fixed bug [ 1902937 ] Error in filters of Sales and Invoice Dimensional Reports
authorEgoitz Castillo <egoitz.castillo@openbravo.com>
Thu, 10 Apr 2008 08:30:43 +0000
changeset 621 a84edd5004c8
parent 620 c429f49762c2
child 622 6ab7f6e0a9da
fixed bug [ 1902937 ] Error in filters of Sales and Invoice Dimensional Reports
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalyses.java
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesFilter.html
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalyses.java	Thu Apr 10 07:57:04 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalyses.java	Thu Apr 10 08:30:43 2008 +0000
@@ -183,7 +183,7 @@
     xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this, vars.getRole()));
     try {
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLE", "SalesRep_ID", "AD_User SalesRep", "", Utility.getContext(this, vars, "#User_Org", "ReportSalesDimensionalAnalyze"), Utility.getContext(this, vars, "#User_Client", "ReportSalesDimensionalAnalyze"), 0);
-      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportSalesDimensionalAnalyze", strsalesrepId);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportInvoiceCustomerDimensionalAnalyses", strsalesrepId);
       xmlDocument.setData("reportSalesRep_ID","liststructure", comboTableData.select(false));
       comboTableData = null;
     } catch (Exception ex) {
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesFilter.html	Thu Apr 10 07:57:04 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesFilter.html	Thu Apr 10 08:30:43 2008 +0000
@@ -587,7 +587,7 @@
                   <TR>
                     <TD class="TitleCell"><SPAN class="LabelText">Commercial Document</SPAN></TD>
                     <TD class="Combo_ContentCell" colspan="2"><SELECT name="inpSalesrepId" id="inpSalesrepId" class="Combo Combo_TwoCells_width">
-                        <OPTION value=""> <DIV id="reportC_BP_GROUPID"></DIV></OPTION>
+                        <OPTION value=""> <DIV id="reportSalesRep_ID"></DIV></OPTION>
                     </SELECT></TD>
                     <TD class="TitleCell"><SPAN class="LabelText">Commercial File</SPAN></TD>
                     <TD class="Combo_ContentCell" colspan="2"> <SELECT name="inpPartnerSalesrepId" id="inpPartnerSalesrepId" class="Combo Combo_TwoCells_width">
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java	Thu Apr 10 07:57:04 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java	Thu Apr 10 08:30:43 2008 +0000
@@ -82,7 +82,7 @@
       String strsalesrepId = vars.getRequestGlobalVariable("inpSalesrepId", "ReportInvoiceCustomerDimensionalAnalysesJR|salesrep");
       String strcProjectId = vars.getRequestGlobalVariable("inpcProjectId", "ReportInvoiceCustomerDimensionalAnalysesJR|project");
       String strProducttype = vars.getRequestGlobalVariable("inpProducttype", "ReportInvoiceCustomerDimensionalAnalysesJR|producttype");
-      String strOrder = vars.getRequestGlobalVariable("inpOrder","ReportSalesDimensionalAnalyze|order");
+      String strOrder = vars.getRequestGlobalVariable("inpOrder","ReportInvoiceCustomerDimensionalAnalysesJR|order");
       String strMayor = vars.getStringParameter("inpMayor", "");
       String strMenor = vars.getStringParameter("inpMenor", "");
       String strComparative = vars.getStringParameter("inpComparative", "N");
@@ -216,6 +216,15 @@
     }
 
     try {
+      ComboTableData comboTableData = new ComboTableData(vars, this, "TABLE", "SalesRep_ID", "AD_User SalesRep", "", Utility.getContext(this, vars, "#User_Org", "ReportSalesDimensionalAnalyzeJR"), Utility.getContext(this, vars, "#User_Client", "ReportSalesDimensionalAnalyzeJR"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportSalesDimensionalAnalyzeJR", strsalesrepId);
+      xmlDocument.setData("reportSalesRep_ID","liststructure", comboTableData.select(false));
+      comboTableData = null;
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
+
+    try {
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLE", "", "C_BPartner SalesRep", "", Utility.getContext(this, vars, "#User_Org", "ReportInvoiceCustomerDimensionalAnalysesJR"), Utility.getContext(this, vars, "#User_Client", "ReportInvoiceCustomerDimensionalAnalysesJR"), 0);
       Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportInvoiceCustomerDimensionalAnalysesJR", strPartnerSalesrepId);
       xmlDocument.setData("reportPartnerSalesRep_ID","liststructure", comboTableData.select(false));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html	Thu Apr 10 07:57:04 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html	Thu Apr 10 08:30:43 2008 +0000
@@ -579,7 +579,7 @@
                   <TR>
                     <TD class="TitleCell"><SPAN class="LabelText">Commercial Document</SPAN></TD>
                     <TD class="Combo_ContentCell" colspan="2"><SELECT name="inpSalesrepId" id="inpSalesrepId" class="Combo Combo_TwoCells_width">
-                        <OPTION value=""> <DIV id="reportC_BP_GROUPID"></DIV></OPTION>
+                        <OPTION value=""> <DIV id="reportSalesRep_ID"></DIV></OPTION>
                     </SELECT></TD>
                     <TD class="TitleCell"><SPAN class="LabelText">Commercial File</SPAN></TD>
                     <TD class="Combo_ContentCell" colspan="2"> <SELECT name="inpPartnerSalesrepId" id="inpPartnerSalesrepId" class="Combo Combo_TwoCells_width">
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java	Thu Apr 10 07:57:04 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java	Thu Apr 10 08:30:43 2008 +0000
@@ -219,7 +219,7 @@
     xmlDocument.setData("reportCBPartnerId_IN", "liststructure", ReportSalesDimensionalAnalyzeJRData.selectBpartner(this, Utility.getContext(this, vars, "#User_Org", ""), Utility.getContext(this, vars, "#User_Client", ""), strcBpartnerId));
     xmlDocument.setData("reportMProductId_IN", "liststructure", ReportSalesDimensionalAnalyzeJRData.selectMproduct(this, Utility.getContext(this, vars, "#User_Org", ""), Utility.getContext(this, vars, "#User_Client", ""), strmProductId));
     try {
-      ComboTableData comboTableData = new ComboTableData(vars, this, "LIST", "", "C_BPartner SalesRep", "", Utility.getContext(this, vars, "#User_Org", "ReportSalesDimensionalAnalyzeJR"), Utility.getContext(this, vars, "#User_Client", "ReportSalesDimensionalAnalyzeJR"), 0);
+      ComboTableData comboTableData = new ComboTableData(vars, this, "TABLE", "", "C_BPartner SalesRep", "", Utility.getContext(this, vars, "#User_Org", "ReportSalesDimensionalAnalyzeJR"), Utility.getContext(this, vars, "#User_Client", "ReportSalesDimensionalAnalyzeJR"), 0);
       Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportSalesDimensionalAnalyzeJR", strPartnerSalesrepId);
       xmlDocument.setData("reportPartnerSalesRep_ID","liststructure", comboTableData.select(false));
       comboTableData = null;
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html	Thu Apr 10 07:57:04 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html	Thu Apr 10 08:30:43 2008 +0000
@@ -574,7 +574,7 @@
                   <TR>
                     <TD class="TitleCell"><SPAN class="LabelText">Commercial Document</SPAN></TD>
                     <TD class="Combo_ContentCell" colspan="2"><SELECT name="inpSalesrepId" id="inpSalesrepId" class="Combo Combo_TwoCells_width">
-                        <OPTION value=""> <DIV id="reportC_BP_GROUPID"></DIV></OPTION>
+                        <OPTION value=""> <DIV id="reportSalesRep_ID"></DIV></OPTION>
                     </SELECT></TD>
                     <TD class="TitleCell"><SPAN class="LabelText">Commercial File</SPAN></TD>
                     <TD class="Combo_ContentCell" colspan="2"> <SELECT name="inpPartnerSalesrepId" id="inpPartnerSalesrepId" class="Combo Combo_TwoCells_width">