diff --git a/modules/axelor-open-suite/axelor-stock/src/main/java/com/axelor/apps/stock/service/StockMoveServiceImpl.java b/modules/axelor-open-suite/axelor-stock/src/main/java/com/axelor/apps/stock/service/StockMoveServiceImpl.java
index 37a35038..4a0cc5f2 100644
--- a/modules/axelor-open-suite/axelor-stock/src/main/java/com/axelor/apps/stock/service/StockMoveServiceImpl.java
+++ b/modules/axelor-open-suite/axelor-stock/src/main/java/com/axelor/apps/stock/service/StockMoveServiceImpl.java
@@ -293,9 +293,9 @@ public class StockMoveServiceImpl implements StockMoveService {
       }else if(stockMove.getTypeSelect() == StockMoveRepository.TYPE_OUTGOING && stockMove.getIsReversion() == false && stockMove.getPartner().getId() != 853 ){
         stockMove.setStockMoveSeq(
           stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_OUTGOING_CLIENT, stockMove.getCompany()));
-      } else if(stockMove.getTypeSelect() == StockMoveRepository.TYPE_OUTGOING && stockMove.getIsReversion() == false && stockMove.getPartner().getId() == 853){
-        stockMove.setStockMoveSeq(
-          stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_INTERNAL_OUTGOING_CLIENT, stockMove.getCompany()));
+       } else if(stockMove.getTypeSelect() == StockMoveRepository.TYPE_OUTGOING && stockMove.getIsReversion() == false && stockMove.getPartner().getId() == 853){
+         stockMove.setStockMoveSeq(
+           stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_INTERNAL_OUTGOING_CLIENT, stockMove.getCompany()));
       }else if(stockMove.getTypeSelect() == StockMoveRepository.TYPE_OUTGOING && stockMove.getIsReversion() == true){
         stockMove.setStockMoveSeq(
           stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_SUPPLIER_OUTGOING_CLIENT, stockMove.getCompany()));
@@ -654,8 +654,8 @@ public class StockMoveServiceImpl implements StockMoveService {
       newStockMove.setStockMoveSeq(
         stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_OUTGOING_CLIENT, stockMove.getCompany()));
     } else if(stockMove.getTypeSelect() == StockMoveRepository.TYPE_OUTGOING && stockMove.getIsReversion() == false && stockMove.getPartner().getId() == 853){
-      newStockMove.setStockMoveSeq(
-        stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_INTERNAL_OUTGOING_CLIENT, stockMove.getCompany()));
+       newStockMove.setStockMoveSeq(
+         stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_INTERNAL_OUTGOING_CLIENT, stockMove.getCompany()));
     }else if(stockMove.getTypeSelect() == StockMoveRepository.TYPE_OUTGOING && stockMove.getIsReversion() == true){
       newStockMove.setStockMoveSeq(
         stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_SUPPLIER_OUTGOING_CLIENT, stockMove.getCompany()));
@@ -747,14 +747,17 @@ public class StockMoveServiceImpl implements StockMoveService {
     if (stockMove.getTypeSelect() == StockMoveRepository.TYPE_INTERNAL)
       newStockMove.setTypeSelect(StockMoveRepository.TYPE_INTERNAL);
 
-    if (stockMove.getTypeSelect() == StockMoveRepository.TYPE_OUTGOING && stockMove.getIsReversion() == false){
+    if (stockMove.getTypeSelect() == StockMoveRepository.TYPE_OUTGOING){
       newStockMove.setStockMoveSeq(
-      stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_INCOMING_CLIENT, stockMove.getCompany()));}
-      else{
-        newStockMove.setStockMoveSeq(
-            stockMoveToolService.getSequenceStockMove(
-                newStockMove.getTypeSelect(), newStockMove.getCompany()));
-      }
+        stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_INCOMING_CLIENT, stockMove.getCompany()));
+    }else if(stockMove.getTypeSelect() == StockMoveRepository.TYPE_INCOMING){
+      newStockMove.setStockMoveSeq(
+        stockMoveToolService.getSequenceStockMove(StockMoveRepository.TYPE_SUPPLIER_OUTGOING_CLIENT, stockMove.getCompany()));
+    }else{
+      newStockMove.setStockMoveSeq(
+          stockMoveToolService.getSequenceStockMove(
+              newStockMove.getTypeSelect(), newStockMove.getCompany()));
+    }
 
     for (StockMoveLine stockMoveLine : stockMoveLines) {
 
diff --git a/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveLineServiceSupplychainImpl.java b/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveLineServiceSupplychainImpl.java
index 5d75c378..359cd3a2 100644
--- a/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveLineServiceSupplychainImpl.java
+++ b/modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveLineServiceSupplychainImpl.java
@@ -121,11 +121,13 @@ public class StockMoveLineServiceSupplychainImpl extends StockMoveLineServiceImp
       stockMoveLine.setRequestedReservedQty(BigDecimal.ZERO);
       stockMoveLine.setSaleOrderLine(saleOrderLine);
       stockMoveLine.setPurchaseOrderLine(purchaseOrderLine);
-      stockMoveLine.setShp(saleOrderLine.getShp());
-      stockMoveLine.setPpa(saleOrderLine.getPpa());
-      stockMoveLine.setPvg(saleOrderLine.getPvg());
-      stockMoveLine.setStklim(saleOrderLine.getStklim());
-      stockMoveLine.setUg(saleOrderLine.getUg());
+      if(saleOrderLine != null){
+        stockMoveLine.setShp(saleOrderLine.getShp());
+        stockMoveLine.setPpa(saleOrderLine.getPpa());
+        stockMoveLine.setPvg(saleOrderLine.getPvg());
+        stockMoveLine.setStklim(saleOrderLine.getStklim());
+        stockMoveLine.setUg(saleOrderLine.getUg());
+      }
       TrackingNumberConfiguration trackingNumberConfiguration =
           product.getTrackingNumberConfiguration();