feat: Add accounting dimensions to Supplier Quotation
(cherry picked from commit 089da459f73791b86d33cf066e6879e77af200b5) # Conflicts: # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
This commit is contained in:
parent
d89a9a5bfd
commit
7d4ac7e7ff
@ -20,6 +20,10 @@
|
|||||||
"valid_till",
|
"valid_till",
|
||||||
"quotation_number",
|
"quotation_number",
|
||||||
"amended_from",
|
"amended_from",
|
||||||
|
"accounting_dimensions_section",
|
||||||
|
"cost_center",
|
||||||
|
"dimension_col_break",
|
||||||
|
"project",
|
||||||
"currency_and_price_list",
|
"currency_and_price_list",
|
||||||
"currency",
|
"currency",
|
||||||
"conversion_rate",
|
"conversion_rate",
|
||||||
@ -838,6 +842,79 @@
|
|||||||
"fieldname": "named_place",
|
"fieldname": "named_place",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "Named Place"
|
"label": "Named Place"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "shipping_address",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Shipping Address",
|
||||||
|
"options": "Address",
|
||||||
|
"print_hide": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_zjaq",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "shipping_address_display",
|
||||||
|
"fieldtype": "Small Text",
|
||||||
|
"label": "Shipping Address Details",
|
||||||
|
"print_hide": 1,
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "shipping_address_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Shipping Address"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "supplier_address_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Supplier Address"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "company_billing_address_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Company Billing Address"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "billing_address",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Company Billing Address",
|
||||||
|
"options": "Address"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_gcth",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "billing_address_display",
|
||||||
|
"fieldtype": "Small Text",
|
||||||
|
"label": "Billing Address Details",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "cost_center",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Cost Center",
|
||||||
|
"options": "Cost Center"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "project",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Project",
|
||||||
|
"options": "Project"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "dimension_col_break",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "accounting_dimensions_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Accounting Dimensions"
|
||||||
|
>>>>>>> 089da459f7 (feat: Add accounting dimensions to Supplier Quotation)
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "fa fa-shopping-cart",
|
"icon": "fa fa-shopping-cart",
|
||||||
@ -845,7 +922,11 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2023-06-03 16:20:15.880114",
|
"modified": "2023-06-03 16:20:15.880114",
|
||||||
|
=======
|
||||||
|
"modified": "2023-11-17 12:34:30.083077",
|
||||||
|
>>>>>>> 089da459f7 (feat: Add accounting dimensions to Supplier Quotation)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Buying",
|
"module": "Buying",
|
||||||
"name": "Supplier Quotation",
|
"name": "Supplier Quotation",
|
||||||
|
|||||||
@ -68,6 +68,8 @@
|
|||||||
"column_break_15",
|
"column_break_15",
|
||||||
"manufacturer_part_no",
|
"manufacturer_part_no",
|
||||||
"ad_sec_break",
|
"ad_sec_break",
|
||||||
|
"cost_center",
|
||||||
|
"dimension_col_break",
|
||||||
"project",
|
"project",
|
||||||
"section_break_44",
|
"section_break_44",
|
||||||
"page_break"
|
"page_break"
|
||||||
@ -133,7 +135,6 @@
|
|||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fetch_from": "item_code.image",
|
|
||||||
"fieldname": "image",
|
"fieldname": "image",
|
||||||
"fieldtype": "Attach",
|
"fieldtype": "Attach",
|
||||||
"hidden": 1,
|
"hidden": 1,
|
||||||
@ -554,13 +555,23 @@
|
|||||||
"fieldname": "expected_delivery_date",
|
"fieldname": "expected_delivery_date",
|
||||||
"fieldtype": "Date",
|
"fieldtype": "Date",
|
||||||
"label": "Expected Delivery Date"
|
"label": "Expected Delivery Date"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "cost_center",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Cost Center",
|
||||||
|
"options": "Cost Center"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "dimension_col_break",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2023-11-14 18:35:03.435817",
|
"modified": "2023-11-17 12:25:26.235367",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Buying",
|
"module": "Buying",
|
||||||
"name": "Supplier Quotation Item",
|
"name": "Supplier Quotation Item",
|
||||||
|
|||||||
@ -539,6 +539,8 @@ accounting_dimension_doctypes = [
|
|||||||
"Subcontracting Receipt",
|
"Subcontracting Receipt",
|
||||||
"Subcontracting Receipt Item",
|
"Subcontracting Receipt Item",
|
||||||
"Account Closing Balance",
|
"Account Closing Balance",
|
||||||
|
"Supplier Quotation",
|
||||||
|
"Supplier Quotation Item",
|
||||||
]
|
]
|
||||||
|
|
||||||
get_matching_queries = (
|
get_matching_queries = (
|
||||||
|
|||||||
@ -349,5 +349,6 @@ erpnext.patches.v14_0.add_default_for_repost_settings
|
|||||||
erpnext.patches.v15_0.rename_daily_depreciation_to_depreciation_amount_based_on_num_days_in_month
|
erpnext.patches.v15_0.rename_daily_depreciation_to_depreciation_amount_based_on_num_days_in_month
|
||||||
erpnext.patches.v15_0.rename_depreciation_amount_based_on_num_days_in_month_to_daily_prorata_based
|
erpnext.patches.v15_0.rename_depreciation_amount_based_on_num_days_in_month_to_daily_prorata_based
|
||||||
erpnext.patches.v15_0.set_reserved_stock_in_bin
|
erpnext.patches.v15_0.set_reserved_stock_in_bin
|
||||||
|
erpnext.patches.v14_0.create_accounting_dimensions_in_supplier_quotation
|
||||||
# below migration patch should always run last
|
# below migration patch should always run last
|
||||||
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
|
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
|
||||||
|
|||||||
@ -0,0 +1,8 @@
|
|||||||
|
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
|
||||||
|
create_accounting_dimensions_for_doctype,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def execute():
|
||||||
|
create_accounting_dimensions_for_doctype(doctype="Supplier Quotation")
|
||||||
|
create_accounting_dimensions_for_doctype(doctype="Supplier Quotation Item")
|
||||||
Loading…
x
Reference in New Issue
Block a user