Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2012-05-23 18:27:29 +05:30
commit fcbd2ad792
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/selling/doctype/sales_common/sales_common.py
View File

@ -402,7 +402,7 @@ class DocType(TransactionBase):
# check if exists # check if exists
exists = 0 exists = 0
for d in getlist(obj.doclist, 'packing_details'): for d in getlist(obj.doclist, 'packing_details'):
if d.parent_item == line.item_code and d.item_code == packing_item_code: if d.parent_item == line.item_code and d.item_code == packing_item_code and d.parent_detail_docname == line.name:
pi, exists = d, 1 pi, exists = d, 1
break break
@ -440,15 +440,15 @@ class DocType(TransactionBase):
self.update_packing_list_item(obj, i['item_code'], flt(i['qty'])*flt(d.qty), warehouse, d) self.update_packing_list_item(obj, i['item_code'], flt(i['qty'])*flt(d.qty), warehouse, d)
else: else:
self.update_packing_list_item(obj, d.item_code, d.qty, warehouse, d) self.update_packing_list_item(obj, d.item_code, d.qty, warehouse, d)
if d.item_code not in parent_items: if [d.item_code, d.name] not in parent_items:
parent_items.append(d.item_code) parent_items.append([d.item_code, d.name])
self.cleanup_packing_list(obj, parent_items) self.cleanup_packing_list(obj, parent_items)
def cleanup_packing_list(self, obj, parent_items): def cleanup_packing_list(self, obj, parent_items):
"""Remove all those parent items which are no longer present in main item table""" """Remove all those parent items which are no longer present in main item table"""
for d in getlist(obj.doclist, 'packing_details'): for d in getlist(obj.doclist, 'packing_details'):
if d.parent_item not in parent_items: if [d.parent_item, d.parent_detail_docname] not in parent_items:
d.parent = '' d.parent = ''