17173 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	9b11479675	refs #5640 traducciones	2023-08-03 10:10:53 +02:00
Carlos Satorres	4fb0ad415c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-08-03 10:03: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
Alex Moreno	4628450240	refs #6093 deploy: 2334 init version	2023-08-03 09:20:03 +02:00
Alex Moreno	ca34065e89	refs #6093 deploy(2332): dev to test	2023-08-03 09:17:32 +02:00
Guillermo Bonet	5c40280987	Merge pull request '5995-newCmr' (!1698) from 5995-newCmr into master ... Reviewed-on: #1698 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-03 07:09:03 +00:00
Guillermo Bonet	8deb8c1f54	Merge branch 'master' into 5995-newCmr	2023-08-03 06:50:04 +00:00
Guillermo Bonet	688a72ddb3	refs #5995 Modify sql	2023-08-03 08:39:37 +02:00
Guillermo Bonet	aab0771e6e	refs #5995 Removed my code in closure.js	2023-08-02 14:37:38 +02:00
Alex Moreno	3d200ed64b	changeLog correct version	2023-08-02 13:59:56 +02:00
Alex Moreno	fd9b842e6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-02 13:58:40 +02:00
Alex Moreno	29fe1c0c84	refs #5325 displaySearch return if not has search row	2023-08-02 13:55:01 +02:00
Guillermo Bonet	4a0b8f37cd	refs #5995 Load blob	2023-08-02 13:41:44 +02:00
Alex Moreno	56cd94feaa	refs #5843 fix(timeControl_filter): not use userFk	2023-08-02 13:26:42 +02:00
Juan Ferrer	3e8bb221e0	refs #5762 Securify fix for recovery url	2023-08-02 09:29:09 +02:00
Guillermo Bonet	84624935d6	refs #5995 Load blob	2023-08-02 09:09:50 +02:00
Carlos Satorres	6f227d45c4	Merge pull request 'hotfix-loadData' (!1696) from hotifx-loadDataDepartment into master ... Reviewed-on: #1696 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-02 07:08:25 +00:00
Guillermo Bonet	16353dfddc	refs #5995 First commit	2023-08-02 07:35:40 +02:00
Alex Moreno	b8780dfbbf	Merge branch 'master' into hotifx-loadDataDepartment	2023-08-01 12:12:17 +00:00
Carlos Satorres	2bde94a667	Merge branch 'dev' into 5690-redondeo_ticketProblems	2023-08-01 11:40:29 +00:00
Carlos Satorres	79d88facc3	refs #4764 add test front	2023-08-01 12:33:56 +02:00
Alex Moreno	30c5e8d8cc	hotFix(canBeInvoiced): no de vuelve error si hay mas de un ticket y uno esta a 0	2023-08-01 11:11:29 +02:00
Carlos Satorres	40607a42cf	hotfix-loadData	2023-08-01 10:25:44 +02:00
Carlos Andrés	976d8d2f91	Merge pull request 'refs #6077 Log-InvoiceInDueday-incorrecto' (!1692) from 6077-Log-InvoiceInDueday-incorrecto-Salix into master ... Reviewed-on: #1692 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-08-01 06:50:29 +00:00
Vicent Llopis	ae42e161cd	Merge pull request 'hotfix_workCenter_isNull' (!1693) from hotfix_workCenter_isNull into dev ... Reviewed-on: #1693 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-31 10:07:11 +00:00
Carlos Satorres	12acda0b1c	refs #4764 ticketSerivce refund add	2023-07-31 11:06:19 +02:00
Vicent Llopis	db992a9b91	Merge branch 'dev' into hotfix_workCenter_isNull	2023-07-31 08:54:37 +00:00
Vicent Llopis	7d10be37ec	Merge branch 'dev' into 6013-sendMail_fix	2023-07-31 08:26:30 +00:00
Vicent Llopis	69e998ced5	Merge pull request '5804-refactor_activeBuyers' (!1691) from 5804-refactor_activeBuyers into dev ... Reviewed-on: #1691 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-31 08:13:58 +00:00
Carlos Andrés	6872cea6bf	Merge branch 'master' into 6077-Log-InvoiceInDueday-incorrecto-Salix	2023-07-28 13:13:59 +00:00
Vicent Llopis	81dc163819	ya no muestra error en el front	2023-07-28 14:40:03 +02:00
Alex Moreno	e253dd7982	refs #5351 fix(worker_model): remove required userFk	2023-07-28 14:39:01 +02:00
Carlos Andrés	136b401ede	refs #6077 espacios correctos	2023-07-28 14:17:50 +02:00
Carlos Andrés	4061f3e5ce	#refs 6077 espacios por tabulaciones	2023-07-28 12:28:41 +02:00
Vicent Llopis	1d4ce2c703	refs #5804 fix: delete transaction	2023-07-28 12:24:24 +02:00
Alex Moreno	dacbf773c4	Merge branch 'dev' into 5804-refactor_activeBuyers	2023-07-28 09:53:11 +00:00
Vicent Llopis	cf8a84e647	Merge pull request '4734-addViaexpress' (!1629) from 4734-addViaexpress into dev ... Reviewed-on: #1629 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-28 08:57:30 +00:00
Vicent Llopis	251ed36eca	refs #6013 feat: mostrar error en el mail	2023-07-28 10:51:48 +02:00
Vicent Llopis	fbc1e28031	Merge branch 'dev' into 4734-addViaexpress	2023-07-28 07:54:26 +00:00
Carlos Satorres	d01584bfb3	refs #4764 service	2023-07-27 15:15:55 +02:00
Vicent Llopis	0054f2d82f	refs #6013 fix: codigo no bloqueante	2023-07-27 15:07:10 +02:00
Vicent Llopis	7367d1cdfe	refs #6013 fix: add await	2023-07-27 14:41:53 +02:00
Carlos Andrés	3bc3ffe115	refs #6077 Log-InvoiceInDueday-incorrecto	2023-07-27 13:40:39 +02:00
Vicent Llopis	65b9cadd9e	refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker	2023-07-27 12:51:14 +02:00
Alex Moreno	29baa2f0c7	refs #6015 modify changelog	2023-07-27 08:27:09 +02:00
Vicent Llopis	777426aa05	refs #5561 add backTest	2023-07-27 07:58:55 +02:00
Alex Moreno	305caaf8aa	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-27 07:20:34 +02:00
Alex Moreno	61b17d1fa5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-27 07:19:48 +02:00
Carlos Satorres	0808fc5b25	Merge pull request 'hotfix change model' (!1690) from hotfix-modelezpx into master ... Reviewed-on: #1690 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-26 12:11:47 +00:00
Carlos Satorres	1277af1399	hotfix mod path	2023-07-26 13:53:15 +02:00