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

Look and feel v16

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-16 18:54:50 +02:00
parent c3c29393c1
commit 04f64dd252
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/projet/card.php
View File

@ -1105,21 +1105,22 @@ if ($action == 'create' && $user->rights->projet->creer) {
// Opportunity Amount // Opportunity Amount
print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>'; print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
/*if ($object->opp_status)
{
print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
}*/
if (strcmp($object->opp_amount, '')) { if (strcmp($object->opp_amount, '')) {
print '<span class="amount">'.price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency).'</span>'; print '<span class="amount">'.price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency).'</span>';
if (strcmp($object->opp_percent, '')) {
print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
}
} }
print '</td></tr>'; print '</td></tr>';
// Opportunity Weighted Amount // Opportunity Weighted Amount
/*
print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>'; print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) { if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) {
print '<span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span>'; print '<span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';
*/
} }
// Date start - end // Date start - end

3
htdocs/projet/contact.php
View File

@ -377,6 +377,9 @@ if ($id > 0 || !empty($ref)) {
print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>'; print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
if (strcmp($object->opp_amount, '')) { if (strcmp($object->opp_amount, '')) {
print '<span class="amount">'.price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency).'</span>'; print '<span class="amount">'.price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency).'</span>';
if (strcmp($object->opp_percent, '')) {
print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
}
} }
print '</td></tr>'; print '</td></tr>';
} }

5
htdocs/projet/element.php
View File

@ -299,6 +299,9 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>'; print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
if (strcmp($object->opp_amount, '')) { if (strcmp($object->opp_amount, '')) {
print '<span class="amount">'.price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>'; print '<span class="amount">'.price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
if (strcmp($object->opp_percent, '')) {
print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
}
} }
print '</td></tr>'; print '</td></tr>';
} }
@ -698,7 +701,7 @@ if (!$showdatefilter) {
print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to")); print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
print '</div>'; print '</div>';
print '<div class="inline-block">'; print '<div class="inline-block">';
print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">'; print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button small">';
print '</div>'; print '</div>';
print '</form>'; print '</form>';
print '</div>'; print '</div>';

9
htdocs/projet/tasks/comment.php
View File

@ -205,19 +205,18 @@ if ($id > 0 || !empty($ref)) {
// Opportunity percent // Opportunity percent
print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>'; print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
if (strcmp($object->opp_percent, '')) { if (strcmp($projectstatic->opp_percent, '')) {
print price($projectstatic->opp_percent, 0, $langs, 1, 0).' %'; print price($projectstatic->opp_percent, 0, $langs, 1, 0).' %';
} }
print '</td></tr>'; print '</td></tr>';
// Opportunity Amount // Opportunity Amount
print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>'; print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
/*if ($object->opp_status)
{
print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
}*/
if (strcmp($projectstatic->opp_amount, '')) { if (strcmp($projectstatic->opp_amount, '')) {
print price($projectstatic->opp_amount, 0, $langs, 1, 0, -1, $conf->currency); print price($projectstatic->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
if (strcmp($projectstatic->opp_percent, '')) {
print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($projectstatic->opp_amount * $projectstatic->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
}
} }
print '</td></tr>'; print '</td></tr>';
} }