From 8b77ea20192b99d20f875d2e93ad3d7259455c0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 5 Jun 2010 14:34:04 +0000
Subject: [PATCH] Qual: Uniformize code

---
 htdocs/compta/prelevement/create.php            |  3 ++-
 .../societe/class/companybankaccount.class.php  | 17 +++++++++++------
 htdocs/societe/class/societe.class.php          |  8 +++-----
 htdocs/societe/rib.php                          |  4 ++--
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 232ca3e8840..5397f006c90 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2010      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2010	   Juanjo Menent        <jmenent@2byte.es>
  *
@@ -46,7 +47,7 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 if ($_GET["action"] == 'create')
 {
 	$bprev = new BonPrelevement($db);
-	$result=$bprev->create(PRELEVEMENT_CODE_BANQUE, PRELEVEMENT_CODE_GUICHET);
+	$result=$bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET);
 	if ($result < 0)
 	{
 		$mesg='<div class="error">'.$bprev->error.'</div>';
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 61e4eb29116..75b57978967 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -133,15 +133,19 @@ class CompanyBankAccount
 		}
 	}
 
-	/*
-	 *
-	 *
+	/**
+	 * 	Load record from database
+	 *	@param		id			Id of record
+	 * 	@param		socid		Id of company
 	 */
-	function fetch()
+	function fetch($id,$socid)
 	{
+		if (empty($id) && empty($socid)) return -1;
 
-		$sql = "SELECT rowid, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, adresse_proprio FROM ".MAIN_DB_PREFIX."societe_rib";
-		$sql.= " WHERE fk_soc  = ".$this->socid;
+		$sql = "SELECT rowid, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, adresse_proprio";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id)    $sql.= " WHERE rowid = ".$id;
+		if ($socid) $sql.= " WHERE fk_soc  = ".$socid;
 
 		$result = $this->db->query($sql);
 
@@ -151,6 +155,7 @@ class CompanyBankAccount
 			{
 				$obj = $this->db->fetch_object($result);
 
+				$this->id				= $obj->rowid;
 				$this->bank            = $obj->bank;
 				$this->courant         = $obj->courant;
 				$this->clos            = $obj->clos;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index d175ec6bf1b..81886f56fec 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1466,8 +1466,7 @@ class Societe extends CommonObject
 		require_once DOL_DOCUMENT_ROOT . "/societe/class/companybankaccount.class.php";
 
 		$bac = new CompanyBankAccount($this->db);
-		$bac->socid = $this->id;
-		$bac->fetch($this->id);
+		$bac->fetch(0,$this->id);
 
 		if ($bac->code_banque || $bac->code_guichet || $bac->number || $bac->cle_rib)
 		{
@@ -1488,9 +1487,8 @@ class Societe extends CommonObject
 	{
 		require_once DOL_DOCUMENT_ROOT . "/societe/class/companybankaccount.class.php";
 
-		$bac = new CompanyBankAccount($this->db, $this->id);
-		$bac->socid = $this->id;
-		$bac->fetch();
+		$bac = new CompanyBankAccount($this->db);
+		$bac->fetch(0,$this->id);
 
 		$this->bank_account = $bac;
 		return 1;
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index cca175f6ab5..0017a7486cf 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -95,8 +95,8 @@ $head=societe_prepare_head2($soc);
 dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
 
 $account = new CompanyBankAccount($db);
-$account->socid=$soc->id;
-$account->fetch($soc->id);
+$account->fetch(0,$soc->id);
+
 
 
 /* ************************************************************************** */