Commit Graph

8761 Commits

Author SHA1 Message Date
Bernat Exposito 5f1cdc790a Merge branch '2609-travel_index_addEntry' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 10:20:59 +01:00
Bernat Exposito a6c330cf49 change triger itemTag 2021-01-11 10:20:40 +01:00
Bernat Exposito 0e0ce9f3e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-11 09:44:20 +01:00
Javi Gallego eecbdec7ad Merge pull request 'export table payment' (#504) from 2713-export_payment into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #504
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2021-01-08 14:20:46 +00:00
Javi Gallego 6184681d7b Merge branch 'dev' into 2713-export_payment
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 13:52:00 +00:00
Bernat Exposito a2550ce128 export table payment
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 10:24:41 +01:00
Carlos Jimenez Ruiz 418774e5e0 Merge pull request '2605 - Ticket request send chat notification' (#500) from 2605-ticket_request_chat into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #500
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-08 09:07:17 +00:00
Carlos Jimenez Ruiz c623a5d1e4 Merge branch 'dev' into 2605-ticket_request_chat
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 09:00:23 +00:00
Joan Sanchez 88b2041fde Changed order
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 14:33:42 +01:00
Joan Sanchez 7172d6bcd1 Merge branch 'dev' into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 13:32:37 +00:00
Carlos Jimenez Ruiz 2a948ddc33 Merge pull request 'refactor tag fixtures' (#502) from 2707-fixtures_tag into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #502
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-07 12:43:37 +00:00
Bernat Exposito 779b229dfc refactor tag fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 12:11:14 +01:00
Bernat Exposito 490c05f8a9 Merge pull request 'export production' (#501) from 2704-export_production into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #501
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2021-01-07 07:50:57 +00:00
Bernat Exposito 81edd9e57d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2704-export_production
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 08:45:53 +01:00
Bernat Exposito 6179921978 export production
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 08:37:56 +01:00
Joan Sanchez e5b13267e2 2605 - Ticket request send chat notification
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 15:03:35 +01:00
Joan Sanchez 94c8c115e5 Font hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 13:51:17 +01:00
Bernat Exposito 57de04410f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 08:04:56 +01:00
Joan Sanchez 9aca59e47a CSS height fix
gitea/salix/pipeline/head This commit looks good Details
2021-01-04 14:16:12 +01:00
Carlos Jimenez Ruiz 11de5743b7 Merge pull request '2700 - Closure by multiple agencies' (#498) from 2700-closure_by_agency into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #498
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-04 10:58:26 +00: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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 11:53:50 +00:00
Carlos Jimenez Ruiz a867df7085 removed focus on describe and added translation
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 12:38:54 +01:00
Carlos Jimenez Ruiz bf53bff017 e2e amends
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 12:25:20 +01:00
Carlos Jimenez Ruiz 4e7d64e5ca re-enabled working unit test
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 11:17:42 +01:00
Carlos Jimenez Ruiz 0471855372 Merge branch 'dev' into 2696-geo_autocomplete
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 10:30:51 +01:00
Carlos Jimenez Ruiz 3b73e1bee2 supplier updateFiscalData changed to table config
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 10:28:35 +01:00
Carlos Jimenez Ruiz 4754d5481b added street arg to updateFiscalData method
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 09:17:55 +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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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