20003 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	974c95b961	Merge branch 'dev' into 6925-fix_translations	2024-03-14 08:00:29 +00:00
Alex Moreno	a13299d66a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-14 08:40:26 +01:00
Alex Moreno	a00e363fd5	refs #7033 deploy: init version 2414	2024-03-14 08:40:25 +01:00
Alex Moreno	cb299617cf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-14 08:38:52 +01:00
Alex Moreno	0b459f4726	Merge pull request 'refs #7033 deploy(2412): dev to test' (!2166) from 7033-devToTest_2412 into test ... Reviewed-on: #2166 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-03-14 07:37:54 +00:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Carlos Satorres	e7d5d59fa6	Merge pull request 'refs #6913 routeKm' (!2156) from 6913-routeKm into dev ... Reviewed-on: #2156 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-14 07:33:57 +00:00
Carlos Satorres	24c1ab541d	Merge branch 'dev' into 6913-routeKm	2024-03-14 07:31:31 +00:00
Alex Moreno	977181f156	Merge branch 'dev' into 6925-fix_translations	2024-03-14 07:27:16 +00:00
Alex Moreno	346557ed69	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-14 08:20:15 +01:00
Guillermo Bonet	b4b6b47a9c	hotfix: itemProposal added transaction	2024-03-14 07:53:24 +01:00
Guillermo Bonet	4b83d416b2	Merge pull request 'refactor: refs #7018 Mirated procs to vn' (!2157) from 7018-procMigration into dev ... Reviewed-on: #2157 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-14 06:03:32 +00:00
Sergio De la torre	1a2bda7e18	Merge pull request '6078_workerActivty' (!2130) from 6078_workerActivty into dev ... Reviewed-on: #2130 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 05:58:13 +00:00
Juan Ferrer	07f96a864d	Merge branch 'dev' into 6925-fix_translations	2024-03-13 13:22:41 +00:00
Sergio De la torre	b4fe00a028	Merge branch 'dev' into 6078_workerActivty	2024-03-13 11:36:59 +00:00
Guillermo Bonet	14571ed10f	Merge branch 'dev' into 7018-procMigration	2024-03-13 09:39:55 +00:00
Carlos Satorres	922d8acb75	Merge branch 'dev' into 6913-routeKm	2024-03-13 09:24:26 +00:00
Guillermo Bonet	b5f3753253	Merge branch 'test' into dev	2024-03-13 07:42:51 +01:00
Guillermo Bonet	2a38249131	Merge branch 'master' into test	2024-03-13 07:40:39 +01:00
Guillermo Bonet	319bf314b3	hotfix: itemProposal	2024-03-13 07:38:14 +01:00
Carlos Satorres	93170dd82f	Merge branch 'dev' into 6913-routeKm	2024-03-12 11:48:49 +00:00
Alex Moreno	dd69c9fe94	Merge branch 'dev' into 6925-fix_translations	2024-03-12 11:38:43 +00:00
Sergio De la torre	9d94259d67	refs #6078 feat: workerActivity	2024-03-12 12:21:46 +01:00
Sergio De la torre	375b690063	Merge branch 'dev' into 6078_workerActivty	2024-03-12 09:12:45 +00:00
Guillermo Bonet	1d398a0acf	refactor: refs #7018 Added comment and minor changes	2024-03-12 08:40:11 +01:00
Guillermo Bonet	e2eddbaef7	refactor: refs #7018 Added comment	2024-03-12 08:35:13 +01:00
Guillermo Bonet	1bcb61a224	refactor: refs #7018 Mirated procs to vn	2024-03-12 08:25:58 +01:00
Carlos Satorres	6627c7a16a	refs #6913 routeKm	2024-03-12 08:25:01 +01:00
Guillermo Bonet	819bc7a56d	Merge pull request 'refactor: refs #6495 Migrated procs to vn' (!2108) from 6495-procRefactor4 into dev ... Reviewed-on: #2108 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-12 06:04:19 +00:00
Alex Moreno	35ef9b53c2	Merge branch 'dev' into 6925-fix_translations	2024-03-11 12:49:34 +00:00
Guillermo Bonet	adafab5847	refactor: refs #6874 item_getSimilar	2024-03-11 13:27:18 +01:00
Guillermo Bonet	552a1a33c2	hotfix: itemProposal	2024-03-11 12:38:52 +01:00
Guillermo Bonet	a34be6ca02	Merge branch 'test' into dev	2024-03-11 12:21:54 +01:00
Guillermo Bonet	03e9f167a6	Merge branch 'master' into test	2024-03-11 12:18:23 +01:00
Robert Ferrús	4d1b02b793	Merge pull request 'feat: refs #6610 fixDeleteTickets' (!2154) from 6610-hotFixDeleteTicketsWeekly into master ... Reviewed-on: #2154 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-03-11 11:15:04 +00:00
Robert Ferrús	9910ae5c64	fix: refs #6610 quitar variable	2024-03-11 12:12:02 +01:00
Jorge Penadés	47c7985233	Merge pull request '#5186 create parkingLog' (!2116) from 5186-createParkingLog into dev ... Reviewed-on: #2116 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-11 09:06:24 +00:00
Jorge Penadés	e5387b0b65	fix: refs #5186 use date function	2024-03-11 09:14:05 +01:00
Jorge Penadés	4e8e7d3f4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-11 08:59:26 +01:00
Alex Moreno	51fa0e1a75	fix: refs #6925 refund invoice transaltions	2024-03-11 08:12:29 +01:00
Alex Moreno	99fccd1cd2	Merge pull request '#6925 - inctorems-check' (!2150) from 6925-invoice-transaction into dev ... Reviewed-on: #2150 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-11 06:28:02 +00:00
Alex Moreno	dcdad9c469	Merge branch 'dev' into 6925-invoice-transaction	2024-03-11 06:05:50 +00:00
Robert Ferrús	e7a6d0109c	Merge branch 'master' into 6610-hotFixDeleteTicketsWeekly	2024-03-08 11:36:35 +00:00
Robert Ferrús	b6af349d89	Merge branch '6610-hotFixDeleteTicketsWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 6610-hotFixDeleteTicketsWeekly	2024-03-08 12:32:25 +01:00
Robert Ferrús	b1e90fabb2	refs #6610	2024-03-08 12:32:22 +01:00
Guillermo Bonet	1027ef6479	Merge branch 'dev' into 6495-procRefactor4	2024-03-08 11:31:54 +00:00
Javier Segarra	82c9bd4ea7	Merge pull request '#7004 - hotfix_updateFiscalData' (!2153) from 7004_hotfix_updateFiscalData into master ... Reviewed-on: #2153 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-08 11:21:42 +00:00
Robert Ferrús	05b60150a0	Merge branch 'master' into 6610-hotFixDeleteTicketsWeekly	2024-03-08 11:20:07 +00:00
Robert Ferrús	cdb9f372cf	feat: refs #6610 fixDeleteTickets	2024-03-08 12:19:57 +01:00
Jorge Penadés	76c5595a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-08 11:01:25 +01:00