From 8f7c1fe9c3a0ef0da7e61295544184bf19571584 Mon Sep 17 00:00:00 2001
From: bachir souldi <bachir.souldi@sophal.net>
Date: Wed, 31 Aug 2022 09:25:17 +0100
Subject: [PATCH] add purchase type and its inheritance

---
 .../apps/purchase/service/PurchaseRequestServiceImpl.java   | 1 +
 .../src/main/resources/domains/PurchaseOrder.xml            | 3 +++
 .../src/main/resources/domains/PurchaseRequest.xml          | 2 ++
 .../axelor-purchase/src/main/resources/views/Selects.xml    | 6 ++++++
 .../service/PurchaseOrderSupplierService.java               | 1 +
 5 files changed, 13 insertions(+)

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 c76c4d44..ac3b52a4 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<PurchaseOrder> hash_Set = new HashSet<PurchaseOrder>();
       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 f7834372..d30c0686 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 @@
 	<many-to-one name="cancelReason" title="Cancel reason" ref="com.axelor.apps.base.db.CancelReason"/>
 	<string name="cancelReasonStr" title="Cancel Reason" large="true"/>
 	
+	<many-to-many name="purchaseRequestSet" ref="com.axelor.apps.purchase.db.PurchaseRequest" mappedBy="purchaseOrderSet" title="Purchase Request" />
 
+	<integer name="purchaseType" title="Purchase Type" selection="purchase.request.project.select"/>
+	
   	<unique-constraint columns="purchaseOrderSeq,company"/>
   	
   	<extra-code>
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 d6b28569..acb4ae6f 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 @@
 	
 	<many-to-one name="printingSettings" ref="com.axelor.apps.base.db.PrintingSettings"/>
 
+	<integer name="purchaseType" title="Purchase Type" selection="purchase.request.project.select"/>
+
     <unique-constraint columns="purchaseRequestSeq"/>
 
     <extra-code>
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 6242aeb4..783066e4 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 @@
 		<option value="8">Canceled</option>
 	</selection>
 
+	<selection name="purchase.request.type.select">
+		<option value="1">Projet</option>
+		<option value="2">Routine</option>
+		<option value="3">Maintenance</option>
+	</selection>
+
 	<selection name="base.blocking.select" id="purchase.blocking.select">
 		<option value="6">Purchase blocking</option>
 	</selection>
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 2402a8ff..94038f57 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);