From 40b5352430a13c80f01e71b66a3fe546645caaf3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 30 Mar 2010 13:26:20 +0000
Subject: [PATCH] Fix: rename "templates" to "tpl"

---
 htdocs/admin/multicompany.php                      |  2 +-
 htdocs/cashdesk/affIndex.php                       |  2 +-
 htdocs/cashdesk/facturation.php                    |  2 +-
 htdocs/cashdesk/liste_articles.php                 |  2 +-
 .../{templates => tpl}/facturation1.tpl.php        |  0
 htdocs/cashdesk/{templates => tpl}/index.php       |  0
 .../{templates => tpl}/liste_articles.tpl.php      |  0
 htdocs/cashdesk/{templates => tpl}/menu.tpl.php    |  0
 htdocs/cashdesk/{templates => tpl}/ticket.tpl.php  |  0
 .../{templates => tpl}/validation1.tpl.php         |  0
 .../{templates => tpl}/validation2.tpl.php         |  0
 htdocs/cashdesk/validation.php                     |  4 ++--
 htdocs/cashdesk/validation_ok.php                  |  4 ++--
 htdocs/cashdesk/validation_ticket.php              |  4 ++--
 htdocs/core/{templates => tpl}/README              |  0
 htdocs/core/{templates => tpl}/error.tpl           |  0
 htdocs/core/{templates => tpl}/footer.tpl          |  0
 htdocs/core/{templates => tpl}/header.tpl          |  0
 htdocs/core/{templates => tpl}/index.php           |  0
 htdocs/core/{templates => tpl}/login.tpl           |  0
 htdocs/core/{templates => tpl}/login.tpl.php       |  0
 .../core/{templates => tpl}/passwordforgotten.tpl  |  0
 .../class/pdf_courrier_droit_editeur.class.php     |  2 +-
 htdocs/lib/security.lib.php                        | 14 +++++++-------
 htdocs/product/fiche.php                           |  4 ++--
 htdocs/product/liste.php                           | 10 +++++-----
 htdocs/theme/auguria/{templates => tpl}/README     |  0
 htdocs/theme/auguria/{templates => tpl}/index.php  |  0
 htdocs/theme/bluelagoon/{templates => tpl}/README  |  0
 .../theme/bluelagoon/{templates => tpl}/index.php  |  0
 htdocs/theme/eldy/{templates => tpl}/README        |  0
 htdocs/theme/eldy/{templates => tpl}/index.php     |  0
 htdocs/theme/freelug/{templates => tpl}/README     |  0
 htdocs/theme/freelug/{templates => tpl}/index.php  |  0
 .../phones/iphone/{templates => tpl}/index.php     |  0
 .../phones/iphone/{templates => tpl}/login.tpl     |  0
 .../iphone/{templates => tpl}/user/index.php       |  0
 .../{templates => tpl}/user/passwordforgotten.tpl  |  0
 .../phones/others/{templates => tpl}/index.php     |  0
 .../phones/others/{templates => tpl}/login.tpl     |  0
 htdocs/theme/rodolphe/{templates => tpl}/README    |  0
 htdocs/theme/rodolphe/{templates => tpl}/index.php |  0
 htdocs/theme/yellow/{templates => tpl}/README      |  0
 htdocs/theme/yellow/{templates => tpl}/index.php   |  0
 htdocs/user/passwordforgotten.php                  | 10 +++++-----
 scripts/books/droits-editeurs.php                  |  2 +-
 46 files changed, 31 insertions(+), 31 deletions(-)
 rename htdocs/cashdesk/{templates => tpl}/facturation1.tpl.php (100%)
 rename htdocs/cashdesk/{templates => tpl}/index.php (100%)
 rename htdocs/cashdesk/{templates => tpl}/liste_articles.tpl.php (100%)
 rename htdocs/cashdesk/{templates => tpl}/menu.tpl.php (100%)
 rename htdocs/cashdesk/{templates => tpl}/ticket.tpl.php (100%)
 rename htdocs/cashdesk/{templates => tpl}/validation1.tpl.php (100%)
 rename htdocs/cashdesk/{templates => tpl}/validation2.tpl.php (100%)
 rename htdocs/core/{templates => tpl}/README (100%)
 rename htdocs/core/{templates => tpl}/error.tpl (100%)
 rename htdocs/core/{templates => tpl}/footer.tpl (100%)
 rename htdocs/core/{templates => tpl}/header.tpl (100%)
 rename htdocs/core/{templates => tpl}/index.php (100%)
 rename htdocs/core/{templates => tpl}/login.tpl (100%)
 rename htdocs/core/{templates => tpl}/login.tpl.php (100%)
 rename htdocs/core/{templates => tpl}/passwordforgotten.tpl (100%)
 rename htdocs/theme/auguria/{templates => tpl}/README (100%)
 rename htdocs/theme/auguria/{templates => tpl}/index.php (100%)
 rename htdocs/theme/bluelagoon/{templates => tpl}/README (100%)
 rename htdocs/theme/bluelagoon/{templates => tpl}/index.php (100%)
 rename htdocs/theme/eldy/{templates => tpl}/README (100%)
 rename htdocs/theme/eldy/{templates => tpl}/index.php (100%)
 rename htdocs/theme/freelug/{templates => tpl}/README (100%)
 rename htdocs/theme/freelug/{templates => tpl}/index.php (100%)
 rename htdocs/theme/phones/iphone/{templates => tpl}/index.php (100%)
 rename htdocs/theme/phones/iphone/{templates => tpl}/login.tpl (100%)
 rename htdocs/theme/phones/iphone/{templates => tpl}/user/index.php (100%)
 rename htdocs/theme/phones/iphone/{templates => tpl}/user/passwordforgotten.tpl (100%)
 rename htdocs/theme/phones/others/{templates => tpl}/index.php (100%)
 rename htdocs/theme/phones/others/{templates => tpl}/login.tpl (100%)
 rename htdocs/theme/rodolphe/{templates => tpl}/README (100%)
 rename htdocs/theme/rodolphe/{templates => tpl}/index.php (100%)
 rename htdocs/theme/yellow/{templates => tpl}/README (100%)
 rename htdocs/theme/yellow/{templates => tpl}/index.php (100%)

