details:   https://code.openbravo.com/erp/devel/pi/rev/9f8588c74edc
changeset: 29254:9f8588c74edc
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Wed Apr 20 13:30:16 2016 +0200
summary:   Fixes Issue 18273. Adds ability to filter Payment Report by
Sales Representative.

Adapts code to be able to filter the data based on Sales Rep.

details:   https://code.openbravo.com/erp/devel/pi/rev/f7808366cd8b
changeset: 29255:f7808366cd8b
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Tue Apr 19 13:47:59 2016 +0200
summary:   Fixes Issue 18271. Adds payment method field to Report output.

details:   https://code.openbravo.com/erp/devel/pi/rev/a4c45ff02eb9
changeset: 29256:a4c45ff02eb9
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Wed Apr 20 09:56:17 2016 +0200
summary:   Related to Issue 18271. Related to Issue 18273. Export of
AD_TEXTINTERFACES.

diffstat:

 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
                                        |   22 +
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
       |   32 +-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
       |   38 ++-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml
        |    8 +
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
    |   46 ++-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
 |  109 +++++---
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml
   |  134 ++++++---
 7 files changed, 272 insertions(+), 117 deletions(-)

diffs (truncated from 1160 to 300 lines):

diff -r 46b75b28bc64 -r a4c45ff02eb9 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- 
a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
    Tue Apr 19 13:58:01 2016 +0200
+++ 
b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
    Wed Apr 20 09:56:17 2016 +0200
@@ -715,6 +715,17 @@
 <!--AC44B03FF40047059E663CEB9CF49A5A-->  
<AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--AC44B03FF40047059E663CEB9CF49A5A--></AD_TEXTINTERFACES>
 
+<!--AE86D09F82DD4588AB57CBF2004F2773--><AD_TEXTINTERFACES>
+<!--AE86D09F82DD4588AB57CBF2004F2773-->  
<AD_TEXTINTERFACES_ID><![CDATA[AE86D09F82DD4588AB57CBF2004F2773]]></AD_TEXTINTERFACES_ID>
+<!--AE86D09F82DD4588AB57CBF2004F2773-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AE86D09F82DD4588AB57CBF2004F2773-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AE86D09F82DD4588AB57CBF2004F2773-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AE86D09F82DD4588AB57CBF2004F2773-->  <TEXT><![CDATA[Payment 
Method]]></TEXT>
+<!--AE86D09F82DD4588AB57CBF2004F2773-->  
<FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
+<!--AE86D09F82DD4588AB57CBF2004F2773-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AE86D09F82DD4588AB57CBF2004F2773-->  
<AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AE86D09F82DD4588AB57CBF2004F2773--></AD_TEXTINTERFACES>
+
 <!--AF049D5097F14A79E040007F010149FB--><AD_TEXTINTERFACES>
 <!--AF049D5097F14A79E040007F010149FB-->  
<AD_TEXTINTERFACES_ID><![CDATA[AF049D5097F14A79E040007F010149FB]]></AD_TEXTINTERFACES_ID>
 <!--AF049D5097F14A79E040007F010149FB-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -814,6 +825,17 @@
 <!--AFBBE094BB59D031E040007F01013B9F-->  
<AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--AFBBE094BB59D031E040007F01013B9F--></AD_TEXTINTERFACES>
 
+<!--B1B0646B7C574424953A5A25D3353041--><AD_TEXTINTERFACES>
+<!--B1B0646B7C574424953A5A25D3353041-->  
<AD_TEXTINTERFACES_ID><![CDATA[B1B0646B7C574424953A5A25D3353041]]></AD_TEXTINTERFACES_ID>
+<!--B1B0646B7C574424953A5A25D3353041-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B1B0646B7C574424953A5A25D3353041-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B1B0646B7C574424953A5A25D3353041-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B1B0646B7C574424953A5A25D3353041-->  <TEXT><![CDATA[Sales 
Representative]]></TEXT>
+<!--B1B0646B7C574424953A5A25D3353041-->  
<FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME>
+<!--B1B0646B7C574424953A5A25D3353041-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--B1B0646B7C574424953A5A25D3353041-->  
<AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--B1B0646B7C574424953A5A25D3353041--></AD_TEXTINTERFACES>
+
 <!--B973837A2C334DC49973CEE4179F43B7--><AD_TEXTINTERFACES>
 <!--B973837A2C334DC49973CEE4179F43B7-->  
