26411 Commits

All Branches

Search

Author	SHA1	Message	Date
Ivan Mas	f68f62543d	Merge branch 'dev' into 8477-AddFeeToAWB	2025-01-30 17:00:14 +00:00
Ivan Mas	148072b39d	feat: refs #8477 change column name and add comment	2025-01-30 17:58:39 +01:00
Sergio De la torre	be93ea3a07	fix: refs #6964 visibleGreaterThanZero	2025-01-30 17:55:10 +01:00
Ivan Mas	9e95afa190	Merge branch 'dev' into 8312-newPackagingColumn	2025-01-30 16:37:52 +00:00
Ivan Mas	e0e72272a7	feat: refs #8312 change column name	2025-01-30 17:35:30 +01:00
Javi Gallego	3965441f7f	Merge branch 'dev' into 7686-onPrevious	2025-01-30 15:29:45 +01:00
Guillermo Bonet	855600811e	feat: refs #8227 Roadmap changes	2025-01-30 15:00:19 +01:00
Ivan Mas	ecc92792da	Merge pull request 'feat: refs #8487 deprecate travel.appointment' (!3399) from 8487-deprecateAppointmentFromTravel into dev ... Reviewed-on: #3399 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-30 13:40:37 +00:00
Ivan Mas	85c3dc54fa	Merge branch 'dev' into 8487-deprecateAppointmentFromTravel	2025-01-30 13:24:08 +00:00
Jon Elias	ef8e206520	Merge pull request '#7488: Deleted nif validation' (!3402) from 7488-DeleteNifValidation into dev ... Reviewed-on: #3402 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-30 12:52:50 +00:00
Jon Elias	0a89a6a6fd	fix: refs #7488 deleted nif validation	2025-01-30 12:40:48 +01:00
Sergio De la torre	c3163df2e8	Merge pull request 'fix: refs #7920 shelvingFkByCode' (!3401) from 7920_itemShelvingCode into master ... Reviewed-on: #3401 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-30 08:29:38 +00:00
Guillermo Bonet	123f28055e	feat: refs #8227 Roadmap changes	2025-01-30 09:28:44 +01:00
Sergio De la torre	c96d083467	fix: refs #7920 shelvingFkByCode	2025-01-30 09:16:54 +01:00
Robert Ferrús	7654a2e693	Merge pull request 'feat: refs #6822 ACL' (!3388) from 6822-entryTransferFix into dev ... Reviewed-on: #3388 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-01-30 07:26:33 +00:00
Robert Ferrús	9c467e67e0	Merge branch 'dev' into 6822-entryTransferFix	2025-01-30 06:07:59 +00:00
Ivan Mas	2a7795d432	feat: refs #8477 add fee column to awb table	2025-01-29 19:24:49 +01:00
Javier Segarra	1a8e962382	Merge pull request '#7134 SupplierBalance' (!3173) from 7134-supplierBalance into dev ... Reviewed-on: #3173 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-29 15:15:58 +00:00
Javier Segarra	efe0aa708f	Merge branch 'dev' into 7134-supplierBalance	2025-01-29 15:13:49 +00:00
Ivan Mas	70d286df80	feat: refs #8487 deprecate travel.appointment	2025-01-29 14:59:19 +01:00
Guillermo Bonet	a14d6227a1	feat: refs #8227 Roadmap changes	2025-01-29 14:15:22 +01:00
Pako Natek	e87803874c	Merge pull request 'feat(available): refs #8408 available refreshing now includes time' (!3395) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3395 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-29 12:57:13 +00:00
Pako Natek	73d1266bfc	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-01-29 12:54:07 +00:00
Robert Ferrús	dd77326424	Merge pull request 'feat: refs #8077 redirection lilium' (!3389) from 8077-sumDefaulterRedirectionLilium into dev ... Reviewed-on: #3389 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-01-29 12:48:35 +00:00
Robert Ferrús	f87fa37a79	Merge branch 'dev' into 8077-sumDefaulterRedirectionLilium	2025-01-29 12:44:42 +00:00
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
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