details: http://code.openbravo.com/erp/devel/pi/rev/2885eb922f99
changeset: 3341:2885eb922f99
user: Gorka Mauleon <gorka.mauleon <at> openbravo.com>
date: Fri Mar 06 15:52:24 2009 +0100
summary: fixes 0007841: Print and email option icons are visible in Sales
order report.(which is not visible in other reports)
diffstat:
1 file changed, 24 insertions(+), 20 deletions(-)
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java | 44 +++++-----
diffs (105 lines):
diff -r da25ccb7bcfb -r 2885eb922f99
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java Fri Mar
06 15:33:21 2009 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java Fri Mar
06 15:52:24 2009 +0100
@@ -106,6 +106,7 @@
"",
"openServletNewWindow('EDIT_PDF', true, 'ReportSalesOrderJR.pdf',
'ReportSalesOrderFilterJR', null, false, '700', '1000', true);return false;",
false, "ad_reports", strReplaceWith, false, true);
+ toolbar.setEmail(false);
toolbar.prepareSimpleToolBarTemplate();
xmlDocument.setParameter("toolbar", toolbar.toString());
@@ -151,8 +152,8 @@
xmlDocument.setParameter("mProductCatId", "");
try {
ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "M_Warehouse_ID",
- "", "", Utility.getContext(this, vars, "#AccessibleOrgTree",
"SalesOrderFilterJR"), Utility
- .getContext(this, vars, "#User_Client", "SalesOrderFilter"), 0);
+ "", "", Utility.getContext(this, vars, "#AccessibleOrgTree",
"SalesOrderFilterJR"),
+ Utility.getContext(this, vars, "#User_Client", "SalesOrderFilter"),
0);
Utility.fillSQLParameters(this, vars, null, comboTableData,
"SalesOrderFilterJR", "");
xmlDocument.setData("reportM_WAREHOUSEID", "liststructure",
comboTableData.select(false));
comboTableData = null;
@@ -162,8 +163,9 @@
try {
ComboTableData comboTableData = new ComboTableData(vars, this, "LIST",
"C_Projectkind_ID",
- "Projectkind", "", Utility.getContext(this, vars,
"#AccessibleOrgTree", "SalesOrderFilterJR"),
- Utility.getContext(this, vars, "#User_Client",
"SalesOrderFilterJR"), 0);
+ "Projectkind", "", Utility.getContext(this, vars,
"#AccessibleOrgTree",
+ "SalesOrderFilterJR"), Utility.getContext(this, vars,
"#User_Client",
+ "SalesOrderFilterJR"), 0);
Utility.fillSQLParameters(this, vars, null, comboTableData,
"SalesOrderFilterJR", "");
xmlDocument.setData("reportC_PROJECTKIND", "liststructure",
comboTableData.select(false));
comboTableData = null;
@@ -173,8 +175,9 @@
try {
ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "C_Region_ID", "",
- "C_Region of Country", Utility.getContext(this, vars,
"#AccessibleOrgTree", "SalesOrderFilterJR"),
- Utility.getContext(this, vars, "#User_Client",
"SalesOrderFilterJR"), 0);
+ "C_Region of Country", Utility.getContext(this, vars,
"#AccessibleOrgTree",
+ "SalesOrderFilterJR"), Utility.getContext(this, vars,
"#User_Client",
+ "SalesOrderFilterJR"), 0);
Utility.fillSQLParameters(this, vars, null, comboTableData,
"SalesOrderFilterJR", "");
xmlDocument.setData("reportC_REGIONID", "liststructure",
comboTableData.select(false));
comboTableData = null;
@@ -184,8 +187,9 @@
try {
ComboTableData comboTableData = new ComboTableData(vars, this, "LIST",
"C_Projectkind_ID",
- "PublicPrivate", "", Utility.getContext(this, vars,
"#AccessibleOrgTree", "SalesOrderFilterJR"),
- Utility.getContext(this, vars, "#User_Client",
"SalesOrderFilterJR"), 0);
+ "PublicPrivate", "", Utility.getContext(this, vars,
"#AccessibleOrgTree",
+ "SalesOrderFilterJR"), Utility.getContext(this, vars,
"#User_Client",
+ "SalesOrderFilterJR"), 0);
Utility.fillSQLParameters(this, vars, null, comboTableData,
"SalesOrderFilter", "");
xmlDocument.setData("reportC_PROJECTKIND", "liststructure",
comboTableData.select(false));
comboTableData = null;
@@ -196,8 +200,8 @@
xmlDocument.setParameter("ccurrencyid", strCurrencyId);
try {
ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "C_Currency_ID",
- "", "", Utility.getContext(this, vars, "#AccessibleOrgTree",
"SalesOrderFilterJR"), Utility
- .getContext(this, vars, "#User_Client", "SalesOrderFilterJR"),
0);
+ "", "", Utility.getContext(this, vars, "#AccessibleOrgTree",
"SalesOrderFilterJR"),
+ Utility.getContext(this, vars, "#User_Client",
"SalesOrderFilterJR"), 0);
Utility.fillSQLParameters(this, vars, null, comboTableData,
"SalesOrderFilterJR",
strCurrencyId);
xmlDocument.setData("reportC_Currency_ID", "liststructure",
comboTableData.select(false));
@@ -207,14 +211,14 @@
}
xmlDocument.setData("reportCBPartnerId_IN", "liststructure",
ReportProjectBuildingSiteData
- .selectBpartner(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", ""), Utility.getContext(
- this, vars, "#User_Client", ""), ""));
+ .selectBpartner(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", ""), Utility
+ .getContext(this, vars, "#User_Client", ""), ""));
xmlDocument.setData("reportMProductId_IN", "liststructure",
ReportProjectBuildingSiteData
- .selectMproduct(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", ""), Utility.getContext(
- this, vars, "#User_Client", ""), ""));
+ .selectMproduct(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", ""), Utility
+ .getContext(this, vars, "#User_Client", ""), ""));
xmlDocument.setData("reportC_PRODUCTCATREGORY", "liststructure",
SubCategoryProductData.select(
- this, Utility.getContext(this, vars, "#AccessibleOrgTree", ""),
Utility.getContext(this, vars,
- "#User_Client", "")));
+ this, Utility.getContext(this, vars, "#AccessibleOrgTree", ""),
Utility.getContext(this,
+ vars, "#User_Client", "")));
response.setContentType("text/html; charset=UTF-8");
xmlDocument.setParameter("dateFromdisplayFormat",
vars.getSessionValue("#AD_SqlDateFormat"));
@@ -244,10 +248,10 @@
myMessage = new OBError();
try {
data = OrderEditionData.select(this, strCurrencyId,
Utility.getContext(this, vars,
- "#AccessibleOrgTree", "SalesOrderFilterJR"),
Utility.getContext(this, vars, "#User_Client",
- "SalesOrderFilterJR"), strdateFrom, strdateTo, strmWarehouseId,
strcProjectId,
- strProjectpublic, strcRegionId, strmProductCategoryId,
strProjectkind, strcBpartnerId,
- strmProductId);
+ "#AccessibleOrgTree", "SalesOrderFilterJR"),
Utility.getContext(this, vars,
+ "#User_Client", "SalesOrderFilterJR"), strdateFrom, strdateTo,
strmWarehouseId,
+ strcProjectId, strProjectpublic, strcRegionId,
strmProductCategoryId, strProjectkind,
+ strcBpartnerId, strmProductId);
} catch (ServletException ex) {
myMessage = Utility.translateError(this, vars, vars.getLanguage(),
ex.getMessage());
}
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
