Compare commits

..

2054 Commits

Author SHA1 Message Date
e3f4196e42 Finish FixTransUl
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-12-16 12:06:57 +01:00
13dfca6944 Corretta chiusura popup trasferimento in caso di stampa in popup trasferimento 2025-12-16 12:06:43 +01:00
4e15508d80 Finish FixAddArt
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-15 11:11:36 +01:00
6502abf6ba Fix articolo non visibile in aggiunta al listino in popup ordine se presente in contratto 2025-12-15 11:09:33 +01:00
f68da24f87 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-12 17:15:29 +01:00
ef816ecf1a aggiunti parametri 2025-12-12 17:13:28 +01:00
aed3eac4b8 Fix stampe in popup trasferimento controllo giacenze
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-12 16:16:34 +01:00
d891fefae8 Fix messaggio articoli senza prezzo sostituito dal fido in popup ordine dp
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-12 15:46:05 +01:00
8c80c27ea9 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-11 16:29:59 +01:00
92761f3d85 Finish Hotfix-15
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-11 16:29:58 +01:00
1ba7b7ad33 aggiunto fitlro per deposito 2025-12-11 15:39:18 +01:00
5f3d47f20d Unificato popup trasferimento da refactoring
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-11 12:51:22 +01:00
bf3da20652 Unificato popup trasferimento da refactoring
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-11 09:45:40 +01:00
0c092ed928 Finish Hotfix-15
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-10 15:54:55 +01:00
c748a65d71 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-10 15:54:55 +01:00
7f78643d0e cambiata condizione sui pv 2025-12-10 15:52:26 +01:00
6c93df7b4e Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-10 12:24:00 +01:00
eda828a708 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-10 12:23:59 +01:00
945cea8b7c [Anomalie UL]
- TabView per visualizzazione e gestione dei livelli di anomalia
2025-12-10 12:23:38 +01:00
25de0b8d12 Gestita richiesta dei dati del documento in trasferimento ul controllo giacenze
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-10 10:16:42 +01:00
9dc5ad1672 Gestita richiesta dei dati del documento in trasferimento ul controllo giacenze
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-10 10:08:56 +01:00
8a313bc694 Gestita richiesta dei dati del documento in trasferimento ul controllo giacenze
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-10 09:53:05 +01:00
f09c599d82 - fix drag to select in savableTable
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-09 16:23:56 +01:00
be22f27b6d Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-09 14:34:56 +01:00
06b200094d Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-09 14:34:55 +01:00
09d778b68d corretto reloading datsource in modifica anomalie 2025-12-09 14:33:52 +01:00
cc15afd890 Merge tag 'Release-2' into develop
All checks were successful
PVM/pipeline/head This commit looks good
Finish Release-anomalie
2025-12-09 12:42:48 +01:00
4a3cac8f60 Merge branch 'release/Release-2'
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-09 12:42:47 +01:00
7572634526 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-09 12:41:49 +01:00
c13c3eec4f [CONTROLLO GIACENZE]
- gestite anomalie merce
2025-12-09 12:41:35 +01:00
1f3dadfd21 Finish FixSaveManutenzione
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-09 10:32:25 +01:00
152c53859c Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-09 10:32:25 +01:00
c3cd28938a Corretto creazione ordine in manutenzione macchinari 2025-12-09 10:32:08 +01:00
e01f8af9ce [Rossogargano - Non conformità]
- fix nuova anomalia
- merge da branch nuovi colli
2025-12-05 13:38:35 +01:00
a751b01146 Merge remote-tracking branch 'origin/develop' into develop 2025-12-05 11:10:09 +01:00
9f46de09f4 [Rossogargano - Non conformità]
- creata nuova gestione non conformità
2025-12-05 11:09:52 +01:00
194a6be744 Fix cancellazione dataRifScad in contratti di vendita e delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-04 17:40:20 +01:00
5ac7033aa1 Gestito gruppo SC come SL in azzeramento magazzino prod 2025-12-04 17:35:46 +01:00
525e9a35c1 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-04 15:16:07 +01:00
e8d4c893c0 Finish FixRicambi
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-04 15:16:06 +01:00
fef34df435 Fix dropdownlist articoli in macchinari prod 2025-12-04 15:14:25 +01:00
a33e509b14 Ordini per deposito utente in piano arrivi, qta ord in storico mes e modifica query statistiche listini vendita
Some checks are pending
PVM/pipeline/head Build queued...
2025-12-04 15:12:26 +01:00
4fe3a6639a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-04 15:07:37 +01:00
82aea4f73a Modifica query approvvigionamenti AURICCHIO 2025-12-04 15:07:07 +01:00
cce2aff5da Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-03 16:59:36 +01:00
7f5693b623 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-03 16:59:35 +01:00
333f7f6b1d [GRAMM]
- fix errore download scheda tecnica
2025-12-03 16:59:12 +01:00
57c15fca36 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-03 11:41:27 +01:00
16c13c96d4 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-03 11:41:26 +01:00
3adae42e13 [DELIVERY PLAN]
- gestiti caratteri speciali in conflitti note ordini
2025-12-03 11:41:01 +01:00
3b7ecb6279 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-02 16:02:06 +01:00
6e04ee70c9 Finish FixGetArticoli
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-02 16:02:06 +01:00
1be6647903 Fix errore campo mancante in popup nuovo materiale mes 2025-12-02 16:01:43 +01:00
6895c17781 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-02 11:47:05 +01:00
ff783398b1 Finish FixUpdEntriesWeb
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-02 11:47:04 +01:00
3cd4b5f93a Corretto invio richieste di tipo form 2025-12-02 11:46:50 +01:00
09c9706e05 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-01 18:20:31 +01:00
825f7f5c4a Finish CMMSRicambi
All checks were successful
PVM/pipeline/head This commit looks good
2025-12-01 18:19:31 +01:00
b17f6d62b3 Gestito e configurato guzzl, gestiti ricambi in macchinari prod 2025-12-01 18:19:02 +01:00
68820281b2 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-27 13:17:42 +01:00
4484a23cc4 Finish FixQueryListVend
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-27 13:17:42 +01:00
4a602184d3 Fix lentezza query listino vendita delivery plan 2025-11-27 13:17:23 +01:00
55be4808a1 eliminati ordini agganciati ai colli
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-27 11:05:11 +01:00
f9c03367da Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-27 10:30:34 +01:00
8929de84f7 Finish FixSaveCq
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-27 10:30:33 +01:00
d72c6d9476 Corretto salvataggio e cancellazione cq per tipologia 2025-11-27 10:30:14 +01:00
fb83c28919 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-26 16:27:04 +01:00
73b54e058b Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-26 16:27:03 +01:00
3fda9384b0 Merge branch 'master' into hotfix/Hotfix-15 2025-11-26 16:26:48 +01:00
2ee3a85fbe [Carelli - Modellini]
- gestita lista di articoli in form ispezioni
2025-11-26 16:26:18 +01:00
60f2bb8fef Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-26 11:11:25 +01:00
6b133e8388 Finish FixDupOrdDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-26 11:10:58 +01:00
90dbf28bd1 Rimossi viaggi in duplica ordine delivery plan 2025-11-26 11:10:42 +01:00
496d91ff3c Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-26 10:29:58 +01:00
a1a520d4b2 Finish FixLoginMD5
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-26 10:29:58 +01:00
bf3b1b1955 Corretta login con md5 2025-11-26 10:29:41 +01:00
bc0be3565a Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-25 10:17:21 +01:00
8737c2f13f Finish FixDataAddType
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-25 10:17:20 +01:00
d1a20eb06e Fix errore se nessun filtro in dataAddType 2025-11-25 10:17:03 +01:00
3227cec406 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-24 13:42:41 +01:00
0f41c64ddb Finish FixUpdateMaster
All checks were successful
PVM/pipeline/head This commit is unstable
2025-11-24 13:42:40 +01:00
5c8ff8600c Modifica modalita pubblicazione da ftp ad ssh 2025-11-24 13:35:28 +01:00
a1abc0c809 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-24 12:14:38 +01:00
7d75d11b50 Finish FixUpdateMaster
All checks were successful
PVM/pipeline/head This commit is unstable
2025-11-24 12:14:37 +01:00
58b1a5b424 Modifica modalita pubblicazione da ftp ad ssh 2025-11-24 12:14:23 +01:00
74e0ca4fa2 Merge branch 'master' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-11-24 11:39:26 +01:00
74b2aafe3c Finish FixUpdateMaster
All checks were successful
PVM/pipeline/head This commit is unstable
2025-11-24 11:39:25 +01:00
82f68cf520 Modifica modalita pubblicazione da ftp ad ssh 2025-11-24 11:39:10 +01:00
d04277192e Merge branch 'master' into develop
Some checks failed
PVM/pipeline/head Something is wrong with the build of this commit
2025-11-24 11:37:50 +01:00
fd6a1a2f74 Finish FixUpdateMaster
Some checks failed
PVM/pipeline/head Something is wrong with the build of this commit
2025-11-24 11:37:50 +01:00
b07af1cc18 Modifica modalita pubblicazione da ftp ad ssh 2025-11-24 11:37:35 +01:00
68b967ca0a Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-24 11:22:53 +01:00
181e24efc1 Finish FixUpdateMaster
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-24 11:22:52 +01:00
0ba636ba7f Modifica modalita pubblicazione da ftp ad ssh 2025-11-24 11:22:36 +01:00
f7cacc6a61 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-24 10:22:25 +01:00
6d2d376358 Finish FixUpdateMaster
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-24 10:22:24 +01:00
6e087ac049 Modifica modalita pubblicazione da ftp ad ssh 2025-11-24 10:22:07 +01:00
jenkins
70892a332d Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit is unstable
2025-11-23 07:21:42 +01:00
a595442cac Gestito focus sul campo password in caso di credenziali non valide
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-20 09:59:49 +01:00
0a006e81ef Cambio decimali in costo trasporto listini di vendita 2025-11-20 09:40:11 +01:00
be767b2c34 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-19 15:49:47 +01:00
2c259f2a07 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-19 15:49:47 +01:00
8c22d00faf [Controllo giacenze]
- fix gestione colonne nascoste/visibili
2025-11-19 15:49:23 +01:00
a1960a6164 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-19 12:37:04 +01:00
09b742ddf5 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-19 12:37:03 +01:00
0fec755244 corretto nome gestione ordini di produzione per cambio su wingest 2025-11-19 12:36:40 +01:00
f6d3405bc8 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 15:30:20 +01:00
33be4a79d8 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 15:30:19 +01:00
ffd098ddcd [Kendo]
- risolto problema sui filtri varchar con rappresentazione numerica
2025-11-18 15:29:32 +01:00
7f8d1de28d Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 13:22:09 +01:00
82da3e6527 Finish FixButtonDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 13:22:08 +01:00
8f6fbed5ec Fix pulsanti stampa non cliccabili in popup ordine delivery plan 2025-11-18 13:21:55 +01:00
5a915ca77c Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 13:07:04 +01:00
b86f3e3900 Finish FixBancaDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 13:07:03 +01:00
eddd90f1ab Rimosso controllo modifica flag banca ven in cambio cod paga popup ordine delivery plan 2025-11-18 13:06:45 +01:00
025c6de857 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 12:18:53 +01:00
15d12263d4 Aggiunta condizione per escludere ordini fatturati 2025-11-18 12:18:38 +01:00
f779338879 [MRP]
All checks were successful
PVM/pipeline/head This commit looks good
-fix filtro num ordine
2025-11-18 12:16:30 +01:00
8d64f5ed42 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 12:10:16 +01:00
b20aca0c1b Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 12:10:15 +01:00
9bf2e2c450 [Controllo giacenze]
- fix in filtri con valori numerici in campi varchar
2025-11-18 12:08:51 +01:00
df0f111571 [MRP]
All checks were successful
PVM/pipeline/head This commit looks good
- aggiunto filtro su numero ordine
2025-11-18 11:31:44 +01:00
a7b71d538c Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 11:31:09 +01:00
510cd46ff6 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-18 11:31:09 +01:00
fdf6ed0229 [Controllo giacenze]
- fix ricerca
2025-11-18 11:30:47 +01:00
598b5d0a85 [MES]
All checks were successful
PVM/pipeline/head This commit looks good
- rimossa distinta obbligatoria in query ordine lav
2025-11-17 17:47:14 +01:00
c15b7fc33e Finish FixDPPopupOrd
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 17:41:09 +01:00
071f46e5fd Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 17:41:09 +01:00
f70c17bc69 Fix width articolo in popup ordine delivery plan 2025-11-17 17:40:32 +01:00
195333136f Finish Hotfix-15
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 15:35:31 +01:00
b52adf3144 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 15:35:31 +01:00
6d311e5054 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 15:35:05 +01:00
00f38fa56c Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 15:35:04 +01:00
93ab6d9298 aggiunta immagine a sistemata query 2025-11-17 15:34:52 +01:00
b2f53e63e0 Merge branch 'master' into hotfix/Hotfix-15 2025-11-17 15:34:49 +01:00
e2efa1e9b4 [Controllo giacenze]
- fix doppio filtro su campi cod_mart e cod_mdep
- aggiunto controllo sui depositi utilizzabili dall'utente
2025-11-17 15:34:07 +01:00
704ab8c742 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 15:13:26 +01:00
75cdb8c0ea Finish Hotfix-100
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 15:13:25 +01:00
4da8997786 aggiunta immagine a sistemata query 2025-11-17 15:13:08 +01:00
cab8782281 aggiunta immagine a sistemata query 2025-11-17 15:12:51 +01:00
4c5149f21d Finish LoginJWT
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 12:36:33 +01:00
92da2191df Gestito login con token jwt 2025-11-17 12:20:03 +01:00
1ef37d47f5 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 12:11:45 +01:00
afd1b2bfb2 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit is unstable
2025-11-17 12:11:43 +01:00
0b728b3e61 [Delivery Plan]
- corretto controllo su righe di vendita evase
2025-11-17 12:11:07 +01:00
43b73417c4 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 11:18:19 +01:00
2f077574bf Finish ContGiacRead
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-17 11:16:56 +01:00
7cc0bb5e1d Rimosso read ad apertura giacenze 2025-11-17 11:16:40 +01:00
019d38fe71 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-14 15:46:59 +01:00
550466fb1f Finish FixSaveSegnalazione
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-14 15:46:58 +01:00
d428b2a660 Corretto salvataggio allegati in segnalazione modellini 2025-11-14 15:46:43 +01:00
220f2903bf [CMMS]
All checks were successful
PVM/pipeline/head This commit looks good
- rimosso codice deposito da anagrafica macchinari
2025-11-14 12:18:20 +01:00
d6ee4198ae Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-14 09:53:58 +01:00
bba4103d8a [GRAMM - MES]
- ripianificazione ordine lav tramite servizio
2025-11-14 09:53:38 +01:00
638f399929 Rimosso file inutile
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-14 09:30:12 +01:00
b4b41aa431 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-13 18:47:11 +01:00
8da5157f93 Finish FixCreaUdc
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-13 18:47:10 +01:00
eea7530563 Fix in creazione risposta in createUDS 2025-11-13 18:46:55 +01:00
8729f6ccc8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-13 15:52:54 +01:00
386161064f [GRAMM - MES]
- aggiunta nuova categoria di controlli di qualità
2025-11-13 15:52:32 +01:00
60af3b04ee Cambio titolo pagina ordini v slim2k
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-13 15:35:49 +01:00
32181a9c9e Ordinato anche per progressivo ul in popup ordine mes
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-13 15:27:24 +01:00
1cb0fc8a4e Creata tabella ordini v slim2k 2025-11-13 15:26:52 +01:00
6873371cd7 logo capelli monelli
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-13 12:38:08 +01:00
ea343fdabc Gestito flag evaso sulle righe popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-13 10:58:01 +01:00
59be998b44 Fix filtro utente in chiusura tagli prezzo
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-12 18:15:44 +01:00
32c1a6585f Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-12 12:59:50 +01:00
87020dd47d Finish AttivazioneTabUDCMes
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-12 12:59:49 +01:00
9d79008230 Attivata tab udc anche senza colli in popup ordine mes 2025-11-12 12:58:31 +01:00
2988fe27be gestito tipo um
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-11 17:26:07 +01:00
193907efc0 Finish FixContextMenuCntrolloGiac
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-11 17:19:07 +01:00
59309e7ea9 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-11 17:19:07 +01:00
dbd59cf54e Fix context menu sostituito anche per thead della tabella in controllo giacenze 2025-11-11 17:18:49 +01:00
bbdcd5946e Forzata creazione setup base per setup user
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-11 11:47:47 +01:00
6b0737a929 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-11 11:16:19 +01:00
f9377ba14d Finish RevertDCodBancDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-11 11:16:18 +01:00
72ef5d0836 Annullata modifica su cod_banc 2025-11-11 11:15:38 +01:00
9e821fda61 Impostati cq solo standard per deposito 01
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-10 16:54:36 +01:00
38570211ac Finish FixCQDate
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-10 16:12:45 +01:00
f5a63dd9ad Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-10 16:12:45 +01:00
2b698b026e Fix salvataggio cq per deposito 01 gramm 2025-11-10 16:12:39 +01:00
fca19d1018 portato divario di minuti in timepicker manutenzioni ad 1 minuto
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-10 13:20:16 +01:00
157e6ea8ed Finish FixCodBancDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-10 12:33:15 +01:00
8379c03474 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-10 12:33:15 +01:00
6e6c090a3b Fix errore se in nuovo ordine popup delivery plan 2025-11-10 12:33:00 +01:00
9f5bd0720c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-10 12:12:12 +01:00
b0404b0ee1 modifiche a mrp 2025-11-10 12:11:45 +01:00
30f1cc0994 Spostata modifiche query listini-vendita da branch refactoring
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-10 11:52:45 +01:00
95d51e05d7 Gestite note incoterms da ordine in creazione viaggio
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-10 11:12:04 +01:00
c1443e6313 Impostata data validita fissa alla versione con data prima dell'ordine in aggiunta art listino delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-07 17:18:52 +01:00
a939a8b4dd Fix campi non svuotati in aggiunta nuova riga cq gramm
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-07 16:51:28 +01:00
d6ed4324db Fix descrizione del fermo troppo stretta
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-07 12:16:28 +01:00
a35f1c5cac Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-06 18:09:30 +01:00
7f30268db5 sistemata query 2025-11-06 16:49:33 +01:00
33a739cd5a Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-06 16:18:59 +01:00
2de5d92ac9 Finish FixIdViaggioDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-06 16:18:58 +01:00
31acf9172b Fix id viaggio non assegnato se nuova riga in popup ordine 2025-11-06 16:18:42 +01:00
7f14c2e444 Revert mostrati solo articoli con flag primario in aggiunta articoli popup ordine delivery plan, usato solo in order by
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-06 16:03:01 +01:00
ee473209d2 Mostrati solo articoli con flag primario in aggiunta articoli popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-06 15:58:01 +01:00
f259928f95 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-06 12:16:49 +01:00
e375fa4df7 aggiunta pagina OrdiniVSlim2k 2025-11-06 12:16:32 +01:00
557b934434 aggiunta pagina OrdiniVSlim2k 2025-11-06 12:16:11 +01:00
84b30d6d61 Mostrati solo articoli con flag primario in aggiunta articoli popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-06 12:13:41 +01:00
2c732d375f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-06 09:51:51 +01:00
5bcba57fb3 Aggiunto filtro su flag primario in tab costi listini di vendita
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-05 18:38:55 +01:00
aaa258f6d1 Fix cod_jfas errato in storico ordini al cambio linea monitoraggio ordini
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-05 17:21:22 +01:00
84566fa7cd aggiunto capelli monelli 2025-11-05 15:59:23 +01:00
21f085f9e9 Fix null su flag banca ven in nuovo ordine
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-05 15:28:14 +01:00
9f45a1575f Impostato filtro suddivisione e riassortimento se non punto vendita
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-05 14:58:12 +01:00
cde2435693 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-05 12:18:27 +01:00
85cf0e1a84 Finish ModifListiniVend
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-05 12:18:26 +01:00
e5ee119819 Gestito group_equi null in listini di vendita 2025-11-05 12:18:11 +01:00
e46b154362 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-05 11:11:56 +01:00
29e0d2b52c Finish FixEModifStat
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-05 11:11:56 +01:00
5e6efdd63b Fix errore creaViaggio body troppo lungo, modificato gruppo statistiche in listini di vendita e descrizione art estesa 2025-11-05 11:11:39 +01:00
fad540afae Gestita banca in contratti di vendita e delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-05 11:04:50 +01:00
d37e3bb930 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-04 12:26:17 +01:00
438e77fe07 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-04 09:43:54 +01:00
73bb0ff43e Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-04 09:43:53 +01:00
36b70ebd80 fix: contextMenu in errore su articoli senza posizione 2025-11-04 09:43:33 +01:00
f37aff119c modificata chiamata al servizio 2025-11-03 12:51:11 +01:00
2b098d2977 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-03 12:22:48 +01:00
b199436934 Finish FixPopupOrdDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-11-03 12:22:48 +01:00
176417b508 Fix errore in nuovo ordine dp 2025-11-03 12:21:19 +01:00
1961c74290 Modificato messaggio errore foritore non valido
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-31 17:44:08 +01:00
88186d90b1 Gestito tipo valore dropdownlist in controlli qualita
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-30 16:07:15 +01:00
00cb5135d8 Fix calcolo qta in query giacenze mes
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-29 16:07:06 +01:00
bd6cb118b1 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-29 15:13:11 +01:00
6db01fba80 aggiunti nuovi campi della vista 2025-10-29 15:12:42 +01:00
9ea40beefa Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-29 10:52:09 +01:00
993d5129ab Finish FixCambioDataPartDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-29 10:52:08 +01:00
2fe3ed8e02 Corretta modifica data consegna su righe ordini con viaggi agganciati 2025-10-29 10:51:35 +01:00
c2a5387d63 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit is unstable
2025-10-29 09:51:52 +01:00
6d282e589f Finish FixArticoliAll
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-29 09:51:51 +01:00
61922ba1a8 Fix query list-articoli-all se non usa kendo 2025-10-29 09:51:41 +01:00
fd5cd04ffb Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-28 12:22:59 +01:00
08737a18fa Finish FixListiniVend
All checks were successful
PVM/pipeline/head This commit is unstable
2025-10-28 12:22:58 +01:00
420ecd95b4 Corretta modifica unt mis ven e cancellazione trasporti in listini di vendita 2025-10-28 12:22:41 +01:00
17731d5b5d Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-22 16:46:44 +02:00
7791252860 Finish FixCreaViaggio
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-22 16:46:44 +02:00
435aa9c18e Fix in creazione viaggi da ordini con incoterms 2025-10-22 16:46:29 +02:00
8521f581d6 Sistemata query listini quando ci sono equivalenti
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-22 16:25:46 +02:00
836ded1b56 Finish ModifListiniVend
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-10-22 11:55:34 +02:00
e5807d98fa Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-22 11:55:34 +02:00
bb639337c0 Gestita creazione nuovo listino vuoto in listini di vendita e modifica tab statistiche 2025-10-22 11:55:18 +02:00
a80f0f1cfd Finish MargNegStat
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-21 17:56:37 +02:00
ddabd0a9e8 Merge branch 'master' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-10-21 17:56:37 +02:00
55d2fce4d8 Margine negativo rosso in statistiche listini di vendita 2025-10-21 17:56:22 +02:00
57bef21034 Finish FixCostiStat
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-21 17:45:49 +02:00
650af8ea7e Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-21 17:45:49 +02:00
ae9b427e99 Corretto costo in statistiche listini di vendita 2025-10-21 17:45:34 +02:00
0601905158 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-21 17:44:29 +02:00
fa07c3ec89 Finish FixPermessoModifLotto
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-21 17:44:28 +02:00
f96fd82517 Fix permesso modifica lotto in caso di partita mag prod diversa da quella dell'ordine 2025-10-21 17:44:14 +02:00
6708b1ee0a Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-21 10:08:05 +02:00
062a0df5a8 Finish FixDuplicaLisv
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-21 10:08:05 +02:00
bc5b09aa45 Corretta duplicazione listino di vendita, prima usava solo l'ultima versione 2025-10-21 10:07:49 +02:00
0200c195e1 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-20 18:05:43 +02:00
74fbcca896 Finish FixFlagPrimario
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-20 18:05:42 +02:00
fbff3c0923 Fix flag primario true solo in inserimento 2025-10-20 18:04:24 +02:00
a3b113f342 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-20 12:08:33 +02:00
f8c3d6f33e Finish FixModifQtaGiac
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-20 12:08:32 +02:00
1ff25282a3 Fix context menu voci cancellate permanentemente se aperto su un collo V in controllo giacenze 2025-10-20 12:08:15 +02:00
44e6e41a8b Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-20 11:08:51 +02:00
5d1063a42d Finish aggNumUDCMP
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-10-20 11:08:50 +02:00
30124d66c5 inserito numUDCMP 2025-10-20 11:07:57 +02:00
jenkins
be708dc549 Merge branch 'master' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-10-19 07:21:51 +02:00
af6c781d81 Gestito fork di phpexcel
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-17 10:47:22 +02:00
cdf69d3170 Fix ricerca articoli in aggiunti riga contratti di vendita
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-16 17:50:03 +02:00
ddd51a64b8 Migliorato filtro per codMdep utente in controllo giacenze
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-16 16:10:01 +02:00
5935b6182d Gestito context menu filtro articolo ed unificate classi ListaArriviView e ListaImpegnatoView
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-16 10:40:08 +02:00
a03e7e1091 gestito flag_primario
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-15 15:11:12 +02:00
c367ea2e51 aggiunto flag primario
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-15 13:15:41 +02:00
07a0896bff Esclusi cancellati e non attivi in get-costi listini vendita
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-15 13:02:30 +02:00
ac5becd634 Modificato .editorconfig, fix divide by 0 in listini di vendita e creata api WmsUtility
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-15 12:42:52 +02:00
8724fa0cab Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-15 12:27:16 +02:00
a060e5c7f7 Merge branch 'hotfix/Hotfix-15' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-10-15 12:27:16 +02:00
9d196f78cb [GRAMM - MES]
- corretti undefined index in rettifica plus alla chiusura dell'ordine
2025-10-15 12:26:54 +02:00
920af2894d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 18:11:57 +02:00
98a90a14c4 Sistemato inserimento utente in modo che venga aggiornata la cache 2025-10-14 18:11:38 +02:00
52ed386d34 Sistemato inserimento utente in modo che venga aggiornata la cache 2025-10-14 18:05:45 +02:00
8484aa1014 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 16:05:07 +02:00
fa2be30fbf Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 16:05:07 +02:00
7e8cc923b4 [ROSSOGARGANO - Articoli Ricambi]
- corretta gestione modifica articoli di ricambio (errore di validazione sul gruppo merceologico)
2025-10-14 16:04:45 +02:00
53a0aaab1c Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 15:52:09 +02:00
23d19c8d71 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 15:52:09 +02:00
7f0fcdbe45 [ROSSOGARGANO - CONTRATTI V]
- corretto controllo su data ricorrenza minima in modifica
2025-10-14 15:51:36 +02:00
b06f5ad5c7 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 15:42:19 +02:00
b1c51afcf9 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 15:42:18 +02:00
86a4a91855 [ROSSOGARGANO - Articoli Ricambi]
- corretta gestione modifica articoli di ricambio (errore di validazione sul gruppo merceologico)
2025-10-14 15:41:58 +02:00
7b13209c5c Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit is unstable
2025-10-14 11:00:51 +02:00
9a97cf08b3 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 11:00:50 +02:00
5dd1605879 [GRAMM - MES]
- corretti undefined index in rettifica plus alla chiusura dell'ordine
2025-10-14 11:00:30 +02:00
e864b35d5e Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 10:18:54 +02:00
a7e13e23c0 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-14 10:18:53 +02:00
f6e0c6988f [GRAMM - MES]
- corretto controllo differenze quantità residuo in chiusura ordine dovute alla gestione dei valori float
2025-10-14 10:18:29 +02:00
8fcf7d42f0 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-13 12:38:55 +02:00
81fca4c581 Modifica query elenco ordini per floreali 2025-10-13 12:38:39 +02:00
jenkins
145c4d3049 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-12 07:21:40 +02:00
9946c54b9e Aggiornato devcontainer.json
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-09 10:54:04 +00:00
0335d1aad5 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-08 16:45:27 +02:00
f48b215777 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-08 16:45:27 +02:00
b3938af954 [CMMS]
- corretta gestione macchinari senza collector
[MODELLINI]
- corretta gestione date su attività con nuovi campi calcolati
[MES]
- fix in caricamento linee senza supervisor
2025-10-08 16:45:02 +02:00
9c89f43246 Modifica query duplicazione ordini di vendita: riportava anche flag e qtà evasa
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-10-08 13:16:10 +02:00
5d216fe34e Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-07 10:54:51 +02:00
f4826d10c4 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-07 10:54:50 +02:00
3403ddeccd [REPORT_AREA]
- modificati flag htmlentities per fare in modo che caratteri non validi (es. à) non annullino la stringa ma vengano solo ignorati
[CMMS]
- gestito correttamente parametro codArea in stampa riepilogo reparto
2025-10-07 10:54:27 +02:00
176a86edab Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-06 10:53:24 +02:00
b8f58a63b5 Finish ModifBlacklistArt
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-06 10:53:23 +02:00
f7037fbc01 Modificate colonne tabella blacklist textiles 2025-10-06 10:53:02 +02:00
1fdba573b5 Aggiunta possibilità di override custom in docker-compose
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-03 15:36:54 +02:00
1b391a2814 Visualizzazione giacenza per depositi dell'utente in riepilogo prodotto rosso gargano
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-01 18:21:00 +02:00
01aa13e4c3 Finish GestBlacklistArtClie
All checks were successful
PVM/pipeline/head This commit looks good
2025-10-01 12:31:56 +02:00
19ea05fdbf Creata nuova gestione blacklist articoli cliente 2025-10-01 12:21:21 +02:00
93d79afc3b Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-30 13:08:23 +02:00
b8eaf73166 Finish FixUntMisVen
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-30 13:08:23 +02:00
073110c188 Fix valore unt mis ven se articolo non da listino 2025-09-30 13:08:01 +02:00
e186222147 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-30 12:49:12 +02:00
068111a907 Finish FixPercProvDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-30 12:49:11 +02:00
3158b254c4 Fix perc prov errata in listino vendita delivery plan 2025-09-30 12:48:54 +02:00
09d58dfd1b Aggiornato devcontainer.json
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-09-29 11:12:36 +00:00
339e778683 Aggiornato devcontainer.json
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-09-29 12:50:31 +02:00
aed2153440 Aggiornato devcontainer.json
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-09-29 12:24:16 +02:00
776a899745 Aggiornato devcontainer.json
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-09-29 10:15:12 +02:00
1debd17f6e Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-29 09:52:27 +02:00
43831043b2 Finish FixGetRapConv
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-29 09:52:26 +02:00
6d87fb7a45 Fix getRapConvForUm se articolo da contratto in popup ordine delivery plan 2025-09-29 09:51:53 +02:00
b344e8374a Fix errore all'aggiunta di un cq fermo macchina se indice iniziale non 0
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-26 12:12:47 +02:00
8452e9efe1 Aggiornato devcontainer.json
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-25 17:43:38 +02:00
275c0d023a Aggiunto gitignore per copilot e datasources. Aggiunta config temporanea di Vetta
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-25 16:21:29 +02:00
55470051bb Fix cache moduli non per profileDb
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-25 09:54:52 +02:00
513005a604 Allineato periodo fabbisogno a destra
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-24 13:02:54 +02:00
62cb05849d Build con podman
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-24 12:16:22 +02:00
4a11aef216 Build con podman
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-09-24 12:02:55 +02:00
b768f83ac7 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-24 10:57:26 +02:00
b7e9d91963 Finish FixSelectContrattiVend
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-24 10:57:26 +02:00
b2bf9d0db8 Fix lentezza su ricerca articoli e clienti 2025-09-24 10:56:59 +02:00
ecb545d4f8 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-23 16:24:31 +02:00
67cf544ba6 Finish FixCRM
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-09-23 16:24:30 +02:00
1f78a6fe6d Fix in modifica articolo preventivo se cancellato dal listino o articolo inattivo 2025-09-23 16:24:11 +02:00
f02437bcab Gestita visualizzazione fabbisogni mrp per settimana e per mese
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-23 12:38:08 +02:00
1fad303aa0 Finish ModifRiepRG
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-22 18:14:52 +02:00
b89eddd647 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-22 18:14:52 +02:00
299147d708 Esclusa giacenza per deposito senza gestisci colli e fix lentezza su query riepiloghi rosso gargano 2025-09-22 18:14:24 +02:00
0be206a8ea Spostata cache del menu dalla session a phpfastcache e gestita invalidazione da gestione menu
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-22 12:34:35 +02:00
e641e19585 Aggiunta condizione su listino per ricerca articoli in catalogo ime ba
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-19 18:36:37 +02:00
3b0af5dbc3 Separata query per materiali per id lotto da quella per ordine
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-09-19 16:36:59 +02:00
d635d31665 Fix autofit ed impostati filtri obbligatori in tracciabilita
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-18 18:40:51 +02:00
6680b18cc7 Reso chkList non rimovibile se preselezionato, selezione ordine obbligatorie per listino e permesso evasione se ultimo documento
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-18 17:40:40 +02:00
edf3ebec92 Fix nome campo descrizione prod in tracciab udc prod
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-18 13:15:02 +02:00
048b8d62f1 rivista la query affinchè lo sconto venga solo se tutti i clienti agganciati al listino hanno la stessa scontistica
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-17 18:28:11 +02:00
4809ca3825 Creato pulsante per riapertura segnalazione in modellini
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-17 18:14:04 +02:00
470038f26a Aggiunto filtro con ora in data ora prod tracciabilita
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-17 17:27:37 +02:00
c3e0c15217 Fix width di alcune colonne in tracciabilita
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-17 17:06:28 +02:00
8bc40c4d94 Fix udc in tab vendite tracciabilita
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-17 16:37:04 +02:00
e83b5cc661 Impostato minimo qta contratto come somma tra qta ordinata e qta consegnata in contratti di vendita
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-17 16:15:18 +02:00
bbd9f25033 Lettura flag_attivo per pulsante esporta ordine in ordini_a
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-17 12:38:06 +02:00
bdeb623817 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-17 12:20:49 +02:00
dbdd931789 agggiunto flag espotazione attiva 2025-09-17 12:20:07 +02:00
8c319389fe Finish GestioneTracciabilita
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-17 12:14:54 +02:00
e83c9663d0 Creata gestione per consultazione tracciabilita acquisti, produzione e vendite e migliorata creazione models kendo 2025-09-17 12:11:31 +02:00
6245f6e47d Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-16 12:40:46 +02:00
2ceb7cf90f Finish FixGestSetupCache
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-16 12:40:46 +02:00
660e8403fa Fix cache gest setup non per profileDb 2025-09-16 12:40:27 +02:00
784e9c56a1 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-16 10:46:06 +02:00
4d00902d51 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-16 10:46:05 +02:00
cfeb23a2f7 - fix parse Automatica delle Entity (codici numerici trasformati in date) 2025-09-16 10:45:45 +02:00
efc9fa282d Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit is unstable
2025-09-16 09:59:55 +02:00
50c2942d5d Finish FixTermCons
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-16 09:59:55 +02:00
768bb2b0dc Fix set term cons ad aggiunta articolo popup ordine delivery plan 2025-09-16 09:59:36 +02:00
569658b22a Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-15 16:26:59 +02:00
51f1f4f8e3 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-15 16:26:58 +02:00
94b86027c8 - in parse automatica di entity da array aggiunto controllo su numeri erroneamente considerati date 2025-09-15 16:26:37 +02:00
630675c7bf [biolevante - cmmms]
All checks were successful
PVM/pipeline/head This commit looks good
- gestione reparti , caratteristiche macchina e stampa riepilogo per reparto
2025-09-12 18:38:22 +02:00
1efb51ac7a Fix vari contratti di vendita
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-12 10:13:24 +02:00
d0f34836f6 sistemati apici
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-11 15:01:03 +02:00
edc0a79162 Gestiti nuovi campi in contratti di vendita ed in selezione articoli da contratto in delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-10 11:09:40 +02:00
jenkins
ac3e4314e8 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-07 07:21:28 +02:00
4afd5a2939 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-03 17:30:44 +02:00
bb186b9930 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-03 17:30:44 +02:00
3cbb51c68b [DELIVERY PLAN]
- correzioni su contratti e destinatari
2025-09-03 17:30:21 +02:00
09edebf75e sistemato popup ordine chiuso
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-02 18:02:44 +02:00
54d522b30e Finish GestioneImmaginiArticoli
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-01 16:01:33 +02:00
0014f445b1 Merge branch 'develop' into feature/GestioneImmaginiArticoli 2025-09-01 16:01:18 +02:00
e8287bd36c rifattoizzata gestione immagni articoli con tabella kendo 2025-09-01 15:48:15 +02:00
030be4ca7e Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-01 11:17:48 +02:00
7a6d7926f6 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-09-01 11:17:47 +02:00
2a8185e081 [BIOLEVANTE - MES]
- corretta gestione servizio gestSetup multiple e criteri di visualizzazione tab stato macchine
2025-09-01 11:17:27 +02:00
afaf7cf3c8 Aggiunto raggruppamento per contratto e gestione conflitti in popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-29 18:55:07 +02:00
38a542102d Gestito errore in caso di cancellazione di un ordine con rientri in mes
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-28 11:52:09 +02:00
a053096cee Rimosso private no expire per session cache in campi di raccolta
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-26 15:24:44 +02:00
e085e6488d Spostata cancellazione su servizi per ordini lav ed acq
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-25 10:22:55 +02:00
2050b0f98f [dulciar - mes]
All checks were successful
PVM/pipeline/head This commit looks good
- fix formattazione data rilevamento pesata
2025-08-25 09:48:13 +02:00
6733e9ab8c Fix warning in caso di setup senza description
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-22 10:01:15 +02:00
92e7ffb071 Gestita ricerca per id in sidebar
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-21 15:07:50 +02:00
20295007e2 Riattivata cache in GestSetup e fix get_azienda in class Login
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-21 12:09:21 +02:00
fe771d639b Aggiornata classe di gestione di GestSetup: adesso viene chiamato il servizio di setup e non più processSql
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-21 10:12:58 +02:00
ae56a5fca0 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-19 18:16:21 +02:00
07ed227662 Finish FixDockerDev
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-19 18:16:21 +02:00
e68ee047c8 Fix composer install mancante in final-dev docker 2025-08-19 18:15:52 +02:00
c33409097b Merge branch 'master' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-08-19 18:08:15 +02:00
a3e07dd901 Finish FixDockerDev
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-19 18:08:14 +02:00
8a2e9c2a14 Fix composer install mancante in final-dev docker 2025-08-19 18:06:55 +02:00
6e5060f264 Merge branch 'master' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-08-19 17:55:32 +02:00
94657bd0e3 Finish FixDockerDev
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-19 17:55:32 +02:00
67e98a5525 Fix composer install mancante in final-dev docker 2025-08-19 17:55:16 +02:00
fd59984fc2 [MES]
All checks were successful
PVM/pipeline/head This commit looks good
- aggiunta possibilità di definire la stampa dell'ordine di lavoro per linea di lavorazione
2025-08-19 10:23:12 +02:00
83804143d7 Compilato mezzo alla selezione di un cliente in popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-18 12:44:23 +02:00
2f253969bc Aggiunto permesso per modifica prezzo contratto in nuovo carico rosso gargano
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-14 11:38:12 +02:00
d8f226189d Fix query search articoli in contratti di vendita
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-13 16:41:08 +02:00
5521f3fa30 Aggiunto controllo > 0 per qta residua contratto in popup listino delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-13 12:47:35 +02:00
20d134cbf1 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-11 10:42:34 +02:00
28b667c1f3 Finish FixTableSpes
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-11 10:42:34 +02:00
fd8272c2af Fix larghezze mancanti in tabella spese dp 2025-08-11 10:42:13 +02:00
f50f67fd32 Corretto nome setup chiusura tagli prezzo
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-11 09:38:35 +02:00
ed196534c6 Gestite setup det con flag_multi_value, nuove setup per chiusura tagli prezzo e permesso per modifica data scadenza segnalazione carelli
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-08 16:24:04 +02:00
24483c83f0 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-08 10:59:04 +02:00
6d562965e5 Finish FixModifForn
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-08 10:59:04 +02:00
eb482b6364 Fix salvataggi mancanti in modifica destinatario 2025-08-08 10:58:42 +02:00
75166167b8 correzione su utenti e lista ordini
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-07 13:21:16 +02:00
6c30849011 Finish FixModifUDC
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-06 10:58:24 +02:00
97776001f8 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit is unstable
2025-08-06 10:58:24 +02:00
1631ab1f23 [ROSSOGARGANO]
- lettura partita da collo in modifica udc
- aggiunta possibilità di inserire manualmente il fnc1 in versamento materiale
2025-08-06 10:58:06 +02:00
907256e1a2 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 18:47:24 +02:00
bcfecda1b0 Finish FixBuild
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 18:47:23 +02:00
0e2f5a2c9f Fix build su Azure 2025-08-05 18:45:42 +02:00
7b83418e11 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 18:38:31 +02:00
2e11933e21 Finish FixBuild
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 18:38:31 +02:00
50b6c8b43d Fix build su azure 2025-08-05 18:38:14 +02:00
8c54538d69 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 17:56:30 +02:00
158ca2e0cd Finish FixPianTab
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 17:56:30 +02:00
ceade73195 Fix detail in pianificazione e creata setup per proponi ultima qta in crea udc 2025-08-05 17:56:13 +02:00
24164c8742 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 12:11:01 +02:00
d4ca2e483b Finish ModifPianAcc
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 12:11:00 +02:00
0507dca691 Sort per rag soc prod e nuovi pulsanti in tab pianificazioni 2025-08-05 12:10:37 +02:00
db40156e86 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 11:47:09 +02:00
bc2a4ba546 Finish ModifPianAcc
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-05 11:47:08 +02:00
7cf90d8ad0 Sort per rag soc prod e nuovi pulsanti in tab pianificazioni 2025-08-05 11:46:53 +02:00
04f0a2cae5 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-04 16:32:18 +02:00
4728704387 Finish TriggerChangeViag
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-04 16:32:17 +02:00
772dfdae1e Aggiunto trigger change in caso di costo venditore in popup riep giorno rg 2025-08-04 16:31:39 +02:00
d568311d55 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-04 16:20:49 +02:00
b90447e82d Finish TriggerChangeViag
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-04 16:20:49 +02:00
6452fd4f01 Aggiunto trigger change in caso di costo venditore in popup riep giorno rg 2025-08-04 16:20:34 +02:00
d248f1883a Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-04 13:23:01 +02:00
f7592db544 Finish RefreshPian
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-04 13:23:00 +02:00
3de9b0073b Impostato refresh in pianificazioni ogni 5 minuti 2025-08-04 13:22:44 +02:00
44170608a2 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-04 10:03:32 +02:00
2c695415e5 Finish OrderByScar
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-04 10:03:32 +02:00
a52ea4f706 Aggiunto order by in popup scarichi mes 2025-08-04 10:03:13 +02:00
4d1e35a3ea Fix type per valori numerici
All checks were successful
PVM/pipeline/head This commit looks good
2025-08-01 16:49:39 +02:00
e68ed8fa4c Fix dettaglio xdebug presente se non dev client
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-31 12:44:39 +02:00
d6ee7b3c66 Fix dimensioni fisse in mrp v2
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-30 18:52:46 +02:00
ca78a73d97 Finish AggPhpfastcache
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-30 17:36:41 +02:00
7c35db90d8 Gestita invalidazione cache dopo modifica setup 2025-07-30 17:36:19 +02:00
0656a5e691 aggiunta configurazione di fallback per cache di php
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-30 12:14:11 +02:00
bf37d1ac43 Aggiunto phpcache con sqlite ed implementato in gestsetup
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-30 11:48:40 +02:00
5f01fae5a4 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-29 17:47:49 +02:00
cdcd907a81 Finish FixDockerBuild
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-29 17:47:49 +02:00
a65d2c651d Disattivata al momento build di production per branch main 2025-07-29 17:47:21 +02:00
46bdf5d39c Gestito permesso per mostrare pulsante configurazione permessi
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-29 12:47:00 +02:00
23dbdc7635 Migliorata ricerca per src_clienteCommessa creando la query con solo ciò che è usato
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-29 11:16:13 +02:00
b416e08c97 Creato permesso per permettere il recupero del materiale versato in MES
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-25 13:04:52 +02:00
1daee3a940 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-25 13:04:01 +02:00
44c5b4d40f Finish FixPermCancMat
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-25 13:04:00 +02:00
b9cf2725cb Fix nome permesso cancella materiale 2025-07-25 13:03:19 +02:00
e377979651 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-25 11:00:23 +02:00
d1548374f2 Finish FixDetailBudget
All checks were successful
PVM/pipeline/head This commit is unstable
2025-07-25 11:00:23 +02:00
7c6eac4c32 Fix query detail analisi budget rosso gargano 2025-07-25 11:00:09 +02:00
314e740819 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-25 10:32:54 +02:00
2213b6239a Finish FixContextMenuBudget
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-25 10:32:53 +02:00
15e1384e1a Gestita visualizzazione per mese e fix context menu in analisi budget rosso gargano 2025-07-25 10:32:31 +02:00
f7dcd4fd65 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-24 17:30:43 +02:00
874b9bfedd Finish ModifVarieRG
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-24 17:30:42 +02:00
a5f02ef4e5 Aggiunto perc prov e val prov in popup ordine dp e fix vari rg 2025-07-24 17:30:24 +02:00
9c5fa2cafd Rimossa cartella exports in docker build e creato dockerfile separato per dev
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-23 15:47:45 +02:00
e840681f8e Finish Dockerfile
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-23 09:29:47 +02:00
2f1758b2e9 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-23 09:29:47 +02:00
8690758742 Aggiunto composer in dockerfile
(cherry picked from commit a56c8e0ca9)
2025-07-23 09:29:18 +02:00
256e16435e Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-22 19:10:39 +02:00
691155e07a Finish ComposerInstall
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-22 19:10:38 +02:00
a3702326f7 Finish ComposerInstall
(cherry picked from commit 9d66309d50)

# Conflicts:
#	.gitignore
2025-07-22 19:09:51 +02:00
a56c8e0ca9 Aggiunto composer in dockerfile
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-22 19:02:20 +02:00
9d66309d50 Finish ComposerInstall
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-22 18:02:13 +02:00
e6ace0b69b Aggiunto composer install in jenkins
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-22 17:54:18 +02:00
15974323d1 Aggiunto composer install in jenkins
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-07-22 17:43:12 +02:00
304b831778 Eseguito composer update 2025-07-22 17:29:03 +02:00
fbd6cdc20f Rimossa cartella vendor da git 2025-07-22 17:26:54 +02:00
f75baef9f8 Aggiunti nuovi parametri in script run-docker
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-22 12:34:48 +02:00
66cdcdde7a Rimosso mount su docker in favore di mutagen e configurati task di avvio
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-21 18:13:02 +02:00
66cc57ab30 Finish FixRigheDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-21 17:31:20 +02:00
71d0fc0f33 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-21 17:31:20 +02:00
13b7fe45e3 Fix controllo id contratto a listino con contratto senza residuo 2025-07-21 17:30:22 +02:00
6cad4e6f46 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-21 17:10:12 +02:00
7e1494bee1 Modifica catalogo 2025-07-21 17:09:44 +02:00
d199cef880 Modifica catalogo 2025-07-21 17:09:11 +02:00
6a31530a88 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-21 15:31:17 +02:00
37ced39ff7 Finish ModifCooperativa
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-21 15:31:16 +02:00
3351d909d7 Aggiunta modifica dati cooperativa in previsioni raccolta 2025-07-21 15:30:46 +02:00
1bbefc8be6 Rese colonne ridimensionabili in popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-18 17:59:33 +02:00
9f0a39ad65 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-18 17:40:10 +02:00
2de360f00a Finish AggMsgrBudg
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-18 17:40:10 +02:00
544df05eef Aggiunti nuovi cod_msgr in famiglie e formati in analisi budget rosso gargano 2025-07-18 17:39:31 +02:00
2efd19e5d6 Mostrati posti pallet per accessori non associati ad un tipo pedana
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-18 12:28:14 +02:00
9abc058ab1 Fix modifiche per riferimento in filtri campi di raccolta
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-18 10:56:48 +02:00
07a1175542 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-17 16:46:20 +02:00
9d9feca3c8 Finish FixVari
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-17 16:46:19 +02:00
a5c96428d9 Fix righe ordini pianificazione produzione orto e impostato solo 0 per unavailable 2025-07-17 16:45:58 +02:00
fff24047b0 Test configurazione DevContainer
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-15 18:24:46 +02:00
94a5611add Aggiunta configurazione DevContainer
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-15 18:12:24 +02:00
94cae1217e Finish CheckNumOrdClieDP
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-07-15 12:28:06 +02:00
5dcd938371 Merge branch 'master' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-07-15 12:28:06 +02:00
9839f62df6 Reso obbligatorio rif num ord e rif data ord se compilati uno dei due in popup ordine dp 2025-07-15 12:27:50 +02:00
2e0a6cdf0b Finish SetupCodVmzo
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-15 11:08:45 +02:00
98df531bc3 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-15 11:08:45 +02:00
650cc0643b Gestita setup per macrozona racc in previsioni raccolta 2025-07-15 11:08:30 +02:00
f0dd696426 Finish AggZonaNuovaProd
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-15 10:26:12 +02:00
fd47e500e8 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-15 10:26:12 +02:00
2fdb201866 Fix raggruppamento ed aggiunta selezione zona in catasto terreni 2025-07-15 10:25:53 +02:00
c2bab70f5a Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-14 12:44:24 +02:00
e6dbe280e9 Finish AggStampaMovViag
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-14 12:44:23 +02:00
b52f1e059e Aggiunto pulsante stampa documento pedane in popup viaggi 2025-07-14 12:44:05 +02:00
b3422ef72d Esclusi articoli equivalenti in aggiungi articoli popup contratti di vendita
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-14 10:59:56 +02:00
4d119bfeba Fix errorCode 4 e corretti parz e compl in get righe ordini pian prod orto
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-11 18:46:44 +02:00
839e773bff Fix listino non aggiornato al cambio destinatario popup ordine delivery plan 2025-07-11 17:42:00 +02:00
ed1dc99716 Fix formato data in data partenza pianificazione produzione orto
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-11 17:10:25 +02:00
cb7c32fe2f Resa opzionale associazione tra fornitore e gruppi merceologici
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-11 13:05:15 +02:00
47ffb15f51 Fix formato data in data partenza pianificazione produzione orto
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-11 10:12:29 +02:00
2150875151 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-10 18:54:53 +02:00
d9ba054318 Finish FixFornTrasp
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-10 18:54:53 +02:00
6bd363ef5c Fix selettore fornitore del trasporto in apertura popup viaggio 2025-07-10 18:54:30 +02:00
23f2ad0107 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-10 17:05:42 +02:00
13e6fd862a Finish FixCRM
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-10 17:05:41 +02:00
0ecd64bb2b Fix creazione commessa in crm/completeOrder 2025-07-10 17:05:23 +02:00
f568581d38 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-09 17:52:30 +02:00
c244cb5561 Finish FixSaveVisita
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-09 17:52:30 +02:00
f176ecb29f Aggiunto parent activity id in save visita contatti commesse 2025-07-09 17:52:10 +02:00
2f0d28c1c7 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-09 10:34:43 +02:00
890ee62f32 Finish FixGetArtLisDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-09 10:34:43 +02:00
be1489f315 Fix filtro sbagliato in getArticoloListino popup ordine delivery plan 2025-07-09 10:34:25 +02:00
9a093cc5a5 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-08 17:28:15 +02:00
d18688c2df Finish FixCRM
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-08 17:28:15 +02:00
47c903e036 Fix chiamata crm/completeOrder 2025-07-08 17:28:00 +02:00
30a7bb4912 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-07 17:30:23 +02:00
45a96fec95 Finish AggNumAutoriz
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-07 17:30:22 +02:00
472ed45120 Aggiunto num autoriz in form vettore 2025-07-07 17:28:44 +02:00
013df8cddb Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-07 15:10:03 +02:00
81b64fa3fc Finish AggConsultazione2
All checks were successful
PVM/pipeline/head This commit is unstable
2025-07-07 15:10:02 +02:00
d3d310b5e1 Gestiti campi nuovi convalidato_da2 e data_convalida2 in macchinari_prod 2025-07-07 15:09:44 +02:00
ba09b7512d Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-07 13:21:08 +02:00
c29d80ef9a Finish AggConvalida2
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-07 13:21:07 +02:00
b6c73f9f64 Gestiti campi nuovi convalidato_da2 e data_convalida2 in macchinari_prod 2025-07-07 13:20:52 +02:00
114541015e Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-07 12:57:51 +02:00
b50e2efd93 Finish AggConvalida2
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-07 12:57:51 +02:00
c35982e08f Gestiti campi nuovi convalidato_da2 e data_convalida2 in macchinari_prod 2025-07-07 12:57:07 +02:00
51b0ad7621 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-07 11:48:01 +02:00
3c15d3f868 Finish AggConvalida2
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-07 11:48:01 +02:00
f5611a5fea Gestiti campi nuovi convalidato_da2 e data_convalida2 in macchinari_prod 2025-07-07 11:47:45 +02:00
jenkins
0e9c8e5714 Merge branch 'master' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-07-06 07:21:44 +02:00
d8572ec831 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-04 15:06:11 +02:00
530b2f8d0e Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-04 15:06:11 +02:00
d923a17602 - aggiunto parametro per chiamate "silenziose" che ignorano eventuali risposte di errore 2025-07-04 15:04:39 +02:00
fbf1af4d02 Correzione righe ordini mancanti se da contratto con qta residua negativa in popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-04 14:51:07 +02:00
07215dafa1 Gestita andata a capo in descrizione estesa popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-04 10:20:00 +02:00
25de7bf06b Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-03 16:10:44 +02:00
b609f3adeb Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-03 16:10:44 +02:00
0b0ae595d4 aggiunto controllo su campo stato non disponibile in getOrdini 2025-07-03 16:10:24 +02:00
adb5027d7d Aggiunto campo barcode_ul dalla testata collo in Controllo Giacenze
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-03 15:20:30 +02:00
772b85a1a2 Rinominato inserito da in compilato da
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-03 15:00:36 +02:00
b1d94e37a5 Rimossa possibilità di cambiare listino dell'ordine in delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-03 14:56:03 +02:00
b4ada51f5e Fix filtri in tabella ordini campi di raccolta
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-03 12:39:16 +02:00
b13e93271e Aggiunta unt mis 2 in nuovo ordine mes ed aggiunto a video compilato da in delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-02 18:50:16 +02:00
7b70afdc02 Stop propagation in assegna pos in assegna posizione campi di raccolta
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-02 17:39:41 +02:00
74eb15d844 Gestito suggest note per accessori in popup ordine delivery plan e contratti di vendita e permesso aggiunta accessori in contratto senza qta e prz
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-02 16:50:13 +02:00
b0d22bbd60 Finish ModifDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-02 10:35:12 +02:00
84d17ebbb5 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-02 10:35:12 +02:00
4343910f0e Aggiunto ordinamento per num ord in lista ordini delivery plan 2025-07-02 10:34:56 +02:00
8cedf610a6 Finish FixFiltriCampi
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-02 09:36:25 +02:00
e912ff6c5e Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-02 09:36:25 +02:00
73526db7c9 Fix partite multiple in lista ordini campi di raccolta 2025-07-02 09:36:08 +02:00
cb1407170e Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-01 18:04:53 +02:00
4d0858d1a5 Finish FixSystemOk
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-01 18:04:52 +02:00
62cf802177 Rimosso azzeramento profiledb in system ok 2025-07-01 18:04:33 +02:00
d3c8258c67 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-01 15:16:06 +02:00
eabf6c8695 Finish FixSaveArt
All checks were successful
PVM/pipeline/head This commit looks good
2025-07-01 15:16:05 +02:00
6cf69a9a69 Fix campo barcode imballo vuoto in popup ordine mes 2025-07-01 15:15:49 +02:00
488830d5f0 Cambio setup da sottogruppo a gruppo e skip data fine in chiusura anticipata per punti vendita
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-30 17:28:23 +02:00
4f4ec2329e Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-30 16:42:15 +02:00
15591a7f4a Finish StampaColli
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-30 16:42:14 +02:00
ee7c1ecf9b Gestita stampa multipla in trasporti del giorno 2025-06-30 16:41:56 +02:00
72e33c3ebf Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-30 12:54:36 +02:00
e6a6fc89f7 Finish FixQueryErr
All checks were successful
PVM/pipeline/head This commit is unstable
2025-06-30 12:54:35 +02:00
6b5c7a9907 Fix in set error code query 2025-06-30 12:54:21 +02:00
c8cba22310 Aggiunto codvlis deposito e filtro sottogruppo in chiusura tagli prezzo
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-06-30 12:53:15 +02:00
c21b474923 Finish Feature-CRM
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-27 18:14:04 +02:00
f9d9852724 Merge branch 'develop' into feature/Feature-CRM
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-27 18:12:36 +02:00
28acf8b16d Gestita pagina di controllo quando i servizi non rispondono
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-27 16:27:11 +02:00
330c428d6c Gestita cancellazione della partita in cancellazione ordine di lavoro mes
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-26 17:17:08 +02:00
835e635b1a Aggiunto totale qta in tab udc popup ordine mes 2025-06-26 16:41:44 +02:00
322cf99983 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-26 16:00:55 +02:00
ae3bda5e16 Finish AggCreateField
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-26 16:00:55 +02:00
fb429cf4f5 Gestito inserimento num piante e superficie in nuova produzione 2025-06-26 16:00:38 +02:00
897e1d3f1c Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-26 11:00:00 +02:00
12cf7349b8 Finish ModifCatastoTerreni
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-26 10:59:59 +02:00
3198dfe80e Gestita modifica dati destinatario in creazione e modifica produzione catasto terreni 2025-06-26 10:59:41 +02:00
c4a658232c Fix crm
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-25 18:20:40 +02:00
91963fe6dd Merge branch 'develop' into feature/Feature-CRM 2025-06-25 17:57:00 +02:00
1fae1419f2 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-25 17:23:03 +02:00
d166a44da5 Finish FixCampiDiRacc
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-25 17:23:03 +02:00
ca657fc9f8 Fix lista ordini e click lista ordini non mappati in campi di raccolta 2025-06-25 17:22:38 +02:00
f31be6da24 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-25 15:54:23 +02:00
f14ae4247e esplosa tutta la distinta 2025-06-25 15:54:01 +02:00
3f9344f0b1 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-24 16:59:22 +02:00
a2c8ea4a3c Finish FixFiltriContrGiac
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-24 16:59:21 +02:00
deae98f342 Fix filtri datetime in controllo giacenze 2025-06-24 16:59:06 +02:00
df88d88ba2 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-24 13:02:41 +02:00
ec7f142072 Finish Hotfix-15
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-24 13:02:41 +02:00
4f4f2c2e92 elieliminati macchinari disattivi 2025-06-24 13:02:10 +02:00
a5a62f322f eliminati macchinari disattivi
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-24 13:01:19 +02:00
e82865bb52 crm
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-24 13:00:47 +02:00
b6e47fd996 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-24 12:38:07 +02:00
3da612bf49 Finish ModifCatastoTerreni
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-24 12:38:07 +02:00
f28ca49c9a Fix filtri in catasto terreni 2025-06-24 12:37:26 +02:00
9ac4a9658b Migliorato form articolo ed incluso in tab distinta base popup ordine mes
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-24 12:35:45 +02:00
cfda190e30 Finish ModifCatastoTerreni
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-23 13:02:59 +02:00
bdd5b53564 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-23 13:02:59 +02:00
c820e27b98 Fix filtri in catasto terreni 2025-06-23 13:02:37 +02:00
jenkins
23c1e15465 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-22 07:22:39 +02:00
7d345785db crm
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-20 15:45:11 +02:00
35b50e1795 Nuova gestione catasto terreni e migliorie varie
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-20 12:47:41 +02:00
41780589ec crm
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-19 17:04:12 +02:00
76d0255db0 aggiunta descrizione partita
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-19 11:12:03 +02:00
69d516f466 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit is unstable
2025-06-19 10:56:08 +02:00
a57016ac35 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-19 10:56:07 +02:00
566b5ce890 fix griglie kendo senza contextMenu 2025-06-19 10:55:46 +02:00
4675942cac Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-18 18:11:10 +02:00
d0d6b85b29 Finish saveKendoGrid
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-18 18:11:10 +02:00
2d4e876e95 Migliorato salvataggio dati kendo grid 2025-06-18 18:10:55 +02:00
015be9296e modifche a chiamata servizi 2025-06-18 17:22:26 +02:00
d02198b1fa allineati decimali
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-17 14:59:31 +02:00
6b6adea851 bloccato campo per suddivisione
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-17 13:44:15 +02:00
8c21054413 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-17 13:23:55 +02:00
7c8638d167 cambio label 2025-06-17 13:23:19 +02:00
4920ada3e7 Finish FixAggListinoDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-16 12:51:32 +02:00
4c6b649bd0 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-16 12:51:32 +02:00
535dc57bc7 Fix lingua listino non impostata all'apertura del popup ordine delivery plan 2025-06-16 12:51:13 +02:00
f96fbd245c Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-16 11:31:02 +02:00
d7b619f143 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-16 11:31:01 +02:00
4118d76439 Merge branch 'master' into hotfix/Hotfix-15 2025-06-16 11:30:47 +02:00
f3f62eeaab corretta gestione trasferimenti in logica colli vecchia 2025-06-16 10:02:45 +02:00
170d3fb03a aggiunta esportazione eventi macchine con report 2025-06-16 10:02:06 +02:00
6a7ba2aeeb corretta applicazione filtri custom su articolo e deposito 2025-06-16 10:01:30 +02:00
8e9d87703d Fix stampa nomi con apostrofo in popup esporta
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-12 17:35:16 +02:00
d60938ab98 Cambio posizione giac in gestione ricambistica
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-12 16:29:04 +02:00
84a8e9a807 Modifica gestione consegne per problema cancellazione riga viaggio
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-12 11:05:41 +02:00
0798db3c4a Aggiunte note contratto di acquisto in piano arrivi
All checks were successful
PVM/pipeline/head This commit looks good
(cherry picked from commit d0b0b54b15)
2025-06-11 19:07:11 +02:00
0b25bba96a Gestito fileTypes come array
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-11 18:28:39 +02:00
0858483db7 Fix stampa disegni con sottoreport
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-11 18:17:32 +02:00
1f3cd55813 Fix permesso editable in gestione utenti pian_acc_rossg
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-11 15:53:59 +02:00
b5ed5dfce9 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-09 18:33:18 +02:00
d4a1c1ee56 eliminata nativesql 2025-06-09 18:32:57 +02:00
99317c7c61 Fix stampa excel certificati e corretta selezione in tabella certificati
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-09 16:34:18 +02:00
f4d05a4c4f Gestito permesso per creazione ordini anche in modifica e cancellazione in modal mrp
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-09 10:29:04 +02:00
b224f7fa8b Aggiunta colonna giacenza finale in analisi budget rosso gargano
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-09 09:49:32 +02:00
458e1dacfc Rimossa width in pulsanti mes
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-06 17:16:06 +02:00
a570cda598 Fix init table as listino popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-06 16:15:13 +02:00
3e5febc901 Minimo 0 in qta mod inventario
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-06 13:11:19 +02:00
aa94144b3b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-05 16:27:47 +02:00
182493b9ba sistemata condizione di visibilità dell'articolo nell'accetazione 2025-06-05 16:27:21 +02:00
5cacde8d44 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-05 16:11:08 +02:00
a347b702cf Finish FixOrdDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-05 16:11:07 +02:00
ddd620760a Fix apertura ordine con listino diverso da quello del cliente 2025-06-05 16:10:48 +02:00
afb23bf01f Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-05 14:45:49 +02:00
504b1d2ac7 Finish Hotfix-15
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-05 14:45:48 +02:00
2cb91552b9 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-05 12:02:42 +02:00
d8787d8b44 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-05 12:02:42 +02:00
e9ace4523c - corretta visualizzazione pulsante versamento diretto materiali 2025-06-05 12:02:18 +02:00
ba51c5a7f0 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-05 10:34:13 +02:00
dfa9e3cc0a Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-05 10:34:12 +02:00
f90bf462ca [ROSSOGARGANO]
- gestiti tipi concorrenza ordini multipli su linee di lavorazione

- corretta gestione flag azzeramento colli
2025-06-05 10:33:08 +02:00
7a3709effa Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-04 18:25:42 +02:00
20656c54bc Finish FixCambioCodVdesDP
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-04 18:25:42 +02:00
f629e36dcb Fix refresh listino senza cod_mdep ed impostato id viaggio in aggiungi al listino 2025-06-04 18:25:26 +02:00
3682740aeb Fix ordini non visibili in delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-04 17:08:15 +02:00
5d920eb7cd Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-04 15:08:37 +02:00
dbbb672e61 Finish FixAllegatiPopupMES
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-04 15:08:36 +02:00
8b115d067d Fix download allegati ed aggiunto parametro per download content in JtbDisegniFiles 2025-06-04 15:08:17 +02:00
57f2518040 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-03 13:08:28 +02:00
41c5f41199 Finish AggModalitaRaccolta
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-03 13:08:27 +02:00
042edaf0fe Aggiunta modalita raccolta in articolo comp 2025-06-03 13:08:11 +02:00
63adb45c68 Sostituito ems-core con ems-engine
All checks were successful
PVM/pipeline/head This commit looks good
2025-06-03 11:42:09 +02:00
dc210cb9e0 Sostituito ems-core con ems-engine
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-06-03 11:09:04 +02:00
d5721a1d44 inserito left outer join 2025-06-03 11:06:23 +02:00
79144e0263 Nascosti articoli con contratto in listino con qta residua a 0 in popup ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-30 16:33:34 +02:00
d48c1953a5 Fix righe sdoppiate se ordine con doc proforma e fix mezzo in delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-29 16:45:33 +02:00
454c83d2bf Nascosta qta prevista e residua per punto vendita in sidebar ordine campi di raccolta
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-29 12:45:45 +02:00
b69e28cf0c Cambio label e posizioni in popup nuova produzione
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-29 12:33:13 +02:00
6b10d7bc16 Forzata creazione deposito in nuova produzione
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-29 12:27:41 +02:00
03c503f9b5 Fix flex pallet in popup riep giorno
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-29 10:03:55 +02:00
1a47eae0f3 Reso possibile aprire dettaglio depositi non mappati in campi di raccolta
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-28 11:59:00 +02:00
ad4b230ad0 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-28 11:57:05 +02:00
ac7ae8fed2 Finish RiepGiornoOFDemo
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-28 11:57:05 +02:00
3f29c44b77 Aggiunto popup riep giorno in of demo 2025-05-28 11:56:30 +02:00
dc007c7369 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-28 09:49:05 +02:00
8e8daa7550 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-28 09:49:05 +02:00
0648643fb8 Merge branch 'master' into hotfix/Hotfix-15 2025-05-28 09:48:50 +02:00
a08e5b38fe [ListiniVendita]
- corretto parametro data validità passato al report pedane
2025-05-28 09:48:09 +02:00
64d0c2832e Finish OfdemoRG
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-27 18:18:28 +02:00
554a9501c1 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit is unstable
2025-05-27 18:18:28 +02:00
2527ab9acc Duplicato budget rosso gargano in of_demo e invertiti depositi riepiloghi 2025-05-27 18:18:05 +02:00
cd6e40e61f Finish FixPopupOrd
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-27 16:28:19 +02:00
e0e09d468f Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-27 16:28:19 +02:00
239ca0b273 Fix lettura ordine in popup modifica delivery plan 2025-05-27 16:28:03 +02:00
254e3557d0 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-26 13:13:25 +02:00
ca7d59e751 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-26 13:13:25 +02:00
040b37543d [MES]
- aggiunte note ordine in storico lavorazioni
[RICAMBISTICA]
 aggiunto filtro extra in testata tabella
2025-05-26 13:13:06 +02:00
607e302c85 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-26 12:42:09 +02:00
c2b5e4bfe6 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-26 12:42:08 +02:00
1c26439a9a [MES]
- corretta conversione date provenienti dai servizi
2025-05-26 12:41:50 +02:00
ea585cebb1 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-22 10:17:34 +02:00
ac55c6f00e [CONTROLLO GIACENZE]
- aggiunta stampa sscc automatica ul
2025-05-22 09:59:54 +02:00
b2567091d5 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-22 09:57:16 +02:00
a1ec431511 Finish FixDPListino
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-22 09:57:15 +02:00
5a9e4964ee Fix righe listino cancellate con setup view righe listino attiva 2025-05-22 09:56:59 +02:00
34061de5a3 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-21 19:18:58 +02:00
ee0a25fc76 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-21 19:18:58 +02:00
917865cf83 [CONTROLLO GIACENZE]
- completata migrazione a ts di pagina controllo giacenze
2025-05-21 19:18:38 +02:00
351004b7a8 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-21 19:11:09 +02:00
01b23f220e Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-21 19:11:08 +02:00
85bec92c34 [CONTROLLO GIACENZE]
- completata migrazione a ts di pagina controllo giacenze
2025-05-21 19:06:44 +02:00
4f5546e951 Modificato testo mail deposito ordini a riassortimento
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-21 17:01:07 +02:00
51b2a2985e Rimosso controllo flag_evaso_forzato in getPianificazioni accettazione rossogargano
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-05-21 12:15:05 +02:00
c5e2490516 Fix lettura date getOrdiniLavorazione
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-21 11:13:19 +02:00
6d4b2fce61 [CONTROLLO GIACENZE]
- spostata gestione in TS
- creata base gestione tabs
- aggiunta scelta creazione documenti in azzeramento colli
[ACCETTAZIONE DA CAMPO]
- corretto bug nuova versione di kendo in importazione certificati
2025-05-21 10:42:23 +02:00
474611c88e Aggiunto pulsante per cancellazione ordine di lavorazione nel MES
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-19 18:36:19 +02:00
75520d6048 Aggiunta licenza di kendo
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-19 16:21:40 +02:00
jenkins
6f30a3b3b7 Merge branch 'master' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-18 07:21:36 +02:00
5482db46b4 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-16 18:26:29 +02:00
5f18686e1f [CARELLI]
- Gestione tipi attività  calendario pv
2025-05-16 18:26:13 +02:00
f9ab9be5fc Gestita riapertura ordine per il lotto
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-16 17:59:31 +02:00
324773f71d Gestita riapertura ordine per il lotto
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-16 17:46:42 +02:00
8e68bbcf38 Gestiti permessi context menu in controllo giacenze
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-16 16:21:37 +02:00
1afae97813 Fix stash Jenkinsfile
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-16 15:05:44 +02:00
b8e2508240 Fix lettura cod_vdes in modifica ordine delivery plan
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-16 15:03:34 +02:00
41bbb77883 Riattivato filtro con autocomplete per articolo in controllo giacenze
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-16 10:28:26 +02:00
469819fd5b Creato pulsante per riapertura ordine di lavorazione in storico ordini MES
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-16 10:07:45 +02:00
18dcc0ec61 Fix refresh listino duplica righe del listino
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-15 16:28:12 +02:00
e561acfef2 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-15 13:10:32 +02:00
23eac376bb Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-15 13:10:31 +02:00
3a01519eeb [ROSSOGARGANO]
- aggiunta personalizzazione MES su rossogargancont
2025-05-15 13:09:36 +02:00
4cf418e78d [ROSSOGARGANO]
- aggiunta personalizzazione MES su rossogargancont
2025-05-15 13:09:18 +02:00
992e039b46 Aggiunta unt_mis in selezione articoli nuovo ordine mes e miglioramento apertura tab ordini aperti in piano arrivi
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-15 12:13:54 +02:00
841e02bd39 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-13 18:21:28 +02:00
8f3f30492a Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-13 18:21:27 +02:00
4246f8dd86 Fix publish on Azure 2025-05-13 18:16:47 +02:00
77095c9a58 Aggiunto permesso pulsante pausa in MES e fix font size descrizione
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-13 18:07:51 +02:00
560a1cb18a Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-13 17:56:47 +02:00
e5c9cbc0a2 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-13 17:46:31 +02:00
1b5cc25153 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-13 17:46:30 +02:00
7146328ace Fix publish on Azure 2025-05-13 17:46:11 +02:00
2ac1364e10 Merge branch 'hotfix/Hotfix-15' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-05-13 17:20:23 +02:00
c5288188dd Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-13 17:20:22 +02:00
2a825d645d aggiunto parametro per evitare rigenerazione ordini L in cambio priorità temporale di produzione 2025-05-13 17:16:50 +02:00
3cc67d31b0 Merge branch 'master' into develop
Some checks failed
PVM/pipeline/head There was a failure building this commit
2025-05-13 17:11:57 +02:00
3c8e87befb Finish Hotfix-15
All checks were successful
PVM/pipeline/head This commit looks good
2025-05-13 17:11:57 +02:00
b0b0619483 Cambiato publish JenkinsFile 2025-05-13 17:11:41 +02:00
1232dae89c Aggiornamento kendo v2023.3.1010 -> v2025.1.227, creata sidebar per filtri avanzati in kendo
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-13 16:50:51 +02:00
17a5e58656 [CARELLI]
All checks were successful
PVM (new)/pipeline/head This commit looks good
- bloccato salvataggio documenti RGIAC in documenti interni
- corretta gestione tab in calendario P.V.
2025-05-12 17:26:22 +02:00
d38dc7fe78 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-12 10:39:39 +02:00
2d7cbd7dbf Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM (new)/pipeline/head This commit is unstable
2025-05-12 10:39:39 +02:00
edc1ad86c4 [ROSSOGARGANO]
- trasferimento automatico in versamento materiali
2025-05-12 10:39:16 +02:00
006c410de4 Aggiunto campo per definire se il documento deve essere salvato
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-12 09:38:00 +02:00
b4c168a26c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-12 09:17:38 +02:00
jenkins
89a868c2f8 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-11 07:21:29 +02:00
63a7265a1c accettazione carelli eliminati componenti 2025-05-09 18:59:37 +02:00
6fffd9fa32 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-09 13:18:13 +02:00
93e57fc607 [ROSSOGARGANO]
- nuova chiusura ordine con riproporzionamento
2025-05-09 13:14:46 +02:00
7dcd4aff1b Aggiunto margine in gestione budget
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-08 18:14:53 +02:00
bf984e8898 Gestita creazione, modifica e cancellazione budget
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-08 17:54:37 +02:00
456e44c6de Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-07 13:01:35 +02:00
3a6a12f020 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-07 13:01:35 +02:00
b9a014c32d [CARELLI]
- corretta paginazione lista attività calendario
2025-05-07 13:01:17 +02:00
42915a4f56 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM (new)/pipeline/head This commit is unstable
2025-05-07 12:55:58 +02:00
1e1e544665 Merge branch 'hotfix/Hotfix-15'
Some checks failed
PVM (new)/pipeline/head Something is wrong with the build of this commit
2025-05-07 12:55:57 +02:00
12d7ea26b7 [BIOLEVANTE]
- rimosso blocco modifica manutenzioni convalidate
[CARELLI]
- corretto controllo su permesso lista attività
[ROSSOGARGANO]
- aggiunto ordinamento multiplo colonne controllo giacenze
2025-05-07 12:55:40 +02:00
3e32e79644 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-06 17:52:05 +02:00
a3c2a48c19 Finish FixSaveOrdDP
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-06 17:52:04 +02:00
aeba6b080b Fix salvataggio ordine delivery plan 2025-05-06 17:51:50 +02:00
c69b926e5e Assegnata commessa da servizi
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-06 15:02:52 +02:00
1988068a92 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-06 11:57:43 +02:00
fe0fd41ad1 modificata query prendendo stb_user 2025-05-06 11:39:04 +02:00
35a4a37296 Aggiunto allegato ordine in mail deposito riassortimenti
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-06 11:25:28 +02:00
07f049d2e2 Spostata modifica password su servizi
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-05 16:26:59 +02:00
4ff64e6a1e Finish FixSalvaViaggi
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-05-05 16:02:04 +02:00
fd9d69e085 Merge branch 'master' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-05-05 16:02:04 +02:00
1a682689be Fix assegnazione viaggio dopo la creazione 2025-05-05 16:01:41 +02:00
jenkins
53f8ea5644 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-04 07:21:30 +02:00
a9afb3a237 Gestita selezione pedane in creazione viaggi
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-05-02 16:56:27 +02:00
08585d9b70 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-29 10:34:21 +02:00
1c0c93f96c Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-29 10:34:20 +02:00
246d6917ee - fix minori 2025-04-29 10:33:59 +02:00
806bf6ca66 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-28 11:39:43 +02:00
3a304666ce Finish AggDataVersRettificaUl
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-28 11:39:42 +02:00
b3537733ca Gestito salvataggio data vers in rettificaGiacenzaUl 2025-04-28 11:39:26 +02:00
92e728ee2b Aggiunto a video il deposito dell'udc e mostro se diverso dal quello dell'ordine
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-24 19:21:59 +02:00
436db56ba8 Fix inversione logica setup FERMA_CREA_DOCS
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-24 15:43:43 +02:00
ccf8b3f8e3 Fix inversione logica setup FERMA_CREA_DOCS
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-24 15:37:30 +02:00
08a3b78b08 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit is unstable
2025-04-23 15:09:11 +02:00
1dc64d35f2 Finish FixLoadDataSource
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-23 15:09:11 +02:00
5ec0966d09 Fix errore in caricamento datasource con filter 2025-04-23 15:08:56 +02:00
60884454ac Merge branch 'master' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-23 12:23:28 +02:00
78af30b4f9 Finish FixModifLotto
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-23 12:23:27 +02:00
2e419f124f Fix modifical lotto imposta stessa partita mag prod precedente 2025-04-23 12:23:11 +02:00
7eb679c7d1 Merge branch 'master' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-22 16:53:51 +02:00
823ecc62d6 Finish Hotfix-15
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-22 16:53:51 +02:00
f5c311e01e Fix lettura da cache in GestSetup 2025-04-22 16:53:37 +02:00
851ab10848 Aggiunta partita iva in selettori vettore in delivery plan
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-22 11:40:22 +02:00
0c933cc087 Cambio title data cons in popup mrp in base alla gestione
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-22 10:17:01 +02:00
205e25ae19 Rimosse nazioni senza descrizione
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-18 18:57:20 +02:00
c811433e3a Impostato filtro viaggi dal al primo dell'anno in viaggi ordini
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-18 18:17:45 +02:00
efec493315 Creato form di creazione cliente/fornitore
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-18 16:51:03 +02:00
44cd114f37 Rimosso parametro includeClass in current_mainClasspath
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-18 12:51:36 +02:00
8ec0cd88a0 Rimosso parametro includeClass in current_mainClasspath
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-18 12:44:11 +02:00
f594c7c105 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-17 18:43:00 +02:00
c64c9b2bda Finish FixCheckCollo
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-17 18:43:00 +02:00
22a9bca136 Controllo esistenza in checkCollo controllo giacenze 2025-04-17 18:42:39 +02:00
1b8cb44a88 Merge branch 'hotfix/Hotfix-15' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-17 18:41:54 +02:00
67cd42894c Merge branch 'hotfix/Hotfix-15'
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-17 18:41:53 +02:00
7260b075f1 [CONTROLLO GIACENZE]
corretto calcolo colonne tabella
2025-04-17 18:41:32 +02:00
70113cabb9 Merge branch 'feature/CarelliCalendarioPV' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-17 17:01:10 +02:00
0485fe2c8c Merge branch 'develop' into feature/CarelliCalendarioPV 2025-04-17 17:00:51 +02:00
c928554ddb Merge branch 'hotfix/Hotfix-15' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-17 16:54:45 +02:00
bfec0cc6bf Merge branch 'hotfix/Hotfix-15'
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-17 16:54:44 +02:00
31633cfb07 [ROSSOGARGANO]
aggiunti controlli in scansione barcode per versamento diretto
2025-04-17 16:54:01 +02:00
d9cc8c6336 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-17 11:07:39 +02:00
713cd46521 Finish FixEditPartitaMES
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-17 11:07:39 +02:00
7ebd64cfc0 Fix modifica partita mag data scad obbligatoria con gg_scad_partita a 0 2025-04-17 11:07:25 +02:00
d6a18189c0 Aggiunto calibro 50 in cq carciofi
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-17 09:58:01 +02:00
3afc0bd536 Merge branch 'hotfix/Hotfix-15'
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-16 12:13:46 +02:00
21aa9be926 Merge branch 'hotfix/Hotfix-15' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-16 12:13:46 +02:00
3e0ffecc45 corrretta gestione trasferimenti da controllo giacenze 2025-04-16 12:13:25 +02:00
9cb0151737 Merge branch 'hotfix/Hotfix-15'
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-16 11:17:07 +02:00
c00b340236 Merge branch 'hotfix/Hotfix-15' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-16 11:17:07 +02:00
c1e520ddb1 modifiche per avviamento rossogargano 2025-04-16 11:16:42 +02:00
4618b52abc Finish FixDataScad
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-16 11:05:44 +02:00
805d415f2a Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-16 11:05:44 +02:00
648c982812 Fix errore all'invio di data scad se non impostata 2025-04-16 11:05:28 +02:00
ce7ef5b2aa Unificato load moduli
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-15 12:21:57 +02:00
0e30becce3 Seleziona solo firmati e non esportati in riepilogo consegne
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-14 18:45:47 +02:00
722f2faa10 Impedita selezione di elementi non firmati in riepilogo consegne
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-14 17:17:08 +02:00
5763d5c868 Finish FixTagAssetsTs
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-14 10:59:20 +02:00
468c1547e9 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-14 10:59:20 +02:00
49bffdabf9 Fix tag script per tipi module 2025-04-14 10:59:05 +02:00
jenkins
5f12c76c53 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-13 07:21:32 +02:00
7a2cd6c88c Finish LottiScadMult
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-11 18:30:26 +02:00
5b37e9dbe8 Nascosto play se linea con vincolaLottoOrdineASL e gestita partitaMagProd separata 2025-04-11 18:30:12 +02:00
18776c8ac6 Merge branch 'develop' into feature/LottiScadMult 2025-04-11 18:28:08 +02:00
1fbd9ab589 Merge branch 'develop' into feature/CarelliCalendarioPV
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-11 13:00:38 +02:00
5cfa3b58f2 Merge branch 'hotfix/Hotfix-14'
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-11 12:57:52 +02:00
6a73d1df8d Merge branch 'hotfix/Hotfix-14' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-11 12:57:52 +02:00
0c5d1fce04 rimosso vincolo su variazione del 20% in accettazione merce da campo 2025-04-11 12:56:45 +02:00
2cd221952e gestioine calendario pv 2025-04-11 12:55:51 +02:00
9f95a928b3 Inviati campi barcode_ul e posizione durante le rettifiche da MES / Controllo Giacenze
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-11 10:50:53 +02:00
85283c83bd Merge branch 'develop' into feature/LottiScadMult
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-10 16:38:22 +02:00
9a923566d4 Fix warning se lettura di righe senza ordine di produzione in MES
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-10 16:38:11 +02:00
df5f80e35e Finish FixGetAuthorization
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-09 12:23:46 +02:00
fcf3a8f8e7 Merge branch 'master' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-09 12:23:46 +02:00
87b218d3e4 Fix metodo getAuthorization per campi boolean 2025-04-09 12:23:19 +02:00
ee7c3d3b29 Modificato titolo data vers. in data prod. per tabella scarichi MES
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-09 11:22:11 +02:00
2f4d705392 Gestita creazione lotti con scadenza multipla
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-08 17:47:38 +02:00
4e95e6ba4f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-08 13:35:32 +02:00
dbe75c5d8f Aggiornato Jenkinsfile 2025-04-08 13:35:17 +02:00
70716c511a Merge remote-tracking branch 'origin/feature/CarelliCalendarioPV' into feature/CarelliCalendarioPV
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
# Conflicts:
#	public_html/gest-lib/dashboard/css/main.css
2025-04-08 13:33:41 +02:00
4b10be3613 [CARELLI]
- calendario pv
2025-04-08 13:32:40 +02:00
4a9b2b2cf5 [carelli - calendario pv] 2025-04-08 13:32:40 +02:00
41f9fe06ed [CARELLI]
- gestione homepage personalizzata per utente
- creato modulo calendario_pv.php
2025-04-08 13:32:39 +02:00
aec2529a82 Merge branch 'hotfix/Hotfix-13'
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-08 13:28:14 +02:00
048f1a9f9e Merge branch 'hotfix/Hotfix-13' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-08 13:28:14 +02:00
d52890fe5c modificata la gestione della modalita di raccolta dei carciofi 2025-04-08 13:27:17 +02:00
526762bdb7 Aggiornato Jenkinsfile
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-08 12:56:55 +02:00
cdbcfe3709 Fix endpoint in navbar
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-08 12:44:06 +02:00
cfdfb560db Fix Dockerfile
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-08 12:36:36 +02:00
7be073eabc Aggiunta indicazione dell'endpoint utilizzato nella navbar
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-08 12:27:26 +02:00
a333e5ddc9 Aggiunto id contratto in tabella contratti di acquisto
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-08 09:42:15 +02:00
4c26cdfe17 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-07 18:28:51 +02:00
f997e91cad Aggiunto barcode ul in recupera materiale 2025-04-07 18:28:31 +02:00
65657473b8 Aggiunto check per esito in tabella manutenzioni CMMS
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-07 18:28:22 +02:00
b0040ca490 Fix ordinamento in aggiunta articoli in popup ordine delivery plan
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-07 18:14:13 +02:00
d17be287e4 Finish FixMES
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-07 13:09:35 +02:00
f7e5ea3bde Merge branch 'master' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-07 13:09:35 +02:00
1df33501f4 Fix timer mes disattivato 2025-04-07 13:09:15 +02:00
50491ef8ad Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-04-07 12:45:31 +02:00
404d4e9eda aggiunto barcode ul in servizio scarico collo da produzione 2025-04-07 12:45:13 +02:00
e6eb65c45d Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-07 11:56:58 +02:00
e3975173fd Finish Hotfix-13
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-07 11:56:57 +02:00
6b7181328e Fix aggiunta module in js globale 2025-04-07 11:56:42 +02:00
41adb08d8a Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-07 11:32:38 +02:00
f4bd50c09c Finish FixBuildUglify
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-07 11:32:38 +02:00
53e7a2ca7a Fix aggiunta module in application.min.js 2025-04-07 11:32:20 +02:00
312f0adc53 Migliorie al trasferisci pedana in ControlloGiacenze
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-07 10:31:09 +02:00
66cf2f2abb Finish PermessiMES
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-04 19:12:47 +02:00
76d3cfd949 Merge branch 'develop' into feature/PermessiMES 2025-04-04 19:12:40 +02:00
04cbcc6a6f Aggiunto fornitore in contratti di acquisto e fix lista ordini v in popup ord prod 2025-04-04 19:12:23 +02:00
633141c8e1 [CARELLI]
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
- calendario pv
2025-04-04 15:21:23 +02:00
7c829b53d6 [carelli - calendario pv] 2025-04-03 12:07:21 +02:00
61ea89ea5d [CARELLI]
- gestione homepage personalizzata per utente
- creato modulo calendario_pv.php
2025-04-03 12:07:21 +02:00
f149fd4063 rimosso blocco su salvataggio numero bin calibrati
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-03 12:05:55 +02:00
1f57c324b7 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-03 10:34:38 +02:00
57426b16b1 Finish Hotfix-13
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-03 10:34:37 +02:00
4e1740c909 [ROSSOGARGANO - Accettzione da campo]
- aggiunto controllo su numero certificato = 0
2025-04-03 10:29:26 +02:00
3bd8b10c83 Merge branch 'develop' into feature/PermessiMES 2025-04-03 09:52:33 +02:00
2799dd9212 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-03 09:34:14 +02:00
e9311c0346 Finish Hotfix-13
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-03 09:34:13 +02:00
15d88302b0 [kendo]
spostata libreria icone kendo in locale da cdn
2025-04-03 09:33:29 +02:00
b0f2b488b7 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-02 19:29:08 +02:00
aadb70c59d Finish Hotfix-13
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-02 19:29:06 +02:00
296f3fac2c [Rossogargano]
- allineato rientro versamento con procedura versamento
2025-04-02 19:18:49 +02:00
49b33d3d7d [ROSSOGARGANO]
- modifiche in accettazione da campo
- gestita partitaMagProd in campi raccolta e accettazione da campo
- nuovo versamento materiale su ordine
2025-04-02 17:44:11 +02:00
161711ac4f Rimosso uso setup ABILITA_MODIFICA_ARTICOLI
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-01 13:12:42 +02:00
2d3c10f66c Spostato stash per feature
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-04-01 09:43:44 +02:00
783bec8ee8 Rimosso permesso btnModificaLotto in favore della setup abilitaCreaDuplicaOrdine
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-31 18:57:26 +02:00
f3f6bee546 Merge branch 'develop' into feature/PermessiMES 2025-03-31 17:12:57 +02:00
eb63cfa503 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-31 17:10:20 +02:00
f874c9f567 Finish FixJenkins
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-31 17:10:19 +02:00
7e3044c605 Fix pubblicazione pvm 2025-03-31 17:10:06 +02:00
ade7b82364 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit is unstable
2025-03-31 16:31:15 +02:00
23eb528a7e Finish Hotfix-13
All checks were successful
PVM (new)/pipeline/head This commit is unstable
2025-03-31 16:31:14 +02:00
7a4f75f3d3 Gestito filtro data cons in mrp, descrizione estesa in popup nuovo articolo piano arrivi e fix undefined sugli sconti 2025-03-31 16:30:58 +02:00
530c064d04 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-31 13:40:20 +02:00
8b95ba2061 Finish Hotfix-13
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-31 13:40:20 +02:00
8281ced43b Test Jenkinsfile 2025-03-31 13:40:06 +02:00
54e4ac19f9 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit is unstable
2025-03-31 13:26:27 +02:00
bcb4f73ada Finish Hotfix-13
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-31 13:26:26 +02:00
cfaf4256f7 Esclusa cartella cache da ftpPublisher 2025-03-31 13:26:11 +02:00
c3283d9a3f Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-31 12:32:11 +02:00
a72d0d7a90 Finish Hotfix-13
All checks were successful
PVM (new)/pipeline/head This commit is unstable
2025-03-31 12:32:10 +02:00
117e24159c rimessa la cdn su incone kendo 2025-03-31 12:31:51 +02:00
57d2dc41d4 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-31 12:20:54 +02:00
46bcc933af Finish Hotfix-13
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-31 12:20:53 +02:00
5177548288 [Rossogargano]
- corrette query accettazione da campo
- rimossa CDN icone kendo
2025-03-31 12:20:23 +02:00
fe2ef2688c [Rossogargano]
- corrette query accettazione da campo
- rimossa CDN icone kendo
2025-03-31 12:19:27 +02:00
b2f76ff8f8 Aggiunto tasto jsonEditor in popup depositi
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-28 16:55:05 +01:00
87e38f194e Aggiunti totali e rimossi sconti aggiuntivi in popup ordine piano arrivi
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-28 12:07:24 +01:00
1c245d882a Impostata chiamata load_step2 in post in accettazione
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-28 09:56:46 +01:00
6d5e667072 Cambio permesso btn nuovo ordine in mes
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-27 17:45:31 +01:00
23f9608ba0 Gestiti nuovi permessi ed implementati sul mes
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-27 16:34:10 +01:00
2f7259cbab Fix errore in invio email con rag. soc. con virgola
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-27 16:30:47 +01:00
16b9a842db Fix ora mancante in stampa etichette carciofi
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-26 16:50:40 +01:00
79108cdf4f Mantenuto il keypair in fase di login per non invalidare le richieste da js
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-26 12:13:01 +01:00
7eae1328f1 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-25 13:11:50 +01:00
103646d845 Finish FixDescrizionePopOrdDP 2025-03-25 13:11:50 +01:00
9a074d30ff Fix descrizione articolo mancante in popup ordine delivery plan 2025-03-25 13:10:44 +01:00
2e01c612c3 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-25 12:26:41 +01:00
3644067476 Finish AggCal100Report 2025-03-25 12:26:41 +01:00
b8026fb947 Aggiunto calibro 100 in report carciofi 2025-03-25 12:26:26 +01:00
a66678587d Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-25 12:13:58 +01:00
8a219a7e2e Finish Hotfix-13 2025-03-25 12:13:57 +01:00
d3bd9b05b8 [CARELLI - accettazione]
- fix data max accettazione
[GRAMM - MES]
- corretta gestione setup suggest data scad
[ROSSOGARGANO - Carciofi]
- corretta gestione calcolo min/max prezzo
2025-03-25 12:05:56 +01:00
ea19359fe2 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-25 11:36:40 +01:00
c14e1bda6a Finish FixInitAsListino 2025-03-25 11:36:40 +01:00
0ebe899735 Fix pedane vuote in apertura ordine da listino con righe 2025-03-25 11:36:25 +01:00
d3e63c6028 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-25 09:53:03 +01:00
7a56eea14c Finish AggCal100 2025-03-25 09:53:02 +01:00
7f81a45fec Aggiunto calibro 100 in carciofi 2025-03-25 09:52:47 +01:00
b8b1627e01 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-24 17:27:00 +01:00
34b8a2f4d4 Finish Hotfix-13 2025-03-24 17:26:59 +01:00
6622e5b398 [CMMS]
corretta condizione su convalida manutenzione in apertura popup
2025-03-24 17:23:38 +01:00
07c71c2c4c Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-24 16:21:21 +01:00
dd60cea2d3 Finish Hotfix-13 2025-03-24 16:21:20 +01:00
7be43ec324 [BIOLEVANTE - CMMS]
gestita convalidazione manutenzioni
2025-03-24 16:20:48 +01:00
88ab7dc456 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-24 12:10:11 +01:00
c31a1ce31e Finish Hotfix-13 2025-03-24 12:10:10 +01:00
498622e889 [CARELLI - ACCETTAZIONE]
aggiunto popup di avviso in caso di accettazione di merce a 0 con qta documento > 0
2025-03-24 12:09:35 +01:00
034e79e579 Fix tipo variabile "flagFirmato"
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-21 15:43:07 +01:00
cd17fe5a8b Finish GestRiepConsegne
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-21 10:03:46 +01:00
d02b6e4142 Creata gestione Riepilogo Consegne VG 2025-03-21 10:03:39 +01:00
e2c9c2e8bd Fix controllo su linee da escludere per cliente
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-19 17:36:54 +01:00
0f7457e406 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit is unstable
2025-03-19 12:35:05 +01:00
b9b8fb0742 Finish Hotfix-13 2025-03-19 12:35:04 +01:00
079a1522b7 sistemata query accettazione 2025-03-19 11:35:56 +01:00
55b30c852d Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-18 16:25:43 +01:00
750445fea8 Finish FixCreaUdc 2025-03-18 16:25:42 +01:00
763e6ee6a7 Fix undefined index in caricoProdFinJson al creaUdc 2025-03-18 16:25:28 +01:00
401406cb55 Fix utente in docker
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-18 15:58:52 +01:00
7fed8367f4 Finish FixAddDP 2025-03-18 12:43:35 +01:00
cf9ea3ba89 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-18 12:43:35 +01:00
b1eec147ce Fix inserimento articoli da contratto in delivery plan 2025-03-18 12:43:20 +01:00
d7c324012f Aggiunta build version
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-18 11:38:22 +01:00
c89c9fd52d Aggiunta build version
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-18 10:20:39 +01:00
7bd7f8eb96 Aggiunta build version
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-18 10:10:00 +01:00
48c37be4d7 Aggiunta build version
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-18 10:05:20 +01:00
8fd5114895 Aggiunta build version
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-18 10:01:22 +01:00
de79e99cc2 Aggiunta build version
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-18 09:57:43 +01:00
48bf1abab9 Aggiunto controllo flag_escludi_lav in mvw_articoli_esclusi_wms
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-17 18:49:45 +01:00
61ff4f0ae7 Rimosso stage build se su feature
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-17 12:29:08 +01:00
5e64f0eee9 Rimossa possibile riga inutile 2025-03-17 12:20:02 +01:00
b1a26fea94 Merge branch 'master' into develop 2025-03-17 12:16:04 +01:00
4df084f4b5 Finish FixJenkins 2025-03-17 12:16:03 +01:00
dec8e7db8b Aggiunto gitattributes 2025-03-17 12:15:49 +01:00
1b86866508 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-14 19:10:14 +01:00
6f91564876 Finish AggiuntoGruntIntegry
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-14 19:10:14 +01:00
ba4fe71658 Aggiunto integry in gruntfile.js 2025-03-14 19:09:55 +01:00
15e638e408 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-14 18:54:34 +01:00
0f90277550 Aggiunto pulsante Invia CU all'interno della gestione delle paghe 2025-03-14 18:53:59 +01:00
ab9a5610e6 Merge branch 'master' into develop
All checks were successful
PVM (new)/pipeline/head This commit looks good
2025-03-14 18:47:24 +01:00
b404991647 Finish FixFileBuild
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-14 18:47:23 +01:00
9ec819c090 Fix build.sh line endings 2025-03-14 18:47:09 +01:00
a76400d06f Merge branch 'master' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-14 18:36:39 +01:00
07d7a5b267 Finish RevertBuildsh
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-14 18:36:39 +01:00
26552017c6 Revert modifica build.sh 2025-03-14 18:36:24 +01:00
3e9af97f7b Merge branch 'master' into develop
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-14 18:21:38 +01:00
357cc55cce Finish JenkinsPipeline
Some checks failed
PVM (new)/pipeline/head There was a failure building this commit
2025-03-14 18:21:37 +01:00
f24713e865 Aggiunto Jenkinsfile 2025-03-14 18:21:22 +01:00
06caa88f27 Gestite note incoterms e spostati i dati dell'ordine del cliente vicino al rif nel popup ordine 2025-03-14 18:05:57 +01:00
9b6e7c5ec9 Gestiti sconti e calcolo importo in piano arrivi 2025-03-14 18:05:57 +01:00
086e81917b Miglioramenti, fix e gestito cambio listino in popup ordine ed aggiunte note incoterms in creazione viaggio 2025-03-14 18:05:57 +01:00
a8512fb7b1 Merge remote-tracking branch 'origin/develop' into develop 2025-03-14 17:56:02 +01:00
de343ce988 AGGIUNTA MIGRATION 2025-03-14 17:43:45 +01:00
c7dbde718c Fix salvataggio codvdes null in salvataggio contratti di vendita 2025-03-14 17:30:22 +01:00
643c29ea3e Merge branch 'master' into develop 2025-03-14 11:26:22 +01:00
c777916744 Finish FixListaContrAcqMRPV2 2025-03-14 11:26:21 +01:00
7794c05455 Fix get lista contratti di acquisto mancante in mrpv2 2025-03-14 11:26:01 +01:00
40d7f2938c Revert modifica build.sh 2025-03-13 16:52:53 +01:00
0060c5b20e Merge remote-tracking branch 'origin/develop' into develop 2025-03-12 11:25:13 +01:00
c389f1dd0a [GRAMM]
- ricerca moduli da mebnù laterale
2025-03-12 11:24:34 +01:00
93ec7181cc Gestita creazione ordine su linea terzista e tipo doc in base ad ordine terzista o no in termina ordine mes 2025-03-11 17:47:36 +01:00
b461b293b9 Gestito cambio articolo per articoli da contratto in ordine delivery plan 2025-03-11 17:44:54 +01:00
c14d81e7a0 Creato script per eseguire un container al branch corrente 2025-03-10 10:40:19 +01:00
05436f0e06 Fix reset note se assente in save ordine delivery plan 2025-03-07 18:33:00 +01:00
56bb43a655 Ricerca ord prod in produzione planning per gestione A 2025-03-07 10:08:34 +01:00
f91d8acb2f Aggiunta lista mail cc interne in lista invio mail ordine delivery plan e piano arrivi 2025-03-07 10:07:03 +01:00
9a95c1a6d8 [GRAMM]
- aggiunto possibilita di proporre la data scadenza lotto di produzione in base alla data ordine
- limitata modifica udc solo a colli senza documento
2025-03-06 16:43:18 +01:00
dad0aa7b83 Merge remote-tracking branch 'origin/develop' into develop 2025-03-06 11:45:11 +01:00
47ad30dd0d [CARELLI]
- inserito vincolo data minima da doc consegna in accettazione merce
2025-03-06 11:44:46 +01:00
c145113cc5 Migliorie gestione menu 2025-03-05 16:24:30 +01:00
7b0de25f93 Gestita scelta prefisso in creazione menu e gestione opzionale 2025-03-05 15:09:30 +01:00
fc386f2ba0 Migliorie gestione menu 2025-03-05 12:58:20 +01:00
2737b36d60 Merge branch 'master' into develop 2025-03-05 10:17:31 +01:00
d601e940a3 Finish Hotfix-13 2025-03-05 10:17:30 +01:00
7f835e56d7 Resa sempre visibile l'unità di misura nelle tile delle macchine nel MES 2025-03-05 10:17:13 +01:00
1e537a888d Merge branch 'master' into develop 2025-03-04 11:31:35 +01:00
f876de96e0 Finish Hotfix-13 2025-03-04 11:31:34 +01:00
6aadb844c8 [INTEGRY]
- gestiti risultati da query in parametri report collection

[GRAMM]
- rimossi controlli su operazioni in MES
2025-03-04 11:29:38 +01:00
7bf6b2c70f Aggiunto controllo su linee da escludere per cliente 2025-03-04 09:54:09 +01:00
af91c8c80c Finish Hotfix-13 2025-03-04 09:52:22 +01:00
bc571e33ef Merge branch 'master' into develop 2025-03-04 09:52:22 +01:00
3309afa1bc modificato controllo su esistenza griglia di acquisto su articolo del fornitore 2025-03-04 09:51:47 +01:00
da78f31409 Finish Hotfix-13 2025-03-03 11:32:38 +01:00
99dc8849cc Merge branch 'master' into develop 2025-03-03 11:32:38 +01:00
090814c54b [CMMS]
- corretto caricamentio stampa manutenzione
2025-03-03 11:31:56 +01:00
2a699c4039 Finish Hotfix-13 2025-03-03 11:15:46 +01:00
970d4d6935 Merge branch 'master' into develop 2025-03-03 11:15:46 +01:00
9c41fb914c [CMMS]
- corretti parametri stampa manutenzione
2025-03-03 11:14:58 +01:00
00c05802a0 Aggiunto valore richiesto di xdebug in base all'env 2025-03-03 11:14:20 +01:00
4b6f3afbc5 Merge branch 'master' into develop 2025-03-03 10:28:56 +01:00
7a728f196b Finish Hotfix-13 2025-03-03 10:28:55 +01:00
196c806e07 [CMMS]
- gestione allegati manutenzione
- nuovi campi manutenzione
[ricambi]
- stampe in contextMenu
- importazione posizione default articolo da ul
2025-03-03 10:27:05 +01:00
4ae1eb88b7 Gestita build docker multiplatform 2025-03-03 09:45:36 +01:00
11723e26ad Fix righe listino duplicate con viewRigheListino in popup ordine delivery plan 2025-02-26 18:49:09 +01:00
8d7bb217ad Aggiunto tipo pagamento e rif documenti in riep scadenze delivery plan 2025-02-26 12:41:08 +01:00
d74c0ce6da Corretto cod_jfas in testata ed impostata planning date predefinita 2025-02-26 12:13:27 +01:00
9f6b864a0b Revert "Revert "Reso destinatario opzionale in popup contratti di vendita e rimossa data cons prod in produzione planning"
This reverts commit 89e88e3c73a689be5cde798fb9206c3da1b3c77d."

This reverts commit 0bb7575993.
2025-02-25 16:40:43 +01:00
90b38e2198 Aggiunti messaggi di errore nelle verifiche registrazioni follie 2025-02-25 13:23:57 +01:00
3c0b371bb8 Merge branch 'master' into develop 2025-02-24 17:38:40 +01:00
2fa533167d Finish Hotfix-13 2025-02-24 17:38:40 +01:00
e0333ee94e [GRAMM]
- annullamento partita ordine in ripianificazione
[INTEGRY]
- corrette funzioni varie
2025-02-24 17:36:17 +01:00
9de0b77ef8 Merge branch 'master' into develop 2025-02-24 11:14:28 +01:00
c28f22aff4 Finish FixSetDate 2025-02-24 11:14:27 +01:00
7ca92af396 Fix set date e datetime in entityitem 2025-02-24 11:14:16 +01:00
fabaa4b64c Debounce salvataggio date a 20s e fix cancellazione cq gramm 2025-02-21 19:03:46 +01:00
4162bd82d5 [CONTROLLO GIACENZE]
aggiunto controllo su deposito partenza != deposito di arrivo in trasferimento ul
2025-02-20 19:25:47 +01:00
4ad18e8348 Merge remote-tracking branch 'origin/develop' into develop 2025-02-20 18:30:19 +01:00
7b786ad79f [ROSSOGARGANO]
- creazione on the fly di una udc in fase di versamento su ordine
2025-02-20 18:25:37 +01:00
eb5e7a993d Fix check allowedMimeTypes, public url twob e val_unt list spese 2025-02-20 09:40:33 +01:00
3ee60a4e30 Merge remote-tracking branch 'origin/develop' into develop 2025-02-18 16:22:39 +01:00
4dd65bf2a0 [ROSSOGARGANO]
- corretti tab accettazione pomodiori
- aggiunti tag php estesi in popup dettagli ordine

- corretta gestione allegati
2025-02-18 16:22:08 +01:00
780134bbbb Merge branch 'master' into develop 2025-02-18 09:57:45 +01:00
9a044d4c7f Finish RevertProdPlanning 2025-02-18 09:57:45 +01:00
0bb7575993 Revert "Reso destinatario opzionale in popup contratti di vendita e rimossa data cons prod in produzione planning"
This reverts commit 89e88e3c73.
2025-02-18 09:56:12 +01:00
8333476992 Merge branch 'master' into develop 2025-02-18 09:53:45 +01:00
b3be7ce942 Finish FixBooking 2025-02-18 09:53:45 +01:00
2799fc809e Fix stampa targa e booking in popup riep giorno 2025-02-18 09:53:31 +01:00
186bdc1823 Merge branch 'master' into develop 2025-02-17 16:44:51 +01:00
e3a05e6aa9 Finish FixPublicUrl 2025-02-17 16:44:50 +01:00
7d8978b9d0 Fix lettura public url da config aziende 2025-02-17 16:44:28 +01:00
8d55534c0c [ROSSOGARGANO]
- corretta query materiali di ricambio
2025-02-17 15:43:59 +01:00
2064905ebd Merge branch 'master' into develop 2025-02-17 11:05:58 +01:00
373b703847 Finish Hotfix-13 2025-02-17 11:05:57 +01:00
fa82bd2d32 spostata lettura barcode_ul su mtb_colt per assenza temporanea da vista inventario 2025-02-17 11:05:37 +01:00
a3a11c81f3 Merge branch 'master' into develop 2025-02-17 10:38:31 +01:00
4224bf2b0d Finish Hotfix-13 2025-02-17 10:38:30 +01:00
cda9c368b7 correzioni popup scarichi mes 2025-02-17 10:37:41 +01:00
318cbe72ca Merge branch 'master' into develop 2025-02-17 09:56:13 +01:00
83be7ad1f1 Finish Hotfix-13 2025-02-17 09:56:13 +01:00
12c79e5774 Bugfixes apertura popup scarichi e invio fattura c.to deposito 2025-02-17 09:53:39 +01:00
e936e5d494 Aggiunta selezione nulla in magazzino piano di carico 2025-02-17 09:48:44 +01:00
89462f872e Fix numeri in esportazione excel mrp, fix rimozione cliente in listini di vendita e aggiunto booking sempre in viaggi 2025-02-14 19:31:56 +01:00
89e88e3c73 Reso destinatario opzionale in popup contratti di vendita e rimossa data cons prod in produzione planning 2025-02-14 18:45:22 +01:00
d99d564f1b [ROSSOGARGANO]
- Nel pop-up 'Nuovo Scarico' creare un pulsante per riportare tutta la giacenza delle UDC nella colonna 'Qta da scaricare' e aggiungere dei totali. Inoltre aggiungere barcodeul, progressivo, data e ora
2025-02-14 16:15:18 +01:00
3198ebbe33 Merge remote-tracking branch 'origin/develop' into develop 2025-02-13 18:31:34 +01:00
450f9e2a87 [ROSSOGARGANO]
- caricamento/modifica/eliminazione udc da popup dettagli ordine
- modifiche grafiche per identificazione ul tramite barcode in dettaglio ordine
- gestione permessi fatturazione C.to deposito
[INTEGRY]
- correzione gestione setup
2025-02-13 18:29:11 +01:00
a11f22405a Aggiunto pulsante per esportazione in excel prodotti segnalati 2025-02-13 18:03:41 +01:00
28f05bc99f Merge branch 'master' into develop 2025-02-13 11:44:48 +01:00
e5bf5fee00 Finish FixPopupOff 2025-02-13 11:44:48 +01:00
2a32c3c271 Fix errore ret mancante in popup offerta contratti di vendita 2025-02-13 11:44:06 +01:00
a15dc78b71 Fix culture kendo, aggiunto signals-core, gestita risposta diretta in IMSApi e gestita firma in impostazioni 2025-02-13 11:36:12 +01:00
7d2ed63198 Miglioramenti modifiche per tipo json in impostazioni e gestita setup CONFIG_STAMPE_POPUP_ORD in delivery plan 2025-02-07 18:38:34 +01:00
3845c34386 Merge remote-tracking branch 'origin/develop' into develop 2025-02-07 13:25:40 +01:00
c2ac3b34e3 [ROSSOGARGANO]
- correzioni conto deposito
2025-02-07 13:25:12 +01:00
4952afc0df Gestita qta e val_unt in spese accessorie, aggiunto sconto 3 e 4 ed impostato filtro porti 2025-02-07 11:35:48 +01:00
a796f18e19 Fix datasource gruppi in popup aggiungi forn 2025-02-05 16:59:04 +01:00
5df6fd32f5 [florapulia]
- corrette condizioni intervallo temporale blocco ordini
2025-02-05 16:38:13 +01:00
9dae5616e6 Merge remote-tracking branch 'origin/develop' into develop 2025-02-05 12:27:51 +01:00
a7e69a9676 [ROSSOGARGANO]
- correzione calcolo qtaResidura in contratti di vendita
2025-02-05 12:27:23 +01:00
21e91f4cd2 Attivato noImplicitOverride ed impostato su tutti 2025-02-05 09:27:52 +01:00
61237ce28f Merge branch 'master' into develop 2025-02-04 12:55:12 +01:00
966dac4825 Finish FixFormPopup 2025-02-04 12:55:12 +01:00
f5f6bba1fc Fix eventi non funzionanti in FormPopup 2025-02-04 12:54:54 +01:00
5730d3df03 [ROSSOGARGANO]
- Fattura conto deposito da contratto di vendita
2025-02-04 10:03:39 +01:00
b43dafb707 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	public_html/gest-lib/monitoraggio_linee_v2/js/ordini.module.js
2025-02-04 10:02:42 +01:00
77f03d9cba aggiunta possibilità di customizzare il timeout alle chiamate alle macchine 2025-02-04 10:01:47 +01:00
610501227d Merge branch 'master' into develop 2025-02-03 18:58:14 +01:00
52c7f53e23 Finish AggBilanceDulciar 2025-02-03 18:58:13 +01:00
efdf13b52d Gestito selettore bilancia per Dulciar nel MES 2025-02-03 18:57:59 +01:00
5ef8ae95ee Aggiunto .editorconfig 2025-02-03 17:29:06 +01:00
c3238df48b Finish FixCalcImpRigaDP 2025-02-03 17:26:40 +01:00
b763519cc0 Merge branch 'master' into develop 2025-02-03 17:26:40 +01:00
660632eb40 Fix errore se articolo non presente in listino in popup ordine delivery plan 2025-02-03 17:26:26 +01:00
93ce4eed47 Merge branch 'master' into develop 2025-02-03 17:24:26 +01:00
e3de10d26a Finish AggFornPianoArrivi 2025-02-03 17:24:25 +01:00
14a65177c8 Gestito inserimento nuovo fornitore in piano arrivi 2025-02-03 17:24:12 +01:00
3f84241761 Fix query controllo giacenze, correzione calcolo importo in popup ordine delivery plan e salvataggio viaggio prima della stampa in popup 2025-01-31 15:55:31 +01:00
77ed963481 Fix request uri too long in PopupSchedaCosti 2025-01-31 10:59:54 +01:00
8510f94e73 Corretta gestione errore BadRequest 2025-01-31 10:49:56 +01:00
fc695daa4f Merge branch 'master' into develop 2025-01-30 16:49:08 +01:00
377b8f6229 Finish Hotfix-13 2025-01-30 16:49:07 +01:00
6720a4bde4 [GESTIONE RICAMBI]
- corretta gestione flagQtaCnfFissa in creazione articolo
[PIANO ARRIVI]
 - corretta join su listino di acquisti in lista fornitori
2025-01-30 16:48:36 +01:00
838bfed74a Merge remote-tracking branch 'origin/develop' into develop 2025-01-30 12:21:48 +01:00
aa4de20c3a [ROSSOGARGANO]
- modifica dati partita di magazzino lavorazione
[CARELLI]
- correzioni campi modellini
2025-01-30 12:21:22 +01:00
7681fda859 sistemato filtro articoli equivalenti su listini 2025-01-29 15:48:19 +01:00
842c20b563 sistemato controllo su qta multiple 2025-01-29 12:45:20 +01:00
40869ff58a Merge branch 'master' into develop 2025-01-29 11:23:17 +01:00
227b87822d Finish FixCheckPedaneAcc 2025-01-29 11:23:16 +01:00
3b7ed4a65b Rimosso check pedane per tipo ACC 2025-01-29 11:22:56 +01:00
645ec839e1 [Marco & Peppe]
modifica allegati
2025-01-27 17:11:16 +01:00
10463a3789 Merge branch 'master' into develop 2025-01-27 16:50:53 +01:00
8329845e5a Finish FixLisiniForn 2025-01-27 16:50:52 +01:00
4e6702a35e Riaggunta modifica errata 2025-01-27 16:50:34 +01:00
be18eb743a Merge branch 'master' into develop 2025-01-27 16:02:46 +01:00
359fee5ab2 Finish FixListiniForn 2025-01-27 16:02:45 +01:00
0e7fae6210 Corretta query listini fornitori in piano arrivi 2025-01-27 16:02:25 +01:00
bcc900b3d8 Merge branch 'master' into develop 2025-01-27 13:12:41 +01:00
19be7cba64 Finish FixRicercaArt 2025-01-27 13:12:40 +01:00
fced89daa2 Fix contains in cerca articoli piano arrivi 2025-01-27 13:11:35 +01:00
adb6f303f7 Merge branch 'master' into develop 2025-01-27 11:13:24 +01:00
a1251216a0 Finish FixErrori 2025-01-27 11:13:23 +01:00
0e2d3b5195 Fix dati gruppi in popup form articoli e ricerca articoli in piano arrivi 2025-01-27 11:13:10 +01:00
c5f190f6b9 Gestita compilazione multistage in docker 2025-01-27 09:49:20 +01:00
553c5e655d Ordinamento gruppo_cons desc in PopupRiepGiorno 2025-01-23 18:06:10 +01:00
5ccb33ae12 Merge branch 'master' into develop 2025-01-23 17:52:33 +01:00
f75e30b30a Finish FixDeliveryPlan 2025-01-23 17:52:32 +01:00
15be0918c3 Fix viaggi delivery plan
(cherry picked from commit 818d2ea1c3)
2025-01-23 17:52:23 +01:00
967880e5ee Fix ricerca articoli in piano arrivi 2025-01-23 17:15:09 +01:00
d9870595c5 Finish PulsanteCopiaCodmart 2025-01-23 14:44:02 +01:00
fb8ce9d7f7 Merge branch 'master' into develop 2025-01-23 14:44:02 +01:00
966748b968 Aggiunto pulsante copia codmart in popup aggiungi listino piano arrivi e fix pulsante duplica in delivery plan
(cherry picked from commit 8f6c8ced2d)
2025-01-23 14:43:50 +01:00
6f7c090d5f Aggiunto pulsante di stampa in popup crea viaggio 2025-01-23 10:46:09 +01:00
d23b598513 Finish Hotfix-13 2025-01-23 09:33:37 +01:00
2152416fca Merge branch 'master' into develop 2025-01-23 09:33:37 +01:00
8e78d1ba0f [Gestione Ricambistica]
- aggiunto pulsante proposta barcode
2025-01-23 09:33:13 +01:00
8f6c8ced2d Aggiunto pulsante copia codmart in popup aggiungi listino piano arrivi e fix pulsante duplica in delivery plan 2025-01-22 15:42:12 +01:00
a8336892f7 Merge branch 'master' into develop 2025-01-21 18:48:00 +01:00
97da34cf60 Finish FixPopupOrdineDP 2025-01-21 18:47:59 +01:00
e0a1f58bad Aggiunto controllo per inserimento dataAttributes in bsautocomplete 2025-01-21 18:47:45 +01:00
818d2ea1c3 Fix viaggi delivery plan 2025-01-21 17:07:44 +01:00
6ec4099a99 Fix errore risorsa non valida 2025-01-20 17:03:03 +01:00
5a8c1c3822 Fix riepiloghi viaggi, corretto controllo disponibilità ordini lav mrp e controllo scarichi in mes 2025-01-17 19:00:31 +01:00
d94cd49070 Merge remote-tracking branch 'origin/develop' into develop 2025-01-17 12:08:43 +01:00
a6e400cf37 eliminati kit 2025-01-17 12:08:25 +01:00
437b7add18 aggiunta persona di riferimento 2025-01-17 12:05:52 +01:00
5a09b91519 Refresh riepiloghi al cambio dati su righe viaggi 2025-01-16 18:32:58 +01:00
6a9f1688bd Aggiunte colonne colli e prezzo medio e selettore tipo costo in statistiche listini di vendita 2025-01-16 17:56:37 +01:00
16721e4ccc Fix table spese in nuovo ordine delivery plan 2025-01-16 12:48:16 +01:00
8b5e77591d Mostro fornitori con listini di acquisto vuoti in piano arrivi 2025-01-16 12:03:02 +01:00
f20b61f00a Modificata colonna data cons in data part in popup fabbisogno 2025-01-16 10:17:00 +01:00
80f5628ab4 Gestita visualizzazione pedane in viaggio DP e versioni costi di trasporto in listini vendita 2025-01-15 18:25:36 +01:00
b8ef81a2b3 Merge branch 'master' into develop 2025-01-15 16:26:29 +01:00
5a71f08905 Finish Hotfix-13 2025-01-15 16:26:29 +01:00
fc9de83edb Completati todo in PopupNuovoMaterialeOrdine 2025-01-15 16:26:14 +01:00
e3b1917585 Merge branch 'master' into develop 2025-01-15 13:08:46 +01:00
29eb94fda3 Finish Hotfix-13 2025-01-15 13:08:45 +01:00
48188fd297 correzione su modellini:
aggiunto nuovamente reparto
  disabilitata la cancellazione se l'attività è stata inserita da un altro utente
sistemata query accettazione
2025-01-15 13:06:39 +01:00
090906bd0d [ROSSOGARGANO - MES]
- aggiunta/modifica/eliminazione materiali da ordine di lavoro
2025-01-14 19:57:32 +01:00
9a3422dfb2 Merge branch 'master' into develop 2025-01-13 17:51:39 +01:00
cb126274d5 Finish Hotfix-13 2025-01-13 17:51:38 +01:00
14c1497e6e [CARELLI]
- corretto caricamento module
 - permessa modifica qtà check n accettazione merce
 - Corretta gestione data inserimento attività da ispezione
[ROSSOGARGANO]
 - aggiunti campi pedana in controllo giacenze
2025-01-13 17:51:03 +01:00
c095e70800 [ROSSOGARGANO]
- aggiunto dettaglio numero confezioni in documento di trasferimento deposito
2025-01-10 17:51:16 +01:00
db6f7ed2a6 Merge remote-tracking branch 'origin/develop' into develop 2025-01-10 17:44:40 +01:00
bef8878b95 [CARELLI]
- nascosto campo reparto in attività di ispezione
 - salvato campo protocollo in attività di ispezione
 [MES]
 - corretta query materiali in giacenza
2025-01-10 17:44:10 +01:00
092d015223 Fix campo confermato eliminato in vtb_viaggi 2025-01-10 16:18:24 +01:00
990b590784 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	public_html/gest-lib/controllo_giacenze/sql/list-articoli.sql
2025-01-10 10:17:59 +01:00
b07903fd65 Aggiunto cliente in gestione Controllo Giacenze 2025-01-10 10:16:27 +01:00
b03487ddfc Modifica query statistiche in listini vendita 2025-01-09 16:29:33 +01:00
119d9603d9 Merge branch 'master' into develop 2025-01-09 13:00:28 +01:00
ee6f7eab5c Finish Hotfix-13 2025-01-09 13:00:28 +01:00
a27aea8f75 rimossa temporaneamente query dashboard da CMMS ed aggiustata navbar per conflitto con colori azienda personalizzati 2025-01-09 13:00:03 +01:00
76ef7347ff [BIOLEVANTE]
impostazione tara in chiusura ordine di lavorazione
2025-01-09 12:58:52 +01:00
41165f3afa [CARELLI]
luogo segnalazione compilato automaticamente dai pv
2025-01-09 12:49:30 +01:00
6041e877fc Corretta definizione di mezzo in VtbViaggi 2025-01-09 11:45:05 +01:00
66a2fa2dc9 Rimosso controllo su ore in salvataggio date cq 2025-01-09 09:22:27 +01:00
ab178ad255 Gestite spese accessorie in popup ordine delivery plan 2025-01-07 16:17:57 +01:00
d64f43a194 Riattivato timer in delivery plan 2025-01-02 17:31:39 +01:00
573a04280c sistemato controllo su qta_cnf dell'ordine 2025-01-02 17:08:51 +01:00
08a005d8c2 Merge branch 'master' into develop 2024-12-30 17:08:41 +01:00
ea787ac0d2 Finish FormVettore 2024-12-30 17:08:40 +01:00
9003ae48d0 Miglioramento gestione module in BaseModule e creato FormViewModule 2024-12-30 17:08:26 +01:00
e4e1e4154d [ROSSOGARGANO]
- abilitato trasferimento di UL multiple in ControlloGiacenze.class.php
2024-12-30 12:51:03 +01:00
3b1f91f577 [delivery-plan]
unificata chiamata fuori fido clienti
2024-12-19 19:15:16 +01:00
01bb0077fc [ROSSOGRAGANO]
servizio di trasferimento UL da controllo giacenze
2024-12-19 18:18:13 +01:00
da4a4c6fdc Merge branch 'master' into develop 2024-12-18 12:02:00 +01:00
27bf83bb55 Finish Hotfix-13 2024-12-18 12:01:59 +01:00
32e6c856f9 [MES]
- aggiunto controllo su flag showInTile per mostrare dati macchina in Monitoraggio linee
2024-12-18 12:00:04 +01:00
0f5380161b Merge branch 'master' into develop 2024-12-17 16:37:51 +01:00
fe88c31599 Finish Hotfix-13 2024-12-17 16:37:50 +01:00
f81d1b8d2f controllo minimo d'ordine bloccante 2024-12-17 16:36:38 +01:00
c4c365facd Merge branch 'master' into develop 2024-12-16 18:50:12 +01:00
6b14b74b3b Finish Hotfix-13 2024-12-16 18:50:12 +01:00
1139cb768a [ROSSOGARGANO]
- ordinamento campi tabella articoli ricambi
- aggiunti campi barcode e progressivo ul in tabella giacenze
2024-12-16 18:49:46 +01:00
947c7c9d25 Merge branch 'master' into develop 2024-12-16 15:46:24 +01:00
b143cf7714 Finish Hotfix-13 2024-12-16 15:46:24 +01:00
564402af40 [ROSSOGARGANO]
- Gestione rientro merce versata in mes
- aggiunta giacenza articoli in gestione merce ricambi
2024-12-16 15:45:29 +01:00
f62b61959d sistemato controllo su valore minimo ordine 2024-12-11 17:54:27 +01:00
1ec1b37fc3 Merge branch 'master' into develop 2024-12-10 18:17:18 +01:00
09179a159f Finish Hotfix-13 2024-12-10 18:17:17 +01:00
74b19a27ef [PEPPE]
modifiche in gestione exchange per visualizzazione errore
2024-12-10 18:16:53 +01:00
31597c8e54 Merge branch 'master' into develop 2024-12-10 17:32:47 +01:00
f33a7d2ac7 Finish MRPSoloConDati 2024-12-10 17:32:47 +01:00
d25c6f49ff Aggiunto filtro solo con dati 2024-12-10 17:32:26 +01:00
8367a51985 Merge branch 'master' into develop 2024-12-10 12:53:05 +01:00
f7653e4017 Finish Hotfix-13 2024-12-10 12:53:04 +01:00
4a6f9ff627 [ROSSOGARGANO]
corretta visualizzazione campi barcode e posizione in gestione ricambistica
2024-12-10 12:52:25 +01:00
08b24cc892 Merge branch 'master' into develop 2024-12-10 12:11:42 +01:00
20588ce004 Finish MRPSoloArtDis 2024-12-10 12:11:42 +01:00
ca92d28825 Gestita visualizzazione di articoli disattivi in MRP 2024-12-10 12:11:27 +01:00
b4e23b8efb Gestito Cache-Control per file js, mjs e css 2024-12-10 12:10:20 +01:00
64cb1c48e7 Merge branch 'master' into develop 2024-12-10 10:20:53 +01:00
e2d6047514 Finish Hotfix-13 2024-12-10 10:20:52 +01:00
1e3c36d0b1 corretta incompatibilità php5.6 in classe module 2024-12-10 10:19:49 +01:00
e3b495cd92 Fix aggiunta stesso articolo con prezzo diverso in delivery plan 2024-12-09 18:46:49 +01:00
d5513052d4 Merge branch 'master' into develop 2024-12-09 16:14:36 +01:00
fc4e5b2c08 Finish Hotfix-13 2024-12-09 16:14:35 +01:00
e651819304 fix orderby kendo query 2024-12-09 16:12:57 +01:00
d9e041e63b Merge branch 'master' into develop 2024-12-09 12:20:55 +01:00
125ae6b1b2 Finish Hotfix-13 2024-12-09 12:20:55 +01:00
b8854c5521 risolto problema funzioni tipizzate con parametro nullable 2024-12-09 12:20:34 +01:00
a98b9dd96b Merge branch 'master' into develop 2024-12-09 11:41:33 +01:00
bd65924be9 Finish Hotfix-13 2024-12-09 11:41:33 +01:00
47227d271d [KENDO]
- corretta gestione query senza template (ma con template duplicato)
2024-12-09 11:41:12 +01:00
ae48775bcb Modificato parametro lang listino e offerte 2024-12-06 18:40:24 +01:00
61371be465 - filtrati formati e famiglie in analisi budget rossoG
- configurato nuovo endpoint RossoG

- resettato formato in selezione famiglia in analisiBudget
2024-12-06 18:31:19 +01:00
7c9ee2e692 Gestito caso ricevuto e parzialmente evaso in piano arrivi 2024-12-06 17:44:46 +01:00
666cd601dc Gestito parametro lang in getPdfListino listini e offerte 2024-12-06 17:33:27 +01:00
b478643561 - Modifiche alla pagina controllo giacenze
- aggiunta possibilità di inserire un articolo nel listino di acquisto al volo in piano arrivi
2024-12-06 14:55:48 +01:00
716600596a Gestiti campi nuovo in creazione viaggio 2024-12-06 10:32:49 +01:00
351a87cd2c Fix problema di memoria e migliorato context menu tabella costi in listini di vendita 2024-12-04 18:22:26 +01:00
6b254c655b Merge branch 'master' into develop 2024-12-04 10:30:11 +01:00
d8fb9a0064 Finish Hotfix-13 2024-12-04 10:30:10 +01:00
fef66a5ac6 Monitoraggio linee -> Manufacturing Execution System
impostato caricamento primi risultati in pagina controllo giacenze solo all'inserimento di un filtro
2024-12-04 10:29:37 +01:00
822e3779cd Fix note null 2024-12-03 17:24:45 +01:00
a29a47325c Gestito editor html in note del giorno piano carico 2024-12-03 16:45:22 +01:00
c461f0fc07 Gestite note del giorno in piano carico rosso gargano 2024-12-03 12:56:35 +01:00
d12d98f150 Fix ceil su totale 2024-12-03 11:33:41 +01:00
4006078cf2 Merge branch 'master' into develop 2024-12-02 19:45:31 +01:00
439d1cc8cd Finish FixCQDate 2024-12-02 19:45:30 +01:00
a20eb97b5f Fix nuova riga cq e include su magazzino_prod 2024-12-02 19:44:58 +01:00
2879778585 [ROSSOGARGANO]
- corretta configurazione nuovo server su profilo principale
2024-12-02 10:25:24 +01:00
9b1afad91b Merge branch 'master' into develop 2024-12-02 10:24:04 +01:00
4da7db8123 Finish Hotfix-13 2024-12-02 10:24:03 +01:00
e0a5ad1310 [ROSSOGARGANO]
- corretta configurazione nuovo server su profilo contabilità
2024-12-02 10:23:41 +01:00
f6d528ecda Correzioni per strictNullChecks 2024-12-02 09:29:04 +01:00
254c49f2af - filtrati formati e famiglie in analisi budget rossoG
- configurato nuovo endpoint RossoG

- resettato formato in selezione famiglia in analisiBudget
2024-11-29 17:22:48 +01:00
6104a80d98 - Rimossa chiamata ridondante alle impostazioni delle linee
- Aggiunto nuovo calcolo dimensioni popup per problemi su mobile

- abbassato intervallo minuti select fermi macchina a 5 minuti
2024-11-29 16:10:04 +01:00
9e14ab3ca8 Gestito tipo generico in getModel 2024-11-27 17:24:18 +01:00
f8ffd0eef6 Finish MiglioramentiTabArt 2024-11-27 17:21:05 +01:00
a4348a9e90 Gestita lista articoli da servizio e nuovi dto 2024-11-27 17:20:39 +01:00
e09a9807e5 Merge branch 'develop' into feature/MiglioramentiTabArt 2024-11-27 17:09:59 +01:00
d05ca43f2e Aggiunte config Rossogarganocont 2024-11-27 17:06:47 +01:00
35d06db94f aggiunto nella compilazione 2024-11-27 13:24:58 +01:00
af4e4c8728 Migliorato salvataggio date in cq gramm 2024-11-27 11:42:31 +01:00
3b7b4ff394 Merge branch 'master' into develop 2024-11-27 10:10:18 +01:00
675e87d71b Finish Hotfix-13 2024-11-27 10:10:17 +01:00
205af66294 Aggiunto Rossogarganocont 2024-11-27 10:09:59 +01:00
3c2346ce63 Merge branch 'master' into develop 2024-11-26 16:25:24 +01:00
aebfdef60f Finish Hotfix-13 2024-11-26 16:25:23 +01:00
fe5583ca73 [GRAMM]
- revert a gestione sessione classica di php
- rimossa privatizzazione costanti per compatibilità con PHP 5.6
2024-11-26 16:22:12 +01:00
9efc88aed8 Lettura da get_commesse se arr_commesse vuoto in catalogo 2024-11-25 18:11:17 +01:00
1cd3145eeb Merge branch 'master' into develop 2024-11-25 17:06:33 +01:00
ee0940b552 Finish FixOrdineDeliveryPlan 2024-11-25 17:06:32 +01:00
01e995c761 Aggiunto avviso al salvataggio ordine del delivery plan 2024-11-25 17:06:14 +01:00
0bc9a65958 Merge branch 'master' into develop 2024-11-25 09:41:03 +01:00
114329ee25 Finish FixNamespace 2024-11-25 09:41:02 +01:00
9ad1c1866f Fix errore class not found 2024-11-25 09:40:44 +01:00
e16d09e3a5 Modifica get articoli in gestione ricambistica 2024-11-22 19:13:47 +01:00
3a212f744a Gestito formato come figlio di famiglia in analisi budget rosso gargano 2024-11-22 19:04:17 +01:00
5f4fd9afec Merge branch 'master' into develop 2024-11-21 12:15:40 +01:00
0b314a7f56 Finish Hotfix-13 2024-11-21 12:15:40 +01:00
007a99a9da aggiunta lettura di qta cnd da listino in data 2024-11-21 12:15:16 +01:00
a1548d30a3 Fix errore namespace 2024-11-21 11:38:38 +01:00
4c50c46cb3 Fix calcolo posti pallet e controllo cambio pedane 2024-11-20 18:40:54 +01:00
ebf4c3b54d Fix classe inesistente in piano produzione giornaliera 2024-11-20 16:52:23 +01:00
133e0c057c Merge branch 'master' into develop 2024-11-20 13:30:17 +01:00
e32f28970d Finish PubbRicambiRG 2024-11-20 13:30:16 +01:00
7ba85ab542 Fix pulsanti modal su mobile
(cherry picked from commit 6f8ba5ab80)
2024-11-20 13:29:59 +01:00
6f8ba5ab80 Fix pulsanti modal su mobile 2024-11-20 13:24:09 +01:00
f60465ea91 Conversione flag in boolean 2024-11-20 11:17:15 +01:00
25f564a580 Finish Rossogargano_ricambi 2024-11-20 10:10:47 +01:00
5dae39738c Gestito input dropdownlist per gruppo, sottogruppo, famiglia, unt mis e aliquota 2024-11-20 10:10:33 +01:00
a9636f2881 Merge branch 'develop' into feature/Rossogargano_ricambi 2024-11-19 09:43:20 +01:00
0c78ac80ca Merge branch 'master' into develop 2024-11-19 09:39:17 +01:00
453334a4ad Finish FixReportArea 2024-11-19 09:39:16 +01:00
c4c103a91a Fix errore unexpected end of file area report 2024-11-19 09:39:01 +01:00
584fa0f600 [ROSSOGARGANO]
servizio di creazione articoli ricambio
2024-11-18 19:35:34 +01:00
6551daec65 Merge branch 'master' into develop 2024-11-18 17:09:37 +01:00
7bc37eaacd Finish Hotfix-13 2024-11-18 17:09:36 +01:00
6b5d5b51ff [CARELLI]
-correzioni modellini
[smetar]
corretta stampa estimated_time quando null
[biolevante]
corretta gestione wherecond in setting  quando la keysection contiene where
2024-11-18 17:09:15 +01:00
baab9ccd38 Merge branch 'master' into develop 2024-11-18 10:53:30 +01:00
63a8a50dac Finish FixMonOrd 2024-11-18 10:53:30 +01:00
9343d4c90b Fix query scarichi e setup nome report rientro come boolean 2024-11-18 10:53:14 +01:00
5015cf03f5 Aggiunto pulsante importa trasferimenti in doc interni 2024-11-15 18:28:06 +01:00
fadb9cd6d4 Fix conteggio resi da ordini non più validi 2024-11-15 18:27:19 +01:00
0163a6541d Lettura da da exchange in riep prodotti rosso gargano 2024-11-15 18:26:32 +01:00
29da106ae4 Rimosso default driver query 2024-11-15 18:25:25 +01:00
839461ac31 Fix dati analisi costi 2024-11-15 18:22:39 +01:00
4a74dae200 Rimossi tutti gli short open tag 2024-11-13 16:23:18 +01:00
d93adc5052 Impostati include come include_once e rimossi tutti gli include di classi 2024-11-12 15:36:17 +01:00
8e66a7c349 Merge branch 'master' into develop 2024-11-12 15:28:31 +01:00
a867132e0a Finish FixPreventivieStoricoOrd 2024-11-12 15:28:31 +01:00
03a42e25c9 Corretta importazione da commessa in catalogo e fix tabella storico in monitoraggio ordini 2024-11-12 15:28:17 +01:00
275af49d5e Fix metodo mancante ed aggiunto endpoint per ottenimento dati server 2024-11-12 15:23:59 +01:00
de99cd83f4 Finish Feature-ListiniRossoGargano 2024-11-12 09:45:04 +01:00
040c7d3909 Merge branch 'develop' into feature/Feature-ListiniRossoGargano 2024-11-12 09:44:19 +01:00
5f76f1bf51 Merge remote-tracking branch 'origin/develop' into develop 2024-11-11 18:33:03 +01:00
dcdf6b20e8 - Gestito nuovo campo note su macchinari di produzione
- Gestita compilazione report in upload Jrxml
2024-11-11 18:32:37 +01:00
91db00ac76 Gestito il tipo valore in cq gramm 2024-11-11 18:09:12 +01:00
329882b7ef Finish FixDettStorico 2024-11-11 12:48:28 +01:00
5174e4e7b7 Merge branch 'master' into develop 2024-11-11 12:48:28 +01:00
14e5c112ed Fix pulsante dettagli in storico monitoraggio ordini 2024-11-11 12:47:23 +01:00
bba46aa8e6 Merge branch 'develop' into feature/Feature-ListiniRossoGargano 2024-11-11 11:55:38 +01:00
284570a60a correzioni gestione variabili collection per errore in MRP 2024-11-08 18:42:21 +01:00
0bd51e89c6 modifiche su listini Rosso Gargano 2024-11-08 13:54:18 +01:00
9353057831 In accettazione visualizzati articoli con cod_mart null 2024-11-08 13:51:33 +01:00
fb09d92150 corretto upload stbFilesAttached 2024-11-08 13:38:00 +01:00
3352924d17 corretto gestito profilo integry a sfavore del profilo studioml 2024-11-08 10:52:25 +01:00
b37cffb40e Merge branch 'master' into develop 2024-11-06 15:42:33 +01:00
e83b794d05 Finish Hotfix-13 2024-11-06 15:42:32 +01:00
deb2dd8733 risolta import popupbarcode in monitoraggio linee 2024-11-06 15:42:09 +01:00
47d28aed64 Merge branch 'master' into develop 2024-11-06 12:20:36 +01:00
81de53393f Finish Hotfix-13 2024-11-06 12:20:35 +01:00
fa8bd1abb0 corretta import file numberStyle 2024-11-06 12:20:16 +01:00
2d9416fc9b Merge branch 'master' into develop 2024-11-06 11:52:38 +01:00
06ffa394d8 Finish Hotfix-13 2024-11-06 11:52:37 +01:00
f3b2a68e3e [ROSSOGARGANO]
- gestione excel in modal iframe
- fix in pagina accettazione pomodori
- gestione versamento su ordine da MES
[CARELLI]
gestita visualizzazione campi modellini
2024-11-06 11:52:15 +01:00
44d1abb8be Gestito stato viaggio, rimosso confermato e gestito colore per ordini evasi 2024-10-31 11:24:48 +01:00
6f51e9bd4b Merge branch 'master' into develop 2024-10-29 16:53:14 +01:00
01a13fe98f Finish ModifAnalisiCosti 2024-10-29 16:53:14 +01:00
a018bc09df Fix errori analisi costi 2024-10-29 16:52:57 +01:00
4faa338588 Aggiunto controllo uds scaricati in monitoraggio ordini, fix excel mrp v2 ed errore pedane in aggiungi articolo listino delivery plan 2024-10-29 16:51:18 +01:00
2e1cbde6c2 Merge branch 'master' into develop 2024-10-28 09:36:07 +01:00
3b84390521 Finish FixImportFont 2024-10-28 09:36:06 +01:00
58358b4799 Aggiornata versione grunt-contrib-cssmin 2024-10-28 09:35:24 +01:00
7555604468 Miglioramenti analisi costi gramm 2024-10-25 18:49:59 +02:00
97ef16a7cd Aggiunto filtro userName in get commesse catalogo 2024-10-23 17:54:35 +02:00
25160e8b50 rimossa azienda studioml 2024-10-23 11:47:03 +02:00
ecc7a0d673 Merge remote-tracking branch 'origin/develop' into develop 2024-10-23 11:26:33 +02:00
8a2f1c0101 test compilazione automatica 2024-10-23 11:26:07 +02:00
948b1a7963 Aggiunti personalizzazione colore materica 2024-10-22 17:11:27 +02:00
a43c20ae2a Fix valore con virgola in popup ordine delivery plan 2024-10-22 17:10:11 +02:00
575f3d9b5c Corretto debounce su keyup in popup ordine delivery plan 2024-10-22 13:03:02 +02:00
70d9ad3780 Nascosti articoli senza codice in analisi budget rosso gargano 2024-10-21 15:12:06 +02:00
9ef4c4a6e3 Aggiornato logo integry e restyle menu tradizionale 2024-10-21 13:12:58 +02:00
3583744224 Aggiunto checkbox per nascondere partite con qta residua a 0 in campi di raccolta 2024-10-17 12:05:26 +02:00
e24f1f9556 Aggiunto cod_mart_stat in get-articoli budget rosso gargano 2024-10-16 16:44:59 +02:00
30dda05065 Merge branch 'master' into develop 2024-10-16 16:27:47 +02:00
e4f55e8de2 Finish FixAllegatiOrdWeb 2024-10-16 16:27:46 +02:00
59315247ea Aggiunti allegati ordini web mancanti 2024-10-16 16:27:28 +02:00
7d9361b85a Merge branch 'master' into develop 2024-10-16 15:43:25 +02:00
c2165a8f2c Finish CreaCommInPrev 2024-10-16 15:43:25 +02:00
64c95e1731 Gestita creazione commessa in modifica preventivo 2024-10-16 15:42:41 +02:00
5e54e97318 Fix filtro qta vuote in detail budget rosso gargano 2024-10-16 11:43:27 +02:00
d5ef247f9d Modifica query budget rosso gargano 2024-10-16 10:49:56 +02:00
620da7dfb7 Riattivato refresh automatico weeklyPlanner delivery plan 2024-10-15 11:48:02 +02:00
bdaf398210 Gestiti posti pallet come pedane in PopupListino delivery plan 2024-10-15 11:39:57 +02:00
9b6a98cd1a Aggiunto controllo cod mart in get_udc 2024-10-11 16:32:51 +02:00
ec46ddeb02 Aggiunto controllo segno_qta_scar e segno_val_scar nel tipo del documento ordini delivery plan 2024-10-10 17:28:27 +02:00
f7fb613765 Gestita creazione documenti per terzista smetar e fix vari 2024-10-10 15:59:06 +02:00
ccf705b566 Merge remote-tracking branch 'origin/develop' into develop 2024-10-10 10:37:03 +02:00
195d5a709c Aggiunta SUIT_PUGLIA 2024-10-10 10:36:35 +02:00
07491c6b1d Merge branch 'master' into develop 2024-10-09 13:08:45 +02:00
09eaa2ac6f Finish Hotfix-13 2024-10-09 13:08:44 +02:00
1b9c6cbfc0 [ROSSOGARGANO]
- Aggiunta gestione parametri di tipo collection in area report
- correzioni in accettzione da campo
2024-10-09 13:08:10 +02:00
c722f7f677 Fix commesse multiple e modifica destinatario esistente 2024-10-08 16:16:36 +02:00
62bac32c91 Merge branch 'master' into develop 2024-10-07 15:24:28 +02:00
c82a5a922a Finish FixDestDeliveryPlan 2024-10-07 15:24:27 +02:00
bb91c3a221 Disattivato controllo su destinatari per aziende con view righe listino in delivery plan 2024-10-07 15:23:49 +02:00
cf984c3f8a Merge branch 'master' into develop 2024-10-02 14:59:11 +02:00
801acd49f4 Finish Hotfix-13 2024-10-02 14:59:11 +02:00
fba4780d23 [MATERICA]
Aggiunti pdf documenti in esportazione zip
2024-10-02 14:58:45 +02:00
b84bdc2630 Merge branch 'master' into develop 2024-09-30 12:46:51 +02:00
8e962df792 Finish Hotfix-13 2024-09-30 12:46:50 +02:00
61c6704d27 [ROSSOGARGANO]
- corretta importazione popup cambio ordine raccolta
2024-09-30 12:46:30 +02:00
3b5faecd40 Merge branch 'master' into develop 2024-09-30 09:58:50 +02:00
19ec7e72f6 Finish Hotfix-13 2024-09-30 09:58:48 +02:00
55a765a1c0 [ROSSOGARGANO]
- eliminazione certificato non versato
- cambio ordine di raccolta su certificato
2024-09-30 09:57:49 +02:00
2377b88612 Merge branch 'master' into develop 2024-09-26 11:25:38 +02:00
1f9f83659a Finish Hotfix-14 2024-09-26 11:25:38 +02:00
e2d51c56de [BIOLEVANTE]
fix query getMaterialiDistinta
2024-09-26 11:25:18 +02:00
e513064162 Merge branch 'master' into develop
# Conflicts:
#	public_html/gest-lib/pian_acc_rossg/classes/PianAccRossg.class.php
#	public_html/gest-lib/pian_acc_rossg/ts/GenDocAccettazioneTabView.ts
2024-09-25 09:52:39 +02:00
870d2ac8e7 Finish Hotfix-13 2024-09-25 09:50:22 +02:00
4fe2f4d99f [GLOBAL]
- aggiornata gestione sessione
[ROSSOGARGANO]
- aggiunti report filtrati certificati
- aggiunta cancellazione certificati non versati
- aggiunti totali in tabella valorizzazioni
2024-09-25 09:49:38 +02:00
7db1c81915 [ROSSOGARGANO]
modifiche accettazione pomodori
2024-09-25 09:48:17 +02:00
9b2d307071 Merge remote-tracking branch 'origin/develop' into develop 2024-09-23 16:28:03 +02:00
f7227875f8 [ROSSOGARGANO]
modifiche accettazione pomodori
2024-09-23 15:44:21 +02:00
99cc225749 Gestito destinatario in contratti di vendita 2024-09-20 18:47:44 +02:00
9e9246d2e5 Merge remote-tracking branch 'origin/develop' into develop 2024-09-20 15:01:25 +02:00
9d69d7ca37 sistemata query affinchè escano le categorie nuove 2024-09-20 14:59:22 +02:00
b8d30eb4bd Merge remote-tracking branch 'origin/develop' into develop 2024-09-20 11:17:18 +02:00
a93ebf9eeb Modifica per errore al rientro da modifca scheda prodotto auricchio 2024-09-20 11:17:02 +02:00
fb2b4601c5 Fix invio null in PriceListUpdate, fix calcolo delta kpi e rimoss localpvm 2024-09-20 10:13:46 +02:00
84919d3979 Merge branch 'master' into develop 2024-09-20 09:48:23 +02:00
0a6b5bf696 Finish Hotfix-13 2024-09-20 09:48:21 +02:00
1c9dfd87c5 [Rossogargano]
corretta importazione file js
2024-09-20 09:47:53 +02:00
c8ce447c42 Merge branch 'master' into develop 2024-09-19 19:00:11 +02:00
159165bd6b Finish Hotfix-13 2024-09-19 19:00:11 +02:00
b8d5040fd3 [ROSSOGARGANO]
corrette query
aggiunta modifica indice variazione in valorizzazione certificati
2024-09-19 18:59:48 +02:00
524cd55999 Fix ordinamento per qta in tabella ordini campi di raccolta 2024-09-18 18:16:28 +02:00
9c26cdd192 Merge branch 'master' into develop 2024-09-18 16:42:26 +02:00
c096efd925 Finish Hotfix-13 2024-09-18 16:42:24 +02:00
f04483f41a [ROSSOGARGANO]
corretta query colli da bollettare
2024-09-18 16:41:23 +02:00
8c7609fd40 Resa session private in BaseModule 2024-09-18 13:12:14 +02:00
78eb6173f9 [ROSSOGARGANO]
corretta importazione certificati da sinfo1
corretta query certificati da bollettare
2024-09-18 12:58:28 +02:00
c57929cacd Fix datasource sbagliata in catalogo 2024-09-18 12:53:19 +02:00
3f0ea0deb3 Merge branch 'master' into develop 2024-09-18 10:08:41 +02:00
c73133f861 Finish Hotfix-13 2024-09-18 10:08:40 +02:00
d2f2e9504f Gestita setup nome report per etichetta rientro in mes, mostrate solo destinazioni attive in contatti commesse ed input lg in popup crea udc 2024-09-18 10:06:59 +02:00
3cbd2ddcdf Fix: pulsante crea udc duplicato
fix: query carico rossogargano
2024-09-18 10:06:02 +02:00
3a967678b7 Gestita setup nome report per etichetta rientro in mes, mostrate solo destinazioni attive in contatti commesse ed input lg in popup crea udc 2024-09-17 17:58:52 +02:00
9bebd8fc3b Calcolo valore merce solo per righe con id viaggio 2024-09-17 16:25:55 +02:00
2eae15801a Merge branch 'master' into develop 2024-09-17 13:05:12 +02:00
c6c4324aaf Finish Hotfix-13 2024-09-17 13:05:11 +02:00
57f6e86c36 [ROSSOGARGANO]
corretto ordinamento colli cq
modifiche valorizzazione certificati
2024-09-17 11:22:39 +02:00
a1c2e26e17 Merge branch 'master' into develop 2024-09-16 12:55:27 +02:00
76845a3cb0 Finish FixCQMesDulciar 2024-09-16 12:55:27 +02:00
2451af6c49 Fix errore apertura php senza contenuto 2024-09-16 12:54:45 +02:00
c95158e006 Merge branch 'master' into develop 2024-09-16 10:06:07 +02:00
f5e22749d9 Finish FixStampaOrdine 2024-09-16 10:06:06 +02:00
f1f35b2449 Fix check configurazione di stampa in stampa ordine MES 2024-09-16 10:05:51 +02:00
6185c9987b Fix pulsanti genera per tipi non allegabili e gestiti pulsanti genera multipli 2024-09-11 17:15:18 +02:00
cb4e7c2275 Rimosso join su jtb_dist_mate in catalogo ime te 2024-09-11 15:58:33 +02:00
ee9dc57656 Corretto deposito in stampa ordine monitoraggio linee e reso close di modalbox promise 2024-09-11 15:33:01 +02:00
477b2ed20f Merge branch 'master' into develop 2024-09-10 17:59:30 +02:00
bb89d7756a Finish FixPreventivi 2024-09-10 17:59:30 +02:00
3668f6fd07 Fix salvataggio commessa in modifica preventivo 2024-09-10 17:59:15 +02:00
9cd9186d97 Fix calcolo qtaCnf in popup rientro monitoraggio linee 2024-09-10 17:34:56 +02:00
95276e6804 Merge branch 'master' into develop 2024-09-09 13:07:08 +02:00
46bd5fa04d Finish Hotfix-13 2024-09-09 13:07:07 +02:00
5ea3a4e469 aggiunto valore default filtri in getlistzone 2024-09-09 13:06:45 +02:00
9871a6a1d7 Gestita generazione report in modal allegati e contatti commesse 2024-09-06 16:47:55 +02:00
8c6c2fdac3 [MES]
corretta visualizzazione in assenza di data fine lavorazione in storico ordini
2024-09-06 09:47:56 +02:00
c1ef084168 Merge branch 'master' into develop 2024-09-05 10:31:04 +02:00
dfd58c41a1 Finish Hotfix-13 2024-09-05 10:31:03 +02:00
e00bf8d9b2 [ROSSOGARGANO]
- Gestito campo zona raccolta in accettazione pomodori
- corretta gestione scarichi multipli su singola linea
2024-09-05 10:30:47 +02:00
4731d21765 Aggiunta qta iniz in kpi analisi budget rosso gargano 2024-09-03 17:53:33 +02:00
5e51fec5af Aggiunto tipo anag "P" in creazione ordine web catalogo ime ba 2024-09-03 17:17:03 +02:00
7e42be85bc sistemata condizione che obbliga ad avere le variazioni in data 2024-09-02 17:58:48 +02:00
ad15697e6c Merge branch 'master' into develop 2024-09-02 17:20:07 +02:00
23a1d897c9 Finish Hotfix-13 2024-09-02 17:20:06 +02:00
2a6a0bd31d aggiunto segnale raccolta manuale in lavorazioni giornaliere 2024-09-02 17:17:14 +02:00
89f38a1602 Merge branch 'master' into develop 2024-09-02 16:42:32 +02:00
21240cbf79 Finish Hotfix-13 2024-09-02 16:42:31 +02:00
d5a71d24fd [ROSSOGARGANO]
correzioni accettazione pomodori
2024-09-02 16:41:28 +02:00
4125ef7eef Refactor TabImpl a TabView 2024-09-02 15:52:20 +02:00
93124866fa Rimosso systemjs 2024-08-30 12:10:44 +02:00
03b60fc2de Aggiunta esportazione in excel su analisi budget Agricoper 2024-08-30 09:51:59 +02:00
fe7501a206 Spostata navbar notification in notifiche 2024-08-29 16:51:30 +02:00
ac525a5476 [ROSSOGARGANO]
corretta query ordinamento lavorazioni in accettazione pomodori
2024-08-29 15:39:52 +02:00
926806629c Esclusi file ts da gest-lib in build 2024-08-29 12:12:01 +02:00
e9ee95b0fb Fix destinazione esistente in preventivi e corretta esportazione excel lavorazioni giornaliere 2024-08-29 11:57:36 +02:00
42e2fc40d6 Merge branch 'master' into develop 2024-08-28 12:13:40 +02:00
33a06ff4e0 Finish ModifAccRossG 2024-08-28 12:13:40 +02:00
bd27569959 Rinominati file tab, aggiunta stampa in excel e miglioramenti definizione context menu 2024-08-28 12:13:27 +02:00
2ce266eec5 Gestito report jasper in xlsx e fix calcolo settimana campi di raccolta 2024-08-28 12:11:10 +02:00
dc5013b513 Modificata query get-stato-versamenti e get-stato-lavorazioni 2024-08-23 18:00:12 +02:00
f3c5d62614 Aggiustamenti frasi lavorazioni giorno piano acc 2024-08-23 15:26:52 +02:00
fb79b8949d Modifiche pian acc rosso gargano, aggiunta sessione in BaseModule ed apertura ordini senza posizione in campi di raccolta 2024-08-23 13:53:01 +02:00
6b88952eba Creata nuova gestione analisi costi per gramm 2024-08-23 12:58:01 +02:00
415399745d Creata config azienda Integry 2024-08-23 11:43:57 +02:00
9df72c2cdb Gestito flagMultiValue e creazione migration al posto di sql in impostazioni 2024-08-13 13:07:10 +02:00
81ea56a895 Aggiunta ricerca e corretto salvataggio multiplo in gestione menu 2024-08-12 15:58:39 +02:00
920aea1226 Merge remote-tracking branch 'origin/develop' into develop 2024-08-11 20:46:01 +02:00
d4297b6caa [ROSSOGARGANO]
in lavorazioni del giorno ogni raggruppamento deve mostrare:
- totale camion  (di cui quanti di oggi e quanti precedenti)
- totale (kg e casse)

Nelle lavorazioni del giorno far in modo di leggere la linea dai colli così da poterli vedere a video in quella linguetta (dai colli L+ prima del versamento e dai colli L- dopo)
Nelle lavorazioni del giorno aggiungere in numero di casse come per lo scarico prodotto (se non c'è spazio si potrebbe ridurre la colonna del DDT o andare a capo nella colonna Durata)
2024-08-11 20:45:13 +02:00
0755466231 Diviso cod mart da articolo in esportazione excel mrp 2024-08-08 16:31:16 +02:00
c438efa949 Articolo a sinistra e ordinamento per articolo in magazzino_prod 2024-08-08 15:37:52 +02:00
4f5f463a9c Possibilità di salvare preventivo in allegato commessa in catalogo 2024-08-08 09:41:24 +02:00
77401c7533 Aggiunto id lotto in tab storico e pulsante cambio linea per ordini in pausa in monitoraggio ordini 2024-08-06 17:59:06 +02:00
54446a4bf5 Aggiunta scelta orientamento in configurazioni di stampa e gestito report type STAMPA_ORDINE_LAVORAZIONE 2024-08-06 12:04:53 +02:00
4b71113377 Aggiunto valore merce per giorno in delivery plan 2024-08-05 15:31:06 +02:00
2074cfaad0 [ROSSOGARGANO]
Aggiunta qta impegnata in riepilogo prodotti viaggi in delivery plan
2024-08-05 11:23:07 +02:00
96a0229a2b Merge branch 'master' into develop 2024-08-02 10:16:48 +02:00
289936a27c Finish Hotfix-13 2024-08-02 10:16:47 +02:00
d7b891e218 [IME-TE]
corretti errori in preventivi
[rossogargano]
corrette query lavorazione e scarico
2024-08-02 10:12:57 +02:00
76d71107dc Merge branch 'master' into develop 2024-08-01 13:20:06 +02:00
cdb5b37c74 Finish Hotfix-13 2024-08-01 13:20:06 +02:00
fee54f876b [ROSSOGARGANO]
- Nella linguetta Scarico Prodotto i kg non si aggiornano ma sono sempre 0
- Nelle lavorazioni del giorno far in modo di leggere la linea dai colli così da poterli vedere a video in quella linguetta (dai colli L+ prima del versamento e dai colli L- dopo)
- il filtro sul DDT non funziona
- il filtro Socio / Produttore nel popup per creare un campo di raccolta deve agire anche sul produttore (ad oggi filtra solo sul socio) e il produttore deve essere messo anche a video
2024-08-01 13:19:41 +02:00
f74de3e86c Merge branch 'master' into develop 2024-07-31 17:09:55 +02:00
f70b1a9f9e Finish Hotfix-13 2024-07-31 17:09:54 +02:00
b5f4b1c120 [ROSSOGARGANO]
correzioni entrata pomodori
2024-07-31 17:09:21 +02:00
32687bfbca Merge branch 'master' into develop 2024-07-31 10:14:17 +02:00
e9610c9c5a Finish Hotfix-13 2024-07-31 10:14:16 +02:00
301142173b [ROSSOGARGANO]
- corretta query import certificati
2024-07-31 10:13:53 +02:00
c8ffc84f5d Merge branch 'master' into develop 2024-07-30 23:48:11 +02:00
5fde937d22 Finish Hotfix-13 2024-07-30 23:48:10 +02:00
5775723662 [ROSSOGARGANO]
- gestita varieta come caratteristica del singolo carico e non del campo
- spostata generazione campi di raccolta in servizio ad hoc
[IME BA]
- gestito download allegati da MtbAartLink
2024-07-30 23:47:40 +02:00
5ddd8e1f76 Merge remote-tracking branch 'origin/develop' into develop 2024-07-25 16:40:44 +02:00
7daada0c08 PriceListUpdate: filtro su listini disattivati 2024-07-25 16:40:21 +02:00
4d59fa3998 Merge branch 'master' into develop 2024-07-25 16:36:54 +02:00
a176945d22 Finish Hotfix-13 2024-07-25 16:36:53 +02:00
f5dbb6d4ca modifiche accettazione pomodori 2024-07-25 16:36:18 +02:00
0fa3b9fa6a Miglioramento get righe ordini per lentezza da Agricoper 2024-07-25 15:09:13 +02:00
178f551df9 Aggiunta l'informativa sulla privacy in invio mail preventivi 2024-07-25 11:12:39 +02:00
f915d37745 Aggiunto checkbox per segnare un collo in quarantena 2024-07-24 15:26:16 +02:00
bc07959554 Finish Hotfix-13 2024-07-23 18:13:37 +02:00
3b63002412 Merge branch 'master' into develop 2024-07-23 18:13:37 +02:00
cbf21a8f2a [ROSSOGARGANO]
aggiunte stampe riepiloghi trasporti e CqPomodori
2024-07-23 18:13:13 +02:00
9121485fa6 Merge branch 'master' into develop 2024-07-23 17:25:20 +02:00
42b6ce6aeb Finish Hotfix-13 2024-07-23 17:25:19 +02:00
d70f91fbd7 [ROSSOGARGANO]
gestiti permessi per utente
2024-07-23 17:24:41 +02:00
1cf1e4bb57 Fix data minima viaggio rosso gargano ed aggiunti cq fermi macchine su tutti gli articoli 2024-07-23 16:24:14 +02:00
f85febb775 Merge remote-tracking branch 'origin/develop' into develop 2024-07-22 18:46:02 +02:00
39083f2e67 Aggiunta configurazione SUIT_PUFLIA 2024-07-22 18:45:34 +02:00
1d8d53ee99 Finish ModifCreateZipFromFiles 2024-07-22 10:20:44 +02:00
cfae16f285 Merge branch 'master' into develop 2024-07-22 10:20:44 +02:00
6fccc8c236 Gestita creazione zip da MtbAartLink 2024-07-22 10:20:29 +02:00
7dde9ae8d6 Merge remote-tracking branch 'origin/develop' into develop 2024-07-19 19:25:41 +02:00
ac460f83d1 [ROSSOGARGANO]
Nuova tab lavorazioni in accettazione pommorolo
2024-07-19 19:25:12 +02:00
38b768c08b Aggiunti allegati articoli in contatti_commesse 2024-07-19 19:08:16 +02:00
40e64a5bb1 Aggiunto storico variazioni data scadenza e filtro su data segnalazione e data inserimento in modellini 2024-07-18 09:51:10 +02:00
17b90fe320 Merge branch 'master' into develop 2024-07-17 16:35:13 +02:00
a41017a083 Finish Hotfix-13 2024-07-17 16:35:13 +02:00
5e503c84fa [ROSSOGARGANO]
gestione pianificate di exchange
2024-07-17 16:28:42 +02:00
ad60ec5777 Finish Carelli_InvioVariazioniPrezzi_FixCaricamento&ModificheInviaVariazioni 2024-07-17 13:09:33 +02:00
d59bba9e78 Merge branch 'develop' into feature/Carelli_InvioVariazioniPrezzi_FixCaricamento&ModificheInviaVariazioni 2024-07-17 13:09:15 +02:00
92cb627266 cambiato servizio 2024-07-17 13:08:46 +02:00
47d69461fd Merge branch 'master' into develop 2024-07-17 11:56:25 +02:00
5b34236d7e Finish Hotfix-13 2024-07-17 11:56:24 +02:00
1828102462 [ROSSOGARGANO
corretta gestione ordinamento scarichi
2024-07-17 11:55:53 +02:00
9d708e8110 Merge branch 'master' into develop 2024-07-17 10:46:43 +02:00
15c5196a79 Finish GetRiepRGExch 2024-07-17 10:46:43 +02:00
ebade4649f Lettura giacenza da rosso gargano exchange in delivery plan
(cherry picked from commit 5d91b5e337)
2024-07-17 10:42:54 +02:00
990d13f70c Merge branch 'master' into develop 2024-07-16 20:26:12 +02:00
0b0c3393d4 Finish Hotfix-13 2024-07-16 20:26:11 +02:00
ab002cf5ad [rossogargano]
aggiunto vettore e varieta in partita
2024-07-16 20:25:46 +02:00
1a30e0af78 Merge branch 'develop' into feature/Carelli_InvioVariazioniPrezzi_FixCaricamento&ModificheInviaVariazioni 2024-07-16 17:36:18 +02:00
96557376e2 - Pulizia codice
- fix minori
2024-07-16 17:34:20 +02:00
b6c40ae676 [Invio Variazioni Prezzi]
- Fix caricamento storico variazioni
- Fix apertura popup invia a selezionati
- Modifiche minori
2024-07-16 17:32:44 +02:00
80ffbc570c Unito pulsante stampa listino range pedane in listini vendita 2024-07-16 12:11:34 +02:00
5d91b5e337 Lettura giacenza da rosso gargano exchange in delivery plan 2024-07-16 10:42:50 +02:00
ff9aabd43d Merge branch 'master' into develop 2024-07-12 17:54:08 +02:00
2aa32ee93c Finish Hotfix-13 2024-07-12 17:54:07 +02:00
e745457ed3 [Rossogargano] 2024-07-12 17:53:27 +02:00
cdfe5a7276 Merge branch 'master' into develop 2024-07-12 12:49:48 +02:00
c40dd1f53a Finish Hotfix-13 2024-07-12 12:49:48 +02:00
2fbaf2b09c corretti import moduli ts 2024-07-12 12:49:23 +02:00
ebb8fc12e1 Merge branch 'master' into develop 2024-07-12 12:46:46 +02:00
00ac375b6d Finish Hotfix-13 2024-07-12 12:46:45 +02:00
ab7b63374e [ROSSOGARGANO - Accettazione pomodori]
start importazione certificati
2024-07-12 12:46:01 +02:00
0ccb207e26 Merge branch 'master' into develop 2024-07-09 12:31:11 +02:00
875b01314c Finish Hotfix-13 2024-07-09 12:31:10 +02:00
5dc69249d1 [ROSSOGARGANO - accettazione]
modifiche accettazione pomodori
2024-07-09 12:31:01 +02:00
ab29823172 Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 12:25:54 +02:00
jenkins
f5348ccd5e Merge branch 'master' into develop 2024-07-07 07:22:20 +02:00
f6fa2c69cd Gestita chiusura senza verifica ed aggiunto persona rif in sollecito 2024-07-05 16:53:51 +02:00
a624b5bc76 Aggiunta data inserimento e protocollo in popup segnalazione 2024-07-05 12:01:12 +02:00
c14f721569 Spostata commessa sopra in catalogo 2024-07-04 17:12:32 +02:00
ba813dc32e Visualizzata solo ultima settimana in delivery plan 2024-07-04 16:21:02 +02:00
4c665287a9 Merge branch 'refs/heads/master' into develop 2024-07-04 13:24:15 +02:00
24318a9183 [Gramm - MonitoraggioLinee]
- Fix saveCaratInput non funzionante
- Rimossa la chiusura del popup al saveCaratInput
2024-07-04 13:20:33 +02:00
bb887e92fd [MRP]
- Fix deposito mancante alla modifica di un ordine di lavorazione
- Fix funzioni await
- Fix salvataggio quantità aggiornata (rimesso l'update sulla ordProd)
2024-07-04 13:20:32 +02:00
9fe69e5811 Cambiata configurazione risto cash 2024-07-04 09:28:05 +02:00
aca0d580e1 Merge branch 'master' into develop 2024-07-03 18:11:47 +02:00
d232cb1114 Finish ModifPianProd 2024-07-03 18:11:46 +02:00
a95792841b Aggiunta data esportazione in DtbOrdrPianProd e gestita esportazione per linea 2024-07-03 18:11:25 +02:00
4901c4a25a Aggiunti colori custom per materica e considerato giorno inizio settimana in campi di raccolta 2024-07-03 17:40:58 +02:00
cc00538d30 Finish Integry_Impostazioni_FixCancellaValore 2024-07-01 15:58:32 +02:00
23fd661d11 Merge tag 'Integry_Impostazioni_FixCancellaValore' into develop
Finish Integry_Impostazioni_FixCancellaValore
2024-07-01 15:58:32 +02:00
6f1ce2d29c [Impostazioni]
- Fix null value alla cancellazione del valore
2024-07-01 15:57:21 +02:00
19f2a0518e Merge branch 'master' into develop 2024-07-01 12:48:09 +02:00
64eaf36e11 Finish EsportazFoodProcess 2024-07-01 12:48:08 +02:00
de3036f205 Gestita esportazione FoodProcess in pianificazione produzione orto e creazione attività processo trattativa 2024-07-01 12:47:53 +02:00
56a25c9669 [Gramm - MonitoraggioLinee]
- Fix saveCaratInput non funzionante
- Rimossa la chiusura del popup al saveCaratInput
2024-06-28 17:33:20 +02:00
386a4cafd0 [MRP]
- Fix deposito mancante alla modifica di un ordine di lavorazione
- Fix funzioni await
- Fix salvataggio quantità aggiornata (rimesso l'update sulla ordProd)
2024-06-28 17:02:42 +02:00
034a2dc235 Merge branch 'master' into develop 2024-06-26 11:56:00 +02:00
cc8a5b900c Finish Hotfix-13 2024-06-26 11:55:59 +02:00
e976572127 corrette import ts 2024-06-26 11:52:27 +02:00
5124a9f05c Merge branch 'master' into develop 2024-06-26 10:56:54 +02:00
36db1e78cd Finish Hotfix-13 2024-06-26 10:56:54 +02:00
ceee8bba8d [ROSSOGARGANO - Accettazione raccolta]
gestione scarichi
2024-06-26 10:56:29 +02:00
4547c81028 Aggiunto comando nuovo modulo 2024-06-25 17:33:36 +02:00
17979e0a15 Merge branch 'master' into develop 2024-06-25 10:42:59 +02:00
0954c8c034 Finish Hotfix-13 2024-06-25 10:42:58 +02:00
c73070ba2b corretto errore sodium in pagina grafici macchinari 2024-06-25 10:42:44 +02:00
8abb489c1e Merge tag 'Gramm_MonitoraggioLinee_FixDatePickerCQ' into develop
Finish Gramm_MonitoraggioLinee_FixDatePickerCQ
2024-06-24 16:03:53 +02:00
66c33d00ec Finish Gramm_MonitoraggioLinee_FixDatePickerCQ 2024-06-24 16:03:52 +02:00
4c7fade63b [Monitoraggio Linee]
- Fix datepicker controlli qualità
2024-06-24 16:03:05 +02:00
9b914d42e1 Merge branch 'master' into develop 2024-06-24 13:34:01 +02:00
884cd517d3 Finish Hotfix-13 2024-06-24 13:34:01 +02:00
340c045bdd Correzioni grafiche su stato macchina nel caso di macchine con Velocità in percentuale 2024-06-24 13:33:42 +02:00
ecfc1e6b99 Merge tag 'Biolevante_MRP_FixFiltroArticolo' into develop
Finish Biolevante_MRP_FixFiltroArticolo
2024-06-24 12:59:20 +02:00
37d2ed41b9 Finish Biolevante_MRP_FixFiltroArticolo 2024-06-24 12:59:19 +02:00
ea382e25bf [MRP]
- Fix filtro articolo
2024-06-24 12:51:58 +02:00
daef9e0d2b Finish Gramm_MagazzinoProd_AzzeraRimacinaPercentuale 2024-06-21 18:06:14 +02:00
733c185026 [Conto Economico Prodotto]
- modifiche minori e pulizia codice
2024-06-21 18:05:42 +02:00
3b585bae9c [Magazzino Prod]
- Popup Azzera Selezionati, possibilità di azzerare con le percentuali la rimacina
2024-06-21 10:06:33 +02:00
82d904ec17 Merge tag 'Integry_Impostazioni_FixPopupTabella' into develop
Finish Integry_Impostazioni_FixPopupTabella
2024-06-19 10:38:30 +02:00
2770279149 Finish Integry_Impostazioni_FixPopupTabella 2024-06-19 10:38:29 +02:00
15cdae061f [Impostazioni]
- Fix popup per tabelle (ingranaggi)
2024-06-19 10:31:08 +02:00
49d910f2cc Merge tag 'Gramm_MonitoraggioLineeV2_FixPulsante' into develop
Finish Gramm_MonitoraggioLineeV2_FixPulsante
2024-06-17 17:35:47 +02:00
80460b2037 Finish Gramm_MonitoraggioLineeV2_FixPulsante 2024-06-17 17:35:46 +02:00
9a04f4b5ba [Monitoraggio Linee]
- Fix pulsante nuovo
2024-06-17 17:34:55 +02:00
790eaca86e Impostata l'operazione dell'ord prod in update a no_op in mrp 2024-06-17 16:37:56 +02:00
7f5a5ca3e8 Gestita esportazione excel con u.m. configurabili 2024-06-17 16:23:56 +02:00
df899f8620 Merge tag 'Carelli_Accettazione_FixData' into develop
Finish Carelli_Accettazione_FixData
2024-06-17 12:20:40 +02:00
240b068e58 Finish Carelli_Accettazione_FixData 2024-06-17 12:20:39 +02:00
8ae480318b [Accettazione]
- Fix data Doc
- Pulizia codice e modifiche minori
2024-06-17 12:20:15 +02:00
aa0492df2a Merge tag 'Biolevante_ListiniEOfferte_FixGrafici' into develop
Finish Biolevante_ListiniEOfferte_FixGrafici
2024-06-17 11:59:00 +02:00
eb2e11725e Finish Biolevante_ListiniEOfferte_FixGrafici 2024-06-17 11:58:59 +02:00
5345dd2ca3 [Conto Economico Prodotto]
- Fix width datePicker
- Rimosso picker data Validità
2024-06-17 11:57:31 +02:00
e3365fe7bf Finish Gramm_MonitoraggioLinee_AbilitaCreaOrdine 2024-06-14 18:33:37 +02:00
8d0b74b7f1 Merge branch 'develop' into feature/Gramm_MonitoraggioLinee_AbilitaCreaOrdine 2024-06-14 18:33:19 +02:00
296c8f69b9 [Listini Vendita]
- Fix freccia indietro
2024-06-14 18:32:56 +02:00
5bd902b42d [Monitoraggio Linee - Gramm]
- Fix controlli qualità in storico ordini
- pulizia codice
2024-06-14 18:32:02 +02:00
615bb23c88 Merge branch 'develop' into feature/Gramm_MonitoraggioLinee_AbilitaCreaOrdine 2024-06-14 18:31:09 +02:00
a0fbda4a09 [Listini e Offerte]
•	Nella data proporre la data dell’ultima variazione fatta sul listino <= oggi e cambiare la label in “Listino del:”

•	Il tasto modifica deve aprire la variazione del giorno selezionato e non proporre la nuova data di inserimento, come fa ora cliccando sulla data, eliminare la funzionalità di modifica dal click sulla data.

•	Aggiungere un picker che permetta di selezionare dal calendario la data per le nuove variazioni
•	Se la data selezionata è diversa dalla data presente sul listino visualizzare il tasto “Nuovo Prezzo”. Questo tasto funzionerà come funziona ora “modifica” l’unica differenza e che non dovrà proporre nella data di validità la data di oggi ma la data selezionata.
•	Se la data del picker coincide con la data validità pulsante modifica se sono diversi pulsante nuovo
•	Pulsante elimina nell’avanti elenco (sempre presente)
•	Esempio testo elimina “L'articolo 202149 verrà rimosso dal listino 07350 a partire dal 01/02/2024, continuare?”
•	Listino del diventa “data inizio validita”
•	In modifica bloccare la data validita
•	All’apertura del listino mi deve consigliare la max(data_listino) <= oggi e non le successive
2024-06-14 18:29:40 +02:00
9e9ed5e0af Migliorata lettura sidebar ordini in campi di raccolta 2024-06-13 12:55:35 +02:00
16bfd252f0 Corretto nome logo per os case sensitive 2024-06-13 11:01:15 +02:00
1779b3bd2b Merge branch 'develop' into feature/Gramm_MonitoraggioLinee_AbilitaCreaOrdine 2024-06-13 10:42:25 +02:00
b128af90af Gestita seconda um in esportazione excel mrp v2 2024-06-12 18:59:50 +02:00
d85910d495 Merge branch 'master' into develop 2024-06-12 12:08:08 +02:00
ca96ca6027 Finish ModifAnalisiBudgetRG 2024-06-12 12:08:07 +02:00
8d2e4d5ae1 Ricreazione tabella in analisi budget rosso gargano
(cherry picked from commit 4864d1d664)
2024-06-12 12:07:56 +02:00
4864d1d664 Ricreazione tabella in analisi budget rosso gargano 2024-06-11 15:27:31 +02:00
003ebedb12 Finish MigliorieListiniVend 2024-06-11 09:54:15 +02:00
064ebcfb56 Merge branch 'master' into develop 2024-06-11 09:54:15 +02:00
a999a3b3a7 Aggiunto componente per cambio versione rapido, migliorato stato editMode e personalizzato avviso cancellazione 2024-06-11 09:54:00 +02:00
553199732a [Monitoraggio Linee]
- Rinominato ABILITA_DUPLICA_ORDINE in ABILITA_CREA_DUPLICA_ORDINE
- Disabilitato il pulsante nuovo ordine in base alla setup
2024-06-10 13:08:17 +02:00
406afafcaf Gestita creazione della commessa direttamente dal preventivo in catalogo 2024-06-10 11:52:11 +02:00
e092b5196f Escape su title note_viag e fix qtaBdgVend 2024-06-07 18:56:57 +02:00
0bf1f24633 Finish RossoGargano_ListiniVendita_StampaListinoRangePedane 2024-06-07 17:34:04 +02:00
bf7be6f85c Merge branch 'develop' into feature/RossoGargano_ListiniVendita_StampaListinoRangePedane 2024-06-07 17:01:17 +02:00
595b82cbc3 Finish Carelli_ChiusuraTagliPrezzo_Modifiche 2024-06-07 16:58:42 +02:00
9d538115a7 Merge branch 'develop' into feature/Carelli_ChiusuraTagliPrezzo_Modifiche 2024-06-07 16:58:30 +02:00
c5051b5f34 Finish Gramm_MonitoraggioLineeV2_ControlliQualitàSLFixSalvataggioData 2024-06-07 16:57:36 +02:00
540c26e566 [Monitoraggio Linee - Gramm]
- Aggiunto campo Operatore
- Fix dimensioni col-md
2024-06-07 16:50:58 +02:00
716f2659e9 Merge branch 'develop' into feature/Gramm_MonitoraggioLineeV2_ControlliQualitàSLFixSalvataggioData 2024-06-07 16:47:25 +02:00
cb89e19ca9 [Report Type]
- Creazione ReportType 'STAMPA_LISTINI_VENDITA_RANGE_PEDANE'

[Report Area]
- Fix Popup nuova configurazione di stampa

[Conto Economico Prodotto]
- getPdfListino gestione flag_range

[Listini Vendita]
- Aggiunto pulsante 'Stampa Listino Range Pedane'
2024-06-07 16:34:16 +02:00
ba18d946ce [Report Area]
- Pulizia codice
2024-06-06 13:17:20 +02:00
29c3c8d657 [Chiusura Tagli Prezzo]
- inserire un contatore delle righe estratte
- valorizzare data validità  = oggi
- nella query prendere le promozioni che terminano il giorno seguente alla data validità
2024-06-06 13:14:42 +02:00
3689a82212 [Monitoraggio Linee]
- Aggiunto pulsante per il salvataggio invece di triggerare il change
2024-06-05 13:33:19 +02:00
d9fe5a79ce [GRAMM - Stato macchine]
corretta visualizzazione contatori double
2024-06-05 12:20:50 +02:00
7b99e03c4e Merge branch 'master' into develop 2024-06-05 11:52:57 +02:00
abff55a767 Finish Hotfix-13 2024-06-05 11:52:56 +02:00
5c3dfed8a9 [ROSSOGARGANO - ACCETTAZIONI]
corretto comando stampa
2024-06-05 11:52:23 +02:00
3951bb30fb Merge branch 'master' into develop 2024-06-05 11:29:12 +02:00
ec682dd321 Finish Hotfix-13 2024-06-05 11:29:11 +02:00
7060739b09 [ROSSOGARGANO - ACCETTAZIONI]
MES
	dimensioni etichtta: 70v X 100h mm
Nuovo carico
-	scambiare scarto da pz a %
- 	controllare calcolo kg netti
Trasporti del giorno
-	!agiungere targa mezzo
-	evidenziare certificati che  hanno ricevuto la tara come "completata"
bollettazione
	campi scarto e variazione prezzo
	salvataggio massivo
	stampa certificati
	certificati non devono sparire per permettere la stampa
	numero di stampe per certificati
2024-06-05 11:25:33 +02:00
28a5c73926 Cancellata gestione contatti_commesse_integry 2024-06-04 12:13:51 +02:00
3b95014998 Aggiunta modalita tabella in ModalAllegati e 2024-06-03 18:35:12 +02:00
ddb1f84ebf Finish ImeBa_ViaggiOrdini_NascondiViaggio 2024-06-03 15:05:49 +02:00
d50da2e9a9 [Consegne]
- Adesso vengono visualizzati solo i viaggi che hanno vtb_viaggi.confermato = 0
- Aggiunto pulsante "Nascondi Viaggio" che imposta il confermato a 1
- Modifiche minori e pulizia codice
2024-06-03 14:59:31 +02:00
efc7cb1bbc Fix lettura value type se numero con virgola 2024-05-31 19:03:20 +02:00
3af0699d24 [Rilevazioni Steup]
- Fix Activity Id
2024-05-31 17:25:59 +02:00
b57b8c026b Finish Carelli_RilevazioniSteup_StampaIspezione 2024-05-31 17:06:09 +02:00
cd9c236e2a Merge branch 'develop' into feature/Carelli_RilevazioniSteup_StampaIspezione 2024-05-31 16:24:09 +02:00
3f8a43fd74 [Impostazioni]
- Adesso se la query va in errore viene comunque aperto l'edit dell'impostazione, in modo da poter correggere la query
- Se il menù a tendina rimane in caricamento, aprire la console, probabilmente la query sarà andata in errore
2024-05-31 16:23:31 +02:00
96b7ed2cc0 Finish Carelli_Accettazione_FixLoopJS 2024-05-31 15:45:08 +02:00
50decf8699 [Rilevazioni Steup]
- Aggiunto pulsante per stampare l'ispezione
- Modifiche minori e pulizia codice
2024-05-31 15:42:14 +02:00
f6e83b4741 [Accettazione]
- Fix loop quando la qta chk non era multipla della qta per conf
- Fix aggiunta di articolo terzo
2024-05-31 15:14:54 +02:00
f86609de61 [ROSSOGARGANO - piano accettazione]
correzioni modulo accettazione da raccolta
2024-05-30 15:51:34 +02:00
386ed3b58a Merge remote-tracking branch 'origin/develop' into develop 2024-05-30 15:22:33 +02:00
e9db25b82b [ROSSOGARGANO - piano accettazione]
correzioni modulo accettazione da raccolta
2024-05-30 15:21:58 +02:00
d968abf895 Finish Integry_Biolevante_GiacenzeArtDaProdurre&FixSetup 2024-05-30 13:22:44 +02:00
04eb0d8a88 Merge branch 'develop' into feature/Integry_Biolevante_GiacenzeArtDaProdurre&FixSetup 2024-05-30 13:22:37 +02:00
4c9a071d58 Finish Follies_CatalogoModa_UpdateGrafico 2024-05-30 13:19:26 +02:00
124e54ad94 Merge branch 'develop' into feature/Follies_CatalogoModa_UpdateGrafico 2024-05-30 13:18:24 +02:00
48b868dc7c [Report]
- Adesso è possibile aprire la modifica del report anche se il JRXML è corrotto, per avere la possibilita di sostituirlo

[IME BA]

- Aggiornamento logo
2024-05-30 13:17:37 +02:00
a00bcd14cf [Catalogo Moda]
- Come da richiesta modificato il layout grafico per vedere le immagini più grandi
2024-05-30 13:16:08 +02:00
6aead1f6c3 [Monitoraggio Linee]
- Aggiunte colonne "Giacenza", "Arrivi", "Impegni" e "Disponibilita" nel popup "Seleziona l'articolo da produrre"
- Fix setup "ABILITA_MODIFICA_ARTICOLI" e "ABILITA_DUPLICA_ORDINE", adesso prende il valore di default della setup se non è specificato per utente
2024-05-30 13:10:46 +02:00
0bf827ccc1 Merge remote-tracking branch 'origin/develop' into develop 2024-05-29 17:54:09 +02:00
6d316a1e3a [ROSSOGARGANO - piano accettazione]
correzioni modulo accettazione da raccolta
2024-05-29 17:53:45 +02:00
b5ddd41555 Fix formato data viaggi ordini 2024-05-29 17:25:26 +02:00
dd644b8027 Merge remote-tracking branch 'origin/develop' into develop 2024-05-29 12:32:47 +02:00
4a24561da4 [ROSSOGARGANO - piano accettazione]
gestione calibri carciofi e etichette
2024-05-29 12:31:42 +02:00
86fe40ea20 Configurazione Farmmes SUIT_PUGLIA 2024-05-29 11:36:06 +02:00
0b5fc4d209 Merge remote-tracking branch 'origin/develop' into develop 2024-05-27 13:11:42 +02:00
b48b82b773 Aggiunto logo ime_ba 2024-05-27 13:10:19 +02:00
2cb21458f8 Merge remote-tracking branch 'origin/develop' into develop 2024-05-27 12:12:33 +02:00
a9aca411bb [ROSSOGARGANO]
Aggiunto suggerimento automatico lotto in creazione ordine di lavoro da modal mrp
2024-05-27 12:12:06 +02:00
65aec5ae36 Merge remote-tracking branch 'origin/develop' into develop 2024-05-24 17:35:54 +02:00
32e208ec69 [MRP]
- Fix getMateriali con i depositi filtrati nell'avanti elenco

[Classes]

- Fix Sodium

[Conto Economico]

- Trasformata chiamata GET in POST per fix ad errore
2024-05-24 17:35:23 +02:00
e5ec708911 Corretto confronto posizione come stringa in popup riep giorno 2024-05-23 16:13:10 +02:00
877556e43c Merge branch 'master' into develop 2024-05-21 12:12:43 +02:00
33ba009024 Finish Hotfix-13 2024-05-21 12:12:42 +02:00
c0ceea3ed4 corretta gestione classe DateTime nelle query
corretta gestione tipo int
2024-05-21 12:08:51 +02:00
bf06ad550e Merge branch 'master' into develop 2024-05-20 16:47:19 +02:00
4900874b25 Finish ModifPopupRiep 2024-05-20 16:47:18 +02:00
dad50ec988 Gestita posizione e stato confermato dei viaggi in popup riep giorno 2024-05-20 16:47:03 +02:00
2a0ca125af Finish Carelli_ProduttivitaAValore_PuliziaCodice 2024-05-20 15:01:19 +02:00
eefbea1490 Merge branch 'develop' into feature/Carelli_ProduttivitaAValore_PuliziaCodice 2024-05-20 15:01:14 +02:00
adfe8d4fc2 Merge tag 'Gramm_Sfrido_FiltroDateBetween' into develop
Finish Gramm_Sfrido_FiltroDateBetween
2024-05-20 15:00:20 +02:00
fdd3cdb580 Finish Gramm_Sfrido_FiltroDateBetween 2024-05-20 15:00:19 +02:00
38e8b611bd [Monitoraggio Linee]
- Adesso gli ordini lavorazione dello sfrido vengono filtrati per range di date (come l'avanti elenco)
2024-05-20 14:59:49 +02:00
5c35150b3f [Impostazioni]
- Fix filtro select2
- Reso getListDefaultValues globale
2024-05-20 13:16:18 +02:00
c20e86b167 [Produttivita a Valore]
- Pulizia codice
2024-05-20 13:14:10 +02:00
75c0b9f3f2 Gestite flag spese per articolo in listini vendita e controllo su part iva in popup ordine 2024-05-20 09:57:04 +02:00
748ed86587 Correzione check stringa unix valido 2024-05-17 12:52:27 +02:00
ae0795295c Fix chiamata setdatetime con stringa di un numero in fromArray 2024-05-17 12:46:19 +02:00
fa388ef7d2 Gestita stampa di più copie nei report e modifiche varie 2024-05-17 10:39:29 +02:00
7ba6a2b3ab [Inventario]
- Aggiunto userName sotto deposito
2024-05-16 12:52:39 +02:00
62e4e49c0a Aggiunto filtro data mancante in fabb_olio_linea 2024-05-15 19:12:29 +02:00
a3a40eb32e [Monitoraggio Linee]
- Fix filtro ordiniLavorazione, adesso controllafiltra per gli ordini che sono attualmente sulla linea (dtb_ord_steps)
2024-05-15 15:50:58 +02:00
8758ec64fa Rimosso controllo su data_iniz in get lotti monitoraggio ordini 2024-05-15 15:38:04 +02:00
169d620330 Cambio ordine per data lotto in monitoraggio ordini 2024-05-15 15:26:17 +02:00
4a53dcd548 Merge remote-tracking branch 'origin/develop' into develop 2024-05-15 12:38:49 +02:00
01853aa727 Fix proxy errato in docker 2024-05-15 12:35:54 +02:00
dfa842748d [Monitoraggio Linee]
- Fix serie collo
2024-05-15 12:33:06 +02:00
24bb01c504 Finish Dulciar_MonitoraggioLineeV2_Tooltip+ControlliQualita 2024-05-15 10:45:10 +02:00
0cfe65eb4b [Monitoraggio Linee]
- Introdotto tooltip sulle linee
- Fix controlli qualità Dulciar
- Fix serie Sfrido
2024-05-15 10:44:22 +02:00
453fc9dcba Fix input vuoto 2024-05-14 15:45:55 +02:00
216df8d4bc Corretta session_start in emailcheck, modificato popup dettagli fabbisogni olio ed aggiunto avviso in caso di errata lettura input crittografati 2024-05-14 15:24:38 +02:00
ed1f732c6f Merge remote-tracking branch 'origin/develop' into develop 2024-05-14 10:38:55 +02:00
fbf00a9556 [CARELLI - STEUP]
segnalata recidiva reparto
gestiti campi priorita e persona riferimento
2024-05-14 10:38:34 +02:00
5c535c1bb5 Merge branch 'master' into develop 2024-05-14 09:58:26 +02:00
f704db460b Finish FixSodium 2024-05-14 09:58:25 +02:00
492650895f Rimossa forzatura encrypt in execute ajax ed aggiunto avviso se sodium non presente 2024-05-14 09:58:10 +02:00
1a79f9dcf5 Merge branch 'master' into develop 2024-05-13 18:32:22 +02:00
7d8ebf1764 Finish FixRientroMES 2024-05-13 18:32:22 +02:00
dc7d4aacd8 Corretto ottenimento data collo in creazione rientro 2024-05-13 18:32:07 +02:00
8676e41f88 Merge branch 'master' into develop 2024-05-13 17:52:26 +02:00
71093d7d16 Finish FixMES 2024-05-13 17:52:25 +02:00
2bb8ac0c50 Correzioni monitoraggio ordini e mes 2024-05-13 17:51:37 +02:00
bec369714a [Monitoraggio Linee]
- Fix messaggio caricamento sfrido
2024-05-13 17:30:31 +02:00
4b286c30dc Finish Gramm_GiacenzaUL_ColonnaAnnotazioni 2024-05-13 16:06:29 +02:00
c2ce76b7ce [Controllo Giacenze]
- Aggiunta colonna Annotazioni

[Monitoraggio Linee]

- Rimossa partita mag fissa
2024-05-13 16:05:17 +02:00
a28711beb8 Merge branch 'master' into develop 2024-05-13 11:12:48 +02:00
fc685af026 Finish Hotfix-13 2024-05-13 11:12:47 +02:00
42eecd60a1 [MONITORAGGIO_LINEE]
corretta condizione per avvio più ordini su linea contemporaneamente
2024-05-13 11:12:08 +02:00
d0b6d6fa3b Finish Gramm_MonitoraggioLineeV2_Sfrido 2024-05-10 18:13:31 +02:00
be648fa00b [Monitoraggio Linee - Controlli Qualità]
- DatePicker editabile a mano

[Monitoraggio Linee]

- Fix suggestDataScadPartitaMag
- Ultime modifiche Sfrido + Stampa Sfrido
- Pulizia codice + modifiche minori

[Report Area]

- Pulizia codice
2024-05-10 18:13:19 +02:00
bc987af9df Merge branch 'develop' into feature/Gramm_MonitoraggioLineeV2_Sfrido 2024-05-10 18:02:52 +02:00
74e18f49cb Finish RossoGargano_MonitoraggioLinee_ControlliQualitaStandard 2024-05-10 18:02:29 +02:00
68ed50e3ec [Monitoraggio Linee]
- Controllo Qualita Standardizzato
2024-05-10 18:00:48 +02:00
89fd42f310 Merge branch 'develop' into feature/Gramm_MonitoraggioLineeV2_Sfrido 2024-05-09 17:36:09 +02:00
955ef2c6be Aggiunto dettaglio articoli in fabb_olio_linea 2024-05-09 17:14:03 +02:00
4751d5d6cf Merge branch 'develop' into feature/Gramm_MonitoraggioLineeV2_Sfrido 2024-05-08 12:30:30 +02:00
087bcd853f Fix trim se cod_tcol_UL null in delivery plan 2024-05-08 10:44:29 +02:00
8a6202414d Finish FabbOlioLinea 2024-05-08 09:35:47 +02:00
15a9db2f48 Nuova gestione Fabbisogno olio per linea 2024-05-08 09:34:50 +02:00
81286e348d Corretta creazione collo rientro se partita non presente 2024-05-07 18:08:52 +02:00
b1308fdb14 Aggiunto avviso in caso di spostamento di un ordine con viaggio in delivery plan 2024-05-07 17:41:53 +02:00
a67477776f Reso viaggio modificabile in PopupRiepGiorno rosso gargano 2024-05-07 16:23:40 +02:00
f54fc328ee Merge branch 'develop' into feature/Gramm_MonitoraggioLineeV2_Sfrido 2024-05-07 12:06:52 +02:00
a0f9056215 Merge tag 'Licor_ConfigAzienda_Fix' into develop
Finish Licor_ConfigAzienda_Fix
2024-05-07 10:50:10 +02:00
9f602e2b1d Finish Licor_ConfigAzienda_Fix 2024-05-07 10:50:09 +02:00
dd2213f5fb [Config Aziende]
- Fix ip nuovo server Licor
2024-05-07 10:45:05 +02:00
636c0cf898 Finish Integry_MRP&PianoArrivi_Fixes&Ottimizzazioni 2024-05-07 10:43:41 +02:00
e31ffeecf3 [MRP]
- Ottimizzazione e pulizia codice
- Aggiunto titolo "Fabbisogno Giornaliero"
- Fix grafico fa-circle in dettaglio articolo (Adesso viene mostrata correttamente la lettera all'interno del pallino)

[Piano Arrivi]

- Fix tabella xdebug dopo la selezione di un articolo da listino
- Aggiunto titolo a pulsante aggiungi pedana
- Pulizia codice
2024-05-07 10:42:38 +02:00
7f1518d5f7 Aggiunto header app token e rimosso file non utilizzato 2024-05-06 19:09:00 +02:00
93bd5047a0 Corretto percorso sodium 2024-05-06 15:45:33 +02:00
1241d1316d Attivazione encryptData se sodium è attivo 2024-05-06 15:27:19 +02:00
a3cfe01bc2 Implementazione sodium in invio dati ajax, migliorie generic in BasePopup e Ajax, definito metodo data("command") in jquery 2024-05-06 12:51:24 +02:00
e3b4edf1e2 Merge branch 'master' into develop 2024-05-06 09:57:33 +02:00
bb5bdd3192 Finish Hotfix-13 2024-05-06 09:57:32 +02:00
002a55019f aggiunte estensioni .js in importazioni moduli ts 2024-05-06 09:57:13 +02:00
0f8c05225d Merge remote-tracking branch 'origin/develop' into develop 2024-05-03 19:37:04 +02:00
10406d94e6 [ROSSOGARGANO]
Correzioni generazione documenti di accettazione carico e scarico materia prima
2024-05-03 19:36:32 +02:00
a51c5a9043 Merge remote-tracking branch 'origin/develop' into develop 2024-05-03 15:39:52 +02:00
831883a175 [Controllo Giacenze]
- Installato nuovamente Sass
- Fix dimensione box elementi per pagina nelle kendogrid (adesso si vedono quattro cifre)
- Ridotto da 5000 a 4000 il max di elementi per pagina
2024-05-03 15:33:02 +02:00
0b40763b3f [ROSSOGARGANO]
Servizio accettazione materia prima ortofrutta
2024-05-02 20:02:10 +02:00
903cf882b2 Info ordine in riga e non testata collo 2024-04-24 17:26:27 +02:00
7c9d13d34d [Monitoraggio Linee]
- Prima parte della gestione dei colli di Sfrido
2024-04-24 17:21:22 +02:00
82743c84ed Passata data validità in riassortimenti in chiusura tagli prezzo 2024-04-24 09:47:37 +02:00
f7b3f00bee Finish Carelli_DocInterni_EliminaRigaCollo 2024-04-22 13:02:52 +02:00
6265f82efe [Doc Interni]
- Aggiunta la possibilità di eliminare la riga del collo
2024-04-22 13:02:26 +02:00
9304fd6832 Finish Carelli_Inventari_FixOrdinamentoERimozionePagination 2024-04-19 16:04:53 +02:00
87b9e66ed0 [Inventario]
- Rimozione pagination
2024-04-19 16:04:28 +02:00
ab8c10b10d [Ordini A Riass Clie]
- Fix condizione di where in list-articoli-preordinati
- $maxCountResoBuco adesso viene nuovamente valorizzata in checkResiAsso (Da controllare perché fosse stato messo a null, dato che così non sarebbe mai entrato in alcuni controlli)
- Pulizia codice e modifiche minori

[Ordini Web Plants]

- Modifiche minori
2024-04-19 12:23:52 +02:00
dea17977d1 Merge branch 'master' into develop 2024-04-19 11:13:56 +02:00
f6db047e67 Finish Hotfix-13 2024-04-19 11:13:56 +02:00
b511ff6374 [DOLCE BONTA]
fix profilo pvm
2024-04-19 11:13:34 +02:00
8700271d1c Merge branch 'master' into develop 2024-04-19 11:04:33 +02:00
325a39101a Finish Hotfix-13 2024-04-19 11:04:33 +02:00
b4841de01c [DOLCE BONTA]
fix profilo pvm
2024-04-19 11:04:04 +02:00
26592f710e [DOLCE BONTA]
fix profilo pvm
2024-04-19 11:03:37 +02:00
1ed11fac86 Merge branch 'master' into develop 2024-04-19 10:12:24 +02:00
14292c5dd7 Finish Hotfix-13 2024-04-19 10:12:24 +02:00
4c8b42737f [DOLCE BONTA]
fix profilo pvm
2024-04-19 10:11:59 +02:00
eed7ee22a0 Merge branch 'master' into develop 2024-04-17 12:46:09 +02:00
e073ca9494 Finish FixGrunt 2024-04-17 12:46:08 +02:00
7771cd7c85 Aggiunti file nascosti in creazione zip _base 2024-04-17 12:45:36 +02:00
0accaf6b48 Merge tag 'Hotfix-12' into develop
Finish Hotfix-12
2024-04-17 12:33:42 +02:00
2a7dcc0453 Finish Hotfix-12 2024-04-17 12:33:42 +02:00
f88f27e392 [Gruntfile]
- abilitata la lettura dei file nascosti (come chiesto da Anthony)
2024-04-17 12:33:04 +02:00
a9afb427f5 Modificato profile MAGGIOSRL 2024-04-16 11:03:58 +02:00
fcb46f6f69 Merge tag 'Hotfix-11' into develop
Finish Hotfix-11
2024-04-15 12:29:00 +02:00
f959d3098e Finish Hotfix-11 2024-04-15 12:28:59 +02:00
bb84844d3b [MRP V2]
- Cambiato "consumi medi" con "media mobile"

[Monitoraggio Linee]

- Fix setup FlagCheckOrdine
2024-04-15 12:28:08 +02:00
09830da2f5 Merge tag 'Gramm_MagazzinoProd_FixDataColloRettifica' into develop
Finish Gramm_MagazzinoProd_FixDataColloRettifica
2024-04-15 12:26:22 +02:00
d3fc893c15 Finish Gramm_MagazzinoProd_FixDataColloRettifica 2024-04-15 12:26:21 +02:00
1af4cd013b [Magazzino Prod]
- Fix createFromFormat dataCollo
2024-04-15 12:25:46 +02:00
9c6ff3985b Merge branch 'master' into develop 2024-04-15 09:47:46 +02:00
4b15884b7e Finish Hotfix-11 2024-04-15 09:47:46 +02:00
3616c2ddc9 [FOLLIE - riassortimento]
Errore nel download degli articoli da rendere
2024-04-15 09:45:36 +02:00
69409f7952 Merge branch 'master' into develop 2024-04-11 17:32:41 +02:00
0bd6a5a01d Finish Hotfix-11 2024-04-11 17:32:40 +02:00
71f136c636 correzione query 2024-04-11 17:32:24 +02:00
55026372b3 [StbActivityFile]
- Fix rearrangeFilesArray
2024-04-10 15:44:57 +02:00
1ca3722d5b [Modal Mrp]
- PopupOrdProd fix chiamate setListMateriali multiple
2024-04-10 15:36:49 +02:00
0a9277d21b [IMSApi > SqlToExcel]
- Pulizia codice
2024-04-10 15:35:35 +02:00
890b307921 [Utility > File]
- Fix rearrangeFilesArray
2024-04-10 15:33:42 +02:00
25ddee8bcb Merge remote-tracking branch 'origin/develop' into develop 2024-04-10 15:32:43 +02:00
c746e48501 [Impostazioni]
- Fix array_get
- Pulizia codice
2024-04-10 15:32:19 +02:00
c83149b8f0 [Monitoraggio Linee]
- Pulizia codice
2024-04-10 15:13:14 +02:00
3044d9c7df Aggiunto pulsante esporta pdf in analisi budget agricoper 2024-04-09 12:08:35 +02:00
0db50c14f5 Aggiustamenti filtri in chiusura tagli prezzo 2024-04-05 13:10:49 +02:00
8ee40a5a96 Fix override open in BasePopup 2024-04-05 10:42:02 +02:00
74411b82e2 Finish Integry_MRP_ListMaterialiDepositi 2024-04-05 10:09:19 +02:00
58a49f9e98 Merge branch 'develop' into feature/Integry_MRP_ListMaterialiDepositi 2024-04-05 10:09:14 +02:00
6baebc9cc4 Finish Integry_MRP_ListMaterialiDepositi 2024-04-05 10:09:06 +02:00
2dc3b6a3c5 [Previsioni Raccolta]
- Fix datapicker doppio anno
- Pulizia codice
2024-04-05 10:00:15 +02:00
22c699f000 [Ordini Riass Clie]
- Fix velocità query
- Ottimizzazione codice
2024-04-05 09:59:09 +02:00
ea1d8d8390 [MRP]
- Adesso la listMateriali considera tutti i depositi presenti nel filtro dell'avantielenco
- Fix doppia chiamata alla setListMateriali
- Modifiche minori e ottimizzazione codice
2024-04-05 09:56:32 +02:00
e52f3e2266 Finish Follie_OrdiniARiassClie_OttimizzazioneVelocitaQuery 2024-04-04 10:38:46 +02:00
5d784a0e30 Merge branch 'develop' into feature/Follie_OrdiniARiassClie_OttimizzazioneVelocitaQuery 2024-04-04 10:38:31 +02:00
c38f9f8e3a Finish Follie_OrdiniARiassClie_OttimizzazioneVelocitaQuery 2024-04-04 10:34:53 +02:00
dadcb105b4 [Riassortimento]
- Ottimizzazione query "list-articoli"
- Modifiche minori e ottimizzazione codice
2024-04-04 10:30:03 +02:00
301d1bd025 [Contratti di Vendita]
- Alla modifica dell'ordine mantiene il paging della tabella
- Aumento delle righe per pagina
- Fix controllo sui dati al salvataggio ($div inesistente per i toast)
2024-04-03 17:21:24 +02:00
6d49dd2840 [INTEGRY]
spostata query retrieve ultima qta cnf in colli di produzione al momento prima di aprire il popup crea udc
2024-04-03 12:28:51 +02:00
31942a9742 Merge tag 'Integry_FileClass_FixFunctionRearrangeFileArray' into develop
Finish Integry_FileClass_FixFunctionRearrangeFileArray
2024-04-02 16:44:51 +02:00
c0345a77b8 Finish Integry_FileClass_FixFunctionRearrangeFileArray 2024-04-02 16:44:51 +02:00
7870cb3a08 [Utility]
- Fixato errore che non faceva caricare login
2024-04-02 16:42:46 +02:00
1b952a7339 Merge branch 'master' into develop 2024-04-02 10:57:32 +02:00
fb86335943 Finish ModifPrecisione 2024-04-02 10:57:31 +02:00
7bfb7c0295 Modificata precisione prezzi e nuova colonna prezzo netto pz 2024-04-02 10:57:05 +02:00
126416a19e Merge tag 'Cosmapack_ConfigAzienda_FixDbNameWeb' into develop
Finish Cosmapack_ConfigAzienda_FixDbNameWeb
2024-03-29 15:19:10 +01:00
2652e61d9a Finish Cosmapack_ConfigAzienda_FixDbNameWeb 2024-03-29 15:19:06 +01:00
67c9e51c10 [Config Aziende]
- Fixato il dbName come richiesto da Valerio
2024-03-29 15:18:37 +01:00
bda62b38e3 Corretto calcolo margine valore ed aggiunto calcolo sbagliato margine perc 2024-03-28 19:12:09 +01:00
8b3fe5753e Modificato spinner splash screen 2024-03-28 16:28:24 +01:00
eaac827cea Aggiunto parametro per limitare le righe di una textarea 2024-03-28 16:07:15 +01:00
56c076293d Finish Carelli_Impostazioni_FixListaUtenti 2024-03-28 15:22:43 +01:00
0d65f80ce5 [Impostazioni]
- Fix lista utenti, ora prende tutti gli utenti e non solo i web
2024-03-28 15:22:16 +01:00
38a2d43fd5 Finish Carelli_Modellini_FixAllegati 2024-03-28 14:56:59 +01:00
48634f6769 [Modellini]
- Fix Allegati alla segnalazione
- Modifiche minori
2024-03-28 14:56:23 +01:00
bfa0a14224 [Modellini]
- Fix Allegati alla segnalazione
- Modifiche minori
2024-03-28 14:52:15 +01:00
d46462c027 Impostate note ordine come text area in popup riep giorno 2024-03-28 13:01:14 +01:00
7514b33da4 Finish Florapulia_OrdiniWebPlants_AggiuntaNumSconto 2024-03-28 10:32:56 +01:00
6b277d8a84 [Ordini Web Plants]
- Lo sconto adesso viene applicato correttamente dopo gli sconti del cliente (se il cliente ha sconto1, lo sconto verrà applicato come sconto2 ecc.)
2024-03-28 10:32:08 +01:00
938fd342d0 Finish Gramm_MRP_PopupCampiMancanti 2024-03-28 10:16:11 +01:00
de35050a88 Merge branch 'develop' into feature/Gramm_MRP_PopupCampiMancanti 2024-03-28 10:15:58 +01:00
6fe65466b2 Finish Gramm_ControlloGiacenze_FixCodSgruppo 2024-03-28 10:15:36 +01:00
3b1c511f3c Merge branch 'develop' into feature/Gramm_ControlloGiacenze_FixCodSgruppo 2024-03-28 10:12:35 +01:00
9d47dce099 Spostata definizione type in public_html 2024-03-28 09:36:43 +01:00
cb884aa67d Fix import di file mjs e corretto calcolo ricarico costi trasporto 2024-03-27 18:54:22 +01:00
e31902ea4b [Controllo Giacenze]
- Fix colonna Cod Sgruppo
2024-03-27 17:25:33 +01:00
60e4bd169a Merge branch 'develop' into feature/Gramm_MRP_PopupCampiMancanti 2024-03-27 17:09:12 +01:00
627e2aa80a Corretta assegnazione posti pallet in salvataggio 2024-03-27 15:53:04 +01:00
fb912780c2 Rimossi SVG di FontAwesome
Migliorata velocità di copy file in grunt
Fix su htaccess sotto config-azienda (per Apache 2.4)
2024-03-27 12:33:49 +01:00
0e562a502c Merge branch 'develop' into feature/Gramm_MRP_PopupCampiMancanti 2024-03-27 12:11:08 +01:00
385da701f8 Aggiunto modulo mitt come event emitter 2024-03-27 10:07:21 +01:00
0e412cbb57 Aggiunta blacklist in salvataggio di gruppo listini di vendita 2024-03-27 09:38:31 +01:00
1af924632e Corretta somma popup riep giorno rosso gargano 2024-03-26 17:34:29 +01:00
c4c7fe7b46 Merge branch 'develop' into feature/Gramm_MRP_PopupCampiMancanti 2024-03-26 12:40:02 +01:00
85fcf40772 [MRP]
- Fix popup solo se campi valorizzato
- Rimosso campo qta_cnf (pz_cartoni) dato che non può essere 0
2024-03-26 12:39:24 +01:00
21d65528ee Migliorato filtro tipi in tab clienti in listini vendita 2024-03-26 09:47:03 +01:00
8b08bdef67 [MRP]
- Aggiunto controllo mancante su checkLastProd (c'era su MRP 1.0)
- Aggiunto popup che controlla l'anagrafica dell'articolo e avvisa se mancano determinati campi nell'anagrafica
2024-03-25 16:59:21 +01:00
26331cba56 Fix selezione listino dopo duplicazione 2024-03-25 12:56:59 +01:00
6426581e54 Modifiche tab clienti listini vendita e fix query trasporti 2024-03-22 19:18:33 +01:00
449cc21dd8 Finish Licor_MrpV2_FixModificaOrdineProd 2024-03-22 18:16:19 +01:00
1069e08e5b Merge branch 'develop' into feature/Licor_MrpV2_FixModificaOrdineProd
# Conflicts:
#	public_html/gest-lib/impostazioni/classes/Impostazioni.class.php
2024-03-22 18:15:31 +01:00
8d2c3c8bd6 Finish Gramm_MonitoraggioLinee_AbilitaPulsantiModArt&DuplOrd 2024-03-22 18:14:20 +01:00
acb0f486a0 Merge branch 'develop' into feature/Gramm_MonitoraggioLinee_AbilitaPulsantiModArt&DuplOrd 2024-03-22 16:48:52 +01:00
44c6a97684 [INTEGRY]
Gestione setup con valore array
2024-03-22 16:39:08 +01:00
53d51fca7e Aggiunta nazionalita_det in id_ord per ordinamento sul gruppo in popup riep giorno 2024-03-22 10:56:05 +01:00
9269228e29 [Monitoraggio Linee]
- Fix setups
2024-03-21 16:13:47 +01:00
2584a63533 [Monitoraggio Linee]
- Aggiunto controllo con setup per abilitare pulsante Modifica Articolo
- Aggiunto controllo con setup per abilitare pulsante Duplica Ordine
2024-03-21 14:54:19 +01:00
ca39975d17 Correzione query menu admin 2024-03-20 17:39:01 +01:00
036e47800d Aggiunta nuova tab clienti in listini vendita 2024-03-20 16:05:48 +01:00
744ce0351c Merge remote-tracking branch 'origin/develop' into develop 2024-03-20 14:05:59 +01:00
fda4904b4b Merge branch 'master' into develop 2024-03-20 13:17:41 +01:00
b4eebdd870 Finish Hotfix-11 2024-03-20 13:17:40 +01:00
e526a044e8 Rimosse referenze a report type WMS_ETICHETTA_SSCC_SPEDIZIONE_ORD 2024-03-20 13:16:57 +01:00
717c5ccbe5 query menu 2024-03-20 12:07:48 +01:00
e63005ddfc Finish Integry_Impostazioni_FixSelect2ValoriPipe 2024-03-19 15:56:02 +01:00
96dc0cf15e [Impostazioni]
- Fix alle options con il pipe che separa valore e descrizione
2024-03-19 15:54:03 +01:00
53942db506 Merge tag 'Licor_MonitoraggioLinee_FixPriorità' into develop
Finish Licor_MonitoraggioLinee_FixPriorità
2024-03-19 15:51:25 +01:00
96d983a923 Finish Licor_MonitoraggioLinee_FixPriorità 2024-03-19 15:51:24 +01:00
8a5be1660f [Monitoraggio Linee]
- Fix ordine selezione priorità
2024-03-19 15:50:26 +01:00
4fed2f33c9 Merge branch 'develop' into feature/Licor_MrpV2_FixModificaOrdineProd 2024-03-19 15:41:51 +01:00
7987d97f44 [ROSSOGARGANO]
Aggiunto metodo fetch destinatari fornitore
2024-03-19 12:49:02 +01:00
3d9f9c09f9 [Mrp V2]
- Aggiornamento variabili + controllo ordine che scompariva
2024-03-19 12:37:13 +01:00
5fdc93f017 Merge branch 'develop' into feature/Licor_MrpV2_FixModificaOrdineProd 2024-03-19 12:33:40 +01:00
5721d43d1f Merge remote-tracking branch 'origin/develop' into develop 2024-03-19 12:09:17 +01:00
daf64a1c82 Aggiunta somma pedane viaggio in popup riep giorno 2024-03-19 11:37:18 +01:00
9fd99d827a Merge branch 'develop' into feature/Licor_MrpV2_FixModificaOrdineProd 2024-03-19 10:02:38 +01:00
193cb49c30 Merge remote-tracking branch 'origin/develop' into develop 2024-03-18 19:14:49 +01:00
2f67923b95 Gestita duplicazione listini di vendita 2024-03-18 18:23:23 +01:00
1758635eb2 Merge remote-tracking branch 'origin/develop' into develop 2024-03-18 17:08:39 +01:00
78832c055f [Mrp]
- Fix modifica ordine di produzione
2024-03-18 10:34:28 +01:00
24a5cdefbc Finish Biolevante_PianoArrivi_GiacenzeListinoTuttiDepositi 2024-03-15 12:22:03 +01:00
dd9320d7c9 [Piano Arrivi]
- Adesso tutte le qta non vengono prese solo da un deposito ma da tutti i depositi aziendali
- Fix data_conferma null in nuovo ordine
- Pulizia codice
2024-03-15 12:21:37 +01:00
3c111096c1 Impostati public url in https su dulciar e vg 2024-03-14 18:37:04 +01:00
e6ed487499 Fix pulsante new ed aggiunto pulsante stampa listino 2024-03-14 17:14:41 +01:00
96f5478273 Finish Carelli_Inventario_ModificaInventariSparatiOggi 2024-03-14 17:01:09 +01:00
5138f8fdd3 Merge branch 'develop' into feature/Carelli_Inventario_ModificaInventariSparatiOggi 2024-03-14 16:21:41 +01:00
0ce750f233 Finish Carelli_Modellini&OrdiniA_Modifiche&Fixes 2024-03-14 16:21:14 +01:00
af66b3db12 Merge branch 'develop' into feature/Carelli_Modellini&OrdiniA_Modifiche&Fixes 2024-03-14 16:20:36 +01:00
8bfa118543 [Inventario]
- Adesso è possibile modificare solamente gli inventari sparati nel giorno (data_ora_inv === oggi)
- Pulizia delle query (Sostituite da tempo dai servizi)
- Pulizia codice
2024-03-14 16:19:57 +01:00
14b10ef9f3 Merge remote-tracking branch 'origin/develop' into develop 2024-03-13 19:42:31 +01:00
d224d513ea Merge branch 'master' into develop 2024-03-13 10:42:21 +01:00
8b262876cc Finish ModifViaggiRoss 2024-03-13 10:42:20 +01:00
6f293a5459 Gestiti posti pallet e solo viaggi odierni in assegnazione 2024-03-13 10:41:40 +01:00
162a5ecd22 Merge tag 'Gramm_ControlloGiacenze_FixSelectableRow' into develop
Finish Gramm_ControlloGiacenze_FixSelectableRow
2024-03-13 10:25:46 +01:00
c005301fa6 Finish Gramm_ControlloGiacenze_FixSelectableRow 2024-03-13 10:25:45 +01:00
a81bca7bce [Controllo Giacenze]
- Fix selectable row
2024-03-13 10:25:20 +01:00
e875463467 Merge remote-tracking branch 'origin/develop' into develop 2024-03-13 10:07:27 +01:00
58a2a9be6b [BIOLEVANTE - DeliveryPlan]
aggiunta definizione campo mezzo in popupOrdine
2024-03-13 10:07:07 +01:00
41d9ac4a77 Merge tag 'Gramm_ControlloGiacenze_FixMultiSelect' into develop
Finish Gramm_ControlloGiacenze_FixMultiSelect
2024-03-12 17:43:04 +01:00
6ab6fbecd7 Finish Gramm_ControlloGiacenze_FixMultiSelect 2024-03-12 17:43:03 +01:00
ac5481d386 [Controllo Giacenze]
- Fix multiselect
2024-03-12 17:37:24 +01:00
266c8df54b Merge branch 'develop' into feature/Carelli_Modellini&OrdiniA_Modifiche&Fixes 2024-03-12 16:43:45 +01:00
48006124be Aggiunto pos_riga ed esclusi ordini sospesi nei viaggi rosso gargano 2024-03-12 15:55:10 +01:00
9d25af739b Aggiunta colonna username e solo articoli riassortiti di default in chiusura tagli prezzo 2024-03-12 15:23:48 +01:00
a5b1a4a67d [Modellini]
- Fix UserSettings nel datasource + ricezione su js

[Ordini Acquisto]

- Aggiunto un debounce alla pressione del tasto invio per mandare le mail
2024-03-12 13:24:35 +01:00
382b9d5df0 Merge tag 'Integry_ContoEconomicoProdotto_FixCONCATWS' into develop
Finish Integry_ContoEconomicoProdotto_FixCONCATWS
2024-03-12 13:05:32 +01:00
c01fa9bdf6 Finish Integry_ContoEconomicoProdotto_FixCONCATWS 2024-03-12 13:05:31 +01:00
7613a29370 Inserito utente che ha inserito la promozione 2024-03-11 10:44:15 +01:00
4fca5ccfc9 [Conto Economico Prodotto]
- Fix CONCAT_wS nella query
2024-03-11 10:23:05 +01:00
8cfa6eea88 Rimosso tipo di default in ajax e gestita creazione nuovo listino 2024-03-08 18:20:20 +01:00
fec4df0477 [GRAMM - ModalMRP]
In modifica ordine di produzione se si cambia la data di produzione viene inviata la data vecchia come chiave di una entity
2024-03-08 15:19:50 +01:00
6e37719db1 Merge branch 'master' into develop 2024-03-07 16:29:02 +01:00
7860043a2e Finish ConfToscaCloud 2024-03-07 16:29:00 +01:00
e6a5c32a77 Modifica config tosca cloud 2024-03-07 16:28:24 +01:00
210668a23f [Delivery Plan]
- Fix cod_vvet
2024-03-07 16:15:18 +01:00
91a3f9f6ee Finish RossoGargano_DeliveryPlan_FixFiltriEModificheGrafiche 2024-03-07 15:26:30 +01:00
20eb47b07e Merge branch 'develop' into feature/RossoGargano_DeliveryPlan_FixFiltriEModificheGrafiche 2024-03-07 15:26:23 +01:00
f4cf0b2d43 Finish Gramm_MrpV2_FlagAttivaSelezioneMultipla 2024-03-07 15:13:26 +01:00
42831ca8cb Merge branch 'develop' into feature/Gramm_MrpV2_FlagAttivaSelezioneMultipla 2024-03-07 15:03:57 +01:00
c856ecc062 Finish Biolevante_MonitoraggioLinee_FixPulsanteCambiaDataProd 2024-03-07 13:23:01 +01:00
650a9285f8 Merge branch 'develop' into feature/Biolevante_MonitoraggioLinee_FixPulsanteCambiaDataProd 2024-03-07 13:22:56 +01:00
d17891bc72 aggiunto filtro su tipo promozione Taglio prezzo 2024-03-07 13:18:22 +01:00
0b9c2ae993 Merge branch 'develop' into feature/Biolevante_MonitoraggioLinee_FixPulsanteCambiaDataProd 2024-03-07 13:17:44 +01:00
a5107e669c [Monitoraggio Linee]
- Fix pulsante 'Cambia Data Produzione' adesso viene aggiornata anche la data di consegna in testata e sulle righe
2024-03-07 13:13:10 +01:00
05cca03d60 [MRP V2]
- Aggiunto flagAttivaSelezioneMultipla, se è a n permette di selezionare solo un singolo ordine di vendita
2024-03-07 13:10:59 +01:00
da7211026a Cambio icona listini di vendita 2024-03-06 10:23:46 +01:00
87fdd92ff9 Aggiunta icona gestione listini di vendita 2024-03-06 09:52:36 +01:00
db11b4a719 Corretta applicazione filtri aggiunta articolo in listini vendita e creato filtro per tipo mgrp 2024-03-05 19:00:42 +01:00
8fafae725b Rimessa qta residua al posto di ammanco in popup riep giorno ed impostata assegnazione viaggi solo su righe con cod_mart 2024-03-05 12:21:25 +01:00
bd1154cf36 Creata setup per leggere il prezzo base da distinta al posto del listino in listini vendita 2024-03-05 10:41:57 +01:00
ec8b3b1e08 Riattivati pulsanti rimozione per vettore ed automezzo in popup riep giorno rosso gargano e fix peso kg in popup in listini vendita 2024-03-05 10:22:14 +01:00
61dd8ac8a2 [Delivery Plan]
- Qta evasa diventa colli residui
2024-03-05 09:38:39 +01:00
8716bedac1 [Delivery Plan]
- Modifiche al Popup (Aggiunte colonne Cod. Art. e Qta Evasa, 3 cifre decimali prezzi, Prezzo KG diventa Prezzo a U.M.)
- Fix filtro ricerca cliente (Problema ordini sdoppiati)
2024-03-04 16:42:28 +01:00
14786f68e6 Nuovo raggruppamento, sincronizzazione modifiche gruppo e nuovo pulsante per aggiunta in listino 2024-03-01 16:41:47 +01:00
e57ad565f4 Finish Biolevante_ContoEconomicoProdotto_StampaSchedaCosti 2024-03-01 15:41:53 +01:00
7cc44128ee Merge branch 'develop' into feature/Biolevante_ContoEconomicoProdotto_StampaSchedaCosti 2024-03-01 15:41:49 +01:00
0455406a52 Finish Biolevante_ContoEconomicoProdotto_StampaSchedaCosti 2024-03-01 15:41:40 +01:00
12e205736c [Delivery Plan]
- Aggiunta condizione di filtro 'art_lisv' nella lista deglia rticoli per il popup AggiungiAlListino
2024-03-01 15:41:13 +01:00
262a6feb0d [Conto Economico Prodotto]
- Aggiunto pulsante stampa scheda costi
2024-03-01 15:37:42 +01:00
7a5ee8c9b5 Merge branch 'master' into develop 2024-03-01 12:24:11 +01:00
ab3bc2fc90 Finish Hotfix-11 2024-03-01 12:24:09 +01:00
3f2f59cff1 Agguinto tosca cloud alle compilazioni 2024-03-01 12:23:35 +01:00
80a1f1dbe7 Merge remote-tracking branch 'origin/develop' into develop 2024-02-29 16:10:56 +01:00
80e8f4da13 [TOSCA - Sincronizzazioni]
aggiunti field wherecond sql e java
2024-02-29 16:10:34 +01:00
35f8774bf0 Finish Biolevante_MRPV2_ModificheMassimo 2024-02-29 11:10:08 +01:00
94781bef76 [MRP V2]
- Adesso è possibile modificare un ordine di produzione selezionando e deselezionando gli ordini di vendita associati
- Aggiunto Ordini Pianificati in Produzione, cioè gli ordini di vendia già agganciai a partita mag, nel popup fabbisogno ordini vendita
2024-02-29 11:01:48 +01:00
b469535917 [TOSCA - Sincronizzazioni]
gestione refresh stato in completamente sincronizzazioni
2024-02-28 11:12:42 +01:00
1ed42dda8e [TOSCA - Sincronizzazioni]
corretta funzione start
2024-02-27 10:38:21 +01:00
9c38b15470 [TOSCA - Sincronizzazioni]
aggiunti waiter modal e confirm modal in eliminazione dati
2024-02-27 10:30:57 +01:00
a0a2cec00d [TOSCA - Sincronizzazioni]
Aggiunta possibilita modifica con doppio click
2024-02-27 09:55:52 +01:00
209d4f7922 Fix definizione dropzone e destroy mancante in campi di raccolta 2024-02-26 18:03:39 +01:00
bca8636e4b Merge branch 'master' into develop 2024-02-26 15:54:31 +01:00
f4bbea373c Finish ModifListiniVendita 2024-02-26 15:54:29 +01:00
847a5c3c63 Fix ed impostati valori di default per nuovi premi in listini vendita 2024-02-26 15:54:01 +01:00
652c3ba19f Aggiunti filtri su tutte le colonne e pulsante seleziona tutti in chiusura tagli prezzo 2024-02-26 12:11:56 +01:00
d970b39ae9 Merge branch 'master' into develop 2024-02-26 10:53:23 +01:00
ffe760949d Finish Hotfix-11 2024-02-26 10:53:22 +01:00
28fe701677 Corretta retrocompatibilità importazione tabViewModules 2024-02-26 10:52:58 +01:00
fc8bc7e53c Merge branch 'master' into develop 2024-02-26 10:26:18 +01:00
bf74ba1698 Finish Hotfix-11 2024-02-26 10:26:17 +01:00
fa2ecee83b correzione query 2024-02-26 10:26:01 +01:00
13cb6b86ab Merge branch 'master' into develop 2024-02-26 10:19:07 +01:00
c6ab8f85c2 Finish Hotfix-11 2024-02-26 10:19:06 +01:00
d8043c7589 Aggiunta estensione file in import moduli sincronizzazioni 2024-02-26 10:18:46 +01:00
59ccc62dc7 Fix calcoli prz vend trasp in listini vendita 2024-02-23 19:21:02 +01:00
3ddc846689 Finish Biolevante_PVM_FixesVari 2024-02-23 17:56:51 +01:00
0f83a0fcf2 Merge branch 'develop' into feature/Biolevante_PVM_FixesVari 2024-02-23 17:56:35 +01:00
65889d28a1 Merge remote-tracking branch 'origin/develop' into develop 2024-02-23 17:56:05 +01:00
07dceb81cb Aggiunte nuove colonne in listini vendita e precompilata data validità da max data iniz del listino 2024-02-23 17:36:28 +01:00
34dc4091c1 Finish Smetar_Planner_FixAllegati 2024-02-23 14:51:07 +01:00
5fb0e62d87 [Planner]
- Fix caricamento righe allegati multipli
2024-02-23 14:50:42 +01:00
051dd901c7 Merge branch 'master' into develop 2024-02-23 09:40:32 +01:00
d8e1b95fbd Finish FixListiniVend 2024-02-23 09:40:31 +01:00
aa4e81a045 Correzioni varie in listini vendita 2024-02-23 09:39:56 +01:00
33726fad43 Merge branch 'master' into develop 2024-02-22 17:56:26 +01:00
a6c5b46794 Finish ModifListiniVend 2024-02-22 17:56:24 +01:00
0080e638c6 Creata tab costi in listini vendita e gestita import tab in TabsViewModule 2024-02-22 17:55:36 +01:00
7eb571a2a7 Merge branch 'develop' into feature/Biolevante_PVM_FixesVari 2024-02-22 17:02:12 +01:00
0007f5b12f Finish Gramm_MrpV2_ColonnaDeposito 2024-02-22 16:39:21 +01:00
64a81c1888 [MRP V2]
- Popup nuovo Ordine Prod: Alla selezione dell'ordine di acquisto viene portato anche il tipo pedana
- Popup nuovo Ordine Prod: Controllo i Cartoni per Pedana devono essere uguali tra gli ordini di acquisto per essere selezionati

[Allegati]
- Controllo Verifica Lettura
- Rimozione Sourcetype OrdAcqCom visto che è uguale alla OrdCom

[Monitoraggio Linee]
- Fix modifica materiale

[Piano Arrivi]
- Aggiunto popup dropzone per gli allegati anche nel popup di invio al fornitore
2024-02-22 16:38:39 +01:00
241df06378 [MRP]
- Aggiunto colonna deposito nel popup Dettaglio ordini
- Ordinato la query per colonna deposito
- Fix grafici
2024-02-21 12:10:42 +01:00
5a46ed9664 Finish Auricchio_PricelistUpdate_FixEliminaListinoAcquisto 2024-02-21 11:51:26 +01:00
b4e2f87f5b Merge branch 'develop' into feature/Auricchio_PricelistUpdate_FixEliminaListinoAcquisto 2024-02-21 11:44:59 +01:00
d42641671c Finish Carelli_RilevazioniSteup_FixVisualizzazione 2024-02-19 18:00:00 +01:00
6df076518b [Rilevazioni Steup]
- Fix visualizzazioni
2024-02-19 17:58:36 +01:00
c30eb591bf Finish Tosca_Sincronizzazioni_CreazioneModulo 2024-02-19 16:17:48 +01:00
e04d381ce3 Merge branch 'develop' into feature/Tosca_Sincronizzazioni_CreazioneModulo
# Conflicts:
#	public_html/js/ims/ems-core.module.ts
2024-02-19 16:15:29 +01:00
10cf9e2888 Reso utilizzabile al minimo gestione sincronizzazioni 2024-02-19 16:09:53 +01:00
e5c827d96c [Pricelist Update]
- Fix: all'eliminazione del listino di vendita, elimina quello di acquisto solo se era l'ultimo collegamento
2024-02-19 15:04:50 +01:00
329fc7d0cb Aggiunta icona gestione chiusura tagli prezzo 2024-02-16 18:36:11 +01:00
67e44e1d9a [Monitoraggio Linee]
- Fix visualizazione data 'Prodotto il'
2024-02-16 16:57:28 +01:00
292e9f3c39 Finish Gramm_Notifiche_FixFirebase 2024-02-16 16:56:25 +01:00
3c4e5eecc5 Merge branch 'develop' into feature/Gramm_Notifiche_FixFirebase 2024-02-16 16:56:04 +01:00
73541c2441 Gestito campo mezzo in popup riep giorno rosso gargano 2024-02-16 11:45:30 +01:00
c9d91630a4 [Notifiche]
- Firebase, fix importScripts
2024-02-16 10:30:23 +01:00
e04293fee9 Finish Florapulia_OrdiniWebPlants_AggiuntaScontoCliente 2024-02-15 16:56:30 +01:00
5609a75dd7 [Ordini Web Plants]
- Sconto1 viene applicato se la setup percsconto è settata e se l'utente è cliente
2024-02-15 16:14:48 +01:00
277b79be7f Merge branch 'develop' into feature/Florapulia_OrdiniWebPlants_AggiuntaScontoCliente 2024-02-15 16:04:16 +01:00
ece9a34b9e Finish Carelli_RilevazioniSteup_FixConsulta&VelocitaAvantiElenco 2024-02-15 16:00:34 +01:00
18eda39136 Merge branch 'develop' into feature/Carelli_RilevazioniSteup_FixConsulta&VelocitaAvantiElenco 2024-02-15 16:00:29 +01:00
d70d5b185b Finish Smetar_Planner_FixAllegati 2024-02-15 15:59:35 +01:00
f1988627ca [Planner]
- Fix upload allegati
2024-02-15 15:57:51 +01:00
bb2982f8d5 [Rilevazioni Steup]
- Migliorata velocità dell'index
- Fix popup consulta
- Fix array_get
- Modifiche grafiche
2024-02-15 15:08:04 +01:00
98e377645d Merge tag 'IMEBA_Preventivi_FixUploadAllegato' into develop
Finish IMEBA_Preventivi_FixUploadAllegato
2024-02-14 17:12:29 +01:00
28b7128fcf Finish IMEBA_Preventivi_FixUploadAllegato 2024-02-14 17:12:28 +01:00
2fb6a9ed24 [Preventivi]
- Fix upload allegati
2024-02-14 17:11:26 +01:00
3e6ae0439b Merge branch 'develop' into feature/Tosca_Sincronizzazioni_CreazioneModulo
# Conflicts:
#	public_html/config-menu.json
2024-02-14 15:47:46 +01:00
240bc07a2a VArie 2024-02-14 15:36:57 +01:00
50cecba3ae Merge tag 'Integry_MRPV2_FixExplodeDist' into develop
Finish Integry_MRPV2_FixExplodeDist
2024-02-14 12:48:40 +01:00
3c936fb16f Merge tag 'Integry_DeliveryPlan_FixLinguaNuovoArticoloListino' into develop
Finish Integry_DeliveryPlan_FixLinguaNuovoArticoloListino
2024-02-14 12:45:13 +01:00
f59aee83f9 [Ordini Web Plants]
- Aggiunto Sconto Cliente
2024-02-14 12:31:41 +01:00
af08926a4d Aggiustamenti popup riep giorno rosso gargano e fix filtro clienti delivery plan 2024-02-13 12:56:22 +01:00
8e203589d1 Rimossa implementazione inutile 2024-02-12 15:41:06 +01:00
7281a5be83 Aggiunta qta residua in popup crea udc monitoraggio ordini 2024-02-12 15:12:57 +01:00
3517e4b0d5 Aggiunta cancellazione fase in monitoraggio ordini 2024-02-12 11:59:34 +01:00
5e54e2494b [Sincronizzazioni]
- Creazione modulo
- Tabella publications
- Collegamento al servizio per l'aggiornamento stato + progressbar
2024-02-01 13:50:33 +01:00
186749d98a [Sincronizzazioni]
- Creazione modulo
- Tabella publications
- Collegamento al servizio per l'aggiornamento stato + progressbar
2024-02-01 13:32:12 +01:00
10547 changed files with 152765 additions and 418177 deletions

64
.devcontainer/Dockerfile Normal file
View File

@@ -0,0 +1,64 @@
# syntax=docker/dockerfile:1
ARG NODE_VERSION="20"
ARG PHP_VERSION="7.4"
ARG AZIENDA="integry"
ARG NODE_ENV="production"
# Immagine finale
FROM php:${PHP_VERSION}-apache-bullseye AS final
ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
COPY docker/php/php.ini $PHP_INI_DIR/php.ini
# Imposto la lingua delle date
ENV LC_TIME=it_IT.UTF-8
RUN apt-get update && apt-get install -y --no-install-recommends locales bash curl git ca-certificates \
&& apt-get clean \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
&& echo it_IT.UTF-8 UTF-8 >> /etc/locale.gen \
&& locale-gen \
&& install-php-extensions \
gd \
imagick \
zip
RUN git config --global --add safe.directory /var/www/html/pvm
# Installo NVM
ARG NODE_VERSION=20
# set env
ENV NVM_DIR=/root/.nvm
# install node
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash \
&& bash -lc "source $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION} && nvm alias default ${NODE_VERSION}"
# Installa Composer
RUN curl -sS https://getcomposer.org/installer | php -- \
--install-dir=/usr/local/bin \
--filename=composer \
COPY docker/apache/000-default.conf $APACHE_CONFDIR/sites-available/000-default.conf
RUN a2enmod rewrite
WORKDIR /var/www/html
FROM final AS final-dev
COPY docker/php/conf.d/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
RUN install-php-extensions xdebug
COPY docker/php/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
EXPOSE 80
EXPOSE 9003
FROM final AS final-prod
RUN install-php-extensions opcache

View File

@@ -0,0 +1,28 @@
{
"name": "PHP 7.4 + Apache",
"build": {
"dockerfile": "Dockerfile",
"target": "final-dev"
},
"runArgs": [
"--map-host-loopback",
"-p", "80:80",
"-p", "9003:9003"
],
// "appPort": [80, 9003],
"forwardPorts": [80, 9003],
"workspaceFolder": "/var/www/html/pvm",
"postCreateCommand": "",
"postStartCommand": "bash -ic 'composer install --working-dir=public_html' && service apache2 start",
"mounts": [
],
"containerUser": "root",
"updateRemoteUserUID": true,
"customizations": {
"jetbrains": {
"settings": {
"com.intellij:app:Vcs-Log-App-Settings.show_changes_from_parents": true
}
}
},
}

View File

@@ -0,0 +1,51 @@
ServerName localhost
<VirtualHost *:80>
# The ServerName directive sets the request scheme, hostname and port that
# the server uses to identify itself. This is used when creating
# redirection URLs. In the context of virtual hosts, the ServerName
# specifies what hostname must appear in the request's Host: header to
# match this virtual host. For the default virtual host (this file) this
# value is not decisive as it is used as a last resort host regardless.
# However, you must set it for any further virtual host explicitly.
# ServerName localhost
ServerAdmin webmaster@localhost
DocumentRoot /var/www/html
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
# It is also possible to configure the loglevel for particular
# modules, e.g.
#LogLevel info ssl:warn
# Directory configuration for the DocumentRoot
<Directory /var/www/html/>
DirectoryIndex index.php
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
# For most configuration files from conf-available/, which are
# enabled or disabled at a global level, it is possible to
# include a line for only one particular virtual host. For example the
# following line enables the CGI configuration for this host only
# after it has been globally disabled with "a2disconf".
#Include conf-available/serve-cgi-bin.conf
# Proxy PHP requests to port 9000 PHP-FPM container
<IfModule mod_proxy.c>
ProxyTimeout 259200
<FilesMatch \.php$>
Require all granted
SetHandler proxy:fcgi://${PHP_HOST}:${PHP_PORT}
</FilesMatch>
</IfModule>
</VirtualHost>
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

View File

@@ -0,0 +1 @@
error_reporting=E_ALL

View File

@@ -0,0 +1,6 @@
zend_extension=xdebug
[xdebug]
xdebug.mode=develop,debug
xdebug.client_host=host.docker.internal
xdebug.start_with_request=yes

File diff suppressed because it is too large Load Diff

18
.dockerignore Normal file
View File

@@ -0,0 +1,18 @@
.git*
.idea
.bin
.devcontainer
.editorconfig
.env
.eslint*
exports
**/node_modules
**/dist
**/cache
docker-compose.yml
Dockerfile
install-mutagen.ps1
Jenkinsfile.groovy
mutagen
mutagen.yml*
run-docker.ps1

837
.editorconfig Normal file
View File

@@ -0,0 +1,837 @@
[*]
charset = utf-8
end_of_line = crlf
indent_size = 4
indent_style = space
insert_final_newline = true
max_line_length = 120
tab_width = 4
trim_trailing_whitespace = true
ij_continuation_indent_size = 8
ij_formatter_off_tag = @formatter:off
ij_formatter_on_tag = @formatter:on
ij_formatter_tags_enabled = true
ij_smart_tabs = false
ij_visual_guides =
ij_wrap_on_typing = false
[*.blade.php]
ij_blade_keep_indents_on_empty_lines = false
[*.css]
ij_css_align_closing_brace_with_properties = false
ij_css_blank_lines_around_nested_selector = 1
ij_css_blank_lines_between_blocks = 1
ij_css_block_comment_add_space = false
ij_css_brace_placement = end_of_line
ij_css_enforce_quotes_on_format = false
ij_css_hex_color_long_format = false
ij_css_hex_color_lower_case = false
ij_css_hex_color_short_format = false
ij_css_hex_color_upper_case = false
ij_css_keep_blank_lines_in_code = 2
ij_css_keep_indents_on_empty_lines = false
ij_css_keep_single_line_blocks = false
ij_css_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
ij_css_space_after_colon = true
ij_css_space_before_opening_brace = true
ij_css_use_double_quotes = true
ij_css_value_alignment = do_not_align
[*.feature]
indent_size = 2
ij_gherkin_keep_indents_on_empty_lines = false
[*.less]
indent_size = 2
ij_less_align_closing_brace_with_properties = false
ij_less_blank_lines_around_nested_selector = 1
ij_less_blank_lines_between_blocks = 1
ij_less_block_comment_add_space = false
ij_less_brace_placement = 0
ij_less_enforce_quotes_on_format = false
ij_less_hex_color_long_format = false
ij_less_hex_color_lower_case = false
ij_less_hex_color_short_format = false
ij_less_hex_color_upper_case = false
ij_less_keep_blank_lines_in_code = 2
ij_less_keep_indents_on_empty_lines = false
ij_less_keep_single_line_blocks = false
ij_less_line_comment_add_space = false
ij_less_line_comment_at_first_column = false
ij_less_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
ij_less_space_after_colon = true
ij_less_space_before_opening_brace = true
ij_less_use_double_quotes = true
ij_less_value_alignment = 0
[*.sass]
indent_size = 2
ij_sass_align_closing_brace_with_properties = false
ij_sass_blank_lines_around_nested_selector = 1
ij_sass_blank_lines_between_blocks = 1
ij_sass_brace_placement = 0
ij_sass_enforce_quotes_on_format = false
ij_sass_hex_color_long_format = false
ij_sass_hex_color_lower_case = false
ij_sass_hex_color_short_format = false
ij_sass_hex_color_upper_case = false
ij_sass_keep_blank_lines_in_code = 2
ij_sass_keep_indents_on_empty_lines = false
ij_sass_keep_single_line_blocks = false
ij_sass_line_comment_add_space = false
ij_sass_line_comment_at_first_column = false
ij_sass_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
ij_sass_space_after_colon = true
ij_sass_space_before_opening_brace = true
ij_sass_use_double_quotes = true
ij_sass_value_alignment = 0
[*.scss]
indent_size = 2
ij_scss_align_closing_brace_with_properties = false
ij_scss_blank_lines_around_nested_selector = 1
ij_scss_blank_lines_between_blocks = 1
ij_scss_block_comment_add_space = false
ij_scss_brace_placement = 0
ij_scss_enforce_quotes_on_format = false
ij_scss_hex_color_long_format = false
ij_scss_hex_color_lower_case = false
ij_scss_hex_color_short_format = false
ij_scss_hex_color_upper_case = false
ij_scss_keep_blank_lines_in_code = 2
ij_scss_keep_indents_on_empty_lines = false
ij_scss_keep_single_line_blocks = false
ij_scss_line_comment_add_space = false
ij_scss_line_comment_at_first_column = false
ij_scss_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
ij_scss_space_after_colon = true
ij_scss_space_before_opening_brace = true
ij_scss_use_double_quotes = true
ij_scss_value_alignment = 0
[*.twig]
ij_twig_keep_indents_on_empty_lines = false
ij_twig_spaces_inside_comments_delimiters = true
ij_twig_spaces_inside_delimiters = true
ij_twig_spaces_inside_variable_delimiters = true
[*.vue]
indent_size = 2
tab_width = 2
ij_continuation_indent_size = 4
ij_vue_indent_children_of_top_level = template
ij_vue_interpolation_new_line_after_start_delimiter = true
ij_vue_interpolation_new_line_before_end_delimiter = true
ij_vue_interpolation_wrap = off
ij_vue_keep_indents_on_empty_lines = false
ij_vue_spaces_within_interpolation_expressions = true
[.editorconfig]
ij_editorconfig_align_group_field_declarations = false
ij_editorconfig_space_after_colon = false
ij_editorconfig_space_after_comma = true
ij_editorconfig_space_before_colon = false
ij_editorconfig_space_before_comma = false
ij_editorconfig_spaces_around_assignment_operators = true
[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul,phpunit.xml.dist}]
ij_xml_align_attributes = true
ij_xml_align_text = false
ij_xml_attribute_wrap = normal
ij_xml_block_comment_add_space = false
ij_xml_block_comment_at_first_column = true
ij_xml_keep_blank_lines = 2
ij_xml_keep_indents_on_empty_lines = false
ij_xml_keep_line_breaks = true
ij_xml_keep_line_breaks_in_text = true
ij_xml_keep_whitespaces = false
ij_xml_keep_whitespaces_around_cdata = preserve
ij_xml_keep_whitespaces_inside_cdata = false
ij_xml_line_comment_at_first_column = true
ij_xml_space_after_tag_name = false
ij_xml_space_around_equals_in_attribute = false
ij_xml_space_inside_empty_tag = false
ij_xml_text_wrap = normal
[{*.ats,*.cts,*.mts,*.ts}]
ij_continuation_indent_size = 4
ij_typescript_align_imports = false
ij_typescript_align_multiline_array_initializer_expression = false
ij_typescript_align_multiline_binary_operation = false
ij_typescript_align_multiline_chained_methods = false
ij_typescript_align_multiline_extends_list = false
ij_typescript_align_multiline_for = true
ij_typescript_align_multiline_parameters = true
ij_typescript_align_multiline_parameters_in_calls = false
ij_typescript_align_multiline_ternary_operation = false
ij_typescript_align_object_properties = 0
ij_typescript_align_union_types = false
ij_typescript_align_var_statements = 0
ij_typescript_array_initializer_new_line_after_left_brace = false
ij_typescript_array_initializer_right_brace_on_new_line = false
ij_typescript_array_initializer_wrap = off
ij_typescript_assignment_wrap = off
ij_typescript_binary_operation_sign_on_next_line = false
ij_typescript_binary_operation_wrap = off
ij_typescript_blacklist_imports = rxjs/Rx, node_modules/**, **/node_modules/**, @angular/material, @angular/material/typings/**
ij_typescript_blank_lines_after_imports = 1
ij_typescript_blank_lines_around_class = 1
ij_typescript_blank_lines_around_field = 0
ij_typescript_blank_lines_around_field_in_interface = 0
ij_typescript_blank_lines_around_function = 1
ij_typescript_blank_lines_around_method = 1
ij_typescript_blank_lines_around_method_in_interface = 1
ij_typescript_block_brace_style = end_of_line
ij_typescript_block_comment_add_space = false
ij_typescript_block_comment_at_first_column = true
ij_typescript_call_parameters_new_line_after_left_paren = false
ij_typescript_call_parameters_right_paren_on_new_line = false
ij_typescript_call_parameters_wrap = off
ij_typescript_catch_on_new_line = false
ij_typescript_chained_call_dot_on_new_line = true
ij_typescript_class_brace_style = end_of_line
ij_typescript_class_decorator_wrap = split_into_lines
ij_typescript_class_field_decorator_wrap = off
ij_typescript_class_method_decorator_wrap = off
ij_typescript_comma_on_new_line = false
ij_typescript_do_while_brace_force = never
ij_typescript_else_on_new_line = false
ij_typescript_enforce_trailing_comma = whenmultiline
ij_typescript_enum_constants_wrap = on_every_item
ij_typescript_extends_keyword_wrap = off
ij_typescript_extends_list_wrap = off
ij_typescript_field_prefix = _
ij_typescript_file_name_style = relaxed
ij_typescript_finally_on_new_line = false
ij_typescript_for_brace_force = never
ij_typescript_for_statement_new_line_after_left_paren = false
ij_typescript_for_statement_right_paren_on_new_line = false
ij_typescript_for_statement_wrap = off
ij_typescript_force_quote_style = true
ij_typescript_force_semicolon_style = true
ij_typescript_function_expression_brace_style = end_of_line
ij_typescript_function_parameter_decorator_wrap = off
ij_typescript_if_brace_force = never
ij_typescript_import_merge_members = global
ij_typescript_import_prefer_absolute_path = global
ij_typescript_import_sort_members = true
ij_typescript_import_sort_module_name = false
ij_typescript_import_use_node_resolution = true
ij_typescript_imports_wrap = on_every_item
ij_typescript_indent_case_from_switch = true
ij_typescript_indent_chained_calls = true
ij_typescript_indent_package_children = 0
ij_typescript_jsdoc_include_types = false
ij_typescript_jsx_attribute_value = braces
ij_typescript_keep_blank_lines_in_code = 2
ij_typescript_keep_first_column_comment = true
ij_typescript_keep_indents_on_empty_lines = false
ij_typescript_keep_line_breaks = true
ij_typescript_keep_simple_blocks_in_one_line = false
ij_typescript_keep_simple_methods_in_one_line = false
ij_typescript_line_comment_add_space = true
ij_typescript_line_comment_at_first_column = false
ij_typescript_method_brace_style = end_of_line
ij_typescript_method_call_chain_wrap = off
ij_typescript_method_parameters_new_line_after_left_paren = false
ij_typescript_method_parameters_right_paren_on_new_line = false
ij_typescript_method_parameters_wrap = off
ij_typescript_object_literal_wrap = on_every_item
ij_typescript_object_types_wrap = on_every_item
ij_typescript_parentheses_expression_new_line_after_left_paren = false
ij_typescript_parentheses_expression_right_paren_on_new_line = false
ij_typescript_place_assignment_sign_on_next_line = false
ij_typescript_prefer_as_type_cast = false
ij_typescript_prefer_explicit_types_function_expression_returns = false
ij_typescript_prefer_explicit_types_function_returns = false
ij_typescript_prefer_explicit_types_vars_fields = false
ij_typescript_prefer_parameters_wrap = false
ij_typescript_property_prefix =
ij_typescript_reformat_c_style_comments = false
ij_typescript_space_after_colon = true
ij_typescript_space_after_comma = true
ij_typescript_space_after_dots_in_rest_parameter = false
ij_typescript_space_after_generator_mult = true
ij_typescript_space_after_property_colon = true
ij_typescript_space_after_quest = true
ij_typescript_space_after_type_colon = true
ij_typescript_space_after_unary_not = false
ij_typescript_space_before_async_arrow_lparen = true
ij_typescript_space_before_catch_keyword = true
ij_typescript_space_before_catch_left_brace = true
ij_typescript_space_before_catch_parentheses = true
ij_typescript_space_before_class_lbrace = true
ij_typescript_space_before_class_left_brace = true
ij_typescript_space_before_colon = true
ij_typescript_space_before_comma = false
ij_typescript_space_before_do_left_brace = true
ij_typescript_space_before_else_keyword = true
ij_typescript_space_before_else_left_brace = true
ij_typescript_space_before_finally_keyword = true
ij_typescript_space_before_finally_left_brace = true
ij_typescript_space_before_for_left_brace = true
ij_typescript_space_before_for_parentheses = true
ij_typescript_space_before_for_semicolon = false
ij_typescript_space_before_function_left_parenth = true
ij_typescript_space_before_generator_mult = false
ij_typescript_space_before_if_left_brace = true
ij_typescript_space_before_if_parentheses = true
ij_typescript_space_before_method_call_parentheses = false
ij_typescript_space_before_method_left_brace = true
ij_typescript_space_before_method_parentheses = false
ij_typescript_space_before_property_colon = false
ij_typescript_space_before_quest = true
ij_typescript_space_before_switch_left_brace = true
ij_typescript_space_before_switch_parentheses = true
ij_typescript_space_before_try_left_brace = true
ij_typescript_space_before_type_colon = false
ij_typescript_space_before_unary_not = false
ij_typescript_space_before_while_keyword = true
ij_typescript_space_before_while_left_brace = true
ij_typescript_space_before_while_parentheses = true
ij_typescript_spaces_around_additive_operators = true
ij_typescript_spaces_around_arrow_function_operator = true
ij_typescript_spaces_around_assignment_operators = true
ij_typescript_spaces_around_bitwise_operators = true
ij_typescript_spaces_around_equality_operators = true
ij_typescript_spaces_around_logical_operators = true
ij_typescript_spaces_around_multiplicative_operators = true
ij_typescript_spaces_around_relational_operators = true
ij_typescript_spaces_around_shift_operators = true
ij_typescript_spaces_around_unary_operator = false
ij_typescript_spaces_within_array_initializer_brackets = false
ij_typescript_spaces_within_brackets = false
ij_typescript_spaces_within_catch_parentheses = false
ij_typescript_spaces_within_for_parentheses = false
ij_typescript_spaces_within_if_parentheses = false
ij_typescript_spaces_within_imports = false
ij_typescript_spaces_within_interpolation_expressions = false
ij_typescript_spaces_within_method_call_parentheses = false
ij_typescript_spaces_within_method_parentheses = false
ij_typescript_spaces_within_object_literal_braces = false
ij_typescript_spaces_within_object_type_braces = true
ij_typescript_spaces_within_parentheses = false
ij_typescript_spaces_within_switch_parentheses = false
ij_typescript_spaces_within_type_assertion = false
ij_typescript_spaces_within_union_types = true
ij_typescript_spaces_within_while_parentheses = false
ij_typescript_special_else_if_treatment = true
ij_typescript_ternary_operation_signs_on_next_line = false
ij_typescript_ternary_operation_wrap = off
ij_typescript_union_types_wrap = on_every_item
ij_typescript_use_chained_calls_group_indents = false
ij_typescript_use_double_quotes = true
ij_typescript_use_explicit_js_extension = auto
ij_typescript_use_import_type = auto
ij_typescript_use_path_mapping = always
ij_typescript_use_public_modifier = false
ij_typescript_use_semicolon_after_statement = true
ij_typescript_var_declaration_wrap = normal
ij_typescript_while_brace_force = never
ij_typescript_while_on_new_line = false
ij_typescript_wrap_comments = false
[{*.bash,*.sh,*.zsh}]
indent_size = 2
tab_width = 2
ij_shell_binary_ops_start_line = false
ij_shell_keep_column_alignment_padding = false
ij_shell_minify_program = false
ij_shell_redirect_followed_by_space = false
ij_shell_switch_cases_indented = false
ij_shell_use_unix_line_separator = true
[{*.cjs,*.es6,*.js,*.mjs}]
ij_continuation_indent_size = 4
ij_javascript_align_imports = false
ij_javascript_align_multiline_array_initializer_expression = false
ij_javascript_align_multiline_binary_operation = false
ij_javascript_align_multiline_chained_methods = false
ij_javascript_align_multiline_extends_list = false
ij_javascript_align_multiline_for = true
ij_javascript_align_multiline_parameters = true
ij_javascript_align_multiline_parameters_in_calls = false
ij_javascript_align_multiline_ternary_operation = false
ij_javascript_align_object_properties = 0
ij_javascript_align_union_types = false
ij_javascript_align_var_statements = 0
ij_javascript_array_initializer_new_line_after_left_brace = false
ij_javascript_array_initializer_right_brace_on_new_line = false
ij_javascript_array_initializer_wrap = off
ij_javascript_assignment_wrap = off
ij_javascript_binary_operation_sign_on_next_line = false
ij_javascript_binary_operation_wrap = off
ij_javascript_blacklist_imports = rxjs/Rx, node_modules/**, **/node_modules/**, @angular/material, @angular/material/typings/**
ij_javascript_blank_lines_after_imports = 1
ij_javascript_blank_lines_around_class = 1
ij_javascript_blank_lines_around_field = 0
ij_javascript_blank_lines_around_function = 1
ij_javascript_blank_lines_around_method = 1
ij_javascript_block_brace_style = end_of_line
ij_javascript_block_comment_add_space = false
ij_javascript_block_comment_at_first_column = true
ij_javascript_call_parameters_new_line_after_left_paren = false
ij_javascript_call_parameters_right_paren_on_new_line = false
ij_javascript_call_parameters_wrap = off
ij_javascript_catch_on_new_line = false
ij_javascript_chained_call_dot_on_new_line = true
ij_javascript_class_brace_style = end_of_line
ij_javascript_class_decorator_wrap = split_into_lines
ij_javascript_class_field_decorator_wrap = off
ij_javascript_class_method_decorator_wrap = off
ij_javascript_comma_on_new_line = false
ij_javascript_do_while_brace_force = never
ij_javascript_else_on_new_line = false
ij_javascript_enforce_trailing_comma = whenmultiline
ij_javascript_extends_keyword_wrap = off
ij_javascript_extends_list_wrap = off
ij_javascript_field_prefix = _
ij_javascript_file_name_style = relaxed
ij_javascript_finally_on_new_line = false
ij_javascript_for_brace_force = never
ij_javascript_for_statement_new_line_after_left_paren = false
ij_javascript_for_statement_right_paren_on_new_line = false
ij_javascript_for_statement_wrap = off
ij_javascript_force_quote_style = true
ij_javascript_force_semicolon_style = true
ij_javascript_function_expression_brace_style = end_of_line
ij_javascript_function_parameter_decorator_wrap = off
ij_javascript_if_brace_force = never
ij_javascript_import_merge_members = global
ij_javascript_import_prefer_absolute_path = global
ij_javascript_import_sort_members = true
ij_javascript_import_sort_module_name = false
ij_javascript_import_use_node_resolution = true
ij_javascript_imports_wrap = on_every_item
ij_javascript_indent_case_from_switch = true
ij_javascript_indent_chained_calls = true
ij_javascript_indent_package_children = 0
ij_javascript_jsx_attribute_value = braces
ij_javascript_keep_blank_lines_in_code = 2
ij_javascript_keep_first_column_comment = true
ij_javascript_keep_indents_on_empty_lines = false
ij_javascript_keep_line_breaks = true
ij_javascript_keep_simple_blocks_in_one_line = false
ij_javascript_keep_simple_methods_in_one_line = false
ij_javascript_line_comment_add_space = true
ij_javascript_line_comment_at_first_column = false
ij_javascript_method_brace_style = end_of_line
ij_javascript_method_call_chain_wrap = off
ij_javascript_method_parameters_new_line_after_left_paren = false
ij_javascript_method_parameters_right_paren_on_new_line = false
ij_javascript_method_parameters_wrap = off
ij_javascript_object_literal_wrap = on_every_item
ij_javascript_object_types_wrap = on_every_item
ij_javascript_parentheses_expression_new_line_after_left_paren = false
ij_javascript_parentheses_expression_right_paren_on_new_line = false
ij_javascript_place_assignment_sign_on_next_line = false
ij_javascript_prefer_as_type_cast = false
ij_javascript_prefer_explicit_types_function_expression_returns = false
ij_javascript_prefer_explicit_types_function_returns = false
ij_javascript_prefer_explicit_types_vars_fields = false
ij_javascript_prefer_parameters_wrap = false
ij_javascript_property_prefix =
ij_javascript_reformat_c_style_comments = false
ij_javascript_space_after_colon = true
ij_javascript_space_after_comma = true
ij_javascript_space_after_dots_in_rest_parameter = false
ij_javascript_space_after_generator_mult = true
ij_javascript_space_after_property_colon = true
ij_javascript_space_after_quest = true
ij_javascript_space_after_type_colon = true
ij_javascript_space_after_unary_not = false
ij_javascript_space_before_async_arrow_lparen = true
ij_javascript_space_before_catch_keyword = true
ij_javascript_space_before_catch_left_brace = true
ij_javascript_space_before_catch_parentheses = true
ij_javascript_space_before_class_lbrace = true
ij_javascript_space_before_class_left_brace = true
ij_javascript_space_before_colon = true
ij_javascript_space_before_comma = false
ij_javascript_space_before_do_left_brace = true
ij_javascript_space_before_else_keyword = true
ij_javascript_space_before_else_left_brace = true
ij_javascript_space_before_finally_keyword = true
ij_javascript_space_before_finally_left_brace = true
ij_javascript_space_before_for_left_brace = true
ij_javascript_space_before_for_parentheses = true
ij_javascript_space_before_for_semicolon = false
ij_javascript_space_before_function_left_parenth = true
ij_javascript_space_before_generator_mult = false
ij_javascript_space_before_if_left_brace = true
ij_javascript_space_before_if_parentheses = true
ij_javascript_space_before_method_call_parentheses = false
ij_javascript_space_before_method_left_brace = true
ij_javascript_space_before_method_parentheses = false
ij_javascript_space_before_property_colon = false
ij_javascript_space_before_quest = true
ij_javascript_space_before_switch_left_brace = true
ij_javascript_space_before_switch_parentheses = true
ij_javascript_space_before_try_left_brace = true
ij_javascript_space_before_type_colon = false
ij_javascript_space_before_unary_not = false
ij_javascript_space_before_while_keyword = true
ij_javascript_space_before_while_left_brace = true
ij_javascript_space_before_while_parentheses = true
ij_javascript_spaces_around_additive_operators = true
ij_javascript_spaces_around_arrow_function_operator = true
ij_javascript_spaces_around_assignment_operators = true
ij_javascript_spaces_around_bitwise_operators = true
ij_javascript_spaces_around_equality_operators = true
ij_javascript_spaces_around_logical_operators = true
ij_javascript_spaces_around_multiplicative_operators = true
ij_javascript_spaces_around_relational_operators = true
ij_javascript_spaces_around_shift_operators = true
ij_javascript_spaces_around_unary_operator = false
ij_javascript_spaces_within_array_initializer_brackets = false
ij_javascript_spaces_within_brackets = false
ij_javascript_spaces_within_catch_parentheses = false
ij_javascript_spaces_within_for_parentheses = false
ij_javascript_spaces_within_if_parentheses = false
ij_javascript_spaces_within_imports = false
ij_javascript_spaces_within_interpolation_expressions = false
ij_javascript_spaces_within_method_call_parentheses = false
ij_javascript_spaces_within_method_parentheses = false
ij_javascript_spaces_within_object_literal_braces = false
ij_javascript_spaces_within_object_type_braces = true
ij_javascript_spaces_within_parentheses = false
ij_javascript_spaces_within_switch_parentheses = false
ij_javascript_spaces_within_type_assertion = false
ij_javascript_spaces_within_union_types = true
ij_javascript_spaces_within_while_parentheses = false
ij_javascript_special_else_if_treatment = true
ij_javascript_ternary_operation_signs_on_next_line = false
ij_javascript_ternary_operation_wrap = off
ij_javascript_union_types_wrap = on_every_item
ij_javascript_use_chained_calls_group_indents = false
ij_javascript_use_double_quotes = true
ij_javascript_use_explicit_js_extension = auto
ij_javascript_use_import_type = auto
ij_javascript_use_path_mapping = always
ij_javascript_use_public_modifier = false
ij_javascript_use_semicolon_after_statement = true
ij_javascript_var_declaration_wrap = normal
ij_javascript_while_brace_force = never
ij_javascript_while_on_new_line = false
ij_javascript_wrap_comments = false
[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}]
ij_continuation_indent_size = 4
ij_php_align_assignments = false
ij_php_align_class_constants = false
ij_php_align_enum_cases = false
ij_php_align_group_field_declarations = false
ij_php_align_inline_comments = false
ij_php_align_key_value_pairs = false
ij_php_align_match_arm_bodies = false
ij_php_align_multiline_array_initializer_expression = true
ij_php_align_multiline_binary_operation = true
ij_php_align_multiline_chained_methods = false
ij_php_align_multiline_extends_list = false
ij_php_align_multiline_for = true
ij_php_align_multiline_parameters = true
ij_php_align_multiline_parameters_in_calls = false
ij_php_align_multiline_ternary_operation = false
ij_php_align_named_arguments = false
ij_php_align_phpdoc_comments = false
ij_php_align_phpdoc_param_names = false
ij_php_anonymous_brace_style = end_of_line
ij_php_api_weight = 28
ij_php_array_initializer_new_line_after_left_brace = true
ij_php_array_initializer_right_brace_on_new_line = true
ij_php_array_initializer_wrap = normal
ij_php_assignment_wrap = normal
ij_php_attributes_wrap = split_into_lines
ij_php_author_weight = 28
ij_php_binary_operation_sign_on_next_line = true
ij_php_binary_operation_wrap = normal
ij_php_blank_lines_after_class_header = 0
ij_php_blank_lines_after_function = 1
ij_php_blank_lines_after_imports = 1
ij_php_blank_lines_after_opening_tag = 0
ij_php_blank_lines_after_package = 0
ij_php_blank_lines_around_class = 1
ij_php_blank_lines_around_constants = 0
ij_php_blank_lines_around_enum_cases = 0
ij_php_blank_lines_around_field = 0
ij_php_blank_lines_around_method = 1
ij_php_blank_lines_before_class_end = 0
ij_php_blank_lines_before_imports = 1
ij_php_blank_lines_before_method_body = 0
ij_php_blank_lines_before_package = 1
ij_php_blank_lines_before_return_statement = 0
ij_php_blank_lines_between_imports = 0
ij_php_block_brace_style = end_of_line
ij_php_call_parameters_new_line_after_left_paren = false
ij_php_call_parameters_right_paren_on_new_line = false
ij_php_call_parameters_wrap = off
ij_php_catch_on_new_line = false
ij_php_category_weight = 28
ij_php_class_brace_style = end_of_line
ij_php_comma_after_last_argument = false
ij_php_comma_after_last_argument_style = when_multiline
ij_php_comma_after_last_array_element = false
ij_php_comma_after_last_closure_use_var = false
ij_php_comma_after_last_closure_use_var_style = when_multiline
ij_php_comma_after_last_match_arm = false
ij_php_comma_after_last_parameter = false
ij_php_comma_after_last_parameter_style = when_multiline
ij_php_concat_spaces = true
ij_php_copyright_weight = 28
ij_php_deprecated_weight = 28
ij_php_do_while_brace_force = always
ij_php_else_if_style = as_is
ij_php_else_on_new_line = false
ij_php_example_weight = 28
ij_php_extends_keyword_wrap = off
ij_php_extends_list_wrap = off
ij_php_fields_default_visibility = private
ij_php_filesource_weight = 28
ij_php_finally_on_new_line = false
ij_php_for_brace_force = never
ij_php_for_statement_new_line_after_left_paren = false
ij_php_for_statement_right_paren_on_new_line = false
ij_php_for_statement_wrap = off
ij_php_force_empty_classes_in_one_line = false
ij_php_force_empty_methods_in_one_line = true
ij_php_force_short_declaration_array_style = false
ij_php_getters_setters_naming_style = camel_case
ij_php_getters_setters_order_style = getters_first
ij_php_global_weight = 28
ij_php_group_use_wrap = on_every_item
ij_php_heredoc_on_same_line = false
ij_php_if_brace_force = always
ij_php_if_lparen_on_next_line = false
ij_php_if_rparen_on_next_line = false
ij_php_ignore_weight = 28
ij_php_import_sorting = alphabetic
ij_php_indent_break_from_case = true
ij_php_indent_case_from_switch = true
ij_php_indent_code_in_php_tags = false
ij_php_internal_weight = 28
ij_php_keep_blank_lines_after_lbrace = 2
ij_php_keep_blank_lines_before_right_brace = 2
ij_php_keep_blank_lines_in_code = 2
ij_php_keep_blank_lines_in_declarations = 2
ij_php_keep_control_statement_in_one_line = true
ij_php_keep_first_column_comment = true
ij_php_keep_indents_on_empty_lines = false
ij_php_keep_line_breaks = true
ij_php_keep_rparen_and_lbrace_on_one_line = false
ij_php_keep_simple_classes_in_one_line = false
ij_php_keep_simple_methods_in_one_line = false
ij_php_lambda_brace_style = end_of_line
ij_php_license_weight = 28
ij_php_line_comment_add_space = false
ij_php_line_comment_at_first_column = true
ij_php_link_weight = 28
ij_php_lower_case_boolean_const = true
ij_php_lower_case_keywords = true
ij_php_lower_case_null_const = true
ij_php_method_brace_style = end_of_line
ij_php_method_call_chain_wrap = off
ij_php_method_parameters_new_line_after_left_paren = false
ij_php_method_parameters_right_paren_on_new_line = false
ij_php_method_parameters_wrap = off
ij_php_method_weight = 28
ij_php_modifier_list_wrap = false
ij_php_multiline_chained_calls_first_call_on_new_line = false
ij_php_multiline_chained_calls_semicolon_on_new_line = false
ij_php_multiline_closure_lambda_on_new_line = false
ij_php_namespace_brace_style = 1
ij_php_new_line_after_php_opening_tag = true
ij_php_null_type_position = in_the_end
ij_php_package_weight = 28
ij_php_param_weight = 0
ij_php_parameters_attributes_wrap = off
ij_php_parentheses_expression_new_line_after_left_paren = false
ij_php_parentheses_expression_right_paren_on_new_line = false
ij_php_phpdoc_blank_line_before_tags = false
ij_php_phpdoc_blank_lines_around_parameters = false
ij_php_phpdoc_keep_blank_lines = true
ij_php_phpdoc_param_spaces_between_name_and_description = 1
ij_php_phpdoc_param_spaces_between_tag_and_type = 1
ij_php_phpdoc_param_spaces_between_type_and_name = 1
ij_php_phpdoc_use_fqcn = false
ij_php_phpdoc_wrap_long_lines = false
ij_php_place_assignment_sign_on_next_line = true
ij_php_place_parens_for_constructor = 0
ij_php_property_read_weight = 28
ij_php_property_weight = 28
ij_php_property_write_weight = 28
ij_php_return_type_on_new_line = false
ij_php_return_weight = 1
ij_php_see_weight = 28
ij_php_since_weight = 28
ij_php_sort_phpdoc_elements = true
ij_php_space_after_colon = true
ij_php_space_after_colon_in_enum_backed_type = true
ij_php_space_after_colon_in_named_argument = true
ij_php_space_after_colon_in_return_type = true
ij_php_space_after_comma = true
ij_php_space_after_for_semicolon = true
ij_php_space_after_quest = true
ij_php_space_after_type_cast = false
ij_php_space_after_unary_not = false
ij_php_space_before_array_initializer_left_brace = false
ij_php_space_before_catch_keyword = true
ij_php_space_before_catch_left_brace = true
ij_php_space_before_catch_parentheses = true
ij_php_space_before_class_left_brace = true
ij_php_space_before_closure_left_parenthesis = true
ij_php_space_before_colon = true
ij_php_space_before_colon_in_enum_backed_type = false
ij_php_space_before_colon_in_named_argument = false
ij_php_space_before_colon_in_return_type = false
ij_php_space_before_comma = false
ij_php_space_before_do_left_brace = true
ij_php_space_before_else_keyword = true
ij_php_space_before_else_left_brace = true
ij_php_space_before_finally_keyword = true
ij_php_space_before_finally_left_brace = true
ij_php_space_before_for_left_brace = true
ij_php_space_before_for_parentheses = true
ij_php_space_before_for_semicolon = false
ij_php_space_before_if_left_brace = true
ij_php_space_before_if_parentheses = true
ij_php_space_before_method_call_parentheses = false
ij_php_space_before_method_left_brace = true
ij_php_space_before_method_parentheses = false
ij_php_space_before_quest = true
ij_php_space_before_short_closure_left_parenthesis = false
ij_php_space_before_switch_left_brace = true
ij_php_space_before_switch_parentheses = true
ij_php_space_before_try_left_brace = true
ij_php_space_before_unary_not = false
ij_php_space_before_while_keyword = true
ij_php_space_before_while_left_brace = true
ij_php_space_before_while_parentheses = true
ij_php_space_between_ternary_quest_and_colon = false
ij_php_spaces_around_additive_operators = true
ij_php_spaces_around_arrow = false
ij_php_spaces_around_assignment_in_declare = false
ij_php_spaces_around_assignment_operators = true
ij_php_spaces_around_bitwise_operators = true
ij_php_spaces_around_equality_operators = true
ij_php_spaces_around_logical_operators = true
ij_php_spaces_around_multiplicative_operators = true
ij_php_spaces_around_null_coalesce_operator = true
ij_php_spaces_around_pipe_in_union_type = false
ij_php_spaces_around_relational_operators = true
ij_php_spaces_around_shift_operators = true
ij_php_spaces_around_unary_operator = false
ij_php_spaces_around_var_within_brackets = false
ij_php_spaces_within_array_initializer_braces = false
ij_php_spaces_within_brackets = false
ij_php_spaces_within_catch_parentheses = false
ij_php_spaces_within_for_parentheses = false
ij_php_spaces_within_if_parentheses = false
ij_php_spaces_within_method_call_parentheses = false
ij_php_spaces_within_method_parentheses = false
ij_php_spaces_within_parentheses = false
ij_php_spaces_within_short_echo_tags = true
ij_php_spaces_within_switch_parentheses = false
ij_php_spaces_within_while_parentheses = false
ij_php_special_else_if_treatment = false
ij_php_subpackage_weight = 28
ij_php_ternary_operation_signs_on_next_line = false
ij_php_ternary_operation_wrap = off
ij_php_throws_weight = 2
ij_php_todo_weight = 28
ij_php_treat_multiline_arrays_and_lambdas_multiline = false
ij_php_unknown_tag_weight = 28
ij_php_upper_case_boolean_const = false
ij_php_upper_case_null_const = false
ij_php_uses_weight = 28
ij_php_var_weight = 28
ij_php_variable_naming_style = camel_case
ij_php_version_weight = 28
ij_php_while_brace_force = always
ij_php_while_on_new_line = false
[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,.ws-context,composer.lock,jest.config}]
indent_size = 2
ij_json_array_wrapping = split_into_lines
ij_json_keep_blank_lines_in_code = 0
ij_json_keep_indents_on_empty_lines = false
ij_json_keep_line_breaks = true
ij_json_keep_trailing_comma = false
ij_json_object_wrapping = split_into_lines
ij_json_property_alignment = do_not_align
ij_json_space_after_colon = true
ij_json_space_after_comma = true
ij_json_space_before_colon = false
ij_json_space_before_comma = false
ij_json_spaces_within_braces = false
ij_json_spaces_within_brackets = false
ij_json_wrap_long_lines = false
[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
ij_html_add_new_line_before_tags = body, div, p, form, h1, h2, h3
ij_html_align_attributes = true
ij_html_align_text = false
ij_html_attribute_wrap = normal
ij_html_block_comment_add_space = false
ij_html_block_comment_at_first_column = true
ij_html_do_not_align_children_of_min_lines = 0
ij_html_do_not_break_if_inline_tags = title, h1, h2, h3, h4, h5, h6, p
ij_html_do_not_indent_children_of_tags = html, body, thead, tbody, tfoot
ij_html_enforce_quotes = false
ij_html_inline_tags = a, abbr, acronym, b, basefont, bdo, big, br, cite, cite, code, dfn, em, font, i, img, input, kbd, label, q, s, samp, select, small, span, strike, strong, sub, sup, textarea, tt, u, var
ij_html_keep_blank_lines = 2
ij_html_keep_indents_on_empty_lines = false
ij_html_keep_line_breaks = true
ij_html_keep_line_breaks_in_text = true
ij_html_keep_whitespaces = false
ij_html_keep_whitespaces_inside = span, pre, textarea
ij_html_line_comment_at_first_column = true
ij_html_new_line_after_last_attribute = never
ij_html_new_line_before_first_attribute = never
ij_html_quote_style = double
ij_html_remove_new_line_before_tags = br
ij_html_space_after_tag_name = false
ij_html_space_around_equality_in_attribute = false
ij_html_space_inside_empty_tag = false
ij_html_text_wrap = normal
[{*.http,*.rest}]
ij_continuation_indent_size = 4
ij_http-request_call_parameters_wrap = normal
ij_http-request_method_parameters_wrap = split_into_lines
ij_http-request_space_before_comma = true
ij_http-request_spaces_around_assignment_operators = true
[{*.markdown,*.md}]
ij_markdown_force_one_space_after_blockquote_symbol = true
ij_markdown_force_one_space_after_header_symbol = true
ij_markdown_force_one_space_after_list_bullet = true
ij_markdown_force_one_space_between_words = true
ij_markdown_format_tables = true
ij_markdown_insert_quote_arrows_on_wrap = true
ij_markdown_keep_indents_on_empty_lines = false
ij_markdown_keep_line_breaks_inside_text_blocks = true
ij_markdown_max_lines_around_block_elements = 1
ij_markdown_max_lines_around_header = 1
ij_markdown_max_lines_between_paragraphs = 1
ij_markdown_min_lines_around_block_elements = 1
ij_markdown_min_lines_around_header = 1
ij_markdown_min_lines_between_paragraphs = 1
ij_markdown_wrap_text_if_long = true
ij_markdown_wrap_text_inside_blockquotes = true
[{*.yaml,*.yml}]
indent_size = 2
ij_yaml_align_values_properties = do_not_align
ij_yaml_autoinsert_sequence_marker = true
ij_yaml_block_mapping_on_new_line = false
ij_yaml_indent_sequence_value = true
ij_yaml_keep_indents_on_empty_lines = false
ij_yaml_keep_line_breaks = true
ij_yaml_line_comment_add_space = false
ij_yaml_line_comment_add_space_on_reformat = false
ij_yaml_line_comment_at_first_column = true
ij_yaml_sequence_on_new_line = false
ij_yaml_space_before_colon = false
ij_yaml_spaces_within_braces = true
ij_yaml_spaces_within_brackets = true

View File

@@ -1,10 +1,11 @@
APP_ENV=DEV
NODE_ENV=development
AZIENDA=studioml
LOGIN_JWT=true
AZIENDA=integry
ENABLED_PROFILES=
SERVICES_BASE_URL=http://localhost:8080
PUBLIC_URL=http://localhost/pvm
SC_PROJECT=
SC_SECURITY=
SC_SECURITY=

View File

@@ -4,11 +4,11 @@ module.exports = {
env: {
browser: true,
es6: true,
jquery: true
jquery: true,
},
parserOptions: {
ecmaVersion: 2022,
sourceType: "module"
sourceType: "module",
},
rules: {
"no-redeclare": "off",
@@ -16,7 +16,8 @@ module.exports = {
"no-unused-vars": "warn",
"no-extra-semi": "warn",
"no-useless-escape": "warn",
"no-delete-var": "warn"
"no-delete-var": "warn",
"no-warning-comments": ["error", {"terms": ["DONOTPUSH"]}],
},
ignorePatterns: ["public_html/assets/**", "public_html/vendor/**", "public_html/dist/**"],
overrides: [
@@ -32,4 +33,4 @@ module.exports = {
},
},
],
};
};

View File

@@ -1,6 +0,0 @@
{
"key1":{
"username":"alexs",
"password":"*0081iyAS"
}
}

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
*.sh eol=lf

25
.gitignore vendored
View File

@@ -1,16 +1,14 @@
!public_html/cache/IGNORATEMI.T87
.bin
*.css.map
*Thumbs.db
/exports
/images
/node_modules
nbproject/private/private.xml
public_html/node_modules
public_html/.htaccess
public_html/cache/*
public_html/classes/Restful.config.json
public_html/test.php
/public_html/node_modules
/public_html/vendor/
/public_html/cache/*
!public_html/cache/IGNORATEMI.T87
/public_html/classes/Restful.config.json
/public_html/scss/css/*.css
/public_html/gest-lib/*/css/*.css.map
@@ -24,6 +22,11 @@ public_html/test.php
.eslintcache
**/.sass-cache
# Mutagen project lock files
*.lock
docker-compose.override.yml
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
@@ -100,4 +103,8 @@ fabric.properties
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
.idea/caches/build_file_checksums.ser
copilot.*.xml
/.idea/dataSources.xml

7
.idea/codeStyles/Project.xml generated Normal file
View File

@@ -0,0 +1,7 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<codeStyleSettings language="PHP">
<option name="SPECIAL_ELSE_IF_TREATMENT" value="true" />
</codeStyleSettings>
</code_scheme>
</component>

View File

@@ -1,5 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default copy" />
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>

3
.idea/codeception.xml generated
View File

@@ -9,9 +9,6 @@
<Configuration>
<option name="path" value="$PROJECT_DIR$/public_html/tests" />
</Configuration>
<Configuration>
<option name="path" value="$PROJECT_DIR$/public_html/tests" />
</Configuration>
</list>
</option>
</component>

6
.idea/data_source_mapping.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourcePerFileMappings">
<file url="file://$PROJECT_DIR$/public_html/gest-lib/macchinari_prod/sql/getProductionLineData.sql" value="166173fd-28e1-41b6-bd7b-6b86f44fc66c" />
</component>
</project>

6
.idea/git_toolbox_blame.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GitToolBoxBlameSettings">
<option name="version" value="2" />
</component>
</project>

View File

@@ -30,6 +30,7 @@
</option>
<option name="myCustomValuesEnabled" value="true" />
</inspection_tool>
<inspection_tool class="JSCheckFunctionSignatures" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="TaskProblemsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
</profile>
</component>

View File

@@ -3,6 +3,21 @@
<component name="PhpDockerContainerSettings">
<list>
<map>
<entry key="567d2c7a-851a-482a-b1f0-351a5d183c75">
<value>
<DockerContainerSettings>
<option name="version" value="1" />
<option name="volumeBindings">
<list>
<DockerVolumeBindingImpl>
<option name="containerPath" value="/opt/project" />
<option name="hostPath" value="$PROJECT_DIR$" />
</DockerVolumeBindingImpl>
</list>
</option>
</DockerContainerSettings>
</value>
</entry>
<entry key="798c1055-f5cd-4fc7-94ce-172726f2f18a">
<value>
<DockerContainerSettings>

126
.idea/php.xml generated
View File

@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MessDetector">
<phpmd_settings>
<phpmd_by_interpreter asDefaultInterpreter="true" interpreter_id="95695835-a42f-49c0-a365-384bae95652b" timeout="30000" />
</phpmd_settings>
</component>
<component name="MessDetectorOptionsConfiguration">
<option name="transferred" value="true" />
</component>
@@ -9,6 +14,11 @@
<component name="PHPCodeSnifferOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PhpCodeSniffer">
<phpcs_settings>
<phpcs_by_interpreter asDefaultInterpreter="true" interpreter_id="567d2c7a-851a-482a-b1f0-351a5d183c75" timeout="30000" />
</phpcs_settings>
</component>
<component name="PhpDebugIgnoredPathsSettings">
<skipped_paths>
<skipped_path path="$PROJECT_DIR$/../REPO-IMAGES" />
@@ -16,18 +26,6 @@
</component>
<component name="PhpIncludePathManager">
<include_path>
<path value="$PROJECT_DIR$/public_html/vendor/athari/yalinqo" />
<path value="$PROJECT_DIR$/public_html/vendor/electrolinux/phpquery" />
<path value="$PROJECT_DIR$/public_html/vendor/phpseclib/phpseclib" />
<path value="$PROJECT_DIR$/public_html/vendor/mobiledetect/mobiledetectlib" />
<path value="$PROJECT_DIR$/public_html/vendor/phpoffice/phpexcel" />
<path value="$PROJECT_DIR$/public_html/vendor/jdorn/sql-formatter" />
<path value="$PROJECT_DIR$/public_html/vendor/mike42/escpos-php" />
<path value="$PROJECT_DIR$/public_html/vendor/nategood/httpful" />
<path value="$PROJECT_DIR$/public_html/vendor/composer" />
<path value="$PROJECT_DIR$/public_html/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/public_html/vendor/phpoption/phpoption" />
<path value="$PROJECT_DIR$/public_html/vendor/symfony/polyfill-ctype" />
<path value="$PROJECT_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/psr/simple-cache" />
<path value="$PROJECT_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/psr/log" />
<path value="$PROJECT_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/phpmyadmin/motranslator" />
@@ -68,24 +66,120 @@
<path value="$PROJECT_DIR$/public_html/config_aziende/MYSRL/vendor/psr/log" />
<path value="$PROJECT_DIR$/public_html/config_aziende/MYSRL/vendor/phpmyadmin/motranslator" />
<path value="$PROJECT_DIR$/public_html/config_aziende/MYSRL/vendor/psr/cache" />
<path value="$PROJECT_DIR$/public_html/vendor/nategood/httpful" />
<path value="$PROJECT_DIR$/public_html/vendor/phpseclib/phpseclib" />
<path value="$PROJECT_DIR$/public_html/vendor/electrolinux/phpquery" />
<path value="$PROJECT_DIR$/public_html/vendor/composer" />
<path value="$PROJECT_DIR$/public_html/vendor/phpoption/phpoption" />
<path value="$PROJECT_DIR$/public_html/vendor/mobiledetect/mobiledetectlib" />
<path value="$PROJECT_DIR$/public_html/vendor/mike42/escpos-php" />
<path value="$PROJECT_DIR$/public_html/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/public_html/vendor/jdorn/sql-formatter" />
<path value="$PROJECT_DIR$/public_html/vendor/athari/yalinqo" />
<path value="$PROJECT_DIR$/public_html/vendor/myclabs/php-enum" />
<path value="$PROJECT_DIR$/public_html/vendor/symfony/polyfill-ctype" />
<path value="$PROJECT_DIR$/public_html/vendor/psr/cache" />
<path value="$PROJECT_DIR$/public_html/vendor/psr/simple-cache" />
<path value="$PROJECT_DIR$/public_html/vendor/phpfastcache/phpfastcache" />
<path value="$PROJECT_DIR$/public_html/vendor/integrydev/phpexcel" />
<path value="$PROJECT_DIR$/public_html/vendor/ralouphie/getallheaders" />
<path value="$PROJECT_DIR$/public_html/vendor/paragonie/random_compat" />
<path value="$PROJECT_DIR$/public_html/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/public_html/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/public_html/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/public_html/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/public_html/vendor/symfony/polyfill-php72" />
<path value="$PROJECT_DIR$/public_html/vendor/symfony/polyfill-intl-idn" />
<path value="$PROJECT_DIR$/public_html/vendor/symfony/polyfill-intl-normalizer" />
<path value="$PROJECT_DIR$/public_html/vendor/symfony/polyfill-php70" />
</include_path>
</component>
<component name="PhpProjectServersManager">
<servers>
<server host="localpvm" id="5394f34d-47b0-4fe7-87c5-bce404508b30" name="localpvm" />
</servers>
<component name="PhpInterpreters">
<interpreters>
<interpreter id="567d2c7a-851a-482a-b1f0-351a5d183c75" name="pvm-php-apache:latest" home="docker://DATA" auto="false" debugger_id="php.debugger.XDebug">
<remote_data INTERPRETER_PATH="php" HELPERS_PATH="/opt/.phpstorm_helpers" VALID="true" RUN_AS_ROOT_VIA_SUDO="false" DOCKER_ACCOUNT_NAME="Docker" DOCKER_IMAGE_NAME="pvm-php-apache:latest" DOCKER_REMOTE_PROJECT_PATH="/opt/project" />
</interpreter>
</interpreters>
</component>
<component name="PhpInterpretersPhpInfoCache">
<phpInfoCache>
<interpreter name="pvm-php-apache:latest">
<phpinfo binary_type="PHP" php_cli="/usr/local/bin/php" path_separator=":" version="7.4.33">
<additional_php_ini>/usr/local/etc/php/conf.d/docker-php-ext-gd.ini, /usr/local/etc/php/conf.d/docker-php-ext-imagick.ini, /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini, /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini, /usr/local/etc/php/conf.d/docker-php-ext-zip.ini, /usr/local/etc/php/conf.d/error_reporting.ini</additional_php_ini>
<configuration_file>/usr/local/etc/php/php.ini</configuration_file>
<configuration_options>
<configuration_option name="include_path" value=".:/usr/local/lib/php" />
</configuration_options>
<debuggers>
<debugger_info debugger="xdebug" debugger_version="3.1.6">
<debug_extensions />
</debugger_info>
</debuggers>
<loaded_extensions>
<extension name="Core" />
<extension name="PDO" />
<extension name="Phar" />
<extension name="Reflection" />
<extension name="SPL" />
<extension name="SimpleXML" />
<extension name="ctype" />
<extension name="curl" />
<extension name="date" />
<extension name="dom" />
<extension name="fileinfo" />
<extension name="filter" />
<extension name="ftp" />
<extension name="gd" />
<extension name="hash" />
<extension name="iconv" />
<extension name="imagick" />
<extension name="json" />
<extension name="libxml" />
<extension name="mbstring" />
<extension name="mysqlnd" />
<extension name="openssl" />
<extension name="pcre" />
<extension name="pdo_sqlite" />
<extension name="posix" />
<extension name="readline" />
<extension name="session" />
<extension name="sodium" />
<extension name="sqlite3" />
<extension name="standard" />
<extension name="tokenizer" />
<extension name="xdebug" />
<extension name="xml" />
<extension name="xmlreader" />
<extension name="xmlwriter" />
<extension name="zip" />
<extension name="zlib" />
</loaded_extensions>
</phpinfo>
</interpreter>
</phpInfoCache>
</component>
<component name="PhpProjectSharedConfiguration">
<option name="suggestChangeDefaultLanguageLevel" value="false" />
</component>
<component name="PhpStan">
<PhpStan_settings>
<phpstan_by_interpreter asDefaultInterpreter="true" interpreter_id="1864307c-cd7f-480f-80fe-4bf27e854f94" timeout="60000" />
</PhpStan_settings>
</component>
<component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PhpUnit">
<phpunit_settings>
<phpunit_by_interpreter interpreter_id="567d2c7a-851a-482a-b1f0-351a5d183c75" custom_loader_path="C:/work/Prod_Web/PVM/public_html/vendor/autoload.php" />
<PhpUnitSettings custom_loader_path="$PROJECT_DIR$/public_html/vendor/autoload.php" />
</phpunit_settings>
</component>
<component name="Psalm">
<Psalm_settings>
<psalm_fixer_by_interpreter asDefaultInterpreter="true" interpreter_id="1864307c-cd7f-480f-80fe-4bf27e854f94" timeout="60000" />
</Psalm_settings>
</component>
<component name="PsalmOptionsConfiguration">
<option name="transferred" value="true" />
</component>

89
.idea/pvm.iml generated
View File

@@ -2,6 +2,8 @@
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/public_html/classes" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/BIOLEVANTE/monitoraggio_linee_v2" isTestSource="false" packagePrefix="BIOLEVANTE" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/DULCIAR/monitoraggio_linee_v2" isTestSource="false" packagePrefix="DULCIAR" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/DULCIAR/monitoraggio_linee_v2/tipo_prod" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/GRAMM/magazzino_prod" isTestSource="false" />
@@ -10,73 +12,32 @@
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/LEVANPLAST/monitoraggio_linee_v2" isTestSource="false" packagePrefix="LEVANPLAST" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/LICOR/monitoraggio_linee_v2" isTestSource="false" packagePrefix="LICOR" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/LICOR/monitoraggio_linee_v2/tipo_prod" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/modellini/include" isTestSource="false" packagePrefix="Modellini" />
<sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/report_area/classes" isTestSource="false" packagePrefix="ReportArea" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/DULCIAR/monitoraggio_linee_v2" isTestSource="false" packagePrefix="DULCIAR" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/DULCIAR/monitoraggio_linee_v2/tipo_prod" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/GRAMM/magazzino_prod" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/GRAMM/monitoraggio_linee_v2" isTestSource="false" packagePrefix="GRAMM" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/GRAMM/monitoraggio_linee_v2/tipo_prod" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/LEVANPLAST/monitoraggio_linee_v2" isTestSource="false" packagePrefix="LEVANPLAST" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/LICOR/monitoraggio_linee_v2" isTestSource="false" packagePrefix="LICOR" />
<sourceFolder url="file://$MODULE_DIR$/public_html/config_aziende/LICOR/monitoraggio_linee_v2/tipo_prod" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/modellini/include" isTestSource="false" packagePrefix="Modellini" />
<sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/monitoraggio_linee_v2/classes" isTestSource="false" packagePrefix="MonitoraggioLineeV2" />
<sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/report_area/classes" isTestSource="false" packagePrefix="ReportArea" />
<excludeFolder url="file://$MODULE_DIR$/.idea/dataSources" />
<excludeFolder url="file://$MODULE_DIR$/public_html/cache/*" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/vlucas/phpdotenv" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/phpoption/phpoption" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/symfony/polyfill-ctype" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/paragonie/random_compat" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/phpmyadmin/motranslator" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/psr/cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/psr/simple-cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/symfony/cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/symfony/expression-language" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/symfony/polyfill-apcu" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/FOLLIESGROUP/vendor/symfony/polyfill-php70" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/paragonie/random_compat" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/phpmyadmin/motranslator" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/psr/cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/psr/simple-cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/symfony/cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/symfony/expression-language" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/symfony/polyfill-apcu" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MIDEL/vendor/symfony/polyfill-php70" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/paragonie/random_compat" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/phpmyadmin/motranslator" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/psr/cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/psr/simple-cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/symfony/cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/symfony/expression-language" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/symfony/polyfill-apcu" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/MYSRL/vendor/symfony/polyfill-php70" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/paragonie/random_compat" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/phpmyadmin/motranslator" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/psr/cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/psr/simple-cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/symfony/cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/symfony/expression-language" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/symfony/polyfill-apcu" />
<excludeFolder url="file://$MODULE_DIR$/public_html/config_aziende/TWOBROTHERS/vendor/symfony/polyfill-php70" />
<excludeFolder url="file://$MODULE_DIR$/public_html/cache/MtbAartLink" />
<excludeFolder url="file://$MODULE_DIR$/public_html/cache/geo" />
<excludeFolder url="file://$MODULE_DIR$/public_html/cache/images" />
<excludeFolder url="file://$MODULE_DIR$/public_html/cache/mailsSent" />
<excludeFolder url="file://$MODULE_DIR$/public_html/cache/pdf" />
<sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/modellini/classes" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/public_html/gest-lib/report_area/classes" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/public_html/spec" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/public_html/tests" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/public_html/cache" />
<excludeFolder url="file://$MODULE_DIR$/public_html/node_modules" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor" />
<excludeFolder url="file://$MODULE_DIR$/public_html/dist" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/myclabs/php-enum" />
<excludeFolder url="file://$MODULE_DIR$/.bin" />
<excludeFolder url="file://$MODULE_DIR$/.idea/dataSources" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/athari/yalinqo" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/electrolinux/phpquery" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/jdorn/sql-formatter" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/mike42/escpos-php" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/mobiledetect/mobiledetectlib" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/nategood/httpful" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/phpoption/phpoption" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/phpseclib/phpseclib" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/symfony/polyfill-ctype" />
<excludeFolder url="file://$MODULE_DIR$/public_html/vendor/vlucas/phpdotenv" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="counter" level="application" />
</component>
</module>

View File

@@ -0,0 +1,19 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Mutagen daemon start" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value=".\.bin\mutagen\mutagen.exe daemon start" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="powershell.exe" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2">
<option name="RunConfigurationTask" enabled="false" run_configuration_name="Mutagen install" run_configuration_type="ShConfigurationType" />
</method>
</configuration>
</component>

View File

@@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Mutagen install" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value="$branch= &amp;git rev-parse --abbrev-ref HEAD; docker buildx build --load -t ($branch.Replace('/', '_').ToLower() + &quot;:latest&quot;) --build-arg SERVICES_BASE_URL=https://services.studioml.it --target=final-dev ." />
<option name="INDEPENDENT_SCRIPT_PATH" value="false" />
<option name="SCRIPT_PATH" value="$PROJECT_DIR$/install-mutagen.ps1" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
<option name="INTERPRETER_PATH" value="$PROJECT_DIR$/../../../Windows/System32/WindowsPowerShell/v1.0/powershell.exe" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_SCRIPT_FILE" value="true" />
<envs />
<method v="2" />
</configuration>
</component>

View File

@@ -0,0 +1,19 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Mutagen start" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value=".\.bin\mutagen\mutagen.exe project start" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="powershell.exe" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2">
<option name="RunConfigurationTask" enabled="false" run_configuration_name="Mutagen install" run_configuration_type="ShConfigurationType" />
</method>
</configuration>
</component>

View File

@@ -0,0 +1,19 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Mutagen terminate" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value=".\.bin\mutagen\mutagen.exe project terminate" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="powershell.exe" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs>
<env name="Path" value="./bin/mutagen" />
</envs>
<method v="2" />
</configuration>
</component>

11
.idea/runConfigurations/Nuovo_Modulo.xml generated Normal file
View File

@@ -0,0 +1,11 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Nuovo Modulo" type="js.build_tools.grunt">
<node-interpreter value="project" />
<gruntfile value="$PROJECT_DIR$/Gruntfile.js" />
<tasks>
<task value="Nuovo modulo" />
</tasks>
<envs />
<method v="2" />
</configuration>
</component>

View File

@@ -2,7 +2,6 @@
<configuration default="false" name="PVM" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="envFilePath" value="" />
<option name="commandLineOptions" value="--build" />
<option name="sourceFilePath" value="docker-compose.yml" />
</settings>

View File

@@ -7,6 +7,8 @@
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
<method v="2">
<option name="RunConfigurationTask" enabled="true" run_configuration_name="install" run_configuration_type="js.build_tools.npm" />
</method>
</configuration>
</component>

9
.idea/runConfigurations/install.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="install" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="install" />
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>

12
.idea/runConfigurations/lint.xml generated Normal file
View File

@@ -0,0 +1,12 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="lint" type="js.build_tools.npm" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="lint" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>

View File

@@ -7,6 +7,8 @@
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
<method v="2">
<option name="RunConfigurationTask" enabled="true" run_configuration_name="install" run_configuration_type="js.build_tools.npm" />
</method>
</configuration>
</component>

1
.idea/sqldialects.xml generated
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="file://$PROJECT_DIR$/public_html/gest-lib/macchinari_prod/sql/getProductionLineData.sql" dialect="TSQL" />
<file url="PROJECT" dialect="TSQL" />
</component>
</project>

8
.idea/startup.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectStartupSharedConfiguration">
<configurations>
<configuration id="npm.watch" name="watch" />
</configurations>
</component>
</project>

View File

@@ -14,7 +14,7 @@
<array />
</option>
<option name="outputFromStdout" value="false" />
<option name="program" value="sass" />
<option name="program" value="$PROJECT_DIR$/node_modules/.bin/sass" />
<option name="runOnExternalChanges" value="true" />
<option name="scopeName" value="GestLib" />
<option name="trackOnlyRoot" value="true" />
@@ -34,7 +34,7 @@
<array />
</option>
<option name="outputFromStdout" value="false" />
<option name="program" value="sass" />
<option name="program" value="$PROJECT_DIR$/node_modules/.bin/sass" />
<option name="runOnExternalChanges" value="true" />
<option name="scopeName" value="Assets" />
<option name="trackOnlyRoot" value="true" />
@@ -54,7 +54,7 @@
<array />
</option>
<option name="outputFromStdout" value="false" />
<option name="program" value="sass" />
<option name="program" value="$PROJECT_DIR$/node_modules/.bin/sass" />
<option name="runOnExternalChanges" value="true" />
<option name="scopeName" value="Scss" />
<option name="trackOnlyRoot" value="true" />
@@ -74,7 +74,7 @@
<array />
</option>
<option name="outputFromStdout" value="false" />
<option name="program" value="sass" />
<option name="program" value="$PROJECT_DIR$/node_modules/.bin/sass" />
<option name="runOnExternalChanges" value="true" />
<option name="scopeName" value="ConfigAziende" />
<option name="trackOnlyRoot" value="true" />

View File

@@ -1,6 +1,107 @@
FROM php:7.4-fpm
# syntax=docker/dockerfile:1
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
ARG NODE_VERSION="20"
ARG PHP_VERSION="7.4"
ARG AZIENDA="integry"
ARG NODE_ENV="production"
RUN chmod +x /usr/local/bin/install-php-extensions && \
install-php-extensions gd opcache xdebug imagick zip
# Compilatore js
FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-alpine AS builder
WORKDIR /app
COPY . .
ARG NODE_ENV
ENV NODE_ENV=$NODE_ENV
ARG TARGETOS
ARG TARGETARCH
RUN npm install --os $TARGETOS --cpu $TARGETARCH \
&& npm run build
RUN /bin/sh build.sh
# Unzip compilati
FROM --platform=$BUILDPLATFORM alpine AS exports
ARG AZIENDA
ENV AZIENDA=$AZIENDA
COPY --from=builder app/exports/_base.zip .
RUN unzip _base.zip -d ./unzip
COPY --from=builder app/exports/${AZIENDA}.zip .
RUN unzip ${AZIENDA}.zip -d ./unzip
# Immagine finale
FROM php:${PHP_VERSION}-apache-bullseye AS final
COPY --from=composer /usr/bin/composer /usr/bin/composer
RUN composer self-update
ARG AZIENDA
ENV AZIENDA=$AZIENDA
ENV SERVICES_BASE_URL="http://host.docker.internal:8080"
ENV PUBLIC_URL="http://localhost/pvm"
# Enable Apache modules to ensure proper functionality
RUN a2enmod rewrite
ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
COPY docker/php/php.ini $PHP_INI_DIR/php.ini
# Imposto la lingua delle date
ENV LC_TIME=it_IT.UTF-8
RUN apt-get update && apt-get install -y --no-install-recommends locales \
&& apt-get clean \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
&& echo it_IT.UTF-8 UTF-8 >> /etc/locale.gen \
&& locale-gen \
&& install-php-extensions \
gd \
imagick \
zip
COPY docker/apache/000-default.conf $APACHE_CONFDIR/sites-available/000-default.conf
WORKDIR /var/www/html
FROM final AS final-dev
COPY docker/php/conf.d/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
RUN install-php-extensions xdebug
COPY docker/php/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
COPY --from=builder --chown=www-data:www-data app ./pvm
RUN cd ./pvm/public_html && composer install
ARG BUILD_VERSION
ENV BUILD_VERSION=$BUILD_VERSION
USER www-data
RUN touch pvm/.env \
&& printenv | sed 's/\(^[^=]*\)=\(.*\)/\1="\2"/' > pvm/.env
EXPOSE 80
EXPOSE 9003
FROM final AS final-prod
RUN install-php-extensions opcache
COPY --from=exports --chown=www-data:www-data unzip .
RUN composer install --no-dev -o
ARG BUILD_VERSION
ENV BUILD_VERSION=$BUILD_VERSION
USER www-data
RUN touch .env \
&& printenv | sed 's/\(^[^=]*\)=\(.*\)/\1="\2"/' > .env
EXPOSE 80

43
Dockerfile.dev Normal file
View File

@@ -0,0 +1,43 @@
# syntax=docker/dockerfile:1
ARG PHP_VERSION="7.4"
# Immagine finale
FROM php:${PHP_VERSION}-apache-bullseye AS final
COPY --from=composer /usr/bin/composer /usr/bin/composer
RUN composer self-update
# Enable Apache modules to ensure proper functionality
RUN a2enmod rewrite
ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
COPY docker/php/php.ini $PHP_INI_DIR/php.ini
# Imposto la lingua delle date
ENV LC_TIME=it_IT.UTF-8
RUN apt-get update && apt-get install -y --no-install-recommends locales \
&& apt-get clean \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
&& echo it_IT.UTF-8 UTF-8 >> /etc/locale.gen \
&& locale-gen \
&& install-php-extensions \
gd \
imagick \
zip
COPY docker/apache/000-default.conf $APACHE_CONFDIR/sites-available/000-default.conf
WORKDIR /var/www/html
COPY docker/php/conf.d/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
RUN install-php-extensions xdebug
COPY docker/php/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
USER www-data
EXPOSE 80
EXPOSE 9003

View File

@@ -7,7 +7,7 @@ const _arr_aziende = [
{n: "cosmapack"},
{n: "didesi"},
{n: "didonna"},
{n: "dolce_bo"},
{n: "dolce_bonta"},
{n: "dulciar"},
{n: "florapulia"},
{n: "folliesgroup"},
@@ -16,6 +16,7 @@ const _arr_aziende = [
{n: "gramm"},
{n: "ime_te"},
{n: "ime_ba"},
{n: "integry"},
{n: "lamonarca"},
{n: "levanplast"},
{n: "licor"},
@@ -29,10 +30,11 @@ const _arr_aziende = [
{n: "of_demo"},
{n: "produzione"},
{n: "risto_cash"},
{n: "rossogargano"},
{n: "rossogargano", sub :["rossogarganocont"]},
{n: "sapori_veri", sub: ["dispensa"]},
{n: "smetar"},
{n: "suit", sub: ["santantonio", "carni_sardegna", "valpietro"]},
{n: "suit", sub: ["santantonio", "carni_sardegna", "valpietro", "suit_puglia"]},
{n: "tosca_cloud"},
{n: "tosca_ce"},
{n: "tosca_ba"},
{n: "tosca_mi"},
@@ -225,7 +227,7 @@ module.exports = function (grunt) {
timestamp: date.getTime()
}
};
grunt.file.write("public_html/build.json", JSON.stringify(build));
grunt.file.write("exports/tmp/build.json", JSON.stringify(build));
});
_arr_aziende.forEach(azienda => {
let nomeAzienda = azienda.n.toLowerCase();
@@ -321,7 +323,8 @@ function compress_getValues() {
expand: true,
cwd: "exports/_base",
src: ["**/*"],
dest: "/"
dest: "/",
dot: true
}
return ret;
}
@@ -438,10 +441,7 @@ function copy_getValues(grunt) {
arr_gestFileAzi.push("config_aziende/.htaccess");
let arr_copyValues = []; //["**", "!*.php", "!*.js", "!js/**", "!css/**", "!scss/**", "!assets/**", "!vendor/**", "!gest-lib/**", "!cache/**", "!config_aziende/**"];
//arr_copyValues = arr_copyValues.concat(arr_systemFile);
arr_copyValues = arr_copyValues.concat(arr_gestFileAzi);
//let arr_copyValues = []; //["**", "!*.php", "!*.js", "!js/**", "!css/**", "!scss/**", "!assets/**", "!vendor/**", "!gest-lib/**", "!cache/**", "!config_aziende/**"];
//arr_copyValues.push("!**/old/**");
/*
@@ -453,7 +453,7 @@ function copy_getValues(grunt) {
files: [
{
cwd: "public_html",
src: arr_copyValues.concat("!**/*.js", "!**/*.ts"),
src: arr_gestFileAzi,//.concat("!**/*.js", "!**/*.ts"),
dest: "exports/tmp", // + nomeAzienda.toUpperCase(),
expand: true,
options: {timestamp: true}
@@ -471,10 +471,20 @@ function copy_getValues(grunt) {
ret["assets"] = {
cwd: "public_html",
src: ["**", "!config_aziende/**", "!js/**", "!scss/**", "!css/**", "!gest-lib/**/*.js", "!dist/config_aziende/**"],
src: [
"**",
"!config_aziende/**",
"!js/**",
"!scss/**",
"!css/**",
"!gest-lib/**/*.js",
"!gest-lib/**/*.ts",
"!dist/config_aziende/**"
],
dest: "exports/_base", // + nomeAzienda.toUpperCase(),
expand: true,
options: {timestamp: true}
options: {timestamp: true},
dot: true
};
ret.build_folder = {

163
Jenkinsfile.groovy Normal file
View File

@@ -0,0 +1,163 @@
def defineNodeEnv() {
if (env.BRANCH_NAME == "master" || env.BRANCH_NAME.startsWith('main/')) {
return 'production'
} else {
return 'development'
}
}
pipeline {
agent any
options {
buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10'))
disableConcurrentBuilds()
skipDefaultCheckout true
}
environment {
AZIENDA = "integry"
NODE_ENV = defineNodeEnv()
}
stages {
stage("Prepare Ws") {
steps {
cleanWs deleteDirs: true, patterns: [[pattern: 'exports/', type: 'INCLUDE']]
checkout scm
}
}
stage("Build") {
steps {
script {
bat 'cd public_html && composer install --no-dev -o'
if (!env.BRANCH_NAME.startsWith('feature/')) {
echo "Building ${env.NODE_ENV} version"
nodejs('NodeJS 20.10.0') {
bat 'npm install'
bat 'npm run build'
// bat 'cd public_html && npm install --omit=dev'
if (env.NODE_ENV == 'development') {
bat '7za a public_html.zip "%WORKSPACE%\\public_html" -tzip'
} else if (env.NODE_ENV == 'production') {
bat 'grunt BuildAll'
}
}
}
stash excludes: 'exports,public_html.zip', name: 'docker-ws'
}
}
}
stage("Deploy") {
parallel {
stage("Update Master") {
steps {
script {
if (env.BRANCH_NAME == 'develop') {
archiveArtifacts artifacts: 'public_html.zip', onlyIfSuccessful: true
sshPublisher(publishers: [sshPublisherDesc(configName: 'Production Linux Web Server (192.168.3.13)',
transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: 'sudo /bin/chmod -R 777 /var/www/dev/pvm/cache',
execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+',
remoteDirectory: '', remoteDirectorySDF: false, removePrefix: '', sourceFiles: '')], usePromotionTimestamp: false,
useWorkspaceInPromotion: false, verbose: false)])
// ftpPublisher alwaysPublishFromMaster: false, masterNodeName: '',
// paramPublish: [parameterName: ""], continueOnError: false, failOnError: false,
// publishers: [[configName: 'Production Linux Web Server (ftp.studioml.it)',
// transfers: [[asciiMode: false, cleanRemote: true, excludes: '', flatten: false, makeEmptyDirs: true,
// noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/dev/pvm', remoteDirectorySDF: false,
// removePrefix: 'public_html/', sourceFiles: 'public_html/']], usePromotionTimestamp: false,
// useWorkspaceInPromotion: false, verbose: false]]
sshPublisher(publishers: [sshPublisherDesc(configName: 'Production Linux Web Server (192.168.3.13) (integry)',
transfers: [sshTransfer(cleanRemote: true, excludes: 'public_html/cache/', execCommand: '', execTimeout: 120000, flatten: false,
makeEmptyDirs: true, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/dev/pvm',
remoteDirectorySDF: false, removePrefix: 'public_html/', sourceFiles: 'public_html/')], usePromotionTimestamp: false,
useWorkspaceInPromotion: false, verbose: false)])
sshPublisher(publishers: [
sshPublisherDesc(configName: 'Production Linux Web Server (192.168.3.13)',
transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '''sudo /bin/mkdir /var/www/dev/pvm/cache
sudo /bin/chmod -R 777 /var/www/dev/pvm/cache''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false,
patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false,
removePrefix: '', sourceFiles: '')], usePromotionTimestamp: false,
useWorkspaceInPromotion: false, verbose: false)])
} else if (env.BRANCH_NAME == 'master') {
archiveArtifacts artifacts: 'exports\\*.zip', onlyIfSuccessful: true
sshPublisher(publishers: [sshPublisherDesc(configName: 'Production Linux Web Server (192.168.3.13)',
transfers: [sshTransfer(cleanRemote: false, excludes: '',
execCommand: 'sudo /bin/chmod -R 777 /var/www/portale/cache', execTimeout: 120000, flatten: false,
makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '',
remoteDirectorySDF: false, removePrefix: '', sourceFiles: '')], usePromotionTimestamp: false,
useWorkspaceInPromotion: false, verbose: false)])
// ftpPublisher alwaysPublishFromMaster: false, masterNodeName: '',
// paramPublish: [parameterName: ""], continueOnError: false, failOnError: false,
// publishers: [[configName: 'Production Linux Web Server (ftp.studioml.it)', transfers: [[asciiMode: false, cleanRemote: true, excludes: 'public_html/cache/', flatten: false, makeEmptyDirs: true, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/portale', remoteDirectorySDF: false, removePrefix: 'public_html/', sourceFiles: 'public_html/']], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false]]
sshPublisher(publishers: [sshPublisherDesc(configName: 'Production Linux Web Server (192.168.3.13) (integry)',
transfers: [sshTransfer(cleanRemote: true, excludes: 'public_html/cache/',
execCommand: '', execTimeout: 120000, flatten: false,
makeEmptyDirs: true, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/portale',
remoteDirectorySDF: false, removePrefix: 'public_html/', sourceFiles: 'public_html/')], usePromotionTimestamp: false,
useWorkspaceInPromotion: false, verbose: false)])
sshPublisher(publishers: [
sshPublisherDesc(configName: 'Production Linux Web Server (192.168.3.13)',
transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '''sudo /bin/mkdir /var/www/portale/cache
sudo /bin/chmod -R 777 /var/www/portale/cache''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false,
patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false,
removePrefix: '', sourceFiles: '')], usePromotionTimestamp: false,
useWorkspaceInPromotion: false, verbose: false)])
}
}
}
}
stage('Publish on Azure') {
steps {
script {
if (env.NODE_ENV == 'production') {
azureUpload fileShareName: 'storage-ci', filesPath: 'exports/*.zip', removePrefixPath: 'exports/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: "pvm/${env.BRANCH_NAME}"
}
}
}
}
stage('Docker Build') {
steps {
node('server-build') {
cleanWs()
unstash 'docker-ws'
echo "Building Docker image"
script {
def branchVersion = ""
if (env.BRANCH_NAME != "master") {
branchVersion = "-${env.BRANCH_NAME.toLowerCase().replace('/', '-')}"
}
def target = "final-prod"
if (env.NODE_ENV == "development" || env.BRANCH_NAME.startsWith('main/')) {
target = "final-dev"
}
bat """
podman build --platform linux/amd64 -t "git.studioml.it/integry/pvm${branchVersion}:latest" --build-arg NODE_ENV=${env.NODE_ENV} --build-arg BUILD_VERSION=${env.BUILD_TAG.replace(' ', '-')} --target ${target} .
"""
bat """
podman push git.studioml.it/integry/pvm${branchVersion}:latest"
"""
}
}
}
}
}
}
}
}

5
build.sh Normal file
View File

@@ -0,0 +1,5 @@
#!/bin/sh
if [ "${NODE_ENV}" = "production" ]; then
npm run grunt -- BuildAll
fi

View File

@@ -1,23 +1,23 @@
version: "3.9"
services:
php-fpm:
mutagen:
build: ./mutagen
restart: unless-stopped
init: true
container_name: pvm-mutagen
volumes:
- app:/app
php-apache:
build:
dockerfile: ./Dockerfile.dev
restart: unless-stopped
container_name: php-apache
extra_hosts:
- host.docker.internal:host-gateway
build: ./
volumes:
- ./:/var/www/html/pvm
- ./docker/php/php.ini:/usr/local/etc/php/php.ini
- ./docker/php/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
- ./docker/php/conf.d/error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini
apache:
restart: unless-stopped
build:
context: .
dockerfile: ./docker/apache/Dockerfile
ports:
- "80:80"
volumes:
- ./:/var/www/html/pvm
depends_on:
- php-fpm
- app:/var/www/html/pvm
volumes:
app:

View File

@@ -0,0 +1,51 @@
ServerName localhost
<VirtualHost *:80>
# The ServerName directive sets the request scheme, hostname and port that
# the server uses to identify itself. This is used when creating
# redirection URLs. In the context of virtual hosts, the ServerName
# specifies what hostname must appear in the request's Host: header to
# match this virtual host. For the default virtual host (this file) this
# value is not decisive as it is used as a last resort host regardless.
# However, you must set it for any further virtual host explicitly.
# ServerName localhost
ServerAdmin webmaster@localhost
DocumentRoot /var/www/html
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
# It is also possible to configure the loglevel for particular
# modules, e.g.
#LogLevel info ssl:warn
# Directory configuration for the DocumentRoot
<Directory /var/www/html/>
DirectoryIndex index.php
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
# For most configuration files from conf-available/, which are
# enabled or disabled at a global level, it is possible to
# include a line for only one particular virtual host. For example the
# following line enables the CGI configuration for this host only
# after it has been globally disabled with "a2disconf".
#Include conf-available/serve-cgi-bin.conf
# Proxy PHP requests to port 9000 PHP-FPM container
<IfModule mod_proxy.c>
ProxyTimeout 259200
<FilesMatch \.php$>
Require all granted
SetHandler proxy:fcgi://${PHP_HOST}:${PHP_PORT}
</FilesMatch>
</IfModule>
</VirtualHost>
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

View File

@@ -1,15 +0,0 @@
FROM httpd:2.4
COPY ./docker/apache/apache.vhost.conf /usr/local/apache2/conf/extra/apache.vhost.conf
RUN echo "Include /usr/local/apache2/conf/extra/apache.vhost.conf" >> /usr/local/apache2/conf/httpd.conf
# Enable Apache modules to ensure proper functionality
RUN sed -i \
# Uncomment the configuration for mod_deflate to enable compression
-e '/#LoadModule deflate_module/s/^#//g' \
# Uncomment the configuration for mod_proxy to enable proxying capabilities
-e '/#LoadModule proxy_module/s/^#//g' \
# Uncomment the configuration for mod_proxy_fcgi to enable FastCGI proxy module
-e '/#LoadModule proxy_fcgi_module/s/^#//g' \
-e '/#LoadModule rewrite_module/s/^#//g' \
/usr/local/apache2/conf/httpd.conf

View File

@@ -1,23 +0,0 @@
# Set the ServerName to localhost
ServerName localhost
# Configure a VirtualHost to handle requests on port 80
<VirtualHost *:80>
# Proxy PHP requests to port 9000 PHP-FPM container
ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://php-fpm:9000/var/www/html/$1 timeout=259200
# Set the DocumentRoot for the virtual host
DocumentRoot /var/www/html/
# Directory configuration for the DocumentRoot
<Directory /var/www/html/>
DirectoryIndex index.php
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
</Directory>
# Define the CustomLog and ErrorLog destinations
CustomLog /proc/self/fd/1 common
ErrorLog /proc/self/fd/2
</VirtualHost>

View File

@@ -184,7 +184,7 @@ engine = On
; Development Value: Off
; Production Value: Off
; http://php.net/short-open-tag
short_open_tag = On
short_open_tag = Off
; The number of significant digits displayed in floating point numbers.
; http://php.net/precision
@@ -362,7 +362,7 @@ zend.enable_gc = On
;zend.script_encoding =
; Allows to include or exclude arguments from stack traces generated for exceptions.
; In production, it is recommended to turn this setting on to prohibit the output
; In production, it is recommended to turn this setting on to prohibit the output
; of sensitive information in stack traces
; Default: Off
zend.exception_ignore_args = Off
@@ -406,7 +406,7 @@ max_input_vars = 10000
; Maximum amount of memory a script may consume
; http://php.net/memory-limit
memory_limit = 256M
memory_limit = 2G
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Error handling and logging ;
@@ -640,7 +640,7 @@ report_memleaks = On
; Development Value: "GPCS"
; Production Value: "GPCS";
; http://php.net/variables-order
variables_order = "GPCS"
variables_order = "EGPCS"
; This directive determines which super global data (G,P & C) should be
; registered into the super global array REQUEST. If so, it also determines
@@ -1053,7 +1053,7 @@ date.timezone = Europe/Rome
[Pdo_mysql]
; Default socket name for local MySQL connects. If empty, uses the built-in
; MySQL defaults.
pdo_mysql.default_socket=
pdo_mysql.default_socket =
[Phar]
; http://php.net/phar.readonly
@@ -1739,16 +1739,16 @@ tidy.clean_output = Off
[soap]
; Enables or disables WSDL caching feature.
; http://php.net/soap.wsdl-cache-enabled
soap.wsdl_cache_enabled=1
soap.wsdl_cache_enabled = 1
; Sets the directory name where SOAP extension will put cache files.
; http://php.net/soap.wsdl-cache-dir
soap.wsdl_cache_dir="/tmp"
soap.wsdl_cache_dir = "/tmp"
; (time to live) Sets the number of second while cached file will be used
; instead of original one.
; http://php.net/soap.wsdl-cache-ttl
soap.wsdl_cache_ttl=86400
soap.wsdl_cache_ttl = 86400
; Sets the size of the cache limit. (Max. number of WSDL files to cache)
soap.wsdl_cache_limit = 5
@@ -1766,20 +1766,20 @@ ldap.max_links = -1
[opcache]
; Determines if Zend OPCache is enabled
;opcache.enable=1
opcache.enable=1
; Determines if Zend OPCache is enabled for the CLI version of PHP
;opcache.enable_cli=0
; The OPcache shared memory storage size.
;opcache.memory_consumption=128
opcache.memory_consumption=128
; The amount of memory for interned strings in Mbytes.
;opcache.interned_strings_buffer=8
opcache.interned_strings_buffer=8
; The maximum number of keys (scripts) in the OPcache hash table.
; Only numbers between 200 and 1000000 are allowed.
;opcache.max_accelerated_files=10000
opcache.max_accelerated_files=4000
; The maximum percentage of "wasted" memory until a restart is scheduled.
;opcache.max_wasted_percentage=5
@@ -1797,17 +1797,17 @@ ldap.max_links = -1
; How often (in seconds) to check file timestamps for changes to the shared
; memory storage allocation. ("1" means validate once per second, but only
; once per request. "0" means always validate)
;opcache.revalidate_freq=2
opcache.revalidate_freq=60
; Enables or disables file search in include_path optimization
;opcache.revalidate_path=0
; If disabled, all PHPDoc comments are dropped from the code to reduce the
; size of the optimized code.
;opcache.save_comments=1
opcache.save_comments=0
; Allow file existence override (file_exists, etc.) performance feature.
;opcache.enable_file_override=0
opcache.enable_file_override=1
; A bitmask, where each bit enables or disables the appropriate OPcache
; passes
@@ -1944,4 +1944,4 @@ ldap.max_links = -1
;ffi.enable=preload
; List of headers files to preload, wildcard patterns allowed.
;ffi.preload=
;ffi.preload=

38
install-mutagen.ps1 Normal file
View File

@@ -0,0 +1,38 @@
# Definisci il percorso in cui cercare l'eseguibile
$mutagenPath = ".bin\mutagen\mutagen.exe"
# Verifica se Mutagen è già installato
if (Test-Path $mutagenPath) {
Write-Host "Mutagen e' gia' installato nella cartella: $mutagenPath"
} else {
Write-Host "Mutagen non e' stato trovato. Procedo con l'installazione..."
# URL per il download di Mutagen
$mutagenUrl = "https://github.com/mutagen-io/mutagen/releases/download/v0.18.1/mutagen_windows_amd64_v0.18.1.zip"
$downloadPath = ".bin\mutagen.zip"
$extractPath = ".bin\mutagen"
# Crea la cartella finale (se non esiste già)
if (-not (Test-Path ".bin")) {
New-Item -ItemType Directory -Path ".bin"
}
# Scarica Mutagen
Invoke-WebRequest -Uri $mutagenUrl -OutFile $downloadPath
# Estrai il file zip nella cartella "mutagen"
Expand-Archive -Path $downloadPath -DestinationPath $extractPath
# Rimuovi il file zip
$maxTries = 5
$try = 0
while ($try -lt $maxTries) {
try {
Remove-Item -Path $downloadPath -ErrorAction Stop
break # Se va a buon fine, esci dal ciclo
} catch {
Start-Sleep -Seconds 1
$try++
}
}
}

44
mutagen.yml Normal file
View File

@@ -0,0 +1,44 @@
# Set up the Mutagen service and code volume before creating sessions.
beforeCreate:
- docker compose up --build --detach mutagen
# Set up the main services after creating sessions. At this point, sessions will
# have been established and code pushed to the shared volume.
afterCreate:
- docker compose up --build --detach
# Pause services after pausing sessions.
afterPause:
- docker compose stop
# Resume services before resume sessions.
beforeResume:
- docker compose start
# Tear down all services and remove the code volume after terminating sessions.
afterTerminate:
- docker-compose down --rmi=local --volumes
sync:
defaults:
flushOnCreate: true
ignore:
vcs: true
app:
alpha: "."
beta: "docker://pvm-mutagen/app"
mode: "two-way-resolved"
ignore:
paths:
- ".git*"
- ".idea"
- ".bin"
- ".devcontainer"
- ".editorconfig"
- ".eslint*"
- "docker-compose.yml"
- "Dockerfile"
- "install-mutagen.ps1"
- "mutagen"
- "mutagen.yml"
- "run-docker.ps1"

16
mutagen/Dockerfile Normal file
View File

@@ -0,0 +1,16 @@
# Use a minimal base image.
FROM alpine:latest
RUN set -x \
&& adduser -u 33 -D -S -G www-data www-data
# Create the directory that will be used as a volume and set owner
RUN mkdir -p /app && chown www-data:www-data /app
USER www-data:www-data
# Declare the volume (optional, for documentation purposes)
VOLUME /app
# Run a no-op entry point and wait to host Mutagen agent processes.
ENTRYPOINT ["tail", "-f", "/dev/null"]

8177
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -8,17 +8,18 @@
"test": "test"
},
"scripts": {
"postinstall": "node postinstall.js",
"clean": "rimraf public_html/dist",
"lint": "eslint . --fix --cache",
"clean": "del-cli public_html/dist",
"build": "npm run clean && tsc",
"build:watch": "npm run build -- --watch",
"grunt": "grunt",
"lint": "eslint . --fix --cache",
"postinstall": "node postinstall.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"pre-commit": [
"lint"
],
"devDependencies": {
"dependencies": {
"@ihvh/air-datepicker-types": "^2.0.2",
"@types/bootstrap": "^3.3.42",
"@types/chart.js": "^2.9.37",
@@ -26,17 +27,17 @@
"@types/daterangepicker": "^3.1.8",
"@types/jquery": "^3.5.16",
"@types/jqueryui": "^1.12.16",
"@types/systemjs": "^6.13.1",
"@types/tableau": "^2.2.4",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.57.1",
"del-cli": "^6.0.0",
"eslint": "^8.37.0",
"grunt": "^0.4.5",
"grunt-cli": "^1.2.0",
"grunt-contrib-clean": "^0.5.0",
"grunt-contrib-compress": "^1.4.3",
"grunt-contrib-copy": "^0.4.1",
"grunt-contrib-cssmin": "^0.14.0",
"grunt-contrib-cssmin": "^5.0.0",
"grunt-contrib-htmlmin": "^0.6.0",
"grunt-contrib-rename": "^0.2.0",
"grunt-contrib-uglify": "^4.0.0",
@@ -53,8 +54,8 @@
"grunt-string-replace": "^1.3.1",
"number-ticker": "file:public_html/assets/number-ticker",
"pre-commit": "^1.2.2",
"rimraf": "^4.4.1",
"typescript": "^5.0.3"
"sass": "^1.86.3",
"typescript": "~5.0.3"
},
"author": "",
"license": "ISC"

View File

@@ -1,7 +1,3 @@
if (process.env.NODE_ENV === "production") {
process.exit();
}
const {spawn} = require('child_process');
const cmd = "cd public_html && npm install";

10
public_html/.htaccess Normal file
View File

@@ -0,0 +1,10 @@
<IfModule mod_mime.c>
AddType text/javascript js mjs
</IfModule>
<IfModule headers_module>
<FilesMatch "\.(js|mjs|css)$">
Header set Cache-Control "public, must-revalidate, max-age=3600"
Header unset Etag
</FilesMatch>
</IfModule>

View File

@@ -0,0 +1,33 @@
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include_once "include/module.php";
include Controller::current_mainClasspath(false);
(new Ajax())->checkAjaxRequests();
?>
<!DOCTYPE html>
<!--html manifest="manifest.appcache"-->
<html lang="it">
<head>
<?php include pvm_tagHead; ?>
</head>
<body>
<?php include pvm_headerNavbar; ?>
<?php include pvm_splashScreen; ?>
<div id="content">
<div><?php
include pvm_navTab;
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
} else {
include Controller::current_gestpath_mainPage();
} ?>
</div>
</div>
<?php include pvm_footerMinimal; ?>
</body>
</html>

View File

@@ -0,0 +1,33 @@
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include_once "include/module.php";
include Controller::current_mainClasspath();
(new Ajax())->checkAjaxRequests();
?>
<!DOCTYPE html>
<!--html manifest="manifest.appcache"-->
<html lang="it">
<head>
<?php include pvm_tagHead; ?>
</head>
<body>
<?php include pvm_headerNavbar; ?>
<?php include pvm_splashScreen; ?>
<div id="content">
<div><?php
include pvm_navTab;
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
} else {
include Controller::current_gestpath_mainPage();
} ?>
</div>
</div>
<?php include pvm_footerMinimal; ?>
</body>
</html>

View File

@@ -1,9 +1,10 @@
<?
session_start();
include "functions.php";
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include "config.php";
include "include/module.php";
include_once "include/module.php";
include Controller::current_mainClasspath();
include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
<!--html manifest="manifest.appcache"-->
<html>
<head>
<? include pvm_tagHead; ?>
<?php include pvm_tagHead; ?>
</head>
<body>
<? include pvm_headerNavbar; ?>
<?php include pvm_headerNavbar; ?>
<div id="content">
<div><?
<div><?php
include pvm_navTab;
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
@@ -32,6 +33,6 @@ include Controller::current_gestpath_include("ajax.php");
} ?>
</div>
</div>
<? include pvm_footerMinimal; ?>
<?php include pvm_footerMinimal; ?>
</body>
</html>
</html>

View File

@@ -1,9 +1,10 @@
<?
session_start();
include "functions.php";
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include "config.php";
include "include/module.php";
include_once "include/module.php";
include Controller::current_mainClasspath();
include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
<!--html manifest="manifest.appcache"-->
<html>
<head>
<? include pvm_tagHead; ?>
<?php include pvm_tagHead; ?>
</head>
<body>
<? include pvm_headerNavbar; ?>
<?php include pvm_headerNavbar; ?>
<div id="content">
<div><?
<div><?php
include pvm_navTab;
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
} ?>
</div>
</div>
<? include pvm_footerMinimal; ?>
<?php include pvm_footerMinimal; ?>
</body>
</html>
</html>

View File

@@ -1,27 +1,24 @@
<?
session_start();
include "functions.php";
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
if (!isset($_GET["render"])) {
require_once "include_login.php";
}
include "config.php";
/*
if(!class_exists("Allegati")){
include Controller::current_gestpath_classes("Allegati.class.php");
}*/
include Controller::current_gestpath_include("ajax.php");
(new AllegatiAjax())->checkAjaxRequests();
?>
<!DOCTYPE html>
<!--html manifest="manifest.appcache"-->
<html>
<head>
<? include pvm_tagHead; ?>
<?php include pvm_tagHead; ?>
</head>
<body>
<? include pvm_headerNavbar; ?>
<?php include pvm_headerNavbar; ?>
<div id="content">
<div><?
<div><?php
include pvm_navTab;
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
@@ -30,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
} ?>
</div>
</div>
<? include pvm_footerMinimal; ?>
<?php include pvm_footerMinimal; ?>
</body>
</html>
</html>

View File

@@ -1,9 +1,10 @@
<?
session_start();
include "functions.php";
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include "config.php";
include "include/module.php";
include_once "include/module.php";
include Controller::current_mainClasspath();
include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
<!--html manifest="manifest.appcache"-->
<html>
<head>
<? include pvm_tagHead; ?>
<?php include pvm_tagHead; ?>
</head>
<body>
<? include pvm_headerNavbar; ?>
<?php include pvm_headerNavbar; ?>
<div id="content">
<div><?
<div><?php
include pvm_navTab;
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
} ?>
</div>
</div>
<? include pvm_footerMinimal; ?>
<?php include pvm_footerMinimal; ?>
</body>
</html>
</html>

View File

@@ -1,9 +1,10 @@
<?php
session_start();
include "functions.php";
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include "config.php";
include "include/module.php";
include_once "include/module.php";
include Controller::current_mainClasspath();
$className = "AnalisiBudget" . Utility\Str::ucfirst(preg_replace("/[^A-Za-z0-9\\-]/", "", User::get_current_profileDb()));
@@ -31,4 +32,4 @@ $className = "AnalisiBudget" . Utility\Str::ucfirst(preg_replace("/[^A-Za-z0-9\\
</div>
<?php include pvm_footerMinimal; ?>
</body>
</html>
</html>

View File

@@ -0,0 +1,33 @@
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include_once "include/module.php";
include Controller::current_mainClasspath();
(new Ajax())->checkAjaxRequests();
?>
<!DOCTYPE html>
<!--html manifest="manifest.appcache"-->
<html lang="it">
<head>
<?php include pvm_tagHead; ?>
</head>
<body>
<?php include pvm_headerNavbar; ?>
<?php include pvm_splashScreen; ?>
<div id="content">
<div><?php
include pvm_navTab;
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
} else {
include Controller::current_gestpath_mainPage();
} ?>
</div>
</div>
<?php include pvm_footerMinimal; ?>
</body>
</html>

View File

@@ -0,0 +1,32 @@
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include_once "include/module.php";
include Controller::current_mainClasspath(false);
(new Ajax())->checkAjaxRequests();
?>
<!DOCTYPE html>
<!--html manifest="manifest.appcache"-->
<html>
<head>
<?php include pvm_tagHead; ?>
</head>
<body>
<?php include pvm_headerNavbar; ?>
<?php include pvm_splashScreen; ?>
<?php
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
} else {
include Controller::current_gestpath_mainPage();
} ?>
<?php include pvm_footerMinimal; ?>
</body>
</html>

View File

@@ -1,10 +1,8 @@
<?php
session_start();
include "functions.php";
require_once "include_login.php";
include "config.php";
include "include/module.php";
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
$className = null;
$methodData = Ajax::getMethodData();
@@ -18,7 +16,7 @@ if (isset($methodName) && isset($type)) {
$className = ucfirst(camelCaseEncode($data[0]));
$newMethodName = $data[1];
$var = $type ? $_GET : $_POST;
$var = $type === "GET" ? $_GET : $_POST;
$methodValue = $var[$methodName];
unset($var[$methodName]);

View File

@@ -1,9 +1,10 @@
<?
session_start();
include "functions.php";
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include "config.php";
include "include/module.php";
include_once "include/module.php";
include Controller::current_mainClasspath();
include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
<!--html manifest="manifest.appcache"-->
<html>
<head>
<? include pvm_tagHead; ?>
<?php include pvm_tagHead; ?>
</head>
<body>
<? include pvm_headerNavbar; ?>
<?php include pvm_headerNavbar; ?>
<div id="content">
<div><?
<div><?php
include pvm_navTab;
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
} ?>
</div>
</div>
<? include pvm_footerMinimal; ?>
<?php include pvm_footerMinimal; ?>
</body>
</html>
</html>

View File

@@ -1,9 +1,10 @@
<?
session_start();
include "functions.php";
<?php
include_once "session.php";
$session = getSession();
include_once "functions.php";
include_once "config.php";
require_once "include_login.php";
include "config.php";
include "include/module.php";
include_once "include/module.php";
include Controller::current_mainClasspath();
include Controller::current_gestpath_include("ajax.php");
@@ -12,12 +13,12 @@ include Controller::current_gestpath_include("ajax.php");
<!--html manifest="manifest.appcache"-->
<html>
<head>
<? include pvm_tagHead; ?>
<?php include pvm_tagHead; ?>
</head>
<body>
<? include pvm_headerNavbar; ?>
<?php include pvm_headerNavbar; ?>
<div id="content">
<div><?
<div><?php
include pvm_navTab;
if (!PVM\CurrentModule::isAuthorizedToCurrentUser()) {
include pvm_unauthorized;
@@ -26,6 +27,6 @@ include Controller::current_gestpath_include("ajax.php");
} ?>
</div>
</div>
<? include pvm_footerMinimal; ?>
<?php include pvm_footerMinimal; ?>
</body>
</html>
</html>

View File

@@ -11,7 +11,8 @@
"lodash",
"moment",
"date-formats",
"animate"
"animate",
"sodium"
]
},
"std-pkg": {
@@ -29,6 +30,7 @@
"date-formats",
"animate",
"firebase",
"sodium",
"navbar"
]
},
@@ -154,12 +156,6 @@
"assets/graphic/Chart.min.js"
]
},
"json-editor": {
"js": [
"assets/jsoneditor/jsoneditor.min.js",
"assets/jsoneditor/jsoneditor.language.it.js"
]
},
"trumbowyg": {
"js": [
"assets/trumbowyg/trumbowyg.customized.js",
@@ -220,16 +216,21 @@
"md5": {
"js": [
"assets/md5.js"
],
"ts": [
"assets/md5.js"
]
},
"moment": {
"js": [
"assets/moment-with-locales.js",
"assets/moment-duration-format.js"
"assets/moment-duration-format.js",
"assets/moment-config.js"
],
"ts": [
"assets/moment-with-locales.js",
"assets/moment-duration-format.js"
"assets/moment-duration-format.js",
"assets/moment-config.js"
]
},
"URI": {
@@ -394,8 +395,8 @@
"assets/kendo/js/messages/kendo.messages.it-IT.min.js"
],
"css": [
"https://unpkg.com/@progress/kendo-font-icons/dist/index.css",
"assets/kendo/styles/default-main.css"
"assets/kendo/styles/default-main.css",
"assets/kendo/styles/kendo-font-icons/index.css"
]
},
"amcharts": {
@@ -492,11 +493,6 @@
"assets/printThis/printThis.min.js"
]
},
"systemjs": {
"js": [
"assets/system.min.js"
]
},
"tableau": {
"js": [
"https://online.tableau.com/javascripts/api/tableau-2.9.1.min.js"
@@ -510,9 +506,33 @@
"assets/visibility/visibility.min.js"
]
},
"sodium": {
"js": [
"node_modules/sodium-plus/dist/sodium-plus.min.js"
],
"ts": [
"node_modules/sodium-plus/dist/sodium-plus.min.js"
]
},
"masonry": {
"js": [
"assets/masonry.pkgd.min.js"
]
},
"navbar": {
"js": [
"assets/navbar/navbar.js"
"dist/js/navbar.module.js"
],
"ts": [
"dist/js/navbar.module.js"
]
},
"sidebar": {
"js": [
"assets/jquery.sidebar.min.js"
],
"ts": [
"assets/jquery.sidebar.min.js"
]
}
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 684 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 2.3 MiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 2.1 MiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 1.9 MiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 1.5 MiB

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!-- Font Awesome Pro 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M103.3 344.3c-6.5-14.2-6.9-18.3 7.4-23.1 25.6-8 8 9.2 43.2 49.2h.3v-93.9c1.2-50.2 44-92.2 97.7-92.2 53.9 0 97.7 43.5 97.7 96.8 0 63.4-60.8 113.2-128.5 93.3-10.5-4.2-2.1-31.7 8.5-28.6 53 0 89.4-10.1 89.4-64.4 0-61-77.1-89.6-116.9-44.6-23.5 26.4-17.6 42.1-17.6 157.6 50.7 31 118.3 22 160.4-20.1 24.8-24.8 38.5-58 38.5-93 0-35.2-13.8-68.2-38.8-93.3-24.8-24.8-57.8-38.5-93.3-38.5s-68.8 13.8-93.5 38.5c-.3.3-16 16.5-21.2 23.9l-.5.6c-3.3 4.7-6.3 9.1-20.1 6.1-6.9-1.7-14.3-5.8-14.3-11.8V20c0-5 3.9-10.5 10.5-10.5h241.3c8.3 0 8.3 11.6 8.3 15.1 0 3.9 0 15.1-8.3 15.1H130.3v132.9h.3c104.2-109.8 282.8-36 282.8 108.9 0 178.1-244.8 220.3-310.1 62.8zm63.3-260.8c-.5 4.2 4.6 24.5 14.6 20.6C306 56.6 384 144.5 390.6 144.5c4.8 0 22.8-15.3 14.3-22.8-93.2-89-234.5-57-238.3-38.2zM393 414.7C283 524.6 94 475.5 61 310.5c0-12.2-30.4-7.4-28.9 3.3 24 173.4 246 256.9 381.6 121.3 6.9-7.8-12.6-28.4-20.7-20.4zM213.6 306.6c0 4 4.3 7.3 5.5 8.5 3 3 6.1 4.4 8.5 4.4 3.8 0 2.6.2 22.3-19.5 19.6 19.3 19.1 19.5 22.3 19.5 5.4 0 18.5-10.4 10.7-18.2L265.6 284l18.2-18.2c6.3-6.8-10.1-21.8-16.2-15.7L249.7 268c-18.6-18.8-18.4-19.5-21.5-19.5-5 0-18 11.7-12.4 17.3L234 284c-18.1 17.9-20.4 19.2-20.4 22.6z"/></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!-- Font Awesome Pro 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M423.9 255.8L411 413.1c-3.3 40.7-63.9 35.1-60.6-4.9l10-122.5-41.1 2.3c10.1 20.7 15.8 43.9 15.8 68.5 0 41.2-16.1 78.7-42.3 106.5l-39.3-39.3c57.9-63.7 13.1-167.2-74-167.2-25.9 0-49.5 9.9-67.2 26L73 243.2c22-20.7 50.1-35.1 81.4-40.2l75.3-85.7-42.6-24.8-51.6 46c-30 26.8-70.6-18.5-40.5-45.4l68-60.7c9.8-8.8 24.1-10.2 35.5-3.6 0 0 139.3 80.9 139.5 81.1 16.2 10.1 20.7 36 6.1 52.6L285.7 229l106.1-5.9c18.5-1.1 33.6 14.4 32.1 32.7zm-64.9-154c28.1 0 50.9-22.8 50.9-50.9C409.9 22.8 387.1 0 359 0c-28.1 0-50.9 22.8-50.9 50.9 0 28.1 22.8 50.9 50.9 50.9zM179.6 456.5c-80.6 0-127.4-90.6-82.7-156.1l-39.7-39.7C36.4 287 24 320.3 24 356.4c0 130.7 150.7 201.4 251.4 122.5l-39.7-39.7c-16 10.9-35.3 17.3-56.1 17.3z"/></svg>

Before

Width:  |  Height:  |  Size: 912 B

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><!-- Font Awesome Pro 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M322.1 252v-1l-51.2-65.8s-12 1.6-25 15.1c-9 9.3-242.1 239.1-243.4 240.9-7 10 1.6 6.8 15.7 1.7.8 0 114.5-36.6 114.5-36.6.5-.6-.1-.1.6-.6-.4-5.1-.8-26.2-1-27.7-.6-5.2 2.2-6.9 7-8.9l92.6-33.8c.6-.8 88.5-81.7 90.2-83.3zm160.1 120.1c13.3 16.1 20.7 13.3 30.8 9.3 3.2-1.2 115.4-47.6 117.8-48.9 8-4.3-1.7-16.7-7.2-23.4-2.1-2.5-205.1-245.6-207.2-248.3-9.7-12.2-14.3-12.9-38.4-12.8-10.2 0-106.8.5-116.5.6-19.2.1-32.9-.3-19.2 16.9C250 75 476.5 365.2 482.2 372.1zm152.7 1.6c-2.3-.3-24.6-4.7-38-7.2 0 0-115 50.4-117.5 51.6-16 7.3-26.9-3.2-36.7-14.6l-57.1-74c-5.4-.9-60.4-9.6-65.3-9.3-3.1.2-9.6.8-14.4 2.9-4.9 2.1-145.2 52.8-150.2 54.7-5.1 2-11.4 3.6-11.1 7.6.2 2.5 2 2.6 4.6 3.5 2.7.8 300.9 67.6 308 69.1 15.6 3.3 38.5 10.5 53.6 1.7 2.1-1.2 123.8-76.4 125.8-77.8 5.4-4 4.3-6.8-1.7-8.2z"/></svg>

Before

Width:  |  Height:  |  Size: 989 B

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!-- Font Awesome Pro 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M357.45 468.2c-1.2-7.7-1.3-7.6-9.6-7.6-99.8.2-111.8-2.4-112.7-2.6-12.3-1.7-20.6-10.5-21-23.1-.1-1.6-.2-71.6-1-129.1-.1-4.7 1.6-6.4 5.9-7.5 12.5-3 24.9-6.1 37.3-9.7 4.3-1.3 6.8-.2 8.4 3.5 4.5 10.3 8.8 20.6 13.2 30.9 1.6 3.7.1 4.4-3.4 4.4-10-.2-20-.1-30.4-.1v27h116c-1.4-9.5-2.7-18.1-4-27.5-7 0-13.8.4-20.4-.1-22.6-1.6-18.3-4.4-84-158.6-8.8-20.1-27.9-62.1-36.5-89.2-4.4-14 5.5-25.4 18.9-26.6 18.6-1.7 37.5-1.6 56.2-2 20.6-.4 41.2-.4 61.8-.5 3.1 0 4-1.4 4.3-4.3 1.2-9.8 2.7-19.5 4-29.2.8-5.3 1.6-10.7 2.4-16.1L23.75 0c-3.6 0-5.3 1.1-4.6 5.3 2.2 13.2-.8.8 6.4 45.3 63.4 0 71.8.9 101.8.5 12.3-.2 37 3.5 37.7 22.1.4 11.4-1.1 11.3-32.6 87.4-53.8 129.8-50.7 120.3-67.3 161-1.7 4.1-3.6 5.2-7.6 5.2-8.5-.2-17-.3-25.4.1-1.9.1-5.2 1.8-5.5 3.2-1.5 8.1-2.2 16.3-3.2 24.9h114.3v-27.6c-6.9 0-33.5.4-35.3-2.9 5.3-12.3 10.4-24.4 15.7-36.7 16.3 4 31.9 7.8 47.6 11.7 3.4.9 4.6 3 4.6 6.8-.1 42.9.1 85.9.2 128.8 0 10.2-5.5 19.1-14.9 23.1-6.5 2.7-3.3 3.4-121.4 2.4-5.3 0-7.1 2-7.6 6.8-1.5 12.9-2.9 25.9-5 38.8-.8 5 1.3 5.7 5.3 5.7 183.2.6-30.7 0 337.1 0-2.5-15-4.4-29.4-6.6-43.7zm-174.9-205.7c-13.3-4.2-26.6-8.2-39.9-12.5a44.53 44.53 0 0 1-5.8-2.9c17.2-44.3 34.2-88.1 51.3-132.1 7.5 2.4 7.9-.8 9.4 0 9.3 22.5 18.1 60.1 27 82.8 6.6 16.7 13 33.5 19.7 50.9a35.78 35.78 0 0 1-3.9 2.1c-13.1 3.9-26.4 7.5-39.4 11.7a27.66 27.66 0 0 1-18.4 0z"/></svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!-- Font Awesome Pro 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M248 167.5l64.9 98.8H183.1l64.9-98.8zM496 256c0 136.9-111.1 248-248 248S0 392.9 0 256 111.1 8 248 8s248 111.1 248 248zm-99.8 82.7L248 115.5 99.8 338.7h30.4l33.6-51.7h168.6l33.6 51.7h30.2z"/></svg>

Before

Width:  |  Height:  |  Size: 404 B

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M482.1 32H28.7C5.8 32 0 37.9 0 60.9v390.2C0 474.4 5.8 480 28.7 480h453.4c24.4 0 29.9-5.2 29.9-29.7V62.2c0-24.6-5.4-30.2-29.9-30.2zM178.4 220.3c-27.5-20.2-72.1-8.7-84.2 23.4-4.3 11.1-9.3 9.5-17.5 8.3-9.7-1.5-17.2-3.2-22.5-5.5-28.8-11.4 8.6-55.3 24.9-64.3 41.1-21.4 83.4-22.2 125.3-4.8 40.9 16.8 34.5 59.2 34.5 128.5 2.7 25.8-4.3 58.3 9.3 88.8 1.9 4.4.4 7.9-2.7 10.7-8.4 6.7-39.3 2.2-46.6-7.4-1.9-2.2-1.8-3.6-3.9-6.2-3.6-3.9-7.3-2.2-11.9 1-57.4 36.4-140.3 21.4-147-43.3-3.1-29.3 12.4-57.1 39.6-71 38.2-19.5 112.2-11.8 114-30.9 1.1-10.2-1.9-20.1-11.3-27.3zm286.7 222c0 15.1-11.1 9.9-17.8 9.9H52.4c-7.4 0-18.2 4.8-17.8-10.7.4-13.9 10.5-9.1 17.1-9.1 132.3-.4 264.5-.4 396.8 0 6.8 0 16.6-4.4 16.6 9.9zm3.8-340.5v291c0 5.7-.7 13.9-8.1 13.9-12.4-.4-27.5 7.1-36.1-5.6-5.8-8.7-7.8-4-12.4-1.2-53.4 29.7-128.1 7.1-144.4-85.2-6.1-33.4-.7-67.1 15.7-100 11.8-23.9 56.9-76.1 136.1-30.5v-71c0-26.2-.1-26.2 26-26.2 3.1 0 6.6.4 9.7 0 10.1-.8 13.6 4.4 13.6 14.3-.1.2-.1.3-.1.5zm-51.5 232.3c-19.5 47.6-72.9 43.3-90 5.2-15.1-33.3-15.5-68.2.4-101.5 16.3-34.1 59.7-35.7 81.5-4.8 20.6 28.8 14.9 84.6 8.1 101.1zm-294.8 35.3c-7.5-1.3-33-3.3-33.7-27.8-.4-13.9 7.8-23 19.8-25.8 24.4-5.9 49.3-9.9 73.7-14.7 8.9-2 7.4 4.4 7.8 9.5 1.4 33-26.1 59.2-67.6 58.8z"/></svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M159.7 237.4C108.4 308.3 43.1 348.2 14 326.6-15.2 304.9 2.8 230 54.2 159.1c51.3-70.9 116.6-110.8 145.7-89.2 29.1 21.6 11.1 96.6-40.2 167.5zm351.2-57.3C437.1 303.5 319 367.8 246.4 323.7c-25-15.2-41.3-41.2-49-73.8-33.6 64.8-92.8 113.8-164.1 133.2 49.8 59.3 124.1 96.9 207 96.9 150 0 271.6-123.1 271.6-274.9.1-8.5-.3-16.8-1-25z"/></svg>

Before

Width:  |  Height:  |  Size: 541 B

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!-- Font Awesome Pro 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M224 373.12c-25.24-31.67-40.08-59.43-45-83.18-22.55-88 112.61-88 90.06 0-5.45 24.25-20.29 52-45 83.18zm138.15 73.23c-42.06 18.31-83.67-10.88-119.3-50.47 103.9-130.07 46.11-200-18.85-200-54.92 0-85.16 46.51-73.28 100.5 6.93 29.19 25.23 62.39 54.43 99.5-32.53 36.05-60.55 52.69-85.15 54.92-50 7.43-89.11-41.06-71.3-91.09 15.1-39.16 111.72-231.18 115.87-241.56 15.75-30.07 25.56-57.4 59.38-57.4 32.34 0 43.4 25.94 60.37 59.87 36 70.62 89.35 177.48 114.84 239.09 13.17 33.07-1.37 71.29-37.01 86.64zm47-136.12C280.27 35.93 273.13 32 224 32c-45.52 0-64.87 31.67-84.66 72.79C33.18 317.1 22.89 347.19 22 349.81-3.22 419.14 48.74 480 111.63 480c21.71 0 60.61-6.06 112.37-62.4 58.68 63.78 101.26 62.4 112.37 62.4 62.89.05 114.85-60.86 89.61-130.19.02-3.89-16.82-38.9-16.82-39.58z"/></svg>

Before

Width:  |  Height:  |  Size: 986 B

Some files were not shown because too many files have changed in this diff Show More