';
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 7b4ca7f91ce..14d91d85581 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 5d3dcd737a8..f287c0ad9dd 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 "\n";
@@ -396,7 +396,7 @@ else {
print $langs->trans('From') . ': ';
print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
print '
';
- print $langs->trans('To') . ': ';
+ print $langs->trans('to') . ': ';
print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
print '';
print ' | ';
@@ -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 '
';
- 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 '';
print '';
print $langs->trans('From');
print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
print ' ';
- print $langs->trans('To');
+ print $langs->trans('to');
print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
print ' | ';
@@ -450,7 +450,7 @@ else {
print '' . $line->label_compte . ' | ';
print '' . price($line->debit) . ' | ';
print '' . price($line->credit) . ' | ';
- print '' . $line->code_journal . ' | ';
+ print '' . $line->code_journal . ' | ';
print '';
print '' . img_edit() . ' ';
print '' . img_delete() . '';
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index e2c50c23d53..04fccce1285 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2013-2015 Alexandre Spangaro
+ * Copyright (C) 2013-2016 Alexandre Spangaro
* Copyright (C) 2014 Ari Elbaz (elarifr)
* Copyright (C) 2014 Florian Henry
*
@@ -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",
|