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

add stamp & fix tax & payer partner & deliveryPartner

Browse Source
This commit is contained in:
bachir souldi
2022-10-02 14:30:45 +01:00
parent 825bdd96ef
commit 5c3d39c341
9 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -764,7 +764,10 @@ public class StockMoveServiceImpl implements StockMoveService {
newStockMove.setOrigin(stockMove.getOrigin());
newStockMove.setOriginId(stockMove.getOriginId());
newStockMove.setOriginTypeSelect(stockMove.getOriginTypeSelect());
newStockMove.setStamp(stockMove.getStamp());
newStockMove.setFixTax(stockMove.getFixTax());
newStockMove.setPayerPartner(stockMove.getPayerPartner());
newStockMove.setDeliveryPartner(stockMove.getDeliveryPartner());
return Optional.of(stockMoveRepo.save(newStockMove));
}

8
modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMove.xml
View File

@@ -30,6 +30,10 @@
<many-to-one name="company" ref="com.axelor.apps.base.db.Company" title="Company" required="true"/>
<many-to-one name="partner" ref="com.axelor.apps.base.db.Partner" title="Partner"/>
<many-to-one name="payerPartner" ref="com.axelor.apps.base.db.Partner" title="Payer Supplier"/>
<many-to-one name="deliveryPartner" ref="com.axelor.apps.base.db.Partner" title="Delivery Supplier"/>
<one-to-many name="stockMoveLineList" ref="com.axelor.apps.stock.db.StockMoveLine" mappedBy="stockMove" orderBy="sequence" title="Stock move content"/>
<one-to-many name="plannedStockMoveLineList" ref="com.axelor.apps.stock.db.StockMoveLine" mappedBy="plannedStockMove" orderBy="sequence"/>
@@ -92,6 +96,10 @@
<many-to-one name="reversionOriginStockMove" title="Origin stock move" ref="com.axelor.apps.stock.db.StockMove"/>
<string name="pickingOrderComments" title="Comment to display on picking order" large="true"/>
<decimal name="stamp" title="stamp" scale="2" precision="20" />
<decimal name="fixTax" title="fix Tax" scale="2" precision="20" />
<unique-constraint columns="stockMoveSeq,company"/>
<extra-code><![CDATA[