Fix: move common templates in core directory

Fix: rename canvas in templates

.settings/org.eclipse.core.resources.prefs

@@ -49,7 +49,6 @@ encoding//htdocs/includes/menus/barre_left/eldy_frontoffice.php=ISO-8859-1
 encoding//htdocs/includes/menus/barre_top/empty.php=ISO-8859-1
 encoding//htdocs/includes/menus/barre_top/rodolphe.php=ISO-8859-1
 encoding//htdocs/includes/modules/DolibarrModules.class.php=ISO-8859-1
-encoding//htdocs/includes/modules/facture/pdf_crabe.modules.php=ISO-8859-1
 encoding//htdocs/includes/modules/modAdherent.class.php=ISO-8859-1
 encoding//htdocs/includes/modules/modBanque.class.php=ISO-8859-1
 encoding//htdocs/includes/modules/modCategorie.class.php=ISO-8859-1
@@ -619,14 +618,14 @@ encoding//htdocs/lib/product.lib.php=ISO-8859-1
 encoding//htdocs/main.inc.php=ISO-8859-1
 encoding//htdocs/master.inc.php=ISO-8859-1
 encoding//htdocs/paiement.class.php=ISO-8859-1
-encoding//htdocs/product/canvas/livre/liste.tpl=UTF-8
-encoding//htdocs/product/canvas/livre/livre-create.tpl=UTF-8
-encoding//htdocs/product/canvas/livre/livre-edit.tpl=UTF-8
-encoding//htdocs/product/canvas/livre/livre-view.tpl=UTF-8
-encoding//htdocs/product/canvas/livrecontrat/livrecontrat-edit.tpl=UTF-8
-encoding//htdocs/product/canvas/livrecontrat/livrecontrat-view.tpl=UTF-8
-encoding//htdocs/product/canvas/livrecouverture/livrecouverture-edit.tpl=UTF-8
-encoding//htdocs/product/canvas/livrecouverture/livrecouverture-view.tpl=UTF-8
+encoding//htdocs/product/templates/livre/liste.tpl=UTF-8
+encoding//htdocs/product/templates/livre/livre-create.tpl=UTF-8
+encoding//htdocs/product/templates/livre/livre-edit.tpl=UTF-8
+encoding//htdocs/product/templates/livre/livre-view.tpl=UTF-8
+encoding//htdocs/product/templates/livrecontrat/livrecontrat-edit.tpl=UTF-8
+encoding//htdocs/product/templates/livrecontrat/livrecontrat-view.tpl=UTF-8
+encoding//htdocs/product/templates/livrecouverture/livrecouverture-edit.tpl=UTF-8
+encoding//htdocs/product/templates/livrecouverture/livrecouverture-view.tpl=UTF-8
 encoding//htdocs/product/fiche.php=ISO-8859-1
 encoding//htdocs/product/reassort.php=ISO-8859-1
 encoding//htdocs/product/stats/fiche.php=ISO-8859-1

htdocs/admin/produit.php

@@ -306,7 +306,7 @@ if ($conf->global->PRODUCT_CANVAS_ABILITY)
 	print "  <td width=\"80\">&nbsp;</td></tr>\n";
 
 	require_once(DOL_DOCUMENT_ROOT . "/product.class.php");
