details:   https://code.openbravo.com/erp/devel/pi/rev/063228ee428e
changeset: 24093:063228ee428e
user:      Rafa Roda Palacios <rafa.roda <at> ubiquads.com>
date:      Tue Jul 22 08:09:03 2014 +0200
summary:   Fixes issue 26936 Feature request to make Purchase Invoice 
Dimensional Report exportable to excel

diffstat:

 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml                         
            |   10 +
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml                               
            |   44 +
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
 |   40 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java
       |  167 +++-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
  |   50 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml
     |  355 ++++++++++
 6 files changed, 611 insertions(+), 55 deletions(-)

diffs (truncated from 814 to 300 lines):

diff -r 4780c7c70da5 -r 063228ee428e 
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml    Tue Jul 22 
08:06:32 2014 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml    Tue Jul 22 
08:09:03 2014 +0200
@@ -4430,6 +4430,16 @@
 <!--D31E38655CA14D6992BB7E1A8DB8180A-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--D31E38655CA14D6992BB7E1A8DB8180A--></AD_MODEL_OBJECT_MAPPING>
 
+<!--D75563571E22413BA3F62F8579638FF5--><AD_MODEL_OBJECT_MAPPING>
+<!--D75563571E22413BA3F62F8579638FF5-->  
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[D75563571E22413BA3F62F8579638FF5]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--D75563571E22413BA3F62F8579638FF5-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D75563571E22413BA3F62F8579638FF5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D75563571E22413BA3F62F8579638FF5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D75563571E22413BA3F62F8579638FF5-->  
<AD_MODEL_OBJECT_ID><![CDATA[801713]]></AD_MODEL_OBJECT_ID>
+<!--D75563571E22413BA3F62F8579638FF5-->  
<MAPPINGNAME><![CDATA[/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.xls]]></MAPPINGNAME>
+<!--D75563571E22413BA3F62F8579638FF5-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--D75563571E22413BA3F62F8579638FF5--></AD_MODEL_OBJECT_MAPPING>
+
 <!--D7609AF5FD7C44B1B96632F8DE1A8C5F--><AD_MODEL_OBJECT_MAPPING>
 <!--D7609AF5FD7C44B1B96632F8DE1A8C5F-->  
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[D7609AF5FD7C44B1B96632F8DE1A8C5F]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--D7609AF5FD7C44B1B96632F8DE1A8C5F-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 4780c7c70da5 -r 063228ee428e 
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml  Tue Jul 22 08:06:32 
2014 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml  Tue Jul 22 08:09:03 
2014 +0200
@@ -14366,6 +14366,17 @@
 <!--5450D2BE7B8748A8811C4D0964DDE38A-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5450D2BE7B8748A8811C4D0964DDE38A--></AD_TEXTINTERFACES>
 
+<!--5467683708B8479D89E38EB79686CA7B--><AD_TEXTINTERFACES>
+<!--5467683708B8479D89E38EB79686CA7B-->  
<AD_TEXTINTERFACES_ID><![CDATA[5467683708B8479D89E38EB79686CA7B]]></AD_TEXTINTERFACES_ID>
+<!--5467683708B8479D89E38EB79686CA7B-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5467683708B8479D89E38EB79686CA7B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5467683708B8479D89E38EB79686CA7B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5467683708B8479D89E38EB79686CA7B-->  <TEXT><![CDATA[Generate 
Excel]]></TEXT>
+<!--5467683708B8479D89E38EB79686CA7B-->  
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html]]></FILENAME>
+<!--5467683708B8479D89E38EB79686CA7B-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--5467683708B8479D89E38EB79686CA7B-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5467683708B8479D89E38EB79686CA7B--></AD_TEXTINTERFACES>
+
 <!--54C1E7A930E347E7B3AD261B80B599C5--><AD_TEXTINTERFACES>
 <!--54C1E7A930E347E7B3AD261B80B599C5-->  
<AD_TEXTINTERFACES_ID><![CDATA[54C1E7A930E347E7B3AD261B80B599C5]]></AD_TEXTINTERFACES_ID>
 <!--54C1E7A930E347E7B3AD261B80B599C5-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20876,6 +20887,17 @@
 <!--CFD9C649094548D4AE25DB1FD7286161-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--CFD9C649094548D4AE25DB1FD7286161--></AD_TEXTINTERFACES>
 
