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

- New: Can choose contact on event (action com) creation, and filtred by

Browse Source 
thirdparty
This commit is contained in:
Florian Henry 2013-10-01 18:11:53 +02:00
parent 957ff08458
commit d41ceae64a
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -61,6 +61,7 @@ For users:
- New: Can send an email from thirdparty card. - New: Can send an email from thirdparty card.
- New: Can cancel holidays that were previously validated. - New: Can cancel holidays that were previously validated.
- Fix: [bug #1022] correct margin calculation for credit notes. - Fix: [bug #1022] correct margin calculation for credit notes.
- New: Can choose contact on event (action com) creation, and filtred by thirdparty
For translators: For translators:
- Qual: Normalized sort order of all languages files with english reference files. - Qual: Normalized sort order of all languages files with english reference files.

24
htdocs/comm/action/fiche.php
View File

@ -564,23 +564,23 @@ if ($action == 'create')
} }
else else
{ {
$events=array();
$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
//For external user force the company to user company //For external user force the company to user company
if (!empty($user->societe_id)) { if (!empty($user->societe_id)) {
print $form->select_company($user->societe_id,'socid','',1,1); print $form->select_company($user->societe_id,'socid','',1,1,0,$events);
} else { } else {
print $form->select_company('','socid','',1,1); print $form->select_company('','socid','',1,1,0,$events);
} }
} }
print '</td></tr>'; print '</td></tr>';
// If company is forced, we propose contacts (may be contact is also forced) print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
if (GETPOST("contactid") > 0 || GETPOST('socid','int') > 0) $form->select_contacts(GETPOST('socid','int'),GETPOST('contactid'),'contactid',1);
{ print '</td></tr>';
print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
$form->select_contacts(GETPOST('socid','int'),GETPOST('contactid'),'contactid',1);
print '</td></tr>';
}
// Project // Project
if (! empty($conf->projet->enabled)) if (! empty($conf->projet->enabled))
@ -809,12 +809,14 @@ if ($id > 0)
{ {
print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td>'; print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td>';
print '<td>'; print '<td>';
print $form->select_company($act->societe->id,'socid','',1,1); $events=array();
$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
print $form->select_company($act->societe->id,'socid','',1,1,0,$events);
print '</td>'; print '</td>';
// Contact // Contact
print '<td>'.$langs->trans("Contact").'</td><td width="30%">'; print '<td>'.$langs->trans("Contact").'</td><td width="30%">';
print $form->selectarray("contactid", (empty($act->societe->id)?array():$act->societe->contact_array()), $act->contact->id, 1); $form->select_contacts($act->societe->id, $act->contact->id,'contactid',1);
print '</td></tr>'; print '</td></tr>';
} }