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[

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>

5
modules/axelor-open-suite/axelor-stock/src/main/java/com/axelor/apps/stock/service/StockMoveServiceImpl.java
View File

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

8
modules/axelor-open-suite/axelor-stock/src/main/resources/domains/StockMove.xml
View File

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

4
modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierService.java
View File

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

4
modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/PurchaseOrderStockServiceImpl.java
View File

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

5
modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveInvoiceServiceImpl.java
View File

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