+<!--D02ADB9E9D3A4589B407C8F40ED11B54--><AD_TEXTINTERFACES>
+<!--D02ADB9E9D3A4589B407C8F40ED11B54-->  
<AD_TEXTINTERFACES_ID><![CDATA[D02ADB9E9D3A4589B407C8F40ED11B54]]></AD_TEXTINTERFACES_ID>
+<!--D02ADB9E9D3A4589B407C8F40ED11B54-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D02ADB9E9D3A4589B407C8F40ED11B54-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D02ADB9E9D3A4589B407C8F40ED11B54-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D02ADB9E9D3A4589B407C8F40ED11B54-->  <TEXT><![CDATA[XLS Format]]></TEXT>
+<!--D02ADB9E9D3A4589B407C8F40ED11B54-->  
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html]]></FILENAME>
+<!--D02ADB9E9D3A4589B407C8F40ED11B54-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--D02ADB9E9D3A4589B407C8F40ED11B54-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D02ADB9E9D3A4589B407C8F40ED11B54--></AD_TEXTINTERFACES>
+
 <!--D06F914B4FEE484B89B39BBDD1FBA5BD--><AD_TEXTINTERFACES>
 <!--D06F914B4FEE484B89B39BBDD1FBA5BD-->  
<AD_TEXTINTERFACES_ID><![CDATA[D06F914B4FEE484B89B39BBDD1FBA5BD]]></AD_TEXTINTERFACES_ID>
 <!--D06F914B4FEE484B89B39BBDD1FBA5BD-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21712,6 +21734,28 @@
 <!--FCDE492F181D47A8A87B93F89C18C831-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FCDE492F181D47A8A87B93F89C18C831--></AD_TEXTINTERFACES>
 
+<!--FD4B9BD0444F79A0E040007F01014582--><AD_TEXTINTERFACES>
+<!--FD4B9BD0444F79A0E040007F01014582-->  
<AD_TEXTINTERFACES_ID><![CDATA[FD4B9BD0444F79A0E040007F01014582]]></AD_TEXTINTERFACES_ID>
+<!--FD4B9BD0444F79A0E040007F01014582-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD4B9BD0444F79A0E040007F01014582-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD4B9BD0444F79A0E040007F01014582-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD4B9BD0444F79A0E040007F01014582-->  <TEXT><![CDATA[Document No]]></TEXT>
+<!--FD4B9BD0444F79A0E040007F01014582-->  
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml]]></FILENAME>
+<!--FD4B9BD0444F79A0E040007F01014582-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD4B9BD0444F79A0E040007F01014582-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD4B9BD0444F79A0E040007F01014582--></AD_TEXTINTERFACES>
+
+<!--FD4B9BD0445179A0E040007F01014582--><AD_TEXTINTERFACES>
+<!--FD4B9BD0445179A0E040007F01014582-->  
<AD_TEXTINTERFACES_ID><![CDATA[FD4B9BD0445179A0E040007F01014582]]></AD_TEXTINTERFACES_ID>
+<!--FD4B9BD0445179A0E040007F01014582-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD4B9BD0445179A0E040007F01014582-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD4B9BD0445179A0E040007F01014582-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD4B9BD0445179A0E040007F01014582-->  <TEXT><![CDATA[Invoice Date]]></TEXT>
+<!--FD4B9BD0445179A0E040007F01014582-->  
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml]]></FILENAME>
+<!--FD4B9BD0445179A0E040007F01014582-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD4B9BD0445179A0E040007F01014582-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD4B9BD0445179A0E040007F01014582--></AD_TEXTINTERFACES>
+
 <!--FD6E8FB2F09445C0B2CC4E09D4C3BF69--><AD_TEXTINTERFACES>
 <!--FD6E8FB2F09445C0B2CC4E09D4C3BF69-->  
<AD_TEXTINTERFACES_ID><![CDATA[FD6E8FB2F09445C0B2CC4E09D4C3BF69]]></AD_TEXTINTERFACES_ID>
 <!--FD6E8FB2F09445C0B2CC4E09D4C3BF69-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 4780c7c70da5 -r 063228ee428e 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
--- 
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
        Tue Jul 22 08:06:32 2014 +0200
+++ 
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
        Tue Jul 22 08:09:03 2014 +0200
