From 89ef075344edafeda8b0b690d7eff5d4a2dc4794 Mon Sep 17 00:00:00 2001
From: Eric Antones <eantones@nuobit.com>
Date: Mon, 22 Jan 2024 02:16:53 +0100
Subject: [PATCH 1/8] [FIX] connector_oxigesti: removing items from Odoo did
 not mark the corresponding records in Oxigesti as deprecated

---
 .../models/product_pricelist_item/__init__.py |  1 +
 .../models/product_pricelist_item/adapter.py  |  2 +-
 .../models/product_pricelist_item/binding.py  | 71 +++++++++++++++-
 .../product_pricelist_item/export_mapper.py   |  2 +-
 .../models/product_pricelist_item/exporter.py | 83 +++++++++++--------
 .../models/product_pricelist_item/listener.py | 22 +++++
 .../views/product_pricelist_item_view.xml     | 19 +++++
 7 files changed, 163 insertions(+), 37 deletions(-)
 create mode 100644 connector_oxigesti/models/product_pricelist_item/listener.py

diff --git a/connector_oxigesti/models/product_pricelist_item/__init__.py b/connector_oxigesti/models/product_pricelist_item/__init__.py
index 43d4796fa..470152118 100644
--- a/connector_oxigesti/models/product_pricelist_item/__init__.py
+++ b/connector_oxigesti/models/product_pricelist_item/__init__.py
@@ -3,3 +3,4 @@
 from . import export_mapper
 from . import binder
 from . import binding
+from . import listener
diff --git a/connector_oxigesti/models/product_pricelist_item/adapter.py b/connector_oxigesti/models/product_pricelist_item/adapter.py
index fb6c7293e..0eb795fea 100644
--- a/connector_oxigesti/models/product_pricelist_item/adapter.py
+++ b/connector_oxigesti/models/product_pricelist_item/adapter.py
@@ -11,7 +11,7 @@ class ProductPricelistItemAdapter(Component):
 
     _apply_on = "oxigesti.product.pricelist.item"
 
-    _sql = """select b.CodigoArticulo, b.Codigo_Mutua, b.Importe
+    _sql = """select b.CodigoArticulo, b.Codigo_Mutua, b.Importe, b.Deprecated
               from %(schema)s.Odoo_Articulos_Generales_x_Cliente b
             """
 
diff --git a/connector_oxigesti/models/product_pricelist_item/binding.py b/connector_oxigesti/models/product_pricelist_item/binding.py
index e11179a6e..8dcf3538f 100644
--- a/connector_oxigesti/models/product_pricelist_item/binding.py
+++ b/connector_oxigesti/models/product_pricelist_item/binding.py
@@ -1,8 +1,28 @@
 # Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
 # Copyright NuoBiT Solutions - Kilian Niubo <kniubo@nuobit.com>
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
-from odoo import api, fields, models
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class Pricelist(models.Model):
+    _inherit = "product.pricelist"
+
+    # TODO: Review use deleter to mark items as deprecated
+    def unlink(self):
+        for rec in self:
+            if rec.item_ids.oxigesti_bind_ids:
+                raise ValidationError(
+                    _(
+                        "You can't delete the pricelist %s that has been exported "
+                        "the product prices by customer to Oxigesti. If you want to"
+                        "delete it, you must first delete the items of the pricelist."
+                    )
+                    % rec.name
+                )
+        return super().unlink()
 
 
 class ProductPricelistItem(models.Model):
@@ -14,6 +34,41 @@ class ProductPricelistItem(models.Model):
         string="Oxigesti Bindings",
     )
 
+    @api.constrains("compute_price", "applied_on", "product_tmpl_id")
+    def _check_binding(self):
+        for rec in self:
+            if rec.oxigesti_bind_ids:
+                partners = (
+                    self.env["res.partner"]
+                    .search(
+                        [
+                            ("company_id", "=?", rec.company_id.id),
+                        ]
+                    )
+                    .filtered(
+                        lambda x: x.property_product_pricelist == rec.pricelist_id
+                    )
+                )
+                if partners:
+                    raise ValidationError(
+                        _(
+                            "You can't change the product, the price calculation "
+                            "method or the applied on field of a pricelist item "
+                            "because they have been exported the product prices by "
+                            "customer to Oxigesti.\nIf you need to change any of "
+                            "these fields, you can delete the pricelist item and "
+                            "create a new one."
+                        )
+                    )
+
+    def is_deprecated(self, partner):
+        self.ensure_one()
+        return (
+            partner.property_product_pricelist != self.pricelist_id
+            or not self.active
+            or not self.product_tmpl_id.active
+        )
+
 
 class ProductPricelistItemBinding(models.Model):
     _name = "oxigesti.product.pricelist.item"
@@ -31,6 +86,20 @@ class ProductPricelistItemBinding(models.Model):
     odoo_partner_id = fields.Many2one(
         comodel_name="res.partner", string="Partner", required=True, ondelete="cascade"
     )
+
+    deprecated = fields.Boolean(
+        required=True,
+        compute="_compute_deprecated",
+        store=True,
+    )
+
+    @api.depends(
+        "active", "product_tmpl_id.active", "odoo_partner_id.property_product_pricelist"
+    )
+    def _compute_deprecated(self):
+        for rec in self:
+            rec.deprecated = rec.odoo_id.is_deprecated(rec.odoo_partner_id)
+
     _sql_constraints = [
         (
             "oxigesti_external_uniq",
diff --git a/connector_oxigesti/models/product_pricelist_item/export_mapper.py b/connector_oxigesti/models/product_pricelist_item/export_mapper.py
index dc324b212..2089840c9 100644
--- a/connector_oxigesti/models/product_pricelist_item/export_mapper.py
+++ b/connector_oxigesti/models/product_pricelist_item/export_mapper.py
@@ -63,4 +63,4 @@ def Codigo_Mutua(self, record):
 
     @mapping
     def Deprecated(self, record):
-        return {"Deprecated": 0}
+        return {"Deprecated": record.deprecated and 1 or 0}
diff --git a/connector_oxigesti/models/product_pricelist_item/exporter.py b/connector_oxigesti/models/product_pricelist_item/exporter.py
index 40a1e8770..a187f469d 100644
--- a/connector_oxigesti/models/product_pricelist_item/exporter.py
+++ b/connector_oxigesti/models/product_pricelist_item/exporter.py
@@ -3,20 +3,18 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 
-from odoo.addons.component.core import Component
+from odoo.addons.component.core import AbstractComponent, Component
 
 
-class ProductPricelistItemBatchExporter(Component):
+class ProductPricelistItemBatchExporter(AbstractComponent):
     """Export the Oxigesti Product prices.
 
     For every product in the list, a delayed job is created.
     """
 
-    _name = "oxigesti.product.pricelist.item.delayed.batch.exporter"
-    _inherit = "oxigesti.delayed.batch.exporter"
-    _apply_on = "oxigesti.product.pricelist.item"
+    _name = "oxigesti.product.pricelist.item.batch.exporter"
 
-    def run(self, domain=None):
+    def run_common(self, domain=None):
         if not domain:
             domain = []
         # Run the batch synchronization
@@ -32,47 +30,64 @@ def run(self, domain=None):
                 since_date = value
             else:
                 domain.append(e)
-        partner_adapter = self.component(
-            usage="backend.adapter", model_name="oxigesti.res.partner"
-        )
-        partner_binder = self.binder_for("oxigesti.res.partner")
         binder = self.binder_for(self.model._name)
         for p in self.env["res.partner"].search(domain):
-            partner_external_id = partner_binder.to_external(p, wrap=True)
-            for pl in p.property_product_pricelist.item_ids.filtered(
+            pricelist_items = p.property_product_pricelist.item_ids.filtered(
                 lambda x: (
                     not since_date
                     or x.write_date > since_date
                     or p.write_date > since_date
                 )
-                and p.customer_rank >= p.supplier_rank
                 and x.applied_on == "1_product"
                 and x.compute_price == "fixed"
                 and (
                     not x.sudo().product_tmpl_id.company_id
                     or x.sudo().product_tmpl_id.company_id == p.company_id
                 )
-            ):
-                if pl.product_tmpl_id.default_code and partner_external_id:
-                    external_id = [
-                        pl.product_tmpl_id.default_code,
-                        partner_adapter.id2dict(partner_external_id)["Codigo_Mutua"],
-                    ]
-                    binding = binder.to_internal(external_id)
-                    if binding and binding.odoo_id != pl:
-                        old_binding = binder._find_binding(
-                            pl, binding_extra_vals={"odoo_partner_id": p.id}
-                        )
-                        if old_binding:
-                            old_binding.unlink()
-                        binding.odoo_id = pl
-                binding = binder.wrap_binding(
-                    pl,
-                    binding_extra_vals={
-                        "odoo_partner_id": p.id,
-                    },
-                )
-                self._export_record(binding)
+            )
+            if pricelist_items:
+                # create/update binding data
+                for pl in pricelist_items:
+                    binding = binder.wrap_binding(
+                        pl,
+                        binding_extra_vals={
+                            "odoo_partner_id": p.id,
+                            "deprecated": pl.is_deprecated(p),
+                        },
+                    )
+                    self._export_record(binding)
+
+
+class ProductPricelistItemDelayedBatchExporter(Component):
+    """Export the Oxigesti Product prices.
+
+    For every product in the list, a delayed job is created.
+    """
+
+    _name = "oxigesti.product.pricelist.item.delayed.batch.exporter"
+    _inherit = [
+        "oxigesti.delayed.batch.exporter",
+        "oxigesti.product.pricelist.item.batch.exporter",
+    ]
+
+    def run(self, domain=None):
+        super().run_common(domain=domain)
+
+
+class ProductPricelistItemDirectBatchExporter(Component):
+    """Export the Oxigesti Product prices.
+
+    For every product in the list, a direct job is created.
+    """
+
+    _name = "oxigesti.product.pricelist.item.direct.batch.exporter"
+    _inherit = [
+        "oxigesti.direct.batch.exporter",
+        "oxigesti.product.pricelist.item.batch.exporter",
+    ]
+
+    def run(self, domain=None):
+        super().run_common(domain=domain)
 
 
 class ProductPricelistItemExporter(Component):
diff --git a/connector_oxigesti/models/product_pricelist_item/listener.py b/connector_oxigesti/models/product_pricelist_item/listener.py
new file mode 100644
index 000000000..6cded2102
--- /dev/null
+++ b/connector_oxigesti/models/product_pricelist_item/listener.py
@@ -0,0 +1,22 @@
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
+from odoo.addons.component.core import Component
+
+
+class ProductPricelistItemListener(Component):
+    _name = "oxigesti.product.pricelist.item.listener"
+    _inherit = "oxigesti.event.listener"
+
+    _apply_on = "product.pricelist.item"
+
+    def on_record_unlink(self, relation):
+        bindings = relation.sudo().oxigesti_bind_ids
+        bindings.deprecated = True
+        for backend in bindings.backend_id:
+            with backend.work_on(bindings._name) as work:
+                exporter = work.component(usage="direct.batch.exporter")
+                partners = bindings.filtered(
+                    lambda x: x.backend_id == backend
+                ).odoo_partner_id
+                exporter.run([("id", "=", partners.ids)])
diff --git a/connector_oxigesti/views/product_pricelist_item_view.xml b/connector_oxigesti/views/product_pricelist_item_view.xml
index fc3fa56f4..5a590a613 100644
--- a/connector_oxigesti/views/product_pricelist_item_view.xml
+++ b/connector_oxigesti/views/product_pricelist_item_view.xml
@@ -2,6 +2,23 @@
 <!-- Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) -->
 <odoo>
+    <record id="product_pricelist_item_view_form_oxigesti" model="ir.ui.view">
+        <field name="name">product.pricelist.item.oxigesti.connector.form</field>
+        <field name="model">product.pricelist.item</field>
+        <field name="inherit_id" ref="product.product_pricelist_item_form_view" />
+        <field name="arch" type="xml">
+            <xpath expr="//form/sheet" position="inside">
+                <notebook>
+                    <page name="connector" string="Connectors">
+                        <group string="Oxigesti Bindings">
+                            <field name="oxigesti_bind_ids" nolabel="1" />
+                        </group>
+                    </page>
+                </notebook>
+            </xpath>
+        </field>
+    </record>
+
     <record id="oxigesti_product_pricelist_item_view_form" model="ir.ui.view">
         <field name="name">oxigesti.product.pricelist.item.form</field>
         <field name="model">oxigesti.product.pricelist.item</field>
@@ -13,6 +30,7 @@
                     <field name="odoo_partner_id" readonly="True" />
                     <field name="external_id_display" readonly="True" />
                     <field name="sync_date" readonly="True" />
+                    <field name="deprecated" readonly="True" />
                 </group>
             </form>
         </field>
@@ -28,6 +46,7 @@
                 <field name="odoo_partner_id" />
                 <field name="external_id_display" />
                 <field name="sync_date" />
+                <field name="deprecated" readonly="True" />
                 <button
                     name="resync"
                     type="object"

From d80cd59ac122dd7e1d7a5d983d3d245999b6ba69 Mon Sep 17 00:00:00 2001
From: Eric Antones <eantones@nuobit.com>
Date: Tue, 27 Feb 2024 19:20:46 +0100
Subject: [PATCH 2/8] [FIX] connector_oxigesti: get back the code for reusing
 the existing binding on changing the partner pricelist

---
 .../models/product_pricelist_item/exporter.py | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/connector_oxigesti/models/product_pricelist_item/exporter.py b/connector_oxigesti/models/product_pricelist_item/exporter.py
index a187f469d..614627e03 100644
--- a/connector_oxigesti/models/product_pricelist_item/exporter.py
+++ b/connector_oxigesti/models/product_pricelist_item/exporter.py
@@ -30,6 +30,10 @@ def run_common(self, domain=None):
                 since_date = value
             else:
                 domain.append(e)
+        partner_adapter = self.component(
+            usage="backend.adapter", model_name="oxigesti.res.partner"
+        )
+        partner_binder = self.binder_for("oxigesti.res.partner")
         binder = self.binder_for(self.model._name)
         for p in self.env["res.partner"].search(domain):
             pricelist_items = p.property_product_pricelist.item_ids.filtered(
@@ -47,7 +51,23 @@ def run_common(self, domain=None):
             )
             if pricelist_items:
                 # create/update binding data
+                partner_external_id = partner_binder.to_external(p, wrap=True)
                 for pl in pricelist_items:
+                    if pl.product_tmpl_id.default_code and partner_external_id:
+                        external_id = [
+                            pl.product_tmpl_id.default_code,
+                            partner_adapter.id2dict(partner_external_id)[
+                                "Codigo_Mutua"
+                            ],
+                        ]
+                        binding = binder.to_internal(external_id)
+                        if binding and binding.odoo_id != pl:
+                            old_binding = binder._find_binding(
+                                pl, binding_extra_vals={"odoo_partner_id": p.id}
+                            )
+                            if old_binding:
+                                old_binding.unlink()
+                            binding.odoo_id = pl
                     binding = binder.wrap_binding(
                         pl,
                         binding_extra_vals={

From 3305193bee183ad6154369363c03cd87a438c7d6 Mon Sep 17 00:00:00 2001
From: FrankC013 <fcespedes@nuobit.com>
Date: Fri, 2 Feb 2024 18:31:42 +0100
Subject: [PATCH 3/8] [REF] connector_oxigesti: delete wrong code related to
 record deletion via listener

---
 connector_oxigesti/models/__init__.py         |  1 -
 .../models/product_category/__init__.py       |  1 -
 .../models/product_category/adapter.py        |  4 ----
 .../models/product_category/listener.py       | 11 ----------
 .../product_category/product_category.py      | 12 -----------
 .../models/product_product/__init__.py        |  1 -
 .../models/product_product/adapter.py         |  4 ----
 .../models/product_product/binding.py         | 12 -----------
 .../models/product_product/listener.py        | 11 ----------
 .../models/product_template/__init__.py       |  4 ----
 .../models/product_template/binding.py        | 21 -------------------
 .../models/product_template/listener.py       | 11 ----------
 12 files changed, 93 deletions(-)
 delete mode 100644 connector_oxigesti/models/product_category/listener.py
 delete mode 100644 connector_oxigesti/models/product_product/listener.py
 delete mode 100644 connector_oxigesti/models/product_template/__init__.py
 delete mode 100644 connector_oxigesti/models/product_template/binding.py
 delete mode 100644 connector_oxigesti/models/product_template/listener.py

diff --git a/connector_oxigesti/models/__init__.py b/connector_oxigesti/models/__init__.py
index 577636a98..b7a2420df 100644
--- a/connector_oxigesti/models/__init__.py
+++ b/connector_oxigesti/models/__init__.py
@@ -1,7 +1,6 @@
 from . import oxigesti_binding
 from . import oxigesti_backend
 from . import res_partner
-from . import product_template
 from . import product_product
 from . import product_category
 from . import product_buyerinfo
diff --git a/connector_oxigesti/models/product_category/__init__.py b/connector_oxigesti/models/product_category/__init__.py
index 98026c285..1d62de855 100644
--- a/connector_oxigesti/models/product_category/__init__.py
+++ b/connector_oxigesti/models/product_category/__init__.py
@@ -5,5 +5,4 @@
 from . import export_mapper
 from . import binder
 from . import binding
-from . import listener
 from . import product_category
diff --git a/connector_oxigesti/models/product_category/adapter.py b/connector_oxigesti/models/product_category/adapter.py
index 0bff1cfd1..e50b404ef 100644
--- a/connector_oxigesti/models/product_category/adapter.py
+++ b/connector_oxigesti/models/product_category/adapter.py
@@ -28,8 +28,4 @@ class ProductCategoryAdapter(Component):
                      values (%(phvalues)s)
                 """
 
