details:   https://code.openbravo.com/erp/devel/pi/rev/35a5a07f47a9
changeset: 17723:35a5a07f47a9
user:      Naiara Garcia <naiara.garcia <at> openbravo.com>
date:      Mon Aug 20 14:17:59 2012 +0200
summary:   20900: In Volume Discounts the 'All excluding defined'
option for Products and Categories does not work

diffstat:

 src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml |  54 ++++++------
 1 files changed, 28 insertions(+), 26 deletions(-)

diffs (64 lines):

diff -r cc375f70dce9 -r 35a5a07f47a9 
src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml       Tue Aug 
21 08:40:26 2012 +0200
+++ b/src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml       Mon Aug 
20 14:17:59 2012 +0200
@@ -264,32 +264,34 @@
         AND I.DATEINVOICED<v_LimitDate+1
         AND I.C_BPARTNER_ID=RP.C_BPARTNER_ID
         AND IL.M_PRODUCT_ID IN
-        (SELECT P.M_PRODUCT_ID
-        FROM M_RAPPEL R,
-          M_PRODUCT P
-        WHERE R.M_RAPPEL_ID=RP.M_RAPPEL_ID
-          AND ((COALESCE(R.INCLUDE_PRODUCT_CATEGORY, 'Y')='N'
-          AND P.M_PRODUCT_CATEGORY_ID IN
-          (SELECT M_PRODUCT_CATEGORY_ID
-          FROM M_RAPPEL_PRODUCTCATEGORY RC
-          WHERE RC.M_RAPPEL_ID=R.M_RAPPEL_ID
-          )))
-        UNION
-        SELECT M_PRODUCT_ID
-        FROM M_RAPPEL_PRODUCT RP,
-          M_RAPPEL R1
-        WHERE R.M_RAPPEL_ID=RP.M_RAPPEL_ID
-          AND  R1.M_RAPPEL_ID=RP.M_RAPPEL_ID
-          AND RP.ISACTIVE='Y'
-          AND COALESCE(R1.INCLUDE_PRODUCT, 'Y')='N' MINUS
-        SELECT M_PRODUCT_ID
-        FROM M_RAPPEL_PRODUCT RP,
-          M_RAPPEL R1
-        WHERE R.M_RAPPEL_ID=RP.M_RAPPEL_ID
-          AND  R1.M_RAPPEL_ID=RP.M_RAPPEL_ID
-          AND RP.ISACTIVE='Y'
-          AND COALESCE(R1.INCLUDE_PRODUCT, 'Y')='Y'
-        )
+       (SELECT P.M_PRODUCT_ID
+       FROM M_RAPPEL R,
+         M_PRODUCT P
+       WHERE R.M_RAPPEL_ID=RP.M_RAPPEL_ID
+         AND ((COALESCE(R.INCLUDE_PRODUCT_CATEGORY, 'Y')='N' -- Only defined 
categories
+         AND P.M_PRODUCT_CATEGORY_ID IN
+         (SELECT M_PRODUCT_CATEGORY_ID
+         FROM M_RAPPEL_PRODUCTCATEGORY RC
+         WHERE RC.M_RAPPEL_ID=R.M_RAPPEL_ID
+         AND RC.ISACTIVE = 'Y'))
+         OR (COALESCE(R.INCLUDE_PRODUCT_CATEGORY, 'Y')='Y' -- All categories 
except defined
+         AND P.M_PRODUCT_CATEGORY_ID NOT IN
+         (SELECT M_PRODUCT_CATEGORY_ID
+         FROM M_RAPPEL_PRODUCTCATEGORY RC
+         WHERE RC.M_RAPPEL_ID=R.M_RAPPEL_ID
+         AND RC.ISACTIVE = 'Y')))
+         AND ((COALESCE(R.INCLUDE_PRODUCT, 'Y')='N' -- Only defined products
+         AND P.M_PRODUCT_ID IN
+         (SELECT M_PRODUCT_ID
+         FROM M_RAPPEL_PRODUCT RP
+         WHERE RP.M_RAPPEL_ID=R.M_RAPPEL_ID
+         AND RP.ISACTIVE='Y'))
+         OR (COALESCE(R.INCLUDE_PRODUCT, 'Y')='Y' -- All products except 
defined
+         AND P.M_PRODUCT_ID NOT IN
+         (SELECT M_PRODUCT_ID
+         FROM M_RAPPEL_PRODUCT RP
+         WHERE RP.M_RAPPEL_ID=R.M_RAPPEL_ID
+         AND RP.ISACTIVE='Y'))))
         AND I.C_BPARTNER_ID=PL.C_BPARTNER_ID
         AND NOT EXISTS
         (SELECT 1

------------------------------------------------------------------------------
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