From bef80bab0d2959904d63c96b7b4c0473361d706d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 11 Dec 2014 16:27:18 +0530 Subject: [PATCH] Removed gross profit field from sales invoice --- .../doctype/sales_invoice/sales_invoice.js | 3 +-- .../doctype/sales_invoice/sales_invoice.json | 23 +------------------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index cc841e2ffcd..a50d69e97f0 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -225,8 +225,7 @@ $.extend(cur_frm.cscript, new erpnext.accounts.SalesInvoiceController({frm: cur_ // Hide Fields // ------------ cur_frm.cscript.hide_fields = function(doc) { - par_flds = ['project_name', 'due_date', 'is_opening', 'source', 'total_advance', 'gross_profit', - 'gross_profit_percent', 'get_advances_received', + par_flds = ['project_name', 'due_date', 'is_opening', 'source', 'total_advance', 'get_advances_received', 'advance_adjustment_details', 'sales_partner', 'commission_rate', 'total_commission', 'advances', 'from_date', 'to_date']; diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 3dcf136d455..b27a2abc756 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -568,27 +568,6 @@ "print_hide": 0, "read_only": 1 }, - { - "fieldname": "gross_profit", - "fieldtype": "Currency", - "label": "Gross Profit", - "oldfieldname": "gross_profit", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, - { - "fieldname": "gross_profit_percent", - "fieldtype": "Float", - "label": "Gross Profit (%)", - "oldfieldname": "gross_profit_percent", - "oldfieldtype": "Currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, { "fieldname": "advances", "fieldtype": "Section Break", @@ -1213,7 +1192,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-10-10 16:54:22.284284", + "modified": "2014-12-11 16:26:12.402110", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice",