From c3845ac0f1f726ae8f5d9f20211b6f50955e997e Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 11 Apr 2024 11:30:56 +0530 Subject: [PATCH] fix: Allow updating cost center and project for repostable doctypes --- .../doctype/accounting_dimension/accounting_dimension.js | 5 ++++- erpnext/accounts/doctype/payment_entry/payment_entry.json | 6 ++++-- .../doctype/purchase_invoice/purchase_invoice.json | 4 +++- .../accounts/doctype/purchase_invoice/purchase_invoice.py | 8 ++------ erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 4 +++- erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 8 ++------ 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js index cd883e5bf72..4e45dede1d5 100644 --- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js +++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js @@ -57,9 +57,12 @@ frappe.ui.form.on("Accounting Dimension", { } }, + label: function (frm) { + frm.set_value("fieldname", frappe.model.scrub(frm.doc.label)); + }, + document_type: function (frm) { frm.set_value("label", frm.doc.document_type); - frm.set_value("fieldname", frappe.model.scrub(frm.doc.document_type)); frappe.db.get_value( "Accounting Dimension", diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json index 0dfa1a51138..e27a1f79b8e 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.json +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -150,6 +150,7 @@ "reqd": 1 }, { + "allow_on_submit": 1, "fieldname": "cost_center", "fieldtype": "Link", "label": "Cost Center", @@ -477,6 +478,7 @@ "label": "More Information" }, { + "allow_on_submit": 1, "fieldname": "project", "fieldtype": "Link", "label": "Project", @@ -777,7 +779,7 @@ "table_fieldname": "payment_entries" } ], - "modified": "2024-03-27 13:10:09.131139", + "modified": "2024-04-11 11:25:07.366347", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Entry", @@ -823,4 +825,4 @@ "states": [], "title_field": "title", "track_changes": 1 -} +} \ No newline at end of file diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 5e070d0f871..e68c8410b73 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -299,6 +299,7 @@ "remember_last_selected_value": 1 }, { + "allow_on_submit": 1, "fieldname": "cost_center", "fieldtype": "Link", "label": "Cost Center", @@ -1368,6 +1369,7 @@ "read_only": 1 }, { + "allow_on_submit": 1, "fieldname": "project", "fieldtype": "Link", "label": "Project", @@ -1638,7 +1640,7 @@ "idx": 204, "is_submittable": 1, "links": [], - "modified": "2024-03-27 13:10:23.476658", + "modified": "2024-04-11 11:28:42.802211", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index e224b594d23..bbf9fc36bbb 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -68,15 +68,11 @@ class PurchaseInvoice(BuyingController): from erpnext.accounts.doctype.purchase_invoice_advance.purchase_invoice_advance import ( PurchaseInvoiceAdvance, ) - from erpnext.accounts.doctype.purchase_invoice_item.purchase_invoice_item import ( - PurchaseInvoiceItem, - ) + from erpnext.accounts.doctype.purchase_invoice_item.purchase_invoice_item import PurchaseInvoiceItem from erpnext.accounts.doctype.purchase_taxes_and_charges.purchase_taxes_and_charges import ( PurchaseTaxesandCharges, ) - from erpnext.accounts.doctype.tax_withheld_vouchers.tax_withheld_vouchers import ( - TaxWithheldVouchers, - ) + from erpnext.accounts.doctype.tax_withheld_vouchers.tax_withheld_vouchers import TaxWithheldVouchers from erpnext.buying.doctype.purchase_receipt_item_supplied.purchase_receipt_item_supplied import ( PurchaseReceiptItemSupplied, ) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 91ea5029421..20326e865b8 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -291,6 +291,7 @@ "read_only": 1 }, { + "allow_on_submit": 1, "fieldname": "project", "fieldtype": "Link", "hide_days": 1, @@ -356,6 +357,7 @@ "reqd": 1 }, { + "allow_on_submit": 1, "fieldname": "cost_center", "fieldtype": "Link", "hide_days": 1, @@ -2201,7 +2203,7 @@ "link_fieldname": "consolidated_invoice" } ], - "modified": "2024-03-27 13:10:35.407256", + "modified": "2024-04-11 11:30:26.272441", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 3ccaba98e7c..206cdf93366 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -58,13 +58,9 @@ class SalesInvoice(SellingController): from erpnext.accounts.doctype.payment_schedule.payment_schedule import PaymentSchedule from erpnext.accounts.doctype.pricing_rule_detail.pricing_rule_detail import PricingRuleDetail - from erpnext.accounts.doctype.sales_invoice_advance.sales_invoice_advance import ( - SalesInvoiceAdvance, - ) + from erpnext.accounts.doctype.sales_invoice_advance.sales_invoice_advance import SalesInvoiceAdvance from erpnext.accounts.doctype.sales_invoice_item.sales_invoice_item import SalesInvoiceItem - from erpnext.accounts.doctype.sales_invoice_payment.sales_invoice_payment import ( - SalesInvoicePayment, - ) + from erpnext.accounts.doctype.sales_invoice_payment.sales_invoice_payment import SalesInvoicePayment from erpnext.accounts.doctype.sales_invoice_timesheet.sales_invoice_timesheet import ( SalesInvoiceTimesheet, )