26496 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	51edeec9a2	Merge pull request 'fix: refs #8494 Fix ZoneIncluded logs' (!3398) from test into master ... Reviewed-on: #3398	2025-01-29 12:17:38 +00:00
Robert Ferrús	35e72c90d3	Merge branch 'dev' into 6822-entryTransferFix	2025-01-29 11:46:23 +00:00
Robert Ferrús	d536690197	feat: refs #6822 changes request	2025-01-29 12:43:46 +01:00
Jose Antonio Tubau	ad29b26553	refactor: refs #7414 update Spanish translation for 'total' to 'importe'	2025-01-29 12:43:03 +01:00
Pako Natek	af5b4981df	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-01-29 11:16:41 +00:00
Pako Natek	597615facb	fix(agencyIncomingForeign): refs #8408 version changes rolled back ... Refs: #8408	2025-01-29 12:15:04 +01:00
Pako Natek	4e2a6d275a	fix(travel): refs #8408 trigger restriction for wrong availabled value ... Refs: #8408	2025-01-29 12:12:23 +01:00
Pako Natek	0de9c3c172	feat(available): refs #8408 available refreshing now includes time ... Refs: #8408	2025-01-29 12:03:55 +01:00
Jon Elias	17b4089b51	Merge pull request 'Fix[WorkerFilter]: Fixed filter' (!3394) from Fix-WorkerFilterLimit into dev ... Reviewed-on: #3394 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-01-29 11:03:14 +00:00
Jon Elias	8f3226f7c1	Merge pull request 'Hotfix[CreateManualInvoice]: Fixed manual invoice' (!3393) from Hotfix-ManualInvoice into master ... Reviewed-on: #3393 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-29 10:59:09 +00:00
Jorge Penadés	2b443266b2	Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-29 11:51:21 +01:00
Jon Elias	1d53f2c490	fix: worker filter limit	2025-01-29 11:43:15 +01:00
Carlos Satorres	78842cd69c	Merge pull request 'fix: refs #7917 fix route filter freeLancer' (!3327) from 7917-freelancerRoute2 into dev ... Reviewed-on: #3327 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-29 10:37:04 +00:00
Carlos Satorres	17a27060c3	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-29 10:11:50 +00:00
Jon Elias	f088f1776f	fix: fixed manual invoice	2025-01-29 10:45:29 +01:00
Juan Ferrer	9a6b89793c	fix: refs #8494 Fix ZoneIncluded logs	2025-01-29 10:35:06 +01:00
Javier Segarra	295c8493a8	Merge branch '7134-supplierBalance' of https://gitea.verdnatura.es/verdnatura/salix into 7134-supplierBalance	2025-01-29 09:54:17 +01:00
Javier Segarra	f2be71be6c	fix: refs #7134 replace value by util.VN_CURDATE()	2025-01-29 09:54:05 +01:00
Guillermo Bonet	56b0baebaa	feat: refs #8227 Roadmap changes	2025-01-29 07:53:41 +01:00
Javier Segarra	b32c7f734f	Merge branch 'dev' into 7134-supplierBalance	2025-01-28 22:43:12 +00:00
Javier Segarra	a63ca1b3c5	Merge branch 'dev' into 7134-supplierBalance	2025-01-28 23:39:03 +01:00
Ivan Mas	dfcc155ef9	Merge branch 'dev' into 8312-newPackagingColumn	2025-01-28 18:14:38 +00:00
Ivan Mas	821e2cbe4d	feat: refs #8312 new column packaging.rejectCost	2025-01-28 19:11:56 +01:00
Carlos Andrés	ec71cb8df6	Merge pull request 'fix: refs #8492 Sage invoiceInTax Check VAT' (!3390) from 8492-InvoiceInTax-Check-VAT into dev ... Reviewed-on: #3390 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-28 17:58:17 +00:00
Carlos Andrés	801629c8db	fix: refs #8492 Sage invoiceInTax Check VAT	2025-01-28 18:04:02 +01:00
Robert Ferrús	a6a875cb2c	feat: refs #8077 redirection lilium	2025-01-28 13:27:35 +01:00
Carlos Satorres	b383725f9f	fix: refs #7917 fix user tests	2025-01-28 12:56:30 +01:00
Carlos Satorres	bb08ad7d1a	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-28 12:51:24 +01:00
Carlos Satorres	a01c419b44	fix: refs #7917 fix tback	2025-01-28 12:51:21 +01:00
Carlos Satorres	3c16914135	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-28 11:43:25 +00:00
Jorge Penadés	051c6ffcbc	refactor(vehicle filter): refs #7119 simplify search condition to use logical OR for ID and number plate	2025-01-28 12:23:24 +01:00
Carlos Satorres	b14beb83f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-28 11:55:27 +01:00
Jorge Penadés	2eabfaaa8f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-28 11:44:59 +01:00
Robert Ferrús	8482743baf	feat: refs #6822 ACL	2025-01-28 11:26:48 +01:00
Sergio De la torre	8ed9e864a2	Merge pull request '7569_sendEmail' (!3387) from 7569_sendEmail into master ... Reviewed-on: #3387 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-28 10:26:48 +00:00
Sergio De la torre	1575c509d1	fix: refs #7569 saveSign use lastState	2025-01-28 11:19:45 +01:00
Sergio De la torre	3f0f155113	fix: refs #7569 saveSign use lastState	2025-01-28 11:15:29 +01:00
Sergio De la torre	79ea19a360	fix: refs #7569 saveSign use lastState	2025-01-28 11:14:08 +01:00
Sergio De la torre	a29de13ab3	fix: refs #7569 saveSign use smtp.send and fix link	2025-01-28 09:54:26 +01:00
Javi Gallego	08d2414363	refactor: refs #7686 update editableStates tests to check for 'OK' and 'Bloqueado' states	2025-01-28 09:16:19 +01:00
Javier Segarra	9419eada64	Merge branch 'dev' into 7134-supplierBalance	2025-01-28 08:46:17 +01:00
Javi Gallego	0def25ad15	Merge branch 'dev' into 7686-onPrevious	2025-01-28 08:28:16 +01:00
Jon Elias	6833dbe846	Merge pull request 'Hotfix: Fixed shipped date when it is null' (!3382) from Hotfix-PriceDifferenceShipped into master ... Reviewed-on: #3382 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-28 07:21:58 +00:00
Javier Segarra	198ae9a83b	Merge branch 'master' into Hotfix-PriceDifferenceShipped	2025-01-28 07:19:37 +00:00
Alex Moreno	d75d4f82f2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-28 08:16:59 +01:00
Alex Moreno	837719327d	Merge pull request 'build: refs #8452 dump db' (!3386) from 8452-dump into master ... Reviewed-on: #3386 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-28 07:16:33 +00:00
Jon Elias	eb29a66a80	Merge pull request 'Fix_TicketSummary[Address]: Added nickname in address relation' (!3383) from Fix-TicketSummaryAddress into dev ... Reviewed-on: #3383 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-28 07:14:07 +00:00
Jon Elias	dac30dcac5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress	2025-01-28 08:10:25 +01:00
Alex Moreno	f4b7683609	build: refs #8452 dump db	2025-01-28 08:10:23 +01:00
Javi Gallego	c73af0a44b	fix: specify database context in agencyIncoming foreign key deletion SQL	2025-01-28 08:09:18 +01:00