Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cc-allocation' into develop

Browse Source
This commit is contained in:
Nabin Hait 2022-02-01 22:27:23 +05:30
commit 008b331f49
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/cost_center_allocation_percentage/cost_center_allocation_percentage.json
View File

@ -1,7 +1,7 @@
{ {
"actions": [], "actions": [],
"allow_rename": 1, "allow_rename": 1,
"creation": "2022-01-03 18:10:11.697198", "creation": "2022-01-13 20:07:30.096306",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
@ -20,7 +20,7 @@
}, },
{ {
"fieldname": "percentage", "fieldname": "percentage",
"fieldtype": "Int", "fieldtype": "Percent",
"in_list_view": 1, "in_list_view": 1,
"label": "Percentage (%)", "label": "Percentage (%)",
"reqd": 1 "reqd": 1
@ -29,7 +29,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-01-03 18:10:20.029821", "modified": "2022-02-01 22:22:31.589523",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Cost Center Allocation Percentage", "name": "Cost Center Allocation Percentage",

2
erpnext/patches/v14_0/migrate_cost_center_allocations.py
View File

@ -27,7 +27,7 @@ def create_new_cost_center_allocation_records(cc_allocations):
cca.submit() cca.submit()
def get_existing_cost_center_allocations(): def get_existing_cost_center_allocations():
if not frappe.get_meta("Cost Center").has_field("enable_distributed_cost_center"): if not frappe.db.exists("DocType", "Distributed Cost Center"):
return return
par = frappe.qb.DocType("Cost Center") par = frappe.qb.DocType("Cost Center")