10221 Commits

Author	SHA1	Message	Date
Robert Ferrús	3adbc9c343	Merge branch 'dev' into 8077-sumDefaulter	2024-11-22 05:39:20 +00:00
Javi Gallego	41b3f34158	fix: refs #7821 alias	2024-11-21 16:38:11 +01:00
Javi Gallego	53673f43b8	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 16:20:25 +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
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
Alex Moreno	0ac46882be	Merge branch 'dev' into 6924-NotifyOnlyToBoss	2024-11-21 06:54:00 +00:00
Ivan Mas	0274c01c14	Merge branch 'dev' into 7690-renameConfigTables	2024-11-20 13:54:57 +00: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
Robert Ferrús	26965c33de	Merge branch 'dev' into 8077-sumDefaulter	2024-11-20 11:43:58 +00:00
Pablo Natek	cde3c8c50a	Merge pull request 'feat: refs #8138 reduce credit on risk' (!3215) from 8138-feat-reduce-credit-on-risk into dev ... Reviewed-on: #3215 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-20 11:21:09 +00:00
Guillermo Bonet	42a27f3407	Merge branch 'test' into dev	2024-11-20 12:17:53 +01:00
Guillermo Bonet	d302a9c3ba	Merge branch 'master' into test	2024-11-20 12:17:30 +01:00
Carlos Satorres	be311c0557	fix: fix deleteZone	2024-11-20 11:09:15 +01:00
Pablo Natek	5e52b3b596	Merge branch 'dev' into 8138-feat-reduce-credit-on-risk	2024-11-20 06:46:46 +00:00
Carlos Andrés	ad345a0b91	Merge pull request 'feat: refs#8087 Redadas en travel' (!3177) from 8087-nuevosCamposTravel into dev ... Reviewed-on: #3177 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-19 16:57:15 +00:00
Ivan Mas	715cea0670	Merge branch 'dev' into 7690-renameConfigTables	2024-11-19 15:07:03 +00:00
Robert Ferrús	846479f942	Merge branch 'dev' into 8077-sumDefaulter	2024-11-19 13:05:04 +00: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
Jon Elias	492c79de46	Merge branch 'dev' into 6924-NotifyOnlyToBoss	2024-11-19 12:42:53 +00:00
Jon Elias	149524f4fd	Merge branch '6924-NotifyOnlyToBoss' of https://gitea.verdnatura.es/verdnatura/salix into 6924-NotifyOnlyToBoss	2024-11-19 13:40:32 +01:00
Jon Elias	f145649fc7	fix: refs #6924 requested change	2024-11-19 13:40:31 +01:00
Jorge Penadés	c31fa7e9cf	Merge branch 'test' into 7323-warfix-addRemainingFields	2024-11-19 12:33:01 +00:00
Jorge Penadés	f89080d373	fix: refs #7323 add remaining fields	2024-11-19 11:53:12 +01:00
Sergio De la torre	d21b42a567	feat: refs #8099 refs#8099 addComplmentSalary	2024-11-19 11:24:00 +01:00
Pablo Natek	a3f92a284f	Merge branch 'dev' into 8138-feat-reduce-credit-on-risk	2024-11-19 07:02:11 +00:00
Pablo Natek	2f93da199a	feat: refs #8138 reduce credit on risk	2024-11-19 08:01:41 +01:00
Alex Moreno	7f39edf014	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-19 07:46:43 +01:00
Pablo Natek	4e7a96442a	Merge branch 'master' into 7404-fixNegativeQuantity	2024-11-19 05:21:26 +00:00
Pablo Natek	33d9ba9b44	fix: refs #7404 negative quantity	2024-11-19 06:21:00 +01:00
Pablo Natek	056b5adddc	Merge branch 'dev' into 7457-orderFilter	2024-11-19 05:12:18 +00:00
Carlos Satorres	6619ec451c	fix: getSales	2024-11-18 13:46:56 +01:00
Robert Ferrús	4e5b9e6a34	Merge branch '8077-sumDefaulter' of https://gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulter	2024-11-18 13:21:35 +01:00
Robert Ferrús	4b309d7dc3	Merge branch 'dev' into 8077-sumDefaulter	2024-11-18 12:20:15 +00:00
Robert Ferrús	76b32e1d25	feat: refs #8077 add description to sumAmount	2024-11-18 13:19:25 +01:00
Javi Gallego	72415a4348	Merge branch 'dev' into 7821-entryIsBooked	2024-11-18 12:49:59 +01:00
Javier Segarra	4b64b27ca7	Merge branch 'dev' into 7289_sales_already_moved	2024-11-18 10:39:17 +00:00
Jorge Penadés	dd637b9333	fix: refs #6869 use id as primaryKey	2024-11-18 10:34:23 +01:00
Javier Segarra	9558d030ff	feat: refs #7289 #7289 remove bad translation	2024-11-18 10:10:30 +01:00
Guillermo Bonet	2b97c18412	Merge branch 'dev' into 6869-createGetDetails	2024-11-18 08:34:11 +00:00
Robert Ferrús	2511fbf71c	Merge branch 'dev' into 8077-sumDefaulter	2024-11-18 06:18:06 +00:00
Javier Segarra	6c00efae89	feat: refs #7289 #7289 apply option 1	2024-11-17 17:57:54 +01:00
Ivan Mas	2a1c0ef2af	Merge branch 'dev' into 7690-renameConfigTables	2024-11-15 13:35:14 +00:00
Ivan Mas	6a11416838	refactor: refs #7690 copy acls and remove worker-time-control-params.json	2024-11-15 14:30:32 +01:00
Jon Elias	7d7c66de89	Merge branch 'Hotfix-DescriptorRedirectToLilium' of https://gitea.verdnatura.es/verdnatura/salix into Hotfix-DescriptorRedirectToLilium	2024-11-15 14:22:21 +01:00
Jon Elias	4783cc23ac	refactor: deleted negative bases route due to not being used	2024-11-15 14:22:19 +01:00
Jon Elias	af781d4c1a	Merge branch 'master' into Hotfix-DescriptorRedirectToLilium	2024-11-15 12:15:21 +00:00
Jon Elias	6ed521ae5e	fix: redirect to invoice-out summary from salix' descriptor	2024-11-15 13:10:19 +01:00