diff --git a/htdocs/admin/multicompany.php b/htdocs/admin/multicompany.php
index 24d732feb95..ce4ca7ae54c 100644
--- a/htdocs/admin/multicompany.php
+++ b/htdocs/admin/multicompany.php
@@ -58,7 +58,7 @@ print_fiche_titre($langs->trans("MultiCompanySetup"),$linkback,'setup');
 
 print '<br>';
 
-$smarty->template_dir = DOL_DOCUMENT_ROOT.'/multicompany/templates/';
+$smarty->template_dir = DOL_DOCUMENT_ROOT.'/multicompany/tpl/';
 
 /*
  * Create
diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
index 64664a540db..49f913b96b9 100644
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@@ -72,7 +72,7 @@ print '<div class="conteneur_img_droite">'."\n";
 print '<h1 class="entete"><span>POINT OF SALE</span></h1>'."\n";
 
 print '<div class="menu_principal">'."\n";
-include_once('templates/menu.tpl.php');
+include_once('tpl/menu.tpl.php');
 print '</div>'."\n";
 
 print '<div class="contenu">'."\n";
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index 43a63ff2614..f705c7b71db 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -157,6 +157,6 @@ $obj_facturation->paiement_le ('RESET');
 
 
 // Affichage des templates
-require ('templates/facturation1.tpl.php');
+require ('tpl/facturation1.tpl.php');
 
 ?>
diff --git a/htdocs/cashdesk/liste_articles.php b/htdocs/cashdesk/liste_articles.php
index 26cfa75583c..1c718c512e5 100644
--- a/htdocs/cashdesk/liste_articles.php
+++ b/htdocs/cashdesk/liste_articles.php
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-require ('templates/liste_articles.tpl.php');
+require ('tpl/liste_articles.tpl.php');
 
 $obj_facturation->prix_total_ht ($lst_total_ht);
 $obj_facturation->prix_total_ttc ($lst_total_ttc);
diff --git a/htdocs/cashdesk/templates/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
similarity index 100%
rename from htdocs/cashdesk/templates/facturation1.tpl.php
rename to htdocs/cashdesk/tpl/facturation1.tpl.php
diff --git a/htdocs/cashdesk/templates/index.php b/htdocs/cashdesk/tpl/index.php
similarity index 100%
rename from htdocs/cashdesk/templates/index.php
rename to htdocs/cashdesk/tpl/index.php
diff --git a/htdocs/cashdesk/templates/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
similarity index 100%
rename from htdocs/cashdesk/templates/liste_articles.tpl.php
rename to htdocs/cashdesk/tpl/liste_articles.tpl.php
diff --git a/htdocs/cashdesk/templates/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
similarity index 100%
rename from htdocs/cashdesk/templates/menu.tpl.php
rename to htdocs/cashdesk/tpl/menu.tpl.php
diff --git a/htdocs/cashdesk/templates/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
similarity index 100%
rename from htdocs/cashdesk/templates/ticket.tpl.php
rename to htdocs/cashdesk/tpl/ticket.tpl.php
diff --git a/htdocs/cashdesk/templates/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
similarity index 100%
rename from htdocs/cashdesk/templates/validation1.tpl.php
rename to htdocs/cashdesk/tpl/validation1.tpl.php
diff --git a/htdocs/cashdesk/templates/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php
similarity index 100%
rename from htdocs/cashdesk/templates/validation2.tpl.php
rename to htdocs/cashdesk/tpl/validation2.tpl.php
diff --git a/htdocs/cashdesk/validation.php b/htdocs/cashdesk/validation.php
index 211e9ebbcd1..5b4d0269c7e 100644
--- a/htdocs/cashdesk/validation.php
+++ b/htdocs/cashdesk/validation.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Jérémie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 J�r�mie Ollivier <jeremie.o@laposte.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,6 @@
  */
 
 	// Affichage des templates
