audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] Ensure Analytic Account is copied from SO to Agreement

Browse Source
This commit is contained in:
Daniel Reis
2019-12-17 13:30:51 +00:00
committed by Patrick Wilson
parent 2c370b6208
commit fcba25441c
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
agreement_legal_sale/models/agreement.py
View File

@@ -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
View File

@@ -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