From 043cf6d151ad2d81f1a530c268429908755970e7 Mon Sep 17 00:00:00 2001
From: bachir souldi <bachir.souldi@sophal.net>
Date: Mon, 17 Oct 2022 13:13:26 +0100
Subject: [PATCH] add file type and CDR other than DZD

---
 .../axelor/apps/purchase/service/PurchaseOrderServiceImpl.java | 3 ++-
 .../src/main/resources/domains/ImportationFolder.xml           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java
index d68844e..e886fe9 100644
--- a/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java
@@ -608,6 +608,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     importationFolder.setPurchaseOrderList(purchaseOrders);
     importationFolder.setCurrency(purchaseOrder.getCurrency());
     importationFolder.setProgress(10);
+    importationFolder.setSupplierPartner(purchaseOrder.getSupplierPartner());
 
 
     BigDecimal amount = BigDecimal.ZERO;
@@ -616,7 +617,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 
 
-    if(purchaseOrder.getCurrency().getId() == 148 || purchaseOrder.getCurrency().getId() == 46){
+    if(purchaseOrder.getCurrency().getId() != 41){
         Currency currency = Beans.get(CurrencyRepository.class).find(purchaseOrder.getCurrency().getId());
         Currency currencyDzd = Beans.get(CurrencyRepository.class).findByCode("DZD");
         BigDecimal currencyAmount = Beans.get(CurrencyService.class).getCurrencyConversionRate(currency, currencyDzd);
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml
index f18af81..7309611 100644
--- a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml
@@ -96,6 +96,7 @@
 
 		<string name="tracking_website" selection="purchase.importation.folder.website.selection" title="Tracking website" />
 
+		<string name="file_type" selection="purchase.importation.folder.file.type" title="File type" />
 
 		<extra-code>
 			<![CDATA[