details: https://code.openbravo.com/erp/devel/pi/rev/c26136893378
changeset: 24095:c26136893378
user: Rafa Roda Palacios <rafa.roda <at> ubiquads.com>
date: Tue Jul 22 08:13:24 2014 +0200
summary: Fixes issue 27025 Feature request to add a multiple Document Type
selector to the Sales Invoice Dimensional Report
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml
| 36 +
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 13 +
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 10 +
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 55 +
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
| 52 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
| 94 +++
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.xml
| 5 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
| 12 +-
src/org/openbravo/erpCommon/info/DocTypeMultiple.html
| 308 ++++++++++
src/org/openbravo/erpCommon/info/DocTypeMultiple.java
| 307 +++++++++
src/org/openbravo/erpCommon/info/DocTypeMultiple.xml
| 34 +
src/org/openbravo/erpCommon/info/DocTypeMultiple_data.xsql
| 75 ++
src/org/openbravo/erpCommon/info/SelectorUtility_data.xsql
| 15 +
13 files changed, 997 insertions(+), 19 deletions(-)
diffs (truncated from 1300 to 300 lines):
diff -r 605a1d203445 -r c26136893378 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Tue Jul 22 08:11:07 2014 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Tue Jul 22 08:13:24 2014 +0200
@@ -16763,6 +16763,18 @@
<!--1961EDB8E6F743B29134D8DA4E411528-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--1961EDB8E6F743B29134D8DA4E411528--></AD_MESSAGE>
+<!--1998C76DEE4E40C0BED520AF56AE633E--><AD_MESSAGE>
+<!--1998C76DEE4E40C0BED520AF56AE633E-->
<AD_MESSAGE_ID><![CDATA[1998C76DEE4E40C0BED520AF56AE633E]]></AD_MESSAGE_ID>
+<!--1998C76DEE4E40C0BED520AF56AE633E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1998C76DEE4E40C0BED520AF56AE633E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1998C76DEE4E40C0BED520AF56AE633E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1998C76DEE4E40C0BED520AF56AE633E-->
<VALUE><![CDATA[DS_ORGANIZATION]]></VALUE>
+<!--1998C76DEE4E40C0BED520AF56AE633E-->
<MSGTEXT><![CDATA[Organization]]></MSGTEXT>
+<!--1998C76DEE4E40C0BED520AF56AE633E--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--1998C76DEE4E40C0BED520AF56AE633E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1998C76DEE4E40C0BED520AF56AE633E-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--1998C76DEE4E40C0BED520AF56AE633E--></AD_MESSAGE>
+
<!--19E206D186C94610B0179C6B106E94BF--><AD_MESSAGE>
<!--19E206D186C94610B0179C6B106E94BF-->
<AD_MESSAGE_ID><![CDATA[19E206D186C94610B0179C6B106E94BF]]></AD_MESSAGE_ID>
<!--19E206D186C94610B0179C6B106E94BF-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18564,6 +18576,18 @@
<!--45FB8C27317D441CAFD96F2EE0005EA1-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--45FB8C27317D441CAFD96F2EE0005EA1--></AD_MESSAGE>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1--><AD_MESSAGE>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1-->
<AD_MESSAGE_ID><![CDATA[4665A4D2C49E48A4A6A2CFBBAFF03EC1]]></AD_MESSAGE_ID>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1--> <VALUE><![CDATA[DS_DOCTYPE]]></VALUE>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1--> <MSGTEXT><![CDATA[Document
Type]]></MSGTEXT>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--4665A4D2C49E48A4A6A2CFBBAFF03EC1--></AD_MESSAGE>
+
<!--466602FE48454BF588E9458DFB75CB16--><AD_MESSAGE>
<!--466602FE48454BF588E9458DFB75CB16-->
<AD_MESSAGE_ID><![CDATA[466602FE48454BF588E9458DFB75CB16]]></AD_MESSAGE_ID>
<!--466602FE48454BF588E9458DFB75CB16-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -24023,6 +24047,18 @@
<!--D4208AC7E8B348D08F0D621DB273F257-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--D4208AC7E8B348D08F0D621DB273F257--></AD_MESSAGE>
+<!--D447E08029244AD4AE34B647368241F8--><AD_MESSAGE>
+<!--D447E08029244AD4AE34B647368241F8-->
<AD_MESSAGE_ID><![CDATA[D447E08029244AD4AE34B647368241F8]]></AD_MESSAGE_ID>
+<!--D447E08029244AD4AE34B647368241F8-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D447E08029244AD4AE34B647368241F8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D447E08029244AD4AE34B647368241F8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D447E08029244AD4AE34B647368241F8-->
<VALUE><![CDATA[NoDocTypeSelected]]></VALUE>
+<!--D447E08029244AD4AE34B647368241F8--> <MSGTEXT><![CDATA[No document type is
selected]]></MSGTEXT>
+<!--D447E08029244AD4AE34B647368241F8--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--D447E08029244AD4AE34B647368241F8-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D447E08029244AD4AE34B647368241F8-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D447E08029244AD4AE34B647368241F8--></AD_MESSAGE>
+
<!--D4C26BD5396244C4B3CD1731B02C4A0A--><AD_MESSAGE>
<!--D4C26BD5396244C4B3CD1731B02C4A0A-->
<AD_MESSAGE_ID><![CDATA[D4C26BD5396244C4B3CD1731B02C4A0A]]></AD_MESSAGE_ID>
<!--D4C26BD5396244C4B3CD1731B02C4A0A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 605a1d203445 -r c26136893378
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Tue Jul 22 08:11:07
2014 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Tue Jul 22 08:13:24
2014 +0200
@@ -4099,6 +4099,19 @@
<!--970E07E33FD1412D84D9155EBBAD4E0B-->
<OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--970E07E33FD1412D84D9155EBBAD4E0B--></AD_MODEL_OBJECT>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12--><AD_MODEL_OBJECT>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12-->
<AD_MODEL_OBJECT_ID><![CDATA[98AE7DE5E7194CB582F30B8A88C5DA12]]></AD_MODEL_OBJECT_ID>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12--> <ACTION><![CDATA[P]]></ACTION>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12-->
<CLASSNAME><![CDATA[org.openbravo.erpCommon.info.DocTypeMultiple]]></CLASSNAME>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12-->
<OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12--> <NAME><![CDATA[Document Type Multiple
Selector]]></NAME>
+<!--98AE7DE5E7194CB582F30B8A88C5DA12--></AD_MODEL_OBJECT>
+
<!--9931DE504494438491E5B89E7F1CF9B7--><AD_MODEL_OBJECT>
<!--9931DE504494438491E5B89E7F1CF9B7-->
<AD_MODEL_OBJECT_ID><![CDATA[9931DE504494438491E5B89E7F1CF9B7]]></AD_MODEL_OBJECT_ID>
<!--9931DE504494438491E5B89E7F1CF9B7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 605a1d203445 -r c26136893378
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Tue Jul 22
08:11:07 2014 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Tue Jul 22
08:13:24 2014 +0200
@@ -3930,6 +3930,16 @@
<!--5FA3D61C38984B96B34C2CDA1F61DE64--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--5FA3D61C38984B96B34C2CDA1F61DE64--></AD_MODEL_OBJECT_MAPPING>
+<!--615F8578681A483282327E9EB93E95FC--><AD_MODEL_OBJECT_MAPPING>
+<!--615F8578681A483282327E9EB93E95FC-->
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[615F8578681A483282327E9EB93E95FC]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--615F8578681A483282327E9EB93E95FC-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--615F8578681A483282327E9EB93E95FC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--615F8578681A483282327E9EB93E95FC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--615F8578681A483282327E9EB93E95FC-->
<AD_MODEL_OBJECT_ID><![CDATA[98AE7DE5E7194CB582F30B8A88C5DA12]]></AD_MODEL_OBJECT_ID>
+<!--615F8578681A483282327E9EB93E95FC-->
<MAPPINGNAME><![CDATA[/info/DocTypeMultiple.html]]></MAPPINGNAME>
+<!--615F8578681A483282327E9EB93E95FC--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--615F8578681A483282327E9EB93E95FC--></AD_MODEL_OBJECT_MAPPING>
+
<!--6172BEF2FBAEFE39E040007F0101461A--><AD_MODEL_OBJECT_MAPPING>
<!--6172BEF2FBAEFE39E040007F0101461A-->
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[6172BEF2FBAEFE39E040007F0101461A]]></AD_MODEL_OBJECT_MAPPING_ID>
<!--6172BEF2FBAEFE39E040007F0101461A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 605a1d203445 -r c26136893378
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Jul 22 08:11:07
2014 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Jul 22 08:13:24
2014 +0200
@@ -21844,6 +21844,61 @@
<!--FD6E8FB2F09445C0B2CC4E09D4C3BF69-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--FD6E8FB2F09445C0B2CC4E09D4C3BF69--></AD_TEXTINTERFACES>
+<!--FD9E7290E1827584E040007F01015D57--><AD_TEXTINTERFACES>
+<!--FD9E7290E1827584E040007F01015D57-->
<AD_TEXTINTERFACES_ID><![CDATA[FD9E7290E1827584E040007F01015D57]]></AD_TEXTINTERFACES_ID>
+<!--FD9E7290E1827584E040007F01015D57-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD9E7290E1827584E040007F01015D57--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD9E7290E1827584E040007F01015D57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD9E7290E1827584E040007F01015D57--> <TEXT><![CDATA[Document Type]]></TEXT>
+<!--FD9E7290E1827584E040007F01015D57-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html]]></FILENAME>
+<!--FD9E7290E1827584E040007F01015D57--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD9E7290E1827584E040007F01015D57-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD9E7290E1827584E040007F01015D57--></AD_TEXTINTERFACES>
+
+<!--FD9E7290E1847584E040007F01015D57--><AD_TEXTINTERFACES>
+<!--FD9E7290E1847584E040007F01015D57-->
<AD_TEXTINTERFACES_ID><![CDATA[FD9E7290E1847584E040007F01015D57]]></AD_TEXTINTERFACES_ID>
+<!--FD9E7290E1847584E040007F01015D57-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD9E7290E1847584E040007F01015D57--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD9E7290E1847584E040007F01015D57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD9E7290E1847584E040007F01015D57--> <TEXT><![CDATA[Document Type multiple
selector]]></TEXT>
+<!--FD9E7290E1847584E040007F01015D57-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/info/DocTypeMultiple.html]]></FILENAME>
+<!--FD9E7290E1847584E040007F01015D57--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD9E7290E1847584E040007F01015D57-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD9E7290E1847584E040007F01015D57--></AD_TEXTINTERFACES>
+
+<!--FD9E7290E1867584E040007F01015D57--><AD_TEXTINTERFACES>
+<!--FD9E7290E1867584E040007F01015D57-->
<AD_TEXTINTERFACES_ID><![CDATA[FD9E7290E1867584E040007F01015D57]]></AD_TEXTINTERFACES_ID>
+<!--FD9E7290E1867584E040007F01015D57-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD9E7290E1867584E040007F01015D57--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD9E7290E1867584E040007F01015D57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD9E7290E1867584E040007F01015D57--> <TEXT><![CDATA[Document Type
selector]]></TEXT>
+<!--FD9E7290E1867584E040007F01015D57-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/info/DocTypeMultiple.html]]></FILENAME>
+<!--FD9E7290E1867584E040007F01015D57--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD9E7290E1867584E040007F01015D57-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD9E7290E1867584E040007F01015D57--></AD_TEXTINTERFACES>
+
+<!--FD9E7290E1887584E040007F01015D57--><AD_TEXTINTERFACES>
+<!--FD9E7290E1887584E040007F01015D57-->
<AD_TEXTINTERFACES_ID><![CDATA[FD9E7290E1887584E040007F01015D57]]></AD_TEXTINTERFACES_ID>
+<!--FD9E7290E1887584E040007F01015D57-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD9E7290E1887584E040007F01015D57--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD9E7290E1887584E040007F01015D57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD9E7290E1887584E040007F01015D57--> <TEXT><![CDATA[DataGrid]]></TEXT>
+<!--FD9E7290E1887584E040007F01015D57-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/info/DocTypeMultiple.html]]></FILENAME>
+<!--FD9E7290E1887584E040007F01015D57--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD9E7290E1887584E040007F01015D57-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD9E7290E1887584E040007F01015D57--></AD_TEXTINTERFACES>
+
+<!--FD9E7290E18A7584E040007F01015D57--><AD_TEXTINTERFACES>
+<!--FD9E7290E18A7584E040007F01015D57-->
<AD_TEXTINTERFACES_ID><![CDATA[FD9E7290E18A7584E040007F01015D57]]></AD_TEXTINTERFACES_ID>
+<!--FD9E7290E18A7584E040007F01015D57-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD9E7290E18A7584E040007F01015D57--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD9E7290E18A7584E040007F01015D57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD9E7290E18A7584E040007F01015D57--> <TEXT><![CDATA[Loading...]]></TEXT>
+<!--FD9E7290E18A7584E040007F01015D57-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/info/DocTypeMultiple.html]]></FILENAME>
+<!--FD9E7290E18A7584E040007F01015D57--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD9E7290E18A7584E040007F01015D57-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD9E7290E18A7584E040007F01015D57--></AD_TEXTINTERFACES>
+
<!--FE9F357DE872420ABD3286CDCAE919D1--><AD_TEXTINTERFACES>
<!--FE9F357DE872420ABD3286CDCAE919D1-->
<AD_TEXTINTERFACES_ID><![CDATA[FE9F357DE872420ABD3286CDCAE919D1]]></AD_TEXTINTERFACES_ID>
<!--FE9F357DE872420ABD3286CDCAE919D1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 605a1d203445 -r c26136893378
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
Tue Jul 22 08:11:07 2014 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
Tue Jul 22 08:13:24 2014 +0200
@@ -85,6 +85,8 @@
"ReportInvoiceCustomerDimensionalAnalysesJR|project", "");
String strProducttype = vars.getGlobalVariable("inpProducttype",
"ReportInvoiceCustomerDimensionalAnalysesJR|producttype", "");
+ String strcDocTypeId = vars.getInGlobalVariable("inpcDocTypeId_IN",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|doctype", "",
IsIDFilter.instance);
String strOrder = vars.getGlobalVariable("inpOrder",
"ReportInvoiceCustomerDimensionalAnalyze|order", "Normal");
String strMayor = vars.getNumericGlobalVariable("inpMayor",
@@ -105,7 +107,8 @@
printPageDataSheet(request, response, vars, strComparative, strDateFrom,
strDateTo,
strPartnerGroup, strcBpartnerId, strProductCategory, strmProductId,
strNotShown,
strShown, strDateFromRef, strDateToRef, strOrg, strsalesrepId,
strcProjectId,
- strProducttype, strOrder, strMayor, strMenor, strPartnerSalesRepId,
strCurrencyId);
+ strProducttype, strcDocTypeId, strOrder, strMayor, strMenor,
strPartnerSalesRepId,
+ strCurrencyId);
} else if (vars.commandIn("EDIT_HTML", "EDIT_HTML_COMPARATIVE")) {
String strDateFrom = vars.getRequestGlobalVariable("inpDateFrom",
"ReportInvoiceCustomerDimensionalAnalysesJR|dateFrom");
@@ -134,6 +137,8 @@
"ReportInvoiceCustomerDimensionalAnalysesJR|project");
String strProducttype = vars.getRequestGlobalVariable("inpProducttype",
"ReportInvoiceCustomerDimensionalAnalysesJR|producttype");
+ String strcDocTypeId =
vars.getRequestInGlobalVariable("inpcDocTypeId_IN",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|doctype",
IsIDFilter.instance);
String strOrder = vars.getRequestGlobalVariable("inpOrder",
"ReportInvoiceCustomerDimensionalAnalysesJR|order");
String strMayor = vars.getNumericParameter("inpMayor", "");
@@ -146,7 +151,8 @@
printPageHtml(request, response, vars, strComparative, strDateFrom,
strDateTo,
strPartnerGroup, strcBpartnerId, strProductCategory, strmProductId,
strNotShown,
strShown, strDateFromRef, strDateToRef, strOrg, strsalesrepId,
strcProjectId,
- strProducttype, strOrder, strMayor, strMenor, strPartnerSalesrepId,
strCurrencyId, "html");
+ strProducttype, strcDocTypeId, strOrder, strMayor, strMenor,
strPartnerSalesrepId,
+ strCurrencyId, "html");
} else if (vars.commandIn("EDIT_PDF", "EDIT_PDF_COMPARATIVE")) {
String strDateFrom = vars.getRequestGlobalVariable("inpDateFrom",
"ReportInvoiceCustomerDimensionalAnalysesJR|dateFrom");
@@ -175,6 +181,8 @@
"ReportInvoiceCustomerDimensionalAnalysesJR|project");
String strProducttype = vars.getRequestGlobalVariable("inpProducttype",
"ReportInvoiceCustomerDimensionalAnalysesJR|producttype");
+ String strcDocTypeId =
vars.getRequestInGlobalVariable("inpcDocTypeId_IN",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|doctype",
IsIDFilter.instance);
String strOrder = vars.getRequestGlobalVariable("inpOrder",
"ReportSalesDimensionalAnalyze|order");
String strMayor = vars.getNumericParameter("inpMayor", "");
@@ -187,7 +195,8 @@
printPageHtml(request, response, vars, strComparative, strDateFrom,
strDateTo,
strPartnerGroup, strcBpartnerId, strProductCategory, strmProductId,
strNotShown,
strShown, strDateFromRef, strDateToRef, strOrg, strsalesrepId,
strcProjectId,
- strProducttype, strOrder, strMayor, strMenor, strPartnerSalesrepId,
strCurrencyId, "pdf");
+ strProducttype, strcDocTypeId, strOrder, strMayor, strMenor,
strPartnerSalesrepId,
+ strCurrencyId, "pdf");
} else if (vars.commandIn("EXCEL")) {
String strDateFrom = vars.getRequestGlobalVariable("inpDateFrom",
"ReportInvoiceCustomerDimensionalAnalysesJR|dateFrom");
@@ -216,6 +225,8 @@
"ReportInvoiceCustomerDimensionalAnalysesJR|project");
String strProducttype = vars.getRequestGlobalVariable("inpProducttype",
"ReportInvoiceCustomerDimensionalAnalysesJR|producttype");
+ String strcDocTypeId =
vars.getRequestInGlobalVariable("inpcDocTypeId_IN",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|doctype",
IsIDFilter.instance);
String strOrder = vars.getRequestGlobalVariable("inpOrder",
"ReportSalesDimensionalAnalyze|order");
String strMayor = vars.getNumericParameter("inpMayor", "");
@@ -228,7 +239,8 @@
printPageHtml(request, response, vars, strComparative, strDateFrom,
strDateTo,
strPartnerGroup, strcBpartnerId, strProductCategory, strmProductId,
strNotShown,
strShown, strDateFromRef, strDateToRef, strOrg, strsalesrepId,
strcProjectId,
- strProducttype, strOrder, strMayor, strMenor, strPartnerSalesrepId,
strCurrencyId, "xls");
+ strProducttype, strcDocTypeId, strOrder, strMayor, strMenor,
strPartnerSalesrepId,
+ strCurrencyId, "xls");
} else
pageErrorPopUp(response);
}
@@ -238,8 +250,9 @@
String strPartnerGroup, String strcBpartnerId, String strProductCategory,
String strmProductId, String strNotShown, String strShown, String
strDateFromRef,
String strDateToRef, String strOrg, String strsalesrepId, String
strcProjectId,
- String strProducttype, String strOrder, String strMayor, String strMenor,
- String strPartnerSalesrepId, String strCurrencyId) throws IOException,
ServletException {
+ String strProducttype, String strcDocTypeId, String strOrder, String
strMayor,
+ String strMenor, String strPartnerSalesrepId, String strCurrencyId)
throws IOException,
+ ServletException {
if (log4j.isDebugEnabled())
log4j.debug("Output: dataSheet");
String discard[] = { "selEliminarHeader1" };
@@ -425,6 +438,13 @@
throw new ServletException(ex);
}
+ xmlDocument.setData(
+ "reportCDocTypeId_IN",
+ "liststructure",
+ SelectorUtilityData.selectCDocType(this,
+ Utility.getContext(this, vars, "#AccessibleOrgTree", ""),
+ Utility.getContext(this, vars, "#User_Client", ""),
strcDocTypeId));
+
if (vars.getLanguage().equals("en_US")) {
xmlDocument.setData("structure1",
ReportInvoiceCustomerDimensionalAnalysesJRData.selectNotShown(this,
strShown));
@@ -452,9 +472,9 @@
String strPartnerGroup, String strcBpartnerId, String strProductCategory,
String strmProductId, String strNotShown, String strShown, String
strDateFromRef,
String strDateToRef, String strOrg, String strsalesrepId, String
strcProjectId,
- String strProducttype, String strOrder, String strMayor, String strMenor,
- String strPartnerSalesrepId, String strCurrencyId, String strOutput)
throws IOException,
- ServletException {
+ String strProducttype, String strcDocTypeId, String strOrder, String
strMayor,
+ String strMenor, String strPartnerSalesrepId, String strCurrencyId,
String strOutput)
+ throws IOException, ServletException {
if (log4j.isDebugEnabled())
log4j.debug("Output: print html");
String strOrderby = "";
@@ -685,15 +705,15 @@
vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strPartnerGroup, strcBpartnerId, strProductCategory,
strmProductId,
strsalesrepId, strPartnerSalesrepId, strcProjectId,
strProducttype,
- strDateFrom, DateTimeData.nDaysAfter(this, strDateTo,
"1"), strDateFromRef,
- DateTimeData.nDaysAfter(this, strDateToRef, "1"))
+ strcDocTypeId, strDateFrom, DateTimeData.nDaysAfter(this,
strDateTo, "1"),
+ strDateFromRef, DateTimeData.nDaysAfter(this,
strDateToRef, "1"))
:
ReportInvoiceCustomerDimensionalAnalysesJRData.selectNoComparativeCount(this,
levelsconcat.toString(), Tree.getMembers(this,
TreeData.getTreeOrg(this, vars.getClient()), strOrg),
Utility.getContext(
this, vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strPartnerGroup, strcBpartnerId, strProductCategory,
strmProductId,
strsalesrepId, strPartnerSalesrepId, strcProjectId,
strProducttype,
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