-	require ('templates/validation1.tpl.php');
+	require ('tpl/validation1.tpl.php');
 
 ?>
diff --git a/htdocs/cashdesk/validation_ok.php b/htdocs/cashdesk/validation_ok.php
index ae3e461617c..1c6fa4343a6 100644
--- a/htdocs/cashdesk/validation_ok.php
+++ b/htdocs/cashdesk/validation_ok.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Jérémie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 J�r�mie Ollivier <jeremie.o@laposte.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,6 @@
  */
 
 	// Affichage des templates
-	require ('templates/validation2.tpl.php');
+	require ('tpl/validation2.tpl.php');
 
 ?>
diff --git a/htdocs/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php
index 6e028fb0864..74fdf692928 100644
--- a/htdocs/cashdesk/validation_ticket.php
+++ b/htdocs/cashdesk/validation_ticket.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Jérémie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 J�r�mie Ollivier <jeremie.o@laposte.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 	unset ($_SESSION['serObjFacturation']);
 
 
-		require ('templates/ticket.tpl.php');
+		require ('tpl/ticket.tpl.php');
 
 
 	$_SESSION['serObjFacturation'] = serialize ($obj_facturation);
diff --git a/htdocs/core/templates/README b/htdocs/core/tpl/README
similarity index 100%
rename from htdocs/core/templates/README
rename to htdocs/core/tpl/README
diff --git a/htdocs/core/templates/error.tpl b/htdocs/core/tpl/error.tpl
similarity index 100%
rename from htdocs/core/templates/error.tpl
rename to htdocs/core/tpl/error.tpl
diff --git a/htdocs/core/templates/footer.tpl b/htdocs/core/tpl/footer.tpl
similarity index 100%
rename from htdocs/core/templates/footer.tpl
rename to htdocs/core/tpl/footer.tpl
diff --git a/htdocs/core/templates/header.tpl b/htdocs/core/tpl/header.tpl
similarity index 100%
rename from htdocs/core/templates/header.tpl
rename to htdocs/core/tpl/header.tpl
diff --git a/htdocs/core/templates/index.php b/htdocs/core/tpl/index.php
similarity index 100%
rename from htdocs/core/templates/index.php
rename to htdocs/core/tpl/index.php
diff --git a/htdocs/core/templates/login.tpl b/htdocs/core/tpl/login.tpl
similarity index 100%
rename from htdocs/core/templates/login.tpl
rename to htdocs/core/tpl/login.tpl
diff --git a/htdocs/core/templates/login.tpl.php b/htdocs/core/tpl/login.tpl.php
similarity index 100%
rename from htdocs/core/templates/login.tpl.php
rename to htdocs/core/tpl/login.tpl.php
diff --git a/htdocs/core/templates/passwordforgotten.tpl b/htdocs/core/tpl/passwordforgotten.tpl
similarity index 100%
rename from htdocs/core/templates/passwordforgotten.tpl
rename to htdocs/core/tpl/passwordforgotten.tpl
diff --git a/htdocs/docs/class/pdf_courrier_droit_editeur.class.php b/htdocs/docs/class/pdf_courrier_droit_editeur.class.php
index c477a5c8b9e..5b5a98839e5 100644
--- a/htdocs/docs/class/pdf_courrier_droit_editeur.class.php
+++ b/htdocs/docs/class/pdf_courrier_droit_editeur.class.php
@@ -67,7 +67,7 @@ class pdf_courrier_droit_editeur
 
 		require_once(FPDF_PATH.'fpdf.php');
 		require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
