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

Merge branch 'latest' of github.com:webnotes/erpnext into latest

Browse Source
This commit is contained in:
Rushabh Mehta 2012-02-17 10:38:00 +05:30
commit b96f30459d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,7 +179,7 @@ class DocType:
self.add_roles(pr)
def add_roles(self, pr):
roles_list = ['System Manager','Sales Manager','Sales User','Purchase Manager','Purchase User','Material Manager','Material User','Accounts Manager','Accounts User','HR Manager','HR User','Production Manager','Production User','Sales Master Manager','Purchase Master Manager','Material Master Manager','Quality Manager','Maintenance User','Maintenance Manager']
roles_list = ['Accounts Manager', 'Accounts User', 'Blogger', 'HR Manager', 'HR User', 'Maintenance User', 'Maintenance Manager', 'Material Manager', 'Material User', 'Material Master Manager', 'Production Manager', 'Production User', 'Projects User', 'Purchase Manager', 'Purchase User', 'Purchase Master Manager', 'Quality Manager', 'Sales Manager', 'Sales User', 'Sales Master Manager', 'Support Manager', 'Support Team', 'System Manager', 'Website Manager']
for r in roles_list:
d = addchild(pr, 'userroles', 'UserRole', 1)
d.role = r

2
erpnext/stock/doctype/packing_slip/packing_slip.js
View File

@ -29,7 +29,6 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
var ps_detail = getchildren('Packing Slip Detail', doc.name, 'item_details');
if(!(flt(ps_detail[0].net_weight) && cstr(ps_detail[0].weight_uom))) {
cur_frm.cscript.update_item_details(doc);
refresh_field('naming_series');
}
}
}
@ -41,6 +40,7 @@ cur_frm.cscript.update_item_details = function(doc) {
msgprint(r.exc);
} else {
refresh_field('item_details');
refresh_field('naming_series');
}
});
}

2
erpnext/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.js
View File

@ -26,7 +26,7 @@ cur_frm.fields_dict.purchase_receipt_no.get_query = function(doc) {
// Hide/unhide based on return type
//----------------------------------
cur_frm.cscript.return_type = function(doc, cdt, cdn) {
var cp = locals['Control Panel']['Control Panel'];
var cp = wn.control_panel;
hide_field(['purchase_receipt_no', 'delivery_note_no', 'sales_invoice_no',
'return_details', 'Get Items', 'Make Excise Invoice', 'Make Stock Entry',
'Make Debit Note', 'Make Credit Note']);