<AD_TEXTINTERFACES_ID><![CDATA[B973837A2C334DC49973CEE4179F43B7]]></AD_TEXTINTERFACES_ID>
 <!--B973837A2C334DC49973CEE4179F43B7-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 46b75b28bc64 -r a4c45ff02eb9 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
--- 
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
   Tue Apr 19 13:58:01 2016 +0200
+++ 
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
   Wed Apr 20 09:56:17 2016 +0200
@@ -23,7 +23,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>Payment Report</title>
     <link rel="shortcut icon" href="../../../../../web/images/favicon.ico" 
type="image/x-icon" />
-    <link rel="stylesheet" type="text/css" 
href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS" />
+    <link rel="stylesheet" type="text/css" 
href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS" /> 
      
     <script language="JavaScript" type="text/javascript" id="paramDirectory">
       var baseDirectory = "../../../../../web/";
@@ -910,8 +910,18 @@
                     </select>
                   </td>
                 </tr>
-                
-                
+                <tr>
+                  <td class="TitleCell">
+                    <span class="LabelText">Sales Representative</span>
+                  </td>
+                  <td class="Combo_ContentCell" colspan="2">
+                    <select name="inpSalesrepId" id="paramSalesrepId" 
class="Combo Combo_TwoCells_width">
+                      <option value=""> <div 
id="reportSalesRep_ID"></div></option>
+                    </select>
+                  </td>
+                  <td class="ContentCell"></td>
+-                  <td class="ContentCell"></td>
+                </tr>
                 <tr>
                   <td class="TitleCell"><span class="LabelText">Payment 
Method</span></td>
                   <td class="Combo_ContentCell" colspan="2">
@@ -1174,7 +1184,7 @@
                   </td>
                   <td class="ContentCell"></td>
                   <td class="ContentCell"></td>
-                  <td class="ContentCell"></td>
+-                 <td class="ContentCell"></td>
                 </tr>
               <table class="Main_Client_TableEdition">
                   <tr>
@@ -1184,7 +1194,7 @@
                       <table border="0" cellspacing="0" cellpadding="0" 
width="90%" class="DataGrid_Header_Table DataGrid_Body_Table" 
style="table-layout: auto;">
                         <div id="sectionStatus">
                           <tr class="DataGrid_Body_Row">
-                            <th colspan="17"  class="DataGrid_Header_Cell" 
style="text-align:left">Status<span>:&nbsp;</span>
+                            <th colspan="18"  class="DataGrid_Header_Cell" 
style="text-align:left">Status<span>:&nbsp;</span>
                             <span id="fieldStatus">xxStatusName</span></th>
                           </tr>
                     
@@ -1196,6 +1206,7 @@
                             <th width="10%" class="DataGrid_Header_Cell">Sales 
Person</th>
                             <th width="10%" 
class="DataGrid_Header_Cell">Invoice Number</th>
                             <th width="10%" 
class="DataGrid_Header_Cell">Invoice Date</th>
+                            <th width="10%" 
class="DataGrid_Header_Cell">Payment Method</th>
                             <th width="10%" 
class="DataGrid_Header_Cell">Payment</th>
                             <th width="10%" class="DataGrid_Header_Cell">Due 
Date</th>
                             <th width="10%" 
class="DataGrid_Header_Cell">Expected Date</th>
@@ -1223,6 +1234,7 @@
                               </td>
                                 
                               <td width="10%" id="fieldInvoiceDate" 
