19618 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	7e9d222b35	Merge pull request 'refs #6669 fix:ticket_isOutClosureZone' (!1984) from 6669_ticketClosure into dev ... Reviewed-on: #1984 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-19 10:33:51 +00:00
Sergio De la torre	a656447fdb	Merge branch 'dev' into 6669_ticketClosure	2024-02-19 10:31:49 +00:00
David Domenech	c12fdc2ed4	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-19 10:29:47 +00:00
David Domenech	3d47c9e5e8	refs #6372	2024-02-19 11:27:37 +01:00
Sergio De la torre	7a0320270a	Merge pull request 'test' (!2048) from test into dev ... Reviewed-on: #2048 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-19 10:25:33 +00:00
Jorge Penadés	fc6e34ddfd	fix: refs #6776 replace name	2024-02-19 11:18:05 +01:00
Jorge Penadés	882c179e89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-19 11:14:02 +01:00
David Domenech	12f3af68bf	refs #6372	2024-02-19 11:04:07 +01:00
Sergio De la torre	3a4463d0a4	Merge pull request 'refs #6531 feat:showLastTickets' (!2045) from 6531-showTickets into test ... Reviewed-on: #2045 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-19 10:00:32 +00:00
David Domenech	1fbda19fdb	Merge branch '6372-Delete-views-from-vn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-19 10:58:47 +01:00
David Domenech	cc600542ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-19 10:58:36 +01:00
Sergio De la torre	adeca2bb22	refs #6531 feat:modify name	2024-02-19 09:17:57 +01:00
Sergio De la torre	5b541aa804	refs #6531 feat:modify name	2024-02-19 09:13:03 +01:00
Sergio De la torre	3193d17b5d	Merge branch 'dev' into 6669_ticketClosure	2024-02-19 08:11:28 +00:00
Pako Natek	ad1010f3fc	Merge branch 'dev' into 6358-boxPicking-BluePinguin	2024-02-19 07:37:54 +00:00
Pako Natek	3ef26bfd7d	packing	2024-02-19 08:34:17 +01:00
David Domenech	2c8cd07476	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-19 07:14:52 +00:00
Sergio De la torre	dff70e57c1	Merge pull request '#6559 _getSectors' (!2014) from 6559_getSectors into dev ... Reviewed-on: #2014 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-19 06:01:04 +00:00
Sergio De la torre	15de4f0b73	refs #6531 feat:showLastTickets	2024-02-16 15:56:40 +01:00
Pablo Natek	c10cb7c051	feat(spec): refs #6403 mrwIntegration	2024-02-16 14:15:13 +01:00
Sergio De la torre	f4ea220578	Merge branch 'dev' into 6559_getSectors	2024-02-16 12:54:45 +00:00
Jorge Penadés	69acebb43c	fix: refs #6776 replace name	2024-02-16 13:48:55 +01:00
Jorge Penadés	8cecff36ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-16 13:14:59 +01:00
Carlos Satorres	59ea47a8c3	refs #6414 tback	2024-02-16 13:06:33 +01:00
Jorge Penadés	3cf61537b3	Merge pull request '#6760 modify transferClient' (!2035) from 6760-modifyTransferClient into dev ... Reviewed-on: #2035 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-16 12:00:09 +00:00
Jorge Penadés	f8ceca3575	Merge branch 'dev' into 6760-modifyTransferClient	2024-02-16 11:58:39 +00:00
Pablo Natek	a79ddc1c6c	Merge pull request '6358-boxPicking_ultimate' (!2044) from 6358-boxPicking_ultimate into dev ... Reviewed-on: #2044 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-16 11:17:25 +00:00
Pako Natek	f048412ad5	Merge branch 'dev' into 6358-boxPicking_ultimate	2024-02-16 11:13:10 +00:00
Pako Natek	bf67c2348d	refactor proc	2024-02-16 12:05:47 +01:00
Pablo Natek	85b1391006	fix(sql): refs #6403 merge master	2024-02-16 08:31:41 +01:00
Pablo Natek	94fe0220e5	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6403-mrwIntegration	2024-02-16 08:30:06 +01:00
Pablo Natek	b6be76c38f	feat(test): refs #6403 add spec	2024-02-16 08:28:40 +01:00
Jorge Penadés	556a67ecfc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient	2024-02-16 08:26:32 +01:00
Josep Domingo	9182549b47	Merge pull request 'refs #6685' (!2043) from 6685--HotFix-credit into master ... Reviewed-on: #2043 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-16 06:38:43 +00:00
Sergio De la torre	a76872a082	refs #6669 fix:ticket_isOutClosureZone	2024-02-16 07:08:01 +01:00
Sergio De la torre	ca438c7c7f	Merge branch 'dev' into 6669_ticketClosure	2024-02-16 05:57:29 +00:00
David Domenech	ae0ce91127	refs #6685	2024-02-16 06:10:09 +01:00
Carlos Satorres	bb6861d799	Merge pull request 'hotfix creditClient' (!2041) from hotfix-creditClient into master ... Reviewed-on: #2041 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-15 15:25:46 +00:00
Jorge Penadés	78583751ec	refactor: refs #6760 ticketsIds improved	2024-02-15 16:22:13 +01:00
Jorge Penadés	3d25b599ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-15 14:49:21 +01:00
Jorge Penadés	f11aa2605b	feat: refs #6776 back & procedure modified	2024-02-15 14:48:30 +01:00
Javi Gallego	27627017c5	feat: #6392 fk que faltan	2024-02-15 14:21:49 +01:00
David Domenech	04fe6a8596	refs #6372	2024-02-15 13:58:12 +01:00
David Domenech	03b5ed064d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-15 13:48:21 +01:00
Guillermo Bonet	3950f287c9	Merge branch 'dev' into 6721-método-de-pago-al-volver-a-activar-trabajadores	2024-02-15 12:24:26 +00:00
Guillermo Bonet	98ad133afd	Merge pull request 'refactor: refs #6775 Deleted proc itemProposal_Add' (!2034) from 6775-itemProposalAdd into dev ... Reviewed-on: #2034 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-15 12:21:23 +00:00
Guillermo Bonet	4b568bc41e	Merge branch 'dev' into 6775-itemProposalAdd	2024-02-15 13:19:58 +01:00
Carlos Satorres	98d2b5a0ff	hotfix creditClient	2024-02-15 12:59:30 +01:00
Alex Moreno	8cb17762f8	refs #6863 deployt: init version 24.10	2024-02-15 12:21:45 +01:00
Juan Ferrer	acc9d05530	build: refs #6859 pnpm-lock.yaml updated	2024-02-15 11:49:25 +01:00