Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix

@salix/crud/src/client/addresses-data-edit/index.js

@@ -11,14 +11,18 @@ export const COMPONENT = {
             json => {
                 this.address = json.data;
                 this.copyAddress();
-             }
+            }
         );
         
         $http.get('/client/api/Agencies').then(
-            json => this.agencies = json.data
+            json => {
+                this.agencies = json.data;
+            }
         );
         $http.get('/client/api/Provinces').then(
-            json => this.provinces = json.data
+            json => {
+                this.provinces = json.data;
+            }
         );
 
         this.submit = function() {
@@ -29,7 +33,6 @@ export const COMPONENT = {
                         this.copyAddress();
                     }
                 );
-
             }
         };
 

@salix/crud/src/client/web-access/index.html

@@ -2,13 +2,13 @@
     <vn-card>
         <vn-vertical pad-large>
             <vn-title>Web access</vn-title>
-            <vn-check label="Web access enabled" field="web.account.active"></vn-check>
-            <vn-textfield label="User" class="margin-medium-top" field="web.account.user" focus></vn-textfield>
+            <vn-check label="Acceso Web" field="web.account.active"></vn-check>
+            <vn-textfield label="Usuario" class="margin-medium-top" field="web.account.name" focus></vn-textfield>
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Change password" vn-dialog="vn-client-change-password"></vn-button>
+        <vn-submit label="Guardar"></vn-submit>
+        <vn-button label="Cambiar password" vn-dialog="vn-client-change-password"></vn-button>
     </vn-button-bar>
 </form>
 <vn-dialog-confirm object="web.account" object-old="web.accountOld" state="web.state"></vn-dialog-confirm>

@salix/crud/src/client/web-access/index.js

@@ -15,7 +15,7 @@ export const COMPONENT = {
         this.submit = function() {
             if (!equalsObject(this.account, this.accountOld)) {
                 this.client.modify = "WebAccess";
-                $http.put(`/client/api/Accounts/${this.account.id}`, this.account).then(
+                $http.put('/client/api/Accounts', this.account).then(
                     json => {
                         this.account = json.data;
                         self.copyAccount();

db.json

@@ -9,7 +9,7 @@
     "Country": 3,
     "Province": 3,
     "Agency": 4,
-    "Account": 15,
+    "Account": 20,
     "ClientObservation": 1265
   },
   "models": {
@@ -53,9 +53,9 @@
       "3": "{\"name\":\"DHL\",\"id\":3}"
     },
     "Account": {
-      "1": "{\"id\":1,\"password\":\"12\"}",
-      "12": "{\"id\":12,\"name\":\"prueba12\",\"active\":true,\"user\":\"juanete\"}",
-      "13": "{\"id\":13,\"name\":\"manu\",\"active\":false,\"user\":\"joselito\"}"
+      "1": "{\"id\":1,\"password\":\"joselito\",\"name\":\"asdf\"}",
+      "14": "{\"id\":14,\"active\":true,\"name\":\"f\"}",
+      "15": "{\"id\":15,\"name\":\"asdf\"}"
     },
     "ClientObservation": {
       "1258": "{\"text\":\"Nota de prueba 1\",\"creationDate\":\"2017-01-17T15:24:23.320Z\",\"client\":12,\"salesPerson\":\"user\",\"id\":1258}",

services/client/common/models/Agency.json

@@ -1,6 +1,7 @@
 {
   "name": "Agency",
   "base": "PersistedModel",
+  "validateUpsert": true,
   "properties": {
     "id": {
       "type": "Number",

services/client/common/models/Country.json

@@ -1,6 +1,7 @@
 {
   "name": "Country",
   "base": "PersistedModel",
+  "validateUpsert": true,
   "properties": {
     "id": {
       "type": "Number",

services/client/common/models/PaymentMethod.json

@@ -1,6 +1,7 @@
 {
   "name": "PaymentMethod",
   "base": "PersistedModel",
+  "validateUpsert": true,
   "properties": {
     "id": {
       "type": "Number",

services/client/common/models/Province.json

@@ -1,6 +1,7 @@
 {
   "name": "Province",
   "base": "PersistedModel",
+  "validateUpsert": true,
   "properties": {
     "id": {
       "type": "Number",

services/client/common/models/SalesPerson.json

@@ -1,6 +1,7 @@
 {
   "name": "SalesPerson",
   "base": "PersistedModel",
+  "validateUpsert": true,
   "properties": {
     "id": {
       "type": "Number",

services/client/common/models/account.json

@@ -1,6 +1,7 @@
 {
   "name": "Account",
   "base": "PersistedModel",
+  "validateUpsert": true,
   "properties": {
     "id": {
       "type": "Number",