Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg 2022-04-02 17:25:29 +05:30
parent 0f6d52c625
commit 485f5cfdfe
3 changed files with 89 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/patches.txt
View File

@ -356,7 +356,6 @@ erpnext.patches.v13_0.update_exchange_rate_settings
erpnext.patches.v14_0.delete_amazon_mws_doctype
erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
erpnext.patches.v13_0.update_accounts_in_loan_docs
<<<<<<< HEAD
erpnext.patches.v14_0.update_batch_valuation_flag
erpnext.patches.v14_0.delete_non_profit_doctypes
erpnext.patches.v14_0.update_employee_advance_status
@ -364,9 +363,4 @@ erpnext.patches.v13_0.add_cost_center_in_loans
erpnext.patches.v13_0.set_return_against_in_pos_invoice_references
erpnext.patches.v13_0.remove_unknown_links_to_prod_plan_items # 24-03-2022
erpnext.patches.v13_0.update_expense_claim_status_for_paid_advances
=======
erpnext.patches.v13_0.remove_unknown_links_to_prod_plan_items
erpnext.patches.v13_0.rename_non_profit_fields
erpnext.patches.v13_0.enable_ksa_vat_docs #1
erpnext.patches.v13_0.create_gst_custom_fields_in_quotation
>>>>>>> 7cae669e81 (fix(India): Auto tax fetching based on GSTIN)
erpnext.patches.v13_0.create_gst_custom_fields_in_quotation

22
erpnext/regional/india/setup.py
View File

