17336 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	6691cbf32f	ref #5914 changes moved	2023-09-29 11:24:24 +02:00
Jorge Penadés	2506db69cb	Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-29 08:20:00 +02:00
Jorge Penadés	19fc2a4523	Merge branch 'dev' into 5914-transferInvoiceOut	2023-09-29 06:18:20 +00:00
Jorge Penadés	d4e78ea889	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-29 08:16:12 +02: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
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
Jorge Penadés	4b213c1c9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-28 13:31:45 +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	463fc8ae95	ref #5914 added fixtures in English	2023-09-28 08:20:59 +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	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
Alex Moreno	d313f6ea5c	Merge branch 'dev' into 5673-claim-development	2023-09-26 12:59:32 +00:00
Sergio De la torre	2ea2943eca	refs #5134 feat: models	2023-09-26 13:12:18 +02:00
Jorge Penadés	e1e225a1ef	Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-26 12:42:47 +02:00
Jorge Penadés	50543963c1	ref #5914 refactor createTicketRefund	2023-09-26 12:42:45 +02:00
Jorge Penadés	45fbe6f174	Merge branch 'dev' into 5914-transferInvoiceOut	2023-09-26 06:36:44 +00:00
Jorge Penadés	7876561188	Merge pull request 'ref #6246 check sales and update test' (!1763) from 6246-checkTicketSales into dev ... Reviewed-on: #1763 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-26 06:25:21 +00:00
Jorge Penadés	db8dc8487b	ref #6246 replace name	2023-09-25 15:28:08 +02:00
Jorge Penadés	474399b383	ref #5914 refactor	2023-09-25 15:23:51 +02:00
Jorge Penadés	3493ca1709	Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-25 14:01:42 +02:00
Jorge Penadés	64eb216367	ref #5914 fixed back test	2023-09-25 14:01:40 +02:00
Jorge Penadés	f4ce5db93b	Merge branch 'dev' into 6246-checkTicketSales	2023-09-25 11:49:18 +00:00
Jorge Penadés	092180b3b2	Merge branch 'dev' into 5914-transferInvoiceOut	2023-09-25 11:38:56 +00:00
Javi Gallego	2607c1d215	Merge pull request '4059-revocar-permisos-client-account' (!1760) from 4059-revocar-permisos-client-account into dev ... Reviewed-on: #1760 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-25 11:29:58 +00:00
Jorge Penadés	98ee9bbaf3	ref #5914 back test added	2023-09-25 12:54:31 +02:00
Alex Moreno	d05106cc83	Merge branch 'dev' into 5673-claim-development	2023-09-25 10:10:21 +00:00
Jorge Penadés	c8c06f498c	ref #5914 fixed tests e2e	2023-09-25 10:49:47 +02:00
Jorge Penadés	731bad5981	ref #5914 create ticket with new and refactor	2023-09-22 14:52:56 +02:00
Jorge Penadés	f64f7a975d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-22 14:51:20 +02:00
Alex Moreno	d43b70c971	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-22 14:30:28 +02:00
Alex Moreno	cf36b10763	refs #4815 feat: add serialNumber in deviceLog	2023-09-22 14:29:48 +02:00
Carlos Satorres	da9fe5c86e	Merge pull request '5843-quitUserFk2' (!1758) from 5843-quitUserFk2 into dev ... Reviewed-on: #1758 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-22 11:18:15 +00:00
Alex Moreno	d16ae47712	Merge branch 'dev' into 5843-quitUserFk2	2023-09-22 11:01:25 +00:00
Jorge Penadés	6fe52ba3e8	ref #6246 check sales and update test	2023-09-22 12:48:54 +02:00
Sergio De la torre	ed1d8ca94f	refs #5134 feat: models	2023-09-22 12:29:56 +02:00
Jorge Penadés	6bc9b7b232	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-22 12:05:12 +02:00
Pablo Natek	13febd30f5	Merge pull request 'refs #6159 fixBusinessAfterInsert' (!1719) from 6159-businessAfterInsert into dev ... Reviewed-on: #1719 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-22 09:18:03 +00:00
Carlos Satorres	c7f84ad6db	refs #5843 add return	2023-09-22 10:36:51 +02:00
Pablo Natek	c175bcfc97	refs #6159 rename spec	2023-09-22 09:40:37 +02:00
Pablo Natek	3013e3cd9c	refs #6159 removeSpaces	2023-09-22 09:14:59 +02:00
Pablo Natek	1357b60b9b	refs #6159 fixFixtures	2023-09-22 09:14:08 +02:00
Jorge Penadés	82f14e62ad	ref #5914 tests fixed	2023-09-21 16:08:55 +02:00
Pablo Natek	850df64348	refs #6159 moveChangefile	2023-09-21 14:59:26 +02:00
Carlos Satorres	1f1dfae7e3	refs #5843 changes models	2023-09-21 12:50:07 +02:00
Javi Gallego	4761b0f784	fixes #4059 añado comillas	2023-09-21 10:41:20 +02:00
Pablo Natek	e037b0074e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6159-businessAfterInsert	2023-09-21 09:24:18 +02:00
Jorge Penadés	ac4aea7d38	ref #5914 created transfer issued invoice	2023-09-21 09:14:46 +02:00