SOPHAL/CRM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add file type and CDR other than DZD

Browse Source
This commit is contained in:
bachir souldi
2022-10-17 13:13:26 +01:00
parent 34cc097d45
commit 043cf6d151
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java
View File

@@ -608,6 +608,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
importationFolder.setPurchaseOrderList(purchaseOrders); importationFolder.setPurchaseOrderList(purchaseOrders);
importationFolder.setCurrency(purchaseOrder.getCurrency()); importationFolder.setCurrency(purchaseOrder.getCurrency());
importationFolder.setProgress(10); importationFolder.setProgress(10);
importationFolder.setSupplierPartner(purchaseOrder.getSupplierPartner());
BigDecimal amount = BigDecimal.ZERO; 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 currency = Beans.get(CurrencyRepository.class).find(purchaseOrder.getCurrency().getId());
Currency currencyDzd = Beans.get(CurrencyRepository.class).findByCode("DZD"); Currency currencyDzd = Beans.get(CurrencyRepository.class).findByCode("DZD");
BigDecimal currencyAmount = Beans.get(CurrencyService.class).getCurrencyConversionRate(currency, currencyDzd); BigDecimal currencyAmount = Beans.get(CurrencyService.class).getCurrencyConversionRate(currency, currencyDzd);

1
modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml
View File

@@ -96,6 +96,7 @@
<string name="tracking_website" selection="purchase.importation.folder.website.selection" title="Tracking website" /> <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> <extra-code>
<![CDATA[ <![CDATA[