diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index d0eef1dc2f4..a5f54d5c431 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -155,8 +155,8 @@ foreach ( $list as $key ) { print ''; } -print ''; print "\n"; +print ''; print '
'; diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php index 9e5c59f4555..6358bf353f3 100644 --- a/htdocs/accountancy/admin/importaccounts.php +++ b/htdocs/accountancy/admin/importaccounts.php @@ -120,6 +120,9 @@ if ($result) { $i = 0; print_barre_liste($langs->trans("ImportAccount"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines); + print '
' . "\n"; + print ''; + print ''; print ''; print ''; @@ -132,9 +135,6 @@ if ($result) { $form = new Form($db); $htmlacc = new FormVentilation($db); - print '' . "\n"; - print ''; - $var = true; while ( $i < min($num_lines, $limit) ) { $objp = $db->fetch_object($result); diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index e72df6a0431..85e49028298 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -181,7 +181,6 @@ print '\n"; print ''; print '\n"; -print ''; print "
' . $langs->trans("accountingaccount") . '' . $langs->trans("label") . ''.nl2br($langs->trans('OptionModeTrueDesc')); print "
'.$langs->trans('OptionModeVirtual').''.nl2br($langs->trans('OptionModeVirtualDesc'))."
\n"; @@ -285,10 +284,10 @@ if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) { } print ''; -print ''; + print "\n"; print '

'; - +print ''; llxFooter(); $db->close(); \ No newline at end of file diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php index f7507cda234..d97af918f90 100644 --- a/htdocs/accountancy/admin/journaux.php +++ b/htdocs/accountancy/admin/journaux.php @@ -112,10 +112,10 @@ foreach ( $list as $key ) { print ''; } -print ''; print "\n"; print '
'; +print ''; print '
'; diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 608c62cf1d0..a24ed34e052 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -358,7 +358,8 @@ else print ''; print ''; } - print ""; + print ''; + print ''; } } } diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index 6291790d008..9d0de035223 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -27,7 +27,7 @@ /** * Class to manage accountancy book keeping */ -class BookKeeping +class BookKeeping extends CommonObject { var $db; var $error; diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 15cb2f87b0b..5fc8e16381a 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -900,7 +900,7 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al if (! empty($linkedobject["date_title"]) && ! empty($linkedobject["date_value"])) { - $posy+=3; + $posy+=7; $pdf->SetXY($posx,$posy); $pdf->MultiCell($w, $h, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', $align); }