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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-05 01:30:32 +01:00
commit e7527ca4b5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/comm/propal/card.php
View File

@ -1411,16 +1411,13 @@ if ($action == 'create')
} }
print '</tr>' . "\n"; print '</tr>' . "\n";
// Contacts (ask contact only if thirdparty already defined). TODO do this also into order and invoice.
if ($socid > 0) if ($socid > 0)
{ {
// Contacts (ask contact only if thirdparty already defined). TODO do this also into order and invoice.
print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td>'; print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td>';
$form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist); $form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);
print '</td></tr>'; print '</td></tr>';
}
if ($socid > 0)
{
// Ligne info remises tiers // Ligne info remises tiers
print '<tr><td>' . $langs->trans('Discounts') . '</td><td>'; print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
if ($soc->remise_percent) if ($soc->remise_percent)