-	$dir = DOL_DOCUMENT_ROOT . "/product/canvas/";
+	$dir = DOL_DOCUMENT_ROOT . "/product/templates/";
 
 	if ($conf->global->PRODUCT_CANVAS_ABILITY)
 	{

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.class.php");
-		require_once(DOL_DOCUMENT_ROOT."/product/canvas/product.livre.class.php");
+		require_once(DOL_DOCUMENT_ROOT."/product/templates/product.livre.class.php");
 		$error = 0;
 		$year = strftime("%Y", time());
 

htdocs/multicompany/multicompany.class.php

@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/multicompany/canvas/multicompany.class.php
+ *	\file       htdocs/multicompany/multicompany.class.php
  *	\ingroup    multicompany
  *	\brief      File Class multicompany
  *	\version    $Id$

htdocs/product/fiche.php

@@ -572,7 +572,7 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ
 	{
 		if (! isset($product))
 		{
-			$filecanvas=DOL_DOCUMENT_ROOT.'/product/canvas/product.'.$_GET["canvas"].'.class.php';
+			$filecanvas=DOL_DOCUMENT_ROOT.'/product/templates/product.'.$_GET["canvas"].'.class.php';
 			if ($_GET["canvas"] && file_exists($filecanvas) )
 			{
 				$class = 'Product'.ucfirst($_GET["canvas"]);
@@ -759,7 +759,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"].'/';
+		$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/templates/'.$_GET["canvas"].'/';
 		$tvaarray = load_tva($db,"tva_tx",$conf->defaulttx,$mysoc,'');
 		$smarty->assign('tva_taux_value', $tvaarray['value']);
 		$smarty->assign('tva_taux_libelle', $tvaarray['label']);
@@ -797,7 +797,7 @@ if ($_GET["id"] || $_GET["ref"])
 
 			$result = $product->FetchCanvas($_GET["id"],'',$_GET["action"]);
 
-			$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/';
+			$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/templates/'.$product->canvas.'/';
 
 			$product->assign_smarty_values($smarty,$_GET["action"]);
 		}

htdocs/product/liste.php

@@ -213,15 +213,15 @@ if ($resql)
 			$template = $_GET["canvas"].'/liste.tpl';
 		}
 		// Check if a default template is present
-		else if (file_exists(DOL_DOCUMENT_ROOT . '/product/canvas/'.$_GET["canvas"].'/liste.tpl'))
+		else if (file_exists(DOL_DOCUMENT_ROOT . '/product/templates/'.$_GET["canvas"].'/liste.tpl'))
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT . '/product/canvas/';
+			$smarty->template_dir = DOL_DOCUMENT_ROOT . '/product/templates/';
 			$template = $_GET["canvas"].'/liste.tpl';
 		}
 		// Error template
 		else
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT . '/theme/common/templates/';
+			$smarty->template_dir = DOL_DOCUMENT_ROOT . '/core/templates/';
 			$template = 'error.tpl';
 		}
 		

htdocs/product/pre.inc.php

@@ -50,7 +50,7 @@ function llxHeader($head = "", $urlp = "", $title="")
 	}
 
 	// Produit specifique
-	$dir = DOL_DOCUMENT_ROOT . "/product/canvas/";
+	$dir = DOL_DOCUMENT_ROOT . "/product/templates/";
 	if(is_dir($dir) && ! empty($conf->global->PRODUCT_CANVAS_ABILITY))
 	{
 		if ($handle = opendir($dir))

htdocs/product/templates/product.livre.class.php

@@ -18,13 +18,13 @@
  */
 
 /**
- *	\file       htdocs/product/canvas/product.livre.class.php
+ *	\file       htdocs/product/templates/product.livre.class.php
  *	\ingroup    produit
  *	\brief      Fichier de la classe des produits specifiques de type livre
  *	\version    $Id$
  */
 
-require_once(DOL_DOCUMENT_ROOT.'/product/canvas/product.livrecontrat.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/product/templates/product.livrecontrat.class.php');
 
 
 /**

htdocs/product/templates/product.livrecontrat.class.php

@@ -18,13 +18,13 @@
  */
 
 /**
-   \file       htdocs/product/canvas/product.livre.class.php
+   \file       htdocs/product/templates/product.livre.class.php
    \ingroup    produit
    \brief      Fichier de la classe des produits specifiques de type livre
    \version    $Id$
 */
 
-require_once(DOL_DOCUMENT_ROOT.'/product/canvas/product.livre.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/product/templates/product.livre.class.php');
 
 /**
    \class      ProductLivreContrat

htdocs/product/templates/product.livrecouverture.class.php

@@ -17,13 +17,13 @@
  */
 
 /**
-   \file       htdocs/product/canvas/product.livre.class.php
+   \file       htdocs/product/templates/product.livre.class.php
    \ingroup    produit
    \brief      Fichier de la classe des produits specifiques de type livre
    \version    $Id$
 */
 
-require_once(DOL_DOCUMENT_ROOT.'/product/canvas/product.livre.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/product/templates/product.livre.class.php');
 
 /**
    \class      ProductLivreCouverture

htdocs/theme/auguria/templates/README

@@ -0,0 +1,3 @@
+README (english)
+
+This directory is used to store custom templates. (system core and modules)

htdocs/theme/bluelagoon/templates/README

@@ -0,0 +1,3 @@
+README (english)
+
+This directory is used to store custom templates. (system core and modules)

htdocs/theme/freelug/templates/README

@@ -0,0 +1,3 @@
+README (english)
+
+This directory is used to store custom templates. (system core and modules)

htdocs/theme/rodolphe/templates/README

@@ -0,0 +1,3 @@
+README (english)
+
+This directory is used to store custom templates. (system core and modules)

htdocs/theme/yellow/templates/README

@@ -0,0 +1,3 @@
+README (english)
+
+This directory is used to store custom templates. (system core and modules)

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.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/canvas/product.livre.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/templates/product.livre.class.php");
 
 $error = 0;
 $year = strftime("%Y", time());