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

packing list issue fixed

Browse Source
This commit is contained in:
Nabin Hait 2012-07-18 13:19:01 +05:30
parent 255d58b3a0
commit 510eda353a
3 changed files with 8 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

@ -410,7 +410,7 @@ class DocType(TransactionBase):
if self.has_sales_bom(d.item_code): if self.has_sales_bom(d.item_code):
for p in getlist(obj.doclist, 'packing_details'): for p in getlist(obj.doclist, 'packing_details'):
if p.parent_detail_docname == d.name: if p.parent_detail_docname == d.name and p.parent_item == d.item_code:
# the packing details table's qty is already multiplied with parent's qty # the packing details table's qty is already multiplied with parent's qty
il.append({ il.append({
'warehouse': d.warehouse, 'warehouse': d.warehouse,
@ -525,7 +525,9 @@ class DocType(TransactionBase):
if [d.item_code, d.name] not in parent_items: if [d.item_code, d.name] not in parent_items:
parent_items.append([d.item_code, d.name]) parent_items.append([d.item_code, d.name])
self.cleanup_packing_list(obj, parent_items) obj.doclist = self.cleanup_packing_list(obj, parent_items)
return obj.doclist
def cleanup_packing_list(self, obj, parent_items): def cleanup_packing_list(self, obj, parent_items):
"""Remove all those child items which are no longer present in main item table""" """Remove all those child items which are no longer present in main item table"""
@ -547,6 +549,8 @@ class DocType(TransactionBase):
% (", ".join(["%s"] * len(delete_list))), % (", ".join(["%s"] * len(delete_list))),
tuple(delete_list)) tuple(delete_list))
return obj.doclist
# Get total in words # Get total in words
# ================================================================== # ==================================================================
def get_total_in_words(self, currency, amount): def get_total_in_words(self, currency, amount):

2
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -316,7 +316,7 @@ class DocType(TransactionBase):
sales_com_obj.validate_max_discount(self,'sales_order_details') sales_com_obj.validate_max_discount(self,'sales_order_details')
# this is to verify that the allocated % of sales persons is 100% # this is to verify that the allocated % of sales persons is 100%
sales_com_obj.get_allocated_sum(self) sales_com_obj.get_allocated_sum(self)
sales_com_obj.make_packing_list(self,'sales_order_details') self.doclist = sales_com_obj.make_packing_list(self,'sales_order_details')
# get total in words # get total in words
dcc = TransactionBase().get_company_currency(self.doc.company) dcc = TransactionBase().get_company_currency(self.doc.company)

2
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@ -434,7 +434,7 @@ class DocType(TransactionBase):
def on_update(self): def on_update(self):
get_obj('Sales Common').make_packing_list(self,'delivery_note_details') self.doclist = get_obj('Sales Common').make_packing_list(self,'delivery_note_details')
self.set_actual_qty() self.set_actual_qty()
get_obj('Stock Ledger').scrub_serial_nos(self) get_obj('Stock Ledger').scrub_serial_nos(self)