diff --git a/__init__.py b/__init__.py index 57b6124..2be1e7c 100644 --- a/__init__.py +++ b/__init__.py @@ -1,9 +1,9 @@ from trytond.pool import Pool -from . import product -from . import sale +from . import product, sale, equipment def register(): Pool.register( product.Template, sale.SaleLine, + equipment.OpticalEquipment, module='optical_equipment', type_='model') diff --git a/product.py b/product.py index 172f604..f0d12e9 100644 --- a/product.py +++ b/product.py @@ -43,6 +43,21 @@ class Template(metaclass=PoolMeta): 'Main tecnology') calibration = fields.Boolean("Apply calibration") observation = fields.Text('Observation') + mark_category = fields.Many2One('product.category', 'Mark') + model_category = fields.Many2One('product.category', "Model") + reference = fields.Char("Reference", size=None, required=True) + origin_country = fields.Many2One('country.country',"Origin Country") + software_version = fields.Char( + "Software version", size=None, required=True) + useful_life = fields.Char( + "Useful life", size=None, required=True) + warranty = fields.Char( + "Warranty", size=None, required=True) + serial = fields.Char( + "Serial", size=None, required=True) + health_register = fields.Char( + "Serial", size=None, required=True) + refurbish = fields.Boolean('Refurbish') @staticmethod def default_equipment(): diff --git a/sale.py b/sale.py index 869263a..1943e82 100644 --- a/sale.py +++ b/sale.py @@ -1,24 +1,7 @@ from trytond.pool import Pool, PoolMeta -from trytond.model import ModelView, ModelSQL -from trytond.model import fields +from trytond.model import ModelView, ModelSQL, fields -class SaleLine(ModelSQL, ModelView, metaclass=PoolMeta): +class SaleLine(metaclass=PoolMeta): 'SaleLine' __name__ = 'sale.line' - - mark_category = fields.Many2One('product.category', 'Mark') - model_category = fields.Many2One('product.category', "Model") - reference = fields.Char("Reference", size=None, required=True) - origin_country = fields.Many2One('country.country',"Origin Country") - software_version = fields.Char( - "Software version", size=None, required=True) - useful_life = fields.Char( - "Useful life", size=None, required=True) - warranty = fields.Char( - "Warranty", size=None, required=True) - serial = fields.Char( - "Serial", size=None, required=True) - health_register = fields.Char( - "Serial", size=None, required=True) - refurbish = fields.Boolean('Refurbish') diff --git a/tryton.cfg b/tryton.cfg index 55c6d6b..75a9e9e 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -2,9 +2,12 @@ version=6.0 depends: ir + party + company product sale country xml: product.xml + equipment.xml sale.xml \ No newline at end of file diff --git a/view/sale_line_form.xml b/view/sale_line_form.xml index 2f35b76..88e7915 100644 --- a/view/sale_line_form.xml +++ b/view/sale_line_form.xml @@ -4,24 +4,6 @@ -