Commit Graph

414 Commits

Author SHA1 Message Date
31b35d4d16 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	IntegryManagementSystem.ipr
2021-01-14 12:20:09 +01:00
b72716d3c0 Commit IPR 2021-01-14 11:40:16 +01:00
8d898a5372 Aggiornato bytecode level di ems-engine-customizations nell'ipr 2021-01-14 09:44:34 +01:00
200c080f5c Fix dependencies 2021-01-13 11:50:24 +01:00
Filippo Maino
2861c75cb5 terminando WsPriceList - cancello classe per debug 2021-01-13 10:20:05 +01:00
8a62427f3d Creato servizio chiusura ordine gramm 2021-01-12 18:51:27 +01:00
b1d069fa4c Merge tag 'Biolevante_chiusuraORdini' into develop
Finish Biolevante_chiusuraORdini
2021-01-08 16:16:19 +01:00
085c7478d2 [Biolevante - MES]
Correzione whereCond chiusura ordini
2021-01-08 16:16:12 +01:00
e5f475844c Aggiornata libreria barcodes 2021-01-05 18:41:26 +01:00
47acde529d Aggiornate librerie maven con repo interna Integry 2021-01-05 18:30:46 +01:00
30d129a73d Aggiornata libreria JasperReport 2021-01-05 17:03:42 +01:00
dd553fd07e Implementata export per SIAN 2021-01-04 17:54:09 +01:00
aee9f849a2 Commit IPr 2020-12-31 13:03:09 +01:00
0b6df36a6e aggiunto campo tipo_prod in jtb_fasi
aggiunto noloop su check aliquota ordini vendita
2020-12-30 09:11:17 +01:00
50c759b4d1 gestione olio 2020-12-21 09:36:27 +01:00
5bed0a3ea5 Aggiustata SDK PEPPINO 2020-12-17 18:17:49 +01:00
e33d826831 [FIX] Sostituita libreria barcodes 2020-12-17 11:59:44 +01:00
c9300819b5 commit ipr 2020-12-07 09:32:39 +01:00
688575156d Commit IPR 2020-12-02 17:39:59 +01:00
4e60baadae Modifica ipr 2020-11-30 10:44:57 +01:00
13aeffb23e Rimossi IML 2020-11-28 12:54:56 +01:00
c04b57eac9 Revert "Aggiornate alcune librerie e rimosse alcune inutilizzate"
This reverts commit af825a68
2020-11-24 13:09:13 +01:00
af825a68c1 Aggiornate alcune librerie e rimosse alcune inutilizzate 2020-11-17 10:13:27 +01:00
81b989678e Creazione gestione notifiche e device tokens 2020-11-12 17:29:05 +01:00
39cb198828 TrasfScrofetteACespite 2020-10-06 09:06:44 +02:00
071551b048 Gestione articoli Follies 2020-09-21 19:20:53 +02:00
668214bafe share configurazioni tomcat 2020-09-10 10:45:47 +02:00
14d5abc0f6 Revert "Converted project to idea directory based"
This reverts commit e34152a0e4.

# Conflicts:
#	.idea/IntegryManagementSystem.iml
#	.idea/compiler.xml
#	.idea/misc.xml
#	ems-core/src/main/ems-core.iml
#	ims.iml
2020-09-10 10:40:44 +02:00
e34152a0e4 Converted project to idea directory based 2020-09-10 10:19:04 +02:00
275869dcd5 corretta duplicazione movimenti contabili e variazione su esportazione varizioni 2020-09-01 15:30:41 +02:00
7dfe7cf077 [LICOR - WOOCOMMERCE]
Corretto calcolo prezzi vendita articoli ecommerce
2020-07-30 10:10:07 +02:00
8cd88ab5e7 Produzione: modificata procedura chiusura giornata 2020-07-24 14:57:59 +02:00
66aa4c5ccf Merge tag 'LicorWooCommerce' into develop
Finish LicorWooCommerce
2020-07-16 17:07:48 +02:00
a9dcf6a8f4 WooCOmmerce licor aggiornamento ordine post import 2020-07-16 17:07:37 +02:00
64acec7338 Aggiunto flag_inc_acq, ven, lav su MTB_SPES 2020-07-15 18:32:32 +02:00
98f1923d5f Aggiornamento listino FL 2020-07-14 12:32:05 +02:00
82d6ea5d33 WC 2020-07-10 15:26:29 +02:00
f0a5212976 Merge branch 'feature/WooCommerceService' into hotfix/WooCommerce 2020-07-10 10:43:01 +02:00
106dc49a6c Aggiunta esclusione libreria 2020-07-02 15:48:36 +02:00
dd9a6d94bf Merge branch 'develop' into feature/WooCommerceService 2020-06-04 12:47:34 +02:00
30c3a0c1c6 Modificato campo salvataggio richiesta di pagamento di ordinfy 2020-06-04 10:28:48 +02:00
7ef1f5c114 Rimosso ems-map 2020-06-01 16:46:38 +02:00
a51d4cae6f Integrato servizio mappe 2020-05-28 18:50:09 +02:00
ed34ae9550 Aggiornato progetto 2020-05-27 12:07:19 +02:00
e035d5e061 Bug Fix: controllo su tipoUm NULL in gtb_spes 2020-05-21 09:35:40 +02:00
287dd53afa Create classi per la importazione degli ordini da woocommerce 2020-05-21 09:27:56 +02:00
644c82816c Merge branch 'develop' into feature/MinIO
# Conflicts:
#	ems-core/src/main/java/it/integry/ems_model/base/EntityBase.java
#	ems-core/src/main/java/it/integry/ems_model/base/EntityPropertyHolder.java
#	ems-retail/src/main/java/it/integry/ems/retail/wms/service/WMSService.java
2020-05-04 10:14:28 +02:00
97aaf7bb16 Aggiunta regola esclusione import delle librerie sun.text.normalizer.
Implementata logica di rettifica UL nei servizi JAVA.
2020-04-29 20:03:17 +02:00
e496a99a5b Sistemata lettura OldK 2020-04-28 10:59:57 +02:00
616b610025 Merge branch 'master' into feature/MinIO
# Conflicts:
#	ems-core/src/main/java/it/integry/ems_model/base/EntityBase.java
2020-04-27 09:54:55 +02:00