23519 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	00eae3920b	feat: refs 179918 clean	2024-05-02 13:33:25 +02:00
Carlos Satorres	7ced8dc54a	Merge pull request '6870-modifyDefaulterNotification' (!2383) from 6870-modifyDefaulterNotification into dev ... Reviewed-on: #2383 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 11:32:01 +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
Robert Ferrús	145a477a80	feat: refs #179918 entry delete isBooked	2024-05-02 12:39:12 +02:00
Carlos Satorres	ae15f4b5d1	refs #6870 markdown	2024-05-02 12:14:39 +02:00
Alex Moreno	0b2606096f	Merge pull request '#6889 set originalQuantity to 0' (!2391) from 6889-hotfix-resetOriginalQuantity into master ... Reviewed-on: #2391 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 10:07:28 +00:00
Javier Segarra	70c33d9040	Merge branch '7272_bug_redirectToLogin' of https://gitea.verdnatura.es/verdnatura/salix into 7272_bug_redirectToLogin	2024-05-02 10:36:27 +02:00
Javier Segarra	ae91486641	test(salix): refs #7272 #7272 fix renew-token.spec	2024-05-02 10:36:18 +02:00
Pablo Natek	6868863e54	fix: refs #6602 refactor code	2024-05-02 10:32:20 +02:00
Javier Segarra	f0f38c199c	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-05-02 10:29:49 +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	7cb728432a	fix refs #6889 set originalQuantity to 0	2024-05-02 10:15:01 +02:00
Javier Segarra	bc4c671587	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-05-02 07:41:25 +00: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
Jorge Penadés	d4a8dc7731	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7165-fixEmptySheet	2024-05-02 08:58:24 +02:00
Alex Moreno	fa982df610	Merge branch 'master' into 7268-hotFix_getChanges_datestring	2024-05-02 06:55:57 +00:00
Alex Moreno	71f8e18b46	Merge pull request 'hotFix(getBalance): date setHours to 0' (!2390) from hotFix_getBalance into master ... Reviewed-on: #2390 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 06:27:55 +00:00
Robert Ferrús	a00dd82f14	hotFix(getBalance): if null	2024-05-02 08:21:39 +02:00
Robert Ferrús	54499ae4dc	Merge branch 'master' into hotFix_getBalance	2024-05-02 06:10:58 +00: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
Guillermo Bonet	b926725021	hotfix: ticket#179915 Fix no worker exists	2024-05-02 08:04:44 +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
Jorge Penadés	a9bdfd8821	feat: refs #7165 add changeLog	2024-04-30 16:55:41 +02:00
Jorge Penadés	d26692aceb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7165-fixEmptySheet	2024-04-30 16:26:26 +02:00
Jorge Penadés	cc4081d25f	fix: refs #7165 css	2024-04-30 16:17:29 +02:00
Carlos Andrés	a67f603990	Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas	2024-04-30 15:50:13 +02:00
Carlos Andrés	a40545264b	fix: descuentos en bs.ventas refs #6974	2024-04-30 15:46:24 +02:00
Ivan Mas	de5e43fb05	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-30 12:41:54 +00:00
Ivan Mas	3167bdcdd0	refs #7191 message modification	2024-04-30 14:37:06 +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
Robert Ferrús	5ea57ce728	Merge branch 'dev' into 7296-expeditionTruck	2024-04-30 10:04:40 +00:00
Robert Ferrús	83e9756692	fear: refs #7296 expeditionTruck	2024-04-30 12:02:19 +02:00
Robert Ferrús	e7be1e2efe	feat: refs #7296 expeditionTruck to roadmapStop	2024-04-30 11:48:18 +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
Javier Segarra	426c5de1b8	Merge branch '7272_bug_redirectToLogin' of https://gitea.verdnatura.es/verdnatura/salix into 7272_bug_redirectToLogin	2024-04-30 11:45:39 +02:00
Guillermo Bonet	d44b8f7c9a	hotfix: ticket #179514 ticket_close packaging fix	2024-04-30 11:44:16 +02:00
Javier Segarra	5b4ed62a36	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-04-30 11:35:51 +02:00
Javier Segarra	be3ee43b06	fix(salix): refs #7272 #7272 Back validateToken endpoint	2024-04-30 11:35:30 +02:00
Javier Segarra	b4284889e1	fix(salix): refs #7272 #7272 Front retry calls	2024-04-30 11:35:07 +02:00