diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/editcreatecustomeraddress.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/editcreatecustomeraddress.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/editcreatecustomeraddress.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/editcreatecustomeraddress.js
@@ -19,8 +19,18 @@
     onShowPopup: ''
   },
   handlers: {
+    onSetValues: 'setValues',
+    onRetrieveCustomer: 'retrieveCustomers',
     onCancelClose: 'cancelClose'
   },
+  setValues: function (inSender, inEvent) {
+    this.waterfall('onSetValue', inEvent);
+  },
+  retrieveCustomers: function (inSender, inEvent) {
+    var retrievedValues = inEvent || {};
+    this.waterfall('onRetrieveValues', retrievedValues);
+    return retrievedValues;
+  },
   cancelClose: function (inSender, inEvent) {
     this.customerAddr = inEvent.customerAddr;
     this.hide();
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/editcreatecustomerform.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/editcreatecustomerform.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/editcreatecustomerform.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/editcreatecustomerform.js
@@ -17,13 +17,23 @@
     onShowPopup: ''
   },
   handlers: {
-    onCancelClose: 'cancelClose'
+    onCancelClose: 'cancelClose',
+    onSetValues: 'setValues',
+    onRetrieveCustomer: 'retrieveCustomers'
   },
   cancelClose: function (inSender, inEvent) {
     this.customer = inEvent.customer;
     this.hide();
     return true;
   },
+  setValues: function (inSender, inEvent) {
+    this.waterfall('onSetValue', inEvent);
+  },
+  retrieveCustomers: function (inSender, inEvent) {
+    var retrievedValues = inEvent || {};
+    this.waterfall('onRetrieveValues', retrievedValues);
+    return retrievedValues;
+  },
   executeOnShow: function () {
     if (OB.MobileApp.model.get('terminal').defaultbp_paymentmethod !== null && OB.MobileApp.model.get('terminal').defaultbp_bpcategory !== null && OB.MobileApp.model.get('terminal').defaultbp_paymentterm !== null && OB.MobileApp.model.get('terminal').defaultbp_invoiceterm !== null && OB.MobileApp.model.get('terminal').defaultbp_bpcountry !== null && OB.MobileApp.model.get('terminal').defaultbp_bporg !== null) {
       // Hide components depending on its displayLogic function