21.03.26

modules/purchase_trade/purchase.py

@@ -689,8 +689,7 @@ class Assay(ModelSQL, ModelView):
         'assay.line', 'assay', "Assay Lines"
     )
 
-    document = fields.Binary("Analysis", filename='filename')
-    filename = fields.Char('Analysis')
+    analysis = fields.Many2One('document.incoming',"Analysis")
 
 class AssayLine(ModelSQL, ModelView):
     "Assay Line"
@@ -1110,10 +1109,10 @@ class Line(metaclass=PoolMeta):
             
             if line.assays:
                 for assay in line.assays:
-                    if not assay.lines and assay.document:
-                        file_data = assay.document or b""
+                    if not assay.lines and assay.analysis:
+                        file_data = assay.analysis.data or b""
                         logger.info(f"File size: {len(file_data)} bytes")
-                        file_name = assay.file_name or "document"
+                        file_name = assay.analysis.name or "document"
 
                         response = requests.post(
                             "http://62.72.36.116:8006/ocr-parse-assay",

modules/purchase_trade/view/assay_form.xml

@@ -9,8 +9,8 @@
     <field name="status"/>
     <label name="lab"/>
     <field name="lab"/>
-    <label name="filename"/>
-    <field name="filename"/>
+    <label name="analysis"/>
+    <field name="analysis"/>
     <newline/>
     <field name="lines" colspan="4"/>
 </form>

modules/purchase_trade/view/assay_tree.xml

@@ -4,5 +4,4 @@
     <field name="type"/>
     <field name="status"/>
     <field name="lab"/>
-    <field name="document"/>
 </tree>