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

14
modules/axelor-open-suite/axelor-sale/src/main/java/com/axelor/apps/sale/service/saleorder/SaleOrderLineServiceImpl.java
View File

@@ -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);

6
modules/axelor-open-suite/axelor-sale/src/main/resources/domains/SaleOrderLine.xml
View File

@@ -68,6 +68,12 @@
<decimal name="totalPack" title="Total for pack lines"/>
<integer name="packPriceSelect" title="Pack price select" selection="product.pack.price.select"/>
<decimal name="ppa" title="PPA" precision="20" scale="10"/>
<decimal name="pvg" title="PVG" precision="20" scale="10"/>
<decimal name="ug" title="UG" precision="20" scale="10"/>
<decimal name="stklim" title="Stklim" precision="20" scale="10" />
<decimal name="shp" title="SHP" precision="20" scale="10" />
<finder-method name="findAllBySaleOrder" using="saleOrder" all="true"/>
<extra-code>