diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 79d642ffcefc148a369ddb79bcfea3637e6e7df6..f0a103ae912892293b3566fc2bb6b442566800c8 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -65,14 +65,6 @@ $formventilation = new FormVentilation($db);
$formother = new FormOther($db);
$form = new Form($db);
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
-{
- $search_accountancy_code_start = '';
- $search_accountancy_code_end = '';
- $search_date_start = '';
- $search_date_end = '';
-}
-
if (empty($search_date_start)) {
$search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
@@ -106,6 +98,19 @@ if (! empty($search_accountancy_code_end)) {
* Action
*/
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+ $search_accountancy_code_start = '';
+ $search_accountancy_code_end = '';
+ $search_date_start = '';
+ $search_date_end = '';
+}
+
+
+/*
+ * View
+ */
+
if ($action == 'export_csv') {
$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
$journal = 'bookkepping';
@@ -132,155 +137,148 @@ if ($action == 'export_csv') {
}
else {
-
- $title_page = $langs->trans("AccountBalance") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
-
- llxHeader('', $title_page);
-
- /*
- * List
- */
- $nbtotalofrecords = 0;
- if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- $nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
- if ($nbtotalofrecords < 0) {
- setEventMessages($object->error, $object->errors, 'errors');
- }
- }
-
- $result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
- if ($result < 0) {
- setEventMessages($object->error, $object->errors, 'errors');
- }
-
- print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, 0, 'title_accountancy');
-
- print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
- print '<div class="tabsAction">' . "\n";
- print '<div class="inline-block divButAction"><input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" /></div>';
- print '</div>';
-
- $moreforfilter='';
-
- $moreforfilter.='<div class="divsearchfield">';
- $moreforfilter.=$langs->trans('DateStart') . ': ';
- $moreforfilter.=$form->select_date($search_date_start, 'date_start', 0, 0, 1, '', 1, 0, 1);
- $moreforfilter.=$langs->trans('DateEnd') . ': ';
- $moreforfilter.=$form->select_date($search_date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
- $moreforfilter.='</div>';
-
- if (! empty($moreforfilter))
- {
- print '<div class="liste_titre liste_titre_bydiv centpercent">';
- print $moreforfilter;
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- print '</div>';
- }
-
- print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
- print '<tr class="liste_titre">';
- print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
- print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "t.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("Solde"), $_SERVER["PHP_SELF"], "", $options, "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
- print "</tr>\n";
-
- print '<tr class="liste_titre">';
- print '<td colspan="2">';
- 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 $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
- print '</td>';
-
- print '<td> </td>';
- print '<td> </td>';
- print '<td> </td>';
-
- print '<td align="right" class="liste_titre">';
- print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
- print ' ';
- print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
- print '</td>';
-
- print '</tr>';
-
- $var = True;
-
- $total_debit = 0;
- $total_credit = 0;
- $sous_total_debit = 0;
- $sous_total_credit = 0;
- $displayed_account = "";
-
- foreach ( $object->lines as $line ) {
- $var = ! $var;
- $link = '';
- $total_debit += $line->debit;
- $total_credit += $line->credit;
- $description = $object->get_compte_desc($line->numero_compte); // Search description of the account
- $root_account_description = $object->get_compte_racine($line->numero_compte);
- if(empty($description)){
- $link = '<a href="../admin/card.php?action=create&compte=' . length_accountg($line->numero_compte) . '">' . img_edit_add() .'</a>';
- }
- print '<tr'. $bc[$var].'>';
-
-
- // Permet d'afficher le compte comptable
- if ($root_account_description != $displayed_account) {
-
- // Affiche un Sous-Total par compte comptable
- if ($displayed_account != "") {
- print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td><td class="nowrap" align="right">'.price($sous_total_credit-$sous_total_debit).'</td>';
- print "<td> </td>\n";
- print '</tr>';
- }
-
- // Affiche le compte comptable en d�but de ligne
- print "<tr>";
- print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">'. $root_account_description .'</td>';
- print '</tr>';
-
- $displayed_account = $root_account_description;
- $sous_total_debit = 0;
- $sous_total_credit = 0;
+ $title_page = $langs->trans("AccountBalance") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
+
+ llxHeader('', $title_page);
+
+ // List
+
+ $nbtotalofrecords = 0;
+ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+ $nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
+ if ($nbtotalofrecords < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
}
-
- // $object->get_compte_racine($line->numero_compte);
-
-
- print '<td>' . length_accountg($line->numero_compte) . '</td>';
- print '<td>' . $description . '</td>';
- print '<td align="right">' . number_format($line->debit, 2, ',', ' ') . '</td>';
- print '<td align="right">' . number_format($line->credit, 2, ',', ' ') . '</td>';
- print '<td align="right">' . number_format($line->credit - $line->debit, 2, ',', ' ') . '</td>';
- print '<td align="center">' . $link;
- print '</td>';
- print "</tr>\n";
-
- // Comptabilise le sous-total
- $sous_total_debit += $line->debit;
- $sous_total_credit += $line->credit;
-
- }
-
- print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td><td class="nowrap" align="right">'.price($sous_total_credit-$sous_total_debit).'</td>';
- print "<td> </td>\n";
- print '</tr>';
-
- print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("AccountBalance") . ':</td><td class="nowrap" align="right">'.price($total_debit).'</td><td class="nowrap" align="right">'.price($total_credit).'</td><td class="nowrap" align="right">'.price($total_credit-$total_debit).'</td>';
- print "<td> </td>\n";
- print '</tr>';
-
-
- print "</table>";
- print '</form>';
-
- llxFooter();
+
+ $result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+
+
+ print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+
+ $button = '<input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" />';
+ print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, 0, 'title_accountancy', 0, $button);
+
+
+ $moreforfilter = '';
+
+ $moreforfilter .= '<div class="divsearchfield">';
+ $moreforfilter .= $langs->trans('DateStart') . ': ';
+ $moreforfilter .= $form->select_date($search_date_start, 'date_start', 0, 0, 1, '', 1, 0, 1);
+ $moreforfilter .= $langs->trans('DateEnd') . ': ';
+ $moreforfilter .= $form->select_date($search_date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
+ $moreforfilter .= '</div>';
+
+ if (! empty($moreforfilter)) {
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
+ print $moreforfilter;
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ print '</div>';
+ }
+
+ print '<table class="liste ' . ($moreforfilter ? "listwithfilterbefore" : "") . '">';
+ print '<tr class="liste_titre">';
+ print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
+ print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "t.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("Solde"), $_SERVER["PHP_SELF"], "", $options, "", 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+ print "</tr>\n";
+
+ print '<tr class="liste_titre">';
+ print '<td colspan="2">';
+ 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 $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
+ print '</td>';
+
+ print '<td> </td>';
+ print '<td> </td>';
+ print '<td> </td>';
+
+ print '<td align="right" class="liste_titre">';
+ print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+ print ' ';
+ print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
+ print '</td>';
+
+ print '</tr>';
+
+ $var = True;
+
+ $total_debit = 0;
+ $total_credit = 0;
+ $sous_total_debit = 0;
+ $sous_total_credit = 0;
+ $displayed_account = "";
+
+ foreach ($object->lines as $line) {
+ $var = ! $var;
+ $link = '';
+ $total_debit += $line->debit;
+ $total_credit += $line->credit;
+ $description = $object->get_compte_desc($line->numero_compte); // Search description of the account
+ $root_account_description = $object->get_compte_racine($line->numero_compte);
+ if (empty($description)) {
+ $link = '<a href="../admin/card.php?action=create&compte=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
+ }
+ print '<tr' . $bc[$var] . '>';
+
+ // Permet d'afficher le compte comptable
+ if ($root_account_description != $displayed_account) {
+
+ // Affiche un Sous-Total par compte comptable
+ if ($displayed_account != "") {
+ print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit - $sous_total_debit) . '</td>';
+ print "<td> </td>\n";
+ print '</tr>';
+ }
+
+ // Affiche le compte comptable en d�but de ligne
+ print "<tr>";
+ print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">' . $root_account_description . '</td>';
+ print '</tr>';
+
+ $displayed_account = $root_account_description;
+ $sous_total_debit = 0;
+ $sous_total_credit = 0;
+ }
+
+ // $object->get_compte_racine($line->numero_compte);
+
+ print '<td>' . length_accountg($line->numero_compte) . '</td>';
+ print '<td>' . $description . '</td>';
+ print '<td align="right">' . number_format($line->debit, 2, ',', ' ') . '</td>';
+ print '<td align="right">' . number_format($line->credit, 2, ',', ' ') . '</td>';
+ print '<td align="right">' . number_format($line->credit - $line->debit, 2, ',', ' ') . '</td>';
+ print '<td align="center">' . $link;
+ print '</td>';
+ print "</tr>\n";
+
+ // Comptabilise le sous-total
+ $sous_total_debit += $line->debit;
+ $sous_total_credit += $line->credit;
+ }
+
+ print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit - $sous_total_debit) . '</td>';
+ print "<td> </td>\n";
+ print '</tr>';
+
+ print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("AccountBalance") . ':</td><td class="nowrap" align="right">' . price($total_debit) . '</td><td class="nowrap" align="right">' . price($total_credit) . '</td><td class="nowrap" align="right">' . price($total_credit - $total_debit) . '</td>';
+ print "<td> </td>\n";
+ print '</tr>';
+
+ print "</table>";
+ print '</form>';
+
+ llxFooter();
}
$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index a650100918eefac5d97e778e3257cd5cb90031b0..df2ee00e86913666b4665db10430f97bbfee5cc9 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -288,7 +288,7 @@ if ($action == 'export_csv') {
}
$title_page = $langs->trans("Bookkeeping");
-if ($search_date_start || $search_date_end) $title_page .= ' ' . dol_print_date($search_date_start, 'day') . ' - ' . dol_print_date($search_date_end, 'day');
+
llxHeader('', $title_page);
// List
@@ -356,20 +356,21 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
+$button = '<a class="butAction" name="button_export_csv" href="'.$_SERVER["PHP_SELF"].'?action=export_csv'.($param?'&'.$param:'').'">';
+if (count($filter)) $button.= $langs->trans("ExportFilteredList");
+else $button.= $langs->trans("ExportList");
+$button.= '</a>';
+
+$groupby = ' <a href="./listbyaccount.php">' . $langs->trans("GroupByAccountAccounting") . '</a>';
+
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby, '', $limit);
print '<div class="tabsAction">' . "\n";
print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
-print '<div class="inline-block divButAction"><a class="butAction" name="button_export_csv" href="'.$_SERVER["PHP_SELF"].'?action=export_csv'.($param?'&'.$param:'').'">';
-if (count($filter)) print $langs->trans("ExportFilteredList");
-else print $langs->trans("ExportList");
-print '</a></div>';
print '<div class="inline-block divButAction"><a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param?'&'.$param:'').'">' . $langs->trans("DelBookKeeping") . '</a></div>';
print '</div>';
-print ' <a href="./listbyaccount.php">' . $langs->trans("GroupByAccountAccounting") . '</a><br><br>';
-
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 9d8c74299642440db96f1efc3ee53393ad17bff9..63b0955722fc413900427c2993d6c8fe78dad87a 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -156,7 +156,7 @@ if ($action == 'delmouvconfirm') {
* View
*/
-$title_page = $langs->trans("Bookkeeping") . ' ' . strtolower($langs->trans("By")) . ' ' . $langs->trans("AccountAccounting") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
+$title_page = $langs->trans("Bookkeeping") . ' ' . strtolower($langs->trans("By")) . ' ' . $langs->trans("AccountAccounting");
llxHeader('', $title_page);
@@ -207,7 +207,9 @@ if ($action == 'delbookkeepingyear') {
print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords,'title_accountancy',0,'','',$limit);
+$viewflat = ' <a href="./list.php">' . $langs->trans("ViewFlatList") . '</a>';
+
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords,'title_accountancy',0,$viewflat,'',$limit);
// Reverse sort order
if ( preg_match('/^asc/i', $sortorder) )
@@ -219,8 +221,6 @@ print '<div class="tabsAction">' . "\n";
print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
print '</div>';
-print ' <a href="./list.php">' . $langs->trans("ViewFlatList") . '</a><br><br>';
-
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>' . $langs->trans("AccountAccounting") . '</td>';
@@ -331,14 +331,15 @@ foreach ( $object->lines as $line ) {
}
// Affiche un Sous-Total du dernier compte comptable affiché
-print '<tr class="liste_total"><td align="right" colspan="4">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
+print '<tr class="liste_total">';
+print '<td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
print "<td> </td>\n";
print '</tr>';
// Affiche le Total
print '<tr class="liste_total">';
-print '<td align="right" colspan="4">'.$langs->trans("Total").':</td>';
+print '<td align="right" colspan="5">'.$langs->trans("Total").':</td>';
print '<td align="right">';
print price($total_debit);
print '</td>';
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index 0031fa3c3b494bb02edb9cbd6b85c03b426c4777..e31e1c92f175e4553946235fd58ef08883387c81 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -75,9 +75,12 @@ $form = new Form($db);
$textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
$textnextyear = ' <a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
-print load_fiche_titre($langs->trans('ReportInOut') . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear, '', 'title_accountancy');
+print load_fiche_titre($langs->trans('ReportInOut'), $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear, 'title_accountancy');
-print '<table class="border" width="100%">';
+$moreforfilter='';
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
$months = array( $langs->trans("JanuaryMin"),
$langs->trans("FebruaryMin"),
@@ -93,7 +96,8 @@ $months = array( $langs->trans("JanuaryMin"),
$langs->trans("DecemberMin"),
);
-print '<tr class="liste_titre"><th class="liste_titre">'.$langs->trans("Account").'</th>';
+print '<tr class="liste_titre">';
+print '<th class="liste_titre">'.$langs->trans("Account").'</th>';
print '<th class="liste_titre">'.$langs->trans("Description").'</th>';
print '<th class="liste_titre" align="center">N-1</th>';
print '<th class="liste_titre" align="center">'.$langs->trans("NReal").'</th>';
@@ -257,6 +261,7 @@ if (!empty($cats))
}
print "</table>";
+print '</div>';
llxFooter();
$db->close();
\ No newline at end of file
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index befc9d5c208bd47afbe9021928a32938eadc1b80..236e22ba981ba376f1914f5b2907ba4d27c33ee8 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -1,7 +1,7 @@
<?php
-/* Copyright (C) 2013 Antoine Iauch <aiauch@gpcsolutions.fr>
- * Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2013 Antoine Iauch <aiauch@gpcsolutions.fr>
+ * Copyright (C) 2013-2016 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -262,7 +262,11 @@ if ($modecompta == 'CREANCES-DETTES')
print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
}
- print '<table class="noborder" width="100%">';
+ $moreforfilter='';
+
+ print '<div class="div-table-responsive">';
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
// Category filter
print '<tr class="liste_titre">';
print '<td>';
@@ -418,6 +422,8 @@ if ($modecompta == 'CREANCES-DETTES')
$db->free($result);
}
print "</table>";
+ print '</div>';
+
print '</form>';
} else {
// $modecompta != 'CREANCES-DETTES'
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index e5a4bc37f78bfa971959195610453ecfbd5e53fb..d72b06a1bb030fdc4cd13eaf3843461f8f729a79 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Antoine Iauch <aiauch@gpcsolutions.fr>
*
@@ -260,8 +260,11 @@ if ($modecompta != 'CREANCES-DETTES') {
}
}
-$i = 0;
-print "<table class=\"noborder\" width=\"100%\">";
+$morefilter='';
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
print "<tr class=\"liste_titre\">";
print_liste_field_titre(
$langs->trans("User"),
@@ -346,6 +349,8 @@ if (count($amount)) {
$arrayforsort=$amount;
}
+ $i = 0;
+
foreach($arrayforsort as $key => $value) {
$var=!$var;
print "<tr ".$bc[$var].">";
@@ -432,6 +437,8 @@ if (count($amount)) {
}
print "</table>";
+print '</div>';
+print '</form>';
llxFooter();
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index e2e092b032f7296380a244f829add47fb1f15dba..26063587c5d9c2990d80578aae49ab5de3a417db 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2013 Antoine Iauch <aiauch@gpcsolutions.fr>
@@ -22,7 +22,7 @@
/**
* \file htdocs/compta/stats/casoc.php
- * \brief Page reporting CA par societe
+ * \brief Page reporting Turnover (CA) by thirdparty
*/
require '../../main.inc.php';
@@ -151,6 +151,7 @@ foreach($allparams as $key => $value) {
$paramslink .= '&' . $key . '=' . $value;
}
+
/*
* View
*/
@@ -338,8 +339,13 @@ foreach($headerparams as $key => $value)
{
print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
}
-print "<table class=\"noborder\" width=\"100%\">";
- // Category filter
+
+$moreforfilter='';
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+// Category filter
print '<tr class="liste_titre">';
print '<td>';
print $langs->trans("Category") . ': ' . $formother->select_categories(Categorie::TYPE_CUSTOMER, $selected_cat, 'search_categ', true);
@@ -614,6 +620,8 @@ if (count($amount)) {
}
print "</table>";
+print "</div>";
+
print '</form>';
llxFooter();
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 1a343cbcb0bff864d5bbe3184023ed0fa46c2fb5..a32a67bb9feb690c0c62f6ac1559ebdb190a957f 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -178,12 +178,11 @@ if ($modecompta != 'CREANCES-DETTES')
}
}
+$moreforfilter='';
-/*
- * Show result array
- */
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-print '<table width="100%" class="noborder">';
print '<tr class="liste_titre"><td> </td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
@@ -433,6 +432,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
}
print "</tr>\n";
print "</table>";
+print '</div>';
/*
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 1dee42cd39d3c66cbe3803e3bca0a98ed1e64b7e..dcefae7aecbb436b43e6865ab8750de406b76684 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -140,7 +140,7 @@ DelYear=Year to delete
DelJournal=Journal to delete
ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete the record of the general ledger
+DelBookKeeping=Delete record of the general ledger
FinanceJournal=Finance journal
ExpenseReportsJournal=Expense reports journal
DescFinanceJournal=Finance journal including all the types of payments by bank account