mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
[MIG] account_invoice_change_analytic: to 13.0
H12964
This commit is contained in:
@@ -16,7 +16,7 @@ class TestInvoiceChange(AccountTestUsers):
|
||||
'journal_id': self.journalrec.id,
|
||||
'partner_id': self.partner3.id,
|
||||
# account_id=self.account_rec1_id.id,
|
||||
'line_ids': [(0, 0, {
|
||||
'invoice_line_ids': [(0, 0, {
|
||||
'product_id': self.env.ref('product.product_product_5').id,
|
||||
'quantity': 10.0,
|
||||
'account_id': self.env['account.account'].search(
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
<xpath expr="//field[@name='state']" position="before">
|
||||
<button name="%(action_view_account_invoice_change)d" string="Change"
|
||||
type="action" class="btn-secondary"
|
||||
attrs="{'invisible': ['|', ('state', 'in', ('sale', 'done', 'cancel')), ('type', 'not in', ('out_invoice', 'out_refund'))]}"
|
||||
attrs="{'invisible': ['|', ('state', 'in', ('draft', 'cancel')), ('type', 'not in', ('out_invoice', 'out_refund'))]}"
|
||||
context="{'default_move_id': id}"
|
||||
groups="account.group_account_manager" />
|
||||
</xpath>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
'name': 'Account Invoice Change - Analytic',
|
||||
'author': 'Hibou Corp. <hello@hibou.io>',
|
||||
'version': '12.0.1.0.0',
|
||||
'version': '13.0.1.0.0',
|
||||
'category': 'Accounting',
|
||||
'sequence': 95,
|
||||
'summary': 'Change Analytic Account on Invoice.',
|
||||
|
||||
@@ -12,35 +12,48 @@ class TestWizard(TestInvoiceChange):
|
||||
|
||||
super(TestWizard, self).test_invoice_change_basic()
|
||||
# Tests Adding an Analytic Account
|
||||
self.assertFalse(self.invoice_basic.invoice_line_ids.mapped('account_analytic_id'))
|
||||
ctx = {'active_model': 'account.invoice', 'active_ids': [self.invoice_basic.id]}
|
||||
self.assertFalse(self.invoice_basic.line_ids.mapped('analytic_account_id'))
|
||||
ctx = {'active_model': 'account.move', 'active_ids': [self.invoice_basic.id]}
|
||||
change = self.env['account.invoice.change'].with_context(ctx).create({})
|
||||
change.analytic_account_id = self.analytic_account
|
||||
change.affect_change()
|
||||
self.assertTrue(self.invoice_basic.invoice_line_ids.mapped('account_analytic_id'))
|
||||
self.assertEqual(self.invoice_basic.move_id.mapped('line_ids.analytic_account_id'), self.analytic_account)
|
||||
# Do not want to set analytic account on receivable lines
|
||||
invoice_lines = self.invoice_basic.invoice_line_ids
|
||||
other_lines = self.invoice_basic.line_ids - invoice_lines
|
||||
self.assertEqual(invoice_lines.analytic_account_id, self.analytic_account)
|
||||
self.assertFalse(other_lines.analytic_account_id)
|
||||
self.assertEqual(invoice_lines.analytic_line_ids.account_id, self.analytic_account)
|
||||
|
||||
# Tests Removing Analytic Account
|
||||
new_invoice = self.invoice_basic.copy()
|
||||
new_invoice.invoice_line_ids.account_analytic_id = self.analytic_account
|
||||
new_invoice.action_invoice_open()
|
||||
self.assertEqual(new_invoice.state, 'open')
|
||||
self.assertEqual(new_invoice.move_id.mapped('line_ids.analytic_account_id'), self.analytic_account)
|
||||
ctx = {'active_model': 'account.invoice', 'active_ids': [new_invoice.id]}
|
||||
new_invoice.invoice_line_ids.analytic_account_id = self.analytic_account
|
||||
new_invoice.action_post()
|
||||
self.assertEqual(new_invoice.state, 'posted')
|
||||
self.assertEqual(new_invoice.mapped('line_ids.analytic_account_id'), self.analytic_account)
|
||||
ctx = {'active_model': 'account.move', 'active_ids': [new_invoice.id]}
|
||||
change = self.env['account.invoice.change'].with_context(ctx).create({})
|
||||
change.analytic_account_id = False
|
||||
change.affect_change()
|
||||
self.assertFalse(new_invoice.invoice_line_ids.mapped('account_analytic_id'))
|
||||
self.assertFalse(new_invoice.move_id.mapped('line_ids.analytic_account_id'))
|
||||
invoice_lines = new_invoice.invoice_line_ids
|
||||
other_lines = new_invoice.line_ids - invoice_lines
|
||||
self.assertFalse(invoice_lines.analytic_account_id)
|
||||
self.assertFalse(other_lines.analytic_account_id)
|
||||
self.assertFalse(invoice_lines.analytic_line_ids)
|
||||
|
||||
# Tests Changing Analytic Account
|
||||
new_invoice = self.invoice_basic.copy()
|
||||
new_invoice.invoice_line_ids.account_analytic_id = self.analytic_account
|
||||
new_invoice.action_invoice_open()
|
||||
self.assertEqual(new_invoice.state, 'open')
|
||||
self.assertEqual(new_invoice.move_id.mapped('line_ids.analytic_account_id'), self.analytic_account)
|
||||
ctx = {'active_model': 'account.invoice', 'active_ids': [new_invoice.id]}
|
||||
new_invoice.invoice_line_ids.analytic_account_id = self.analytic_account
|
||||
new_invoice.action_post()
|
||||
self.assertEqual(new_invoice.state, 'posted')
|
||||
invoice_lines = new_invoice.invoice_line_ids
|
||||
other_lines = new_invoice.line_ids - invoice_lines
|
||||
self.assertEqual(invoice_lines.analytic_account_id, self.analytic_account)
|
||||
self.assertFalse(other_lines.analytic_account_id)
|
||||
self.assertEqual(invoice_lines.analytic_line_ids.account_id, self.analytic_account)
|
||||
ctx = {'active_model': 'account.move', 'active_ids': [new_invoice.id]}
|
||||
change = self.env['account.invoice.change'].with_context(ctx).create({})
|
||||
change.analytic_account_id = self.analytic_account2
|
||||
change.affect_change()
|
||||
self.assertEqual(new_invoice.move_id.mapped('line_ids.analytic_account_id'), self.analytic_account2)
|
||||
self.assertEqual(invoice_lines.analytic_account_id, self.analytic_account2)
|
||||
self.assertFalse(other_lines.analytic_account_id)
|
||||
self.assertEqual(invoice_lines.analytic_line_ids.account_id, self.analytic_account2)
|
||||
|
||||
@@ -7,7 +7,7 @@ class InvoiceChangeWizard(models.TransientModel):
|
||||
analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account')
|
||||
|
||||
def _analytic_account_id(self, invoice):
|
||||
analytics = invoice.invoice_line_ids.mapped('account_analytic_id')
|
||||
analytics = invoice.invoice_line_ids.mapped('analytic_account_id')
|
||||
if len(analytics):
|
||||
return analytics[0].id
|
||||
return False
|
||||
@@ -15,27 +15,24 @@ class InvoiceChangeWizard(models.TransientModel):
|
||||
@api.model
|
||||
def default_get(self, fields):
|
||||
rec = super(InvoiceChangeWizard, self).default_get(fields)
|
||||
invoice = self.env['account.invoice'].browse(rec['invoice_id'])
|
||||
invoice = self.env['account.move'].browse(rec['move_id'])
|
||||
rec.update({
|
||||
'analytic_account_id': self._analytic_account_id(invoice),
|
||||
})
|
||||
return rec
|
||||
|
||||
|
||||
@api.multi
|
||||
def affect_change(self):
|
||||
old_analytic_id = self._analytic_account_id(self.invoice_id)
|
||||
old_analytic_id = self._analytic_account_id(self.move_id)
|
||||
res = super(InvoiceChangeWizard, self).affect_change()
|
||||
self._affect_analytic_change(old_analytic_id)
|
||||
return res
|
||||
|
||||
def _affect_analytic_change(self, old_analytic_id):
|
||||
if old_analytic_id != self.analytic_account_id.id:
|
||||
self.invoice_id.invoice_line_ids \
|
||||
.filtered(lambda l: l.account_analytic_id.id == old_analytic_id) \
|
||||
.write({'account_analytic_id': self.analytic_account_id.id})
|
||||
if self.invoice_id.move_id:
|
||||
lines_to_affect = self.invoice_id.move_id \
|
||||
.line_ids.filtered(lambda l: l.analytic_account_id.id == old_analytic_id)
|
||||
lines_to_affect.write({'analytic_account_id': self.analytic_account_id.id})
|
||||
lines_to_affect.create_analytic_lines()
|
||||
lines_to_affect = self.move_id.invoice_line_ids \
|
||||
.filtered(lambda l: l.analytic_account_id.id == old_analytic_id)
|
||||
lines_to_affect.write({
|
||||
'analytic_account_id': self.analytic_account_id.id,
|
||||
'analytic_line_ids': [(5, 0, 0)],
|
||||
})
|
||||
lines_to_affect.create_analytic_lines()
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<field name="inherit_id" ref="account_invoice_change.account_invoice_change_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//group[@name='group_right']" position="inside">
|
||||
<field name="analytic_account_id" domain="[('company_id', '=', invoice_company_id)]"/>
|
||||
<field name="analytic_account_id" domain="[('company_id', '=', move_company_id)]"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
Reference in New Issue
Block a user