26469 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	05af629a62	build: empty commit	2025-02-14 14:32:15 +01:00
Guillermo Bonet	dce263992e	fix: refs #8227 Roadmap columns	2025-02-14 12:36:06 +01:00
Guillermo Bonet	d9e177d6b4	Merge pull request 'feat: refs #8227 Update roadmap triggers to manage eta adjustments and prevent recursive calls' (!3428) from 8227-roadmapChanges into test ... Reviewed-on: #3428 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-14 10:54:18 +00:00
Guillermo Bonet	aca49505bd	Merge branch 'test' into 8227-roadmapChanges	2025-02-14 10:52:40 +00:00
Guillermo Bonet	d6f08d7e27	feat: refs #8227 update roadmap triggers and views, remove obsolete trigger and column	2025-02-14 10:04:04 +01:00
Carlos Andrés	4e9bcf530b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-13 18:59:26 +01:00
Carlos Andrés	b06ffdff52	Actualizar modules/ticket/back/methods/ticket/closeAll.js	2025-02-13 16:42:20 +00:00
Carlos Andrés	536203e0a1	Merge pull request 'fix: facturacion por consignatario en el cierre nocturno y unificación de backs' (!3453) from Hotfix-cierre-facturacion into master ... Reviewed-on: #3453 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-13 16:37:00 +00:00
Carlos Andrés	7f32a10c06	fix: facturacion por consignatario en el cierre nocturno y unificación de backs	2025-02-13 15:22:37 +01:00
Guillermo Bonet	845ce8d6d8	feat: refs #8227 Minor changes	2025-02-13 14:36:09 +01:00
Guillermo Bonet	4042679c9b	feat: refs #8227 Grants	2025-02-13 14:12:44 +01:00
Carlos Andrés	b2071994da	fix: update closeAll method to improve date handling and ticket selection logic	2025-02-13 13:28:14 +01:00
Carlos Satorres	cd258eb44e	Merge pull request 'fix: refs #6553 remove business' (!3451) from 6553-warnFixBusinessSummary into test ... Reviewed-on: #3451 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-13 11:14:15 +00:00
Jorge Penadés	e99fbca255	Merge pull request 'feat: refs #8571 enhance email formatting in sendToSupport function with structured HTML table' (!3445) from 8571-hotfix-notShowToken into master ... Reviewed-on: #3445 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-13 11:01:37 +00:00
Jorge Penadés	fa12debcd7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8571-hotfix-notShowToken	2025-02-13 11:59:36 +01:00
Carlos Satorres	1b7026fa00	fix: refs #6553 remove business	2025-02-13 10:46:48 +01:00
Guillermo Bonet	bd53f7367c	Merge branch 'test' into 8227-roadmapChanges	2025-02-13 08:34:20 +00:00
Guillermo Bonet	92ab3648e7	feat: refs #8227 Fix tests	2025-02-13 09:22:45 +01:00
Guillermo Bonet	5543da2c80	Merge branch 'master' into test	2025-02-12 14:37:10 +01:00
Guillermo Bonet	ef9ca5f56c	Merge pull request 'refactor: refs #6944 Update ticket_setState to improve state change logic and user tracking' (!3439) from 6944-stateNoRepeat into master ... Reviewed-on: #3439 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-12 13:36:14 +00:00
Carlos Andrés	65a4967d46	fix: update maxShipped to use toDate in closeAll method	2025-02-12 14:16:43 +01:00
Jorge Penadés	3754ede42d	feat: refs #8571 enhance email formatting in sendToSupport function with structured HTML table	2025-02-12 14:15:53 +01:00
Guillermo Bonet	ba3909a984	refactor: refs #6944 Requested changes	2025-02-12 14:13:39 +01:00
Carlos Andrés	9785ab5a7d	feat: enhance ticket closure process with error handling and email notifications	2025-02-12 13:23:57 +01:00
Carlos Andrés	b40981aa03	feat: enhance ticket closure process with error handling and email notifications	2025-02-12 13:18:18 +01:00
Carlos Andrés	fad95f2cf9	Merge pull request 'hotFix_daily_addressInvoice_2' (!3441) from hotFix_daily_addressInvoice_2 into test ... Reviewed-on: #3441 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-12 11:22:08 +00:00
Alex Moreno	5d155ef6bd	Merge branch 'test' into hotFix_daily_addressInvoice_2	2025-02-12 11:17:27 +00:00
Carlos Andrés	1c9417556b	feat: enhance ticket closure process with error handling and email notifications	2025-02-12 12:13:23 +01:00
Guillermo Bonet	e7c027a8b1	refactor: refs #6944 Update ticket_setState to improve state change logic and user tracking	2025-02-12 10:06:48 +01:00
Carlos Satorres	798d8a514e	Merge pull request 'fix: hotfix delivery-note' (!3437) from hotfix-producerPdf into master ... Reviewed-on: #3437 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-11 15:13:27 +00:00
Carlos Satorres	b49df364bf	Merge branch 'master' into hotfix-producerPdf	2025-02-11 14:58:16 +00:00
Carlos Satorres	92232b34ce	fix: hotfix delivery-note	2025-02-11 15:55:08 +01:00
Alex Moreno	3fbd740a2b	fix: address invoice daily	2025-02-11 14:31:26 +01:00
Guillermo Bonet	0a33e05bff	Merge branch 'master' into test	2025-02-11 13:26:02 +01:00
Guillermo Bonet	a387e3ae92	feat: refs #7162 Add packages and packagesList to ticket_doCmr procedure	2025-02-11 13:25:30 +01:00
Guillermo Bonet	75b6867be8	feat: refs #8227 Minor change	2025-02-10 13:06:05 +01:00
Guillermo Bonet	e19e50de14	feat: refs #8227 Update roadmap triggers to manage eta adjustments and prevent recursive calls	2025-02-10 13:04:23 +01:00
Guillermo Bonet	a002168f61	Merge branch 'master' into test	2025-02-10 07:26:53 +01:00
Guillermo Bonet	50a295d495	fix: refs #7162 Update JOIN condition for agencyMode in ticket_doCmr	2025-02-10 07:25:39 +01:00
Guillermo Bonet	8261b35559	Merge branch 'master' into test	2025-02-07 15:05:20 +01:00
Guillermo Bonet	b56468d3aa	fix: refs #7024 Test	2025-02-07 15:05:04 +01:00
Guillermo Bonet	b1d2441d2e	Merge branch 'master' into test	2025-02-07 14:27:56 +01:00
Guillermo Bonet	95d2823666	fix: refs #7024 Deleted dated check	2025-02-07 14:27:27 +01:00
Carlos Andrés	f851a0b73b	Merge pull request 'HOTFIX: before save checkAccessAcl' (!3426) from hotfix_client_beforeSave_ACL into master ... Reviewed-on: #3426 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 10:18:43 +00:00
Javier Segarra	23134deab5	fix: before save checkAccessAcl	2025-02-07 11:11:22 +01:00
Jon Elias	18fe468623	Merge pull request 'Hotfix[InvoiceOutList]: Fixed company filter' (!3424) from Hotfix-InvoiceOutCompanyFilter into master ... Reviewed-on: #3424 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 07:12:33 +00:00
Jon Elias	a6de493271	Merge branch 'master' into Hotfix-InvoiceOutCompanyFilter	2025-02-07 06:56:49 +00:00
Jon Elias	200f159c6b	fix: style	2025-02-07 07:55:08 +01:00
Jon Elias	ec01c6b0c2	fix: fixed company filter	2025-02-07 07:51:18 +01:00
Jorge Penadés	fa098661b6	Merge pull request 'fix: add await' (!3422) from hotfix-addAwait into master ... Reviewed-on: #3422 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-06 16:53:52 +00:00