Fix: Error when using iphone

Fix: Error in not found class

htdocs/compta/facture/facture.class.php

@@ -1373,6 +1373,8 @@ class Facture extends CommonObject
 			$num = $this->ref;
 		}
 
+		if ($num)
+		{
 			$this->update_price();
 
 			// Validate
@@ -1469,6 +1471,11 @@ class Facture extends CommonObject
 				if ($result < 0) { $error++; $this->errors=$interface->errors; }
 				// Fin appel triggers
 			}
+		}
+		else
+		{
+			$error++;
+		}
 
 		if (! $error)
 		{
@@ -2219,8 +2226,11 @@ class Facture extends CommonObject
 		global $conf, $db, $langs;
 		$langs->load("bills");
 
-		if (! empty($conf->global->FACTURE_ADDON))
+		if (empty($conf->global->FACTURE_ADDON))
 		{
+			$conf->global->FACTURE_ADDON='terre';
+		}
+
 		$file = $conf->global->FACTURE_ADDON."/".$conf->global->FACTURE_ADDON.".modules.php";
 		$classname = "mod_facture_".$conf->global->FACTURE_ADDON;
 
@@ -2249,12 +2259,6 @@ class Facture extends CommonObject
 			return "";
 		}
 	}
-		else
-		{
-			print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_NotDefined");
-			return "";
-		}
-	}
 
 	/**
 	 *      \brief     Charge les informations de l'onglet info dans l'objet facture

htdocs/fourn/facture/fiche.php

@@ -29,6 +29,8 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
+require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/product/product.class.php');

htdocs/fourn/facture/paiement.php

@@ -28,6 +28,8 @@
  */
 
 require("../../main.inc.php");
+require(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.class.php');
+require(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php');
 require(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php');
 
 $langs->load('companies');

htdocs/fourn/paiement/fiche.php

@@ -21,15 +21,15 @@
 /**
  *	\file       htdocs/fourn/paiement/fiche.php
  *	\ingroup    facture, fournisseur
- *	\brief      Onglet paiement d'un paiement fournisseur
+ *	\brief      Tab to show a payment of a supplier invoice
  *	\remarks	Fichier presque identique a compta/paiement/fiche.php
  *	\version    $Id$
  */
 
-
 require("../../main.inc.php");
 require(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php');
-
+require(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.class.php');
+require(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php');
 
 $langs->load('bills');
 $langs->load('banks');

htdocs/lib/security.lib.php

@@ -49,8 +49,12 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	$php_self.= $_SERVER["QUERY_STRING"]?'?'.$_SERVER["QUERY_STRING"]:'';
 
 	// Select templates
-	if ($conf->browser->phone)
+	$template_dir=DOL_DOCUMENT_ROOT.'/core/tpl/';	// Common case
+	if (! empty($conf->global->MAIN_USE_THEME_TEMPLATES))	// Disabled by default because make useless filsesystem calls that reduce speed.
 	{
+		if ($conf->browser->phone && ! empty($conf->global->MAIN_SMARTY))
+		{
+			// Special cases
 			if (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone))
 			{
 				$template_dir=DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/tpl/";
@@ -62,18 +66,15 @@ function dol_loginfunction($langs,$conf,$mysoc)
 		}
 		else
 		{
-		if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/login.tpl")
+			if ((! empty($conf->global->MAIN_SMARTY) && file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/login.tpl"))
-			|| file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/login.tpl.php"))
+			||  (empty($conf->global->MAIN_SMARTY) && file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/login.tpl.php")))
 			{
 				$template_dir=DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
 			}
-		else
+		}
-		{
-			$template_dir=DOL_DOCUMENT_ROOT.'/core/tpl/';
 	}
 
 	$conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang;
-	}
 
 	// Set cookie for timeout management
 	$sessiontimeout='DOLSESSTIMEOUT_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]);