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

Minor fixes in recurring invoice

Browse Source
This commit is contained in:
Nabin Hait 2014-06-25 18:34:29 +05:30
parent 7ca3be57df
commit 33a21ffbdc
2 changed files with 1 additions and 2 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)