From 90b7cd1aae6e504d9e0897f5b155911827167138 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2012 02:04:55 +0100
Subject: [PATCH] [ task #176 ] Allow to use ODT templates for prososal like
it's done for invoices. Move pdf and odt to doc dir
---
htdocs/admin/propale.php | 6 +++---
htdocs/core/modules/propale/modules_propale.php | 14 +++++++-------
test/phpunit/BuildDocTest.php | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index b9e5bf5af30..7e57e60d2f6 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -71,12 +71,12 @@ if ($action == 'specimen')
$propal->initAsSpecimen();
// Charge le modele
- $dir = "/core/modules/propale/";
- $file = "pdf_propale_".$modele.".modules.php";
+ $dir = "/core/modules/propale/doc/";
+ $file = "pdf_".$modele.".modules.php";
$file = dol_buildpath($dir.$file);
if (file_exists($file))
{
- $classname = "pdf_propale_".$modele;
+ $classname = "pdf_".$modele;
require_once($file);
$module = new $classname($db);
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index 3dbe4e79d66..e0898fc4930 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -147,7 +147,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
$langs->load("propale");
$error=0;
-
+
$dir = "/core/modules/propale/";
$srctemplatepath='';
@@ -233,11 +233,11 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$dir.$file));
return -1;
}
-
-
+
+
/*
// Positionne modele sur le nom du modele de propale a utiliser
- $file = "pdf_propale_".$modele.".modules.php";
+ $file = "pdf_".$modele.".modules.php";
// On verifie l'emplacement du modele
$file = dol_buildpath($dir.$file);
@@ -248,7 +248,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
if (! $modelisok)
{
if ($conf->global->PROPALE_ADDON_PDF) $modele = $conf->global->PROPALE_ADDON_PDF;
- $file = "pdf_propale_".$modele.".modules.php";
+ $file = "pdf_".$modele.".modules.php";
// On verifie l'emplacement du modele
$file = dol_buildpath($dir.$file);
if (file_exists($file)) $modelisok=1;
@@ -259,7 +259,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
{
$liste=ModelePDFPropales::liste_modeles($db);
$modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau
- $file = "pdf_propale_".$modele.".modules.php";
+ $file = "pdf_".$modele.".modules.php";
$file = dol_buildpath($dir.$file);
if (file_exists($file)) $modelisok=1;
}
@@ -268,7 +268,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
// Charge le modele
if ($modelisok)
{
- $classname = "pdf_propale_".$modele;
+ $classname = "pdf_".$modele;
require_once($file);
$obj = new $classname($db);
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index e9f243a0dd7..e2b23ef9cde 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -37,10 +37,10 @@ require_once dirname(__FILE__).'/../../htdocs/projet/class/task.class.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/pdf.lib.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/doc/pdf_oursin.modules.php';
+require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/doc/pdf_azur.modules.php';
+require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/doc/pdf_jaune.modules.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/commande/pdf_edison.modules.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/commande/pdf_einstein.modules.php';
-require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/pdf_propale_azur.modules.php';
-require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/pdf_propale_jaune.modules.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/project/pdf/pdf_baleine.modules.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/fichinter/pdf_soleil.modules.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php';
--
GitLab