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

enable check tco before approuving and validation

Browse Source
This commit is contained in:
bachir souldi
2022-11-13 09:18:51 +01:00
parent d1413e78ea
commit 07c02a7f53
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,7 +307,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
@Override
@Transactional(rollbackOn = {Exception.class})
public void requestPurchaseOrder(PurchaseOrder purchaseOrder) throws AxelorException {
this.checkTcoToApprove(purchaseOrder);
Boolean checkTcoEnabled = Beans.get(AppBaseService.class).getAppBase().getEnableCheckTco();
if(checkTcoEnabled){
this.checkTcoToApprove(purchaseOrder);
}
purchaseOrder.setStatusSelect(PurchaseOrderRepository.STATUS_REQUESTED);
Partner partner = purchaseOrder.getSupplierPartner();
Company company = purchaseOrder.getCompany();
@@ -474,7 +480,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
@Override
@Transactional(rollbackOn = {Exception.class})
public void validatePurchaseOrder(PurchaseOrder purchaseOrder) throws AxelorException, MalformedURLException, JSONException {
checkAllTco(purchaseOrder);
Boolean checkTcoAcceptedEnabled = Beans.get(AppBaseService.class).getAppBase().getEnableCheckTcoAccpeted();
if(checkTcoAcceptedEnabled){
checkAllTco(purchaseOrder);
}
computePurchaseOrder(purchaseOrder);
purchaseOrder.setStatusSelect(PurchaseOrderRepository.STATUS_VALIDATED);