24001 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	38af3156ff	Merge branch 'dev' into productionConfig.defaultSectorFk	2024-05-03 10:48:50 +00:00
Jorge Penadés	19841f0e12	Merge branch 'dev' into 7165-fixEmptySheet	2024-05-03 10:48:43 +00: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	0dfb7f2825	Merge branch 'test' into 6005-fix-runtime-error	2024-05-03 10:34:52 +00:00
Pablo Natek	48bfba71de	fix: refs #6005 runtime	2024-05-03 12:33:59 +02:00
Sergio De la torre	98d366cd06	Merge pull request 'refs #6799 feat: french and portuguese' (!2395) from 6799_translations into dev ... Reviewed-on: #2395 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:32:50 +00:00
Carlos Satorres	f77cf619db	refs #6682 holidays conditional	2024-05-03 12:27:19 +02:00
Javier Segarra	6e00b790d2	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-05-03 10:27:08 +00:00
Jorge Penadés	411933a608	feat: refs #6598 acls back	2024-05-03 12:17:51 +02:00
Pablo Natek	f5352c03a9	Merge pull request 'fix: refs #6005 time issue' (!2399) from 6005-fix-time-error into test ... Reviewed-on: #2399 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:12:28 +00:00
Pablo Natek	8b11a4a290	fix: refs #6005 time issue	2024-05-03 12:08:22 +02:00
Sergio De la torre	c3b9e76cd6	Merge branch 'dev' into 6799_translations	2024-05-03 09:28:28 +00:00
Robert Ferrús	82ee8d2209	Merge branch 'dev' into 7039-country-country	2024-05-03 09:25:06 +00:00
Pako Natek	b5402a3f2f	defaultSector	2024-05-03 10:44:57 +02:00
Carlos Andrés	7659a39b42	feat: Turn issues into calculated columns refs#7213	2024-05-03 10:19:05 +02:00
Jorge Penadés	3b46f67b9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7165-fixEmptySheet	2024-05-03 09:14:59 +02:00
Jorge Penadés	67bd95ea32	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-05-03 08:42:38 +02:00
Javier Segarra	da3c4cb8fc	fix(salix): refs #7272 #7272 Errors when Token not exists	2024-05-03 08:24:10 +02:00
Robert Ferrús	cdb0bf28c2	Merge pull request 'feat: refs #7325 item_getBalance' (!2397) from 7325-item_getBalance into dev ... Reviewed-on: #2397 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-05-03 06:04:47 +00:00
Robert Ferrús	b6e4130184	feat: refs #7325 item_getBalance	2024-05-03 07:51:04 +02:00
Robert Ferrús	523735e4fc	Merge branch 'dev' into 7296-expeditionTruck	2024-05-03 04:59:01 +00:00
Carlos Andrés	9905d7254d	Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas	2024-05-02 18:17:31 +02:00
Carlos Andrés	e28a5eb478	feat: Turn issues into calculated columns refs#7213	2024-05-02 18:13:12 +02:00
Jorge Penadés	a21e335774	feat: refs #6449 Add display of item ID in Ticket Logs	2024-05-02 17:23:04 +02:00
Carlos Andrés	27e3ae897a	feat: Turn issues into calculated columns refs#7213	2024-05-02 17:05:10 +02:00
Sergio De la torre	d994a682f9	refs #6799 feat: french and portuguese	2024-05-02 16:48:58 +02: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
Guillermo Bonet	3146f4f5b6	refactor: refs #6701 Refactor claim_ratio_routine	2024-05-02 14:59:30 +02:00
Pablo Natek	ddc4d4a08e	Merge branch 'dev' into 6602-barcode-to-qr	2024-05-02 12:37:34 +00:00
Robert Ferrús	9f2c3bbd0d	Merge pull request 'feat: refs #179918 entry delete isBooked' (!2393) from 179918-cleanDeleteEntry into master ... Reviewed-on: #2393 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-02 11:46:13 +00:00
Carlos Satorres	6e5c791a51	Merge pull request '6895-removeShelving' (!2388) from 6895-removeShelving into dev ... Reviewed-on: #2388 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 11:43:35 +00:00
Carlos Satorres	11ffc3a652	Merge branch 'dev' into 6895-removeShelving	2024-05-02 11:40:55 +00:00
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