nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-03 21:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	selling/doctype/lead/lead.txt
This commit is contained in:
Anand Doshi
2013-07-04 17:18:45 +05:30
parent 99100a4135 37805ca415
commit 8aaccf7269
44 changed files with 1061 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/selling_controller.py
View File

@@ -276,7 +276,9 @@ class SellingController(StockController):
def validate_order_type(self):
valid_types = ["Sales", "Maintenance", "Shopping Cart"]
if self.doc.order_type not in valid_types:
if not self.doc.order_type:
self.doc.order_type = "Sales"
elif self.doc.order_type not in valid_types:
msgprint(_(self.meta.get_label("order_type")) + " " +
_("must be one of") + ": " + comma_or(valid_types),
raise_exception=True)