Commit Graph

9936 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 9deb518064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2057_e2e_address_create_custom_agent
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 09:55:05 +02:00
Carlos Jimenez Ruiz 9bf509cd5d customs agent e2e path + small fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 09:54:31 +02:00
Joan Sanchez e6c813b63a Merge pull request '2205 - Prevent relations to being logged in' (#281) from 2205-loggable_relations_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-28 06:30:28 +00:00
Joan Sanchez 5c3e8e9465 Added insert ignore
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 08:09:12 +02:00
Joan Sanchez a3e7771295 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2205-loggable_relations_fix 2020-05-28 08:08:00 +02:00
Joan Sanchez 0fe78a2b8f 2176 - Added contextmenu
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 08:07:26 +02:00
Joan Sanchez dfa6472fcf Merge pull request 'now we can create thermographs for travelThermograph' (#283) from 2269_thermograph_create into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-27 13:11:21 +00:00
Carlos Jimenez Ruiz a858e51aee removed unused code
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 14:54:54 +02:00
Carlos Jimenez Ruiz 296967ab4b fixed a front unit test with jest.fn() as spy 2020-05-27 14:54:29 +02:00
Carlos Jimenez Ruiz dfa74221dd added crud model to preload autocompletes on demand + e2e path done
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-27 14:34:34 +02:00
Carlos Jimenez Ruiz 2345a922c8 now we can create thermographs for travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 13:11:41 +02:00
Bernat Exposito Domenech f28f88a100 ticket summary invoiceOut popover
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 12:29:01 +02:00
Carlos Jimenez Ruiz 98157fc45a Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-27 07:10:27 +00:00
Bernat Exposito Domenech 89ce963a4c update db
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 08:35:24 +02:00
Bernat Exposito Domenech 8be929c1da log tiquet request 2020-05-27 08:07:14 +02:00
Joan Sanchez 8b9b65138c Merge pull request 'Change visible & available methods' (#278) from 2234-getVisibleAvailable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-27 05:44:08 +00:00
Joan Sanchez 6d94894b73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2234-getVisibleAvailable
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 07:24:33 +02:00
Joan Sanchez 3cd4ab086d Fix
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 15:49:20 +02:00
Joan Sanchez 8384918d9e Removed line
gitea/salix/pipeline/head This commit has test failures Details
2020-05-26 14:42:45 +02:00
Joan Sanchez d24f04912e 2205 - Prevent relations to being logged in
gitea/salix/pipeline/head This commit has test failures Details
2020-05-26 14:37:34 +02:00
Bernat Exposito Domenech 60d50afb2e fix traduction
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 12:20:06 +02:00
Joan Sanchez 731e411cf8 Merge pull request '2204-dbtest_zone_getEvents' (#280) from 2204-dbtest_zone_getEvents into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-26 10:16:05 +00:00
Bernat Exposito Domenech e515e5df7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2204-dbtest_zone_getEvents
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 12:08:01 +02:00
Bernat Exposito Domenech 41bf237289 dbtest zone_getEvent 2020-05-26 12:07:52 +02:00
Joan Sanchez 14251e5a0c Merge pull request '2262-catalog_remove_tag' (#276) from 2262-catalog_remove_tag into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-05-26 09:39:47 +00:00
Joan Sanchez 193a104552 Merge pull request '2274 - Added english translation' (#275) from 2274-delivery_note_translation into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-05-26 09:38:59 +00:00
Javi Gallego 5188f80da5 Merge branch 'dev' into 2234-getVisibleAvailable
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:47:48 +02:00
Bernat Exposito 26930c5091 Merge pull request 'test ticket_makecomponentupdate' (#277) from 2229-dbtest_ticket_componentMakeUpdate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-26 08:46:54 +00:00
Bernat Exposito Domenech e7fc70a4b4 add column in ticket split
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:43:53 +02:00
Javi Gallego d8871c0bce cr
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:37:52 +02:00
Bernat Exposito 17ef761ba4 Merge pull request '2226-item_last_entries' (#271) from 2226-item_last_entries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-05-26 07:59:17 +00:00
Bernat Exposito Domenech 9e85e8187c skipped
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 09:58:08 +02:00
Bernat Exposito Domenech a77467fb0e skip test
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 09:53:30 +02:00
Bernat Exposito Domenech 1de6b2bd77 test ticket_makecomponentupdate
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 09:28:41 +02:00
Joan Sanchez 23ec99d0f8 2274 - Added english translation
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 08:24:38 +02:00
Joan Sanchez 44160d2f3c Changed order
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 08:11:36 +02:00
Joan Sanchez 4d2d57d646 2265 Changes to filter
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 08:08:09 +02:00
Carlos Jimenez Ruiz d02655d4d3 Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-25 12:58:08 +00:00
Carlos Jimenez Ruiz 65432ef1ed Merge pull request '1490 - Don't update with empty value' (#274) from 1490-ticket_update_price into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-25 12:56:42 +00:00
Joan Sanchez 73a6148a77 2273 - Fixed transfer sales
gitea/salix/pipeline/head This commit looks good Details
2020-05-25 14:45:26 +02:00
Joan Sanchez d60f8721f1 1490 - Don't update with empty value
gitea/salix/pipeline/head This commit looks good Details
2020-05-25 13:49:24 +02:00
Joan Sanchez 2af39d4b67 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-05-25 07:43:24 +02:00
Joan Sanchez 4878c0dc46 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-25 07:25:21 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-22 15:20:55 +02:00
Carlos Jimenez Ruiz f4984c142f Merge pull request '2242-test' (#263) from 2242-test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-22 07:05:48 +00:00
Javi Gallego 0f718ad065 Merge branch 'dev' into 2242-test
gitea/salix/pipeline/head This commit looks good Details
2020-05-22 07:56:00 +02:00
Bernat Exposito b335eb4b1f Merge pull request 'fixed the intermitence of subtotal in the e2e path' (#270) from order_lines_e2e_fixed into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-05-21 13:26:04 +00:00
Bernat Exposito Domenech 8c2f57e380 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 15:26:04 +02:00
Bernat Exposito Domenech 52241e6f2c update itemLastENtries 2020-05-21 15:26:00 +02:00
Carlos Jimenez Ruiz d829ae02ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2263_e2e_zone_descriptor 2020-05-21 15:22:02 +02:00