diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index df1dd945064..34429dd1dbe 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -404,19 +404,25 @@ class Conf
 			// To prepare split of module fournisseur into fournisseur + supplier_order + supplier_invoice
 			if (! empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))  // By default, if module supplier is on, we set new properties
 			{
-				$this->supplier_order=new stdClass();
-				$this->supplier_order->enabled				= 1;
-				$this->supplier_order->multidir_output		= array($this->entity => $rootfordata."/fournisseur/commande");
-				$this->supplier_order->multidir_temp		= array($this->entity => $rootfortemp."/fournisseur/commande/temp");
-				$this->supplier_order->dir_output			= $rootfordata."/fournisseur/commande";			// For backward compatibility
-				$this->supplier_order->dir_temp				= $rootfortemp."/fournisseur/commande/temp";	// For backward compatibility
-
-				$this->supplier_invoice=new stdClass();
-				$this->supplier_invoice->enabled			= 1;
-				$this->supplier_invoice->multidir_output	= array($this->entity => $rootfordata."/fournisseur/facture");
-				$this->supplier_invoice->multidir_temp		= array($this->entity => $rootfortemp."/fournisseur/facture/temp");
-				$this->supplier_invoice->dir_output			= $rootfordata."/fournisseur/facture";			// For backward compatibility
-				$this->supplier_invoice->dir_temp			= $rootfortemp."/fournisseur/facture/temp";		// For backward compatibility
+				if (empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))	// This can be set to 1 once modules purchase order and supplier invoice exists
+				{
+					$this->supplier_order=new stdClass();
+					$this->supplier_order->enabled				= 1;
+					$this->supplier_order->multidir_output		= array($this->entity => $rootfordata."/fournisseur/commande");
+					$this->supplier_order->multidir_temp		= array($this->entity => $rootfortemp."/fournisseur/commande/temp");
+					$this->supplier_order->dir_output			= $rootfordata."/fournisseur/commande";			// For backward compatibility
+					$this->supplier_order->dir_temp				= $rootfortemp."/fournisseur/commande/temp";	// For backward compatibility
+				}
+				
+				if (empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))	// This can be set to 1 once modules purchase order and supplier invoice exists				
+				{
+					$this->supplier_invoice=new stdClass();
+					$this->supplier_invoice->enabled			= 1;
+					$this->supplier_invoice->multidir_output	= array($this->entity => $rootfordata."/fournisseur/facture");
+					$this->supplier_invoice->multidir_temp		= array($this->entity => $rootfortemp."/fournisseur/facture/temp");
+					$this->supplier_invoice->dir_output			= $rootfordata."/fournisseur/facture";			// For backward compatibility
+					$this->supplier_invoice->dir_temp			= $rootfortemp."/fournisseur/facture/temp";		// For backward compatibility
+				}
 			}
 		}