[FIX] l10n_ar_ux: report_payment_group

Ticket: 62067
Now report_payment_group print correctly because the field signed_amount renames to amount_signed in Odoo 15
ica fixed this en 16 here #699 but now is needed to fix this in 15

X-original-commit: 2797386

l10n_ar_ux/__manifest__.py

@@ -1,6 +1,12 @@
 {
     'name': 'Argentinian Accounting UX',
+<<<<<<< HEAD
     'version': "16.0.1.4.0",
+||||||| parent of e07bfb0 (temp)
+    'version': "15.0.1.13.0",
+=======
+    'version': "15.0.1.14.0",
+>>>>>>> e07bfb0 (temp)
     'category': 'Localization/Argentina',
     'sequence': 14,
     'author': 'ADHOC SA',

l10n_ar_ux/reports/report_payment_group.xml

@@ -69,8 +69,16 @@
                                 <span t-out='"Cheque nro %s - %s" % (check.l10n_latam_check_number, check.l10n_latam_check_bank_id.name or check.journal_id.name)'/><span t-if="check.l10n_latam_check_payment_date"> - Venc. <span t-field="check.l10n_latam_check_payment_date"/></span>
                            </td>
                             <td  class="text-right" t-if="any(o.mapped('payment_ids.other_currency'))">
+<<<<<<< HEAD
                                 <t t-if="line.currency_id">
                                     <span class="text-nowrap" t-field="line.amount_signed" t-field-options='{"widget": "monetary",  "display_currency": "line.currency_id"}'/>
+||||||| parent of e07bfb0 (temp)
+                                <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"}'/>
+=======
+                                <t t-if="check.currency_id">
+                                    <span class="text-nowrap" t-field="check.amount_signed" t-field-options='{"widget": "monetary",  "display_currency": "check.currency_id"}'/>
+>>>>>>> e07bfb0 (temp)
                                 </t>
                             </td>
                             <td class="text-right o_price_total">