diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseRequestServiceImpl.java b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseRequestServiceImpl.java index c76c4d4..ac3b52a 100644 --- a/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseRequestServiceImpl.java +++ b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseRequestServiceImpl.java @@ -138,6 +138,7 @@ public class PurchaseRequestServiceImpl implements PurchaseRequestService { purchaseOrder.getPurchaseOrderLineList().addAll(purchaseOrderLineList); purchaseOrderService.computePurchaseOrder(purchaseOrder); purchaseOrder.setPurchaseRequestOrigin(purchaseRequest); + purchaseOrder.setPurchaseType(purchaseRequest.getPurchaseType()); purchaseOrderRepo.save(purchaseOrder); Set hash_Set = new HashSet(); hash_Set.add(purchaseOrder); diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml index f783437..d30c068 100644 --- a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml +++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml @@ -73,7 +73,10 @@ + + + diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseRequest.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseRequest.xml index d6b2856..acb4ae6 100644 --- a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseRequest.xml +++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseRequest.xml @@ -33,6 +33,8 @@ + + diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/Selects.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/Selects.xml index 6242aeb..783066e 100644 --- a/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/Selects.xml +++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/Selects.xml @@ -43,6 +43,12 @@ + + + + + + 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 2402a8f..94038f5 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 @@ -297,6 +297,7 @@ public class PurchaseOrderSupplierService { purchaseOrder.setStatusSelect(PurchaseOrderRepository.STATUS_REQUESTED); purchaseOrder.setReceiptState(PurchaseOrderRepository.STATE_NOT_RECEIVED); purchaseOrder.setPurchaseRequestOrigin(parentPurchaseOrder.getPurchaseRequestOrigin()); + purchaseOrder.setPurchaseType(parentPurchaseOrder.getPurchaseType()); // copy description from parent po purchaseOrder.setNotes(parentPurchaseOrder.getNotes());; poRepo.save(purchaseOrder);