1608 Commits

Author	SHA1	Message	Date
Jorge Penadés	f69dfbd5aa	refactor: refs #7936 remove schema	2024-12-09 14:03:45 +01:00
Jorge Penadés	7c2c56ed9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-09 13:50:01 +01:00
Carlos Satorres	cb516d2022	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-7323workerHoliday	2024-12-09 13:22:10 +01:00
Guillermo Bonet	e279cc4b47	feat: refs #7882 Added osrm service	2024-12-09 10:01:59 +01:00
Guillermo Bonet	0bb9282953	feat: refs #7882 Added locationiq service	2024-12-09 09:11:55 +01:00
Guillermo Bonet	8960b54664	feat: refs #7882 Added locationiq service	2024-12-08 14:30:05 +01:00
Guillermo Bonet	04a96e87d6	refactor: refs #7882 Deleted quadminds files	2024-12-08 07:28:29 +01:00
Sergio De la torre	f8e5b76a6f	feat: refs #8188 refs#8188 orderPicking	2024-12-05 13:56:06 +01:00
Sergio De la torre	5db8ae53ac	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:39:20 +01:00
Carlos Satorres	483966501a	fix: refs #7031 fix vnPrice	2024-12-05 08:31:09 +01:00
Jorge Penadés	ea5bf85b55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-04 13:31:54 +01:00
Carlos Satorres	fad6f33b7c	fix: refs #7031 remove check	2024-12-04 12:33:17 +01:00
Alex Moreno	fb13a9ff38	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8267-devToTest	2024-12-03 13:11:09 +01:00
Guillermo Bonet	6ae2853c4d	Merge branch 'test' into dev	2024-12-03 12:09:16 +01:00
Guillermo Bonet	c52e03c677	Merge branch 'master' into test	2024-12-03 12:09:05 +01:00
Carlos Satorres	e95b2a4496	Merge branch 'master' into hotfix-8222DeleteZoneSQL	2024-12-03 07:50:08 +00:00
Carlos Satorres	0f0c8250a1	fix: fix sql	2024-12-03 08:44:00 +01:00
Alex Moreno	6fcfb0208d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-03 08:29:21 +01:00
Alex Moreno	1ee6254976	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-03 08:24:49 +01:00
Jorge Penadés	9d26a9df7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-02 17:11:21 +01:00
Jorge Penadés	66a87f1997	feat: refs #6818 add current country prefix	2024-12-02 13:33:39 +01:00
Jorge Penadés	fc4f5b55f7	fix: refs #6818 update country & channel	2024-12-02 12:59:37 +01:00
Ivan Mas	bf0daf90db	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 11:56:58 +00:00
Carlos Satorres	4e6b83809b	fix: workerHoliday hr	2024-12-02 10:29:12 +01:00
Carlos Satorres	cf862202ff	fix: hotfix 7323 createAbsence	2024-12-02 10:12:56 +01:00
Jorge Penadés	c270ec3723	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-29 09:41:08 +01:00
Ivan Mas	6d315bf84d	refactor: refs #7146 route.created to route.dated	2024-11-28 17:29:39 +01:00
Jorge Penadés	ba51052d88	feat: refs #7936 add SiiTypeInvoiceIn model and update invoice correction logic	2024-11-27 17:52:45 +01:00
Carlos Andrés	15c755087c	fix: refs #8221 duaInvoiceIn unique	2024-11-27 14:28:50 +01:00
Jorge Penadés	4234e614fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-27 09:41:19 +01:00
Jorge Penadés	60a90bb090	fix: add IF NOT EXISTS to isRaid column in travel table	2024-11-27 09:38:33 +01:00
Guillermo Bonet	05671be60e	Merge pull request 'refactor: refs #8204 Deprecated itemShelvingLog' (!3249) from 8204-byeItemShelvingLog into dev ... Reviewed-on: #3249 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-27 05:50:44 +00:00
Jorge Penadés	6ab25c2ff5	fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table	2024-11-26 17:06:45 +01:00
Jorge Penadés	a68e287b23	refactor: refs #7936 remove old trigger and add isRaid column to travel table	2024-11-26 17:01:50 +01:00
Jorge Penadés	9a645c3288	fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table	2024-11-26 16:56:39 +01:00
Jorge Penadés	ad35a354a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-facturas-recibidas	2024-11-26 16:35:46 +01:00
Guillermo Bonet	89d941c115	refactor: refs #8235 Deleted deprecated objects	2024-11-26 14:10:39 +01:00
Guillermo Bonet	10fe53b7f2	refactor: refs #8204 Deprecated itemShelvingLog	2024-11-26 14:01:44 +01:00
Guillermo Bonet	f8a79057b2	fix: refs #7899 Version	2024-11-26 13:42:33 +01:00
Ivan Mas	f32d709b9d	Merge branch 'dev' into 7899-deleteUnusedStates	2024-11-26 12:22:30 +00:00
Guillermo Bonet	c14484366e	Merge branch 'test' into dev	2024-11-26 10:10:09 +01:00
Carlos Andrés	d007e4f218	Actualizar db/versions/11363-silverCarnation/00-firstScript.sql	2024-11-25 17:53:44 +00:00
Carlos Andrés	26406b6fdb	feat: refs #8124 Enrutadores nuevos requerimientos	2024-11-25 18:45:37 +01:00
Sergio De la torre	f6941928cd	feat: refs #8213 refs#8213 picker ItemShelvingSale	2024-11-25 16:20:25 +01:00
Ivan Mas	10e332ca85	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-11-25 11:23:52 +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
Ivan Mas	00412e3258	refactor: refs #7899 delete unused states	2024-11-22 12:21:05 +01:00
Pablo Natek	2ba931bedb	Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries	2024-11-22 06:32:19 +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	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	0870a1c3d6	refs#8087 Redadas en travel test	2024-11-21 15:09:58 +01: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
Pablo Natek	c17069a909	Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries	2024-11-21 10:29:52 +01:00
Pablo Natek	c63dfba7da	feat: refs #7301 add inventory-config and acl	2024-11-21 10:18:09 +01:00
Ivan Mas	b2fa7e7caf	Merge branch 'dev' into 7690-renameConfigTables	2024-11-21 09:11:06 +00:00
Ivan Mas	0274c01c14	Merge branch 'dev' into 7690-renameConfigTables	2024-11-20 13:54:57 +00:00
Ivan Mas	830573e229	refactor: refs #7690 remove modifications printQueue_check.sql	2024-11-20 14:49:55 +01:00
Carlos Satorres	82f4815282	fix: refs #7529 fix acls	2024-11-20 14:16:26 +01:00
Carlos Satorres	7ab1b7d171	Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-11-20 13:14:26 +01:00
Carlos Satorres	df249b05d3	fix: refs #7529 fix acl	2024-11-20 13:10:43 +01:00
Guillermo Bonet	42a27f3407	Merge branch 'test' into dev	2024-11-20 12:17:53 +01:00
Jorge Penadés	3cce342d9d	fix: refs #6818 add config	2024-11-20 09:52:42 +01:00
Ivan Mas	715cea0670	Merge branch 'dev' into 7690-renameConfigTables	2024-11-19 15:07:03 +00:00
Ivan Mas	a9d45bde4c	refactor: refs #7690 modify printQueue_check and rename tables	2024-11-19 16:03:23 +01:00
Carlos Andrés	63c0747304	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel	2024-11-19 13:52:12 +01:00
Sergio De la torre	feb11c123e	feat: refs #8099 refs#8099 addComplmentSalary	2024-11-19 11:45:40 +01:00
Sergio De la torre	d21b42a567	feat: refs #8099 refs#8099 addComplmentSalary	2024-11-19 11:24:00 +01:00
Carlos Andrés	43e121a2f3	refactor: refs #8210 ticket_splitItemPackingType	2024-11-19 11:04:16 +01:00
Carlos Satorres	6b0d7762b4	Merge branch '7529-workerPIT' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-11-18 13:57:42 +01:00
Carlos Satorres	2790e92741	fix: refs #7529 fix acl	2024-11-18 13:57:40 +01:00
Guillermo Bonet	8d4769d74d	feat: refs #8057 More precision in getGeo	2024-11-18 13:34:20 +01:00
Guillermo Bonet	cdcc5051d2	feat: refs #8057 Fix version	2024-11-18 13:09:33 +01:00
Guillermo Bonet	2b770c0201	feat: refs #8057 Fix version	2024-11-18 12:56:37 +01:00
Guillermo Bonet	aed4bc89c7	feat: refs #8057 Fix version	2024-11-18 12:53:36 +01:00
Javi Gallego	72415a4348	Merge branch 'dev' into 7821-entryIsBooked	2024-11-18 12:49:59 +01:00
Guillermo Bonet	66009ee0dd	Merge branch 'dev' into 8057-geoFk	2024-11-18 09:52:55 +00:00
Guillermo Bonet	754c0cb9ab	Merge branch '8057-geoFk' of https://gitea.verdnatura.es/verdnatura/salix into 8057-geoFk	2024-11-18 10:52:44 +01:00
Guillermo Bonet	a64f9b74ec	feat: refs #8057 Requested changes	2024-11-18 10:52:41 +01:00
Sergio De la torre	7d5928bc3d	Merge pull request 'feat: refs #8135 refs#8135 updateTicketACL' (!3210) from 8135-ticketACL into dev ... Reviewed-on: #3210 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-18 08:21:18 +00:00
Guillermo Bonet	e81727f3f8	Merge branch 'dev' into 8057-geoFk	2024-11-18 07:58:51 +00:00
Guillermo Bonet	b529ccfe29	feat: refs #7920 Added ItemShelving in shelvingLog	2024-11-15 12:43:15 +01:00
Guillermo Bonet	a3945070f2	refactor: refs #7920 No changes in itemShelvingLog table	2024-11-15 11:34:18 +01:00
Sergio De la torre	07318656b7	feat: refs #8135 refs#8135 updateTicketACL	2024-11-15 08:47:30 +01:00
Guillermo Bonet	e1a091535e	refactor: refs #7920 Fix version	2024-11-15 08:45:28 +01:00
Guillermo Bonet	b5463e5560	refactor: refs #7920 Fix version	2024-11-15 07:54:33 +01:00
Guillermo Bonet	e49285ace8	refactor: refs #7920 Fix version	2024-11-15 07:51:37 +01:00
Guillermo Bonet	e344ae3bf2	refactor: refs #7920 Fix version	2024-11-15 07:48:17 +01:00
Guillermo Bonet	48ffb80094	Merge branch 'dev' into 7920-itemShelving	2024-11-15 06:40:41 +00:00
Guillermo Bonet	d1c528c8fd	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-15 06:03:36 +00:00
Guillermo Bonet	0fbef4c88a	Merge pull request 'fix: refs #7244 Added collection ACL' (!3198) from 7244-collectionAcl into dev ... Reviewed-on: #3198 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 06:01:48 +00:00
Jorge Penadés	f96b914649	fix: refs #6818 use right col type	2024-11-14 16:39:26 +01:00
Jorge Penadés	86c95e185c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel	2024-11-14 16:32:40 +01:00
Jorge Penadés	eff251fbb5	feat: refs #7874 add default type	2024-11-14 15:46:51 +01:00
Alex Moreno	a8cb0b9eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-14 12:21:13 +01:00
Jorge Penadés	25b05637a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel	2024-11-14 11:17:11 +01:00