class="DataGrid_Body_Cell">xx14500.34</td>
+                              <td width="10%" id="fieldPaymentMethod" 
class="DataGrid_Body_Cell">xx14500.34</td>
                               <td width="10%" 
class="DataGrid_Body_Cell_Amount">
                                 <a href="#" onclick="validate(); 
openPaymentTab('yy', 'zz');" onmouseover="window.status='Payment Report';return 
true;" onmouseout="window.status='';return true;" class="LabelLink" 
id="fieldPaymLink" style="xx" title="xx">
                                   <span id="fieldPayment">xx14500.34</span>
@@ -1242,7 +1254,7 @@
                           </div>
                           <tr class="DataGrid_Body_Row">
                             <th width="10%" class="DataGrid_Header_Cell"><span 
class="Bold">Sub Total (Status)</span></th>
-                            <th width="100%" 
class="DataGrid_Header_Cell_Amount" colspan="13"></th>
+                            <th width="100%" 
class="DataGrid_Header_Cell_Amount" colspan="14"></th>
                             <th width="10%" 
class="DataGrid_Header_Cell_Amount" style="text-align:right"><span class="Bold" 
id="subtotalBaseAmount"></span></th>
                             <th width="10%" class="DataGrid_Header_Cell"><span 
class="Bold" id="fieldBaseCurrency"></span></th>
                             <th width="100%" 
class="DataGrid_Header_Cell_Amount"></th>
@@ -1257,7 +1269,7 @@
                       <table cellspacing="0" cellpadding="0" width="90%" 
class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;">
                           <div id="sectionGroupCrit">
                             <tr class="DataGrid_Body_Row">
-                              <th colspan="13" class="DataGrid_Header_Cell" 
style="text-align:left">Grouping Criteria<span>:&nbsp;</span>
+                              <th colspan="15" class="DataGrid_Header_Cell" 
style="text-align:left">Grouping Criteria<span>:&nbsp;</span>
                                 <span 
id="fieldGroupCritName">xxGroupCritName</span></th>
                              <!-- <th class="DataGrid_Header_Cell">Balance</th>
                               <th class="DataGrid_Header_Cell_Amount"><span 
id="sumBalanceAmount"></span></th>
@@ -1266,7 +1278,7 @@
                             </tr>
                             <div id="sectionStatus2">
                                 <tr class="DataGrid_Body_Row">
-                                  <th colspan="17" 
class="DataGrid_Header_Cell" style="text-align:left">Status<span>:&nbsp;</span>
+                                  <th colspan="18" 
class="DataGrid_Header_Cell" style="text-align:left">Status<span>:&nbsp;</span>
                                 <span 
id="fieldStatus2">xxStatusName</span></th>
                                 </tr>
                         
@@ -1277,6 +1289,7 @@
                                     <th width="10%" 
class="DataGrid_Header_Cell">Sales Person</th>
                                     <th width="10%" 
class="DataGrid_Header_Cell">Invoice Number</th>
                                     <th width="10%" 
class="DataGrid_Header_Cell">Invoice Date</th>
+                                    <th width="10%" 
class="DataGrid_Header_Cell">Payment Method</th>
                                     <th width="10%" 
class="DataGrid_Header_Cell">Payment</th>
                                     <th width="10%" 
class="DataGrid_Header_Cell">Due Date</th>
                                     <th width="10%" 
class="DataGrid_Header_Cell">Expected Date</th>
@@ -1303,6 +1316,7 @@
                                       <span id="fieldInvoiceNumber2_nolink" 
class="DataGrid_Body_Cell" style="xx">xx14500.34</span>
                                     </td>
                                     <td width="10%" id="fieldInvoiceDate2" 
