7829 Commits

Author	SHA1	Message	Date
Alex Moreno	d1cb2a1d9a	refs #5918 test: add updateWorkerTimeControlMail	2023-10-18 10:30:36 +02: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	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	69a54be1a9	ref #5947 refactorWorkerCreate	2023-10-17 14:02:08 +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	9870a0e60a	feat(origin): create method url_/geturl redf #5979	2023-10-17 13:56:49 +02:00
Alex Moreno	d4770c525e	refs #6199 test(sale): fix test	2023-10-17 11:00:41 +02:00
Jorge Penadés	48003b5d03	ref #6138	2023-10-17 08:28:15 +02:00
Pablo Natek	4f911e644c	fix: remove console.log refs #5979	2023-10-16 18:43:03 +02:00
Pablo Natek	afe4c676fc	fix(url): la ulr termina con / no es necesario añadir el texto	2023-10-16 18:38:33 +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
Alex Moreno	093431ecdf	refs #6119 fix(sale_hook): fix quantity case	2023-10-16 15:27:10 +02:00
Alex Moreno	9e39e96cf4	hotFix: workerTimeControl	2023-10-16 15:22:33 +02:00
Alex Moreno	f79e711617	refs #6199 test: updateQuantity refactor	2023-10-16 10:19:33 +02:00
Alex Moreno	b769fa9bcf	refs #6199 ... fix(sale_updateQuantity): if clientType is loses skip test: fix updateQuantity activeCtx and add test for minQuantity	2023-10-16 10:10:57 +02:00
Jorge Penadés	3af72e1439	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-16 08:20:20 +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
Pablo Natek	f832c1d9ec	refs #5979 getUrl	2023-10-15 11:08:33 +02:00
Sergio De la torre	f6bf36d46a	Merge branch 'dev' into 5134-ModelsSalix	2023-10-13 14:02:25 +00:00
Alex Moreno	ab1cc34015	refs #6199 feat(sale): best quantity restriction	2023-10-13 15:14:48 +02:00
Alex Moreno	03687cb482	hotFix: delete getCurrentWorkerMana	2023-10-13 14:56:56 +02:00
Jorge Penadés	9ba3c9c8bc	Merge branch 'dev' into 5914-transferInvoiceOut	2023-10-13 11:17:12 +00:00
Jorge Penadés	6b8a6c7a69	Merge branch 'dev' into 5914-transferInvoiceOut	2023-10-13 11:15:04 +00:00
Alex Moreno	f00a4e63a6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back	2023-10-13 13:08:54 +02:00
Javi Gallego	0081c55b9e	Merge branch 'dev' into 6119-addMicrosipLink	2023-10-13 10:56:33 +00:00
Carlos Andrés	9c0334619d	refs #6199	2023-10-13 11:56:50 +02:00
Alex Moreno	fa90132934	refs #6199 fix(orderCatalogView): html and css	2023-10-13 10:23:48 +02:00
Guillermo Bonet	7367656a35	refs #6199 Requested changes	2023-10-13 09:02:40 +02:00
Sergio De la torre	35c0ec0d04	Merge branch 'dev' into 5134-ModelsSalix	2023-10-11 15:14:13 +00:00
Javi Gallego	393d1889f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-11 14:06:32 +02:00
Javi Gallego	df9d6fd6f8	efectue con acento	2023-10-11 14:06:28 +02:00
Carlos Satorres	cba8a48d18	Merge branch 'dev' into 5768-incoterms	2023-10-11 10:05:45 +00:00
Carlos Satorres	0023561acb	refs #6293 traducción	2023-10-11 12:04:12 +02:00
Guillermo Bonet	6b1dded222	refs #6199 Requested change, position of input	2023-10-11 08:28:52 +02:00
Guillermo Bonet	d41233efaf	refs #6199 Requested change, name of color	2023-10-11 07:59:05 +02:00
Guillermo Bonet	2b41bf7eb1	refs #6199 Requested changes	2023-10-11 07:39:41 +02:00
Guillermo Bonet	d2ce920f13	refs #6199 Added minQuantity in catalog and more	2023-10-10 13:49:11 +02:00
Carlos Satorres	4adee11c63	refs #5768 remove comment	2023-10-10 12:35:34 +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
Guillermo Bonet	03afea3b8e	refs #6199 Added minQuantity in item	2023-10-10 10:51:02 +02:00
Carlos Satorres	1adfa33a9a	hotfix length sales	2023-10-06 14:52:30 +02:00
Pablo Natek	c4e3fdf510	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-10-06 06:03:03 +00:00
Carlos Satorres	05812c3f35	refs #6282 left join	2023-10-06 07:14:30 +02:00
Carlos Satorres	62c7dc9db5	hotfix-change minus	2023-10-06 06:16:42 +02:00
Pablo Natek	f40185c2d4	refs #4764 hotfix	2023-10-05 14:24:52 +02:00
Carlos Satorres	3fbdae15b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-10-05 14:04:42 +02:00
Carlos Satorres	3b81b511c2	remove consolelog	2023-10-05 14:01:53 +02:00
Carlos Satorres	5b6eb0a2a6	refs #5768 add address, nickname, pdf, email	2023-10-05 14:01:07 +02:00
Pablo Natek	020de5d754	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-05 07:57:46 +00:00
Alex Moreno	8d7eda5af3	refs #5673 fix: add development translation	2023-10-05 09:12:54 +02:00
Alex Moreno	7a6022efd4	Merge branch 'dev' into 6216-saleLog_open_ticketLog	2023-10-05 06:31:54 +00:00
Jorge Penadés	0d39471970	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-05 08:20:47 +02: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
Carlos Satorres	f2adbc1716	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-10-04 13:54:18 +02:00
Alex Moreno	f8a510b330	refs #5918 fix(workerTimeControl): update(workerTimeControl	2023-10-04 12:31:46 +02:00
Alex Moreno	df6d10e514	refs #5918 fix(workerTimeControl): resend mail	2023-10-04 12:17:24 +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
Carlos Satorres	bd46a77cb7	refs #5768 incoterms addressFk	2023-10-03 10:15:16 +02:00
Pablo Natek	96769d9ff9	refs #6213 fixIntermitentError	2023-10-03 08:57:59 +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
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
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
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	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	5f93df26a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-10-02 08:21:09 +02: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	3e9d01815a	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 10:30:44 +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	9536fdba58	ref #6119 refactor	2023-09-29 10:10:58 +02:00
Alex Moreno	a0a59b672f	refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail	2023-09-29 10:04:57 +02:00
Pablo Natek	0fa56149d7	refs #6266 smsfix	2023-09-29 09:47:22 +02:00
Alex Moreno	542119983b	refs #5929 test: fix test after fix ticket_isEditable	2023-09-29 09:28:23 +02:00
Jorge Penadés	f1dc809147	Merge branch 'dev' into 6119-addMicrosipLink	2023-09-29 06:22:51 +00:00
Jorge Penadés	4d226d9a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-09-29 08:20:16 +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	1d4001f520	Merge branch 'dev' into 5673-claim-development	2023-09-28 12:04:11 +00: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	e51df063d3	refs #5890 feat: add userId in rawSql	2023-09-28 13:26:05 +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
Jorge Penadés	e209ab28f4	ref #6065 first time hours load fixed	2023-09-28 11:53:09 +02:00
Jorge Penadés	869bdab7ce	ref #6065 fetchHours relocated	2023-09-28 11:36:03 +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	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
Sergio De la torre	ac3e9c811d	refs #5890 feat: itemShelvingSaleAsignado	2023-09-27 14:01:17 +02:00
Jorge Penadés	a7c0949f0e	ref #6065 replace then by async/await	2023-09-27 08:57:31 +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
Alex Moreno	e36f98195c	refs #6033 feat: create user-photo component for worker and user descriptor	2023-09-26 08:15:19 +02: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
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	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
Alex Moreno	eb0e6dd985	refs #6033 feat(VnLog): can use accountDescriptor	2023-09-25 13:06:28 +02: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
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
Pablo Natek	af8773612c	refs #6213 remove f	2023-09-25 08:23:59 +02:00
Pablo Natek	fc4019ad69	Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors	2023-09-25 08:23:25 +02:00
Pablo Natek	9b10a2904c	refs #6213 unifyTest	2023-09-25 08:23:23 +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	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
Carlos Satorres	5b22314b07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-09-22 12:17:23 +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	a854fff94f	refs #3126 changes	2023-09-22 10:59:48 +02: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	1357b60b9b	refs #6159 fixFixtures	2023-09-22 09:14:08 +02:00
Carlos Satorres	c7e26f9155	refs #5768 autocomplete	2023-09-22 06:08:07 +02:00
Jorge Penadés	82f14e62ad	ref #5914 tests fixed	2023-09-21 16:08:55 +02:00
Alex Moreno	a78348f2de	refs #6067 feat(account_basicData): use vnUser/preview	2023-09-21 15:06:14 +02:00
Carlos Satorres	7b246b1bac	refs #5768 trad choose address	2023-09-21 13:15:00 +02:00
Carlos Satorres	1f1dfae7e3	refs #5843 changes models	2023-09-21 12:50:07 +02:00
Jorge Penadés	ac4aea7d38	ref #5914 created transfer issued invoice	2023-09-21 09:14:46 +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