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

cancel stamp and tax on invoice & add stock account

Browse Source
This commit is contained in:
bachir souldi
2022-11-03 16:30:28 +01:00
parent 12d656c88c
commit f60d2fe2af
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/axelor-open-suite/axelor-account/src/main/java/com/axelor/apps/account/service/invoice/generator/InvoiceGenerator.java
View File

@@ -418,12 +418,12 @@ public abstract class InvoiceGenerator {
} }
// In the invoice currency // 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()))); // invoice.setCompanyInTaxTotal(invoice.getCompanyInTaxTotal().add(invoice.getStamp().add(invoice.getFixTax())));
// In the company accounting currency // 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.setInTaxTotal(invoice.getExTaxTotal().add(invoice.getTaxTotal()).add(invoice.getStamp().add(invoice.getFixTax())));
invoice.setAmountRemaining(invoice.getInTaxTotal()); invoice.setAmountRemaining(invoice.getInTaxTotal());
invoice.setHasPendingPayments(false); invoice.setHasPendingPayments(false);

1
modules/axelor-open-suite/axelor-account/src/main/resources/domains/AccountManagement.xml
View File

@@ -10,6 +10,7 @@
<many-to-one name="purchaseAccount" ref="com.axelor.apps.account.db.Account" title="Purchase account"/> <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="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="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="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"/> <many-to-one name="paymentMode" ref="com.axelor.apps.account.db.PaymentMode" title="Payment mode"/>