lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ task #176 ] Allow to use ODT templates for prososal like it's done for

Browse Source 
invoices. Move pdf and odt to doc dir
This commit is contained in:
Laurent Destailleur 2012-01-04 02:04:55 +01:00
parent 29a1ae17ac
commit 90b7cd1aae
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/propale.php
View File

@ -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);

14
htdocs/core/modules/propale/modules_propale.php
View File

@ -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);

4
test/phpunit/BuildDocTest.php
View File

@ -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';