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

Merge pull request #1845 from nabinhait/v4-hotfix

Browse Source 
V4 hotfix
This commit is contained in:
Nabin Hait 2014-06-25 19:16:05 +05:30
commit 23152f68f2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/account/account.js
View File

@ -54,7 +54,6 @@ cur_frm.add_fetch('parent_account', 'root_type', 'root_type');
cur_frm.cscript.account_type = function(doc, cdt, cdn) { cur_frm.cscript.account_type = function(doc, cdt, cdn) {
if(doc.group_or_ledger=='Ledger') { if(doc.group_or_ledger=='Ledger') {
cur_frm.toggle_display(['tax_rate'], doc.account_type == 'Tax'); 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' || cur_frm.toggle_display('master_name', doc.account_type=='Warehouse' ||
in_list(['Customer', 'Supplier'], doc.master_type)); in_list(['Customer', 'Supplier'], doc.master_type));
} }

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -747,7 +747,7 @@ def assign_task_to_owner(inv, msg, users):
'doctype' : 'Sales Invoice', 'doctype' : 'Sales Invoice',
'name' : inv, 'name' : inv,
'description' : msg, 'description' : msg,
'priority' : 'Urgent' 'priority' : 'High'
} }
assign_to.add(args) assign_to.add(args)

6
erpnext/controllers/stock_controller.py
View File

@ -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)) frappe.throw(_("Expense or Difference account is mandatory for Item {0} as it impacts overall stock value").format(item.item_code))
else: 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"): if is_expense_account and not item.get("cost_center"):
frappe.throw(_("{0} {1}: Cost Center is mandatory for Item {2}").format( frappe.throw(_("{0} {1}: Cost Center is mandatory for Item {2}").format(
_(self.doctype), self.name, item.get("item_code"))) _(self.doctype), self.name, item.get("item_code")))