@@ -13,7 +13,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2011 Openbravo SLU
+ * All portions are Copyright (C) 2001-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -770,7 +770,8 @@
                   </tr>
 
                   <tr>
-                    <td class="Button_RightAlign_ContentCell" colspan="2">
+                    <td class="ContentCell"></td>
+                    <td class="Button_RightAlign_ContentCell" colspan="0">
                       <div>
                         <button type="button" 
                           id="buttonHTML" 
@@ -795,7 +796,7 @@
                         </button>
                       </div>
                     </td>
-                    <td class="Button_LeftAlign_ContentCell" colspan="0">
+                    <td class="Button_CenterAlign_ContentCell" colspan="0">
                       <div>
                         <button type="button" 
                           class="ButtonLink" 
@@ -819,12 +820,37 @@
                         </button>
                       </div>
                     </td>
+                    <td class="Button_LeftAlign_ContentCell" colspan="0">
+                      <div>
+                        <button type="button" 
+                          id="buttonExcel" 
+                          class="ButtonLink" 
+                          onclick="submitCommandForm('EXCEL', true, null, 
'ReportInvoiceVendorDimensionalAnalysesXLS.xls', '_blank', null, false);return 
false;" 
+                          onfocus="buttonEvent('onfocus', this); 
window.status='Generate Excel'; return true;" 
+                          onblur="buttonEvent('onblur', this);" 
+                          onkeyup="buttonEvent('onkeyup', this);" 
+                          onkeydown="buttonEvent('onkeydown', this);" 
+                          onkeypress="buttonEvent('onkeypress', this);" 
+                          onmouseup="buttonEvent('onmouseup', this);" 
+                          onmousedown="buttonEvent('onmousedown', this);" 
+                          onmouseover="buttonEvent('onmouseover', this); 
window.status='Generate Excel'; return true;" 
+                          onmouseout="buttonEvent('onmouseout', this);">
+                          <table class="Button">
+                            <tr>
+                              <td class="Button_left"><img class="Button_Icon 
Button_Icon_process" alt="Generate Excel" title="Generate Excel" 
src="../../../../../web/images/blank.gif" border="0" /></td>
+                              <td class="Button_text">XLS Format</td>
+                              <td class="Button_right"></td>
+                            </tr>
+                          </table>
+                        </button>
+                      </div>
+                    </td>  
                     <td class="TitleCell"><span 
class="LabelText">Currency</span></td>
                        <td class="Combo_ContentCell">
-                       <select name="inpCurrencyId" id="inpCurrencyId" 
class="ComboKey Combo_OneCell_width" required="true">
-                    <option value=""><div 
id="reportC_Currency_ID"></div></option>
-                    </select>
-                  </td> 
+                         <select name="inpCurrencyId" id="inpCurrencyId" 
class="ComboKey Combo_OneCell_width" required="true">
+                      <option value=""><div 
id="reportC_Currency_ID"></div></option>
+                      </select>
+                    </td> 
                   </tr>
 
               </table>
diff -r 4780c7c70da5 -r 063228ee428e 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java
--- 
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java
      Tue Jul 22 08:06:32 2014 +0200
+++ 
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java
      Tue Jul 22 08:09:03 2014 +0200
@@ -8,7 +8,7 @@
  * either express or implied. See the License for the specific language
  * governing rights and limitations under the License. The Original Code is
  * Openbravo ERP. The Initial Developer of the Original Code is Openbravo SLU 
All
- * portions are Copyright (C) 2001-2012 Openbravo SLU All Rights Reserved.
+ * portions are Copyright (C) 2001-2014 Openbravo SLU All Rights Reserved.
  * Contributor(s): ______________________________________.
  */
 
@@ -164,6 +164,41 @@
           strPartnerGroup, strcBpartnerId, strProductCategory, strmProductId, 
strNotShown,
           strShown, strDateFromRef, strDateToRef, strOrg, strOrder, strMayor, 
strMenor,
           strProducttype, strCurrencyId, "pdf");
