fix: Allow updating cost center and project for repostable doctypes

(cherry picked from commit c3845ac0f1)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
This commit is contained in:
Deepesh Garg
2024-04-11 11:30:56 +05:30
committed by Mergify
parent 088aa94fa1
commit e278688a4b
6 changed files with 27 additions and 14 deletions

View File

@@ -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",

View File

@@ -150,6 +150,7 @@
"reqd": 1
},
{
"allow_on_submit": 1,
"fieldname": "cost_center",
"fieldtype": "Link",
"label": "Cost Center",
@@ -476,6 +477,7 @@
"label": "More Information"
},
{
"allow_on_submit": 1,
"fieldname": "project",
"fieldtype": "Link",
"label": "Project",
@@ -776,7 +778,11 @@
"table_fieldname": "payment_entries"
}
],
<<<<<<< HEAD
"modified": "2024-01-03 12:46:41.759121",
=======
"modified": "2024-04-11 11:25:07.366347",
>>>>>>> c3845ac0f1 (fix: Allow updating cost center and project for repostable doctypes)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Entry",
@@ -822,4 +828,4 @@
"states": [],
"title_field": "title",
"track_changes": 1
}
}

View File

@@ -299,6 +299,7 @@
"remember_last_selected_value": 1
},
{
"allow_on_submit": 1,
"fieldname": "cost_center",
"fieldtype": "Link",
"label": "Cost Center",
@@ -1367,6 +1368,7 @@
"read_only": 1
},
{
"allow_on_submit": 1,
"fieldname": "project",
"fieldtype": "Link",
"label": "Project",
@@ -1637,7 +1639,11 @@
"idx": 204,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-03-20 15:57:00.736868",
=======
"modified": "2024-04-11 11:28:42.802211",
>>>>>>> c3845ac0f1 (fix: Allow updating cost center and project for repostable doctypes)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",

View File

@@ -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,
)

View File

@@ -289,6 +289,7 @@
"read_only": 1
},
{
"allow_on_submit": 1,
"fieldname": "project",
"fieldtype": "Link",
"hide_days": 1,
@@ -354,6 +355,7 @@
"reqd": 1
},
{
"allow_on_submit": 1,
"fieldname": "cost_center",
"fieldtype": "Link",
"hide_days": 1,
@@ -2185,7 +2187,11 @@
"link_fieldname": "consolidated_invoice"
}
],
<<<<<<< HEAD
"modified": "2024-03-22 17:50:34.395602",
=======
"modified": "2024-04-11 11:30:26.272441",
>>>>>>> c3845ac0f1 (fix: Allow updating cost center and project for repostable doctypes)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",

View File

@@ -55,13 +55,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,
)