[IMP] account: Normalize factors in _distribute_delta_amounts_smoothly

At the moment, `_distribute_delta_amounts_smoothly` requires the factors
to be pre-nomalized. However, normalizing the factors robustly requires
more logic than just dividing by the sum of factors, especially if the
factors have different signs.

This commit moves the normalization into
`_distribute_delta_amounts_smoothly` itself meaning the calling code
doesn't need to take care of it anymore.

task-none

X-original-commit: 80d5eed
Part-of: odoo#232025
Related: odoo/enterprise#97443
Signed-off-by: Antoine Dupuis (andu) <[email protected]>
Signed-off-by: Laurent Smet (las) <[email protected]>

Author: antoine162

addons/account/models/account_tax.py

@@ -1744,13 +1744,21 @@ def _distribute_delta_amount_smoothly(self, precision_digits, delta_amount, targ
         sign = -1 if delta_amount < 0.0 else 1
         nb_of_errors = round(abs(delta_amount / precision_rounding))
         remaining_errors = nb_of_errors
-        for i, target_factor in enumerate(target_factors):
-            factor = target_factor['factor']
+
+        # Take absolute value of factors and sort them by largest absolute value first
+        factors = [(i, abs(target_factor['factor'])) for i, target_factor in enumerate(target_factors)]
+        factors.sort(key=lambda x: x[1], reverse=True)
+        sum_of_factors = sum(x[1] for x in factors)
+
+        if sum_of_factors == 0.0:
+            return amounts_to_distribute
+
+        for i, factor in factors:
             if not remaining_errors:
                 break
 
             nb_of_amount_to_distribute = min(
-                math.ceil(abs(factor * nb_of_errors)),
+                math.ceil(factor / sum_of_factors * nb_of_errors),
                 remaining_errors,
             )
             remaining_errors -= nb_of_amount_to_distribute
@@ -2067,7 +2075,7 @@ def _round_base_lines_tax_details(self, base_lines, company, tax_lines=None):
                 delta_amount = tax_amounts[f'raw_{delta_field}'] - tax_amounts[delta_field]
                 target_factors = [
                     {
-                        'factor': abs(base_line['tax_details']['total_included_currency'] / tax_amounts['total_included_currency']),
+                        'factor': base_line['tax_details']['total_included_currency'],
                         'base_line': base_line,
                         'index_tax_data': index_tax_data,
                     }
@@ -2116,7 +2124,7 @@ def _round_base_lines_tax_details(self, base_lines, company, tax_lines=None):
 
                 target_factors = [
                     {
-                        'factor': abs(base_line['tax_details']['total_included_currency'] / tax_amounts['total_included_currency']),
+                        'factor': base_line['tax_details']['total_included_currency'],
                         'base_line': base_line,
                         'index_tax_data': index_tax_data,
                     }
@@ -2175,7 +2183,7 @@ def _round_base_lines_tax_details(self, base_lines, company, tax_lines=None):
                 continue
 
             # Dispatch the base delta evenly on the base lines, starting from the biggest line.
-            factors = [{'factor': 1.0 / len(base_amounts['base_lines'])}] * len(base_amounts['base_lines'])
+            factors = [{'factor': 1.0}] * len(base_amounts['base_lines'])
             base_lines_sorted = sorted(
                 base_amounts['base_lines'],
                 key=lambda base_line: base_line['tax_details']['total_included_currency'],
@@ -2361,7 +2369,7 @@ def _add_accounting_data_to_base_line_tax_details(self, base_line, company, incl
                 delta_amount = tax_amount - total_tax_rep_amounts[field]
                 target_factors = [
                     {
-                        'factor': abs(tax_rep_data[field] / tax_amount) if tax_amount else 0.0,
+                        'factor': tax_rep_data[field],
                         'tax_rep_data': tax_rep_data,
                     }
                     for tax_rep_data in sorted_tax_reps_data

addons/account/static/src/helpers/account_tax.js

@@ -696,14 +696,21 @@ export const accountTaxHelpers = {
         const nb_of_errors = Math.round(Math.abs(delta_amount / precision_rounding));
         let remaining_errors = nb_of_errors;
 
-        for (let i = 0; i < target_factors.length; i++) {
-            const factor = target_factors[i].factor;
+        // Take absolute value of factors and sort them by largest absolute value first
+        const factors = target_factors.map((x, i) => [i, Math.abs(x.factor)]);
+        factors.sort((a, b) => b[1] - a[1]);
+        const sum_of_factors = factors.reduce((sum, x) => sum + x[1], 0.0);
+        if (sum_of_factors === 0.0) {
+            return amounts_to_distribute;
+        }
+
+        for (const [i, factor] of factors) {
             if (remaining_errors === 0) {
                 break;
             }
 
             const nb_of_amount_to_distribute = Math.min(
-                Math.ceil(Math.abs(factor * nb_of_errors)),
+                Math.ceil(Math.abs((factor / sum_of_factors) * nb_of_errors)),
                 remaining_errors
             );
 
@@ -1069,10 +1076,7 @@ export const accountTaxHelpers = {
                 const target_factors = tax_amounts.sorted_base_line_x_tax_data
                     .filter(([base_line, index_tax_data]) => index_tax_data)
                     .map(([base_line, index_tax_data]) => ({
-                        factor: Math.abs(
-                            base_line.tax_details.total_included_currency /
-                                tax_amounts.total_included_currency
-                        ),
+                        factor: base_line.tax_details.total_included_currency,
                         base_line: base_line,
                         index_tax_data: index_tax_data,
                     }));
@@ -1134,10 +1138,7 @@ export const accountTaxHelpers = {
 
                 const target_factors = tax_amounts.sorted_base_line_x_tax_data.map(
                     ([base_line, index_tax_data]) => ({
-                        factor: Math.abs(
-                            base_line.tax_details.total_included_currency /
-                                tax_amounts.total_included_currency
-                        ),
+                        factor: base_line.tax_details.total_included_currency,
                         base_line: base_line,
                         index_tax_data: index_tax_data,
                     })
@@ -1215,9 +1216,7 @@ export const accountTaxHelpers = {
             }
 
             // Dispatch the base delta evenly on the base lines, starting from the biggest line.
-            const factors = Array(base_amounts.base_lines.length).fill({
-                factor: 1.0 / base_amounts.base_lines.length,
-            });
+            const factors = Array(base_amounts.base_lines.length).fill({ factor: 1.0 });
             const base_lines_sorted = base_amounts.base_lines.sort(
                 (a, b) =>
                     a.tax_details.total_included_currency - b.tax_details.total_included_currency