0040939: Error with ModalProductAttributes modal

diff -r 1d0edf97538c web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js	Wed May 22 08:06:30 2019 +0530
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js	Wed May 22 16:13:17 2019 -0300
@@ -2647,7 +2647,7 @@
           });
         }
 
-        if (p.get('obposScale') && !options.isVerifiedReturn) {
+        if (p.get('obposScale') && !(option && option.isVerifiedReturn)) {
           OB.POS.hwserver.getWeight(function (data) {
             if (data.exception) {
               OB.UTIL.showConfirmation.display('', data.exception.message);
@@ -8066,4 +8066,4 @@
   window.OB.Model.MultiOrders = MultiOrders;
 
   window.OB.Model.modelLoaders = [];
-}());
\ No newline at end of file
+}());
diff -r 1d0edf97538c web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalproductattribute.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalproductattribute.js	Wed May 22 08:06:30 2019 +0530
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalproductattribute.js	Wed May 22 16:13:17 2019 -0300
@@ -1,4 +1,4 @@
-/*
+w/*
  ************************************************************************************
  * Copyright (C) 2017-2019 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
@@ -85,9 +85,9 @@
     this.$.bodyContent.$.valueAttribute.setValue(null);
   },
   executeOnShow: function () {
-    if (this.args.options.attSetInstanceDesc) {
+    if (this.args.options && this.args.options.attSetInstanceDesc) {
       this.$.bodyContent.$.valueAttribute.setValue(this.args.options.attSetInstanceDesc);
-    } else if (this.args.options.attributeValue) {
+    } else if (this.args.options && this.args.options.attributeValue) {
       this.$.bodyContent.$.valueAttribute.setValue(this.args.options.attributeValue);
     }
     this.$.headerCloseButton.hide();
@@ -95,4 +95,4 @@
   initComponents: function () {
     this.inherited(arguments);
   }
-});
\ No newline at end of file
+});