Commit Graph

10044 Commits

Author SHA1 Message Date
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
Javi Gallego cfc538d9bf npm i
gitea/salix/pipeline/head This commit looks good Details
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
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
Joan Sanchez e00d2d6e8f Merge branch 'dev' into 2685-create_test_e2e_entryObservation
gitea/salix/pipeline/head This commit looks good Details
2020-12-30 06:19:15 +00:00
Javi Gallego 0d5540b639 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #495
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-12-29 12:51:07 +00:00
Joan Sanchez edd25a347b Moved line
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 13:44:12 +01:00
Joan Sanchez 20862db854 2690 - Duplicated foreign key fix
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 13:39:10 +01:00
Joan Sanchez 2886e02328 Enabled loggable for locations
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 08:50:12 +01:00
Joan Sanchez f4ff31a294 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log 2020-12-29 08:09:49 +01:00
Joan Sanchez f29840b37b Buyer ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 07:52:36 +01:00
Carlos Jimenez Ruiz 4a60e1da1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation 2020-12-28 15:36:35 +01:00
Carlos Jimenez Ruiz e193c2998c Merge pull request '2665-route_index_multi_clone + e2e' (#492) from 2665-route_index_multi_clone into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #492
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-28 14:11:58 +00:00
Joan Sanchez 910caf5689 2661 - Added clone options
gitea/salix/pipeline/head This commit looks good Details
2020-12-28 14:53:26 +01:00
Carlos Jimenez Ruiz 67072f5c23 e2e path for route index now works focused and full run
gitea/salix/pipeline/head This commit looks good Details
2020-12-28 14:13:22 +01:00
Jorge Padawan 5af51763d6 Created back test field for entryObservation
gitea/salix/pipeline/head This commit looks good Details
2020-12-28 12:55:28 +01:00
Carlos Jimenez Ruiz 846117d3bd backend unit tests disabled for jenkins
gitea/salix/pipeline/head This commit looks good Details
2020-12-28 10:16:25 +01:00
Carlos Jimenez Ruiz f16eaf105b enabled back end unit tests for jenkins
gitea/salix/pipeline/head This commit has test failures Details
2020-12-28 09:46:33 +01:00
Carlos Jimenez Ruiz 0715f8ac81 now loopback reconects to db
gitea/salix/pipeline/head This commit looks good Details
2020-12-28 09:44:21 +01:00
Carlos Jimenez Ruiz 3f9446d94f e2e path updated + extension refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-24 16:48:56 +01:00
Carlos Jimenez Ruiz 68f2976c2d e2e path updated for clonation
gitea/salix/pipeline/head This commit looks good Details
2020-12-24 13:15:14 +01:00
Carlos Jimenez Ruiz e6106b1aa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2665-route_index_multi_clone
gitea/salix/pipeline/head This commit looks good Details
2020-12-24 11:31:27 +01:00
Carlos Jimenez Ruiz 8ede30398b clone feature for routes index 2020-12-24 11:31:20 +01:00
Joan Sanchez c192a0e125 Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #490
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-24 08:59:33 +00:00
Carlos Jimenez Ruiz 5696ada927 Merge pull request '2666 - Closure invalid email notification' (#489) from 2666-closure_invalid_email into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #489
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-12-23 12:38:29 +00:00
Jorge Padawan 259842c22d Retirado el parametro required por no utilizarse
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 13:32:58 +01:00
Jorge Padawan 3517bdea41 Añadido a las foreignKeys el valor UNIQUE 2020-12-23 13:31:55 +01:00
Joan Sanchez 87f9a39e50 Merge branch 'dev' into 2666-closure_invalid_email
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:29:36 +00:00
Joan Sanchez c740767599 Merge pull request 'fix searchbar index' (#491) from 2625-travel_index into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #491
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-23 11:51:10 +00:00
Bernat Exposito a21476e3df fix searchbar index
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:42:41 +01:00
Jorge Padawan 2948747da3 Seccion nueva, "Note" mas campo entryObservation
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:25:12 +01:00
Jorge Padawan a19064cb1b Nueva tabla entryObservation y he juntado la consulta de 1260-navidad con 1260-holydays 2020-12-23 12:23:37 +01:00
Juan Ferrer d064bc0417 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 00:00:38 +01:00