diff --git a/purchase.py b/purchase.py index 0992b38..186bbcc 100644 --- a/purchase.py +++ b/purchase.py @@ -56,7 +56,7 @@ class Purchase(metaclass=PoolMeta): equipment.save() else: continue - purchase.equipment_available = True + purchase.equipment_create = True cls.save(purchases) else: raise InvalidNumberPurchases( diff --git a/subscription.py b/subscription.py index 9ee107a..379fd92 100644 --- a/subscription.py +++ b/subscription.py @@ -10,7 +10,7 @@ class Subscription(metaclass=PoolMeta): equipments = fields.Many2Many('sale.subscription-optical_equipment.equipment', 'subscription', 'equipment', "Equipments") - @classmethod + """@classmethod @ModelView.button @Workflow.transition('running') @set_employee('run_by') @@ -39,11 +39,29 @@ class Subscription(metaclass=PoolMeta): line.compute_next_consumption_date()) lines.extend(subscription.lines) Line.save(lines) - cls.save(subscriptions) + cls.save(subscriptions)""" + """ + @classmethod + def __setup__(cls): + super(Subscription, cls).__setup__() + cls._order = [ + ('end_date', 'DESC'), + ('id', 'DESC'), + ] + """ + class SubscriptionEquipment(ModelSQL): 'Optical Equipment - Subscription' __name__ = 'sale.subscription-optical_equipment.equipment' subscription = fields.Many2One('sale.subscription', 'Subscription', select=True) equipment = fields.Many2One('optical_equipment.equipment', 'Equipment', select=True) + + @classmethod + def __setup__(cls): + super(SubscriptionEquipment, cls).__setup__() + cls._order = [ + ('start_date', 'DESC'), + ('id', 'DESC'), + ] diff --git a/view/optical_equipment_configuration_form.xml b/view/optical_equipment_configuration_form.xml index 76fac4d..60cb1ef 100644 --- a/view/optical_equipment_configuration_form.xml +++ b/view/optical_equipment_configuration_form.xml @@ -3,7 +3,7 @@ this repository contains the full copyright notices and license terms. -->
- +