From 5c3d39c3414e7fffc8d73c3e65c135e14533b97c Mon Sep 17 00:00:00 2001
From: bachir souldi <bachir.souldi@sophal.net>
Date: Sun, 2 Oct 2022 14:30:45 +0100
Subject: [PATCH] add stamp & fix tax & payer partner & deliveryPartner

---
 .../service/invoice/generator/InvoiceGenerator.java       | 6 ++++--
 .../axelor-account/src/main/resources/domains/Invoice.xml | 8 ++++++++
 .../apps/purchase/service/PurchaseOrderServiceImpl.java   | 2 +-
 .../src/main/resources/domains/PurchaseOrder.xml          | 6 ++++++
 .../axelor/apps/stock/service/StockMoveServiceImpl.java   | 5 ++++-
 .../axelor-stock/src/main/resources/domains/StockMove.xml | 8 ++++++++
 .../service/PurchaseOrderSupplierService.java             | 4 ++++
 .../service/PurchaseOrderStockServiceImpl.java            | 4 ++++
 .../supplychain/service/StockMoveInvoiceServiceImpl.java  | 5 ++++-
 9 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/modules/axelor-open-suite/axelor-account/src/main/java/com/axelor/apps/account/service/invoice/generator/InvoiceGenerator.java b/modules/axelor-open-suite/axelor-account/src/main/java/com/axelor/apps/account/service/invoice/generator/InvoiceGenerator.java
index acd58252..00d3a4a6 100644
--- a/modules/axelor-open-suite/axelor-account/src/main/java/com/axelor/apps/account/service/invoice/generator/InvoiceGenerator.java
+++ b/modules/axelor-open-suite/axelor-account/src/main/java/com/axelor/apps/account/service/invoice/generator/InvoiceGenerator.java
@@ -418,10 +418,12 @@ public abstract class InvoiceGenerator {
     }
 
     // In the invoice currency
-    invoice.setInTaxTotal(invoice.getExTaxTotal().add(invoice.getTaxTotal()));
+    // invoice.setInTaxTotal(invoice.getExTaxTotal().add(invoice.getTaxTotal()));
+    invoice.setCompanyInTaxTotal(invoice.getCompanyInTaxTotal().add(invoice.getStamp().add(invoice.getFixTax())));
 
     // In the company accounting currency
-    invoice.setCompanyInTaxTotal(invoice.getCompanyExTaxTotal().add(invoice.getCompanyTaxTotal()));
+    // invoice.setCompanyInTaxTotal(invoice.getCompanyExTaxTotal().add(invoice.getCompanyTaxTotal()));
+    invoice.setInTaxTotal(invoice.getExTaxTotal().add(invoice.getTaxTotal()).add(invoice.getStamp().add(invoice.getFixTax())));
 
     invoice.setAmountRemaining(invoice.getInTaxTotal());
     invoice.setHasPendingPayments(false);
diff --git a/modules/axelor-open-suite/axelor-account/src/main/resources/domains/Invoice.xml b/modules/axelor-open-suite/axelor-account/src/main/resources/domains/Invoice.xml
index b95a8232..7221fb21 100644
--- a/modules/axelor-open-suite/axelor-account/src/main/resources/domains/Invoice.xml
+++ b/modules/axelor-open-suite/axelor-account/src/main/resources/domains/Invoice.xml
@@ -146,6 +146,14 @@
   <!-- is approach -->
     <boolean name="isInvoiceApproach" title="Facture d'approche" />
 
+    <decimal name="stamp" title="stamp" scale="2" precision="20" />
+    <decimal name="fixTax" title="fix Tax" scale="2" precision="20" />
+
+      	
+    <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"/>
+
+
   	<unique-constraint columns="invoiceId,company"/>
 
 	<extra-code><![CDATA[
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java
index 4d0ae431..d68844e6 100644
--- a/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/PurchaseOrderServiceImpl.java
@@ -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 = {}",
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml
index d30c0686..c59886ec 100644
--- a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml
@@ -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>
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 084e75c6..4be84507 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
@@ -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));
   }
 
diff --git a/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMove.xml b/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMove.xml
index 035cefd7..7ec86a20 100644
--- a/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMove.xml
+++ b/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMove.xml
@@ -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[
diff --git a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java
index fafa97eb..09455d1d 100644
--- a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java
+++ b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java
@@ -352,6 +352,10 @@ public class PurchaseOrderSupplierService {
     purchaseOrder.setReceiptState(PurchaseOrderRepository.STATE_NOT_RECEIVED);
     purchaseOrder.setPurchaseRequestOrigin(parentPurchaseOrder.getPurchaseRequestOrigin());
     purchaseOrder.setPurchaseType(parentPurchaseOrder.getPurchaseType());
+    purchaseOrder.setStamp(parentPurchaseOrder.getStamp());
+    purchaseOrder.setFixTax(parentPurchaseOrder.getFixTax());
+    purchaseOrder.setDeliveryPartner(parentPurchaseOrder.getSupplierPartner());
+    purchaseOrder.setPayerPartner(parentPurchaseOrder.getSupplierPartner());
     // copy description from parent po
     purchaseOrder.setNotes(parentPurchaseOrder.getNotes());;
     poRepo.save(purchaseOrder);
diff --git a/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/PurchaseOrderStockServiceImpl.java b/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/PurchaseOrderStockServiceImpl.java
index e2d8113c..0cdaa6a3 100644
--- a/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/PurchaseOrderStockServiceImpl.java
+++ b/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/PurchaseOrderStockServiceImpl.java
@@ -214,6 +214,10 @@ public class PurchaseOrderStockServiceImpl implements PurchaseOrderStockService
     stockMove.setOriginTypeSelect(StockMoveRepository.ORIGIN_PURCHASE_ORDER);
     stockMove.setOrigin(purchaseOrder.getPurchaseOrderSeq());
     stockMove.setTradingName(purchaseOrder.getTradingName());
+    stockMove.setStamp(purchaseOrder.getStamp());
+    stockMove.setFixTax(purchaseOrder.getFixTax());
+    stockMove.setPayerPartner(purchaseOrder.getPayerPartner());
+    stockMove.setDeliveryPartner(purchaseOrder.getDeliveryPartner());
 
     qualityStockMove.setOriginId(purchaseOrder.getId());
     qualityStockMove.setOriginTypeSelect(StockMoveRepository.ORIGIN_PURCHASE_ORDER);
diff --git a/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveInvoiceServiceImpl.java b/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveInvoiceServiceImpl.java
index 0a28aa3e..0ce7c3c9 100644
--- a/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveInvoiceServiceImpl.java
+++ b/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveInvoiceServiceImpl.java
@@ -219,7 +219,10 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       this.extendInternalReference(stockMove, invoice);
       invoice.setAddressStr(
           Beans.get(AddressService.class).computeAddressStr(invoice.getAddress()));
-
+          invoice.setPayerPartner(stockMove.getPayerPartner());
+          invoice.setDeliveryPartner(stockMove.getDeliveryPartner());
+          invoice.setStamp(stockMove.getStamp());
+          invoice.setFixTax(stockMove.getFixTax());
       if (invoice != null) {
         Set<StockMove> stockMoveSet = invoice.getStockMoveSet();
         if (stockMoveSet == null) {