diff --git a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java index 7d0aa415..3533c001 100644 --- a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java +++ b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java @@ -134,7 +134,8 @@ public class PurchaseOrderSupplierService { supplierPartner, purchaseOrderLinesBySupplierPartner.get(supplierPartner), purchaseOrder); createPurchaseOrderSupplierLineTCO(PurchaseOrderNew.getPurchaseOrderLineList() ,purchaseOrderLinesBySupplierPartner.get(supplierPartner)); } - + + purchaseOrder.setArchived(true); poRepo.save(purchaseOrder); } 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 472bb2c0..3830ea91 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 @@ -35,10 +35,28 @@ import com.axelor.rpc.ActionResponse; import com.google.common.base.Strings; import com.google.inject.Singleton; import java.util.stream.Collectors; +import com.axelor.meta.schema.actions.ActionView; + @Singleton public class PurchaseOrderSupplierLineController { + public void showPurchaseOrder(ActionRequest request, ActionResponse response) { + PurchaseOrderSupplierLine purchaseOrderSupplierLine = Beans.get(PurchaseOrderSupplierLineRepository.class) + .find(request.getContext().asType(PurchaseOrderSupplierLine.class).getId()); + PurchaseOrder purchaseOrder = purchaseOrderSupplierLine.getPurchaseOrderLine().getPurchaseOrder(); + response.setView( + ActionView.define("Devis fournisseur") + .model(PurchaseOrder.class.getName()) + .add("form", "purchase-order-form") + .param("show-toolbar", "false") + .param("show-confirm", "false") + .param("popup-save", "false") + .param("popup", "true") + .context("_showRecord", String.valueOf(purchaseOrder.getId())) + .map()); + } + public void accept(ActionRequest request, ActionResponse response) { PurchaseOrderSupplierLine purchaseOrderSupplierLine = diff --git a/src/main/webapp/css/modern-dark/theme.css b/src/main/webapp/css/modern-dark/theme.css index 230ff2c5..facaa58a 100644 --- a/src/main/webapp/css/modern-dark/theme.css +++ b/src/main/webapp/css/modern-dark/theme.css @@ -86,6 +86,10 @@ table.form-layout .tabbable-tabs .tab-content{ .view-tabs, .nav-tabs-strip { background: #323232 !important; +/* background: url('../../img/bg.jpg') !important; */ + /* background-repeat: no-repeat !important; */ + /* object-fit: fill !important; */ + /* background-size: 100% !important; */ } .navbar-inner { diff --git a/src/main/webapp/img/bg.jpg b/src/main/webapp/img/bg.jpg new file mode 100644 index 00000000..cd11c67b Binary files /dev/null and b/src/main/webapp/img/bg.jpg differ