diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php index a913858be0c..f12b05f1635 100644 --- a/htdocs/partnership/admin/setup.php +++ b/htdocs/partnership/admin/setup.php @@ -80,10 +80,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php'; if ($action == 'setting') { - $value = GETPOST('managed_for', 'alpha'); $res = dolibarr_set_const($db, "PARTNERSHIP_IS_MANAGED_FOR", $value, 'chaine', 0, '', $conf->entity); - } if ($action) { diff --git a/htdocs/partnership/lib/partnership.lib.php b/htdocs/partnership/lib/partnership.lib.php index b9b0a04965f..74a4328a5ff 100644 --- a/htdocs/partnership/lib/partnership.lib.php +++ b/htdocs/partnership/lib/partnership.lib.php @@ -40,12 +40,12 @@ function partnershipAdminPrepareHead() $head[$h][2] = 'settings'; $h++; - + $head[$h][0] = dol_buildpath("/partnership/admin/myobject_extrafields.php", 1); $head[$h][1] = $langs->trans("ExtraFields"); $head[$h][2] = 'myobject_extrafields'; $h++; - + $head[$h][0] = dol_buildpath("/partnership/admin/about.php", 1); $head[$h][1] = $langs->trans("About"); @@ -133,4 +133,4 @@ function partnershipPrepareHead($object) complete_head_from_modules($conf, $langs, $object, $head, $h, 'partnership@partnership', 'remove'); return $head; -} \ No newline at end of file +} diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php index 865993c3a18..67b13817ff1 100644 --- a/htdocs/partnership/partnership_card.php +++ b/htdocs/partnership/partnership_card.php @@ -108,10 +108,9 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen // Initialize array of search criterias $search_all = GETPOST("search_all", 'alpha'); $search = array(); -if($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') +if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') unset($object->fields['fk_soc']); -else - unset($object->fields['fk_member']); +else unset($object->fields['fk_member']); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha')) { $search[$key] = GETPOST('search_'.$key, 'alpha'); @@ -205,9 +204,7 @@ if (empty($reshook)) { } else { setEventMessages($object->error, $object->errors, 'errors'); } - } - - elseif ($action == 'confirm_refuse' && $permissiontoadd && !GETPOST('cancel', 'alpha')) { + } elseif ($action == 'confirm_refuse' && $permissiontoadd && !GETPOST('cancel', 'alpha')) { // Close proposal if (!(GETPOST('reason_decline_or_cancel', 'alpha'))) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Refuse")), null, 'errors'); @@ -604,7 +601,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Clone // print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd); - + // if ($permissiontoadd) { // if ($object->status == $object::STATUS_ENABLED) { // print ''.$langs->trans("Disable").''."\n"; @@ -617,12 +614,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea if ($permissiontoadd) { if ($object->status == $object::STATUS_ACCEPTED) { print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes&token='.newToken(), '', $permissiontoadd); - } else if($object->status == $object::STATUS_CANCELED){ + } elseif ($object->status == $object::STATUS_CANCELED) { // print ''.$langs->trans("Re-Open").''."\n"; print dolGetButtonAction($langs->trans('Re-Open'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken(), '', $permissiontoadd); } } - + // Refuse if ($permissiontoadd) { if ($object->status != $object::STATUS_CANCELED) { diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php index 4e6d542c12b..67c82f8c6c9 100644 --- a/htdocs/partnership/partnership_list.php +++ b/htdocs/partnership/partnership_list.php @@ -123,10 +123,9 @@ $extrafields->fetch_name_optionals_label($object->table_element); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); -if($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') +if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') unset($object->fields['fk_soc']); -else - unset($object->fields['fk_member']); +else unset($object->fields['fk_member']); // Default sort order (if not yet defined by previous GETPOST) if (!$sortfield) {