diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index d0eef1dc2f454c675ef35ec21d567a6a4be1c719..a5f54d5c431f161ab45837044074f5a73c75ca21 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -155,8 +155,8 @@ foreach ( $list as $key ) { print '</td></tr>'; } -print '</form>'; print "</table>\n"; +print '</form>'; print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>'; diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php index 9e5c59f45555ac92f0e2483f1de8016460c04fca..6358bf353f37afa51a0c2353adda559784df82ee 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 '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n"; + print '<input type="hidden" name="action" value="import">'; + print '<table class="noborder" width="100%">'; print '<tr class="liste_titre"><td>' . $langs->trans("accountingaccount") . '</td>'; print '<td>' . $langs->trans("label") . '</td>'; @@ -132,9 +135,6 @@ if ($result) { $form = new Form($db); $htmlacc = new FormVentilation($db); - print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n"; - print '<input type="hidden" name="action" value="import">'; - $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 e72df6a04315670d40d35d73d39886db1b87d204..85e490282986bbc58f7fb12a6b6297da05cc3513 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -181,7 +181,6 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc')); print "</td></tr>\n"; print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>'; print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n"; -print '</form>'; print "</table>\n"; @@ -285,10 +284,10 @@ if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) { } print '</tr>'; -print '</form>'; + print "</table>\n"; print '<br /><br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>'; - +print '</form>'; llxFooter(); $db->close(); \ No newline at end of file diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php index f7507cda234216ba3390e9b4dc187fc515a752e1..d97af918f90abb3f8bae929a4f8545e9a465b159 100644 --- a/htdocs/accountancy/admin/journaux.php +++ b/htdocs/accountancy/admin/journaux.php @@ -112,10 +112,10 @@ foreach ( $list as $key ) { print '</td></tr>'; } -print '</form>'; print "</table>\n"; print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>'; +print '</form>'; print '<br />'; diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 608c62cf1d08a5980d815cafcfad1bb9a5f3202f..a24ed34e052ac289f483f09330977b92659a0e0f 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -358,7 +358,8 @@ else print '<td><input type="submit" class="button" value="' . $langs->trans("Save") . '"></td>'; print '</tr>'; } - print "</table>"; + print '</table>'; + print '</form>'; } } } diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index 6291790d008834e779bbe90fab88e6b79729e997..9d0de035223e2cdc6620b6e263903ce8a50b169f 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 15cb2f87b0b447721070185c3260ed293c02824d..5fc8e16381a01dca4990fe6e98af05c2ca98bf87 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); }