lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Currency of a bank account can be changed. However if currenci differs from default, amount must be changed during conciliation to reflect true amount in bank account currency.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-06-08 19:21:40 +00:00
parent cd1c9e7ffa
commit 3158e8db2c
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/bank/account.class.php
View File

@ -551,6 +551,7 @@ class Account extends CommonObject
$this->account_number = $obj->account_number; $this->account_number = $obj->account_number;
$this->currency_code = $obj->currency_code; $this->currency_code = $obj->currency_code;
$this->account_currency_code = $obj->currency_code;
$this->min_allowed = $obj->min_allowed; $this->min_allowed = $obj->min_allowed;
$this->min_desired = $obj->min_desired; $this->min_desired = $obj->min_desired;
$this->comment = $obj->comment; $this->comment = $obj->comment;

37
htdocs/compta/bank/fiche.php
View File

@ -20,10 +20,10 @@
*/ */
/** /**
\file htdocs/compta/bank/fiche.php * \file htdocs/compta/bank/fiche.php
\ingroup banque * \ingroup banque
\brief Fiche creation compte bancaire * \brief Fiche creation compte bancaire
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -148,6 +148,9 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user-
} }
/*
* View
*/
llxHeader(); llxHeader();
@ -198,13 +201,13 @@ if ($_GET["action"] == 'create')
// Currency // Currency
print '<tr><td valign="top">'.$langs->trans("Currency").'</td>'; print '<tr><td valign="top">'.$langs->trans("Currency").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
/*
$selectedcode=$account->account_currency_code; $selectedcode=$account->account_currency_code;
if (! $selectedcode) $selectedcode=$conf->monnaie; if (! $selectedcode) $selectedcode=$conf->monnaie;
$form->select_currency($selectedcode, 'account_currency_code'); $form->select_currency($selectedcode, 'account_currency_code');
*/ //print $langs->trans("Currency".$conf->monnaie);
print $langs->trans("Currency".$conf->monnaie); //print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
print '</td></tr>'; print '</td></tr>';
// Pays // Pays
@ -286,7 +289,7 @@ else
dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount")); dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"));
/* /*
* Confirmation de la suppression * Confirmation to delete
*/ */
if ($_GET["action"] == 'delete') if ($_GET["action"] == 'delete')
{ {
@ -327,13 +330,11 @@ else
// Currency // Currency
print '<tr><td valign="top">'.$langs->trans("Currency").'</td>'; print '<tr><td valign="top">'.$langs->trans("Currency").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
/*
$selectedcode=$account->account_currency_code; $selectedcode=$account->account_currency_code;
if (! $selectedcode) $selectedcode=$conf->monnaie; if (! $selectedcode) $selectedcode=$conf->monnaie;
$form->select_currency($selectedcode, 'account_currency_code'); print $langs->trans("Currency".$selectedcode);
*/
print $langs->trans("Currency".$conf->monnaie);
print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>'; print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
@ -439,13 +440,13 @@ else
print '<input type="hidden" value="'.$account->currency_code.'">'; print '<input type="hidden" value="'.$account->currency_code.'">';
print '</td>'; print '</td>';
print '<td colspan="3">'; print '<td colspan="3">';
/*
$selectedcode=$account->account_currency_code; $selectedcode=$account->account_currency_code;
if (! $selectedcode) $selectedcode=$conf->monnaie; if (! $selectedcode) $selectedcode=$conf->monnaie;
$form->select_currency($selectedcode, 'account_currency_code'); $form->select_currency($selectedcode, 'account_currency_code');
*/ //print $langs->trans("Currency".$conf->monnaie);
print $langs->trans("Currency".$conf->monnaie); //print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>'; print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';