10126 Commits

Author	SHA1	Message	Date
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
Javi Gallego	2f5f4ecc7c	Merge pull request 'feat: refs #7943 quitar lectura en metodos comunes' (!3136) from 7943-permisosWorker into dev ... Reviewed-on: #3136 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-23 05:53:03 +00:00
Carlos Satorres	72662b3112	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-10-23 07:50:40 +02:00
Javi Gallego	62f9f31279	feat: refs #7943 usa back con permisos	2024-10-23 07:44:41 +02:00
Alex Moreno	f47043cae4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-22 15:07:24 +02:00
Jorge Penadés	a543fca01a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8083-hotfix-changeState	2024-10-22 14:23:53 +02:00
Guillermo Bonet	c3f8da52c6	feat: refs #7266 Item label barcode	2024-10-22 13:43:54 +02:00
Jorge Penadés	1c5e4f40ce	feat: refs #8083 add prop	2024-10-22 12:39:51 +02:00
Jorge Penadés	ee0c0996f6	feat: refs #7524 add e2e	2024-10-22 12:16:26 +02:00
Guillermo Bonet	0af58b20be	feat: refs #7266 Item label QR finished	2024-10-22 12:02:04 +02:00
Guillermo Bonet	bf2d7541a5	feat: refs #7266 Item label QR	2024-10-21 14:57:55 +02:00
Jorge Penadés	1efe258ea0	fix: refs #7524 filter by department	2024-10-21 14:30:45 +02:00
Carlos Satorres	aad616ff83	Merge branch 'dev' into 6850-removeChandgeUpdateClaim	2024-10-21 12:26:53 +00:00
Carlos Satorres	c3ffb31348	Merge branch 'dev' into 6831-observationDefaulterEmail	2024-10-21 12:23:39 +00:00
Jorge Penadés	2f77359892	Merge branch 'dev' into 7919-deleteTicketRefund	2024-10-21 11:00:31 +00:00
Jon Elias	158f701f1e	Merge branch 'dev' into Fix-ItemRequest	2024-10-21 09:31:29 +00:00
Jorge Penadés	cb4e8355ba	feat: refs #7524 myteam filter	2024-10-21 10:58:36 +02:00
Jorge Penadés	288dc1c598	feat: refs #7524 myteam filter wip	2024-10-21 10:05:58 +02:00
Carlos Satorres	bf0cc687e1	Merge branch 'dev' into 6850-removeChandgeUpdateClaim	2024-10-21 07:27:46 +00:00
Carlos Satorres	eea09a9d4a	fix: refs #6850 add code	2024-10-21 09:24:53 +02:00
Javi Gallego	be9f711cc1	Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev ... Reviewed-on: #3110 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:31:17 +00:00
Carlos Satorres	19fbb836a6	fix: refs #6850 fix model	2024-10-21 08:30:39 +02:00
Javi Gallego	da772cf504	Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev ... Reviewed-on: #3114 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:29:17 +00:00
Carlos Satorres	b88dc1c70f	fix: refs #6850 remove notifyPickUp	2024-10-20 16:23:24 +02:00
Carlos Satorres	b8e782d3a5	fix: refs #6831 filter observation	2024-10-20 15:59:24 +02:00
Jon Elias	9e9773578a	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 11:22:35 +00:00
Carlos Satorres	ed69604767	Merge branch 'dev' into 7906-notDeleteZone	2024-10-18 08:31:38 +00:00
Guillermo Bonet	939f083671	Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev ... Reviewed-on: #3122 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-18 08:27:08 +00:00
Carlos Satorres	5a14aed73a	Merge branch 'dev' into 7906-notDeleteZone	2024-10-18 07:40:04 +00:00
Jon Elias	3139d99130	Merge branch 'dev' into 7010-AddPackingField	2024-10-18 07:30:43 +00:00
Jon Elias	46993ad103	refactor: refs #7010 deleted distinct	2024-10-18 09:29:01 +02:00
Carlos Satorres	1273e895af	fix: refs #7906 fix test back	2024-10-18 09:27:43 +02:00
Jon Elias	f68584b3fa	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 06:53:38 +00:00
Carlos Satorres	02dc952024	fix: refs #7906 add test	2024-10-18 08:28:08 +02:00
Guillermo Bonet	28e957fecd	refactor: refs #8106 refs #1406 Optimized ticket_getTax	2024-10-17 14:46:19 +02:00
Javi Gallego	681f82a3ae	feat: refs #7744 test back ok	2024-10-16 16:09:53 +02:00
Carlos Satorres	37d3ef5f16	Merge branch 'dev' into 7986-workerMoto	2024-10-16 12:10:13 +00:00
Carlos Satorres	67714f2dff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-10-16 13:59:04 +02:00
Carlos Satorres	3f3b936255	fix: refs #7906 remove code	2024-10-16 13:56:42 +02:00
Carlos Satorres	a282170016	fix: refs #7906 fix method	2024-10-16 11:36:48 +02:00
Jorge Penadés	8f01e4d110	fix: refs #7353 redirect to lilium	2024-10-16 09:32:15 +02:00
Carlos Satorres	c5aa7dc44e	fix: refs #7906 edit test	2024-10-16 09:30:37 +02:00
Jorge Penadés	8ca097d4a9	chore: refs #7919 change var name	2024-10-16 09:23:39 +02:00
Javi Gallego	aac4dd0a6d	feat: refs #7348 minor bug	2024-10-16 08:52:27 +02:00
Javi Gallego	c6e764b478	feat: refs #7348 hasDailyInvoice from client	2024-10-16 08:32:10 +02:00
Carlos Satorres	46e657675b	fix: refs #7906 remake method	2024-10-16 08:26:39 +02:00
Jorge Penadés	d57f4fc44a	chore: refs #7919 refactor, drop relation on back	2024-10-15 17:24:14 +02:00
Jorge Penadés	6f8a005726	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund	2024-10-15 17:01:29 +02:00
Javi Gallego	4a88ba5078	feat: refs #7744 closeAll Test	2024-10-15 15:43:12 +02:00
Carlos Satorres	099fe8f950	fix: refs #7986 fix model	2024-10-15 14:42:35 +02:00
Jon Elias	e334152acc	refactor: deleted comment	2024-10-15 09:03:15 +02:00
Javi Gallego	976e50b566	feat: refs #8098 identation	2024-10-15 08:25:53 +02:00
Javi Gallego	4526873bbe	feat: refs #8098 without Date	2024-10-15 08:24:13 +02:00
Javi Gallego	5e2edad6de	Merge branch 'dev' into 8098-closureTransation	2024-10-15 08:21:40 +02:00
Javi Gallego	f2d1aa5f16	feat: refs #8098 closureDaysAgo	2024-10-15 08:17:03 +02:00
Alex Moreno	5b938a6f78	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-15 08:00:39 +02:00
Sergio De la torre	f27566ac0f	Merge pull request 'master' (!3098) from master into test ... Reviewed-on: #3098 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-10-15 05:18:30 +00:00
Jorge Penadés	6d4c71d465	feat: refs #7919 test	2024-10-14 17:14:40 +02:00
Jorge Penadés	a35208d903	feat: refs #7919 test	2024-10-14 17:14:01 +02:00
Jorge Penadés	ccf9dbde8e	feat: refs #7919 test	2024-10-14 17:11:12 +02:00
Sergio De la torre	13c7b34c98	Merge branch 'master' into 6861-ItemShelvingSaleReserve	2024-10-14 14:15:51 +00:00
Jorge Penadés	0549e22720	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-14 15:38:30 +02:00
Jorge Penadés	f3b5a70b67	feat: refs #7323 show right error	2024-10-14 14:41:25 +02:00
Carlos Satorres	68469e2ba8	Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto	2024-10-14 13:52:08 +02:00
Jon Elias	07849ebeb8	fix: myTeam param	2024-10-14 13:25:09 +02:00
Sergio De la torre	06b7d56837	fix: refs #6861 assignCollection&isOnReservationMode	2024-10-14 13:01:30 +02:00
Jon Elias	4ee6a46bd5	feat: added new filter param	2024-10-14 11:29:49 +02:00
Guillermo Bonet	6c62172633	feat: refs #7006 itemTypeLog created	2024-10-14 09:31:35 +02:00
Guillermo Bonet	78a9b788bf	feat: refs #7006 itemTypeLog created	2024-10-14 08:42:54 +02:00
Jorge Penadés	b39a749bee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-14 08:37:58 +02:00
Alex Moreno	d8e0c1debe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-14 07:27:19 +02:00
Jorge Penadés	2b17e6da4c	Merge branch 'dev' into 7874-createObservationType	2024-10-10 08:16:29 +00:00
Jorge Penadés	f5a43962fd	Merge branch 'dev' into 7207-showPbx	2024-10-10 07:18:06 +00:00
Alex Moreno	040304d04f	fix: merge	2024-10-08 17:10:19 +02:00
Alex Moreno	0c6541372e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-08 17:09:26 +02:00
Alex Moreno	3cf7591206	fix(closeAll): not use transaction	2024-10-08 17:03:27 +02:00
Carlos Satorres	39e808bca7	fix: refs #7986 fix model	2024-10-08 16:06:38 +02:00
Carlos Andrés	d497ffc781	Actualizar modules/ticket/back/methods/ticket/closure.js	2024-10-08 13:32:57 +00:00
Alex Moreno	5cdb0b7eb6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-08 12:19:10 +02:00
Jorge Penadés	3755c5a15b	Merge branch 'dev' into 7207-showPbx	2024-10-07 14:27:09 +00:00
Jorge Penadés	4fb0936399	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-07 06:39:11 +00:00
Jorge Penadés	53f590af61	Merge branch 'dev' into 7207-showPbx	2024-10-07 06:31:14 +00:00