Fix several bugs on css, translation or look

htdocs/adherents/index.php

@@ -140,7 +140,7 @@ if (count($listofsearchfields))
 	foreach($listofsearchfields as $key => $value)
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr>';
+		print '<tr '.$bc[false].'>';
 		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';

htdocs/comm/index.php

@@ -114,7 +114,7 @@ if (count($listofsearchfields))
 	foreach($listofsearchfields as $key => $value)
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr>';
+		print '<tr '.$bc[false].'>';
 		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';

htdocs/compta/hrm.php

@@ -96,7 +96,7 @@ if (count($listofsearchfields))
 	foreach($listofsearchfields as $key => $value)
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr>';
+		print '<tr '.$bc[false].'>';
 		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';

htdocs/compta/index.php

@@ -115,7 +115,7 @@ if (count($listofsearchfields))
 	foreach($listofsearchfields as $key => $value)
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr>';
+		print '<tr '.$bc[false].'>';
 		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';

htdocs/compta/prelevement/stats.php

@@ -73,7 +73,7 @@ if ($resql)
  */
 
 print '<br>';
-print load_fiche_titre($langs->trans("WithdrawStatistics"));
+print load_fiche_titre($langs->trans("WithdrawStatistics"), '', '');
 
 $ligne=new LignePrelevement($db,$user);
 
@@ -138,12 +138,11 @@ else
 
 
 /*
- *
+ * Stats on errors
- * Stats sur les rejets
- *
  */
+
 print '<br>';
-print load_fiche_titre($langs->trans("WithdrawRejectStatistics"));
+print load_fiche_titre($langs->trans("WithdrawRejectStatistics"), '', '');
 
 
 // Define total and nbtotal

htdocs/compta/salaries/card.php

@@ -36,6 +36,7 @@ $langs->load("banks");
 $langs->load("bills");
 $langs->load("users");
 $langs->load("salaries");
+$langs->load('hrm');
 
 $id=GETPOST("id",'int');
 $action=GETPOST('action');

htdocs/fourn/facture/list.php

@@ -261,7 +261,8 @@ if ($resql)
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 	if ($search_status >= 0)  	$param.="&search_status=".$search_status;
 
-	print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+	print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy');
+	
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

htdocs/holiday/define_holiday.php

@@ -40,6 +40,7 @@ $action=GETPOST('action');
 $holiday = new Holiday($db);
 
 $langs->load('users');
+$langs->load('hrm');
 
 
 /*

htdocs/holiday/list.php

@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 
 $langs->load('users');
 $langs->load('holidays');
+$langs->load('hrm');
 
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();

htdocs/holiday/month_report.php

@@ -36,6 +36,7 @@ if ($user->societe_id > 0) accessforbidden();
 // Si l'utilisateur n'a pas le droit de lire cette page
 if(!$user->rights->holiday->read_all) accessforbidden();
 
+$langs->load('hrm');
 
 
 /*

htdocs/langs/en_US/admin.lang

@@ -499,7 +499,7 @@ Module510Desc=Management of employees salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module600Desc=Send EMail notifications (triggered by some business events) to third-party contacts (setup defined on each thirdparty) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports

htdocs/langs/en_US/holiday.lang

@@ -8,7 +8,6 @@ NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
 AddCP=Make a leave request
-Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
 DateCreateCP=Creation date
@@ -79,7 +78,6 @@ PrevSoldeCP=Previous Balance
 NewSoldeCP=New Balance
 alreadyCPexist=A leave request has already been done on this period.
 UserName=Name
-Employee=Employee
 FirstDayOfHoliday=First day of vacation
 LastDayOfHoliday=Last day of vacation
 BoxTitleLastLeaveRequests=Last %s modified leave requests 

htdocs/langs/en_US/hrm.lang

@@ -15,5 +15,6 @@ DictionaryFunction=HRM - Function list
 ListOfEmployees=List of employees
 Employees=Employees
 Employee=Employee
+Employe=Employe
 NewEmployee=New employee
 EmployeeCard=Employee card

htdocs/langs/en_US/salaries.lang

@@ -3,7 +3,6 @@ SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
 Salary=Salary
 Salaries=Salaries
-Employee=Employee
 NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments

htdocs/product/index.php

@@ -94,7 +94,7 @@ if (count($listofsearchfields))
 	foreach($listofsearchfields as $key => $value)
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr>';
+		print '<tr '.$bc[false].'>';
 		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';

htdocs/projet/activity/index.php

@@ -83,7 +83,7 @@ if (count($listofsearchfields))
 	foreach($listofsearchfields as $key => $value)
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr>';
+		print '<tr '.$bc[false].'>';
 		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';

htdocs/projet/index.php

@@ -113,7 +113,7 @@ if (count($listofsearchfields))
 	foreach($listofsearchfields as $key => $value)
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr>';
+		print '<tr '.$bc[false].'>';
 		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';

htdocs/societe/index.php

@@ -77,7 +77,7 @@ if (count($listofsearchfields))
 	foreach($listofsearchfields as $key => $value)
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr>';
+		print '<tr '.$bc[false].'>';
 		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';

htdocs/supplier_proposal/index.php

@@ -64,10 +64,9 @@ $var=false;
 print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchRequest").'</td></tr>';
+print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
 print '</tr>';
 print "</table></form><br>\n";
 

htdocs/theme/eldy/style.css.php

@@ -2931,6 +2931,10 @@ table.dp {
     vertical-align:middle;
     cursor: pointer;
 }
+.datenowlink
+{
+	color: rgb(<?php print $colortextlink; ?>);
+}
 
 
 /* ============================================================================== */

