diff --git a/web/org.openbravo.retail.posterminal/js/components/modalreceiptproperties.js b/web/org.openbravo.retail.posterminal/js/components/modalreceiptproperties.js
--- a/web/org.openbravo.retail.posterminal/js/components/modalreceiptproperties.js
+++ b/web/org.openbravo.retail.posterminal/js/components/modalreceiptproperties.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2013-2016 Openbravo S.L.U.
+ * Copyright (C) 2013-2017 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.
@@ -154,7 +154,7 @@
           this.loadValue(att);
         }
       }
-      if (!_.isNull(bp)) {
+      if (!_.isNull(bp) && diff.bp) {
         criteria.bpartner = bp.get('id');
         if (OB.MobileApp.model.hasPermission('OBPOS_remote.customer', true)) {
           var bPartnerId = {
diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2013-2016 Openbravo S.L.U.
+ * Copyright (C) 2013-2017 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.
@@ -1025,9 +1025,6 @@
         this.set('replacedorder_documentNo', _order.get('replacedorder_documentNo'));
       }
 
-      if (_order.get('replacedorder_documentNo')) {
-        this.set('replacedorder_documentNo', _order.get('replacedorder_documentNo'));
-      }
       if (_order.get('replacedorder')) {
         this.set('replacedorder', _order.get('replacedorder'));
       }