From 9e08c12a10374e4cbc9bd7c2a9a48b5a66ec2d63 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 28 Dec 2011 16:30:48 +0530 Subject: [PATCH] Default price list currency issue in delivery note fixed --- .../doctype/receivable_voucher/receivable_voucher.js | 4 ++-- erpnext/stock/doctype/delivery_note/delivery_note.js | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js index c2b478e8e2..d0d31bef25 100644 --- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js +++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js @@ -18,8 +18,8 @@ cur_frm.cscript.onload = function(doc,dt,dn) { if(!doc.voucher_date) set_multiple(dt,dn,{voucher_date:get_today()}); if(!doc.due_date) set_multiple(dt,dn,{due_date:get_today()}); if(!doc.posting_date) set_multiple(dt,dn,{posting_date:get_today()}); - if(!doc.currency && sys_defaults.currency) set_multiple(cdt,cdn,{currency:sys_defaults.currency}); - if(!doc.price_list_currency) set_multiple(cdt, cdn, {price_list_currency: doc.currency, plc_conversion_rate: 1}); + if(!doc.currency && sys_defaults.currency) set_multiple(dt,dn,{currency:sys_defaults.currency}); + if(!doc.price_list_currency) set_multiple(dt, dn, {price_list_currency: doc.currency, plc_conversion_rate: 1}); //for previously created sales invoice, set required field related to pos if(doc.is_pos ==1) cur_frm.cscript.is_pos(doc, dt, dn); diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 8f9fa6d822..e86c2fe9b6 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -15,14 +15,14 @@ cur_frm.cscript.onload = function(doc, dt, dn) { if(!doc.transaction_date) set_multiple(dt,dn,{transaction_date:get_today()}); if(!doc.posting_date) set_multiple(dt,dn,{posting_date:get_today()}); if(doc.__islocal && doc.customer) cur_frm.cscript.pull_item_details_onload(doc,dt,dn); - if(!doc.price_list_currency) set_multiple(cdt, cdn, {price_list_currency: doc.currency, plc_conversion_rate: 1}); - + if(!doc.price_list_currency) { + set_multiple(dt, dn, {price_list_currency: doc.currency, plc_conversion_rate:1}); +} if(!doc.posting_time) doc.posting_time = wn.datetime.get_cur_time() if(doc.__islocal){ hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']); } - } cur_frm.cscript.onload_post_render = function(doc, dt, dn) { @@ -34,7 +34,6 @@ cur_frm.cscript.onload_post_render = function(doc, dt, dn) { // REFRESH // ================================================================================================ cur_frm.cscript.refresh = function(doc, cdt, cdn) { - cur_frm.clear_custom_buttons(); if(doc.per_billed < 100 && doc.docstatus==1) cur_frm.add_custom_button('Make Invoice', cur_frm.cscript['Make Sales Invoice']);