Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP] l10n_ar_withholding_ux: apply ratio on base amount #888

Open
wants to merge 1 commit into
base: 17.0
Choose a base branch
from
Open

[IMP] l10n_ar_withholding_ux: apply ratio on base amount #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions l10n_ar_account_withholding/models/account_tax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def get_withholding_vals(self, payment):
base_amount = vals['withholdable_base_amount']

if self.withholding_type == 'partner_tax':
amount = base_amount * (alicuota)
amount = base_amount * (alicuota) * self.ratio / 100
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
amount = base_amount * (alicuota) * self.ratio / 100
amount = base_amount * (alicuota) * (self.ratio or 100) / 100

vals['comment'] = "%s x %s" % (
base_amount, alicuota)
vals['period_withholding_amount'] = amount
Expand Down Expand Up @@ -250,7 +250,7 @@ def _compute_amount(
if self.amount_type == 'partner_tax':
date = self._context.get('invoice_date', fields.Date.context_today(self))
partner = partner and partner.sudo()
return base_amount * self.sudo().get_partner_alicuota_percepcion(partner, date)
return base_amount * self.sudo().get_partner_alicuota_percepcion(partner, date) * self.ratio / 100
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(self.ratio or 100)

else:
return super(AccountTax, self)._compute_amount(
base_amount, price_unit, quantity=quantity, product=product,
Expand Down
2 changes: 1 addition & 1 deletion l10n_ar_withholding_ux/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'Argentinian withholding UX',
'version': "17.0.1.5.0",
'version': "17.0.1.6.0",
'category': 'Localization/Argentina',
'sequence': 14,
'author': 'ADHOC SA',
Expand Down
8 changes: 8 additions & 0 deletions l10n_ar_withholding_ux/models/account_tax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class AccountTax(models.Model):
'tax_withholding_id',
'Rules',
)
ratio = fields.Float(required=True, default=100, help="Ratio to apply to tax base amount")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Para quien haga review técnico me queda dudas si debe ser requerido, o si debemos hacer que siempre sea 100 y hacemos que sea solo visible para argentina

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove default and required, extend help

Suggested change
ratio = fields.Float(required=True, default=100, help="Ratio to apply to tax base amount")
ratio = fields.Float(help="Ratio to apply to tax base amount. If left empty will be 100 % ratio")


@api.constrains(
'withholding_non_taxable_amount',
Expand Down Expand Up @@ -224,3 +225,10 @@ def get_withholding_vals(self, payment, force_withholding_amount_type=None):
'automatic': True,
'comment': comment,
}

@api.constrains('ratio')
def _check_line_ids_percent(self):
""" Check that the total percent is not bigger than 100.0 """
for tax in self:
if not (0 < tax.ratio <= 100.0):
raise ValidationError(_('The total percentage (%s) should be less or equal to 100!', tax.ratio))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

greather than 0 and...

1 change: 1 addition & 0 deletions l10n_ar_withholding_ux/views/account_tax_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
</div>
<field name="withholding_non_taxable_minimum"/>
<field name="withholding_non_taxable_amount"/>
<field name="ratio" invisible="country_code != 'AR'"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

            <label for="ratio" invisible="country_code != 'AR'/>
            <div invisible="country_code != 'AR'>
                <field name="ratio" class="oe_inline"/>
                %
            </div>

<field name="withholding_user_error_message"/>
<field name="withholding_user_error_domain" invisible="not withholding_user_error_message"/>
</group>
Expand Down