class="DataGrid_Body_Cell">xx14500.34</td>
+                                    <td width="10%" id="fieldPaymentMethod" 
class="DataGrid_Body_Cell">xx14500.34</td>
                                     <td width="10%" 
class="DataGrid_Body_Cell_Amount">
                                       <a href="#" onclick="validate(); 
openPaymentTab('yy', 'zz');" onmouseover="window.status='Payment Report';return 
true;" onmouseout="window.status='';return true;" class="LabelLink" 
id="fieldPaymLink2" style="xx" title="xx">
                                         <span 
id="fieldPayment2">xx14500.34</span>
@@ -1322,7 +1336,7 @@
                                 </div>
                                 <tr class="DataGrid_Body_Row">
                                   <th width="10%" 
class="DataGrid_Header_Cell"><span class="Bold">Sub Total (Status)</span></th>
-                                  <th width="100%" 
class="DataGrid_Header_Cell_Amount" colspan="13"></th>
+                                  <th width="100%" 
class="DataGrid_Header_Cell_Amount" colspan="14"></th>
                                   <th width="10%" 
class="DataGrid_Header_Cell_Amount" style="text-align:right"><span class="Bold" 
id="subtotalBaseAmountStatus"></span></th>
                                   <th width="10%" 
class="DataGrid_Header_Cell"><span class="Bold" 
id="fieldBaseCurrency2"></span></th>
                                   <th width="100%" 
class="DataGrid_Header_Cell_Amount"></th>
diff -r 46b75b28bc64 -r a4c45ff02eb9 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
--- 
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
   Tue Apr 19 13:58:01 2016 +0200
+++ 
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
   Wed Apr 20 09:56:17 2016 +0200
@@ -93,6 +93,8 @@
           "PaymentReport|BusinessPartner", "", IsIDFilter.instance);
       String strcBPGroupIdIN = vars.getGlobalVariable("inpcBPGroupId_IN",
           "PaymentReport|BusinessPartnerCategory", "");
+      String strsalesrepId = vars.getGlobalVariable("inpSalesrepId", 
"PaymentReport|SalesRepId",
+          "", IsIDFilter.instance);
       String strcNoBusinessPartner = vars.getGlobalVariable("inpcNoBPartner",
           "PaymentReport|noBusinessPartner", "include");
       String strcProjectIdIN = vars.getInGlobalVariable("inpcProjectId_IN",
@@ -136,7 +138,8 @@
           strDocumentDateTo, strcBPartnerIdIN, strcBPGroupIdIN, 
strcNoBusinessPartner,
           strcProjectIdIN, strfinPaymSt, strPaymentMethodId, 
strFinancialAccountId, strcCurrency,
           strConvertCurrency, strConversionDate, strPaymType, strOverdue, 
strBAZero, strGroupCrit,
-          strOrdCrit, strInclPaymentUsingCredit, strPaymentDateFrom, 
strPaymentDateTo);
+          strOrdCrit, strInclPaymentUsingCredit, strPaymentDateFrom, 
strPaymentDateTo,
+          strsalesrepId);
       // DIRECT is used when coming from Aging Balance Report
     } else if (vars.commandIn("FIND", "DIRECT")) {
       String strOrg = vars.getRequestGlobalVariable("inpOrg", 
"PaymentReport|Organization");
@@ -181,6 +184,8 @@
           "PaymentReport|noBusinessPartner");
       String strcProjectIdIN = 
vars.getRequestInGlobalVariable("inpcProjectId_IN",
           "PaymentReport|Project", IsIDFilter.instance);
