17853 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	7951b874a6	Merge branch 'dev' into 6264-renewToken	2023-11-20 06:39:50 +00:00
Pablo Natek	f27fdaa023	Merge pull request 'fix(filter): refs #6461 now is mockDate in local' (!1845) from 6461-fixFilterNegativeBases into dev ... Reviewed-on: #1845 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-17 11:23:24 +00:00
Pablo Natek	e2a2454d4e	Merge branch 'dev' into 6461-fixFilterNegativeBases	2023-11-17 10:31:35 +00:00
Pablo Natek	dc100f7959	fix(filter): refs #6461 now is mockDate in local	2023-11-17 11:29:57 +01:00
Alex Moreno	21701c40ae	Merge pull request '#6335 -ticketAdvance_splitOrCreate' (!1817) from 6335-ticketAdvance_splitOrCreate into dev ... Reviewed-on: #1817 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-17 06:55:58 +00:00
Alex Moreno	b8d256e4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-16 09:58:51 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Alex Moreno	54e8e6a27d	refs #6417 fix(vnUser): toLowerCase	2023-11-16 09:10:45 +01:00
Alex Moreno	5bdf6a7338	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-16 07:56:23 +01:00
Alex Moreno	4896be51ef	fix: translation	2023-11-16 07:27:42 +01:00
Sergio De la torre	9f300de468	Merge pull request 'refs #5652 fix: setVisibleDiscard add parameter null' (!1841) from 5652_warmFix_setVisibleDiscard into test ... Reviewed-on: #1841 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-15 15:12:57 +00:00
Carlos Satorres	a62b74dc10	Merge pull request 'hotfix addressFk' (!1835) from hotfix-ticketAddresFk into master ... Reviewed-on: #1835 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-15 13:38:27 +00:00
Carlos Satorres	5b587b3449	Merge branch 'master' into hotfix-ticketAddresFk	2023-11-15 12:56:45 +00:00
Sergio De la torre	a5d94b3a26	Merge branch 'test' into 5652_warmFix_setVisibleDiscard	2023-11-15 12:43:58 +00:00
Alex Moreno	89967b8538	fix(workerDescriptor): show account button	2023-11-15 13:16:31 +01:00
Alex Moreno	51f881427d	Merge pull request '6434-signInLog_issue' (!1839) from 6434-signInLog_issue into test ... Reviewed-on: #1839 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-15 12:12:30 +00:00
Sergio De la torre	692c5eb164	refs #5652 fix: setVisibleDiscard add parameter null	2023-11-15 12:38:08 +01:00
Alex Moreno	0d9ee1758b	Merge branch 'master' into hotfix-ticketAddresFk	2023-11-15 11:06:52 +00:00
Javier Segarra	f7b0882978	refs #6434 feat: remove forceId property	2023-11-15 11:50:56 +01:00
Javi Gallego	87bd6c4282	Merge pull request 'fix: refs: #6207 impide facturar si no tienes incoterm' (!1829) from 6207-incoterm-solo-en-serie-world into dev ... Reviewed-on: #1829 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-15 09:26:28 +00:00
Javi Gallego	a4328e607e	Merge branch 'dev' into 6207-incoterm-solo-en-serie-world	2023-11-15 10:11:05 +01:00
Javier Segarra	4d677ccc89	refs #6434 perf: rename folder db/changes version	2023-11-15 10:02:48 +01:00
Javier Segarra	11352798f0	refs #6434 feat: save token in db for each login	2023-11-15 09:41:12 +01:00
Javier Segarra	e25b7d0a12	refs #6434 feat: show error for wrong login	2023-11-15 09:39:51 +01:00
Javier Segarra	4061241650	refs #6434 feat: create signInLog table	2023-11-15 09:37:03 +01:00
Alex Moreno	2a67048594	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-14 15:54:47 +01:00
Alex Moreno	88ec0f24c3	ref #5914 rename table	2023-11-14 15:45:52 +01:00
Juan Ferrer	a5682e9a0d	doc: refs #6062 README abbreviation	2023-11-14 15:39:50 +01:00
Alex Moreno	e25969360c	Merge pull request 'ref #5914 renameTable' (!1831) from 5914-warmfix-renameTable into dev ... Reviewed-on: #1831 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-14 14:04:34 +00:00
Alex Moreno	aed673cea3	Merge branch 'dev' into 5914-warmfix-renameTable	2023-11-14 13:24:41 +00:00
Sergio De la torre	2bec1a2bed	refs #6014 fix: response type. fix: accessType EXECUTE	2023-11-14 14:02:40 +01:00
Carlos Satorres	f3faf37e1a	hotfix addressFk	2023-11-14 12:34:00 +01:00
Alex Moreno	2cd9c9c688	Merge branch 'dev' into 5914-warmfix-renameTable	2023-11-14 09:36:47 +00:00
Alex Moreno	bc6389fd66	Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate	2023-11-14 09:00:12 +00:00
Alex Moreno	aec1c9d447	fix: correct align	2023-11-14 09:54:07 +01:00
Alex Moreno	12f23fc894	Merge pull request '6014-executeRoutineMethod' (!1809) from 6014-executeRoutineMethod into dev ... Reviewed-on: #1809 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-14 08:45:04 +00:00
Alex Moreno	cce61ae8cc	refs #6014 refactor(execute): schema required	2023-11-14 09:17:46 +01:00
Alex Moreno	47d85c4c61	refs #6335 fix: remove unnecessary translations	2023-11-13 12:54:02 +01:00
Alex Moreno	1a66987cd0	refs #5979 fix(vn-user): resetPassword url	2023-11-13 12:26:31 +01:00
Alex Moreno	59d2da24eb	refs #6014 refactor(execute): split code	2023-11-13 09:36:20 +01:00
Javier Segarra	bcccd1894c	refs #6264 test: init test	2023-11-10 13:13:17 +01:00
Carlos Satorres	bfaa648280	Merge pull request 'hotfix addressId' (!1834) from hotfix-addressId into master ... Reviewed-on: #1834 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-10 11:05:39 +00:00
Carlos Satorres	a1c8bba4a5	hotfix addressId	2023-11-10 11:29:18 +01:00
Alex Moreno	0fed5c1ab4	Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate	2023-11-10 09:59:24 +00:00
Alex Moreno	69255fe2fc	refs #6014 feat(execute): use user_hasRoutinePriv. feat(execute): split in executeProc & executeFunc	2023-11-10 10:58:58 +01:00
Alex Moreno	f1b5e45491	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6014-executeRoutineMethod	2023-11-10 10:53:11 +01:00
Alex Moreno	ad07c4ec97	Merge pull request '#4797 Seccion Worker/Notification' (!1494) from 4797-worker-notification-selector into dev ... Reviewed-on: #1494 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-10 09:47:40 +00:00
Alex Moreno	2eacf7391e	refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls	2023-11-10 08:46:49 +01:00
Alex Moreno	e9666a5930	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-10 08:11:52 +01:00
Jorge Penadés	8d94a94e14	ref #5914 fix test back	2023-11-09 15:56:50 +01:00