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

Fix: [ bug #1166 ] Supplier account number in its card does not respect

Browse Source 
order set in Banks module.
This commit is contained in:
Laurent Destailleur 2013-12-01 23:16:18 +01:00
parent f7d855f4ce
commit c475346248
4 changed files with 314 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/bank.php
View File

@ -177,13 +177,13 @@ while ($i < $nbofbank)
if ($conf->global->BANK_SHOW_ORDER_OPTION == $i) if ($conf->global->BANK_SHOW_ORDER_OPTION == $i)
{ {
print '<td align="center">'; print '<td align="center">';
print img_picto($langs->trans("Activated"),'switch_on'); print img_picto($langs->trans("Activated"),'on');
print '</td>'; print '</td>';
} }
else else
{ {
print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&amp;value='.$i.'">'; print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&amp;value='.$i.'">';
print img_picto($langs->trans("Disabled"),'switch_off'); print img_picto($langs->trans("Disabled"),'off');
print '</a></td>'; print '</a></td>';
} }
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';

180
htdocs/compta/bank/bankid_fr.php
View File

@ -131,7 +131,7 @@ if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
if ($action == 'delete') if ($action == 'delete')
{ {
print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$account->id,$langs->trans("DeleteAccount"),$langs->trans("ConfirmDeleteAccount"),"confirm_delete"); print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$account->id,$langs->trans("DeleteAccount"),$langs->trans("ConfirmDeleteAccount"),"confirm_delete");
} }
@ -171,38 +171,71 @@ if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
print '<tr><td valign="top">'.$langs->trans("BankAccountCountry").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountCountry").'</td><td colspan="3">';
$img=picto_from_langcode($account->country_code); $img=picto_from_langcode($account->country_code);
print $img?$img.' ':''; print $img?$img.' ':'';
print getCountry($account->getCountryCode(),0,$db); print getCountry($account->getCountryCode(), 0, $db);
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankName").'</td>'; print '<tr><td valign="top">'.$langs->trans("BankName").'</td>';
print '<td colspan="3">'.$account->bank.'</td></tr>'; print '<td colspan="3">'.$account->bank.'</td></tr>';
if ($account->useDetailedBBAN() == 1) // Show fields of bank account
$fieldlists='BankCode DeskCode AccountNumber BankAccountNumberKey';
if (! empty($conf->global->BANK_SHOW_ORDER_OPTION))
{ {
print '<tr><td>'.$langs->trans("BankCode").'</td>'; if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION))
print '<td colspan="3">'.$account->code_banque.'</td>'; {
print '</tr>'; if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') $fieldlists='BankCode DeskCode BankAccountNumberKey AccountNumber';
}
print '<tr><td>'.$langs->trans("DeskCode").'</td>'; else $fieldlists=$conf->global->BANK_SHOW_ORDER_OPTION;
print '<td colspan="3">'.$account->code_guichet.'</td>';
print '</tr>';
} }
if ($account->useDetailedBBAN() == 2) $fieldlistsarray=explode(' ',$fieldlists);
{
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td colspan="3">'.$account->code_banque.'</td>';
print '</tr>';
}
print '<tr><td>'.$langs->trans("BankAccountNumber").'</td>'; foreach($fieldlistsarray as $val)
print '<td colspan="3">'.$account->number.'</td>';
print '</tr>';
if ($account->useDetailedBBAN() == 1)
{ {
print '<tr><td>'.$langs->trans("BankAccountNumberKey").'</td>'; if ($val == 'BankCode')
print '<td colspan="3">'.$account->cle_rib.'</td>'; {
print '</tr>'; if ($account->useDetailedBBAN() == 1)
{
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td colspan="3">'.$account->code_banque.'</td>';
print '</tr>';
}
}
if ($val == 'DeskCode')
{
if ($account->useDetailedBBAN() == 1)
{
print '<tr><td>'.$langs->trans("DeskCode").'</td>';
print '<td colspan="3">'.$account->code_guichet.'</td>';
print '</tr>';
}
}
if ($val == 'BankCode')
{
if ($account->useDetailedBBAN() == 2)
{
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td colspan="3">'.$account->code_banque.'</td>';
print '</tr>';
}
}
if ($val == 'AccountNumber')
{
print '<tr><td>'.$langs->trans("BankAccountNumber").'</td>';
print '<td colspan="3">'.$account->number.'</td>';
print '</tr>';
}
if ($val == 'BankAccountNumberKey')
{
if ($account->useDetailedBBAN() == 1)
{
print '<tr><td>'.$langs->trans("BankAccountNumberKey").'</td>';
print '<td colspan="3">'.$account->cle_rib.'</td>';
print '</tr>';
}
}
} }
$ibankey="IBANNumber"; $ibankey="IBANNumber";
@ -310,38 +343,77 @@ if ($_GET["id"] && $action == 'edit' && $user->rights->banque->configurer)
if ($account->type == 0 || $account->type == 1) if ($account->type == 0 || $account->type == 1)
{ {
print '<tr><td valign="top">'.$langs->trans("BankAccountCountry").'</td><td colspan="3">';
$img=picto_from_langcode($account->country_code);
print $img?$img.' ':'';
print getCountry($account->getCountryCode(), 0, $db);
print "</td></tr>\n";
// If bank account // If bank account
print '<tr><td valign="top">'.$langs->trans("BankName").'</td>'; print '<tr><td valign="top">'.$langs->trans("BankName").'</td>';
print '<td colspan="3"><input size="30" type="text" class="flat" name="bank" value="'.$account->bank.'"></td>'; print '<td colspan="3"><input size="30" type="text" class="flat" name="bank" value="'.$account->bank.'"></td>';
print '</tr>'; print '</tr>';
// BBAN // Show fields of bank account
if ($account->useDetailedBBAN() == 1) $fieldlists='BankCode DeskCode AccountNumber BankAccountNumberKey';
if (! empty($conf->global->BANK_SHOW_ORDER_OPTION))
{ {
print '<tr><td>'.$langs->trans("BankCode").'</td>'; if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION))
print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>'; {
print '</tr>'; if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') $fieldlists='BankCode DeskCode BankAccountNumberKey AccountNumber';
}
print '<tr><td>'.$langs->trans("DeskCode").'</td>'; else $fieldlists=$conf->global->BANK_SHOW_ORDER_OPTION;
print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.$account->code_guichet.'"></td>';
print '</tr>';
} }
if ($account->useDetailedBBAN() == 2) $fieldlistsarray=explode(' ',$fieldlists);
{
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
print '</tr>';
}
print '<td>'.$langs->trans("BankAccountNumber").'</td>'; foreach($fieldlistsarray as $val)
print '<td><input size="18" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
print '</tr>';
if ($account->useDetailedBBAN() == 1)
{ {
print '<td>'.$langs->trans("BankAccountNumberKey").'</td>'; if ($val == 'BankCode')
print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.$account->cle_rib.'"></td>'; {
print '</tr>'; if ($account->useDetailedBBAN() == 1)
{
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
print '</tr>';
}
}
if ($val == 'DeskCode')
{
if ($account->useDetailedBBAN() == 1)
{
print '<tr><td>'.$langs->trans("DeskCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.$account->code_guichet.'"></td>';
print '</tr>';
}
}
if ($val == 'BankCode')
{
if ($account->useDetailedBBAN() == 2)
{
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
print '</tr>';
}
}
if ($val == 'AccountNumber')
{
print '<td>'.$langs->trans("BankAccountNumber").'</td>';
print '<td><input size="18" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
print '</tr>';
}
if ($val == 'BankAccountNumberKey')
{
if ($account->useDetailedBBAN() == 1)
{
print '<td>'.$langs->trans("BankAccountNumberKey").'</td>';
print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.$account->cle_rib.'"></td>';
print '</tr>';
}
}
} }
$ibankey="IBANNumber"; $ibankey="IBANNumber";
@ -361,10 +433,6 @@ if ($_GET["id"] && $action == 'edit' && $user->rights->banque->configurer)
print $account->domiciliation; print $account->domiciliation;
print "</textarea></td></tr>"; print "</textarea></td></tr>";
print '<tr><td valign="top">'.$langs->trans("BankAccountCountry").'</td><td colspan="3">';
print getCountry($account->getCountryCode());
print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>';
print '<td colspan="3"><input size="30" type="text" class="flat" name="proprio" value="'.$account->proprio.'">'; print '<td colspan="3"><input size="30" type="text" class="flat" name="proprio" value="'.$account->proprio.'">';
print '</td></tr>'; print '</td></tr>';
@ -376,11 +444,15 @@ if ($_GET["id"] && $action == 'edit' && $user->rights->banque->configurer)
} }
print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("Save").'" type="submit" class="button">';
print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button">';
print '</td></tr>';
print '</table>'; print '</table>';
print '<br>';
print '<div align="center">';
print '<input value="'.$langs->trans("Save").'" type="submit" class="button">';
print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button">';
print '</div>';
print '</form>'; print '</form>';
} }

