10142 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	c9f235df97	Merge branch 'dev' into 3032-ticket_card_components_volume_error	2021-07-28 07:35:28 +00:00
Joan Sanchez	bbc6484588	Merge pull request 'autoload refreshes the model when url is set' (#703) from 3020-crudModel_add_flag_for_requests into dev ... Reviewed-on: #703 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-28 07:35:09 +00:00
Carlos Jimenez Ruiz	6e3a18a923	removed test for deprecated function	2021-07-27 18:18:32 +02:00
Carlos Jimenez Ruiz	88ecaff1d2	prevented an error if resultant length is 0	2021-07-27 16:17:47 +02:00
Carlos Jimenez Ruiz	6d4b97443e	autoload refreshes the model when url is set	2021-07-27 15:59:59 +02:00
Joan Sanchez	8b005ae012	Updated unit tests	2021-07-27 12:24:45 +02:00
Joan Sanchez	531937ebbc	2985 - Create a manual invoice from a ticket or client	2021-07-27 09:07:04 +02:00
Joan Sanchez	faab039022	Merge pull request '3014-invoiceIn_clone_from_descriptor' (#701) from 3014-invoiceIn_clone_from_descriptor into dev ... Reviewed-on: #701 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-23 13:30:49 +00:00
Carlos Jimenez Ruiz	caedfff34e	Merge branch '3014-invoiceIn_clone_from_descriptor' of https://gitea.verdnatura.es/verdnatura/salix into 3014-invoiceIn_clone_from_descriptor	2021-07-23 15:18:08 +02:00
Carlos Jimenez Ruiz	b837a8c328	fixed a selector for ticket sale	2021-07-23 15:17:30 +02:00
Carlos Jimenez Ruiz	72535f87e1	Merge branch 'dev' into 3014-invoiceIn_clone_from_descriptor	2021-07-23 12:47:36 +00:00
Joan Sanchez	98933ff53c	Merge pull request '3023-client_webAccess_block_simultaneous_changes' (#700) from 3023-client_webAccess_block_simultaneous_changes into dev ... Reviewed-on: #700 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-23 12:43:48 +00:00
Carlos Jimenez Ruiz	1e97447386	selectors updated according to previous changes on ticket sales	2021-07-23 14:36:37 +02:00
Carlos Jimenez Ruiz	ed97af01f2	e2e for descriptor clone option	2021-07-23 14:07:05 +02:00
Carlos Jimenez Ruiz	abbce74100	clone invoiceIn from descriptor	2021-07-23 14:06:48 +02:00
Joan Sanchez	f97e2427a4	Merge branch 'dev' into 3023-client_webAccess_block_simultaneous_changes	2021-07-22 07:30:37 +00:00
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	d24457b6cf	Merge branch 'dev' into 3023-client_webAccess_block_simultaneous_changes	2021-07-21 09:22:59 +00: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
Carlos Jimenez Ruiz	c1162b1b8a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3023-client_webAccess_block_simultaneous_changes	2021-07-21 10:07:21 +02:00
Carlos Jimenez Ruiz	25411c90e3	web access e2e path adapted to lastest modificications	2021-07-21 10:07:12 +02:00
Carlos Jimenez Ruiz	0676eb5f30	web access inputs can't be modified together anymore	2021-07-21 10:06:50 +02: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	94b668c01e	Filter item from a dialog	2021-07-15 13:41:29 +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