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

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

Browse Source
This commit is contained in:
Rushabh Mehta 2012-05-02 13:45:25 +05:30
commit 30ab0227b3
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -173,7 +173,6 @@ cur_frm.cscript.warehouse = function(doc, cdt , cdn) {
//Customer //Customer
cur_frm.cscript.customer = function(doc,dt,dn,onload) { cur_frm.cscript.customer = function(doc,dt,dn,onload) {
var callback = function(r,rt) { var callback = function(r,rt) {
var callback2 = function(doc, dt, dn) { var callback2 = function(doc, dt, dn) {
doc = locals[dt][dn]; doc = locals[dt][dn];
@ -181,7 +180,7 @@ cur_frm.cscript.customer = function(doc,dt,dn,onload) {
get_server_fields('get_cust_and_due_date','','',doc,dt,dn,1, get_server_fields('get_cust_and_due_date','','',doc,dt,dn,1,
function(doc, dt, dn) { function(doc, dt, dn) {
cur_frm.refresh(); cur_frm.refresh();
cur_frm.cscript.price_list_name(doc, dt, dn); if (!onload) cur_frm.cscript.price_list_name(doc, dt, dn);
}); });
} }

2
erpnext/patches/jan_mar_2012/sync_ref_db.py
View File

@ -20,7 +20,7 @@ def execute():
'Invest 80 Declaration Detail', 'IT Checklist', 'Chapter VI A Detail', 'Declaration Detail', 'Invest 80 Declaration Detail', 'IT Checklist', 'Chapter VI A Detail', 'Declaration Detail',
'Personalize', 'Salary Slip Control Panel', 'Question Control' 'Personalize', 'Salary Slip Control Panel', 'Question Control'
], ],
'Page' : ['File Browser', 'Bill of Materials'], 'Page' : ['File Browser', 'Bill of Materials', 'question-view'],
'DocType Mapper': ['Production Forecast-Production Planning Tool', 'Production Forecast-Production Plan', 'Sales Order-Production Plan'], 'DocType Mapper': ['Production Forecast-Production Planning Tool', 'Production Forecast-Production Plan', 'Sales Order-Production Plan'],
} }

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

@ -102,7 +102,7 @@ cur_frm.cscript.customer = function(doc,dt,dn) {
var callback2 = function(r, rt) { var callback2 = function(r, rt) {
if(doc.customer) unhide_field(['customer_address', 'contact_person', 'territory','customer_group','shipping_address']); if(doc.customer) unhide_field(['customer_address', 'contact_person', 'territory','customer_group','shipping_address']);
cur_frm.refresh(); cur_frm.refresh();
cur_frm.cscript.price_list_name(doc, dt, dn); if(!onload) cur_frm.cscript.price_list_name(doc, dt, dn);
} }
var doc = locals[cur_frm.doctype][cur_frm.docname]; var doc = locals[cur_frm.doctype][cur_frm.docname];

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

@ -83,7 +83,7 @@ cur_frm.cscript.customer = function(doc,dt,dn,onload) {
var doc = locals[cur_frm.doctype][cur_frm.docname]; var doc = locals[cur_frm.doctype][cur_frm.docname];
if(doc.customer) unhide_field(['customer_address','contact_person','territory','customer_group']); if(doc.customer) unhide_field(['customer_address','contact_person','territory','customer_group']);
cur_frm.refresh(); cur_frm.refresh();
cur_frm.cscript.price_list_name(doc, dt, dn); if(!onload) cur_frm.cscript.price_list_name(doc, dt, dn);
} }
var args = onload ? 'onload':'' var args = onload ? 'onload':''
if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_shipping_address', args, callback); if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_shipping_address', args, callback);