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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-03 17:28:52 +02:00
commit 5dc6f6aec8
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/prospect/recap-prospect.php
View File

@ -27,6 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
$langs->load("companies"); $langs->load("companies");
$langs->load('other');
if ($conf->facture->enabled) $langs->load("bills"); if ($conf->facture->enabled) $langs->load("bills");
// Security check // Security check

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

@ -2048,22 +2048,25 @@ function img_mime($file, $alt = '')
} }
/** /**
* Show phone logo. * Show phone logo.
* Use img_picto instead. * Use img_picto instead.
* *
* @param string $alt Text to show on alt image * @param string $alt Text to show on alt image
* @param int $option Option * @param int $option Option
* @return string Return img tag * @return string Return img tag
* @deprecated * @deprecated
*/ */
function img_phone($alt = "default",$option=0) function img_phone($alt = 'default', $option = 0)
{ {
global $conf,$langs; global $conf,$langs;
if ($alt=="default") $alt=$langs->trans("Call");
$img='call_out'; if ($alt == 'default') $alt = $langs->trans('Call');
if ($option == 1) $img='call';
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/'.$img.'.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; if ($option == 1) $img = 'call';
else $img = 'call_out';
return img_picto($alt, $img);
} }

2
htdocs/ecm/index.php
View File

@ -361,7 +361,7 @@ $moreheadjs=empty($conf->use_javascript_ajax)?"":"
}); });
</script>"; </script>";
llxHeader($moreheadcss.$moreheadjs,$langs->trans("ECM"),'','','','',$morejs,'',0,0); llxHeader($moreheadcss.$moreheadjs,$langs->trans("ECMArea"),'','','','',$morejs,'',0,0);
// Add sections to manage // Add sections to manage