From 955cda6957c897b370d05c7bbb6345cc49f597bf Mon Sep 17 00:00:00 2001 From: hparfr Date: Wed, 12 Apr 2023 12:15:00 +0200 Subject: [PATCH] has_discount collides with account_cash_discount rename here because it's easier --- account_usability/README.rst | 2 +- account_usability/i18n/fr.po | 7 ++++++- account_usability/models/account_move.py | 12 ++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/account_usability/README.rst b/account_usability/README.rst index 5610e4a..d672671 100644 --- a/account_usability/README.rst +++ b/account_usability/README.rst @@ -32,7 +32,7 @@ This modules adds the following functions: * A wizard to mark several invoices as sent at once (forward from v8) * Default date for Account Move Reversal is now D+1 instead of today * Track more fields on invoice (see details in account.py) -* Add boolean fields `has_discount` and `has_attachment` on invoice +* Add boolean fields `has_line_discount` and `has_attachment` on invoice * Add button "Delete line qty = 0" on supplier invoice * Cut name_get() of invoice if too long * A script for if Odoo screws up invoice attachment filename diff --git a/account_usability/i18n/fr.po b/account_usability/i18n/fr.po index e887d11..7e4f5ab 100644 --- a/account_usability/i18n/fr.po +++ b/account_usability/i18n/fr.po @@ -296,11 +296,16 @@ msgstr "Possède une pièce jointe" #. module: account_usability #: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__has_discount -#: model:ir.model.fields,field_description:account_usability.field_account_move__has_discount #: model:ir.model.fields,field_description:account_usability.field_account_payment__has_discount msgid "Has Discount" msgstr "A une réduction" +#. module: account_usability +#: model:ir.model.fields,field_description:account_usability.field_account_move__has_line_discount + +msgid "Has Line Discount" +msgstr "Contient une réduction" + #. module: account_usability #: model:ir.model.fields,field_description:account_usability.field_account_bank_statement__hide_bank_statement_balance #: model:ir.model.fields,field_description:account_usability.field_account_journal__hide_bank_statement_balance diff --git a/account_usability/models/account_move.py b/account_usability/models/account_move.py index 76954c4..dc9343e 100644 --- a/account_usability/models/account_move.py +++ b/account_usability/models/account_move.py @@ -28,8 +28,8 @@ class AccountMove(models.Model): fiscal_position_id = fields.Many2one(tracking=True) amount_total = fields.Monetary(tracking=True) # for invoice report - has_discount = fields.Boolean( - compute='_compute_has_discount', readonly=True) + has_line_discount = fields.Boolean( + compute='_compute_has_line_discount', readonly=True) # has_attachment is useful for those who use attachment to archive # supplier invoices. It allows them to find supplier invoices # that don't have any attachment @@ -41,15 +41,15 @@ class AccountMove(models.Model): help="This information appear on invoice qweb report " "(you may use it for your own report)") - def _compute_has_discount(self): + def _compute_has_line_discount(self): prec = self.env['decimal.precision'].precision_get('Discount') for inv in self: - has_discount = False + has_line_discount = False for line in inv.invoice_line_ids: if not line.display_type and not float_is_zero(line.discount, precision_digits=prec): - has_discount = True + has_line_discount = True break - inv.has_discount = has_discount + inv.has_line_discount = has_line_discount def _compute_has_attachment(self): iao = self.env['ir.attachment']