Merge branch 'dev' of http://git.verdnatura.es/salix into dev

client/client/src/address-edit/address-edit.html

@@ -91,7 +91,6 @@
         <vn-one>
             <vn-icon
                 pointer 
-                margin-medium-left
                 vn-tooltip="Add note"
                 tooltip-position = "right"
                 orange

client/core/src/components/autocomplete/autocomplete.html

@@ -17,6 +17,11 @@
         </div>
         <label class="mdl-textfield__label" translate>{{::$ctrl.label}}</label>
     </div>
+    <i class="material-icons pointer"
+        ng-show="!$ctrl.disabled && $ctrl.hasValue && ($ctrl.hasFocus || $ctrl.hasMouseIn)"
+        ng-click="$ctrl.clear()">
+        clear
+    </i>
 </div>
 <vn-drop-down
     vn-id="drop-down"

client/core/src/components/autocomplete/autocomplete.js

@@ -45,7 +45,7 @@ export default class Autocomplete extends Input {
         this.refreshSelection();
 
         if (this.onChange)
-            this.onChange(value);
+            this.onChange({value});
     }
 
     /**
@@ -235,6 +235,7 @@ ngModule.component('vnAutocomplete', {
         showField: '@?',
         valueField: '@?',
         selectFields: '<?',
+        disabled: '<?',
         where: '@?',
         order: '@?',
         label: '@',

client/item/src/barcode/item-barcode.html

@@ -8,25 +8,27 @@
                 model="barcode.code"
                 vn-acl="buyer, replenisher">
             </vn-textfield>
-            <vn-one pad-medium-top>
+            <vn-one>
                 <vn-icon
+                    pad-medium-top
                     vn-acl="buyer,replenisher"
                     pointer
                     medium-grey
+                    vn-tooltip="Remove note"
+                    tooltip-position="left"
                     icon="remove_circle_outline"
                     ng-click="$ctrl.removeBarcode($index)">
                 </vn-icon>
-                <vn-icon
-                    vn-acl="buyer, replenisher"
-                    pointer 
-                    margin-medium-left
-                    orange
-                    icon="add_circle"
-                    ng-if = "barcode.showAddIcon" 
-                    ng-click="$ctrl.addBarcode()"
-                ></vn-icon>  
             </vn-one>
         </vn-horizontal>
+        <vn-one>
+            <vn-icon
+                vn-acl="buyer, replenisher"
+                pointer vn-tooltip="Add note"
+                tooltip-position="right" orange icon="add_circle"
+                ng-click="$ctrl.addBarcode()">
+            </vn-icon>
+        </vn-one>
     </vn-card>
     <vn-button-bar>
         <vn-submit label="Save"></vn-submit>

client/item/src/niche/item-niche.html

@@ -32,25 +32,26 @@
                 rule="itemNiche.code"
                 vn-acl="buyer,replenisher">
             </vn-textfield>
-            <vn-one pad-medium-top>
+            <vn-one>
                 <vn-icon
                     vn-acl="buyer,replenisher"
                     pointer
                     medium-grey
+                    vn-tooltip="Remove note"
+                    tooltip-position="left"
                     icon="remove_circle_outline"
                     ng-click="$ctrl.removeNiche($index)">
                 </vn-icon>
+            </vn-one>
+        </vn-horizontal>
+        <vn-one>
             <vn-icon
                 vn-acl="buyer, replenisher"
-                    pointer 
+                pointer vn-tooltip="Add note"
-                    margin-medium-left
+                tooltip-position="right" orange icon="add_circle"
-                    orange
-                    icon="add_circle"
-                    ng-if="itemNiche.showAddIcon" 
                 ng-click="$ctrl.addNiche()">
             </vn-icon>
         </vn-one>
-        </vn-horizontal>
     </vn-card>
     <vn-button-bar>
         <vn-submit label="Save"></vn-submit>

client/ticket/routes.json

@@ -170,7 +170,7 @@
                 "ticket": "$ctrl.ticket"
             },
             "menu": {
-                "description": "Sale Checked",
+                "description": "Sale checked",
                 "icon": "assignment"
             }
         }

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/note/ticket-observation.html

@@ -48,7 +48,7 @@
         </vn-one>
         <vn-one>
             <vn-icon
-                pointer margin-medium-left vn-tooltip="Add note"
+                pointer vn-tooltip="Add note"
                 tooltip-position="right" orange icon="add_circle"
                 ng-if="observationTypes.model.length  > $ctrl.ticketObservations.length"
                 ng-click="$ctrl.addObservation()">

client/ticket/src/package/index/package.html

@@ -53,7 +53,6 @@
         <vn-one>
             <vn-icon
                 pointer 
-                margin-medium-left
                 vn-tooltip="Add package"
                 tooltip-position = "right"
                 orange

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-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"></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">