-    _sql_delete = """delete from %(schema)s.Odoo_Articulos_Categorias
-                     where Id = %%(Id)s
-         """
-
     _id = ("Id",)
diff --git a/connector_oxigesti/models/product_category/listener.py b/connector_oxigesti/models/product_category/listener.py
deleted file mode 100644
index 6625b2166..000000000
--- a/connector_oxigesti/models/product_category/listener.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-
-from odoo.addons.component.core import Component
-
-
-class ProductCategoryListener(Component):
-    _name = "oxigesti.product.category.listener"
-    _inherit = "oxigesti.event.listener"
-
-    _apply_on = "product.category"
diff --git a/connector_oxigesti/models/product_category/product_category.py b/connector_oxigesti/models/product_category/product_category.py
index 1f022c6d3..bbfa8dcec 100644
--- a/connector_oxigesti/models/product_category/product_category.py
+++ b/connector_oxigesti/models/product_category/product_category.py
@@ -14,15 +14,3 @@ class ProductCategory(models.Model):
         inverse_name="odoo_id",
         string="Oxigesti Bindings",
     )
-
-    def unlink(self):
-        to_remove = {}
-        for record in self:
-            to_remove[record.id] = [
-                (binding.backend_id.id, binding._name, binding.external_id)
-                for binding in record.oxigesti_bind_ids
-            ]
-        result = super(ProductCategory, self).unlink()
-        for bindings_data in to_remove.values():
-            self._event("on_record_post_unlink").notify(bindings_data)
-        return result
diff --git a/connector_oxigesti/models/product_product/__init__.py b/connector_oxigesti/models/product_product/__init__.py
index 655cad79f..7bdde7bb4 100644
--- a/connector_oxigesti/models/product_product/__init__.py
+++ b/connector_oxigesti/models/product_product/__init__.py
@@ -5,4 +5,3 @@
 from . import export_mapper
 from . import binder
 from . import binding
-from . import listener
diff --git a/connector_oxigesti/models/product_product/adapter.py b/connector_oxigesti/models/product_product/adapter.py
index af1ef919c..0a2d4ecad 100644
--- a/connector_oxigesti/models/product_product/adapter.py
+++ b/connector_oxigesti/models/product_product/adapter.py
@@ -27,8 +27,4 @@ class ProductProductAdapter(Component):
                      values (%(phvalues)s)
          """
 
-    _sql_delete = """delete from %(schema)s.Odoo_Articulos_Generales
-                     where CodigoArticulo = %%(CodigoArticulo)s
-         """
-
     _id = ("CodigoArticulo",)
diff --git a/connector_oxigesti/models/product_product/binding.py b/connector_oxigesti/models/product_product/binding.py
index bc324fcb3..a50d90b45 100644
--- a/connector_oxigesti/models/product_product/binding.py
+++ b/connector_oxigesti/models/product_product/binding.py
@@ -14,18 +14,6 @@ class ProductProduct(models.Model):
         string="Oxigesti Bindings",
     )
 
-    def unlink(self):
-        to_remove = {}
-        for record in self:
-            to_remove[record.id] = [
-                (binding.backend_id.id, binding._name, binding.external_id)
-                for binding in record.oxigesti_bind_ids
-            ]
-        result = super(ProductProduct, self).unlink()
-        for bindings_data in to_remove.values():
-            self._event("on_record_post_unlink").notify(bindings_data)
-        return result
-
 
 class ProductProductBinding(models.Model):
     _name = "oxigesti.product.product"
diff --git a/connector_oxigesti/models/product_product/listener.py b/connector_oxigesti/models/product_product/listener.py
deleted file mode 100644
index d01997641..000000000
--- a/connector_oxigesti/models/product_product/listener.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-
-from odoo.addons.component.core import Component
-
-
-class ProductProductListener(Component):
-    _name = "oxigesti.product.product.listener"
-    _inherit = "oxigesti.event.listener"
-
-    _apply_on = "product.product"
diff --git a/connector_oxigesti/models/product_template/__init__.py b/connector_oxigesti/models/product_template/__init__.py
deleted file mode 100644
index 209806a0a..000000000
--- a/connector_oxigesti/models/product_template/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-
-from . import binding
-from . import listener
diff --git a/connector_oxigesti/models/product_template/binding.py b/connector_oxigesti/models/product_template/binding.py
deleted file mode 100644
index 4ce56784c..000000000
--- a/connector_oxigesti/models/product_template/binding.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
-# Copyright NuoBiT Solutions - Kilian Niubo <kniubo@nuobit.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-
-from odoo import models
-
-
-class ProductTemplate(models.Model):
-    _inherit = "product.template"
-
-    def unlink(self):
-        to_remove = {}
-        for record in self:
-            to_remove[record.id] = [
-                (binding.backend_id.id, binding._name, binding.external_id)
-                for binding in record.product_variant_ids.mapped("oxigesti_bind_ids")
-            ]
-        result = super(ProductTemplate, self).unlink()
-        for bindings_data in to_remove.values():
-            self._event("on_record_post_unlink").notify(bindings_data)
-        return result
diff --git a/connector_oxigesti/models/product_template/listener.py b/connector_oxigesti/models/product_template/listener.py
deleted file mode 100644
index 6e161534c..000000000
--- a/connector_oxigesti/models/product_template/listener.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-
-from odoo.addons.component.core import Component
-
-
-class ProductTemplateListener(Component):
-    _name = "oxigesti.product.template.listener"
-    _inherit = "oxigesti.event.listener"
-
-    _apply_on = "product.template"

From c3efa902a9aacf8d84a87ff614a3d8c2c57ad75b Mon Sep 17 00:00:00 2001
From: FrankC013 <fcespedes@nuobit.com>
Date: Fri, 2 Feb 2024 18:32:42 +0100
Subject: [PATCH 4/8] [IMP] connector_oxigesti: new logic for updating
 deprecated field

---
 connector_oxigesti/components/__init__.py     |  1 +
 connector_oxigesti/components/adapter.py      |  4 +++
 connector_oxigesti/components/deleter.py      | 22 +++++++++++++
 .../data/queue_job_function_data.xml          | 12 +++++++
 .../models/oxigesti_binding/common.py         | 15 +++++++++
 .../models/product_pricelist/__init__.py      |  1 +
 .../models/product_pricelist/binding.py       | 15 +++++++++
 .../models/product_pricelist_item/__init__.py |  3 ++
 .../models/product_pricelist_item/adapter.py  |  5 +++
 .../models/product_pricelist_item/binding.py  | 32 ++++++++-----------
 .../models/product_pricelist_item/deleter.py  | 22 +++++++++++++
 .../models/product_pricelist_item/listener.py | 17 ++++------
 .../models/product_template/__init__.py       |  1 +
 .../models/product_template/binding.py        | 26 +++++++++++++++
 .../models/res_partner/binding.py             |  8 +++++
 15 files changed, 155 insertions(+), 29 deletions(-)
 create mode 100644 connector_oxigesti/components/deleter.py
 create mode 100644 connector_oxigesti/models/product_pricelist/__init__.py
 create mode 100644 connector_oxigesti/models/product_pricelist/binding.py
 create mode 100644 connector_oxigesti/models/product_pricelist_item/deleter.py
 create mode 100644 connector_oxigesti/models/product_template/__init__.py
 create mode 100644 connector_oxigesti/models/product_template/binding.py

diff --git a/connector_oxigesti/components/__init__.py b/connector_oxigesti/components/__init__.py
index d1e50e2df..2789d7a61 100644
--- a/connector_oxigesti/components/__init__.py
+++ b/connector_oxigesti/components/__init__.py
@@ -8,3 +8,4 @@
 from . import import_mapper
 from . import export_mapper
 from . import listener
+from . import deleter
diff --git a/connector_oxigesti/components/adapter.py b/connector_oxigesti/components/adapter.py
index a597e189a..e9857be10 100644
--- a/connector_oxigesti/components/adapter.py
+++ b/connector_oxigesti/components/adapter.py
@@ -437,6 +437,10 @@ def delete(self, _id):
             raise pymssql.InternalError("The schema %s does not exist" % self.schema)
 
         # prepare the sql with base strucrture
+        if not hasattr(self, "_sql_delete"):
+            raise ValidationError(
+                _("The model %s does not have a delete SQL defined") % (self._name,)
+            )
         sql = self._sql_delete % dict(schema=self.schema)
 
         # get id fieldnames and values
diff --git a/connector_oxigesti/components/deleter.py b/connector_oxigesti/components/deleter.py
new file mode 100644
index 000000000..eba9ca2f6
--- /dev/null
+++ b/connector_oxigesti/components/deleter.py
@@ -0,0 +1,22 @@
+# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
+import logging
+
+from odoo.addons.component.core import AbstractComponent
+
+_logger = logging.getLogger(__name__)
+
+
+class OxigestiExportDeleter(AbstractComponent):
+    """Base Export Deleter for Oxigesti"""
+
+    _name = "oxigesti.export.deleter"
+    _inherit = ["base.deleter", "base.oxigesti.connector"]
+
+    _usage = "record.export.deleter"
+
+    def run(self, external_id):
+        adapter = self.component(usage="backend.adapter")
+        adapter.delete(external_id)
diff --git a/connector_oxigesti/data/queue_job_function_data.xml b/connector_oxigesti/data/queue_job_function_data.xml
index 01a51c63b..13142bb1e 100644
--- a/connector_oxigesti/data/queue_job_function_data.xml
+++ b/connector_oxigesti/data/queue_job_function_data.xml
@@ -209,4 +209,16 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)-->
         <field name="channel_id" ref="connector_oxigesti.channel_oxigesti" />
         <field name="retry_pattern" eval="{1: 10, 5: 30, 10: 60, 15: 300}" />
     </record>
+    <record
+        id="oxigesti_product_pricelist_item_export_deleter_record_job_function"
+        model="queue.job.function"
+    >
+        <field
+            name="model_id"
+            ref="connector_oxigesti.model_oxigesti_product_pricelist_item"
+        />
+        <field name="method">export_deleter_record</field>
+        <field name="channel_id" ref="connector_oxigesti.channel_oxigesti" />
+        <field name="retry_pattern" eval="{1: 10, 5: 30, 10: 60, 15: 300}" />
+    </record>
 </odoo>
diff --git a/connector_oxigesti/models/oxigesti_binding/common.py b/connector_oxigesti/models/oxigesti_binding/common.py
index 6e614cdad..df22f7b35 100644
--- a/connector_oxigesti/models/oxigesti_binding/common.py
+++ b/connector_oxigesti/models/oxigesti_binding/common.py
@@ -213,3 +213,18 @@ def export_record(self, backend, relation):
         with backend.work_on(self._name) as work:
             exporter = work.component(usage="record.exporter")
             return exporter.run(relation)
+
+    @api.model
+    def export_deleter_record(self, backend, external_id):
+        """Deleter Oxigesti record"""
+        if not external_id:
+            raise ValidationError(_("The external_id of the binding is null"))
+        binding_name = self._name
+        with backend.work_on(binding_name) as work:
+            deleter = work.component(usage="record.export.deleter")
+            deleter.run(external_id)
+
+    @api.model
+    def import_deleter_record(self, backend, relation):
+        """Deleter Odoo record"""
+        raise NotImplementedError
diff --git a/connector_oxigesti/models/product_pricelist/__init__.py b/connector_oxigesti/models/product_pricelist/__init__.py
new file mode 100644
index 000000000..0fec82e8a
--- /dev/null
+++ b/connector_oxigesti/models/product_pricelist/__init__.py
@@ -0,0 +1 @@
+from . import binding
diff --git a/connector_oxigesti/models/product_pricelist/binding.py b/connector_oxigesti/models/product_pricelist/binding.py
new file mode 100644
index 000000000..dd003bcfe
--- /dev/null
+++ b/connector_oxigesti/models/product_pricelist/binding.py
@@ -0,0 +1,15 @@
+# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
+from odoo import models
+
+
+class Pricelist(models.Model):
+    _inherit = "product.pricelist"
+
+    def unlink(self):
+        for rec in self:
+            for item in rec.item_ids.filtered(lambda x: x.oxigesti_bind_ids):
+                item.unlink()
+        return super().unlink()
diff --git a/connector_oxigesti/models/product_pricelist_item/__init__.py b/connector_oxigesti/models/product_pricelist_item/__init__.py
index 470152118..fd680d3b4 100644
--- a/connector_oxigesti/models/product_pricelist_item/__init__.py
+++ b/connector_oxigesti/models/product_pricelist_item/__init__.py
@@ -1,6 +1,9 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
 from . import exporter
 from . import adapter
 from . import export_mapper
 from . import binder
 from . import binding
 from . import listener
+from . import deleter
diff --git a/connector_oxigesti/models/product_pricelist_item/adapter.py b/connector_oxigesti/models/product_pricelist_item/adapter.py
index 0eb795fea..fdaae7b5b 100644
--- a/connector_oxigesti/models/product_pricelist_item/adapter.py
+++ b/connector_oxigesti/models/product_pricelist_item/adapter.py
@@ -28,4 +28,9 @@ class ProductPricelistItemAdapter(Component):
                      values (%(phvalues)s)
                 """
 
+    _sql_delete = """delete from %(schema)s.Odoo_Articulos_Generales_x_Cliente
+                     where CodigoArticulo = %%(CodigoArticulo)s
+                     and Codigo_Mutua = %%(Codigo_Mutua)s
+                """
+
     _id = ("CodigoArticulo", "Codigo_Mutua")
diff --git a/connector_oxigesti/models/product_pricelist_item/binding.py b/connector_oxigesti/models/product_pricelist_item/binding.py
index 8dcf3538f..6fa6d37a1 100644
--- a/connector_oxigesti/models/product_pricelist_item/binding.py
+++ b/connector_oxigesti/models/product_pricelist_item/binding.py
@@ -7,24 +7,6 @@
 from odoo.exceptions import ValidationError
 
 
-class Pricelist(models.Model):
-    _inherit = "product.pricelist"
-
-    # TODO: Review use deleter to mark items as deprecated
-    def unlink(self):
-        for rec in self:
-            if rec.item_ids.oxigesti_bind_ids:
-                raise ValidationError(
-                    _(
-                        "You can't delete the pricelist %s that has been exported "
-                        "the product prices by customer to Oxigesti. If you want to"
-                        "delete it, you must first delete the items of the pricelist."
-                    )
-                    % rec.name
-                )
-        return super().unlink()
-
-
 class ProductPricelistItem(models.Model):
     _inherit = "product.pricelist.item"
 
@@ -69,6 +51,20 @@ def is_deprecated(self, partner):
             or not self.product_tmpl_id.active
         )
 
+    def unlink(self):
+        to_remove = {}
+        for record in self:
+            for binding in record.oxigesti_bind_ids:
+                with binding.backend_id.work_on(binding._name) as work:
+                    binder = work.component(usage="binder")
+                    to_remove.setdefault(record.id, []).append(
+                        (binding.backend_id, binder.to_external(binding))
+                    )
+        result = super(ProductPricelistItem, self).unlink()
+        for bindings_data in to_remove.values():
+            self._event("on_record_post_unlink").notify(bindings_data)
+        return result
+
 
 class ProductPricelistItemBinding(models.Model):
     _name = "oxigesti.product.pricelist.item"
diff --git a/connector_oxigesti/models/product_pricelist_item/deleter.py b/connector_oxigesti/models/product_pricelist_item/deleter.py
new file mode 100644
index 000000000..ae59e0405
--- /dev/null
+++ b/connector_oxigesti/models/product_pricelist_item/deleter.py
@@ -0,0 +1,22 @@
+# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
+import logging
+
+from odoo.addons.component.core import Component
+
+_logger = logging.getLogger(__name__)
+
+
+class OxigestiExportDeleter(Component):
+    """Base Export Deleter for Oxigesti"""
+
+    _name = "oxigesti.product.pricelist.item.deleter"
+    _inherit = "oxigesti.export.deleter"
+
+    _apply_on = "oxigesti.product.pricelist.item"
+
+    def run(self, external_id):
+        adapter = self.component(usage="backend.adapter")
+        adapter.write(external_id, {"deprecated": True})
diff --git a/connector_oxigesti/models/product_pricelist_item/listener.py b/connector_oxigesti/models/product_pricelist_item/listener.py
index 6cded2102..25deca103 100644
--- a/connector_oxigesti/models/product_pricelist_item/listener.py
+++ b/connector_oxigesti/models/product_pricelist_item/listener.py
@@ -1,6 +1,5 @@
 # Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-
 from odoo.addons.component.core import Component
 
 
@@ -10,13 +9,9 @@ class ProductPricelistItemListener(Component):
 
     _apply_on = "product.pricelist.item"
 
-    def on_record_unlink(self, relation):
-        bindings = relation.sudo().oxigesti_bind_ids
-        bindings.deprecated = True
-        for backend in bindings.backend_id:
-            with backend.work_on(bindings._name) as work:
-                exporter = work.component(usage="direct.batch.exporter")
-                partners = bindings.filtered(
-                    lambda x: x.backend_id == backend
-                ).odoo_partner_id
-                exporter.run([("id", "=", partners.ids)])
+    def on_record_post_unlink(self, backend_external):
+        for backend, external_id in backend_external:
+            binding_name = self.model.oxigesti_bind_ids._name
+            self.env[binding_name].with_delay().export_deleter_record(
+                backend, external_id
+            )
diff --git a/connector_oxigesti/models/product_template/__init__.py b/connector_oxigesti/models/product_template/__init__.py
new file mode 100644
index 000000000..0fec82e8a
--- /dev/null
+++ b/connector_oxigesti/models/product_template/__init__.py
@@ -0,0 +1 @@
+from . import binding
diff --git a/connector_oxigesti/models/product_template/binding.py b/connector_oxigesti/models/product_template/binding.py
new file mode 100644
index 000000000..fad4e4aed
--- /dev/null
+++ b/connector_oxigesti/models/product_template/binding.py
@@ -0,0 +1,26 @@
+# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
+from odoo import models
+
+
+class ProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    def unlink(self):
+        res = super().unlink()
+        for rec in self:
+            item = (
+                self.env["product.pricelist.item"]
+                .search(
+                    [
+                        ("product_tmpl_id", "=", rec.id),
+                        ("oxigesti_bind_ids", "!=", False),
+                    ]
+                )
+                .filtered(lambda x: not all(x.oxigesti_bind_ids.mapped("deprecated")))
+            )
+            if item:
+                item.unlink()
+        return res
diff --git a/connector_oxigesti/models/res_partner/binding.py b/connector_oxigesti/models/res_partner/binding.py
index 6df54bc3c..5095e1ab8 100644
--- a/connector_oxigesti/models/res_partner/binding.py
+++ b/connector_oxigesti/models/res_partner/binding.py
@@ -14,6 +14,14 @@ class ResPartner(models.Model):
         string="Oxigesti Bindings",
     )
 
+    def unlink(self):
+        for rec in self:
+            for item in rec.property_product_pricelist.item_ids.filtered(
+                lambda x: x.oxigesti_bind_ids
+            ):
+                item.unlink()
+        return super().unlink()
+
 
 class ResPartnerBinding(models.Model):
     _name = "oxigesti.res.partner"

From ac295cb8cd74afd4a869f73cf38638a5df7f33f3 Mon Sep 17 00:00:00 2001
From: FrankC013 <fcespedes@nuobit.com>
Date: Tue, 6 Feb 2024 10:23:54 +0100
Subject: [PATCH 5/8] [IMP] connector_oxigesti: new implementations

---
 connector_oxigesti/components/adapter.py      | 120 ++++++++++++++----
 connector_oxigesti/components/deleter.py      |  37 ++++++
 .../components_custom/binder.py               |   3 +
 .../data/queue_job_function_data.xml          |  16 ++-
 connector_oxigesti/models/__init__.py         |   2 +
 .../models/oxigesti_binding/common.py         |  37 +++++-
 .../models/product_pricelist/__init__.py      |   2 +-
 .../models/product_pricelist/listener.py      |  18 +++
 .../models/product_pricelist_item/binding.py  |  14 --
 .../models/product_pricelist_item/deleter.py  |   9 +-
 .../models/product_pricelist_item/listener.py |  12 +-
 .../models/product_template/__init__.py       |   2 +-
 .../models/product_template/binding.py        |  26 ----
 .../models/product_template/listener.py       |  18 +++
 .../models/res_partner/__init__.py            |   1 +
 .../models/res_partner/binding.py             |   8 --
 .../models/res_partner/listener.py            |  22 ++++
 17 files changed, 264 insertions(+), 83 deletions(-)
 create mode 100644 connector_oxigesti/models/product_pricelist/listener.py
 delete mode 100644 connector_oxigesti/models/product_template/binding.py
 create mode 100644 connector_oxigesti/models/product_template/listener.py
 create mode 100644 connector_oxigesti/models/res_partner/listener.py

diff --git a/connector_oxigesti/components/adapter.py b/connector_oxigesti/components/adapter.py
index e9857be10..be990cce4 100644
--- a/connector_oxigesti/components/adapter.py
+++ b/connector_oxigesti/components/adapter.py
@@ -15,6 +15,7 @@
 
 from odoo import _, exceptions
 from odoo.exceptions import ValidationError
+from odoo.osv.expression import normalize_domain
 
 from odoo.addons.component.core import AbstractComponent
 from odoo.addons.connector.exception import NetworkRetryableError
@@ -62,6 +63,80 @@ def api_handle_errors(message=""):
         )
 
 
+def domain_to_where(domain):
+    OP_MAP = {
+        "&": "AND",
+        "|": "OR",
+        "!": "NOT",
+    }
+
+    def domain_prefix_to_infix(domain):
+        stack = []
+        i = len(domain) - 1
+        while i >= 0:
+            item = domain[i]
+            if item in OP_MAP:
+                if item == "!":
+                    stack.append((item, stack.pop()))
+                else:
+                    stack.append((stack.pop(), item, stack.pop()))
+            else:
+                if not isinstance(item, (tuple, list)):
+                    raise ValidationError(_("Unexpected domain clause %s") % item)
+                stack.append(item)
+            i -= 1
+        return stack.pop()
+
+    def domain_infix_to_where_raw(domain, values):
+        if not isinstance(domain, (list, tuple)):
+            raise ValidationError(_("Invalid domain format %s") % domain)
+        if len(domain) == 2:
+            operator, expr = domain
+            if operator not in OP_MAP:
+                raise ValidationError(
+                    _("Invalid format, operator not supported %s on domain %s")
+                    % (operator, domain)
+                )
+            values_r, right = domain_infix_to_where_raw(expr, values)
+            return values_r, f"{OP_MAP[operator]} ({right})"
+        elif len(domain) == 3:
+            expr_l, operator, expr_r = domain
+            if operator in OP_MAP:
+                values_l, left = domain_infix_to_where_raw(expr_l, values)
+                values_r, right = domain_infix_to_where_raw(expr_r, values)
+                return {**values_l, **values_r}, f"({left} {OP_MAP[operator]} {right})"
+            field, operator, value = domain
+            # field and values
+            if field not in values:
+                values[field] = {"next": 1, "values": {}}
+            field_n = f"{field}{values[field]['next']}"
+            if field_n in values[field]["values"]:
+                raise ValidationError(_("Unexpected!! Field %s already used") % field)
+            values[field]["values"][field_n] = value
+            values[field]["next"] += 1
+            # operator and nulls values
+            if value is None:
+                if operator == "=":
+                    operator = "is"
+                elif operator == "!=":
+                    operator = "is not"
+                else:
+                    raise ValidationError(
+                        _("Operator '%s' is not implemented on NULL values") % operator
+                    )
+            return values, f"{field} {operator} %({field_n})s"
+        else:
+            raise ValidationError(_("Invalid domain format %s") % domain)
+
+    domain_norm = normalize_domain(domain)
+    domain_infix = domain_prefix_to_infix(domain_norm)
+    values, where = domain_infix_to_where_raw(domain_infix, {})
+    values_norm = {}
+    for _k, v in values.items():
+        values_norm.update(v["values"])
+    return values_norm, where
+
+
 class CRUDAdapter(AbstractComponent):
     """External Records Adapter for Oxigesti"""
 
@@ -153,7 +228,7 @@ def _escape(self, s):
 
     def _exec_sql(self, sql, params, as_dict=False, commit=False):
         # Convert params
-        params = self._convert_tuple(params, to_backend=True)
+        params = self._convert_dict(params, to_backend=True)
         # Execute sql
         conn = self.conn()
         cr = conn.cursor(as_dict=as_dict)
@@ -179,7 +254,7 @@ def _exec_query(self, filters=None, fields=None, as_dict=True):
             filters = []
         # check if schema exists to avoid injection
         schema_exists = self._exec_sql(
-            "select 1 from sys.schemas where name=%s", (self.schema,)
+            "select 1 from sys.schemas where name=%(schema)s", dict(schema=self.schema)
         )
         if not schema_exists:
             raise pymssql.InternalError("The schema %s does not exist" % self.schema)
@@ -201,26 +276,27 @@ def _exec_query(self, filters=None, fields=None, as_dict=True):
             sql_l.append("select %s from t" % (", ".join(fields_l),))
 
             if filters:
-                where = []
-                for k, operator, v in filters:
-                    if v is None:
-                        if operator == "=":
-                            operator = "is"
-                        elif operator == "!=":
-                            operator = "is not"
-                        else:
-                            raise Exception(
-                                "Operator '%s' is not implemented on NULL values"
-                                % operator
-                            )
-
-                    where.append("%s %s %%s" % (k, operator))
-                    values.append(v)
-                sql_l.append("where %s" % (" and ".join(where),))
+                values, where = domain_to_where(filters)
+                # where = []
+                # for k, operator, v in filters:
+                #     if v is None:
+                #         if operator == "=":
+                #             operator = "is"
+                #         elif operator == "!=":
+                #             operator = "is not"
+                #         else:
+                #             raise Exception(
+                #                 "Operator '%s' is not implemented on NULL values"
+                #                 % operator
+                #             )
+                #
+                #     where.append("%s %s %%s" % (k, operator))
+                #     values.append(v)
+                sql_l.append("where %s" % where)
 
             sql = " ".join(sql_l)
 
-        res = self._exec_sql(sql, tuple(values), as_dict=as_dict)
+        res = self._exec_sql(sql, values, as_dict=as_dict)
 
         filter_keys_s = {e[0] for e in filters}
         if self._id and set(self._id).issubset(filter_keys_s):
@@ -291,7 +367,7 @@ def write(self, _id, values_d):  # pylint: disable=W8106
 
         # check if schema exists to avoid injection
         schema_exists = self._exec_sql(
-            "select 1 from sys.schemas where name=%s", (self.schema,)
+            "select 1 from sys.schemas where name=%(schema)s", dict(schema=self.schema)
         )
         if not schema_exists:
             raise pymssql.InternalError("The schema %s does not exist" % self.schema)
@@ -357,7 +433,7 @@ def create(self, values_d):  # pylint: disable=W8106
 
         # check if schema exists to avoid injection
         schema_exists = self._exec_sql(
-            "select 1 from sys.schemas where name=%s", (self.schema,)
+            "select 1 from sys.schemas where name=%(schema)s", dict(schema=self.schema)
         )
         if not schema_exists:
             raise pymssql.InternalError("The schema %s does not exist" % self.schema)
@@ -431,7 +507,7 @@ def delete(self, _id):
 
         # check if schema exists to avoid injection
         schema_exists = self._exec_sql(
-            "select 1 from sys.schemas where name=%s", (self.schema,)
+            "select 1 from sys.schemas where name=%(schema)s", dict(schema=self.schema)
         )
         if not schema_exists:
             raise pymssql.InternalError("The schema %s does not exist" % self.schema)
diff --git a/connector_oxigesti/components/deleter.py b/connector_oxigesti/components/deleter.py
index eba9ca2f6..1fe6134a8 100644
--- a/connector_oxigesti/components/deleter.py
+++ b/connector_oxigesti/components/deleter.py
@@ -20,3 +20,40 @@ class OxigestiExportDeleter(AbstractComponent):
     def run(self, external_id):
         adapter = self.component(usage="backend.adapter")
         adapter.delete(external_id)
+
+
+class OxigestiBatchExportDeleter(AbstractComponent):
+    _name = "oxigesti.batch.export.deleter"
+    _inherit = ["base.exporter", "base.oxigesti.connector"]
+
+    def run(self, filters=None):
+        if not filters:
+            filters = []
+        # Run the synchronization
+        record_ids = self.backend_adapter.search(filters)  # canviar per external:ids
+        for record_id in record_ids:
+            self._export_delete_record(record_id)
+
+    def _export_delete_record(self, external_id):
+        raise NotImplementedError
+
+
+class OxigestiDirectBatchExportDeleter(AbstractComponent):
+    _name = "oxigesti.direct.batch.export.deleter"
+    _inherit = "oxigesti.batch.export.deleter"
+
+    _usage = "direct.batch.export.deleter"
+
+    def _export_delete_record(self, relation):
+        self.model.export_delete_record(self.backend_record, relation)
+
+
+class OxigestiDelayedBatchExportDeleter(AbstractComponent):
+    _name = "oxigesti.delayed.batch.export.deleter"
+    _inherit = "oxigesti.batch.export.deleter"
+
+    _usage = "delayed.batch.export.deleter"
+
+    def _export_delete_record(self, external_id, job_options=None):
+        delayable = self.model.with_delay(**job_options or {})
+        delayable.export_delete_record(self.backend_record, external_id)
diff --git a/connector_oxigesti/components_custom/binder.py b/connector_oxigesti/components_custom/binder.py
index face852b6..73b82f4f1 100644
--- a/connector_oxigesti/components_custom/binder.py
+++ b/connector_oxigesti/components_custom/binder.py
@@ -258,3 +258,6 @@ def to_json(self, value):
         return {
             self._external_field: value,
         }
+
+    def _get_internal_record_domain(self, values):
+        return [(k, "=", v) for k, v in values.items()]
diff --git a/connector_oxigesti/data/queue_job_function_data.xml b/connector_oxigesti/data/queue_job_function_data.xml
index 13142bb1e..49ef310ad 100644
--- a/connector_oxigesti/data/queue_job_function_data.xml
+++ b/connector_oxigesti/data/queue_job_function_data.xml
@@ -210,14 +210,26 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)-->
         <field name="retry_pattern" eval="{1: 10, 5: 30, 10: 60, 15: 300}" />
     </record>
     <record
-        id="oxigesti_product_pricelist_item_export_deleter_record_job_function"
+        id="oxigesti_product_pricelist_item_export_delete_record_job_function"
         model="queue.job.function"
     >
         <field
             name="model_id"
             ref="connector_oxigesti.model_oxigesti_product_pricelist_item"
         />
-        <field name="method">export_deleter_record</field>
+        <field name="method">export_delete_record</field>
+        <field name="channel_id" ref="connector_oxigesti.channel_oxigesti" />
+        <field name="retry_pattern" eval="{1: 10, 5: 30, 10: 60, 15: 300}" />
+    </record>
+    <record
+        id="oxigesti_product_pricelist_item_export_delete_batch_job_function"
+        model="queue.job.function"
+    >
+        <field
+            name="model_id"
+            ref="connector_oxigesti.model_oxigesti_product_pricelist_item"
+        />
+        <field name="method">export_delete_batch</field>
         <field name="channel_id" ref="connector_oxigesti.channel_oxigesti" />
         <field name="retry_pattern" eval="{1: 10, 5: 30, 10: 60, 15: 300}" />
     </record>
diff --git a/connector_oxigesti/models/__init__.py b/connector_oxigesti/models/__init__.py
index b7a2420df..d6fe1628f 100644
--- a/connector_oxigesti/models/__init__.py
+++ b/connector_oxigesti/models/__init__.py
@@ -1,9 +1,11 @@
 from . import oxigesti_binding
 from . import oxigesti_backend
 from . import res_partner
+from . import product_template
 from . import product_product
 from . import product_category
 from . import product_buyerinfo
+from . import product_pricelist
 from . import product_pricelist_item
 from . import stock_production_lot
 from . import sale_order_line
diff --git a/connector_oxigesti/models/oxigesti_binding/common.py b/connector_oxigesti/models/oxigesti_binding/common.py
index df22f7b35..84aadcf53 100644
--- a/connector_oxigesti/models/oxigesti_binding/common.py
+++ b/connector_oxigesti/models/oxigesti_binding/common.py
@@ -215,7 +215,7 @@ def export_record(self, backend, relation):
             return exporter.run(relation)
 
     @api.model
-    def export_deleter_record(self, backend, external_id):
+    def export_delete_record(self, backend, external_id):
         """Deleter Oxigesti record"""
         if not external_id:
             raise ValidationError(_("The external_id of the binding is null"))
@@ -225,6 +225,39 @@ def export_deleter_record(self, backend, external_id):
             deleter.run(external_id)
 
     @api.model
-    def import_deleter_record(self, backend, relation):
+    def import_delete_record(self, backend, relation):
         """Deleter Odoo record"""
         raise NotImplementedError
+
+    @api.model
+    def export_delete_batch(self, backend, filters=None):
+        """Prepare the batch export of records modified on Odoo"""
+        if not filters:
+            filters = []
+        # Prepare the batch export of records modified on Odoo
+        with backend.work_on(self._name) as work:
+            exporter = work.component(usage="delayed.batch.export.deleter")
+            return exporter.run(filters=filters)
+
+    @api.model
+    def import_delete_batch(self, backend, filters=None):
+        """Prepare the batch import of records modified on Oxigesti"""
+        raise NotImplementedError
+
+    def get_external_ids_domain(self):
+        clause = []
+        for bind in self:
+            with bind.backend_id.work_on(bind._name) as work:
+                binder = work.component(usage="binder")
+                external_id = binder.to_external(bind.id)
+                if external_id:
+                    adapter = work.component(usage="backend.adapter")
+                    external_dict = adapter.id2dict(external_id)
+                    clause.append(external_dict)
+        domain = ["|"] * (len(clause) - 1)
+        for c in clause:
+            ext_domain = ["&"] * (len(c) - 1)
+            for k, v in c.items():
+                ext_domain.append((k, "=", v))
+            domain += ext_domain
+        return domain
diff --git a/connector_oxigesti/models/product_pricelist/__init__.py b/connector_oxigesti/models/product_pricelist/__init__.py
index 0fec82e8a..9430369c2 100644
--- a/connector_oxigesti/models/product_pricelist/__init__.py
+++ b/connector_oxigesti/models/product_pricelist/__init__.py
@@ -1 +1 @@
-from . import binding
+from . import listener
diff --git a/connector_oxigesti/models/product_pricelist/listener.py b/connector_oxigesti/models/product_pricelist/listener.py
new file mode 100644
index 000000000..0f7ccbe87
--- /dev/null
+++ b/connector_oxigesti/models/product_pricelist/listener.py
@@ -0,0 +1,18 @@
+# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+from odoo.addons.component.core import Component
+
+
+class ProductPricelistItemListener(Component):
+    _name = "oxigesti.product.pricelist.listener"
+    _inherit = "oxigesti.event.listener"
+
+    _apply_on = "product.pricelist"
+
+    def on_record_unlink(self, relation):
+        bindings = relation.sudo().item_ids.oxigesti_bind_ids
+        domain = bindings.get_external_ids_domain()
+        self.env["oxigesti.product.pricelist.item"].with_delay().export_delete_batch(
+            bindings.backend_id, filters=domain
+        )
diff --git a/connector_oxigesti/models/product_pricelist_item/binding.py b/connector_oxigesti/models/product_pricelist_item/binding.py
index 6fa6d37a1..a661f330b 100644
--- a/connector_oxigesti/models/product_pricelist_item/binding.py
+++ b/connector_oxigesti/models/product_pricelist_item/binding.py
@@ -51,20 +51,6 @@ def is_deprecated(self, partner):
             or not self.product_tmpl_id.active
         )
 
-    def unlink(self):
-        to_remove = {}
-        for record in self:
-            for binding in record.oxigesti_bind_ids:
-                with binding.backend_id.work_on(binding._name) as work:
-                    binder = work.component(usage="binder")
-                    to_remove.setdefault(record.id, []).append(
-                        (binding.backend_id, binder.to_external(binding))
-                    )
-        result = super(ProductPricelistItem, self).unlink()
-        for bindings_data in to_remove.values():
-            self._event("on_record_post_unlink").notify(bindings_data)
-        return result
-
 
 class ProductPricelistItemBinding(models.Model):
     _name = "oxigesti.product.pricelist.item"
diff --git a/connector_oxigesti/models/product_pricelist_item/deleter.py b/connector_oxigesti/models/product_pricelist_item/deleter.py
index ae59e0405..b6768456b 100644
--- a/connector_oxigesti/models/product_pricelist_item/deleter.py
+++ b/connector_oxigesti/models/product_pricelist_item/deleter.py
@@ -12,7 +12,7 @@
 class OxigestiExportDeleter(Component):
     """Base Export Deleter for Oxigesti"""
 
-    _name = "oxigesti.product.pricelist.item.deleter"
+    _name = "oxigesti.product.pricelist.item.export.deleter"
     _inherit = "oxigesti.export.deleter"
 
     _apply_on = "oxigesti.product.pricelist.item"
@@ -20,3 +20,10 @@ class OxigestiExportDeleter(Component):
     def run(self, external_id):
         adapter = self.component(usage="backend.adapter")
         adapter.write(external_id, {"deprecated": True})
+
+
+class OxigestiDelayedBatchExportDeleter(Component):
+    _name = "oxigesti.product.pricelist.item.delayed.batch.export.deleter"
+    _inherit = "oxigesti.delayed.batch.export.deleter"
+
+    _apply_on = "oxigesti.product.pricelist.item"
diff --git a/connector_oxigesti/models/product_pricelist_item/listener.py b/connector_oxigesti/models/product_pricelist_item/listener.py
index 25deca103..c1eb1f4c2 100644
--- a/connector_oxigesti/models/product_pricelist_item/listener.py
+++ b/connector_oxigesti/models/product_pricelist_item/listener.py
@@ -9,9 +9,9 @@ class ProductPricelistItemListener(Component):
 
     _apply_on = "product.pricelist.item"
 
-    def on_record_post_unlink(self, backend_external):
-        for backend, external_id in backend_external:
-            binding_name = self.model.oxigesti_bind_ids._name
-            self.env[binding_name].with_delay().export_deleter_record(
-                backend, external_id
-            )
+    def on_record_unlink(self, relation):
+        bindings = relation.sudo().oxigesti_bind_ids
+        domain = bindings.get_external_ids_domain()
+        self.env["oxigesti.product.pricelist.item"].with_delay().export_delete_batch(
+            bindings.backend_id, filters=domain
+        )
diff --git a/connector_oxigesti/models/product_template/__init__.py b/connector_oxigesti/models/product_template/__init__.py
index 0fec82e8a..9430369c2 100644
--- a/connector_oxigesti/models/product_template/__init__.py
+++ b/connector_oxigesti/models/product_template/__init__.py
@@ -1 +1 @@
-from . import binding
+from . import listener
diff --git a/connector_oxigesti/models/product_template/binding.py b/connector_oxigesti/models/product_template/binding.py
deleted file mode 100644
index fad4e4aed..000000000
--- a/connector_oxigesti/models/product_template/binding.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
-# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-
-from odoo import models
-
-
-class ProductTemplate(models.Model):
-    _inherit = "product.template"
-
-    def unlink(self):
-        res = super().unlink()
-        for rec in self:
-            item = (
-                self.env["product.pricelist.item"]
-                .search(
-                    [
-                        ("product_tmpl_id", "=", rec.id),
-                        ("oxigesti_bind_ids", "!=", False),
-                    ]
-                )
-                .filtered(lambda x: not all(x.oxigesti_bind_ids.mapped("deprecated")))
-            )
-            if item:
-                item.unlink()
-        return res
diff --git a/connector_oxigesti/models/product_template/listener.py b/connector_oxigesti/models/product_template/listener.py
new file mode 100644
index 000000000..9a8035842
--- /dev/null
+++ b/connector_oxigesti/models/product_template/listener.py
@@ -0,0 +1,18 @@
+# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+from odoo.addons.component.core import Component
+
+
+class ProductPricelistItemListener(Component):
+    _name = "oxigesti.product.template.listener"
+    _inherit = "oxigesti.event.listener"
+
+    _apply_on = "product.template"
+
+    def on_record_unlink(self, relation):
+        bindings = relation.sudo().product_variant_ids.oxigesti_bind_ids
+        domain = bindings.get_external_ids_domain()
+        self.env["oxigesti.product.pricelist.item"].with_delay().export_delete_batch(
+            bindings.backend_id, filters=domain
+        )
diff --git a/connector_oxigesti/models/res_partner/__init__.py b/connector_oxigesti/models/res_partner/__init__.py
index 3e96d846c..87d8b1370 100644
--- a/connector_oxigesti/models/res_partner/__init__.py
+++ b/connector_oxigesti/models/res_partner/__init__.py
@@ -5,3 +5,4 @@
 from . import import_mapper
 from . import binder
 from . import binding
+from . import listener
diff --git a/connector_oxigesti/models/res_partner/binding.py b/connector_oxigesti/models/res_partner/binding.py
index 5095e1ab8..6df54bc3c 100644
--- a/connector_oxigesti/models/res_partner/binding.py
+++ b/connector_oxigesti/models/res_partner/binding.py
@@ -14,14 +14,6 @@ class ResPartner(models.Model):
         string="Oxigesti Bindings",
     )
 
-    def unlink(self):
-        for rec in self:
-            for item in rec.property_product_pricelist.item_ids.filtered(
-                lambda x: x.oxigesti_bind_ids
-            ):
-                item.unlink()
-        return super().unlink()
-
 
 class ResPartnerBinding(models.Model):
     _name = "oxigesti.res.partner"
diff --git a/connector_oxigesti/models/res_partner/listener.py b/connector_oxigesti/models/res_partner/listener.py
new file mode 100644
index 000000000..558997095
--- /dev/null
+++ b/connector_oxigesti/models/res_partner/listener.py
@@ -0,0 +1,22 @@
+# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+from odoo.addons.component.core import Component
+
+
+class ProductPricelistItemListener(Component):
+    _name = "oxigesti.res.partner.listener"
+    _inherit = "oxigesti.event.listener"
+
+    _apply_on = "res.partner"
+
+    def on_record_unlink(self, relation):
+        bindings = (
+            relation.sudo()
+            .property_product_pricelist.item_ids.filtered(lambda x: x.oxigesti_bind_ids)
+            .oxigesti_bind_ids
+        )
+        domain = bindings.get_external_ids_domain()
+        self.env["oxigesti.product.pricelist.item"].with_delay().export_delete_batch(
+            bindings.backend_id, filters=domain
+        )

From 6308abeef1d73e27fd7fc0f1c9ad08a6099c6f29 Mon Sep 17 00:00:00 2001
From: FrankC013 <fcespedes@nuobit.com>
Date: Tue, 6 Feb 2024 11:59:51 +0100
Subject: [PATCH 6/8] [REF] connector_oxigesti: commit reviews

---
 connector_oxigesti/common/tools.py            |  90 +++++++++++++++
 connector_oxigesti/components/adapter.py      | 107 +-----------------
 connector_oxigesti/components/deleter.py      |   8 +-
 .../models/oxigesti_binding/common.py         |  51 +++++----
 .../models/product_pricelist/binding.py       |  15 ---
 .../models/product_pricelist/listener.py      |   8 +-
 .../models/product_pricelist_item/listener.py |   6 +-
 .../models/product_template/listener.py       |  12 +-
 .../models/res_partner/listener.py            |  10 +-
 9 files changed, 146 insertions(+), 161 deletions(-)
 create mode 100644 connector_oxigesti/common/tools.py
 delete mode 100644 connector_oxigesti/models/product_pricelist/binding.py

diff --git a/connector_oxigesti/common/tools.py b/connector_oxigesti/common/tools.py
new file mode 100644
index 000000000..edb439ef0
--- /dev/null
+++ b/connector_oxigesti/common/tools.py
@@ -0,0 +1,90 @@
+# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
+# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
+
+from odoo import _
+from odoo.exceptions import ValidationError
+from odoo.osv.expression import normalize_domain
+
+OP_MAP = {
+    "&": "AND",
+    "|": "OR",
+    "!": "NOT",
+}
+
+
+def domain_prefix_to_infix(domain):
+    stack = []
+    i = len(domain) - 1
+    while i >= 0:
+        item = domain[i]
+        if item in OP_MAP:
+            if item == "!":
+                stack.append((item, stack.pop()))
+            else:
+                stack.append((stack.pop(), item, stack.pop()))
+        else:
+            if not isinstance(item, (tuple, list)):
+                raise ValidationError(_("Unexpected domain clause %s") % item)
+            stack.append(item)
+        i -= 1
+    return stack.pop()
+
+
+def domain_infix_to_where(domain):
+    def _convert_operator(operator, value):
+        if value is None:
+            if operator == "=":
+                operator = "is"
+            elif operator == "!=":
+                operator = "is not"
+            else:
+                raise ValidationError(
+                    _("Operator '%s' is not implemented on NULL values") % operator
+                )
+        return operator
+
+    def _domain_infix_to_where_raw(domain, values):
+        if not isinstance(domain, (list, tuple)):
+            raise ValidationError(_("Invalid domain format %s") % domain)
+        if len(domain) == 2:
+            operator, expr = domain
+            if operator not in OP_MAP:
+                raise ValidationError(
+                    _("Invalid format, operator not supported %s on domain %s")
+                    % (operator, domain)
+                )
+            values_r, right = _domain_infix_to_where_raw(expr, values)
+            return values_r, f"{OP_MAP[operator]} ({right})"
+        elif len(domain) == 3:
+            expr_l, operator, expr_r = domain
+            if operator in OP_MAP:
+                values_l, left = _domain_infix_to_where_raw(expr_l, values)
+                values_r, right = _domain_infix_to_where_raw(expr_r, values)
+                return {**values_l, **values_r}, f"({left} {OP_MAP[operator]} {right})"
+            field, operator, value = domain
+            # field and values
+            if field not in values:
+                values[field] = {"next": 1, "values": {}}
+            field_n = f"{field}{values[field]['next']}"
+            if field_n in values[field]["values"]:
+                raise ValidationError(_("Unexpected!! Field %s already used") % field)
+            values[field]["values"][field_n] = value
+            values[field]["next"] += 1
+            # operator and nulls values
+            operator = _convert_operator(operator, value)
+            return values, f"{field} {operator} %({field_n})s"
+        else:
+            raise ValidationError(_("Invalid domain format %s") % domain)
+
+    values, where = _domain_infix_to_where_raw(domain, {})
+    values_norm = {}
+    for _k, v in values.items():
+        values_norm.update(v["values"])
+    return values_norm, where
+
+
+def domain_to_where(domain):
+    domain_norm = normalize_domain(domain)
+    domain_infix = domain_prefix_to_infix(domain_norm)
+    return domain_infix_to_where(domain_infix)
diff --git a/connector_oxigesti/components/adapter.py b/connector_oxigesti/components/adapter.py
index be990cce4..2efb8d316 100644
--- a/connector_oxigesti/components/adapter.py
+++ b/connector_oxigesti/components/adapter.py
@@ -15,11 +15,12 @@
 
 from odoo import _, exceptions
 from odoo.exceptions import ValidationError
-from odoo.osv.expression import normalize_domain
 
 from odoo.addons.component.core import AbstractComponent
 from odoo.addons.connector.exception import NetworkRetryableError
 
+from ..common.tools import domain_to_where
+
 try:
     import pymssql
 except ImportError:
@@ -63,80 +64,6 @@ def api_handle_errors(message=""):
         )
 
 
-def domain_to_where(domain):
-    OP_MAP = {
-        "&": "AND",
-        "|": "OR",
-        "!": "NOT",
-    }
-
-    def domain_prefix_to_infix(domain):
-        stack = []
-        i = len(domain) - 1
-        while i >= 0:
-            item = domain[i]
-            if item in OP_MAP:
-                if item == "!":
-                    stack.append((item, stack.pop()))
-                else:
-                    stack.append((stack.pop(), item, stack.pop()))
-            else:
-                if not isinstance(item, (tuple, list)):
-                    raise ValidationError(_("Unexpected domain clause %s") % item)
-                stack.append(item)
-            i -= 1
-        return stack.pop()
-
-    def domain_infix_to_where_raw(domain, values):
-        if not isinstance(domain, (list, tuple)):
-            raise ValidationError(_("Invalid domain format %s") % domain)
-        if len(domain) == 2:
-            operator, expr = domain
-            if operator not in OP_MAP:
-                raise ValidationError(
-                    _("Invalid format, operator not supported %s on domain %s")
-                    % (operator, domain)
-                )
-            values_r, right = domain_infix_to_where_raw(expr, values)
-            return values_r, f"{OP_MAP[operator]} ({right})"
-        elif len(domain) == 3:
-            expr_l, operator, expr_r = domain
-            if operator in OP_MAP:
-                values_l, left = domain_infix_to_where_raw(expr_l, values)
-                values_r, right = domain_infix_to_where_raw(expr_r, values)
-                return {**values_l, **values_r}, f"({left} {OP_MAP[operator]} {right})"
-            field, operator, value = domain
-            # field and values
-            if field not in values:
-                values[field] = {"next": 1, "values": {}}
-            field_n = f"{field}{values[field]['next']}"
-            if field_n in values[field]["values"]:
-                raise ValidationError(_("Unexpected!! Field %s already used") % field)
-            values[field]["values"][field_n] = value
-            values[field]["next"] += 1
-            # operator and nulls values
-            if value is None:
-                if operator == "=":
-                    operator = "is"
-                elif operator == "!=":
-                    operator = "is not"
-                else:
-                    raise ValidationError(
-                        _("Operator '%s' is not implemented on NULL values") % operator
-                    )
-            return values, f"{field} {operator} %({field_n})s"
-        else:
-            raise ValidationError(_("Invalid domain format %s") % domain)
-
-    domain_norm = normalize_domain(domain)
-    domain_infix = domain_prefix_to_infix(domain_norm)
-    values, where = domain_infix_to_where_raw(domain_infix, {})
-    values_norm = {}
-    for _k, v in values.items():
-        values_norm.update(v["values"])
-    return values_norm, where
-
-
 class CRUDAdapter(AbstractComponent):
     """External Records Adapter for Oxigesti"""
 
@@ -277,21 +204,6 @@ def _exec_query(self, filters=None, fields=None, as_dict=True):
 
             if filters:
                 values, where = domain_to_where(filters)
-                # where = []
-                # for k, operator, v in filters:
-                #     if v is None:
-                #         if operator == "=":
-                #             operator = "is"
-                #         elif operator == "!=":
-                #             operator = "is not"
-                #         else:
-                #             raise Exception(
-                #                 "Operator '%s' is not implemented on NULL values"
-                #                 % operator
-                #             )
-                #
-                #     where.append("%s %s %%s" % (k, operator))
-                #     values.append(v)
                 sql_l.append("where %s" % where)
 
             sql = " ".join(sql_l)
@@ -439,16 +351,10 @@ def create(self, values_d):  # pylint: disable=W8106
             raise pymssql.InternalError("The schema %s does not exist" % self.schema)
 
         # build the sql parts
-        fields, params, phvalues = [], [], []
-        for k, v in values_d.items():
+        fields, phvalues = [], []
+        for k in values_d.keys():
             fields.append(k)
-            params.append(v)
-            if v is None or isinstance(v, (str, datetime.date, datetime.datetime)):
-                phvalues.append("%s")
-            elif isinstance(v, (int, float)):
-                phvalues.append("%d")
-            else:
-                raise NotImplementedError("Type %s" % type(v))
+            phvalues.append(f"%({k})s")
 
         # build retvalues
         retvalues = ["inserted.%s" % x for x in self._id]
@@ -462,9 +368,8 @@ def create(self, values_d):  # pylint: disable=W8106
         )
 
         # executem la insercio
-        res = None
         try:
-            res = self._exec_sql(sql, tuple(params), commit=True)
+            res = self._exec_sql(sql, values_d, commit=True)
         except pymssql.IntegrityError as e:
             # Workaround: Because of Microsoft SQL Server
             # removes the spaces on varchars on comparisions
diff --git a/connector_oxigesti/components/deleter.py b/connector_oxigesti/components/deleter.py
index 1fe6134a8..28991bc49 100644
--- a/connector_oxigesti/components/deleter.py
+++ b/connector_oxigesti/components/deleter.py
@@ -26,11 +26,11 @@ class OxigestiBatchExportDeleter(AbstractComponent):
     _name = "oxigesti.batch.export.deleter"
     _inherit = ["base.exporter", "base.oxigesti.connector"]
 
-    def run(self, filters=None):
-        if not filters:
-            filters = []
+    def run(self, domain=None):
+        if not domain:
+            domain = []
         # Run the synchronization
