Related to issue 15092: code review.
authorMikel Irurita <mikel.irurita@openbravo.com>
Tue, 24 Apr 2012 18:16:02 +0200
changeset 16196 b1c45effac4b
parent 16195 2580ff5d8c68
child 16197 a1ae084a5dfb
Related to issue 15092: code review.
Add validation 'AD_Org (without *)' for Orders Awaiting Delivery and Print Invoices.
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java
modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java
src/org/openbravo/erpCommon/ad_process/PrintInvoices.java
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java	Tue Apr 24 12:44:32 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java	Tue Apr 24 18:16:02 2012 +0200
@@ -148,7 +148,7 @@
     xmlDocument.setParameter("inpChkIsReceipt", strIsReceipt);
 
     String newOrg = strOrganizationId;
-    if (null != (strOrganizationId)) {
+    if (null != strOrganizationId) {
       xmlDocument.setParameter("orgId", strOrganizationId);
     }
     try {
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java	Tue Apr 24 12:44:32 2012 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java	Tue Apr 24 18:16:02 2012 +0200
@@ -154,8 +154,9 @@
     xmlDocument.setParameter("adOrgId", strCOrgId);
     try {
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
-          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "PrintInvoices"),
-          Utility.getContext(this, vars, "#User_Client", "ReportOrderNotShipped"), 0);
+          "49DC1D6F086945AB82F84C66F5F13F16", Utility.getContext(this, vars, "#AccessibleOrgTree",
+              "ReportOrderNotShipped"), Utility.getContext(this, vars, "#User_Client",
+              "ReportOrderNotShipped"), 0);
       Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportOrderNotShipped", "");
       xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
       comboTableData = null;
--- a/src/org/openbravo/erpCommon/ad_process/PrintInvoices.java	Tue Apr 24 12:44:32 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/PrintInvoices.java	Tue Apr 24 18:16:02 2012 +0200
@@ -83,8 +83,8 @@
 
     try {
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
-          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "PrintInvoices"),
-          Utility.getContext(this, vars, "#User_Client", "PrintInvoices"), 0);
+          "49DC1D6F086945AB82F84C66F5F13F16", Utility.getContext(this, vars, "#AccessibleOrgTree",
+              "PrintInvoices"), Utility.getContext(this, vars, "#User_Client", "PrintInvoices"), 0);
       Utility.fillSQLParameters(this, vars, null, comboTableData, "PrintInvoices", "");
       xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
       comboTableData = null;