diff --git a/.travis.yml b/.travis.yml
index c1bed319447..ca1412ff1cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,8 +38,8 @@ env:
 
 jobs:
   fast_finish: true
-  allow_failures:
-  - php: nightly
+  #allow_failures:
+  #- php: nightly
   include:
     - if: type = push
       php: '5.6'
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 739299f02a1..f689e7c3a4c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -208,6 +208,8 @@ class Propal extends CommonObject
 	public $demand_reason_id;
 	public $demand_reason_code;
 
+	public $warehouse_id;
+
 	public $extraparams = array();
 
 	/**
@@ -231,8 +233,6 @@ class Propal extends CommonObject
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
 
-	public $oldcopy;
-
 
 	/**
 	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 3cc0fa72ae6..248a45c629a 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -200,6 +200,8 @@ class Commande extends CommonOrder
 	public $special_code;
 	public $source; // Order mode. How we received order (by phone, by email, ...)
 
+	public $warehouse_id;
+
 	public $extraparams = array();
 
 	public $linked_objects = array();
@@ -231,11 +233,6 @@ class Commande extends CommonOrder
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
 
-	/**
-	 * @var Commande clone of order object
-	 */
-	public $oldcopy;
-
 	//! key of module source when order generated from a dedicated module ('cashdesk', 'takepos', ...)
 	public $module_source;
 	//! key of pos source ('0', '1', ...)