Commit Graph

3264 Commits

Author SHA1 Message Date
Carlos Jimenez 1136afa484 order refactor 2018-07-31 11:51:24 +02:00
gerard 21ab8a5573 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-31 11:27:01 +02:00
gerard 2355ecc66a translations added 2018-07-31 11:26:57 +02:00
Joan Sanchez 4103f7fcf6 Added sample create #440 2018-07-31 11:08:22 +02:00
Bernat 81c6546e96 update fixtures 2018-07-30 20:45:26 +02:00
Bernat 8e1ef327c2 add model ClaimDevelopment 2018-07-30 20:16:25 +02:00
Bernat c3956b2354 add model ClaimDevelopment 2018-07-30 15:41:02 +02:00
Bernat 1ec3777f4a update fixtures and fix test 2018-07-30 15:21:12 +02:00
gerard 564d4f63b8 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-30 14:46:09 +02:00
gerard 2d9edcef52 fixed wrong calls to functions 2018-07-30 14:46:04 +02:00
Bernat 23b7e5a0cc update fixtures and add new models for claim module 2018-07-30 14:10:09 +02:00
Carlos Jimenez d866e0c982 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-07-30 14:05:40 +02:00
Carlos Jimenez 7b7a0cc1e9 refactor para que funcione data bind en lineas de pedido 2018-07-30 14:05:27 +02:00
Joan Sanchez 182599f663 Fixed scroll on itemDIary to line with alertLevel 1 #433 2018-07-30 12:12:41 +02:00
gerard 0022e4e427 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-27 15:13:05 +02:00
gerard 97cbb4fb25 Iban validation for french clients desactivated 2018-07-27 15:13:01 +02:00
Joan Sanchez 66a1f8fcfa updated fonts 2018-07-27 14:50:28 +02:00
gerard ddc6b9d77e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-27 12:20:14 +02:00
gerard 38ba6bae7a Bug #453 Fallo al cambiar el estaddo de un ticket desde sale 2018-07-27 12:20:10 +02:00
Joan Sanchez bf5a48f126 added field longName to item summary and basic data #449 2018-07-27 12:15:25 +02:00
Joan Sanchez 23993ce717 updated model sample & clientSample 2018-07-27 11:18:27 +02:00
gerard f87ccee0b2 fixed bugs of client descriptor popover 2018-07-27 09:44:25 +02:00
gerard d2359af6ba added client descriptor popover to ticket descriptor 2018-07-26 14:02:23 +02:00
gerard fa9494fe03 added styles 2018-07-26 13:49:01 +02:00
gerard c3846eaaea Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-26 13:43:43 +02:00
gerard 333193f2e8 fixed descriptor size 2018-07-26 13:43:32 +02:00
Joan Sanchez 2042acac75 fixed translations 2018-07-26 12:25:25 +02:00
gerard 296508d216 Tarea #428 Componentizar descriptor de client 2018-07-26 12:06:53 +02:00
gerard d569c19a8a readded scope refresh 2018-07-26 09:16:33 +02:00
gerard 0f1227a47b removed dummy buttons 2018-07-26 09:12:25 +02:00
Joan Sanchez a05347d768 Order items list by isActive. #434 2018-07-26 07:46:25 +02:00
Bernat 4e2ff17121 add new models and fixtures 2018-07-25 20:47:07 +02:00
Joan Sanchez 2433d7684d Change page title #426 2018-07-25 15:14:03 +02:00
gerard a2de55fae5 Bug #437 Boton cancelar 2018-07-25 14:18:12 +02:00
gerard d6f3f22970 Bug #437 Boton cancelar 2018-07-25 13:37:27 +02:00
gerard 82b0323847 Bug #431 error con tickets sin foto 2018-07-25 11:37:15 +02:00
gerard f3ad02e28c order volume now imports fetched tags and item descriptor components 2018-07-25 11:30:44 +02:00
gerard b68f34d3d4 Tarea #427 mover create order de ticket a order 2018-07-24 13:48:31 +02:00
gerard 81dc09999f Tarea #406 order.volumen 2018-07-24 12:57:07 +02:00
gerard a7ec730216 bug with barcodes solved 2018-07-24 12:56:07 +02:00
gerard 73ed4d0d19 Tarea #406 order.volumen 2018-07-24 12:55:10 +02:00
gerard 9a66c950b7 bug with barcodes solved 2018-07-24 12:53:26 +02:00
gerard 446a503ee5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-24 12:22:54 +02:00
gerard a04b592633 padding added 2018-07-24 12:22:49 +02:00
Joan Sanchez bea6378f6a Change shipment date on landed data selection. #410 2018-07-24 12:14:35 +02:00
gerard dc60156277 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-24 11:36:28 +02:00
gerard 7e62f2afa7 excluded french TIN test as it has been disabled 2018-07-24 11:36:07 +02:00
Bernat 6b73a6392f update fixtures 2018-07-24 11:32:10 +02:00
gerard 6490234951 bug with order total solved 2018-07-24 11:28:20 +02:00
gerard 3dfa4bfc04 Bug #425 Split no funciona en produccion 2018-07-24 11:27:04 +02:00