Commit Graph

15909 Commits

Author SHA1 Message Date
f66a3ccdfb aggiunto tipo per trigger 2024-07-15 13:52:22 +02:00
6056e4dccc Merge branch 'master' into develop 2024-07-15 10:28:43 +02:00
493ca43226 Finish Hotfix-71 2024-07-15 10:28:42 +02:00
81394cc6fa eliminato controllo su esitenza setup 2024-07-15 10:28:36 +02:00
cd1f71952b Merge branch 'refs/heads/master' into develop
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
2024-07-12 17:57:54 +02:00
432de33a60 Finish Hotfix-71
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/system/exchange/dto/CertificatiSinfoOneDTO.java
#	ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
2024-07-12 17:55:17 +02:00
6078e9770e [RossoGargano] importazione certificati da sinfo 1 2024-07-12 17:53:57 +02:00
d6add3cf65 Fix nome variavile immagine scheda prodotto 2024-07-12 17:39:39 +02:00
6a03fd5010 Fix nome variavile immagine scheda prodotto 2024-07-12 17:20:56 +02:00
e04e5166ce scheda tecnica prodotto 2024-07-12 16:56:59 +02:00
012f27d460 Gestite eccezioni compileWordFile 2024-07-12 16:36:36 +02:00
d8a9337d30 Gestito valore hashmap null in replaceVariables 2024-07-12 15:06:08 +02:00
71f7a665c8 aggiunta fk 2024-07-12 13:39:11 +02:00
cc7db6a529 Merge branch 'refs/heads/develop' into feature/Feature-variazioni2
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/controller/RetailController.java
2024-07-12 12:58:44 +02:00
b2522ecc38 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 12:57:30 +02:00
356e1bdd12 Aggiunto parametro mancante su operazioni pianificate di default 2024-07-12 12:57:21 +02:00
4eae593bce Merge branch 'master' into develop
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
2024-07-12 12:52:50 +02:00
40055a6c03 Finish Hotfix-71 2024-07-12 12:52:07 +02:00
48edcf2e9d [RossoGargano] importazione certificati da sinfo 1 2024-07-12 12:52:00 +02:00
49214b500e gestione scheda tecnica 2024-07-12 11:56:01 +02:00
d6d4c3583b modifica gestione elenco file scheda tecnica 2024-07-12 11:43:48 +02:00
049e1b4921 aggiunta gestione Elenco File Scheda Tecnica 2024-07-12 11:04:52 +02:00
672195fb4a Fix e migliorie su importazione Exchange 2024-07-11 16:14:58 +02:00
ffa3ea8cff correzione mrp controllo scorta minima 2024-07-11 13:38:01 +02:00
de3f04a6ca Merge remote-tracking branch 'origin/develop' into develop 2024-07-11 13:02:39 +02:00
d76fd941a8 Fix e migliorie su importazione Exchange 2024-07-11 13:02:33 +02:00
05a6b2b5d4 Aggiunto controllo per esclusione esecuzione da DMS 2024-07-11 11:09:31 +02:00
8e846a6598 Merge remote-tracking branch 'origin/develop' into develop 2024-07-11 10:47:11 +02:00
1f8252db21 Query MRP_ImpProx 2024-07-11 10:47:03 +02:00
08cae9e3bb Impostato salvataggio rest gestione scheda tecnica 2024-07-11 10:08:47 +02:00
513fa6f5f0 Finish Hotfix-70 2024-07-10 18:33:26 +02:00
9c1bb13d7a Merge tag 'Hotfix-70' into develop
Finish Hotfix-70
2024-07-10 18:33:26 +02:00
ab6a08ab60 Modifica tracciti MIRARCHI\DIPA\ROTUNNO 2024-07-10 18:33:11 +02:00
5793fd1908 Creato servizio che compila e scarica il file di word della scheda tecnica 2024-07-10 17:37:31 +02:00
641f39784c Merge remote-tracking branch 'origin/develop' into develop 2024-07-10 15:49:45 +02:00
64850e628a MIRARCHI 2024-07-10 15:49:40 +02:00
88d0d82544 aggiunti giorni per recupero scontrini 2024-07-10 12:09:02 +02:00
cabc38b216 Merge branch 'master' into develop 2024-07-10 11:53:08 +02:00
04841eec4e Finish Hotfix-70 2024-07-10 11:53:07 +02:00
3a12327b16 sistemata condizione su data inizio su recupera scontrini 2024-07-10 11:52:51 +02:00
1d3b96395e Modificato servizio getTreeView 2024-07-10 10:16:34 +02:00
7341cc625b Merge branch 'master' into develop 2024-07-09 18:47:46 +02:00
2ee729449d Finish Hotfix-70 2024-07-09 18:47:45 +02:00
87fb1868f0 correzione errore for input string 2024-07-09 18:47:39 +02:00
446db73fe7 Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 18:32:10 +02:00
05a6e363c9 varie sian 2024-07-09 18:32:07 +02:00
0b91e53f96 Merge tag 'Hotfix-69' into develop
Finish Hotfix-69
2024-07-09 17:25:31 +02:00
a5518de1c1 Finish Hotfix-69 2024-07-09 17:25:30 +02:00
0dd3403946 Fix customer id null e fix target quantity 2024-07-09 17:25:12 +02:00
0e316cba9c nuova entitychild 2024-07-09 16:26:28 +02:00