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

Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1

Browse Source
This commit is contained in:
Laurent Destailleur 2011-11-01 22:47:14 +01:00
commit ab3abaa7a3
9 changed files with 718 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/tools/listevents.php
View File

@ -93,7 +93,7 @@ if ($_REQUEST['action'] == 'confirm_purge' && $_REQUEST['confirm'] == 'yes' && $
else else
{ {
$error++; $error++;
dol_syslog($securityevent->error, LOG_ERROR); dol_syslog($securityevent->error, LOG_ERR);
$db->rolback(); $db->rolback();
} }
} }

2
htdocs/compta/prelevement/class/bon-prelevement.class.php
View File

@ -1029,7 +1029,7 @@ class BonPrelevement extends CommonObject
else else
{ {
$this->db->rollback(); $this->db->rollback();
dol_syslog("Error",LOG_ERROR); dol_syslog("Error",LOG_ERR);
} }
return sizeof($factures_prev); return sizeof($factures_prev);

2
htdocs/contact/index.php
View File

@ -407,7 +407,7 @@ if ($result)
print '</form>'; print '</form>';
if ($num > $limit) print_barre_liste('' ,$page, "index.php", '&amp;begin='.$begin.'&amp;view='.$view.'&amp;userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords, ''); if ($num > $limit) print_barre_liste('' ,$page, $_SERVER["PHP_SELF"], '&amp;begin='.$begin.'&amp;view='.$view.'&amp;userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords, '');
$db->free($result); $db->free($result);
} }

8
htdocs/core/class/interfaces.class.php
View File

@ -59,7 +59,7 @@ class Interfaces
// Check parameters // Check parameters
if (! is_object($object) || ! is_object($conf)) // Error if (! is_object($object) || ! is_object($conf)) // Error
{ {
dol_syslog('interface::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_ERROR); dol_syslog('interface::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_ERR);
return -1; return -1;
} }
if (! is_object($user) || ! is_object($langs)) // Warning if (! is_object($user) || ! is_object($langs)) // Warning
@ -71,7 +71,7 @@ class Interfaces
{ {
$dir=dol_buildpath($reldir,0); $dir=dol_buildpath($reldir,0);
//print "xx".$dir;exit; //print "xx".$dir;exit;
// Check if directory exists // Check if directory exists
if (!is_dir($dir)) continue; if (!is_dir($dir)) continue;
@ -154,7 +154,7 @@ class Interfaces
} }
else else
{ {
dol_syslog("Interfaces::run_triggers action=".$action." Failed to instantiate trigger for file '".$file."'",LOG_ERROR); dol_syslog("Interfaces::run_triggers action=".$action." Failed to instantiate trigger for file '".$file."'",LOG_ERR);
} }
} }
} }
@ -194,7 +194,7 @@ class Interfaces
{ {
$dir=dol_buildpath($reldir,0); $dir=dol_buildpath($reldir,0);
//print "xx".$dir;exit; //print "xx".$dir;exit;
// Check if directory exists // Check if directory exists
if (!is_dir($dir)) continue; if (!is_dir($dir)) continue;

17
htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -358,15 +358,13 @@ class doc_generic_invoice_odt extends ModelePDFFactures
// Make substitutions into odt of freetext // Make substitutions into odt of freetext
if ($newfreetext) try {
{ $odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
try {
$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
}
catch(OdfException $e)
{
}
} }
catch(OdfException $e)
{
}
// Make substitutions into odt of user info // Make substitutions into odt of user info
$tmparray=$this->get_substitutionarray_user($user,$outputlangs); $tmparray=$this->get_substitutionarray_user($user,$outputlangs);
//var_dump($tmparray); exit; //var_dump($tmparray); exit;
@ -428,8 +426,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
{ {
} }
} }
// Replace tags of object // Replace tags of object + external module
$tmparray=$this->get_substitutionarray_object($object,$outputlangs); $tmparray=$this->get_substitutionarray_object($object,$outputlangs);
complete_substitutions_array($tmparray, $outputlangs, $object);
foreach($tmparray as $key=>$value) foreach($tmparray as $key=>$value)
{ {
try { try {

2
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -455,7 +455,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY(82, $posy); $pdf->SetXY(82, $posy);
$lib_availability=$outputlangs->transnoentities("AvailabilityPeriod".$object->availability_code)!=('AvailabilityPeriod'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityPeriod".$object->availability_code):$outputlangs->convToOutputCharset($object->availability); $lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
$lib_availability=str_replace('\n',"\n",$lib_availability); $lib_availability=str_replace('\n',"\n",$lib_availability);
$pdf->MultiCell(80, 4, $lib_availability,0,'L'); $pdf->MultiCell(80, 4, $lib_availability,0,'L');

992
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

File diff suppressed because it is too large Load Diff

2
htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -277,7 +277,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
} }
// 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, $langs, $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)
{ {

4
htdocs/lib/CMailFile.class.php
View File

@ -332,7 +332,7 @@ class CMailFile
if (! $dest) if (! $dest)
{ {
$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid"; $this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERROR); dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
} }
else else
{ {
@ -361,7 +361,7 @@ class CMailFile
if (! $res) if (! $res)
{ {
$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Check your server logs and your firewalls setup"; $this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Check your server logs and your firewalls setup";
dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERROR); dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
} }
else else
{ {