details: https://code.openbravo.com/erp/devel/pi/rev/f4adff9d033c
changeset: 30491:f4adff9d033c
user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com>
date: Mon Oct 17 19:46:29 2016 +0200
summary: Related to issue 30242: Fix function in Oracle
diffstat:
src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 16 ++++++++++---
1 files changed, 12 insertions(+), 4 deletions(-)
diffs (61 lines):
diff -r d52eb3542b99 -r f4adff9d033c
src-db/database/model/functions/M_REQUISITION_CREATEPO.xml
--- a/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml Mon Oct
17 18:08:57 2016 +0200
+++ b/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml Mon Oct
17 19:46:29 2016 +0200
@@ -54,6 +54,7 @@
v_stdPre NUMBER;
v_priPre NUMBER;
v_Gross NUMBER;
+ v_Description C_OrderLine.Description%TYPE;
p_OrderDate DATE;
p_Vendor_ID VARCHAR2(32);
@@ -128,7 +129,7 @@
M_PRICELIST.ISTAXINCLUDED
FROM (SELECT COALESCE(p_Vendor_ID, M_REQUISITIONLINE.C_BPARTNER_ID,
M_REQUISITION.C_BPARTNER_ID, PRODUCT_PO.C_BPARTNER_ID) AS VENDOR_ID,
COALESCE(p_PriceList_ID, M_REQUISITIONLINE.M_PRICELIST_ID,
M_REQUISITION.M_PRICELIST_ID) AS A_PRICELIST_ID,
- M_REQUISITIONLINE.*
+ M_REQUISITIONLINE.*, M_REQUISITION.DESCRIPTION AS HEADERDESC
FROM M_REQUISITION, M_REQUISITIONLINE LEFT JOIN (SELECT
MAX(C_BPARTNER_ID) AS C_BPARTNER_ID, M_PRODUCT_ID
FROM
M_PRODUCT_PO
WHERE
ISCURRENTVENDOR = 'Y'
@@ -207,7 +208,8 @@
DELIVERYRULE, FREIGHTCOSTRULE, DELIVERYVIARULE, PRIORITYRULE,
TOTALLINES, GRANDTOTAL, M_WAREHOUSE_ID, M_PRICELIST_ID,
ISTAXINCLUDED, POSTED, PROCESSING, BILLTO_ID,
- AD_USER_ID, COPYFROM, DATEPROMISED
+ AD_USER_ID, COPYFROM, DATEPROMISED,
+ DESCRIPTION
) VALUES (
v_C_Order_ID, v_CLIENT_ID, p_Org_ID, v_User_ID,now(),
v_User_ID, now(), 'N', v_DocumentNo, 'DR',
@@ -217,7 +219,8 @@
COALESCE(Cur_Lines.Deliveryrule, 'A'), 'I', 'D', '5',
0, 0, p_WAREHOUSE_ID, Cur_Lines.PRICELIST_ID,
'N', 'N', 'N', v_BillTo_ID,
- v_sales_rep_ID, 'N', Cur_Lines.NEEDBYDATE
+ v_sales_rep_ID, 'N', Cur_Lines.NEEDBYDATE,
+ Cur_Lines.HEADERDESC
);
END IF;
@@ -273,6 +276,11 @@
v_Discount :=ROUND((v_PriceList-v_PriceActual) / v_PriceList*100,
v_stdPre); -- Calculate rounded discount
END IF;
END IF;
+
+ v_Description := COALESCE(Cur_Lines.DESCRIPTION, '');
+ IF (Cur_Lines.SUPPLIERNOTES IS NOT NULL) THEN
+ v_Description := v_Description || ' ' || Cur_Lines.SUPPLIERNOTES;
+ END IF;
INSERT INTO C_OrderLine (
C_ORDERLINE_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE,
@@ -288,7 +296,7 @@
v_COrderLine_ID,v_Client_ID, p_Org_ID,'Y',
now(), v_User_ID, now(), v_User_ID,
v_C_Order_ID, v_Line, Cur_Lines.Vendor_ID, v_BPartner_Location_ID,
- p_OrderDate, Cur_Lines.NEEDBYDATE, Cur_Lines.SUPPLIERNOTES,
Cur_Lines.M_Product_ID,
+ p_OrderDate, Cur_Lines.NEEDBYDATE, v_Description,
Cur_Lines.M_Product_ID,
Cur_Lines.M_AttributeSetInstance_ID,
p_Warehouse_ID, Cur_Lines.C_UOM_ID, Cur_Lines.QTY -
Cur_Lines.ORDEREDQTY, v_Currency_ID,
v_PriceList, v_PriceActual, v_PriceLimit,
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
