16840 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
Alex Moreno	56cd94feaa	refs #5843 fix(timeControl_filter): not use userFk	2023-08-02 13:26:42 +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
Alex Moreno	b8780dfbbf	Merge branch 'master' into hotifx-loadDataDepartment	2023-08-01 12:12:17 +00: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
Vicent Llopis	db992a9b91	Merge branch 'dev' into hotfix_workCenter_isNull	2023-07-31 08:54:37 +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	fbc1e28031	Merge branch 'dev' into 4734-addViaexpress	2023-07-28 07:54:26 +00: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
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
Carlos Satorres	2a0c363dc5	hotfix change model	2023-07-26 13:28:40 +02:00
Jorge Penadés	fca03e5b7c	Merge pull request '5929-editTicketPrice' (!1688) from 5929-editTicketPrice into dev ... Reviewed-on: #1688 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-26 08:24:04 +00:00
Jorge Penadés	a0fee6ad50	refs #5929 removed useless vars	2023-07-26 09:20:54 +02:00
Jorge Penadés	0b6fb70f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5929-editTicketPrice	2023-07-26 08:36:29 +02:00
Jorge Penadés	b10d774c11	Merge pull request 'refs #6047 added editable-td component' (!1686) from 6047-addEditableTd into dev ... Reviewed-on: #1686 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-26 06:05:46 +00:00
Alex Moreno	af28cfe6df	Merge branch 'dev' into 6047-addEditableTd	2023-07-26 05:22:44 +00:00
Jorge Penadés	96483a827f	Merge branch 'dev' into 5929-editTicketPrice	2023-07-25 13:40:08 +00:00
Jorge Penadés	543fbf3c0a	refs #5929 isEditableOrThrow created, tests passed	2023-07-25 15:35:08 +02:00
Alex Moreno	bf92c5d482	refs #6059 validateLogin sync user	2023-07-25 15:00:08 +02:00
Jorge Penadés	9978db9d52	refs #5929 WIP test created	2023-07-25 11:33:01 +02:00
Alex Moreno	44ceeac9c4	refs #5983 feat(itemShelving): add userFk field	2023-07-25 10:21:54 +02:00
Alex Moreno	26ea39cacc	Merge pull request '5712-workerDms_integrateDocuware' (!1577) from 5712-workerDms_integrateDocuware into dev ... Reviewed-on: #1577 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-25 05:18:03 +00:00
Jorge Penadés	4f80221101	refs #5929 added ACL and accurate errors	2023-07-24 10:34:44 +02:00
Jorge Penadés	55f32397c5	removed unnecesary comments	2023-07-21 13:13:44 +02:00
Jorge Penadés	ade7303a6f	refs #6047 added editable-td component	2023-07-21 13:05:55 +02:00
Alex Moreno	b400e1983a	Merge pull request 'refs #5769 fix(web-access): email rule' (!1684) from 5769-hotFix_client_web-access_email2 into master ... Reviewed-on: #1684 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-07-21 10:43:32 +00:00
Alex Moreno	203f6a5659	refs #5712 correct sql folder	2023-07-21 12:41:16 +02:00
Alex Moreno	23308d7ae3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-21 12:40:59 +02:00
Alex Moreno	985e258529	refs #5769 fix(web-access): email rule	2023-07-21 12:33:14 +02:00
Alex Moreno	eb963ff993	refs #5866 fix(transferClient): correct variable name	2023-07-21 08:28:19 +02:00