24337 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	7dae387b7f	Merge pull request '8032-devToTest_2440' (!3009) from 8032-devToTest_2440 into test ... Reviewed-on: #3009 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-09-24 09:34:47 +00:00
Alex Moreno	afbf084535	Merge branch 'test' into 8032-devToTest_2440	2024-09-24 09:29:38 +00:00
Alex Moreno	ae97c8a035	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-24 11:29:09 +02:00
Sergio De la torre	ea06afb361	Merge pull request 'fix: hotFix backLimit refs #6964' (!3003) from 6964-ListItemNewer into master ... Reviewed-on: #3003 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 05:17:02 +00:00
Robert Ferrús	2a3dcbe71a	Merge pull request 'feat: refs #8000 add column' (!3005) from 8000-zoneAddColumn into master ... Reviewed-on: #3005 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 11:23:03 +00:00
Ivan Mas	f4de066d16	Merge pull request 'refactor: refs #7725 deprecate worker.isF11Allowed' (!3002) from 7725-refactorIsF11Allowed into dev ... Reviewed-on: #3002 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-23 10:26:41 +00:00
Robert Ferrús	a61d2ceb56	Merge branch 'master' into 8000-zoneAddColumn	2024-09-23 10:26:19 +00:00
Javier Segarra	21cc899e99	Merge pull request 'HOTFIX: Administrative role ACL' (!3006) from hotfix_administrativeACL into master ... Reviewed-on: #3006 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 10:17:18 +00:00
Javier Segarra	4689681618	fix(salix): add administrative ACLs	2024-09-23 12:07:06 +02:00
Robert Ferrús	31d5a7a635	feat: refs #8000 add column	2024-09-23 11:53:27 +02:00
Robert Ferrús	c0cc25219f	Merge pull request 'feat: refs #8000 refs #8000 catalog_calculate itemMaxLength' (!2992) from 8000-catalog_calculate into master ... Reviewed-on: #2992 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-23 09:11:10 +00:00
Robert Ferrús	b34e8a7b7e	Merge branch 'master' into 8000-catalog_calculate	2024-09-23 08:18:49 +00:00
Pablo Natek	cd545c0001	Merge pull request 'fix(shelving_clean): less time por shelving removal' (!2988) from fixShelvingClean into master ... Reviewed-on: #2988 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-23 08:05:09 +00:00
Sergio De la torre	c6d5e2f292	fix: hotFix backLimit refs #6964	2024-09-23 08:09:24 +02:00
Robert Ferrús	e0e3201f78	Merge branch 'master' into 8000-catalog_calculate	2024-09-23 05:37:43 +00:00
Ivan Mas	06f8f8e95e	refactor: refs #7725 deprecate worker.isF11Allowed	2024-09-22 08:39:19 +02:00
Javier Segarra	20c42e82e9	Merge pull request 'fix: acls' (!2999) from hotfix-postCodeACLS into master ... Reviewed-on: #2999 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-20 12:40:28 +00:00
Javier Segarra	8523ec1b8a	Merge branch 'master' into hotfix-postCodeACLS	2024-09-20 12:38:35 +00:00
Carlos Andrés	e25415f820	fix: refs#8011 previousSticker_get	2024-09-20 13:54:22 +02:00
Javier Segarra	6f78a7470c	Merge branch 'master' into hotfix-postCodeACLS	2024-09-20 11:51:11 +00:00
Carlos Andrés	190c964ec2	fix: refs#8011 previousSticker_get	2024-09-20 13:50:08 +02:00
Carlos Satorres	346893455f	fix: remove comment	2024-09-20 13:38:53 +02:00
Carlos Satorres	564d23653c	fix: acls	2024-09-20 13:24:00 +02:00
Pako Natek	ada3fbe019	Merge pull request 'feat(TPV): refs #7999 new frmLongTermStorage' (!2998) from 7999-longTermStorage into dev ... Reviewed-on: #2998 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-20 11:07:43 +00:00
Carlos Andrés	7dce536f43	Merge pull request 'fix: refs #8011 Previas compo F' (!2995) from 8011-previas-campo-F into master ... Reviewed-on: #2995 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-09-20 10:23:04 +00:00
Robert Ferrús	3bdd196fcc	Merge branch 'master' into 8000-catalog_calculate	2024-09-20 08:38:12 +00:00
Robert Ferrús	a65700abed	feat: refs #8000 modificar comentario	2024-09-20 10:37:36 +02:00
Pako Natek	e9b93ff99b	Merge branch 'dev' into 7999-longTermStorage	2024-09-20 08:13:52 +00:00
Pako Natek	e8add6e614	feat(TPV): refs #7999 new frmLongTermStorage ... Parking table foreign key updated Old proc removed Refs: #7999	2024-09-20 10:12:24 +02:00
Carlos Andrés	633766e58b	fix: recupero version anterior	2024-09-20 10:06:10 +02:00
Carlos Satorres	477ad30c4f	Merge pull request 'fix: refs #6898 filter fix' (!2997) from 6898-fixSupplier2 into master ... Reviewed-on: #2997 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-20 07:35:21 +00:00
Carlos Satorres	eb3ea010a1	Merge branch 'master' into 6898-fixSupplier2	2024-09-20 07:31:15 +00:00
Carlos Satorres	889b86644b	fix: refs #6898 filter fix	2024-09-20 09:14:38 +02:00
Carlos Andrés	cd5efc095f	Merge pull request 'solve_merge_problems' (!2986) from solve_merge_problems into master ... Reviewed-on: #2986 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-20 07:07:22 +00:00
Carlos Andrés	1a44d23239	Merge branch 'master' into solve_merge_problems	2024-09-20 08:59:58 +02:00
Robert Ferrús	1b4a324c3c	feat: refs #8000 modificar comentarios	2024-09-20 07:58:15 +02:00
Robert Ferrús	f50b8326ba	Merge branch '8000-catalog_calculate' of https://gitea.verdnatura.es/verdnatura/salix into 8000-catalog_calculate	2024-09-20 07:33:08 +02:00
Robert Ferrús	0c35e1fa9c	feat: refs #8000 modificar comentario	2024-09-20 07:33:05 +02:00
Robert Ferrús	e75ac1bb8d	Merge branch 'master' into 8000-catalog_calculate	2024-09-20 04:58:51 +00:00
Carlos Andrés	4c0e05fdab	fix: refs #8011 Previas compo F	2024-09-19 18:03:59 +02:00
Guillermo Bonet	28c38d09fd	Merge branch 'test' into dev	2024-09-19 16:41:08 +02:00
Guillermo Bonet	8c2e6558a3	Merge branch 'master' into test	2024-09-19 16:40:49 +02:00
Guillermo Bonet	e40e3ebed6	fix: refs #7882 Quadmind api config	2024-09-19 16:40:33 +02:00
Ivan Mas	5dec25d423	Merge pull request 'feat: refs #7343 Modify driverRouteEmail.js' (!2994) from 7343-ModifyDiverRouteEmail into dev ... Reviewed-on: #2994 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-19 11:07:14 +00:00
Ivan Mas	24b9dfb9a9	Merge branch 'dev' into 7343-ModifyDiverRouteEmail	2024-09-19 10:50:44 +00:00
Ivan Mas	c82c9395a4	feat: refs #7343 Requested changes	2024-09-19 12:49:45 +02:00
Alex Moreno	ccb60eee87	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-19 12:42:12 +02:00
Alex Moreno	b7e712b738	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-19 12:38:08 +02:00
Ivan Mas	c30ecd3760	feat: refs #7343 Modify driverRouteEmail.js	2024-09-19 12:26:06 +02:00
Robert Ferrús	5456490dcd	feat: refs #8000 poner comentario	2024-09-19 12:09:47 +02:00