diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/components/sharedcomponents.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/components/sharedcomponents.js
index c6cc15be9..518238583 100644
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/components/sharedcomponents.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/components/sharedcomponents.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2019 Openbravo S.L.U.
+ * Copyright (C) 2012-2020 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -9,7 +9,7 @@
  ************************************************************************************
  */
 
-/*global OB, enyo, _ */
+/*global enyo*/
 
 enyo.kind({
   name:
@@ -96,7 +96,9 @@ enyo.kind({
   },
   change: function() {},
   valueSet: function(inSender, inEvent) {
-    if (inEvent.data.hasOwnProperty(this.modelProperty)) {
+    if (
+      Object.prototype.hasOwnProperty.call(inEvent.data, this.modelProperty)
+    ) {
       this.setValue(inEvent.data[this.modelProperty]);
     }
   },
@@ -323,6 +325,7 @@ enyo.kind({
           {
             customerAddr: this.model.get('customerAddr'),
             isNew: true,
+            customer: me.customer,
             windowComponent: me
           },
           function(args) {
@@ -517,6 +520,7 @@ enyo.kind({
                               {
                                 customerAddr: me.model.get('customerAddr'),
                                 isNew: false,
+                                customer: me.customer,
                                 windowComponent: me
                               },
                               function(args) {
@@ -565,6 +569,7 @@ enyo.kind({
                       {
                         customerAddr: me.model.get('customerAddr'),
                         isNew: false,
+                        customer: me.customer,
                         windowComponent: me
                       },
                       function(args) {
@@ -647,7 +652,9 @@ enyo.kind({
     onSaveProperty: ''
   },
   valueSet: function(inSender, inEvent) {
-    if (inEvent.data.hasOwnProperty(this.modelProperty)) {
+    if (
+      Object.prototype.hasOwnProperty.call(inEvent.data, this.modelProperty)
+    ) {
       if (inEvent.data[this.modelProperty]) {
         this.check();
       } else {
@@ -710,7 +717,9 @@ enyo.kind({
   renderEmpty: 'enyo.Control',
   valueSet: function(inSender, inEvent) {
     var i;
-    if (inEvent.data.hasOwnProperty(this.modelProperty)) {
+    if (
+      Object.prototype.hasOwnProperty.call(inEvent.data, this.modelProperty)
+    ) {
       for (i = 0; i < this.getCollection().length; i++) {
         if (
           this.getCollection().models[i].get('id') ===
-- 
2.17.1