Compare commits
1 Commits
feature/su
...
feature/pu
| Author | SHA1 | Date | |
|---|---|---|---|
| 16d224ce63 |
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -135,9 +135,6 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
|
||||
stockMove, purchaseOrderRepo.find(origin), qtyToInvoiceMap);
|
||||
} else {
|
||||
invoice = createInvoiceFromOrderlessStockMove(stockMove, qtyToInvoiceMap);
|
||||
invoice.setExTaxTotal(stockMove.getExTaxTotal());
|
||||
BigDecimal inTaxTotal = invoice.getExTaxTotal().add(invoice.getExTaxTotal().multiply(invoice.getTaxTotal())).setScale(2, RoundingMode.HALF_UP);
|
||||
invoice.setInTaxTotal(inTaxTotal);
|
||||
}
|
||||
return invoice;
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
Reference in New Issue
Block a user