9474 Commits

Author	SHA1	Message	Date
Pablo Natek	d152a58dda	Merge branch '7129-fixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7129-fixFilter	2024-07-22 13:33:52 +02:00
Pablo Natek	b73eceb1c8	fix: refs #7129 fix backFilters	2024-07-22 13:33:51 +02:00
Pablo Natek	62ab72d6d5	Merge branch 'test' into 7129-fixFilter	2024-07-22 11:20:04 +00:00
Guillermo Bonet	b58cdcc590	Merge branch 'master' into test	2024-07-22 12:24:39 +02:00
Guillermo Bonet	ab45b988c8	feat: refs #7704 Added itemMinimumQuantity_check	2024-07-22 10:27:24 +02:00
Pablo Natek	c18765f22f	fix: refs #7129 fix return	2024-07-22 09:18:37 +02:00
Pablo Natek	c3d3a21b23	feat: refs #7129 add fields	2024-07-22 09:12:24 +02:00
Guillermo Bonet	ce59a2bbbf	fix: refs #6769 Item diary redirection to Lilium	2024-07-22 08:40:12 +02:00
Pablo Natek	ae18a52a89	fix: refs #7129 fix filter	2024-07-22 06:41:02 +02:00
Javier Segarra	376ddebdcd	Merge branch 'master' into 7648_myEntries	2024-07-19 11:42:53 +02:00
Guillermo Bonet	fd2bac713d	fix: #6184 Deleted unused params	2024-07-19 07:16:24 +02:00
Guillermo Bonet	f18b165e4a	Merge branch 'master' into test	2024-07-18 13:45:23 +02:00
Robert Ferrús	e96fa75356	fix: refs #7039 country order	2024-07-18 09:22:27 +02:00
Sergio De la torre	0181764744	Merge pull request 'master' (!2750) from master into test ... Reviewed-on: #2750 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 15:09:35 +00:00
Sergio De la torre	3aea6fdd46	hotFix reservas refs #6861	2024-07-17 16:13:31 +02:00
Alex Moreno	a1f481deb1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 14:17:17 +02:00
Alex Moreno	2763839c54	hotFix(workerTimeControl): confirm correct url	2024-07-17 13:42:23 +02:00
Alex Moreno	d52a229613	hotFix(workerTimeControl): confirm correct url	2024-07-17 13:40:57 +02:00
Alex Moreno	021d315a01	fix: weeklyHourRecordEmail workerId prop and correct request in frontend	2024-07-17 13:30:47 +02:00
Alex Moreno	ae2ddcb8c7	add console.log	2024-07-17 12:20:58 +02:00
Alex Moreno	e5bfb4af23	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 12:20:22 +02:00
Alex Moreno	4ff388198b	fix(deletExpeditions): add try catch	2024-07-17 10:14:41 +02:00
Pablo Natek	f83dd37a28	fix: refs #6403 remove line	2024-07-17 08:23:33 +02:00
Pablo Natek	0ea69427ec	feat: refs #6403 add cancelShipment on deleteExpeditions	2024-07-17 08:16:01 +02:00
Javier Segarra	d558e3d9f4	test(salix): refs #7648 #7648 test travels and entries	2024-07-16 12:45:51 +02:00
Javier Segarra	8fe94772f3	feat(salix): refs #7648 #7648 buyLabels	2024-07-16 12:45:31 +02:00
Javier Segarra	6856ab0501	feat(salix): refs #7648 #7648 myEntries	2024-07-16 12:45:14 +02:00
Alex Moreno	1cf0ab1654	Merge branch 'test' into warmFix_worker_new	2024-07-16 08:51:11 +00:00
Alex Moreno	b871615e8f	fix: worker new if not has provinceFk	2024-07-16 10:42:08 +02:00
Sergio De la torre	dbb893c723	Merge pull request 'refs newStatePartial refs #7642' (!2737) from 7642newState into test ... Reviewed-on: #2737 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-16 08:19:38 +00:00
Alex Moreno	4fa9f057de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 07:41:21 +02:00
Sergio De la torre	dc5903421b	refs newStatePartial refs #7642	2024-07-15 16:21:19 +02:00
Sergio De la torre	87b0d3e8d1	refs newStatePartial refs #7642	2024-07-15 16:18:30 +02:00
Javi Gallego	f25d5c3bb5	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 10:37:53 +00:00
Alex Moreno	eca89c1c4e	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 08:19:26 +00:00
Javier Segarra	199d8e0034	Merge branch '7648_myEntries_filter' of https://gitea.verdnatura.es/verdnatura/salix into 7648_myEntries_filter	2024-07-15 09:59:58 +02:00
Javier Segarra	fb8b31b397	perf: refs #7648 #7648 clean fixtures and SQL filter	2024-07-15 09:59:52 +02:00
Javier Segarra	0ca4bffaf0	Perf: improve condition days filter	2024-07-13 18:07:46 +00:00
Javier Segarra	1d23554508	perf(ssalix): refs #7648 remove default value	2024-07-12 20:52:52 +02:00
Javier Segarra	5dcabd687e	feat(ssalix): refs #7648 clean test !entry.filter	2024-07-12 20:52:26 +02:00
Javier Segarra	bedff9f290	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 20:24:25 +02:00
Guillermo Bonet	dcde6bb37a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-12 14:04:50 +02:00
Guillermo Bonet	1e264c2102	fix: refs #7704 Warehouse priority	2024-07-12 14:04:49 +02:00
Alex Moreno	896d273da8	fix(worker_new): fix countryFk	2024-07-12 12:06:37 +02:00
Robert Ferrús	4da811cba6	Merge branch 'dev' into 7670-addSaleRenewPrice	2024-07-12 08:50:48 +00:00
Guillermo Bonet	f8f6950de1	Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev ... Reviewed-on: #2683 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 08:13:27 +00:00
Guillermo Bonet	1531e27911	fix: refs #7704 Restored minimum quantity label	2024-07-12 10:00:52 +02:00
Guillermo Bonet	910071bde0	refactor: refs #7704 Requested changes	2024-07-12 09:11:55 +02:00
Guillermo Bonet	bb787b1581	refactor: refs #7704 Requested changes	2024-07-12 09:03:37 +02:00
Javier Segarra	47cff3f894	feat(ssalix): refs #7648 remove select field	2024-07-12 08:52:03 +02:00