diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index de935b3d0f056623851201d99c90e3c9f8702394..aef978ec6ad73e635fc565946d07df5e8d065295 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -163,9 +163,9 @@ if ($action == 'setdefaultduration') } } -if ($action == 'set_ASK_PAYMENT_BANK_DURING_PROPOSAL') +if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') { - $res = dolibarr_set_const($db, "ASK_PAYMENT_BANK_DURING_PROPOSAL",$value,'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL",$value,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; @@ -602,20 +602,20 @@ if ($conf->banque->enabled) { $var=!$var; print '<tr '.$bc[$var].'><td>'; - print $langs->trans("ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td> </td><td align="center">'; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td> </td><td align="center">'; if (! empty($conf->use_javascript_ajax)) { - print ajax_constantonoff('ASK_PAYMENT_BANK_DURING_PROPOSAL'); + print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL'); } else { - if (empty($conf->global->ASK_PAYMENT_BANK_DURING_PROPOSAL)) + if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL)) { - print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ASK_PAYMENT_BANK_DURING_PROPOSAL&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>'; + print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>'; } else { - print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ASK_PAYMENT_BANK_DURING_PROPOSAL&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>'; + print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>'; } } print '</td></tr>'; @@ -624,7 +624,7 @@ else { $var=!$var; print '<tr '.$bc[$var].'><td>'; - print $langs->trans("ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td> </td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>'; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td> </td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>'; } print '</table>'; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index b14c95164650a0557b84c98c3cca1d853fd9b337..6e105acea6d83354b498804cdba1072e95a0ba4c 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1310,7 +1310,7 @@ if ($action == 'create') print '</td></tr>'; // Bank Account - if (! empty($conf->global->ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->module->banque->enabled) { + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->module->banque->enabled) { print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">'; $form->select_comptes($fk_account, 'fk_account', 0, '', 1); print '</td></tr>'; @@ -1894,7 +1894,7 @@ if ($action == 'create') print '</tr>'; } - if (! empty($conf->global->ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) { // Bank Account print '<tr><td>'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 13e9580e2b89f269b414c0627d9a1e0eaccabfd1..fec89ae5bcd9610c0e8d09915afc586861620c76 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1139,7 +1139,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) -ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models