Merge pull request #1641 from defrance69/patch-17

Patch 17

htdocs/comm/propal/class/propal.class.php

@@ -2537,16 +2537,21 @@ class Propal extends CommonObject
         {
         	$mybool=false;
 
-            $file = $conf->global->PROPALE_ADDON.".php";
+		$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-            $classname = $conf->global->PROPALE_ADDON;
+		foreach ($dirmodels as $reldir)
+		{
+	            $file = $conf->global->PROPALE_ADDON.".php";
+	            $classname = $conf->global->PROPALE_ADDON;
+	
+	            // Include file with class
+	            foreach ($conf->file->dol_document_root as $dirroot)
+	            {
+	            	$dir = $dirroot.$reldir."/core/modules/propale/";
+	            	// Load file with numbering class (if found)
+	            	$mybool|=@include_once $dir.$file;
+	            }
+		}
 
-            // Include file with class
-            foreach ($conf->file->dol_document_root as $dirroot)
-            {
-            	$dir = $dirroot."/core/modules/propale/";
-            	// Load file with numbering class (if found)
-            	$mybool|=@include_once $dir.$file;
-            }
 
             if (! $mybool)
             {

htdocs/commande/class/commande.class.php

@@ -131,18 +131,21 @@ class Commande extends CommonOrder
 
         if (! empty($conf->global->COMMANDE_ADDON))
         {
-        	$mybool=false;
+		$mybool=false;
-
+		$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-            $file = $conf->global->COMMANDE_ADDON.".php";
+		foreach ($dirmodels as $reldir)
-            $classname = $conf->global->COMMANDE_ADDON;
+		{
-
+	            $file = $conf->global->COMMANDE_ADDON.".php";
-            // Include file with class
+	            $classname = $conf->global->COMMANDE_ADDON;
-            foreach ($conf->file->dol_document_root as $dirroot)
+	
-            {
+	            // Include file with class
-            	$dir = $dirroot."/core/modules/commande/";
+	            foreach ($conf->file->dol_document_root as $dirroot)
-            	// Load file with numbering class (if found)
+	            {
-            	$mybool|=@include_once $dir.$file;
+	            	$dir = $dirroot.$reldir."/core/modules/commande/";
-            }
+	            	// Load file with numbering class (if found)
+	            	$mybool|=@include_once $dir.$file;
+	            }
+		}
 
             if (! $mybool)
             {

htdocs/core/modules/barcode/modules_barcode.class.php

@@ -109,6 +109,7 @@ abstract class ModeleNumRefBarCode
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
 	

htdocs/core/modules/commande/modules_commande.php

@@ -142,6 +142,7 @@ abstract class ModeleNumRefCommandes
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/modules/contract/modules_contract.php

@@ -138,6 +138,7 @@ class ModelNumRefContracts
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/modules/dons/modules_don.php

@@ -134,6 +134,7 @@ abstract class ModeleNumRefDons
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
 }

htdocs/core/modules/expedition/modules_expedition.php

@@ -136,6 +136,7 @@ abstract class ModelNumRefExpedition
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/modules/facture/modules_facture.php

@@ -137,6 +137,7 @@ abstract class ModeleNumRefFactures
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/modules/fichinter/modules_fichinter.php

@@ -136,6 +136,7 @@ abstract class ModeleNumRefFicheinter
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/modules/livraison/modules_livraison.php

@@ -139,6 +139,7 @@ abstract class ModeleNumRefDeliveryOrder
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/modules/product/modules_product.class.php

@@ -97,6 +97,7 @@ abstract class ModeleProductCode
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
 

htdocs/core/modules/project/modules_project.php

@@ -134,6 +134,7 @@ abstract class ModeleNumRefProjects
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/modules/propale/modules_propale.php

@@ -138,6 +138,7 @@ abstract class ModeleNumRefPropales
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/modules/societe/modules_societe.class.php

@@ -134,6 +134,7 @@ abstract class ModeleThirdPartyCode
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
 
@@ -303,6 +304,7 @@ abstract class ModeleAccountancyCode
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
 

htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php

@@ -127,6 +127,7 @@ abstract class ModeleNumRefSuppliersInvoices
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/modules/supplier_order/modules_commandefournisseur.php

@@ -132,6 +132,7 @@ abstract class ModeleNumRefSuppliersOrders
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }