gerard
|
c461f16ce7
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-01 16:09:10 +02:00 |
 Joan Sanchez
|
d83665a0c5
|
show itemDiary icon on ticket descriptor popover. #441 - CR Javi
|
2018-08-01 12:15:09 +02:00 |
Carlos Jimenez
|
b5356eb07d
|
spec files renamed accordingly, plus linter or indentation corrections
|
2018-08-01 09:47:34 +02:00 |
|
Joan Sanchez
|
c5269fedfa
|
updated fontello fonts
|
2018-07-31 14:41:42 +02:00 |
|
gerard
|
9ce117325c
|
when you create an order now redirects to order.card.catalogue
|
2018-07-31 14:08:41 +02:00 |
|
Carlos Jimenez
|
5aae572566
|
renamed spec files plus fixtures update for ticket basicdata #462 e2e
|
2018-07-31 13:49:54 +02:00 |
|
Carlos Jimenez
|
d2314b8a1b
|
renamed karma spec files acordantly and removed unused ones on client client
|
2018-07-31 12:38:31 +02:00 |
|
Carlos Jimenez
|
6684642f31
|
removed unused spec file
|
2018-07-31 12:15:31 +02:00 |
|
Carlos Jimenez
|
0fe58f78b4
|
added a describe to help further implementation
|
2018-07-31 12:00:44 +02:00 |
|
Carlos Jimenez
|
6f78bc61db
|
added separation between describes
|
2018-07-31 11:54:54 +02:00 |
|
Carlos Jimenez
|
1858cea710
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-07-31 11:51:35 +02:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
6490234951
|
bug with order total solved
|
2018-07-24 11:28:20 +02:00 |
|
gerard
|
ff6d86f6c2
|
bug with filter solved
|
2018-07-24 10:47:00 +02:00 |
|
Joan Sanchez
|
896c033594
|
added order catalogue #408
|
2018-07-24 09:35:23 +02:00 |
|
gerard
|
5d64376212
|
rollback
|
2018-07-23 14:45:01 +02:00 |
|
gerard
|
17e1bd351c
|
Tarea #401 Links con texto subrayado
|
2018-07-23 10:59:49 +02:00 |