9369 Commits

All Branches

Search

Author	SHA1	Message	Date
Bernat Exposito	57de04410f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry	2021-01-05 08:04:56 +01:00
Joan Sanchez	292a46106e	Translation fix	2021-01-04 15:08:52 +01:00
Joan Sanchez	2a97833f00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-04 14:17:08 +01:00
Joan Sanchez	9aca59e47a	CSS height fix	2021-01-04 14:16:12 +01:00
Joan Sanchez	062e1514c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-04 13:50:55 +01:00
Carlos Jimenez Ruiz	11de5743b7	Merge pull request '2700 - Closure by multiple agencies' (#498) from 2700-closure_by_agency into dev ... Reviewed-on: #498 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-04 10:58:26 +00:00
Javi Gallego	1291fc4b6c	acl	2021-01-04 11:49:32 +01:00
Bernat Exposito	ccfeea8e74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry	2021-01-04 10:55:53 +01:00
Bernat Exposito	f0fb906670	add in travel index, entry create	2021-01-04 10:54:46 +01:00
Joan Sanchez	e4f9ad2774	Merge branch 'dev' into 2700-closure_by_agency	2021-01-04 08:28:21 +00:00
Joan Sanchez	ef7449a4eb	Merge pull request 'entry observations section unit test + e2e' (#493) from 2685-create_test_e2e_entryObservation into dev ... Reviewed-on: #493 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-04 08:26:49 +00:00
Joan Sanchez	1353a0987d	2700 - Closure by multiple agencies	2021-01-04 09:22:32 +01:00
Carlos Jimenez Ruiz	ad03b9cf2b	Merge branch '2685-create_test_e2e_entryObservation' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation	2020-12-31 16:43:27 +01:00
Carlos Jimenez Ruiz	5765fee47d	e2e path for entry.observation - missing role	2020-12-31 16:42:38 +01:00
Carlos Jimenez Ruiz	b843914cec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation	2020-12-31 16:13:40 +01:00
Joan Sanchez	a521ad4262	Fixed claim basicData back error	2020-12-31 14:18:06 +01:00
Carlos Jimenez Ruiz	ac5d5ddf41	Merge pull request '2696 - Geo autocompletion fix' (#497) from 2696-geo_autocomplete into dev ... Reviewed-on: #497 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-12-31 12:20:09 +00:00
Carlos Jimenez Ruiz	fee454ca44	Merge branch 'dev' into 2696-geo_autocomplete	2020-12-31 11:53:50 +00:00
Carlos Jimenez Ruiz	a867df7085	removed focus on describe and added translation	2020-12-31 12:38:54 +01:00
Carlos Jimenez Ruiz	bf53bff017	e2e amends	2020-12-31 12:25:20 +01:00
Carlos Jimenez Ruiz	4e7d64e5ca	re-enabled working unit test	2020-12-31 11:17:42 +01:00
Carlos Jimenez Ruiz	0471855372	Merge branch 'dev' into 2696-geo_autocomplete	2020-12-31 10:02:52 +00:00
Carlos Jimenez Ruiz	1a3cc54dd2	Merge pull request '2661 - Added clone options' (#494) from 2661-travel_cloneWithEntries into dev ... Reviewed-on: #494 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-12-31 10:00:42 +00:00
Carlos Jimenez Ruiz	5dd7db23ec	submit should always be enabled for creation forms	2020-12-31 10:39:37 +01:00
Carlos Jimenez Ruiz	7711367e35	added summary state check to e2e path	2020-12-31 10:39:09 +01:00
Joan Sanchez	6bbe33433d	2696 - Geo autocompletion fix	2020-12-31 10:30:51 +01:00
Carlos Jimenez Ruiz	3b73e1bee2	supplier updateFiscalData changed to table config	2020-12-31 10:28:35 +01:00
Carlos Jimenez Ruiz	4754d5481b	added street arg to updateFiscalData method	2020-12-31 10:13:42 +01:00
Carlos Jimenez Ruiz	92d9435125	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries	2020-12-31 09:27:38 +01:00
Carlos Jimenez Ruiz	12d6948c0e	Route.index e2e path needs time to load results	2020-12-31 09:17:55 +01:00
Javi Gallego	cfc538d9bf	npm i	2020-12-31 07:50:12 +01:00
Joan Sanchez	f0165ae348	Merge pull request 'Add ID in typeTransaction on client and supplier' (#496) from 2689-add_id_in_typeTransaction_client_and_supplier into dev ... Reviewed-on: #496 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-30 15:07:05 +00:00
Jorge Padawan	b403899072	modificated value of "order" on client and supplier	2020-12-30 15:39:27 +01:00
Carlos Jimenez Ruiz	e356dd9e5e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries	2020-12-30 14:55:14 +01:00
Carlos Jimenez Ruiz	52cb6c076c	travel cloneWithEntries path + e2e fix	2020-12-30 14:54:51 +01:00
Jorge Padawan	f2742b88a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2689-add_id_in_typeTransaction_client_and_supplier	2020-12-30 10:49:58 +01:00
Jorge Padawan	77e3ae9fee	Modificated the e2e of fiscal data on client	2020-12-30 10:49:42 +01:00
Jorge Padawan	c9ae5989f9	Add id on description of typeTransiction on client and supplier	2020-12-30 10:49:02 +01:00
Joan Sanchez	e00d2d6e8f	Merge branch 'dev' into 2685-create_test_e2e_entryObservation	2020-12-30 06:19:15 +00:00
Javi Gallego	0d5540b639	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-29 17:00:45 +01:00
Javi Gallego	3db3d65600	test	2020-12-29 17:00:22 +01:00
Joan Sanchez	beb6c85d58	Merge pull request '2657-zone_log' (#472) from 2657-zone_log into dev ... Reviewed-on: #472 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-29 13:32:05 +00:00
Joan Sanchez	45fac5d71d	Merge branch 'dev' into 2657-zone_log	2020-12-29 13:08:22 +00:00
Carlos Jimenez Ruiz	c870baa182	Merge branch '2661-travel_cloneWithEntries' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries	2020-12-29 14:05:47 +01:00
Carlos Jimenez Ruiz	23a1494fdd	selectors for create travel	2020-12-29 14:05:43 +01:00
Joan Sanchez	c2d50c6044	Dup entry error handler	2020-12-29 14:02:26 +01:00
Joan Sanchez	a3f17ae302	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries	2020-12-29 13:55:06 +01:00
Carlos Jimenez Ruiz	3f4366b907	Merge pull request '2690 - Duplicated foreign key fix' (#495) from 2690-duplicated_fk into dev ... Reviewed-on: #495 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-12-29 12:51:07 +00:00
Joan Sanchez	edd25a347b	Moved line	2020-12-29 13:44:12 +01:00
Joan Sanchez	20862db854	2690 - Duplicated foreign key fix	2020-12-29 13:39:10 +01:00