Commit Graph

25 Commits

Author SHA1 Message Date
9678de10f1 Ricopiato ems_settings da develop tranne per ime_te e gramm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-12-10 17:12:41 +01:00
3eaa1218c5 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	.idea/structuralSearch.xml
#	docker/tomcat/conf/integry/ems_settings.json
#	ems-core/src/main/java/it/integry/common/var/CommonConstants.java
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251205111526.java
#	ems-core/src/main/java/it/integry/ems/rules/completing/DocumentCheckRules.java
#	ems-core/src/main/java/it/integry/ems/user/service/UserCacheService.java
#	ems-core/src/main/java/it/integry/ems_model/entity/Azienda.java
#	ems-core/src/main/java/it/integry/ems_model/utility/UtilityException.java
#	ems-engine/src/main/java/it/integry/ems/customizations/production/service/ToscaProductionService.java
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
#	ems-engine/src/main/java/it/integry/ems/logistic/Import/service/EuritmoImportService.java
#	ems-engine/src/main/java/it/integry/ems/logistic/controller/LogisticController.java
#	ems-engine/src/main/java/it/integry/ems/logistic/service/LogisticService.java
#	ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java
#	ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSGenericController.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/MvwSitArtUdcDetInventarioDTO.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
#	ems-engine/src/main/java/it/integry/ems/system/controller/SystemController.java
2025-12-09 10:01:18 +01:00
f4faa20652 Aggiornata connessione FRUDIS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-12-02 17:33:54 +01:00
7dab29e8c2 Aggiornato ems_settings.json
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	docker/tomcat/conf/integry/ems_settings.json
2025-12-01 10:23:34 +01:00
01c1551b73 Aggiornato ems_settings.json
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-12-01 10:22:38 +01:00
b33090641b Merge branch 'master' into feature/RefactoringGestioneColli
# Conflicts:
#	docker/tomcat/conf/integry/ems_settings.json
#	ems-core/src/main/java/it/integry/ems/rules/completing/PurchasesRules.java
#	ems-core/src/main/java/it/integry/security/jwt/AccessTokenProvider.java
#	ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoApuliaCarrefourService.java
#	ems-engine/src/main/java/it/integry/ems/production/service/ProductionOrdersLifecycleService.java
2025-12-01 09:48:39 +01:00
e5689da13d Cambiato ems_settings.json
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-27 11:44:24 +01:00
f57710cb32 Cambiato ems_settings.json
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-27 11:31:20 +01:00
3a934813d8 Cambiato ems_settings.json 2025-11-27 11:06:27 +01:00
febb3bf10b Fix su insertUdsRows
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-26 15:42:53 +01:00
4d2fbf610d Rimosso BiolevantePeppe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 10:37:32 +02:00
e8d8f7db1a Ripristinato maggio srl in ems_settings.json
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 16:51:45 +02:00
7ba89d3cfa Rimosso Maggio Peppe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 11:18:46 +02:00
3055139b83 Aggiunti servizi per retrieve lista resi fornitori
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-18 10:12:49 +02:00
76785b22fe Cambiata connessione biolevante con biolevante_peppe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 15:08:16 +02:00
e1e9a3cbfc Rimosso Rossogargano_peppe da build docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 13:41:44 +02:00
54fc28eb74 Fix su migration per nuova logica WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 15:17:48 +02:00
749a7e9750 Cambiato db RossoGargano in RossoGargano_peppe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 12:27:17 +02:00
f06117d5ef Merge branch 'develop' into feature/RefactoringGestioneColli
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGiacenzaULService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/controller/WMSMaterialiController.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/dto/VersaMaterialiRequestDTO.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSMaterialiService.java
2025-04-09 11:32:45 +02:00
fdcf4a5f40 Fix fonts in docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 11:20:20 +02:00
0b3f1ee9fc Aggiornato ems-settings docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 11:52:55 +02:00
7c19c93814 Aggiornato ems-settings docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 11:45:55 +02:00
532c12dd22 Iniziato refactoring VersamentoMateriali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 09:04:17 +02:00
6a2708dd82 Aggiornati json per docker build
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-03-11 13:05:55 +01:00
aedaad1de3 Integrato Docker
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-03-11 12:37:33 +01:00