9403 Commits

Author	SHA1	Message	Date
Jorge Penadés	39dcb7d6a8	fix: refs #6889 check if has collection or sectorCollection	2024-06-03 10:30:20 +02:00
Carlos Satorres	7a92963886	fix acls	2024-06-03 10:21:25 +02:00
Jorge Penadés	ea7c2346d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 10:13:59 +02:00
Jorge Penadés	1382b24c1d	refactor: refs #6600 add space	2024-06-03 09:38:35 +02:00
Jon Elias	340a8c119e	refactor: refs #6753 fix saveSign	2024-06-03 09:35:44 +02:00
Jorge Penadés	72630d613b	fix: refs #6600 rollback	2024-06-03 09:32:03 +02:00
Jorge Penadés	790a637d4d	feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table	2024-06-03 09:25:48 +02:00
Jorge Penadés	084f31e441	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment	2024-06-03 08:34:10 +02:00
Jorge Penadés	68bb282659	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 08:30:41 +02:00
Sergio De la torre	b9a9f52514	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-03 07:56:43 +02:00
Sergio De la torre	1941d8f5b3	Merge branch 'dev' into 6832_refactorBackToItem	2024-06-03 05:04:05 +00:00
Jorge Penadés	dc8696b422	feat: refs #6889 add back tests	2024-05-31 16:31:36 +02:00
Jorge Penadés	836cfcbd07	refactor: refs #6889 sale tests e2e	2024-05-31 13:58:26 +02:00
Sergio De la torre	2985e1c9e8	feat: roadMap refs #7195	2024-05-31 13:08:48 +02:00
Jorge Penadés	9578c506b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 12:58:05 +02:00
Carlos Satorres	e09a8f2eb7	refs #6897 remove code redirection	2024-05-31 12:41:38 +02:00
Javi Gallego	6a08a806a9	Merge branch 'dev' into 6408-rocketChat	2024-05-31 10:39:14 +00:00
Guillermo Bonet	7dc17cd4f6	Merge branch 'test' into dev	2024-05-31 12:29:32 +02:00
Robert Ferrús	85c328e522	fix: refs #7039 hotFixcountry	2024-05-31 10:07:27 +02:00
Alex Moreno	788f334e70	intros	2024-05-31 09:29:47 +02:00
Alex Moreno	bd82bb011a	fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests	2024-05-31 08:44:30 +02:00
Sergio De la torre	1944a4f308	Merge branch 'dev' into 4021_packaging	2024-05-31 06:43:20 +00:00
Jorge Penadés	eb15262fb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 08:37:28 +02:00
Sergio De la torre	db1c352be3	feat: packaging refs #4021	2024-05-30 18:06:35 +02:00
Jorge Penadés	002111d8d1	fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer	2024-05-30 11:47:12 +02:00
Jorge Penadés	5158017edd	fix: refs #6889 fix back tests	2024-05-30 11:21:42 +02:00
Jorge Penadés	05e6e10337	fix: refs #6889 fix back tests	2024-05-30 10:04:34 +02:00
Javi Gallego	7186686548	Merge branch 'dev' into 4560-GastosReparto	2024-05-30 09:44:06 +02:00
Javi Gallego	5e55f2d92d	feat: refs # 6408 test ok	2024-05-30 09:35:42 +02:00
Alex Moreno	f9d25ccd6c	hotFix(updateClaim): salesPerson undefined	2024-05-30 08:14:10 +02:00
Jorge Penadés	a32db7840e	feat: refs #6889 fixtures & models	2024-05-29 16:54:24 +02:00
Javi Gallego	d9d7904aaf	refs: #7108 weekends	2024-05-29 11:58:13 +02:00
Jorge Penadés	fc606f7e36	fix: refs #6889 rollback	2024-05-29 10:22:22 +02:00
Jorge Penadés	9d58c67b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-29 09:16:25 +02:00
Jorge Penadés	d35bbe5c06	Merge branch 'dev' into 6942-improveInvoiceIn	2024-05-29 07:00:17 +00:00
Guillermo Bonet	f87ee5cb91	Merge branch 'test' into dev	2024-05-29 08:09:53 +02:00
Jorge Penadés	885aa5208a	feat : refs #6889 wip: check if is productionReviewer or owner	2024-05-28 17:23:58 +02:00
Carlos Andrés	dc3c92eef1	Merge pull request 'Hotfix contabilizar DUA Ticket #188682' (!2519) from Hotfix-contabilizar-DUA-Ticket-#188682 into master ... Reviewed-on: #2519 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-28 11:34:04 +00:00
Jorge Penadés	56407e12a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-28 13:22:33 +02:00
Jorge Penadés	44e71b303c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-28 13:14:31 +02:00
Javi Gallego	1bcd7a9665	Merge branch 'dev' into 6408-rocketChat	2024-05-28 12:46:37 +02:00
Carlos Andrés	6e5b41a886	Hotfix contabilizar DUA Ticket #188682	2024-05-28 12:30:17 +02:00
Carlos Satorres	b95009899c	refs #7406 fix back	2024-05-28 12:22:11 +02:00
Javi Gallego	9ee05860f6	feat: #6408 tests	2024-05-28 12:19:54 +02:00
Alex Moreno	08856a9132	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-28 12:11:51 +02:00
Alex Moreno	8ec2a10cbf	deploy: dump	2024-05-28 12:05:09 +02:00
Jorge Penadés	7cc86d5af0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 14:36:18 +02:00
Carlos Satorres	578b8a2c71	refs #7406 changes sql, modelconfig model	2024-05-27 14:28:13 +02:00
Robert Ferrús	b404c7d101	Merge pull request 'test' (!2514) from test into dev ... Reviewed-on: #2514 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-05-27 12:11:12 +00:00
Robert Ferrús	f4426f5863	Merge branch 'test' into 7296-restoreExpeditionTruck	2024-05-27 12:05:49 +00:00
Robert Ferrús	df5f4a5a42	feat: refs #7296 fixAPPWarehouse	2024-05-27 14:05:31 +02:00
Guillermo Bonet	c7a324bc27	Merge branch 'test' into dev	2024-05-27 13:57:53 +02:00
Jorge Penadés	9ecba10446	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-27 13:57:35 +02:00
Guillermo Bonet	d384c5624f	refactor: refs #7486 Deleted unused debugAll	2024-05-27 13:57:27 +02:00
Jorge Penadés	c136f2783a	refactor: refs #6942 toUnbook & drop buyer acls	2024-05-27 12:34:27 +02:00
Carlos Satorres	208409acb2	refs #7406 add relation	2024-05-27 11:50:15 +02:00
Jorge Penadés	dc90ad6595	fix: refs #6942 acls & back	2024-05-27 10:48:32 +02:00
Carlos Satorres	723327918b	refs #7406 worker formation	2024-05-24 15:55:23 +02:00
Javi Gallego	0e5a15dd4e	con addressFk	2024-05-24 15:14:20 +02:00
Jorge Penadés	c76fd15f07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-24 08:46:16 +02:00
Carlos Satorres	2fc6f6356f	Merge branch 'dev' into 7292-createAddresUEEMember	2024-05-24 06:38:27 +00:00
Carlos Satorres	a435d88e55	refs #7292 fix tback	2024-05-24 08:37:46 +02:00
Carlos Satorres	a5079a5ae0	Merge branch 'dev' into 6095-refFk-null-on-search	2024-05-24 06:26:46 +00:00
Sergio De la torre	cee8fdd784	refs #6832 fix: ToItem	2024-05-23 16:56:35 +02:00
Carlos Satorres	84582120d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-23 16:12:55 +02:00
Jorge Penadés	798b4f9df0	fix: refs #6942 toBook/toUnbook	2024-05-23 16:12:21 +02:00
Jorge Penadés	3e2abfea2c	fix: refs #6942 merge	2024-05-23 16:08:48 +02:00
Jorge Penadés	2cd3002d06	Merge pull request 'test' (!2506) from test into dev ... Reviewed-on: #2506 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-23 14:07:21 +00:00
Carlos Andrés	14f243f251	Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test ... Reviewed-on: #2495 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-23 14:03:22 +00:00
Carlos Satorres	f45f909995	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-23 14:46:33 +02:00
Carlos Satorres	ee010a3bb3	refs #7296 fix pr errors, trad	2024-05-23 14:44:47 +02:00
Jorge Penadés	4219b22553	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-23 14:13:17 +02:00
Sergio De la torre	0914925a86	refs #6964 feat: hasItemOlder	2024-05-23 13:43:00 +02:00
Carlos Andrés	35a583d6d8	Merge pull request 'test' (!2504) from test into dev ... Reviewed-on: #2504 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-23 11:42:23 +00:00
Pablo Natek	86a6211cd8	fix: refs #7187 fix duplicate	2024-05-23 12:23:31 +02:00
Carlos Satorres	49c105ae09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6095-refFk-null-on-search	2024-05-23 11:54:48 +02:00
Carlos Satorres	83f638323a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-22 16:09:52 +02:00
Sergio De la torre	49fed4e51e	refs #6964 feat: hasItemOlder	2024-05-22 12:23:33 +02:00
Jorge Penadés	60fa55566c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-22 09:13:58 +02:00
Pablo Natek	2142b78deb	feat: refs #7187 Add support for multiple PDAs per user	2024-05-21 19:25:18 +02:00
Jorge Penadés	365e5a3ba3	fix: refs # 7400 ledger_next	2024-05-21 17:31:29 +02:00
Alex Moreno	28279b0782	Merge branch 'dev' into 7421-fix_checking_NODE_ENV	2024-05-21 13:12:30 +00:00
Alex Moreno	ff33c926af	fix: move to boot	2024-05-21 15:11:32 +02:00
Alex Moreno	18bb8a4ea5	fix: checking process.env.NODE_ENV	2024-05-21 13:50:45 +02:00
Guillermo Bonet	6e06891937	Merge branch 'master' into test	2024-05-21 11:44:26 +02:00
Guillermo Bonet	d672385776	hotfix: Rectificación Pepe	2024-05-21 11:44:11 +02:00
Pablo Natek	b39f953898	Merge branch 'dev' into 7187-redirect	2024-05-21 08:21:40 +00:00
Carlos Satorres	9bd5244f64	refs #7292 hook ueemember	2024-05-21 10:19:21 +02:00
Guillermo Bonet	6f9826421d	refactor: refs #7422 Fix e2e	2024-05-21 09:39:09 +02:00
Pablo Natek	8e5d12a6cb	Merge branch 'dev' into 7187-redirect	2024-05-21 07:18:06 +00:00
Pablo Natek	1fef00789f	fix: refs #7187 remove bindings	2024-05-21 08:54:53 +02:00
Javier Casado	d0bb9d7690	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-21 05:50:49 +00:00
Pablo Natek	335b9caaa4	fix: refs #7187 got summary before lilium	2024-05-21 01:10:53 +02:00
Jorge Penadés	50dbc5c515	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-20 15:36:09 +02:00
Robert Ferrús	823e8fd7a1	feat: refs #7296 requested changes3	2024-05-20 13:27:38 +02:00
Robert Ferrús	34f48e46e7	feat: refs #7296 requested changes2	2024-05-20 13:19:01 +02:00
Jorge Penadés	40762ba4aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-20 12:34:37 +02:00
Robert Ferrús	996f14341d	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-20 10:31:13 +00:00
Robert Ferrús	62ca4885c4	feat: refs #7296 requested changes	2024-05-20 12:28:27 +02:00
Alex Moreno	9cba2be00d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-20 11:31:24 +02:00
Alex Moreno	f82b105430	fix: TicketLog res.data	2024-05-20 11:30:43 +02:00
Carlos Satorres	6d66c0f71f	hotfix TicketLog filter	2024-05-20 11:14:30 +02:00
Jorge Penadés	741c995c31	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-20 10:30:38 +02:00
Jorge Penadés	480daea26f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-20 08:54:17 +02:00
Robert Ferrús	e67981b382	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-20 06:44:31 +00:00
Carlos Satorres	cbbd488674	Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev ... Reviewed-on: #2474 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 06:27:33 +00:00
Guillermo Bonet	18ce388944	Merge branch 'test' into dev	2024-05-20 06:59:42 +02:00
Carlos Satorres	05f09d0b87	refs #7187 fix workerPda	2024-05-17 14:56:40 +02:00
Pablo Natek	7fb6ecd617	feat: refs #7187 redirect to lilium	2024-05-17 14:46:49 +02:00
Jorge Penadés	f36f5fa5df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-17 14:39:35 +02:00
Carlos Satorres	dd7ee27e9b	refs #7396 fix worker model	2024-05-17 14:28:28 +02:00
Jorge Penadés	1f1a49d0a5	refactor: refs #6889 use addSale	2024-05-17 14:20:33 +02:00
Javier Casado	5ee550ebf7	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-17 12:08:41 +00:00
Guillermo Bonet	968effc936	hotfix: ticket 135539 Unroute tickets	2024-05-17 11:56:04 +02:00
Pablo Natek	47c573a324	fix: refs #6095 filter by refFk null	2024-05-17 10:51:37 +02:00
Pablo Natek	1372f817bd	fix: refs #7187 model	2024-05-16 14:05:22 +02:00
Pablo Natek	b299e842b9	fix: refs #7187 model foreignKey	2024-05-16 14:04:21 +02:00
Pablo Natek	4cf5457690	fix: refs #7187 remove focus on spec	2024-05-16 14:01:41 +02:00
Pablo Natek	1abacdc42b	fix: refs #7187 method	2024-05-16 14:00:42 +02:00
Pablo Natek	b41104432c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers	2024-05-16 13:57:55 +02:00
Pablo Natek	bcb3ea4837	feat: refs #7187 new method available pda	2024-05-16 10:23:33 +02:00
Robert Ferrús	11a0b98495	feat: refs #7296 roadmapStop	2024-05-16 10:20:08 +02:00
Alex Moreno	8260016da5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-15 13:53:07 +02:00
Carlos Satorres	4b8cad9aef	hotfix accessScopes	2024-05-15 13:23:36 +02:00
Carlos Satorres	a4e1b1931c	hotfix accessScopes	2024-05-15 12:38:30 +02:00
Juan Ferrer	e469fb2da4	Merge pull request 'test' (!2456) from test into dev ... Reviewed-on: #2456	2024-05-15 06:57:05 +00:00
Javi Gallego	0894cbd38c	Merge pull request 'feat: #7333 ticket with refund' (!2422) from 7333-ClaimRefund into dev ... Reviewed-on: #2422 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-14 13:45:11 +00:00
Sergio De la torre	edb024a1f9	refs #6106 hotFix: getTickets	2024-05-14 10:14:53 +02:00
Robert Ferrús	eeb36a6810	Merge branch 'dev' into 7039-country-country	2024-05-14 06:32:45 +00:00
Alex Moreno	3798509206	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-14 07:51:04 +02:00
Robert Ferrús	c6f7a0768a	Merge branch 'dev' into 7039-country-country	2024-05-14 05:49:39 +00:00
Alex Moreno	6251493adb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-05-13 14:24:31 +02:00
Jorge Penadés	b902a1a7f7	Merge branch 'dev' into 5919-locker	2024-05-13 12:02:17 +00:00
Jorge Penadés	1f39330041	fix: refs #5919 drop focus	2024-05-13 14:00:19 +02:00
Jorge Penadés	5d5f1ef7c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-13 13:20:32 +02:00
Jorge Penadés	e16e5e3db3	feat: refs #5919 back test	2024-05-13 13:19:28 +02:00
Carlos Satorres	ac4cc1506b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7360-errorWeeklyHourEmail	2024-05-13 12:18:03 +02:00
Guillermo Bonet	799108f041	fix: refs #7345 Fixed e2e	2024-05-13 11:23:29 +02:00
Pablo Natek	a797fca2dd	feat: refs #7187 merge dev	2024-05-13 08:30:20 +02:00
Javier Casado	03f0de489e	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-13 05:40:25 +00:00
Jorge Penadés	cbb7cb18eb	fix: refs #5919 delete locker field	2024-05-10 16:02:50 +02:00
Alex Moreno	a7910d9894	hotFix(invoiceInPdf): fix accessScopes	2024-05-10 14:58:52 +02:00
Jorge Penadés	8943bc7115	fix: refs #5919 back tests	2024-05-10 14:04:34 +02:00
Jorge Penadés	af11bb8663	feat: refs #5919 hook	2024-05-10 13:04:12 +02:00
Robert Ferrús	35f69b8692	Merge branch 'dev' into 7039-country-country	2024-05-10 07:21:05 +00:00
Jorge Penadés	4e7d0e6469	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-10 08:28:06 +02:00
Jon Elias	6207d79244	Merge pull request 'feat: refs #6739 transferInvoice new functionality' (!2412) from 6739-transferInvoiceOut into dev ... Reviewed-on: #2412 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-10 04:51:41 +00:00
Jorge Penadés	7f4965879c	fix: refs #5919 get locker by relation	2024-05-09 15:54:34 +02:00
Carlos Satorres	fcd1b5e351	Merge pull request 'refs #6877 add attenderFk' (!2427) from 6877-modPeticionesCompra into dev ... Reviewed-on: #2427 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-09 10:53:10 +00:00
Robert Ferrús	0498b425b3	Merge branch 'dev' into 7039-country-country	2024-05-09 10:51:18 +00:00
Jorge Penadés	035782414f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 12:47:25 +02:00
Carlos Satorres	0f52fe65d3	refs #7360 fix error weekly	2024-05-09 09:46:40 +02:00
Pablo Natek	98e28b8d50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers	2024-05-09 09:09:00 +02:00
Jorge Penadés	dc45527e1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 08:45:17 +02:00
Jon Elias	620dd3d836	Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut	2024-05-09 08:05:24 +02:00
Jon Elias	58aedf160b	refactor: refs #6739 changed translations' keys	2024-05-09 08:05:23 +02:00
Jon Elias	0f973baa65	Merge branch 'dev' into 6739-transferInvoiceOut	2024-05-08 12:31:32 +00:00
Jon Elias	77c2f61f47	refs #6739 move petitions	2024-05-08 14:30:20 +02:00
Jon Elias	72da046ead	Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut	2024-05-08 14:12:11 +02:00
Jon Elias	9d75ba0bc5	refactor: refs #6739 default params	2024-05-08 14:12:10 +02:00
Carlos Satorres	0d43d9a982	refs #6877 remove restriction	2024-05-08 13:20:45 +02:00
Carlos Satorres	f64e899061	Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev ... Reviewed-on: #2271 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 10:27:20 +00:00
Carlos Satorres	7b298c1baf	refs #6882 fix tback	2024-05-08 12:24:05 +02:00
Carlos Satorres	fa2c4de562	Merge pull request 'refs #6842 worker' (!2404) from 6842-errorCalendar into dev ... Reviewed-on: #2404 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 10:21:19 +00:00
Carlos Satorres	8a7d124066	refs #6882 fix traductions	2024-05-08 12:17:44 +02:00
Carlos Satorres	0709a64dca	refs #6882 fix back	2024-05-08 12:05:47 +02:00
Carlos Satorres	269c42e5c9	Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-08 11:47:06 +02:00
Carlos Satorres	c355595384	refs #6882 fix back, tback te2e	2024-05-08 11:47:04 +02:00
Jorge Penadés	26ff5e8fa9	feat; refs #5919 WIP acls	2024-05-08 11:03:18 +02:00
Jorge Penadés	d0c9e83504	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-08 10:35:07 +02:00
Carlos Satorres	c0b4a931a6	Merge branch 'dev' into 6682-notHolidays	2024-05-08 07:55:26 +00:00
Carlos Satorres	8637488fc1	refs #6882 fix pr	2024-05-08 08:48:19 +02:00
Javi Gallego	8e1c84ec4b	feat: #7333 ticket with refund	2024-05-07 15:33:18 +02:00
Carlos Satorres	5e8e09cbae	refs #6877 add attenderFk	2024-05-07 13:42:58 +02:00
Guillermo Bonet	6e9ea9665d	Merge branch 'master' into test	2024-05-07 13:18:46 +02:00
Guillermo Bonet	0d7d4917a7	Merge branch 'master' into test	2024-05-07 13:18:28 +02:00
Jorge Penadés	7d07c513b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-05-07 13:06:47 +02:00
Jorge Penadés	0f5e2dcc54	fix: refs #6938 rollback	2024-05-07 11:47:22 +02:00
Jon Elias	5e96049e65	Merge branch 'dev' into 6739-transferInvoiceOut	2024-05-07 09:36:26 +00:00
Jon Elias	d4f734455d	refactor: refs #6739 transferInvoice() refactor	2024-05-07 11:35:05 +02:00
Carlos Satorres	19c729d5fd	Merge branch 'dev' into 6842-errorCalendar	2024-05-07 06:55:05 +00:00
Robert Ferrús	1610b9bd0a	Merge branch 'dev' into 7039-country-country	2024-05-07 05:11:02 +00:00
Jon Elias	4e78307a8d	feat: refs #6739 transferInvoice new functionality	2024-05-06 14:51:53 +02:00
Alex Moreno	f23924e792	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-06 14:31:41 +02:00
Carlos Andrés	14a1c5cbbb	Merge pull request 'master' (!2408) from master into test ... Reviewed-on: #2408 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-06 12:22:04 +00:00
Robert Ferrús	b57be129e3	Merge branch 'dev' into 7039-country-country	2024-05-06 08:27:21 +00:00
Carlos Satorres	bc5f78827c	Merge branch 'dev' into 6682-notHolidays	2024-05-06 08:09:21 +00:00
Javi Gallego	633a3c481c	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-05-06 07:42:38 +00:00
Carlos Satorres	fe300f0f24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-06 09:26:14 +02:00
Robert Ferrús	87e85e4a4e	Merge branch 'dev' into 7039-country-country	2024-05-06 05:08:07 +00:00
Jorge Penadés	40b2c32a00	feat: refs #6243 show all cmr	2024-05-03 17:37:36 +02:00
Carlos Satorres	e15b8eee30	refs #6842 worker	2024-05-03 14:54:12 +02:00
Pablo Natek	699684bd65	feat: refs #7187 add sim column to the model and id	2024-05-03 14:22:48 +02:00
Pablo Natek	95aba9e7b3	Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev ... Reviewed-on: #2292 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 11:52:22 +00:00
Pablo Natek	4c55ae40ef	Merge pull request 'test' (!2402) from test into dev ... Reviewed-on: #2402 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:58:42 +00:00
Pablo Natek	3ae192c761	fix: refs #6005 fix test	2024-05-03 12:52:12 +02:00
Pablo Natek	6152820078	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error	2024-05-03 12:47:14 +02:00
Pablo Natek	48bfba71de	fix: refs #6005 runtime	2024-05-03 12:33:59 +02:00
Carlos Satorres	f77cf619db	refs #6682 holidays conditional	2024-05-03 12:27:19 +02:00
Pablo Natek	8b11a4a290	fix: refs #6005 time issue	2024-05-03 12:08:22 +02:00
Robert Ferrús	82ee8d2209	Merge branch 'dev' into 7039-country-country	2024-05-03 09:25:06 +00:00
Jorge Penadés	74b04d98f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-05-02 16:38:56 +02:00
Pablo Natek	ddc4d4a08e	Merge branch 'dev' into 6602-barcode-to-qr	2024-05-02 12:37:34 +00:00
Carlos Satorres	11ffc3a652	Merge branch 'dev' into 6895-removeShelving	2024-05-02 11:40:55 +00:00
Carlos Satorres	ee41e5b6ac	Merge branch 'dev' into 6895-removeShelving	2024-05-02 10:47:38 +00:00
Carlos Satorres	9e2332ca4a	refs #6895 state home	2024-05-02 12:48:11 +02:00
Carlos Satorres	a43593f63b	Merge branch 'dev' into 6870-modifyDefaulterNotification	2024-05-02 10:42:00 +00:00
Carlos Satorres	def1521131	refs #6870 defaulter id	2024-05-02 12:42:17 +02:00
Pablo Natek	d45d53d665	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6602-barcode-to-qr	2024-05-02 10:26:46 +02:00
Pablo Natek	bd1499a6f7	feat(collection-label): new option barcode-qr	2024-05-02 10:25:46 +02:00
Jorge Penadés	63655a4dd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-02 08:58:51 +02:00
Robert Ferrús	a00dd82f14	hotFix(getBalance): if null	2024-05-02 08:21:39 +02:00
Guillermo Bonet	0ab79728b5	Merge branch 'test' into dev	2024-05-02 08:10:20 +02:00
Guillermo Bonet	7eb2e8f218	Merge branch 'master' into test	2024-05-02 08:09:59 +02:00
Robert Ferrús	77a1b4bb57	hotFix(getBalance): simplify	2024-05-02 08:02:17 +02:00
Robert Ferrús	b8b055b86c	hotFix(getBalance): date setHours to 0	2024-05-02 08:00:44 +02:00
Carlos Satorres	b66111a032	refs #6895 remove tfront	2024-04-30 13:33:46 +02:00
Carlos Satorres	b0b8f12ca9	refs #6895 remove code	2024-04-30 13:17:19 +02:00
Carlos Satorres	e546a13e5d	refs #6895 redirect lilium	2024-04-30 12:41:29 +02:00
Jon Elias	2b9bfb5d85	Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev ... Reviewed-on: #2364 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-30 10:19:29 +00:00
Alex Moreno	d18f08e676	hotFix(addSaleByCode) add userId	2024-04-30 12:15:27 +02:00
Guillermo Bonet	f10ecf4f00	Merge branch 'test' into dev	2024-04-30 11:47:55 +02:00
Guillermo Bonet	c987bb6e66	Merge branch 'master' into test	2024-04-30 11:47:35 +02:00
Guillermo Bonet	110cae3171	Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev ... Reviewed-on: #2353 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 08:23:52 +00:00
Carlos Satorres	ace39b92ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification	2024-04-29 12:14:38 +02:00
Jorge Penadés	be69b5e2c4	fix: refs #5919 rollback	2024-04-29 12:04:31 +02:00
Carlos Satorres	f3c7b1e89c	refs #6870 add observationEmail	2024-04-29 11:59:51 +02:00
Jorge Penadés	f6e89c9049	fix: refs #5919 rollback	2024-04-29 11:46:58 +02:00
Jorge Penadés	7240269f5b	fix: refs #5919 rollback	2024-04-29 11:45:54 +02:00
Jorge Penadés	50ea41f99a	fix: refs #5919 rollback	2024-04-29 11:43:56 +02:00
Jorge Penadés	8adb52aac4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-04-29 09:24:10 +02:00
Sergio De la torre	a180f54390	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:59:12 +02:00
Sergio De la torre	f4767728bc	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:20:57 +02:00
Sergio De la torre	f2225b49a7	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:19:18 +02:00
Jorge Penadés	b9d3684db2	feat: refs #6600 add column	2024-04-26 15:48:30 +02:00
Robert Ferrús	d2c3034ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country	2024-04-26 12:07:53 +02:00
Robert Ferrús	fd7dcf2781	fix: refs #7039 fixpr	2024-04-26 10:26:20 +02:00
Robert Ferrús	2d0d4b5643	Merge branch 'dev' into 7039-country-country	2024-04-26 06:48:01 +00:00
Pablo Natek	4693ba13fa	Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-26 08:37:51 +02:00
Javi Gallego	94e04c1c2f	Merge branch 'dev' into 7108-exchange-rate	2024-04-26 06:45:43 +02:00
Jorge Penadés	b9de2b3ce6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice	2024-04-25 17:18:37 +02:00
Jorge Penadés	32da39899a	fix: refs #7211 test e2e	2024-04-25 17:16:43 +02:00
Pablo Natek	5c45dd6c17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 16:18:18 +02:00
Jorge Penadés	180a484c55	fix: refs #7211 rollback	2024-04-25 16:14:34 +02:00
Jorge Penadés	f7cdbd39f0	fix: refs #7211 tests	2024-04-25 16:08:52 +02:00
Jorge Penadés	edeed037a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl	2024-04-25 15:38:40 +02:00
Jorge Penadés	4e864fed52	fix: refs #7211 tests	2024-04-25 15:38:21 +02:00
Javi Gallego	2e2bc3d594	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-04-25 12:31:06 +00:00
Javi Gallego	4f20224acc	Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking	2024-04-25 14:28:53 +02:00
Javi Gallego	7d3870e4a1	feat: refs#6382 test fixed	2024-04-25 14:28:47 +02:00