[OpenbravoERP-commits] devel/pi: 2 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/068a6648be18
changeset: 15838:068a6648be18
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Fri Mar 16 11:33:34 2012 +0100
summary:   Fixes issue 0018665: Corrected call to AD_ISORGINCLUDED method.

details:   https://code.openbravo.com/erp/devel/pi/rev/549163537206
changeset: 15839:549163537206
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Fri Mar 16 11:34:23 2012 +0100
summary:   Fixes issue 0020048: Changed the validatio rule when querying 
Organizations.

diffstat:

 src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java      |  2 +-
 src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r c459bea5041f -r 549163537206 
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java
--- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java      Tue Mar 
20 11:31:24 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java      Fri Mar 
16 11:34:23 2012 +0100
@@ -402,7 +402,7 @@
     xmlDocument.setParameter("paramPriceListId", strPriceListId);
     try {
       ComboTableData comboTableData = new ComboTableData(vars, this, 
"TABLEDIR", "AD_Org_ID", "",
-          "AD_Org Trx Security validation", Utility.getContext(this, vars, 
"#User_Org",
+          "AD_Org is transactions allowed", Utility.getContext(this, vars, 
"#User_Org",
               "RequisitionToOrder"), Utility.getContext(this, vars, 
"#User_Client",
               "RequisitionToOrder"), 0);
       Utility.fillSQLParameters(this, vars, null, comboTableData, 
"RequisitionToOrder", strOrgId);
diff -r c459bea5041f -r 549163537206 
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql Tue Mar 
20 11:31:24 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql Fri Mar 
16 11:34:23 2012 +0100
@@ -217,7 +217,7 @@
       <![CDATA[
         SELECT AD_ORG.AD_ORG_ID AS PADRE, M_WAREHOUSE.M_WAREHOUSE_ID AS ID, 
M_WAREHOUSE.NAME AS NAME
         FROM M_WAREHOUSE, AD_ORG
-        WHERE AD_ISORGINCLUDED(AD_ORG.AD_ORG_ID, M_WAREHOUSE.AD_ORG_ID, ?) <> 
-1
+        WHERE AD_ISORGINCLUDED(M_WAREHOUSE.AD_ORG_ID, AD_ORG.AD_ORG_ID, ?) <> 
-1
           AND AD_ORG.AD_ORG_ID IN ('1')
           AND M_WAREHOUSE.AD_CLIENT_ID IN ('1')
         ORDER BY PADRE, NAME

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits