[IMP]pruchase_ux: new features in purchase.bill.line.match

closes #320

Signed-off-by: Juan Carreras <jc@adhoc.com.ar>

Author: mav-adhoc

purchase_ux/__manifest__.py

@@ -19,7 +19,7 @@
 ##############################################################################
 {
     "name": "Purchase UX",
-    "version": "18.0.1.3.0",
+    "version": "18.0.1.4.0",
     "category": "Purchases",
     "sequence": 14,
     "summary": "",

purchase_ux/models/account_move.py

@@ -86,8 +86,25 @@ def get_product_lines_to_update(self):
     def action_purchase_matching(self):
         res = super().action_purchase_matching()
         # mark the action so compute method in the view can apply special filtering
+        # also pass the current move id so matching adds POLs to this bill instead of creating a new one
         if isinstance(res, dict):
             ctx = dict(res.get("context") or {})
             ctx["purchase_matching_from_button"] = True
+            ctx["default_account_move_id"] = self.id
             res["context"] = ctx
+            # Show only POLs where ordered qty > invoiced qty (fully invoiced lines excluded).
+            all_pols = self.env["purchase.order.line"].search(
+                [
+                    ("partner_id", "in", (self.partner_id | self.partner_id.commercial_partner_id).ids),
+                    ("state", "in", ["purchase", "done"]),
+                ]
+            )
+            # exclude POLs already matched to a line in this bill (qty_invoiced ignores drafts)
+            already_matched = set(self.invoice_line_ids.filtered("purchase_line_id").mapped("purchase_line_id").ids)
+            pending_pol_ids = all_pols.filtered(
+                lambda p: p.product_qty > p.qty_invoiced and p.id not in already_matched
+            ).ids
+            domain = list(res.get("domain") or [])
+            domain += ["|", ("pol_id", "=", False), ("pol_id", "in", pending_pol_ids)]
+            res["domain"] = domain
         return res

purchase_ux/models/purchase_bill_line_match.py

@@ -7,6 +7,7 @@
 
 class PurchaseBillLineMatch(models.Model):
     _inherit = "purchase.bill.line.match"
+    _order = "state, product_id, aml_id, pol_id"
 
     reference_description = fields.Char(
         string="Description",
@@ -19,25 +20,34 @@ class PurchaseBillLineMatch(models.Model):
         readonly=True,
     )
 
+    date_order = fields.Datetime(related="pol_id.order_id.date_order", readonly=True)
+
     @api.depends("pol_id", "product_id", "display_name")
     def _compute_reference_description(self):
+        lang = self.env.user.lang
         for rec in self:
-            if rec.pol_id and rec.product_id:
+            if rec.pol_id:
                 pol_name = rec.pol_id.name or ""
-                product_name = rec.product_id.display_name or ""
-                if pol_name.startswith(product_name):
-                    remaining = pol_name[len(product_name) :].strip()
-                    if remaining:
-                        rec.reference_description = f"{product_name} - {remaining}"
-                    else:
-                        rec.reference_description = product_name
-                else:
-                    rec.reference_description = pol_name
-            elif rec.pol_id:
-                rec.reference_description = rec.pol_id.name
+                # pol.name format: "[ref] Product Name\nExtra description"
+                # Use only the extra description if present, otherwise translated product name
+                parts = pol_name.split("\n", 1)
+                extra = parts[1].strip() if len(parts) > 1 else ""
+                rec.reference_description = extra or rec.pol_id.product_id.with_context(lang=lang).display_name
             else:
                 rec.reference_description = rec.display_name
 
+    def action_match_lines(self):
+        """When opened from an existing draft bill and only PO lines are selected
+        (no aml_id), add the POLs to the current bill instead of creating a new one.
+        """
+        account_move_id = self.env.context.get("default_account_move_id")
+        if account_move_id and not self.aml_id and self.pol_id:
+            bill = self.env["account.move"].browse(account_move_id)
+            if bill.exists() and bill.state == "draft":
+                bill._add_purchase_order_lines(self.pol_id)
+                return bill._get_records_action()
+        return super().action_match_lines()
+
     def _compute_product_uom_qty(self):
         # Only apply the incompatibility filter when the view was opened
         # via the purchase matching action (context flag set by the action).

purchase_ux/views/purchase_bill_line_match_views.xml

@@ -6,6 +6,7 @@
         <field name="inherit_id" ref="purchase.purchase_bill_line_match_tree"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='display_name']" position="replace">
+                <field name="product_id"/>
                 <field name="reference_description" string="Description" decoration-it="not product_id"/>
             </xpath>
             <xpath expr="//field[@name='product_uom_qty']" position="after">
@@ -19,10 +20,17 @@
         <field name="model">purchase.bill.line.match</field>
         <field name="arch" type="xml">
             <search>
+                <field name="product_id"/>
+                <field name="reference_description" string="Description"/>
+                <field name="purchase_order_id" string="Purchase Order"/>
                 <filter string="Órdenes de Compra" name="pol_id" domain="[('pol_id', '!=', False)]"/>
                 <separator/>
                 <filter string="No Facturado" name="not_invoiced" domain="[('account_move_id', '=', False)]"/>
                 <filter string="En Factura Actual" name="current_invoice" domain="[('account_move_id', '!=', False), ('state', '=', 'draft')]"/>
+                <separator/>
+                <filter string="Recibido" name="received" domain="[('qty_received', '>', 0)]"/>
+                <separator/>
+                <filter string="Fecha" name="Date" date="date_order"/>
             </search>
         </field>
     </record>