diff --git a/rma_purchase_analytic/README.rst b/rma_purchase_analytic/README.rst
index a6cb2af1f..aa23b7aea 100644
--- a/rma_purchase_analytic/README.rst
+++ b/rma_purchase_analytic/README.rst
@@ -23,10 +23,10 @@ Usage
 Contributors
 ------------
 
-* Aaron Henriquez <ahenriquez@eficent.com>
+* Aaron Henriquez <aaron.henriquez@forgeflow.com>
 
 
 Maintainer
 ----------
 
-This module is maintained by Eficent.
+This module is maintained by ForgeFlow.
diff --git a/rma_purchase_analytic/__manifest__.py b/rma_purchase_analytic/__manifest__.py
index 70b19ff10..1bd2b706d 100644
--- a/rma_purchase_analytic/__manifest__.py
+++ b/rma_purchase_analytic/__manifest__.py
@@ -1,14 +1,13 @@
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2023 ForgeFlow S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
 {
     "name": "Analytic Account in RMA purchase",
-    "version": "10.0.1.0.0",
-    "author": "Eficent," "Odoo Community Association (OCA)",
-    "license": "LGPL-3",
+    "version": "15.0.1.0.0",
+    "author": "ForgeFlow," "Odoo Community Association (OCA)",
+    "license": "AGPL-3",
     "website": "https://github.com/ForgeFlow/stock-rma",
     "category": "Analytic",
     "depends": ["rma_account", "rma_analytic", "purchase_analytic"],
-    "data": [],
     "installable": True,
 }
diff --git a/rma_purchase_analytic/models/purchase_order_line.py b/rma_purchase_analytic/models/purchase_order_line.py
index e1e953f14..f3fa5d8a2 100644
--- a/rma_purchase_analytic/models/purchase_order_line.py
+++ b/rma_purchase_analytic/models/purchase_order_line.py
@@ -1,4 +1,4 @@
-# © 2018 Eficent Business and IT Consulting Services S.L.
+# Copyright 2023 ForgeFlow S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
 from odoo import _, api, exceptions, models
diff --git a/rma_purchase_analytic/wizards/__init__.py b/rma_purchase_analytic/wizards/__init__.py
index 4be361297..ddd67e8f1 100644
--- a/rma_purchase_analytic/wizards/__init__.py
+++ b/rma_purchase_analytic/wizards/__init__.py
@@ -1,4 +1,3 @@
-# © 2018 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 from . import rma_add_purchase
diff --git a/rma_purchase_analytic/wizards/rma_add_purchase.py b/rma_purchase_analytic/wizards/rma_add_purchase.py
index 75766ec34..51349bb33 100644
--- a/rma_purchase_analytic/wizards/rma_add_purchase.py
+++ b/rma_purchase_analytic/wizards/rma_add_purchase.py
@@ -1,4 +1,4 @@
-# © 2018 Eficent Business and IT Consulting Services S.L.
+# Copyright 2023 ForgeFlow S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 from odoo import api, models
@@ -10,7 +10,7 @@ class RmaAddPurchase(models.TransientModel):
     @api.model
     def _prepare_rma_line_from_po_line(self, line):
         data = super(RmaAddPurchase, self)._prepare_rma_line_from_po_line(line)
-        data.update(analytic_account_id=line.analytic_account_id.id)
+        data.update(analytic_account_id=line.account_analytic_id.id)
         return data
 
 
diff --git a/setup/rma_purchase_analytic/odoo/__init__.py b/setup/rma_purchase_analytic/odoo/__init__.py
deleted file mode 100644
index de40ea7ca..000000000
--- a/setup/rma_purchase_analytic/odoo/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/rma_purchase_analytic/odoo/addons/__init__.py b/setup/rma_purchase_analytic/odoo/addons/__init__.py
deleted file mode 100644
index de40ea7ca..000000000
--- a/setup/rma_purchase_analytic/odoo/addons/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)