From f6b06a6b3091190f9e4c0929899dfec447ea08c2 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 19 Mar 2013 15:01:07 +0530 Subject: [PATCH] fixes in sales purchase return --- stock/doctype/stock_entry/stock_entry.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py index 37d55d90cb..5b90c625a5 100644 --- a/stock/doctype/stock_entry/stock_entry.py +++ b/stock/doctype/stock_entry/stock_entry.py @@ -789,6 +789,8 @@ def make_return_jv(stock_entry): from accounts.utils import get_balance_on for r in result: + if not r.get("account"): + print result jv_list.append({ "__islocal": 1, "doctype": "Journal Voucher Detail", @@ -846,6 +848,9 @@ def make_return_jv_from_delivery_note(se, ref): if not invoices_against_delivery: return [] + + packing_item_parent_map = dict([[d.item_code, d.parent_item] for d in ref.doclist.get( + {"parentfield": ref.parentfields[1]})]) parent = {} children = [] @@ -853,8 +858,11 @@ def make_return_jv_from_delivery_note(se, ref): for se_item in se.doclist.get({"parentfield": "mtn_details"}): for sales_invoice in invoices_against_delivery: si = webnotes.bean("Sales Invoice", sales_invoice) - si.run_method("make_packing_list") - ref_item = si.doclist.get({"item_code": se_item.item_code}) + + if se_item.item_code in packing_item_parent_map: + ref_item = si.doclist.get({"item_code": packing_item_parent_map[se_item.item_code]}) + else: + ref_item = si.doclist.get({"item_code": se_item.item_code}) if not ref_item: continue