lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon

Browse Source
This commit is contained in:
Alexandre SPANGARO 2019-09-27 14:20:53 +02:00
commit 4b73e09c60
7 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/index.php
View File

@ -43,8 +43,7 @@ $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones'
llxHeader('', $langs->trans("Setup"), $wikihelp); 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)) if (! empty($conf->global->MAIN_MOTD_SETUPPAGE))
{ {

38
htdocs/core/lib/functions.lib.php
View File

@ -3015,10 +3015,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on'))) //if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
if (empty($srconly) && in_array($pictowithoutext, array( 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', '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', 'jabber','skype','twitter','facebook','linkedin',
'chevron-left','chevron-right','chevron-down','chevron-top', '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'; $fa='fa';
@ -3030,62 +3030,50 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$fakey = 'fa-cog'; $fakey = 'fa-cog';
$fasize = '1.4em'; $fasize = '1.4em';
} }
elseif ($pictowithoutext == 'home') {
// Title fa-icon
elseif ($pictowithoutext == 'title_tools') {
$fakey = 'fa-tools';
$fasize = '2.4em';
}
elseif ($pictowithoutext == 'title_home') {
$fakey = 'fa-home'; $fakey = 'fa-home';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_companies') { elseif ($pictowithoutext == 'companies') {
$fakey = 'fa-building'; $fakey = 'fa-building';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_products') { elseif ($pictowithoutext == 'products') {
$fakey = 'fa-box-open'; $fakey = 'fa-box-open';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_commercial') { elseif ($pictowithoutext == 'commercial') {
$fakey = 'fa-user-tie'; $fakey = 'fa-user-tie';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_invoicing') { elseif ($pictowithoutext == 'invoicing') {
$fakey = 'fa-file-invoice'; $fakey = 'fa-file-invoice';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_accountancy') { elseif ($pictowithoutext == 'accountancy') {
$fakey = 'fa-coins'; $fakey = 'fa-coins';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_bank') { elseif ($pictowithoutext == 'project') {
$fakey = 'fa-university';
$fasize = '2.4em';
}
elseif ($pictowithoutext == 'title_project') {
$fakey = 'fa-project-diagram'; $fakey = 'fa-project-diagram';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_hrm') { elseif ($pictowithoutext == 'hrm') {
$fakey = 'fa-umbrella-beach'; $fakey = 'fa-umbrella-beach';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_members') { elseif ($pictowithoutext == 'members') {
$fakey = 'fa-user-friends'; $fakey = 'fa-user-friends';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_ticket') { elseif ($pictowithoutext == 'ticket') {
$fakey = 'fa-sticky-note'; $fakey = 'fa-sticky-note';
$fasize = '2.4em'; $fasize = '2.4em';
} }
elseif ($pictowithoutext == 'title_generic') { elseif ($pictowithoutext == 'generic') {
$fakey = 'fa-folder-open'; $fakey = 'fa-folder-open';
$fasize = '2.4em'; $fasize = '2.4em';
} }
// Button fa-icon
elseif ($pictowithoutext == 'switch_off') { elseif ($pictowithoutext == 'switch_off') {
$fakey = 'fa-toggle-off'; $fakey = 'fa-toggle-off';
$facolor = '#999'; $facolor = '#999';

2
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -440,7 +440,7 @@ class pdf_azur extends ModelePDFPropales
{ {
$tmpuser=new User($this->db); $tmpuser=new User($this->db);
$tmpuser->fetch($object->user_author_id); $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->email) $notetoshow.=', Mail: '.$tmpuser->email;
if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone; if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
} }

1
htdocs/langs/en_US/propal.lang
View File

@ -83,3 +83,4 @@ DefaultModelPropalToBill=Default template when closing a business proposal (to b
DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
ProposalCustomerSignature=Written acceptance, company stamp, date and signature ProposalCustomerSignature=Written acceptance, company stamp, date and signature
ProposalsStatisticsSuppliers=Vendor proposals statistics ProposalsStatisticsSuppliers=Vendor proposals statistics
CaseFollowedBy=Case followed by

2
htdocs/resource/class/dolresource.class.php
View File

@ -849,7 +849,7 @@ class Dolresource extends CommonObject
$sql.= ' FROM '.MAIN_DB_PREFIX.'element_resources'; $sql.= ' FROM '.MAIN_DB_PREFIX.'element_resources';
$sql.= " WHERE element_id=".$element_id." AND element_type='".$this->db->escape($element)."'"; $sql.= " WHERE element_id=".$element_id." AND element_type='".$this->db->escape($element)."'";
if($resource_type) 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'; $sql .= ' ORDER BY resource_type';
dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG); dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG);

2
htdocs/theme/eldy/global.inc.php
View File

@ -3500,7 +3500,7 @@ div.boximport {
.fieldrequired { font-weight: bold; color: #000055; } .fieldrequired { font-weight: bold; color: #000055; }
.widthpictotitle { width: 40px; text-align: <?php echo $left; ?>; } .widthpictotitle { width: 40px; font-size: 1.5em; text-align: <?php echo $left; ?>; }
.dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
.dolgraphtitlecssboxes { /* margin: 0px; */ } .dolgraphtitlecssboxes { /* margin: 0px; */ }

2
htdocs/theme/md/style.css.php
View File

@ -3536,7 +3536,7 @@ div.boximport {
.fieldrequired { font-weight: bold; color: #000055; } .fieldrequired { font-weight: bold; color: #000055; }
.widthpictotitle { width: 40px; text-align: <?php echo $left; ?>; } .widthpictotitle { width: 40px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
.dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
.dolgraphtitlecssboxes { /* margin: 0px; */ } .dolgraphtitlecssboxes { /* margin: 0px; */ }