[OpenbravoERP-commits] devel/pi: Fixes issue 0026445: HASSECONDUOM auxiliar input take ...

Tue, 12 Aug 2014 08:29:37 -0700 

details:   https://code.openbravo.com/erp/devel/pi/rev/7e9c66b444b8
changeset: 24244:7e9c66b444b8
user:      Jon Alegría <jon.alegria <at> openbravo.com>
date:      Tue Aug 12 17:28:32 2014 +0200
summary:   Fixes issue 0026445: HASSECONDUOM auxiliar input take into
consideration inactive uoms

diffstat:

 src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product_data.xsql       | 
 3 ++-
 src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product_data.xsql           | 
 1 +
 src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product_data.xsql | 
 1 +
 src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product_data.xsql | 
 3 ++-
 src/org/openbravo/erpCommon/ad_callouts/SL_WRPhaseProduct_Product_data.xsql  | 
 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diffs (82 lines):

diff -r 681262a36913 -r 7e9c66b444b8 
src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product_data.xsql
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product_data.xsql    
Mon Aug 11 11:06:52 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product_data.xsql    
Tue Aug 12 17:28:32 2014 +0200
@@ -34,7 +34,7 @@
   <SqlMethod name="strMProductUOMID" type="preparedStatement" return="String" 
default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
-      SELECT M_PRODUCT_UOM_ID FROM M_PRODUCT_UOM WHERE M_PRODUCT_ID = ? AND 
C_UOM_ID = ?
+      SELECT M_PRODUCT_UOM_ID FROM M_PRODUCT_UOM WHERE M_PRODUCT_ID = ? AND 
C_UOM_ID = ? AND ISACTIVE = 'Y'
     </Sql>
     <Parameter name="mProductId"/>
     <Parameter name="cUOMId"/>
@@ -45,6 +45,7 @@
       SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE 1 END) AS TOTAL 
       FROM M_PRODUCT_UOM 
       WHERE M_PRODUCT_ID = ?
+      AND ISACTIVE = 'Y'
     </Sql>
     <Parameter name="mProductId"/>
   </SqlMethod>
diff -r 681262a36913 -r 7e9c66b444b8 
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product_data.xsql
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product_data.xsql        
Mon Aug 11 11:06:52 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product_data.xsql        
Tue Aug 12 17:28:32 2014 +0200
@@ -54,6 +54,7 @@
       SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE 1 END) AS TOTAL 
       FROM M_PRODUCT_UOM 
       WHERE M_PRODUCT_ID = ?
+      AND ISACTIVE = 'Y'
     </Sql>
     <Parameter name="mProductId"/>
   </SqlMethod>
diff -r 681262a36913 -r 7e9c66b444b8 
src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product_data.xsql
--- 
a/src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product_data.xsql  
    Mon Aug 11 11:06:52 2014 +0200
+++ 
b/src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product_data.xsql  
    Tue Aug 12 17:28:32 2014 +0200
@@ -66,6 +66,7 @@
       SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE 1 END) AS TOTAL 
       FROM M_PRODUCT_UOM 
       WHERE M_PRODUCT_ID = ?
+      AND ISACTIVE = 'Y'
     </Sql>
     <Parameter name="mProductId"/>
   </SqlMethod>
diff -r 681262a36913 -r 7e9c66b444b8 
src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product_data.xsql
--- 
a/src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product_data.xsql  
    Mon Aug 11 11:06:52 2014 +0200
+++ 
b/src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product_data.xsql  
    Tue Aug 12 17:28:32 2014 +0200
@@ -44,7 +44,7 @@
   <SqlMethod name="strMProductUOMID" type="preparedStatement" return="String" 
default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
-      SELECT M_PRODUCT_UOM_ID FROM M_PRODUCT_UOM WHERE M_PRODUCT_ID = ? AND 
C_UOM_ID = ?
+      SELECT M_PRODUCT_UOM_ID FROM M_PRODUCT_UOM WHERE M_PRODUCT_ID = ? AND 
C_UOM_ID = ? AND ISACTIVE = 'Y'
     </Sql>
     <Parameter name="mProductId"/>
     <Parameter name="cUOMId"/>
@@ -55,6 +55,7 @@
       SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE 1 END) AS TOTAL 
       FROM M_PRODUCT_UOM 
       WHERE M_PRODUCT_ID = ?
+      AND ISACTIVE = 'Y'
     </Sql>
     <Parameter name="mProductId"/>
   </SqlMethod>
diff -r 681262a36913 -r 7e9c66b444b8 
src/org/openbravo/erpCommon/ad_callouts/SL_WRPhaseProduct_Product_data.xsql
--- 
a/src/org/openbravo/erpCommon/ad_callouts/SL_WRPhaseProduct_Product_data.xsql   
    Mon Aug 11 11:06:52 2014 +0200
+++ 
b/src/org/openbravo/erpCommon/ad_callouts/SL_WRPhaseProduct_Product_data.xsql   
    Tue Aug 12 17:28:32 2014 +0200
@@ -43,7 +43,7 @@
   <SqlMethod name="strMProductUOMID" type="preparedStatement" return="String" 
default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
-      SELECT M_PRODUCT_UOM_ID FROM M_PRODUCT_UOM WHERE M_PRODUCT_ID = ? AND 
C_UOM_ID = ?
+      SELECT M_PRODUCT_UOM_ID FROM M_PRODUCT_UOM WHERE M_PRODUCT_ID = ? AND 
C_UOM_ID = ? AND ISACTIVE = 'Y'
     </Sql>
     <Parameter name="mProductId"/>
     <Parameter name="cUOMId"/>
@@ -54,6 +54,7 @@
       SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE 1 END) AS TOTAL 
       FROM M_PRODUCT_UOM 
       WHERE M_PRODUCT_ID = ?
+      AND ISACTIVE = 'Y'
     </Sql>
     <Parameter name="mProductId"/>
   </SqlMethod>

------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to