-		require_once(DOL_DOCUMENT_ROOT."/product/templates/product.livre.class.php");
+		require_once(DOL_DOCUMENT_ROOT."/product/canvas/livre/product.livre.class.php");
 		$error = 0;
 		$year = strftime("%Y", time());
 
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 813e8966fa3..1b9e7dbdde8 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -53,23 +53,23 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	{
 		if (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone))
 		{
-			$template_dir=DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/templates/";
+			$template_dir=DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/tpl/";
 		}
 		else
 		{
-			$template_dir=DOL_DOCUMENT_ROOT."/theme/phones/others/templates/";
+			$template_dir=DOL_DOCUMENT_ROOT."/theme/phones/others/tpl/";
 		}
 	}
 	else
 	{
-		if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/templates/login.tpl")
-			|| file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/templates/login.tpl.php"))
+		if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/login.tpl")
+			|| file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/login.tpl.php"))
 		{
-			$template_dir=DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/templates/";
+			$template_dir=DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
 		}
 		else
 		{
-			$template_dir=DOL_DOCUMENT_ROOT.'/core/templates/';
+			$template_dir=DOL_DOCUMENT_ROOT.'/core/tpl/';
 		}
 
 		$conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang;
@@ -253,7 +253,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 			$smarty->assign('main_google_ad_width', $conf->global->MAIN_GOOGLE_AD_WIDTH);
 			$smarty->assign('main_google_ad_height', $conf->global->MAIN_GOOGLE_AD_HEIGHT);
 
-			$google_ad_template = DOL_DOCUMENT_ROOT."/core/templates/google_ad.tpl";
+			$google_ad_template = DOL_DOCUMENT_ROOT."/core/tpl/google_ad.tpl";
 			$smarty->assign('google_ad_tpl', $google_ad_template);
 		}
 
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 45b2aaaf099..1ea84f20fa9 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -657,7 +657,7 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ
 	{
 		// On assigne les valeurs meme en creation car elles sont definies si
 		// on revient en erreur
-		$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$_GET["canvas"].'/templates/';
+		$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$_GET["canvas"].'/tpl/';
 		$tvaarray = load_tva($db,"tva_tx",$conf->defaulttx,$mysoc,'');
 		$smarty->assign('tva_taux_value', $tvaarray['value']);
 		$smarty->assign('tva_taux_libelle', $tvaarray['label']);
@@ -865,7 +865,7 @@ if ($_GET["id"] || $_GET["ref"])
 
 		$result = $product->fetchCanvas($_GET["id"],'',$_GET["action"]);
 
-		$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/templates/';
+		$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/tpl/';
 
 		$product->assign_smarty_values($smarty,$_GET["action"]);
 	}
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 78a10c64f06..2c164ce20c3 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -238,21 +238,21 @@ if ($resql)
 		$title_text = $title;
 		
 		// Check if a custom template is present
