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 d68844e6..e886fe99 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 f18af81e..7309611a 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 @@ +