diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index f6bdb81345c..0ef1f4bd62b 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -140,7 +140,7 @@ if (count($listofsearchfields)) foreach($listofsearchfields as $key => $value) { if ($i == 0) print ''.$langs->trans("Search").''; - print ''; + print ''; print ':'; if ($i == 0) print ''; print ''; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index d55c05102d5..00bba632d1c 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -114,7 +114,7 @@ if (count($listofsearchfields)) foreach($listofsearchfields as $key => $value) { if ($i == 0) print ''.$langs->trans("Search").''; - print ''; + print ''; print ':'; if ($i == 0) print ''; print ''; diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php index d4639947529..2f176bc0c32 100644 --- a/htdocs/compta/hrm.php +++ b/htdocs/compta/hrm.php @@ -96,7 +96,7 @@ if (count($listofsearchfields)) foreach($listofsearchfields as $key => $value) { if ($i == 0) print ''.$langs->trans("Search").''; - print ''; + print ''; print ':'; if ($i == 0) print ''; print ''; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 099a3063127..70e2564829e 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -115,7 +115,7 @@ if (count($listofsearchfields)) foreach($listofsearchfields as $key => $value) { if ($i == 0) print ''.$langs->trans("Search").''; - print ''; + print ''; print ':'; if ($i == 0) print ''; print ''; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 5e20815469c..ceeef191aee 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -73,7 +73,7 @@ if ($resql) */ print '
'; -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 sur les rejets - * + * Stats on errors */ + print '
'; -print load_fiche_titre($langs->trans("WithdrawRejectStatistics")); +print load_fiche_titre($langs->trans("WithdrawRejectStatistics"), '', ''); // Define total and nbtotal diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 0e8e69b8353..cc66d7c7978 100644 --- a/htdocs/compta/salaries/card.php +++ b/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'); diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 4778aeb48a1..6731c70d328 100644 --- a/htdocs/fourn/facture/list.php +++ b/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 '
'; if ($optioncss != '') print ''; print ''; diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index c64e89b342f..e78d185661f 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -40,6 +40,7 @@ $action=GETPOST('action'); $holiday = new Holiday($db); $langs->load('users'); +$langs->load('hrm'); /* diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 5c28894fdbf..673ee101cf0 100644 --- a/htdocs/holiday/list.php +++ b/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(); diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index e1204429100..55b4e05942a 100644 --- a/htdocs/holiday/month_report.php +++ b/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'); /* diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 9a36531e543..4afd7402668 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/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 diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index 4b8c9507b92..0b471cc8c51 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/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, click here . 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 diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang index 1d03a8ebbf9..1c6ec8e61fc 100644 --- a/htdocs/langs/en_US/hrm.lang +++ b/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 diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang index 79dbeadf775..da177410860 100644 --- a/htdocs/langs/en_US/salaries.lang +++ b/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 diff --git a/htdocs/product/index.php b/htdocs/product/index.php index c2a702e796a..ccba0f887eb 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -94,7 +94,7 @@ if (count($listofsearchfields)) foreach($listofsearchfields as $key => $value) { if ($i == 0) print ''.$langs->trans("Search").''; - print ''; + print ''; print ':'; if ($i == 0) print ''; print ''; diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 1be05aed2d8..9dec7555ae0 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -83,7 +83,7 @@ if (count($listofsearchfields)) foreach($listofsearchfields as $key => $value) { if ($i == 0) print ''.$langs->trans("Search").''; - print ''; + print ''; print ':'; if ($i == 0) print ''; print ''; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 8b3d2b76c25..e1bc581453d 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -113,7 +113,7 @@ if (count($listofsearchfields)) foreach($listofsearchfields as $key => $value) { if ($i == 0) print ''.$langs->trans("Search").''; - print ''; + print ''; print ':'; if ($i == 0) print ''; print ''; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 9556a95b826..b5f895cdcbb 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -77,7 +77,7 @@ if (count($listofsearchfields)) foreach($listofsearchfields as $key => $value) { if ($i == 0) print ''.$langs->trans("Search").''; - print ''; + print ''; print ':'; if ($i == 0) print ''; print ''; diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php index 9339f801583..9e07aaf5d96 100644 --- a/htdocs/supplier_proposal/index.php +++ b/htdocs/supplier_proposal/index.php @@ -64,10 +64,9 @@ $var=false; print ''; print ''; print ''; -print ''; +print ''; print ''; -print ''; +print $langs->trans("SupplierProposal").':'; print ''; print "
'.$langs->trans("SearchRequest").'
'.$langs->trans("Search").'
'; -print $langs->trans("Ref").':
'.$langs->trans("Other").':

\n"; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 5dd49a57266..6592e5e4116 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2931,6 +2931,10 @@ table.dp { vertical-align:middle; cursor: pointer; } +.datenowlink +{ + color: rgb(); +} /* ============================================================================== */ diff --git a/htdocs/theme/md/img/menus/home.png b/htdocs/theme/md/img/menus/home.png index 1614347a829..c5441fa2962 100644 Binary files a/htdocs/theme/md/img/menus/home.png and b/htdocs/theme/md/img/menus/home.png differ diff --git a/htdocs/theme/md/img/title_home.png b/htdocs/theme/md/img/title_home.png index b832916f5e9..9f61d7bf25b 100644 Binary files a/htdocs/theme/md/img/title_home.png and b/htdocs/theme/md/img/title_home.png differ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 6e10a9e5024..5983243341e 100644 --- a/htdocs/theme/md/style.css.php +++ b/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 { - padding: 5px 2px 5px 3px; /* t r b l */ +table.liste th, table.noborder th, table.noborder tr.liste_titre td { + 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(); +} /* ============================================================================== */ /* Afficher/cacher */ diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 7a4ffcb1372..374aaf51fbb 100644 --- a/htdocs/user/card.php +++ b/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); diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 43812be515c..d0ac0aaa66d 100644 --- a/htdocs/user/index.php +++ b/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;