diff --git a/equipment.py b/equipment.py index 4643f5f..3fbc907 100644 --- a/equipment.py +++ b/equipment.py @@ -5,7 +5,7 @@ from trytond.exceptions import UserError class OpticalEquipment(ModelSQL, ModelView): 'Optical Equipment' - __name__ = "optical.equipment" + __name__ = "optical_equipment.equipment" company = fields.Many2One('company.company', "Company") location = fields.Many2One('stock.location', "Location") @@ -30,7 +30,7 @@ class OpticalEquipment(ModelSQL, ModelView): serial = fields.Char("Serial", size=None) health_register = fields.Char("Health Register", size=None) - subscription_history = fields.Many2Many('sale.subscription-optical.equipment', 'equipment', 'subscription', "Subscriptions") + subscription_history = fields.Many2Many('sale.subscription-optical_equipment.equipment', 'equipment', 'subscription', "Subscriptions") @staticmethod def get_origin(): @@ -43,9 +43,8 @@ class OpticalEquipment(ModelSQL, ModelView): for record in records: ids.append(record.id) - Subscriptions = pool.get('sale.subscription-optical.equipment') + Subscriptions = pool.get('sale.subscription-optical_equipment.equipment') subscriptions = Subscriptions.search([("equipment", 'in', ids)]) - #raise UserError(str(ids)) subscriptions_history_id = [] DICC = {} diff --git a/equipment.xml b/equipment.xml index a77673e..2c6eee9 100644 --- a/equipment.xml +++ b/equipment.xml @@ -9,15 +9,15 @@ id="menu_equipment"/> Equipments - optical.equipment + optical_equipment.equipment - optical.equipment + optical_equipment.equipment tree optical_equipment_tree - optical.equipment + optical_equipment.equipment form optical_equipment_form diff --git a/purchase.py b/purchase.py index f9bbe09..68efbb7 100644 --- a/purchase.py +++ b/purchase.py @@ -11,7 +11,7 @@ class Purchase(metaclass=PoolMeta): @ModelView.button def process(cls, purchases): pool = Pool() - Equipment = pool.get('optical.equipment') + Equipment = pool.get('optical_equipment.equipment') #raise UserError(str(type(Equipment))) Line = pool.get('purchase.line') lines = [] diff --git a/subscription.py b/subscription.py index cbe2ec7..16704e6 100644 --- a/subscription.py +++ b/subscription.py @@ -4,11 +4,11 @@ from trytond.model import ModelSQL, ModelView, fields class Subscription(metaclass=PoolMeta): __name__ = 'sale.subscription' - equipments = fields.Many2Many('sale.subscription-optical.equipment', 'subscription', 'equipment', "Equipments") + equipments = fields.Many2Many('sale.subscription-optical_equipment.equipment', 'subscription', 'equipment', "Equipments") class SubscriptionEquipment(ModelSQL): 'Optical Equipment - Subscription' - __name__ = 'sale.subscription-optical.equipment' + __name__ = 'sale.subscription-optical_equipment.equipment' - subscription = fields.Many2One('sale.subscription', 'Subscription', select=True) - equipment = fields.Many2One('optical.equipment', 'Equipment', select=True) + subscription = fields.Many2One('sale_subscription', 'Subscription', select=True) + equipment = fields.Many2One('optical_equipment.equipment', 'Equipment', select=True) diff --git a/tryton.cfg b/tryton.cfg index 2f44aff..4fc94a4 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -11,7 +11,6 @@ depends: stock country sale_subscription - xml: party.xml product.xml