fix calculation when using advance account

__manifest__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     'name': 'Vendor Payment Diff Amount',
-    'version': '17.0.2.1.0',
+    'version': '19.0.2.1.0',
     'category': 'Accounting/Accounting',
     'summary': 'Support multiple payment deductions for vendor payments (withholding tax, fees, etc.)',
     'description': """

models/payment_deduction_line.py

@@ -58,7 +58,7 @@ class PaymentDeductionLine(models.Model):
         'account.account',
         string='Deduction Account',
         required=True,
-        domain="[('account_type', 'not in', ['asset_cash', 'asset_cash_bank', 'asset_receivable', 'liability_payable']), ('deprecated', '=', False)]",
+        domain="[('account_type', 'not in', ['asset_cash', 'asset_cash_bank', 'asset_receivable', 'liability_payable']), ('active', '=', True)]",
         help='Account where the deduction will be recorded (use tax payable or expense accounts, NOT payable/receivable accounts)',
     )
     name = fields.Char(

tests/test_account_payment.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 
 from odoo import fields
-from odoo.tests import TransactionCase
+from odoo.tests import TransactionCase, tagged
 from odoo.exceptions import ValidationError
 from hypothesis import given, strategies as st, settings
 
 
+@tagged('post_install', '-at_install')
 class TestAccountPayment(TransactionCase):
     """Test cases for vendor payment deduction functionality"""
 
@@ -37,7 +38,7 @@ class TestAccountPayment(TransactionCase):
             'name': 'Withholding Tax Account',
             'code': 'WHT001',
             'account_type': 'expense',
-            'company_id': self.env.company.id,
+            'company_ids': [self.env.company.id],
         })
 
     @given(

tests/test_batch_payment_integration.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
 from odoo import fields
-from odoo.tests import TransactionCase
+from odoo.tests import TransactionCase, tagged
 from odoo.exceptions import ValidationError
 
 
+@tagged('post_install', '-at_install')
 class TestBatchPaymentIntegration(TransactionCase):
     """Test cases for batch payment integration with deduction functionality"""
 

views/account_batch_payment_views.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Add deduction lines field to batch payment line tree view -->
+    <!-- Add deduction lines field to batch payment line list view -->
     <record id="view_batch_payment_form_inherit_diff_amount" model="ir.ui.view">
         <field name="name">account.batch.payment.form.inherit.diff.amount</field>
         <field name="model">account.batch.payment</field>
         <field name="inherit_id" ref="vendor_batch_payment_merge.view_batch_payment_form_inherit"/>
         <field name="arch" type="xml">
-            <!-- Replace the tree view with one that includes a form view for deduction lines -->
+            <!-- Replace the list view with one that includes a form view for deduction lines -->
             <xpath expr="//field[@name='direct_payment_line_ids']" position="replace">
                 <field name="direct_payment_line_ids">
-                    <tree editable="bottom">
+                    <list editable="bottom">
                         <field name="partner_id" domain="parent.batch_type == 'outbound' and [('supplier_rank', '>', 0)] or [('customer_rank', '>', 0)]" options="{'no_create': True}"/>
                         <field name="amount" sum="Total"/>
                         <field name="expense_account_id"/>
@@ -17,7 +17,7 @@
                         <field name="memo"/>
                         <field name="date"/>
                         <field name="payment_id" readonly="1"/>
-                    </tree>
+                    </list>
                     <form>
                         <group>
                             <group name="payment_info">
@@ -32,13 +32,13 @@
                         </group>
                         <group string="Deductions" name="deductions">
                             <field name="deduction_line_ids" nolabel="1" context="{'default_currency_id': currency_id}">
-                                <tree editable="bottom">
+                                <list editable="bottom">
                                     <field name="sequence" widget="handle"/>
                                     <field name="substract_account_id" required="1"/>
                                     <field name="name" placeholder="Description (optional)"/>
                                     <field name="amount_substract" required="1" sum="Total"/>
                                     <field name="currency_id" column_invisible="1"/>
-                                </tree>
+                                </list>
                             </field>
                             <field name="amount_substract" readonly="1"/>
                         </group>

views/account_payment_views.xml

@@ -12,14 +12,14 @@
                        invisible="payment_type != 'outbound'"
                        readonly="state != 'draft'"
                        nolabel="1">
-                    <tree editable="bottom">
+                    <list editable="bottom">
                         <field name="sequence" widget="handle"/>
                         <field name="substract_account_id" required="1"/>
                         <field name="name" placeholder="Description (optional)"/>
                         <field name="amount_substract" required="1" sum="Total Deductions"/>
                         <field name="currency_id" column_invisible="1"/>
                         <field name="company_id" column_invisible="1"/>
-                    </tree>
+                    </list>
                 </field>
                 
                 <label for="amount_substract" string="Total Deductions" 

wizard/payment_amount_fix_wizard.py

@@ -28,12 +28,17 @@ class PaymentAmountFixWizard(models.TransientModel):
         payments_to_fix = []
         for payment in payments:
             if payment.move_id:
-                counterpart_lines = payment.move_id.line_ids.filtered(
-                    lambda l: l.debit > 0 and l.account_id.account_type in ('liability_payable', 'expense')
-                )
-                if counterpart_lines:
-                    correct_amount = counterpart_lines[0].debit
-                    if abs(payment.amount - correct_amount) > 0.01:
+                liquidity_lines, counterpart_lines, writeoff_lines = payment._seek_for_lines()
+                non_liquidity_lines = counterpart_lines + writeoff_lines
+                
+                if payment.payment_type == 'outbound':
+                    gross_lines = non_liquidity_lines.filtered(lambda l: l.debit > 0)
+                else:
+                    gross_lines = non_liquidity_lines.filtered(lambda l: l.credit > 0)
+                    
+                if gross_lines:
+                    correct_amount = sum(abs(l.amount_currency) for l in gross_lines)
+                    if abs(payment.amount - correct_amount) > 0.001:
                         payments_to_fix.append(payment.id)
         
         res['payment_ids'] = [(6, 0, payments_to_fix)]
@@ -45,13 +50,17 @@ class PaymentAmountFixWizard(models.TransientModel):
         
         for payment in self.payment_ids:
             if payment.move_id:
-                counterpart_lines = payment.move_id.line_ids.filtered(
-                    lambda l: l.debit > 0 and l.account_id.account_type in ('liability_payable', 'expense')
-                )
+                liquidity_lines, counterpart_lines, writeoff_lines = payment._seek_for_lines()
+                non_liquidity_lines = counterpart_lines + writeoff_lines
                 
-                if counterpart_lines:
-                    correct_amount = counterpart_lines[0].debit
-                    if abs(payment.amount - correct_amount) > 0.01:
+                if payment.payment_type == 'outbound':
+                    gross_lines = non_liquidity_lines.filtered(lambda l: l.debit > 0)
+                else:
+                    gross_lines = non_liquidity_lines.filtered(lambda l: l.credit > 0)
+                    
+                if gross_lines:
+                    correct_amount = sum(abs(l.amount_currency) for l in gross_lines)
+                    if abs(payment.amount - correct_amount) > 0.001:
                         # Fix using SQL to avoid sync issues
                         payment.env.cr.execute(
                             "UPDATE account_payment SET amount = %s WHERE id = %s",

wizard/payment_amount_fix_wizard_views.xml

@@ -12,14 +12,14 @@
                 </p>
                 <group>
                     <field name="payment_ids" nolabel="1">
-                        <tree>
+                        <list>
                             <field name="name"/>
                             <field name="partner_id"/>
                             <field name="amount"/>
                             <field name="amount_substract"/>
                             <field name="final_payment_amount"/>
                             <field name="date"/>
-                        </tree>
+                        </list>
                     </field>
                 </group>
                 <footer>