diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 835e370d12e..c7d5e5b8912 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -43,8 +43,7 @@ $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones' llxHeader('', $langs->trans("Setup"), $wikihelp); -print load_fiche_titre($langs->trans("SetupArea"), '', 'title_tools'); - +print load_fiche_titre($langs->trans("SetupArea"), '', 'tools'); if (! empty($conf->global->MAIN_MOTD_SETUPPAGE)) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 2dcd3db799f..1cea52c8453 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3015,10 +3015,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ //if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on'))) if (empty($srconly) && in_array($pictowithoutext, array( 'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', - 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', + 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', 'jabber','skype','twitter','facebook','linkedin', 'chevron-left','chevron-right','chevron-down','chevron-top', - 'title_tools', 'title_home','title_companies','title_products','title_commercial','title_invoicing','title_accountancy', 'title_bank','title_project','title_hrm','title_generic','title_members','title_ticket' + 'home', 'companies', 'products', 'commercial', 'invoicing', 'accountancy', 'project', 'hrm', 'members', 'ticket', 'generic' ) )) { $fa='fa'; @@ -3030,62 +3030,50 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $fakey = 'fa-cog'; $fasize = '1.4em'; } - - // Title fa-icon - elseif ($pictowithoutext == 'title_tools') { - $fakey = 'fa-tools'; - $fasize = '2.4em'; - } - elseif ($pictowithoutext == 'title_home') { + elseif ($pictowithoutext == 'home') { $fakey = 'fa-home'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_companies') { + elseif ($pictowithoutext == 'companies') { $fakey = 'fa-building'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_products') { + elseif ($pictowithoutext == 'products') { $fakey = 'fa-box-open'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_commercial') { + elseif ($pictowithoutext == 'commercial') { $fakey = 'fa-user-tie'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_invoicing') { + elseif ($pictowithoutext == 'invoicing') { $fakey = 'fa-file-invoice'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_accountancy') { + elseif ($pictowithoutext == 'accountancy') { $fakey = 'fa-coins'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_bank') { - $fakey = 'fa-university'; - $fasize = '2.4em'; - } - elseif ($pictowithoutext == 'title_project') { + elseif ($pictowithoutext == 'project') { $fakey = 'fa-project-diagram'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_hrm') { + elseif ($pictowithoutext == 'hrm') { $fakey = 'fa-umbrella-beach'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_members') { + elseif ($pictowithoutext == 'members') { $fakey = 'fa-user-friends'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_ticket') { + elseif ($pictowithoutext == 'ticket') { $fakey = 'fa-sticky-note'; $fasize = '2.4em'; } - elseif ($pictowithoutext == 'title_generic') { + elseif ($pictowithoutext == 'generic') { $fakey = 'fa-folder-open'; $fasize = '2.4em'; } - - // Button fa-icon elseif ($pictowithoutext == 'switch_off') { $fakey = 'fa-toggle-off'; $facolor = '#999'; diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 77c41d01927..d7c57e83ccc 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -440,7 +440,7 @@ class pdf_azur extends ModelePDFPropales { $tmpuser=new User($this->db); $tmpuser->fetch($object->user_author_id); - $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs); + $notetoshow.=$langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs); if ($tmpuser->email) $notetoshow.=', Mail: '.$tmpuser->email; if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone; } diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 7fce5107356..b6a7df10aca 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -83,3 +83,4 @@ DefaultModelPropalToBill=Default template when closing a business proposal (to b DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) ProposalCustomerSignature=Written acceptance, company stamp, date and signature ProposalsStatisticsSuppliers=Vendor proposals statistics +CaseFollowedBy=Case followed by diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 4cb115ef378..1b9a0290c53 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -849,7 +849,7 @@ class Dolresource extends CommonObject $sql.= ' FROM '.MAIN_DB_PREFIX.'element_resources'; $sql.= " WHERE element_id=".$element_id." AND element_type='".$this->db->escape($element)."'"; if($resource_type) - $sql.=" AND resource_type LIKE '%".$resource_type."%'"; + $sql.=" AND resource_type LIKE '%".$this->db->escape($resource_type)."%'"; $sql .= ' ORDER BY resource_type'; dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG); diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 14f13f4f97e..561da969cdd 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -3500,7 +3500,7 @@ div.boximport { .fieldrequired { font-weight: bold; color: #000055; } -.widthpictotitle { width: 40px; text-align: ; } +.widthpictotitle { width: 40px; font-size: 1.5em; text-align: ; } .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitlecssboxes { /* margin: 0px; */ } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 4d0fbe1d09f..35bbdc9b3a5 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3536,7 +3536,7 @@ div.boximport { .fieldrequired { font-weight: bold; color: #000055; } -.widthpictotitle { width: 40px; text-align: ; } +.widthpictotitle { width: 40px; font-size: 1.4em; text-align: ; } .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitlecssboxes { /* margin: 0px; */ }