diff --git a/mobile_service_shop/models/mobile_service.py b/mobile_service_shop/models/mobile_service.py
index a6783a183..95bf85875 100644
--- a/mobile_service_shop/models/mobile_service.py
+++ b/mobile_service_shop/models/mobile_service.py
@@ -424,7 +424,7 @@ class ProductOrderLine(models.Model):
                 'picking_id': picking.id,
                 'move_dest_id': False,
                 'state': 'draft',
-                'company_id': self.product_order_id.account_type.company_id.id,
+                'company_id': self.product_order_id.company_id.id,
                 'price_unit': price_unit,
                 'picking_type_id': picking.picking_type_id.id,
                 'procurement_id': False,
diff --git a/pos_mrp_order/static/src/js/models.js b/pos_mrp_order/static/src/js/models.js
index aa59f06ca..1997d2bb0 100644
--- a/pos_mrp_order/static/src/js/models.js
+++ b/pos_mrp_order/static/src/js/models.js
@@ -18,11 +18,11 @@ pos_screens.PaymentScreenWidget.include({
             var self = this
             this._super(force_validation);
             var order = self.pos.get_order();
-            var order_line = order.orderlines.models;
-            var list_product = []
+            var order_line = order.orderlines.models;            
             var due = order.get_due();
              for (var i in order_line)
               {
+		         var list_product = []
                  if (order_line[i].product.to_make_mrp)
                  {
                    if (order_line[i].quantity>0)