+      String strsalesrepId = vars.getRequestGlobalVariable("inpSalesrepId",
+          "PaymentReport|SalesRepId", IsIDFilter.instance);
       dao = new PaymentReportDao();
       String strfinPaymSt = "";
       if (vars.commandIn("FIND")) {
@@ -216,7 +221,8 @@
           strDocumentDateTo, strcBPartnerIdIN, strcBPGroupIdIN, 
strcNoBusinessPartner,
           strcProjectIdIN, strfinPaymSt, strPaymentMethodId, 
strFinancialAccountId, strcCurrency,
           strConvertCurrency, strConversionDate, strPaymType, strOverdue, 
strBAZero, strGroupCrit,
-          strOrdCrit, strInclPaymentUsingCredit, strPaymentDateFrom, 
strPaymentDateTo);
+          strOrdCrit, strInclPaymentUsingCredit, strPaymentDateFrom, 
strPaymentDateTo,
+          strsalesrepId);
     } else if (vars.commandIn("PDF", "XLS")) {
       String strOrg = vars.getRequestGlobalVariable("inpOrg", 
"PaymentReport|Organization");
       String strInclSubOrg = vars.getRequestGlobalVariable("inpInclSubOrg",
@@ -275,6 +281,8 @@
       final String strInclPaymentUsingCredit = 
vars.getStringParameter("inpInclPaymentUsingCredit",
           "N");
       vars.setSessionValue("PaymentReport|IncludePaymentUsingCredit", 
strInclPaymentUsingCredit);
+      String strsalesrepId = vars.getRequestGlobalVariable("inpSalesrepId",
+          "PaymentReport|SalesRepId", IsIDFilter.instance);
       if (vars.commandIn("PDF"))
         strOutput = "pdf";
       else if (vars.commandIn("XLS"))
@@ -285,7 +293,8 @@
           strDocumentDateTo, strcBPartnerIdIN, strcBPGroupIdIN, 
strcNoBusinessPartner,
           strcProjectIdIN, strfinPaymSt, strPaymentMethodId, 
strFinancialAccountId, strcCurrency,
           strConvertCurrency, strConversionDate, strPaymType, strOverdue, 
strBAZero, strOutput,
-          strGroupCrit, strOrdCrit, strInclPaymentUsingCredit, 
strPaymentDateFrom, strPaymentDateTo);
+          strGroupCrit, strOrdCrit, strInclPaymentUsingCredit, 
strPaymentDateFrom,
+          strPaymentDateTo, strsalesrepId);
 
     } else if (vars.commandIn("LINK")) {
       String strTableId = vars.getRequiredStringParameter("inpAdTableId", 
IsIDFilter.instance);
@@ -317,7 +326,8 @@
       String strFinancialAccountId, String strcCurrency, String 
strConvertCurrency,
       String strConversionDate, String strPaymType, String strOverdue, String 
strBAZero,
       String strGroupCrit, String strOrdCrit, String strInclPaymentUsingCredit,
-      String strPaymentDateFrom, String strPaymentDateTo) throws IOException, 
ServletException {
+      String strPaymentDateFrom, String strPaymentDateTo, String 
strsalesrepId) throws IOException,
+      ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: dataSheet");
     XmlDocument xmlDocument = null;
@@ -335,7 +345,7 @@
             strPaymentMethodId, strFinancialAccountId, strcCurrency, 
strConvertCurrency,
             strConversionDate, strPaymType, strOverdue, strBAZero, 
strGroupCrit, strOrdCrit,
             strInclPaymentUsingCredit, strPaymentDateFrom, strPaymentDateTo, 
