11160 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	0aa0358b50	refactor(events): name of variable	2021-11-09 10:21:28 +01:00
Alex Moreno	f45db68e0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3319-worker_time-control	2021-11-09 10:10:20 +01:00
Alex Moreno	da80fee0e2	refactor(time-control): getWorkedHours.spec	2021-11-09 10:09:44 +01:00
Carlos Jimenez Ruiz	a53f98dea9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-09 09:56:13 +01:00
Carlos Jimenez Ruiz	345be297f0	Merge branch 'dev' into 3116-client_balance	2021-11-09 08:26:41 +00:00
Carlos Jimenez Ruiz	127077b985	Merge pull request 'export-database' (#767) from 3304-export_database into dev ... Reviewed-on: #767 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-09 08:20:02 +00:00
Carlos Jimenez Ruiz	63b90a4246	Merge branch 'dev' into 3304-export_database	2021-11-09 08:04:21 +00:00
Alex Moreno	7009cc0cc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar	2021-11-09 08:40:42 +01:00
Alex Moreno	9ab51fc21f	feat(eventsFiltered): add backTest & refactor zone	2021-11-09 08:39:20 +01:00
Carlos Jimenez Ruiz	e4ea05fd07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-08 17:46:50 +01:00
Carlos Jimenez Ruiz	262e46d7c9	added autocompletes to item index	2021-11-08 17:46:40 +01:00
Vicent Llopis	395ad1c76d	fix(ibanRequired): set different ibanRequired for Client and Supplier	2021-11-08 15:04:33 +01:00
Joan Sanchez	eb36f86b9d	Added smart-table to item index	2021-11-08 14:46:23 +01:00
Joan Sanchez	fbf1c50f97	Added total rows and a message for no results	2021-11-08 14:13:28 +01:00
Alex Moreno	9e4627617d	fix(time-control): modify select & refactor dates	2021-11-08 14:08:44 +01:00
Joan Sanchez	2bf7250117	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-08 13:40:22 +01:00
Joan Sanchez	a48617e267	Group first	2021-11-08 13:39:12 +01:00
Vicent Llopis	bfbc9b50c4	feat(client_balance): add maxImport if "cash"	2021-11-08 13:02:42 +01:00
Joan Sanchez	7dc95b8cbf	Group first	2021-11-08 12:50:13 +01:00
Alex Moreno	9c877ceb7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar	2021-11-08 11:31:26 +01:00
Alex Moreno	6e2f7d9e0d	feat(events): get range date of calendar	2021-11-08 11:30:00 +01:00
Alex Moreno	45b36a5c77	export-database	2021-11-08 09:28:34 +01:00
Carlos Jimenez Ruiz	208f38baad	Merge pull request 'fix(claim): salesPersonFk where add officeBoss' (#766) from 3295-claim_search-panel into dev ... Reviewed-on: #766 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-08 08:25:19 +00:00
Vicent Llopis	000ae21ce5	create colum sql	2021-11-08 09:16:27 +01:00
Vicent Llopis	fbbb1ecdf6	feat(client_balance): add maxImport if "cash"	2021-11-08 08:59:42 +01:00
Carlos Jimenez Ruiz	8fff96ca05	Merge branch 'dev' into 3295-claim_search-panel	2021-11-08 07:54:10 +00:00
Carlos Jimenez Ruiz	e474f97aec	Merge pull request 'feat(entry_descriptor): add supplier button' (#764) from 3289-entry_descriptor into dev ... Reviewed-on: #764 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-08 07:53:53 +00:00
Carlos Jimenez Ruiz	46fde9a703	Merge branch 'dev' into 3289-entry_descriptor	2021-11-08 07:50:04 +00:00
Joan Sanchez	06b72ae708	fix(pickup-order): changed sql query from pickup order	2021-11-08 07:41:10 +01:00
Alex Moreno	3324f4acd2	fix(zone): back remoteMethod	2021-11-04 07:56:12 +01:00
Alex Moreno	bb0745532b	fix(claim): salesPersonFk where add officeBoss	2021-11-02 11:24:52 +01:00
Alex Moreno	b01298ed17	feat(entry_descriptor): add supplier button	2021-11-02 08:25:43 +01:00
Alex Moreno	b2dd9e6076	feat(zone): filter calendar	2021-11-02 07:55:35 +01:00
Joan Sanchez	7dc9173431	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-29 17:06:16 +02:00
Carlos Jimenez Ruiz	04a31f4cff	vn table now receives show buttons options	2021-10-29 16:55:19 +02:00
Carlos Jimenez Ruiz	11f24372e5	autocomplete options added to smart table	2021-10-29 15:52:04 +02:00
Joan Sanchez	026e5d706f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-10-29 11:43:05 +02:00
Joan Sanchez	3f73084c7d	Changed report translations	2021-10-29 11:42:03 +02:00
Carlos Jimenez Ruiz	a1970c6fc8	translation for hide show columns	2021-10-28 15:22:26 +02:00
Carlos Jimenez Ruiz	89b7f5ed7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-10-28 13:46:41 +02:00
Carlos Jimenez Ruiz	ddd72798fa	Merge pull request 'feat(description): concat bank with tickets' (#763) from 3260-ticket_receipt into dev ... Reviewed-on: #763 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-28 11:36:27 +00:00
Carlos Jimenez Ruiz	13aa96d6a8	test(payout): e2e path updated for ticket payout	2021-10-28 13:30:07 +02:00
Joan Sanchez	5beeab36b1	Changed shown fields form to two columns	2021-10-28 09:25:46 +02:00
Joan Sanchez	dfb2b0b3d8	Updated checked property	2021-10-28 09:09:52 +02:00
Joan Sanchez	bfc9228eef	Restored ticket table and added table compatibility on contextmenu	2021-10-28 09:06:03 +02:00
Carlos Jimenez Ruiz	b27a443729	show/hide columns and load default view	2021-10-27 17:11:33 +02:00
Vicent Llopis	cd6f0057a1	test	2021-10-27 13:41:59 +02:00
Vicent Llopis	b1b6d93c8e	change column value : checkbox for text	2021-10-27 13:39:38 +02:00
Vicent Llopis	f60fa5a852	change receiver to requesterId	2021-10-27 12:22:32 +02:00
Vicent Llopis	d94e2900d0	feat(ticket-request): send rocket message when ticket-reques is denied	2021-10-27 12:16:37 +02:00