diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php index 62e85558ed1..2e7425dca98 100644 --- a/htdocs/compta/bank/transfer.php +++ b/htdocs/compta/bank/transfer.php @@ -76,7 +76,7 @@ if ($action == 'add') { $errori[$i] = 0; $tabnum[$i] = 0; - if (!empty($label[$i]) || !empty($type[$i]) || !($amount[$i] <= 0) || !($accountfrom[$i] < 0) || !($accountto[$i] < 0)) { + if (!empty($label[$i]) || !($amount[$i] <= 0) || !($accountfrom[$i] < 0) || !($accountto[$i] < 0)) { $tabnum[$i] = 1; } $i++; @@ -124,7 +124,7 @@ if ($action == 'add') { $amountto[$n] = $amount[$n]; } else { if (!$amountto[$n]) { - $error[$n]++; + $errori[$n]++; setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AmountTo")).' #'.$n, null, 'errors'); } } @@ -172,7 +172,7 @@ if ($action == 'add') { $result = $tmpaccountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert'); } if (!($result > 0)) { - $errori++; + $errori[$n]++; } if (!$errori[$n]) { $result = $tmpaccountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert'); @@ -211,68 +211,38 @@ llxHeader('', $title, $help_url); print ' '; @@ -298,16 +268,18 @@ print ''.$langs->trans("Type").''; print ''.$langs->trans("Date").''; print ''.$langs->trans("Description").''; print ''.$langs->trans("Amount").''; -//print ''.$langs->trans("AmountToOthercurrency").''; +print ''.$langs->trans("AmountToOthercurrency").''; print ''; for ($i = 1 ; $i < $MAXLINES; $i++) { $label = ''; $amount = ''; + $amounto = ''; if ($errori[$i]) { $label = GETPOST($i.'_label', 'alpha'); $amount = GETPOST($i.'_amount', 'alpha'); + $amountto = GETPOST($i.'_amountto', 'alpha'); } if ($i == 1) { @@ -339,11 +311,14 @@ for ($i = 1 ; $i < $MAXLINES; $i++) { print $form->selectDate((!empty($dateo[$i]) ? $dateo[$i] : ''), $i.'_', '', '', '', 'add'); print "\n"; + // Description print ''; + // Amount print ''; - print ''; + // AmountToOthercurrency + print ''; print ''; } @@ -352,7 +327,7 @@ print ''; print ''; print ''; print '
'; -print ' +print ' '; diff --git a/htdocs/core/ajax/getaccountcurrency.php b/htdocs/core/ajax/getaccountcurrency.php deleted file mode 100644 index 20061dcdf2b..00000000000 --- a/htdocs/core/ajax/getaccountcurrency.php +++ /dev/null @@ -1,66 +0,0 @@ - - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/core/ajax/getaccountcurrency.php - * \brief File to load currency rates - */ - -if (!defined('NOTOKENRENEWAL')) { - define('NOTOKENRENEWAL', '1'); // Disables token renewal -} -if (!defined('NOREQUIREMENU')) { - define('NOREQUIREMENU', '1'); -} -if (!defined('NOREQUIREAJAX')) { - define('NOREQUIREAJAX', '1'); -} - -// Load Dolibarr environment -require '../../main.inc.php'; - -$id = GETPOST('id', 'int'); - -// Security check -$result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account'); - - -/* - * View - */ - -top_httphead(); - -//print ''."\n"; - -// Load original field value -if (!empty($id)) { - require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; - $account = new Account($db); - $result = $account->fetch($id); - if ($result < 0) { - $return['value'] = ''; - $return['num'] = $result; - $return['error'] = $account->errors[0]; - } else { - $return['value'] = $account->currency_code; - $return['num'] = $result; - $return['error'] = ''; - } - - echo json_encode($return); -}