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

2
modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java
View File

@@ -174,7 +174,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
purchaseOrder.getTaxTotal().add(purchaseOrderLineVat.getTaxTotal()));
}
purchaseOrder.setInTaxTotal(purchaseOrder.getExTaxTotal().add(purchaseOrder.getTaxTotal()));
purchaseOrder.setInTaxTotal(purchaseOrder.getExTaxTotal().add(purchaseOrder.getTaxTotal().add(purchaseOrder.getStamp().add(purchaseOrder.getFixTax()))));
logger.debug(
"Montant de la facture: HTT = {}, HT = {}, TVA = {}, TTC = {}",

6
modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml
View File

@@ -22,6 +22,9 @@
<many-to-one name="contactPartner" ref="com.axelor.apps.base.db.Partner" title="Contact"/>
<many-to-one name="priceList" ref="com.axelor.apps.base.db.PriceList" title="Price list"/>
<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"/>
<many-to-one name="team" ref="com.axelor.team.db.Team" title="Team" />
<many-to-one name="buyerUser" ref="com.axelor.auth.db.User" title="Buyer"/>
<many-to-one name="currency" ref="com.axelor.apps.base.db.Currency" title="Currency" required="true"/>
@@ -77,6 +80,9 @@
<integer name="purchaseType" title="Purchase Type" selection="purchase.request.project.select"/>
<decimal name="stamp" title="stamp" scale="2" precision="20" />
<decimal name="fixTax" title="fix Tax" scale="2" precision="20" />
<unique-constraint columns="purchaseOrderSeq,company"/>
<extra-code>