10107 Commits

Author	SHA1	Message	Date
Alex Moreno	a8cb0b9eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-14 12:21:13 +01:00
Ivan Mas	96a13af02c	Merge branch 'dev' into 8143-deprecateColumnsFromUser	2024-11-14 10:11:37 +00:00
Carlos Satorres	155616e622	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-11-14 09:26:13 +01:00
Ivan Mas	e1b0fc298c	feat: refs #8143 deprecate recoverPass and sync from account.user	2024-11-13 20:26:54 +01:00
Pablo Natek	5f3b1ff601	Merge pull request 'fix: refs #7404 filter an rounding issues' (!3196) from 7404-fix-stockBoughtDetailFilter into master ... Reviewed-on: #3196 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 11:24:18 +00:00
Jorge Penadés	f52041eeff	Merge branch 'dev' into 6818-saySimpleIntegration	2024-11-13 08:22:40 +00:00
Pablo Natek	b025a8b804	fix: refs #7404 filter an rounding issues	2024-11-13 09:10:18 +01:00
Sergio De la torre	b532691043	Merge pull request 'feat: refs #8150 movExpeditions' (!3167) from 8150-moveExpeditionsApp into dev ... Reviewed-on: #3167 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 11:02:58 +00:00
Guillermo Bonet	aec4d0b1a4	Merge branch 'test' into dev	2024-11-12 11:28:32 +01:00
Guillermo Bonet	699675b476	fix: hotfix	2024-11-12 11:27:23 +01:00
Javier Segarra	96301f8a0b	fix: hotfix create order from customer	2024-11-12 10:43:05 +01:00
Jorge Penadés	186312702d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration	2024-11-11 16:41:37 +01:00
Alex Moreno	f7a29cd9c7	feat(Supplier): refs #6828 add companySize	2024-11-11 10:32:17 +01:00
Jorge Penadés	6927f4b28d	feat: refs #6818 saysimple integration	2024-11-08 11:51:00 +01:00
Sergio De la torre	fd36f7ecc3	feat: refs #8150 movExpeditions	2024-11-08 10:44:01 +01:00
Sergio De la torre	a8cc417fb4	Merge branch 'dev' into 7922-scanOrder	2024-10-29 06:32:32 +00:00
Guillermo Bonet	6afb8fbeb5	Merge pull request 'feat: refs #7266 Added details and improvements in item label reports' (!3154) from 7266-itemQrBarcodeLabel into dev ... Reviewed-on: #3154 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-29 06:04:15 +00:00
Carlos Andrés	66a5708efb	Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!3147) from 8087-nuevoCampoTravel into dev ... Reviewed-on: #3147 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-28 14:41:01 +00:00
Guillermo Bonet	c8662a5051	Merge branch '7266-itemQrBarcodeLabel' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemQrBarcodeLabel	2024-10-28 14:51:21 +01:00
Guillermo Bonet	a37b7b71a8	feat: refs #7266 Requested changes and improvements	2024-10-28 14:51:19 +01:00
Carlos Satorres	385279b39d	fix: refs #7283 tback	2024-10-28 13:15:40 +01:00
Carlos Satorres	0180998683	fix: refs #7283 item filters	2024-10-28 13:08:27 +01:00
Guillermo Bonet	b899a7967f	Merge branch 'dev' into 7266-itemQrBarcodeLabel	2024-10-28 10:38:17 +00:00
Guillermo Bonet	c43bdb5021	feat: refs #7266 Added details and improvements in item label reports	2024-10-28 11:29:15 +01:00
Jon Elias	b27aa1bd94	Merge branch 'dev' into 7193-ParkingCreateScope	2024-10-28 09:52:17 +00:00
Jon Elias	eb5f57285a	feat: refs #7193 added scope in parking model	2024-10-28 10:40:43 +01:00
Sergio De la torre	93feb74949	Merge branch 'dev' of https: refs #7921//gitea.verdnatura.es/verdnatura/salix into 7921-sendExpeditionLost	2024-10-28 10:22:23 +01:00
Jorge Penadés	b20ca1d8d7	Merge branch 'dev' into 7524-fixE2e	2024-10-28 08:43:45 +00:00
Sergio De la torre	6efc2c340c	feat: refs #7921 refs#7921 sendLostExpedition	2024-10-28 08:57:22 +01:00
Carlos Satorres	c8101375a2	Merge branch 'dev' into 6644-modEmail	2024-10-28 07:04:17 +00:00
Carlos Satorres	869c7ab598	fix: refs #6644 email and translations	2024-10-28 07:37:42 +01:00
Guillermo Bonet	8c4d3bac0d	Merge branch 'test' into dev	2024-10-28 07:11:38 +01:00
Guillermo Bonet	765d125219	Merge branch 'master' into test	2024-10-28 07:11:21 +01:00
Jorge Penadés	d8e241740f	feat: refs #7524 restrict fields	2024-10-27 13:47:52 +01:00
Guillermo Bonet	80764b6495	feat: refs #7006 itemTypeLog	2024-10-25 14:17:57 +02:00
Sergio De la torre	e775e56120	feat: refs #7921 refs#7921 sendLostExpedition	2024-10-25 13:48:27 +02:00
Guillermo Bonet	956e89475e	Merge branch 'dev' into 7006-itemTypeLog	2024-10-25 11:06:55 +00:00
Jorge Penadés	8f10260795	feat: refs #7943 return just the required content	2024-10-25 11:37:45 +02:00
Guillermo Bonet	69e1df2504	fix: refs #235425 Requested changes	2024-10-25 08:47:43 +02:00
Guillermo Bonet	111480f7b7	fix: refs #235425 Requested changes	2024-10-25 07:22:36 +02:00
Sergio De la torre	11e13fdb20	feat: refs #7922 refs #792 scanOrder	2024-10-25 06:40:06 +02:00
Carlos Andrés	4d3bc2c837	feat: refs #8087 Traspasar redadas a travels	2024-10-24 19:32:02 +02:00
Carlos Andrés	1bf900f81b	feat: refs #8087 Traspasar redadas a travels	2024-10-24 12:33:47 +02:00
Guillermo Bonet	4da11c65bb	fix: refs #235425 sale priceFixed update	2024-10-24 12:26:03 +02:00
Guillermo Bonet	f97f1c2b9a	Merge branch 'dev' into 7266-itemLabels	2024-10-24 09:31:14 +00:00
Javier Segarra	070a5640df	fix: recalculatePrice not working with all ids	2024-10-24 08:16:04 +00:00
Alex Moreno	7ae99fe6a1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-24 07:47:54 +02:00
Alex Moreno	4660118211	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-24 07:47:41 +02:00
Guillermo Bonet	4c9682e107	Merge branch 'dev' into 7266-itemLabels	2024-10-24 05:16:16 +00:00
Jorge Penadés	43f8b22593	feat: refs #8083 add field	2024-10-23 16:10:00 +02:00