diff --git a/account_invoice_change/tests/test_invoice_change.py b/account_invoice_change/tests/test_invoice_change.py
index 93209226..da433052 100644
--- a/account_invoice_change/tests/test_invoice_change.py
+++ b/account_invoice_change/tests/test_invoice_change.py
@@ -1,10 +1,11 @@
-from odoo.addons.account.tests.account_test_users import AccountTestUsers
 from odoo import fields
+from odoo.tests import tagged
+from odoo.addons.account.tests.account_test_users import AccountTestUsers
 
 
-class TestInvoiceChange(AccountTestUsers):
-
-    def test_invoice_change_basic(self):
+class InvoiceChangeCommon(AccountTestUsers):
+    def setUp(self):
+        super().setUp()
         self.account_invoice_obj = self.env['account.move']
         self.payment_term = self.env.ref('account.account_payment_term_advance')
         self.journalrec = self.env['account.journal'].search([('type', '=', 'sale')])[0]
@@ -25,6 +26,11 @@ class TestInvoiceChange(AccountTestUsers):
                 'price_unit': 100.00,
             })],
         })
+
+
+@tagged('post_install', '-at_install')
+class TestInvoiceChange(InvoiceChangeCommon):
+    def test_invoice_change_basic(self):
         self.assertEqual(self.invoice_basic.state, 'draft')
         self.invoice_basic.action_post()
         self.assertEqual(self.invoice_basic.state, 'posted')
diff --git a/account_invoice_change_analytic/tests/test_invoice_change.py b/account_invoice_change_analytic/tests/test_invoice_change.py
index 5c3ad74c..962ad769 100644
--- a/account_invoice_change_analytic/tests/test_invoice_change.py
+++ b/account_invoice_change_analytic/tests/test_invoice_change.py
@@ -1,59 +1,116 @@
-from odoo.addons.account_invoice_change.tests.test_invoice_change import TestInvoiceChange
+from odoo.tests import tagged, Form
+from odoo.addons.account_invoice_change.tests.test_invoice_change import InvoiceChangeCommon
 
 
-class TestWizard(TestInvoiceChange):
-    def test_invoice_change_basic(self):
+@tagged('post_install', '-at_install')
+class TestWizard(InvoiceChangeCommon):
+    def setUp(self):
+        super().setUp()
         self.analytic_account = self.env['account.analytic.account'].create({
             'name': 'test account',
         })
         self.analytic_account2 = self.env['account.analytic.account'].create({
             'name': 'test account2',
         })
-
-        super(TestWizard, self).test_invoice_change_basic()
+        self.analytic_account3 = self.env['account.analytic.account'].create({
+            'name': 'test account3',
+        })
+        self.analytic_tag1 = self.env['account.analytic.tag'].create({
+            'name': 'Tag 1',
+            'active_analytic_distribution': True,
+            'analytic_distribution_ids': [
+                (0, 0, {'account_id': self.analytic_account.id, 'percentage': 30.0}),
+                (0, 0, {'account_id': self.analytic_account2.id, 'percentage': 70.0}),
+            ],
+        })
+        self.analytic_tag2 = self.env['account.analytic.tag'].create({
+            'name': 'Tag 2',
+            'active_analytic_distribution': True,
+            'analytic_distribution_ids': [
+                (0, 0, {'account_id': self.analytic_account.id, 'percentage': 60.0}),
+                (0, 0, {'account_id': self.analytic_account3.id, 'percentage': 40.0}),
+            ],
+        })
+    
+    def test_invoice_change_analytic_account(self):
+        self.assertEqual(self.invoice_basic.state, 'draft')
+        self.invoice_basic.action_post()
+        self.assertEqual(self.invoice_basic.state, 'posted')
+        
         # Tests Adding an Analytic Account
         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 = Form(self.env['account.invoice.change'].with_context(ctx))
         change.analytic_account_id = self.analytic_account
-        change.affect_change()
+        change.save().affect_change()
         # 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 Changing Analytic Account
+        ctx = {'active_model': 'account.move', 'active_ids': [self.invoice_basic.id]}
+        change = Form(self.env['account.invoice.change'].with_context(ctx))
+        change.analytic_account_id = self.analytic_account2
+        change.save().affect_change()
+        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)
 
         # Tests Removing Analytic Account
-        new_invoice = self.invoice_basic.copy()
-        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()
-        invoice_lines = new_invoice.invoice_line_ids
-        other_lines = new_invoice.line_ids - invoice_lines
+        ctx = {'active_model': 'account.move', 'active_ids': [self.invoice_basic.id]}
+        change = Form(self.env['account.invoice.change'].with_context(ctx))
+        change.analytic_account_id = self.env['account.analytic.account']
+        change.save().affect_change()
         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.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(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)
