Commit Graph

292 Commits

Author SHA1 Message Date
Gerard 5ef524559e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-19 12:59:58 +01:00
Gerard abfbf791f3 added one time bindings 2019-02-19 12:50:24 +01:00
Carlos Jimenez Ruiz ff415dc654 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-19 12:14:27 +01:00
Gerard Miguel 12337d6bcf Merge branch 'test' of gerard/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-19 10:42:40 +00:00
Gerard 280803f2ad tests updated
gitea/salix/PR-11 This commit looks good Details
gitea/salix/PR-12 This commit looks good Details
2019-02-19 11:17:08 +01:00
Gerard 054cf21c1f item index fixes
gitea/salix/PR-10 This commit has test failures Details
2019-02-19 10:15:39 +01:00
Carlos Jimenez Ruiz 2d2ce304b5 merge 2019-02-19 08:16:36 +01:00
Joan Sanchez 75053618a2 zoneLocation order
gitea/salix/dev This commit looks good Details
2019-02-18 13:39:48 +01:00
Joan Sanchez 813d7368f3 fixed zoneLocation order 2019-02-18 13:37:36 +01:00
Joan Sanchez 0ea161ff19 fixed zoneLocation search
gitea/salix/dev This commit looks good Details
2019-02-18 13:23:24 +01:00
Gerard 3adc035cab #1121 worker.descriptor 2019-02-18 12:54:33 +01:00
Gerard f5759f131b #1145 item diary no va a la linea actual
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-02-18 09:50:46 +01:00
Gerard 13473e7bec #1145 item diary no va a la linea actual 2019-02-18 09:50:09 +01:00
Joan Sanchez 5eb4eb2e79 Merge branch 'dev' into test
gitea/salix/dev There was a failure building this commit Details
gitea/salix/test Something is wrong with the build of this commit Details
2019-02-18 08:38:14 +01:00
Joan Sanchez 3b0d003322 treeview refactor & zone #1140
gitea/salix/dev This commit looks good Details
2019-02-18 08:37:26 +01:00
Carlos Jimenez Ruiz 4186fbacb3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-16 17:15:03 +01:00
Joan Sanchez 42e3fede23 fixed ng-repeat transition 2019-02-15 17:33:03 +01:00
Gerard cb9e2284eb styles, imports of titles and traductions added 2019-02-15 17:30:22 +01:00
Carlos Jimenez Ruiz b034a8fab7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-15 15:33:11 +01:00
Gerard 8bed065f62 My team checkbox now has three states 2019-02-15 13:59:44 +01:00
Gerard b01f401286 Merge branch 'dev' into jgallego 2019-02-15 13:33:24 +01:00
Javi Gallego 32cc39ad00 order.json regularizados campos addressFk, agencyModeFk 2019-02-15 13:26:49 +01:00
Javi Gallego 7f7f47d861 bug no results duplicado 2019-02-15 13:25:23 +01:00
Carlos Jimenez Ruiz d6a8cd68d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-15 13:19:21 +01:00
Javi Gallego 8bea3afbfb karma reparado 2019-02-15 13:13:23 +01:00
Carlos Jimenez Ruiz 3ab0b2eb19 merge 2019-02-15 12:43:18 +01:00
Carlos Jimenez Ruiz 92a645f395 #1122 + worker descriptor popover + small refactors for worker.nickname 2019-02-15 12:39:21 +01:00
Gerard 4f851c9eed #1111 poder buscar pedidos confirmados o sin confirmar 2019-02-15 11:05:14 +01:00
Gerard 90a4e5a7d1 #1144 fixed bugs with $destroy 2019-02-15 11:03:27 +01:00
Gerard db6a5cfc3e changed hide for on-hide binding 2019-02-14 20:18:10 +01:00
Gerard 1144a197a5 #1112 ticket.sale 2019-02-14 12:06:14 +01:00
Gerard 16f92ce646 changed Type traduction 2019-02-14 12:05:46 +01:00
Gerard f7968ff15b tests fixed 2019-02-14 11:41:06 +01:00
Gerard 9c439e9a92 added category to item search panel 2019-02-14 11:24:04 +01:00
Gerard 2a48e183e9 information added to the table 2019-02-14 09:59:54 +01:00
Juan Ferrer f3e3c1bbae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 14:01:38 +01:00
Juan Ferrer 1f759b6b8c Style fixes 2019-02-13 14:01:37 +01:00
Bernat df452ff345 merge 2019-02-13 13:28:02 +01:00
Bernat bbd4188695 #9848 fix test and update fixtures 2019-02-13 13:19:15 +01:00
Gerard b93e2f5359 #1114 item.regularize 2019-02-13 09:49:41 +01:00
Gerard 5063bd8137 #1128 item.index 2019-02-13 09:27:11 +01:00
Carlos Jimenez Ruiz fb4a4cd3de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 08:19:44 +01:00
Joan Sanchez 7f96eae312 $applyAsync() with relocate() on catalog. Replaced $$postDigest() #1072 2019-02-13 07:57:08 +01:00
Juan Ferrer d65a6fd59e Ticket summary fix: lines with no claim 2019-02-12 15:39:37 +01:00
Carlos Jimenez Ruiz 3a5b5096da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 14:40:22 +01:00
Carlos Jimenez Ruiz 9c0613e8e7 #1127 2019-02-12 14:40:13 +01:00
Gerard 5b50bbd5d0 Merge branch 'test' into dev 2019-02-12 14:36:24 +01:00
Gerard 208936f979 Merge branch 'master' into test 2019-02-12 14:29:45 +01:00
Gerard 41d950eaef hotfix errors creting tickets 2019-02-12 14:23:04 +01:00
Carlos Jimenez Ruiz 8ef6db9017 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 13:33:21 +01:00