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

Include in print rate validation added

Browse Source
This commit is contained in:
Nabin Hait 2012-07-16 15:38:11 +05:30
parent 8f5cd388cc
commit 49e170153e
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -342,7 +342,7 @@ cur_frm.cscript.basic_rate = function(doc, cdt, cdn) {
Please either <br /> \
* Specify Basic Rate (i.e. Rate which will be displayed in print) <br /> \
-- or -- <br />\
* Uncheck 'Included in Print Rate' in the tax entries of Taxes section.");
* Uncheck 'Is this Tax included in Basic Rate?' in the tax entries of Taxes section.");
}
}
}
@ -655,27 +655,15 @@ cur_frm.cscript.included_in_print_rate = function(doc, cdt, cdn) {
var tax = locals[cdt][cdn];
if(tax.included_in_print_rate==1) {
if(!inList(['On Net Total', 'On Previous Row Total', 'On Previous Row Amount'], tax.charge_type)) {
msgprint("Included in Print Rate (i.e. Inclusive Price) is only valid for charges of type: <br /> \
msgprint("'Is this Tax included in Basic Rate?' (i.e. Inclusive Price) is only valid for charges of type: <br /> \
* On Net Total <br /> \
* On Previous Row Amount <br /> \
* On Previous Row Total");
tax.included_in_print_rate = 0;
refresh_field('included_in_print_rate', tax.name, cur_frm.cscript.other_fname);
} else if(inList(['On Previous Row Total', 'On Previous Row Amount'], tax.charge_type)){
if(tax.row_id) {
var tax_list = getchildren('Sales Taxes and Charges', doc.name, cur_frm.cscript.other_fname, doc.doctype);
if(tax_list[tax.row_id-1].charge_type=='Actual') {
msgprint("Row of type 'Actual' cannot be depended on for type '" + tax.charge_type + "'\
when using tax inclusive prices.<br />\
This will lead to incorrect values.<br /><br /> \
<b>Please specify correct value in 'Enter Row' column of <span style='color:red'>Row: "
+ tax.idx + "</span> in Taxes table</b>");
validated = false;
tax.included_in_print_rate = 0;
refresh_field('included_in_print_rate', tax.name, cur_frm.cscript.other_fname);
}
}
}
}
var tax_list = getchildren('Sales Taxes and Charges', doc.name, cur_frm.cscript.other_fname, doc.doctype);
cur_frm.cscript.validate_print_rate_option(doc, tax_list, tax.idx-1);
}
}
@ -757,6 +745,32 @@ cur_frm.cscript.recalculate_values = function(doc, cdt, cdn) {
cur_frm.cscript.calculate_charges(doc,cdt,cdn);
}
cur_frm.cscript.validate_print_rate_option = function(doc, taxes, i) {
if(in_list(['On Previous Row Amount','On Previous Row Total'], taxes[i].charge_type)) {
if(!taxes[i].row_id){
alert("Please Enter Row on which amount needs to be calculated for row : "+taxes[i].idx);
validated = false;
} else if(taxes[i].included_in_print_rate && taxes[taxes[i].row_id-1].charge_type=='Actual') {
msgprint("Row of type 'Actual' cannot be depended on for type '" + taxes[i].charge_type + "'\
when using tax inclusive prices.<br />\
This will lead to incorrect values.<br /><br /> \
<b>Please specify correct value in 'Enter Row' column of <span style='color:red'>Row: "
+ taxes[i].idx + "</span> in Taxes table</b>");
validated = false;
taxes[i].included_in_print_rate = 0;
refresh_field('included_in_print_rate', taxes[i].name, other_fname);
} else if ((taxes[i].included_in_print_rate && !taxes[taxes[i].row_id-1].included_in_print_rate) ||
(!taxes[i].included_in_print_rate && taxes[taxes[i].row_id-1].included_in_print_rate)) {
msgprint("If any row in the tax table depends on 'Previous Row Amount/Total', <br />\
'Is this Tax included in Basic Rate?' column should be same for both row <br />\
i.e for that row and the previous row. <br /><br />\
The same is violated for row #"+(i+1)+" and row #"+taxes[i].row_id
);
validated = false;
}
}
}
cur_frm.cscript.calculate_charges = function(doc, cdt, cdn) {
var other_fname = cur_frm.cscript.other_fname;
@ -766,21 +780,7 @@ cur_frm.cscript.calculate_charges = function(doc, cdt, cdn) {
cl[i].total_amount = 0;
cl[i].tax_amount = 0; // this is done to calculate other charges
cl[i].total = 0;
if(in_list(['On Previous Row Amount','On Previous Row Total'], cl[i].charge_type)) {
if(!cl[i].row_id){
alert("Please Enter Row on which amount needs to be calculated for row : "+cl[i].idx);
validated = false;
} else if(cl[i].included_in_print_rate && cl[cl[i].row_id-1].charge_type=='Actual') {
msgprint("Row of type 'Actual' cannot be depended on for type '" + cl[i].charge_type + "'\
when using tax inclusive prices.<br />\
This will lead to incorrect values.<br /><br /> \
<b>Please specify correct value in 'Enter Row' column of <span style='color:red'>Row: "
+ cl[i].idx + "</span> in Taxes table</b>");
validated = false;
cl[i].included_in_print_rate = 0;
refresh_field('included_in_print_rate', cl[i].name, other_fname);
}
}
cur_frm.cscript.validate_print_rate_option(doc, cl, i);
}
cur_frm.cscript.recalc(doc, 1);
}