From 25b662d20d55511b4a43f6728d0dbda1d45c3fc3 Mon Sep 17 00:00:00 2001 From: zainab2097 <149927291+zainab2097@users.noreply.github.com> Date: Sun, 1 Sep 2024 17:53:13 +0300 Subject: [PATCH] Update project_invoice.py --- .../project_base/models/project_invoice.py | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/odex25_project/project_base/models/project_invoice.py b/odex25_project/project_base/models/project_invoice.py index c06abee91..44a651787 100644 --- a/odex25_project/project_base/models/project_invoice.py +++ b/odex25_project/project_base/models/project_invoice.py @@ -358,18 +358,16 @@ class ProjectInvoiceLine(models.Model): # Convert to string to avoid TypeError name = str(self.name) if self.name else '' project_name = str(self.project_invoice_id.project_id.name) if self.project_invoice_id and self.project_invoice_id.project_id.name else '' - - res = { - 'name': name + '/' + project_name, - 'account_id': self.project_invoice_id.project_id.category_id.account_id and self.project_invoice_id.project_id.category_id.account_id.id or False, - 'product_id': self.product_id.id, - 'product_uom_id': self.product_uom.id, - 'quantity': self.product_uom_qty, - 'discount': self.discount, - 'price_unit': self.price_unit, - 'tax_ids': [(6, 0, self.tax_id.ids)], - 'analytic_account_id': self.project_invoice_id.project_id.analytic_account_id.id - } + res = { + 'name': name + '/' + project_name, + 'account_id': self.project_invoice_id.project_id.category_id.account_id and self.project_invoice_id.project_id.category_id.account_id.id or False, + 'product_id': self.product_id.id, + 'product_uom_id': self.product_uom.id, + 'quantity': self.product_uom_qty, + 'discount': self.discount, + 'price_unit': self.price_unit, + 'tax_ids': [(6, 0, self.tax_id.ids)], + 'analytic_account_id': self.project_invoice_id.project_id.analytic_account_id.id} if self.project_invoice_id.project_id.purchase_order_id and self.project_invoice_id.project_id.type == 'expense' : res['analytic_account_id'] = self.project_invoice_id.project_id.purchase_line_id.account_analytic_id.id res['purchase_line_id'] = self.project_invoice_id.project_id.purchase_line_id.id