Better translation

htdocs/compta/localtax/index.php

@@ -96,10 +96,10 @@ function pt ($db, $sql, $date)
         $i = 0;
         $total = 0;
         print '<table class="noborder" width="100%">';
+
         print '<tr class="liste_titre">';
         print '<td class="nowrap" width="60%">'.$date.'</td>';
         print '<td align="right">'.$langs->trans("Amount").'</td>';
-        print '<td>&nbsp;</td>'."\n";
         print "</tr>\n";
 
         while ($i < $num) {
@@ -109,12 +109,12 @@ function pt ($db, $sql, $date)
             print '<td class="nowrap">'.$obj->dm."</td>\n";
             $total = $total + $obj->mm;
 
-            print '<td class="nowrap" align="right">'.price($obj->mm)."</td><td >&nbsp;</td>\n";
+            print '<td class="nowrap" align="right">'.price($obj->mm)."</td>\n";
             print "</tr>\n";
 
             $i++;
         }
-        print '<tr class="liste_total"><td align="right">'.$langs->trans("Total")." :</td><td class=\"nowrap\" align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>";
+        print '<tr class="liste_total"><td align="right">'.$langs->trans("Total")." :</td><td class=\"nowrap\" align=\"right\"><b>".price($total)."</b></td></tr>";
 
         print "</table>";
         $db->free($result);
@@ -507,7 +507,7 @@ $sql.= " AND localtaxtype=".$localTaxType;
 $sql.= " GROUP BY dm";
 $sql.= " ORDER BY dm ASC";
 
-pt($db, $sql,$langs->trans("Year")." $y");
+pt($db, $sql,$langs->trans("Month"));
 
 
 print '<br>';

htdocs/compta/sociales/card.php

@@ -327,13 +327,23 @@ if ($action == 'create')
 	// Date end period
 	print '<tr>';
 	print '<td class="fieldrequired">';
-	print $langs->trans("PeriodEndDate");
+	print $form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo"));
 	print '</td>';
    	print '<td>';
 	print $form->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
 	print '</td>';
 	print '</tr>';
 
+	// Date due
+	print '<tr>';
+	print '<td class="fieldrequired">';
+	print $langs->trans("DateDue");
+	print '</td>';
+	print '<td>';
+	print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
+	print '</td>';
+	print "</tr>\n";
+
 	// Amount
 	print '<tr>';
 	print '<td class="fieldrequired">';
@@ -370,16 +380,6 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-	// Date due
-	print '<tr>';
-	print '<td class="fieldrequired">';
-	print $langs->trans("DateDue");
-	print '</td>';
-	print '<td>';
-	print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
-	print '</td>';
-	print "</tr>\n";
-
 	print '</table>';
 
 	dol_fiche_end();
@@ -496,7 +496,7 @@ if ($id > 0)
 		print "</tr>";
 
 		// Period end date
-		print "<tr><td>".$langs->trans("PeriodEndDate")."</td>";
+		print "<tr><td>".$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo"))."</td>";
 		print "<td>";
 		if ($action == 'edit')
 		{

htdocs/compta/tva/card.php

@@ -248,7 +248,7 @@ if ($action == 'create')
     print $form->select_date($datep,"datep",'','','','add',1,1);
     print '</td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
+    print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
     print $form->select_date($datev,"datev",'','','','add',1,1);
     print '</td></tr>';
 
@@ -261,7 +261,7 @@ if ($action == 'create')
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="minwidth300" name="label" id="label" value="'.($_POST["label"]?GETPOST("label",'',2):$label).'"></td></tr>';
 
 	// Amount
-	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount","alpha").'"></td></tr>';
 
     if (! empty($conf->banque->enabled))
     {
@@ -325,9 +325,9 @@ if ($id)
 
 
 	print '<tr><td>';
-	print $form->editfieldkey("DateValue", 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
+	print $form->editfieldkey($form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")), 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
 	print '</td><td>';
-	print $form->editfieldval("DateValue", 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
+	print $form->editfieldval("PeriodEndDate", 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
 	//print dol_print_date($object->datev,'day');
 	print '</td></tr>';
 

htdocs/compta/tva/index.php

@@ -96,10 +96,10 @@ function pt ($db, $sql, $date)
         $i = 0;
         $total = 0;
         print '<table class="noborder" width="100%">';
+
         print '<tr class="liste_titre">';
         print '<td class="nowrap" width="60%">'.$date.'</td>';
         print '<td align="right">'.$langs->trans("Amount").'</td>';
-        print '<td>&nbsp;</td>'."\n";
         print "</tr>\n";
 
         while ($i < $num) {
@@ -109,12 +109,12 @@ function pt ($db, $sql, $date)
             print '<td class="nowrap">'.$obj->dm."</td>\n";
             $total = $total + $obj->mm;
 
-            print '<td class="nowrap" align="right">'.price($obj->mm)."</td><td >&nbsp;</td>\n";
+            print '<td class="nowrap" align="right">'.price($obj->mm)."</td\n";
             print "</tr>\n";
 
             $i++;
         }
-        print '<tr class="liste_total"><td align="right">'.$langs->trans("Total")." :</td><td class=\"nowrap\" align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>";
+        print '<tr class="liste_total"><td align="right">'.$langs->trans("Total")." :</td><td class=\"nowrap\" align=\"right\"><b>".price($total)."</b></td></tr>";
 
         print "</table>";
         $db->free($result);
@@ -470,9 +470,10 @@ $sql.= " FROM ".MAIN_DB_PREFIX."tva as f";
 $sql.= " WHERE f.entity = ".$conf->entity;
 $sql.= " AND f.datep >= '".$db->idate($date_start)."'";
 $sql.= " AND f.datep <= '".$db->idate($date_end)."'";
-$sql.= " GROUP BY dm ORDER BY dm ASC";
+$sql.= " GROUP BY dm";
+$sql.= " ORDER BY dm ASC";
 
-pt($db, $sql,$langs->trans("Year")." $y");
+pt($db, $sql, $langs->trans("Month"));
 
 
 print '<br>';

htdocs/compta/tva/list.php

@@ -170,11 +170,11 @@ if ($result)
 	print '<table class="noborder" width="100%">';
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"><input type="text" class="flat" size="4" name="search_ref" value="'.$search_ref.'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$search_label.'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre" colspan="1" align="center">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
 	$syear = $year;
 	$formother->select_year($syear?$syear:-1,'year',1, 20, 5);
 	print '</td>';
@@ -199,7 +199,7 @@ if ($result)
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre("Label",$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre("DateValue",$_SERVER["PHP_SELF"],"t.datev","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre("PeriodEndDate",$_SERVER["PHP_SELF"],"t.datev","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"t.datep","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
 	if (! empty($conf->banque->enabled)) print_liste_field_titre("Account",$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);

htdocs/langs/en_US/compta.lang

@@ -244,3 +244,4 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to