11871 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	fdd780a470	Merge pull request '3977-invoiceIn.tax' (#969) from 3977-invoiceIn.tax into dev ... Reviewed-on: #969 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-13 13:04:41 +00:00
Joan Sanchez	913b76880a	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-13 12:59:30 +00:00
Joan Sanchez	d1dc7888ee	Merge pull request '3851-dms_delete' (#964) from 3851-dms_delete into dev ... Reviewed-on: #964 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-13 12:59:12 +00:00
Joan Sanchez	89746e6d57	Merge branch 'dev' into 3851-dms_delete	2022-05-13 12:56:27 +00:00
Joan Sanchez	558585fd15	Updated redmine link	2022-05-12 12:08:12 +02:00
Javi Gallego	0d63f3c3af	Merge branch 'dev' into 3851-dms_delete	2022-05-12 11:13:34 +02:00
Vicent Llopis	568579f461	refactor: pull request changes	2022-05-12 08:27:04 +02:00
Carlos Jimenez Ruiz	c749438f32	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-11 13:37:29 +00:00
Carlos Jimenez Ruiz	b0f70c728e	Merge pull request '3940-export_database' (#966) from 3940-export_database into dev ... Reviewed-on: #966 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-11 13:10:15 +00:00
Carlos Jimenez Ruiz	442644d3f1	Merge branch 'dev' into 3940-export_database	2022-05-11 12:57:29 +00:00
Joan Sanchez	afe4f0ba94	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-11 12:46:39 +00:00
Carlos Jimenez Ruiz	d994daa619	Merge pull request '3327 - Invoicing queue' (#961) from 3327-global_invoicing into dev ... Reviewed-on: #961 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-10 13:15:17 +00:00
Carlos Jimenez Ruiz	86ee110b78	Merge branch 'dev' into 3327-global_invoicing	2022-05-10 12:55:00 +00:00
Joan Sanchez	e0c0663e41	Renamed folder	2022-05-10 14:21:41 +02:00
Carlos Jimenez Ruiz	a7b56b3b89	Merge branch 'dev' into 3327-global_invoicing	2022-05-10 12:19:31 +00:00
Carlos Jimenez Ruiz	d7b76835f5	Merge pull request '3752-claim_action' (#939) from 3752-claim_action into dev ... Reviewed-on: #939 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-10 12:05:03 +00:00
Carlos Jimenez Ruiz	a47c0dbaea	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:47:14 +00:00
Carlos Jimenez Ruiz	b5dbe67c99	Merge pull request '3887-multi-check' (#942) from 3887-multi-check into dev ... Reviewed-on: #942 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-10 11:46:48 +00:00
Carlos Jimenez Ruiz	0e65f382f9	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:36:35 +00:00
Alex Moreno	946f1c1cb5	refactor test	2022-05-10 12:02:50 +02:00
Alex Moreno	5919c42df2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 11:42:35 +02:00
Joan Sanchez	7f19f0bebe	Merge pull request '3795-client_administraive' (#938) from 3795-client_administraive into dev ... Reviewed-on: #938	2022-05-10 08:26:38 +00:00
Joan Sanchez	866834d1d7	Merge pull request '3948-invoceIn.index' (#956) from 3948-invoceIn.index into dev ... Reviewed-on: #956 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-10 08:25:47 +00:00
Joan Sanchez	aa431bbe0f	Merge branch 'dev' into 3795-client_administraive	2022-05-10 08:24:32 +00:00
Joan Sanchez	4e9396f4f3	Merge pull request '3996-fix(entry_summary): get entry.id' (#968) from 3996-entry_summary into dev ... Reviewed-on: #968 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-10 08:22:40 +00:00
Joan Sanchez	93829eeff5	Merge branch 'dev' into 3948-invoceIn.index	2022-05-10 08:22:06 +00:00
Joan Sanchez	c0f2b9dca9	Merge branch 'dev' into 3996-entry_summary	2022-05-10 08:09:31 +00:00
Joan Sanchez	d9c8ed96e4	Added SQL version	2022-05-10 09:46:56 +02:00
Alex Moreno	fde73b35e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 08:57:28 +02:00
Alex Moreno	5bad0592a5	change errors	2022-05-10 08:48:51 +02:00
Alex Moreno	263d0e3f79	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive	2022-05-10 07:55:41 +02:00
Vicent Llopis	bb4dbb60b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-05-10 07:11:26 +02:00
Carlos Jimenez Ruiz	b7e3607ece	Merge pull request '3978-invoiceIn.summary' (#967) from 3978-invoiceIn.summary into dev ... Reviewed-on: #967 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 15:28:59 +00:00
Carlos Jimenez Ruiz	5c55caaec6	Merge branch 'dev' into 3978-invoiceIn.summary	2022-05-09 14:59:32 +00:00
Carlos Jimenez Ruiz	a6f9e9efbd	Merge pull request '3950-invoiceIn.create' (#955) from 3950-invoiceIn.create into dev ... Reviewed-on: #955 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 14:46:44 +00:00
Carlos Jimenez Ruiz	e71003778a	Merge branch 'dev' into 3950-invoiceIn.create	2022-05-09 14:41:33 +00:00
Carlos Jimenez Ruiz	c2d05d9219	Merge pull request '3941-order.index' (#952) from 3941-order.index into dev ... Reviewed-on: #952 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 14:32:23 +00:00
Carlos Jimenez Ruiz	6fb83f5c65	Merge branch 'dev' into 3941-order.index	2022-05-09 14:21:24 +00:00
Carlos Jimenez Ruiz	6c895ee1ab	Merge pull request '3927-monitor_ticket' (#951) from 3927-monitor_ticket into dev ... Reviewed-on: #951 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 14:19:31 +00:00
Carlos Jimenez Ruiz	9c085fa653	Merge branch 'dev' into 3927-monitor_ticket	2022-05-09 14:14:01 +00:00
Joan Sanchez	7365143eac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-09 16:09:17 +02:00
Carlos Jimenez Ruiz	fcb87148f8	Merge pull request '3900-client_credit' (#946) from 3900-client_credit into dev ... Reviewed-on: #946 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 13:53:41 +00:00
Carlos Jimenez Ruiz	93d29bb202	Merge branch 'dev' into 3900-client_credit	2022-05-09 13:16:04 +00:00
Carlos Jimenez Ruiz	58ab1ab4dc	Merge pull request '3750-claim_photo' (#935) from 3750-claim_photo into dev ... Reviewed-on: #935 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 13:15:14 +00:00
Vicent Llopis	f08a384a7c	fix: e2e test	2022-05-09 14:49:37 +02:00
Alex Moreno	d9055abca9	fix(entry_summary): get entry.id	2022-05-09 14:44:30 +02:00
Carlos Jimenez Ruiz	efc43c9611	Merge branch 'dev' into 3750-claim_photo	2022-05-09 12:36:27 +00:00
Vicent Llopis	a6b8674302	feat(invoiceIn.tax): add button for create an expence	2022-05-09 14:34:20 +02:00
Joan Sanchez	f806a598ea	Updated method path	2022-05-09 13:15:48 +02:00
Vicent Llopis	bd7eb67aeb	fix: add CAST DECIMAL(10,2)	2022-05-09 12:31:38 +02:00