nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 21:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
This commit is contained in:
Anand Doshi
2013-02-21 11:09:43 +05:30
parent 8867cc2381 1c36697556
commit 59d8a76e60
36 changed files with 1595 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
selling/doctype/quotation/quotation.js
View File

@@ -28,6 +28,7 @@ wn.require('app/utilities/doctype/sms_control/sms_control.js');
// ONLOAD
// ===================================================================================
cur_frm.cscript.onload = function(doc, cdt, cdn) {
cur_frm.cscript.manage_rounded_total();
if(!doc.quotation_to) hide_field(['customer','customer_address','contact_person','customer_name','lead', 'lead_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email', 'territory', 'customer_group']);
if(!doc.price_list_name) set_multiple(cdt,cdn,{price_list_name:sys_defaults.price_list_name});
if(!doc.status) set_multiple(cdt,cdn,{status:'Draft'});

18
selling/doctype/sales_common/sales_common.js
View File

@@ -182,27 +182,37 @@ cur_frm.cscript.hide_price_list_currency = function(doc, cdt, cdn, callback1) {
if (doc.plc_conversion_rate != 1)
set_multiple(cdt, cdn, {plc_conversion_rate:1})
hide_field(['price_list_currency', 'plc_conversion_rate']);
}
}
}
if (r.message[1] == doc.currency) {
if (doc.conversion_rate != 1)
set_multiple(cdt, cdn, {conversion_rate:1});
hide_field(['conversion_rate', 'grand_total_export', 'in_words_export', 'rounded_total_export']);
} else unhide_field(['conversion_rate', 'grand_total_export', 'in_words_export', 'rounded_total_export']);
} else {
unhide_field(['conversion_rate', 'grand_total_export', 'in_words_export']);
if(!cint(sys_defaults.disable_rounded_total))
unhide_field("rounded_total_export");
}
if (r.message[1] == doc.price_list_currency) {
if (doc.plc_conversion_rate != 1)
set_multiple(cdt, cdn, {plc_conversion_rate:1});
hide_field('plc_conversion_rate');
} else unhide_field('plc_conversion_rate');
cur_frm.cscript.dynamic_label(doc, cdt, cdn, r.message[1], callback1);
}
})
}
}
cur_frm.cscript.manage_rounded_total = function() {
if(cint(sys_defaults.disable_rounded_total)) {
cur_frm.set_df_property("rounded_total", "print_hide", 1);
cur_frm.set_df_property("rounded_total_export", "print_hide", 1);
hide_field(["rounded_total", "rounded_total_export"]);
}
}
// TRIGGERS FOR CALCULATIONS
// =====================================================================================================

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

@@ -28,6 +28,8 @@ wn.require('app/utilities/doctype/sms_control/sms_control.js');
cur_frm.cscript.onload = function(doc, cdt, cdn) {
cur_frm.cscript.manage_rounded_total();
if(!doc.status) set_multiple(cdt,cdn,{status:'Draft'});
if(!doc.transaction_date) set_multiple(cdt,cdn,{transaction_date:get_today()});
if(!doc.price_list_currency) set_multiple(cdt, cdn, {price_list_currency: doc.currency, plc_conversion_rate: 1});