diff --git a/account_payment_line_manual_account/models/account_payment_line.py b/account_payment_line_manual_account/models/account_payment_line.py
index 5f58592..e155c9c 100644
--- a/account_payment_line_manual_account/models/account_payment_line.py
+++ b/account_payment_line_manual_account/models/account_payment_line.py
@@ -12,6 +12,10 @@ class AccountPaymentLine(models.Model):
         'account.account',
         compute="_compute_account_id", store=True, readonly=False, check_company=True,
         domain="[('company_id', '=', company_id), ('deprecated', '=', False)]")
+    analytic_account_id = fields.Many2one(
+        'account.analytic.account', string='Analytic Account',
+        domain="[('company_id', 'in', [False, company_id])]",
+        check_company=True)
 
     @api.depends('move_line_id', 'partner_id')
     def _compute_account_id(self):
@@ -29,5 +33,6 @@ class AccountPaymentLine(models.Model):
     def payment_line_hashcode(self):
         hashcode = super().payment_line_hashcode()
         account_str = str(self.account_id.id or False)
-        hashcode = '-'.join([hashcode, account_str])
+        analytic_account_str = str(self.analytic_account_id.id or False)
+        hashcode = '-'.join([hashcode, account_str, analytic_account_str])
         return hashcode
diff --git a/account_payment_line_manual_account/models/account_payment_order.py b/account_payment_line_manual_account/models/account_payment_order.py
index d698190..4d44a2e 100644
--- a/account_payment_line_manual_account/models/account_payment_order.py
+++ b/account_payment_line_manual_account/models/account_payment_order.py
@@ -11,5 +11,8 @@ class AccountPaymentOrder(models.Model):
     def _prepare_move_line_partner_account(self, bank_line):
         vals = super()._prepare_move_line_partner_account(bank_line)
         if not bank_line.payment_line_ids[0].move_line_id:
-            vals['account_id'] = bank_line.payment_line_ids[0].account_id.id
+            vals.update({
+                'account_id': bank_line.payment_line_ids[0].account_id.id,
+                'analytic_account_id': bank_line.payment_line_ids[0].analytic_account_id.id or False,
+                })
         return vals
diff --git a/account_payment_line_manual_account/views/account_payment_line.xml b/account_payment_line_manual_account/views/account_payment_line.xml
index a5e150b..9c8c063 100644
--- a/account_payment_line_manual_account/views/account_payment_line.xml
+++ b/account_payment_line_manual_account/views/account_payment_line.xml
@@ -15,6 +15,7 @@
     <field name="arch" type="xml">
         <field name="company_id" position="after">
             <field name="account_id" attrs="{'invisible': [('move_line_id', '!=', False)], 'required': [('move_line_id', '=', False)]}"/>
+            <field name="analytic_account_id" attrs="{'invisible': [('move_line_id', '!=', False)]}" groups="analytic.group_analytic_accounting"/>
         </field>
     </field>
 </record>
@@ -25,6 +26,7 @@
     <field name="arch" type="xml">
         <field name="move_line_id" position="after">
             <field name="account_id" optional="hide"/>
+            <field name="analytic_account_id" optional="hide" groups="analytic.group_analytic_accounting"/>
         </field>
     </field>
 </record>