SOPHAL/CRM
1
0
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

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

@@ -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);

8
modules/axelor-open-suite/axelor-account/src/main/resources/domains/Invoice.xml
View File

@@ -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[