| ' . $langs->trans("Pcgtype") . ' | ';
print '';
@@ -195,13 +195,13 @@ else if ($id)
print '';
- print '| ' . $langs->trans("AccountNumber") . ' | ';
+ print ' | ' . $langs->trans("AccountNumber") . ' | ';
print ' | ';
- print '| ' . $langs->trans("Label") . ' | ';
+ print ' | ' . $langs->trans("Label") . ' | ';
print ' | ';
print '| ' . $langs->trans("Accountparent") . ' | ';
print '';
- print $htmlacc->select_account($accounting->account_parent, 'account_parent');
+ print $htmlacc->select_account($accounting->account_parent, 'account_parent', 1);
print ' | ';
print '| ' . $langs->trans("Pcgtype") . ' | ';
print '';
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index 365fbef4cdf..340882a3e5a 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -395,7 +395,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
*/
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
+ if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index db0017a2e98..c40b8bb93a1 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -242,7 +242,7 @@ class pdf_baleine extends ModelePDFProjects
$nexY = $pdf->GetY();
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
diff --git a/htdocs/includes/adodbtime/adodb-time.inc.php b/htdocs/includes/adodbtime/adodb-time.inc.php
index 1be5f4cd607..88d05d2f2b1 100644
--- a/htdocs/includes/adodbtime/adodb-time.inc.php
+++ b/htdocs/includes/adodbtime/adodb-time.inc.php
@@ -1006,7 +1006,7 @@ function adodb_tz_offset($gmt,$isphp5)
return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
else
return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
- break;
+ //break;
}
| |