[IMP] account: emphasizes exchange diff entries in payment widget

Task ID: 2712093

Currently:
- In the payment widget the exchange difference value is always shown as 0 and is described as "Paid on", which can be confusing for a user

Desired:
- The exchange difference should have the difference amount and be described as "Exchange difference" (text-muted)
- In the payment widget pop-up, show the both the amount in company and foreign currencies

closes #82206

Signed-off-by: Quentin De Paoli <qdp@odoo.com>

Author: aliya

addons/account/models/account_move.py

@@ -1633,30 +1633,39 @@ def _compute_payments_widget_to_reconcile_info(self):
     def _get_reconciled_info_JSON_values(self):
         self.ensure_one()
         reconciled_vals = []
-        for partial, amount, counterpart_line in self._get_reconciled_invoices_partials():
-            reconciled_vals.append(self._get_reconciled_vals(partial, amount, counterpart_line))
-        return reconciled_vals
+        reconciled_partials, exchange_diff_moves = self._get_reconciled_invoices_partials()
+        for partial, amount, counterpart_line in reconciled_partials:
+            if counterpart_line.move_id.ref:
+                reconciliation_ref = '%s (%s)' % (counterpart_line.move_id.name, counterpart_line.move_id.ref)
+            else:
+                reconciliation_ref = counterpart_line.move_id.name
 
-    def _get_reconciled_vals(self, partial, amount, counterpart_line):
-        if counterpart_line.move_id.ref:
-            reconciliation_ref = '%s (%s)' % (counterpart_line.move_id.name, counterpart_line.move_id.ref)
-        else:
-            reconciliation_ref = counterpart_line.move_id.name
-        return {
-            'name': counterpart_line.name,
-            'journal_name': counterpart_line.journal_id.name,
-            'amount': amount,
-            'currency': self.currency_id.symbol,
-            'digits': [69, self.currency_id.decimal_places],
-            'position': self.currency_id.position,
-            'date': counterpart_line.date,
-            'payment_id': counterpart_line.id,
-            'partial_id': partial.id,
-            'account_payment_id': counterpart_line.payment_id.id,
-            'payment_method_name': counterpart_line.payment_id.payment_method_line_id.name,
-            'move_id': counterpart_line.move_id.id,
-            'ref': reconciliation_ref,
-        }
+            currency = self.currency_id
+            is_exchange = counterpart_line.move_id.id in exchange_diff_moves
+            if is_exchange:
+                amount = counterpart_line.move_id.amount_total_signed
+                currency = self.company_id.currency_id
+
+            reconciled_vals.append({
+                'name': counterpart_line.name,
+                'journal_name': counterpart_line.journal_id.name,
+                'amount': amount,
+                'currency': currency.symbol,
+                'digits': [69, currency.decimal_places],
+                'position': currency.position,
+                'date': counterpart_line.date,
+                'payment_id': counterpart_line.id,
+                'partial_id': partial.id,
+                'account_payment_id': counterpart_line.payment_id.id,
+                'payment_method_name': counterpart_line.payment_id.payment_method_line_id.name,
+                'move_id': counterpart_line.move_id.id,
+                'ref': reconciliation_ref,
+                # these are necessary for the views to change depending on the values
+                'is_exchange': is_exchange,
+                'amount_company_currency': formatLang(self.env, abs(counterpart_line.balance), currency_obj=counterpart_line.company_id.currency_id),
+                'amount_foreign_currency': formatLang(self.env, abs(counterpart_line.amount_currency), currency_obj=counterpart_line.currency_id) if counterpart_line.currency_id != counterpart_line.company_id.currency_id else False
+            })
+        return reconciled_vals
 
     @api.depends('move_type', 'line_ids.amount_residual')
     def _compute_payments_widget_reconciled_info(self):
@@ -2438,12 +2447,17 @@ def _get_reconciled_invoices_partials(self):
         pay_term_lines = self.line_ids\
             .filtered(lambda line: line.account_internal_type in ('receivable', 'payable'))
         invoice_partials = []
+        exchange_diff_moves = []
 
         for partial in pay_term_lines.matched_debit_ids:
             invoice_partials.append((partial, partial.credit_amount_currency, partial.debit_move_id))
+            if partial.exchange_move_id:
+                exchange_diff_moves.append(partial.exchange_move_id.id)
         for partial in pay_term_lines.matched_credit_ids:
             invoice_partials.append((partial, partial.debit_amount_currency, partial.credit_move_id))
-        return invoice_partials
+            if partial.exchange_move_id:
+                exchange_diff_moves.append(partial.exchange_move_id.id)
+        return invoice_partials, exchange_diff_moves
 
     def _reverse_move_vals(self, default_values, cancel=True):
         ''' Reverse values passed as parameter being the copied values of the original journal entry.

addons/account/static/src/xml/account_payment.xml

@@ -37,16 +37,24 @@
                         <td>
                            <a role="button" tabindex="0" class="js_payment_info fa fa-info-circle" t-att-index="line.index" style="margin-right:5px;" aria-label="Info" title="Journal Entry Info" data-toggle="tooltip"></a>
                         </td>
-                        <td>
-                            <i class="o_field_widget text-right o_payment_label">Paid on <t t-esc="line.date"></t></i>
+                        <td t-if="!line.is_exchange">
+                            <i class="o_field_widget text-left o_payment_label">Paid on <t t-esc="line.date"></t></i>
+                        </td>
+                        <td t-if="line.is_exchange">
+                            <i class="o_field_widget text-left o_payment_label text-muted">Exchange Difference</i>
                         </td>
                     </t>
                         <td style="text-align:right;">
                             <span class="oe_form_field oe_form_field_float oe_form_field_monetary" style="margin-left: -10px;">
                                 <t t-if="line.position === 'before'">
                                     <t t-esc="line.currency"/>
                                 </t>
-                                <t t-esc="line.amount"></t>
+                                <t t-if="!line.is_exchange">
+                                    <t t-esc="line.amount"/>
+                                </t>
+                                <t t-if="line.is_exchange">
+                                    <i class="text-muted"><t t-esc="line.amount"/></i>
+                                </t>
                                 <t t-if="line.position === 'after'">
                                     <t t-esc="line.currency"/>
                                 </t>
@@ -64,12 +72,9 @@
                 <tr>
                     <td><strong>Amount: </strong></td>
                     <td>
-                        <t t-if="position === 'before'">
-                            <t t-esc="currency"/>
-                        </t>
-                        <t t-esc="amount"></t>
-                        <t t-if="position === 'after'">
-                            <t t-esc="currency"/>
+                        <t t-esc="amount_company_currency"></t>
+                        <t t-if="amount_foreign_currency">
+                            (<span class="fa fa-money"/> <t t-esc="amount_foreign_currency"/>)
                         </t>
                     </td>
                 </tr>

addons/account/views/report_invoice.xml

@@ -141,7 +141,7 @@
                                         <t t-if="o.payment_state != 'invoicing_legacy'">
                                             <t t-set="payments_vals" t-value="o.sudo()._get_reconciled_info_JSON_values()"/>
                                             <t t-foreach="payments_vals" t-as="payment_vals">
-                                                <tr>
+                                                <tr t-if="payment_vals['is_exchange'] == 0">
                                                     <td>
                                                         <i class="oe_form_field text-right oe_payment_label">Paid on <t t-esc="payment_vals['date']" t-options='{"widget": "date"}'/></i>
                                                     </td>