diff --git a/l10n_fr_tax_return/data/account_tax_return.xml b/l10n_fr_tax_return/data/account_tax_return.xml index 3637396..8870171 100644 --- a/l10n_fr_tax_return/data/account_tax_return.xml +++ b/l10n_fr_tax_return/data/account_tax_return.xml @@ -1,7 +1,7 @@ - - + + diff --git a/l10n_fr_tax_return/models/account_tax_return.py b/l10n_fr_tax_return/models/account_tax_return.py index 55bc127..3a069f3 100644 --- a/l10n_fr_tax_return/models/account_tax_return.py +++ b/l10n_fr_tax_return/models/account_tax_return.py @@ -45,8 +45,8 @@ class AccountTaxReturn(models.Model): self.ensure_one() if not self.is_sum_line: if self.line_type == "credit": - return sum(move_lines.mapped(lambda aml: aml.credit - aml.debit)) + return round(sum(move_lines.mapped(lambda aml: aml.credit - aml.debit))) else: - return sum(move_lines.mapped(lambda aml: aml.debit - aml.credit)) + return round(sum(move_lines.mapped(lambda aml: aml.debit - aml.credit))) else: - return 0.0 + return 0 diff --git a/l10n_fr_tax_return/models/account_tax_return_year.py b/l10n_fr_tax_return/models/account_tax_return_year.py index 1f0b726..55762e8 100644 --- a/l10n_fr_tax_return/models/account_tax_return_year.py +++ b/l10n_fr_tax_return/models/account_tax_return_year.py @@ -16,7 +16,6 @@ class AccountTaxReturnYear(models.Model): line_type = fields.Selection( related="line_id.line_type", ) - amount = fields.Float( + amount = fields.Integer( string="Amount", - digits="Product Price", ) diff --git a/l10n_fr_tax_return/wizards/tax_return_wizard.py b/l10n_fr_tax_return/wizards/tax_return_wizard.py index 49e6956..153462c 100644 --- a/l10n_fr_tax_return/wizards/tax_return_wizard.py +++ b/l10n_fr_tax_return/wizards/tax_return_wizard.py @@ -20,17 +20,6 @@ class TaxReturnWizard(models.TransientModel): "Please set a year in the past and after you started your odoo accounting." ) ) - # return { - # "value": { - # "name": "", - # }, - # "warning": { - # "title": _("Wrong year !"), - # "massage": _( - # "Please set a year in the past and after you started your odoo accounting." - # ), - # }, - # } def execute(self): self._check_year() @@ -81,7 +70,7 @@ class TaxReturnWizard(models.TransientModel): lambda atry: atry.line_id.id in line.sum_line_ids.ids ).mapped("amount") ) - or 0.0 + or 0 ) - ( sum( @@ -89,7 +78,7 @@ class TaxReturnWizard(models.TransientModel): lambda atry: atry.line_id.id in line.ded_line_ids.ids ).mapped("amount") ) - or 0.0 + or 0 ), } year_atry |= ATRY.create([new_vals])