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

client/core/src/lib/fullEmpty.js

@@ -1,7 +1,7 @@
 import {module} from '../module';
 
 const isFullEmpty = item => {
-    return (!item && item !== 0 && item !== false) || (typeof item === 'object' && !Object.keys(item).length);
+    return (item === null || item === undefined) || (typeof item === 'object' && !Object.keys(item).length);
 };
 
 export default isFullEmpty;

client/core/src/watcher/watcher.js

@@ -12,12 +12,13 @@ import isFullEmpty from '../lib/fullEmpty';
  * properties are provided.
  */
 export default class Watcher extends Component {
-    constructor($element, $scope, $state, $transitions, $http, vnApp, $translate) {
+    constructor($element, $scope, $state, $transitions, $http, vnApp, $translate, $attrs) {
         super($element);
         this.$scope = $scope;
         this.$state = $state;
         this.$http = $http;
         this.$translate = $translate;
+        this.$attrs = $attrs;
         this.vnApp = vnApp;
 
         this.state = null;
@@ -93,10 +94,10 @@ export default class Watcher extends Component {
                 (resolve, reject) => this.noChanges(reject)
             );
         }
-        let changedData = getModifiedData(this.data, this.orgData);
+        let changedData = (this.$attrs.save && this.$attrs.save.toLowerCase() === 'post') ? this.copyInNewObject(this.data) : getModifiedData(this.data, this.orgData);
 
         if (this.save) {
-            this.save.model = this.copyInNewObject(changedData);
+            this.save.model = changedData; // this.copyInNewObject(changedData);
             return new Promise((resolve, reject) => {
                 this.save.accept().then(
                     json => this.writeData({data: json}, resolve),
@@ -194,7 +195,7 @@ export default class Watcher extends Component {
     }
 }
 
-Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnApp', '$translate'];
+Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnApp', '$translate', '$attrs'];
 
 module.component('vnWatcher', {
     template: require('./watcher.html'),

client/core/src/watcher/watcher.spec.js

@@ -11,6 +11,7 @@ describe('Component vnWatcher', () => {
     let vnApp;
     let $translate;
     let controller;
+    let $attrs;
 
     beforeEach(() => {
         angular.mock.module('client');
@@ -25,7 +26,10 @@ describe('Component vnWatcher', () => {
         $transitions = _$transitions_;
         $httpBackend = _$httpBackend_;
         $translate = _$translate_;
-        controller = $componentController('vnWatcher', {$scope, $element, $state, vnApp, $transitions, $httpBackend, $translate});
+        $attrs = {
+            save: "patch"
+        };
+        controller = $componentController('vnWatcher', {$scope, $element, $state, vnApp, $transitions, $httpBackend, $translate, $attrs});
     }));
 
     describe('$onInit()', () => {

services/item/common/models/intrastat.json

@@ -21,7 +21,7 @@
         "taxGroup": {
             "type": "belongsTo",
             "model": "TaxGroup",
-            "foreignKey": "taxGroupFk"
+            "foreignKey": "taxClassFk"
         },
         "taxCode": {
             "type": "belongsTo",

services/item/common/models/tax-class.json

@@ -1,9 +1,9 @@
 {
-    "name": "TaxGroup",
+    "name": "TaxClass",
     "base": "VnModel",
     "options": {
         "mysql": {
-          "table": "taxGroup",
+          "table": "taxClass",
           "database": "vn"
         }
     },

services/item/server/model-config.json

@@ -42,7 +42,7 @@
   "Intrastat": {
     "dataSource": "vn"
   },
-  "TaxGroup": {
+  "TaxClass": {
     "dataSource": "vn"
   },
   "TaxCode": {