strExpectedDateFrom,
-            strExpectedDateTo, "HTML");
+            strExpectedDateTo, strsalesrepId, "HTML");
       } catch (OBException e) {
         discardAL.add("sectionGroupCrit");
         discardAL.add("sectionStatus");
@@ -721,6 +731,18 @@
     xmlDocument.setData("reportOrdCrit", "liststructure", objectListData);
     xmlDocument.setData("reportShown", "liststructure", 
PaymentReportDao.getObjectList(strOrdCrit));
 
+    xmlDocument.setParameter("salesrepId", strsalesrepId);
+    try {
+      ComboTableData comboTableData = new ComboTableData(vars, this, "TABLE", 
"SalesRep_ID",
+          "AD_User SalesRep", "", Utility.getContext(this, vars, 
"#AccessibleOrgTree",
+              "PaymentReport"), Utility.getContext(this, vars, "#User_Client", 
"PaymentReport"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, 
"PaymentReport", strsalesrepId);
+      xmlDocument.setData("reportSalesRep_ID", "liststructure", 
comboTableData.select(false));
+      comboTableData = null;
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
+
     xmlDocument.setParameter("showOneAsterisk", showAsterisk(data, "*") ? "" : 
"Display:none");
     xmlDocument.setParameter("showTwoAsterisk", showAsterisk(data, "**") ? "" 
: "Display:none");
 
@@ -757,8 +779,8 @@
       String strPaymentMethodId, String strFinancialAccountId, String 
strcCurrency,
       String strConvertCurrency, String strConversionDate, String strPaymType, 
String strOverdue,
       String strBAZero, String strOutput, String strGroupCrit, String 
strOrdCrit,
-      String strInclPaymentUsingCredit, String strPaymentDateFrom, String 
strPaymentDateTo)
-      throws IOException, ServletException {
+      String strInclPaymentUsingCredit, String strPaymentDateFrom, String 
strPaymentDateTo,
+      String strsalesrepId) throws IOException, ServletException {
 
     response.setContentType("text/html; charset=UTF-8");
 
@@ -771,7 +793,7 @@
           strPaymentMethodId, strFinancialAccountId, strcCurrency, 
strConvertCurrency,
           strConversionDate, strPaymType, strOverdue, strBAZero, strGroupCrit, 
strOrdCrit,
           strInclPaymentUsingCredit, strPaymentDateFrom, strPaymentDateTo, 
strExpectedDateFrom,
-          strExpectedDateTo, strOutput);
+          strExpectedDateTo, strsalesrepId, strOutput);
     } catch (OBException e) {
       advisePopUp(request, response, "WARNING",
           Utility.messageBD(this, "ProcessStatus-W", vars.getLanguage()),
diff -r 46b75b28bc64 -r a4c45ff02eb9 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml
--- 
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml
    Tue Apr 19 13:58:01 2016 +0200
+++ 
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml
    Wed Apr 20 09:56:17 2016 +0200
@@ -121,6 +121,10 @@
   <SUBREPORT id="reportGroupCrit" name="reportGroupCrit" 
report="org/openbravo/erpCommon/reference/List">
     <ARGUMENT name="parameterListSelected" withId="paramGroupCrit"/>
   </SUBREPORT>
+    <PARAMETER id="paramSalesrepId" name="salesrepId" attribute="value"/>
+  <SUBREPORT id="reportSalesRep_ID" name="reportSalesRep_ID" 
report="org/openbravo/erpCommon/reference/List">
+    <ARGUMENT name="parameterListSelected" withId="paramSalesrepId"/>
+  </SUBREPORT>
   <PARAMETER id="paramOrdCrit" name="ordCrit" attribute="value"/>
   <SUBREPORT id="reportOrdCrit" name="reportOrdCrit" 
report="org/openbravo/erpCommon/reference/List">
     <ARGUMENT name="parameterListSelected" withId="paramOrdCrit"/>
@@ -146,6 +150,8 @@
     <FIELD id="fieldInvoiceNumber_nolink" 
replaceCharacters="html">INVOICE_NUMBER</FIELD>
     <FIELD id="fieldInvoiceNumber_nolink" attribute="style" 
replace="xx">NOT_PAYMENT_PLAN_Y_N</FIELD>
     
+    <FIELD id="fieldPaymentMethod">PAYMENT_METHOD</FIELD>
+    
     <FIELD id="fieldInvoiceDate">INVOICE_DATE</FIELD>
     
     <FIELD id="fieldPayment" replaceCharacters="html">PAYMENT</FIELD>
@@ -186,6 +192,8 @@

------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to