details: https://code.openbravo.com/erp/devel/pi/rev/f111e305e4c3
changeset: 30487:f111e305e4c3
user: Atul Gaware <atul.gaware <at> openbravo.com>
date: Mon Oct 17 18:52:02 2016 +0530
summary: Related to issue 30242:Backout changeset e86c34bf3374
diffstat:
src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diffs (41 lines):
diff -r 0f6f5ff03a21 -r f111e305e4c3
src-db/database/model/functions/M_REQUISITION_CREATEPO.xml
--- a/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml Mon Oct
17 13:52:50 2016 +0200
+++ b/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml Mon Oct
17 18:52:02 2016 +0530
@@ -128,7 +128,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_REQUISITION.DESCRIPTION AS HEADERDESC
+ M_REQUISITIONLINE.*
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,8 +207,7 @@
DELIVERYRULE, FREIGHTCOSTRULE, DELIVERYVIARULE, PRIORITYRULE,
TOTALLINES, GRANDTOTAL, M_WAREHOUSE_ID, M_PRICELIST_ID,
ISTAXINCLUDED, POSTED, PROCESSING, BILLTO_ID,
- AD_USER_ID, COPYFROM, DATEPROMISED,
- DESCRIPTION
+ AD_USER_ID, COPYFROM, DATEPROMISED
) VALUES (
v_C_Order_ID, v_CLIENT_ID, p_Org_ID, v_User_ID,now(),
v_User_ID, now(), 'N', v_DocumentNo, 'DR',
@@ -218,8 +217,7 @@
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,
- Cur_Lines.HEADERDESC
+ v_sales_rep_ID, 'N', Cur_Lines.NEEDBYDATE
);
END IF;
@@ -290,7 +288,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,
COALESCE(Cur_Lines.DESCRIPTION,'')||' '||COALESCE(Cur_Lines.SUPPLIERNOTES,''),
Cur_Lines.M_Product_ID,
+ p_OrderDate, Cur_Lines.NEEDBYDATE, Cur_Lines.SUPPLIERNOTES,
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
