From 33a21ffbdc414f99d5b4d85243d0d0eb11f858d4 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 25 Jun 2014 18:34:29 +0530 Subject: [PATCH 1/2] Minor fixes in recurring invoice --- erpnext/accounts/doctype/account/account.js | 1 - erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js index 471fe7e9b6..e39d77bcd3 100644 --- a/erpnext/accounts/doctype/account/account.js +++ b/erpnext/accounts/doctype/account/account.js @@ -54,7 +54,6 @@ cur_frm.add_fetch('parent_account', 'root_type', 'root_type'); cur_frm.cscript.account_type = function(doc, cdt, cdn) { if(doc.group_or_ledger=='Ledger') { cur_frm.toggle_display(['tax_rate'], doc.account_type == 'Tax'); - cur_frm.toggle_display('master_type', cstr(doc.account_type)==''); cur_frm.toggle_display('master_name', doc.account_type=='Warehouse' || in_list(['Customer', 'Supplier'], doc.master_type)); } diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 348543ee28..614c13a315 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -747,7 +747,7 @@ def assign_task_to_owner(inv, msg, users): 'doctype' : 'Sales Invoice', 'name' : inv, 'description' : msg, - 'priority' : 'Urgent' + 'priority' : 'High' } assign_to.add(args) From 00778c9a1e960b02149cbda707bcb17af74fe1f4 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 25 Jun 2014 19:12:24 +0530 Subject: [PATCH 2/2] Validate expense account for perpetual inventory --- erpnext/controllers/stock_controller.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 83cec985ca..bb3ab69ca1 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -238,7 +238,11 @@ class StockController(AccountsController): frappe.throw(_("Expense or Difference account is mandatory for Item {0} as it impacts overall stock value").format(item.item_code)) else: - is_expense_account = frappe.db.get_value("Account", item.get("expense_account"), "report_type")=="Profit and Loss" + is_expense_account = frappe.db.get_value("Account", + item.get("expense_account"), "report_type")=="Profit and Loss" + if self.doctype != "Purchase Receipt" and not is_expense_account: + frappe.throw(_("Expense / Difference account ({0}) must be a 'Profit or Loss' account") + .format(item.get("expense_account"))) if is_expense_account and not item.get("cost_center"): frappe.throw(_("{0} {1}: Cost Center is mandatory for Item {2}").format( _(self.doctype), self.name, item.get("item_code")))