3240 Commits

Author	SHA1	Message	Date
Javi Gallego	e856de0cfd	feat: refs #6028 test	2023-11-22 15:54:38 +01:00
Javi Gallego	e146c0ea46	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-22 12:42:20 +01:00
Guillermo Bonet	d52c82fb19	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-22 11:36:07 +00: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
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
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
Alex Moreno	7951b874a6	Merge branch 'dev' into 6264-renewToken	2023-11-20 06:39:50 +00: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	a73453e9ed	refs #6434 feat: remove old sql file	2023-11-16 11:56:59 +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	67f5be474d	refs #6434 perf: rename db/changes current folder	2023-11-16 09:21:22 +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	144b26cf4c	refs #6434 perf: signInLog table id column AI	2023-11-16 08:47:08 +01:00
Javier Segarra	d032b3a527	refs #6434 perf: add description to signInLog table	2023-11-16 08:42:17 +01:00
Javier Segarra	e73836cbdb	refs #6434 feat: remove primary key constraint	2023-11-16 08:31:01 +01:00
Javier Segarra	c6b5d7f5a4	refs #6434 feat: rename id key by token	2023-11-16 08:30:01 +01:00
Javier Segarra	e0f6d08a1e	refs #6434 feat: create signInLog table	2023-11-15 13:49:41 +01:00
Javi Gallego	a4328e607e	Merge branch 'dev' into 6207-incoterm-solo-en-serie-world	2023-11-15 10:11:05 +01:00
Javier Segarra	4d677ccc89	refs #6434 perf: rename folder db/changes version	2023-11-15 10:02:48 +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
Javier Segarra	7f82243ce6	refs #6434 feat: create signInLog table	2023-11-14 15:00:03 +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	0fed5c1ab4	Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate	2023-11-10 09:59:24 +00:00
Alex Moreno	69255fe2fc	refs #6014 feat(execute): use user_hasRoutinePriv. feat(execute): split in executeProc & executeFunc	2023-11-10 10:58:58 +01:00
Alex Moreno	f1b5e45491	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6014-executeRoutineMethod	2023-11-10 10:53:11 +01: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
Alex Moreno	fd142b9f23	refs #5881 warmFix: roleSync	2023-11-09 15:05:36 +01:00
Jorge Penadés	52f1843580	ref #5835 due day new and fixtures	2023-11-09 15:00:49 +01:00
Jorge Penadés	b07858fddb	ref #5914 replace name	2023-11-09 14:33:46 +01:00
Sergio De la torre	4aac9f93cc	Merge branch 'dev' into 6014-executeRoutineMethod	2023-11-09 13:03:25 +00:00
Jorge Penadés	3e45334149	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-warmfix-renameTable	2023-11-09 12:04:47 +01:00
Jorge Penadés	01d3c23cf0	ref #5914 renameTable	2023-11-09 11:57:52 +01:00
Alex Moreno	a0c4573f4d	refs #4797 fix: correct sql folder	2023-11-09 09:34:37 +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
Alex Moreno	dbe6844419	refs #6415 feat: init version 23.48	2023-11-09 09:31:32 +01:00
Alex Moreno	973eff4520	refs #6415 fix. sql files	2023-11-09 09:05:56 +01:00
Alex Moreno	204323ac69	test(notification_getList): fix	2023-11-08 14:57:07 +01:00
Sergio De la torre	5751065e6a	refs #5652 feat:addressShortage	2023-11-08 11:50:04 +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	0818efaa99	fix(fixtures): refs #6150 clientCredit	2023-11-06 14:58:39 +01:00
Pablo Natek	72c8e76a2f	Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix	2023-11-06 14:54:57 +01:00
Pablo Natek	b442c9f5ed	fix: refs #6150 ticket to client trigger	2023-11-06 14:54:56 +01:00
Pablo Natek	526a5fdc8f	Merge branch 'dev' into 6150-clientCredit-update-Fix	2023-11-06 13:26:45 +00: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
Pablo Natek	7ca3ea156c	feat(claimViewer): refs #5881 nuevo rol claimViewer	2023-11-06 09:16:10 +01:00
Javier Segarra	43366d1ba8	refs #6264 feat: update fixture.sql	2023-11-04 17:24:04 +01:00
Javier Segarra	21028e3b79	refs #6264 feat: db changes	2023-11-04 17:23:44 +01:00
Alex Moreno	8c5e40c27f	refs #4797 fix: correct sql folder	2023-11-03 15:16:03 +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
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	bf84863237	refs #6376 fix: changelog	2023-11-02 08:42:53 +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
Alex Moreno	d7542bcbb4	refs #6335 fix(ticketAdvance): procedure	2023-10-31 15:11:03 +01:00
Pablo Natek	a47d31cec9	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-31 06:48:53 +00:00
Pablo Natek	e7da093fc1	fix(acl.sql): refs #4131 òner comillas en el sql	2023-10-31 07:49:27 +01:00
Jorge Penadés	f250c084f7	ref #5216 refactor expeditionState BeforeInsert	2023-10-30 09:11:52 +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	65a1d052dc	feat(ticket.state): refs #4131 to state	2023-10-27 18:03:40 +02:00
Alex Moreno	ae160890a8	refs #6335 feat(ticketAdvance): use componentUpdate	2023-10-27 15:06:20 +02:00
Pablo Natek	9708f66cef	merge(dev): refs #4131 merge dev move sql files	2023-10-27 12:36:28 +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	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	e0b4ac733e	ref #5914 move changes	2023-10-26 09:30:48 +02:00
Jorge Penadés	56c431888f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-26 09:29:13 +02:00
Alex Moreno	cecdf8633c	refs #6350 deploy: init version 23.46	2023-10-26 09:27:32 +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	83cff37422	refs #6350 fix: 00-dropWorkerCreate.sql	2023-10-26 08:23:18 +02:00
Alex Moreno	26bdbabff5	refs #6335 feat(ticketAdvanced): show all tickets	2023-10-25 15:48:19 +02:00
Carlos Andrés	b461f63e2c	refs #4707 fix: correct sqlVersion	2023-10-25 11:02:53 +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
Carlos Andrés	800bbd74c8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl	2023-10-24 14:35:36 +02:00
Alex Moreno	589d7cbbb8	fix: ticket_canAdvance correct worker. fix(dockerFIle)! dockerFile debian version	2023-10-24 12:02:21 +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
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	2fa2e7f099	Merge branch '4707-test-workerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl	2023-10-23 16:58:58 +02:00
Carlos Andrés	4ff0bb94c0	refs #4707	2023-10-23 16:58:56 +02:00
Carlos Andrés	08431e94c6	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-23 13:52:52 +00:00
Carlos Andrés	0055abc0a8	refs #4707 fix: problemas fichadas y test	2023-10-23 15:52:05 +02:00
Alex Moreno	483526c970	refs #6015 feat(executeRoutine): check db restrictions. test: add executeRoutine tests	2023-10-23 15:03:05 +02:00
Carlos Andrés	6e3517b40f	refs #4707 fix: problemas fichadas y test	2023-10-23 14:51:09 +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	ecbc2fb7fc	Merge branch '3126-changePackageFkTopackagingFk' of https://gitea.verdnatura.es/verdnatura/salix into 3126-changePackageFkTopackagingFk	2023-10-19 15:05:21 +02:00
Pablo Natek	37209a223a	feat(db): packagefk virtual column refs #3126	2023-10-19 15:05:19 +02:00
Pablo Natek	f26595bb62	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 12:15:43 +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
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
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
Pablo Natek	a5b6921592	refactor(changes): se mueven los sql a la ultima carpeta refs #3126	2023-10-19 10:44:34 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Jorge Penadés	8fe911ee0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-18 13:43:22 +02:00
Jorge Penadés	62d2c7e701	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-18 13:42:15 +02:00
Jorge Penadés	ea5597d3f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-18 13:40:02 +02:00
Pablo Natek	bf09f13aa2	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-18 11:07:24 +00:00
Alex Moreno	a7b0ef1e4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-10-18 09:23:55 +02:00
Alex Moreno	b3c7511e59	refs #6067 feat(url): getByUser	2023-10-18 08:52:06 +02:00
Alex Moreno	6871ce4b15	Merge branch '6067-vnUser_privileges_and_verifyEmail' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:29:03 +02:00
Alex Moreno	a916007314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:20:34 +02:00
Pablo Natek	8d44bb8867	refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749	2023-10-17 15:05:48 +02:00
Jorge Penadés	fdfa481d21	ref #5947 drop procedure	2023-10-17 14:52:47 +02:00
Pablo Natek	541926d3f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded	2023-10-17 13:57:32 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Jorge Penadés	bd535374d8	ref #6138 setPasword created	2023-10-16 15:58:25 +02:00
Jorge Penadés	ab6c58cd12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-16 08:18:00 +02:00
Guillermo Bonet	e1c1d1a556	refs #6199 Fixed tests	2023-10-13 12:33:39 +02:00
Pablo Natek	f9fdd4c726	Merge branch '3126-changePackageFkTopackagingFk' of https://gitea.verdnatura.es/verdnatura/salix into 3126-changePackageFkTopackagingFk	2023-10-13 08:54:07 +02:00
Pablo Natek	104d11ac3c	refs #3126 procReplace	2023-10-13 08:52:28 +02:00
Sergio De la torre	1a7f7b6a00	refs #5134 feat:models	2023-10-13 08:02:00 +02:00
Sergio De la torre	35c0ec0d04	Merge branch 'dev' into 5134-ModelsSalix	2023-10-11 15:14:13 +00:00
Sergio De la torre	0028dd150a	refs #5134 feat:models	2023-10-11 17:12:55 +02:00
Jorge Penadés	179d8ab87d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-10 11:30:53 +02:00
Pablo Natek	c4e3fdf510	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-10-06 06:03:03 +00:00
Pablo Natek	90fe65acc2	refs #6213 fixChanges	2023-10-06 08:03:37 +02:00
Pablo Natek	020de5d754	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-05 07:57:46 +00:00
Alex Moreno	7a6022efd4	Merge branch 'dev' into 6216-saleLog_open_ticketLog	2023-10-05 06:31:54 +00:00
Alex Moreno	9538841a30	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-05 07:28:02 +02:00
Alex Moreno	ca86b3cc2f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-10-05 07:27:35 +02:00
Alex Moreno	7cd2e290ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-05 07:22:41 +02:00
Jorge Penadés	c35899542d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-04 08:40:44 +02:00
Alex Moreno	45e41de9a9	refs #5918 fix(worker_time-control): isMailSended	2023-10-03 14:03:52 +02:00
Alex Moreno	21ddcb7e8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-10-03 11:39:44 +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	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
Sergio De la torre	3ba349b74a	refs #5890 feat: itemShelvingSaleAsignado more calls	2023-10-02 09:14:30 +02:00
Carlos Andrés	41ac907b05	refs #6254-collection_getTickets	2023-09-29 13:44:41 +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
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	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
Carlos Andrés	934b4c4b36	refs #5890	2023-09-29 10:53:06 +02: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	f3c55cdee9	refs #5929 fix(isEditable): can edit if is weekly	2023-09-28 16:00:09 +02:00
Carlos Andrés	52cba80dc8	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-28 15:13:37 +02: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	75e54bd82f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado	2023-09-28 13:21:12 +02:00
Alex Moreno	d4e5815d41	refs #6254 feat(collection_getTickets): refactor code and add test	2023-09-28 08:30:50 +02: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	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
Alex Moreno	1307d4727c	refs #6254 feat(collection): add getTickets	2023-09-27 15:08:36 +02:00
Sergio De la torre	ac3e9c811d	refs #5890 feat: itemShelvingSaleAsignado	2023-09-27 14:01:17 +02:00
Jorge Penadés	474399b383	ref #5914 refactor	2023-09-25 15:23:51 +02:00
Alex Moreno	7a3d3d5e2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-09-25 14:14:23 +02: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	6cf1095b10	refs #6067 feat: vnUser use verify() and more security when update user and mailForward	2023-09-25 08:33:16 +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
Alex Moreno	db7f72e262	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-09-22 13:19:35 +02:00
Pablo Natek	ed157d1fd1	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-22 11:11:25 +00:00
Alex Moreno	d16ae47712	Merge branch 'dev' into 5843-quitUserFk2	2023-09-22 11:01:25 +00: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	a854fff94f	refs #3126 changes	2023-09-22 10:59:48 +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
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
Pablo Natek	acd4f398c7	refs #6159 procBasedUpdate	2023-09-21 08:44:52 +02:00
Javi Gallego	4e6808ec4a	fixes #4059 muevo archivos a changes actual	2023-09-21 08:24:57 +02:00
Javi Gallego	7ec47f0cc3	Merge branch 'dev' into 4059-revocar-permisos-client-account	2023-09-21 07:34:12 +02:00
Carlos Satorres	cd20a2d06d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-21 07:32:19 +02:00
Pablo Natek	324b3ed8ee	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-21 05:21:06 +00:00
Jorge Penadés	5b818cef0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-20 15:25:20 +02:00
Alex Moreno	3b90d7e5e5	refs #6067 refactor: vnUser and mailForward privileges. fix: emailVerification	2023-09-20 15:10:28 +02:00
Carlos Satorres	f60b6b84fe	refs #5843 fix back	2023-09-20 11:58:36 +02:00
Carlos Satorres	f92acdfe6f	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-09-20 09:52:32 +00:00
Jorge Penadés	4870b0830b	ref #5914 fix refund and change method name	2023-09-20 11:06:30 +02:00
Pablo Natek	d29c37693d	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-09-20 08:53:53 +00:00
Jorge Penadés	87cee57e56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-20 10:47:53 +02:00
Javi Gallego	29a186fa18	Merge branch 'dev' into 6241--arreglar--dbTest	2023-09-20 08:18:46 +02:00
Javi Gallego	45cf1b1ff3	fixes #6241 dbTest fixed	2023-09-20 08:12:07 +02:00
Carlos Satorres	daf5b343fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-19 13:58:13 +02:00
Carlos Satorres	9524ff6932	refs #5660 fix sql	2023-09-19 11:02:12 +02:00
Pablo Natek	361c2b4cad	refs #6213 fixSpec	2023-09-19 07:33:28 +02:00
Pablo Natek	90b3107537	refs #4131 grant and revoke	2023-09-19 07:07:52 +02:00
Pablo Natek	747ba0124c	refs #4131 dumpedFixtures	2023-09-18 13:53:56 +02:00
Carlos Satorres	63068ddfb8	refs #5660 call and insert	2023-09-18 12:24:26 +02:00
Carlos Satorres	cfd080530a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-18 11:49:03 +02:00
Pablo Natek	c1da4815cb	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-18 08:12:08 +00:00
Pablo Natek	44ec197ea0	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-09-18 06:56:48 +00:00
Carlos Satorres	fa87757d0f	refs #5560 sql fix	2023-09-18 08:56:25 +02:00
Carlos Satorres	0912bd40f3	refs #5660 sql fix	2023-09-15 09:15:48 +02:00
Sergio De la torre	0403c67bad	Merge branch 'dev' into 5652-ItemTrash	2023-09-15 05:47:00 +00:00
Carlos Satorres	2a1e828e14	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-15 07:30:46 +02:00
Pablo Natek	191b254acc	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-09-14 16:05:25 +00:00
Sergio De la torre	b756d2f938	refs #5652 modify	2023-09-14 18:03:30 +02:00
Pablo Natek	cf138a0814	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-14 13:15:52 +00:00
Javi Gallego	ca2257d29b	subo version 2340	2023-09-14 13:47:04 +02:00
Carlos Satorres	11109d72a6	move sql	2023-09-14 11:36:09 +02:00
Carlos Satorres	cdc91e76f5	refs #5525 supplier sql table i18n	2023-09-14 10:04:34 +02:00
Javi Gallego	e1b03172fb	Merge pull request 'test' (!1744) from test into dev ... Reviewed-on: #1744 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-14 07:32:24 +00:00
Sergio De la torre	43f5bbb04e	Merge branch 'dev' into 5652-ItemTrash	2023-09-14 09:05:55 +02:00
Sergio De la torre	d2cd522842	refs #5652 modify:without fit	2023-09-14 07:47:10 +02:00
Pablo Natek	66e851b5ea	refs #4131 changeStateRefactor	2023-09-13 19:48:58 +02:00
Pablo Natek	72026332ba	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-13 13:07:38 +00:00
Carlos Satorres	4b40c8b067	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-09-13 13:16:26 +02:00
Carlos Satorres	a9b2aef27a	refs #5660 join and value	2023-09-13 12:02:25 +02:00
Carlos Satorres	d26a73bdd9	refs #5525 sql correct	2023-09-13 11:02:47 +02:00
Pablo Natek	740514c5a8	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-09-12 13:46:58 +00:00
Carlos Satorres	0ddcb57209	refs #5660 fix e2e	2023-09-12 10:40:10 +02:00
Pablo Natek	37c57af2ed	Merge branch 'dev' into 6131-duplicatedProvince	2023-09-11 17:27:10 +00:00
Pablo Natek	1b158bea67	refs #6131 unique constraint country-name	2023-09-11 19:28:05 +02:00
Pablo Natek	6a753d26af	refs #6213 default account value	2023-09-11 18:28:47 +02:00
Javi Gallego	705505b931	fixes #4059 acl for address	2023-09-11 16:24:47 +02:00
Sergio De la torre	5f5a0645be	refs #5652 feat:itemTrash_new	2023-09-11 16:16:49 +02:00
Carlos Satorres	49e635ff4b	refs #5660 dump dumpedFixtures	2023-09-11 13:49:18 +02:00
Pablo Natek	ccfd8fad05	refs #6213 fixCreateError	2023-09-11 12:32:46 +02:00
Carlos Satorres	62a4469803	refs #5660 cambios structure	2023-09-11 11:34:23 +02:00
Carlos Satorres	9d0e4e7558	refs #5660 change sql	2023-09-11 10:47:39 +02:00