10070 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	6143992238	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-22 08:39:47 +02:00
Joan Sanchez	50629804cb	HOTFIX: Changed param order on insert email into queue	2021-07-22 08:39:15 +02:00
Carlos Jimenez Ruiz	8ed7fe9dca	Merge pull request '3004 - Deprecated ticket_closeAll()' (#699) from 3004-closure_procedures into dev ... Reviewed-on: #699 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-07-21 09:22:36 +00:00
Joan Sanchez	64b3f10fc5	Removed drop temporary table	2021-07-20 13:11:48 +02:00
Joan Sanchez	dbe680a58c	3004 - Deprecated ticket_closeAll()	2021-07-20 13:06:31 +02:00
Carlos Jimenez Ruiz	4c76ec0d01	Merge pull request '3028 - Added visible column on ticket sales' (#698) from 3028-sale_visible into dev ... Reviewed-on: #698 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-07-20 10:48:21 +00:00
Joan Sanchez	9d855a80d5	3028 - Added visible column on ticket sales	2021-07-20 12:33:27 +02:00
Carlos Jimenez Ruiz	d8f92e8b12	Merge pull request '2989 - Added client debt statement sample' (#696) from 2989-client_debt_sample into dev ... Reviewed-on: #696 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-07-20 09:15:13 +00:00
Joan Sanchez	f24e7cafce	Merge branch 'dev' into 2989-client_debt_sample	2021-07-20 09:07:36 +00:00
Joan Sanchez	1b373503a6	Added translation & removed fields property	2021-07-20 11:07:04 +02:00
Joan Sanchez	ffa17b21b2	Merge pull request 'added agency and route columns to client.summary tickets' (#697) from 3025-client_summary_additions into dev ... Reviewed-on: #697 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-20 08:55:56 +00:00
Joan Sanchez	3080936963	Merge branch 'dev' into 3025-client_summary_additions	2021-07-20 08:10:42 +00:00
Carlos Jimenez Ruiz	7563287e58	Merge pull request '3026 - Send invoice PDF' (#694) from 3026-send_invoice into dev ... Reviewed-on: #694 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-07-20 08:04:46 +00:00
Joan Sanchez	266ffde86b	Merge branch 'dev' into 3026-send_invoice	2021-07-20 07:53:56 +00:00
Joan Sanchez	6f400aa1f3	Merge pull request '3027-itemBotanical_deprecated_column' (#695) from 3027-itemBotanical_deprecated_column into dev ... Reviewed-on: #695 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-20 07:53:38 +00:00
Carlos Jimenez Ruiz	af321be095	Merge branch 'dev' into 3026-send_invoice	2021-07-20 07:52:42 +00:00
Carlos Jimenez Ruiz	4cbaf247ed	removed unused showfield in model log	2021-07-20 09:33:45 +02:00
Joan Sanchez	bfd6c995ad	2989 - Added client deb statement sample	2021-07-20 09:09:46 +02:00
Carlos Jimenez Ruiz	0163b6c21b	added agency and route columns to client.summary tickets	2021-07-19 15:59:39 +02:00
Carlos Jimenez Ruiz	e784403fd4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3027-itemBotanical_deprecated_column	2021-07-19 14:46:32 +02:00
Carlos Jimenez Ruiz	29f1f7e89e	itemTaxCountry and item bonanical no longer use the bonanical prop	2021-07-19 14:46:18 +02:00
Joan Sanchez	63b502b368	Updated model ACL	2021-07-19 13:01:06 +02:00
Joan Sanchez	97e9ac4044	Merge pull request 'last steps to preview credit request' (#692) from 1939-add_client_credit_report into dev ... Reviewed-on: #692 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-19 10:33:18 +00:00
Joan Sanchez	e9b6c6b63e	3026 - Send invoice PDF	2021-07-19 12:31:09 +02:00
Carlos Jimenez Ruiz	724da74204	removed footer unused bindings and added date	2021-07-19 10:57:08 +02:00
Carlos Jimenez Ruiz	4ed31f5172	added footerr to report	2021-07-19 10:42:12 +02:00
Carlos Jimenez Ruiz	9a2fe0260e	last steps to preview credit request	2021-07-19 10:16:15 +02:00
Joan Sanchez	d46c9bbfa7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-14 11:37:46 +02:00
Carlos Jimenez Ruiz	559eaf5853	the absences are now fetched alongside the hours	2021-07-14 11:22:04 +02:00
Carlos Jimenez Ruiz	9f5df91be4	workers without active contract no longer set calendar and timeControl at fault	2021-07-14 11:21:29 +02:00
Joan Sanchez	a5ea19b527	Merge pull request 'the absences are now fetched alongside the hours' (#689) from 3018-time_control_info into dev ... Reviewed-on: #689 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-14 09:17:42 +00:00
Joan Sanchez	675a48d8ad	Merge branch 'dev' into 3018-time_control_info	2021-07-14 08:36:09 +00:00
Carlos Jimenez Ruiz	ae4f1d1730	the absences are now fetched alongside the hours	2021-07-14 10:09:24 +02:00
Joan Sanchez	4eabba115f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-13 11:21:26 +02:00
Joan Sanchez	c72cefe61e	Merge pull request '3002-more_module_transactions' (#688) from 3002-more_module_transactions into dev ... Reviewed-on: #688 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-13 08:15:55 +00:00
Joan Sanchez	ea78db1441	3012 - Hotfix: Get ticket list	2021-07-13 08:59:36 +02:00
Carlos Jimenez Ruiz	98a691c152	minor changes	2021-07-12 15:00:20 +02:00
Carlos Jimenez Ruiz	1835171fe8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-more_module_transactions	2021-07-12 13:56:58 +02:00
Carlos Jimenez Ruiz	21e34de1dd	item module transactions	2021-07-12 12:54:59 +02:00
Carlos Jimenez Ruiz	dd3473b93d	small refactors correcting constants and adding transactions	2021-07-12 12:50:15 +02:00
Joan Sanchez	c0d75e20d8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-12 08:32:11 +02:00
Joan Sanchez	878e989c02	HOTFIX: Disable address without a province	2021-07-12 08:29:21 +02:00
Carlos Jimenez Ruiz	3b2b4e3819	client module changes for transactions	2021-07-08 15:53:30 +02:00
Carlos Jimenez Ruiz	10c7aa70d6	claim module transactions for filter, summary and isEditable	2021-07-05 12:00:49 +02:00
Joan Sanchez	ae091a3b11	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-02 14:41:45 +02:00
Joan Sanchez	35e3c8ce65	HOTFIX: 3009 - Unlock report button	2021-07-02 14:35:24 +02:00
Joan Sanchez	48730be203	Updated unit test	2021-07-02 14:12:37 +02:00
Joan Sanchez	057d138991	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-02 13:44:44 +02:00
Joan Sanchez	4849355c9b	Changed limit value	2021-07-02 13:22:37 +02:00
Joan Sanchez	9ad54b9622	HOTFIX: Renamed 'in' to 'invalue'	2021-07-02 13:17:48 +02:00