diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241112183616.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241112183616.java new file mode 100644 index 0000000000..245d649fe8 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241112183616.java @@ -0,0 +1,23 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.IntegryCustomer; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20241112183616 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + if ( isCustomer(IntegryCustomer.Carelli)) + updateSetupValue("PICKING", "ACCETTAZIONE_BOLLA", "FLAG_DISABLE_MANDATORY_TRACCIABILITA", "S"); + } + + @Override + public void down() throws Exception { + + } + +} \ No newline at end of file diff --git a/ems-engine/src/main/java/it/integry/ems/retail/service/ListiniAcquistoHandlerService.java b/ems-engine/src/main/java/it/integry/ems/retail/service/ListiniAcquistoHandlerService.java index dbbfc304d6..53bb8a675e 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/service/ListiniAcquistoHandlerService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/service/ListiniAcquistoHandlerService.java @@ -101,7 +101,7 @@ public class ListiniAcquistoHandlerService { " descrizione,\n" + " cod_mart,\n" + " cod_art_for,\n" + - " qta_cnf,\n" + + " round(qta_cnf/rap_conv, 5) qta_cnf,\n" + " unt_mis_acq,\n" + " qta_min_ord,\n" + " flag_qta_multipla\n" +