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

Coded column deleted, column added from UI

Browse Source
This commit is contained in:
Kanchan Chauhan
2016-08-26 14:25:16 +05:30
parent 4403cf71b5
commit dd96cbd012
40 changed files with 750 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/public/js/controllers/taxes_and_totals.js
View File

@@ -2,18 +2,7 @@
// License: GNU General Public License v3. See license.txt
erpnext.taxes_and_totals = erpnext.payments.extend({
setup: function() {
if(this.frm.get_field('taxes')) {
this.frm.get_field('taxes').grid.editable_fields = [
{fieldname: 'charge_type', columns: 2},
{fieldname: 'account_head', columns: 2},
{fieldname: 'rate', columns: 2},
{fieldname: 'tax_amount', columns: 2},
{fieldname: 'total', columns: 2}
];
}
},
setup: function() {},
apply_pricing_rule_on_item: function(item){
if(!item.margin_type){
item.margin_rate_or_amount = 0.0;

10
erpnext/public/js/controllers/transaction.js
View File

@@ -4,16 +4,6 @@
erpnext.TransactionController = erpnext.taxes_and_totals.extend({
setup: function() {
this._super();
if(in_list(["Sales Invoice", "Purchase Invoice"], this.frm.doc.doctype)) {
this.frm.get_field('advances').grid.editable_fields = [
{fieldname: 'reference_name', columns: 3},
{fieldname: 'remarks', columns: 3},
{fieldname: 'advance_amount', columns: 2},
{fieldname: 'allocated_amount', columns: 2}
];
}
frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
frappe.model.round_floats_in(item, ["rate", "price_list_rate"]);