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

add more infos in link

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-01-20 18:45:44 +01:00
parent 9e5dc89cea
commit 9e5f0a8cb9
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
6 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/comm/propal/list.php
View File

@ -1262,12 +1262,10 @@ if ($resql)
if ($nbofsalesrepresentative > 3) // We print only number if ($nbofsalesrepresentative > 3) // We print only number
{ {
print $nbofsalesrepresentative; print $nbofsalesrepresentative;
} elseif ($nbofsalesrepresentative > 0) } elseif ($nbofsalesrepresentative > 0) {
{
$userstatic = new User($db); $userstatic = new User($db);
$j = 0; $j = 0;
foreach ($listsalesrepresentatives as $val) foreach ($listsalesrepresentatives as $val) {
{
$userstatic->id = $val['id']; $userstatic->id = $val['id'];
$userstatic->lastname = $val['lastname']; $userstatic->lastname = $val['lastname'];
$userstatic->firstname = $val['firstname']; $userstatic->firstname = $val['firstname'];
@ -1275,7 +1273,10 @@ if ($resql)
$userstatic->statut = $val['statut']; $userstatic->statut = $val['statut'];
$userstatic->entity = $val['entity']; $userstatic->entity = $val['entity'];
$userstatic->photo = $val['photo']; $userstatic->photo = $val['photo'];
$userstatic->login = $val['login'];
$userstatic->phone = $val['phone'];
$userstatic->job = $val['job'];
$userstatic->gender = $val['gender'];
//print '<div class="float">': //print '<div class="float">':
print $userstatic->getNomUrl(-2); print $userstatic->getNomUrl(-2);
$j++; $j++;

10
htdocs/contrat/list.php
View File

@ -719,12 +719,10 @@ while ($i < min($num, $limit))
if ($nbofsalesrepresentative > 3) { if ($nbofsalesrepresentative > 3) {
// We print only number // We print only number
print $nbofsalesrepresentative; print $nbofsalesrepresentative;
} elseif ($nbofsalesrepresentative > 0) } elseif ($nbofsalesrepresentative > 0) {
{
$userstatic = new User($db); $userstatic = new User($db);
$j = 0; $j = 0;
foreach ($listsalesrepresentatives as $val) foreach ($listsalesrepresentatives as $val) {
{
$userstatic->id = $val['id']; $userstatic->id = $val['id'];
$userstatic->lastname = $val['lastname']; $userstatic->lastname = $val['lastname'];
$userstatic->firstname = $val['firstname']; $userstatic->firstname = $val['firstname'];
@ -732,6 +730,10 @@ while ($i < min($num, $limit))
$userstatic->statut = $val['statut']; $userstatic->statut = $val['statut'];
$userstatic->entity = $val['entity']; $userstatic->entity = $val['entity'];
$userstatic->photo = $val['photo']; $userstatic->photo = $val['photo'];
$userstatic->login = $val['login'];
$userstatic->phone = $val['phone'];
$userstatic->job = $val['job'];
$userstatic->gender = $val['gender'];
//print '<div class="float">': //print '<div class="float">':
print $userstatic->getNomUrl(-2); print $userstatic->getNomUrl(-2);

11
htdocs/projet/list.php
View File

@ -788,12 +788,10 @@ while ($i < min($num, $limit))
if ($nbofsalesrepresentative > 3) // We print only number if ($nbofsalesrepresentative > 3) // We print only number
{ {
print $nbofsalesrepresentative; print $nbofsalesrepresentative;
} elseif ($nbofsalesrepresentative > 0) } elseif ($nbofsalesrepresentative > 0) {
{
$userstatic = new User($db); $userstatic = new User($db);
$j = 0; $j = 0;
foreach ($listsalesrepresentatives as $val) foreach ($listsalesrepresentatives as $val) {
{
$userstatic->id = $val['id']; $userstatic->id = $val['id'];
$userstatic->lastname = $val['lastname']; $userstatic->lastname = $val['lastname'];
$userstatic->firstname = $val['firstname']; $userstatic->firstname = $val['firstname'];
@ -801,6 +799,11 @@ while ($i < min($num, $limit))
$userstatic->statut = $val['statut']; $userstatic->statut = $val['statut'];
$userstatic->entity = $val['entity']; $userstatic->entity = $val['entity'];
$userstatic->photo = $val['photo']; $userstatic->photo = $val['photo'];
$userstatic->photo = $val['photo'];
$userstatic->login = $val['login'];
$userstatic->phone = $val['phone'];
$userstatic->job = $val['job'];
$userstatic->gender = $val['gender'];
print $userstatic->getNomUrl(1, '', 0, 0, 12); print $userstatic->getNomUrl(1, '', 0, 0, 12);
//print $userstatic->getNomUrl(-2); //print $userstatic->getNomUrl(-2);
$j++; $j++;

3
htdocs/societe/canvas/actions_card_common.class.php
View File

@ -303,8 +303,7 @@ abstract class ActionsCardCommon
if ($nbofsalesrepresentative > 3) // We print only number if ($nbofsalesrepresentative > 3) // We print only number
{ {
$this->tpl['sales_representatives'] .= $nbofsalesrepresentative; $this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
} elseif ($nbofsalesrepresentative > 0) } elseif ($nbofsalesrepresentative > 0) {
{
$userstatic = new User($this->db); $userstatic = new User($this->db);
$i = 0; $i = 0;
foreach ($listsalesrepresentatives as $val) foreach ($listsalesrepresentatives as $val)

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

@ -2197,7 +2197,7 @@ class Societe extends CommonObject
$reparray = array(); $reparray = array();
$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo"; $sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo, u.gender";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u"; $sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug"; $sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
@ -2234,6 +2234,7 @@ class Societe extends CommonObject
$reparray[$i]['entity'] = $obj->entity; $reparray[$i]['entity'] = $obj->entity;
$reparray[$i]['login'] = $obj->login; $reparray[$i]['login'] = $obj->login;
$reparray[$i]['photo'] = $obj->photo; $reparray[$i]['photo'] = $obj->photo;
$reparray[$i]['gender'] = $obj->gender;
} else { } else {
$reparray[] = $obj->rowid; $reparray[] = $obj->rowid;
} }

8
htdocs/societe/tpl/linesalesrepresentative.tpl.php
View File

@ -16,8 +16,7 @@
*/ */
// Protection to avoid direct call of template // Protection to avoid direct call of template
if (empty($conf) || !is_object($conf)) if (empty($conf) || !is_object($conf)) {
{
print "Error, template page can't be called as URL"; print "Error, template page can't be called as URL";
exit; exit;
} }
@ -42,7 +41,9 @@ if ($action == 'editsalesrepresentatives') {
print '<input type="hidden" name="socid" value="'.$object->id.'" />'; print '<input type="hidden" name="socid" value="'.$object->id.'" />';
$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1); $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
$arrayselected = GETPOST('commercial', 'array'); $arrayselected = GETPOST('commercial', 'array');
if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1); if (empty($arrayselected)) {
$arrayselected = $object->getSalesRepresentatives($user, 1);
}
print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%"); print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'" />'; print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'" />';
print '</form>'; print '</form>';
@ -62,6 +63,7 @@ if ($action == 'editsalesrepresentatives') {
$userstatic->phone = $val['phone']; $userstatic->phone = $val['phone'];
$userstatic->job = $val['job']; $userstatic->job = $val['job'];
$userstatic->entity = $val['entity']; $userstatic->entity = $val['entity'];
$userstatic->gender = $val['gender'];
print $userstatic->getNomUrl(-1); print $userstatic->getNomUrl(-1);
print ' '; print ' ';
} }