From ae214d14ace28717ffe2ec9119ac099fe55e7d58 Mon Sep 17 00:00:00 2001 From: bachir souldi Date: Thu, 21 Jul 2022 14:08:10 +0100 Subject: [PATCH] fix scrollup on click action in TCO --- .../service/PurchaseOrderSupplierLineService.java | 10 ++++++++++ .../web/PurchaseOrderSupplierLineController.java | 14 +++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java index 76245ff..7685712 100644 --- a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java +++ b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java @@ -75,6 +75,16 @@ public class PurchaseOrderSupplierLineService { poSupplierLineRepo.save(purchaseOrderSupplierLine); } + @Transactional(rollbackOn = {Exception.class}) + public void refuse(PurchaseOrderSupplierLine purchaseOrderSupplierLine) throws AxelorException { + purchaseOrderSupplierLine.setStateSelect(PurchaseOrderSupplierLineRepository.STATE_NOT_ACCEPTED); + // sophal add acceptedOn and By TCO + purchaseOrderSupplierLine.setRefusalDate(appPurchaseService.getTodayDate()); + purchaseOrderSupplierLine.setRefusedByUser(AuthUtils.getUser());; + + poSupplierLineRepo.save(purchaseOrderSupplierLine); + } + public PurchaseOrderSupplierLine create(Partner supplierPartner, BigDecimal price) { return new PurchaseOrderSupplierLine( diff --git a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/web/PurchaseOrderSupplierLineController.java b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/web/PurchaseOrderSupplierLineController.java index 3830ea9..8f0a33e 100644 --- a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/web/PurchaseOrderSupplierLineController.java +++ b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/web/PurchaseOrderSupplierLineController.java @@ -78,12 +78,24 @@ public class PurchaseOrderSupplierLineController { // sophal refresh purchase order price Beans.get(PurchaseOrderService.class).computePurchaseOrder(order); Beans.get(PurchaseOrderService.class).updateCostPrice(order); - response.setReload(true); + // response.setReload(true); } catch (Exception e) { TraceBackService.trace(response, e); } } + public void refuse(ActionRequest request, ActionResponse response) { + + PurchaseOrderSupplierLine purchaseOrderSupplierLine = + Beans.get(PurchaseOrderSupplierLineRepository.class) + .find(request.getContext().asType(PurchaseOrderSupplierLine.class).getId()); + try { + Beans.get(PurchaseOrderSupplierLineService.class).refuse(purchaseOrderSupplierLine); + } catch (Exception e) { + TraceBackService.trace(response, e); + } + } + /** * Called on supplier partner select. Set the domain for the field supplierPartner *