Commit Graph

194 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 2358c94aae #1402 route.ticket 2019-05-15 13:07:32 +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
Joan Sanchez 0dbed4e102 fixed translation
gitea/salix/dev This commit looks good Details
2019-05-02 10:40:46 +02:00
Joan Sanchez a2fd8ddc8a buy requests translation & default order
gitea/salix/dev This commit looks good Details
2019-05-02 10:04:02 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Bernat bc005b2310 #1346 fix confirm.js and update item request
gitea/salix/dev This commit looks good Details
2019-04-18 11:02:28 +02:00
Carlos Jimenez Ruiz bafbd92802 Bug/Test #1331 cambio de rol
gitea/salix/dev This commit looks good Details
2019-04-17 08:21:58 +02:00
Carlos Jimenez Ruiz 9baa37b833 #1306 Renombrar controladores, rutas y carpetas 2019-04-16 14:30:01 +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
Joan Sanchez b3c00e5a29 updated td-editable styles #1313
gitea/salix/dev This commit looks good Details
2019-04-09 13:47:13 +02:00
Joan Sanchez 4f1a1ae004 Merge branch 'master' into dev 2019-04-09 13:19:34 +02:00
Joan Sanchez a6308c7f1e input-number refactor #1311
gitea/salix/master This commit looks good Details
2019-04-09 13:18:55 +02:00
Gerard 633ab28c41 #1315 item.ticketRequest
gitea/salix/dev This commit looks good Details
2019-04-05 15:20:12 +02:00
Gerard d7c063f389 removed unused binding 2019-04-05 09:27:43 +02:00
Joan Sanchez ccb2505896 Merge branch 'master' into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-03 12:58:59 +02:00
Joan Sanchez eea4f53151 removed field acl for buyer on item tags
gitea/salix/master This commit looks good Details
2019-04-03 12:58:30 +02:00
Joan Sanchez 0a0aa3853a Merge branch 'master' into dev
gitea/salix/dev This commit has test failures Details
2019-04-03 12:48:21 +02:00
Joan Sanchez 1e99a890e2 allow item tags for accessory role
gitea/salix/master This commit looks good Details
2019-04-03 12:47:51 +02:00
Joan Sanchez 5898d07822 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-01 09:02:13 +02:00
Joan Sanchez dfe1a68d35 fix ticket basic data allow change company #1277
gitea/salix/test This commit looks good Details
2019-04-01 09:01:11 +02:00
Gerard 164093af48 Merge branch 'test' into dev
gitea/salix/dev This commit has test failures Details
2019-04-01 08:43:22 +02:00
Gerard 034bd77d52 Date is visible always
gitea/salix/test This commit looks good Details
2019-04-01 08:42:19 +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
Gerard eaec968aa4 Now you can change the shipped hour of a ticket 2019-03-26 12:25:06 +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 5fcb9f61ab Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-13 16:09:14 +01:00
Gerard fd4fe288a5 has visible disabled temporally
gitea/salix/master This commit looks good Details
2019-03-13 12:03:06 +01:00
Gerard fb75ff0eae #1222 Activar log en el modulo ítem
gitea/salix/dev This commit looks good Details
2019-03-12 11:47:53 +01:00
Gerard 987fc1e4e3 tranlations added
gitea/salix/test This commit looks good Details
2019-03-11 08:40:35 +01:00
Gerard d1ce85c81e taxclass field temporally removed as it slows the query
gitea/salix/test This commit looks good Details
2019-03-08 13:46:33 +01:00
Gerard 720803facb #1220 item.index añadir campos a buscador avanzado
gitea/salix/test This commit looks good Details
2019-03-08 13:12:13 +01:00
Gerard 7d8879a979 deleted default query on item index 2019-03-08 07:52:43 +01:00
Gerard 32893b49c1 #1174 item.index buscador avanzado mostrar comprador 2019-03-05 12:13:46 +01:00
Gerard 00f9754c1e #1171 item.index mostrar campos medida y nicho
gitea/salix/dev This commit looks good Details
2019-03-05 12:03:34 +01:00
Gerard 1b2f851525 #1191 item not available icon added
gitea/salix/dev This commit has test failures Details
2019-03-04 20:00:12 +01:00
Gerard 9ef3eac480 #1136 item.buscador Avanzado añadir campo visible y isActive
gitea/salix/dev This commit looks good Details
2019-02-28 13:50:39 +01:00
Gerard 7dd08dc6e5 merge test
gitea/salix/dev This commit looks good Details
2019-02-28 10:19:31 +01:00
Gerard 87e8be0ede time filter changed by dateTime 2019-02-27 17:04:00 +01:00
Carlos Jimenez Ruiz c227784877 typoe fixed 2019-02-27 10:05:49 +01:00
Carlos Jimenez Ruiz 4b37b0fc1e #1155 item.index añadir grouping y packing
gitea/salix/dev This commit looks good Details
2019-02-25 14:55:06 +01:00
Gerard ea9d194368 traduction added
gitea/salix/test This commit looks good Details
2019-02-22 13:18:53 +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 c95b2d71d4 tag not closed correctly fixed
gitea/salix/test This commit looks good Details
2019-02-20 16:43:01 +01:00
Juan Ferrer 8c401b6921 Style fixes
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-02-20 14:38:41 +01:00
Juan Ferrer 8f1e41e744 Style fixes 2019-02-20 14:34:16 +01:00
Gerard 5d6951a610 deleted deprecated component
gitea/salix/dev There was a failure building this commit Details
2019-02-20 11:41:06 +01:00
Gerard efff9d2184 deleted duplicated data
gitea/salix/dev This commit looks good Details
2019-02-20 11:36:55 +01:00
Gerard 0f5d1e55c0 item descriptor not sending the correct warehouse fixed
gitea/salix/dev This commit looks good Details
2019-02-20 11:30:55 +01:00
Gerard 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +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
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 054cf21c1f item index fixes
gitea/salix/PR-10 This commit has test failures Details
2019-02-19 10:15:39 +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 2d2ce304b5 merge 2019-02-19 08:16:36 +01:00
Javi Gallego da4d961c8b Merge branch 'dev' into jgallego
gitea/salix/jgallego This commit has test failures Details
2019-02-18 13:35:33 +01:00
Javi Gallego a3e69d604a getAvailable aislado 2019-02-18 13:31:57 +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
Javi Gallego 58706b8694 backPreparado
gitea/salix/jgallego There was a failure building this commit Details
2019-02-18 07:57:15 +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
Javi Gallego 2b4f5984cc principio 1146 2019-02-15 16:04:24 +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 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 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
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
Carlos Jimenez Ruiz b0e22febd3 #1127 mover ticket.descriptor al modulo ticket 2019-02-12 09:03:56 +01:00
Carlos Jimenez Ruiz 82d59b544d removed unused fdescribe 2019-02-11 15:01:12 +01:00
Joan Sanchez 7365a1e001 updated delivery-note, fixed fallback locale 2019-02-11 10:06:26 +01:00
Juan Ferrer c0dd1624f6 Table style 2019-02-10 22:52:35 +01:00
Juan Ferrer f52d306db4 Color style unified 2019-02-08 17:49:51 +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 35bd82c9cb item summary fix & css report fixes 2019-02-06 10:53:12 +01:00
Gerard a605b8f9b7 #1065 item.last-entries 2019-02-05 16:53:55 +01:00
Gerard f59d022da8 #1078 risk.create 2019-02-05 16:46:02 +01:00
Gerard 48bb876bea Revert "#1012 claim.action"
This reverts commit 44893b57e7.
2019-02-05 16:42:28 +01:00
Gerard 44893b57e7 #1012 claim.action 2019-02-05 16:41:36 +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
Gerard a19745a3e3 Merge branch 'master' into test 2019-02-04 12:52:58 +01:00
Gerard 879c9b8877 #1093 ticket.descriptor ha dejado de funcionar en el modulo item 2019-02-04 12:24:47 +01:00