From 93d27059af74c61ae5980cd10a4c39f6b5418b66 Mon Sep 17 00:00:00 2001
From: laurentbarontini <l.barontini@open-squared.ch>
Date: Sat, 21 Mar 2026 18:25:30 +0100
Subject: [PATCH] 21.03.26

---
 modules/purchase_trade/__init__.py            |  3 +
 modules/purchase_trade/purchase.py            | 65 ++++++++++++++++++-
 modules/purchase_trade/purchase.xml           | 21 ++++++
 modules/purchase_trade/view/assay_form.xml    | 16 +++++
 .../purchase_trade/view/assay_line_tree.xml   |  8 +++
 modules/purchase_trade/view/assay_tree.xml    |  8 +++
 .../view/purchase_line_form.xml               |  4 +-
 7 files changed, 122 insertions(+), 3 deletions(-)
 create mode 100644 modules/purchase_trade/view/assay_form.xml
 create mode 100644 modules/purchase_trade/view/assay_line_tree.xml
 create mode 100644 modules/purchase_trade/view/assay_tree.xml

diff --git a/modules/purchase_trade/__init__.py b/modules/purchase_trade/__init__.py
index 73fe546..171353f 100755
--- a/modules/purchase_trade/__init__.py
+++ b/modules/purchase_trade/__init__.py
@@ -169,6 +169,9 @@ def register():
         purchase.PurchaseStrategy,
         purchase.PriceComposition,
         purchase.QualityAnalysis,
+        purchase.Assay,
+        purchase.AssayLine,
+        purchase.AssayElement,
         backtoback.Backtoback,
         dimension.AnalyticDimension,
         dimension.AnalyticDimensionValue,
diff --git a/modules/purchase_trade/purchase.py b/modules/purchase_trade/purchase.py
index a1097a6..56318b1 100755
--- a/modules/purchase_trade/purchase.py
+++ b/modules/purchase_trade/purchase.py
@@ -528,7 +528,69 @@ class PriceComposition(ModelSQL,ModelView):
     line = fields.Many2One('purchase.line',"Purchase line")
     component = fields.Char("Component")
     price = fields.Numeric("Price")
-    
+
+class Assay(ModelSQL, ModelView):
+    __name__ = 'assay.assay'
+
+    line = fields.Many2One('purchase.line',"Purchase Line")
+
+    reference = fields.Char("Lab Reference")
+    date = fields.Date("Analysis Date")
+
+    type = fields.Selection([
+        ('provisional', 'Provisional'),
+        ('final', 'Final'),
+        ('umpire', 'Umpire'),
+    ], "Type")
+
+    status = fields.Selection([
+        ('draft', 'Draft'),
+        ('validated', 'Validated'),
+    ], "Status")
+
+    laboratory = fields.Char("Laboratory")
+
+    lines = fields.One2Many(
+        'assay.line', 'assay', "Assay Lines"
+    )
+
+    document = fields.Binary("Analysis", filename='filename')
+    filename = fields.Char('Analysis')
+
+class AssayLine(ModelSQL, ModelView):
+    __name__ = 'assay.line'
+
+    assay = fields.Many2One('assay.assay', "Assay")
+
+    element = fields.Many2One('assay.element', "Element")
+
+    value = fields.Float("Value")
+
+    unit = fields.Many2One('product.uom', "Unit")
+
+    category = fields.Selection([
+        ('assay', 'Assay'),
+        ('penalty', 'Penalty'),
+        ('moisture', 'Moisture'),
+    ], "Category")
+
+    method = fields.Char("Method")
+
+    is_payable = fields.Boolean("Payable")
+
+class AssayElement(ModelSQL, ModelView):
+    __name__ = 'assay.element'
+
+    name = fields.Char("Code")  # Cu, Au, As
+    description = fields.Char("Description")
+
+    default_unit = fields.Many2One('product.uom', "Default Unit")
+
+    type = fields.Selection([
+        ('metal', 'Metal'),
+        ('impurity', 'Impurity'),
+    ])
+
 class QualityAnalysis(ModelSQL,ModelView):
     "Quality Analysis"
     __name__ = 'quality.analysis'
