details:   https://code.openbravo.com/erp/devel/pi/rev/6fef658096a2
changeset: 16493:6fef658096a2
user:      Rafa de Miguel <rafael.demiguel <at> openbravo.com>
date:      Fri May 11 10:31:58 2012 +0200
summary:   Fixed Issue 20466: M_GET_STOCK function should also take into account

diffstat:

 src-db/database/model/functions/M_GET_STOCK.xml |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r b53dc1683c2c -r 6fef658096a2 
src-db/database/model/functions/M_GET_STOCK.xml
--- a/src-db/database/model/functions/M_GET_STOCK.xml   Fri May 11 01:24:29 
2012 +0200
+++ b/src-db/database/model/functions/M_GET_STOCK.xml   Fri May 11 10:31:58 
2012 +0200
@@ -148,7 +148,7 @@
         AND COALESCE(T.M_ATTRIBUTESETINSTANCE_ID, '-1') = 
COALESCE(v_AttributesetinstanceID, T.M_ATTRIBUTESETINSTANCE_ID, '-1')
         AND COALESCE(L.M_LOCATOR_ID, '-1') = COALESCE(v_LocatorID, 
L.M_LOCATOR_ID, '-1')
         AND COALESCE(W.M_WAREHOUSE_ID, '-1') = COALESCE(v_WarehouseID, 
W.M_WAREHOUSE_ID, '-1')
-        AND AD_ISORGINCLUDED(W.AD_ORG_ID,v_OrgID,W.AD_CLIENT_ID)<>-1
+        AND ((AD_ISORGINCLUDED(W.AD_ORG_ID,v_OrgID,W.AD_CLIENT_ID)<>-1) OR 
(AD_ISORGINCLUDED(v_OrgID,W.AD_ORG_ID,W.AD_CLIENT_ID)<>-1))
         AND COALESCE(MS.Quantity, 0)>0
         ORDER BY PRIORITYNO, LASTUPDATED
       )
@@ -184,7 +184,7 @@
         AND COALESCE(T.M_ATTRIBUTESETINSTANCE_ID, '-1') = 
COALESCE(v_AttributesetinstanceID, T.M_ATTRIBUTESETINSTANCE_ID, '-1')
         AND COALESCE(L.M_LOCATOR_ID, '-1') = COALESCE(v_LocatorID, 
L.M_LOCATOR_ID, '-1')
         AND COALESCE(W.M_WAREHOUSE_ID, '-1') = COALESCE(v_WarehouseID, 
W.M_WAREHOUSE_ID, '-1')
-        AND AD_ISORGINCLUDED(W.AD_ORG_ID,v_OrgID,W.AD_CLIENT_ID)<>-1
+        AND ((AD_ISORGINCLUDED(W.AD_ORG_ID,v_OrgID,W.AD_CLIENT_ID)<>-1) OR 
(AD_ISORGINCLUDED(v_OrgID,W.AD_ORG_ID,W.AD_CLIENT_ID)<>-1))
         AND COALESCE(T.QtyOnHand, 0)>0
         ORDER BY PRIORITYNO, LASTUPDATED
       )

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to