details: /erp/erp/devel/pi/rev/aa18feecfefe
changeset: 4667:aa18feecfefe
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Aug 20 18:30:26 2009 +0530
summary: Fixes Issue 9676: Price adjustment calculated twice in purchase
invoice
diffstat:
src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (32 lines):
diff -r 8d81bf71afee -r aa18feecfefe
src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml
--- a/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml Thu Aug 20
17:25:56 2009 +0530
+++ b/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml Thu Aug 20
18:30:26 2009 +0530
@@ -240,10 +240,12 @@
SELECT COALESCE(MAX(PriceList), 0),
COALESCE(MAX(PriceActual), 0),
COALESCE(MAX(PriceLimit), 0),
+ COALESCE(MAX(Linenetamt),0),
MAX(c_tax_id)
INTO v_PriceList,
v_PriceActual,
v_PriceLimit,
+ v_LineNetAmt,
v_c_Tax_ID
FROM C_ORDERLINE
WHERE C_OrderLine_ID=CUR_ShipmentLines.C_OrderLine_ID;
@@ -260,6 +262,7 @@
AND M_PriceList_Version_ID=v_M_PriceList_Version_ID;
v_C_Tax_ID:=C_Gettax(CUR_ShipmentLines.M_Product_ID,
CUR_Shipment.MovementDate, CUR_Shipment.AD_Org_ID, CUR_Shipment.M_Warehouse_ID,
CUR_Shipment.C_BPartner_Location_ID, CUR_Shipment.C_BPartner_Location_ID,
CUR_Shipment.C_Project_ID, 'N') ;
v_PriceActual:=M_Get_Offers_Price(now(),
CUR_Shipment.C_BPartner_ID, CUR_ShipmentLines.M_Product_ID, v_PriceActual,
CUR_ShipmentLines.MovementQty, v_M_PriceList_ID);
+ v_LineNetAmt:=ROUND(M_Get_Offers_Price(now(),
CUR_Shipment.C_BPartner_ID, CUR_ShipmentLines.M_Product_ID, v_PriceActual,
CUR_ShipmentLines.MovementQty, v_M_PriceList_ID)
*CUR_ShipmentLines.MovementQty, 2) ;
END IF;
-- Get UOM + Tax -- VERY simplified, but should work in most cases
v_ResultStr:='NoUOM+Tax';
@@ -270,7 +273,6 @@
-- v_UOM_ID, v_Tax_ID
v_ResultStr:='InsertInvoiceLine';
Ad_Sequence_Next('C_InvoiceLine', CUR_Shipment.C_Order_ID,
v_NextNo) ;
- v_LineNetAmt:=ROUND(M_Get_Offers_Price(now(),
CUR_Shipment.C_BPartner_ID, CUR_ShipmentLines.M_Product_ID, v_PriceActual,
CUR_ShipmentLines.MovementQty, v_M_PriceList_ID)
*CUR_ShipmentLines.MovementQty, 2) ;
INSERT
INTO C_INVOICELINE
(
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
