17724 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	bd46a77cb7	refs #5768 incoterms addressFk	2023-10-03 10:15:16 +02:00
Alex Moreno	8c39f65dc3	refs #6067 feat: url model to everyone	2023-10-03 09:36:11 +02:00
Pablo Natek	96769d9ff9	refs #6213 fixIntermitentError	2023-10-03 08:57:59 +02:00
Alex Moreno	62fa54e02f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-03 07:26:41 +02:00
Alex Moreno	9baa450298	Merge branch 'dev' into 6216-saleLog_open_ticketLog	2023-10-03 05:25:55 +00:00
Pablo Natek	ca556349a8	Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors	2023-10-03 07:12:20 +02:00
Pablo Natek	7fd2d143c3	refs #6213 devMerge	2023-10-03 07:08:29 +02:00
Alex Moreno	4545a63214	refs #6067 feat(vnUser): verifyEmail redirect to lilium	2023-10-02 14:51:19 +02:00
Pablo Natek	99d65804e8	refs #6278 fixFilter	2023-10-02 13:29:39 +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
Alex Moreno	83d1e5cb74	Merge pull request '6254-collection_getTickets' (!1769) from 6254-collection_getTickets into test ... Reviewed-on: #1769 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-02 07:51:58 +00:00
Jorge Penadés	31220b8005	Merge branch '6119-addMicrosipLink' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-02 09:28:55 +02:00
Jorge Penadés	0489bdfdb8	Merge branch 'dev' into 6119-addMicrosipLink	2023-10-02 07:28:55 +00:00
Jorge Penadés	2eb9a97ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-02 09:28:41 +02: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
Sergio De la torre	3ba349b74a	refs #5890 feat: itemShelvingSaleAsignado more calls	2023-10-02 09:14:30 +02: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	1cb2bec650	Merge branch 'dev' into 6119-addMicrosipLink	2023-10-02 06:37:58 +00: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	3ec598f3f6	Merge pull request 'HOTFIX refs #5929 fix(isEditable): can edit if is weekly' (!1770) from 5929-hotFix_canEdit_weekly into master ... Reviewed-on: #1770 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-02 05:16:05 +00:00
Alex Moreno	d3706733e4	Merge branch 'master' into 5929-hotFix_canEdit_weekly	2023-10-02 05:06:55 +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	d112fd0e5b	Merge branch 'dev' into 6119-addMicrosipLink	2023-09-29 12:35:22 +00:00
Carlos Andrés	c469a221c7	refs #6254	2023-09-29 14:16:35 +02:00
Carlos Andrés	0e5a7bbb85	refs #6254	2023-09-29 14:11:11 +02:00
Carlos Andrés	17e6cffa3d	refs #6254 collection getTickets	2023-09-29 13:47:29 +02:00
Carlos Andrés	41ac907b05	refs #6254-collection_getTickets	2023-09-29 13:44:41 +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
Carlos Andrés	2820b0253f	Merge branch 'test' into 6254-collection_getTickets	2023-09-29 10:31:14 +00:00
Jorge Penadés	3e9d01815a	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 10:30:44 +00:00
Carlos Andrés	9a7cb3ef7b	refs #6254 collection_getTickets	2023-09-29 12:30:05 +02: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	a0d705683b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-09-29 12:22:42 +02:00
Alex Moreno	53ab694ad4	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-29 10:18:34 +00:00
Alex Moreno	b33700abc9	refs #6216 feat(ticket_sale): open filtered ticketLog	2023-09-29 11:57:25 +02:00
Jorge Penadés	6691cbf32f	ref #5914 changes moved	2023-09-29 11:24:24 +02:00