Commit Graph

10332 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz b28b9be3d8 Merge branch 'dev' into 2708-travel_extracommunity 2021-01-19 13:51:58 +00:00
Joan Sanchez 3625ea2c36 Updated delivery note with botanical field 2021-01-19 14:43:40 +01:00
Joan Sanchez bbfb230427 Removed clog 2021-01-19 14:30:06 +01:00
Joan Sanchez 9935f7f4ee Updated unit test 2021-01-19 14:27:58 +01:00
Joan Sanchez 6d35a4a160 1823 - Added independent order object from card 2021-01-19 13:57:04 +01:00
Bernat Exposito e9f408d5ba delete comments 2021-01-19 13:44:14 +01:00
Carlos Jimenez Ruiz 4f7c2f3afd added placeholder and fixed css 2021-01-19 13:30:07 +01:00
Joan Sanchez dfbf114161 Merge branch 'dev' into 2708-travel_extracommunity 2021-01-19 12:10:06 +00:00
Joan Sanchez 8c8891f8e3 Requested changes 2021-01-19 13:06:10 +01:00
Bernat Exposito 426249f9bf entry index changes 2021-01-19 12:50:11 +01:00
Javi Gallego e47e5b9ec4 merged carpetas de cambios 2021-01-19 11:32:47 +01:00
Joan Sanchez 5c4dd027d3 Updated e2e 2021-01-19 11:25:05 +01:00
Carlos Jimenez Ruiz e859a1b837 removed incorrect icon 2021-01-19 11:14:43 +01:00
Carlos Jimenez Ruiz 8e789126cc renamed a selector 2021-01-19 10:53:37 +01:00
Joan Sanchez 727fcddc3d Merge pull request 'Delete description from thermograph create' (#514) from 2678-Delete_description_on_travel_thermograph into dev
Reviewed-on: #514
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-01-19 09:44:17 +00:00
Javi Gallego 043a74b548 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-19 10:20:45 +01:00
Joan Sanchez b99ac2c9d5 Merge branch 'dev' into 2678-Delete_description_on_travel_thermograph 2021-01-19 08:51:38 +00:00
Javi Gallego 49b0bca721 refactor autocomplete 2021-01-19 09:27:15 +01:00
Jorge Padawan aea07832b1 Delete description from thermograph create 2021-01-19 09:24:37 +01:00
Carlos Jimenez Ruiz ea6b7cd9e8 worker calendar e2e fix 2021-01-18 19:11:29 +01:00
Carlos Jimenez Ruiz 464366fdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz 52a1e3f652 fixed price controller tests 2021-01-18 16:32:54 +01:00
Carlos Jimenez Ruiz 3ec641f733 filter unit tests 2021-01-18 15:42:38 +01:00
Joan Sanchez d6ac9dba4c Updated e2e 2021-01-18 14:53:15 +01:00
Joan Sanchez 895fd4c9e8 Updated unit test 2021-01-18 14:22:27 +01:00
Carlos Jimenez Ruiz 8d6dd3e03a minor refactors 2021-01-18 14:17:01 +01:00
Carlos Jimenez Ruiz 3251d737e6 fixed price index implementation 2021-01-18 14:16:39 +01:00
Carlos Jimenez Ruiz e4c5ebf615 Merge pull request '2724 - Fix: Create new service type' (#511) from 2724-ticket_service_fix into dev
Reviewed-on: #511
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-18 13:03:26 +00:00
Joan Sanchez b142d5800e Merge branch 'dev' into 2724-ticket_service_fix 2021-01-18 11:24:11 +00:00
Jorge Benedito 3b5565f0b6 Merge pull request 'Add column multiplier on item section' (#512) from 2721-Add_column_stem_multiplier into dev
Reviewed-on: #512
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2021-01-18 11:00:28 +00:00
Jorge Benedito 622c43f4a0 Merge branch 'dev' into 2721-Add_column_stem_multiplier 2021-01-18 10:53:49 +00:00
Jorge Padawan 97c8faaf50 Add column multiplier on item section 2021-01-18 11:43:48 +01:00
Joan Sanchez 239e64db48 Updated unit test 2021-01-18 09:08:50 +01:00
Joan Sanchez 783a8dee48 2724 - Fix: Create new service type 2021-01-18 08:55:57 +01:00
Bernat Exposito 61c18f09e2 Merge pull request 'entry search panel changes' (#510) from 2602-entry_index_searchBar into dev
Reviewed-on: #510
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-18 07:48:25 +00:00
Joan Sanchez ddf5993277 2708 - Added report 2021-01-18 08:33:20 +01:00
Bernat Exposito 7da3aad2de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2602-entry_index_searchBar 2021-01-18 08:19:20 +01:00
Bernat Exposito 25535576c5 pr changes resolved 2021-01-18 08:19:17 +01:00
Jorge Padawan fe6124b691 Put log in the section 2021-01-15 13:57:36 +01:00
Jorge Padawan 51627af395 Fixed open popup 2021-01-15 13:13:51 +01:00
Jorge Padawan c5ace0a939 create the tests fields for create Account section 2021-01-15 11:24:32 +01:00
Jorge Padawan daa8bafb09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-15 08:56:20 +01:00
Joan Sanchez 8fed9dacd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-14 13:56:35 +01:00
Joan Sanchez efb0d2f380 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-01-14 13:42:09 +01:00
Joan Sanchez 53e80d29c8 Consumption hotfix 2021-01-14 13:41:50 +01:00
Bernat Exposito a45a76018b entry search panel changes 2021-01-14 09:26:50 +01:00
Joan Sanchez 33289b3ac1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-13 11:18:02 +01:00
Joan Sanchez 946d0e8209 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-01-13 11:05:48 +01:00
Joan Sanchez 0e9160f61b Letter debtor hotfix 2021-01-13 11:05:30 +01:00
Joan Sanchez 0079d31b34 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-01-13 10:47:27 +01:00