diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 4fc99beac08..a62f4437fd6 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -812,31 +812,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) { print ''; } - // Visibility - print ''.$langs->trans("Visibility").''; - $array = array(); - if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) { - $array[0] = $langs->trans("PrivateProject"); - } - if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) { - $array[1] = $langs->trans("SharedProject"); - } - - if (count($array) > 0) { - print $form->selectarray('public', $array, GETPOSTINT('public') ? 1 : 0, 0, 0, 0, '', 0, 0, 0, '', '', 1); - } else { - print ''; - - if (GETPOSTINT('public') == 0) { - print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"'); - print $langs->trans("PrivateProject"); - } else { - print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"'); - print $langs->trans("SharedProject"); - } - } - print ''; - if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) { // Opportunity status print ''.$langs->trans("OpportunityStatus").''; @@ -901,6 +876,31 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) { print ""; } + // Visibility + print ''.$langs->trans("Visibility").''; + $array = array(); + if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) { + $array[0] = $langs->trans("PrivateProject"); + } + if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) { + $array[1] = $langs->trans("SharedProject"); + } + + if (count($array) > 0) { + print $form->selectarray('public', $array, GETPOSTINT('public') ? 1 : 0, 0, 0, 0, '', 0, 0, 0, '', '', 1); + } else { + print ''; + + if (GETPOSTINT('public') == 0) { + print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"'); + print $langs->trans("PrivateProject"); + } else { + print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"'); + print $langs->trans("SharedProject"); + } + } + print ''; + // Selection of Owner contact type print ''.$langs->trans("ProjectContactTypeManager").''; print ''; @@ -1210,31 +1210,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) { print ''; } - // Visibility - print ''.$langs->trans("Visibility").''; - $array = array(); - if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) { - $array[0] = $langs->trans("PrivateProject"); - } - if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) { - $array[1] = $langs->trans("SharedProject"); - } - - if (count($array) > 0) { - print $form->selectarray('public', $array, $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1); - } else { - print ''; - - if ($object->public == 0) { - print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"'); - print $langs->trans("PrivateProject"); - } else { - print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"'); - print $langs->trans("SharedProject"); - } - } - print ''; - if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) { $classfortr = ($object->usage_opportunity ? '' : ' hideobject'); // Opportunity status @@ -1322,6 +1297,31 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) { print ""; } + // Visibility + print ''.$langs->trans("Visibility").''; + $array = array(); + if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) { + $array[0] = $langs->trans("PrivateProject"); + } + if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) { + $array[1] = $langs->trans("SharedProject"); + } + + if (count($array) > 0) { + print $form->selectarray('public', $array, $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1); + } else { + print ''; + + if ($object->public == 0) { + print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"'); + print $langs->trans("PrivateProject"); + } else { + print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"'); + print $langs->trans("SharedProject"); + } + } + print ''; + // Other options $parameters = array(); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook