From 614f25bf51b8707a47285958b825553e0c62e3aa Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 4 Jun 2010 14:40:12 +0000
Subject: [PATCH] Fix: First debug of standing orders

---
 htdocs/compta/prelevement/class/bon-prelevement.class.php | 7 ++++---
 htdocs/compta/prelevement/create.php                      | 5 +++--
 htdocs/societe/class/societe.class.php                    | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php
index e8116bd05fb..b19dae2617e 100644
--- a/htdocs/compta/prelevement/class/bon-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2010	   Juanjo Menent        <jmenent@2byte.es>
  *
  * 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
@@ -322,7 +323,7 @@ class BonPrelevement extends CommonObject
             }
 
             /*
-             * Fin de la proc�dure
+             * Fin de la procedure
              *
              */
             if ($error == 0)
@@ -681,7 +682,7 @@ class BonPrelevement extends CommonObject
 
         dol_syslog("BonPrelevement::Create banque=$banque guichet=$guichet");
 
-        require_once (DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php");
+        //require_once (DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php");
         require_once (DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
         require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
         require_once (DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
@@ -842,7 +843,7 @@ class BonPrelevement extends CommonObject
 
                 // Create withdraw receipt in database
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
-                $sql.= ", ref";
+                $sql.= " ref";
                 $sql.= ", entity";
                 $sql.= ",datec";
                 $sql.= ") VALUES (";
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 001e13c6521..232ca3e8840 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2010	   Juanjo Menent        <jmenent@2byte.es>
  *
  * 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
@@ -45,7 +46,7 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 if ($_GET["action"] == 'create')
 {
 	$bprev = new BonPrelevement($db);
-	$result=$bprev->create($_GET["banque"],$_GET["guichet"]);
+	$result=$bprev->create(PRELEVEMENT_CODE_BANQUE, PRELEVEMENT_CODE_GUICHET);
 	if ($result < 0)
 	{
 		$mesg='<div class="error">'.$bprev->error.'</div>';
@@ -179,7 +180,7 @@ else
 
 
 /*
- * Factures en attente de pr�l�vement
+ * Factures en attente de prelevement
  *
  */
 $sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid";
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index b85c3ea9d0b..d175ec6bf1b 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1489,7 +1489,8 @@ class Societe extends CommonObject
 		require_once DOL_DOCUMENT_ROOT . "/societe/class/companybankaccount.class.php";
 
 		$bac = new CompanyBankAccount($this->db, $this->id);
-		$bac->fetch($this->id);
+		$bac->socid = $this->id;
+		$bac->fetch();
 
 		$this->bank_account = $bac;
 		return 1;