diff --git a/rma_analytic/models/__init__.py b/rma_analytic/models/__init__.py
index 9cf2d984..d6058afe 100644
--- a/rma_analytic/models/__init__.py
+++ b/rma_analytic/models/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
-from . import rma_order
+from . import rma_order_line
+from . import procurement
diff --git a/rma_analytic/wizards/__init__.py b/rma_analytic/wizards/__init__.py
index 741a3793..c9b61ef7 100644
--- a/rma_analytic/wizards/__init__.py
+++ b/rma_analytic/wizards/__init__.py
@@ -3,3 +3,4 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 from . import rma_add_stock_move
+from . import rma_make_picking
diff --git a/rma_analytic/wizards/rma_add_stock_move.py b/rma_analytic/wizards/rma_add_stock_move.py
index 9ef9ea05..c2f2089c 100644
--- a/rma_analytic/wizards/rma_add_stock_move.py
+++ b/rma_analytic/wizards/rma_add_stock_move.py
@@ -13,5 +13,5 @@ class RmaAddStockMove(models.TransientModel):
     def _prepare_rma_line_from_stock_move(self, sm, lot=False):
         data = super(RmaAddStockMove, self)._prepare_rma_line_from_stock_move(
             sm, lot)
-        data.update(analytic_account_id=sm.analytic_account_id)
+        data.update(analytic_account_id=sm.analytic_account_id.id)
         return data