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

Compare commits

base: SOPHAL:5264159e1bc65d07b764f2e04b4a2f2fc359af99
Branches Tags
SOPHAL:main SOPHAL:mehdi-dev SOPHAL:feature/purchaseOrderStatus
..
compare: SOPHAL:feature/purchaseOrderStatus
Branches Tags
SOPHAL:mehdi-dev SOPHAL:feature/purchaseOrderStatus SOPHAL:main

1 Commits
5264159e1b ... feature/pu

Author SHA1 Message Date
zakaria.hachem
16d224ce63 fix:status to validated when creating an rf 2025-10-19 10:57:48 +01:00
5 changed files with 6 additions and 15 deletions
Expand all files Collapse all files

8
modules/axelor-open-suite/axelor-base/src/main/resources/domains/Product.xml
View File

@ -149,10 +149,6 @@
<boolean name="isDangerousProduct" title="Is dangerous" />
<boolean name="needDt1Validation" title="DT1 validation required" massUpdate="true"/>
<boolean name="needDt2Validation" title="DT2 validation required" massUpdate="true"/>
<boolean name="needQaQc1Validation" title="QAQC1 validation required" massUpdate="true"/>
<boolean name="needQaQc2Validation" title="QAQC2 validation required" massUpdate="true"/>
<many-to-one name="coaSpec" ref="com.axelor.meta.db.MetaFile" />
@ -213,10 +209,6 @@
<field name="shp" />
<field name="stklim" />
<field name="ug" />
<field name="needDt1Validation" />
<field name="needDt2Validation" />
<field name="needQaQc1Validation" />
<field name="needQaQc2Validation" />
<message if="true" on="UPDATE">Product updated</message>
</track>
</entity>

7
modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockLocation.xml
View File

@ -21,8 +21,6 @@
<many-to-many name="stockLocationList" ref="com.axelor.apps.stock.db.StockLocation" title="Stock locations"/>
<many-to-one name="picture" ref="com.axelor.meta.db.MetaFile" title="Photo" index="false"/>
<boolean name="needCheckInVerification" title="Check-in verification required" default="false" massUpdate="true"/>
<finder-method name="findByCompany" using="company"/>
<finder-method name="findByPartner" using="partner"/>
@ -43,11 +41,6 @@
]]></extra-code>
<track on="UPDATE">
<field name="needCheckInVerification" />
</track>
</entity>
</domain-models>

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

@ -55,6 +55,7 @@ public interface PurchaseOrderStockService {
public void updateReceiptState(PurchaseOrder purchaseOrder) throws AxelorException;
public void updateStatusSelect(PurchaseOrder purchaseOrder) throws AxelorException;
/**
* Create a query to find purchase order line of a product of a specific/all company and a
* specific/all stock location

4
modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/PurchaseOrderStockServiceImpl.java
View File

@ -551,6 +551,10 @@ public class PurchaseOrderStockServiceImpl implements PurchaseOrderStockService
purchaseOrder.setReceiptState(computeReceiptState(purchaseOrder));
}
public void updateStatusSelect(PurchaseOrder purchaseOrder) throws AxelorException {
purchaseOrder.setStatusSelect(PurchaseOrderRepository.STATUS_VALIDATED);
}
private int computeReceiptState(PurchaseOrder purchaseOrder) throws AxelorException {
if (purchaseOrder.getPurchaseOrderLineList() == null

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

@ -133,6 +133,7 @@ public class StockMoveServiceSupplychainImpl extends StockMoveServiceImpl
purchaseOrder.setReceiptState(PurchaseOrderRepository.STATE_PARTIALLY_RECEIVED);
} else {
Beans.get(PurchaseOrderStockService.class).updateReceiptState(purchaseOrder);
Beans.get(PurchaseOrderStockService.class).updateStatusSelect(purchaseOrder);
if (appSupplychain.getTerminatePurchaseOrderOnReceipt()) {
finishOrValidatePurchaseOrderStatus(purchaseOrder);