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

Fix label in graph

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-06 14:26:48 +02:00
parent 4be2d1414e
commit 92ae3c9d52
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/main.lang
View File

@ -1140,3 +1140,4 @@ EmailMsgID=Email MsgID
Forthcoming=Forthcoming Forthcoming=Forthcoming
Currently=Currently Currently=Currently
ClientTZ=Client Time Zone (user) ClientTZ=Client Time Zone (user)
NotClosedYet=Not yet closed

8
htdocs/projet/card.php
View File

@ -918,8 +918,8 @@ if ($action == 'create' && $user->rights->projet->creer) {
print '<td>'; print '<td>';
print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1, 0, 0, 0, 'inline-block valignmiddle', 0, 1); print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1, 0, 0, 0, 'inline-block valignmiddle', 0, 1);
print '<div id="divtocloseproject" class="inline-block valign" style="display: none;"> &nbsp; &nbsp; '; print '<div id="divtocloseproject" class="inline-block valign" style="display: none;"> &nbsp; &nbsp; ';
print '<input type="checkbox" id="inputcloseproject" name="closeproject" /> '; print '<input type="checkbox" id="inputcloseproject" name="closeproject" />';
print $langs->trans("AlsoCloseAProject"); print '<label for="inputcloseproject">'.$langs->trans("AlsoCloseAProject").'</label>';
print '</div>'; print '</div>';
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -940,11 +940,11 @@ if ($action == 'create' && $user->rights->projet->creer) {
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print $form->selectDate($object->date_start ? $object->date_start : -1, 'projectstart', 0, 0, 0, '', 1, 0); print $form->selectDate($object->date_start ? $object->date_start : -1, 'projectstart', 0, 0, 0, '', 1, 0);
print ' &nbsp; &nbsp; <input type="checkbox" class="valignmiddle" name="reportdate" value="yes" '; print ' &nbsp; &nbsp; <input type="checkbox" class="valignmiddle" id="reportdate" name="reportdate" value="yes" ';
if ($comefromclone) { if ($comefromclone) {
print ' checked '; print ' checked ';
} }
print '/> '.$langs->trans("ProjectReportDate"); print '/><label for="reportdate">'.$langs->trans("ProjectReportDate").'</label>';
print '</td></tr>'; print '</td></tr>';
// Date end // Date end

3
htdocs/projet/graph_opportunities.inc.php
View File

@ -83,6 +83,9 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
$code = dol_getIdFromCode($db, $status, 'c_lead_status', 'rowid', 'code'); $code = dol_getIdFromCode($db, $status, 'c_lead_status', 'rowid', 'code');
if ($code) { if ($code) {
$labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code); $labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code);
if ($code == 'WON' || $code == 'LOST') {
$labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code).' ('.$langs->transnoentitiesnoconv("NotClosedYet").")";
}
} }
if (empty($labelStatus)) { if (empty($labelStatus)) {
$labelStatus = $listofopplabel[$status]; $labelStatus = $listofopplabel[$status];

2
htdocs/projet/index.php
View File

@ -152,7 +152,7 @@ if ($resql) {
while ($i < $num) { while ($i < $num) {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$listofoppstatus[$objp->rowid] = $objp->percent; $listofoppstatus[$objp->rowid] = $objp->percent;
$listofopplabel[$objp->rowid] = $objp->label; $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found.
$listofoppcode[$objp->rowid] = $objp->code; $listofoppcode[$objp->rowid] = $objp->code;
switch ($objp->code) { switch ($objp->code) {
case 'PROSP': case 'PROSP':