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

add purchase type and its inheritance

Browse Source
This commit is contained in:
bachir souldi
2022-08-31 09:25:17 +01:00
parent bbc3b52e90
commit 8f7c1fe9c3
5 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,6 +138,7 @@ public class PurchaseRequestServiceImpl implements PurchaseRequestService {
purchaseOrder.getPurchaseOrderLineList().addAll(purchaseOrderLineList); purchaseOrder.getPurchaseOrderLineList().addAll(purchaseOrderLineList);
purchaseOrderService.computePurchaseOrder(purchaseOrder); purchaseOrderService.computePurchaseOrder(purchaseOrder);
purchaseOrder.setPurchaseRequestOrigin(purchaseRequest); purchaseOrder.setPurchaseRequestOrigin(purchaseRequest);
purchaseOrder.setPurchaseType(purchaseRequest.getPurchaseType());
purchaseOrderRepo.save(purchaseOrder); purchaseOrderRepo.save(purchaseOrder);
Set<PurchaseOrder> hash_Set = new HashSet<PurchaseOrder>(); Set<PurchaseOrder> hash_Set = new HashSet<PurchaseOrder>();
hash_Set.add(purchaseOrder); hash_Set.add(purchaseOrder);

3
modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml
View File

@@ -73,6 +73,9 @@
<many-to-one name="cancelReason" title="Cancel reason" ref="com.axelor.apps.base.db.CancelReason"/> <many-to-one name="cancelReason" title="Cancel reason" ref="com.axelor.apps.base.db.CancelReason"/>
<string name="cancelReasonStr" title="Cancel Reason" large="true"/> <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"/> <unique-constraint columns="purchaseOrderSeq,company"/>

2
modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseRequest.xml
View File

@@ -33,6 +33,8 @@
<many-to-one name="printingSettings" ref="com.axelor.apps.base.db.PrintingSettings"/> <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"/> <unique-constraint columns="purchaseRequestSeq"/>
<extra-code> <extra-code>

6
modules/axelor-open-suite/axelor-purchase/src/main/resources/views/Selects.xml
View File

@@ -43,6 +43,12 @@
<option value="8">Canceled</option> <option value="8">Canceled</option>
</selection> </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"> <selection name="base.blocking.select" id="purchase.blocking.select">
<option value="6">Purchase blocking</option> <option value="6">Purchase blocking</option>
</selection> </selection>

1
modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java
View File

@@ -297,6 +297,7 @@ public class PurchaseOrderSupplierService {
purchaseOrder.setStatusSelect(PurchaseOrderRepository.STATUS_REQUESTED); purchaseOrder.setStatusSelect(PurchaseOrderRepository.STATUS_REQUESTED);
purchaseOrder.setReceiptState(PurchaseOrderRepository.STATE_NOT_RECEIVED); purchaseOrder.setReceiptState(PurchaseOrderRepository.STATE_NOT_RECEIVED);
purchaseOrder.setPurchaseRequestOrigin(parentPurchaseOrder.getPurchaseRequestOrigin()); purchaseOrder.setPurchaseRequestOrigin(parentPurchaseOrder.getPurchaseRequestOrigin());
purchaseOrder.setPurchaseType(parentPurchaseOrder.getPurchaseType());
// copy description from parent po // copy description from parent po
purchaseOrder.setNotes(parentPurchaseOrder.getNotes());; purchaseOrder.setNotes(parentPurchaseOrder.getNotes());;
poRepo.save(purchaseOrder); poRepo.save(purchaseOrder);