@ -909,7 +909,6 @@ def get_custom_fields():
read_only=1,
),
],
<<<<<<< HEAD
"Purchase Invoice": purchase_invoice_gst_category
+ invoice_gst_fields
+ purchase_invoice_itc_fields
@ -931,6 +930,7 @@ def get_custom_fields():
"Journal Entry": journal_entry_fields,
"Sales Order": sales_invoice_gst_fields,
"Tax Category": inter_state_gst_field,
"Quotation": sales_invoice_gst_fields,
"Item": [
dict(
fieldname="gst_hsn_code",
@ -948,26 +948,6 @@ def get_custom_fields():
dict(
fieldname="is_non_gst", label="Is Non GST ", fieldtype="Check", insert_after="is_nil_exempt"
),
=======
'Purchase Invoice': purchase_invoice_gst_category + invoice_gst_fields + purchase_invoice_itc_fields + purchase_invoice_gst_fields,
'Purchase Order': purchase_invoice_gst_fields,
'Purchase Receipt': purchase_invoice_gst_fields,
'Sales Invoice': sales_invoice_gst_category + invoice_gst_fields + sales_invoice_shipping_fields + sales_invoice_gst_fields + si_ewaybill_fields + si_einvoice_fields,
'POS Invoice': sales_invoice_gst_fields,
'Delivery Note': sales_invoice_gst_fields + ewaybill_fields + sales_invoice_shipping_fields + delivery_note_gst_category,
'Payment Entry': payment_entry_fields,
'Journal Entry': journal_entry_fields,
'Sales Order': sales_invoice_gst_fields,
'Tax Category': inter_state_gst_field,
'Quotation': sales_invoice_gst_fields,
'Item': [
dict(fieldname='gst_hsn_code', label='HSN/SAC',
fieldtype='Link', options='GST HSN Code', insert_after='item_group'),
dict(fieldname='is_nil_exempt', label='Is Nil Rated or Exempted',
fieldtype='Check', insert_after='gst_hsn_code'),
dict(fieldname='is_non_gst', label='Is Non GST ',
fieldtype='Check', insert_after='is_nil_exempt')
>>>>>>> 7cae669e81 (fix(India): Auto tax fetching based on GSTIN)
],
"Quotation Item": [hsn_sac_field, nil_rated_exempt, is_non_gst],
"Supplier Quotation Item": [hsn_sac_field, nil_rated_exempt, is_non_gst],

394
erpnext/selling/doctype/quotation/quotation.json
View File

@ -112,16 +112,13 @@
"enq_det",
"supplier_quotation",
"opportunity",
"lost_reasons",
"competitors"
"lost_reasons"
],
"fields": [
{
"fieldname": "customer_section",
"fieldtype": "Section Break",
"options": "fa fa-user",
"show_days": 1,
"show_seconds": 1
"options": "fa fa-user"
},
{
"allow_on_submit": 1,
@ -131,9 +128,7 @@
"hidden": 1,
"label": "Title",
"no_copy": 1,
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "naming_series",
@ -145,9 +140,7 @@
"options": "SAL-QTN-.YYYY.-",
"print_hide": 1,
"reqd": 1,
"set_only_once": 1,
"show_days": 1,
"show_seconds": 1
"set_only_once": 1
},
{
"default": "Customer",
@ -159,9 +152,7 @@
"oldfieldtype": "Select",
"options": "DocType",
"print_hide": 1,
"reqd": 1,
"show_days": 1,
"show_seconds": 1
"reqd": 1
},
{
"bold": 1,
@ -174,9 +165,7 @@
"oldfieldtype": "Link",
"options": "quotation_to",
"print_hide": 1,
"search_index": 1,
"show_days": 1,
"show_seconds": 1
"search_index": 1
},
{
"bold": 1,
@ -185,16 +174,12 @@
"hidden": 1,
"in_global_search": 1,
"label": "Customer Name",
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "column_break1",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1,
"width": "50%"
},
{
@ -208,8 +193,6 @@
"options": "Quotation",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1,
"width": "150px"
},
{
@ -222,8 +205,6 @@
"print_hide": 1,
"remember_last_selected_value": 1,
"reqd": 1,
"show_days": 1,
"show_seconds": 1,
"width": "150px"
},
{
@ -238,16 +219,12 @@
"oldfieldtype": "Date",
"reqd": 1,
"search_index": 1,
"show_days": 1,
"show_seconds": 1,
"width": "100px"
},
{
"fieldname": "valid_till",
"fieldtype": "Date",
"label": "Valid Till",
"show_days": 1,
"show_seconds": 1
"label": "Valid Till"
},
{
"default": "Sales",
@ -259,9 +236,7 @@
"oldfieldtype": "Select",
"options": "\nSales\nMaintenance\nShopping Cart",
"print_hide": 1,
"reqd": 1,
"show_days": 1,
"show_seconds": 1
"reqd": 1
},
{
"collapsible": 1,
@ -269,18 +244,14 @@
"fieldname": "contact_section",
"fieldtype": "Section Break",
"label": "Address and Contact",
"options": "fa fa-bullhorn",
"show_days": 1,
"show_seconds": 1
"options": "fa fa-bullhorn"
},
{
"fieldname": "customer_address",
"fieldtype": "Link",
"label": "Customer Address",
"options": "Address",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "address_display",
@ -288,9 +259,7 @@
"label": "Address",
"oldfieldname": "customer_address",
"oldfieldtype": "Small Text",
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "contact_person",
@ -299,26 +268,20 @@
"oldfieldname": "contact_person",
"oldfieldtype": "Link",
"options": "Contact",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "contact_display",
"fieldtype": "Small Text",
"in_global_search": 1,
"label": "Contact",
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "contact_mobile",
"fieldtype": "Small Text",
"label": "Mobile No",
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "contact_email",
@ -327,16 +290,12 @@
"label": "Contact Email",
"options": "Email",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"depends_on": "eval:doc.quotaion_to=='Customer' && doc.party_name",
"fieldname": "col_break98",
"fieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1,
"width": "50%"
},
{
@ -344,18 +303,14 @@
"fieldtype": "Link",
"label": "Shipping Address",
"options": "Address",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "shipping_address",
"fieldtype": "Small Text",
"label": "Shipping Address",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"depends_on": "eval:doc.quotaion_to=='Customer' && doc.party_name",
@ -366,27 +321,21 @@
"oldfieldname": "customer_group",
"oldfieldtype": "Link",
"options": "Customer Group",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "territory",
"fieldtype": "Link",
"label": "Territory",
"options": "Territory",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"collapsible": 1,
"fieldname": "currency_and_price_list",
"fieldtype": "Section Break",
"label": "Currency and Price List",
"options": "fa fa-tag",
"show_days": 1,
"show_seconds": 1
"options": "fa fa-tag"
},
{
"fieldname": "currency",
@ -397,8 +346,6 @@
"options": "Currency",
"print_hide": 1,
"reqd": 1,
"show_days": 1,
"show_seconds": 1,
"width": "100px"
},
{
@ -411,15 +358,11 @@
"precision": "9",
"print_hide": 1,
"reqd": 1,
"show_days": 1,
"show_seconds": 1,
"width": "100px"
},
{
"fieldname": "column_break2",
"fieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1,
"width": "50%"
},
{
@ -431,8 +374,6 @@
"options": "Price List",
"print_hide": 1,
"reqd": 1,
"show_days": 1,
"show_seconds": 1,
"width": "100px"
},
{
@ -442,9 +383,7 @@
"options": "Currency",
"print_hide": 1,
"read_only": 1,
"reqd": 1,
"show_days": 1,
"show_seconds": 1
"reqd": 1
},
{
"description": "Rate at which Price list currency is converted to company's base currency",
@ -453,9 +392,7 @@
"label": "Price List Exchange Rate",
"precision": "9",
"print_hide": 1,
"reqd": 1,
"show_days": 1,
"show_seconds": 1
"reqd": 1
},
{
"default": "0",
@ -464,17 +401,13 @@
"label": "Ignore Pricing Rule",
"no_copy": 1,
"permlevel": 1,
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "items_section",
"fieldtype": "Section Break",
"oldfieldtype": "Section Break",
"options": "fa fa-shopping-cart",
"show_days": 1,
"show_seconds": 1
"options": "fa fa-shopping-cart"
},
{
"allow_bulk_edit": 1,
@ -485,39 +418,29 @@
"oldfieldtype": "Table",
"options": "Quotation Item",
"reqd": 1,
"show_days": 1,
"show_seconds": 1,
"width": "40px"
},
{
"fieldname": "pricing_rule_details",
"fieldtype": "Section Break",
"label": "Pricing Rules",
"show_days": 1,
"show_seconds": 1
"label": "Pricing Rules"
},
{
"fieldname": "pricing_rules",
"fieldtype": "Table",
"label": "Pricing Rule Detail",
"options": "Pricing Rule Detail",
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "sec_break23",
"fieldtype": "Section Break",
"show_days": 1,
"show_seconds": 1
"fieldtype": "Section Break"
},
{
"fieldname": "total_qty",
"fieldtype": "Float",
"label": "Total Quantity",
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "base_total",
@ -525,9 +448,7 @@
"label": "Total (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "base_net_total",
@ -538,24 +459,18 @@
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1,
"width": "100px"
},
{
"fieldname": "column_break_28",
"fieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1
"fieldtype": "Column Break"
},
{
"fieldname": "total",
"fieldtype": "Currency",
"label": "Total",
"options": "currency",
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "net_total",
@ -563,42 +478,32 @@
"label": "Net Total",
"options": "currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "total_net_weight",
"fieldtype": "Float",
"label": "Total Net Weight",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "taxes_section",
"fieldtype": "Section Break",
"label": "Taxes and Charges",
"oldfieldtype": "Section Break",
"options": "fa fa-money",
"show_days": 1,
"show_seconds": 1
"options": "fa fa-money"
},
{
"fieldname": "tax_category",
"fieldtype": "Link",
"label": "Tax Category",
"options": "Tax Category",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "column_break_34",
"fieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1
"fieldtype": "Column Break"
},
{
"fieldname": "shipping_rule",
@ -606,15 +511,11 @@
"label": "Shipping Rule",
"oldfieldtype": "Button",
"options": "Shipping Rule",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "section_break_36",
"fieldtype": "Section Break",
"show_days": 1,
"show_seconds": 1
"fieldtype": "Section Break"
},
{
"fieldname": "taxes_and_charges",
@ -623,9 +524,7 @@
"oldfieldname": "charge",
"oldfieldtype": "Link",
"options": "Sales Taxes and Charges Template",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "taxes",
@ -633,17 +532,13 @@
"label": "Sales Taxes and Charges",
"oldfieldname": "other_charges",
"oldfieldtype": "Table",
"options": "Sales Taxes and Charges",
"show_days": 1,
"show_seconds": 1
"options": "Sales Taxes and Charges"
},
{
"collapsible": 1,
"fieldname": "sec_tax_breakup",
"fieldtype": "Section Break",
"label": "Tax Breakup",
"show_days": 1,
"show_seconds": 1
"label": "Tax Breakup"
},
{
"fieldname": "other_charges_calculation",
@ -652,15 +547,11 @@
"no_copy": 1,
"oldfieldtype": "HTML",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "section_break_39",
"fieldtype": "Section Break",
"show_days": 1,
"show_seconds": 1
"fieldtype": "Section Break"
},
{
"fieldname": "base_total_taxes_and_charges",
@ -670,15 +561,11 @@
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "column_break_42",
"fieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1
"fieldtype": "Column Break"
},
{
"fieldname": "total_taxes_and_charges",
@ -686,34 +573,26 @@
"label": "Total Taxes and Charges",
"options": "currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"collapsible": 1,
"collapsible_depends_on": "discount_amount",
"fieldname": "section_break_44",
"fieldtype": "Section Break",
"label": "Additional Discount and Coupon Code",
"show_days": 1,
"show_seconds": 1
"label": "Additional Discount and Coupon Code"
},
{
"fieldname": "coupon_code",
"fieldtype": "Link",
"label": "Coupon Code",
"options": "Coupon Code",
"show_days": 1,
"show_seconds": 1
"options": "Coupon Code"
},
{
"fieldname": "referral_sales_partner",
"fieldtype": "Link",
"label": "Referral Sales Partner",
"options": "Sales Partner",
"show_days": 1,
"show_seconds": 1
"options": "Sales Partner"
},
{
"default": "Grand Total",
@ -721,9 +600,7 @@
"fieldtype": "Select",
"label": "Apply Additional Discount On",
"options": "\nGrand Total\nNet Total",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "base_discount_amount",
@ -731,41 +608,31 @@
"label": "Additional Discount Amount (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "column_break_46",
"fieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1
"fieldtype": "Column Break"
},
{
"fieldname": "additional_discount_percentage",
"fieldtype": "Float",
"label": "Additional Discount Percentage",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "discount_amount",
"fieldtype": "Currency",
"label": "Additional Discount Amount",
"options": "currency",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "totals",
"fieldtype": "Section Break",
"oldfieldtype": "Section Break",
"options": "fa fa-money",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "base_grand_total",
@ -776,8 +643,6 @@
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1,
"width": "200px"
},
{
@ -787,9 +652,7 @@
"no_copy": 1,
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"description": "In Words will be visible once you save the Quotation.",
@ -801,8 +664,6 @@
"oldfieldtype": "Data",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1,
"width": "200px"
},
{
@ -814,8 +675,6 @@
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1,
"width": "200px"
},
{
@ -823,8 +682,6 @@
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1,
"width": "50%"
},
{
@ -836,8 +693,6 @@
"oldfieldtype": "Currency",
"options": "currency",
"read_only": 1,
"show_days": 1,
"show_seconds": 1,
"width": "200px"
},
{
@ -847,9 +702,7 @@
"no_copy": 1,
"options": "currency",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"bold": 1,
@ -860,8 +713,6 @@
"oldfieldtype": "Currency",
"options": "currency",
"read_only": 1,
"show_days": 1,
"show_seconds": 1,
"width": "200px"
},
{
@ -873,25 +724,19 @@
"oldfieldtype": "Data",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1,
"width": "200px"
},
{
"fieldname": "payment_schedule_section",
"fieldtype": "Section Break",
"label": "Payment Terms",
"show_days": 1,
"show_seconds": 1
"label": "Payment Terms"
},
{
"fieldname": "payment_terms_template",
"fieldtype": "Link",
"label": "Payment Terms Template",
"options": "Payment Terms Template",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "payment_schedule",
@ -899,9 +744,7 @@
"label": "Payment Schedule",
"no_copy": 1,
"options": "Payment Schedule",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"collapsible": 1,
@ -910,9 +753,7 @@
"fieldtype": "Section Break",
"label": "Terms and Conditions",
"oldfieldtype": "Section Break",
"options": "fa fa-legal",
"show_days": 1,
"show_seconds": 1
"options": "fa fa-legal"
},
{
"fieldname": "tc_name",
@ -922,26 +763,20 @@
"oldfieldtype": "Link",
"options": "Terms and Conditions",
"print_hide": 1,
"report_hide": 1,
"show_days": 1,
"show_seconds": 1
"report_hide": 1
},
{
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Term Details",
"oldfieldname": "terms",
"oldfieldtype": "Text Editor",
"show_days": 1,
"show_seconds": 1
"oldfieldtype": "Text Editor"
},
{
"collapsible": 1,
"fieldname": "print_settings",
"fieldtype": "Section Break",
"label": "Print Settings",
"show_days": 1,
"show_seconds": 1
"label": "Print Settings"
},
{
"allow_on_submit": 1,
@ -951,9 +786,7 @@
"oldfieldname": "letter_head",
"oldfieldtype": "Select",
"options": "Letter Head",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"allow_on_submit": 1,
@ -961,15 +794,11 @@
"fieldname": "group_same_items",
"fieldtype": "Check",
"label": "Group same items",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "column_break_73",
"fieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1
"fieldtype": "Column Break"
},
{
"allow_on_submit": 1,
@ -981,25 +810,19 @@
"oldfieldtype": "Link",
"options": "Print Heading",
"print_hide": 1,
"report_hide": 1,
"show_days": 1,
"show_seconds": 1
"report_hide": 1
},
{
"fieldname": "language",
"fieldtype": "Data",
"label": "Print Language",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "subscription_section",
"fieldtype": "Section Break",
"label": "Auto Repeat Section",
"show_days": 1,
"show_seconds": 1
"label": "Auto Repeat Section"
},
{
"fieldname": "auto_repeat",
@ -1008,18 +831,14 @@
"no_copy": 1,
"options": "Auto Repeat",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"allow_on_submit": 1,
"depends_on": "eval: doc.auto_repeat",
"fieldname": "update_auto_repeat_reference",
"fieldtype": "Button",
"label": "Update Auto Repeat Reference",
"show_days": 1,
"show_seconds": 1
"label": "Update Auto Repeat Reference"
},
{
"collapsible": 1,
@ -1028,9 +847,7 @@
"label": "More Information",
"oldfieldtype": "Section Break",
"options": "fa fa-file-text",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "campaign",
@ -1039,9 +856,7 @@
"oldfieldname": "campaign",
"oldfieldtype": "Link",
"options": "Campaign",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "source",
@ -1050,9 +865,7 @@
"oldfieldname": "source",
"oldfieldtype": "Select",
"options": "Lead Source",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"allow_on_submit": 1,
@ -1063,17 +876,13 @@
"no_copy": 1,
"oldfieldname": "order_lost_reason",
"oldfieldtype": "Small Text",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"fieldname": "column_break4",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1,
"width": "50%"
},
{
@ -1088,9 +897,7 @@
"options": "Draft\nOpen\nReplied\nOrdered\nLost\nCancelled\nExpired",
"print_hide": 1,
"read_only": 1,
"reqd": 1,
"show_days": 1,
"show_seconds": 1
"reqd": 1
},
{
"fieldname": "enq_det",
@ -1100,17 +907,13 @@
"oldfieldname": "enq_det",
"oldfieldtype": "Text",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"fieldname": "supplier_quotation",
"fieldtype": "Link",
"label": "Supplier Quotation",
"options": "Supplier Quotation",
"show_days": 1,
"show_seconds": 1
"options": "Supplier Quotation"
},
{
"fieldname": "opportunity",
@ -1118,9 +921,7 @@
"label": "Opportunity",
"options": "Opportunity",
"print_hide": 1,
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"allow_on_submit": 1,
@ -1128,9 +929,7 @@
"fieldtype": "Table MultiSelect",
"label": "Lost Reasons",
"options": "Quotation Lost Reason Detail",
"read_only": 1,
"show_days": 1,
"show_seconds": 1
"read_only": 1
},
{
"depends_on": "packed_items",
@ -1138,9 +937,7 @@
"fieldtype": "Table",
"label": "Bundle Items",
"options": "Packed Item",
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
"print_hide": 1
},
{
"collapsible": 1,
@ -1150,44 +947,26 @@
"fieldtype": "Section Break",
"label": "Bundle Items",
"options": "fa fa-suitcase",
<<<<<<< HEAD
"print_hide": 1
},
{
"allow_on_submit": 1,
"fieldname": "competitors",
"fieldtype": "Table MultiSelect",
"label": "Competitors",
"options": "Competitor Detail",
"read_only": 1
=======
"print_hide": 1,
"show_days": 1,
"show_seconds": 1
},
{
"fieldname": "company_address",
"fieldtype": "Link",
"label": "Company Address Name",
"options": "Address",
"show_days": 1,
"show_seconds": 1
"options": "Address"
},
{
"fieldname": "company_address_display",
"fieldtype": "Small Text",
"label": "Company Address",
"read_only": 1,
"show_days": 1,
"show_seconds": 1
>>>>>>> 7cae669e81 (fix(India): Auto tax fetching based on GSTIN)
"read_only": 1
}
],
"icon": "fa fa-shopping-cart",
"idx": 82,
"is_submittable": 1,
"links": [],
"modified": "2022-03-23 16:49:36.297403",
"modified": "2022-04-02 17:21:48.578719",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
@ -1282,6 +1061,7 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"timeline_field": "party_name",
"title_field": "title"
}