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

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

Browse Source
This commit is contained in:
Nabin Hait 2012-02-13 18:25:52 +05:30
commit c45337bf97
5 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js
View File

@ -23,9 +23,6 @@ cur_frm.cscript.onload = function(doc,dt,dn) {
hide_field(['customer_address', 'contact_person', 'customer_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email', 'territory', 'customer_group']); hide_field(['customer_address', 'contact_person', 'customer_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email', 'territory', 'customer_group']);
// defined in sales_common.js
cur_frm.cscript.update_item_details(doc, cdt, cdn);
//for previously created sales invoice, set required field related to pos //for previously created sales invoice, set required field related to pos
if(doc.is_pos ==1) cur_frm.cscript.is_pos(doc, dt, dn); if(doc.is_pos ==1) cur_frm.cscript.is_pos(doc, dt, dn);
@ -33,8 +30,10 @@ cur_frm.cscript.onload = function(doc,dt,dn) {
} }
cur_frm.cscript.onload_post_render = function(doc, dt, dn) { cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
var callback = null;
if(doc.customer && doc.__islocal) { if(doc.customer && doc.__islocal) {
// called from mapper, update the account names for items and customer // called from mapper, update the account names for items and customer
callback = function(doc, dt, dn) {
$c_obj(make_doclist(doc.doctype,doc.name), $c_obj(make_doclist(doc.doctype,doc.name),
'load_default_accounts','', 'load_default_accounts','',
function(r,rt) { function(r,rt) {
@ -43,11 +42,10 @@ cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
} }
); );
} }
if(!doc.customer && doc.__islocal) {
// new -- load default taxes
cur_frm.cscript.load_taxes(doc, cdt, cdn);
} }
// defined in sales_common.js
cur_frm.cscript.update_item_details(doc, cdt, cdn, callback);
} }

8
erpnext/selling/doctype/quotation/quotation.js
View File

@ -32,15 +32,11 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
} }
} }
// defined in sales_common.js
cur_frm.cscript.update_item_details(doc, cdt, cdn);
} }
cur_frm.cscript.onload_post_render = function(doc, dt, dn) { cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
// load default charges // defined in sales_common.js
if(doc.__islocal && !getchildren('RV Tax Detail', doc.name, 'other_charges', doc.doctype).length) cur_frm.cscript.update_item_details(doc, cdt, cdn);
cur_frm.cscript.load_taxes(doc, cdt, cdn);
} }
// hide - unhide fields based on lead or customer.. // hide - unhide fields based on lead or customer..

17
erpnext/selling/doctype/sales_common/sales_common.js
View File

@ -6,18 +6,23 @@
// cur_frm.cscript.sales_team_fname - Sales Team fieldname // cur_frm.cscript.sales_team_fname - Sales Team fieldname
// ============== Load Default Taxes =================== // ============== Load Default Taxes ===================
cur_frm.cscript.load_taxes = function(doc, cdt, cdn) { cur_frm.cscript.load_taxes = function(doc, cdt, cdn, callback) {
// run if this is not executed from dt_map... // run if this is not executed from dt_map...
if(doc.customer) return; doc = locals[doc.doctype][doc.name];
if(doc.customer || getchildren('RV Tax Detail', doc.name, 'other_charges', doc.doctype).length) {
if(callback) callback(doc, cdt, cdn);
return;
}
$c_obj([doc],'load_default_taxes','',function(r,rt){ $c_obj([doc],'load_default_taxes','',function(r,rt){
refresh_field('other_charges'); refresh_field('other_charges');
if(callback) callback(doc, cdt, cdn);
}); });
} }
// Gets called after existing item details are update to fill in // Gets called after existing item details are update to fill in
// remaining default values // remaining default values
cur_frm.cscript.load_defaults = function(doc, dt, dn) { cur_frm.cscript.load_defaults = function(doc, dt, dn, callback) {
if(!cur_frm.doc.__islocal) { return; } if(!cur_frm.doc.__islocal) { return; }
doc = locals[doc.doctype][doc.name]; doc = locals[doc.doctype][doc.name];
@ -31,11 +36,13 @@ cur_frm.cscript.load_defaults = function(doc, dt, dn) {
LocalDB.set_default_values(children[i]); LocalDB.set_default_values(children[i]);
} }
refresh_field(cur_frm.cscript.fname); refresh_field(cur_frm.cscript.fname);
cur_frm.cscript.load_taxes(doc, dt, dn, callback);
} }
// Update existing item details // Update existing item details
cur_frm.cscript.update_item_details = function(doc, dt, dn) { cur_frm.cscript.update_item_details = function(doc, dt, dn, callback) {
doc = locals[doc.doctype][doc.name];
if(!cur_frm.doc.__islocal) return; if(!cur_frm.doc.__islocal) return;
var children = getchildren(cur_frm.cscript.tname, doc.name, cur_frm.cscript.fname); var children = getchildren(cur_frm.cscript.tname, doc.name, cur_frm.cscript.fname);
if(children) { if(children) {
@ -44,7 +51,7 @@ cur_frm.cscript.update_item_details = function(doc, dt, dn) {
if(!r.exc) { if(!r.exc) {
refresh_field(cur_frm.cscript.fname); refresh_field(cur_frm.cscript.fname);
doc = locals[doc.doctype][doc.name]; doc = locals[doc.doctype][doc.name];
cur_frm.cscript.load_defaults(doc, dt, dn); cur_frm.cscript.load_defaults(doc, dt, dn, callback);
} }
}); });
} }

7
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -23,15 +23,12 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group','shipping_address']); hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group','shipping_address']);
} }
// defined in sales_common.js
cur_frm.cscript.update_item_details(doc, cdt, cdn);
} }
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
if(doc.__islocal) { if(doc.__islocal) {
if(doc.quotation) cur_frm.cscript['Pull Quotation Details'](doc,cdt,cdn); // defined in sales_common.js
} else { cur_frm.cscript.update_item_details(doc, cdt, cdn, callback);
cur_frm.cscript.load_taxes(doc, cdt, cdn);
} }
} }

5
erpnext/stock/doctype/delivery_note/delivery_note.js
View File

@ -24,12 +24,13 @@ cur_frm.cscript.onload = function(doc, dt, dn) {
hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']); hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
} }
// defined in sales_common.js
//cur_frm.cscript.update_item_details(doc, cdt, cdn);
} }
cur_frm.cscript.onload_post_render = function(doc, dt, dn) { cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
// defined in sales_common.js
//cur_frm.cscript.update_item_details(doc, cdt, cdn);
// load default charges // load default charges
if(doc.__islocal && !getchildren('RV Tax Detail', doc.name, 'other_charges', doc.doctype).length) if(doc.__islocal && !getchildren('RV Tax Detail', doc.name, 'other_charges', doc.doctype).length)
cur_frm.cscript.load_taxes(doc, cdt, cdn); cur_frm.cscript.load_taxes(doc, cdt, cdn);