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

Fix: Patch Raphael

Browse Source
This commit is contained in:
Laurent Destailleur 2008-06-20 20:41:35 +00:00
parent ea312bc9b4
commit 2af507d7a3
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
htdocs/propal.class.php
View File

@ -5,6 +5,7 @@
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com> * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* *
* 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
@ -1337,27 +1338,56 @@ class Propal extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."fa_pr as fp"; $sql.= ", ".MAIN_DB_PREFIX."fa_pr as fp";
$sql.= " WHERE fp.fk_facture = f.rowid AND fp.fk_propal = ".$id; $sql.= " WHERE fp.fk_facture = f.rowid AND fp.fk_propal = ".$id;
$sql.= " UNION "; //$sql.= " UNION ";
// Cas des factures lier via la commande // Cas des factures liees via la commande
$sql.= "SELECT f.rowid, f.facnumber"; $sql2= "SELECT f.rowid, f.facnumber";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql2.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."co_pr as cp, ".MAIN_DB_PREFIX."co_fa as cf"; $sql2.= ", ".MAIN_DB_PREFIX."co_pr as cp, ".MAIN_DB_PREFIX."co_fa as cf";
$sql.= " WHERE cp.fk_propale = ".$id." AND cf.fk_commande = cp.fk_commande AND cf.fk_facture = f.rowid"; $sql2.= " WHERE cp.fk_propale = ".$id." AND cf.fk_commande = cp.fk_commande AND cf.fk_facture = f.rowid";
//$sql = "SELECT fk_facture FROM ".MAIN_DB_PREFIX."fa_pr as fp"; //$sql = "SELECT fk_facture FROM ".MAIN_DB_PREFIX."fa_pr as fp";
//$sql .= " WHERE fk_propal = " . $id; //$sql .= " WHERE fk_propal = " . $id;
dolibarr_syslog("Propal::InvoiceArrayList sql=".$sql); dolibarr_syslog("Propal::InvoiceArrayList sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
$resql2=null;
if ($resql) if ($resql)
{ {
dolibarr_syslog("Propal::InvoiceArrayList sql2=".$sql2);
$resql2=$this->db->query($sql2);
}
if ($resql2)
{
$tab_sqlobj=array();
$nump = $this->db->num_rows($resql); $nump = $this->db->num_rows($resql);
for ($i = 0;$i < $nump;$i++)
{
$sqlobj = $this->db->fetch_object($resql);
$tab_sqlobj[] = $sqlobj;
//$tab_sqlobjOrder[]= $sqlobj->dc;
}
$this->db->free($resql);
$nump = $this->db->num_rows($resql2);
for ($i = 0;$i < $nump;$i++)
{
$sqlobj = $this->db->fetch_object($resql2);
$tab_sqlobj[] = $sqlobj;
//$tab_sqlobjOrder[]= $sqlobj->dc;
}
$this->db->free($resql2);
//array_multisort ($tab_sqlobjOrder,$tab_sqlobj);
//$nump = $this->db->num_rows($resql);
$nump = sizeOf($tab_sqlobj);
if ($nump) if ($nump)
{ {
$i = 0; $i = 0;
while ($i < $nump) while ($i < $nump)
{ {
$obj = $this->db->fetch_object($resql); //$obj = $this->db->fetch_object($resql);
$obj = array_shift($tab_sqlobj);
$ga[$obj->rowid] = $obj->facnumber; $ga[$obj->rowid] = $obj->facnumber;
$i++; $i++;
} }