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

FIX #6880 #6925

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-03 00:58:51 +02:00
parent 976c8e0752
commit af584bc9c0
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/projet/card.php
View File

@ -947,6 +947,7 @@ elseif ($object->id > 0)
// Change probability from status // Change probability from status
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{ {
// Default value to close or not when we set opp to 'WON'.
$defaultcheckedwhenoppclose=1; $defaultcheckedwhenoppclose=1;
if (empty($conf->global->PROJECT_HIDE_TASKS)) $defaultcheckedwhenoppclose=0; if (empty($conf->global->PROJECT_HIDE_TASKS)) $defaultcheckedwhenoppclose=0;
@ -962,12 +963,16 @@ elseif ($object->id > 0)
var oldpercent = \''.dol_escape_js($object->opp_percent).'\'; var oldpercent = \''.dol_escape_js($object->opp_percent).'\';
console.log("We select "+elemcode); console.log("We select "+elemcode);
if (elemcode == \'LOST\') defaultcloseproject = 1;
jQuery("#divtocloseproject").show();
if (defaultcloseproject) jQuery("#inputcloseproject").prop("checked", true);
else jQuery("#inputcloseproject").prop("checked", false);
/* Make close project visible or not */ /* Define if checkbox to close is checked or not */
closeproject = 0;
if (elemcode == \'LOST\') closeproject = 1;
if (elemcode == \'WON\') closeproject = defaultcloseproject;
if (closeproject) jQuery("#inputcloseproject").prop("checked", true);
else jQuery("#inputcloseproject").prop("checked", false);
console.log("closeproject="+closeproject);
/* Make the close project checkbox visible or not */
if (elemcode == \'WON\' || elemcode == \'LOST\') if (elemcode == \'WON\' || elemcode == \'LOST\')
{ {
jQuery("#divtocloseproject").show(); jQuery("#divtocloseproject").show();