Merge modif

This commit is contained in:
Maxime Kohlhaas 2013-06-21 11:23:53 +02:00
parent bd8271ee24
commit 8bc68959e1
2 changed files with 10 additions and 10 deletions

View File

@ -36,7 +36,7 @@ if (! empty($conf->categorie->enabled))
$langs->load("products");
$langs->load("stocks");
$langs->load("suppliers");
$langs->load("suppliers");
$action = GETPOST('action');
$sref=GETPOST("sref");

View File

@ -196,15 +196,15 @@ class CompanyBankAccount extends Account
{
global $langs;
if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib)
{
$rib = $this->code_banque." ".$this->code_guichet." ".$this->number;
$rib.=($this->cle_rib?" (".$this->cle_rib.")":"");
}
else
{
$rib=$langs->trans("NoRIB");
}
if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib)
{
$rib = $this->code_banque." ".$this->code_guichet." ".$this->number;
$rib.=($this->cle_rib?" (".$this->cle_rib.")":"");
}
else
{
$rib=$langs->trans("NoRIB");
}
return $rib;
}