diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 7f9c363aef698c5dc15a2f27308b0bc494dca1cf..82cef6fce8db56bacab30d2e92e8728cd0518724 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1020,8 +1020,6 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False): else source.qty - source.returned_qty ) - if source_parent.project: - target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center") if target.item_code: item = get_item_defaults( target.item_code, source_parent.company, source_parent.get("tax_category") @@ -1034,6 +1032,14 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False): if cost_center: target.cost_center = cost_center + project_cost_center = None + if source_parent.project: + target.project = source_parent.project + project_cost_center = frappe.db.get_value("Project", target.project, "cost_center") + + if source_parent.cost_center or project_cost_center: + target.cost_center = source_parent.cost_center or project_cost_center + doclist = get_mapped_doc( "Sales Order", source_name,