Commit Graph

9936 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz f1a37ba6db fixed the intermitence of subtotal in the e2e path
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 15:12:11 +02:00
Joan Sanchez ce43c1f2d9 Merge pull request '2264-travel_summary' (#265) from 2264-travel_summary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-21 12:27:14 +00:00
Joan Sanchez 9a43dff1fd Removed console.log()
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 14:22:22 +02:00
Joan Sanchez 9a0c9d3da2 2262 Remove filter by id from searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 14:18:24 +02:00
Joan Sanchez aa95a9f984 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 12:33:01 +02:00
Joan Sanchez a7cd7b582d Merge pull request 'Removed fetchSelection()' (#269) from 2225-no_autocomplete_filled into test
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 10:27:00 +00:00
Joan Sanchez 03c9b7ffa6 Removed fetchSelection()
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 12:15:41 +02:00
Joan Sanchez 9156fccd86 Merge pull request '2225 Prevent location override' (#268) from 2225-no_autocomplete_filled into test
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 09:35:19 +00:00
Joan Sanchez d082f5d6c2 2225 Prevent location override
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 11:14:34 +02:00
Joan Sanchez 10049fa8a2 Merge pull request '1791_dreprecate_boot-salixjs' (#266) from 1791_dreprecate_boot-salixjs into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-21 08:50:47 +00:00
Carlos Jimenez Ruiz 245827e8d5 corrected a typo
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 09:28:50 +02:00
Carlos Jimenez Ruiz 4df8d78a4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1791_dreprecate_boot-salixjs 2020-05-21 09:25:19 +02:00
Carlos Jimenez Ruiz 44cd2f743f updated the modelInfo route for the tests
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 09:23:44 +02:00
Carlos Jimenez Ruiz d299f455d6 boot/salix.js deprecated
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-21 09:06:02 +02:00
Joan Sanchez 80a5200281 Unified sql
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 17:03:29 +02:00
Carlos Jimenez Ruiz 80e32e1c5c zone descriptor path 2020-05-20 16:34:53 +02:00
Joan Sanchez f6efa7160e 2141 ReplyTo param
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-20 16:23:53 +02:00
Bernat Exposito Domenech d4dd5eae0c update fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 14:06:51 +02:00
Bernat Exposito Domenech 8ca12d9fdd fix bugs in travel summary 2020-05-20 13:19:02 +02:00
Carlos Jimenez Ruiz 0000ac4343 Merge pull request 'skip dbTest until the procedure works fine' (#264) from 2260-fix_dbtest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 09:14:41 +00:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech bf9ebe21b6 comment test skipped
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 10:38:11 +02:00
Bernat Exposito Domenech a0f5f073a5 fix order traduction
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 10:26:29 +02:00
Bernat Exposito Domenech d729efb761 searchbar fix
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 09:03:47 +02:00
Bernat Exposito Domenech 4133021e5c fix translate on plural
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 08:52:20 +02:00
Bernat Exposito Domenech 84f804eaf4 skip dbTest until the procedure works fine
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 14:42:32 +02:00
Joan Sanchez dbd23f4880 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-19 13:52:09 +02:00
Juan Ferrer 1892447b60 Merge pull request '1882-descriptorRefactor' (#250) from 1882-descriptorRefactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-05-19 11:15:20 +00:00
Javi Gallego 670c5936ce test2
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 13:11:22 +02:00
Javi Gallego 529bd5673c test
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 13:06:59 +02:00
Juan Ferrer 78cf144783 Merge branch 'dev' into 1882-descriptorRefactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 12:53:03 +02:00
Juan Ferrer 9d5395ac25 Focus removed
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-05-19 12:51:48 +02:00
Juan Ferrer ad1c677280 Test focus removed & fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-05-19 12:50:43 +02:00
Bernat Exposito bbe5436350 Merge pull request '2194_e2e_order_index_empty_filter' (#262) from 2194_e2e_order_index_empty_filter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-05-19 10:38:01 +00:00
Juan Ferrer c998097ba1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 12:30:00 +02:00
Javi Gallego 3774d1dd1f Merge branch 'dev' into 2242-test 2020-05-19 12:22:47 +02:00
Javi Gallego 692af6078c Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-05-19 10:21:33 +00:00
Javi Gallego ff03133277 test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-19 12:21:02 +02:00
Carlos Jimenez Ruiz 5e15321749 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2194_e2e_order_index_empty_filter
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 11:49:25 +02:00
Carlos Jimenez Ruiz 321aa827c2 created order.index showEmpty filter path
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 11:49:09 +02:00
Juan Ferrer e7cf060e12 Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:51:50 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:27:22 +02:00
Juan Ferrer d7f2e686b1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 09:28:50 +02:00
Javi Gallego a7e6e3d4b7 cr juan
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 08:46:42 +02:00
Bernat Exposito 5f8a2a24f5 Merge pull request '2246-claim_sorted_states' (#258) from 2246-claim_sorted_states into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-05-19 06:42:07 +00:00
Joan Sanchez 6c49fc9b1c Merge pull request 'client descriptor add risk' (#257) from 2250-client_descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-19 06:26:17 +00:00
Joan Sanchez af0d0f1fbe Merge pull request '2238-ticket_summary_invoiceOut' (#255) from 2238-ticket_summary_invoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-19 06:18:23 +00:00
Bernat Exposito Domenech f9bc1406e2 delete css
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 08:14:44 +02:00
Joan Sanchez 73035c5d65 Merge pull request 'fixed list sales e2e path' (#259) from 1865_fix_e2e_sales_list into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-18 15:04:36 +00:00
Carlos Jimenez Ruiz 8cfa6df99c fixed list sales e2e path
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 16:53:48 +02:00