diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 70f191f3679b1124026326fea77ade3dfdaa094d..623cb44cb28242772294ed8a6e58a013a6ca7a5c 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -145,8 +145,8 @@ if ($result) { print '<br/>'; print '<a class="butAction" href="./card.php?action=create">' . $langs->trans("Addanaccount") . '</a>'; - print '<a class="butAction" href="./importaccounts.php">' . $langs->trans("ImportAccount") . '</a>'; - print '<a class="butAction" href="./productaccount.php">' . $langs->trans("CheckProductAccountancyCode") . '</a>'; + // print '<a class="butAction" href="./importaccounts.php">' . $langs->trans("ImportAccount") . '</a>'; + // print '<a class="butAction" href="./productaccount.php">' . $langs->trans("CheckProductAccountancyCode") . '</a>'; print '<br/><br/>'; print '<table class="noborder" width="100%">'; diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index 7b4ca7f91ce0370f32f2c4a4ed4efd7673684cc1..14d91d855814e0f7e3d45fa823bbaaa84f31e278 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -50,12 +50,14 @@ $main_option = array ( $model_option = array ( 'ACCOUNTING_EXPORT_SEPARATORCSV', - 'ACCOUNTING_EXPORT_DATE', + 'ACCOUNTING_EXPORT_DATE' + /* 'ACCOUNTING_EXPORT_PIECE', 'ACCOUNTING_EXPORT_GLOBAL_ACCOUNT', 'ACCOUNTING_EXPORT_LABEL', 'ACCOUNTING_EXPORT_AMOUNT', - 'ACCOUNTING_EXPORT_DEVISE' + 'ACCOUNTING_EXPORT_DEVISE' + */ ); /* diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 5d3dcd737a874965f331512677651effeb1e2a27..f287c0ad9dde3bff3c0d8573173aed5b23332352 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -385,7 +385,7 @@ else { print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "bk_label_compte", "", $options, "", $sortfield, $sortorder); print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="center"', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder); print "</tr>\n"; @@ -396,7 +396,7 @@ else { print $langs->trans('From') . ': '; print $form->select_date($search_date_start, 'date_start', 0, 0, 1); print '<br>'; - print $langs->trans('To') . ': '; + print $langs->trans('to') . ': '; print $form->select_date($search_date_end, 'date_end', 0, 0, 1); print '</td>'; print '<td><input type="text" name="search_doc_ref" size="8" value="' . $search_doc_ref . '"></td>'; @@ -404,14 +404,14 @@ else { print $langs->trans('From'); print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, ''); print '<br>'; - print $langs->trans('To'); + print $langs->trans('to'); print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, ''); print '</td>'; print '<td>'; print $langs->trans('From'); print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1); print '<br>'; - print $langs->trans('To'); + print $langs->trans('to'); print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1); print '</td>'; @@ -450,7 +450,7 @@ else { print '<td>' . $line->label_compte . '</td>'; print '<td align="right">' . price($line->debit) . '</td>'; print '<td align="right">' . price($line->credit) . '</td>'; - print '<td align="right">' . $line->code_journal . '</td>'; + print '<td align="center">' . $line->code_journal . '</td>'; print '<td align="center">'; print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a> '; print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $options . '&page=' . $page . '">' . img_delete() . '</a>'; diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index e2c50c23d532a1da17db5fd0319951ca20b0aee7..04fccce1285a4e6d1df895ff2ca527915f3dd8bd 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -1,6 +1,6 @@ <?php /* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com> - * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> + * Copyright (C) 2013-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> * Copyright (C) 2014 Ari Elbaz (elarifr) <github@accedinfo.com> * Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro> * @@ -20,7 +20,7 @@ /** * \file htdocs/core/modules/modAccounting.class.php - * \ingroup Accounting Expert + * \ingroup Advanced accountancy * \brief Module to activate Accounting Expert module */ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; @@ -157,16 +157,19 @@ class modAccounting extends DolibarrModules "yesno", "1" ); + /* $this->const[15] = array ( "ACCOUNTING_GROUPBYACCOUNT", "yesno", "1" ); + */ $this->const[16] = array ( "ACCOUNTING_EXPORT_DATE", "chaine", "%d%m%Y" ); + /* $this->const[17] = array ( "ACCOUNTING_EXPORT_PIECE", "yesno", @@ -192,6 +195,7 @@ class modAccounting extends DolibarrModules "yesno", "1" ); + */ $this->const[22] = array( "ACCOUNTING_EXPENSEREPORT_JOURNAL", "chaine",