diff --git a/purchase_stock_ux/models/purchase_order.py b/purchase_stock_ux/models/purchase_order.py
index 21569e0..2f89c58 100644
--- a/purchase_stock_ux/models/purchase_order.py
+++ b/purchase_stock_ux/models/purchase_order.py
@@ -78,9 +78,13 @@ def write(self, values):
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
-            self.check_force_delivered_status(vals)
+            self.check_force_delivered_status(vals)        
+        if self.env.context.get('from_orderpoint', False):
+            for vals in vals_list:
+                vals['user_id'] = self.env.user.id        
         return super().create(vals_list)
 
+
     @api.model
     def check_force_delivered_status(self, vals):
         if vals.get('force_delivered_status') and not self.user_has_groups('base.group_system'):
diff --git a/purchase_stock_ux/models/purchase_order_line.py b/purchase_stock_ux/models/purchase_order_line.py
index e513e46..8da8e6a 100644
--- a/purchase_stock_ux/models/purchase_order_line.py
+++ b/purchase_stock_ux/models/purchase_order_line.py
@@ -189,15 +189,6 @@ def fields_view_get(self, view_id=None, view_type='form',
 
         return res
 
-    @api.model
-    def _prepare_purchase_order_line(self, product_id, product_qty, product_uom, company_id, supplier, po):
-        res = super()._prepare_purchase_order_line(
-            product_id, product_qty, product_uom, company_id, supplier, po)
-        #copiamos user_id desde el reabastecimiento a la orden de compra
-        if not po.user_id:
-            po.user_id = self.env.user
-        return res
-
     @api.depends(
         'qty_invoiced', 'qty_received', 'order_id.state', 'qty_returned')
     def _compute_qty_invoiced(self):
diff --git a/purchase_stock_ux/models/stock_orderpoint.py b/purchase_stock_ux/models/stock_orderpoint.py
index a54462c..e10860f 100644
--- a/purchase_stock_ux/models/stock_orderpoint.py
+++ b/purchase_stock_ux/models/stock_orderpoint.py
@@ -15,4 +15,3 @@ def _get_orderpoint_values(self, product, location):
         if product.seller_ids:
             values['supplier_id'] = product.seller_ids[0].id
         return values
-
diff --git a/purchase_stock_ux/models/stock_rule.py b/purchase_stock_ux/models/stock_rule.py
index daac150..14e2318 100644
--- a/purchase_stock_ux/models/stock_rule.py
+++ b/purchase_stock_ux/models/stock_rule.py
@@ -71,3 +71,4 @@ def _make_po_get_domain(self, company_id, values, partner):
             else:
                 new_domain.append(condition)
         return tuple(new_domain)
+