Browse Source

Merge PR #443 into 12.0

Signed-off-by max3903
pull/396/merge
OCA-git-bot 5 years ago
parent
commit
971621f57b
  1. 3
      agreement_legal_sale/models/agreement.py
  2. 15
      agreement_legal_sale/models/sale_order.py

3
agreement_legal_sale/models/agreement.py

@ -9,7 +9,8 @@ class Agreement(models.Model):
sale_id = fields.Many2one('sale.order', string='Sales Order')
analytic_account_id = fields.Many2one(
'account.analytic.account', 'Analytic Account', readonly=True,
'account.analytic.account',
'Analytic Account',
copy=False)

15
agreement_legal_sale/models/sale_order.py

@ -44,3 +44,18 @@ class SaleOrder(models.Model):
'agreement_id': order.agreement_id.id,
})
return res
def action_confirm(self):
# If sale_timesheet is installed, the _action_confirm()
# may be setting an Analytic Account on the SO.
# But since it is not a dependency, that can happen after
# we create the Agreement.
# To work around that, we check if that is the case,
# and make sure the SO Analytic Account is copied to the Agreement.
res = super(SaleOrder, self).action_confirm()
for order in self:
agreement = order.agreement_id
if (order.analytic_account_id and agreement and
not agreement.analytic_account_id):
agreement.analytic_account_id = order.analytic_account_id
return res
Loading…
Cancel
Save