corrections to module contracts
This commit is contained in:
parent
50dc5aa2b0
commit
20a0df5c50
@ -67,7 +67,7 @@ class Contract(ModelSQL, ModelView):
|
||||
help="The current state of the subscription.")
|
||||
contract = fields.Many2One('sale.subscription', "Contract", readonly=True)
|
||||
prorogues = fields.Many2Many('sale.subscription-optical_equipment.contract',
|
||||
'contract', 'subscription', 'Prorrogation', readonly=True)
|
||||
'contract', 'subscription', 'Prorrogation')
|
||||
equipments = fields.Many2Many('sale.subscription-optical_equipment.equipment', 'subscription',
|
||||
'equipment', "Equipments", readonly=True,
|
||||
domain=[['OR',
|
||||
@ -193,7 +193,7 @@ class CreateProrogue(Wizard):
|
||||
|
||||
subscription = Subscription(
|
||||
state='draft',
|
||||
type='contract',
|
||||
type='prorrogation',
|
||||
party=a['party'],
|
||||
invoice_address=a['invoice_address'],
|
||||
payment_term=a['payment_term'],
|
||||
@ -209,21 +209,22 @@ class CreateProrogue(Wizard):
|
||||
|
||||
subscription.save()
|
||||
|
||||
contract.start_date = a['start_date']
|
||||
contract.end_date = a['end_date']
|
||||
contract.invoice_addres = a['invoice_address']
|
||||
contract.contact = a['contact']
|
||||
contract.contact = a['invoice.recurrence']
|
||||
contract.state = subscription.state
|
||||
|
||||
IdInitialContract = self.start.initial_contract.id
|
||||
pool = Pool()
|
||||
Contract = pool.get('optical_equipment.contract')
|
||||
contract = Contract.search(['id', '=', IdInitialContract])[0]
|
||||
contract.prorogues += (contract,)
|
||||
contract.start_date = a['start_date']
|
||||
contract.end_date = a['end_date']
|
||||
contract.invoice_address = a['invoice_address']
|
||||
contract.contact = a['contact']
|
||||
contract.invoice_recurrence = a['invoice_recurrence']
|
||||
contract.state = subscription.state
|
||||
|
||||
contract.equipments = equipment_to_subscription
|
||||
contract.prorogues += (contract.id,)
|
||||
|
||||
contract.equipments = equipments_to_subscription
|
||||
|
||||
#raise UserError(str(contract.prorogues))
|
||||
contract.save()
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user