+    } else if (vars.commandIn("EXCEL")) {
+      String strDateFrom = vars.getRequestGlobalVariable("inpDateFrom",
+          "ReportInvoiceVendorDimensionalAnalysesJR|dateFrom");
+      String strDateTo = vars.getRequestGlobalVariable("inpDateTo",
+          "ReportInvoiceVendorDimensionalAnalysesJR|dateTo");
+      String strDateFromRef = vars.getRequestGlobalVariable("inpDateFromRef",
+          "ReportInvoiceVendorDimensionalAnalysesJR|dateFromRef");
+      String strDateToRef = vars.getRequestGlobalVariable("inpDateToRef",
+          "ReportSInvoiceVendorDimensionalAnalysesJR|dateToRef");
+      String strPartnerGroup = vars.getRequestGlobalVariable("inpPartnerGroup",
+          "ReportInvoiceVendorDimensionalAnalysesJR|partnerGroup");
+      String strcBpartnerId = 
vars.getRequestInGlobalVariable("inpcBPartnerId_IN",
+          "ReportInvoiceVendorDimensionalAnalysesJR|partner", 
IsIDFilter.instance);
+      String strProductCategory = 
vars.getRequestGlobalVariable("inpProductCategory",
+          "ReportInvoiceVendorDimensionalAnalysesJR|productCategory");
+      String strmProductId = 
vars.getRequestInGlobalVariable("inpmProductId_IN",
+          "ReportInvoiceVendorDimensionalAnalysesJR|product", 
IsIDFilter.instance);
+      // ad_ref_list.value for reference_id 800086
+      String strNotShown = vars.getInStringParameter("inpNotShown", 
IsPositiveIntFilter.instance);
+      String strShown = vars.getInStringParameter("inpShown", 
IsPositiveIntFilter.instance);
+      String strOrg = vars.getRequestGlobalVariable("inpOrg",
+          "ReportInvoiceVendorDimensionalAnalysesJR|Org");
+      String strOrder = vars.getRequestGlobalVariable("inpOrder",
+          "ReportInvoiceVendorDimensionalAnalysesJR|order");
+      String strMayor = vars.getNumericParameter("inpMayor", "");
+      String strMenor = vars.getNumericParameter("inpMenor", "");
+      String strProducttype = vars.getRequestGlobalVariable("inpProducttype",
+          "ReportInvoiceVendorDimensionalAnalysesJR|producttype");
+      String strComparative = vars.getStringParameter("inpComparative", "N");
+      String strCurrencyId = vars.getGlobalVariable("inpCurrencyId",
+          "ReportInvoiceVendorDimensionalAnalysesJR|currency", 
strUserCurrencyId);
+      printPageHtml(request, response, vars, strComparative, strDateFrom, 
strDateTo,
+          strPartnerGroup, strcBpartnerId, strProductCategory, strmProductId, 
strNotShown,
+          strShown, strDateFromRef, strDateToRef, strOrg, strOrder, strMayor, 
strMenor,
+          strProducttype, strCurrencyId, "xls");
     } else
       pageErrorPopUp(response);
   }
@@ -378,6 +413,7 @@
               strProductCategory);
 
     ReportInvoiceVendorDimensionalAnalysesJRData[] data = null;
+    ReportInvoiceVendorDimensionalAnalysesJRData dataXLS = null;
     String[] strShownArray = { "", "", "", "", "" };
     if (strShown.startsWith("("))
       strShown = strShown.substring(1, strShown.length() - 1);
@@ -420,7 +456,8 @@
         strLevelLabel[i] = dimensionLabel[2].name;
       } else if (strShownArray[i].equals("4")) {
         strTextShow[i] = "AD_COLUMN_IDENTIFIER(to_char('M_Product'), to_char( 
M_PRODUCT.M_PRODUCT_ID), to_char('"
-            + vars.getLanguage() + "'))|| CASE WHEN uomsymbol IS NULL THEN '' 
ELSE to_char(' ('||uomsymbol||')') END";
+            + vars.getLanguage()
+            + "'))|| CASE WHEN uomsymbol IS NULL THEN '' ELSE to_char(' 
('||uomsymbol||')') END";
         intAuxDiscard = i;
         intDiscard++;
         intProductLevel = i + 1;
@@ -481,67 +518,105 @@
     }
     strOrderby = strHaving + strOrderby;
 
-    // Checks if there is a conversion rate for each of the transactions of
-    // the report
+    // Checks if there is a conversion rate for each of the transactions of 
the report
     String strConvRateErrorMsg = "";
     OBError myMessage = null;
     myMessage = new OBError();