3
htdocs/compta/bank/index.php
View File

@ -234,7 +234,6 @@ if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>'; print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
print "</table>"; print "</table>";
print "<br>";
/* /*
@ -242,7 +241,7 @@ print "<br>";
*/ */
print '<div class="tabsAction">'."\n"; print '<div class="tabsAction">'."\n";
if ($user->rights->banque->configurer) if ($user->rights->banque->configurer)
{ {
print '<a class="butAction" href="fiche.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>'; print '<a class="butAction" href="fiche.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
} }

291
htdocs/societe/rib.php
View File

@ -92,37 +92,55 @@ if ($action == 'update' && ! $_POST["cancel"])
if ($action == 'add' && ! $_POST["cancel"]) if ($action == 'add' && ! $_POST["cancel"])
{ {
// Ajout $error=0;
$account = new CompanyBankAccount($db);
$account->socid = $soc->id; if (! GETPOST('label'))
{
setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv('Label')),'errors');
$action='create';
$error++;
}
if (! GETPOST('bank'))
{
setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv('BankName')),'errors');
$action='create';
$error++;
}
$account->bank = $_POST["bank"]; if (! $error)
$account->label = $_POST["label"]; {
$account->courant = $_POST["courant"]; // Ajout
$account->clos = $_POST["clos"]; $account = new CompanyBankAccount($db);
$account->code_banque = $_POST["code_banque"];
$account->code_guichet = $_POST["code_guichet"];
$account->number = $_POST["number"];
$account->cle_rib = $_POST["cle_rib"];
$account->bic = $_POST["bic"];
$account->iban_prefix = $_POST["iban_prefix"];
$account->domiciliation = $_POST["domiciliation"];
$account->proprio = $_POST["proprio"];
$account->owner_address = $_POST["owner_address"];
$result = $account->update($user); // TODO Use create and include update into create method $account->socid = $soc->id;
if (! $result)
{ $account->bank = $_POST["bank"];
$message=$account->error; $account->label = $_POST["label"];
$_GET["action"]='create'; // Force chargement page création $account->courant = $_POST["courant"];
} $account->clos = $_POST["clos"];
else $account->code_banque = $_POST["code_banque"];
{ $account->code_guichet = $_POST["code_guichet"];
$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$soc->id; $account->number = $_POST["number"];
header('Location: '.$url); $account->cle_rib = $_POST["cle_rib"];
exit; $account->bic = $_POST["bic"];
} $account->iban_prefix = $_POST["iban_prefix"];
$account->domiciliation = $_POST["domiciliation"];
$account->proprio = $_POST["proprio"];
$account->owner_address = $_POST["owner_address"];
$result = $account->update($user); // TODO Use create and include update into create method
if (! $result)
{
$message=$account->error;
$_GET["action"]='create'; // Force chargement page création
}
else
{
$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$soc->id;
header('Location: '.$url);
exit;
}
}
} }
if ($action == 'setasdefault') if ($action == 'setasdefault')
@ -203,35 +221,68 @@ if ($socid && $action != 'edit' && $action != "create")
print '<tr><td>'.$langs->trans("LabelRIB").'</td>'; print '<tr><td>'.$langs->trans("LabelRIB").'</td>';
print '<td colspan="4">'.$account->label.'</td></tr>'; print '<td colspan="4">'.$account->label.'</td></tr>';
print '<tr><td valign="top" width="35%">'.$langs->trans("Bank").'</td>'; print '<tr><td valign="top" width="35%">'.$langs->trans("BankName").'</td>';
print '<td colspan="4">'.$account->bank.'</td></tr>'; print '<td colspan="4">'.$account->bank.'</td></tr>';
if ($account->useDetailedBBAN() == 1) // Show fields of bank account
$fieldlists='BankCode DeskCode AccountNumber BankAccountNumberKey';
if (! empty($conf->global->BANK_SHOW_ORDER_OPTION))
{ {
print '<tr><td>'.$langs->trans("BankCode").'</td>'; if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION))
print '<td colspan="3">'.$account->code_banque.'</td>'; {
print '</tr>'; if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') $fieldlists='BankCode DeskCode BankAccountNumberKey AccountNumber';
}
print '<tr><td>'.$langs->trans("DeskCode").'</td>'; else $fieldlists=$conf->global->BANK_SHOW_ORDER_OPTION;
print '<td colspan="3">'.$account->code_guichet.'</td>';
print '</tr>';
} }
if ($account->useDetailedBBAN() == 2) $fieldlistsarray=explode(' ',$fieldlists);
{
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td colspan="3">'.$account->code_banque.'</td>';
print '</tr>';
}
print '<tr><td>'.$langs->trans("BankAccountNumber").'</td>'; foreach($fieldlistsarray as $val)
print '<td colspan="3">'.$account->number.'</td>';
print '</tr>';
if ($account->useDetailedBBAN() == 1)
{ {
print '<tr><td>'.$langs->trans("BankAccountNumberKey").'</td>'; if ($val == 'BankCode')
print '<td colspan="3">'.$account->cle_rib.'</td>'; {
print '</tr>'; if ($account->useDetailedBBAN() == 1)
{
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td colspan="3">'.$account->code_banque.'</td>';
print '</tr>';
}
}
if ($val == 'DeskCode')
{
if ($account->useDetailedBBAN() == 1)
{
print '<tr><td>'.$langs->trans("DeskCode").'</td>';
print '<td colspan="3">'.$account->code_guichet.'</td>';
print '</tr>';
}
}
if ($val == 'BankCode')
{
if ($account->useDetailedBBAN() == 2)
{
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td colspan="3">'.$account->code_banque.'</td>';
print '</tr>';
}
}
if ($val == 'AccountNumber')
{
print '<tr><td>'.$langs->trans("BankAccountNumber").'</td>';
print '<td colspan="3">'.$account->number.'</td>';
print '</tr>';
}
if ($val == 'BankAccountNumberKey')
{
if ($account->useDetailedBBAN() == 1)
{
print '<tr><td>'.$langs->trans("BankAccountNumberKey").'</td>';
print '<td colspan="3">'.$account->cle_rib.'</td>';
print '</tr>';
}
}
} }
print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>'; print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
@ -255,7 +306,7 @@ if ($socid && $action != 'edit' && $action != "create")
print '</table>'; print '</table>';
// Check BBAN // Check BBAN
if (! checkBanForAccount($account)) if ($account->label && ! checkBanForAccount($account))
{ {
print '<div class="warning">'.$langs->trans("RIBControlError").'</div>'; print '<div class="warning">'.$langs->trans("RIBControlError").'</div>';
} }
@ -327,11 +378,8 @@ if ($socid && $action != 'edit' && $action != "create")
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer) if ($socid && $action == 'edit' && $user->rights->societe->creer)
{ {
$form = new Form($db);
dol_htmloutput_mesg($message); dol_htmloutput_mesg($message);
print '<form action="rib.php?socid='.$soc->id.'" method="post">'; print '<form action="rib.php?socid='.$soc->id.'" method="post">';
@ -341,40 +389,73 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td valign="top" width="35%">'.$langs->trans("LabelRIB").'</td>'; print '<tr><td valign="top" width="35%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>'; print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
print '<tr><td>'.$langs->trans("Bank").'</td>'; print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
print '<td><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>'; print '<td><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
// BBAN // Show fields of bank account
if ($account->useDetailedBBAN() == 1) $fieldlists='BankCode DeskCode AccountNumber BankAccountNumberKey';
{ if (! empty($conf->global->BANK_SHOW_ORDER_OPTION))
print '<tr><td>'.$langs->trans("BankCode").'</td>'; {
print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>'; if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION))
print '</tr>'; {
if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') $fieldlists='BankCode DeskCode BankAccountNumberKey AccountNumber';
}
else $fieldlists=$conf->global->BANK_SHOW_ORDER_OPTION;
}
$fieldlistsarray=explode(' ',$fieldlists);
print '<tr><td>'.$langs->trans("DeskCode").'</td>'; foreach($fieldlistsarray as $val)
print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.$account->code_guichet.'"></td>'; {
print '</tr>'; if ($val == 'BankCode')
} {
if ($account->useDetailedBBAN() == 2) if ($account->useDetailedBBAN() == 1)
{ {
print '<tr><td>'.$langs->trans("BankCode").'</td>'; print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>'; print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
print '</tr>'; print '</tr>';
} }
}
print '<td>'.$langs->trans("BankAccountNumber").'</td>'; if ($val == 'DeskCode')
print '<td><input size="15" type="text" class="flat" name="number" value="'.$account->number.'"></td>'; {
print '</tr>'; if ($account->useDetailedBBAN() == 1)
{
print '<tr><td>'.$langs->trans("DeskCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.$account->code_guichet.'"></td>';
print '</tr>';
}
}
if ($account->useDetailedBBAN() == 1) if ($val == 'BankCode')
{ {
print '<td>'.$langs->trans("BankAccountNumberKey").'</td>'; if ($account->useDetailedBBAN() == 2)
print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.$account->cle_rib.'"></td>'; {
print '</tr>'; print '<tr><td>'.$langs->trans("BankCode").'</td>';
} print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
print '</tr>';
}
}
if ($val == 'AccountNumber')
{
print '<td>'.$langs->trans("BankAccountNumber").'</td>';
print '<td><input size="18" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
print '</tr>';
}
if ($val == 'BankAccountNumberKey')
{
if ($account->useDetailedBBAN() == 1)
{
print '<td>'.$langs->trans("BankAccountNumberKey").'</td>';
print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.$account->cle_rib.'"></td>';
print '</tr>';
}
}
}
// IBAN // IBAN
print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>'; print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
@ -413,11 +494,8 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
if ($_GET["socid"] && $_GET["action"] == 'create' && $user->rights->societe->creer) if ($socid && $action == 'create' && $user->rights->societe->creer)
{ {
$form = new Form($db);
dol_htmloutput_mesg($message); dol_htmloutput_mesg($message);
print '<form action="rib.php?socid='.$soc->id.'" method="post">'; print '<form action="rib.php?socid='.$soc->id.'" method="post">';
@ -426,58 +504,60 @@ if ($_GET["socid"] && $_GET["action"] == 'create' && $user->rights->societe->cre
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td valign="top" width="35%">'.$langs->trans("LabelRIB").'</td>'; print '<tr><td valign="top" width="35%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
print '<td colspan="4"><input size="30" type="text" name="label"></td></tr>'; print '<td colspan="4"><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
print '<tr><td>'.$langs->trans("Bank").'</td>'; print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
print '<td><input size="30" type="text" name="bank"></td></tr>'; print '<td><input size="30" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
// BBAN // BBAN
if ($account->useDetailedBBAN() == 1) if ($account->useDetailedBBAN() == 1)
{ {
print '<tr><td>'.$langs->trans("BankCode").'</td>'; print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_banque"></td>'; print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.GETPOST('code_banque').'"></td>';
print '</tr>'; print '</tr>';
print '<tr><td>'.$langs->trans("DeskCode").'</td>'; print '<tr><td>'.$langs->trans("DeskCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_guichet"></td>'; print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.GETPOST('code_guichet').'"></td>';
print '</tr>'; print '</tr>';
} }
if ($account->useDetailedBBAN() == 2) if ($account->useDetailedBBAN() == 2)
{ {
print '<tr><td>'.$langs->trans("BankCode").'</td>'; print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_banque"></td>'; print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.GETPOST('code_banque').'"></td>';
print '</tr>'; print '</tr>';
} }
print '<td>'.$langs->trans("BankAccountNumber").'</td>'; print '<td>'.$langs->trans("BankAccountNumber").'</td>';
print '<td><input size="15" type="text" class="flat" name="number"></td>'; print '<td><input size="15" type="text" class="flat" name="number" value="'.GETPOST('number').'"></td>';
print '</tr>'; print '</tr>';
if ($account->useDetailedBBAN() == 1) if ($account->useDetailedBBAN() == 1)
{ {
print '<td>'.$langs->trans("BankAccountNumberKey").'</td>'; print '<td>'.$langs->trans("BankAccountNumberKey").'</td>';
print '<td><input size="3" type="text" class="flat" name="cle_rib"></td>'; print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.GETPOST('value').'"></td>';
print '</tr>'; print '</tr>';
} }
// IBAN // IBAN
print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>'; print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
print '<td colspan="4"><input size="30" type="text" name="iban_prefix"></td></tr>'; print '<td colspan="4"><input size="30" type="text" name="iban_prefix" value="'.GETPOST('iban_prefix').'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BIC").'</td>'; print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
print '<td colspan="4"><input size="12" type="text" name="bic"></td></tr>'; print '<td colspan="4"><input size="12" type="text" name="bic" value="'.GETPOST('bic').'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">'; print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
print "<textarea name=\"domiciliation\" rows=\"4\" cols=\"40\">"; print '<textarea name="domiciliation" rows="4" cols="40">';
print GETPOST('domiciliation');
print "</textarea></td></tr>"; print "</textarea></td></tr>";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>';
print '<td colspan="4"><input size="30" type="text" name="proprio"></td></tr>'; print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
print "<textarea name=\"owner_address\" rows=\"4\" cols=\"40\">"; print '<textarea name="owner_address" rows="4" cols="40">';
print GETPOST('owner_address');
print "</textarea></td></tr>"; print "</textarea></td></tr>";
print '</table><br>'; print '</table><br>';
@ -493,7 +573,7 @@ if ($_GET["socid"] && $_GET["action"] == 'create' && $user->rights->societe->cre
dol_fiche_end(); dol_fiche_end();
if ($_GET["socid"] && $_GET["action"] != 'edit' && $_GET["action"] != 'create') if ($socid && $action != 'edit' && $action != 'create')
{ {
/* /*
* Barre d'actions * Barre d'actions
@ -509,8 +589,7 @@ if ($_GET["socid"] && $_GET["action"] != 'edit' && $_GET["action"] != 'create')
} }
$db->close();
llxFooter(); llxFooter();
?>
$db->close();
?>