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

Fix: First debug of standing orders

Browse Source
This commit is contained in:
Juanjo Menent 2010-06-04 14:40:12 +00:00
parent b72603abc3
commit 614f25bf51
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/compta/prelevement/class/bon-prelevement.class.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> * 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 * 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 * 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<EFBFBD>dure * Fin de la procedure
* *
*/ */
if ($error == 0) if ($error == 0)
@ -681,7 +682,7 @@ class BonPrelevement extends CommonObject
dol_syslog("BonPrelevement::Create banque=$banque guichet=$guichet"); 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."/compta/facture/class/facture.class.php");
require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
require_once (DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.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 // Create withdraw receipt in database
$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons ("; $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
$sql.= ", ref"; $sql.= " ref";
$sql.= ", entity"; $sql.= ", entity";
$sql.= ",datec"; $sql.= ",datec";
$sql.= ") VALUES ("; $sql.= ") VALUES (";

5
htdocs/compta/prelevement/create.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * 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 * 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 * 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') if ($_GET["action"] == 'create')
{ {
$bprev = new BonPrelevement($db); $bprev = new BonPrelevement($db);
$result=$bprev->create($_GET["banque"],$_GET["guichet"]); $result=$bprev->create(PRELEVEMENT_CODE_BANQUE, PRELEVEMENT_CODE_GUICHET);
if ($result < 0) if ($result < 0)
{ {
$mesg='<div class="error">'.$bprev->error.'</div>'; $mesg='<div class="error">'.$bprev->error.'</div>';
@ -179,7 +180,7 @@ else
/* /*
* Factures en attente de pr<EFBFBD>l<EFBFBD>vement * Factures en attente de prelevement
* *
*/ */
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid"; $sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid";

3
htdocs/societe/class/societe.class.php
View File

@ -1489,7 +1489,8 @@ class Societe extends CommonObject
require_once DOL_DOCUMENT_ROOT . "/societe/class/companybankaccount.class.php"; require_once DOL_DOCUMENT_ROOT . "/societe/class/companybankaccount.class.php";
$bac = new CompanyBankAccount($this->db, $this->id); $bac = new CompanyBankAccount($this->db, $this->id);
$bac->fetch($this->id); $bac->socid = $this->id;
$bac->fetch();
$this->bank_account = $bac; $this->bank_account = $bac;
return 1; return 1;