From 9bdee108ac4caadce75c9a0ea65992dcf9e2f178 Mon Sep 17 00:00:00 2001 From: sinergia Date: Wed, 10 Aug 2022 16:57:31 -0500 Subject: [PATCH] add report equipment to equipment --- equipment.py | 7 ++++++- equipment.xml | 12 ++++++++++++ purchase.py | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/equipment.py b/equipment.py index 3a26337..7cb1d81 100644 --- a/equipment.py +++ b/equipment.py @@ -109,8 +109,12 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView): return [Purchase.__name__] - + @property + def origin_name(self): + if isinstance(self.origin, self.__class__): + return self.origin.invoice.rec_name + return self.origin.rec_name if self.origin else None @classmethod def get_origin(cls): @@ -119,6 +123,7 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView): models = cls._get_origin() return [(None, '')] + [(m, get_name(m)) for m in models] + @classmethod def __setup__(cls): diff --git a/equipment.xml b/equipment.xml index de77bb7..e56e0ab 100644 --- a/equipment.xml +++ b/equipment.xml @@ -152,5 +152,17 @@ Equipment + + Equipment + optical_equipment.equipment + optical_equipment.equipment + report/cv.fodt + + + + form_print + optical_equipment.equipment,-1 + + diff --git a/purchase.py b/purchase.py index 625a035..9940ebf 100644 --- a/purchase.py +++ b/purchase.py @@ -62,7 +62,8 @@ class Purchase(metaclass=PoolMeta): serial=None if line.quantity > 1 else line.serial_equipment, health_register=line.health_register, software_version=line.product.software_version, - maintenance_frequency="none") + maintenance_frequency="none", + ) equipment.save() else: continue