diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index eabf4e13e48..d91e58ee711 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -602,6 +602,8 @@ print "\n"; print ''; // Shippable Icon in List +/* Kept as hidden feature for the moment, result seems bugged. +Whet is definition of "shippable" according to all different STOCK_CALCULATE_... options ? $var=!$var; print ""; print ''.$langs->trans("ShippableOrderIconInList").''; @@ -617,6 +619,8 @@ if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) { print ''; print ''; +/* Seems to be not so used. So kept hidden for the moment to avoid dangerous options inflation. +/* // Ask for payment bank during order if ($conf->banque->enabled) { @@ -676,6 +680,7 @@ else print ''; print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '.$langs->trans('NotAvailable').''; } +*/ print ''; print '
'; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index b4f1fe67e0b..57c5560a185 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -606,6 +606,7 @@ print '' print "\n"; print ''; +/* Seems to be not so used. So kept hidden for the moment to avoid dangerous options inflation. if ($conf->banque->enabled) { $var=!$var; @@ -634,6 +635,7 @@ else print ''; print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").' '.$langs->trans('NotAvailable').''; } +*/ print ''; diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index cd1734ff0a5..2f040b4610d 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1356,7 +1356,7 @@ if ($action == 'create') print ''; // Bank Account - if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) { + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && ! empty($conf->banque->enabled)) { print '' . $langs->trans('BankAccount') . ''; $form->select_comptes($fk_account, 'fk_account', 0, '', 1); print ''; @@ -2001,7 +2001,7 @@ if ($action == 'create') print ''; } - if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && ! empty($conf->banque->enabled)) { // Bank Account print ''; diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 3e7871b2c4a..f56daac29ec 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1085,7 +1085,7 @@ if ($action == 'create') print ''; // Bank Account - if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) { + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && ! empty($conf->banque->enabled)) { print '' . $langs->trans('BankAccount') . ''; $form->select_comptes(GETPOST('fk_account')>0 ? GETPOST('fk_account','int') : $fk_account, 'fk_account', 0, '', 1); print ''; @@ -1537,7 +1537,7 @@ if ($action == 'create') print ''; } - if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && ! empty($conf->banque->enabled)) { // Bank Account print '';