diff --git a/models/customer_purchase_order_importer.py b/models/customer_purchase_order_importer.py index b1836b573562367e35c0af2e45daa0c7dc8d90e9..47c24c6d208aa3d6844a003a8517751127f2444e 100644 --- a/models/customer_purchase_order_importer.py +++ b/models/customer_purchase_order_importer.py @@ -135,7 +135,14 @@ class CustomerPurchaseOrderImporter(models.Model): imported.append(file_name) order_vals.update(self._update_file_vals(file_vals)) - pre_sale_orders.append(self._refactor_product_vals_before_import(order_vals)) + + refactored_vals = self._refactor_product_vals_before_import(order_vals) + if refactored_vals in pre_sale_orders: + ftp.delete(import_path + file_name) + + continue + else: + pre_sale_orders.append(refactored_vals) if file_name in ftp.nlst(processed_path): ftp.delete(processed_path + file_name) @@ -930,6 +937,7 @@ class CustomerPurchaseOrderImporter(models.Model): continue product = _product.get('product') + ean13_code = '7790625001409' if product: if branch and ean13_code: self.save_branch_ean_code(branch, ean13_code, product) @@ -1038,14 +1046,14 @@ class CustomerPurchaseOrderImporter(models.Model): return purchase_order def save_branch_ean_code(self, branch, ean13_code, product): - BranchEANCode = self.env['branch.ean.code'] + BranchEanCode = self.env['branch.ean.code'] - branch_ean_code = BranchEANCode.search( - [('branch_id', '=', branch.id), ('ean13_code', '=', ean13_code), ('product_id', '=', product.id)] + branch_ean_code = BranchEanCode.search( + [('branch_id', '=', branch.id), ('ean13_code', '=', ean13_code)] ) - if not branch_ean_code: - BranchEANCode.create({'branch_id': branch.id, 'ean13_code': ean13_code, 'product_id': product.id}) + BranchEanCode.create({'branch_id': branch.id, 'ean13_code': ean13_code, 'product_id': product.id}) + def start_date_is_earlier(self, start_date, end_date): return start_date <= end_date