7059 Commits

Author	SHA1	Message	Date
Ivan Mas	23fb04876c	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2025-01-07 12:16:20 +00:00
Guillermo Bonet	065f13557b	feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana	2025-01-07 11:58:36 +01:00
Jon Elias	c06f2c4e6f	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2025-01-07 09:00:26 +00:00
Robert Ferrús	f04f88d2fc	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 08:00:54 +00:00
Alex Moreno	1cd083ac68	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-07 08:16:43 +01:00
Alex Moreno	48d4bab706	build: refs #8355 dump db	2025-01-07 08:01:44 +01:00
Robert Ferrús	5c42130495	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 06:15:15 +00:00
Alex Moreno	e0a5a3cd8c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-06 19:06:14 +01:00
Pablo Natek	67c484cd87	feat: refs #7301 update SQL fixtures and enhance lastEntriesFilter logic	2025-01-03 09:39:49 +01:00
Pablo Natek	98b68a2c74	Merge pull request 'fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic' (!3324) from 7301-removeRedundantInventories into dev ... Reviewed-on: #3324 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-02 09:54:10 +00:00
Jon Elias	5221b9254a	Merge branch 'dev' of https: refs #7202//gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2025-01-02 08:39:57 +01:00
Carlos Satorres	78a8f80321	fix: refs #7917 fix tback	2025-01-02 08:38:24 +01:00
Alex Moreno	7092226c01	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-02 07:51:54 +01:00
Alex Moreno	bf80cbbf4a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-02 07:50:28 +01:00
Carlos Satorres	81d3bce12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-02 06:23:35 +01:00
Ivan Mas	1cc6e37697	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-31 07:36:21 +00:00
Javi Gallego	8ca5808554	fix: add isCustomInspectionRequired column to item table for customs inspection indication	2024-12-29 10:16:38 +01:00
Javi Gallego	49d87ea44f	Merge pull request 'feat: refs #7924 add isCustomInspectionRequired field to item and update related logic' (!3325) from 7924-itemInspection into dev ... Reviewed-on: #3325 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-29 09:10:51 +00:00
Jose Antonio Tubau	0665453465	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-24 10:55:10 +00:00
Carlos Satorres	85163a13fa	fix: refs #7917 fix fixtures	2024-12-24 08:13:00 +01:00
Jose Antonio Tubau	a2218b41f8	feat: refs #8266 added itemFk and needed fixtures	2024-12-23 14:49:44 +01:00
Carlos Satorres	419815ff87	fix: refs #7917 fix back	2024-12-23 11:59:40 +01:00
Carlos Satorres	afb01ed021	fix: refs #7917 fix route filter freeLancer	2024-12-23 11:55:48 +01:00
Ivan Mas	c59cae9f74	feat: refs #8073 new comment message	2024-12-19 14:38:28 +01:00
Ivan Mas	da4968f8b1	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-19 12:55:23 +00:00
Javi Gallego	a99d7adfe8	feat: refs #7924 add isCustomInspectionRequired field to item and update related logic	2024-12-19 10:11:33 +01:00
Pablo Natek	49c30890e5	fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic	2024-12-19 08:31:51 +01:00
Carlos Andrés	83d46d0a28	feat: refs #8324 country unique	2024-12-18 17:58:30 +01:00
Ivan Mas	148ab57b1a	feat: refs #8073 change names and primary key	2024-12-18 15:06:49 +01:00
Ivan Mas	5620242d7e	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-18 12:30:16 +00:00
Ivan Mas	1ba23ad450	feat: refs #8073 #refs 8073 create vn.productionCountryVolume	2024-12-18 13:27:43 +01:00
Carlos Andrés	94136d35ff	Actualizar db/routines/vn/triggers/route_afterUpdate.sql	2024-12-18 12:22:59 +00:00
Ivan Mas	ab5cf0f497	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-18 11:17:14 +00:00
Alex Moreno	116ec5b107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest	2024-12-18 11:22:28 +01:00
Jorge Penadés	7a3339b623	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-18 10:18:43 +01:00
Alex Moreno	1a8b05c46b	fix: refs #8315 fixture claimDevelopment	2024-12-18 07:08:23 +01:00
Ivan Mas	af86bb24c4	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-17 15:06:00 +00:00
Jorge Penadés	b4c8e16019	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-17 12:31:27 +01:00
Jorge Penadés	6476eb28e6	Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-17 10:51:52 +01:00
Guillermo Bonet	db2a102a88	Merge pull request 'refactor: refs #8262 Deprecated inventoryFailure' (!3311) from 8262-byeInventoryFailure into dev ... Reviewed-on: #3311 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-17 06:17:19 +00:00
Guillermo Bonet	4f4eb389c9	Merge pull request 'feat: refs #8218 Added time and code in mistakeType' (!3310) from 8218-workerMistake into dev ... Reviewed-on: #3310 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-17 06:15:29 +00:00
Robert Ferrús	68715a8c36	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2024-12-16 13:25:38 +00:00
Juanjo Breso	6a3cbed3dd	fix: refs #8174 fix	2024-12-16 13:47:36 +01:00
Juanjo Breso	5a7ac8dcb3	fix: refs #8174 fix	2024-12-16 13:44:58 +01:00
Juanjo Breso	48064d6393	fix: refs #8174 fix	2024-12-16 13:35:50 +01:00
Juanjo Breso	de69a8db1d	fix: refs#8174 fix	2024-12-16 13:01:00 +01:00
Juanjo Breso	11db90c67c	fix: refs#8174 fix	2024-12-16 12:48:43 +01:00
Juanjo Breso	deb1b68c49	fix: refs#8174 fix	2024-12-16 12:47:47 +01:00
Juanjo Breso	7232bfb7a6	fix: 8174 pasar PIN a CHAR	2024-12-16 12:42:08 +01:00
Juanjo Breso	d03a2ced04	fix: refs8174 pasar a char el PIN	2024-12-16 12:30:35 +01:00
Guillermo Bonet	fda2c5725a	refactor: refs #8262 Deprecated inventoryFailure	2024-12-16 12:23:02 +01:00
Guillermo Bonet	5346dd845e	feat: refs #8218 Added time and code in mistakeType	2024-12-16 11:40:57 +01:00
Robert Ferrús	e7e6c88ec5	Merge branch 'dev' into 8190-entry_getCommission	2024-12-16 10:18:53 +00:00
Guillermo Bonet	71fb3996cd	refactor: refs #7882 Added ACL's	2024-12-16 09:40:55 +01:00
Jorge Penadés	d9eab36160	fix: refs #7936 conflicts	2024-12-16 09:35:41 +01:00
Jorge Penadés	4612bf2e9b	Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-16 09:35:23 +01:00
Guillermo Bonet	d9a6e8a1c9	refactor: refs #7882 Added ACL's	2024-12-16 09:34:45 +01:00
Guillermo Bonet	d42ff07547	feat: refs #8174 Changed datatype incompatibility access	2024-12-16 09:20:27 +01:00
Guillermo Bonet	57c3cc8546	feat: refs #8174 Created table sim	2024-12-16 09:01:10 +01:00
Robert Ferrús	1d7e69cb25	feat: refs #7584 workerTimeControl_afterDelete	2024-12-16 07:40:49 +01:00
Guillermo Bonet	e1db7a86f6	Merge branch 'dev' into 7882-locationiq	2024-12-16 06:16:03 +00:00
Carlos Andrés	ec2b6dd0c2	Actualizar db/versions/11327-maroonOak/00-firstScript.sql	2024-12-13 14:55:03 +00:00
Carlos Andrés	11827207ba	Merge pull request 'feat: refs#8174 simSupplier' (!3158) from 8174-crearTablaSim into dev ... Reviewed-on: #3158 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-13 13:43:46 +00:00
Guillermo Bonet	3cdb6c438b	Merge branch 'test' into dev	2024-12-13 13:06:26 +01:00
Guillermo Bonet	452ec3d731	fix: refs #247552 ticket 247552 claimRatio_add	2024-12-13 08:29:14 +01:00
Guillermo Bonet	00b5333ab7	feat: refs #7882 Added tests	2024-12-13 08:07:13 +01:00
Guillermo Bonet	bfad016ec4	Merge branch 'dev' into 7882-osrm	2024-12-13 07:01:42 +01:00
Carlos Andrés	20cf3e0d19	Merge pull request 'fix: refs #8087 refs#8087 errores travel_moveRaids' (!3264) from 8087-erroresTravel_moveRaid into master ... Reviewed-on: #3264 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-12 18:21:42 +00:00
Guillermo Bonet	05ba85219b	feat: refs #7882 Osrm service	2024-12-12 14:35:58 +01:00
Pablo Natek	8e61160aeb	Merge pull request 'feat: refs #7301 add inventory-config and acl' (!3230) from 7301-itemLastEntries into dev ... Reviewed-on: #3230 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 13:12:33 +00:00
Guillermo Bonet	95d7c7f227	Merge branch 'dev' into 7882-osrm	2024-12-12 14:06:44 +01:00
Jorge Penadés	8b37d99287	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-12 09:58:42 +01:00
Jon Elias	7fe3369c35	Merge pull request '#8219: Modified data to be equal as the updated back' (!3274) from Invoice-Out-TransferInvoice into dev ... Reviewed-on: #3274 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-12 08:37:50 +00:00
Pablo Natek	33287938ec	Merge branch 'dev' into 7301-itemLastEntries	2024-12-12 08:34:54 +00:00
Carlos Satorres	2885facc01	Merge branch 'dev' into 7031-zonePrice	2024-12-12 08:32:07 +00:00
Pablo Natek	b5d4d31abb	fix: refs #7301 update ACL insertion to use INSERT IGNORE and refine property value	2024-12-12 09:25:51 +01:00
Jon Elias	956673cf56	Merge branch 'dev' into Invoice-Out-TransferInvoice	2024-12-12 07:02:28 +00:00
Carlos Andrés	fbd6178c06	fix: refs #8149 taxableBase invoiceIn	2024-12-11 13:16:39 +01:00
Guillermo Bonet	bc072208d7	Merge branch 'dev' into 7882-osrm	2024-12-11 11:44:23 +01:00
Juanjo Breso	0d26c52d5d	Merge branch 'dev' into 8174-crearTablaSim	2024-12-11 10:23:44 +00:00
Robert Ferrús	7886adb8f5	Merge branch 'dev' into 8190-entry_getCommission	2024-12-11 10:20:31 +00:00
Juanjo Breso	193e628118	Merge branch '8174-crearTablaSim' of https://gitea.verdnatura.es/verdnatura/salix into 8174-crearTablaSim	2024-12-11 11:20:19 +01:00
Juanjo Breso	28ab6b2266	feat: refs #8174 fix	2024-12-11 11:20:15 +01:00
Jorge Penadés	2a2b4b139b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-11 09:13:50 +01:00
Guillermo Bonet	c8ec94bed9	feat: refs #7882 Osrm service	2024-12-11 09:03:14 +01:00
Alex Moreno	bc3afa81e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-11 07:18:59 +01:00
Sergio De la torre	31692ddd3b	fix: refs #8188 refs#8188 add IfNotExists	2024-12-11 07:15:40 +01:00
Carlos Satorres	83fd11eba8	Merge branch 'dev' into 7031-zonePrice	2024-12-10 18:40:06 +00:00
Juanjo Breso	ce58a9ab2c	Merge branch 'dev' into 8174-crearTablaSim	2024-12-10 12:49:44 +00:00
Juanjo Breso	8797635101	feat: refs #8174 fix	2024-12-10 13:46:03 +01:00
Juanjo Breso	10558853a2	feat: refs #8174 create table simsupplier	2024-12-10 13:41:45 +01:00
Alex Moreno	4e72b17e18	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-10 13:41:09 +01:00
Carlos Satorres	535b04e1df	Merge branch 'dev' of https: refs #7031//gitea.verdnatura.es/verdnatura/salix into 7031-zonePrice	2024-12-10 12:44:52 +01:00
Juan Ferrer	06230d6b2a	Merge pull request 'refs #8257 test into dev' (!3287) from test into dev ... Reviewed-on: #3287	2024-12-10 10:22:54 +00:00
Alex Moreno	2f47d7d76e	build: refs #8282 dump db	2024-12-10 10:30:43 +01:00
Sergio De la torre	699e56a64c	Merge pull request 'feat: refs #8188 refs#8188 orderPicking' (!3279) from 8188-orderPicking into test ... Reviewed-on: #3279 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-10 06:05:11 +00:00
Jorge Penadés	fcb842d948	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-09 16:44:08 +01:00
Alex Moreno	94bc1241e5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-09 14:31:37 +01:00
Alex Moreno	9403588d7b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-09 14:30:03 +01:00
Jorge Penadés	f69dfbd5aa	refactor: refs #7936 remove schema	2024-12-09 14:03:45 +01:00