@@ -690,6 +752,7 @@ class Line(metaclass=PoolMeta):
     finished = fields.Boolean("Mark as finished")
 
     quality_analysis = fields.One2Many('quality.analysis','line',"Quality analysis")
+    assays = fields.One2Many('assay.assay','line',"Assays")
 
     @classmethod
     def default_finished(cls):
diff --git a/modules/purchase_trade/purchase.xml b/modules/purchase_trade/purchase.xml
index d692377..9ff5df5 100755
--- a/modules/purchase_trade/purchase.xml
+++ b/modules/purchase_trade/purchase.xml
@@ -173,6 +173,27 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">quality_analysis_form</field>
         </record>
 
+        <record model="ir.ui.view" id="assay_view_tree">
+            <field name="model">assay.assay</field>
+            <field name="type">tree</field>
+            <field name="name">assay_tree</field>
+        </record>
+        <record model="ir.ui.view" id="assay_view_form">
+            <field name="model">assay.assay</field>
+            <field name="type">form</field>
+            <field name="name">assay_form</field>
+        </record>
+        <record model="ir.ui.view" id="assay_line_view_tree">
+            <field name="model">assay.line</field>
+            <field name="type">tree</field>
+            <field name="name">assay_line_tree</field>
+        </record>
+        <record model="ir.ui.view" id="assay_element_view_form">
+            <field name="model">assay.element</field>
+            <field name="type">form</field>
+            <field name="name">assay_element_form</field>
+        </record>
+
         <menuitem
             name="Pnl Report"
 	        parent="purchase_trade.menu_global_reporting"
diff --git a/modules/purchase_trade/view/assay_form.xml b/modules/purchase_trade/view/assay_form.xml
new file mode 100644
index 0000000..f9f763f
--- /dev/null
+++ b/modules/purchase_trade/view/assay_form.xml
@@ -0,0 +1,16 @@
+<form col="4">
+    <label name="reference"/>
+    <field name="reference"/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="type"/>
+    <field name="type"/>
+    <label name="status"/>
+    <field name="status"/>
+    <label name="laboratory"/>
+    <field name="laboratory"/>
+    <label name="filename"/>
+    <field name="filename"/>
+    <newline/>
+    <field name="lines" colspan="4"/>
+</form>
\ No newline at end of file
diff --git a/modules/purchase_trade/view/assay_line_tree.xml b/modules/purchase_trade/view/assay_line_tree.xml
new file mode 100644
index 0000000..a515ff6
--- /dev/null
+++ b/modules/purchase_trade/view/assay_line_tree.xml
@@ -0,0 +1,8 @@
+<tree editable="1">
+    <field name="element"/>
+    <field name="value"/>
+    <field name="unit"/>
+    <field name="category"/>
+    <field name="method"/>
+    <field name="is_payable"/>
+</tree>
\ No newline at end of file
diff --git a/modules/purchase_trade/view/assay_tree.xml b/modules/purchase_trade/view/assay_tree.xml
new file mode 100644
index 0000000..1bbfac3
--- /dev/null
+++ b/modules/purchase_trade/view/assay_tree.xml
@@ -0,0 +1,8 @@
+<tree editable="1">
+    <field name="reference"/>
+    <field name="date"/>
+    <field name="type"/>
+    <field name="status"/>
+    <field name="laboratory"/>
+    <field name="filename"/>
+</tree>
\ No newline at end of file
diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index 8ce4c6c..754d028 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -55,8 +55,8 @@ this repository contains the full copyright notices and license terms. -->
         <field name="certif"/>
     </xpath>
     <xpath expr="/form/notebook/page[@id='taxes']" position="before">
-        <page string="Quality Analysis" col="4" id="qa">
-            <field name="quality_analysis" mode="form,tree" view_ids="purchase_trade.quality_analysis_view_form,purchase_trade.quality_analysis_view_tree"/>
+        <page string="Assays" col="4" id="as">
+            <field name="assays" mode="tree,form" view_ids="purchase_trade.assay_view_tree,purchase_trade.assay_view_form"/>
         </page>
         <page string="Lots" col="4" id="lots">
             <field name="lots" mode="tree,form" view_ids="lot.lot_view_tree_sequence,lot.lot_view_form"/>