merge

client/ticket/src/locale/es.yml

@@ -35,3 +35,5 @@ Tickets: Tickets
 Tracking: Revisión
 Worker: Trabajador
 Created : Añadido
+Sale checked: Control clientes
+Is checked: Comprobado

client/ticket/src/tracking/edit/edit.html

@@ -1,4 +1,4 @@
-<mg-ajax path="/ticket/api/TicketTrackings/" options="vnPost"></mg-ajax>
+<mg-ajax path="/ticket/api/TicketTrackings" options="vnPost"></mg-ajax>
 <vn-watcher
     vn-id="watcher"
     data="$ctrl.ticket"
@@ -9,7 +9,8 @@
     <vn-card pad-large>
         <vn-title>New state</vn-title>
         <vn-horizontal>
-            <vn-autocomplete vn-one
+            <vn-autocomplete
+            vn-one
             field="$ctrl.ticket.stateFk" 
             url="/ticket/api/States"
             label="State"

client/ticket/src/tracking/index.html

@@ -4,8 +4,8 @@
     <vn-vertical>
         <vn-title>Tracking</vn-title>
         <vn-grid-header on-order="$ctrl.onOrder(field, order)">
-            <vn-column-header vn-one pad-medium-h field="state.name" text="State"></vn-column-header>
-            <vn-column-header vn-two pad-medium-h field="employee" text="Employee"></vn-column-header>
+            <vn-column-header vn-one pad-medium-h field="state.name" text="State" order-locked></vn-column-header>
+            <vn-column-header vn-two pad-medium-h field="employee" text="Employee" order-locked></vn-column-header>
             <vn-column-header vn-two pad-medium-h field="created" text="Created" default-order="ASC"></vn-column-header>
         </vn-grid-header>
         <vn-one class="list list-content">