Merge pull request #33305 from barredterra/incoterm-named-place

feat: incoterm named place
This commit is contained in:
Deepesh Garg 2022-12-15 11:59:54 +05:30 committed by GitHub
commit 076527bb88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 80 additions and 24 deletions

View File

@ -64,12 +64,13 @@
"tax_withholding_net_total", "tax_withholding_net_total",
"base_tax_withholding_net_total", "base_tax_withholding_net_total",
"taxes_section", "taxes_section",
"tax_category",
"taxes_and_charges", "taxes_and_charges",
"column_break_58", "column_break_58",
"tax_category",
"column_break_49",
"shipping_rule", "shipping_rule",
"column_break_49",
"incoterm", "incoterm",
"named_place",
"section_break_51", "section_break_51",
"taxes", "taxes",
"totals", "totals",
@ -1541,13 +1542,19 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Incoterm", "label": "Incoterm",
"options": "Incoterm" "options": "Incoterm"
},
{
"depends_on": "incoterm",
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-11-25 12:44:29.935567", "modified": "2022-12-12 18:37:38.142688",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

View File

@ -61,12 +61,13 @@
"total", "total",
"net_total", "net_total",
"taxes_section", "taxes_section",
"tax_category",
"taxes_and_charges", "taxes_and_charges",
"column_break_38", "column_break_38",
"shipping_rule", "shipping_rule",
"incoterm",
"column_break_55", "column_break_55",
"tax_category", "incoterm",
"named_place",
"section_break_40", "section_break_40",
"taxes", "taxes",
"section_break_43", "section_break_43",
@ -2122,6 +2123,12 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Incoterm", "label": "Incoterm",
"options": "Incoterm" "options": "Incoterm"
},
{
"depends_on": "incoterm",
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
@ -2134,7 +2141,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
"modified": "2022-12-05 16:18:14.532114", "modified": "2022-12-12 18:34:33.409895",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

View File

@ -62,12 +62,13 @@
"set_reserve_warehouse", "set_reserve_warehouse",
"supplied_items", "supplied_items",
"taxes_section", "taxes_section",
"tax_category",
"taxes_and_charges", "taxes_and_charges",
"column_break_53", "column_break_53",
"tax_category",
"column_break_50",
"shipping_rule", "shipping_rule",
"column_break_50",
"incoterm", "incoterm",
"named_place",
"section_break_52", "section_break_52",
"taxes", "taxes",
"totals", "totals",
@ -1256,13 +1257,19 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Incoterm", "label": "Incoterm",
"options": "Incoterm" "options": "Incoterm"
},
{
"depends_on": "incoterm",
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-11-17 17:28:07.729943", "modified": "2022-12-12 18:36:37.455134",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

View File

@ -40,12 +40,13 @@
"total", "total",
"net_total", "net_total",
"taxes_section", "taxes_section",
"tax_category",
"taxes_and_charges", "taxes_and_charges",
"column_break_34", "column_break_34",
"tax_category",
"column_break_36",
"shipping_rule", "shipping_rule",
"column_break_36",
"incoterm", "incoterm",
"named_place",
"section_break_38", "section_break_38",
"taxes", "taxes",
"totals", "totals",
@ -830,6 +831,12 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Incoterm", "label": "Incoterm",
"options": "Incoterm" "options": "Incoterm"
},
{
"depends_on": "incoterm",
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
} }
], ],
"icon": "fa fa-shopping-cart", "icon": "fa fa-shopping-cart",
@ -837,7 +844,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-11-17 17:27:32.179686", "modified": "2022-12-12 18:35:39.740974",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",

View File

@ -43,12 +43,13 @@
"total", "total",
"net_total", "net_total",
"taxes_section", "taxes_section",
"tax_category",
"taxes_and_charges", "taxes_and_charges",
"column_break_36", "column_break_36",
"tax_category",
"column_break_34",
"shipping_rule", "shipping_rule",
"column_break_34",
"incoterm", "incoterm",
"named_place",
"section_break_36", "section_break_36",
"taxes", "taxes",
"section_break_39", "section_break_39",
@ -1059,13 +1060,19 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Incoterm", "label": "Incoterm",
"options": "Incoterm" "options": "Incoterm"
},
{
"depends_on": "incoterm",
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
} }
], ],
"icon": "fa fa-shopping-cart", "icon": "fa fa-shopping-cart",
"idx": 82, "idx": 82,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-11-17 17:20:54.984348", "modified": "2022-12-12 18:32:28.671332",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

View File

@ -58,12 +58,13 @@
"total", "total",
"net_total", "net_total",
"taxes_section", "taxes_section",
"tax_category",
"taxes_and_charges", "taxes_and_charges",
"column_break_38", "column_break_38",
"tax_category",
"column_break_49",
"shipping_rule", "shipping_rule",
"column_break_49",
"incoterm", "incoterm",
"named_place",
"section_break_40", "section_break_40",
"taxes", "taxes",
"section_break_43", "section_break_43",
@ -1630,13 +1631,19 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Incoterm", "label": "Incoterm",
"options": "Incoterm" "options": "Incoterm"
},
{
"depends_on": "incoterm",
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-11-17 17:22:00.413878", "modified": "2022-12-12 18:34:00.681780",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",

View File

@ -57,12 +57,13 @@
"total", "total",
"net_total", "net_total",
"taxes_section", "taxes_section",
"tax_category",
"taxes_and_charges", "taxes_and_charges",
"column_break_43", "column_break_43",
"tax_category",
"column_break_39",
"shipping_rule", "shipping_rule",
"column_break_39",
"incoterm", "incoterm",
"named_place",
"section_break_41", "section_break_41",
"taxes", "taxes",
"section_break_44", "section_break_44",
@ -1388,13 +1389,19 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Incoterm", "label": "Incoterm",
"options": "Incoterm" "options": "Incoterm"
},
{
"depends_on": "incoterm",
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
} }
], ],
"icon": "fa fa-truck", "icon": "fa fa-truck",
"idx": 146, "idx": 146,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-11-17 17:22:42.860790", "modified": "2022-12-12 18:38:53.067799",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",

View File

@ -58,12 +58,13 @@
"total", "total",
"net_total", "net_total",
"taxes_charges_section", "taxes_charges_section",
"tax_category",
"taxes_and_charges", "taxes_and_charges",
"shipping_col", "shipping_col",
"tax_category",
"column_break_53",
"shipping_rule", "shipping_rule",
"column_break_53",
"incoterm", "incoterm",
"named_place",
"taxes_section", "taxes_section",
"taxes", "taxes",
"totals", "totals",
@ -1225,13 +1226,19 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Incoterm", "label": "Incoterm",
"options": "Incoterm" "options": "Incoterm"
},
{
"depends_on": "incoterm",
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
} }
], ],
"icon": "fa fa-truck", "icon": "fa fa-truck",
"idx": 261, "idx": 261,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-11-17 17:29:30.067536", "modified": "2022-12-12 18:40:32.447752",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",