Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Doxygen

Browse Source 
Fix: Bad vars
This commit is contained in:
Laurent Destailleur
2011-10-29 18:15:54 +02:00
parent d183265702
commit de842ef1e1
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/core/lib/functions.lib.php
View File

@@ -585,7 +585,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
$out.="</div>\n"; $out.="</div>\n";
if (! $notab) $out.="\n".'<div class="tabBar">'."\n"; if (! $notab) $out.="\n".'<div class="tabBar">'."\n";
// Parameters for edit in place // Parameters for edit in place
if (! empty($GLOBALS['object'])) if (! empty($GLOBALS['object']))
{ {
@@ -3848,10 +3848,10 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='
/** /**
* Format output for start and end date * Format output for start and end date
* *
* @param date_start Start date * @param timestamp $date_start Start date
* @param date_end End date * @param timestamp $date_end End date
* @param format Output format * @param string $format Output format
* @param outputlangs Output language * @param Translate $outputlangs Output language
* @return void * @return void
*/ */
function print_date_range($date_start,$date_end,$format = '',$outputlangs='') function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
@@ -3862,11 +3862,11 @@ function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
/** /**
* Format output for start and end date * Format output for start and end date
* *
* @param date_start Start date * @param timestamp $date_start Start date
* @param date_end End date * @param timestamp $date_end End date
* @param format Output format * @param string $format Output format
* @param outputlangs Output language * @param Translate $outputlangs Output language
* @return string String * @return string String
*/ */
function get_date_range($date_start,$date_end,$format = '',$outputlangs='') function get_date_range($date_start,$date_end,$format = '',$outputlangs='')
{ {

10
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
View File

@@ -43,7 +43,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
/** /**
* Constructor * Constructor
* *
* @param DoliDB $DB Database handler * @param DoliDB $db Database handler
*/ */
function doc_generic_odt($db) function doc_generic_odt($db)
{ {
@@ -226,7 +226,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
// Open and load template // Open and load template
require_once(ODTPHP_PATH.'odf.php'); require_once(ODTPHP_PATH.'odf.php');
$odfHandler = new odf($srctemplatepath, array( $odfHandler = new odf($srctemplatepath, array
(
'PATH_TO_TMP' => $conf->societe->dir_temp, 'PATH_TO_TMP' => $conf->societe->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{', 'DELIMITER_LEFT' => '{',
@@ -255,6 +256,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
} }
catch(OdfException $e) catch(OdfException $e)
{ {
// setVars failed, probably because key not found
} }
} }
// Make substitutions into odt of mysoc info // Make substitutions into odt of mysoc info
@@ -276,11 +278,12 @@ class doc_generic_odt extends ModeleThirdPartyDoc
} }
catch(OdfException $e) catch(OdfException $e)
{ {
// setVars failed, probably because key not found
} }
} }
// Make substitutions into odt of thirdparty + external modules // Make substitutions into odt of thirdparty + external modules
$tmparray=$this->get_substitutionarray_thirdparty($object,$outputlangs); $tmparray=$this->get_substitutionarray_thirdparty($object,$outputlangs);
complete_substitutions_array($tmparray, $ouputlangs, $object); complete_substitutions_array($tmparray, $outputlangs, $object);
//var_dump($object->id); exit; //var_dump($object->id); exit;
foreach($tmparray as $key=>$value) foreach($tmparray as $key=>$value)
{ {
@@ -297,6 +300,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
} }
catch(OdfException $e) catch(OdfException $e)
{ {
// setVars failed, probably because key not found
} }
} }

12
htdocs/core/modules/societe/modules_societe.class.php
View File

@@ -352,12 +352,12 @@ abstract class ModeleAccountancyCode
/** /**
* Create a document for third party * Create a document for third party
* *
* @param db Database handler * @param DoliDB $db Database handler
* @param id Id of third party to use * @param int $id Id of third party to use
* @param message Message * @param string $message Message
* @param modele Force model to use ('' to not force). model can be a model name or a template file. * @param string $modele Force model to use ('' to not force). model can be a model name or a template file.
* @param outputlangs Objet lang to use for translation * @param Translate $outputlangs Object lang to use for translation
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function thirdparty_doc_create($db, $id, $message, $modele, $outputlangs) function thirdparty_doc_create($db, $id, $message, $modele, $outputlangs)
{ {