Skip to content

Commit

Permalink
[FIX] l10n_ar_ux: field signed_amount is replaced by l10n_ar_amount_c…
Browse files Browse the repository at this point in the history
…ompany_currency_signed in 15 and 16

Ticket: 60402
  • Loading branch information
pablohmontenegro committed Apr 14, 2023
1 parent 36cf4cc commit 2053ebd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion l10n_ar_ux/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'Argentinian Accounting UX',
'version': "15.0.1.13.0",
'version': "15.0.1.14.0",
'category': 'Localization/Argentina',
'sequence': 14,
'author': 'ADHOC SA',
Expand Down
2 changes: 1 addition & 1 deletion l10n_ar_ux/models/account_move.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


def _inverse_l10n_latam_document_number(self):
""" Parche feo para poder usar liquidaciones hasta que se mezcle https://github.com/odoo/odoo/pull/78632 en
"""Parche feo para poder usar liquidaciones hasta que se mezcle https://github.com/odoo/odoo/pull/78632 en
master"""
AccountMoveOriginal._inverse_l10n_latam_document_number(self)
to_review = self.filtered(lambda x: (
Expand Down
8 changes: 4 additions & 4 deletions l10n_ar_ux/reports/report_payment_group.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</td>
<td class="text-right" t-if="any(o.mapped('payment_ids.other_currency'))">
<t t-if="check.currency_id">
<span class="text-nowrap" t-field="check.signed_amount" t-field-options='{"widget": "monetary", "display_currency": "check.currency_id"}'/>
<span class="text-nowrap" t-field="check.l10n_ar_amount_company_currency_signed" t-options='{"widget": "monetary", "display_currency": "check.currency_id"}'/>
</t>
</td>
<td class="text-right o_price_total">
Expand All @@ -85,7 +85,7 @@
</td>
<td class="text-right" t-if="any(o.mapped('payment_ids.other_currency'))">
<t t-if="line.other_currency">
<span class="text-nowrap" t-field="line.signed_amount" t-field-options='{"widget": "monetary", "display_currency": "line.currency_id"}'/>
<span class="text-nowrap" t-field="line.l10n_ar_amount_company_currency_signed" t-options='{"widget": "monetary", "display_currency": "line.currency_id"}'/>
</t>
</td>
<td class="text-right o_price_total">
Expand All @@ -100,7 +100,7 @@
</td>
<td class="text-right" t-if="any(o.mapped('payment_ids.other_currency'))">
<t t-if="line.other_currency">
<span class="text-nowrap" t-field="line.signed_amount" t-field-options='{"widget": "monetary", "display_currency": "line.currency_id"}'/>
<span class="text-nowrap" t-field="line.l10n_ar_amount_company_currency_signed" t-options='{"widget": "monetary", "display_currency": "line.currency_id"}'/>
</t>
</td>
<td class="text-right o_price_total">
Expand All @@ -113,7 +113,7 @@
<tr>
<td><strong><span>Total Pagado</span></strong></td>
<td class="text-right" t-if="any(o.mapped('payment_ids.other_currency'))">
<strong t-if="len(o.payment_ids.mapped('currency_id')) == 1 and o.payment_ids.mapped('currency_id') != o.currency_id"> <span class="text-nowrap" t-out="sum(o.payment_ids.mapped('signed_amount'))" t-options="{'widget': 'monetary', 'display_currency': o.payment_ids.mapped('currency_id')}"/></strong>
<strong t-if="len(o.payment_ids.mapped('currency_id')) == 1 and o.payment_ids.mapped('currency_id') != o.currency_id"> <span class="text-nowrap" t-out="sum(o.payment_ids.mapped('l10n_ar_amount_company_currency_signed'))" t-options="{'widget': 'monetary', 'display_currency': o.payment_ids.mapped('currency_id')}"/></strong>
</td>
<td class="text-right">
<strong><span class="text-nowrap" t-field="o.payments_amount"/></strong>
Expand Down
2 changes: 1 addition & 1 deletion l10n_ar_ux/views/report_invoice.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<span t-field="o.company_id.partner_id.l10n_ar_formatted_vat" position="attributes">
<attribute name="t-field">header_address.l10n_ar_formatted_vat</attribute>
</span>
<span t-esc="o.company_id.l10n_ar_gross_income_type == 'exempt' and 'Exento' or o.company_id.l10n_ar_gross_income_number" position="attributes">
<span t-out="o.company_id.l10n_ar_gross_income_type == 'exempt' and 'Exento' or o.company_id.l10n_ar_gross_income_number" position="attributes">
<attribute name="t-out">header_address.l10n_ar_gross_income_type == 'exempt' and 'Exento' or header_address.l10n_ar_gross_income_number</attribute>
</span>
<span t-field="o.company_id.l10n_ar_afip_start_date" position="attributes">
Expand Down

0 comments on commit 2053ebd

Please sign in to comment.