[IMP] Overrides as Json

Author: maq-adhoc

account_invoice_tax/__manifest__.py

@@ -1,6 +1,6 @@
 {
     "name": "Account Invoice Tax",
-    "version": "18.0.1.2.0",
+    "version": "18.0.1.3.0",
     "author": "ADHOC SA",
     "category": "Localization",
     "depends": [

account_invoice_tax/migrations/18.0.1.2.0/pre-migrate.py

@@ -0,0 +1,91 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+"""
+Migration 18.0.1.2.0 → 18.0.1.3.0
+====================================
+The ``account.move.tax.override`` model has been replaced by a plain JSON
+field ``tax_override_data`` on ``account.move``.
+
+This pre-migration script reads every row from the old
+``account_move_tax_override`` table and serialises the data into the new
+``tax_override_data`` column **before** the ORM updates the schema, so that
+no override data is lost during the upgrade.
+
+JSON structure written to ``tax_override_data``:
+    { "<tax_id>": {"amount": <float>, "amount_company_currency": <float>} }
+"""
+
+import json
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+    if not version:
+        return
+
+    # Check that the source table still exists
+    cr.execute(
+        """
+        SELECT EXISTS (
+            SELECT 1 FROM information_schema.tables
+             WHERE table_name = 'account_move_tax_override'
+        )
+        """
+    )
+    if not cr.fetchone()[0]:
+        _logger.info(
+            "account_move_tax_override table not found – skipping data migration."
+        )
+        return
+
+    # Add the new column if it does not exist yet (the ORM will add it during
+    # the module update, but we need it available right now in pre-migrate).
+    cr.execute(
+        """
+        ALTER TABLE account_move
+            ADD COLUMN IF NOT EXISTS tax_override_data jsonb
+        """
+    )
+
+    # Read all override rows grouped by move
+    cr.execute(
+        """
+        SELECT move_id, tax_id, amount, amount_company_currency
+          FROM account_move_tax_override
+         ORDER BY move_id
+        """
+    )
+    rows = cr.fetchall()
+    if not rows:
+        _logger.info("No rows found in account_move_tax_override – nothing to migrate.")
+        return
+
+    # Group by move_id
+    by_move: dict[int, dict] = {}
+    for move_id, tax_id, amount, amount_company_currency in rows:
+        by_move.setdefault(move_id, {})[str(tax_id)] = {
+            "amount": float(amount or 0),
+            "amount_company_currency": float(amount_company_currency or 0),
+        }
+
+    # Write into tax_override_data – merge with any value already present
+    for move_id, override_dict in by_move.items():
+        cr.execute(
+            """
+            UPDATE account_move
+               SET tax_override_data = COALESCE(tax_override_data, '{}'::jsonb)
+                                    || %s::jsonb
+             WHERE id = %s
+            """,
+            (json.dumps(override_dict), move_id),
+        )
+
+    _logger.info(
+        "Migrated tax override data for %d move(s) into tax_override_data.",
+        len(by_move),
+    )
+
+    # Drop the old table now that data has been moved
+    cr.execute("DROP TABLE IF EXISTS account_move_tax_override")
+    _logger.info("Dropped table account_move_tax_override.")

account_invoice_tax/migrations/18.0.1.3.0/pre-migrate.py

@@ -1,3 +1,2 @@
-from . import account_move_tax_override
 from . import account_move
 from . import account_tax

account_invoice_tax/models/__init__.py

@@ -4,23 +4,54 @@
 class AccountMove(models.Model):
     _inherit = "account.move"
 
-    tax_override_ids = fields.One2many(
-        "account.move.tax.override",
-        "move_id",
-        string="Tax Overrides",
+    # Stores manually-overridden tax amounts keyed by tax id (as string).
+    # Structure: { "<tax_id>": {"amount": float, "amount_company_currency": float} }
+    # Only fixed-amount taxes are stored here; percentage taxes are always
+    # recomputed automatically.
+    tax_override_data = fields.Json(
+        string="Tax Override Data",
         copy=False,
+        default=dict,
     )
 
+    # ------------------------------------------------------------------
+    # Helpers to read/write the JSON field in a structured way
+    # ------------------------------------------------------------------
+
+    def _get_tax_overrides(self):
+        """Return the override dict keyed by integer tax id.
+
+        Structure: { tax_id (int): {"amount": float, "amount_company_currency": float} }
+        """
+        self.ensure_one()
+        raw = self.tax_override_data or {}
+        result = {}
+        for str_id, vals in raw.items():
+            try:
+                result[int(str_id)] = vals
+            except (ValueError, TypeError):
+                continue
+        return result
+
+    def _set_tax_overrides(self, overrides_by_tax_id):
+        """Persist the override dict to the JSON field.
+
+        :param overrides_by_tax_id: dict mapping integer tax_id →
+            {"amount": float, "amount_company_currency": float}
+        """
+        self.ensure_one()
+        self.tax_override_data = {
+            str(tax_id): vals for tax_id, vals in overrides_by_tax_id.items()
+        }
+
     # ------------------------------------------------------------------
     # Tax-totals widget: inject override amounts so the widget reflects
     # the manually-set values instead of the recomputed ones.
     # ------------------------------------------------------------------
 
     def _compute_tax_totals(self):
         for move in self:
-            # Only fixed-amount tax overrides affect the totals widget;
-            # percentage taxes are always recomputed.
-            overrides = {o.tax_id.id: o for o in move.tax_override_ids if o.tax_id.amount_type == "fixed"}
+            overrides = move._get_tax_overrides()
             if not overrides:
                 super(AccountMove, move)._compute_tax_totals()
                 continue
@@ -35,14 +66,22 @@ def _compute_tax_totals(self):
                         # is not stored (always 0); use `amount` directly with rate=1.0.
                         # If the invoice is in a foreign currency, use amount_company_currency
                         # as fixed_amount and derive the rate from both fields.
-                        "fixed_amount": (override.amount if is_company_currency else override.amount_company_currency),
+                        "fixed_amount": (
+                            vals["amount"]
+                            if is_company_currency
+                            else vals["amount_company_currency"]
+                        ),
                         "rate": (
                             1.0
                             if is_company_currency
-                            else (override.amount_company_currency / override.amount if override.amount else 1.0)
+                            else (
+                                vals["amount_company_currency"] / vals["amount"]
+                                if vals.get("amount")
+                                else 1.0
+                            )
                         ),
                     }
-                    for tax_id, override in overrides.items()
+                    for tax_id, vals in overrides.items()
                 },
             }
             super(AccountMove, move.with_context(**tax_context))._compute_tax_totals()