-    if (strComparative.equals("Y")) {
+    if ("xls".equals(strOutput)) {
       try {
-        data = ReportInvoiceVendorDimensionalAnalysesJRData.select(this, 
strCurrencyId,
-            strTextShow[0], strTextShow[1], strTextShow[2], strTextShow[3], 
strTextShow[4], Tree
-                .getMembers(this, TreeData.getTreeOrg(this, vars.getClient()), 
strOrg),
-            Utility.getContext(this, vars, "#User_Client",
-                "ReportInvoiceVendorDimensionalAnalysesJR"), strDateFrom, 
DateTimeData.nDaysAfter(
-                this, strDateTo, "1"), strPartnerGroup, strcBpartnerId, 
strProductCategory,
-            strmProductId, strProducttype, strDateFromRef, 
DateTimeData.nDaysAfter(this,
-                strDateToRef, "1"), strOrderby);
+        dataXLS = ReportInvoiceVendorDimensionalAnalysesJRData.selectXLS(this, 
strCurrencyId, Tree
+            .getMembers(this, TreeData.getTreeOrg(this, vars.getClient()), 
strOrg), Utility
+            .getContext(this, vars, "#User_Client", 
"ReportInvoiceVendorDimensionalAnalysesJR"),
+            strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"), 
strPartnerGroup,
+            strcBpartnerId, strProductCategory, strmProductId, strProducttype);
       } catch (ServletException ex) {
         myMessage = Utility.translateError(this, vars, vars.getLanguage(), 
ex.getMessage());
       }
     } else {
-      try {
-        data = 
ReportInvoiceVendorDimensionalAnalysesJRData.selectNoComparative(this,
-            strCurrencyId, strTextShow[0], strTextShow[1], strTextShow[2], 
strTextShow[3],
-            strTextShow[4], Tree.getMembers(this, TreeData.getTreeOrg(this, 
vars.getClient()),
-                strOrg), Utility.getContext(this, vars, "#User_Client",
-                "ReportInvoiceVendorDimensionalAnalysesJR"), strDateFrom, 
DateTimeData.nDaysAfter(
-                this, strDateTo, "1"), strPartnerGroup, strcBpartnerId, 
strProductCategory,
-            strmProductId, strProducttype, strOrderby);
-      } catch (ServletException ex) {
-        myMessage = Utility.translateError(this, vars, vars.getLanguage(), 
ex.getMessage());
+      if (strComparative.equals("Y")) {
+        try {
+          data = ReportInvoiceVendorDimensionalAnalysesJRData.select(this, 
strCurrencyId,
+              strTextShow[0], strTextShow[1], strTextShow[2], strTextShow[3], 
strTextShow[4], Tree
+                  .getMembers(this, TreeData.getTreeOrg(this, 
vars.getClient()), strOrg), Utility
+                  .getContext(this, vars, "#User_Client",
+                      "ReportInvoiceVendorDimensionalAnalysesJR"), 
strDateFrom, DateTimeData
+                  .nDaysAfter(this, strDateTo, "1"), strPartnerGroup, 
strcBpartnerId,
+              strProductCategory, strmProductId, strProducttype, 
strDateFromRef, DateTimeData
+                  .nDaysAfter(this, strDateToRef, "1"), strOrderby);
+        } catch (ServletException ex) {
+          myMessage = Utility.translateError(this, vars, vars.getLanguage(), 
ex.getMessage());
+        }
+      } else {
+        try {
+          data = 
ReportInvoiceVendorDimensionalAnalysesJRData.selectNoComparative(this,
+              strCurrencyId, strTextShow[0], strTextShow[1], strTextShow[2], 
strTextShow[3],
+              strTextShow[4], Tree.getMembers(this, TreeData.getTreeOrg(this, 
vars.getClient()),
+                  strOrg), Utility.getContext(this, vars, "#User_Client",
+                  "ReportInvoiceVendorDimensionalAnalysesJR"), strDateFrom, 
DateTimeData
+                  .nDaysAfter(this, strDateTo, "1"), strPartnerGroup, 
strcBpartnerId,
+              strProductCategory, strmProductId, strProducttype, strOrderby);
+        } catch (ServletException ex) {
+          myMessage = Utility.translateError(this, vars, vars.getLanguage(), 
ex.getMessage());
+        }
       }
     }

------------------------------------------------------------------------------
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

Reply via email to