18016 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	a27bb53089	refs #5835 getTotals fixed	2023-11-22 08:57:45 +01:00
Sergio De la torre	707173d618	refs #5890 fix: getTickets	2023-11-22 07:04:33 +01:00
Alex Moreno	f9382a1c22	Merge pull request 'refs #6454 feat: dump db' (!1849) from 6454-dbDump into dev ... Reviewed-on: #1849 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-21 12:26:53 +00:00
Alex Moreno	95a55f612d	Merge branch 'dev' into 6454-dbDump	2023-11-21 10:58:21 +00:00
Pablo Natek	bddb787075	Merge pull request 'remove(barcode): refs #5228 remove barcode from report' (!1847) from 5228-fixPalletReport into dev ... Reviewed-on: #1847 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-21 10:44:49 +00:00
Pablo Natek	6fc818deab	Merge branch 'dev' into 5228-fixPalletReport	2023-11-21 10:33:20 +00:00
Jorge Penadés	3f8d1ff617	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-21 10:17:31 +01:00
Guillermo Bonet	b3d1c72adc	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-21 09:13:41 +00:00
Alex Moreno	e909c2bc26	Merge branch 'dev' into 6454-dbDump	2023-11-21 09:13:17 +00:00
Alex Moreno	02e8b90926	refs #6454 test: fix e2e by dump	2023-11-21 10:12:07 +01:00
Jorge Penadés	4c287f6a23	Merge pull request 'ref #5835 due day new and fixtures' (!1833) from 5835-newInvoiceInDueDay into dev ... Reviewed-on: #1833 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-21 09:08:59 +00:00
Juan Ferrer	bf7c67dbde	fix: refs #6197 add definer to events	2023-11-21 09:26:02 +01:00
Jorge Penadés	dd11cf5327	ref #5835 fix test	2023-11-21 09:03:25 +01:00
Jorge Penadés	34e5409533	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay	2023-11-21 08:19:11 +01:00
Pablo Natek	c62390fa4a	Merge branch 'dev' into 5228-fixPalletReport	2023-11-21 06:55:51 +00:00
Pablo Natek	fc653746f0	remove(barcode): refs #5228 remove barcode from report	2023-11-21 07:54:25 +01:00
Juan Ferrer	0a2fd9cf5d	fix: refs #6432, #5848 account sync fixes	2023-11-20 18:39:37 +01:00
Alex Moreno	ee1a0c15ee	refs #6454 feat: dump db	2023-11-20 15:09:55 +01:00
Guillermo Bonet	5fdf18825c	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-20 13:14:51 +00:00
Alex Moreno	e25ca914a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-20 10:13:02 +01:00
Guillermo Bonet	b2b12adb3d	Merge branch '4502-zoneEstimatedDelivery' of https://gitea.verdnatura.es/verdnatura/salix into 4502-zoneEstimatedDelivery	2023-11-20 09:47:58 +01:00
Guillermo Bonet	61b2d4c5fd	refactor: refs #4502 zoneEstimatedDelivery	2023-11-20 09:47:57 +01:00
Alex Moreno	0ddfb28327	refs #5914 fix: transferInvoice	2023-11-20 07:56:15 +01:00
Guillermo Bonet	badb4d69a2	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-20 06:15:40 +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
Juan Ferrer	bb6f3b4cfd	fix: refs #6432 account sync fixes	2023-11-17 08:56:25 +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
Guillermo Bonet	8da36569f7	refactor: refs #4502 zoneEstimatedDelivery	2023-11-17 07:44:43 +01:00
Guillermo Bonet	500eb22dc6	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-17 06:43:58 +00:00
Guillermo Bonet	3d1c69be56	refactor: refs #4502 zoneEstimatedDelivery	2023-11-17 07:43:32 +01:00
Guillermo Bonet	2f611391b9	Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery" ... This reverts commit bfd6e1f398.	2023-11-17 07:17:29 +01:00
Juan Ferrer	c2e295f777	fix: refs #6432 account sync fixes	2023-11-17 00:08:29 +01:00
Juan Ferrer	14eb14ad3f	fix: refs #6432 bookworm upgrade	2023-11-17 00:00:36 +01:00
Juan Ferrer	6930c2d52e	fix: #6432 account sync fixes	2023-11-16 23:13:16 +01:00
Juan Ferrer	ea5a881d1f	fix: refs #6432 account sync fixes	2023-11-16 23:10:30 +01:00
Juan Ferrer	1937560118	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-16 23:07:30 +01:00
Juan Ferrer	4f5242e3ae	fix: refs #6432 account sync fixes	2023-11-16 23:07:26 +01:00
Alex Moreno	aea3f7b2b9	refs #6434 fix: use trim	2023-11-16 15:10:47 +01:00
Alex Moreno	83ae0379b5	refs #6434 fix: console.log	2023-11-16 12:28:35 +01:00
Javier Segarra	adc1cd887b	Merge pull request '#6434 - Usuario accede como otro usuario' (!1843) from 6434-signInLog_issue_MASTER into master ... Reviewed-on: #1843 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-16 11:06:50 +00:00
Javier Segarra	a73453e9ed	refs #6434 feat: remove old sql file	2023-11-16 11:56:59 +01:00
Javier Segarra	9e64939810	refs #6434 feat: add Id property in model	2023-11-16 11:56:48 +01:00
Javier Segarra	abf772ae87	refs #6434 feat: check if signIn inserts signInLog	2023-11-16 10:43:00 +01:00
Javier Segarra	386b556216	refs #6434 feat: new test user signIn with email	2023-11-16 10:29:57 +01:00
Javier Segarra	579cd832c0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER	2023-11-16 10:08:06 +01:00
Alex Moreno	9c6b594426	hotFix: comment error logIn	2023-11-16 10:04:34 +01: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