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

List cleaner

Browse Source
This commit is contained in:
Laurent Destailleur 2014-05-11 21:59:35 +02:00
parent 0b0c9326b9
commit 8428caf8fb
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formsms.class.php
View File

@ -238,7 +238,7 @@ function limitChars(textarea, limit, infodiv)
} }
} }
// To // To (target)
if ($this->withto || is_array($this->withto)) if ($this->withto || is_array($this->withto))
{ {
print '<tr><td width="180">'; print '<tr><td width="180">';

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

@ -551,6 +551,7 @@ MailSentBy=Email sent by
TextUsedInTheMessageBody=Email body TextUsedInTheMessageBody=Email body
SendAcknowledgementByMail=Send Ack. by email SendAcknowledgementByMail=Send Ack. by email
NoEMail=No email NoEMail=No email
NoMobilePhone=No mobile phone
Owner=Owner Owner=Owner
DetectedVersion=Detected version DetectedVersion=Detected version
FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value. FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.

13
htdocs/societe/class/societe.class.php
View File

@ -1794,7 +1794,8 @@ class Societe extends CommonObject
global $langs; global $langs;
$contact_phone = $this->contact_property_array('mobile'); $contact_phone = $this->contact_property_array('mobile');
if ($this->phone)
if (! empty($this->phone)) // If a phone of thirdparty is defined, we add it ot mobile of contacts
{ {
if (empty($this->name)) $this->name=$this->nom; if (empty($this->name)) $this->name=$this->nom;
// TODO: Tester si tel non deja present dans tableau contact // TODO: Tester si tel non deja present dans tableau contact
@ -1808,10 +1809,12 @@ class Societe extends CommonObject
* *
* @param string $mode 'email' or 'mobile' * @param string $mode 'email' or 'mobile'
* @param int $hidedisabled 1=Hide contact if disabled * @param int $hidedisabled 1=Hide contact if disabled
* @return array Array of contacts emails or mobile * @return array Array of contacts emails or mobile array(id=>'Name <email>')
*/ */
function contact_property_array($mode='email', $hidedisabled=0) function contact_property_array($mode='email', $hidedisabled=0)
{ {
global $langs;
$contact_property = array(); $contact_property = array();
@ -1835,6 +1838,12 @@ class Societe extends CommonObject
// Show all contact. If hidedisabled is 1, showonly contacts with status = 1 // Show all contact. If hidedisabled is 1, showonly contacts with status = 1
if ($obj->statut == 1 || empty($hidedisabled)) if ($obj->statut == 1 || empty($hidedisabled))
{ {
if (empty($property))
{
if ($mode == 'email') $property=$langs->trans("NoEMail");
else if ($mode == 'mobile') $property=$langs->trans("NoMobilePhone");
}
if (!empty($obj->poste)) if (!empty($obj->poste))
{ {
$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname))."(".$obj->poste.")"." &lt;".$property."&gt;"; $contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname))."(".$obj->poste.")"." &lt;".$property."&gt;";