diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 79d642ffcef..f0a103ae912 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
 
-	$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>&nbsp;</td>';
-	print '<td>&nbsp;</td>';
-	print '<td>&nbsp;</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 '&nbsp;';
-	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>&nbsp;</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;
+    $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>&nbsp;</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>&nbsp;</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>&nbsp;</td>';
+    print '<td>&nbsp;</td>';
+    print '<td>&nbsp;</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 '&nbsp;';
+    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>&nbsp;</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>&nbsp;</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>&nbsp;</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 a650100918e..df2ee00e869 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 9d8c7429964..63b0955722f 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>&nbsp;</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 0031fa3c3b4..e31e1c92f17 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 = '&nbsp;<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/sociales/card.php b/htdocs/compta/sociales/card.php
index 5f3969d35b1..79401b57798 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -73,6 +73,14 @@ if ($action == 'reopen' && $user->rights->tax->charges->creer) {
     }
 }
 
+if ($action == 'setlib' && $user->rights->tax->charges->creer)
+{
+    $object->fetch($id);
+    $result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
+    if ($result < 0)
+        setEventMessages($object->error, $object->errors, 'errors');
+}
+
 // payment mode
 if ($action == 'setmode' && $user->rights->tax->charges->creer) {
     $object->fetch($id);
@@ -366,6 +374,8 @@ if ($id > 0)
 	{
 		$head=tax_prepare_head($object);
 
+		$totalpaye = $object->getSommePaiement();
+		
 		// Clone confirmation
 		if ($action === 'clone')
 		{
@@ -398,35 +408,46 @@ if ($id > 0)
 
 		dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill');
 
+		$morehtmlref='<div class="refidno">';
+		// Ref customer
+		$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+		$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+		$morehtmlref.='</div>';
+		
 		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>';
-
-		// dol_banner_tab($object, 'id', $linkback, 1, 'id', 'id');
-
+		
+		$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		
+		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+		
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-
+		
 		print '<table class="border" width="100%">';
 
+        /*		
 		// Ref
-		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+		print '<tr><td>'.$langs->trans("Ref").'</td><td>';
 		print $form->showrefnav($object,'id',$linkback);
 		print "</td></tr>";
+        */
 
 		// Label
-		if ($action == 'edit')
+		/*if ($action == 'edit')
 		{
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("Label").'</td><td>';
+			print '<tr><td>'.$langs->trans("Label").'</td><td>';
 			print '<input type="text" name="label" size="40" value="'.$object->lib.'">';
 			print '</td></tr>';
 		}
 		else
 		{
-			print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->lib.'</td></tr>';
-		}
-
+			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->lib.'</td></tr>';
+		}*/
+		
 		// Type
 		print "<tr><td>".$langs->trans("Type")."</td><td>".$object->type_libelle."</td>";
+		print "</tr>";
 
     	// Period end date
 		print "<tr><td>".$langs->trans("PeriodEndDate")."</td>";
@@ -500,7 +521,7 @@ if ($id > 0)
         }
 
 		// Status
-		// print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4, $totalpaye).'</td></tr>';
+		//print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4, $totalpaye).'</td></tr>';
 
 		print '</table>';
 
@@ -526,56 +547,57 @@ if ($id > 0)
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$num = $db->num_rows($resql);
-			$i = 0; $total = 0;
-			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("RefPayment").'</td>';
-			print '<td>'.$langs->trans("Date").'</td>';
-			print '<td>'.$langs->trans("Type").'</td>';
-      		print '<td align="right">'.$langs->trans("Amount").'</td>';
-      		print '<td>&nbsp;</td>';
-      		print '</tr>';
-
-			$var=True;
-			while ($i < $num)
-			{
-				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var]."><td>";
-				print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
-				print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-                $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
-                print "<td>".$labeltype.' '.$objp->num_paiement."</td>\n";
-				print '<td align="right">'.price($objp->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td>\n";
-				print "</tr>";
-				$totalpaye += $objp->amount;
-				$i++;
-			}
-
-			if ($object->paye == 0)
-			{
-				print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaye)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
-				print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
-
-				$resteapayer = $object->amount - $totalpaye;
-
-				print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
-				print "<td align=\"right\">".price($resteapayer)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
-			}
-			print "</table>";
-			$db->free($resql);
+		    $num = $db->num_rows($resql);
+		    $i = 0; $total = 0;
+		    print '<table class="noborder paymenttable">';
+		    print '<tr class="liste_titre">';
+		    print '<td>'.$langs->trans("RefPayment").'</td>';
+		    print '<td>'.$langs->trans("Date").'</td>';
+		    print '<td>'.$langs->trans("Type").'</td>';
+		    print '<td align="right">'.$langs->trans("Amount").'</td>';
+		    print '<td>&nbsp;</td>';
+		    print '</tr>';
+		
+		    $var=True;
+		    while ($i < $num)
+		    {
+		        $objp = $db->fetch_object($resql);
+		        $var=!$var;
+		        print "<tr ".$bc[$var]."><td>";
+		        print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
+		        print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
+		        $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+		        print "<td>".$labeltype.' '.$objp->num_paiement."</td>\n";
+		        print '<td align="right">'.price($objp->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td>\n";
+		        print "</tr>";
+		        $totalpaye += $objp->amount;
+		        $i++;
+		    }
+		
+		    if ($object->paye == 0)
+		    {
+		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaye)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
+		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
+		
+		        $resteapayer = $object->amount - $totalpaye;
+		
+		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
+		        print "<td align=\"right\">".price($resteapayer)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
+		    }
+		    print "</table>";
+		    $db->free($resql);
 		}
 		else
 		{
-			dol_print_error($db);
-		}
-
+		    dol_print_error($db);
+		}		
+		
 		print '</div>';
 		print '</div>';
 		print '</div>';
