8206 Commits

Author	SHA1	Message	Date
Carlos Satorres	c7d960229d	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:34:32 +00:00
Carlos Satorres	acfa0fd857	Merge branch 'dev' into 6318-negativeQuantity	2023-12-07 06:31:21 +00:00
Javi Gallego	7ff8ec93ff	Merge pull request 'test' (!1879) from test into dev ... Reviewed-on: #1879	2023-12-06 07:54:13 +00:00
Jorge Penadés	bb186bafe0	Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-05 14:12:00 +01:00
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
Javier Segarra	035b31d878	refs #5666 test: fix e2e tests	2023-12-05 12:00:31 +01:00
Jorge Penadés	25006a938b	refs #6274 refactor clockIn	2023-12-05 11:53:27 +01:00
Carlos Satorres	f55e85a189	refs #6010 remove pending	2023-12-05 10:35:48 +01:00
Carlos Satorres	af07a531ed	refs #6318 quantity	2023-12-05 08:49:55 +01:00
Sergio De la torre	3692021b12	Merge branch 'dev' into 6275-silex-to-salix	2023-12-05 07:26:22 +00:00
Sergio De la torre	318f7e3c0d	REFS #6275 feat:Silex_to_Salix	2023-12-05 08:20:55 +01:00
Javier Segarra	1d92bbf4a2	refs #5666 feat: replace base value and add mixins	2023-12-05 07:48:56 +01:00
Javier Segarra	57add7abf0	refs #5666 perf: replace Role by VnRole	2023-12-05 07:16:12 +01:00
Jorge Penadés	8cb97e2477	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-04 15:09:44 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +01:00
Carlos Satorres	6d486fbec9	refs #6085 trad, remove front, back test	2023-12-01 13:58:45 +01:00
Pablo Natek	bec1ff71ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-01 13:43:27 +01:00
Robert Ferrús	2a93dcf5b8	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-01 10:20:08 +00:00
Jorge Penadés	611b45bae0	Merge branch 'dev' into 5835-summaryRate	2023-11-30 15:16:18 +00:00
Alex Moreno	b2e7ea3089	refs #5914 feat: make invoice support rectificative	2023-11-30 15:16:41 +01:00
David Domenech	eb0766bafd	Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk	2023-11-30 14:08:47 +00:00
Pablo Natek	72283005b8	remove(console.log): refs #3271 remove console.log	2023-11-30 14:43:14 +01:00
David Domenech	8ab981907d	refactor(ticketTracking.userFk): refs #6398 workerFk to userFk	2023-11-30 14:25:00 +01:00
Pablo Natek	c457b5c4d2	Merge branch 'test' into 3271-zoneGetFilterdFix	2023-11-30 12:39:26 +00:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Alex Moreno	35e74a7635	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-30 12:48:27 +01:00
Alex Moreno	016e4ae37c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-30 12:20:50 +01:00
Javier Segarra	01e7135224	refs #5666 feat: replace Role by VnRole in front	2023-11-30 12:20:05 +01:00
Pablo Natek	3f22f48df7	fix(getFiltered): refs #3271 fix to event filter	2023-11-30 12:13:12 +01:00
Javier Segarra	2a2998a8bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-11-30 12:01:44 +01:00
Jorge Penadés	6121eeaa3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate	2023-11-30 09:44:05 +01:00
Carlos Satorres	9cdb7c3cca	refs #6065 remove workcenter	2023-11-30 09:18:00 +01:00
Jorge Penadés	5442e3b4e0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-30 08:44:41 +01:00
Javier Segarra	97d7f8356f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-30 07:08:23 +01:00
Javier Segarra	1576ab992d	refs #6434 perf: new field in SignInLog table	2023-11-29 19:36:30 +00:00
Javi Gallego	d246b5f9a8	Merge branch 'dev' into 5652-fixtures-fix	2023-11-29 15:26:51 +01:00
Carlos Satorres	9a3efdd6fe	refs #6085 model y back	2023-11-29 13:55:44 +01:00
Jorge Penadés	c609f6f47f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-29 09:27:50 +01:00
Carlos Satorres	e548ef4dae	refs #6085 searchpanel and change path	2023-11-29 07:51:58 +01:00
Carlos Satorres	0186c2c806	refs #6085 aclMail back	2023-11-29 07:33:49 +01:00
Jorge Penadés	29fb36010c	refs #6274 back methods created	2023-11-28 14:48:03 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Jorge Penadés	f2673c3818	refs #5835 rate added	2023-11-28 12:12:42 +01:00
Guillermo Bonet	1a5cc67312	Merge branch 'dev' into 6023-changeRol	2023-11-28 12:07:50 +01:00
Javi Gallego	2fa56cce4b	fix: refs #5652 arreglo fixtures	2023-11-28 09:22:00 +01:00
Javier Segarra	bb9723b65d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-11-28 08:18:11 +01:00
Javier Segarra	f5f2896cbf	refs 5666 feat: replace Role model by VnRole model	2023-11-28 08:12:16 +01:00
Alex Moreno	37555cbb63	refs #6335 warmFix(ticketAdvance): correct properties	2023-11-27 15:10:00 +01:00
Juan Ferrer	c7291e3367	Merge pull request 'test' (!1863) from test into dev ... Reviewed-on: #1863	2023-11-27 12:17:11 +00:00
Juan Ferrer	74772472d5	Merge pull request 'master' (!1820) from master into test ... Reviewed-on: #1820 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-27 12:16:42 +00:00
Robert Ferrús	5f26553092	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-11-27 11:05:50 +00:00
Robert Ferrús	62fab4e744	refs #5854 itemShelving traducciones	2023-11-27 11:52:37 +01:00
Guillermo Bonet	3bdb002034	Merge branch 'dev' into 3222-expenceToExpense	2023-11-27 09:06:17 +00:00
Guillermo Bonet	aefff68c29	refactor: refs #3222 Requested changes	2023-11-27 09:51:56 +01:00
Javier Segarra	901a44cc62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-27 09:48:31 +01:00
Javier Segarra	72a0932e35	refs #6264 other: rename camel-case variable	2023-11-27 09:46:27 +01:00
Alex Moreno	3fb1ed9dfe	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract	2023-11-27 08:38:17 +01:00
Carlos Satorres	f9d5cad412	refs #6506 contract	2023-11-27 07:57:18 +01:00
Alex Moreno	824ca1d70a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-11-27 07:42:50 +01:00
Guillermo Bonet	2be1639e9f	refactor: refs #3222 Expence to expense	2023-11-24 12:42:25 +01:00
Jorge Penadés	53c8e87b5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-24 10:57:32 +01:00
Jorge Penadés	8ac3887d80	refs #5811 rename methods	2023-11-24 10:53:38 +01:00
Jorge Penadés	c56588a472	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-24 10:18:47 +01:00
Jorge Penadés	b3584d9db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals	2023-11-24 10:12:45 +01:00
Carlos Satorres	5d18c211a0	refs #6507 state	2023-11-24 08:40:06 +01:00
Javi Gallego	4071c06b5f	feat: refs #6275 getTickets con los campos de silex	2023-11-24 08:15:39 +01:00
Carlos Satorres	8a568f180a	refs #6506 fix e2e, refactor business	2023-11-24 07:47:57 +01:00
Carlos Satorres	ebe467f721	refs #6506 hotfix	2023-11-24 07:04:55 +01:00
Javi Gallego	aa0794e136	Merge branch 'dev' into 6275-silex-to-salix	2023-11-24 06:31:25 +01:00
Jorge Penadés	e314a67fe7	refs #6274 time control methods migrated	2023-11-23 13:25:31 +01:00
Jorge Penadés	6b2c1e09de	refs #5835 refactor	2023-11-23 11:31:00 +01:00
Javi Gallego	5b145a57e6	error: refs 6028 test front quitado	2023-11-23 11:29:53 +01:00
Jorge Penadés	048e3089cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals	2023-11-23 11:26:41 +01:00
Jorge Penadés	db15285858	refs #5811 test updated	2023-11-23 11:21:56 +01:00
Jorge Penadés	2e67ef4f5d	refs #5811 refactor deleteExpeditions	2023-11-23 10:32:07 +01:00
Jorge Penadés	900dffbbba	refs #5811 delete viaexpress expeditions included	2023-11-23 10:26:28 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Javi Gallego	5b289ec083	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-23 09:21:44 +01:00
Jorge Penadés	da7b670d74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-23 08:28:56 +01:00
Alex Moreno	f4fabb9fff	refs #6491 refactor(order_filter): optimized	2023-11-23 08:26:14 +01:00
Carlos Satorres	2b455488a3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-22 18:35:16 +01:00
Carlos Satorres	6b07ee4eb1	hotfix workerhours	2023-11-22 18:35:14 +01:00
Javi Gallego	e856de0cfd	feat: refs #6028 test	2023-11-22 15:54:38 +01:00
Jorge Penadés	26a8cc6a2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-22 15:41:24 +01:00
Javi Gallego	e146c0ea46	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-22 12:42:20 +01:00
Javi Gallego	a0a9e299d9	feat: refs #6275 getTickets with phone	2023-11-22 12:39:21 +01:00
Guillermo Bonet	d52c82fb19	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-22 11:36:07 +00:00
Jorge Penadés	a27bb53089	refs #5835 getTotals fixed	2023-11-22 08:57:45 +01:00
Carlos Satorres	7c6798c564	refs #6291 dni vn-user	2023-11-21 16:25:48 +01: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
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
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
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	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
Guillermo Bonet	500eb22dc6	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-17 06:43:58 +00:00
Guillermo Bonet	8da36569f7	refactor: refs #4502 zoneEstimatedDelivery	2023-11-17 07:44:43 +01: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	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
Javier Segarra	9e64939810	refs #6434 feat: add Id property in model	2023-11-16 11:56:48 +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
Javier Segarra	e4f7790843	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER	2023-11-16 09:15:01 +01:00
Javier Segarra	c6b5d7f5a4	refs #6434 feat: rename id key by token	2023-11-16 08:30:01 +01:00
Guillermo Bonet	bfd6e1f398	refactor: refs #4502 Deleted zoneEstimatedDelivery	2023-11-16 08:29:00 +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
Javier Segarra	13720291b2	refs #6434 perf: remove unique in token column	2023-11-15 15:18:02 +01:00
Alex Moreno	ac3d23579a	Merge branch 'master' into 6434-signInLog_issue_MASTER	2023-11-15 13:50:21 +00:00
Carlos Satorres	5b587b3449	Merge branch 'master' into hotfix-ticketAddresFk	2023-11-15 12:56:45 +00:00
Javier Segarra	e0f6d08a1e	refs #6434 feat: create signInLog table	2023-11-15 13:49:41 +01: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
Sergio De la torre	692c5eb164	refs #5652 fix: setVisibleDiscard add parameter null	2023-11-15 12:38:08 +01:00
Guillermo Bonet	2847b993d3	Merge branch 'dev' into 6023-changeRol	2023-11-15 11:30:23 +00:00
Javier Segarra	f7b0882978	refs #6434 feat: remove forceId property	2023-11-15 11:50:56 +01:00
Javi Gallego	a4328e607e	Merge branch 'dev' into 6207-incoterm-solo-en-serie-world	2023-11-15 10:11:05 +01:00
Javi Gallego	3f7663da97	feat: refs #6275 crea back etExpeditionSummary	2023-11-15 10:09:04 +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
Pablo Natek	2a57f7e98a	Merge branch 'dev' into 6366-unifyTicketChangeState	2023-11-14 14:02:27 +00:00
Pablo Natek	0a5e8e1902	refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState	2023-11-14 14:49:54 +01:00
Carlos Satorres	f3faf37e1a	hotfix addressFk	2023-11-14 12:34:00 +01:00
Carlos Satorres	b57106af48	refs #6291 validateTin	2023-11-14 11:13:33 +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
Javier Segarra	384b5eb7c7	refs #5666 remove old file	2023-11-13 09:56:16 +01:00
Javier Segarra	aab88dc7de	refs #5666 perf: use use loggable as mixin	2023-11-13 09:54:12 +01:00
Javier Segarra	3c5af184bb	refs #5666 feat: use mixin for this models	2023-11-10 15:12:49 +01:00
Guillermo Bonet	a4cbc33ee1	Merge branch '6023-changeRol' of https://gitea.verdnatura.es/verdnatura/salix into 6023-changeRol	2023-11-10 11:55:38 +01:00
Guillermo Bonet	b7da144967	feat: refs #6023 Added SELECT FOR UPDATE	2023-11-10 11:55:37 +01:00
Guillermo Bonet	eb98de71b1	Merge branch 'dev' into 6023-changeRol	2023-11-10 10:49:38 +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	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	40b9a83606	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay	2023-11-09 15:59:12 +01:00
Jorge Penadés	8d94a94e14	ref #5914 fix test back	2023-11-09 15:56:50 +01:00
Jorge Penadés	513562955b	ref #5835 test back	2023-11-09 15:53:41 +01:00
Jorge Penadés	52f1843580	ref #5835 due day new and fixtures	2023-11-09 15:00:49 +01:00
Jorge Penadés	0baa9c5a98	ref #5914 fix summary	2023-11-09 14:34:53 +01:00
Jorge Penadés	b07858fddb	ref #5914 replace name	2023-11-09 14:33:46 +01:00
Guillermo Bonet	9668468f94	Merge branch 'dev' into 6023-changeRol	2023-11-09 13:06:55 +00:00
Jorge Penadés	01d3c23cf0	ref #5914 renameTable	2023-11-09 11:57:52 +01:00
Alex Moreno	52f419d4cf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-09 09:33:22 +01:00
Sergio De la torre	4258015c07	refs #5870 feat:fixModel	2023-11-09 08:04:38 +01:00
Javi Gallego	9d54618620	fix: refs: #6207 impide facturar si no tienes incoterm	2023-11-08 10:01:02 +01:00
Sergio De la torre	d30c4e4463	refs #5652 feat:addressShortage	2023-11-07 16:13:21 +01:00
Pablo Natek	1c6618d494	fix(new): refs #6150 revert chabges in worker new method	2023-11-06 14:56:48 +01:00
Pablo Natek	aa800b1fd3	Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix	2023-11-06 14:23:38 +01:00
Pablo Natek	a75565f2ce	feat(client.create): refs #6150 clientCredit update fix	2023-11-06 14:23:36 +01:00
Juan Ferrer	99c88e6f5d	fix: refs #6390 Loggable set as base for ItemShelving	2023-11-05 09:33:18 +01:00
Alex Moreno	d06810b1b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-03 14:58:55 +01:00
Alex Moreno	a523e32373	refs #6335 style(ticketAdvance): fix with split-progress	2023-11-03 07:57:53 +01:00
Sergio De la torre	728838334c	hotFix_6312 fix originalQuantity	2023-11-02 14:42:22 +01:00
Pablo Natek	2d3ee4a16e	Merge branch 'dev' into 6150-clientCredit-update-Fix	2023-11-02 13:05:31 +00:00
Pablo Natek	175e73e565	fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit	2023-11-02 14:05:14 +01:00
Alex Moreno	740d2fb976	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-02 08:48:03 +01:00
Alex Moreno	83b9ef72fc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-02 08:47:44 +01:00
Alex Moreno	742d6de986	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-02 07:28:41 +01:00
Carlos Andrés	8c1ff26de7	Merge branch 'dev' into 5637-saleGroupLog	2023-10-31 11:12:40 +00:00
Robert Ferrús	6112c7ba5f	refs #5637 saleGroup traducciones	2023-10-31 09:59:34 +01:00
Pablo Natek	a47d31cec9	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-31 06:48:53 +00:00
Alex Moreno	37dce99447	refs #6335 test(ticketAdvance): add test to keep price	2023-10-30 15:00:05 +01:00
Pablo Natek	e504ad313c	remove(console.log): refs #4131 quitar console log	2023-10-30 14:56:33 +01:00
Alex Moreno	a80715583c	refs #6335 feat(ticketAdvance): change the date if you can	2023-10-30 14:16:25 +01:00
Jorge Penadés	ab0640291b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState	2023-10-30 08:25:41 +01:00
Alex Moreno	bd8cc897c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-10-30 07:21:31 +01:00
Pablo Natek	14753212bb	fix(saveSign): refs #4131 remove call state on saveSign	2023-10-27 18:07:17 +02:00
Pablo Natek	65a1d052dc	feat(ticket.state): refs #4131 to state	2023-10-27 18:03:40 +02:00
Sergio De la torre	7ae12327f5	refs #5134 fix: model ExpeditionScan	2023-10-27 16:16:22 +02:00
Alex Moreno	ae160890a8	refs #6335 feat(ticketAdvance): use componentUpdate	2023-10-27 15:06:20 +02:00
Pablo Natek	42bbdf9814	feat(ticket.state): refs #4131 convert changeState to State	2023-10-27 13:41:32 +02:00
Pablo Natek	524ac4d99d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges	2023-10-26 22:16:06 +02:00
Pablo Natek	3584b15c19	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-26 22:10:35 +02:00
Alex Moreno	55d80458cc	refs #6065 warmFix(workerTimeControl): set date	2023-10-26 14:37:42 +02:00
Alex Moreno	30895f444f	Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress	2023-10-26 12:14:31 +00:00
Alex Moreno	6b94ea7d11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-10-26 09:48:35 +02:00
Jorge Penadés	3a1227bdc2	ref #5914 fix ticketrefund	2023-10-26 09:20:25 +02:00
Jorge Penadés	da2bc416f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-26 08:26:35 +02:00
Alex Moreno	013b010c22	refs #6278 test(itemRequest): fix e2e, correct selector	2023-10-26 07:56:57 +02:00
Alex Moreno	26bdbabff5	refs #6335 feat(ticketAdvanced): show all tickets	2023-10-25 15:48:19 +02:00
Alex Moreno	a501d577f8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-25 09:23:00 +02:00
Alex Moreno	efa9f16452	fix: remove unnecessary UserError	2023-10-25 09:22:44 +02:00
Carlos Andrés	001d7cd574	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-24 15:03:38 +00:00
Jorge Penadés	9f141238bc	ref #5216 add userFk	2023-10-24 11:47:54 +02:00
Alex Moreno	5442476f05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-24 10:35:11 +02:00
Jorge Penadés	35bb949fcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 10:13:38 +02:00
Jorge Penadés	f1deeb69ca	ref #5914 add ticketrefund and fix text	2023-10-24 09:34:04 +02:00
Alex Moreno	22b7c59812	refs #6335 feat(ticketAdvance): add zone field	2023-10-24 09:23:03 +02:00
Jorge Penadés	1231d6dd1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 08:34:42 +02:00
Carlos Andrés	08431e94c6	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-23 13:52:52 +00:00
Carlos Andrés	6e3517b40f	refs #4707 fix: problemas fichadas y test	2023-10-23 14:51:09 +02:00
Alex Moreno	247aa5af2a	refs #6199 fix(sale_quantity): add isReduction	2023-10-23 09:52:06 +02:00
Alex Moreno	cf856a585b	refs #6199 fix(sale_quantity): add isReduction	2023-10-23 09:50:00 +02:00
Jorge Penadés	1f0a57d320	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 09:03:15 +02:00
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Jorge Penadés	33656e9d9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 08:21:32 +02:00
Pablo Natek	0237517f0c	Merge branch 'master' into 5979-getAppOrigin	2023-10-20 10:55:30 +00:00
Pablo Natek	8597c23fb3	Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin	2023-10-20 12:53:57 +02:00
Pablo Natek	5c69d9c7f0	fix: add await in async functions refs #5979	2023-10-20 12:53:54 +02:00
Alex Moreno	1eabad7f4b	refs #6257 fix(saleQuantity): add isInPreparing restriction	2023-10-20 12:37:44 +02:00
Pablo Natek	75cfea4a2e	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-20 10:18:43 +00:00
Pablo Natek	25c13e42ab	Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter	2023-10-20 11:36:24 +02:00
Pablo Natek	243a32dff5	remove(expand): quito expand de la columna requester refs #6278	2023-10-20 11:36:11 +02:00
Alex Moreno	ef1ddfd484	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-20 09:28:37 +02:00
Alex Moreno	84aed7ca21	refs #6257 fix(saleQuantity): newPrice correct restricction	2023-10-20 09:26:56 +02:00
Alex Moreno	d5f98700e7	refs #6287 fix: ticket new correct return type	2023-10-20 08:32:35 +02:00
Pablo Natek	9cb4e57951	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-20 05:31:12 +00:00
Pablo Natek	dc93328bcf	Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin	2023-10-19 18:24:04 +02:00
Pablo Natek	07fa011035	fix(updateClaim): el spec daba error refs #5979	2023-10-19 18:24:03 +02:00
Pablo Natek	dad67539c5	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 16:23:34 +00:00
Carlos Andrés	16f20cea70	refs #6199 fix(sale): get minim price without grouping	2023-10-19 15:12:06 +02:00
Pablo Natek	f26595bb62	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 12:15:43 +00:00
Alex Moreno	a0e32cf455	Merge branch 'test' into 6199-saleUploadQuantity	2023-10-19 12:05:25 +00:00
Alex Moreno	cadec7d01f	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 11:36:14 +00:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Alex Moreno	d9ab607126	refs #6199 feat(sale): increase quantity if newPrice is higher	2023-10-19 13:03:11 +02:00
Pablo Natek	71182d8630	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-19 10:49:31 +00:00
Alex Moreno	1ea6b87266	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 10:48:51 +00:00
Juan Ferrer	39a0f13500	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-19 10:14:29 +00:00
Guillermo Bonet	1b8f227c47	ticket #125321 filter advance tickets fix	2023-10-19 11:58:15 +02:00
Pablo Natek	e2f7ce8b35	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 08:58:50 +00:00
Alex Moreno	3294937b54	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 08:50:29 +00:00
Jorge Penadés	e680a6a080	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-19 10:00:43 +02:00
Jorge Penadés	15890e80d8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-19 09:59:19 +02:00
Jorge Penadés	52b14cf8b4	ref #6138 fix emailVerified	2023-10-19 09:51:10 +02:00
Jorge Penadés	5b1e5743b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-19 09:35:37 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Javi Gallego	84fc0de4ea	Merge pull request 'refs #6312 no inserta el originalquantity' (!1803) from 6312 into dev ... Reviewed-on: #1803 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-19 06:41:43 +00:00
Pablo Natek	d3a7b4ecb9	remove: console.log from updateClaim refs #5979	2023-10-19 08:41:26 +02:00
Pablo Natek	f8889df903	remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979	2023-10-19 08:40:25 +02:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Jorge Penadés	770aa60b69	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-19 08:26:22 +02:00
Jorge Penadés	7e25fac3e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-19 08:25:00 +02:00