21.03.26
This commit is contained in:
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user