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

Merge pull request #7696 from khatrijitendra/patch-1

Browse Source 
[Fix] "type" and "rate" fields
This commit is contained in:
Nabin Hait 2017-02-08 16:26:08 +05:30 committed by GitHub
commit fafa3748f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/pricing_rule/pricing_rule.js
View File

@ -91,8 +91,8 @@ cur_frm.cscript.buying = function() {
} }
//Dynamically change the description based on type of margin //Dynamically change the description based on type of margin
cur_frm.cscript.type = function(doc){ cur_frm.cscript.margin_type = function(doc){
cur_frm.set_df_property('rate', 'description', doc.type=='Percentage'?'In Percentage %':'In Amount') cur_frm.set_df_property('margin_rate_or_amount', 'description', doc.margin_type=='Percentage'?'In Percentage %':'In Amount')
} }
frappe.ui.form.on('Pricing Rule', 'price_or_discount', function(frm){ frappe.ui.form.on('Pricing Rule', 'price_or_discount', function(frm){