8524-devToTest #3415

Merged

alexm merged 343 commits from 8524-devToTest into test 2025-02-04 13:42:16 +00:00

Conversation 0 Commits 343 Files Changed 127 +2327 -1758

343 Commits

Author	SHA1	Message	Date
Alex Moreno	fe7a1c60cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-04 13:03:17 +01:00
Guillermo Bonet	3bb0d52dde	Merge pull request 'fix: refs #8515 Fix test optimizePriority' (!3414) from 8515-fixTestOptimizePriority into dev ... Reviewed-on: #3414 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-04 11:39:41 +00:00
Guillermo Bonet	ee5a93ba81	Merge branch 'dev' into 8515-fixTestOptimizePriority	2025-02-04 10:54:06 +00:00
Guillermo Bonet	879d18dd73	Merge pull request 'feat: refs #8227 Roadmap changes' (!3372) from 8227-roadmap into dev ... Reviewed-on: #3372 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-04 07:59:23 +00:00
Guillermo Bonet	eb9d3a7b21	refactor: refs #8227 Requested changes	2025-02-04 08:27:21 +01:00
Guillermo Bonet	49e5da5547	fix: refs #8515 Fix test optimizePriority	2025-02-04 07:48:56 +01:00
Guillermo Bonet	fb8973a358	fix: refs #8515 Fix test optimizePriority	2025-02-04 07:47:28 +01:00
Guillermo Bonet	d6bd60f181	Merge branch 'dev' into 8227-roadmap	2025-02-04 06:18:34 +00:00
Guillermo Bonet	9cecdab5a8	refactor: refs #8227 Fix tests	2025-02-04 07:17:11 +01:00
Sergio De la torre	8240dd655d	Merge pull request 'feat: refs #7412 notificationMisAllocation' (!3412) from 7412_misallocationNotification into dev ... Reviewed-on: #3412 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-03 15:23:37 +00:00
Sergio De la torre	9adb160f2d	feat: refs #7412 refs#7569 sendEmailNotificationChangeText	2025-02-03 16:14:48 +01:00
Sergio De la torre	ef5fb111b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7412_misallocationNotification	2025-02-03 16:13:55 +01:00
Guillermo Bonet	f0e50943d2	Merge branch '8227-roadmap' of https://gitea.verdnatura.es/verdnatura/salix into 8227-roadmap	2025-02-03 13:23:24 +01:00
Guillermo Bonet	a408af2467	Merge branch 'dev' into 8227-roadmap	2025-02-03 13:23:18 +01:00
Sergio De la torre	6b9c8300fb	feat: refs #7412 notificationMisAllocation	2025-02-03 12:41:56 +01:00
Guillermo Bonet	247bdc7295	Merge branch 'dev' into 8227-roadmap	2025-02-03 09:59:03 +00:00
Guillermo Bonet	c1dd0eeb32	refactor: refs #8512 Add 'master' branch check in description condition	2025-02-03 10:54:17 +01:00
Javi Gallego	55ec4aaba1	Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev ... Reviewed-on: #2890 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-03 08:12:36 +00:00
Javi Gallego	adba4765ed	refactor: refs #7686 update alert level conditions to only check for 'FREE'	2025-02-03 09:07:08 +01:00
Jose Antonio Tubau	ae2a68423a	Merge pull request 'refactor: refs #7414 update Spanish translation for 'total' to 'importe'' (!3397) from 7414-ticketLogChanges into dev ... Reviewed-on: #3397 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-03 06:05:34 +00:00
Jose Antonio Tubau	b2e5ba14c6	Merge pull request 'refactor: refs #7537 address display all digits in black in driver route report' (!3408) from 7537-modifyDriverRoutePdf into dev ... Reviewed-on: #3408 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-03 05:59:22 +00:00
Jose Antonio Tubau	ca5668f941	Merge branch 'dev' into 7414-ticketLogChanges	2025-02-03 05:57:16 +00:00
Jose Antonio Tubau	9f8da1d64e	Merge branch 'dev' into 7537-modifyDriverRoutePdf	2025-02-03 05:52:58 +00:00
Guillermo Bonet	12604d0f67	Merge branch 'dev' into 8227-roadmap	2025-01-31 14:27:18 +01:00
Guillermo Bonet	8dc803b5df	feat: refs #8227 Roadmap changes	2025-01-31 14:25:23 +01:00
Ivan Mas	074fe5b0ac	Merge pull request 'feat: refs #8477 add costPerKg to awb view' (!3409) from 8477-addColumnToAwbView into dev ... Reviewed-on: #3409 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2025-01-31 11:45:36 +00:00
Ivan Mas	2e4c5fe401	feat: refs #8477 add costPerKg to awb view	2025-01-31 12:10:19 +01:00
Ivan Mas	83228d481d	Merge pull request 'feat: refs #8477 add fee column to awb table' (!3400) from 8477-AddFeeToAWB into dev ... Reviewed-on: #3400 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-31 10:42:43 +00:00
Ivan Mas	3fa74a18de	Merge branch 'dev' into 8477-AddFeeToAWB	2025-01-31 10:39:55 +00:00
Ivan Mas	45ccf8da28	Merge pull request 'feat: refs #8312 add flippingCost column to Cubos view' (!3407) from 8312-addColumnCubosView into dev ... Reviewed-on: #3407 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2025-01-31 10:10:12 +00:00
Ivan Mas	fa9b9cc5a3	feat: refs #8312 modify fixtures.before	2025-01-31 11:06:24 +01:00
Guillermo Bonet	b40f145613	feat: refs #8227 Roadmap changes	2025-01-31 10:57:44 +01:00
Ivan Mas	66a08f7641	Merge branch 'dev' into 8312-addColumnCubosView	2025-01-31 09:51:33 +00:00
Jon Elias	923fef444c	Merge pull request 'Fix[CustomerList]: fixed country field' (!3406) from CustomerListCountryField into dev ... Reviewed-on: #3406 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-31 09:33:17 +00:00
Jose Antonio Tubau	5c4f31e6af	refactor: refs #7537 address display all digits in black in driver route report	2025-01-31 10:25:43 +01:00
Ivan Mas	a2258a005a	Merge branch 'dev' into 8312-addColumnCubosView	2025-01-31 09:23:32 +00:00
Carlos Satorres	3fede6d586	Merge pull request 'refs #6553 changes models' (!2522) from 6553-workerBusiness into dev ... Reviewed-on: #2522 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-31 09:19:14 +00:00
Ivan Mas	da5e395450	feat: refs #8312 add flippingCost column to Cubos view	2025-01-31 10:17:01 +01:00
Carlos Satorres	e1125dc46d	Merge branch 'dev' into 6553-workerBusiness	2025-01-31 09:16:13 +00:00
Jon Elias	53ee0c1617	fix: fixed country field	2025-01-31 09:17:15 +01:00
Ivan Mas	4d210b34c7	Merge pull request 'feat: refs #8312 new column packaging.rejectCost' (!3391) from 8312-newPackagingColumn into dev ... Reviewed-on: #3391 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-30 17:03:58 +00:00
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
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
Guillermo Bonet	123f28055e	feat: refs #8227 Roadmap changes	2025-01-30 09:28:44 +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
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	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
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
Carlos Satorres	b14beb83f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-28 11:55:27 +01:00
Robert Ferrús	8482743baf	feat: refs #6822 ACL	2025-01-28 11:26:48 +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
Alex Moreno	d75d4f82f2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-28 08:16:59 +01: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
Javi Gallego	c73af0a44b	fix: specify database context in agencyIncoming foreign key deletion SQL	2025-01-28 08:09:18 +01:00
Jon Elias	167368b9ae	Merge branch 'Fix-TicketSummaryAddress' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress	2025-01-28 07:33:09 +01:00
Jon Elias	e85b68650d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress	2025-01-28 07:33:03 +01:00
Jon Elias	59d3bd9d44	Merge branch 'dev' into Fix-TicketSummaryAddress	2025-01-28 06:28:57 +00:00
Javi Gallego	b8f9dc7ad7	fix: correct SQL syntax for deleting orphaned agencyIncoming records	2025-01-27 16:37:17 +01:00
Javi Gallego	8cbe64eedd	fix: remove orphaned agencyIncoming records with null agencyModeFk	2025-01-27 16:34:28 +01:00
Javi Gallego	1261722943	Merge pull request 'feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model' (!3369) from 8381-thermographTravel into dev ... Reviewed-on: #3369 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-27 15:12:51 +00:00
Javi Gallego	857874c4c6	refactor: refs #7686 remove obsolete alert level updates and adjust state alert level logic	2025-01-27 15:43:26 +01:00
Javi Gallego	ba2333f180	refactor: refs #7686 remove unused stored procedures for item shelving and ticket delay	2025-01-27 15:05:27 +01:00
Alex Moreno	9ba9338f9d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-27 14:39:58 +01:00
Robert Ferrús	56982ee1ba	Merge pull request 'feat: refs #8387 crudModel' (!3355) from 8387-itemTagCrudModel into dev ... Reviewed-on: #3355 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-27 11:38:07 +00:00
Carlos Satorres	d9d80a0e43	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-27 11:46:31 +01:00
Carlos Satorres	d659e05ce8	fix: refs #7917 remove update	2025-01-27 11:46:29 +01:00
Robert Ferrús	5a449c66ce	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-27 10:26:48 +00:00
Guillermo Bonet	a948442e13	Merge branch 'test' into dev	2025-01-27 11:24:05 +01:00
Carlos Satorres	06cd177d31	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-27 10:23:57 +00:00
Robert Ferrús	edb26a3750	Merge pull request '6822-entryTransfer' (!3376) from 6822-entryTransfer into dev ... Reviewed-on: #3376 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-27 10:08:23 +00:00
Guillermo Bonet	75168eef91	feat: refs #8227 Roadmap changes	2025-01-27 11:04:34 +01:00
Carlos Satorres	c4a7fbf6e8	fix: refs #7917 fix tests	2025-01-27 10:57:54 +01:00
Carlos Satorres	14c087e17f	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-27 10:00:34 +01:00
Robert Ferrús	6f8cbc1017	Merge branch 'dev' into 6822-entryTransfer	2025-01-27 08:51:03 +00:00
Carlos Satorres	62f26ec8c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-27 09:24:38 +01:00
Robert Ferrús	d10670cb37	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-27 08:05:26 +00:00
Guillermo Bonet	609df98614	feat: refs #8227 Added grants	2025-01-27 09:02:37 +01:00
Robert Ferrús	1f6779d86b	feat: refs #8387 change request	2025-01-27 08:59:33 +01:00
Jose Antonio Tubau	be3bcefa46	Merge pull request '7322-addSelectAddressOnTicketTransfer' (!3363) from 7322-addSelectAddressOnTicketTransfer into dev ... Reviewed-on: #3363 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-27 07:31:51 +00:00
Jose Antonio Tubau	29af7cfcbc	test: refs #7322 added test error for case when expected error is not thrown	2025-01-27 08:23:30 +01:00
Robert Ferrús	46a22733e2	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-27 07:10:54 +00:00
Jose Antonio Tubau	4fd58e24c5	Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer	2025-01-27 07:07:28 +00:00
Robert Ferrús	705dec2dbc	Merge pull request 'feat: refs #6629 refs # 6629 updateAddress' (!3255) from 6629-addressObservationBack2 into dev ... Reviewed-on: #3255 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-27 07:02:05 +00:00
Robert Ferrús	ad87631092	Merge branch 'dev' into 6629-addressObservationBack2	2025-01-27 06:33:42 +00:00
Robert Ferrús	b9206c44bb	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-27 06:17:49 +00:00
Jon Elias	034df6e8ea	feat: added nickname in address	2025-01-24 13:48:35 +01:00
Robert Ferrús	163302c770	feat: refs #6822 fix test	2025-01-24 13:26:36 +01:00
Robert Ferrús	2ee5ba908a	feat: refs #6822 change request	2025-01-24 13:16:36 +01:00
Guillermo Bonet	e54b148088	Merge pull request 'refactor: refs #8205 Added geoFk Fk' (!3304) from 8205-geoFk into dev ... Reviewed-on: #3304 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2025-01-24 11:42:13 +00:00
Guillermo Bonet	75b0589561	feat: refs #8227 Undo vehicle_checkNumberPlate change and triggers checks	2025-01-24 12:34:08 +01:00
Robert Ferrús	ad05641520	Merge pull request 'feat: refs #8077 sumDefaulter' (!3367) from 8077-sumDefaulterBackFix into dev ... Reviewed-on: #3367 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-24 10:55:32 +00:00
Robert Ferrús	b09e3398ff	Merge branch 'dev' into 8077-sumDefaulterBackFix	2025-01-24 10:46:16 +00:00
Guillermo Bonet	57ed161d27	Merge branch 'dev' into 8205-geoFk	2025-01-24 10:31:02 +00:00
Guillermo Bonet	e9f1e28ac0	feat: refs #8227 Added roadmap_cloneDay	2025-01-24 11:20:16 +01:00
Jon Elias	f3cb2bd200	Merge pull request 'Fix[priceDifference]: Fixed shipped field' (!3380) from Fix-priceDifferenceError into dev ... Reviewed-on: #3380 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-24 07:33:30 +00:00
Jon Elias	603e3e32c4	fix: shipped field	2025-01-24 07:39:18 +01:00
Guillermo Bonet	306eb6a059	feat: refs #8227 Roadmap fix version	2025-01-24 07:26:25 +01:00
Guillermo Bonet	a6908aa8c0	Merge branch 'dev' into 8227-roadmap	2025-01-24 06:00:37 +00:00
Guillermo Bonet	ce8b707400	Merge branch '8227-roadmap' of https://gitea.verdnatura.es/verdnatura/salix into 8227-roadmap	2025-01-23 14:55:01 +01:00
Guillermo Bonet	162cd4d69e	feat: refs #8227 Roadmap major changes	2025-01-23 14:54:59 +01:00
Jose Antonio Tubau	95329b7ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7322-addSelectAddressOnTicketTransfer	2025-01-23 14:43:17 +01:00
Jose Antonio Tubau	f165d17869	feat: refs #7322 add addressFk parameter to transferClient method and update tests	2025-01-23 14:26:02 +01:00
Robert Ferrús	0038fabcc6	Merge branch 'dev' into 6822-entryTransfer	2025-01-23 12:00:13 +00:00
Robert Ferrús	d8847d3d09	feat: refs #6822 change request	2025-01-23 12:59:32 +01:00
Ivan Mas	13821b86ea	Merge pull request 'feat: refs #8342 deprecate sorter and splitLine tables' (!3377) from 8342-deprecateSorterAndSplitLineTables into dev ... Reviewed-on: #3377 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-23 11:40:55 +00:00
Ivan Mas	d98a867e12	Merge branch 'dev' into 8342-deprecateSorterAndSplitLineTables	2025-01-23 11:38:38 +00:00
Robert Ferrús	89de87c280	Merge pull request 'feat: refs #8398 sendCheckingPresence' (!3362) from 8398-mergeSendCheckingPresenceBack into dev ... Reviewed-on: #3362 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 09:51:03 +00:00
Carlos Satorres	10a6626a65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-23 10:26:15 +01:00
Robert Ferrús	2124a50dc2	Merge branch 'dev' into 6629-addressObservationBack2	2025-01-23 08:37:03 +00:00
Robert Ferrús	1816ff6cf4	Merge branch 'dev' into 6822-entryTransfer	2025-01-23 08:22:51 +00:00
Robert Ferrús	14e69c1c64	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-23 08:21:32 +00:00
Guillermo Bonet	0177353b30	Merge branch 'dev' into 8227-roadmap	2025-01-23 08:19:08 +00:00
Jon Elias	64c697da6c	Merge pull request '#7184: Created myTeam filter' (!3378) from 7184-MyTeamFilter into dev ... Reviewed-on: #3378 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 08:03:05 +00:00
Alex Moreno	8ebf68cc4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-23 08:34:08 +01:00
Jon Elias	602e822599	refactor: refs #7184 deleted .value	2025-01-23 08:21:19 +01:00
Jon Elias	6d5a329b49	fix: refs #7184 fixed filter and test	2025-01-22 17:09:01 +01:00
Jon Elias	0eff155daf	refactor: refs #7184 created myteam filter and modified filters where it is used	2025-01-22 16:34:14 +01:00
Robert Ferrús	0f531d4b74	feat: refs #6822 change request	2025-01-22 13:24:06 +01:00
Robert Ferrús	e92e1d3a46	feat: refs #6822 refs #688 change request	2025-01-22 13:20:24 +01:00
Ivan Mas	43528a0a53	feat: refs #8342 deprecate sorter and splitLine tables	2025-01-22 13:04:16 +01:00
Guillermo Bonet	052630d268	feat: refs #8227 Roadmap changes	2025-01-22 12:40:58 +01:00
Carlos Satorres	b47f175b67	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-22 09:07:36 +00:00
Carlos Satorres	99b5433e62	fix: refs #7917 fix acls	2025-01-22 10:02:20 +01:00
Robert Ferrús	4a2508716d	Merge branch 'dev' into 6822-entryTransfer	2025-01-22 07:37:26 +00:00
Robert Ferrús	5a12a01565	Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulterBackFix	2025-01-22 07:51:41 +01:00
Javier Segarra	630d867787	fix: refs #7134 use vn_curdate	2025-01-21 23:09:07 +01:00
Javier Segarra	294c2f832e	Merge branch 'dev' into 7134-supplierBalance	2025-01-21 14:53:19 +01:00
Robert Ferrús	2e247c3ea5	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-21 14:14:27 +01:00
Robert Ferrús	3c89ea0df8	fix: refs #8387 local/es.json	2025-01-21 14:12:14 +01:00
Guillermo Bonet	482fe77159	feat: refs #8227 Roadmap changes	2025-01-21 14:03:50 +01:00
Carlos Satorres	d66b8f4963	fix: refs #7917 acls	2025-01-21 13:54:02 +01:00
Javier Segarra	dfcfd34202	Merge branch 'dev' into 7134-supplierBalance	2025-01-21 13:42:36 +01:00
Robert Ferrús	5ff27de72c	feat: refs #8387	2025-01-21 13:42:12 +01:00
Robert Ferrús	a40e9a547b	feat: refs #8387	2025-01-21 13:40:24 +01:00
Robert Ferrús	b4ac80615b	feat: refs #8387 fix traductions	2025-01-21 13:13:30 +01:00
Robert Ferrús	3d5bfb81da	feat: refs #8387 regular expression all tags	2025-01-21 13:12:03 +01:00
Alex Moreno	9d289fa11e	build: init version	2025-01-21 11:57:35 +01:00
Robert Ferrús	c727586855	feat: refs #8387 add column validationRegex	2025-01-21 11:25:03 +01:00
Javi Gallego	da8609afd6	Merge branch 'dev' into 8381-thermographTravel	2025-01-21 11:20:18 +01:00
Robert Ferrús	7292ac48b2	Merge branch 'dev' into 6822-entryTransfer	2025-01-21 08:48:24 +00:00
Javi Gallego	a46ec1bc8d	feat: refs #8381 add agencyModeFk to thermograph and insert agencyIncoming records	2025-01-21 08:13:56 +01:00
Javi Gallego	8e21ca5293	Merge branch 'dev' into 8381-thermographTravel	2025-01-21 07:53:38 +01:00
Guillermo Bonet	477646ba31	feat: refs #8227 Roadmap changes	2025-01-20 14:43:14 +01:00
Carlos Satorres	ffeb710933	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-20 13:27:42 +01:00
Carlos Satorres	a98967bac1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-20 12:38:46 +01:00
Robert Ferrús	52f9e71062	feat: refs #6822 refs#6822 fix branche	2025-01-19 09:02:48 +01:00
Robert Ferrús	ce96b0a819	Merge branch 'dev' into 6822-entryTransfer	2025-01-19 07:58:16 +00:00
Robert Ferrús	de2f12bdb5	Merge branch 'dev' into 6629-addressObservationBack2	2025-01-19 07:54:37 +00:00
Robert Ferrús	6c2071742c	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-19 07:38:25 +00:00
Javi Gallego	4f68a7d262	feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model	2025-01-17 15:36:11 +01:00
Robert Ferrús	8b3f2572a1	Merge branch 'dev' into 8077-sumDefaulterBackFix	2025-01-17 12:05:01 +00:00
Robert Ferrús	9cd8dfaf9d	feat: refs #8077 fix spec	2025-01-17 13:03:28 +01:00
Robert Ferrús	0bfd0895d7	feat: refs #8077 sumDefaulter	2025-01-17 12:11:18 +01:00
Robert Ferrús	81ab9fe0ba	Merge branch 'dev' into 6822-entryTransfer	2025-01-16 09:06:42 +00:00
Robert Ferrús	df3f4c3d2e	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-16 08:59:15 +00:00
Robert Ferrús	4853e45051	feat: refs #8398 change merge.spec	2025-01-16 07:29:40 +01:00
Jose Antonio Tubau	b78603275f	fix: refs #7322 reorder parameters in transferClient method for consistency	2025-01-15 14:13:00 +01:00
Jose Antonio Tubau	ec14281a82	feat: refs #7322 add optional addressFk parameter to transferClient method	2025-01-15 13:37:57 +01:00
Carlos Satorres	53eb1f427b	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-15 12:13:53 +00:00
Carlos Satorres	516147b8bb	fix: refs #7917 fix acls	2025-01-15 13:04:49 +01:00
Robert Ferrús	6ab0515f8e	feat: refs #8398 sendCheckingPresence	2025-01-15 12:31:28 +01:00
Carlos Satorres	024ab8602d	fix: refs #6553 fix back advanced summary	2025-01-15 10:31:49 +01:00
Robert Ferrús	93c9ef6f4c	feat: refs #8387 changes	2025-01-15 10:25:21 +01:00
Carlos Satorres	6ef0d2625d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-15 08:40:16 +01:00
Robert Ferrús	807ddf07ad	feat: refs #6629 test back	2025-01-15 07:31:49 +01:00
Carlos Satorres	d39c063786	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-15 06:31:00 +01:00
Robert Ferrús	849bcd1ff5	feat: refs #6629 test back updateObservations	2025-01-14 13:39:43 +01:00
Robert Ferrús	277cd80f50	Merge branch 'dev' into 6822-entryTransfer	2025-01-14 07:13:52 +00:00
Carlos Satorres	24f501f47a	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-14 07:23:37 +01:00
Carlos Satorres	07b07611be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-14 07:21:13 +01:00
Carlos Satorres	3bdb8f6228	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-14 06:18:27 +00:00
Carlos Satorres	60c1daa47c	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-14 07:18:09 +01:00
Carlos Satorres	86dde8dfb3	fix: refs #7917 fix pr	2025-01-14 07:18:05 +01:00
Javier Segarra	96649f5d8a	feat: refs #7134 remove default value	2025-01-13 23:13:26 +01:00
Javier Segarra	9bfc2a01c5	perf: refs #7134 sql style	2025-01-13 23:09:13 +01:00
Javier Segarra	f0e9cce228	fix: refs #7134 remove unnused method	2025-01-13 22:52:35 +01:00
Robert Ferrús	da3b8ac8d0	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-13 13:39:12 +00:00
Robert Ferrús	6fd8c5ded6	feat: refs #8387 fix	2025-01-13 14:33:32 +01:00
Robert Ferrús	050c338ffb	feat: refs #8387 crudModel	2025-01-13 14:29:13 +01:00
Carlos Satorres	60f0b169d4	fix: refs #6553 fix advanced	2025-01-13 13:56:24 +01:00
Javier Segarra	f6c3893d00	feat: refs #7134 minor changes	2025-01-13 12:41:36 +01:00
Javier Segarra	420bb2a57e	perf: refs #7134 remove unnecessary code	2025-01-13 12:41:16 +01:00
Carlos Satorres	a4f9d62504	Merge branch '6553-workerBusiness' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-13 12:23:24 +01:00
Carlos Satorres	358f93c454	fix: refs #6553 fix worker back	2025-01-13 12:23:21 +01:00
Javier Segarra	f207222b47	Merge branch 'dev' into 7134-supplierBalance	2025-01-13 11:56:25 +01:00
Carlos Satorres	978914aa71	Merge branch 'dev' into 6553-workerBusiness	2025-01-13 07:50:12 +00:00
Carlos Satorres	d547456d22	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-13 07:14:59 +00:00
Robert Ferrús	95e7757574	Merge branch 'dev' of https: refs #6629//gitea.verdnatura.es/verdnatura/salix into 6629-addressObservationBack2	2025-01-10 11:26:47 +01:00
Guillermo Bonet	886383b82d	Merge branch 'dev' into 7686-onPrevious	2025-01-10 10:01:40 +01:00
Carlos Satorres	6d661dba85	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-10 05:36:23 +00:00
Carlos Satorres	c8d57a1efa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-09 09:59:25 +01:00
Carlos Satorres	209bd21548	Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-08 10:17:50 +01:00
Robert Ferrús	115756aaf3	feat: refs #6822 fix transfer test	2025-01-08 07:44:49 +01:00
Robert Ferrús	5d337c4def	Merge branch 'dev' into 6822-entryTransfer	2025-01-08 06:34:24 +00:00
Carlos Satorres	bd1cee6d8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-07 12:47:48 +01:00
Robert Ferrús	823be8e0ea	Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-07 12:02:35 +01:00
Robert Ferrús	c4c9b5640e	feat: refs #6822 modify transaction	2025-01-07 12:02:32 +01:00
Robert Ferrús	65aa931738	Merge branch 'dev' into 6822-entryTransfer	2025-01-07 09:39:36 +00:00
Carlos Satorres	a139c9849c	fix: refs #6553 fix model	2025-01-07 10:33:30 +01:00
Robert Ferrús	1b90317b67	Merge branch 'dev' into 6822-entryTransfer	2025-01-07 08:51:21 +00:00
Robert Ferrús	ebf234dd4f	feat: refs #6822 delete fixtures to test	2025-01-07 09:49:55 +01:00
Robert Ferrús	aee747abd3	Merge branch 'dev' into 6822-entryTransfer	2025-01-07 08:32:28 +00:00
Robert Ferrús	b7658f5814	feat: refs #6822 fix test	2025-01-07 09:28:17 +01:00
Robert Ferrús	04734ac55c	feat: refs #6822 test transfer	2025-01-07 08:59:47 +01:00
Carlos Satorres	ddecfee24b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-07 06:13:51 +01:00
Robert Ferrús	cbf72be299	Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-03 08:40:05 +01:00
Robert Ferrús	e8faaa42aa	Merge branch 'dev' into 6822-entryTransfer	2025-01-03 07:37:20 +00:00
Robert Ferrús	31aa7f9915	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-03 08:35:17 +01:00
Robert Ferrús	02d77324b1	feat: refs #6822 crear test	2025-01-03 08:27:34 +01:00
Carlos Satorres	78a8f80321	fix: refs #7917 fix tback	2025-01-02 08:38:24 +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
Javier Segarra	a69a767c8a	feat: refs #7134 use filter to order by	2024-12-27 13:57:28 +01:00
Javier Segarra	3691daded4	feat: refs #7134 add bank name	2024-12-27 13:26:38 +01:00
Javier Segarra	ca90d6ecd7	Merge branch 'dev' into 7134-supplierBalance	2024-12-27 11:57:28 +01:00
Carlos Satorres	85163a13fa	fix: refs #7917 fix fixtures	2024-12-24 08:13:00 +01:00
Carlos Satorres	6f16974320	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-12-23 13:30:27 +01:00
Carlos Satorres	16bbcf8185	fix: refs #7917 fix summary test	2024-12-23 12:18:40 +01:00
Carlos Satorres	a30cad1da1	fix: refs #7917 fix tback	2024-12-23 12:14:16 +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
Carlos Satorres	e2a4c5339a	fix: refs #6553 fix back	2024-12-16 13:01:44 +01:00
Carlos Satorres	c1b9032534	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-12-16 12:12:41 +01:00
Carlos Satorres	4bc475d132	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-12-16 11:28:49 +01:00
Carlos Satorres	d1aa164aea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-12-16 07:19:27 +01:00
Guillermo Bonet	781a8a4d10	refactor: refs #8205 Added geoFk Fk	2024-12-13 13:49:35 +01:00
Robert Ferrús	ab1eed66df	feat: refs #6822 changes required	2024-12-13 12:29:03 +01:00
Robert Ferrús	4f370dbaea	Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2024-12-11 11:54:44 +01:00
Robert Ferrús	43bbdfd421	feat: refs #6822	2024-12-11 11:54:40 +01:00
Robert Ferrús	b681585ad5	Merge branch 'dev' into 6822-entryTransfer	2024-12-11 10:21:00 +00:00
Javier Segarra	f86bd1233b	feat: refs #7134 tiller	2024-12-09 14:19:43 +01:00
Javier Segarra	0a4f4c5926	feat: refs #7134 rename supplier.createReceipt by createPayment	2024-12-05 14:54:01 +01:00
Robert Ferrús	6ac30dcb0c	feat: refs #6822 fix conflict	2024-12-04 13:32:10 +01:00
Robert Ferrús	47cb1ff722	Merge branch 'dev' of https: refs #6822//gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2024-12-04 13:18:26 +01:00
Robert Ferrús	b97b61c7dd	feat: refs #6822 fix	2024-12-04 09:40:28 +01:00
Robert Ferrús	c518352bf7	feat: refs #6822 changes required	2024-12-04 08:12:47 +01:00
Javier Segarra	22dc1e22f4	Merge branch 'dev' of https: refs #7134//gitea.verdnatura.es/verdnatura/salix into 7134-supplierBalance	2024-12-02 10:18:21 +01:00
Robert Ferrús	3f4aa60cd2	feat: refs #6822 poner esquemas en el with	2024-11-28 08:22:30 +01:00
Robert Ferrús	be394cec28	feat: refs #6822 change request	2024-11-28 08:17:32 +01:00
Robert Ferrús	4b474834cf	feat: refs #6822 change request	2024-11-28 08:13:53 +01:00
Robert Ferrús	7b8d4c6a2c	Merge branch 'dev' into 6822-entryTransfer	2024-11-28 06:38:36 +00:00
Robert Ferrús	229a241bff	Merge branch 'dev' into 6629-addressObservationBack2	2024-11-27 12:08:37 +00:00
Robert Ferrús	01537d410c	feat: refs #6629 refs # 6629 updateAddress	2024-11-27 13:08:14 +01:00
Javier Segarra	aa2f9985cd	feat: refs #7134 change index	2024-11-20 14:07:35 +01:00
Javier Segarra	aab595e9dd	feat: refs #7134 #7134 use VN_CURDATE	2024-11-20 14:07:14 +01:00
Javier Segarra	f46a46359e	feat: refs #7134 #7134 modify balanceStartingDate	2024-11-20 14:07:00 +01:00
Javier Segarra	771e06743e	feat: refs #7134 add supplier payment	2024-11-20 14:06:52 +01:00
Javier Segarra	50b35c3474	Merge branch 'dev' into 7134-supplierBalance	2024-11-20 11:21:09 +01:00
Javier Segarra	62243e164a	feat: refs #7134 refs #6427 #7134 add new supplier/receipts method	2024-11-11 14:47:21 +01:00
Robert Ferrús	d9575190ee	Merge branch 'dev' into 6822-entryTransfer	2024-11-11 06:33:28 +00:00
Robert Ferrús	4e71fb97c3	Merge branch 'dev' into 6822-entryTransfer	2024-10-29 07:24:17 +00:00
Robert Ferrús	d86eaf5471	Merge branch 'dev' into 6822-entryTransfer	2024-10-25 05:28:54 +00:00
Robert Ferrús	9a01ae5ccc	feat: refs #6822 tabulaciones	2024-10-23 12:32:48 +02:00
Robert Ferrús	d2a4a84728	Merge branch 'dev' into 6822-entryTransfer	2024-10-16 05:22:03 +00:00
Carlos Satorres	601909e853	Merge branch 'dev' into 6553-workerBusiness	2024-09-17 13:11:51 +00:00
Carlos Satorres	4b9a39e6ba	Merge branch 'dev' into 6553-workerBusiness	2024-09-17 09:08:06 +00:00
Carlos Satorres	2aa0e2af2a	Merge branch 'dev' into 6553-workerBusiness	2024-09-17 09:04:21 +00:00
Carlos Satorres	c3c60b1fa7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-09-13 13:06:51 +02:00
Robert Ferrús	18a055f28a	Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2024-09-11 09:59:05 +02:00
Robert Ferrús	e999201969	feat: refs #6822 entry_clone	2024-09-11 09:59:01 +02:00
Robert Ferrús	400226f955	Merge branch 'dev' into 6822-entryTransfer	2024-09-11 07:47:53 +00:00
Robert Ferrús	07c4fa4b1d	Merge branch 'dev' of https: refs #6822//gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2024-09-11 09:46:13 +02:00
Carlos Satorres	ff328c9f0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-09-10 11:34:50 +02:00
Carlos Satorres	a27e3ed60f	Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-09-09 13:21:00 +02:00
Carlos Satorres	5e5a8078ca	fix: refs #6553 json worker	2024-09-03 13:59:02 +02:00
Carlos Satorres	cf651dc2e1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-09-03 10:51:31 +02:00
Guillermo Bonet	28c94b5f32	feat: refs #7686 Changes in procs	2024-08-27 12:58:48 +02:00
Guillermo Bonet	070613de64	feat: refs #7686 Added new alertLevel APPROVED and changes in vn.state.alertLevel	2024-08-27 12:58:08 +02:00
Robert Ferrús	5f63017853	feat: refs #6822 changes transaction	2024-08-06 07:20:30 +02:00
Robert Ferrús	bb36667616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2024-08-05 11:12:44 +02:00
Robert Ferrús	24e64fe607	Merge branch 'dev' into 6822-entryTransfer	2024-07-19 05:21:27 +00:00
Robert Ferrús	8b106a0cbc	Merge branch 'dev' into 6822-entryTransfer	2024-07-18 05:08:10 +00:00
Robert Ferrús	5a742ada5c	Merge branch 'dev' into 6822-entryTransfer	2024-07-17 12:54:19 +02:00
Robert Ferrús	2cb8d07aef	feat: refs #6822	2024-07-17 10:30:23 +02:00
Robert Ferrús	109770b0a3	feat: refs #6822 return newEntry	2024-07-17 10:28:22 +02:00
Robert Ferrús	1332aef213	Merge branch 'dev' into 6822-entryTransfer	2024-07-15 05:31:08 +00:00
Robert Ferrús	d60a1a3424	feat: refs #6822 entry_clone	2024-07-11 09:39:06 +02:00
Robert Ferrús	5a7d5787f7	feat: refs #6822 clonar travel con warehouseInFk	2024-07-11 07:38:13 +02:00
Robert Ferrús	1ffe41c23e	Merge branch 'dev' into 6822-entryTransfer	2024-07-10 11:35:01 +00:00
Robert Ferrús	c286dd780f	Merge branch 'dev' into 6822-entryTransfer	2024-07-10 05:45:02 +00:00
Robert Ferrús	a34376f4d2	feat: refs #6822	2024-07-10 07:31:49 +02:00
Robert Ferrús	22c83b6b56	Merge branch 'dev' into 6822-entryTransfer	2024-07-03 10:04:55 +00:00
Robert Ferrús	04f6059d6f	feat: refs #6822	2024-07-03 12:03:28 +02:00
Robert Ferrús	eb17d66986	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2024-07-03 11:30:58 +02:00
Robert Ferrús	b5f8ad77f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2024-07-03 10:18:34 +02:00
Alex Moreno	36b4c7fb74	typo	2024-06-26 12:33:38 +02:00
Alex Moreno	3362d7562f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-06-26 12:33:19 +02:00
Carlos Satorres	cc8af9d14a	refs #6553 fix back	2024-06-25 10:21:24 +02:00
Carlos Satorres	be0de3511b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-06-25 08:56:49 +02:00
Carlos Satorres	0486c40454	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-06-20 13:35:22 +02:00
Alex Moreno	4f7b625a4f	fix(business): sql role	2024-06-14 14:48:45 +02:00
Alex Moreno	a9ad3df592	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-06-14 13:36:22 +02:00
Alex Moreno	e8d0ebe91d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-06-14 12:09:30 +02:00
Carlos Satorres	41fabecc9b	refs #6553 fix acls	2024-06-10 09:29:37 +02:00
Carlos Satorres	06fe0f5cef	refs #6553 fix acls	2024-06-06 07:34:17 +02:00
Carlos Satorres	5d73af5392	refs #6553 fix back	2024-06-05 10:43:53 +02:00
Carlos Satorres	11d1cd8eb3	Merge branch 'dev' into 6553-workerBusiness	2024-05-30 08:57:58 +00:00
Carlos Satorres	a5ffdddb53	refs #6553 fix back	2024-05-29 15:56:27 +02:00
Carlos Satorres	3e1b296b29	refs #6553 changes models	2024-05-28 15:46:44 +02:00
Robert Ferrús	bac07fe265	feat: refs #6822	2024-05-23 12:41:59 +02:00
Robert Ferrús	9585af8e77	feat: refs #6822 create entryTransfer	2024-05-23 12:39:30 +02:00