From f60d2fe2af976e4c4184e97f85735bd662a3bb50 Mon Sep 17 00:00:00 2001
From: bachir souldi <bachir.souldi@sophal.net>
Date: Thu, 3 Nov 2022 16:30:28 +0100
Subject: [PATCH] cancel stamp and tax on invoice & add stock account

---
 .../service/invoice/generator/InvoiceGenerator.java       | 8 ++++----
 .../src/main/resources/domains/AccountManagement.xml      | 1 +
 2 files changed, 5 insertions(+), 4 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 00d3a4a..1900495 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,12 +418,12 @@ public abstract class InvoiceGenerator {
     }
 
     // In the invoice currency
-    // invoice.setInTaxTotal(invoice.getExTaxTotal().add(invoice.getTaxTotal()));
-    invoice.setCompanyInTaxTotal(invoice.getCompanyInTaxTotal().add(invoice.getStamp().add(invoice.getFixTax())));
+     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.setInTaxTotal(invoice.getExTaxTotal().add(invoice.getTaxTotal()).add(invoice.getStamp().add(invoice.getFixTax())));
+     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/AccountManagement.xml b/modules/axelor-open-suite/axelor-account/src/main/resources/domains/AccountManagement.xml
index eeb59af..7583816 100644
--- a/modules/axelor-open-suite/axelor-account/src/main/resources/domains/AccountManagement.xml
+++ b/modules/axelor-open-suite/axelor-account/src/main/resources/domains/AccountManagement.xml
@@ -10,6 +10,7 @@
 	<many-to-one name="purchaseAccount" ref="com.axelor.apps.account.db.Account" title="Purchase account"/>
 	<many-to-one name="saleAccount" ref="com.axelor.apps.account.db.Account" title="Sale account"/>
 	<many-to-one name="cashAccount" ref="com.axelor.apps.account.db.Account" title="Payment account"/>
+	<many-to-one name="stockAccount" ref="com.axelor.apps.account.db.Account" title="Stock account"/>
 	<many-to-one name="purchFixedAssetsAccount" ref="com.axelor.apps.account.db.Account" title="Account of purchase fixed assets"/>
 
     <many-to-one  name="paymentMode" ref="com.axelor.apps.account.db.PaymentMode" title="Payment mode"/>