17344 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	9d086f5433	Merge branch 'dev' into 5417-fixCustomerPayments	2023-10-04 13:55:28 +00:00
Carlos Satorres	05e11447a5	Merge pull request 'refs #5861 edit css' (!1775) from 5861-invoiceOutSpace into dev ... Reviewed-on: #1775 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-04 05:48:57 +00:00
Carlos Satorres	ed3871f75c	refs #5861 edit css	2023-10-03 14:03:59 +02:00
Jorge Penadés	918cff55d9	Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-02 10:06:08 +02:00
Jorge Penadés	c59b119a4a	ref #5417 fix transactions	2023-10-02 10:06:04 +02:00
Jorge Penadés	a00cf557b7	Merge branch 'dev' into 5417-fixCustomerPayments	2023-10-02 07:57:25 +00:00
Jorge Penadés	a04167f3f1	Merge pull request 'ref #6065 replace then by async/await' (!1766) from 6065-fixWorkerTimeControl into dev ... Reviewed-on: #1766 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-02 07:28:20 +00:00
Jorge Penadés	a7128b8187	ref #5417 fix transactions	2023-10-02 09:04:43 +02:00
Jorge Penadés	b0575a81a0	Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-02 08:49:49 +02:00
Jorge Penadés	cb2ac21349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-02 08:49:27 +02:00
Jorge Penadés	250cb3cb68	Merge branch 'dev' into 5417-fixCustomerPayments	2023-10-02 06:35:15 +00:00
Jorge Penadés	f73a6bdb66	Merge branch '6065-fixWorkerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-10-02 08:21:27 +02:00
Jorge Penadés	82fb294a8b	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-10-02 06:21:42 +00:00
Jorge Penadés	5f93df26a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-10-02 08:21:09 +02:00
Alex Moreno	9d272373b4	Merge pull request 'refs #6033 feat(VnLog): can use accountDescriptor' (!1765) from 6033-vnLog_userDescriptor into dev ... Reviewed-on: #1765 Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-02 05:32:47 +00:00
Alex Moreno	7b8518ff5a	Merge branch 'dev' into 6033-vnLog_userDescriptor	2023-10-02 05:04:26 +00:00
Jorge Penadés	6f4a12e50f	ref #5417 date filters added	2023-09-29 14:42:47 +02:00
Jorge Penadés	b4fdde29b7	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 11:04:08 +00:00
Alex Moreno	5797398cf2	refs #5890 correct version 234201 in dev	2023-09-29 12:41:23 +02:00
Alex Moreno	660a0381c6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-29 12:40:30 +02:00
Alex Moreno	1d440d5c02	refs #5890 correct version 234002	2023-09-29 12:40:11 +02:00
Alex Moreno	10de00ea45	refs #5890 deploy: test to dev	2023-09-29 12:37:53 +02:00
Alex Moreno	6e06d21f9e	refs #5890 deploy: merge dev in test 234002	2023-09-29 12:36:36 +02:00
Jorge Penadés	3e9d01815a	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 10:30:44 +00:00
Alex Moreno	3966f6a53a	Merge pull request 'refs #5890 feat: itemShelvingSaleAsignado' (!1767) from 5890--itemShelvingAsignado into dev ... Reviewed-on: #1767 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-29 10:28:19 +00:00
Alex Moreno	53ab694ad4	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-29 10:18:34 +00:00
Carlos Andrés	934b4c4b36	refs #5890	2023-09-29 10:53:06 +02:00
Jorge Penadés	50eab23f39	Merge branch '6065-fixWorkerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-09-29 08:20:30 +02:00
Jorge Penadés	4d226d9a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-09-29 08:20:16 +02:00
Jorge Penadés	5f4a07bb33	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 06:20:03 +00:00
Alex Moreno	37227e79c8	Merge pull request 'refs #5673 feat(claim_development): redirect to lilium' (!1723) from 5673-claim-development into dev ... Reviewed-on: #1723 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-09-29 06:12:03 +00:00
Carlos Andrés	375429b147	Merge branch '5890--itemShelvingAsignado' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado	2023-09-28 15:14:43 +02:00
Carlos Andrés	b4c67c088c	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-28 13:14:13 +00:00
Carlos Andrés	52cba80dc8	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-28 15:13:37 +02:00
Alex Moreno	1d4001f520	Merge branch 'dev' into 5673-claim-development	2023-09-28 12:04:11 +00:00
Alex Moreno	204770c2de	refs #6224 deploy: init version 234201	2023-09-28 13:53:46 +02:00
Alex Moreno	28dfb895ca	refs #6224 deploy: correct sql folder and fix sql	2023-09-28 13:49:58 +02:00
Alex Moreno	e51df063d3	refs #5890 feat: add userId in rawSql	2023-09-28 13:26:05 +02:00
Alex Moreno	75e54bd82f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado	2023-09-28 13:21:12 +02:00
Alex Moreno	2f22c2807a	Merge pull request '5134-ModelsSalix' (!1768) from 5134-ModelsSalix into dev ... Reviewed-on: #1768 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-28 11:20:20 +00:00
Jorge Penadés	e209ab28f4	ref #6065 first time hours load fixed	2023-09-28 11:53:09 +02:00
Jorge Penadés	869bdab7ce	ref #6065 fetchHours relocated	2023-09-28 11:36:03 +02:00
Sergio De la torre	22f71e6147	Merge branch 'dev' into 5134-ModelsSalix	2023-09-28 08:18:15 +02:00
Sergio De la torre	65b0ec387f	refs #5890 fix: format	2023-09-28 08:09:54 +02:00
Sergio De la torre	4048627c76	refs #5890 fix: format	2023-09-28 08:08:40 +02:00
Sergio De la torre	18de92f9e7	refs #5134 fix: format	2023-09-28 07:51:54 +02:00
Sergio De la torre	a86469ccd2	refs #5134 fix: format	2023-09-28 07:42:44 +02:00
Sergio De la torre	ac3e9c811d	refs #5890 feat: itemShelvingSaleAsignado	2023-09-27 14:01:17 +02:00
Jorge Penadés	a7c0949f0e	ref #6065 replace then by async/await	2023-09-27 08:57:31 +02:00
Alex Moreno	d313f6ea5c	Merge branch 'dev' into 5673-claim-development	2023-09-26 12:59:32 +00:00