@@ -67,14 +106,46 @@ def _recompute_tax_lines(
             move._apply_tax_overrides()
 
     def _apply_tax_overrides(self):
-        """Re-write values from ``tax_override_ids`` onto the matching tax lines.
+        """Re-write values from ``tax_override_data`` onto the matching tax lines.
 
         Only overrides for fixed-amount taxes are applied; percentage-based
         taxes must always reflect their recomputed values.
         """
-        if not self.tax_override_ids:
+        overrides = self._get_tax_overrides()
+        if not overrides:
             return
-        overrides = {o.tax_id: o for o in self.tax_override_ids if o.tax_id.amount_type == "fixed"}
-        for line in self.line_ids.filtered(lambda l: l.tax_line_id in overrides):
-            override = overrides[line.tax_line_id]
-            line.write(override._get_line_values(self))
+
+        move_currency = self.currency_id
+        company_currency = self.company_currency_id
+        not_company_currency = move_currency and move_currency != company_currency
+
+        for line in self.line_ids.filtered(
+            lambda l: l.tax_line_id and l.tax_line_id.id in overrides
+        ):
+            vals = overrides[line.tax_line_id.id]
+            amount = vals.get("amount", 0.0)
+            amount_cc = vals.get("amount_company_currency", 0.0)
+
+            debit = credit = debit_cc = credit_cc = 0.0
+            if self.move_type in ("in_invoice", "in_receipt"):
+                if amount > 0:
+                    debit, debit_cc = amount, amount_cc
+                elif amount < 0:
+                    credit, credit_cc = -amount, -amount_cc
+            else:
+                if amount > 0:
+                    credit, credit_cc = amount, amount_cc
+                elif amount < 0:
+                    debit, debit_cc = -amount, -amount_cc
+
+            line_vals = {
+                "debit": debit_cc if not_company_currency else debit,
+                "credit": credit_cc if not_company_currency else credit,
+                "balance": (
+                    (amount_cc if not_company_currency else amount)
+                    * (1 if debit or debit_cc else -1)
+                ),
+            }
+            if not_company_currency and amount:
+                line_vals["amount_currency"] = amount
+            line.write(line_vals)

account_invoice_tax/models/account_move.py

@@ -1,4 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_invoice_tax,access_account_invoice_tax,account_invoice_tax.model_account_invoice_tax,account.group_account_invoice,1,1,1,0
 access_account_invoice_tax_line,access_account_invoice_tax_line,account_invoice_tax.model_account_invoice_tax_line,account.group_account_invoice,1,1,1,1
-access_account_move_tax_override,access_account_move_tax_override,account_invoice_tax.model_account_move_tax_override,account.group_account_invoice,1,1,1,1