1486 Commits

Author	SHA1	Message	Date
Pablo Natek	35750bc93f	merge(dev): refs #6259 merge dev	2023-12-21 18:46:12 +01:00
Pablo Natek	27a369bef4	refactor(ticketSms): refs #6259 merge ticksms to clientsms	2023-12-21 18:34:22 +01:00
Javier Segarra	100936d40b	Merge branch 'dev' into 5858-zone_Collisions	2023-12-21 12:05:27 +00:00
Carlos Satorres	73d1c1698b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI	2023-12-21 12:38:58 +01:00
Alex Moreno	9951e911ae	refs #5925 feat(docuware_upload): use userConfig.tabletFk	2023-12-21 10:39:46 +01:00
Alex Moreno	7b0c5fe0a0	refs #5739 fix: sql	2023-12-21 08:33:50 +01:00
Javier Segarra	72e9b69d7e	Merge branch 'dev' into 5858-zone_Collisions	2023-12-19 07:04:41 +00:00
Javier Segarra	dbc3fc8007	refs #5858 perf: remove bad comments	2023-12-19 08:02:38 +01:00
Javier Segarra	5b6112720f	refs #5858 feat: new fixture	2023-12-19 07:54:29 +01:00
Carlos Satorres	22a9ffc163	refs #6291 dni	2023-12-18 12:33:04 +01:00
Alex Moreno	59f2e3d0e6	refs #5914 fix: remove unnecessary	2023-12-15 08:54:41 +01:00
Alex Moreno	21a1dbeae7	refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets	2023-12-14 15:56:49 +01:00
Alex Moreno	1ce1af82fe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-12-14 15:55:21 +01:00
Alex Moreno	d7454cdb19	refs #6576 fix: correct version	2023-12-14 11:41:59 +01:00
Jorge Penadés	1f2d475f05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-14 08:41:45 +01:00
Javier Segarra	1e89ed6cdc	Merge branch 'dev' into 6264-renewToken	2023-12-13 14:39:10 +00:00
David Domenech	9bcd0a3c98	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 11:29:46 +00:00
Jorge Penadés	8d61473d4f	refs #6276 fixtures & itemBarcode_delete	2023-12-13 11:43:19 +01:00
Jorge Penadés	a4c3d78e31	refs #6276 drop fixtures & fix getSale	2023-12-13 09:45:01 +01:00
David Domenech	ee6ad55e66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-13 09:43:20 +01:00
Pablo Natek	69dd34665f	refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit	2023-12-13 08:50:17 +01:00
Jorge Penadés	01fa0b1d36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-13 08:35:11 +01:00
Javier Segarra	d44cdcbd13	Merge branch 'dev' into 6264-renewToken	2023-12-13 06:14:55 +00:00
Alex Moreno	ea39f8b3be	remove duplicate	2023-12-12 12:25:51 +01:00
Jorge Penadés	e27bf2ef8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-11 08:29:35 +01:00
Carlos Satorres	866ad7a9f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2023-12-11 08:20:19 +01:00
Alex Moreno	f874faa921	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-12-11 07:47:55 +01:00
Javi Gallego	7ff8ec93ff	Merge pull request 'test' (!1879) from test into dev ... Reviewed-on: #1879	2023-12-06 07:54:13 +00: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
Jorge Penadés	30b63f577f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-01 09:49:49 +01:00
Javier Segarra	db06620d7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2023-12-01 09:39:47 +01:00
Alex Moreno	e634a5e213	refs #5914 feat: create getTaxBases and use in negatives and positives procedures	2023-11-30 15:15:40 +01:00
David Domenech	eb0766bafd	Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk	2023-11-30 14:08:47 +00: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	ab69dcd4fe	refs #6524 fix: fixtures and feat: new changelog format	2023-11-30 12:32:41 +01:00
Pablo Natek	3f22f48df7	fix(getFiltered): refs #3271 fix to event filter	2023-11-30 12:13:12 +01:00
Jorge Penadés	25a0ffcfde	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-30 09:49:50 +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
Javi Gallego	d246b5f9a8	Merge branch 'dev' into 5652-fixtures-fix	2023-11-29 15:26:51 +01:00
Jorge Penadés	133fe1065a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-29 09:44:09 +01:00
Alex Moreno	2e22984e77	refs #6197 fix: add salix role in fixtures	2023-11-29 09:13:54 +01:00
Javi Gallego	2fa56cce4b	fix: refs #5652 arreglo fixtures	2023-11-28 09:22:00 +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
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
Javier Segarra	5d156e81ca	refs #5858 perf: move files to current version folder	2023-11-23 15:18:09 +01:00
Jorge Penadés	f862ed7d8a	refs #6274 refactor updateInTime	2023-11-23 13:19:59 +01:00
Jorge Penadés	a60a30128c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-22 15:40:11 +01:00
Guillermo Bonet	d52c82fb19	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-22 11:36:07 +00:00
Jorge Penadés	40bbad04c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-22 10:16:12 +01:00
Jorge Penadés	251578146e	refs #6276 several methods created	2023-11-21 12:32:36 +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
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	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
Javi Gallego	a4328e607e	Merge branch 'dev' into 6207-incoterm-solo-en-serie-world	2023-11-15 10:11:05 +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
Alex Moreno	2cd9c9c688	Merge branch 'dev' into 5914-warmfix-renameTable	2023-11-14 09:36:47 +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
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	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
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	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
Javi Gallego	9d54618620	fix: refs: #6207 impide facturar si no tienes incoterm	2023-11-08 10:01:02 +01:00
Javier Segarra	43366d1ba8	refs #6264 feat: update fixture.sql	2023-11-04 17:24:04 +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	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
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	6e3517b40f	refs #4707 fix: problemas fichadas y test	2023-10-23 14:51:09 +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	e2f7ce8b35	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 08:58:50 +00: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
Guillermo Bonet	e1c1d1a556	refs #6199 Fixed tests	2023-10-13 12:33:39 +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	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	ca86b3cc2f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-10-05 07:27:35 +02:00
Alex Moreno	4545a63214	refs #6067 feat(vnUser): verifyEmail redirect to lilium	2023-10-02 14:51:19 +02:00
Alex Moreno	b33700abc9	refs #6216 feat(ticket_sale): open filtered ticketLog	2023-09-29 11:57:25 +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
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
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
Jorge Penadés	474399b383	ref #5914 refactor	2023-09-25 15:23:51 +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
Pablo Natek	a854fff94f	refs #3126 changes	2023-09-22 10:59:48 +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
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
Carlos Satorres	f92acdfe6f	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-09-20 09:52:32 +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	cfd080530a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-18 11:49:03 +02:00
Sergio De la torre	b756d2f938	refs #5652 modify	2023-09-14 18:03:30 +02: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
Carlos Satorres	0ddcb57209	refs #5660 fix e2e	2023-09-12 10:40:10 +02:00
Carlos Satorres	49e635ff4b	refs #5660 dump dumpedFixtures	2023-09-11 13:49:18 +02:00
Carlos Satorres	62a4469803	refs #5660 cambios structure	2023-09-11 11:34:23 +02:00
Carlos Satorres	544259df9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-11 10:47:21 +02:00
Carlos Andrés	0465c2ca54	Merge branch 'dev' into 6176-book-entry-deleted	2023-09-06 19:27:02 +00:00
Carlos Andrés	0d2db7749f	refs #6176 book entry deleted	2023-09-06 21:22:10 +02:00
Carlos Satorres	4918e3ccc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-06 14:02:53 +02:00
Sergio De la torre	022d3d08e6	refs #5652 feat:itemTrash_new	2023-09-01 12:34:33 +02:00
Javi Gallego	734b948aac	refs #6173 back test fixed and fixtures refactored	2023-09-01 11:52:48 +02:00
Javi Gallego	92789ba3de	refs #6173 fixed backTest	2023-08-31 10:04:28 +02:00
Javi Gallego	e498bba37b	initial dump	2023-08-31 08:41:19 +02:00
Carlos Satorres	0b9199688e	refs #5843 userFk remove and vchange	2023-08-30 12:48:57 +02:00
Carlos Satorres	91c6ab9e44	refs #5843 edit structure	2023-08-22 12:50:27 +02:00
Jorge Penadés	040f5be85c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-08-18 12:18:30 +02:00
Juan Ferrer	5924303ae2	refs #5483 Dumped fixtures for vn.time removed	2023-08-14 09:53:53 +02:00
Alex Moreno	9ef4ba9bef	refs #5134 feat: add saleMistake model	2023-08-11 12:32:49 +02:00
Carlos Satorres	8807b9f87f	fix upper	2023-08-10 09:58:48 +02:00
Carlos Satorres	aff6668dc9	remove names upper	2023-08-09 13:33:06 +02:00
Carlos Satorres	5653a39e3b	fix fixtures names, socialnames streets	2023-08-09 13:10:05 +02:00
Jorge Penadés	7ca6c6b96d	refs #5914 fix merge	2023-08-08 15:10:15 +02:00
Carlos Satorres	183fdacefc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-08-03 10:01:11 +02:00
Jorge Penadés	7513323156	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-07-31 07:53:36 +02:00
Jorge Penadés	50155cea8d	refs #5914 WIP transfer invoiceOut	2023-07-28 15:21:43 +02:00
Vicent Llopis	fbc1e28031	Merge branch 'dev' into 4734-addViaexpress	2023-07-28 07:54:26 +00:00
Carlos Satorres	0546ae99eb	refs #5660 add fixtures	2023-07-27 17:27:06 +02:00
Carlos Satorres	af60412232	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-07-27 17:24:50 +02:00
Sergio De la torre	85c017431c	refs #5983 fix(itemShelving): fixtures	2023-07-19 07:01:43 +02:00
Alex Moreno	2f6c988005	Merge branch 'dev' into 5983_inventory_parking	2023-07-18 13:53:17 +00:00
Sergio De la torre	9076553070	refs #5983 test(itemShelving): add getInventory	2023-07-18 14:11:50 +02:00
Vicent Llopis	09b00401ec	Merge branch 'dev' into 4734-addViaexpress	2023-07-18 05:56:35 +00:00
Guillermo Bonet	3c013110d3	refs #5819 Changed structure sql	2023-07-18 07:32:45 +02:00
Carlos Satorres	6f3cdd3508	refs #5640 fix e2e back	2023-07-17 12:30:48 +02:00
Carlos Satorres	b113052b5c	refs #5640 fixtures and test fix	2023-07-14 13:48:36 +02:00
Vicent Llopis	01dc26f64e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2	2023-07-13 09:42:53 +02:00
Vicent Llopis	17b2b02246	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress	2023-07-13 09:16:32 +02:00
Alex Moreno	219a4fbca9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-12 13:09:58 +02:00
Vicent Llopis	a831a1534b	Merge branch 'dev' into 4770-routes_roadmap2	2023-07-11 11:50:15 +00:00
Alex Moreno	8922d27f20	refs #4614 fix e2e	2023-07-07 12:25:02 +02:00
Vicent Llopis	6fa6c21cb1	remove fixtures	2023-07-07 09:31:26 +02:00
Alex Moreno	be0120728d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-06 15:15:36 +02:00
Alex Moreno	a665b6c060	refs #5970 fix sql	2023-07-06 11:51:04 +02:00
Alex Moreno	63a8f40443	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-07-06 10:42:53 +02:00
Alex Moreno	040e9e4197	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-05 12:50:45 +02:00
Vicent Llopis	e58d4e5db3	refs #4770 feat: añadida sección 'Troncales'	2023-07-04 14:42:51 +02:00
Pablo Natek	2ccf8d5197	refs #5347	2023-07-03 14:49:21 +02:00
Alex Moreno	461e1d4d5d	refs #5475 feat: userUses, fix forbiddenError and merge in dev	2023-07-03 13:33:48 +02:00
Alex Moreno	7fe8698b6f	refs #5753 fix ticketToInvoice	2023-07-03 10:04:03 +02:00
Alex Moreno	d1fb2859be	Merge branch 'dev' into 5753_232401_db_dump	2023-07-03 06:59:42 +00:00
Alex Moreno	f636c3b1ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 11:57:56 +02:00
Alex Moreno	ff320895a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump	2023-06-30 08:23:00 +02:00
Alex Moreno	c6bee8f2f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-29 14:50:06 +02:00
Carlos Andrés	1d993c74e5	refs #5590 fix total invoiceOut	2023-06-29 10:39:07 +02:00
Vicent Llopis	e3e0c7e97a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa	2023-06-28 14:31:54 +02:00
Alex Moreno	8723cf2958	refs #5753 fix legacy bugs	2023-06-28 14:10:21 +02:00
Carlos Satorres	3bea23c52a	refs #5660 delivery acls	2023-06-28 11:30:45 +02:00
Carlos Satorres	a930963ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-06-27 12:34:37 +02:00
Alex Moreno	e43e52b561	refs #5753 db export and fix fixtures	2023-06-26 15:21:45 +02:00
Alex Moreno	798481b24a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-26 07:53:44 +02:00
Juan Ferrer	47a4a9950f	refs #5772 Parallelism added to PDF generation	2023-06-23 11:42:30 +02:00
Alex Moreno	6ab431f8ef	refs #5475 tests	2023-06-21 14:17:25 +02:00
Carlos Satorres	9870cc7b14	refs #5660 change assist	2023-06-21 13:34:27 +02:00
Alex Moreno	d6c504d3bb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-21 07:53:40 +02:00
Vicent Llopis	f6cb1cb130	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:07:52 +00:00
Alex Moreno	dd157d59d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-16 13:42:13 +02:00
Vicent Llopis	425118d333	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress	2023-06-16 13:09:38 +02:00
Carlos Satorres	0eca606de0	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-06-16 07:29:30 +00:00
Sergio De la torre	1f454e6219	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje	2023-06-15 07:22:10 +02:00
Alex Moreno	3a5e591cf0	refs #5475 feat(signin): use twoFactor and passExpired	2023-06-14 15:15:00 +02:00
Vicent Llopis	0cc5781f3f	refs #4734 feat: añadido método putExpedicionInternacional de viaexpress	2023-06-13 15:05:37 +02:00
Vicent Llopis	61f99744c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-13 07:43:23 +02:00
Carlos Satorres	908799adee	refs #5660 deliveryAssit	2023-06-12 14:58:28 +02:00
Alex Moreno	f113bfbc95	Merge branch 'dev' into test	2023-06-12 12:32:29 +00:00
Alex Moreno	22e69e6e91	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-12 11:06:27 +02:00
Alexandre Riera	703c224e91	refs #5513 modified-entry email	2023-06-12 10:26:50 +02:00
Alex Moreno	a8215e38f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7	2023-06-12 07:31:25 +02:00
Alex Moreno	d735f142a1	Merge branch 'dev' into 5472-user_passExpired	2023-06-12 05:04:28 +00:00
Alex Moreno	50ced36338	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7	2023-06-09 08:43:39 +02:00
Carlos Satorres	c66feb53f0	refs #5760 fix fixtures	2023-06-09 08:29:18 +02:00
Carlos Satorres	ec9dfa90fd	refs #5760 fixtures	2023-06-09 08:06:45 +02:00
Alex Moreno	96d88cdf4b	refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking	2023-06-08 14:42:07 +02:00
Vicent Llopis	cf559b2ba5	refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono	2023-06-08 09:19:57 +02:00
Alex Moreno	1240a6b71a	Merge branch 'dev' into 5472-user_passExpired	2023-06-07 11:44:47 +00:00
Alex Moreno	edc601fd5d	refs #5489 fix(account/sync), fix(order) catalog-search-panel popover	2023-06-07 13:34:13 +02:00
Vicent Llopis	7cf85eeef8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-07 09:03:33 +02:00
Alexandre Riera	bfd421c188	Merge branch 'dev' into 5137-aviso-impresora	2023-06-07 06:30:43 +00:00
Alex Moreno	ac0e7ae32b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-07 07:08:02 +02:00
Alex Moreno	cb50c617ee	refs #5489 deprecate account.user.password	2023-06-06 15:09:01 +02:00
Vicent Llopis	b144948dcf	conflictos resueltos	2023-06-06 12:31:44 +02:00
Vicent Llopis	98af8ee10f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-06 12:31:20 +02:00
Alex Moreno	5d6eaca6b8	refs #5472 test(changePassword): e2e	2023-06-05 15:20:07 +02:00
Alexandre Riera	9c9a2d4fe2	Merge branch 'dev' into 5513-backs-embalajes	2023-06-05 12:25:50 +00:00
Alex Moreno	91b0e3013a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-05 08:11:47 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Alex Moreno	9462ca90a7	refs #5472 refactor setPassword & changePassword, fix sync	2023-06-01 15:29:46 +02:00
Alex Moreno	0263d76021	refs #5701 update to mariadb 10.7.7	2023-05-31 14:58:16 +02:00
Vicent Llopis	46b6625527	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-05-30 12:06:31 +02:00
Alexandre Riera	30816f7947	Merge branch 'dev' into 5513-backs-embalajes	2023-05-30 09:51:42 +00:00
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Alex Moreno	c7b8e57d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-26 07:41:48 +02:00
Alex Moreno	375fdf2a21	fix item_getBalance	2023-05-25 14:31:28 +02:00
Vicent Llopis	886c4a15b5	refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía	2023-05-25 10:19:00 +02:00
Vicent Llopis	eab329b230	refs #554 feat: actualizar el token automáticamente	2023-05-24 15:01:59 +02:00
Alexandre Riera	74ba21b1b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto	2023-05-24 13:39:01 +02:00
Alexandre Riera	49bd9c35b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto	2023-05-24 12:19:45 +02:00
Carlos Satorres	af1f92613f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-05-23 13:57:11 +02:00
Alex Moreno	6f503e2a81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-23 08:23:16 +02:00
Alex Moreno	6f06bac0c1	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-23 05:55:08 +00:00
Juan Ferrer	da0aa57539	Merge branch 'test' into dev	2023-05-22 19:06:20 +02:00
Juan Ferrer	26c2ab867d	Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546	2023-05-22 17:04:32 +00:00
Juan Ferrer	6b0fd99eb8	refs #5667 Fixes: Style, translations, fixtures, UI	2023-05-19 10:56:15 +02:00
Alexandre Riera	58c25786a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-18 14:52:33 +02:00
Alexandre Riera	d70a31bfbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-18 14:49:27 +02:00
Alexandre Riera	e8376c00a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-18 14:43:20 +02:00
Alexandre Riera	2591d2d115	refs #3628 added check & date-picker	2023-05-18 11:42:22 +02:00
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Alex Moreno	cd34ccad8f	refs #5579 use variable	2023-05-17 13:14:43 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Alex Moreno	cc23fd1337	refs #5579 fix mockTimes and remove userLog_add	2023-05-17 09:23:37 +02:00
Alex Moreno	c9af22780b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export	2023-05-17 08:24:23 +02:00
Alex Moreno	7f881409fc	refs #5579 fix mockTime	2023-05-16 15:00:31 +02:00
Alex Moreno	3e33030b1d	refs #5579 update mariadb version to 10.7.6	2023-05-15 15:16:22 +02:00
Alex Moreno	ea6837e33a	refs #5579 export structure and data	2023-05-12 13:07:24 +02:00
Alexandre Riera	9760e50212	refs #5513 minor fixes	2023-05-12 08:46:12 +02:00
Pablo Natek	65082be077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr	2023-05-12 08:28:19 +02:00
Alexandre Riera	ded8e0e141	refs #5137 added trigger, template and test	2023-05-10 13:22:53 +02:00
Alexandre Riera	b37bde2ba7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-09 08:14:42 +02:00
Carlos Satorres	2c6f71b4c4	Merge branch 'dev'	2023-05-08 10:16:57 +02:00
Alexandre Riera	a2055d35fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-08 09:48:09 +02:00
Alexandre Riera	d21b949ffb	refs #5513 fix getItemsPackaging	2023-05-08 09:18:53 +02:00
Alex Moreno	456e1d5912	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-05 14:11:47 +02:00
Alexandre Riera	5cdec35ed4	refs #5513 addFromPackaging.spec.js	2023-05-04 14:30:10 +02:00
Alex Moreno	a1521f5220	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-03 09:39:39 +00:00
Alex Moreno	4a7902ae4d	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 08:41:18 +00:00
Alexandre Riera	c2de5c5ff4	refs #4797 added redirection section	2023-05-02 07:28:59 +02:00
Alex Moreno	ac55dc4cc7	refs #5297 feat(worker_new): add payMethod	2023-04-28 14:17:19 +02:00