diff --git a/modules/axelor-open-suite/axelor-account/src/main/resources/domains/InvoiceLine.xml b/modules/axelor-open-suite/axelor-account/src/main/resources/domains/InvoiceLine.xml index d34e314..d623aaf 100644 --- a/modules/axelor-open-suite/axelor-account/src/main/resources/domains/InvoiceLine.xml +++ b/modules/axelor-open-suite/axelor-account/src/main/resources/domains/InvoiceLine.xml @@ -72,6 +72,12 @@ ]]> + + + + + + + + diff --git a/modules/axelor-open-suite/axelor-sale/src/main/java/com/axelor/apps/sale/service/saleorder/SaleOrderLineServiceImpl.java b/modules/axelor-open-suite/axelor-sale/src/main/java/com/axelor/apps/sale/service/saleorder/SaleOrderLineServiceImpl.java index fe4b58f..dd483e2 100644 --- a/modules/axelor-open-suite/axelor-sale/src/main/java/com/axelor/apps/sale/service/saleorder/SaleOrderLineServiceImpl.java +++ b/modules/axelor-open-suite/axelor-sale/src/main/java/com/axelor/apps/sale/service/saleorder/SaleOrderLineServiceImpl.java @@ -44,6 +44,10 @@ import com.axelor.inject.Beans; import com.axelor.rpc.ActionResponse; import com.axelor.rpc.Context; import com.google.inject.Inject; + +import wslite.json.JSONException; +import wslite.json.JSONObject; + import java.lang.invoke.MethodHandles; import java.math.BigDecimal; import java.math.RoundingMode; @@ -72,10 +76,16 @@ public class SaleOrderLineServiceImpl implements SaleOrderLineService { public void computeProductInformation( SaleOrderLine saleOrderLine, SaleOrder saleOrder, Integer packPriceSelect) throws AxelorException { - saleOrderLine.setProductName(saleOrderLine.getProduct().getName()); + Product product = saleOrderLine.getProduct(); + saleOrderLine.setProductName(product.getName()); + saleOrderLine.setPvg(product.getPvg()); + saleOrderLine.setUg(product.getUg()); + saleOrderLine.setStklim(product.getStklim()); + saleOrderLine.setPpa(product.getPpa()); + saleOrderLine.setShp(product.getShp()); saleOrderLine.setUnit(this.getSaleUnit(saleOrderLine)); if (appSaleService.getAppSale().getIsEnabledProductDescriptionCopy()) { - saleOrderLine.setDescription(saleOrderLine.getProduct().getDescription()); + saleOrderLine.setDescription(product.getDescription()); } saleOrderLine.setTypeSelect(SaleOrderLineRepository.TYPE_NORMAL); diff --git a/modules/axelor-open-suite/axelor-sale/src/main/resources/domains/SaleOrderLine.xml b/modules/axelor-open-suite/axelor-sale/src/main/resources/domains/SaleOrderLine.xml index 2c0ceff..97da0f2 100644 --- a/modules/axelor-open-suite/axelor-sale/src/main/resources/domains/SaleOrderLine.xml +++ b/modules/axelor-open-suite/axelor-sale/src/main/resources/domains/SaleOrderLine.xml @@ -68,6 +68,12 @@ + + + + + + diff --git a/modules/axelor-open-suite/axelor-stock/src/main/java/com/axelor/apps/stock/service/StockMoveServiceImpl.java b/modules/axelor-open-suite/axelor-stock/src/main/java/com/axelor/apps/stock/service/StockMoveServiceImpl.java index 4913f51..f474807 100644 --- a/modules/axelor-open-suite/axelor-stock/src/main/java/com/axelor/apps/stock/service/StockMoveServiceImpl.java +++ b/modules/axelor-open-suite/axelor-stock/src/main/java/com/axelor/apps/stock/service/StockMoveServiceImpl.java @@ -1340,6 +1340,11 @@ public class StockMoveServiceImpl implements StockMoveService { // Set quantity in new stock move line newStockMoveLine = stockMoveLineRepo.copy(moveLine, false); newStockMoveLine.setQty(moveLine.getQty()); + newStockMoveLine.setUg(moveLine.getUg()); + newStockMoveLine.setPpa(moveLine.getPpa()); + newStockMoveLine.setPvg(moveLine.getPvg()); + newStockMoveLine.setStklim(moveLine.getStklim()); + newStockMoveLine.setShp(moveLine.getShp()); newStockMoveLine.setRealQty(moveLine.getQty()); newStockMoveLine.setProductTypeSelect(moveLine.getProductTypeSelect()); // add stock move line diff --git a/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMoveLine.xml b/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMoveLine.xml index b316980..e2fcea4 100644 --- a/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMoveLine.xml +++ b/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMoveLine.xml @@ -69,6 +69,12 @@ + + + + + +