Merge branch 'NEW_contact_project_tab' of github.com:atm-quentin/dolibarr into NEW_contact_project_tab

This commit is contained in:
Quentin VIAL-GOUTEYRON 2022-01-07 10:18:57 +01:00
commit 137371cae5
2 changed files with 65 additions and 68 deletions

View File

@ -83,8 +83,7 @@ if($id) {
$morehtmlref .= $langs->trans('ThirdParty').' : '; $morehtmlref .= $langs->trans('ThirdParty').' : ';
if ($object->thirdparty->id > 0) { if ($object->thirdparty->id > 0) {
$morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact'); $morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact');
} } else {
else {
$morehtmlref .= $langs->trans("ContactNotLinkedToCompany"); $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
} }
} }

View File

@ -201,7 +201,6 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Ref").'</td>'; print '<td>'.$langs->trans("Ref").'</td>';
print '<td>'.$langs->trans("Name").'</td>'; print '<td>'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("ContactType").'</td>';
print '<td class="center">'.$langs->trans("DateStart").'</td>'; print '<td class="center">'.$langs->trans("DateStart").'</td>';
print '<td class="center">'.$langs->trans("DateEnd").'</td>'; print '<td class="center">'.$langs->trans("DateEnd").'</td>';
print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>'; print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
@ -234,7 +233,6 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
// Label // Label
print '<td>'.$obj->title.'</td>'; print '<td>'.$obj->title.'</td>';
print '<td>'.$obj->libelle.'</td>';
// Date start // Date start
print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>'; print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
// Date end // Date end