htdocs/theme/md/style.css.php

@@ -90,9 +90,9 @@ $colorbacklineimpair2='255,255,255';    // line impair
 $colorbacklinepair1='250,250,250';    // line pair
 $colorbacklinepair2='248,248,248';    // line pair
 $colorbacklinepairhover='244,244,244';    // line pair
-$colorbackbody='255,255,255';
+$colorbackbody='248,248,248';
 $colortexttitlenotab='90,90,90';
-$colortexttitle='0,0,0';
+$colortexttitle='20,20,20';
 $colortext='0,0,0';
 $colortextlink='0,0,120';
 $fontsize='13';
@@ -165,7 +165,7 @@ else { $colortextbackvmenu='000000'; }
 $tmppart=explode(',',$colorbacktitle1);
 $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
 if ($tmpval <= 260) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
-else { $colortexttitle='000000'; $colorshadowtitle='FFFFFF'; }
+else { $colortexttitle='404040'; $colorshadowtitle='FFFFFF'; }
 $tmppart=explode(',',$colorbacktabcard1);
 $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
 if ($tmpval <= 340) { $colortextbacktab='FFFFFF'; }
@@ -1925,6 +1925,8 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	-webkit-box-shadow: 2px 2px 4px #CCC;
 	box-shadow: 2px 2px 4px #CCC;
     */
+	box-shadow: 0 0 3px rgba(0,0,0,0.16);
+	
 	-moz-border-radius: 0.1em;
 	-webkit-border-radius: 0.1em;
 	border-radius: 0.1em;
@@ -1943,10 +1945,10 @@ table.noborder tr, div.noborder form {
 	min-height: 26px;
 }
 
-table.liste th, table.noborder th {
+table.liste th, table.noborder th, table.noborder tr.liste_titre td {
-	padding: 5px 2px 5px 3px;			/* t r b l */
+	padding: 12px 2px 12px 3px;			/* t r b l */
 }
-table.noborder th, table.noborder td, div.noborder form, div.noborder form div {
+table.noborder td, div.noborder form, div.noborder form div {
 	padding: 4px 2px 4px 3px;			/* t r b l */
 }
 
@@ -2245,7 +2247,6 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
 {
     /* TO MATCH BOOTSTRAP */
 	background: #ddd;
-	color: #000 !important;
 
 	/* TO MATCH ELDY */
 	/*
@@ -2773,7 +2774,10 @@ table.dp {
     vertical-align:middle;
     cursor: pointer;
 }
-
+.datenowlink
+{
+	color: rgb(<?php print $colortextlink; ?>);
+}
 
 /* ============================================================================== */
 /*  Afficher/cacher                                                               */

htdocs/user/card.php

@@ -87,6 +87,7 @@ $langs->load("users");
 $langs->load("companies");
 $langs->load("ldap");
 $langs->load("admin");
+$langs->load('hrm');
 
 $object = new User($db);
 $extrafields = new ExtraFields($db);

htdocs/user/index.php

@@ -34,6 +34,7 @@ if (! $user->rights->user->user->lire && ! $user->admin)
 
 $langs->load("users");
 $langs->load("companies");
+$langs->load('hrm');
 
 // Security check (for external users)
 $socid=0;