nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-24 00:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2024-12-31 12:43:38 +05:30
committed by GitHub
parent 839ffb3f2a
commit 00ae829d89
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/buying_controller.py
View File

@@ -745,11 +745,8 @@ class BuyingController(SubcontractingController):
def auto_make_assets(self, asset_items): def auto_make_assets(self, asset_items):
items_data = get_asset_item_details(asset_items) items_data = get_asset_item_details(asset_items)
messages = [] messages = []
<<<<<<< HEAD
=======
alert = False alert = False
accounting_dimensions = get_dimensions(with_cost_center_and_project=True) accounting_dimensions = get_dimensions(with_cost_center_and_project=True)
>>>>>>> 079ec864de (fix: copy accounting dimensions to asset and sales invoice (#44964))
for d in self.items: for d in self.items:
if d.is_fixed_asset: if d.is_fixed_asset: