25406 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	d6637a32ce	fix: refs #7917 tback	2024-11-26 10:23:42 +01:00
Carlos Satorres	3a6df984aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute	2024-11-26 06:49:17 +01:00
Jorge Penadés	e2d827d937	Merge pull request 'fix: refs #7229 update env col for consistency' (!3240) from 7229-fixEnvironment into dev ... Reviewed-on: #3240 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-25 13:43:17 +00:00
Jorge Penadés	584287b211	fix: refs #7229 update default environment	2024-11-25 14:20:15 +01:00
Jorge Penadés	a68d7e8c0b	fix: refs #7229 rollback	2024-11-25 14:15:10 +01:00
Jorge Penadés	9da5b4ecda	fix: refs #7229 update default environment	2024-11-25 14:05:12 +01:00
Jorge Penadés	ca1ccff10b	fix: refs #7229 update env col for consistency	2024-11-25 13:55:07 +01:00
Carlos Satorres	bdac9e2167	fix: refs #7917 error filter	2024-11-25 06:16:07 +01:00
Guillermo Bonet	65ca1b5af3	Merge pull request 'feat: refs #8149 Group by CuentaIvaRepercutido' (!3201) from 8149-ivaXDiario into dev ... Reviewed-on: #3201 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-22 12:09:47 +00:00
Carlos Andrés	771aeaa9bd	Merge pull request 'test' (!3237) from test into dev ... Reviewed-on: #3237 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-22 12:03:18 +00:00
Guillermo Bonet	1c6f59a0ec	Merge branch '8149-ivaXDiario' of https://gitea.verdnatura.es/verdnatura/salix into 8149-ivaXDiario	2024-11-22 12:59:26 +01:00
Guillermo Bonet	4ab2d7fd09	feat: refs #8149 Group by CuentaIvaRepercutido	2024-11-22 12:59:24 +01:00
Carlos Andrés	7cf6acec19	Merge pull request '8124-enrutadoresNuevosRequerimientos' (!3235) from 8124-enrutadoresNuevosRequerimientos into test ... Reviewed-on: #3235 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-22 09:46:03 +00:00
Guillermo Bonet	c440472693	Merge branch 'dev' into 8149-ivaXDiario	2024-11-22 09:43:26 +00:00
Jorge Penadés	470d9bde64	Merge pull request 'fix: refs #7229 set right urls' (!3226) from 7229-fixDownloadFile into dev ... Reviewed-on: #3226 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-22 09:34:16 +00:00
Carlos Satorres	9e0d4b7c97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute	2024-11-22 10:29:12 +01:00
Jorge Penadés	b97058735c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile	2024-11-22 10:25:28 +01:00
Guillermo Bonet	46c85d44d6	Merge branch 'test' into dev	2024-11-22 09:12:23 +01:00
Guillermo Bonet	a731bb3a45	Merge branch 'master' into test	2024-11-22 09:11:29 +01:00
Guillermo Bonet	c73196edec	fix: refs #7834 expeditionScan_Put no throw	2024-11-22 09:10:18 +01:00
Javier Segarra	f01051a266	Merge pull request 'Revert ItemMigration and enbale in Salix (cd7ed6987a)' (!3236) from revert_7283_itemMigration3 into test ... Reviewed-on: #3236 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-22 08:02:49 +00:00
Javier Segarra	a6d2f9c3f8	Merge branch 'test' into revert_7283_itemMigration3	2024-11-22 07:56:09 +00:00
Javier Segarra	0c592946e6	revert cd7ed6987a	2024-11-21 20:24:33 +01:00
Carlos Andrés	52364bbe2d	feat: refs #8124 Enrutadores nuevos requerimientos	2024-11-21 18:44:47 +01:00
Carlos Andrés	7ad17d75d7	feat: refs #8124 Enrutadores nuevos requerimientos	2024-11-21 18:41:55 +01:00
Javi Gallego	78d3d01649	Merge pull request 'feat: refs #7821 isBooked with grants' (!3150) from 7821-entryIsBooked into dev ... Reviewed-on: #3150 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-21 15:39:52 +00:00
Javi Gallego	41b3f34158	fix: refs #7821 alias	2024-11-21 16:38:11 +01:00
Sergio De la torre	fc75eae338	Merge pull request 'fix: refs #7855 refs#7855 isCheckedDeleted' (!3234) from 7855-expedition_printOut into master ... Reviewed-on: #3234 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-21 15:37:56 +00:00
Sergio De la torre	5ac255ac52	fix: refs #7855 refs#7855 isCheckedDeleted	2024-11-21 16:27:45 +01:00
Javi Gallego	53673f43b8	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 16:20:25 +01:00
Javi Gallego	0ecbef0c9f	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 16:15:10 +01:00
Carlos Andrés	770ace0f8e	Merge branch 'test' into dev	2024-11-21 16:11:42 +01:00
Carlos Andrés	2563d1f0e4	Merge pull request 'refs#8087 Redadas en travel test' (!3232) from travelisRaidTest into test ... Reviewed-on: #3232 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-21 14:55:07 +00:00
Carlos Andrés	0870a1c3d6	refs#8087 Redadas en travel test	2024-11-21 15:09:58 +01:00
Carlos Andrés	dbf71b981e	Merge pull request 'refactor: refs #8210 ticket_splitItemPackingType' (!3217) from 8210-RefactorTicket_splitItemPackingType into dev ... Reviewed-on: #3217 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-11-21 12:39:34 +00:00
Javi Gallego	80851e094d	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:28:54 +01:00
Javi Gallego	510fffb61a	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:09:01 +01:00
Carlos Andrés	762d4b9955	Merge branch 'dev' into 8210-RefactorTicket_splitItemPackingType	2024-11-21 11:53:59 +00:00
Sergio De la torre	07201f6448	Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLog' (!3231) from 7920-itemShelvingLogs into test ... Reviewed-on: #3231 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-21 10:59:52 +00:00
Sergio De la torre	512b4a54df	fix: refs #7920 refs#7920 itemShelvingLog	2024-11-21 11:28:25 +01:00
Carlos Satorres	7b177fa09f	Merge pull request 'fix: hotfix errorMyTeam' (!3229) from hotfix-filterOrder into master ... Reviewed-on: #3229 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 09:23:14 +00:00
Carlos Satorres	2978af8341	fix: hotfix errorMyTeam	2024-11-21 10:18:17 +01:00
Ivan Mas	fee9bbe387	Merge pull request 'refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig' (!3191) from 7690-renameConfigTables into dev ... Reviewed-on: #3191 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-21 09:13:49 +00:00
Ivan Mas	b2fa7e7caf	Merge branch 'dev' into 7690-renameConfigTables	2024-11-21 09:11:06 +00:00
Javi Gallego	b3ce3a0cc2	feat: refs #7821 with test	2024-11-21 09:12:04 +01:00
Jon Elias	9cd16981e6	Merge pull request '#6924 Notify absences only to department boss' (!3175) from 6924-NotifyOnlyToBoss into dev ... Reviewed-on: #3175 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 07:06:27 +00:00
Alex Moreno	0ac46882be	Merge branch 'dev' into 6924-NotifyOnlyToBoss	2024-11-21 06:54:00 +00:00
Alex Moreno	f5b16ca36d	Merge pull request 'fix: refs #7529 fix acls' (!3228) from 7529-worerPitFix into dev ... Reviewed-on: #3228 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 06:03:19 +00:00
Carlos Satorres	2098ea7163	Merge branch 'dev' into 7529-worerPitFix	2024-11-21 04:48:26 +00:00
Carlos Andrés	031c4398ae	refactor: refs #8210 ticket_splitItemPackingType	2024-11-20 19:19:03 +01:00