16890 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	2ea2943eca	refs #5134 feat: models	2023-09-26 13:12:18 +02:00
Sergio De la torre	ed1d8ca94f	refs #5134 feat: models	2023-09-22 12:29:56 +02:00
Alex Moreno	1ec51d94cf	refs #5134 feat: correct sql	2023-08-11 12:53:43 +02:00
Sergio De la torre	a6047d257b	refs #5134 feat:modelsSalix	2023-08-11 12:45:18 +02:00
Alex Moreno	9ef4ba9bef	refs #5134 feat: add saleMistake model	2023-08-11 12:32:49 +02:00
Sergio De la torre	6eb88f8ab7	refs #5134 feat: models	2023-08-11 11:58:30 +02:00
Alex Moreno	ce78fc8e5d	refs #5986 feat: state model add classColor properties	2023-08-08 15:06:28 +02:00
Alex Moreno	19c09d60a2	refs #5986 feat(ticket_filter): add classColor column	2023-08-08 15:04:21 +02:00
Alex Moreno	61e3b71bbf	init version 233401 after revert(version) in test	2023-08-08 08:51:03 +02:00
Alex Moreno	5804064c8c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-08 08:48:16 +02:00
Alex Moreno	bf5b421a43	refs #5976 warnFix(client_create): socialName to upperCase	2023-08-08 08:39:13 +02:00
Alex Moreno	abd6045bf6	warnFix: revert(version): remove changelog and change package.json	2023-08-07 13:52:46 +02:00
Alex Moreno	b3ac98d751	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-07 10:19:49 +02:00
Alex Moreno	e85cddec3c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-08-07 10:19:27 +02:00
Alex Moreno	26d6bbff4c	refs #5929 hotFix: add UserError	2023-08-07 10:04:46 +02:00
Alex Moreno	4191d2529d	refs #5712 warnFix: getById condition	2023-08-07 07:57:38 +02:00
Guillermo Bonet	f26ab787cc	Merge pull request 'test → dev' (!1701) from test into dev ... Reviewed-on: #1701 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-04 09:39:32 +00:00
Guillermo Bonet	eeb68e1ad9	Merge branch 'dev' into test	2023-08-04 08:54:41 +00:00
Carlos Satorres	44fe6940e5	Merge pull request 'refs #5690 ticketproblems' (!1646) from 5690-redondeo_ticketProblems into dev ... Reviewed-on: #1646 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-04 01:30:47 +00:00
Carlos Satorres	1308efb98d	Merge branch 'dev' into 5690-redondeo_ticketProblems	2023-08-04 01:21:52 +00:00
Alex Moreno	83d0a394e3	refs #5973 refactor(item_fetched-tags): restyle empty tags	2023-08-03 15:59:09 +02:00
Guillermo Bonet	fd62f90640	Merge pull request 'master' (!1699) from master into test ... Reviewed-on: #1699 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-03 12:01:42 +00:00
Carlos Satorres	f3491d3d95	Merge pull request 'refs #5640 oldBranch' (!1638) from 5640-mayusFiscalDate into dev ... Reviewed-on: #1638 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-03 09:52:14 +00:00
Guillermo Bonet	602f57bca9	Merge branch 'test' into master	2023-08-03 08:54:32 +00:00
Carlos Satorres	3388fd7c59	fix test back	2023-08-03 10:26:29 +02:00
Carlos Satorres	b85023b46d	accent	2023-08-03 10:11:17 +02:00
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
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
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