*
* 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
@@ -106,10 +107,10 @@ else if ($action == 'deletecontact' && $user->rights->commande->creer)
}
}
-else if ($action == 'setaddress' && $user->rights->commande->creer)
-{
- $object->fetch($id);
- $object->setDeliveryAddress($_POST['fk_address']);
+else if ($action == 'setaddress' && $user->rights->commande->creer)
+{
+ $object->fetch($id);
+ $object->setDeliveryAddress($_POST['fk_address']);
}
/*
@@ -173,27 +174,27 @@ if ($id > 0 || ! empty($ref))
print "| ".$langs->trans("Company")." | ";
print ''.$object->client->getNomUrl(1).' |
';
- // Delivery address
- if ($conf->global->SOCIETE_ADDRESSES_MANAGEMENT)
- {
- print '| ';
- print '';
- print ' | ';
-
- if ($action == 'editdelivery_address')
- {
- $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'fk_address','commande',$object->id);
- }
- else
- {
- $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'none','commande',$object->id);
- }
- print ' |
';
+ // Delivery address
+ if ($conf->global->SOCIETE_ADDRESSES_MANAGEMENT)
+ {
+ print '| ';
+ print '';
+ print ' | ';
+
+ if ($action == 'editdelivery_address')
+ {
+ $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'fk_address','commande',$object->id);
+ }
+ else
+ {
+ $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'none','commande',$object->id);
+ }
+ print ' |
';
}
print "";
@@ -202,8 +203,15 @@ if ($id > 0 || ! empty($ref))
print '
';
- // Contacts lines
- include(DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php');
+ // Select template for Contacts lines
+ if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/contacts.tpl.php"))
+ {
+ include(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/contacts.tpl.php");
+ }
+ else
+ {
+ include(DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php');
+ }
}
else
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index f239178236e..b06872d3e0d 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -5,7 +5,7 @@
* Copyright (C) 2005-2011 Regis Houssin
* Copyright (C) 2006 Andre Cianfarani
* Copyright (C) 2011 Juanjo Menent
- * Copyright (C) 2011 Philippe Grand
+ * Copyright (C) 2011-2012 Philippe Grand
*
* 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
@@ -156,13 +156,8 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs)
$langs->load("sendings");
- // Increase limit for PDF build
- $err=error_reporting();
- error_reporting(0);
- @set_time_limit(120);
- error_reporting($err);
+ $error=0;
- $dir = "/core/modules/expedition/";
$srctemplatepath='';
// Positionne le modele sur le nom du modele a utiliser
@@ -180,28 +175,33 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs)
// If selected modele is a filename template (then $modele="modelname:filename")
$tmp=explode(':',$modele,2);
- if (! empty($tmp[1]))
- {
- $modele=$tmp[0];
- $srctemplatepath=$tmp[1];
- }
+ if (! empty($tmp[1]))
+ {
+ $modele=$tmp[0];
+ $srctemplatepath=$tmp[1];
+ }
- // Search template file
+ // Search template files
$file=''; $classname=''; $filefound=0;
- foreach(array('doc','pdf') as $prefix)
+ $dirmodels=array('/');
+ if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+ foreach($dirmodels as $reldir)
{
- $file = $prefix."_expedition_".$modele.".modules.php";
+ foreach(array('doc','pdf') as $prefix)
+ {
+ $file = $prefix."_expedition_".$modele.".modules.php";
- // On verifie l'emplacement du modele
- $file = dol_buildpath($dir.'doc/'.$file);
-
- if (file_exists($file))
- {
- $filefound=1;
- $classname=$prefix.'_expedition_'.$modele;
- break;
- }
- }
+ // On verifie l'emplacement du modele
+ $file=dol_buildpath($reldir."core/modules/expedition/doc/".$file,0);
+ if (file_exists($file))
+ {
+ $filefound=1;
+ $classname=$prefix.'_expedition_'.$modele;
+ break;
+ }
+ }
+ if ($filefound) break;
+ }
// Charge le modele
if ($filefound)
@@ -215,7 +215,7 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs)
// We save charset_output to restore it because write_file can change it if needed for
// output format that does not support UTF8.
$sav_charset_output=$outputlangs->charset_output;
- if ($obj->write_file($object, $outputlangs) > 0)
+ if ($obj->write_file($object, $outputlangs, $srctemplatepath) > 0)
{
$outputlangs->charset_output=$sav_charset_output;
@@ -238,4 +238,4 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs)
return -1;
}
}
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php
index 1454421b1fb..c9343e8ae95 100644
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/livraison/modules_livraison.php
@@ -3,6 +3,7 @@
* Copyright (C) 2004-2011 Laurent Destailleur
* Copyright (C) 2004 Eric Seigne
* Copyright (C) 2006-2011 Regis Houssin
+ * Copyright (C) 2011-2012 Philippe Grand
*
* 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
@@ -154,33 +155,62 @@ abstract class ModeleNumRefDeliveryOrder
* @param Translate $outputlangs objet lang a utiliser pour traduction
* @return int 0 if KO, 1 if OK
*/
-function delivery_order_pdf_create($db, $object, $model='', $outputlangs='')
+function delivery_order_pdf_create($db, $object, $modele, $outputlangs='')
{
global $conf,$langs;
+
$langs->load("deliveries");
- $dir = "/core/modules/livraison/pdf/";
+ $error=0;
+
+ $srctemplatepath='';
// Positionne modele sur le nom du modele de bon de livraison a utiliser
- if (! dol_strlen($model))
+ if (! dol_strlen($modele))
{
if ($conf->global->LIVRAISON_ADDON_PDF)
{
- $model = $conf->global->LIVRAISON_ADDON_PDF;
+ $modele = $conf->global->LIVRAISON_ADDON_PDF;
}
else
{
- print $langs->trans("Error")." ".$langs->trans("Error_LIVRAISON_ADDON_PDF_NotDefined");
- return 0;
+ $modele = 'typhon';
}
}
- // Charge le modele
- $file = "pdf_".$model.".modules.php";
- // On verifie l'emplacement du modele
- $file = dol_buildpath($dir.$file);
- if (file_exists($file))
+
+ // If selected modele is a filename template (then $modele="modelname:filename")
+ $tmp=explode(':',$modele,2);
+ if (! empty($tmp[1]))
+ {
+ $modele=$tmp[0];
+ $srctemplatepath=$tmp[1];
+ }
+
+ // Search template files
+ $file=''; $classname=''; $filefound=0;
+ $dirmodels=array('/');
+ if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+ foreach($dirmodels as $reldir)
+ {
+ foreach(array('doc','pdf') as $prefix)
+ {
+ $file = $prefix."_".$modele.".modules.php";
+
+ // On verifie l'emplacement du modele
+ $file=dol_buildpath($reldir."core/modules/livraison/pdf/".$file,0);
+ if (file_exists($file))
+ {
+ $filefound=1;
+ $classname=$prefix.'_'.$modele;
+ break;
+ }
+ }
+ if ($filefound) break;
+ }
+
+ // Charge le modele
+ if ($filefound)
{
- $classname = "pdf_".$model;
require_once($file);
$obj = new $classname($db);
@@ -212,4 +242,4 @@ function delivery_order_pdf_create($db, $object, $model='', $outputlangs='')
}
}
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index b34c255f61b..d3fd5832a78 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1060,7 +1060,7 @@ class Expedition extends CommonObject
// Initialise parametres
$this->id=0;
- $this->ref = 'SPECIMEN_SHIP';
+ $this->ref = 'SPECIMEN';
$this->specimen=1;
$this->statut = 1;
$this->livraison_id = 0;
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 5377fee4f97..e709dc4d6db 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -3,6 +3,7 @@
* Copyright (C) 2005-2010 Regis Houssin
* Copyright (C) 2006-2007 Laurent Destailleur
* Copyright (C) 2007 Franky Van Liedekerke
+ * Copyright (C) 2011-2012 Philippe Grand
*
* 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
@@ -773,7 +774,7 @@ class Livraison extends CommonObject
// Initialise parametres
$this->id=0;
- $this->ref = 'SPECIMEN_RECEIPT';
+ $this->ref = 'SPECIMEN';
$this->specimen=1;
$this->socid = 1;
$this->date_delivery = $now;
@@ -905,4 +906,4 @@ class LivraisonLigne
}
-?>
+?>
\ No newline at end of file