In case Model for document generation is not defined, the criteria to select the model is now:

1. Model for the object
 2. Custom default module
 3. Hardcoded default module

htdocs/adherents/class/adherent.class.php

@@ -1818,16 +1818,14 @@ class Adherent extends CommonObject
     
         $langs->load("orders");
     
-        // Positionne le modele sur le nom du modele a utiliser
+	    if (! dol_strlen($modele)) {
-        if (! dol_strlen($modele))
+
-        {
-            if (! empty($conf->global->ADHERENT_ADDON_PDF))
-            {
-                $modele = $conf->global->ADHERENT_ADDON_PDF;
-            }
-            else
-            {
 		    $modele = 'standard';
+
+		    if ($this->modelpdf) {
+			    $modele = $this->modelpdf;
+		    } elseif (! empty($conf->global->ADHERENT_ADDON_PDF)) {
+			    $modele = $conf->global->ADHERENT_ADDON_PDF;
 		    }
 	    }
     

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

@@ -3434,16 +3434,14 @@ class Propal extends CommonObject
 
 		$langs->load("propale");
 
-		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->PROPALE_ADDON_PDF))
-			{
-				$modele = $conf->global->PROPALE_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'azur';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->PROPALE_ADDON_PDF)) {
+				$modele = $conf->global->PROPALE_ADDON_PDF;
 			}
 		}
 

htdocs/commande/class/commande.class.php

@@ -3641,16 +3641,14 @@ class Commande extends CommonOrder
 
 		$langs->load("orders");
 
-		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->COMMANDE_ADDON_PDF))
-			{
-				$modele = $conf->global->COMMANDE_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'einstein';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->COMMANDE_ADDON_PDF)) {
+				$modele = $conf->global->COMMANDE_ADDON_PDF;
 			}
 		}
 

htdocs/compta/facture/class/facture.class.php

@@ -3967,24 +3967,20 @@ class Facture extends CommonInvoice
 
 		$langs->load("bills");
 
-		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->FACTURE_ADDON_PDF))
-			{
-				$modele = $conf->global->FACTURE_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'crabe';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->FACTURE_ADDON_PDF)) {
+				$modele = $conf->global->FACTURE_ADDON_PDF;
 			}
 		}
 
 		$modelpath = "core/modules/facture/doc/";
 
-		$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-		return $result;
 	}
 
 	/**

htdocs/contrat/class/contrat.class.php

@@ -2199,20 +2199,18 @@ class Contrat extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 	{
-		global $conf,$user,$langs;
+		global $conf,$langs;
 
 		$langs->load("contracts");
 
-		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->CONTRACT_ADDON_PDF))
-			{
-				$modele = $conf->global->CONTRACT_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'strato';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->CONTRACT_ADDON_PDF)) {
+				$modele = $conf->global->CONTRACT_ADDON_PDF;
 			}
 		}
 

htdocs/expedition/class/expedition.class.php

@@ -2162,16 +2162,14 @@ class Expedition extends CommonObject
 
 		$langs->load("sendings");
 
-		// Sets the model on the model name to use
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->EXPEDITION_ADDON_PDF))
-			{
-				$modele = $conf->global->EXPEDITION_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'rouget';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->EXPEDITION_ADDON_PDF)) {
+				$modele = $conf->global->EXPEDITION_ADDON_PDF;
 			}
 		}
 

htdocs/expensereport/class/expensereport.class.php

@@ -1573,16 +1573,14 @@ class ExpenseReport extends CommonObject
 
         $langs->load("trips");
 
-        // Positionne le modele sur le nom du modele a utiliser
+	    if (! dol_strlen($modele)) {
-        if (! dol_strlen($modele))
+
-        {
-            if (! empty($conf->global->EXPENSEREPORT_ADDON_PDF))
-            {
-                $modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
-            }
-            else
-            {
 		    $modele = 'standard';
+
+		    if ($this->modelpdf) {
+			    $modele = $this->modelpdf;
+		    } elseif (! empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
+			    $modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
 		    }
 	    }
 

htdocs/fourn/class/fournisseur.commande.class.php

@@ -2686,20 +2686,18 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 	{
-		global $conf, $user, $langs;
+		global $conf, $langs;
 
 		$langs->load("suppliers");
 
-		// Sets the model on the model name to use
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF))
-			{
-				$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'muscadet';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
+				$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
 			}
 		}
 

htdocs/livraison/class/livraison.class.php

@@ -1009,16 +1009,14 @@ class Livraison extends CommonObject
 
 		$langs->load("deliveries");
 
-		// Positionne modele sur le nom du modele de bon de livraison a utiliser
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->LIVRAISON_ADDON_PDF))
-			{
-				$modele = $conf->global->LIVRAISON_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'typhon';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->LIVRAISON_ADDON_PDF)) {
+				$modele = $conf->global->LIVRAISON_ADDON_PDF;
 			}
 		}
 

htdocs/projet/class/project.class.php

@@ -1569,16 +1569,14 @@ class Project extends CommonObject
 
 		$langs->load("projects");
 
-		// Positionne modele sur le nom du modele de projet a utiliser
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->PROJECT_ADDON_PDF))
-			{
-				$modele = $conf->global->PROJECT_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'baleine';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->PROJECT_ADDON_PDF)) {
+				$modele = $conf->global->PROJECT_ADDON_PDF;
 			}
 		}
 

htdocs/projet/class/task.class.php

@@ -1619,16 +1619,14 @@ class Task extends CommonObject
 
 		$langs->load("projects");
 
-		// Positionne modele sur le nom du modele de projet a utiliser
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->PROJECT_TASK_ADDON_PDF))
-			{
-				$modele = $conf->global->PROJECT_TASK_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'nodefault';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->PROJECT_TASK_ADDON_PDF)) {
+				$modele = $conf->global->PROJECT_TASK_ADDON_PDF;
 			}
 		}
 

htdocs/supplier_proposal/class/supplier_proposal.class.php

@@ -2510,20 +2510,18 @@ class SupplierProposal extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $langs;
 
 		$langs->load("supplier_proposal");
 
-		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele)) {
-		if (! dol_strlen($modele))
+
-		{
-			if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF))
-			{
-				$modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF;
-			}
-			else
-			{
 			$modele = 'aurore';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) {
+				$modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF;
 			}
 		}