diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index bff9dbe4265..0bf37a7753e 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -173,11 +173,12 @@ if ($result) { print ''; print ''; - $var = true; + $var = false; $accountstatic=new AccountingAccount($db); - while ( $i < min($num, $limit) ) { + while ( $i < min($num, $limit) ) + { $obj = $db->fetch_object($resql); $accountstatic->id=$obj->rowid; diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index 3da29bd9cc1..856670e18e2 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -99,12 +99,13 @@ print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup $head = admin_accounting_prepare_head(); -dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron'); print '
'; print ''; print ''; +dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron'); + print ''; $var = true; @@ -169,7 +170,9 @@ if ($num) print "
\n"; } -print '
'; +dol_fiche_end(); + +print '
'; print '
'; diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index fc8994c4836..44b2268dc06 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -157,12 +157,13 @@ print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup $head = admin_accounting_prepare_head($accounting); -dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron'); print '
'; print ''; print ''; +dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron'); + print ''; // Cas du parametre ACCOUNTING_MODE @@ -291,7 +292,11 @@ print ''; print "
\n"; -print '

'; +dol_fiche_end(); + +print '
'; + print '
'; + llxFooter(); $db->close(); diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journal.php similarity index 95% rename from htdocs/accountancy/admin/journaux.php rename to htdocs/accountancy/admin/journal.php index e2359ebd8ee..e1d4894788a 100644 --- a/htdocs/accountancy/admin/journaux.php +++ b/htdocs/accountancy/admin/journal.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/accountancy/admin/journaux.php + * \file htdocs/accountancy/admin/journal.php * \ingroup Accounting Expert * \brief Setup page to configure accounting expert module */ @@ -87,12 +87,12 @@ print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup $head = admin_accounting_prepare_head(null); -dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron'); - print '
'; print ''; print ''; +dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron'); + print ''; print ''; print ''; @@ -115,10 +115,9 @@ foreach ( $list as $key ) { print "
' . $langs->trans('Journaux') . '
\n"; -print '
'; -print '
'; -print '
'; +print '
'; + print ''; print ''; @@ -164,9 +163,12 @@ $db->free($resql); print "
\n"; -print ''; +dol_fiche_end(); + +print '
'; + +print ''; -print '
'; llxFooter(); $db->close(); \ No newline at end of file diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 315c9f55325..9898064f6d5 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -287,8 +287,9 @@ if ($result) { print '' . $langs->trans("Accountancy_code_sell_suggest") . ''; } // print_liste_field_titre(''); - print '' . $langs->trans("Ventilate") . '
/' . ''; + print_liste_field_titre($langs->trans("Ventilate") . '
/ '); print ''; + print ''; print ''; print ''; @@ -359,7 +360,7 @@ if ($result) { // print '' . $compta_prodbuy . ''; // TODO: we shoul set a user defined value to adjust user square / wide screen size // $trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50; - print ''; + print ''; print $form->select_account($compta_prodbuy_id, 'codeventil_'.$product_static->id, 1); print ''; } else { @@ -369,7 +370,7 @@ if ($result) { // TODO: replace by select // TODO: we shoul set a user defined value to adjust user square / wide screen size // $trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50; - print ''; + print ''; print $form->select_account($compta_prodsell_id, 'codeventil_'.$product_static->id, 1); print ''; } diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index f4d6400449f..250d9001679 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -571,7 +571,7 @@ else // Title print ''; - print ''.$langs->trans("ReportName").''; + print ''.$langs->trans("ReportName").''; print ''.$namereport.''; print ''; print ''; @@ -588,7 +588,7 @@ else // Description print ''; - print ''.$langs->trans("ReportDescription").''; + print ''.$langs->trans("ReportDescription").''; print ''.$description.''; print ''; diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php index 196dcfe0997..6e6da6bd686 100644 --- a/htdocs/core/lib/accounting.lib.php +++ b/htdocs/core/lib/accounting.lib.php @@ -47,12 +47,12 @@ function admin_accounting_prepare_head(AccountingAccount $object=null) // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_admin'); - $head[$h][0] = dol_buildpath('/accountancy/admin/journaux.php', 1); + $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journal.php'; $head[$h][1] = $langs->trans("Journaux"); $head[$h][2] = 'journal'; $h ++; - $head[$h][0] = dol_buildpath('/accountancy/admin/export.php', 1); + $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/export.php'; $head[$h][1] = $langs->trans("Export"); $head[$h][2] = 'export'; $h ++; @@ -75,7 +75,7 @@ function accounting_prepare_head(AccountingAccount $object) $h = 0; $head = array (); - $head[$h][0] = dol_buildpath('/accountancy/admin/card.php', 1) . '?id=' . $object->id; + $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'card'; $h ++; diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php index 79ab5fe0ead..8946449d5ac 100644 --- a/htdocs/core/lib/report.lib.php +++ b/htdocs/core/lib/report.lib.php @@ -61,7 +61,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat // Ligne de titre print ''; - print ''.$langs->trans("ReportName").''; + print ''.$langs->trans("ReportName").''; if (! $variantexxx) print ''; else print ''; print $nom; @@ -73,7 +73,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat if ($calcmode) { print ''; - print ''.$langs->trans("CalculationMode").''; + print ''.$langs->trans("CalculationMode").''; if (! $variante) print ''; else print ''; print $calcmode; @@ -94,7 +94,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat // Ligne de description print ''; - print ''.$langs->trans("ReportDescription").''; + print ''.$langs->trans("ReportDescription").''; print ''.$description.''; print '';