fix invoice line creation

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

@@ -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,8 +130,7 @@ 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 =
+      invoice = createInvoiceFromPurchaseOrder(
-          createInvoiceFromPurchaseOrder(
           stockMove, purchaseOrderRepo.find(origin), qtyToInvoiceMap);
     } else {
       invoice = createInvoiceFromOrderlessStockMove(stockMove, qtyToInvoiceMap);
@@ -147,8 +146,7 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       for (StockMoveLine subLine : stockMoveLine.getSubLineList()) {
         BigDecimal qty = BigDecimal.ZERO;
         if (stockMoveLine.getQty().compareTo(BigDecimal.ZERO) != 0) {
-          qty =
+          qty = qtyToInvoiceItem
-              qtyToInvoiceItem
               .multiply(subLine.getQty())
               .divide(stockMoveLine.getQty(), 2, RoundingMode.HALF_EVEN);
         }
@@ -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 =
+    InvoiceGenerator invoiceGenerator = saleOrderInvoiceService.createInvoiceGenerator(saleOrder,
-        saleOrderInvoiceService.createInvoiceGenerator(saleOrder, stockMove.getIsReversion());
+        stockMove.getIsReversion());
 
     Invoice invoice = invoiceGenerator.generate();
 
@@ -210,13 +208,12 @@ 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 =
+    InvoiceGenerator invoiceGenerator = purchaseOrderInvoiceService.createInvoiceGenerator(
-        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,8 +271,7 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       }
     }
 
-    InvoiceGenerator invoiceGenerator =
+    InvoiceGenerator invoiceGenerator = new InvoiceGeneratorSupplyChain(stockMove, invoiceOperationType) {
-        new InvoiceGeneratorSupplyChain(stockMove, invoiceOperationType) {
 
       @Override
       public Invoice generate() throws AxelorException {
@@ -340,12 +336,10 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       Long id = stockMoveLine.getId();
       if (qtyToInvoiceMap != null) {
         if (qtyToInvoiceMap.containsKey(id)) {
-          invoiceLineListCreated =
+          invoiceLineListCreated = this.createInvoiceLine(invoice, stockMoveLine, qtyToInvoiceMap.get(id));
-              this.createInvoiceLine(invoice, stockMoveLine, qtyToInvoiceMap.get(id));
         }
       } else {
-        invoiceLineListCreated =
+        invoiceLineListCreated = this.createInvoiceLine(
-            this.createInvoiceLine(
             invoice,
             stockMoveLine,
             stockMoveLine.getRealQty().subtract(stockMoveLine.getQtyInvoiced()));
@@ -424,8 +418,7 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
           stockMoveLine.getStockMove().getStockMoveSeq());
     }
 
-    InvoiceLineGenerator invoiceLineGenerator =
+    InvoiceLineGenerator invoiceLineGenerator = new InvoiceLineGeneratorSupplyChain(
-        new InvoiceLineGeneratorSupplyChain(
         invoice,
         product,
         stockMoveLine.getProductName(),
@@ -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
@@ -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,14 +540,12 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       stockMove = Beans.get(StockMoveRepository.class).find(stockMove.getId());
 
       if (stockMove.getInvoiceSet() != null && !stockMove.getInvoiceSet().isEmpty()) {
-        Double totalInvoicedQty =
+        Double totalInvoicedQty = stockMove
-            stockMove
             .getStockMoveLineList()
             .stream()
             .mapToDouble(sml -> Double.parseDouble(sml.getQtyInvoiced().toString()))
             .sum();
-        Double totalRealQty =
+        Double totalRealQty = stockMove
-            stockMove
             .getStockMoveLineList()
             .stream()
             .mapToDouble(sml -> Double.parseDouble(sml.getRealQty().toString()))