diff --git a/sale.py b/sale.py index bb69142..7c4bdba 100644 --- a/sale.py +++ b/sale.py @@ -2,7 +2,8 @@ from trytond.pool import Pool, PoolMeta from trytond.model import ModelView, ModelSQL, fields from trytond.pyson import Eval, Bool, If from trytond.transaction import Transaction - +from trytond.exceptions import UserError + from trytond.wizard import ( Button, StateAction, StateTransition, StateView, Wizard) @@ -17,7 +18,22 @@ class CreateSubscriptionStart(ModelView): required=True) invoice_start_date = fields.Date("Invoice Start Date", help='Billing start date') + service = fields.Many2One('sale.subscription.service', "Service") + quantity = fields.Float("Quantity", digits='unit') + + @classmethod + def default_start_date(cls): + pool = Pool() + Date = pool.get('ir.date') + return Date.today() + @classmethod + @fields.depends(methods=['default_start_date']) + def default_invoice_start_date(self): + invoice_start_date = self.default_start_date() + + return invoice_start_date + class CreateSubscription(Wizard): 'Create Subscription' __name__ = 'sale.create.subscription' @@ -25,9 +41,27 @@ class CreateSubscription(Wizard): start = StateView('sale.create.subscription.start', 'optical_equipment.create_subscription_view_form',[ Button('Cancel', 'end', 'tryton-cancel'), - Button('Create', 'create', 'tryton-ok', default=True), + Button('Create', 'create_subscription', 'tryton-ok', default=True), ]) + create_subscription = StateAction('sale_subscription.act_subscription_form') + @property + def _subscription_start(self): + return dict( + start_date = self.start.start_date, + end_date = self.start.end_date, + invoice_recurrence = self.start.invoice_recurrence, + invoice_start_date = self.start.invoice_start_date, + service = self.start.service, + quantity = self.start.quantity) + + def do_create_subscription(self, action): + pool = Pool() + Subscription = pool.get('sale.subscription') + + #subscription = subscription() + self._subscription_start + class SaleLine(metaclass=PoolMeta): 'SaleLine' __name__ = 'sale.line' diff --git a/view/create_subscription_form.xml b/view/create_subscription_form.xml index a1cd1e5..55922b5 100644 --- a/view/create_subscription_form.xml +++ b/view/create_subscription_form.xml @@ -3,11 +3,12 @@ this repository contains the full copyright notices and license terms. -->
- +