Compare commits
1 Commits
feature/pu
...
feature/su
| Author | SHA1 | Date | |
|---|---|---|---|
| c9c107d39a |
@ -55,7 +55,6 @@ public interface PurchaseOrderStockService {
|
|||||||
|
|
||||||
public void updateReceiptState(PurchaseOrder purchaseOrder) throws AxelorException;
|
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
|
* Create a query to find purchase order line of a product of a specific/all company and a
|
||||||
* specific/all stock location
|
* specific/all stock location
|
||||||
|
|||||||
@ -551,10 +551,6 @@ public class PurchaseOrderStockServiceImpl implements PurchaseOrderStockService
|
|||||||
purchaseOrder.setReceiptState(computeReceiptState(purchaseOrder));
|
purchaseOrder.setReceiptState(computeReceiptState(purchaseOrder));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateStatusSelect(PurchaseOrder purchaseOrder) throws AxelorException {
|
|
||||||
purchaseOrder.setStatusSelect(PurchaseOrderRepository.STATUS_VALIDATED);
|
|
||||||
}
|
|
||||||
|
|
||||||
private int computeReceiptState(PurchaseOrder purchaseOrder) throws AxelorException {
|
private int computeReceiptState(PurchaseOrder purchaseOrder) throws AxelorException {
|
||||||
|
|
||||||
if (purchaseOrder.getPurchaseOrderLineList() == null
|
if (purchaseOrder.getPurchaseOrderLineList() == null
|
||||||
|
|||||||
@ -135,6 +135,9 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
|
|||||||
stockMove, purchaseOrderRepo.find(origin), qtyToInvoiceMap);
|
stockMove, purchaseOrderRepo.find(origin), qtyToInvoiceMap);
|
||||||
} else {
|
} else {
|
||||||
invoice = createInvoiceFromOrderlessStockMove(stockMove, qtyToInvoiceMap);
|
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;
|
return invoice;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -133,7 +133,6 @@ public class StockMoveServiceSupplychainImpl extends StockMoveServiceImpl
|
|||||||
purchaseOrder.setReceiptState(PurchaseOrderRepository.STATE_PARTIALLY_RECEIVED);
|
purchaseOrder.setReceiptState(PurchaseOrderRepository.STATE_PARTIALLY_RECEIVED);
|
||||||
} else {
|
} else {
|
||||||
Beans.get(PurchaseOrderStockService.class).updateReceiptState(purchaseOrder);
|
Beans.get(PurchaseOrderStockService.class).updateReceiptState(purchaseOrder);
|
||||||
Beans.get(PurchaseOrderStockService.class).updateStatusSelect(purchaseOrder);
|
|
||||||
|
|
||||||
if (appSupplychain.getTerminatePurchaseOrderOnReceipt()) {
|
if (appSupplychain.getTerminatePurchaseOrderOnReceipt()) {
|
||||||
finishOrValidatePurchaseOrderStatus(purchaseOrder);
|
finishOrValidatePurchaseOrderStatus(purchaseOrder);
|
||||||
|
|||||||
Reference in New Issue
Block a user