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

minor fixes

Browse Source
This commit is contained in:
Nabin Hait 2015-05-25 16:15:39 +05:30
parent e2787cf2ec
commit 63e431a219
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/company/company.py
View File

@ -206,7 +206,7 @@ class Company(Document):
frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
% (f, f, ', '.join(['%s']*len(warehouses))), tuple(warehouses)) % (f, f, ', '.join(['%s']*len(warehouses))), tuple(warehouses))
frappe.db.sql("""update `tabItem Reorder` set warehouse=NULL where warehouse in (%s)""" frappe.db.sql("""delete from `tabItem Reorder` where warehouse in (%s)"""
% ', '.join(['%s']*len(warehouses)), tuple(warehouses)) % ', '.join(['%s']*len(warehouses)), tuple(warehouses))
for f in ["income_account", "expense_account"]: for f in ["income_account", "expense_account"]:

2
erpnext/setup/doctype/sales_person/sales_person.py
View File

@ -32,4 +32,4 @@ class SalesPerson(NestedSet):
sales_person = frappe.db.get_value("Sales Person", {"employee": self.employee}) sales_person = frappe.db.get_value("Sales Person", {"employee": self.employee})
if sales_person and sales_person != self.name: if sales_person and sales_person != self.name:
frappe.throw(_("Another sales person {0} exists with the same employee id").format(sales_person)) frappe.throw(_("Another Sales Person {0} exists with the same Employee id").format(sales_person))