26882 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	8e82a6d0f1	Actualizar db/routines/cache/procedures/available_refresh.sql	2025-03-04 08:03:59 +00:00
Alex Moreno	2037c3d1fb	build: dump db	2025-03-04 08:51:41 +01:00
Alex Moreno	80a27e44d9	Merge pull request '8713-testToMaster' (!3523) from 8713-testToMaster into master ... Reviewed-on: #3523 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-03-04 06:52:13 +00:00
Alex Moreno	75f5888741	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-03-03 14:44:21 +01:00
Carlos Andrés	6861f2d4a0	Merge pull request '8700_invoiceOut' (!3513) from 8700_invoiceOut into master ... Reviewed-on: #3513 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-03 13:12:14 +00:00
Javier Segarra	3adcdeae82	Merge pull request 'fix: hotfix back' (!3517) from hotfix-7830AddresType into master ... Reviewed-on: #3517 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-03 11:39:59 +00:00
Carlos Satorres	5363a368de	fix: hotfix back	2025-03-03 11:39:05 +01:00
Carlos Andrés	7908507825	feat: refs #8700 update XDiario table structure	2025-03-02 13:06:43 +01:00
Carlos Andrés	bbcdff2c31	feat: refs #8700 update invoiceOut procedure to use new serial and ref handling; modify foreign key constraints	2025-03-02 11:13:09 +01:00
Guillermo Bonet	156b965c24	Merge branch 'master' into test	2025-02-28 12:22:51 +01:00
Carlos Satorres	6dac5cc9ce	Merge pull request 'fix: refs #6553 workerBusiness v3' (!3508) from 6553-workerBusinessV3 into test ... Reviewed-on: #3508 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-28 10:10:08 +00:00
Carlos Satorres	434c3ac2f9	fix: refs #6553 workerBusiness v3	2025-02-28 10:32:16 +01:00
Juan Ferrer	d680dc8da7	fix: refs #8689 Drop foreign key cache.last_buy_FK_1	2025-02-27 19:23:21 +01:00
Alex Moreno	7715a50724	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-27 12:01:13 +01:00
Alex Moreno	a85771c1e7	fix: closure email	2025-02-27 12:00:59 +01:00
Pako Natek	ef7ce9bbb6	Merge pull request 'feat(catalog_calculate): refs #8674 new field and modified proc' (!3500) from 8674-hotFix-Restringir-el-acceso-a-determinadas-familias into master ... Reviewed-on: #3500 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-26 11:38:55 +00:00
Pako Natek	b5e8bfa8af	Merge pull request 'feat(catalog_calculate): refs #8674 refs#8674' (!3499) from 8674-restringir-acceso-a-familias into test ... Reviewed-on: #3499 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-26 11:29:26 +00:00
Pako Natek	1b3e5a2576	feat(catalog_calculate): refs #8674 new field and modified proc ... Refs: #8674	2025-02-26 12:20:39 +01:00
Pako Natek	a80614a46d	feat(catalog_calculate): refs #8674 refs#8674	2025-02-26 12:18:55 +01:00
Alex Moreno	e4a9ada838	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-26 07:31:18 +01:00
Alex Moreno	73d92db112	Merge pull request 'hotFix_closeAll_emailDeliveryNote' (!3496) from hotFix_closeAll_emailDeliveryNote into master ... Reviewed-on: #3496 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-25 14:07:17 +00:00
Alex Moreno	2914dfff2e	feat: add Catalan localization for email templates and footer	2025-02-25 14:59:54 +01:00
Alex Moreno	fbdc715fa5	feat: enhance ticket closing process with email notifications and error handling	2025-02-25 14:59:49 +01:00
Carlos Satorres	380d1f69e5	Merge pull request 'fix: refs #6553 workerBusiness, workerDescriptor' (!3484) from 6553-workerBusinessV2 into test ... Reviewed-on: #3484 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-25 08:14:13 +00:00
Carlos Satorres	d6a520d81a	Merge branch 'test' into 6553-workerBusinessV2	2025-02-25 08:10:54 +00:00
Alex Moreno	d12553bbd4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-24 12:35:46 +01:00
Carlos Satorres	aace7fc8ad	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusinessV2	2025-02-21 15:19:02 +01:00
Carlos Satorres	35cfce552b	fix: refs #6553 getWorkerBusiness	2025-02-21 15:14:46 +01:00
Carlos Satorres	ebfba823b0	fix: refs #6553 workerBusiness, workerDescriptor	2025-02-21 14:59:02 +01:00
Javier Segarra	74abd1db32	Merge pull request 'HOTFIX: add param shipped' (!3482) from hotfix_ticket_shipped into master ... Reviewed-on: #3482 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-02-21 11:02:39 +00:00
Javier Segarra	581a7393d4	fix: add param shipped	2025-02-21 11:41:37 +01:00
Guillermo Bonet	c254f31da2	Merge branch 'master' into test	2025-02-20 07:49:39 +01:00
Guillermo Bonet	f414ababb2	fix: refs #8227 Added localPalletM3	2025-02-20 07:29:38 +01:00
Carlos Andrés	b8a216444c	Actualizar db/routines/cache/procedures/available_refresh.sql	2025-02-18 13:11:27 +00:00
Alex Moreno	7ec29d1972	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 13:38:10 +01:00
Alex Moreno	40492d6489	Merge pull request '8627-devToTest' (!3474) from 8627-devToTest into test ... Reviewed-on: #3474 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 12:33:29 +00:00
Alex Moreno	dc989cb075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8627-devToTest	2025-02-18 10:35:00 +01:00
Jorge Penadés	e29e5e28ed	Merge pull request 'fix: refs #8388 update booking status in toUnbook method' (!3462) from 8388-fixUnbook into dev ... Reviewed-on: #3462 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 09:31:22 +00:00
Alex Moreno	2386874a96	fix: refs #8627 add claim in getSales	2025-02-18 10:28:00 +01:00
Alex Moreno	06c123d7f2	fix: refs #8627 ticket isTaxDataChecked	2025-02-18 10:15:28 +01:00
Alex Moreno	a8c03548d9	fix: refs #8627 update stateFk assignment to use code instead of id	2025-02-18 09:51:08 +01:00
Carlos Andrés	5488a229c1	Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master ... Reviewed-on: #3471 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 08:50:27 +00:00
Alex Moreno	664ba03425	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 09:26:30 +01:00
Alex Moreno	dd8ca1eed2	Merge pull request 'build: refs #8622 dump db' (!3473) from 8622-dump into master ... Reviewed-on: #3473 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-18 08:26:18 +00:00
Alex Moreno	08b4d0a4fa	build: refs #8622 dump db	2025-02-18 09:16:31 +01:00
Alex Moreno	f83055057e	fix: expeditionTruck use editorFk	2025-02-18 09:14:08 +01:00
Alex Moreno	ca8bc43262	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 08:53:24 +01:00
Alex Moreno	61df9a0f79	Merge pull request '8622-testToMaster' (!3470) from 8622-testToMaster into master ... Reviewed-on: #3470 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 07:52:22 +00:00
Alex Moreno	669b7cd67f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 08:45:19 +01:00
Alex Moreno	6e4667a563	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 08:45:11 +01:00