diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdRules.java b/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdRules.java
index 03bd837573..68c3e47cf7 100644
--- a/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdRules.java
+++ b/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdRules.java
@@ -956,7 +956,7 @@ public class DocOrdRules extends QueryRules {
         SetupGest setup = new SetupGest();
         Boolean disableTriggerOrdl = setup.getSetupBoolean(connection, "DTB_ORDT", "SETUP", "DISABLE_TRIGGER_ORDL");
 
-        if (!disableTriggerOrdl || dtbOrdt.isGeneraOrdLavDaProd()) return null;
+        if (!disableTriggerOrdl || (dtbOrdt.isGeneraOrdLavDaProd() && dtbOrdt.getParent() != null)) return null;
 
         DtbOrdt dtbOrdtProd =
                 new DtbOrdt()
diff --git a/ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java b/ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java
index d19a39da34..b068897465 100644
--- a/ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java
+++ b/ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java
@@ -1118,7 +1118,10 @@ public class GeneraOrdLav {
                 Integer durataFase = UtilityHashMap.getValueIfExists(step, "durata");
                 String codJfasParent = UtilityHashMap.getValueIfExists(step, "cod_jfas_parent");
                 Integer numFaseDist = UtilityHashMap.getValueIfExists(step, "num_fase");
-                numFaseDist = numFaseDist + explodeDistDTO.getNumFase() - 1;
+/*                numFaseDist = numFaseDist + explodeDistDTO.getNumFase() - 1;*/ /* MODIFICA FABION */
+
+                numFaseDist = numFaseDist;
+
 
                 String qtaProdPRI = "";
                 String untMisRow = explodeDistDTO.getUntMis();
@@ -1377,7 +1380,13 @@ public class GeneraOrdLav {
             List<DtbOrdr> dtbOrdrL = UtilityDB.executeSimpleQueryDTO(conn, sql, DtbOrdr.class);
 
             dtbOrdrL.stream().forEach(x -> {
-                x.setQtaOrd(x.getQtaOrd().multiply(moltiplicatore).setScale(2, RoundingMode.HALF_UP));
+                x.setQtaOrd(x.getQtaOrd().multiply(moltiplicatore).setScale(5, RoundingMode.HALF_UP));
+
+                /*Necessario per farsi che vengano ricalcolate tutte le quantità in funzione della nuova quantità ordinata */
+                x.setNumCnf(null);
+                x.setQtaOrd2(null);
+                x.setQtaOrd3(null);
+                x.setPesoLordo(null);
                 x.setOperation(OperationType.UPDATE);
             });