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

Merge pull request #1896 from anandpdoshi/anand-july-7

Browse Source 
BugFix: selling_controller.py
This commit is contained in:
Rushabh Mehta 2014-07-07 11:50:54 +05:30
commit 47f26b0df4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/selling_controller.py
View File

@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import cint, flt, _round, cstr
from frappe.utils import cint, flt, _round, cstr, comma_or
from erpnext.setup.utils import get_company_currency
from frappe import _, throw
@ -287,7 +287,7 @@ class SellingController(StockController):
if not self.order_type:
self.order_type = "Sales"
elif self.order_type not in valid_types:
throw(_("Order Type must be one of {1}").comma_or(valid_types))
throw(_("Order Type must be one of {0}").format(comma_or(valid_types)))
def check_credit(self, grand_total):
customer_account = frappe.db.get_value("Account", {"company": self.company,