-        record_ids = self.backend_adapter.search(filters)  # canviar per external:ids
+        record_ids = self.backend_adapter.search(domain)  # canviar per external:ids
         for record_id in record_ids:
             self._export_delete_record(record_id)
 
diff --git a/connector_oxigesti/models/oxigesti_binding/common.py b/connector_oxigesti/models/oxigesti_binding/common.py
index 84aadcf53..a73c4bc33 100644
--- a/connector_oxigesti/models/oxigesti_binding/common.py
+++ b/connector_oxigesti/models/oxigesti_binding/common.py
@@ -151,6 +151,29 @@ def _compute_external_id_hash(self):
         ),
     ]
 
+    def get_external_ids_domain_by_backend(self):
+        ext_ids_by_backend = {}
+        for rec in self:
+            with rec.backend_id.work_on(rec._name) as work:
+                binder = work.component(usage="binder")
+                external_id = binder.to_external(rec.id)
+                if external_id:
+                    adapter = work.component(usage="backend.adapter")
+                    external_dict = adapter.id2dict(external_id)
+                    ext_ids_by_backend.setdefault(rec.backend_id, []).append(
+                        external_dict
+                    )
+        res = {}
+        for backend, external_dicts in ext_ids_by_backend.items():
+            domain = ["|"] * (len(external_dicts) - 1)
+            for external_dict in external_dicts:
+                ext_domain = ["&"] * (len(external_dict) - 1)
+                for k, v in external_dict.items():
+                    ext_domain.append((k, "=", v))
+                domain += ext_domain
+            res[backend] = domain
+        return res
+
     @api.model
     def import_data(self, backend, since_date):
         """Default method, it should be overridden by subclasses"""
@@ -230,34 +253,16 @@ def import_delete_record(self, backend, relation):
         raise NotImplementedError
 
     @api.model
-    def export_delete_batch(self, backend, filters=None):
+    def export_delete_batch(self, backend, domain=None):
         """Prepare the batch export of records modified on Odoo"""
-        if not filters:
-            filters = []
+        if not domain:
+            domain = []
         # Prepare the batch export of records modified on Odoo
         with backend.work_on(self._name) as work:
             exporter = work.component(usage="delayed.batch.export.deleter")
-            return exporter.run(filters=filters)
+            return exporter.run(domain=domain)
 
     @api.model
-    def import_delete_batch(self, backend, filters=None):
+    def import_delete_batch(self, backend, domain=None):
         """Prepare the batch import of records modified on Oxigesti"""
         raise NotImplementedError
-
-    def get_external_ids_domain(self):
-        clause = []
-        for bind in self:
-            with bind.backend_id.work_on(bind._name) as work:
-                binder = work.component(usage="binder")
-                external_id = binder.to_external(bind.id)
-                if external_id:
-                    adapter = work.component(usage="backend.adapter")
-                    external_dict = adapter.id2dict(external_id)
-                    clause.append(external_dict)
-        domain = ["|"] * (len(clause) - 1)
-        for c in clause:
-            ext_domain = ["&"] * (len(c) - 1)
-            for k, v in c.items():
-                ext_domain.append((k, "=", v))
-            domain += ext_domain
-        return domain
diff --git a/connector_oxigesti/models/product_pricelist/binding.py b/connector_oxigesti/models/product_pricelist/binding.py
deleted file mode 100644
index dd003bcfe..000000000
--- a/connector_oxigesti/models/product_pricelist/binding.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
-# Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-
-from odoo import models
-
-
-class Pricelist(models.Model):
-    _inherit = "product.pricelist"
-
-    def unlink(self):
-        for rec in self:
-            for item in rec.item_ids.filtered(lambda x: x.oxigesti_bind_ids):
-                item.unlink()
-        return super().unlink()
diff --git a/connector_oxigesti/models/product_pricelist/listener.py b/connector_oxigesti/models/product_pricelist/listener.py
index 0f7ccbe87..b5a478a5f 100644
--- a/connector_oxigesti/models/product_pricelist/listener.py
+++ b/connector_oxigesti/models/product_pricelist/listener.py
@@ -11,8 +11,8 @@ class ProductPricelistItemListener(Component):
     _apply_on = "product.pricelist"
 
     def on_record_unlink(self, relation):
-        bindings = relation.sudo().item_ids.oxigesti_bind_ids
-        domain = bindings.get_external_ids_domain()
-        self.env["oxigesti.product.pricelist.item"].with_delay().export_delete_batch(
-            bindings.backend_id, filters=domain
+        bindings = (
+            relation.sudo().with_context(active_test=False).item_ids.oxigesti_bind_ids
         )
+        for backend, domain in bindings.get_external_ids_domain_by_backend().items():
+            bindings.with_delay().export_delete_batch(backend, domain=domain)
diff --git a/connector_oxigesti/models/product_pricelist_item/listener.py b/connector_oxigesti/models/product_pricelist_item/listener.py
index c1eb1f4c2..58607e54c 100644
--- a/connector_oxigesti/models/product_pricelist_item/listener.py
+++ b/connector_oxigesti/models/product_pricelist_item/listener.py
@@ -11,7 +11,5 @@ class ProductPricelistItemListener(Component):
 
     def on_record_unlink(self, relation):
         bindings = relation.sudo().oxigesti_bind_ids
-        domain = bindings.get_external_ids_domain()
-        self.env["oxigesti.product.pricelist.item"].with_delay().export_delete_batch(
-            bindings.backend_id, filters=domain
-        )
+        for backend, domain in bindings.get_external_ids_domain_by_backend().items():
+            bindings.with_delay().export_delete_batch(backend, domain=domain)
diff --git a/connector_oxigesti/models/product_template/listener.py b/connector_oxigesti/models/product_template/listener.py
index 9a8035842..9ad1dd934 100644
--- a/connector_oxigesti/models/product_template/listener.py
+++ b/connector_oxigesti/models/product_template/listener.py
@@ -11,8 +11,12 @@ class ProductPricelistItemListener(Component):
     _apply_on = "product.template"
 
     def on_record_unlink(self, relation):
-        bindings = relation.sudo().product_variant_ids.oxigesti_bind_ids
-        domain = bindings.get_external_ids_domain()
-        self.env["oxigesti.product.pricelist.item"].with_delay().export_delete_batch(
-            bindings.backend_id, filters=domain
+        bindings = (
+            relation.sudo()
+            .with_context(active_test=False)
+            .product_variant_ids.oxigesti_bind_ids
         )
+        for backend, domain in bindings.get_external_ids_domain_by_backend().items():
+            self.env[
+                "oxigesti.product.pricelist.item"
+            ].with_delay().export_delete_batch(backend, domain)
diff --git a/connector_oxigesti/models/res_partner/listener.py b/connector_oxigesti/models/res_partner/listener.py
index 558997095..339292c15 100644
--- a/connector_oxigesti/models/res_partner/listener.py
+++ b/connector_oxigesti/models/res_partner/listener.py
@@ -13,10 +13,8 @@ class ProductPricelistItemListener(Component):
     def on_record_unlink(self, relation):
         bindings = (
             relation.sudo()
-            .property_product_pricelist.item_ids.filtered(lambda x: x.oxigesti_bind_ids)
-            .oxigesti_bind_ids
-        )
-        domain = bindings.get_external_ids_domain()
-        self.env["oxigesti.product.pricelist.item"].with_delay().export_delete_batch(
-            bindings.backend_id, filters=domain
+            .with_context(active_test=False)
+            .property_product_pricelist.item_ids.oxigesti_bind_ids
         )
+        for backend, domain in bindings.get_external_ids_domain_by_backend().items():
+            bindings.with_delay().export_delete_batch(backend, domain=domain)

From c48432a72bf1f079330e3a51cae808acf8b48e4a Mon Sep 17 00:00:00 2001
From: FrankC013 <fcespedes@nuobit.com>
Date: Wed, 7 Feb 2024 12:40:41 +0100
Subject: [PATCH 7/8] [IMP] connector_oxigesti: add oxigesti write date to
 compute run logic

---
 connector_oxigesti/common/tools.py            |  22 ++
 connector_oxigesti/components/exporter.py     |   5 +-
 .../components_custom/binder.py               |   6 +-
 .../models/oxigesti_binding/common.py         |  29 +--
 .../models/product_buyerinfo/binder.py        |  11 +-
 .../models/product_category/binder.py         |  12 +-
 .../models/product_pricelist_item/binder.py   |   9 +-
 .../models/product_pricelist_item/binding.py  | 104 ++++++--
 .../product_pricelist_item/export_mapper.py   |   8 +-
 .../models/product_pricelist_item/exporter.py | 241 ++++++++++++------
 .../models/product_product/binder.py          |   9 +-
 .../models/stock_production_lot/binder.py     |  11 +-
 12 files changed, 294 insertions(+), 173 deletions(-)

diff --git a/connector_oxigesti/common/tools.py b/connector_oxigesti/common/tools.py
index edb439ef0..f06910856 100644
--- a/connector_oxigesti/common/tools.py
+++ b/connector_oxigesti/common/tools.py
@@ -1,6 +1,7 @@
 # Copyright NuoBiT Solutions - Eric Antones <eantones@nuobit.com>
 # Copyright NuoBiT Solutions - Frank Cespedes <fcespedes@nuobit.com>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
+import hashlib
 
 from odoo import _
 from odoo.exceptions import ValidationError
@@ -88,3 +89,24 @@ def domain_to_where(domain):
     domain_norm = normalize_domain(domain)
     domain_infix = domain_prefix_to_infix(domain_norm)
     return domain_infix_to_where(domain_infix)
+
+
+def idhash(external_id):
+    if not isinstance(external_id, (tuple, list)):
+        raise ValidationError(_("external id must be list or tuple"))
+    external_id_hash = hashlib.sha256()
+    for e in external_id:
+        if isinstance(e, int):
+            e9 = str(e)
+            if int(e9) != e:
+                raise Exception("Unexpected")
+        elif isinstance(e, str):
+            e9 = e
+        elif e is None:
+            pass
+        else:
+            raise Exception("Unexpected type for a key: type %s" % type(e))
+
+        external_id_hash.update(e9.encode("utf8"))
+
+    return external_id_hash.hexdigest()
diff --git a/connector_oxigesti/components/exporter.py b/connector_oxigesti/components/exporter.py
index 026ab8ef6..8ef56ff95 100644
--- a/connector_oxigesti/components/exporter.py
+++ b/connector_oxigesti/components/exporter.py
@@ -88,7 +88,10 @@ def _run(self, fields=None):
 
         # link if already exists on backend
         if not self.external_id:
-            computed_external_id = self.binder._get_external_id(self.binding)
+            extra_vals = {x: self.binding[x] for x in self.binder._odoo_extra_fields}
+            computed_external_id = self.binder._get_external_id(
+                self.binding.odoo_id, extra_vals=extra_vals
+            )
             if computed_external_id:
                 external_record = self.backend_adapter.read(computed_external_id)
                 if external_record:
diff --git a/connector_oxigesti/components_custom/binder.py b/connector_oxigesti/components_custom/binder.py
index 73b82f4f1..3ea5da9ac 100644
--- a/connector_oxigesti/components_custom/binder.py
+++ b/connector_oxigesti/components_custom/binder.py
@@ -75,7 +75,7 @@ def _is_binding(self, binding):
 
         return True
 
-    def _find_binding(self, relation, binding_extra_vals=None):
+    def _find_binding(self, relation, binding_extra_vals=None, unique=True):
         if not binding_extra_vals:
             binding_extra_vals = {}
 
@@ -98,7 +98,7 @@ def _find_binding(self, relation, binding_extra_vals=None):
             domain.append((f, "=", binding_extra_vals[f]))
         binding = self.model.with_context(active_test=False).search(domain)
 
-        if binding:
+        if binding and unique:
             binding.ensure_one()
 
         return binding
@@ -251,7 +251,7 @@ def bind(self, external_id, binding):
             }
         )
 
-    def _get_external_id(self, binding):
+    def _get_external_id(self, relation, extra_vals=None):
         return None
 
     def to_json(self, value):
diff --git a/connector_oxigesti/models/oxigesti_binding/common.py b/connector_oxigesti/models/oxigesti_binding/common.py
index a73c4bc33..ff37a9f59 100644
--- a/connector_oxigesti/models/oxigesti_binding/common.py
+++ b/connector_oxigesti/models/oxigesti_binding/common.py
@@ -2,32 +2,12 @@
 # Copyright NuoBiT Solutions - Kilian Niubo <kniubo@nuobit.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
-import hashlib
 import json
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
-
-def idhash(external_id):
-    if not isinstance(external_id, (tuple, list)):
-        raise ValidationError(_("external id must be list or tuple"))
-    external_id_hash = hashlib.sha256()
-    for e in external_id:
-        if isinstance(e, int):
-            e9 = str(e)
-            if int(e9) != e:
-                raise Exception("Unexpected")
-        elif isinstance(e, str):
-            e9 = e
-        elif e is None:
-            pass
-        else:
-            raise Exception("Unexpected type for a key: type %s" % type(e))
-
-        external_id_hash.update(e9.encode("utf8"))
-
-    return external_id_hash.hexdigest()
+from ...common.tools import idhash
 
 
 class OxigestiBinding(models.AbstractModel):
@@ -35,7 +15,7 @@ class OxigestiBinding(models.AbstractModel):
     _inherit = "external.binding"
     _description = "oxigesti Binding (abstract)"
 
