schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ux] taxes table editable

Browse Source
This commit is contained in:
Rushabh Mehta
2016-06-15 16:45:03 +05:30
parent b5f2c78f8f
commit 2cb7a9f235
5 changed files with 84 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
erpnext/public/js/controllers/accounts.js
View File

@@ -6,6 +6,14 @@ frappe.provide("erpnext.taxes");
frappe.provide("erpnext.taxes.flags");
frappe.ui.form.on(cur_frm.doctype, {
setup: function(frm) {
// set conditional display for rate column in taxes
$(frm.wrapper).on('grid-row-render', function(e, grid_row) {
if(in_list(['Sales Taxes and Charges', 'Purchase Taxes and Charges'], grid_row.doc.doctype)) {
erpnext.taxes.set_conditional_mandatory_rate_or_amount(grid_row);
}
});
},
onload: function(frm) {
if(frm.get_field("taxes")) {
frm.set_query("account_head", "taxes", function(doc) {
@@ -40,10 +48,10 @@ frappe.ui.form.on(cur_frm.doctype, {
frm.get_docfield("taxes", "rate").reqd = 0;
frm.get_docfield("taxes", "tax_amount").reqd = 0;
}
},
taxes_on_form_rendered: function(frm) {
erpnext.taxes.set_conditional_mandatory_rate_or_amount(frm);
erpnext.taxes.set_conditional_mandatory_rate_or_amount(frm.open_grid_row());
}
});
@@ -58,7 +66,8 @@ cur_frm.cscript.account_head = function(doc, cdt, cdn) {
method: "erpnext.controllers.accounts_controller.get_tax_rate",
args: {"account_head":d.account_head},
callback: function(r) {
frappe.model.set_value(cdt, cdn, "rate", r.message || 0);
frappe.model.set_value(cdt, cdn, "rate", r.message.tax_rate || 0);
frappe.model.set_value(cdt, cdn, "description", r.message.account_name);
}
})
}
@@ -67,6 +76,12 @@ cur_frm.cscript.account_head = function(doc, cdt, cdn) {
cur_frm.cscript.validate_taxes_and_charges = function(cdt, cdn) {
var d = locals[cdt][cdn];
var msg = "";
if(d.account_head && !d.description) {
// set description from account head
d.description = d.account_head.split(' - ').slice(0, -1).join(' - ');
}
if(!d.charge_type && (d.row_id || d.rate || d.tax_amount)) {
msg = __("Please select Charge Type first");
d.row_id = "";
@@ -143,8 +158,14 @@ if(!erpnext.taxes.flags[cur_frm.cscript.tax_table]) {
});
frappe.ui.form.on(cur_frm.cscript.tax_table, "charge_type", function(frm, cdt, cdn) {
cur_frm.cscript.validate_taxes_and_charges(cdt, cdn);
erpnext.taxes.set_conditional_mandatory_rate_or_amount(frm);
frm.cscript.validate_taxes_and_charges(cdt, cdn);
var open_form = frm.open_grid_row();
if(open_form) {
erpnext.taxes.set_conditional_mandatory_rate_or_amount(open_form);
} else {
// apply in current row
erpnext.taxes.set_conditional_mandatory_rate_or_amount(frm.get_field('taxes').grid.get_grid_row(cdn));
}
});
frappe.ui.form.on(cur_frm.cscript.tax_table, "included_in_print_rate", function(frm, cdt, cdn) {
@@ -160,18 +181,19 @@ if(!erpnext.taxes.flags[cur_frm.cscript.tax_table]) {
});
}
erpnext.taxes.set_conditional_mandatory_rate_or_amount = function(frm) {
var grid_row = frm.open_grid_row();
if(grid_row.doc.charge_type==="Actual") {
grid_row.toggle_display("tax_amount", true);
grid_row.toggle_reqd("tax_amount", true);
grid_row.toggle_display("rate", false);
grid_row.toggle_reqd("rate", false);
} else {
grid_row.toggle_display("rate", true);
grid_row.toggle_reqd("rate", true);
grid_row.toggle_display("tax_amount", false);
grid_row.toggle_reqd("tax_amount", false);
erpnext.taxes.set_conditional_mandatory_rate_or_amount = function(grid_row) {
if(grid_row) {
if(grid_row.doc.charge_type==="Actual") {
grid_row.toggle_editable("tax_amount", true);
grid_row.toggle_reqd("tax_amount", true);
grid_row.toggle_editable("rate", false);
grid_row.toggle_reqd("rate", false);
} else {
grid_row.toggle_editable("rate", true);
grid_row.toggle_reqd("rate", true);
grid_row.toggle_editable("tax_amount", false);
grid_row.toggle_reqd("tax_amount", false);
}
}
}