nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1180 from nabinhait/hotfix

Browse Source 
[fix] [minor] fixes in packed item
This commit is contained in:
Nabin Hait
2013-12-12 22:11:22 -08:00
parent 52e5b84584 1251a93fc5
commit 5534b59d07
3 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
selling/doctype/sales_order/sales_order.py
View File

@@ -110,12 +110,12 @@ class DocType(SellingController):
self.validate_uom_is_integer("stock_uom", "qty")
self.validate_for_items()
self.validate_warehouse()
from stock.doctype.packed_item.packed_item import make_packing_list
self.doclist = make_packing_list(self,'sales_order_details')
self.validate_with_previous_doc()
if not self.doc.status:
self.doc.status = "Draft"
@@ -124,8 +124,7 @@ class DocType(SellingController):
"Cancelled"])
if not self.doc.billing_status: self.doc.billing_status = 'Not Billed'
if not self.doc.delivery_status: self.doc.delivery_status = 'Not Delivered'
if not self.doc.delivery_status: self.doc.delivery_status = 'Not Delivered'
def validate_warehouse(self):
from stock.utils import validate_warehouse_user, validate_warehouse_company