details: /erp/stable/2.50/rev/23da11ecd5a4
changeset: 9405:23da11ecd5a4
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Wed May 04 17:16:38 2011 +0200
summary: Fixes issue 16183: Wrong size of letters in the Payment Report
details: /erp/stable/2.50/rev/a5f0c0854963
changeset: 9406:a5f0c0854963
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Thu May 05 08:48:29 2011 +0200
summary: fixes issue 16559: When setting project in Purchase Invoice, payment
terms and form of payment fields should not be modified
details: /erp/stable/2.50/rev/5faf0ae12810
changeset: 9407:5faf0ae12810
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Thu May 05 11:13:43 2011 +0200
summary: fises issue 16992: Wrong organization in lines created using Create
Lines From
diffstat:
src-db/database/sourcedata/AD_TEXTINTERFACES.xml |
88 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java |
439 +++---
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java |
40 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Order_Project.java |
41 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.jrxml |
14 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_BankAcc.jrxml |
621 ++++++---
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP.jrxml |
636 ++++++---
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP_BankAcc.jrxml |
514 +++++--
8 files changed, 1469 insertions(+), 924 deletions(-)
diffs (truncated from 4289 to 300 lines):
diff -r 394979a9522f -r 5faf0ae12810
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed May 04 18:14:38
2011 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu May 05 11:13:43
2011 +0200
@@ -18584,6 +18584,17 @@
<!--61DE54F293FD475BBFB42472E73EE30F-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--61DE54F293FD475BBFB42472E73EE30F--></AD_TEXTINTERFACES>
+<!--624A507A3F974756A2EFA480F90BE5F0--><AD_TEXTINTERFACES>
+<!--624A507A3F974756A2EFA480F90BE5F0-->
<AD_TEXTINTERFACES_ID><![CDATA[624A507A3F974756A2EFA480F90BE5F0]]></AD_TEXTINTERFACES_ID>
+<!--624A507A3F974756A2EFA480F90BE5F0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--624A507A3F974756A2EFA480F90BE5F0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--624A507A3F974756A2EFA480F90BE5F0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--624A507A3F974756A2EFA480F90BE5F0--> <TEXT><![CDATA[Cancelled]]></TEXT>
+<!--624A507A3F974756A2EFA480F90BE5F0-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP.jrxml]]></FILENAME>
+<!--624A507A3F974756A2EFA480F90BE5F0--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--624A507A3F974756A2EFA480F90BE5F0-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--624A507A3F974756A2EFA480F90BE5F0--></AD_TEXTINTERFACES>
+
<!--62B7C7033E04DD2CE040007F01017009--><AD_TEXTINTERFACES>
<!--62B7C7033E04DD2CE040007F01017009-->
<AD_TEXTINTERFACES_ID><![CDATA[62B7C7033E04DD2CE040007F01017009]]></AD_TEXTINTERFACES_ID>
<!--62B7C7033E04DD2CE040007F01017009-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18705,17 +18716,6 @@
<!--69B61F0276891955E040007F01017873-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--69B61F0276891955E040007F01017873--></AD_TEXTINTERFACES>
-<!--69B62064DB9888B9E040007F010178C7--><AD_TEXTINTERFACES>
-<!--69B62064DB9888B9E040007F010178C7-->
<AD_TEXTINTERFACES_ID><![CDATA[69B62064DB9888B9E040007F010178C7]]></AD_TEXTINTERFACES_ID>
-<!--69B62064DB9888B9E040007F010178C7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--69B62064DB9888B9E040007F010178C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--69B62064DB9888B9E040007F010178C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--69B62064DB9888B9E040007F010178C7--> <TEXT><![CDATA[cancelled]]></TEXT>
-<!--69B62064DB9888B9E040007F010178C7-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_BankAcc.jrxml]]></FILENAME>
-<!--69B62064DB9888B9E040007F010178C7--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--69B62064DB9888B9E040007F010178C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--69B62064DB9888B9E040007F010178C7--></AD_TEXTINTERFACES>
-
<!--69B62064DB9988B9E040007F010178C7--><AD_TEXTINTERFACES>
<!--69B62064DB9988B9E040007F010178C7-->
<AD_TEXTINTERFACES_ID><![CDATA[69B62064DB9988B9E040007F010178C7]]></AD_TEXTINTERFACES_ID>
<!--69B62064DB9988B9E040007F010178C7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18925,17 +18925,6 @@
<!--69B62064DBAB88B9E040007F010178C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--69B62064DBAB88B9E040007F010178C7--></AD_TEXTINTERFACES>
-<!--69B62064DBAC88B9E040007F010178C7--><AD_TEXTINTERFACES>
-<!--69B62064DBAC88B9E040007F010178C7-->
<AD_TEXTINTERFACES_ID><![CDATA[69B62064DBAC88B9E040007F010178C7]]></AD_TEXTINTERFACES_ID>
-<!--69B62064DBAC88B9E040007F010178C7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--69B62064DBAC88B9E040007F010178C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--69B62064DBAC88B9E040007F010178C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--69B62064DBAC88B9E040007F010178C7--> <TEXT><![CDATA[cancelled]]></TEXT>
-<!--69B62064DBAC88B9E040007F010178C7-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP_BankAcc.jrxml]]></FILENAME>
-<!--69B62064DBAC88B9E040007F010178C7--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--69B62064DBAC88B9E040007F010178C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--69B62064DBAC88B9E040007F010178C7--></AD_TEXTINTERFACES>
-
<!--69B62064DBAD88B9E040007F010178C7--><AD_TEXTINTERFACES>
<!--69B62064DBAD88B9E040007F010178C7-->
<AD_TEXTINTERFACES_ID><![CDATA[69B62064DBAD88B9E040007F010178C7]]></AD_TEXTINTERFACES_ID>
<!--69B62064DBAD88B9E040007F010178C7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19046,17 +19035,6 @@
<!--69B62064DBB688B9E040007F010178C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--69B62064DBB688B9E040007F010178C7--></AD_TEXTINTERFACES>
-<!--69B62064DBB788B9E040007F010178C7--><AD_TEXTINTERFACES>
-<!--69B62064DBB788B9E040007F010178C7-->
<AD_TEXTINTERFACES_ID><![CDATA[69B62064DBB788B9E040007F010178C7]]></AD_TEXTINTERFACES_ID>
-<!--69B62064DBB788B9E040007F010178C7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--69B62064DBB788B9E040007F010178C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--69B62064DBB788B9E040007F010178C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--69B62064DBB788B9E040007F010178C7--> <TEXT><![CDATA[cancelled]]></TEXT>
-<!--69B62064DBB788B9E040007F010178C7-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.jrxml]]></FILENAME>
-<!--69B62064DBB788B9E040007F010178C7--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--69B62064DBB788B9E040007F010178C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--69B62064DBB788B9E040007F010178C7--></AD_TEXTINTERFACES>
-
<!--69B62064DBB888B9E040007F010178C7--><AD_TEXTINTERFACES>
<!--69B62064DBB888B9E040007F010178C7-->
<AD_TEXTINTERFACES_ID><![CDATA[69B62064DBB888B9E040007F010178C7]]></AD_TEXTINTERFACES_ID>
<!--69B62064DBB888B9E040007F010178C7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19123,17 +19101,6 @@
<!--69B62064DBBD88B9E040007F010178C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--69B62064DBBD88B9E040007F010178C7--></AD_TEXTINTERFACES>
-<!--69B62064DBBE88B9E040007F010178C7--><AD_TEXTINTERFACES>
-<!--69B62064DBBE88B9E040007F010178C7-->
<AD_TEXTINTERFACES_ID><![CDATA[69B62064DBBE88B9E040007F010178C7]]></AD_TEXTINTERFACES_ID>
-<!--69B62064DBBE88B9E040007F010178C7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--69B62064DBBE88B9E040007F010178C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--69B62064DBBE88B9E040007F010178C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--69B62064DBBE88B9E040007F010178C7--> <TEXT><![CDATA[cancelled]]></TEXT>
-<!--69B62064DBBE88B9E040007F010178C7-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP.jrxml]]></FILENAME>
-<!--69B62064DBBE88B9E040007F010178C7--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--69B62064DBBE88B9E040007F010178C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--69B62064DBBE88B9E040007F010178C7--></AD_TEXTINTERFACES>
-
<!--69B62064DBBF88B9E040007F010178C7--><AD_TEXTINTERFACES>
<!--69B62064DBBF88B9E040007F010178C7-->
<AD_TEXTINTERFACES_ID><![CDATA[69B62064DBBF88B9E040007F010178C7]]></AD_TEXTINTERFACES_ID>
<!--69B62064DBBF88B9E040007F010178C7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19981,6 +19948,17 @@
<!--706C277695FF4A929E64C20FDA703EEE-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--706C277695FF4A929E64C20FDA703EEE--></AD_TEXTINTERFACES>
+<!--71288415050B47B4BCEA003B81637916--><AD_TEXTINTERFACES>
+<!--71288415050B47B4BCEA003B81637916-->
<AD_TEXTINTERFACES_ID><![CDATA[71288415050B47B4BCEA003B81637916]]></AD_TEXTINTERFACES_ID>
+<!--71288415050B47B4BCEA003B81637916-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--71288415050B47B4BCEA003B81637916--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--71288415050B47B4BCEA003B81637916--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--71288415050B47B4BCEA003B81637916--> <TEXT><![CDATA[Cancelled]]></TEXT>
+<!--71288415050B47B4BCEA003B81637916-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_BankAcc.jrxml]]></FILENAME>
+<!--71288415050B47B4BCEA003B81637916--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--71288415050B47B4BCEA003B81637916-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--71288415050B47B4BCEA003B81637916--></AD_TEXTINTERFACES>
+
<!--745BED8287B445A4A7E6D7ABEFB14951--><AD_TEXTINTERFACES>
<!--745BED8287B445A4A7E6D7ABEFB14951-->
<AD_TEXTINTERFACES_ID><![CDATA[745BED8287B445A4A7E6D7ABEFB14951]]></AD_TEXTINTERFACES_ID>
<!--745BED8287B445A4A7E6D7ABEFB14951-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21882,6 +21860,17 @@
<!--A5BF85B630DC49E59C93045CC8E994C5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--A5BF85B630DC49E59C93045CC8E994C5--></AD_TEXTINTERFACES>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6--><AD_TEXTINTERFACES>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6-->
<AD_TEXTINTERFACES_ID><![CDATA[A6C96EAE55E145AFB6B16F32D2BC76D6]]></AD_TEXTINTERFACES_ID>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6--> <TEXT><![CDATA[Cancelled]]></TEXT>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP_BankAcc.jrxml]]></FILENAME>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A6C96EAE55E145AFB6B16F32D2BC76D6--></AD_TEXTINTERFACES>
+
<!--A6D474BA1F7E40D1BB40DB73A393B864--><AD_TEXTINTERFACES>
<!--A6D474BA1F7E40D1BB40DB73A393B864-->
<AD_TEXTINTERFACES_ID><![CDATA[A6D474BA1F7E40D1BB40DB73A393B864]]></AD_TEXTINTERFACES_ID>
<!--A6D474BA1F7E40D1BB40DB73A393B864-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22267,6 +22256,17 @@
<!--DA5CFE5AA7774C44BC4BED39944402DD-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--DA5CFE5AA7774C44BC4BED39944402DD--></AD_TEXTINTERFACES>
+<!--DA79A8F901A349879E6BA1CF377D5A33--><AD_TEXTINTERFACES>
+<!--DA79A8F901A349879E6BA1CF377D5A33-->
<AD_TEXTINTERFACES_ID><![CDATA[DA79A8F901A349879E6BA1CF377D5A33]]></AD_TEXTINTERFACES_ID>
+<!--DA79A8F901A349879E6BA1CF377D5A33-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DA79A8F901A349879E6BA1CF377D5A33--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DA79A8F901A349879E6BA1CF377D5A33--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DA79A8F901A349879E6BA1CF377D5A33--> <TEXT><![CDATA[Cancelled]]></TEXT>
+<!--DA79A8F901A349879E6BA1CF377D5A33-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.jrxml]]></FILENAME>
+<!--DA79A8F901A349879E6BA1CF377D5A33--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--DA79A8F901A349879E6BA1CF377D5A33-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DA79A8F901A349879E6BA1CF377D5A33--></AD_TEXTINTERFACES>
+
<!--DB6ED88B022A4803A61DD0096917F972--><AD_TEXTINTERFACES>
<!--DB6ED88B022A4803A61DD0096917F972-->
<AD_TEXTINTERFACES_ID><![CDATA[DB6ED88B022A4803A61DD0096917F972]]></AD_TEXTINTERFACES_ID>
<!--DB6ED88B022A4803A61DD0096917F972-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 394979a9522f -r 5faf0ae12810
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Wed May
04 18:14:38 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Thu May
05 11:13:43 2011 +0200
@@ -150,8 +150,8 @@
final String strKey = vars.getRequiredStringParameter("inpKey");
final String strTableId = vars.getStringParameter("inpTableId");
final String strProcessId = vars.getStringParameter("inpProcessId");
- final String strPath = vars.getStringParameter("inpPath",
- strDireccion + request.getServletPath());
+ final String strPath = vars.getStringParameter("inpPath", strDireccion
+ + request.getServletPath());
final String strWindowId = vars.getStringParameter("inpWindowId");
final String strTabName = vars.getStringParameter("inpTabName");
final String strDateInvoiced =
vars.getStringParameter("inpDateInvoiced");
@@ -307,9 +307,9 @@
final XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
"org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank").createXmlDocument();
- final int numRows = Integer.valueOf(CreateFromBankData.countRows(this,
- Utility.getContext(this, vars, "#User_Client", strWindowId),
- Utility.getContext(this, vars, "#User_Org", strWindowId),
strcBPartner, strPaymentRule,
+ final int numRows = Integer.valueOf(CreateFromBankData.countRows(this,
Utility.getContext(this,
+ vars, "#User_Client", strWindowId), Utility
+ .getContext(this, vars, "#User_Org", strWindowId), strcBPartner,
strPaymentRule,
strPlannedDateFrom, strPlannedDateTo, strAmountFrom, strAmountTo,
strIsReceipt, strBank,
strOrg, strCharge, strDocumentNo, strStatus));
final int maxRows =
Integer.valueOf(vars.getSessionValue("#RECORDRANGEINFO"));
@@ -327,19 +327,19 @@
// different limit/offset syntax in oracle and postgresql
if (this.myPool.getRDBMS().equalsIgnoreCase("ORACLE")) {
- data = CreateFromBankData.select(this,
vars.getSessionValue("#AD_SqlDateFormat"),
- vars.getLanguage(), strStatementDate, "ROWNUM",
- Utility.getContext(this, vars, "#User_Client", strWindowId),
- Utility.getContext(this, vars, "#User_Org", strWindowId),
strcBPartner, strPaymentRule,
- strPlannedDateFrom, strPlannedDateTo, strAmountFrom, strAmountTo,
strIsReceipt, strBank,
- strOrg, strCharge, strDocumentNo, strStatus,
String.valueOf(maxRows), null);
+ data = CreateFromBankData.select(this,
vars.getSessionValue("#AD_SqlDateFormat"), vars
+ .getLanguage(), strStatementDate, "ROWNUM", Utility.getContext(this,
vars,
+ "#User_Client", strWindowId), Utility.getContext(this, vars,
"#User_Org", strWindowId),
+ strcBPartner, strPaymentRule, strPlannedDateFrom, strPlannedDateTo,
strAmountFrom,
+ strAmountTo, strIsReceipt, strBank, strOrg, strCharge,
strDocumentNo, strStatus, String
+ .valueOf(maxRows), null);
} else {
- data = CreateFromBankData.select(this,
vars.getSessionValue("#AD_SqlDateFormat"),
- vars.getLanguage(), strStatementDate, "1",
- Utility.getContext(this, vars, "#User_Client", strWindowId),
- Utility.getContext(this, vars, "#User_Org", strWindowId),
strcBPartner, strPaymentRule,
- strPlannedDateFrom, strPlannedDateTo, strAmountFrom, strAmountTo,
strIsReceipt, strBank,
- strOrg, strCharge, strDocumentNo, strStatus, null,
String.valueOf(maxRows));
+ data = CreateFromBankData.select(this,
vars.getSessionValue("#AD_SqlDateFormat"), vars
+ .getLanguage(), strStatementDate, "1", Utility.getContext(this,
vars, "#User_Client",
+ strWindowId), Utility.getContext(this, vars, "#User_Org",
strWindowId), strcBPartner,
+ strPaymentRule, strPlannedDateFrom, strPlannedDateTo, strAmountFrom,
strAmountTo,
+ strIsReceipt, strBank, strOrg, strCharge, strDocumentNo, strStatus,
null, String
+ .valueOf(maxRows));
}
xmlDocument.setParameter("calendar", vars.getLanguage().substring(0, 2));
@@ -365,9 +365,9 @@
try {
ComboTableData comboTableData = new ComboTableData(vars, this, "LIST",
"",
- "All_Payment Rule", "",
- Utility.getContext(this, vars, "#AccessibleOrgTree", "CreateFrom"),
Utility.getContext(
- this, vars, "#User_Client", "CreateFrom"), 0);
+ "All_Payment Rule", "", Utility
+ .getContext(this, vars, "#AccessibleOrgTree", "CreateFrom"),
Utility.getContext(this,
+ vars, "#User_Client", "CreateFrom"), 0);
Utility.fillSQLParameters(this, vars, null, comboTableData,
"CreateFrom", strPaymentRule);
xmlDocument.setData("reportPaymentRule", "liststructure",
comboTableData.select(false));
comboTableData = null;
@@ -378,13 +378,13 @@
xmlDocument.setParameter("cbpartnerId_DES",
CreateFromBankData.bpartner(this, strcBPartner));
xmlDocument.setParameter("plannedDateFrom", strPlannedDateFrom);
- xmlDocument.setParameter("plannedDateFromdisplayFormat",
- vars.getSessionValue("#AD_SqlDateFormat"));
+ xmlDocument.setParameter("plannedDateFromdisplayFormat", vars
+ .getSessionValue("#AD_SqlDateFormat"));
xmlDocument
.setParameter("plannedDateFromsaveFormat",
vars.getSessionValue("#AD_SqlDateFormat"));
xmlDocument.setParameter("plannedDateTo", strPlannedDateTo);
- xmlDocument.setParameter("plannedDateTodisplayFormat",
- vars.getSessionValue("#AD_SqlDateFormat"));
+ xmlDocument.setParameter("plannedDateTodisplayFormat", vars
+ .getSessionValue("#AD_SqlDateFormat"));
xmlDocument.setParameter("plannedDateTosaveFormat",
vars.getSessionValue("#AD_SqlDateFormat"));
xmlDocument.setParameter("amountFrom", strAmountFrom);
{
@@ -415,8 +415,8 @@
try {
ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "AD_Org_ID", "",
- "", Utility.getContext(this, vars, "#AccessibleOrgTree",
strWindowId),
- Utility.getContext(this, vars, "#User_Client", strWindowId), 0);
+ "", Utility.getContext(this, vars, "#AccessibleOrgTree",
strWindowId), Utility
+ .getContext(this, vars, "#User_Client", strWindowId), 0);
Utility.fillSQLParameters(this, vars, null, comboTableData, strWindowId,
strOrg);
xmlDocument.setData("reportAD_Org_ID", "liststructure",
comboTableData.select(false));
comboTableData = null;
@@ -470,42 +470,42 @@
if (strShipment.equals("")) {
if (vars.getLanguage().equals("en_US")) {
if (isSOTrx.equals("Y"))
- data = CreateFromInvoiceData.selectFromPOSOTrx(this,
vars.getLanguage(),
- Utility.getContext(this, vars, "#User_Client", strWindowId),
- Utility.getContext(this, vars, "#User_Org", strWindowId),
strPO);
+ data = CreateFromInvoiceData.selectFromPOSOTrx(this,
vars.getLanguage(), Utility
+ .getContext(this, vars, "#User_Client", strWindowId),
Utility.getContext(this,
+ vars, "#User_Org", strWindowId), strPO);
else
- data = CreateFromInvoiceData.selectFromPO(this, vars.getLanguage(),
- Utility.getContext(this, vars, "#User_Client", strWindowId),
- Utility.getContext(this, vars, "#User_Org", strWindowId),
strPO);
+ data = CreateFromInvoiceData.selectFromPO(this,
vars.getLanguage(), Utility.getContext(
+ this, vars, "#User_Client", strWindowId),
Utility.getContext(this, vars,
+ "#User_Org", strWindowId), strPO);
} else {
if (isSOTrx.equals("Y"))
- data = CreateFromInvoiceData.selectFromPOTrlSOTrx(this,
vars.getLanguage(),
- Utility.getContext(this, vars, "#User_Client", strWindowId),
- Utility.getContext(this, vars, "#User_Org", strWindowId),
strPO);
+ data = CreateFromInvoiceData.selectFromPOTrlSOTrx(this,
vars.getLanguage(), Utility
+ .getContext(this, vars, "#User_Client", strWindowId),
Utility.getContext(this,
+ vars, "#User_Org", strWindowId), strPO);
else
- data = CreateFromInvoiceData.selectFromPOTrl(this,
vars.getLanguage(),
- Utility.getContext(this, vars, "#User_Client", strWindowId),
- Utility.getContext(this, vars, "#User_Org", strWindowId),
strPO);
+ data = CreateFromInvoiceData.selectFromPOTrl(this,
vars.getLanguage(), Utility
+ .getContext(this, vars, "#User_Client", strWindowId),
Utility.getContext(this,
+ vars, "#User_Org", strWindowId), strPO);
}
} else {
if (vars.getLanguage().equals("en_US")) {
if (isSOTrx.equals("Y"))
- data = CreateFromInvoiceData.selectFromShipmentSOTrx(this,
vars.getLanguage(),
- Utility.getContext(this, vars, "#User_Client", strWindowId),
- Utility.getContext(this, vars, "#User_Org", strWindowId),
strShipment);
+ data = CreateFromInvoiceData.selectFromShipmentSOTrx(this,
vars.getLanguage(), Utility
+ .getContext(this, vars, "#User_Client", strWindowId),
Utility.getContext(this,
+ vars, "#User_Org", strWindowId), strShipment);
else
- data = CreateFromInvoiceData.selectFromShipment(this,
vars.getLanguage(),
- Utility.getContext(this, vars, "#User_Client", strWindowId),
- Utility.getContext(this, vars, "#User_Org", strWindowId),
strShipment);
+ data = CreateFromInvoiceData.selectFromShipment(this,
vars.getLanguage(), Utility
+ .getContext(this, vars, "#User_Client", strWindowId),
Utility.getContext(this,
+ vars, "#User_Org", strWindowId), strShipment);
} else {
if (isSOTrx.equals("Y"))
data = CreateFromInvoiceData.selectFromShipmentTrlSOTrx(this,
vars.getLanguage(),
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