-
+		
 		print '<div class="clearboth"></div>';
+
 		dol_fiche_end();
 
 		if ($action == 'edit')
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index e2df56ae91b..1ba0773afff 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -34,8 +34,8 @@ class ChargeSociales extends CommonObject
     public $element='chargesociales';
     public $table='chargesociales';
     public $table_element='chargesociales';
-	var $picto = 'bill';
-
+    public $picto = 'bill';
+    
     /**
      * {@inheritdoc}
      */
@@ -372,7 +372,7 @@ class ChargeSociales extends CommonObject
     /**
      *  Retourne le libelle du statut d'une charge (impaye, payee)
      *
-     *  @param	int		$mode       	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+     *  @param	int		$mode       	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
      *  @return	string        			Label
      */
@@ -385,7 +385,7 @@ class ChargeSociales extends CommonObject
      *  Renvoi le libelle d'un statut donne
      *
      *  @param	int		$statut        	Id statut
-     *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
      *  @return string        			Label
      */
@@ -429,7 +429,13 @@ class ChargeSociales extends CommonObject
             if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
             if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
         }
-
+        if ($mode == 6)
+        {
+            if ($statut ==  0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
+            if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
+            if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
+        }
+        
         return "Error, mode/status not found";
     }
 
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index befc9d5c208..236e22ba981 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 e5a4bc37f78..d72b06a1bb0 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 e2e092b032f..26063587c5d 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 1a343cbcb0b..a32a67bb9fe 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>&nbsp;</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/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7b69b17f89d..33be611442e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1055,6 +1055,12 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); 
 		$morehtmlstatus.=$tmptxt;
 	}
+	elseif ($object->element == 'chargesociales')
+	{
+	    $tmptxt=$object->getLibStatut(6, $object->totalpaye);
+	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); 
+		$morehtmlstatus.=$tmptxt;
+	}
 	elseif ($object->element == 'facturerec') 
 	{
 	    $morehtmlstatus.='<!-- No status for recurring invoice -->';
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index b602f5c1bf6..4d653644f39 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -64,6 +64,10 @@ ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_hom
 
 ALTER TABLE llx_chargesociales ADD COLUMN fk_account integer after fk_type;
 ALTER TABLE llx_chargesociales ADD COLUMN fk_mode_reglement integer after fk_account;
+ALTER TABLE llx_chargesociales ADD COLUMN fk_user_author		integer;
+ALTER TABLE llx_chargesociales ADD COLUMN fk_user_modif         integer;
+ALTER TABLE llx_chargesociales ADD COLUMN fk_user_valid			integer;
+
 
 ALTER TABLE llx_ecm_files ADD COLUMN gen_or_uploaded varchar(12) after cover; 
 
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 0514811eb15..95ab50661b6 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -26,6 +26,9 @@ create table llx_chargesociales
   tms                   timestamp,
   date_creation         datetime,						-- date de creation 
   date_valid            datetime,						-- date de validation
+  fk_user_author		integer,						-- user making creation
+  fk_user_modif         integer,                        -- user making last change
+  fk_user_valid			integer,						-- user validating
   fk_type    integer NOT NULL,
   fk_account integer,                       -- bank account
   fk_mode_reglement integer,                -- mode de reglement
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 1dee42cd39d..dcefae7aecb 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
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index dedd187db6d..ecf61d17d36 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -20,8 +20,8 @@ OnlyOpenedProject=Only open projects are visible (projects in draft or closed st
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
-OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
 NewProject=New project
 AddProject=Create project