diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 836a2e0b49..bad511e25d 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -15,6 +15,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "default": "{supplier_name}", "fieldname": "title", "fieldtype": "Data", @@ -41,6 +42,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "naming_series", "fieldtype": "Select", "hidden": 0, @@ -68,6 +70,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplier", "fieldtype": "Link", "hidden": 0, @@ -95,6 +98,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "depends_on": "supplier", "fieldname": "supplier_name", "fieldtype": "Data", @@ -122,6 +126,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "bill_no", "fieldtype": "Data", @@ -149,6 +154,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "is_paid", "fieldtype": "Check", "hidden": 0, @@ -174,6 +180,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "0", "fieldname": "is_return", "fieldtype": "Check", @@ -184,7 +191,7 @@ "in_list_view": 0, "label": "Is Return", "length": 0, - "no_copy": 0, + "no_copy": 1, "permlevel": 0, "precision": "", "print_hide": 1, @@ -200,6 +207,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break1", "fieldtype": "Column Break", "hidden": 0, @@ -225,6 +233,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Today", "fieldname": "posting_date", "fieldtype": "Date", @@ -252,6 +261,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "due_date", "fieldtype": "Date", "hidden": 0, @@ -278,6 +288,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "bill_date", "fieldtype": "Date", "hidden": 0, @@ -304,6 +315,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "amended_from", "fieldtype": "Link", "hidden": 0, @@ -331,6 +343,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "company", "fieldtype": "Link", "hidden": 0, @@ -356,6 +369,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "is_return", "fieldname": "return_against", "fieldtype": "Link", @@ -366,7 +380,7 @@ "in_list_view": 0, "label": "Return Against Purchase Invoice", "length": 0, - "no_copy": 0, + "no_copy": 1, "options": "Purchase Invoice", "permlevel": 0, "precision": "", @@ -383,6 +397,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_addresses", "fieldtype": "Section Break", "hidden": 0, @@ -408,6 +423,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplier_address", "fieldtype": "Link", "hidden": 0, @@ -433,6 +449,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_person", "fieldtype": "Link", "hidden": 0, @@ -458,6 +475,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "address_display", "fieldtype": "Small Text", @@ -483,6 +501,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_display", "fieldtype": "Small Text", "hidden": 0, @@ -507,6 +526,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_mobile", "fieldtype": "Small Text", "hidden": 0, @@ -531,6 +551,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_email", "fieldtype": "Small Text", "hidden": 0, @@ -555,6 +576,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break_address", "fieldtype": "Column Break", "hidden": 0, @@ -579,6 +601,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "shipping_address", "fieldtype": "Link", @@ -606,6 +629,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "shipping_address_display", "fieldtype": "Small Text", "hidden": 0, @@ -631,6 +655,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "hidden": 0, @@ -656,6 +681,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "currency", "fieldtype": "Link", "hidden": 0, @@ -683,6 +709,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "conversion_rate", "fieldtype": "Float", @@ -711,6 +738,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break2", "fieldtype": "Column Break", "hidden": 0, @@ -734,6 +762,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "buying_price_list", "fieldtype": "Link", "hidden": 0, @@ -759,6 +788,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_currency", "fieldtype": "Link", "hidden": 0, @@ -784,6 +814,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "plc_conversion_rate", "fieldtype": "Float", "hidden": 0, @@ -809,6 +840,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "ignore_pricing_rule", "fieldtype": "Check", "hidden": 0, @@ -833,6 +865,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "items_section", "fieldtype": "Section Break", "hidden": 0, @@ -859,6 +892,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "0", "fieldname": "update_stock", "fieldtype": "Check", @@ -885,6 +919,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "items", "fieldtype": "Table", "hidden": 0, @@ -912,6 +947,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_26", "fieldtype": "Section Break", "hidden": 0, @@ -935,6 +971,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_total", "fieldtype": "Currency", "hidden": 0, @@ -961,6 +998,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "base_net_total", "fieldtype": "Currency", @@ -989,6 +1027,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_28", "fieldtype": "Column Break", "hidden": 0, @@ -1012,6 +1051,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total", "fieldtype": "Currency", "hidden": 0, @@ -1038,6 +1078,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_total", "fieldtype": "Currency", "hidden": 0, @@ -1065,6 +1106,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes_section", "fieldtype": "Section Break", "hidden": 0, @@ -1091,6 +1133,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes_and_charges", "fieldtype": "Link", "hidden": 0, @@ -1118,6 +1161,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes", "fieldtype": "Table", "hidden": 0, @@ -1145,6 +1189,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "other_charges_calculation", "fieldtype": "HTML", "hidden": 0, @@ -1170,6 +1215,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "totals", "fieldtype": "Section Break", "hidden": 0, @@ -1196,6 +1242,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_taxes_and_charges_added", "fieldtype": "Currency", "hidden": 0, @@ -1223,6 +1270,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_taxes_and_charges_deducted", "fieldtype": "Currency", "hidden": 0, @@ -1250,6 +1298,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", "hidden": 0, @@ -1277,6 +1326,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_40", "fieldtype": "Column Break", "hidden": 0, @@ -1301,6 +1351,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes_and_charges_added", "fieldtype": "Currency", "hidden": 0, @@ -1328,6 +1379,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes_and_charges_deducted", "fieldtype": "Currency", "hidden": 0, @@ -1355,6 +1407,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_taxes_and_charges", "fieldtype": "Currency", "hidden": 0, @@ -1382,6 +1435,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "discount_amount", + "columns": 0, "fieldname": "section_break_44", "fieldtype": "Section Break", "hidden": 0, @@ -1407,6 +1461,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Grand Total", "fieldname": "apply_discount_on", "fieldtype": "Select", @@ -1434,6 +1489,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_discount_amount", "fieldtype": "Currency", "hidden": 0, @@ -1460,6 +1516,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_46", "fieldtype": "Column Break", "hidden": 0, @@ -1484,6 +1541,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "additional_discount_percentage", "fieldtype": "Float", "hidden": 0, @@ -1509,6 +1567,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "discount_amount", "fieldtype": "Currency", "hidden": 0, @@ -1535,6 +1594,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_49", "fieldtype": "Section Break", "hidden": 0, @@ -1559,6 +1619,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_grand_total", "fieldtype": "Currency", "hidden": 0, @@ -1586,6 +1647,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "base_in_words", "fieldtype": "Data", @@ -1613,6 +1675,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break8", "fieldtype": "Column Break", "hidden": 0, @@ -1638,6 +1701,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "grand_total", "fieldtype": "Currency", "hidden": 0, @@ -1665,6 +1729,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "in_words", "fieldtype": "Data", "hidden": 0, @@ -1691,6 +1756,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_advance", "fieldtype": "Currency", "hidden": 0, @@ -1718,6 +1784,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "outstanding_amount", "fieldtype": "Currency", "hidden": 0, @@ -1746,6 +1813,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "paid_amount", + "columns": 0, "depends_on": "eval:doc.is_paid===1||(doc.advances && doc.advances.length>0)", "fieldname": "payments_section", "fieldtype": "Section Break", @@ -1772,6 +1840,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "mode_of_payment", "fieldtype": "Link", "hidden": 0, @@ -1798,6 +1867,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "cash_bank_account", "fieldtype": "Link", "hidden": 0, @@ -1824,6 +1894,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_br_payments", "fieldtype": "Column Break", "hidden": 0, @@ -1848,6 +1919,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "is_paid", "fieldname": "paid_amount", "fieldtype": "Currency", @@ -1875,6 +1947,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_paid_amount", "fieldtype": "Currency", "hidden": 0, @@ -1902,6 +1975,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "write_off_amount", + "columns": 0, "depends_on": "grand_total", "fieldname": "write_off", "fieldtype": "Section Break", @@ -1928,6 +2002,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "write_off_amount", "fieldtype": "Currency", "hidden": 0, @@ -1953,6 +2028,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_write_off_amount", "fieldtype": "Currency", "hidden": 0, @@ -1979,6 +2055,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_61", "fieldtype": "Column Break", "hidden": 0, @@ -2003,6 +2080,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:flt(doc.write_off_amount)!=0", "fieldname": "write_off_account", "fieldtype": "Link", @@ -2029,6 +2107,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:flt(doc.write_off_amount)!=0", "fieldname": "write_off_cost_center", "fieldtype": "Link", @@ -2056,6 +2135,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "advances", + "columns": 0, "fieldname": "advances_section", "fieldtype": "Section Break", "hidden": 0, @@ -2082,6 +2162,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "get_advances", "fieldtype": "Button", "hidden": 0, @@ -2108,6 +2189,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "advances", "fieldtype": "Table", "hidden": 0, @@ -2136,6 +2218,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "terms", + "columns": 0, "fieldname": "terms_section_break", "fieldtype": "Section Break", "hidden": 0, @@ -2161,6 +2244,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "tc_name", "fieldtype": "Link", "hidden": 0, @@ -2186,6 +2270,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "terms", "fieldtype": "Text Editor", "hidden": 0, @@ -2210,6 +2295,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "raw_materials_supplied", "fieldtype": "Section Break", "hidden": 0, @@ -2235,6 +2321,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "No", "fieldname": "is_subcontracted", "fieldtype": "Select", @@ -2262,6 +2349,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplier_warehouse", "fieldtype": "Link", "hidden": 0, @@ -2290,6 +2378,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplied_items", "fieldtype": "Table", "hidden": 0, @@ -2316,6 +2405,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "printing_settings", "fieldtype": "Section Break", "hidden": 0, @@ -2341,6 +2431,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "letter_head", "fieldtype": "Link", "hidden": 0, @@ -2367,6 +2458,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "select_print_heading", "fieldtype": "Link", "hidden": 0, @@ -2394,6 +2486,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "language", "fieldtype": "Data", "hidden": 0, @@ -2419,6 +2512,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "more_info", "fieldtype": "Section Break", "hidden": 0, @@ -2445,6 +2539,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "credit_to", "fieldtype": "Link", @@ -2473,6 +2568,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "party_account_currency", "fieldtype": "Link", "hidden": 1, @@ -2499,6 +2595,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "No", "description": "", "fieldname": "is_opening", @@ -2528,6 +2625,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "against_expense_account", "fieldtype": "Small Text", "hidden": 1, @@ -2554,6 +2652,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_63", "fieldtype": "Column Break", "hidden": 0, @@ -2577,6 +2676,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "posting_time", "fieldtype": "Time", "hidden": 0, @@ -2604,6 +2704,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "remarks", "fieldtype": "Small Text", "hidden": 0, @@ -2630,6 +2731,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Warehouse where you are maintaining stock of rejected items", "fieldname": "rejected_warehouse", "fieldtype": "Link", @@ -2658,6 +2760,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "is_recurring", + "columns": 0, "depends_on": "eval:doc.docstatus<2", "fieldname": "recurring_invoice", "fieldtype": "Section Break", @@ -2684,6 +2787,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.docstatus<2", "description": "", "fieldname": "is_recurring", @@ -2710,6 +2814,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring==1", "description": "Select the period when the invoice will be generated automatically", "fieldname": "recurring_type", @@ -2737,6 +2842,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring==1", "description": "Start date of current invoice's period", "fieldname": "from_date", @@ -2763,6 +2869,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring==1", "description": "End date of current invoice's period", "fieldname": "to_date", @@ -2789,6 +2896,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", "fieldname": "submit_on_creation", "fieldtype": "Check", @@ -2815,6 +2923,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", "description": "", "fieldname": "notify_by_email", @@ -2842,6 +2951,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring==1", "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc", "fieldname": "repeat_on_day_of_month", @@ -2868,6 +2978,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring==1", "description": "The date on which recurring invoice will be stop", "fieldname": "end_date", @@ -2894,6 +3005,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_82", "fieldtype": "Column Break", "hidden": 0, @@ -2918,6 +3030,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring==1", "description": "The date on which next invoice will be generated. It is generated on submit.", "fieldname": "next_date", @@ -2944,6 +3057,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring==1", "description": "The unique id for tracking all recurring invoices. It is generated on submit.", "fieldname": "recurring_id", @@ -2970,6 +3084,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring==1", "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", "fieldname": "notification_email_address", @@ -2996,6 +3111,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.is_recurring==1", "fieldname": "recurring_print_format", "fieldtype": "Link", @@ -3032,7 +3148,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-08-24 12:50:15.777689", + "modified": "2016-09-23 18:02:45.349273", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 562eaaac53..90b4318349 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -191,7 +191,7 @@ "in_list_view": 0, "label": "Is Return", "length": 0, - "no_copy": 0, + "no_copy": 1, "permlevel": 0, "precision": "", "print_hide": 1, @@ -380,7 +380,7 @@ "in_list_view": 0, "label": "Return Against Sales Invoice", "length": 0, - "no_copy": 0, + "no_copy": 1, "options": "Sales Invoice", "permlevel": 0, "precision": "", @@ -3867,7 +3867,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-08-31 15:47:32.064861", + "modified": "2016-09-23 17:59:42.200474", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json index 99f97fef45..cea21de76d 100644 --- a/erpnext/setup/doctype/uom/uom.json +++ b/erpnext/setup/doctype/uom/uom.json @@ -1,7 +1,7 @@ { "allow_copy": 0, "allow_import": 1, - "allow_rename": 0, + "allow_rename": 1, "autoname": "field:uom_name", "beta": 0, "creation": "2013-01-10 16:34:24", @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "uom_name", "fieldtype": "Data", "hidden": 0, @@ -41,6 +42,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Check this to disallow fractions. (for Nos)", "fieldname": "must_be_whole_number", "fieldtype": "Check", @@ -74,7 +76,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-07-25 05:24:25.434534", + "modified": "2016-09-23 17:58:21.574996", "modified_by": "Administrator", "module": "Setup", "name": "UOM", @@ -144,5 +146,6 @@ "quick_entry": 1, "read_only": 0, "read_only_onload": 0, + "sort_order": "ASC", "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index bf2f4f3944..522cfde300 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -3,16 +3,19 @@ "allow_import": 1, "allow_rename": 0, "autoname": "naming_series:", + "beta": 0, "creation": "2013-05-24 19:29:09", "custom": 0, "docstatus": 0, "doctype": "DocType", "document_type": "Document", + "editable_grid": 0, "fields": [ { "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "delivery_to_section", "fieldtype": "Section Break", "hidden": 0, @@ -38,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break0", "fieldtype": "Column Break", "hidden": 0, @@ -64,6 +68,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "default": "{customer_name}", "fieldname": "title", "fieldtype": "Data", @@ -90,6 +95,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "naming_series", "fieldtype": "Select", "hidden": 0, @@ -117,6 +123,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "customer", "fieldtype": "Link", "hidden": 0, @@ -144,6 +151,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "depends_on": "customer", "fieldname": "customer_name", "fieldtype": "Data", @@ -169,6 +177,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break1", "fieldtype": "Column Break", "hidden": 0, @@ -193,6 +202,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "amended_from", "fieldtype": "Link", "hidden": 0, @@ -222,6 +232,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "company", "fieldtype": "Link", @@ -252,6 +263,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Today", "fieldname": "posting_date", "fieldtype": "Date", @@ -281,6 +293,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "po_no", "fieldtype": "Data", "hidden": 0, @@ -309,6 +322,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.po_no", "fieldname": "po_date", "fieldtype": "Date", @@ -338,6 +352,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "is_return", "fieldtype": "Check", "hidden": 0, @@ -347,7 +362,7 @@ "in_list_view": 0, "label": "Is Return", "length": 0, - "no_copy": 0, + "no_copy": 1, "permlevel": 0, "precision": "", "print_hide": 1, @@ -363,6 +378,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "is_return", "fieldname": "return_against", "fieldtype": "Link", @@ -373,7 +389,7 @@ "in_list_view": 0, "label": "Return Against Delivery Note", "length": 0, - "no_copy": 0, + "no_copy": 1, "options": "Delivery Note", "permlevel": 0, "precision": "", @@ -390,6 +406,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "depends_on": "customer", "fieldname": "contact_info", "fieldtype": "Section Break", @@ -416,6 +433,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "shipping_address_name", "fieldtype": "Link", "hidden": 0, @@ -441,6 +459,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "shipping_address", "fieldtype": "Small Text", "hidden": 0, @@ -465,6 +484,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_person", "fieldtype": "Link", "hidden": 0, @@ -490,6 +510,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_display", "fieldtype": "Small Text", "hidden": 0, @@ -514,6 +535,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_mobile", "fieldtype": "Small Text", "hidden": 1, @@ -538,6 +560,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_email", "fieldtype": "Data", "hidden": 1, @@ -563,6 +586,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break21", "fieldtype": "Column Break", "hidden": 0, @@ -588,6 +612,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "customer", "fieldname": "customer_address", "fieldtype": "Link", @@ -614,6 +639,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "address_display", "fieldtype": "Small Text", "hidden": 0, @@ -638,6 +664,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "customer_group", "fieldtype": "Link", @@ -664,6 +691,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "territory", "fieldtype": "Link", @@ -690,6 +718,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "hidden": 0, @@ -715,6 +744,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "currency", "fieldtype": "Link", "hidden": 0, @@ -742,6 +772,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Rate at which customer's currency is converted to company's base currency", "fieldname": "conversion_rate", "fieldtype": "Float", @@ -770,6 +801,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break23", "fieldtype": "Column Break", "hidden": 0, @@ -793,6 +825,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "selling_price_list", "fieldtype": "Link", "hidden": 0, @@ -820,6 +853,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_currency", "fieldtype": "Link", "hidden": 0, @@ -845,6 +879,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Rate at which Price list currency is converted to company's base currency", "fieldname": "plc_conversion_rate", "fieldtype": "Float", @@ -871,6 +906,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "ignore_pricing_rule", "fieldtype": "Check", "hidden": 0, @@ -895,6 +931,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "items_section", "fieldtype": "Section Break", "hidden": 0, @@ -921,6 +958,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "items", "fieldtype": "Table", "hidden": 0, @@ -949,6 +987,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "packed_items", + "columns": 0, "fieldname": "packing_list", "fieldtype": "Section Break", "hidden": 0, @@ -975,6 +1014,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "packed_items", "fieldtype": "Table", "hidden": 0, @@ -1002,6 +1042,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "product_bundle_help", "fieldtype": "HTML", "hidden": 0, @@ -1026,6 +1067,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_31", "fieldtype": "Section Break", "hidden": 0, @@ -1049,6 +1091,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_total", "fieldtype": "Currency", "hidden": 0, @@ -1075,6 +1118,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_total", "fieldtype": "Currency", "hidden": 0, @@ -1104,6 +1148,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_33", "fieldtype": "Column Break", "hidden": 0, @@ -1127,6 +1172,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total", "fieldtype": "Currency", "hidden": 0, @@ -1153,6 +1199,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_total", "fieldtype": "Currency", "hidden": 0, @@ -1178,6 +1225,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes_section", "fieldtype": "Section Break", "hidden": 0, @@ -1204,6 +1252,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.", "fieldname": "taxes_and_charges", "fieldtype": "Link", @@ -1232,6 +1281,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_39", "fieldtype": "Column Break", "hidden": 0, @@ -1255,6 +1305,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "shipping_rule", "fieldtype": "Link", "hidden": 0, @@ -1281,6 +1332,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_41", "fieldtype": "Section Break", "hidden": 0, @@ -1304,6 +1356,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes", "fieldtype": "Table", "hidden": 0, @@ -1331,6 +1384,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "other_charges_calculation", "fieldtype": "HTML", "hidden": 0, @@ -1356,6 +1410,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_44", "fieldtype": "Section Break", "hidden": 0, @@ -1379,6 +1434,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", "hidden": 0, @@ -1408,6 +1464,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_47", "fieldtype": "Column Break", "hidden": 0, @@ -1432,6 +1489,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_taxes_and_charges", "fieldtype": "Currency", "hidden": 0, @@ -1458,6 +1516,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "discount_amount", + "columns": 0, "fieldname": "section_break_49", "fieldtype": "Section Break", "hidden": 0, @@ -1483,6 +1542,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Grand Total", "fieldname": "apply_discount_on", "fieldtype": "Select", @@ -1510,6 +1570,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_discount_amount", "fieldtype": "Currency", "hidden": 0, @@ -1536,6 +1597,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_51", "fieldtype": "Column Break", "hidden": 0, @@ -1559,6 +1621,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "additional_discount_percentage", "fieldtype": "Float", "hidden": 0, @@ -1584,6 +1647,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "discount_amount", "fieldtype": "Currency", "hidden": 0, @@ -1609,6 +1673,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "totals", "fieldtype": "Section Break", "hidden": 0, @@ -1635,6 +1700,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_grand_total", "fieldtype": "Currency", "hidden": 0, @@ -1664,6 +1730,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rounded_total", "fieldtype": "Currency", "hidden": 0, @@ -1693,6 +1760,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "In Words will be visible once you save the Delivery Note.", "fieldname": "base_in_words", "fieldtype": "Data", @@ -1722,6 +1790,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break3", "fieldtype": "Column Break", "hidden": 0, @@ -1746,6 +1815,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "grand_total", "fieldtype": "Currency", "hidden": 0, @@ -1775,6 +1845,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "rounded_total", "fieldtype": "Currency", "hidden": 0, @@ -1804,6 +1875,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "In Words (Export) will be visible once you save the Delivery Note.", "fieldname": "in_words", "fieldtype": "Data", @@ -1834,6 +1906,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "terms", + "columns": 0, "fieldname": "terms_section_break", "fieldtype": "Section Break", "hidden": 0, @@ -1860,6 +1933,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "tc_name", "fieldtype": "Link", "hidden": 0, @@ -1887,6 +1961,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "terms", "fieldtype": "Text Editor", "hidden": 0, @@ -1914,6 +1989,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "transporter_name", + "columns": 0, "fieldname": "transporter_info", "fieldtype": "Section Break", "hidden": 0, @@ -1939,6 +2015,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "transporter_name", "fieldtype": "Data", "hidden": 0, @@ -1967,6 +2044,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break34", "fieldtype": "Column Break", "hidden": 0, @@ -1992,6 +2070,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "lr_no", "fieldtype": "Data", @@ -2021,6 +2100,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Today", "description": "", "fieldname": "lr_date", @@ -2051,6 +2131,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "more_info", "fieldtype": "Section Break", "hidden": 0, @@ -2077,6 +2158,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Track this Delivery Note against any Project", "fieldname": "project", "fieldtype": "Link", @@ -2105,6 +2187,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.source == 'Campaign'", "fieldname": "campaign", "fieldtype": "Link", @@ -2133,6 +2216,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "source", "fieldtype": "Select", "hidden": 0, @@ -2160,6 +2244,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break5", "fieldtype": "Column Break", "hidden": 0, @@ -2186,6 +2271,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Time at which items were delivered from warehouse", "fieldname": "posting_time", "fieldtype": "Time", @@ -2215,6 +2301,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "per_billed", "fieldtype": "Percent", "hidden": 0, @@ -2240,6 +2327,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "printing_details", "fieldtype": "Section Break", "hidden": 0, @@ -2265,6 +2353,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "letter_head", "fieldtype": "Link", "hidden": 0, @@ -2292,6 +2381,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "select_print_heading", "fieldtype": "Link", "hidden": 0, @@ -2319,6 +2409,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "language", "fieldtype": "Data", "hidden": 0, @@ -2344,6 +2435,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_88", "fieldtype": "Column Break", "hidden": 0, @@ -2368,6 +2460,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "print_without_amount", "fieldtype": "Check", "hidden": 0, @@ -2394,6 +2487,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_83", "fieldtype": "Section Break", "hidden": 0, @@ -2418,6 +2512,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Draft", "fieldname": "status", "fieldtype": "Select", @@ -2448,6 +2543,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:!doc.__islocal", "description": "% of materials delivered against this Delivery Note", "fieldname": "per_installed", @@ -2476,6 +2572,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "installation_status", "fieldtype": "Select", "hidden": 1, @@ -2500,6 +2597,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_89", "fieldtype": "Column Break", "hidden": 0, @@ -2523,6 +2621,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Required only for sample item.", "fieldname": "to_warehouse", "fieldtype": "Link", @@ -2551,6 +2650,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "excise_page", "fieldtype": "Data", "hidden": 1, @@ -2577,6 +2677,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "instructions", "fieldtype": "Text", "hidden": 0, @@ -2604,6 +2705,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "total_commission", + "columns": 0, "fieldname": "sales_team_section_break", "fieldtype": "Section Break", "hidden": 0, @@ -2630,6 +2732,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sales_partner", "fieldtype": "Link", "hidden": 0, @@ -2659,6 +2762,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break7", "fieldtype": "Column Break", "hidden": 0, @@ -2684,6 +2788,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "commission_rate", "fieldtype": "Float", "hidden": 0, @@ -2712,6 +2817,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_commission", "fieldtype": "Currency", "hidden": 0, @@ -2740,6 +2846,7 @@ "bold": 0, "collapsible": 0, "collapsible_depends_on": "sales_team", + "columns": 0, "fieldname": "section_break1", "fieldtype": "Section Break", "hidden": 0, @@ -2764,6 +2871,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "sales_team", "fieldtype": "Table", "hidden": 0, @@ -2792,6 +2900,7 @@ "hide_toolbar": 0, "icon": "icon-truck", "idx": 146, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 1, @@ -2799,7 +2908,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-04-14 12:53:48.081945", + "modified": "2016-09-23 18:01:54.003673", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", @@ -2906,6 +3015,7 @@ "write": 1 } ], + "quick_entry": 0, "read_only": 0, "read_only_onload": 1, "search_fields": "status,customer,customer_name, territory,base_grand_total", @@ -2914,4 +3024,4 @@ "timeline_field": "customer", "title_field": "title", "track_seen": 0 -} +} \ No newline at end of file diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index f10b634c46..0a6ec9f94a 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -9,11 +9,13 @@ "docstatus": 0, "doctype": "DocType", "document_type": "Document", + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplier_section", "fieldtype": "Section Break", "hidden": 0, @@ -39,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break0", "fieldtype": "Column Break", "hidden": 0, @@ -65,6 +68,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "default": "{supplier_name}", "fieldname": "title", "fieldtype": "Data", @@ -91,6 +95,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "", "fieldname": "naming_series", "fieldtype": "Select", @@ -119,6 +124,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "supplier", "fieldtype": "Link", "hidden": 0, @@ -148,6 +154,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "depends_on": "supplier", "fieldname": "supplier_name", "fieldtype": "Data", @@ -173,6 +180,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break1", "fieldtype": "Column Break", "hidden": 0, @@ -199,6 +207,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Today", "fieldname": "posting_date", "fieldtype": "Date", @@ -228,6 +237,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Time at which materials were received", "fieldname": "posting_time", "fieldtype": "Time", @@ -257,6 +267,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "company", "fieldtype": "Link", @@ -287,6 +298,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "is_return", "fieldtype": "Check", "hidden": 0, @@ -296,7 +308,7 @@ "in_list_view": 0, "label": "Is Return", "length": 0, - "no_copy": 0, + "no_copy": 1, "permlevel": 0, "precision": "", "print_hide": 1, @@ -312,6 +324,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "is_return", "fieldname": "return_against", "fieldtype": "Link", @@ -322,7 +335,7 @@ "in_list_view": 0, "label": "Return Against Purchase Receipt", "length": 0, - "no_copy": 0, + "no_copy": 1, "options": "Purchase Receipt", "permlevel": 0, "precision": "", @@ -339,6 +352,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_addresses", "fieldtype": "Section Break", "hidden": 0, @@ -364,6 +378,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplier_address", "fieldtype": "Link", "hidden": 0, @@ -389,6 +404,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_person", "fieldtype": "Link", "hidden": 0, @@ -414,6 +430,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "address_display", "fieldtype": "Small Text", @@ -439,6 +456,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_display", "fieldtype": "Small Text", "hidden": 0, @@ -463,6 +481,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_mobile", "fieldtype": "Small Text", "hidden": 0, @@ -487,6 +506,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "contact_email", "fieldtype": "Small Text", "hidden": 0, @@ -511,6 +531,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break_address", "fieldtype": "Column Break", "hidden": 0, @@ -535,6 +556,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "shipping_address", "fieldtype": "Link", @@ -562,6 +584,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "shipping_address_display", "fieldtype": "Small Text", "hidden": 0, @@ -587,6 +610,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "hidden": 0, @@ -612,6 +636,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "currency", "fieldtype": "Link", "hidden": 0, @@ -639,6 +664,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Rate at which supplier's currency is converted to company's base currency", "fieldname": "conversion_rate", "fieldtype": "Float", @@ -667,6 +693,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break2", "fieldtype": "Column Break", "hidden": 0, @@ -693,6 +720,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "buying_price_list", "fieldtype": "Link", "hidden": 0, @@ -718,6 +746,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "buying_price_list", "fieldname": "price_list_currency", "fieldtype": "Link", @@ -744,6 +773,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "buying_price_list", "fieldname": "plc_conversion_rate", "fieldtype": "Float", @@ -770,6 +800,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "ignore_pricing_rule", "fieldtype": "Check", "hidden": 0, @@ -794,6 +825,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "items_section", "fieldtype": "Section Break", "hidden": 0, @@ -820,6 +852,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "items", "fieldtype": "Table", "hidden": 0, @@ -847,6 +880,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "get_current_stock", "fieldtype": "Button", "hidden": 0, @@ -873,6 +907,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break0", "fieldtype": "Section Break", "hidden": 0, @@ -897,6 +932,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_total", "fieldtype": "Currency", "hidden": 0, @@ -923,6 +959,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_total", "fieldtype": "Currency", "hidden": 0, @@ -952,6 +989,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_27", "fieldtype": "Column Break", "hidden": 0, @@ -975,6 +1013,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total", "fieldtype": "Currency", "hidden": 0, @@ -1001,6 +1040,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_total", "fieldtype": "Currency", "hidden": 0, @@ -1028,6 +1068,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Add / Edit Taxes and Charges", "fieldname": "taxes_section", "fieldtype": "Section Break", @@ -1055,6 +1096,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "taxes_and_charges", "fieldtype": "Link", @@ -1083,6 +1125,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes", "fieldtype": "Table", "hidden": 0, @@ -1110,6 +1153,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "other_charges_calculation", "fieldtype": "HTML", "hidden": 0, @@ -1135,6 +1179,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "totals", "fieldtype": "Section Break", @@ -1162,6 +1207,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_taxes_and_charges_added", "fieldtype": "Currency", "hidden": 0, @@ -1189,6 +1235,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_taxes_and_charges_deducted", "fieldtype": "Currency", "hidden": 0, @@ -1216,6 +1263,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", "hidden": 0, @@ -1243,6 +1291,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break3", "fieldtype": "Column Break", "hidden": 0, @@ -1268,6 +1317,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes_and_charges_added", "fieldtype": "Currency", "hidden": 0, @@ -1295,6 +1345,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "taxes_and_charges_deducted", "fieldtype": "Currency", "hidden": 0, @@ -1322,6 +1373,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_taxes_and_charges", "fieldtype": "Currency", "hidden": 0, @@ -1349,6 +1401,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "discount_amount", + "columns": 0, "fieldname": "section_break_42", "fieldtype": "Section Break", "hidden": 0, @@ -1374,6 +1427,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Grand Total", "fieldname": "apply_discount_on", "fieldtype": "Select", @@ -1401,6 +1455,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_discount_amount", "fieldtype": "Currency", "hidden": 0, @@ -1427,6 +1482,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_44", "fieldtype": "Column Break", "hidden": 0, @@ -1451,6 +1507,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "additional_discount_percentage", "fieldtype": "Float", "hidden": 0, @@ -1476,6 +1533,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "discount_amount", "fieldtype": "Currency", "hidden": 0, @@ -1502,6 +1560,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_46", "fieldtype": "Section Break", "hidden": 0, @@ -1526,6 +1585,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_grand_total", "fieldtype": "Currency", "hidden": 0, @@ -1553,6 +1613,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "base_in_words", "fieldtype": "Data", @@ -1580,6 +1641,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rounded_total", "fieldtype": "Currency", "hidden": 0, @@ -1607,6 +1669,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_50", "fieldtype": "Column Break", "hidden": 0, @@ -1631,6 +1694,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "grand_total", "fieldtype": "Currency", "hidden": 0, @@ -1658,6 +1722,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "in_words", "fieldtype": "Data", "hidden": 0, @@ -1685,6 +1750,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "terms", + "columns": 0, "fieldname": "terms_section_break", "fieldtype": "Section Break", "hidden": 0, @@ -1711,6 +1777,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "tc_name", "fieldtype": "Link", "hidden": 0, @@ -1738,6 +1805,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "terms", "fieldtype": "Text Editor", "hidden": 0, @@ -1765,6 +1833,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "supplied_items", + "columns": 0, "description": "", "fieldname": "raw_material_details", "fieldtype": "Section Break", @@ -1792,6 +1861,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "No", "description": "", "fieldname": "is_subcontracted", @@ -1821,6 +1891,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "supplier_warehouse", "fieldtype": "Link", @@ -1851,6 +1922,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "supplied_items", "fieldtype": "Table", "hidden": 0, @@ -1878,6 +1950,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "bill_no", "fieldtype": "Data", "hidden": 1, @@ -1904,6 +1977,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "bill_date", "fieldtype": "Date", "hidden": 1, @@ -1930,6 +2004,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "more_info", "fieldtype": "Section Break", "hidden": 0, @@ -1956,6 +2031,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Draft", "fieldname": "status", "fieldtype": "Select", @@ -1986,6 +2062,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Warehouse where you are maintaining stock of rejected items", "fieldname": "rejected_warehouse", "fieldtype": "Link", @@ -2014,6 +2091,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "amended_from", "fieldtype": "Link", "hidden": 1, @@ -2043,6 +2121,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "range", "fieldtype": "Data", "hidden": 1, @@ -2069,6 +2148,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break4", "fieldtype": "Column Break", "hidden": 0, @@ -2095,6 +2175,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "per_billed", "fieldtype": "Percent", "hidden": 0, @@ -2120,6 +2201,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "printing_settings", "fieldtype": "Section Break", "hidden": 0, @@ -2145,6 +2227,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "letter_head", "fieldtype": "Link", "hidden": 0, @@ -2170,6 +2253,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "select_print_heading", "fieldtype": "Link", "hidden": 0, @@ -2197,6 +2281,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "language", "fieldtype": "Data", "hidden": 0, @@ -2222,6 +2307,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "other_details", "fieldtype": "HTML", "hidden": 1, @@ -2250,6 +2336,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "instructions", "fieldtype": "Small Text", "hidden": 0, @@ -2276,6 +2363,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "remarks", "fieldtype": "Small Text", "hidden": 0, @@ -2301,6 +2389,7 @@ "bold": 0, "collapsible": 1, "collapsible_depends_on": "transporter_name", + "columns": 0, "fieldname": "transporter_info", "fieldtype": "Section Break", "hidden": 0, @@ -2326,6 +2415,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "transporter_name", "fieldtype": "Data", "hidden": 0, @@ -2352,6 +2442,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break5", "fieldtype": "Column Break", "hidden": 0, @@ -2377,6 +2468,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "lr_no", "fieldtype": "Data", @@ -2406,6 +2498,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "lr_date", "fieldtype": "Date", @@ -2444,7 +2537,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-06-30 13:42:23.310309", + "modified": "2016-09-23 18:02:17.332333", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt",