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

Compare commits

base: SOPHAL:ICOP-address-management
Branches Tags
SOPHAL:dev2 SOPHAL:ICOP-Mapping-Product-from-crm-to-erp SOPHAL:ICOP-Mapping-fields-from-Vtiger-to-ERP-Partners SOPHAL:ICOP-address-management SOPHAL:invoiceLineBug
..
compare: SOPHAL:invoiceLineBug
Branches Tags
SOPHAL:ICOP-Mapping-Product-from-crm-to-erp SOPHAL:ICOP-Mapping-fields-from-Vtiger-to-ERP-Partners SOPHAL:ICOP-address-management SOPHAL:invoiceLineBug SOPHAL:dev2

1 Commits
ICOP-addre ... invoiceLin

Author SHA1 Message Date
zakaria.hachem
da686191fc fix invoice line creation 2026-02-18 09:20:04 +01:00
4 changed files with 63 additions and 135 deletions
Expand all files Collapse all files

13
modules/axelor-open-suite/axelor-crm/src/main/resources/domains/Address.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<domain-models xmlns="http://axelor.com/xml/ns/domain-models" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://axelor.com/xml/ns/domain-models http://axelor.com/xml/ns/domain-models/domain-models_5.2.xsd">
<module name="base" package="com.axelor.apps.base.db" />
<entity name="Address" lang="java">
<many-to-one name="state" ref="com.axelor.apps.crm.db.StateAdministration" title="State" />
</entity>
</domain-models>

46
modules/axelor-open-suite/axelor-crm/src/main/resources/domains/StateAdministration.xml
View File

@@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<domain-models xmlns="http://axelor.com/xml/ns/domain-models"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://axelor.com/xml/ns/domain-models http://axelor.com/xml/ns/domain-models/domain-models_5.2.xsd">
<module name="crm" package="com.axelor.apps.crm.db"/>
<entity name="StateAdministration" lang="java">
<string name="name" title="Name" required="true"/>
<string name="typeSelect" title="Type" selection="state.administration.type.select" required="true"/>
<many-to-one name="parent" ref="com.axelor.apps.crm.db.StateAdministration"/>
<string name="fullName" namecolumn="true" title="Full name">
<![CDATA[
String fullName = "";
com.axelor.apps.crm.db.StateAdministration current = this;
while (current != null && current.getName() != null) {
if (current == current.getParent()) {
break;
}
if (fullName.isEmpty()) {
fullName = current.getName();
} else {
fullName = current.getName() + " - " + fullName;
}
current = current.getParent();
}
return fullName;
]]>
</string>
</entity>
</domain-models>

7
modules/axelor-open-suite/axelor-crm/src/main/resources/views/Selects.xml
View File

@@ -143,11 +143,4 @@
<option value="1">Some user groups</option>
</selection>
<selection name="state.administration.type.select">
<option value="0">Region</option>
<option value="1">Sub Region</option>
<option value="2">Wilaya</option>
<option value="3">Commune</option>
</selection>
</object-views>

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

@@ -93,7 +93,7 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
}
@Override
@Transactional(rollbackOn = {Exception.class})
@Transactional(rollbackOn = { Exception.class })
public Invoice createInvoice(
StockMove stockMove,
Integer operationSelect,
@@ -130,9 +130,8 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
if (StockMoveRepository.ORIGIN_SALE_ORDER.equals(stockMove.getOriginTypeSelect())) {
invoice = createInvoiceFromSaleOrder(stockMove, saleOrderRepo.find(origin), qtyToInvoiceMap);
} else if (StockMoveRepository.ORIGIN_PURCHASE_ORDER.equals(stockMove.getOriginTypeSelect())) {
invoice =
createInvoiceFromPurchaseOrder(
stockMove, purchaseOrderRepo.find(origin), qtyToInvoiceMap);
invoice = createInvoiceFromPurchaseOrder(
stockMove, purchaseOrderRepo.find(origin), qtyToInvoiceMap);
} else {
invoice = createInvoiceFromOrderlessStockMove(stockMove, qtyToInvoiceMap);
}
@@ -147,10 +146,9 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
for (StockMoveLine subLine : stockMoveLine.getSubLineList()) {
BigDecimal qty = BigDecimal.ZERO;
if (stockMoveLine.getQty().compareTo(BigDecimal.ZERO) != 0) {
qty =
qtyToInvoiceItem
.multiply(subLine.getQty())
.divide(stockMoveLine.getQty(), 2, RoundingMode.HALF_EVEN);
qty = qtyToInvoiceItem
.multiply(subLine.getQty())
.divide(stockMoveLine.getQty(), 2, RoundingMode.HALF_EVEN);
}
qty = qty.setScale(2, RoundingMode.HALF_EVEN);
qtyToInvoiceMap.put(subLine.getId(), qty);
@@ -159,13 +157,13 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
}
@Override
@Transactional(rollbackOn = {Exception.class})
@Transactional(rollbackOn = { Exception.class })
public Invoice createInvoiceFromSaleOrder(
StockMove stockMove, SaleOrder saleOrder, Map<Long, BigDecimal> qtyToInvoiceMap)
throws AxelorException {
InvoiceGenerator invoiceGenerator =
saleOrderInvoiceService.createInvoiceGenerator(saleOrder, stockMove.getIsReversion());
InvoiceGenerator invoiceGenerator = saleOrderInvoiceService.createInvoiceGenerator(saleOrder,
stockMove.getIsReversion());
Invoice invoice = invoiceGenerator.generate();
@@ -210,14 +208,13 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
}
@Override
@Transactional(rollbackOn = {Exception.class})
@Transactional(rollbackOn = { Exception.class })
public Invoice createInvoiceFromPurchaseOrder(
StockMove stockMove, PurchaseOrder purchaseOrder, Map<Long, BigDecimal> qtyToInvoiceMap)
throws AxelorException {
InvoiceGenerator invoiceGenerator =
purchaseOrderInvoiceService.createInvoiceGenerator(
purchaseOrder, stockMove.getIsReversion());
InvoiceGenerator invoiceGenerator = purchaseOrderInvoiceService.createInvoiceGenerator(
purchaseOrder, stockMove.getIsReversion());
Invoice invoice = invoiceGenerator.generate();
@@ -249,7 +246,7 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
}
@Override
@Transactional(rollbackOn = {Exception.class})
@Transactional(rollbackOn = { Exception.class })
public Invoice createInvoiceFromOrderlessStockMove(
StockMove stockMove, Map<Long, BigDecimal> qtyToInvoiceMap) throws AxelorException {
@@ -274,15 +271,14 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
}
}
InvoiceGenerator invoiceGenerator =
new InvoiceGeneratorSupplyChain(stockMove, invoiceOperationType) {
InvoiceGenerator invoiceGenerator = new InvoiceGeneratorSupplyChain(stockMove, invoiceOperationType) {
@Override
public Invoice generate() throws AxelorException {
@Override
public Invoice generate() throws AxelorException {
return super.createInvoiceHeader();
}
};
return super.createInvoiceHeader();
}
};
Invoice invoice = invoiceGenerator.generate();
@@ -340,15 +336,13 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
Long id = stockMoveLine.getId();
if (qtyToInvoiceMap != null) {
if (qtyToInvoiceMap.containsKey(id)) {
invoiceLineListCreated =
this.createInvoiceLine(invoice, stockMoveLine, qtyToInvoiceMap.get(id));
invoiceLineListCreated = this.createInvoiceLine(invoice, stockMoveLine, qtyToInvoiceMap.get(id));
}
} else {
invoiceLineListCreated =
this.createInvoiceLine(
invoice,
stockMoveLine,
stockMoveLine.getRealQty().subtract(stockMoveLine.getQtyInvoiced()));
invoiceLineListCreated = this.createInvoiceLine(
invoice,
stockMoveLine,
stockMoveLine.getRealQty().subtract(stockMoveLine.getQtyInvoiced()));
}
if (invoiceLineListCreated != null) {
@@ -424,32 +418,31 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
stockMoveLine.getStockMove().getStockMoveSeq());
}
InvoiceLineGenerator invoiceLineGenerator =
new InvoiceLineGeneratorSupplyChain(
invoice,
product,
stockMoveLine.getProductName(),
stockMoveLine.getDescription(),
qty,
stockMoveLine.getUnit(),
sequence,
false,
stockMoveLine.getSaleOrderLine(),
stockMoveLine.getPurchaseOrderLine(),
stockMoveLine,
stockMoveLine.getIsSubLine(),
stockMoveLine.getPackPriceSelect()) {
@Override
public List<InvoiceLine> creates() throws AxelorException {
InvoiceLineGenerator invoiceLineGenerator = new InvoiceLineGeneratorSupplyChain(
invoice,
product,
stockMoveLine.getProductName(),
stockMoveLine.getDescription(),
qty,
stockMoveLine.getUnit(),
sequence,
false,
stockMoveLine.getSaleOrderLine(),
stockMoveLine.getPurchaseOrderLine(),
stockMoveLine,
stockMoveLine.getIsSubLine(),
stockMoveLine.getPackPriceSelect()) {
@Override
public List<InvoiceLine> creates() throws AxelorException {
InvoiceLine invoiceLine = this.createInvoiceLine();
InvoiceLine invoiceLine = this.createInvoiceLine();
List<InvoiceLine> invoiceLines = new ArrayList<InvoiceLine>();
invoiceLines.add(invoiceLine);
List<InvoiceLine> invoiceLines = new ArrayList<InvoiceLine>();
invoiceLines.add(invoiceLine);
return invoiceLines;
}
};
return invoiceLines;
}
};
List<InvoiceLine> invoiceLines = invoiceLineGenerator.creates();
for (InvoiceLine invoiceLine : invoiceLines) {
@@ -465,7 +458,8 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
}
/**
* Get a list of stock move lines consolidated by parent line (sale or purchase order).
* Get a list of stock move lines consolidated by parent line (sale or purchase
* order).
*
* @param stockMoveLineList
* @return
@@ -484,8 +478,8 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
if (stockMoveLine.getSaleOrderLine() != null) {
list = stockMoveLineSaleMap.get(stockMoveLine.getSaleOrderLine());
// if (list == null) {
// list = new ArrayList<>();
// stockMoveLineSaleMap.put(stockMoveLine.getSaleOrderLine(), list);
// list = new ArrayList<>();
// stockMoveLineSaleMap.put(stockMoveLine.getSaleOrderLine(), list);
// }
// list.add(stockMoveLine);
resultList.add(stockMoveLine);
@@ -496,7 +490,9 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
stockMoveLinePurchaseMap.put(stockMoveLine.getPurchaseOrderLine(), list);
}
list.add(stockMoveLine);
} else { // if the stock move line does not have a parent line (sale or purchase order line)
resultList.add(stockMoveLine);
} else { // if the stock move line does not have a parent line (sale or purchase order
// line)
resultList.add(stockMoveLine);
}
}
@@ -544,18 +540,16 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
stockMove = Beans.get(StockMoveRepository.class).find(stockMove.getId());
if (stockMove.getInvoiceSet() != null && !stockMove.getInvoiceSet().isEmpty()) {
Double totalInvoicedQty =
stockMove
.getStockMoveLineList()
.stream()
.mapToDouble(sml -> Double.parseDouble(sml.getQtyInvoiced().toString()))
.sum();
Double totalRealQty =
stockMove
.getStockMoveLineList()
.stream()
.mapToDouble(sml -> Double.parseDouble(sml.getRealQty().toString()))
.sum();
Double totalInvoicedQty = stockMove
.getStockMoveLineList()
.stream()
.mapToDouble(sml -> Double.parseDouble(sml.getQtyInvoiced().toString()))
.sum();
Double totalRealQty = stockMove
.getStockMoveLineList()
.stream()
.mapToDouble(sml -> Double.parseDouble(sml.getRealQty().toString()))
.sum();
if (totalRealQty.compareTo(totalInvoicedQty) == 1) {
invoiceStatus = 1;
} else if (totalRealQty.compareTo(totalInvoicedQty) == 0) {