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

add (ppa - pvg - ug - shp - stklim) inheritance (saleOrder stockMove Invoice(s))

Browse Source
This commit is contained in:
bachir souldi
2023-01-16 12:53:03 +01:00
parent 1aaebb5d56
commit 039a38f0f7
10 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -455,6 +455,11 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
for (InvoiceLine invoiceLine : invoiceLines) {
invoiceLine.setStockMoveLine(stockMoveLine);
invoiceLine.setTrackingNumber(stockMoveLine.getTrackingNumber());
invoiceLine.setPvg(stockMoveLine.getPvg());
invoiceLine.setPpa(stockMoveLine.getPpa());
invoiceLine.setUg(stockMoveLine.getUg());
invoiceLine.setShp(stockMoveLine.getShp());
invoiceLine.setStklim(stockMoveLine.getStklim());
}
return invoiceLines;
}

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

@@ -121,6 +121,11 @@ public class StockMoveLineServiceSupplychainImpl extends StockMoveLineServiceImp
stockMoveLine.setRequestedReservedQty(BigDecimal.ZERO);
stockMoveLine.setSaleOrderLine(saleOrderLine);
stockMoveLine.setPurchaseOrderLine(purchaseOrderLine);
stockMoveLine.setShp(saleOrderLine.getShp());
stockMoveLine.setPpa(saleOrderLine.getPpa());
stockMoveLine.setPvg(saleOrderLine.getPvg());
stockMoveLine.setStklim(saleOrderLine.getStklim());
stockMoveLine.setUg(saleOrderLine.getUg());
TrackingNumberConfiguration trackingNumberConfiguration =
product.getTrackingNumberConfiguration();

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

@@ -465,6 +465,11 @@ StockMoveLineRepository stockMoveLineRepo = Beans.get(StockMoveLineRepository.cl
newStockMoveLine.setProductTypeSelect(moveLine.getProductTypeSelect());
newStockMoveLine.setSaleOrderLine(moveLine.getSaleOrderLine());
newStockMoveLine.setCompanyUnitPriceUntaxed(moveLine.getCompanyUnitPriceUntaxed());
newStockMoveLine.setUg(moveLine.getUg());
newStockMoveLine.setPpa(moveLine.getPpa());
newStockMoveLine.setPvg(moveLine.getPvg());
newStockMoveLine.setStklim(moveLine.getStklim());
newStockMoveLine.setShp(moveLine.getShp());
// add stock move line
originalStockMove.addStockMoveLineListItem(newStockMoveLine);

5
modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/invoice/generator/InvoiceLineGeneratorSupplyChain.java
View File

@@ -278,6 +278,11 @@ public abstract class InvoiceLineGeneratorSupplyChain extends InvoiceLineGenerat
invoiceLine.setInTaxPrice(inTaxPrice);
// sophal
invoiceLine.setTrackingNumber(stockMoveLine.getTrackingNumber());
invoiceLine.setPvg(stockMoveLine.getPvg());
invoiceLine.setPpa(stockMoveLine.getPpa());
invoiceLine.setUg(stockMoveLine.getUg());
invoiceLine.setShp(stockMoveLine.getShp());
invoiceLine.setStklim(stockMoveLine.getStklim());
analyticMoveLineList =
invoiceLineService.getAndComputeAnalyticDistribution(invoiceLine, invoice);