+        
+    
+    def test_invoice_change_analytic_tags(self):
+        invoice_lines = self.invoice_basic.invoice_line_ids
+        other_lines = self.invoice_basic.line_ids - invoice_lines
+        
+        self.assertEqual(self.invoice_basic.state, 'draft')
+        invoice_lines.analytic_tag_ids = self.analytic_tag1
+        self.invoice_basic.action_post()
+        self.assertEqual(self.invoice_basic.state, 'posted')
+        
+        self.assertEqual(invoice_lines.analytic_line_ids.mapped(lambda l: (l.account_id, l.amount)), 
+                         [(self.analytic_account, 300.0),
+                          (self.analytic_account2, 700.0)])
+        
+        # Tests Adding an Analytic Account Tag
+        self.assertFalse(self.invoice_basic.line_ids.mapped('analytic_account_id'))
+        ctx = {'active_model': 'account.move', 'active_ids': [self.invoice_basic.id]}
+        change = Form(self.env['account.invoice.change'].with_context(ctx))
+        change.update_tags = 'add'
+        change.analytic_tag_ids.add(self.analytic_tag2)
+        change.save().affect_change()
+        
+        self.assertEqual(invoice_lines.analytic_tag_ids, self.analytic_tag1 | self.analytic_tag2)
+        self.assertFalse(other_lines.analytic_tag_ids)
+        self.assertEqual(invoice_lines.analytic_line_ids.mapped(lambda l: (l.account_id, l.amount)), 
+                         [(self.analytic_account, 300.0),
+                          (self.analytic_account2, 700.0),
+                          (self.analytic_account, 600.0),
+                          (self.analytic_account3, 400.0)])
+        
+        # Tests Replacing all Analytic Account Tags
+        self.assertFalse(self.invoice_basic.line_ids.mapped('analytic_account_id'))
+        ctx = {'active_model': 'account.move', 'active_ids': [self.invoice_basic.id]}
+        change = Form(self.env['account.invoice.change'].with_context(ctx))
+        self.assertEqual(change.analytic_tag_ids[:], self.analytic_tag1 | self.analytic_tag2)
+        change.update_tags = 'set'
+        change.analytic_tag_ids.clear()
+        change.analytic_tag_ids.add(self.analytic_tag2)
+        change.save().affect_change()
+        
+        self.assertEqual(invoice_lines.analytic_tag_ids, self.analytic_tag2)
+        self.assertFalse(other_lines.analytic_tag_ids)
+        self.assertEqual(invoice_lines.analytic_line_ids.mapped(lambda l: (l.account_id, l.amount)), 
+                         [(self.analytic_account, 600.0),
+                          (self.analytic_account3, 400.0)])
diff --git a/account_invoice_change_analytic/wizard/invoice_change.py b/account_invoice_change_analytic/wizard/invoice_change.py
index 9c739271..2a5cca58 100644
--- a/account_invoice_change_analytic/wizard/invoice_change.py
+++ b/account_invoice_change_analytic/wizard/invoice_change.py
@@ -5,6 +5,12 @@ class InvoiceChangeWizard(models.TransientModel):
     _inherit = 'account.invoice.change'
 
     analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account')
+    update_tags = fields.Selection(selection=[
+        ('no', 'Do not update tags'),
+        ('add', 'Add to tags'),
+        ('set', 'Set tags'),
+    ], default='no', string='Update Analytic Tags')
+    analytic_tag_ids = fields.Many2many('account.analytic.tag', string='Analytic Tags')
 
     def _analytic_account_id(self, invoice):
         analytics = invoice.invoice_line_ids.mapped('analytic_account_id')
@@ -18,21 +24,30 @@ class InvoiceChangeWizard(models.TransientModel):
         invoice = self.env['account.move'].browse(rec['move_id'])
         rec.update({
             'analytic_account_id': self._analytic_account_id(invoice),
+            'analytic_tag_ids': [(6, 0, invoice.invoice_line_ids.analytic_tag_ids.ids)],
         })
         return rec
 
     def affect_change(self):
-        old_analytic_id = self._analytic_account_id(self.move_id)
         res = super(InvoiceChangeWizard, self).affect_change()
-        self._affect_analytic_change(old_analytic_id)
+        self._affect_analytic_change()
         return res
+    
+    def _prepare_analytic_values(self):
+        vals = {
+            'analytic_account_id': self.analytic_account_id.id,
+            'analytic_line_ids': [(5, 0, 0)],
+        }
+        tag_commands = []
+        if self.update_tags == 'add':
+            tag_commands = [(4, tag.id, 0) for tag in self.analytic_tag_ids]
+        if self.update_tags == 'set':
+            tag_commands = [(6, 0, self.analytic_tag_ids.ids)]
+        if tag_commands:
+            vals['analytic_tag_ids'] = tag_commands
+        return vals
 
-    def _affect_analytic_change(self, old_analytic_id):
-        if old_analytic_id != self.analytic_account_id.id:
-            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()
+    def _affect_analytic_change(self):
+        lines_to_affect = self.move_id.invoice_line_ids
+        lines_to_affect.write(self._prepare_analytic_values())
+        lines_to_affect.create_analytic_lines()
diff --git a/account_invoice_change_analytic/wizard/invoice_change_views.xml b/account_invoice_change_analytic/wizard/invoice_change_views.xml
index 8ae97f73..0c9747ac 100644
--- a/account_invoice_change_analytic/wizard/invoice_change_views.xml
+++ b/account_invoice_change_analytic/wizard/invoice_change_views.xml
@@ -6,7 +6,15 @@
         <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', '=', move_company_id)]"/>
+                <field name="analytic_account_id"
+                       domain="['|', ('company_id', '=', False), ('company_id', '=', move_company_id)]"
+                       groups="analytic.group_analytic_accounting"/>
+                <field name="update_tags" groups="analytic.group_analytic_tags"/>
+                <field name="analytic_tag_ids"
+                       domain="['|', ('company_id', '=', False), ('company_id', '=', move_company_id)]"
+                       groups="analytic.group_analytic_tags"
+                       attrs="{'invisible': [('update_tags', '=', 'no')]}"
+                       widget="many2many_tags"/>
             </xpath>
         </field>
     </record>