diff --git a/erpnext/accounts/doctype/asset_category/asset_category.js b/erpnext/accounts/doctype/asset_category/asset_category.js index d5f4864c30..aafe8a69a0 100644 --- a/erpnext/accounts/doctype/asset_category/asset_category.js +++ b/erpnext/accounts/doctype/asset_category/asset_category.js @@ -2,15 +2,6 @@ // For license information, please see license.txt frappe.ui.form.on('Asset Category', { - setup: function(frm) { - frm.get_field('accounts').grid.editable_fields = [ - {fieldname: 'company_name', columns: 3}, - {fieldname: 'fixed_asset_account', columns: 3}, - {fieldname: 'accumulated_depreciation_account', columns: 2}, - {fieldname: 'depreciation_expense_account', columns: 2} - ]; - }, - onload: function(frm) { frm.add_fetch('company_name', 'accumulated_depreciation_account', 'accumulated_depreciation_account'); frm.add_fetch('company_name', 'depreciation_expense_account', 'accumulated_depreciation_account'); diff --git a/erpnext/accounts/doctype/asset_category_account/asset_category_account.json b/erpnext/accounts/doctype/asset_category_account/asset_category_account.json index 5158b994ae..32a60e5669 100644 --- a/erpnext/accounts/doctype/asset_category_account/asset_category_account.json +++ b/erpnext/accounts/doctype/asset_category_account/asset_category_account.json @@ -14,6 +14,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "company_name", "fieldtype": "Link", "hidden": 0, @@ -40,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "fixed_asset_account", "fieldtype": "Link", "hidden": 0, @@ -66,6 +68,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "accumulated_depreciation_account", "fieldtype": "Link", "hidden": 0, @@ -92,6 +95,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "depreciation_expense_account", "fieldtype": "Link", "hidden": 0, @@ -125,7 +129,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:27:58.048060", + "modified": "2016-08-26 01:46:01.604335", "modified_by": "Administrator", "module": "Accounts", "name": "Asset Category Account", diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js index fcd280fd18..85d3187131 100644 --- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js +++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js @@ -5,13 +5,6 @@ frappe.ui.form.on("Bank Reconciliation", { setup: function(frm) { frm.get_docfield("payment_entries").allow_bulk_edit = 1; frm.add_fetch("bank_account", "account_currency", "account_currency"); - - frm.get_field('payment_entries').grid.editable_fields = [ - {fieldname: 'against_account', columns: 3}, - {fieldname: 'amount', columns: 2}, - {fieldname: 'cheque_number', columns: 3}, - {fieldname: 'clearance_date', columns: 2} - ]; }, onload: function(frm) { diff --git a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json index 7308fbc1b5..0f30feefa8 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json +++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json @@ -13,6 +13,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "payment_document", "fieldtype": "Link", "hidden": 0, @@ -39,13 +40,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "payment_entry", "fieldtype": "Dynamic Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Payment Entry", "length": 0, "no_copy": 0, @@ -67,6 +69,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "against_account", "fieldtype": "Data", "hidden": 0, @@ -94,6 +97,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -121,6 +125,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_5", "fieldtype": "Column Break", "hidden": 0, @@ -146,6 +151,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "posting_date", "fieldtype": "Date", "hidden": 0, @@ -172,6 +178,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "cheque_number", "fieldtype": "Data", "hidden": 0, @@ -198,6 +205,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "cheque_date", "fieldtype": "Date", "hidden": 0, @@ -224,6 +232,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "clearance_date", "fieldtype": "Date", "hidden": 0, @@ -258,7 +267,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-07-11 03:27:58.139117", + "modified": "2016-08-26 01:51:36.123941", "modified_by": "Administrator", "module": "Accounts", "name": "Bank Reconciliation Detail", diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 2b06e603a9..13f2f61971 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -6,15 +6,6 @@ frappe.provide("erpnext.journal_entry"); frappe.ui.form.on("Journal Entry", { - setup: function(frm) { - frm.get_field('accounts').grid.editable_fields = [ - {fieldname: 'account', columns: 3}, - {fieldname: 'party', columns: 3}, - {fieldname: 'debit_in_account_currency', columns: 2}, - {fieldname: 'credit_in_account_currency', columns: 2} - ]; - }, - refresh: function(frm) { erpnext.toggle_naming_series(); frm.cscript.voucher_type(frm.doc); diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json index e71b53cba5..18fccbe2c7 100644 --- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json +++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json @@ -14,6 +14,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "account", "fieldtype": "Link", "hidden": 0, @@ -43,6 +44,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "account_type", "fieldtype": "Data", "hidden": 1, @@ -68,6 +70,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "balance", "fieldtype": "Currency", "hidden": 0, @@ -95,6 +98,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": ":Company", "description": "If Income or Expense", "fieldname": "cost_center", @@ -126,6 +130,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -149,6 +154,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "party_type", "fieldtype": "Link", "hidden": 0, @@ -174,6 +180,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "party", "fieldtype": "Dynamic Link", "hidden": 0, @@ -199,6 +206,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "party_balance", "fieldtype": "Currency", "hidden": 0, @@ -226,6 +234,7 @@ "bold": 0, "collapsible": 0, "collapsible_depends_on": "", + "columns": 0, "depends_on": "", "fieldname": "currency_section", "fieldtype": "Section Break", @@ -252,6 +261,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "account_currency", "fieldtype": "Link", "hidden": 0, @@ -278,6 +288,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_10", "fieldtype": "Column Break", "hidden": 0, @@ -302,6 +313,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "exchange_rate", "fieldtype": "Float", "hidden": 0, @@ -327,6 +339,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sec_break1", "fieldtype": "Section Break", "hidden": 0, @@ -351,6 +364,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "fieldname": "debit_in_account_currency", "fieldtype": "Currency", "hidden": 0, @@ -377,6 +391,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "debit", "fieldtype": "Currency", "hidden": 0, @@ -405,6 +420,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -428,6 +444,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "fieldname": "credit_in_account_currency", "fieldtype": "Currency", "hidden": 0, @@ -454,6 +471,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "credit", "fieldtype": "Currency", "hidden": 0, @@ -482,6 +500,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference", "fieldtype": "Section Break", "hidden": 0, @@ -506,6 +525,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference_type", "fieldtype": "Select", "hidden": 0, @@ -532,6 +552,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference_name", "fieldtype": "Dynamic Link", "hidden": 0, @@ -558,6 +579,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "project", "fieldtype": "Link", "hidden": 0, @@ -584,6 +606,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -607,6 +630,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "is_advance", "fieldtype": "Select", "hidden": 0, @@ -634,6 +658,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "against_account", "fieldtype": "Text", "hidden": 1, @@ -667,7 +692,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:01.575159", + "modified": "2016-08-26 01:54:32.267927", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Entry Account", diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 4578f308b3..219fbf2e73 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -11,13 +11,6 @@ frappe.ui.form.on('Payment Entry', { }, setup: function(frm) { - frm.get_field('references').grid.editable_fields = [ - {fieldname: 'reference_doctype', columns: 2}, - {fieldname: 'reference_name', columns: 2}, - {fieldname: 'outstanding_amount', columns: 3}, - {fieldname: 'allocated_amount', columns: 3} - ]; - var party_account_type = frm.doc.party_type=="Customer" ? "Receivable" : "Payable"; frm.set_query("paid_from", function() { diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json index 64417481ff..c3e0407651 100644 --- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json +++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json @@ -14,13 +14,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "reference_doctype", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Type", "length": 0, "no_copy": 0, @@ -40,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "reference_name", "fieldtype": "Dynamic Link", "hidden": 0, @@ -66,6 +68,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "due_date", "fieldtype": "Date", "hidden": 0, @@ -91,6 +94,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_4", "fieldtype": "Column Break", "hidden": 0, @@ -115,6 +119,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_amount", "fieldtype": "Float", "hidden": 0, @@ -140,6 +145,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "outstanding_amount", "fieldtype": "Float", "hidden": 0, @@ -165,6 +171,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "allocated_amount", "fieldtype": "Float", "hidden": 0, @@ -190,6 +197,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "exchange_rate", "fieldtype": "Float", "hidden": 0, @@ -222,7 +230,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-14 14:48:13.356944", + "modified": "2016-08-26 01:59:04.697274", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Entry Reference", diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js index 027fa63ca0..6a951a0aff 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js @@ -4,15 +4,6 @@ frappe.provide("erpnext.accounts"); erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.extend({ - setup: function() { - this.frm.get_field('payments').grid.editable_fields = [ - {fieldname: 'reference_name', columns: 3}, - {fieldname: 'invoice_number', columns: 3}, - {fieldname: 'amount', columns: 2}, - {fieldname: 'allocated_amount', columns: 2} - ]; - }, - onload: function() { var me = this this.frm.set_query('party_type', function() { diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json index 681cd53094..f77560c139 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json +++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json @@ -14,6 +14,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference_type", "fieldtype": "Link", "hidden": 0, @@ -39,6 +40,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "reference_name", "fieldtype": "Dynamic Link", "hidden": 0, @@ -65,13 +67,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "posting_date", "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Posting Date", "length": 0, "no_copy": 0, @@ -89,30 +92,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "amount", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Amount", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, + "columns": 0, "fieldname": "is_advance", "fieldtype": "Data", "hidden": 1, @@ -137,6 +117,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference_row", "fieldtype": "Data", "hidden": 1, @@ -161,6 +142,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -185,6 +167,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "invoice_number", "fieldtype": "Select", "hidden": 0, @@ -210,6 +193,32 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, + "fieldname": "amount", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 1, + "label": "Amount", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 2, "fieldname": "allocated_amount", "fieldtype": "Currency", "hidden": 0, @@ -235,6 +244,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sec_break1", "fieldtype": "Section Break", "hidden": 0, @@ -259,6 +269,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "remark", "fieldtype": "Small Text", "hidden": 0, @@ -291,7 +302,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-07-11 03:28:03.672936", + "modified": "2016-08-26 02:08:35.879133", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Reconciliation Payment", diff --git a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json index d73fa99348..49582a4ed5 100644 --- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json +++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -14,6 +14,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference_type", "fieldtype": "Link", "hidden": 0, @@ -43,6 +44,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "reference_name", "fieldtype": "Dynamic Link", "hidden": 0, @@ -69,6 +71,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "remarks", "fieldtype": "Text", "hidden": 0, @@ -97,6 +100,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference_row", "fieldtype": "Data", "hidden": 1, @@ -125,6 +129,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -148,6 +153,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "advance_amount", "fieldtype": "Currency", "hidden": 0, @@ -177,6 +183,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "allocated_amount", "fieldtype": "Currency", "hidden": 0, @@ -214,7 +221,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-07-18 05:13:42.137419", + "modified": "2016-08-26 02:30:54.407138", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Advance", diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json index c822b93855..d4e20f902f 100755 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -42,6 +43,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -65,13 +67,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Item Name", "length": 0, "no_copy": 0, @@ -91,6 +94,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "description_section", "fieldtype": "Section Break", "hidden": 0, @@ -116,6 +120,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -144,6 +149,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -169,6 +175,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -195,6 +202,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_rate", "fieldtype": "Section Break", "hidden": 0, @@ -219,6 +227,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "received_qty", "fieldtype": "Float", "hidden": 0, @@ -244,6 +253,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -270,6 +280,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rejected_qty", "fieldtype": "Float", "hidden": 0, @@ -295,6 +306,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -318,13 +330,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "UOM", "length": 0, "no_copy": 0, @@ -343,6 +356,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "conversion_factor", "fieldtype": "Float", "hidden": 0, @@ -367,6 +381,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sec_break1", "fieldtype": "Section Break", "hidden": 0, @@ -390,6 +405,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -415,6 +431,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "discount_percentage", "fieldtype": "Percent", @@ -422,7 +439,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Discount on Price List Rate (%)", "length": 0, "no_copy": 0, @@ -440,6 +457,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -463,6 +481,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -488,6 +507,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sec_break2", "fieldtype": "Section Break", "hidden": 0, @@ -511,6 +531,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "rate", "fieldtype": "Currency", "hidden": 0, @@ -538,6 +559,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -565,6 +587,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -588,6 +611,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rate", "fieldtype": "Currency", "hidden": 0, @@ -615,6 +639,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_amount", "fieldtype": "Currency", "hidden": 0, @@ -642,6 +667,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "pricing_rule", "fieldtype": "Link", "hidden": 0, @@ -667,6 +693,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_22", "fieldtype": "Section Break", "hidden": 0, @@ -691,6 +718,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_rate", "fieldtype": "Currency", "hidden": 0, @@ -717,6 +745,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_amount", "fieldtype": "Currency", "hidden": 0, @@ -743,6 +772,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_25", "fieldtype": "Column Break", "hidden": 0, @@ -767,6 +797,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_rate", "fieldtype": "Currency", "hidden": 0, @@ -793,6 +824,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_amount", "fieldtype": "Currency", "hidden": 0, @@ -819,6 +851,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse_section", "fieldtype": "Section Break", "hidden": 0, @@ -844,6 +877,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "", "fieldname": "warehouse", "fieldtype": "Link", @@ -871,6 +905,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rejected_warehouse", "fieldtype": "Link", "hidden": 0, @@ -897,6 +932,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "batch_no", "fieldtype": "Link", "hidden": 0, @@ -923,6 +959,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_br_wh", "fieldtype": "Column Break", "hidden": 0, @@ -948,6 +985,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "serial_no", "fieldtype": "Text", "hidden": 0, @@ -973,6 +1011,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rejected_serial_no", "fieldtype": "Text", "hidden": 0, @@ -998,6 +1037,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "accounting", "fieldtype": "Section Break", "hidden": 0, @@ -1022,6 +1062,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "expense_account", "fieldtype": "Link", "hidden": 0, @@ -1051,6 +1092,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break5", "fieldtype": "Column Break", "hidden": 0, @@ -1074,6 +1116,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "project", "fieldtype": "Link", "hidden": 0, @@ -1099,6 +1142,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": ":Company", "depends_on": "eval:!doc.is_fixed_asset", "fieldname": "cost_center", @@ -1130,6 +1174,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference", "fieldtype": "Section Break", "hidden": 0, @@ -1154,6 +1199,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Data", "hidden": 1, @@ -1180,6 +1226,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -1208,6 +1255,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", "fieldname": "item_tax_rate", "fieldtype": "Code", @@ -1235,6 +1283,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_tax_amount", "fieldtype": "Currency", "hidden": 1, @@ -1262,6 +1311,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "purchase_order", "fieldtype": "Link", "hidden": 0, @@ -1289,6 +1339,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "bom", "fieldtype": "Link", "hidden": 0, @@ -1315,6 +1366,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break6", "fieldtype": "Column Break", "hidden": 0, @@ -1338,6 +1390,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "is_fixed_asset", "fieldtype": "Check", "hidden": 1, @@ -1363,6 +1416,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "is_fixed_asset", "fieldname": "asset", "fieldtype": "Link", @@ -1390,6 +1444,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "po_detail", "fieldtype": "Data", "hidden": 1, @@ -1416,6 +1471,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "purchase_receipt", "fieldtype": "Link", "hidden": 0, @@ -1443,6 +1499,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -1467,6 +1524,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "pr_detail", "fieldtype": "Data", "hidden": 1, @@ -1493,6 +1551,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "valuation_rate", "fieldtype": "Currency", "hidden": 1, @@ -1518,6 +1577,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rm_supp_cost", "fieldtype": "Currency", "hidden": 1, @@ -1543,6 +1603,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "landed_cost_voucher_amount", "fieldtype": "Currency", "hidden": 0, @@ -1575,7 +1636,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:04.932212", + "modified": "2016-08-26 04:37:23.737537", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item", diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json index 83762e1114..47e6889cd4 100644 --- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json @@ -8,12 +8,14 @@ "custom": 0, "docstatus": 0, "doctype": "DocType", + "document_type": "Setup", "editable_grid": 1, "fields": [ { "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Valuation and Total", "fieldname": "category", "fieldtype": "Select", @@ -42,6 +44,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Add", "fieldname": "add_deduct_tax", "fieldtype": "Select", @@ -70,6 +73,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "charge_type", "fieldtype": "Select", "hidden": 0, @@ -97,6 +101,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:[\"On Previous Row Amount\", \"On Previous Row Total\"].indexOf(doc.charge_type)!==-1", "fieldname": "row_id", "fieldtype": "Data", @@ -124,6 +129,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount", "fieldname": "included_in_print_rate", "fieldtype": "Check", @@ -150,6 +156,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -173,13 +180,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "account_head", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Account Head", "length": 0, "no_copy": 0, @@ -200,6 +208,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": ":Company", "fieldname": "cost_center", "fieldtype": "Link", @@ -228,13 +237,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "length": 0, "no_copy": 0, @@ -256,6 +266,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_10", "fieldtype": "Section Break", "hidden": 0, @@ -280,6 +291,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "rate", "fieldtype": "Float", "hidden": 0, @@ -306,6 +318,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_9", "fieldtype": "Section Break", "hidden": 0, @@ -330,6 +343,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "tax_amount", "fieldtype": "Currency", "hidden": 0, @@ -357,6 +371,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "tax_amount_after_discount_amount", "fieldtype": "Currency", "hidden": 0, @@ -383,13 +398,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "total", "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Total", "length": 0, "no_copy": 0, @@ -410,6 +426,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_14", "fieldtype": "Column Break", "hidden": 0, @@ -434,6 +451,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_tax_amount", "fieldtype": "Currency", "hidden": 0, @@ -460,6 +478,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_total", "fieldtype": "Currency", "hidden": 1, @@ -486,6 +505,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_tax_amount_after_discount_amount", "fieldtype": "Currency", "hidden": 0, @@ -512,6 +532,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_wise_tax_detail", "fieldtype": "Code", "hidden": 1, @@ -538,6 +559,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "parenttype", "fieldtype": "Data", "hidden": 1, @@ -571,7 +593,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:06.117769", + "modified": "2016-08-26 03:20:22.118330", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Taxes and Charges", diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json index 069ac3ab24..dbbe368671 100644 --- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json +++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json @@ -14,6 +14,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference_type", "fieldtype": "Link", "hidden": 0, @@ -43,6 +44,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "reference_name", "fieldtype": "Dynamic Link", "hidden": 0, @@ -69,6 +71,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "remarks", "fieldtype": "Text", "hidden": 0, @@ -97,6 +100,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference_row", "fieldtype": "Data", "hidden": 1, @@ -125,6 +129,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -148,6 +153,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "advance_amount", "fieldtype": "Currency", "hidden": 0, @@ -177,6 +183,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "allocated_amount", "fieldtype": "Currency", "hidden": 0, @@ -214,7 +221,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-07-18 05:13:21.819598", + "modified": "2016-08-26 02:36:10.718057", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Advance", diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index a408643667..dd46e762af 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "barcode", "fieldtype": "Data", "hidden": 0, @@ -39,6 +40,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 4, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -66,6 +68,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -89,13 +92,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Item Name", "length": 0, "no_copy": 0, @@ -115,6 +119,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "customer_item_code", "fieldtype": "Data", "hidden": 1, @@ -139,6 +144,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_6", "fieldtype": "Section Break", "hidden": 0, @@ -164,6 +170,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -192,6 +199,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_8", "fieldtype": "Column Break", "hidden": 0, @@ -216,6 +224,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -242,6 +251,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -267,6 +277,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_rate", "fieldtype": "Section Break", "hidden": 0, @@ -291,6 +302,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -317,6 +329,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -344,6 +357,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -367,13 +381,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "UOM", "length": 0, "no_copy": 0, @@ -392,6 +407,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -419,6 +435,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "discount_and_margin", "fieldtype": "Section Break", "hidden": 0, @@ -444,6 +461,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "discount_percentage", "fieldtype": "Percent", @@ -451,7 +469,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Discount on Price List Rate (%)", "length": 0, "no_copy": 0, @@ -471,6 +489,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_19", "fieldtype": "Column Break", "hidden": 0, @@ -495,6 +514,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "margin_type", "fieldtype": "Select", @@ -522,6 +542,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "margin_rate_or_amount", "fieldtype": "Float", @@ -548,6 +569,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "total_margin", "fieldtype": "Float", @@ -574,6 +596,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break1", "fieldtype": "Section Break", "hidden": 0, @@ -597,6 +620,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "fieldname": "rate", "fieldtype": "Currency", "hidden": 0, @@ -624,6 +648,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -651,6 +676,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -674,6 +700,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rate", "fieldtype": "Currency", "hidden": 0, @@ -701,6 +728,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_amount", "fieldtype": "Currency", "hidden": 0, @@ -728,6 +756,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "pricing_rule", "fieldtype": "Link", "hidden": 0, @@ -753,6 +782,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_21", "fieldtype": "Section Break", "hidden": 0, @@ -777,6 +807,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_rate", "fieldtype": "Currency", "hidden": 0, @@ -803,6 +834,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_amount", "fieldtype": "Currency", "hidden": 0, @@ -829,6 +861,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_24", "fieldtype": "Column Break", "hidden": 0, @@ -853,6 +886,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_rate", "fieldtype": "Currency", "hidden": 0, @@ -879,6 +913,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_amount", "fieldtype": "Currency", "hidden": 0, @@ -906,6 +941,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "eval:doc.delivered_by_supplier==1", + "columns": 0, "fieldname": "drop_ship", "fieldtype": "Section Break", "hidden": 0, @@ -931,6 +967,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "delivered_by_supplier", "fieldtype": "Check", "hidden": 0, @@ -956,6 +993,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "accounting", "fieldtype": "Section Break", "hidden": 0, @@ -980,6 +1018,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "income_account", "fieldtype": "Link", "hidden": 0, @@ -1009,6 +1048,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "expense_account", "fieldtype": "Link", "hidden": 0, @@ -1035,6 +1075,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -1058,6 +1099,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": ":Company", "fieldname": "cost_center", "fieldtype": "Link", @@ -1089,6 +1131,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "eval:doc.serial_no || doc.batch_no", + "columns": 0, "fieldname": "warehouse_and_reference", "fieldtype": "Section Break", "hidden": 0, @@ -1113,6 +1156,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -1140,6 +1184,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "target_warehouse", "fieldtype": "Link", "hidden": 1, @@ -1166,6 +1211,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "serial_no", "fieldtype": "Small Text", "hidden": 0, @@ -1192,6 +1238,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "batch_no", "fieldtype": "Link", "hidden": 0, @@ -1217,6 +1264,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -1245,6 +1293,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Data", "hidden": 1, @@ -1271,6 +1320,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_tax_rate", "fieldtype": "Small Text", "hidden": 1, @@ -1297,6 +1347,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break5", "fieldtype": "Column Break", "hidden": 0, @@ -1320,6 +1371,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "actual_batch_qty", "fieldtype": "Float", "hidden": 0, @@ -1347,6 +1399,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "actual_qty", "fieldtype": "Float", "hidden": 0, @@ -1373,6 +1426,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "edit_references", "fieldtype": "Section Break", "hidden": 0, @@ -1398,6 +1452,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sales_order", "fieldtype": "Link", "hidden": 0, @@ -1425,6 +1480,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "so_detail", "fieldtype": "Data", "hidden": 1, @@ -1451,6 +1507,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_50", "fieldtype": "Column Break", "hidden": 0, @@ -1475,6 +1532,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "delivery_note", "fieldtype": "Link", "hidden": 0, @@ -1502,6 +1560,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "dn_detail", "fieldtype": "Data", "hidden": 1, @@ -1528,6 +1587,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "delivered_qty", "fieldtype": "Float", "hidden": 0, @@ -1554,6 +1614,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "is_fixed_asset", "fieldtype": "Check", "hidden": 1, @@ -1579,6 +1640,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "asset", "fieldtype": "Link", "hidden": 0, @@ -1605,6 +1667,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_54", "fieldtype": "Section Break", "hidden": 0, @@ -1629,6 +1692,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -1660,7 +1724,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:07.483665", + "modified": "2016-08-26 04:48:29.142409", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item", diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json index 3c1a8fed78..9f6c0036b5 100644 --- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json +++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json @@ -8,12 +8,14 @@ "custom": 0, "docstatus": 0, "doctype": "DocType", + "document_type": "Setup", "editable_grid": 1, "fields": [ { "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "charge_type", "fieldtype": "Select", "hidden": 0, @@ -41,6 +43,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:[\"On Previous Row Amount\", \"On Previous Row Total\"].indexOf(doc.charge_type)!==-1", "fieldname": "row_id", "fieldtype": "Data", @@ -68,13 +71,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "account_head", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Account Head", "length": 0, "no_copy": 0, @@ -95,6 +99,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": ":Company", "fieldname": "cost_center", "fieldtype": "Link", @@ -123,6 +128,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break_1", "fieldtype": "Column Break", "hidden": 0, @@ -147,13 +153,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "length": 0, "no_copy": 0, @@ -175,6 +182,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount", "fieldname": "included_in_print_rate", "fieldtype": "Check", @@ -202,6 +210,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_8", "fieldtype": "Section Break", "hidden": 0, @@ -226,6 +235,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "rate", "fieldtype": "Float", "hidden": 0, @@ -252,6 +262,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_9", "fieldtype": "Section Break", "hidden": 0, @@ -276,6 +287,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "tax_amount", "fieldtype": "Currency", "hidden": 0, @@ -302,13 +314,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "total", "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Total", "length": 0, "no_copy": 0, @@ -328,6 +341,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "tax_amount_after_discount_amount", "fieldtype": "Currency", "hidden": 0, @@ -354,6 +368,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_13", "fieldtype": "Column Break", "hidden": 0, @@ -378,6 +393,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_tax_amount", "fieldtype": "Currency", "hidden": 0, @@ -405,6 +421,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_total", "fieldtype": "Currency", "hidden": 0, @@ -432,6 +449,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:parent.discount_amount", "fieldname": "base_tax_amount_after_discount_amount", "fieldtype": "Currency", @@ -458,6 +476,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_wise_tax_detail", "fieldtype": "Code", "hidden": 1, @@ -484,6 +503,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "parenttype", "fieldtype": "Data", "hidden": 1, @@ -517,7 +537,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:08.283145", + "modified": "2016-08-26 03:08:03.235381", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Taxes and Charges", diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index 6e27546cce..ccf7a2faec 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -12,14 +12,6 @@ cur_frm.email_field = "contact_email"; erpnext.buying.BuyingController = erpnext.TransactionController.extend({ setup: function() { this._super(); - if(!in_list(["Material Request", "Request for Quotation"], this.frm.doc.doctype)){ - this.frm.get_field('items').grid.editable_fields = [ - {fieldname: 'item_code', columns: 3}, - {fieldname: 'qty', columns: 2}, - {fieldname: 'rate', columns: 3}, - {fieldname: 'amount', columns: 2} - ]; - } }, onload: function() { diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json index adb4bde802..de76c82d5f 100755 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -42,6 +43,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "supplier_part_no", "fieldtype": "Data", @@ -67,13 +69,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Item Name", "length": 0, "no_copy": 0, @@ -93,6 +96,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_4", "fieldtype": "Column Break", "hidden": 0, @@ -117,6 +121,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "schedule_date", "fieldtype": "Date", "hidden": 0, @@ -143,6 +148,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_5", "fieldtype": "Section Break", "hidden": 0, @@ -168,6 +174,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -196,6 +203,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -219,6 +227,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -244,6 +253,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -270,6 +280,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_rate", "fieldtype": "Section Break", "hidden": 0, @@ -294,6 +305,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -322,13 +334,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Stock UOM", "length": 0, "no_copy": 0, @@ -351,6 +364,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -374,13 +388,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "UOM", "length": 0, "no_copy": 0, @@ -403,6 +418,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "conversion_factor", "fieldtype": "Float", "hidden": 0, @@ -431,6 +447,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sec_break1", "fieldtype": "Section Break", "hidden": 0, @@ -454,6 +471,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -479,6 +497,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "discount_percentage", "fieldtype": "Percent", @@ -486,7 +505,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Discount on Price List Rate (%)", "length": 0, "no_copy": 0, @@ -504,6 +523,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -527,6 +547,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -552,6 +573,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sec_break2", "fieldtype": "Section Break", "hidden": 0, @@ -575,6 +597,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "rate", "fieldtype": "Currency", "hidden": 0, @@ -602,6 +625,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -629,6 +653,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -652,6 +677,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rate", "fieldtype": "Currency", "hidden": 0, @@ -681,6 +707,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_amount", "fieldtype": "Currency", "hidden": 0, @@ -708,6 +735,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "pricing_rule", "fieldtype": "Link", "hidden": 0, @@ -733,6 +761,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_29", "fieldtype": "Section Break", "hidden": 0, @@ -757,6 +786,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_rate", "fieldtype": "Currency", "hidden": 0, @@ -783,6 +813,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_amount", "fieldtype": "Currency", "hidden": 0, @@ -809,6 +840,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_32", "fieldtype": "Column Break", "hidden": 0, @@ -833,6 +865,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_rate", "fieldtype": "Currency", "hidden": 0, @@ -859,6 +892,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_amount", "fieldtype": "Currency", "hidden": 0, @@ -885,6 +919,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse_and_reference", "fieldtype": "Section Break", "hidden": 0, @@ -909,6 +944,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -936,6 +972,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "project", "fieldtype": "Link", "hidden": 0, @@ -961,6 +998,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "material_request", "fieldtype": "Link", "hidden": 0, @@ -990,6 +1028,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "material_request_item", "fieldtype": "Data", "hidden": 1, @@ -1016,6 +1055,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sales_order", "fieldtype": "Link", "hidden": 0, @@ -1042,6 +1082,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sales_order_item", "fieldtype": "Data", "hidden": 1, @@ -1067,6 +1108,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplier_quotation", "fieldtype": "Link", "hidden": 0, @@ -1092,6 +1134,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplier_quotation_item", "fieldtype": "Link", "hidden": 1, @@ -1117,6 +1160,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "delivered_by_supplier", "fieldtype": "Check", "hidden": 0, @@ -1142,6 +1186,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break5", "fieldtype": "Column Break", "hidden": 0, @@ -1165,6 +1210,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -1193,6 +1239,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Link", "hidden": 1, @@ -1220,6 +1267,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "bom", "fieldtype": "Link", "hidden": 0, @@ -1246,6 +1294,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_qty", "fieldtype": "Float", "hidden": 0, @@ -1274,6 +1323,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "received_qty", "fieldtype": "Float", "hidden": 0, @@ -1300,6 +1350,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "returned_qty", "fieldname": "returned_qty", "fieldtype": "Float", @@ -1326,6 +1377,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "billed_amt", "fieldtype": "Currency", "hidden": 0, @@ -1351,6 +1403,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", "fieldname": "item_tax_rate", "fieldtype": "Code", @@ -1378,6 +1431,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -1411,7 +1465,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:05.251792", + "modified": "2016-08-26 04:41:17.371535", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order Item", diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js index d126eb091e..6847a98aa1 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js @@ -14,19 +14,6 @@ frappe.ui.form.on("Request for Quotation",{ filters: {'supplier': d.supplier} } } - - frm.get_field('items').grid.editable_fields = [ - {fieldname: 'item_code', columns: 3}, - {fieldname: 'qty', columns: 2}, - {fieldname: 'schedule_date', columns: 2}, - {fieldname: 'warehouse', columns: 3}, - ]; - - frm.get_field('suppliers').grid.editable_fields = [ - {fieldname: 'supplier', columns: 4}, - {fieldname: 'contact', columns: 3}, - {fieldname: 'email_id', columns: 3} - ]; }, onload: function(frm) { diff --git a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json index 720cb23677..cc7e36cfcb 100644 --- a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json +++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -43,6 +44,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplier_part_no", "fieldtype": "Data", "hidden": 1, @@ -68,6 +70,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_3", "fieldtype": "Column Break", "hidden": 0, @@ -92,13 +95,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Item Name", "length": 0, "no_copy": 0, @@ -119,6 +123,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_5", "fieldtype": "Section Break", "hidden": 0, @@ -144,6 +149,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -173,6 +179,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -197,6 +204,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -222,6 +230,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -248,6 +257,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity", "fieldtype": "Section Break", "hidden": 0, @@ -273,6 +283,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -302,6 +313,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -326,6 +338,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "default": "Today", "fieldname": "schedule_date", "fieldtype": "Date", @@ -333,7 +346,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Required Date", "length": 0, "no_copy": 0, @@ -352,13 +365,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "UOM", "length": 0, "no_copy": 0, @@ -382,6 +396,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse_and_reference", "fieldtype": "Section Break", "hidden": 0, @@ -407,6 +422,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -435,6 +451,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "project_name", "fieldtype": "Link", "hidden": 0, @@ -461,6 +478,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "material_request", "fieldtype": "Link", "hidden": 0, @@ -487,6 +505,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -511,6 +530,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "material_request_item", "fieldtype": "Data", "hidden": 1, @@ -536,6 +556,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Link", "hidden": 0, @@ -564,6 +585,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -593,6 +615,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -627,7 +650,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:06.681590", + "modified": "2016-08-26 02:40:48.487168", "modified_by": "Administrator", "module": "Buying", "name": "Request for Quotation Item", diff --git a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json index efd81b750a..c2979a1021 100644 --- a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json +++ b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json @@ -14,6 +14,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "default": "1", "fieldname": "send_email", "fieldtype": "Check", @@ -40,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 4, "fieldname": "supplier", "fieldtype": "Link", "hidden": 0, @@ -66,6 +68,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "contact", "fieldtype": "Link", "hidden": 0, @@ -92,6 +95,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_3", "fieldtype": "Column Break", "hidden": 0, @@ -116,13 +120,14 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "supplier_name", "fieldtype": "Read Only", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Supplier Name", "length": 0, "no_copy": 0, @@ -142,13 +147,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "email_id", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Email Id", "length": 0, "no_copy": 1, @@ -168,6 +174,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "download_pdf", "fieldtype": "Button", "hidden": 0, @@ -200,7 +207,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:06.830030", + "modified": "2016-08-26 02:38:45.634613", "modified_by": "Administrator", "module": "Buying", "name": "Request for Quotation Supplier", diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json index f7183b9c24..2f4b39026a 100644 --- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json +++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json @@ -8,12 +8,14 @@ "custom": 0, "docstatus": 0, "doctype": "DocType", + "document_type": "Document", "editable_grid": 1, "fields": [ { "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 4, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -41,6 +43,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "supplier_part_no", "fieldtype": "Data", @@ -66,6 +69,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_3", "fieldtype": "Column Break", "hidden": 0, @@ -90,13 +94,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Item Name", "length": 0, "no_copy": 0, @@ -116,6 +121,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_5", "fieldtype": "Section Break", "hidden": 0, @@ -141,6 +147,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -169,6 +176,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -192,6 +200,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -217,6 +226,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -243,6 +253,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_rate", "fieldtype": "Section Break", "hidden": 0, @@ -267,6 +278,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -295,6 +307,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -320,6 +333,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "discount_percentage", "fieldtype": "Percent", @@ -327,7 +341,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Discount on Price List Rate (%)", "length": 0, "no_copy": 0, @@ -345,6 +359,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -368,13 +383,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "UOM", "length": 0, "no_copy": 0, @@ -397,6 +413,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -422,6 +439,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sec_break1", "fieldtype": "Section Break", "hidden": 0, @@ -445,6 +463,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "fieldname": "rate", "fieldtype": "Currency", "hidden": 0, @@ -472,6 +491,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -499,6 +519,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -522,6 +543,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rate", "fieldtype": "Currency", "hidden": 0, @@ -536,6 +558,7 @@ "oldfieldtype": "Currency", "options": "Company:company:default_currency", "permlevel": 0, + "precision": "2", "print_hide": 1, "print_hide_if_no_value": 0, "print_width": "100px", @@ -551,6 +574,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_amount", "fieldtype": "Currency", "hidden": 0, @@ -578,6 +602,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "pricing_rule", "fieldtype": "Link", "hidden": 0, @@ -603,6 +628,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_24", "fieldtype": "Section Break", "hidden": 0, @@ -627,6 +653,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_rate", "fieldtype": "Currency", "hidden": 0, @@ -652,6 +679,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_amount", "fieldtype": "Currency", "hidden": 0, @@ -678,6 +706,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_27", "fieldtype": "Column Break", "hidden": 0, @@ -702,6 +731,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_rate", "fieldtype": "Currency", "hidden": 0, @@ -728,6 +758,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_amount", "fieldtype": "Currency", "hidden": 0, @@ -754,6 +785,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse_and_reference", "fieldtype": "Section Break", "hidden": 0, @@ -778,6 +810,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -805,6 +838,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "project", "fieldtype": "Link", "hidden": 0, @@ -830,6 +864,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "prevdoc_doctype", "fieldtype": "Data", "hidden": 1, @@ -856,6 +891,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "material_request", "fieldtype": "Link", "hidden": 0, @@ -885,6 +921,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "request_for_quotation", "fieldtype": "Link", "hidden": 0, @@ -911,6 +948,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -934,6 +972,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "material_request_item", "fieldtype": "Data", "hidden": 1, @@ -960,6 +999,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "request_for_quotation_item", "fieldtype": "Data", "hidden": 1, @@ -985,6 +1025,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Link", "hidden": 0, @@ -1012,6 +1053,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -1040,6 +1082,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", "fieldname": "item_tax_rate", "fieldtype": "Code", @@ -1067,6 +1110,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -1100,7 +1144,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:09.043961", + "modified": "2016-08-26 04:51:44.857545", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation Item", diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js index 2fbdbcbad1..94f9d38f45 100644 --- a/erpnext/manufacturing/doctype/bom/bom.js +++ b/erpnext/manufacturing/doctype/bom/bom.js @@ -4,14 +4,6 @@ frappe.provide("erpnext.bom"); frappe.ui.form.on("BOM", { - setup: function(frm) { - frm.get_field('items').grid.editable_fields = [ - {fieldname: 'item_code', columns: 3}, - {fieldname: 'item_name', columns: 3}, - {fieldname: 'qty', columns: 2}, - {fieldname: 'rate', columns: 2} - ]; - }, onload_post_render: function(frm) { frm.get_field("items").grid.set_multiple_add("item_code", "qty"); }, diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json index a9f9229a99..d485abc168 100644 --- a/erpnext/manufacturing/doctype/bom_item/bom_item.json +++ b/erpnext/manufacturing/doctype/bom_item/bom_item.json @@ -13,6 +13,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -40,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, @@ -65,6 +67,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_3", "fieldtype": "Column Break", "hidden": 0, @@ -89,6 +92,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "bom_no", "fieldtype": "Link", "hidden": 0, @@ -118,6 +122,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_5", "fieldtype": "Section Break", "hidden": 0, @@ -142,6 +147,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -170,6 +176,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -193,6 +200,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -218,6 +226,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -244,6 +253,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_rate", "fieldtype": "Section Break", "hidden": 0, @@ -268,6 +278,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -294,6 +305,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "description": "See \"Rate Of Materials Based On\" in Costing Section", "fieldname": "rate", "fieldtype": "Currency", @@ -320,6 +332,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -343,6 +356,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_uom", "fieldtype": "Link", "hidden": 0, @@ -370,6 +384,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -399,6 +414,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "scrap", "fieldtype": "Float", "hidden": 0, @@ -425,6 +441,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "qty_consumed_per_unit", "fieldtype": "Float", "hidden": 1, @@ -458,7 +475,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:27:58.497370", + "modified": "2016-08-26 02:42:40.468812", "modified_by": "Administrator", "module": "Manufacturing", "name": "BOM Item", diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js index bb9e1fdfec..5bb9dd6d8e 100644 --- a/erpnext/projects/doctype/project/project.js +++ b/erpnext/projects/doctype/project/project.js @@ -2,15 +2,6 @@ // License: GNU General Public License v3. See license.txt frappe.ui.form.on("Project", { - setup: function(frm) { - frm.get_field('tasks').grid.editable_fields = [ - {fieldname: 'title', columns: 3}, - {fieldname: 'status', columns: 3}, - {fieldname: 'start_date', columns: 2}, - {fieldname: 'end_date', columns: 2} - ]; - - }, onload: function(frm) { var so = frappe.meta.get_docfield("Project", "sales_order"); so.get_route_options_for_new_doc = function(field) { diff --git a/erpnext/projects/doctype/project_task/project_task.json b/erpnext/projects/doctype/project_task/project_task.json index c21a3ad8e8..a0ef69df0c 100644 --- a/erpnext/projects/doctype/project_task/project_task.json +++ b/erpnext/projects/doctype/project_task/project_task.json @@ -14,6 +14,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "title", "fieldtype": "Data", "hidden": 0, @@ -39,6 +40,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "default": "Open", "fieldname": "status", "fieldtype": "Select", @@ -66,6 +68,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "task_id", "fieldname": "edit_task", "fieldtype": "Button", @@ -92,6 +95,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_3", "fieldtype": "Column Break", "hidden": 0, @@ -116,6 +120,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "start_date", "fieldtype": "Date", "hidden": 0, @@ -141,6 +146,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "default": "", "fieldname": "end_date", "fieldtype": "Date", @@ -148,7 +154,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "End Date", "length": 0, "no_copy": 0, @@ -167,6 +173,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_6", "fieldtype": "Section Break", "hidden": 0, @@ -191,6 +198,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -216,6 +224,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "task_id", "fieldtype": "Link", "hidden": 1, @@ -249,7 +258,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:04.669838", + "modified": "2016-08-26 02:44:34.737837", "modified_by": "Administrator", "module": "Projects", "name": "Project Task", diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js index 907d20db5e..42fe005dfc 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.js +++ b/erpnext/projects/doctype/timesheet/timesheet.js @@ -4,14 +4,6 @@ cur_frm.add_fetch('employee', 'employee_name', 'employee_name'); frappe.ui.form.on("Timesheet", { setup: function(frm) { - frm.get_field('time_logs').grid.editable_fields = [ - {fieldname: 'billable', columns: 1}, - {fieldname: 'project', columns: 3}, - {fieldname: 'activity_type', columns: 2}, - {fieldname: 'from_time', columns: 3}, - {fieldname: 'hours', columns: 1} - ]; - frm.fields_dict.employee.get_query = function() { return { filters:{ diff --git a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json index e122b6cf62..9bd4b8df7e 100644 --- a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json +++ b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json @@ -14,6 +14,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 1, "depends_on": "", "fieldname": "billable", "fieldtype": "Check", @@ -21,7 +22,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Bill", "length": 0, "no_copy": 0, @@ -40,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "activity_type", "fieldtype": "Link", "hidden": 0, @@ -65,6 +67,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "from_time", "fieldtype": "Datetime", "hidden": 0, @@ -90,6 +93,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_3", "fieldtype": "Column Break", "hidden": 0, @@ -114,13 +118,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 1, "fieldname": "hours", "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Hrs", "length": 0, "no_copy": 0, @@ -138,13 +143,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "to_time", "fieldtype": "Datetime", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "To Time", "length": 0, "no_copy": 0, @@ -163,6 +169,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "billable", "fieldname": "section_break_11", "fieldtype": "Section Break", @@ -213,6 +220,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "billing_rate", "fieldtype": "Currency", @@ -239,6 +247,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "costing_rate", "fieldtype": "Currency", "hidden": 0, @@ -264,6 +273,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_14", "fieldtype": "Column Break", "hidden": 0, @@ -288,6 +298,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "default": "0", "depends_on": "", "description": "", @@ -297,7 +308,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Billing Amount", "length": 0, "no_copy": 0, @@ -316,6 +327,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "default": "0", "description": "", "fieldname": "costing_amount", @@ -343,6 +355,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_7", "fieldtype": "Section Break", "hidden": 0, @@ -367,6 +380,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:parent.production_order", "fieldname": "completed_qty", "fieldtype": "Float", @@ -393,13 +407,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "project", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Project", "length": 0, "no_copy": 0, @@ -419,6 +434,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "task", "fieldtype": "Link", @@ -446,6 +462,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_12", "fieldtype": "Column Break", "hidden": 0, @@ -470,6 +487,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:parent.production_order", "fieldname": "workstation", "fieldtype": "Link", @@ -497,6 +515,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:parent.production_order", "fieldname": "operation", "fieldtype": "Link", @@ -524,6 +543,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:parent.production_order", "fieldname": "operation_id", "fieldtype": "Data", @@ -557,7 +577,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-08-22 21:20:31.726779", + "modified": "2016-08-26 03:00:11.431794", "modified_by": "Administrator", "module": "Projects", "name": "Timesheet Detail", diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 06c2b3b4b6..9204657102 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -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; diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 2b73cf4a05..34cbbae31b 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -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"]); diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index 034147aca4..2c73a8e136 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 4, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -44,6 +45,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "customer_item_code", "fieldtype": "Data", "hidden": 1, @@ -68,6 +70,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -91,13 +94,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Item Name", "length": 0, "no_copy": 0, @@ -119,6 +123,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_5", "fieldtype": "Section Break", "hidden": 0, @@ -144,6 +149,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -172,6 +178,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_7", "fieldtype": "Column Break", "hidden": 0, @@ -196,6 +203,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -221,6 +229,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -247,6 +256,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_rate", "fieldtype": "Section Break", "hidden": 0, @@ -271,6 +281,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -299,6 +310,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -328,6 +340,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -351,13 +364,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "UOM", "length": 0, "no_copy": 0, @@ -380,6 +394,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -409,6 +424,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "discount_and_margin", "fieldtype": "Section Break", "hidden": 0, @@ -434,6 +450,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "discount_percentage", "fieldtype": "Percent", @@ -441,7 +458,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Discount on Price List Rate (%)", "length": 0, "no_copy": 0, @@ -463,6 +480,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_18", "fieldtype": "Column Break", "hidden": 0, @@ -487,6 +505,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "margin_type", "fieldtype": "Select", @@ -514,6 +533,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "margin_rate_or_amount", "fieldtype": "Float", @@ -540,6 +560,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "total_margin", "fieldtype": "Float", @@ -566,6 +587,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break1", "fieldtype": "Section Break", "hidden": 0, @@ -589,6 +611,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "depends_on": "", "fieldname": "rate", "fieldtype": "Currency", @@ -619,6 +642,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_rate", "fieldtype": "Currency", "hidden": 0, @@ -644,6 +668,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -673,6 +698,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_amount", "fieldtype": "Currency", "hidden": 0, @@ -699,6 +725,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -722,6 +749,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rate", "fieldtype": "Currency", "hidden": 0, @@ -751,6 +779,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_rate", "fieldtype": "Currency", "hidden": 0, @@ -776,6 +805,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_amount", "fieldtype": "Currency", "hidden": 0, @@ -805,6 +835,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_amount", "fieldtype": "Currency", "hidden": 0, @@ -831,6 +862,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "pricing_rule", "fieldtype": "Link", "hidden": 0, @@ -857,6 +889,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "eval:doc.warehouse", + "columns": 0, "fieldname": "item_balance", "fieldtype": "Section Break", "hidden": 0, @@ -882,6 +915,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -908,6 +942,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_30", "fieldtype": "Column Break", "hidden": 0, @@ -932,6 +967,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "projected_qty", "fieldtype": "Float", "hidden": 0, @@ -957,6 +993,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "actual_qty", "fieldtype": "Float", @@ -983,6 +1020,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_balance", "fieldtype": "Button", "hidden": 0, @@ -1008,6 +1046,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "reference", "fieldtype": "Section Break", "hidden": 0, @@ -1032,6 +1071,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "prevdoc_doctype", "fieldtype": "Link", "hidden": 1, @@ -1061,6 +1101,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "prevdoc_docname", "fieldtype": "Dynamic Link", "hidden": 0, @@ -1090,6 +1131,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_tax_rate", "fieldtype": "Code", "hidden": 1, @@ -1116,6 +1158,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -1139,6 +1182,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -1165,6 +1209,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -1193,6 +1238,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Link", "hidden": 1, @@ -1230,7 +1276,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-07-11 03:28:06.436316", + "modified": "2016-08-26 04:46:21.936481", "modified_by": "Administrator", "module": "Selling", "name": "Quotation Item", diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 92abed83e7..35d8b0b1e9 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 4, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -44,6 +45,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "customer_item_code", "fieldtype": "Data", "hidden": 1, @@ -68,6 +70,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -91,13 +94,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Item Name", "length": 0, "no_copy": 0, @@ -119,6 +123,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_5", "fieldtype": "Section Break", "hidden": 0, @@ -144,13 +149,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "length": 0, "no_copy": 0, @@ -172,6 +178,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_7", "fieldtype": "Column Break", "hidden": 0, @@ -196,6 +203,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -221,6 +229,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -247,6 +256,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_rate", "fieldtype": "Section Break", "hidden": 0, @@ -271,6 +281,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -299,6 +310,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -328,6 +340,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -351,13 +364,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "UOM", "length": 0, "no_copy": 0, @@ -380,6 +394,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -409,6 +424,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "discount_and_margin", "fieldtype": "Section Break", "hidden": 0, @@ -434,6 +450,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "discount_percentage", "fieldtype": "Percent", @@ -441,7 +458,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Discount on Price List Rate (%)", "length": 0, "no_copy": 0, @@ -463,6 +480,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_19", "fieldtype": "Column Break", "hidden": 0, @@ -487,6 +505,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "margin_type", "fieldtype": "Select", @@ -514,6 +533,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "margin_rate_or_amount", "fieldtype": "Float", @@ -540,6 +560,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "total_margin", "fieldtype": "Float", @@ -566,6 +587,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_simple1", "fieldtype": "Section Break", "hidden": 0, @@ -589,6 +611,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "depends_on": "eval: doc.type != \"\"", "fieldname": "rate", "fieldtype": "Float", @@ -619,6 +642,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -649,6 +673,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -672,6 +697,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rate", "fieldtype": "Currency", "hidden": 0, @@ -701,6 +727,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_amount", "fieldtype": "Currency", "hidden": 0, @@ -730,6 +757,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "pricing_rule", "fieldtype": "Link", "hidden": 0, @@ -755,6 +783,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_24", "fieldtype": "Section Break", "hidden": 0, @@ -779,6 +808,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_rate", "fieldtype": "Currency", "hidden": 0, @@ -805,6 +835,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_amount", "fieldtype": "Currency", "hidden": 0, @@ -831,6 +862,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_27", "fieldtype": "Column Break", "hidden": 0, @@ -855,6 +887,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_rate", "fieldtype": "Currency", "hidden": 0, @@ -881,6 +914,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_amount", "fieldtype": "Currency", "hidden": 0, @@ -908,6 +942,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "eval:doc.delivered_by_supplier==1||doc.supplier", + "columns": 0, "fieldname": "drop_ship_section", "fieldtype": "Section Break", "hidden": 0, @@ -933,6 +968,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "delivered_by_supplier", "fieldtype": "Check", "hidden": 0, @@ -958,6 +994,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplier", "fieldtype": "Link", "hidden": 0, @@ -984,6 +1021,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse_and_reference", "fieldtype": "Section Break", "hidden": 0, @@ -1008,6 +1046,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.delivered_by_supplier!=1", "fieldname": "warehouse", "fieldtype": "Link", @@ -1038,6 +1077,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.delivered_by_supplier!=1", "fieldname": "target_warehouse", "fieldtype": "Link", @@ -1065,6 +1105,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "prevdoc_docname", "fieldtype": "Link", "hidden": 0, @@ -1092,6 +1133,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Link", "hidden": 1, @@ -1119,6 +1161,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -1147,6 +1190,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -1173,6 +1217,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -1196,6 +1241,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "projected_qty", "fieldtype": "Float", "hidden": 0, @@ -1224,6 +1270,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "actual_qty", "fieldtype": "Float", "hidden": 0, @@ -1250,6 +1297,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "ordered_qty", "fieldtype": "Float", "hidden": 0, @@ -1275,6 +1323,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "delivered_qty", "fieldtype": "Float", "hidden": 0, @@ -1303,6 +1352,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "returned_qty", "fieldname": "returned_qty", "fieldtype": "Float", @@ -1329,6 +1379,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "billed_amt", "fieldtype": "Currency", "hidden": 0, @@ -1354,6 +1405,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "valuation_rate", "fieldtype": "Currency", "hidden": 0, @@ -1380,6 +1432,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "gross_profit", "fieldtype": "Currency", "hidden": 0, @@ -1406,6 +1459,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "For Production", "fieldname": "planned_qty", "fieldtype": "Float", @@ -1435,6 +1489,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "For Production", "fieldname": "produced_qty", "fieldtype": "Float", @@ -1464,6 +1519,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_tax_rate", "fieldtype": "Code", "hidden": 1, @@ -1490,6 +1546,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Used for Production Plan", "fieldname": "transaction_date", "fieldtype": "Date", @@ -1525,7 +1582,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-07-11 03:28:07.988319", + "modified": "2016-08-26 04:50:27.723801", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index 1ec8029725..a04c652104 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -12,12 +12,6 @@ frappe.provide("erpnext.selling"); erpnext.selling.SellingController = erpnext.TransactionController.extend({ setup: function() { this._super(); - this.frm.get_field('items').grid.editable_fields = [ - {fieldname: 'item_code', columns: 4}, - {fieldname: 'qty', columns: 2}, - {fieldname: 'rate', columns: 2}, - {fieldname: 'amount', columns: 2} - ]; }, onload: function() { diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 28817cc25d..78f17d3949 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -4,14 +4,6 @@ {% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %}; frappe.ui.form.on('Material Request', { - setup: function(frm) { - frm.get_field('items').grid.editable_fields = [ - {fieldname: 'item_code', columns: 3}, - {fieldname: 'qty', columns: 2}, - {fieldname: 'warehouse', columns: 3}, - {fieldname: 'schedule_date', columns: 2}, - ]; - }, onload: function(frm) { // formatter for material request item frm.set_indicator_formatter('item_code', diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json index dedc675fc7..85388a7372 100644 --- a/erpnext/stock/doctype/material_request_item/material_request_item.json +++ b/erpnext/stock/doctype/material_request_item/material_request_item.json @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -44,6 +45,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -67,6 +69,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, @@ -95,6 +98,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_4", "fieldtype": "Section Break", "hidden": 0, @@ -120,6 +124,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -148,6 +153,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_6", "fieldtype": "Column Break", "hidden": 0, @@ -172,6 +178,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach Image", "hidden": 0, @@ -197,6 +204,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_warehouse", "fieldtype": "Section Break", "hidden": 0, @@ -221,6 +229,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -249,13 +258,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Stock UOM", "length": 0, "no_copy": 0, @@ -278,6 +288,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -307,6 +318,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -330,6 +342,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 2, "default": "Today", "fieldname": "schedule_date", "fieldtype": "Date", @@ -337,7 +350,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Required Date", "length": 0, "no_copy": 0, @@ -359,6 +372,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "more_info", "fieldtype": "Section Break", "hidden": 0, @@ -383,6 +397,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -411,6 +426,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Link", "hidden": 0, @@ -440,6 +456,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "lead_time_date", "fieldtype": "Date", "hidden": 0, @@ -466,6 +483,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sales_order", "fieldtype": "Link", "hidden": 0, @@ -491,6 +509,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "project", "fieldtype": "Link", "hidden": 0, @@ -517,6 +536,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -540,6 +560,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "min_order_qty", "fieldtype": "Float", "hidden": 0, @@ -568,6 +589,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "projected_qty", "fieldtype": "Float", "hidden": 0, @@ -596,6 +618,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "ordered_qty", "fieldtype": "Float", "hidden": 0, @@ -622,6 +645,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -655,7 +679,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:02.486124", + "modified": "2016-08-26 02:24:43.340269", "modified_by": "Administrator", "module": "Stock", "name": "Material Request Item", diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json index 85ca8880fe..f6e1e3f870 100755 --- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "barcode", "fieldtype": "Data", "hidden": 0, @@ -40,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_2", "fieldtype": "Section Break", "hidden": 0, @@ -64,6 +66,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -93,6 +96,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_2", "fieldtype": "Column Break", "hidden": 0, @@ -117,13 +121,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Item Name", "length": 0, "no_copy": 0, @@ -143,6 +148,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_4", "fieldtype": "Section Break", "hidden": 0, @@ -168,6 +174,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -196,6 +203,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -219,6 +227,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -244,6 +253,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -270,6 +280,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "received_and_accepted", "fieldtype": "Section Break", "hidden": 0, @@ -294,6 +305,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "received_qty", "fieldtype": "Float", "hidden": 0, @@ -322,6 +334,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -350,6 +363,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rejected_qty", "fieldtype": "Float", "hidden": 0, @@ -378,6 +392,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -401,13 +416,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "UOM", "length": 0, "no_copy": 0, @@ -430,13 +446,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_uom", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Stock UOM", "length": 0, "no_copy": 0, @@ -459,6 +476,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "conversion_factor", "fieldtype": "Float", "hidden": 0, @@ -487,6 +505,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rate_and_amount", "fieldtype": "Section Break", "hidden": 0, @@ -511,6 +530,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -536,6 +556,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "discount_percentage", "fieldtype": "Percent", @@ -543,7 +564,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Discount on Price List Rate (%)", "length": 0, "no_copy": 0, @@ -561,6 +582,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -584,6 +606,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -609,6 +632,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sec_break1", "fieldtype": "Section Break", "hidden": 0, @@ -632,6 +656,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "rate", "fieldtype": "Currency", "hidden": 0, @@ -661,6 +686,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -688,6 +714,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -711,6 +738,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rate", "fieldtype": "Currency", "hidden": 0, @@ -740,6 +768,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_amount", "fieldtype": "Currency", "hidden": 0, @@ -769,6 +798,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "pricing_rule", "fieldtype": "Link", "hidden": 0, @@ -794,6 +824,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_29", "fieldtype": "Section Break", "hidden": 0, @@ -818,6 +849,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_rate", "fieldtype": "Currency", "hidden": 0, @@ -844,13 +876,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "net_amount", "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Net Amount", "length": 0, "no_copy": 0, @@ -870,6 +903,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_32", "fieldtype": "Column Break", "hidden": 0, @@ -894,6 +928,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_rate", "fieldtype": "Currency", "hidden": 0, @@ -920,6 +955,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_amount", "fieldtype": "Currency", "hidden": 0, @@ -946,6 +982,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse_and_reference", "fieldtype": "Section Break", "hidden": 0, @@ -970,6 +1007,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -999,6 +1037,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rejected_warehouse", "fieldtype": "Link", "hidden": 0, @@ -1028,6 +1067,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "qa_no", "fieldtype": "Link", "hidden": 0, @@ -1055,6 +1095,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_40", "fieldtype": "Column Break", "hidden": 0, @@ -1079,6 +1120,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "purchase_order", "fieldtype": "Link", "hidden": 0, @@ -1108,6 +1150,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "schedule_date", "fieldtype": "Date", "hidden": 0, @@ -1134,6 +1177,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_qty", "fieldtype": "Float", "hidden": 0, @@ -1162,6 +1206,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_45", "fieldtype": "Section Break", "hidden": 0, @@ -1186,6 +1231,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "serial_no", "fieldtype": "Text", "hidden": 0, @@ -1212,6 +1258,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "batch_no", "fieldtype": "Link", "hidden": 0, @@ -1239,6 +1286,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_48", "fieldtype": "Column Break", "hidden": 0, @@ -1264,6 +1312,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rejected_serial_no", "fieldtype": "Text", "hidden": 0, @@ -1288,6 +1337,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_50", "fieldtype": "Section Break", "hidden": 0, @@ -1312,6 +1362,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "project", "fieldtype": "Link", "hidden": 0, @@ -1337,6 +1388,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": ":Company", "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", "fieldname": "cost_center", @@ -1364,6 +1416,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "purchase_order_item", "fieldtype": "Data", "hidden": 1, @@ -1392,6 +1445,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break5", "fieldtype": "Column Break", "hidden": 0, @@ -1415,6 +1469,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "bom", "fieldtype": "Link", "hidden": 0, @@ -1441,6 +1496,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "billed_amt", "fieldtype": "Currency", "hidden": 0, @@ -1466,6 +1522,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "landed_cost_voucher_amount", "fieldtype": "Currency", "hidden": 0, @@ -1490,6 +1547,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Link", "hidden": 1, @@ -1517,6 +1575,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -1545,6 +1604,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rm_supp_cost", "fieldtype": "Currency", "hidden": 1, @@ -1574,6 +1634,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_tax_amount", "fieldtype": "Currency", "hidden": 1, @@ -1603,6 +1664,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "valuation_rate", "fieldtype": "Currency", "hidden": 1, @@ -1632,6 +1694,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", "fieldname": "item_tax_rate", "fieldtype": "Code", @@ -1659,6 +1722,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -1692,7 +1756,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:05.657840", + "modified": "2016-08-26 04:44:03.973239", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt Item", diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 6c2a14b50c..7f0b25bd9c 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -49,14 +49,6 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ }; }); } - - this.frm.get_field('items').grid.editable_fields = [ - {fieldname: 'item_code', columns: 3}, - {fieldname: 'qty', columns: 3}, - {fieldname: 's_warehouse', columns: 2}, - {fieldname: 't_warehouse', columns: 2} - ]; - }, onload_post_render: function() { diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json index 2438b07917..bcf9962c39 100644 --- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json +++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json @@ -8,12 +8,14 @@ "custom": 0, "docstatus": 0, "doctype": "DocType", + "document_type": "Other", "editable_grid": 1, "fields": [ { "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "barcode", "fieldtype": "Data", "hidden": 0, @@ -39,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_2", "fieldtype": "Section Break", "hidden": 0, @@ -63,6 +66,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "s_warehouse", "fieldtype": "Link", "hidden": 0, @@ -90,6 +94,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -113,6 +118,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "fieldname": "t_warehouse", "fieldtype": "Link", "hidden": 0, @@ -140,6 +146,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sec_break1", "fieldtype": "Section Break", "hidden": 0, @@ -163,6 +170,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -190,6 +198,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -213,6 +222,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, @@ -237,6 +247,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_8", "fieldtype": "Section Break", "hidden": 0, @@ -262,6 +273,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -290,6 +302,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_10", "fieldtype": "Column Break", "hidden": 0, @@ -314,6 +327,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -339,6 +353,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -365,6 +380,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_rate", "fieldtype": "Section Break", "hidden": 0, @@ -389,6 +405,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 3, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -415,6 +432,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "basic_rate", "fieldtype": "Currency", "hidden": 0, @@ -442,6 +460,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "basic_amount", "fieldtype": "Currency", "hidden": 0, @@ -468,6 +487,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "additional_cost", "fieldtype": "Currency", "hidden": 0, @@ -494,6 +514,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -521,6 +542,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "valuation_rate", "fieldtype": "Currency", "hidden": 0, @@ -547,6 +569,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -570,6 +593,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "uom", "fieldtype": "Link", "hidden": 0, @@ -597,6 +621,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "conversion_factor", "fieldtype": "Float", "hidden": 0, @@ -623,6 +648,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_uom", "fieldtype": "Link", "hidden": 0, @@ -650,6 +676,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "transfer_qty", "fieldtype": "Float", "hidden": 0, @@ -676,6 +703,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "serial_no_batch", "fieldtype": "Section Break", "hidden": 0, @@ -700,6 +728,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "serial_no", "fieldtype": "Text", "hidden": 0, @@ -726,6 +755,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -749,6 +779,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "batch_no", "fieldtype": "Link", "hidden": 0, @@ -776,6 +807,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "accounting", "fieldtype": "Section Break", "hidden": 0, @@ -800,6 +832,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", "fieldname": "expense_account", "fieldtype": "Link", @@ -826,6 +859,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break5", "fieldtype": "Column Break", "hidden": 0, @@ -849,6 +883,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": ":Company", "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", "fieldname": "cost_center", @@ -876,6 +911,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "more_info", "fieldtype": "Section Break", "hidden": 0, @@ -900,6 +936,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "actual_qty", "fieldtype": "Float", "hidden": 0, @@ -926,6 +963,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "BOM No. for a Finished Good Item", "fieldname": "bom_no", "fieldtype": "Link", @@ -952,6 +990,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break6", "fieldtype": "Column Break", "hidden": 0, @@ -975,6 +1014,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Material Request used to make this Stock Entry", "fieldname": "material_request", "fieldtype": "Link", @@ -1001,6 +1041,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "material_request_item", "fieldtype": "Link", "hidden": 1, @@ -1033,7 +1074,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:28:08.710800", + "modified": "2016-08-26 02:18:23.654050", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry Detail", diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index e7ba1bacbf..a0c3adf2ee 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -140,13 +140,6 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({ } } } - - this.frm.get_field('items').grid.editable_fields = [ - {fieldname: 'item_code', columns: 3}, - {fieldname: 'warehouse', columns: 3}, - {fieldname: 'qty', columns: 2}, - {fieldname: 'valuation_rate', columns: 2} - ]; }, refresh: function() { diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json index 3d044878b4..e03d8a0ba9 100644 --- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json +++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json @@ -14,6 +14,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -40,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, @@ -65,6 +67,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 3, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -91,6 +94,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_6", "fieldtype": "Column Break", "hidden": 0, @@ -115,6 +119,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "description": "", "fieldname": "qty", "fieldtype": "Float", @@ -141,6 +146,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 2, "description": "Do not include symbols (ex. $)", "fieldname": "valuation_rate", "fieldtype": "Currency", @@ -167,6 +173,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_3", "fieldtype": "Section Break", "hidden": 0, @@ -191,6 +198,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Before reconciliation", "fieldname": "current_qty", "fieldtype": "Float", @@ -217,6 +225,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_9", "fieldtype": "Column Break", "hidden": 0, @@ -241,6 +250,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Before reconciliation", "fieldname": "current_valuation_rate", "fieldtype": "Read Only", @@ -275,7 +285,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-07-11 03:28:08.918029", + "modified": "2016-08-26 02:15:26.109664", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reconciliation Item",