-    active = fields.Boolean(default=True)
+    # active = fields.Boolean(default=True)
 
     backend_id = fields.Many2one(
         comodel_name="oxigesti.backend",
@@ -94,7 +74,10 @@ def _compute_external_id_hash(self):
             if other:
                 with other.backend_id.work_on(other._name) as work:
                     binder = work.component(usage="binder")
-                other_computed_external_id = binder._get_external_id(other)
+                extra_vals = {x: other[x] for x in binder._odoo_extra_fields}
+                other_computed_external_id = binder._get_external_id(
+                    other, extra_vals=extra_vals
+                )
                 other_computed_external_id_hash = (
                     other_computed_external_id
                     and idhash(other_computed_external_id)
diff --git a/connector_oxigesti/models/product_buyerinfo/binder.py b/connector_oxigesti/models/product_buyerinfo/binder.py
index e3cd1fb83..d9b2b6af5 100644
--- a/connector_oxigesti/models/product_buyerinfo/binder.py
+++ b/connector_oxigesti/models/product_buyerinfo/binder.py
@@ -10,21 +10,16 @@ class ProductBuyerinfoBinder(Component):
 
     _apply_on = "oxigesti.product.buyerinfo"
 
-    def _get_external_id(self, binding):
-        if not self._is_binding(binding):
-            raise Exception("The source object %s must be a binding" % binding._name)
-
+    def _get_external_id(self, relation, extra_vals=None):
         partner_adapter = self.component(
             usage="backend.adapter", model_name="oxigesti.res.partner"
         )
         partner_binder = self.binder_for("oxigesti.res.partner")
-        partner_external_id = partner_binder.to_external(
-            binding.odoo_id.partner_id, wrap=True
-        )
+        partner_external_id = partner_binder.to_external(relation.partner_id, wrap=True)
 
         external_id = None
         if partner_external_id:
-            codigo_articulo = binding.odoo_id.product_id.default_code
+            codigo_articulo = relation.product_id.default_code
             codigo_mutua = partner_adapter.id2dict(partner_external_id)["Codigo_Mutua"]
             if codigo_articulo and codigo_mutua:
                 external_id = [codigo_articulo, codigo_mutua]
diff --git a/connector_oxigesti/models/product_category/binder.py b/connector_oxigesti/models/product_category/binder.py
index 356badd05..2363fb61f 100644
--- a/connector_oxigesti/models/product_category/binder.py
+++ b/connector_oxigesti/models/product_category/binder.py
@@ -13,22 +13,16 @@ class ProductCategoryBinder(Component):
 
     _apply_on = "oxigesti.product.category"
 
-    def _get_external_id(self, binding):
-        if not self._is_binding(binding):
-            raise Exception("The source object %s must be a binding" % binding._name)
-
+    def _get_external_id(self, relation, extra_vals=None):
         adapter = self.component(
             usage="backend.adapter", model_name="oxigesti.product.category"
         )
-        external_ids = adapter.search([("IdCategoriaOdoo", "=", binding.odoo_id.id)])
+        external_ids = adapter.search([("IdCategoriaOdoo", "=", relation.id)])
         if not external_ids:
             return None
         if len(external_ids) > 1:
             raise ValidationError(
-                _(
-                    "More than one Category with ID '%i' on the backend"
-                    % (binding.odoo_id.id,)
-                )
+                _("More than one Category with ID '%i' on the backend" % (relation.id,))
             )
 
         return external_ids[0]
diff --git a/connector_oxigesti/models/product_pricelist_item/binder.py b/connector_oxigesti/models/product_pricelist_item/binder.py
index 2991e8bc8..c59e53923 100644
--- a/connector_oxigesti/models/product_pricelist_item/binder.py
+++ b/connector_oxigesti/models/product_pricelist_item/binder.py
@@ -12,21 +12,18 @@ class ProductPricelistItemBinder(Component):
 
     _odoo_extra_fields = ["odoo_partner_id"]
 
-    def _get_external_id(self, binding):
-        if not self._is_binding(binding):
-            raise Exception("The source object %s must be a binding" % binding._name)
-
+    def _get_external_id(self, relation, extra_vals=None):
         partner_adapter = self.component(
             usage="backend.adapter", model_name="oxigesti.res.partner"
         )
         partner_binder = self.binder_for("oxigesti.res.partner")
         partner_external_id = partner_binder.to_external(
-            binding.odoo_partner_id, wrap=True
+            extra_vals["odoo_partner_id"], wrap=True, wrapped_model="res.partner"
         )
 
         external_id = None
         if partner_external_id:
-            codigo_articulo = binding.odoo_id.product_tmpl_id.default_code
+            codigo_articulo = relation.product_tmpl_id.default_code
             codigo_mutua = partner_adapter.id2dict(partner_external_id)["Codigo_Mutua"]
             if codigo_articulo and codigo_mutua:
                 external_id = [codigo_articulo, codigo_mutua]
diff --git a/connector_oxigesti/models/product_pricelist_item/binding.py b/connector_oxigesti/models/product_pricelist_item/binding.py
index a661f330b..d1881c2a6 100644
--- a/connector_oxigesti/models/product_pricelist_item/binding.py
+++ b/connector_oxigesti/models/product_pricelist_item/binding.py
@@ -10,45 +10,80 @@
 class ProductPricelistItem(models.Model):
     _inherit = "product.pricelist.item"
 
+    oxigesti_write_date = fields.Datetime(
+        compute="_compute_oxigesti_write_date",
+        store=True,
+    )
+
+    @api.depends(
+        "oxigesti_bind_ids.oxigesti_write_date",
+        "oxigesti_bind_ids.odoo_partner_id.write_date",
+        "compute_price",
+        "applied_on",
+        "fixed_price",
+    )
+    def _compute_oxigesti_write_date(self):
+        for rec in self:
+            date = False
+            for binding in rec.oxigesti_bind_ids:
+                date = max(
+                    rec.mapped("write_date")
+                    + binding.mapped("oxigesti_write_date")
+                    + binding.odoo_partner_id.mapped("write_date")
+                )
+            rec.oxigesti_write_date = date
+
     oxigesti_bind_ids = fields.One2many(
         comodel_name="oxigesti.product.pricelist.item",
         inverse_name="odoo_id",
         string="Oxigesti Bindings",
     )
 
-    @api.constrains("compute_price", "applied_on", "product_tmpl_id")
+    @api.constrains("compute_price", "applied_on")
     def _check_binding(self):
         for rec in self:
             if rec.oxigesti_bind_ids:
-                partners = (
-                    self.env["res.partner"]
-                    .search(
-                        [
-                            ("company_id", "=?", rec.company_id.id),
-                        ]
-                    )
-                    .filtered(
-                        lambda x: x.property_product_pricelist == rec.pricelist_id
+                if rec.compute_price != "fixed":
+                    raise ValidationError(
+                        _(
+                            "You can't change the price calculation method of a "
+                            "pricelist item because they have been exported the "
+                            "product prices by customer to Oxigesti.\nIf you need to "
+                            "change the price calculation method, you can delete the "
+                            "pricelist item and create a new one."
+                        )
                     )
-                )
-                if partners:
+                if rec.applied_on != "1_product":
                     raise ValidationError(
                         _(
-                            "You can't change the product, the price calculation "
-                            "method or the applied on field of a pricelist item "
-                            "because they have been exported the product prices by "
-                            "customer to Oxigesti.\nIf you need to change any of "
-                            "these fields, you can delete the pricelist item and "
+                            "You can't change the applied on field of a pricelist "
+                            "item because they have been exported the product prices "
+                            "by customer to Oxigesti.\nIf you need to change the "
+                            "applied on field, you can delete the pricelist item and "
                             "create a new one."
                         )
                     )
 
+    @api.constrains("product_tmpl_id")
+    def _check_product_tmpl_id(self):
+        for rec in self:
+            if rec.oxigesti_bind_ids:
+                raise ValidationError(
+                    _(
+                        "You can't change the product of a pricelist item "
+                        "because they have been exported the product prices by "
+                        "customer to Oxigesti.\nIf you need to change the product, "
+                        "you can delete the pricelist item and create a new one."
+                    )
+                )
+
     def is_deprecated(self, partner):
         self.ensure_one()
         return (
             partner.property_product_pricelist != self.pricelist_id
             or not self.active
             or not self.product_tmpl_id.active
+            or not partner.active
         )
 
 
@@ -58,6 +93,16 @@ class ProductPricelistItemBinding(models.Model):
     _inherits = {"product.pricelist.item": "odoo_id"}
     _description = "Product pricelist item binding"
 
+    oxigesti_write_date = fields.Datetime(
+        compute="_compute_oxigesti_write_date",
+        store=True,
+    )
+
+    @api.depends("deprecated")
+    def _compute_oxigesti_write_date(self):
+        for rec in self:
+            rec.oxigesti_write_date = rec.write_date
+
     odoo_id = fields.Many2one(
         comodel_name="product.pricelist.item",
         string="Product pricelist item",
@@ -69,6 +114,17 @@ class ProductPricelistItemBinding(models.Model):
         comodel_name="res.partner", string="Partner", required=True, ondelete="cascade"
     )
 
+    odoo_fixed_price = fields.Float(
+        compute="_compute_odoo_fixed_price",
+        store=True,
+    )
+
+    @api.depends("odoo_id.fixed_price")
+    def _compute_odoo_fixed_price(self):
+        for rec in self:
+            if not rec.deprecated:
+                rec.odoo_fixed_price = rec.odoo_id.fixed_price
+
     deprecated = fields.Boolean(
         required=True,
         compute="_compute_deprecated",
@@ -76,7 +132,11 @@ class ProductPricelistItemBinding(models.Model):
     )
 
     @api.depends(
-        "active", "product_tmpl_id.active", "odoo_partner_id.property_product_pricelist"
+        "odoo_id",
+        "odoo_id.active",
+        "product_tmpl_id.active",
+        "odoo_partner_id.property_product_pricelist",
+        "odoo_partner_id.active",
     )
     def _compute_deprecated(self):
         for rec in self:
@@ -97,9 +157,13 @@ def _compute_deprecated(self):
 
     @api.model
     def export_data(self, backend, since_date):
-        domain = [("company_id", "in", (backend.company_id.id, False))]
+        domain = [
+            ("company_id", "in", (backend.company_id.id, False)),
+            ("compute_price", "=", "fixed"),
+            ("applied_on", "=", "1_product"),
+        ]
         if since_date:
-            domain += [("write_date", ">", since_date)]
+            domain += [("oxigesti_write_date", ">", since_date)]
         self.with_delay().export_batch(backend, domain=domain)
 
     def resync(self):
diff --git a/connector_oxigesti/models/product_pricelist_item/export_mapper.py b/connector_oxigesti/models/product_pricelist_item/export_mapper.py
index 2089840c9..85ff9b790 100644
--- a/connector_oxigesti/models/product_pricelist_item/export_mapper.py
+++ b/connector_oxigesti/models/product_pricelist_item/export_mapper.py
@@ -12,10 +12,6 @@ class ProductPricelistItemExportMapper(Component):
 
     _apply_on = "oxigesti.product.pricelist.item"
 
-    direct = [
-        ("fixed_price", "Importe"),
-    ]
-
     @only_create
     @mapping
     def CodigoArticulo(self, record):
@@ -61,6 +57,10 @@ def Codigo_Mutua(self, record):
 
         return {"Codigo_Mutua": external_id[0]}
 
+    @mapping
+    def Importe(self, record):
+        return {"Importe": record.odoo_fixed_price}
+
     @mapping
     def Deprecated(self, record):
         return {"Deprecated": record.deprecated and 1 or 0}
diff --git a/connector_oxigesti/models/product_pricelist_item/exporter.py b/connector_oxigesti/models/product_pricelist_item/exporter.py
index 614627e03..78a350186 100644
--- a/connector_oxigesti/models/product_pricelist_item/exporter.py
+++ b/connector_oxigesti/models/product_pricelist_item/exporter.py
@@ -3,79 +3,78 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 
-from odoo.addons.component.core import AbstractComponent, Component
-
-
-class ProductPricelistItemBatchExporter(AbstractComponent):
-    """Export the Oxigesti Product prices.
-
-    For every product in the list, a delayed job is created.
-    """
-
-    _name = "oxigesti.product.pricelist.item.batch.exporter"
-
-    def run_common(self, domain=None):
-        if not domain:
-            domain = []
-        # Run the batch synchronization
-        parent_domain = domain + [
-            ("is_company", "=", True),
-            ("customer_rank", ">=", 0),
-        ]
-        since_date = None
-        domain = []
-        for e in parent_domain:
-            field, operator, value = e
-            if field == "write_date":
-                since_date = value
-            else:
-                domain.append(e)
-        partner_adapter = self.component(
-            usage="backend.adapter", model_name="oxigesti.res.partner"
-        )
-        partner_binder = self.binder_for("oxigesti.res.partner")
-        binder = self.binder_for(self.model._name)
-        for p in self.env["res.partner"].search(domain):
-            pricelist_items = p.property_product_pricelist.item_ids.filtered(
-                lambda x: (
-                    not since_date
-                    or x.write_date > since_date
-                    or p.write_date > since_date
-                )
-                and x.applied_on == "1_product"
-                and x.compute_price == "fixed"
-                and (
-                    not x.sudo().product_tmpl_id.company_id
-                    or x.sudo().product_tmpl_id.company_id == p.company_id
-                )
-            )
-            if pricelist_items:
-                # create/update binding data
-                partner_external_id = partner_binder.to_external(p, wrap=True)
-                for pl in pricelist_items:
-                    if pl.product_tmpl_id.default_code and partner_external_id:
-                        external_id = [
-                            pl.product_tmpl_id.default_code,
-                            partner_adapter.id2dict(partner_external_id)[
-                                "Codigo_Mutua"
-                            ],
-                        ]
-                        binding = binder.to_internal(external_id)
-                        if binding and binding.odoo_id != pl:
-                            old_binding = binder._find_binding(
-                                pl, binding_extra_vals={"odoo_partner_id": p.id}
-                            )
-                            if old_binding:
-                                old_binding.unlink()
-                            binding.odoo_id = pl
-                    binding = binder.wrap_binding(
-                        pl,
-                        binding_extra_vals={
-                            "odoo_partner_id": p.id,
-                            "deprecated": pl.is_deprecated(p),
-                        },
-                    )
-                    self._export_record(binding)
+from odoo.addons.component.core import Component
+
+# class ProductPricelistItemBatchExporter(AbstractComponent):
+#     """Export the Oxigesti Product prices.
+#
+#     For every product in the list, a delayed job is created.
+#     """
+#
+#     _name = "oxigesti.product.pricelist.item.batch.exporter"
+#
+#     def run_common(self, domain=None):
+#         if not domain:
+#             domain = []
+#         # Run the batch synchronization
+#         parent_domain = domain + [
+#             ("is_company", "=", True),
+#             ("customer_rank", ">=", 0),
+#         ]
+#         since_date = None
+#         domain = []
+#         for e in parent_domain:
+#             field, operator, value = e
+#             if field == "write_date":
+#                 since_date = value
+#             else:
+#                 domain.append(e)
+#         partner_adapter = self.component(
+#             usage="backend.adapter", model_name="oxigesti.res.partner"
+#         )
+#         partner_binder = self.binder_for("oxigesti.res.partner")
+#         binder = self.binder_for(self.model._name)
+#         for p in self.env["res.partner"].search(domain):
+#             pricelist_items = p.property_product_pricelist.item_ids.filtered(
+#                 lambda x: (
+#                     not since_date
+#                     or x.write_date > since_date
+#                     or p.write_date > since_date
+#                 )
+#                 and x.applied_on == "1_product"
+#                 and x.compute_price == "fixed"
+#                 and (
+#                     not x.sudo().product_tmpl_id.company_id
+#                     or x.sudo().product_tmpl_id.company_id == p.company_id
+#                 )
+#             )
+#             if pricelist_items:
+#                 # create/update binding data
+#                 partner_external_id = partner_binder.to_external(p, wrap=True)
+#                 for pl in pricelist_items:
+#                     if pl.product_tmpl_id.default_code and partner_external_id:
+#                         external_id = [
+#                             pl.product_tmpl_id.default_code,
+#                             partner_adapter.id2dict(partner_external_id)[
+#                                 "Codigo_Mutua"
+#                             ],
+#                         ]
+#                         binding = binder.to_internal(external_id)
+#                         if binding and binding.odoo_id != pl:
+#                             old_binding = binder._find_binding(
+#                                 pl, binding_extra_vals={"odoo_partner_id": p.id}
+#                             )
+#                             if old_binding:
+#                                 old_binding.unlink()
+#                             binding.odoo_id = pl
+#                     binding = binder.wrap_binding(
+#                         pl,
+#                         binding_extra_vals={
+#                             "odoo_partner_id": p.id,
+#                             "deprecated": pl.is_deprecated(p),
+#                         },
+#                     )
+#                     self._export_record(binding)
 
 
 class ProductPricelistItemDelayedBatchExporter(Component):
@@ -85,13 +84,10 @@ class ProductPricelistItemDelayedBatchExporter(Component):
     """
 
     _name = "oxigesti.product.pricelist.item.delayed.batch.exporter"
-    _inherit = [
-        "oxigesti.delayed.batch.exporter",
-        "oxigesti.product.pricelist.item.batch.exporter",
-    ]
+    _inherit = "oxigesti.delayed.batch.exporter"
 
-    def run(self, domain=None):
-        super().run_common(domain=domain)
+    # def run(self, domain=None):
+    #     super().run_common(domain=domain)
 
 
 class ProductPricelistItemDirectBatchExporter(Component):
@@ -101,13 +97,10 @@ class ProductPricelistItemDirectBatchExporter(Component):
     """
 
     _name = "oxigesti.product.pricelist.item.direct.batch.exporter"
-    _inherit = [
-        "oxigesti.direct.batch.exporter",
-        "oxigesti.product.pricelist.item.batch.exporter",
-    ]
+    _inherit = "oxigesti.direct.batch.exporter"
 
-    def run(self, domain=None):
-        super().run_common(domain=domain)
+    # def run(self, domain=None):
+    #     super().run_common(domain=domain)
 
 
 class ProductPricelistItemExporter(Component):
@@ -116,6 +109,84 @@ class ProductPricelistItemExporter(Component):
 
     _apply_on = "oxigesti.product.pricelist.item"
 
+    def run(self, relation, *args, **kwargs):
+        partners = (
+            self.env["res.partner"]
+            .search(
+                [
+                    ("company_id", "=?", self.backend_record.company_id.id),
+                ]
+            )
+            .filtered(lambda x: x.property_product_pricelist == relation.pricelist_id)
+        )
+        if partners:
+            bindings = self.env[relation.oxigesti_bind_ids._name]
+            for p in partners:
+                bindings |= self.binder.wrap_binding(
+                    relation,
+                    binding_extra_vals={
+                        "odoo_partner_id": p.id,
+                        "deprecated": relation.is_deprecated(p),
+                        "odoo_fixed_price": relation.fixed_price,
+                    },
+                )
+        else:
+            bindings = relation.oxigesti_bind_ids.filtered(
+                lambda x: x.deprecated
+                and x.odoo_partner_id.property_product_pricelist
+                != relation.pricelist_id
+            )
+        for binding in bindings:
+            super().run(binding, *args, **kwargs)
+
+    # def run(self, relation, *args, **kwargs):
+    #     partners = (
+    #         self.env["res.partner"]
+    #         .search(
+    #             [
+    #                 ("company_id", "=?", self.backend_record.company_id.id),
+    #             ]
+    #         )
+    #         .filtered(lambda x: x.property_product_pricelist == relation.pricelist_id)
+    #     )
+    #     for p in partners:
+    #         computed_external_id = self.binder._get_external_id(
+    #             relation, extra_vals={"odoo_partner_id": p.id}
+    #         )
+    #         binding = self.binder.to_internal(computed_external_id)
+    #         if binding and binding.odoo_id != relation:
+    #             # old_binding = self.binder._find_binding(
+    #             #     relation, binding_extra_vals={"odoo_partner_id": p.id}
+    #             # )
+    #             # if old_binding:
+    #             #     old_binding.unlink()
+    #             binding.odoo_id = relation
+    #         # computed_external_id_hash = idhash(computed_external_id)
+    #         # binding = self.env["oxigesti.product.pricelist.item"].search(
+    #         #     [
+    #         #         ("backend_id", "=", self.backend_record.id),
+    #         #         ("external_id_hash", "=", computed_external_id_hash),
+    #         #         ("odoo_partner_id", "=", p.id),
+    #         #         ("odoo_id", "!=", relation.id),
+    #         #     ]
+    #         # )
+    #         # if binding:
+    #         #     binding.odoo_id = relation
+    #         binding = self.binder.wrap_binding(
+    #             relation,
+    #             binding_extra_vals={
+    #                 "odoo_partner_id": p.id,
+    #                 "deprecated": relation.is_deprecated(p),
+    #                 "odoo_fixed_price": relation.fixed_price,
+    #             },
+    #         )
+    #         super().run(binding, *args, **kwargs)
+    #     if not partners:
+    #         for binding in relation.oxigesti_bind_ids.filtered(
+    #             lambda x: x.deprecated
+    #         ):
+    #             super().run(binding, *args, **kwargs)
+
     def _export_dependencies(self):
         # partner
         binder = self.binder_for("oxigesti.res.partner")
diff --git a/connector_oxigesti/models/product_product/binder.py b/connector_oxigesti/models/product_product/binder.py
index 042537bed..5dd37c711 100644
--- a/connector_oxigesti/models/product_product/binder.py
+++ b/connector_oxigesti/models/product_product/binder.py
@@ -19,12 +19,9 @@ class ProductProductBinder(Component):
 
     _apply_on = "oxigesti.product.product"
 
-    def _get_external_id(self, binding):
-        if not self._is_binding(binding):
-            raise Exception("The source object %s must be a binding" % binding._name)
-
+    def _get_external_id(self, relation, extra_vals=None):
         external_id = None
-        if binding.odoo_id.default_code:
-            external_id = [binding.odoo_id.default_code]
+        if relation.default_code:
+            external_id = [relation.default_code]
 
         return external_id
diff --git a/connector_oxigesti/models/stock_production_lot/binder.py b/connector_oxigesti/models/stock_production_lot/binder.py
index 6418275dc..549d74647 100644
--- a/connector_oxigesti/models/stock_production_lot/binder.py
+++ b/connector_oxigesti/models/stock_production_lot/binder.py
@@ -10,14 +10,9 @@ class StockProductionLotBinder(Component):
 
     _apply_on = "oxigesti.stock.production.lot"
 
-    def _get_external_id(self, binding):
-        if not self._is_binding(binding):
-            raise Exception("The source object %s must be a binding" % binding._name)
-
+    def _get_external_id(self, relation, extra_vals=None):
         product_binder = self.binder_for("oxigesti.product.product")
-        product_external_id = product_binder.to_external(
-            binding.odoo_id.product_id, wrap=True
-        )
+        product_external_id = product_binder.to_external(relation.product_id, wrap=True)
 
         external_id = None
         if product_external_id:
@@ -27,6 +22,6 @@ def _get_external_id(self, binding):
             codigo_articulo = product_adapter.id2dict(product_external_id)[
                 "CodigoArticulo"
             ]
-            external_id = [codigo_articulo, binding.name]
+            external_id = [codigo_articulo, relation.name]
 
         return external_id

From 21bd969b0353bfb0b569d2bcb37526bcd86e43e5 Mon Sep 17 00:00:00 2001
From: FrankC013 <fcespedes@nuobit.com>
Date: Wed, 7 Feb 2024 18:37:09 +0100
Subject: [PATCH 8/8] [IMP] connector_oxigesti: last implementations

---
 .../components_custom/binder.py               |  4 +-
 .../models/product_pricelist_item/binding.py  | 58 ++++++++++++++++---
 .../product_pricelist_item/export_mapper.py   |  3 +-
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/connector_oxigesti/components_custom/binder.py b/connector_oxigesti/components_custom/binder.py
index 3ea5da9ac..2aa0e785b 100644
--- a/connector_oxigesti/components_custom/binder.py
+++ b/connector_oxigesti/components_custom/binder.py
@@ -75,7 +75,7 @@ def _is_binding(self, binding):
 
         return True
 
-    def _find_binding(self, relation, binding_extra_vals=None, unique=True):
+    def _find_binding(self, relation, binding_extra_vals=None):
         if not binding_extra_vals:
             binding_extra_vals = {}
 
@@ -98,7 +98,7 @@ def _find_binding(self, relation, binding_extra_vals=None, unique=True):
             domain.append((f, "=", binding_extra_vals[f]))
         binding = self.model.with_context(active_test=False).search(domain)
 
-        if binding and unique:
+        if binding:
             binding.ensure_one()
 
         return binding
diff --git a/connector_oxigesti/models/product_pricelist_item/binding.py b/connector_oxigesti/models/product_pricelist_item/binding.py
index d1881c2a6..86b45f752 100644
--- a/connector_oxigesti/models/product_pricelist_item/binding.py
+++ b/connector_oxigesti/models/product_pricelist_item/binding.py
@@ -10,28 +10,47 @@
 class ProductPricelistItem(models.Model):
     _inherit = "product.pricelist.item"
 
+    partner_ids = fields.Many2many(
+        comodel_name="res.partner",
+        compute="_compute_partner_ids",
+    )
+
+    def _compute_partner_ids(self):
+        for rec in self:
+            rec.partner_ids = (
+                self.env["res.partner"]
+                .search(
+                    [
+                        ("company_id", "", rec.company_id.id),
+                    ]
+                )
+                .filtered(lambda x: x.property_product_pricelist == rec.pricelist_id)
+            )
+
     oxigesti_write_date = fields.Datetime(
         compute="_compute_oxigesti_write_date",
         store=True,
+        required=True,
     )
 
     @api.depends(
+        "partner_ids.property_product_pricelist",
+        "oxigesti_bind_ids",
         "oxigesti_bind_ids.oxigesti_write_date",
-        "oxigesti_bind_ids.odoo_partner_id.write_date",
         "compute_price",
         "applied_on",
         "fixed_price",
     )
     def _compute_oxigesti_write_date(self):
         for rec in self:
-            date = False
-            for binding in rec.oxigesti_bind_ids:
-                date = max(
+            rec.oxigesti_write_date = (
+                max(
                     rec.mapped("write_date")
-                    + binding.mapped("oxigesti_write_date")
-                    + binding.odoo_partner_id.mapped("write_date")
+                    + rec.oxigesti_bind_ids.mapped("oxigesti_write_date")
+                    + rec.oxigesti_bind_ids.odoo_partner_id.mapped("write_date")
                 )
-            rec.oxigesti_write_date = date
+                or False
+            )
 
     oxigesti_bind_ids = fields.One2many(
         comodel_name="oxigesti.product.pricelist.item",
@@ -96,6 +115,8 @@ class ProductPricelistItemBinding(models.Model):
     oxigesti_write_date = fields.Datetime(
         compute="_compute_oxigesti_write_date",
         store=True,
+        required=True,
+        default=fields.Datetime.now,
     )
 
     @api.depends("deprecated")
@@ -106,10 +127,30 @@ def _compute_oxigesti_write_date(self):
     odoo_id = fields.Many2one(
         comodel_name="product.pricelist.item",
         string="Product pricelist item",
+        compute="_compute_odoo_id",
+        store=True,
+        readonly=False,
         required=True,
         ondelete="cascade",
     )
 
+    @api.depends("odoo_partner_id.property_product_pricelist")
+    def _compute_odoo_id(self):
+        for rec in self:
+            record = rec.odoo_partner_id.property_product_pricelist.item_ids.filtered(
+                lambda r: r.product_tmpl_id == rec.product_tmpl_id
+            )
+            if len(record) > 1:
+                raise ValidationError(
+                    _(
+                        "There are more than one pricelist item with the same "
+                        "product and the same pricelist for the customer %s"
+                    )
+                    % rec.odoo_partner_id.name
+                )
+            if record:
+                rec.odoo_id = record
+
     odoo_partner_id = fields.Many2one(
         comodel_name="res.partner", string="Partner", required=True, ondelete="cascade"
     )
@@ -117,9 +158,10 @@ def _compute_oxigesti_write_date(self):
     odoo_fixed_price = fields.Float(
         compute="_compute_odoo_fixed_price",
         store=True,
+        required=True,
     )
 
-    @api.depends("odoo_id.fixed_price")
+    @api.depends("odoo_id.fixed_price", "deprecated")
     def _compute_odoo_fixed_price(self):
         for rec in self:
             if not rec.deprecated:
diff --git a/connector_oxigesti/models/product_pricelist_item/export_mapper.py b/connector_oxigesti/models/product_pricelist_item/export_mapper.py
index 85ff9b790..0012df3de 100644
--- a/connector_oxigesti/models/product_pricelist_item/export_mapper.py
+++ b/connector_oxigesti/models/product_pricelist_item/export_mapper.py
@@ -59,7 +59,8 @@ def Codigo_Mutua(self, record):
 
     @mapping
     def Importe(self, record):
-        return {"Importe": record.odoo_fixed_price}
+        if not record.deprecated:
+            return {"Importe": record.odoo_fixed_price}
 
     @mapping
     def Deprecated(self, record):