diff --git a/models/customer_purchase_order_importer.py b/models/customer_purchase_order_importer.py
index 3f32bc072bb2073c509f4e95cfbb4c53a91bf6e7..91e5b00ee0d8e9f8f23474f526c6667b5600495f 100644
--- a/models/customer_purchase_order_importer.py
+++ b/models/customer_purchase_order_importer.py
@@ -97,14 +97,14 @@ class CustomerPurchaseOrderImporter(models.Model):
                     continue
                 else:
                     partner = file_vals['partner']
-                    config = self.get_config(partner)
+                    configs = self.get_config(partner)
                     config_type = 'basic'
 
-                    if config:
-                        for c in config:
-                            if c.config_type:
-                                if c.config_type != 'internal_code':
-                                    config_type = c.config_type
+                    if configs:
+                        for config in configs:
+                            if config.config_type:
+                                if config.config_type != 'internal_code':
+                                    config_type = config.config_type
 
                             try:
                                 order_vals.update(
@@ -135,7 +135,7 @@ class CustomerPurchaseOrderImporter(models.Model):
                     imported.append(file_name)
 
                     order_vals.update(self._update_file_vals(file_vals))
-    
+
                     refactored_vals = self._refactor_product_vals_before_import(order_vals)
                     if refactored_vals in pre_sale_orders:
                         ftp.delete(import_path + file_name)
@@ -171,6 +171,7 @@ class CustomerPurchaseOrderImporter(models.Model):
         _logger.info(_('Purchase order files import finished!'))
 
         if manual_import:
+            self.env.cr.commit()
             raise UserError(msg)
 
     def get_branch(self, ean_code, product_type):
@@ -285,13 +286,13 @@ class CustomerPurchaseOrderImporter(models.Model):
         return vals
 
     def get_config_internal_code(self, partner):
-        _config = self.get_config(partner)
+        _configs = self.get_config(partner)
         config = None
 
-        if _config:
-            for c in _config:
-                if c.config_type == 'internal_code':
-                    config = c
+        if _configs:
+            for _config in _configs:
+                if _config.config_type == 'internal_code':
+                    config = _config
                     break
 
         return config