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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-12-03 15:06:16 +05:30
committed by GitHub
parent 5533592b2b
commit 86ff3e0c10
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -1556,17 +1556,12 @@ class SalesInvoice(SellingController):
) )
def update_project(self): def update_project(self):
<<<<<<< HEAD
if self.project:
project = frappe.get_doc("Project", self.project)
=======
unique_projects = list(set([d.project for d in self.get("items") if d.project])) unique_projects = list(set([d.project for d in self.get("items") if d.project]))
if self.project and self.project not in unique_projects: if self.project and self.project not in unique_projects:
unique_projects.append(self.project) unique_projects.append(self.project)
for p in unique_projects: for p in unique_projects:
project = frappe.get_doc("Project", p) project = frappe.get_doc("Project", p)
>>>>>>> 7de9c14a2c (fix: incorrect Gross Margin on project (#44461))
project.update_billed_amount() project.update_billed_amount()
project.db_update() project.db_update()