8484 Commits

Author	SHA1	Message	Date
Guillermo Bonet	65756f98ad	fix: #6184 Minor changes	2024-01-29 08:25:00 +01:00
Guillermo Bonet	990e8ee249	Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr	2024-01-29 08:14:34 +01:00
Guillermo Bonet	7c80a7bdda	fix: #6184 Minor changes	2024-01-29 08:14:33 +01:00
Jorge Penadés	4fc780967f	fix: refs #6703 tests	2024-01-26 15:32:50 +01:00
Guillermo Bonet	49a08a96da	Merge branch 'dev' into 6184-saveCmr	2024-01-26 11:56:43 +00:00
Guillermo Bonet	567e480e3b	feat: #6184 Minor changes	2024-01-26 12:40:42 +01:00
Jorge Penadés	ab3fdf4fe4	fix: refs #6703 remove console log	2024-01-26 12:33:04 +01:00
Guillermo Bonet	25fa154f60	feat: #6184 Minor changes	2024-01-26 12:25:02 +01:00
Jorge Penadés	e33861a80d	fix: refs #6703 filter	2024-01-26 12:15:53 +01:00
Guillermo Bonet	d5a145ba1b	feat: #6184 Minor changes	2024-01-26 10:44:04 +01:00
Guillermo Bonet	dec795d902	feat: #6184 Minor changes	2024-01-26 10:14:47 +01:00
Guillermo Bonet	5828fa9657	feat: #6184 Refactor saveSign	2024-01-26 10:05:24 +01:00
Javier Segarra	0afc9ab109	refs #6174 test: fix test bug	2024-01-26 09:55:21 +01:00
Jorge Penadés	53f37bb0eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-26 09:32:08 +01:00
Javier Segarra	f1cbb6aab3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-26 08:48:05 +01:00
Jorge Penadés	e5d466b697	fix: refs #6703 drop & replace sale refund by clone	2024-01-26 08:30:43 +01:00
Jorge Penadés	ed77347fe1	fix: #6557 replace procedure	2024-01-25 15:41:55 +01:00
Pablo Natek	a7faac3ef6	fix. refs #6743 remove consoleLog	2024-01-25 15:07:19 +01:00
Pablo Natek	2e1b55448a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 15:04:32 +01:00
Pablo Natek	3848503853	fix(test): refs #6743 exportDb	2024-01-25 14:58:48 +01:00
Guillermo Bonet	9005975f1c	feat: #6184 Modified email cmr	2024-01-25 13:56:47 +01:00
Alex Moreno	66936d8983	hotFix: saveSign	2024-01-25 11:37:25 +01:00
Alex Moreno	578bcd3cce	hotFix: saveSign	2024-01-25 11:09:56 +01:00
Alex Moreno	d305de2438	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-25 09:00:48 +01:00
Pablo Natek	36fc55180a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 08:30:28 +01:00
Pablo Natek	01c21baa65	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 08:25:08 +01:00
Alex Moreno	dec625d2df	Merge branch 'master' into 6745-2404_testToMaster	2024-01-25 06:23:29 +00:00
Carlos Satorres	a594fda704	Merge branch 'dev' into 6313-removecanForceQuantity	2024-01-24 12:50:03 +00:00
Alex Moreno	1c0f8acb87	refs #5871 fix: awb	2024-01-24 13:37:29 +01:00
Sergio De la torre	48e4e21aa8	refs #6028 hotFix : getByWorker days to show	2024-01-24 12:55:51 +01:00
Sergio De la torre	fc53e98bb5	refs #6028 hotFix : getByWorker days to show	2024-01-24 10:48:01 +01:00
Robert Ferrús	2ee48a53e2	refs #6222 fix(ticket): step-two	2024-01-24 09:59:27 +01:00
Javier Segarra	bc6f9bc074	refs #6174 test: new test for new method	2024-01-23 23:52:45 +01:00
Guillermo Bonet	c7be1b57b1	Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr	2024-01-23 14:13:41 +01:00
Guillermo Bonet	a676607e29	feat: #6184 Added email cmr	2024-01-23 14:13:40 +01:00
Guillermo Bonet	12bfb8ca77	feat: #6184 Added tests and process.env.IS_SPEC_RUNNING	2024-01-23 11:05:39 +01:00
Guillermo Bonet	43bfb3cfde	Merge branch 'dev' into 6184-saveCmr	2024-01-23 10:05:21 +00:00
Javier Segarra	dcb2907d49	Merge branch 'dev' into 6174_refactor_invoicePdfNotify	2024-01-23 07:43:40 +00:00
Javier Segarra	7f43a45955	Merge branch 'dev' into 2687_travel_cloneWithEntries	2024-01-22 11:08:06 +00:00
Carlos Satorres	cf03982d0c	refs #6397 trad tback	2024-01-22 10:20:10 +01:00
Guillermo Bonet	6701f70a33	Merge branch 'dev' into 6184-saveCmr	2024-01-22 09:07:31 +00:00
Javier Segarra	95398485dc	Merge branch 'dev' into 2687_travel_cloneWithEntries	2024-01-22 09:01:28 +00:00
Javier Segarra	ba2815becb	Merge branch 'dev' into 6174_refactor_invoicePdfNotify	2024-01-22 09:00:55 +00:00
Alex Moreno	ee6fe5a6e1	Merge branch 'dev' into 6667-searchFilter	2024-01-22 07:02:51 +00:00
Carlos Satorres	73e1b52348	refs #6397 refactor	2024-01-19 14:53:56 +01:00
Carlos Satorres	391f418883	refs #6397 fix test back	2024-01-19 14:18:17 +01:00
Carlos Satorres	0f104e5410	refs #6667 view workerDepartment	2024-01-19 10:11:33 +01:00
Carlos Satorres	3be194356f	fix expense	2024-01-19 09:31:25 +01:00
Carlos Satorres	882dd04adb	Merge branch 'dev' into 6296-countryAddress	2024-01-19 07:55:00 +00:00
Alex Moreno	7ea1fbfb26	refs #5509 feat: entryDms funcionality	2024-01-18 15:09:52 +01:00
Carlos Satorres	e9c1f125a5	refs #6397 test back	2024-01-18 11:43:05 +01:00
Carlos Satorres	7cb7c7dace	refs #6397 back validation	2024-01-18 10:57:17 +01:00
Guillermo Bonet	9faf889833	Merge branch 'dev' into 6184-saveCmr	2024-01-18 09:55:04 +00:00
Alex Moreno	ef2b156b55	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-18 08:07:47 +01:00
Guillermo Bonet	ce5a2ada62	feat: #6184 Requested changes	2024-01-18 07:46:58 +01:00
Carlos Satorres	23b8703afc	refs #6397 emailValidation	2024-01-17 15:00:31 +01:00
Guillermo Bonet	a486b7f2d4	feat: #6184 Minor change	2024-01-17 14:42:38 +01:00
Carlos Satorres	ccdef0458a	refs #6667 fix groupBy	2024-01-17 14:39:11 +01:00
Guillermo Bonet	85a0f8b323	feat: #6184 Minor change	2024-01-17 14:30:58 +01:00
Alex Moreno	3c778216a4	Merge branch 'test' into 6222-test-saleCcomponentUpdate	2024-01-17 13:19:18 +00:00
Guillermo Bonet	1a52e58eaa	feat: #6184 Created generateCmrPdf	2024-01-17 14:18:31 +01:00
Carlos Satorres	7525998477	refs #6296 postal code	2024-01-17 14:13:09 +01:00
Carlos Satorres	d1a3c67d2e	refs #6667 fix limit	2024-01-17 14:07:04 +01:00
Carlos Satorres	1458a803bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress	2024-01-17 13:49:05 +01:00
Guillermo Bonet	45fd96cee6	feat: #6184 Modified uploadFile	2024-01-17 13:07:26 +01:00
Javier Segarra	3564a77043	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-17 11:12:04 +01:00
Guillermo Bonet	f1b84ee7a0	Merge branch 'dev' into 6184-saveCmr	2024-01-17 10:44:00 +01:00
Javier Segarra	21ce57d217	refs #6174 feat: update back to separate invoice and pdf	2024-01-17 10:31:07 +01:00
Carlos Satorres	d47429b4a7	refs #6667 sql	2024-01-17 10:01:38 +01:00
Guillermo Bonet	2f67056dbf	Merge branch 'test' into dev	2024-01-17 09:44:32 +01:00
Alex Moreno	aac3e17d3c	Merge branch 'test' into 6222-test-saleCcomponentUpdate	2024-01-16 13:40:37 +00:00
Alex Moreno	9452aacb49	Merge branch 'dev' into 6230-basicItem	2024-01-16 13:25:28 +00:00
Guillermo Bonet	5bbeda4014	feat: refs #4734 Added viaexpress interdia	2024-01-16 13:05:16 +01:00
Carlos Satorres	7b9480f006	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2024-01-16 12:48:13 +01:00
Carlos Satorres	3ebeebc159	refs #6230 remove basic-data columns	2024-01-16 11:47:45 +01:00
Carlos Satorres	b3e1c58918	refs #6313 remove restriction	2024-01-15 14:50:08 +01:00
Carlos Satorres	55b5e4cfcd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress	2024-01-15 13:29:39 +01:00
Javier Segarra	831d358e41	refs #6174 feat first approach	2024-01-15 10:52:02 +01:00
Guillermo Bonet	107e35001a	fix: refs #6582 Solved log error	2024-01-15 10:09:43 +01:00
Carlos Satorres	107dded411	refs #6296 countryAddress	2024-01-15 09:03:56 +01:00
Jorge Penadés	fcca927adb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-ticketRefund	2024-01-15 07:54:35 +01:00
Alex Moreno	c20b9fe212	refs #6656 fix(updateTimeEntry): correct accessType (WRITE)	2024-01-15 07:45:40 +01:00
Jorge Penadés	6236cf0621	hotfix ticketRefund	2024-01-12 16:18:26 +01:00
Alex Moreno	199656afb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-12 12:41:52 +01:00
Jorge Penadés	2a6b509a78	fix: refs #6656 change acls	2024-01-12 09:54:18 +01:00
Alex Moreno	14fff571b5	Merge branch 'dev' into 6353-ratingCatalog	2024-01-12 08:52:51 +00:00
Carlos Satorres	d0df880c32	Merge branch 'dev' into 6322-futureTicketImporte	2024-01-12 07:47:23 +00:00
Alex Moreno	b1530d049e	refs #6398 hotFix: use userFk	2024-01-11 13:29:03 +01:00
Javi Gallego	c98baf21bf	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-11 12:17:59 +00:00
Juan Ferrer	ce5e8c278f	Merge branch 'dev' into 6660-mariadbV10.11.6	2024-01-11 11:22:55 +00:00
Alex Moreno	a92297da73	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-01-11 08:14:56 +01:00
Javier Segarra	b76e269e73	refs #5499 perf: rename variable	2024-01-11 06:18:02 +00:00
Alex Moreno	edde5819e3	refs #6660 feat: update mariadb version 10.7.7→10.11.6	2024-01-10 15:39:35 +01:00
Javier Segarra	de4ddf9392	remove bad comment	2024-01-10 13:47:42 +00:00
Pablo Natek	a623e5b90e	Merge branch '6398-ticketTrackingAsignFix' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTrackingAsignFix	2024-01-10 13:55:03 +01:00
Pablo Natek	dff277ed12	fix(spec): refs #6398 fix spec	2024-01-10 13:55:01 +01:00
Pablo Natek	5d63b4fba8	Merge branch 'master' into 6398-ticketTrackingAsignFix	2024-01-10 12:51:33 +00:00
Pablo Natek	63b20c1e91	fix(ticketTracking): refs #6398 assign ticket workerFk to userFk	2024-01-10 13:12:12 +01:00
Carlos Satorres	980ca81bfc	refs #6353 fixtures catalog rating	2024-01-10 09:38:20 +01:00
Carlos Satorres	877dc718a7	refs #6353 remove rating	2024-01-10 08:57:19 +01:00
Javier Segarra	7cc454751e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial	2024-01-10 07:48:11 +01:00
Javier Segarra	1bd6751d56	refs #5499 revert	2024-01-10 07:46:11 +01:00
Guillermo Bonet	783436e8d2	fix: refs #6582 Traductions routesMonitor	2024-01-09 15:02:58 +01:00
Carlos Satorres	16d7a20798	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 13:49:31 +00:00
Guillermo Bonet	81ffc122fc	Merge branch 'test' into dev	2024-01-09 14:09:47 +01:00
Guillermo Bonet	9a82fbea05	Merge branch 'master' into test	2024-01-09 14:07:32 +01:00
Guillermo Bonet	5d4c106825	fix: refs #5848 Added flag DONT_EXPIRE_PASSWD	2024-01-09 13:59:11 +01:00
Carlos Satorres	bf44f82f4f	refs #6322 fix code	2024-01-09 13:16:14 +01:00
Carlos Satorres	676d95563b	refs #6322 importe	2024-01-09 12:53:58 +01:00
Robert Ferrús	ea5483e847	refs #6222 refactor: sale_calculateComponent	2024-01-09 10:50:37 +01:00
Carlos Satorres	a22de3ab25	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 08:46:01 +00:00
Pablo Natek	0e29db3b1e	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-08 13:17:24 +00:00
Carlos Satorres	782772bffc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI	2024-01-08 09:54:50 +01:00
Jorge Penadés	547ac44e9b	fix: refs #6643 fix user link	2024-01-08 09:11:44 +01:00
Pablo Natek	9af27783ed	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-08 08:11:03 +00:00
Carlos Satorres	c72311860b	refs #647 remove e2e	2024-01-08 09:06:22 +01:00
Javi Gallego	406cf7335b	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-05 07:12:12 +00:00
Pablo Natek	f48500f4b3	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-04 18:44:11 +00:00
Pablo Natek	e9773b3885	refactor(state): refs #6366 simplify if condition	2024-01-04 18:56:31 +01:00
Javier Segarra	8ee6cfb015	refs #5499 feat: send RocketMessage when change state	2024-01-04 15:36:35 +01:00
Pablo Natek	2e5ae062cf	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2024-01-04 14:24:24 +00:00
Javier Segarra	71937a4df3	refs #5499 feat: send RocketMessage when change state	2024-01-04 15:17:16 +01:00
Javi Gallego	767c6a6ac8	test: refs #3979 fixtures arregladas para que los abonos sean negativos	2024-01-04 15:01:56 +01:00
Jorge Penadés	932b993723	Merge branch 'dev' into 6515-hasAnyNegativeBase	2024-01-04 11:45:38 +00:00
Javier Segarra	f7d83b15bd	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-04 08:08:46 +00:00
Carlos Satorres	15d6c9a65b	Merge branch '6456-refactor-ticketState' of https://gitea.verdnatura.es/verdnatura/salix into 6456-refactor-ticketState	2024-01-04 08:39:07 +01:00
Javi Gallego	4cb82524cb	test: refs #3979 quito clone parametro group porque no se usa	2024-01-04 08:37:34 +01:00
Alex Moreno	23b544c1ec	refs #6635 fix: add translation	2024-01-04 08:19:48 +01:00
Pablo Natek	847623f9c6	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2024-01-03 18:28:46 +00:00
Pablo Natek	b42aed13c4	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-03 18:15:29 +00:00
Javi Gallego	2fb60aeed3	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-03 15:37:05 +01:00
Javi Gallego	ab341b9b5e	test: refs #3979 test de clone	2024-01-03 15:36:39 +01:00
Alex Moreno	227afbe39d	refs #5914 fix(invoiceOut_descriptorMenu): transalation	2024-01-03 14:54:01 +01:00
Alex Moreno	af784522c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2024-01-03 14:52:16 +01:00
Javier Segarra	4d7f0329ee	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-03 12:46:26 +00:00
Carlos Satorres	3fbead7473	refs #6291 fix tinIsValid	2024-01-03 13:44:20 +01:00
David Domenech	3c1237f727	refs #6456	2024-01-03 13:37:18 +01:00
Guillermo Bonet	a6ebd01ebd	Merge branch 'test' into dev	2024-01-03 13:28:23 +01:00
Jorge Penadés	1f77559519	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-03 12:53:12 +01:00
Alex Moreno	ba26237998	refs #5914 refactor: getTaxBases	2024-01-03 12:19:28 +01:00
Guillermo Bonet	f73a447391	refs #6398 Hotfix 1/2	2024-01-03 11:57:49 +01:00
Jorge Penadés	4e951263c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-03 11:55:37 +01:00
Jorge Penadés	5dc49d226a	refs #6274 fix locale	2024-01-03 10:13:56 +01:00
Alex Moreno	121caee93a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2024-01-03 09:53:52 +01:00
Jorge Penadés	23854cb103	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase	2024-01-03 09:02:52 +01:00
Jorge Penadés	b086da1936	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2024-01-03 08:57:46 +01:00
Alex Moreno	399ca694ab	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-01-03 08:38:01 +01:00
Alex Moreno	f607719efe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2024-01-03 08:34:00 +01:00
Carlos Satorres	12165ab382	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2024-01-03 08:31:07 +01:00
Pablo Natek	c116bc56c3	refactor(clientSms): refs #6259 redirect to lilium	2024-01-02 19:37:51 +01:00
Jorge Penadés	31c282ac0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase	2024-01-02 14:50:26 +01:00
Guillermo Bonet	176cbe1537	Merge branch 'dev' into 6433-sectorRefactor	2024-01-02 13:02:16 +00:00
Alex Moreno	1e3a7e5f91	refs #5914 refactor: invoiceTickets	2024-01-02 13:17:10 +01:00
Javier Segarra	295124e0af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries	2024-01-02 12:59:50 +01:00
Guillermo Bonet	7cfcb17aff	Merge branch 'dev' into 6433-sectorRefactor	2024-01-02 10:50:00 +00:00
Jorge Penadés	6b8a4a512b	adding filter: refs #6606	2024-01-02 10:42:50 +01:00
Javier Segarra	4510f0a037	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-02 09:26:18 +00:00
Jorge Penadés	3bd14095fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6369-fixGetNegativeBasesInvoices	2024-01-02 09:45:44 +01:00
Jorge Penadés	763af7da2d	fix test: refs #6274	2024-01-02 08:58:41 +01:00
Alex Moreno	dd02a932ef	Merge branch 'test' into 5914-hotFix-transferInvoice	2024-01-02 06:40:18 +00:00
Jorge Penadés	15ec91ec79	fix query: refs #6369	2023-12-29 14:05:01 +01:00
Pablo Natek	ccf5387e04	refactor(state): refs #6366 unifyTicketChangeState	2023-12-29 12:44:24 +01:00
Jorge Penadés	1b8461034e	using hasAnyNegative: refs #6515	2023-12-29 12:40:48 +01:00
Pablo Natek	f7ec64f3c1	merge(dev): refs #6366 merge dev	2023-12-28 16:00:23 +01:00
Jorge Penadés	567879d64e	corrective back created: refs #4466	2023-12-28 15:55:11 +01:00
Carlos Satorres	bfb31ad7c3	refs #5525 supplier	2023-12-28 11:46:34 +01:00
Carlos Satorres	c77715d865	refs #6291 validation original	2023-12-26 15:03:10 +01:00
Jorge Penadés	a89d1e883a	create rectification: refs #4466	2023-12-26 14:36:58 +01:00
Pablo Natek	5a1c4ddea0	refactor(ticketSms): refs #6259 ticketSmsToClientSms	2023-12-26 08:20:13 +01:00
Jorge Penadés	86db5a931d	arrange test suites: refs #6274	2023-12-22 10:44:21 +01:00
Pablo Natek	35750bc93f	merge(dev): refs #6259 merge dev	2023-12-21 18:46:12 +01:00
Pablo Natek	27a369bef4	refactor(ticketSms): refs #6259 merge ticksms to clientsms	2023-12-21 18:34:22 +01:00
Carlos Satorres	c4ff4c1984	refs #6291 tin valid	2023-12-21 15:07:03 +01:00
Jorge Penadés	0998b5bf2c	add locale and refactor: refs #6274	2023-12-21 13:58:33 +01:00
Javier Segarra	6b37f23349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-21 13:06:52 +01:00
Carlos Satorres	73d1c1698b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI	2023-12-21 12:38:58 +01:00
Guillermo Bonet	0f20f95dc5	refactor: refs #6433 Deleted isPreviousPrepared* columns in model	2023-12-21 10:08:17 +01:00
Jorge Penadés	f5cc2cd75b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-21 08:38:33 +01:00
Alex Moreno	7b65ebb58b	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-21 06:50:45 +00:00
Javier Segarra	adc7608b25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial	2023-12-20 14:40:42 +01:00
Javier Segarra	5c5be788c1	refs #5499 feat: trigger for all changes	2023-12-20 14:08:11 +01:00
Guillermo Bonet	5f83fc158c	Merge branch 'dev' into 6582-routesMonitorTraduction	2023-12-20 13:03:57 +00:00
Jorge Penadés	5d75592627	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-20 12:19:10 +01:00
Javier Segarra	acb0ec508f	refs #5499 feat: claimObservation	2023-12-20 12:09:01 +01:00
Javier Segarra	01e6e7dc39	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-20 11:02:00 +00:00
Juan Ferrer	10bfafdd3c	Merge branch 'dev' into 6264-renewToken	2023-12-20 09:05:53 +00:00
Alex Moreno	351a12204a	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-20 08:07:30 +00:00
Guillermo Bonet	753c6e9ec5	feat: refs #6582 Added traductions	2023-12-20 07:28:54 +01:00
Guillermo Bonet	516a3760a1	feat: refs #6582 Added traductions	2023-12-20 07:27:13 +01:00
Alex Moreno	7777696cf7	refs #6589 fix(worker_absences): fix started hours	2023-12-19 13:58:08 +01:00
Guillermo Bonet	17e177b788	fix: refs #6398 Fix tests back	2023-12-19 10:12:03 +01:00
David Domenech	d60f2a7f88	fix: refs #6398 Changed alias of views	2023-12-19 09:43:09 +01:00
Carlos Satorres	e4de704b4c	Merge branch 'dev' into 6220-addressFilter	2023-12-18 11:16:58 +00:00
Javier Segarra	7723b244d0	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-18 07:17:51 +00:00
Javier Segarra	8d650cf6c0	refs #6172 test: remove message code	2023-12-18 08:09:44 +01:00
Javier Segarra	29a7d9b941	Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-15 13:01:47 +01:00
Javier Segarra	dc98436b85	refs #2051 perf: rename variable	2023-12-15 13:01:44 +01:00
Javier Segarra	c9af8cba81	refs #5878 feat: remove . for this message	2023-12-15 12:50:05 +01:00
Javier Segarra	98a98e0d9e	refs #2687 perf: remove force test	2023-12-15 07:40:31 +01:00
Javi Gallego	3a37e6dfc8	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2023-12-15 07:37:29 +01:00
Javier Segarra	f10cada19f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries	2023-12-15 07:35:04 +01:00
Javier Segarra	b5b58faee4	refs #2687 perf: remove comments	2023-12-15 07:34:37 +01:00
Javier Segarra	d9ffdaf855	refs #2687 test: use tx.rollback()	2023-12-14 16:00:29 +01:00
Alex Moreno	21a1dbeae7	refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets	2023-12-14 15:56:49 +01:00
Carlos Satorres	fe184156a1	Merge branch 'dev' into 6220-addressFilter	2023-12-14 13:51:09 +00:00
Carlos Satorres	f73f3813b3	Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter	2023-12-14 14:37:22 +01:00
Carlos Satorres	bbb9f58a9e	refs #6220 fix(client_filter): fix where	2023-12-14 14:37:14 +01:00
Javier Segarra	043c411f68	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-14 11:41:11 +00:00
Javier Segarra	9316c31180	refs #6264 perf: rename variable when destroy ids	2023-12-14 12:36:36 +01:00
Javier Segarra	1939c65fab	refs #6264 test: remove force describe for dms test	2023-12-14 12:35:54 +01:00
Javier Segarra	d0af29c0c5	refs #6264 test: remove force describe for dms test	2023-12-14 12:28:41 +01:00
Javier Segarra	dddc749744	Merge branch 'dev' into 6264-renewToken	2023-12-14 11:05:00 +00:00
Javi Gallego	26a05a4840	fix: refs #3979 si se abona un abono sin almacen no falla	2023-12-14 09:14:21 +01:00
Alex Moreno	e7911738c6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-12-14 08:50:20 +01:00
Javier Segarra	397eb4d32b	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-14 06:22:22 +00:00
Javier Segarra	485968037b	Merge branch 'dev' into 6264-renewToken	2023-12-14 06:22:17 +00:00
Sergio De la torre	af83519ee6	Merge branch 'dev' into 6275-silex-to-salix	2023-12-13 15:12:39 +00:00
Javier Segarra	1e89ed6cdc	Merge branch 'dev' into 6264-renewToken	2023-12-13 14:39:10 +00:00
Javier Segarra	06bae44824	refs #2051 perf: uploadFile after review	2023-12-13 15:38:46 +01:00
Carlos Satorres	9a5536a3a3	Merge branch 'dev' into 6220-addressFilter	2023-12-13 14:05:51 +00:00
Carlos Satorres	cfa08963fb	Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter	2023-12-13 15:05:43 +01:00
Carlos Satorres	40499e44cf	refs #6220 remove concat	2023-12-13 15:05:41 +01:00
Robert Ferrús	4df2fa8ee4	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-13 13:30:53 +00:00
Robert Ferrús	b9efbc7d44	refs #5854	2023-12-13 14:30:29 +01:00
Javier Segarra	7b9e3b0985	refs #2051 perf: removeFile after review	2023-12-13 14:24:05 +01:00
Carlos Satorres	6416891918	refs #6291 tinIsValid worker	2023-12-13 13:55:31 +01:00
Javier Segarra	7bdb1b2078	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-13 13:49:38 +01:00
Javier Segarra	a5ecec9603	refs #2051 feat: remove front methods refactor	2023-12-13 13:47:30 +01:00
David Domenech	9bcd0a3c98	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 11:29:46 +00:00
David Domenech	ee6ad55e66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-13 09:43:20 +01:00
Pablo Natek	f63b26b71f	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 07:52:36 +00:00
Carlos Satorres	371a202230	Merge branch 'dev' into 6220-addressFilter	2023-12-13 07:51:23 +00:00
Pablo Natek	69dd34665f	refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit	2023-12-13 08:50:17 +01:00
Javier Segarra	074bb2b980	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-13 06:30:14 +00:00
Sergio De la torre	435819cf3c	refs #6275 feat:Silex_to_Salix test getExpeditionSummary	2023-12-13 07:24:13 +01:00
Javier Segarra	d44cdcbd13	Merge branch 'dev' into 6264-renewToken	2023-12-13 06:14:55 +00:00
Robert Ferrús	5f4adab017	refs #5854	2023-12-12 18:03:09 +01:00
Sergio De la torre	e22201c840	Merge branch 'dev' into 6275-silex-to-salix	2023-12-12 14:50:25 +00:00
Javier Segarra	d206c93305	refs #2051 feat: getAllowedContentTypes approach	2023-12-12 15:03:00 +01:00
Javier Segarra	6b70f8b3eb	refs #2051 feat: uploadFile approach	2023-12-12 13:49:14 +01:00
Carlos Satorres	78aa25d74f	refs #6220 fix testback	2023-12-12 13:21:08 +01:00
Carlos Satorres	6cefc982e4	refs #6220 add filter address	2023-12-12 13:14:41 +01:00
Javier Segarra	ae76776245	refs #2051 feat: removeFile approach	2023-12-12 12:09:06 +01:00
Javier Segarra	8bd9becb74	refs #2687 feat: remove procedure argument	2023-12-12 07:34:20 +01:00
Javier Segarra	30dbc8a587	refs #2687 feat: fix test suite	2023-12-12 07:33:08 +01:00
Robert Ferrús	9894591aa9	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-11 17:56:40 +00:00
Javier Segarra	c0d2e0511d	refs #2687 feat: modify back method	2023-12-11 14:54:12 +01:00
Carlos Satorres	7e6f311a43	refs #6220 address filter	2023-12-11 14:51:11 +01:00
Carlos Satorres	c81ca94d2e	refs #6220 add filter address	2023-12-11 14:44:33 +01:00
Jorge Penadés	84270587cb	refs #6274 refactor	2023-12-11 13:42:19 +01:00