-		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/templates/product/'.$_GET["canvas"].'/list.tpl'))
+		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$_GET["canvas"].'/list.tpl'))
 		{
-			$template_dir = DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/templates/product/'.$_GET["canvas"].'/';
+			$template_dir = DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$_GET["canvas"].'/';
 			$template = 'list.tpl';
 		}
 		// Check if a default template is present
-		else if (file_exists(DOL_DOCUMENT_ROOT . '/product/canvas/'.$_GET["canvas"].'/templates/list.tpl'))
+		else if (file_exists(DOL_DOCUMENT_ROOT . '/product/canvas/'.$_GET["canvas"].'/tpl/list.tpl'))
 		{
-			$template_dir = DOL_DOCUMENT_ROOT . '/product/canvas/'.$_GET["canvas"].'/templates/';
+			$template_dir = DOL_DOCUMENT_ROOT . '/product/canvas/'.$_GET["canvas"].'/tpl/';
 			$template = 'list.tpl';
 		}
 		// Error template
 		else
 		{
-			$template_dir = DOL_DOCUMENT_ROOT . '/core/templates/';
+			$template_dir = DOL_DOCUMENT_ROOT . '/core/tpl/';
 			$template = 'error.tpl';
 		}
 		
diff --git a/htdocs/theme/auguria/templates/README b/htdocs/theme/auguria/tpl/README
similarity index 100%
rename from htdocs/theme/auguria/templates/README
rename to htdocs/theme/auguria/tpl/README
diff --git a/htdocs/theme/auguria/templates/index.php b/htdocs/theme/auguria/tpl/index.php
similarity index 100%
rename from htdocs/theme/auguria/templates/index.php
rename to htdocs/theme/auguria/tpl/index.php
diff --git a/htdocs/theme/bluelagoon/templates/README b/htdocs/theme/bluelagoon/tpl/README
similarity index 100%
rename from htdocs/theme/bluelagoon/templates/README
rename to htdocs/theme/bluelagoon/tpl/README
diff --git a/htdocs/theme/bluelagoon/templates/index.php b/htdocs/theme/bluelagoon/tpl/index.php
similarity index 100%
rename from htdocs/theme/bluelagoon/templates/index.php
rename to htdocs/theme/bluelagoon/tpl/index.php
diff --git a/htdocs/theme/eldy/templates/README b/htdocs/theme/eldy/tpl/README
similarity index 100%
rename from htdocs/theme/eldy/templates/README
rename to htdocs/theme/eldy/tpl/README
diff --git a/htdocs/theme/eldy/templates/index.php b/htdocs/theme/eldy/tpl/index.php
similarity index 100%
rename from htdocs/theme/eldy/templates/index.php
rename to htdocs/theme/eldy/tpl/index.php
diff --git a/htdocs/theme/freelug/templates/README b/htdocs/theme/freelug/tpl/README
similarity index 100%
rename from htdocs/theme/freelug/templates/README
rename to htdocs/theme/freelug/tpl/README
diff --git a/htdocs/theme/freelug/templates/index.php b/htdocs/theme/freelug/tpl/index.php
similarity index 100%
rename from htdocs/theme/freelug/templates/index.php
rename to htdocs/theme/freelug/tpl/index.php
diff --git a/htdocs/theme/phones/iphone/templates/index.php b/htdocs/theme/phones/iphone/tpl/index.php
similarity index 100%
rename from htdocs/theme/phones/iphone/templates/index.php
rename to htdocs/theme/phones/iphone/tpl/index.php
diff --git a/htdocs/theme/phones/iphone/templates/login.tpl b/htdocs/theme/phones/iphone/tpl/login.tpl
similarity index 100%
rename from htdocs/theme/phones/iphone/templates/login.tpl
rename to htdocs/theme/phones/iphone/tpl/login.tpl
diff --git a/htdocs/theme/phones/iphone/templates/user/index.php b/htdocs/theme/phones/iphone/tpl/user/index.php
similarity index 100%
rename from htdocs/theme/phones/iphone/templates/user/index.php
rename to htdocs/theme/phones/iphone/tpl/user/index.php
diff --git a/htdocs/theme/phones/iphone/templates/user/passwordforgotten.tpl b/htdocs/theme/phones/iphone/tpl/user/passwordforgotten.tpl
similarity index 100%
rename from htdocs/theme/phones/iphone/templates/user/passwordforgotten.tpl
rename to htdocs/theme/phones/iphone/tpl/user/passwordforgotten.tpl
diff --git a/htdocs/theme/phones/others/templates/index.php b/htdocs/theme/phones/others/tpl/index.php
similarity index 100%
rename from htdocs/theme/phones/others/templates/index.php
rename to htdocs/theme/phones/others/tpl/index.php
diff --git a/htdocs/theme/phones/others/templates/login.tpl b/htdocs/theme/phones/others/tpl/login.tpl
similarity index 100%
rename from htdocs/theme/phones/others/templates/login.tpl
rename to htdocs/theme/phones/others/tpl/login.tpl
diff --git a/htdocs/theme/rodolphe/templates/README b/htdocs/theme/rodolphe/tpl/README
similarity index 100%
rename from htdocs/theme/rodolphe/templates/README
rename to htdocs/theme/rodolphe/tpl/README
diff --git a/htdocs/theme/rodolphe/templates/index.php b/htdocs/theme/rodolphe/tpl/index.php
similarity index 100%
rename from htdocs/theme/rodolphe/templates/index.php
rename to htdocs/theme/rodolphe/tpl/index.php
diff --git a/htdocs/theme/yellow/templates/README b/htdocs/theme/yellow/tpl/README
similarity index 100%
rename from htdocs/theme/yellow/templates/README
rename to htdocs/theme/yellow/tpl/README
diff --git a/htdocs/theme/yellow/templates/index.php b/htdocs/theme/yellow/tpl/index.php
similarity index 100%
rename from htdocs/theme/yellow/templates/index.php
rename to htdocs/theme/yellow/tpl/index.php
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 6321c1f8520..138c01a2d05 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -157,23 +157,23 @@ if ($conf->global->MAIN_SMARTY)
 	{
 		if (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone))
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/templates/user/";
+			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/tpl/user/";
 			$smarty->assign('theme', 'default');
 		}
 		else
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/others/templates/user/";
+			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/others/tpl/user/";
 		}
 	}
 	else
 	{
-		if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/core/templates/passwordforgotten.tpl"))
+		if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/core/tpl/passwordforgotten.tpl"))
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/templates/core/";
+			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/core/";
 		}
 		else
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT."/core/templates/";
+			$smarty->template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 		}
 
 		$conf->css  = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang;
diff --git a/scripts/books/droits-editeurs.php b/scripts/books/droits-editeurs.php
index 8066de12a2a..0d6c5e2dffb 100644
--- a/scripts/books/droits-editeurs.php
+++ b/scripts/books/droits-editeurs.php
@@ -28,7 +28,7 @@
 require_once("../../htdocs/master.inc.php");
 require_once(FPDF_PATH.'fpdf.php');
 require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/templates/product.livre.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/canvas/livre/product.livre.class.php");
 
 $error = 0;
 $year = strftime("%Y", time());