8420 Commits

Author	SHA1	Message	Date
Alex Moreno	36e8840e6e	Merge branch 'dev' into 6757-supplierMayus	2024-02-01 09:28:59 +00:00
Jorge Penadés	4490dc7bee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-01 08:15:15 +01:00
Jorge Penadés	af4af43d9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:14:50 +01:00
Guillermo Bonet	b045584658	Merge branch 'dev' into 6184-saveCmr	2024-02-01 07:11:33 +00:00
Guillermo Bonet	548526964e	Merge branch 'dev' into 6184-saveCmr	2024-02-01 06:23:25 +00:00
Carlos Satorres	aa993e7386	refs #6757 fix back, fix upperCase, fix e2e back	2024-01-31 17:01:47 +01:00
Carlos Satorres	cbdb089562	Merge branch 'dev' into 6397-emailValidation	2024-01-31 15:44:57 +00:00
Carlos Satorres	40dd0d4e02	Merge branch 'dev' into 6318-removeQuantityCheck	2024-01-31 14:50:05 +00:00
Guillermo Bonet	851e5cc5af	refactor: refs #6235 Fixed tests back	2024-01-31 13:16:56 +01:00
Carlos Satorres	bbf50995c7	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-01-31 10:21:06 +00:00
Guillermo Bonet	e0d15e572c	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-01-31 10:13:57 +00:00
Jorge Penadés	be3e7bb8df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 10:01:21 +01:00
Jorge Penadés	6f306ad18c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-01-31 09:59:57 +01:00
Jorge Penadés	e6eac54709	fix: refs #6703 tests & front	2024-01-31 09:59:32 +01:00
Jorge Penadés	c136395d1e	fix: refs #6703 fix conflicts	2024-01-31 09:16:38 +01:00
Jorge Penadés	d43976192a	fix: refs #6703 fix conflicts	2024-01-31 09:16:26 +01:00
Guillermo Bonet	dd17b2c05d	feat: refs #6235 Added device in clockIn	2024-01-31 09:04:30 +01:00
Sergio De la torre	a8b483078f	refs #6186 feat:deprecated packingShelve	2024-01-31 08:52:36 +01:00
Jorge Penadés	9e12bdf4e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 08:49:28 +01:00
Carlos Satorres	5d2f3d1a4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack	2024-01-30 16:42:00 +01:00
Jorge Penadés	5690da0a18	fix: refs #6776 add userId	2024-01-30 16:05:56 +01:00
Carlos Satorres	509d5cea14	refs #6270 fix back	2024-01-30 15:54:03 +01:00
Jorge Penadés	afa34c6296	feat: refs #6776 makeMulti	2024-01-30 14:00:08 +01:00
Carlos Satorres	2fc39d54a0	refs #6318 fix code	2024-01-30 13:09:15 +01:00
Guillermo Bonet	d39d54a514	fix: #6184 Requested changes	2024-01-30 09:50:53 +01:00
Guillermo Bonet	1e56e741e2	fix: #6184 Requested changes	2024-01-30 09:44:10 +01:00
Guillermo Bonet	13b8964e3d	Merge branch 'dev' into 6184-saveCmr	2024-01-30 07:27:34 +00:00
Sergio De la torre	0f3ffcfa61	fix: refs #6184 Upload sign	2024-01-30 08:11:33 +01:00
Guillermo Bonet	1fe6818a0f	fix: #6184 Minor changes	2024-01-30 07:42:58 +01:00
Guillermo Bonet	65268487b9	fix: #6184 Now creates only one dms in saveSign	2024-01-30 07:32:26 +01:00
Carlos Satorres	9b8c58ba7d	refs #6270 makeInvoice	2024-01-29 16:00:24 +01:00
Carlos Satorres	94cc3ad80e	Merge branch 'dev' into 6397-emailValidation	2024-01-29 14:47:52 +00:00
Carlos Satorres	f14c239391	Merge branch 'dev' into 6397-emailValidation	2024-01-29 14:10:17 +00:00
Javier Segarra	2e0da0881b	refs #6174 test: fix method	2024-01-29 14:54:19 +01:00
Javier Segarra	9bf08f31ae	refs #6174 feat: replace method in salix-front	2024-01-29 14:10:22 +01:00
Carlos Satorres	04f1a03d4d	refs #6397 fix back	2024-01-29 14:08:43 +01:00
Juan Ferrer	194262a93e	fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks	2024-01-29 13:48:02 +01:00
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
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