Commit Graph

226 Commits

Author SHA1 Message Date
Juan Ferrer 4e4919c1e2 Agency fixes & exclusion with left calendar 2019-10-01 13:45:43 +02:00
Joan Sanchez e55b8b7b6b precio por kilo #1690
gitea/salix/dev This commit looks good Details
2019-09-23 14:41:54 +02:00
Juan Ferrer afb06dd4a5 #1167 Fixed
gitea/salix/dev There was a failure building this commit Details
2019-09-19 12:32:34 +02:00
Carlos Jimenez Ruiz b12d0388c9 #1074 Undo changes button for forms 2019-09-18 09:41:25 +02:00
Carlos Jimenez Ruiz 206dec59a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz 2251fb65ad #1615 migrar karma a jest 2019-09-13 16:09:14 +02:00
Joan Sanchez e16d43b2fc Allow disable log on model properties
gitea/salix/dev This commit looks good Details
2019-09-12 09:49:02 +02:00
Joan Sanchez 9bf54f34dd Added fruit translation
gitea/salix/dev This commit looks good Details
2019-09-12 07:26:15 +02:00
Joan Sanchez 176750046a Scroll component #643
gitea/salix/dev This commit looks good Details
2019-09-05 13:06:40 +02:00
Carlos Jimenez Ruiz b9234fc1a8 #1642 order.summary en el descriptor 2019-08-29 13:16:38 +02:00
Bernat b749cb80df Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good Details
2019-08-13 07:45:29 +02:00
Bernat f05f3a3df7 Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good Details
2019-08-12 14:58:46 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598
gitea/salix/dev This commit looks good Details
2019-08-08 08:37:03 +02:00
Bernat fa4fd15450 Tarea #1573 order.catalog No deben de mostrar familias vacias 2019-08-07 07:27:00 +02:00
Carlos Jimenez Ruiz fc80848506 merge 2019-07-03 14:40:53 +02:00
Carlos Jimenez Ruiz ea5cbf634b #1392 order.catalog 2019-07-03 14:39:08 +02:00
Bernat 82a1d00b0c Tarea #1516 order.index buscador avanzado añadir mi equipo
gitea/salix/dev This commit looks good Details
2019-07-03 14:06:27 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00
Bernat 798d4063ea fix karma test
gitea/salix/dev This commit looks good Details
2019-06-03 12:41:57 +02:00
Bernat fa7b79b1c8 Bug/Test #1491, #1500 refactor new.js
gitea/salix/dev There was a failure building this commit Details
2019-06-03 10:05:22 +02:00
Javi Gallego e01765e34e test back-front fixed
gitea/salix/test This commit looks good Details
2019-05-30 08:41:08 +02:00
Carlos Jimenez Ruiz 027602e18a #1476 ticket.Sale check all checkbox
gitea/salix/dev This commit looks good Details
2019-05-27 15:10:57 +02:00
Javi Gallego 3776e0588c merge paso 1 2019-05-23 13:05:02 +02:00
Carlos Jimenez Ruiz ed14f94fd6 small amends
gitea/salix/dev This commit has test failures Details
2019-05-15 08:33:27 +02:00
Joan Sanchez 5cc78ce5ac ticket & order index fixes #1422 & #1423
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-05-14 08:14:37 +02:00
Joan Sanchez 790577acaf ticket & order index fixes #1422 & #1423
gitea/salix/dev This commit has test failures Details
2019-05-14 08:13:04 +02:00
Joan Sanchez eae6a6f43c show spinner on load for table & catalog components #1424
gitea/salix/dev This commit looks good Details
2019-05-10 14:42:46 +02:00
Bernat 83898c9ba7 1354 refactor item-descriptor-popover
gitea/salix/dev This commit looks good Details
2019-05-07 11:32:35 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Joan Sanchez 00c11a95c6 fixed catalog filter bugs #1352
gitea/salix/dev This commit looks good Details
2019-04-24 09:21:24 +02:00
Joan Sanchez 76269a8a16 added drag & drop directives on worker department #1319
gitea/salix/dev This commit has test failures Details
2019-04-23 08:29:23 +02:00
Joan Sanchez 842101e239 fixed catalog price popover
gitea/salix/dev This commit looks good Details
2019-04-16 12:11:06 +02:00
Bernat dbe56b2496 #1330 add info in the search panel
gitea/salix/dev This commit has test failures Details
2019-04-12 14:33:08 +02:00
Gerard 00b7442b89 #1247 reparar tests excluidos
gitea/salix/dev This commit looks good Details
2019-04-05 07:52:08 +02:00
Joan Sanchez 8db51fdf64 added shrink class to item index #1278
gitea/salix/dev This commit looks good Details
2019-03-29 08:01:15 +01:00
Joan Sanchez 2ca5def095 build english locale on dist directory #1268
gitea/salix/dev This commit looks good Details
2019-03-26 12:05:53 +01:00
Joan Sanchez 3df5f4cae9 replaced numeric fields with input-number #1138 2019-03-26 07:29:45 +01:00
Joan Sanchez 4a4b997e1b added subName to fetched-tags #1246
gitea/salix/dev This commit looks good Details
2019-03-22 15:05:15 +01:00
Gerard e23a184166 styles added 2019-03-22 11:56:21 +01:00
Carlos Jimenez Ruiz b165f0d06b removed unexpected fdescribe
gitea/salix/dev There was a failure building this commit Details
2019-03-14 08:29:35 +01:00
Joan Sanchez 12308de5d1 catalog filter by item id #1219
gitea/salix/dev This commit looks good Details
2019-03-13 15:09:10 +01:00
Carlos Jimenez Ruiz 17654ef71e #1183 Crear enlace a client summary en /order/descriptor
gitea/salix/dev This commit looks good Details
2019-03-05 12:37:43 +01:00
Gerard d6683918bb #1165 Añadir al buscador avanzado de order la búsqueda por ticket
gitea/salix/dev This commit looks good Details
2019-03-04 16:06:41 +01:00
Gerard 2f7c544c52 changed showfield of salesperson autocomplete
gitea/salix/dev This commit looks good Details
2019-03-05 12:25:37 +01:00
Gerard 7dd08dc6e5 merge test
gitea/salix/dev This commit looks good Details
2019-02-28 10:19:31 +01:00
Joan Sanchez 4729dda5f6 isDefaultAddress to defaultAddressFk migration #1108
gitea/salix/dev This commit looks good Details
2019-02-28 08:55:34 +01:00
Gerard 87e8be0ede time filter changed by dateTime 2019-02-27 17:04:00 +01:00
Carlos Jimenez Ruiz 048c5c2ad8 #1104 order.index mostar mas campos
gitea/salix/dev This commit looks good Details
2019-02-27 12:03:54 +01:00
Juan Ferrer c3f20dba3c Small fix
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-02-22 17:23:03 +01:00
Juan Ferrer 26419e75c9 Style fixes
gitea/salix/test This commit looks good Details
2019-02-22 16:15:54 +01:00
Juan Ferrer 9fc6a2c4c2 Style fixes 2019-02-22 14:34:11 +01:00
Gerard c590dc6270 traduction added
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-02-21 14:08:32 +01:00
Carlos Jimenez Ruiz 413d2f2855 merge
gitea/salix/dev This commit has test failures Details
2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz 050c5c1126 #1131 Refactor vn-icon a vn-icon-button en las templates. 2019-02-21 11:40:27 +01:00
Gerard 03e168739b updated icons
gitea/salix/test This commit looks good Details
2019-02-21 10:17:13 +01:00
Gerard 23e08331fc fetched tags not sowing title and displaying wrong fixed
gitea/salix/dev This commit looks good Details
2019-02-20 12:12:16 +01:00
Carlos Jimenez Ruiz 250bb359e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-19 18:00:07 +01:00
Carlos Jimenez Ruiz 7d2bc25c95 #1142 order.line total 2019-02-19 17:55:19 +01:00
Gerard 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +01:00
Gerard e041cef586 vn-empty-rows deleted as its not longer needed 2019-02-19 16:11:57 +01:00
Joan Sanchez d11a51b3f1 added color filter #1041
gitea/salix/dev This commit looks good Details
2019-02-19 15:13:27 +01:00
Gerard b7db5f969b fixed worker descriptor not showing the correct worker
gitea/salix/dev This commit looks good Details
2019-02-19 15:09:50 +01:00
Javi Gallego a0cf617cca #498 e2e arreglado
gitea/salix/jgallego This commit looks good Details
2019-02-19 08:42:36 +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
Carlos Jimenez Ruiz b034a8fab7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-15 15:33:11 +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 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
Joan Sanchez 7f96eae312 $applyAsync() with relocate() on catalog. Replaced $$postDigest() #1072 2019-02-13 07:57:08 +01:00
Gerard 5187a7e15b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-11 09:02:26 +01:00
Gerard b38aa57894 order line not redirecting correctly to ticket index fixed 2019-02-11 09:02:09 +01:00
Juan Ferrer c0dd1624f6 Table style 2019-02-10 22:52:35 +01:00
Juan Ferrer 20382b2b14 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-08 17:49:53 +01:00
Juan Ferrer f52d306db4 Color style unified 2019-02-08 17:49:51 +01:00
Gerard 0aefe73379 #1032 order.index buscador avanzado no se puede buscar a carlos lopez 2019-02-08 15:07:18 +01:00
Javi Gallego 6e421d8442 Tarea #808 order.basic-data cr juan 2019-02-06 14:56:36 +01:00
Juan Ferrer 2bf9244770 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 11:24:31 +01:00
Juan Ferrer 03406a7d9b Style fixes 2019-02-06 11:24:29 +01:00
Joan Sanchez fa47c15d7a catalog item type dropdown show limit #1041 2019-02-05 11:31:30 +01:00
Joan Sanchez 353dc38e48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-05 11:08:04 +01:00
Juan Ferrer 1355fb80e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-05 09:47:45 +01:00
Gerard 8f575fbc45 strings added to the locale 2019-02-05 09:37:01 +01:00
Gerard 6c2fe1d4a3 #1036 order.line 2019-02-05 09:27:01 +01:00
Joan Sanchez d87e2dbbf0 fixed order item category filter #1079 2019-02-05 09:21:29 +01:00
Juan Ferrer 8f72fbad23 Merge 2019-02-05 09:14:22 +01:00
Juan Ferrer 1dbb75a1b8 vnSideMenu, vnBackground, style fixes 2019-02-05 09:13:15 +01:00
Joan Sanchez bce67487c1 catalog filter requery fix #1034 2019-02-04 15:21:10 +01:00
Juan Ferrer 84c0002cb1 Hot bugs fixed 2019-02-01 17:11:14 +01:00
Carlos Jimenez Ruiz d109e480a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-31 14:14:52 +01:00
Carlos Jimenez Ruiz 00ccf9a4a0 #1069 mostrar el nickname en los sitios donde aparezca nombre solo 2019-01-31 14:14:39 +01:00
Joan Sanchez 1bcaf27563 changed currency filter, fixed tag value errors 2019-01-31 11:44:03 +01:00
Gerard aac96f4b87 #1080 fallos de estilos en order prices-popover 2019-01-31 11:26:03 +01:00
Juan Ferrer f643261a85 Styles fixed, change language moved to user config popover 2019-01-31 00:33:43 +01:00
Juan Ferrer 1dc8cafc73 Style & translation fixes 2019-01-30 23:47:06 +01:00
Carlos Jimenez Ruiz f4e202dc62 #1069 index now show nicknames 2019-01-30 15:10:52 +01:00
Juan Ferrer 259079b051 Translations fixed 2019-01-30 14:13:47 +01:00
Juan Ferrer 3e40c651af #998 worker.index 2019-01-28 16:24:45 +01:00
Juan Ferrer ce99ab64bd #1058 Fixed 2019-01-28 10:04:08 +01:00
Juan Ferrer 317102b612 Section titile in topbar, responsive 2019-01-28 00:26:01 +01:00
Juan Ferrer af5ab770ec More cleaning, deps in routes.json, module autodetection 2019-01-26 02:30:46 +01:00
Joan Sanchez 5bf430400d show results count #992 2019-01-23 11:08:27 +01:00
Carlos Jimenez Ruiz 5f850e76e2 #884 e2e claim.detail + bug fixes en autocompleteSearch extension 2019-01-22 13:18:20 +01:00
Juan Ferrer 09811d322a Descriptor style fixes 2019-01-21 15:21:24 +01:00
Juan Ferrer 6e43b11e16 Left menu fixed 2019-01-20 18:48:03 +01:00
Juan Ferrer 2df9579f2c Summary style fixes 2019-01-20 16:47:04 +01:00
Joan Sanchez 9cb298fb08 modules summary were not updating view data #978 2019-01-18 14:04:12 +01:00
Gerard cb650bbdbc added missing locale 2019-01-18 13:38:18 +01:00
Gerard 0c0a465784 descriptor not showing correctly fixed 2019-01-17 11:11:45 +01:00
Gerard 60c368baa2 fixed typo 2019-01-14 15:04:30 +01:00
Gerard a32b1ba71e temporally excluded test 2019-01-14 15:03:51 +01:00
Gerard 80fbd14c78 test temporally excluded 2019-01-14 15:01:35 +01:00
Gerard 8633f76017 fdescribe deleted 2019-01-14 14:59:50 +01:00
Gerard 8d0366e7bf test fixed 2019-01-14 14:59:14 +01:00
Gerard 1d5cd1c86d #960 order.line bugs solved 2019-01-14 11:35:48 +01:00
Gerard 100871edf6 clients autocompletes now order by id 2019-01-11 08:03:36 +01:00
Gerard 7f745de314 #927 order.basic-data 2019-01-07 16:53:34 +01:00
Gerard 007516b0cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-07 16:28:24 +01:00
Gerard 650becf455 #945 en salix no se pueden modificar los consignatarios antiguos 2019-01-07 16:28:18 +01:00
Joan 6cffc0f633 fixed order catalog item category 2019-01-07 15:08:05 +01:00
Juan Ferrer 9cdfe0c5d9 #814 First stable version 2018-12-27 12:54:16 +01:00
Juan Ferrer f2fc5b6b2b #841 Client modules mixed with service modules 2018-12-22 11:59:26 +01:00