From c85abbfeca18964f611e46ca3a57512a33b8a621 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 8 Aug 2014 16:07:02 +0530 Subject: [PATCH] PO-PI mapping: divisional loss issue fixed --- erpnext/buying/doctype/purchase_order/purchase_order.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 04ad37fc72..d9035f40c5 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -203,7 +203,8 @@ def make_purchase_receipt(source_name, target_doc=None): target.qty = flt(obj.qty) - flt(obj.received_qty) target.stock_qty = (flt(obj.qty) - flt(obj.received_qty)) * flt(obj.conversion_factor) target.amount = (flt(obj.qty) - flt(obj.received_qty)) * flt(obj.rate) - target.base_amount = (flt(obj.qty) - flt(obj.received_qty)) * flt(obj.base_rate) + target.base_amount = (flt(obj.qty) - flt(obj.received_qty)) * \ + flt(obj.rate) * flt(source_parent.conversion_rate) doc = get_mapped_doc("Purchase Order", source_name, { "Purchase Order": { @@ -235,8 +236,7 @@ def make_purchase_invoice(source_name, target_doc=None): def update_item(obj, target, source_parent): target.amount = flt(obj.amount) - flt(obj.billed_amt) target.base_amount = target.amount * flt(source_parent.conversion_rate) - if flt(obj.base_rate): - target.qty = target.base_amount / flt(obj.base_rate) + target.qty = target.amount / flt(obj.rate) if flt(obj.rate) else flt(obj.qty) doc = get_mapped_doc("Purchase Order", source_name, { "Purchase Order": {