schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Tab Break in Quotation

Browse Source 
(cherry picked from commit 7546562139)
This commit is contained in:
Nabin Hait
2022-09-27 15:16:27 +05:30
committed by Mergify
parent 31cd96bc89
commit b0a9f79e18
3 changed files with 151 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,26 +15,13 @@
"quotation_to",
"party_name",
"customer_name",
"column_break1",
"amended_from",
"company",
"column_break_7",
"transaction_date",
"valid_till",
"column_break1",
"order_type",
"contact_section",
"customer_address",
"address_display",
"contact_person",
"contact_display",
"contact_mobile",
"contact_email",
"col_break98",
"shipping_address_name",
"shipping_address",
"company_address",
"company_address_display",
"customer_group",
"territory",
"company",
"amended_from",
"currency_and_price_list",
"currency",
"conversion_rate",
@@ -43,59 +30,79 @@
"price_list_currency",
"plc_conversion_rate",
"ignore_pricing_rule",
"section_break_33",
"scan_barcode",
"items_section",
"scan_barcode",
"items",
"bundle_items_section",
"packed_items",
"pricing_rule_details",
"pricing_rules",
"sec_break23",
"total_qty",
"total_net_weight",
"column_break_28",
"base_total",
"base_net_total",
"column_break_28",
"column_break_31",
"total",
"net_total",
"total_net_weight",
"taxes_section",
"taxes_and_charges",
"column_break_36",
"tax_category",
"column_break_34",
"shipping_rule",
"section_break_36",
"taxes_and_charges",
"taxes",
"sec_tax_breakup",
"other_charges_calculation",
"section_break_39",
"base_total_taxes_and_charges",
"column_break_42",
"total_taxes_and_charges",
"section_break_44",
"coupon_code",
"referral_sales_partner",
"apply_discount_on",
"base_discount_amount",
"column_break_46",
"additional_discount_percentage",
"discount_amount",
"totals",
"base_grand_total",
"base_rounding_adjustment",
"base_in_words",
"base_rounded_total",
"base_in_words",
"column_break3",
"grand_total",
"rounding_adjustment",
"rounded_total",
"in_words",
"section_break_44",
"apply_discount_on",
"base_discount_amount",
"coupon_code",
"column_break_46",
"additional_discount_percentage",
"discount_amount",
"referral_sales_partner",
"sec_tax_breakup",
"other_charges_calculation",
"bundle_items_section",
"packed_items",
"pricing_rule_details",
"pricing_rules",
"address_and_contact_tab",
"billing_address_section",
"customer_address",
"address_display",
"col_break98",
"contact_person",
"contact_display",
"contact_mobile",
"contact_email",
"shipping_address_section",
"shipping_address_name",
"column_break_81",
"shipping_address",
"company_address_section",
"company_address",
"column_break_87",
"company_address_display",
"terms_tab",
"payment_schedule_section",
"payment_terms_template",
"payment_schedule",
"terms_section_break",
"tc_name",
"terms",
"more_info_tab",
"print_settings",
"letter_head",
"group_same_items",
@@ -105,17 +112,23 @@
"subscription_section",
"auto_repeat",
"update_auto_repeat_reference",
"more_info",
"additional_info_section",
"status",
"customer_group",
"territory",
"column_break_108",
"campaign",
"source",
"order_lost_reason",
"column_break4",
"status",
"enq_det",
"supplier_quotation",
"opportunity",
"supplier_quotation",
"enq_det",
"lost_reasons_section",
"lost_reasons",
"competitors"
"competitors",
"column_break_117",
"order_lost_reason",
"connections_tab"
],
"fields": [
{
@@ -241,14 +254,6 @@
"print_hide": 1,
"reqd": 1
},
{
"collapsible": 1,
"depends_on": "party_name",
"fieldname": "contact_section",
"fieldtype": "Section Break",
"label": "Address and Contact",
"options": "fa fa-bullhorn"
},
{
"fieldname": "customer_address",
"fieldtype": "Link",
@@ -408,6 +413,8 @@
{
"fieldname": "items_section",
"fieldtype": "Section Break",
"hide_border": 1,
"label": "Items",
"oldfieldtype": "Section Break",
"options": "fa fa-shopping-cart"
},
@@ -415,7 +422,6 @@
"allow_bulk_edit": 1,
"fieldname": "items",
"fieldtype": "Table",
"label": "Items",
"oldfieldname": "quotation_details",
"oldfieldtype": "Table",
"options": "Quotation Item",
@@ -423,6 +429,7 @@
"width": "40px"
},
{
"collapsible": 1,
"fieldname": "pricing_rule_details",
"fieldtype": "Section Break",
"label": "Pricing Rules"
@@ -492,6 +499,7 @@
{
"fieldname": "taxes_section",
"fieldtype": "Section Break",
"hide_border": 1,
"label": "Taxes and Charges",
"oldfieldtype": "Section Break",
"options": "fa fa-money"
@@ -517,7 +525,8 @@
},
{
"fieldname": "section_break_36",
"fieldtype": "Section Break"
"fieldtype": "Section Break",
"hide_border": 1
},
{
"fieldname": "taxes_and_charges",
@@ -579,10 +588,9 @@
},
{
"collapsible": 1,
"collapsible_depends_on": "discount_amount",
"fieldname": "section_break_44",
"fieldtype": "Section Break",
"label": "Additional Discount and Coupon Code"
"label": "Additional Discount"
},
{
"fieldname": "coupon_code",
@@ -632,6 +640,7 @@
{
"fieldname": "totals",
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break",
"options": "fa fa-money",
"print_hide": 1
@@ -657,7 +666,6 @@
"read_only": 1
},
{
"description": "In Words will be visible once you save the Quotation.",
"fieldname": "base_in_words",
"fieldtype": "Data",
"label": "In Words (Company Currency)",
@@ -665,8 +673,7 @@
"oldfieldname": "in_words",
"oldfieldtype": "Data",
"print_hide": 1,
"read_only": 1,
"width": "200px"
"read_only": 1
},
{
"fieldname": "base_rounded_total",
@@ -749,7 +756,6 @@
"print_hide": 1
},
{
"collapsible": 1,
"collapsible_depends_on": "terms",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
@@ -824,7 +830,7 @@
{
"fieldname": "subscription_section",
"fieldtype": "Section Break",
"label": "Auto Repeat Section"
"label": "Auto Repeat"
},
{
"fieldname": "auto_repeat",
@@ -842,15 +848,6 @@
"fieldtype": "Button",
"label": "Update Auto Repeat Reference"
},
{
"collapsible": 1,
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Information",
"oldfieldtype": "Section Break",
"options": "fa fa-file-text",
"print_hide": 1
},
{
"fieldname": "campaign",
"fieldtype": "Link",
@@ -943,7 +940,6 @@
},
{
"collapsible": 1,
"collapsible_depends_on": "packed_items",
"depends_on": "packed_items",
"fieldname": "bundle_items_section",
"fieldtype": "Section Break",
@@ -970,22 +966,99 @@
"label": "Company Address",
"read_only": 1
},
{
"fieldname": "section_break_33",
"fieldtype": "Section Break"
},
{
"fieldname": "scan_barcode",
"fieldtype": "Data",
"label": "Scan Barcode",
"options": "Barcode"
},
{
"fieldname": "address_and_contact_tab",
"fieldtype": "Tab Break",
"label": "Address and Contact"
},
{
"fieldname": "terms_tab",
"fieldtype": "Tab Break",
"label": "Terms"
},
{
"fieldname": "more_info_tab",
"fieldtype": "Tab Break",
"label": "More Info"
},
{
"fieldname": "connections_tab",
"fieldtype": "Tab Break",
"label": "Connections",
"show_dashboard": 1
},
{
"fieldname": "column_break_7",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_31",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_36",
"fieldtype": "Column Break"
},
{
"fieldname": "billing_address_section",
"fieldtype": "Section Break",
"label": "Billing Address",
"options": "fa fa-bullhorn"
},
{
"fieldname": "shipping_address_section",
"fieldtype": "Section Break",
"label": "Shipping Address"
},
{
"fieldname": "column_break_81",
"fieldtype": "Column Break"
},
{
"fieldname": "company_address_section",
"fieldtype": "Section Break",
"label": "Company Address"
},
{
"fieldname": "column_break_87",
"fieldtype": "Column Break"
},
{
"collapsible": 1,
"depends_on": "eval:(doc.lost_reasons.length>0 || doc.order_lost_reason)",
"fieldname": "lost_reasons_section",
"fieldtype": "Section Break",
"label": "Lost Reasons"
},
{
"fieldname": "column_break_117",
"fieldtype": "Column Break"
},
{
"collapsible": 1,
"fieldname": "additional_info_section",
"fieldtype": "Section Break",
"label": "Additional Info",
"oldfieldtype": "Section Break",
"options": "fa fa-file-text",
"print_hide": 1
},
{
"fieldname": "column_break_108",
"fieldtype": "Column Break"
}
],
"icon": "fa fa-shopping-cart",
"idx": 82,
"is_submittable": 1,
"links": [],
"modified": "2022-09-16 17:44:43.221804",
"modified": "2022-09-27 15:14:27.693005",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",

3
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -847,7 +847,6 @@
},
{
"collapsible": 1,
"collapsible_depends_on": "discount_amount",
"fieldname": "section_break_48",
"fieldtype": "Section Break",
"hide_days": 1,
@@ -1629,7 +1628,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
"modified": "2022-09-27 12:38:57.007441",
"modified": "2022-09-27 14:51:09.128426",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",

3
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -712,7 +712,6 @@
},
{
"collapsible": 1,
"collapsible_depends_on": "discount_amount",
"fieldname": "section_break_49",
"fieldtype": "Section Break",
"label": "Additional Discount"
@@ -1387,7 +1386,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
"modified": "2022-09-27 12:49:21.640004",
"modified": "2022-09-27 14:51:31.964085",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",