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

Fix: Fix bad link toward suplier invoice in referer stat page of products

Browse Source
This commit is contained in:
Laurent Destailleur 2009-01-07 13:06:56 +00:00
parent d6648b65f2
commit 6e47327ee7
3 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/fourn/fournisseur.class.php
View File

@ -40,7 +40,7 @@ class Fournisseur extends Societe
/** /**
* \brief Constructeur de la classe * \brief Constructeur de la classe
* \param DB handler accès base de données * \param DB handler acc<EFBFBD>s base de donn<EFBFBD>es
* \param id id societe (0 par defaut) * \param id id societe (0 par defaut)
*/ */
@ -84,12 +84,12 @@ class Fournisseur extends Societe
function NbProduct() function NbProduct()
{ {
$sql = "SELECT count(*)"; $sql = "SELECT count(pf.rowid)";
$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur as pf,";
$sql .= " WHERE fk_soc = ".$this->id; $sql.= " ".MAIN_DB_PREFIX."product_fournisseur_price as ppf";
$sql .= " WHERE fk_soc = ".$this->id." AND ppf.fk_product_fournisseur = pf.rowid";
$resql = $this->db->query($sql) ; $resql = $this->db->query($sql) ;
if ( $resql ) if ( $resql )
{ {
$row = $this->db->fetch_row($resql); $row = $this->db->fetch_row($resql);
@ -99,13 +99,12 @@ class Fournisseur extends Societe
{ {
return -1; return -1;
} }
} }
/** /**
* \brief Créé la commande au statut brouillon * \brief Cr<EFBFBD><EFBFBD> la commande au statut brouillon
* \param user Utilisateur qui crée * \param user Utilisateur qui cr<EFBFBD>e
* \return int <0 si ko, id de la commande créée si ok * \return int <0 si ko, id de la commande cr<EFBFBD><EFBFBD>e si ok
*/ */
function updateFromCommandeClient($user, $idc, $comclientid) function updateFromCommandeClient($user, $idc, $comclientid)
{ {
@ -116,9 +115,9 @@ class Fournisseur extends Societe
} }
/** /**
* \brief Créé la commande au statut brouillon * \brief Cr<EFBFBD><EFBFBD> la commande au statut brouillon
* \param user Utilisateur qui crée * \param user Utilisateur qui cr<EFBFBD>e
* \return int <0 si ko, id de la commande créée si ok * \return int <0 si ko, id de la commande cr<EFBFBD><EFBFBD>e si ok
*/ */
function create_commande($user) function create_commande($user)
{ {
@ -215,8 +214,8 @@ class Fournisseur extends Societe
} }
/** /**
* \brief Créé une categorie fournisseur * \brief Cr<EFBFBD><EFBFBD> une categorie fournisseur
* \param user Utilisateur qui crée * \param user Utilisateur qui cr<EFBFBD>e
* \param name Nom categorie * \param name Nom categorie
* \return int <0 si ko, 0 si ok * \return int <0 si ko, 0 si ok
*/ */

21
htdocs/product/stats/facture.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2006 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2006 Regis Houssin <regis@dolibarr.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
@ -56,9 +56,11 @@ if ($user->societe_id > 0)
/* /*
* Affiche fiche * View
*
*/ */
$invoicestatic=new Facture($db);
$html = new Form($db); $html = new Form($db);
@ -97,7 +99,7 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>'; print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
print '</tr>'; print '</tr>';
// Prix // Price
print '<tr><td>'.$langs->trans("SellingPrice").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("SellingPrice").'</td><td colspan="3">';
if ($product->price_base_type == 'TTC') if ($product->price_base_type == 'TTC')
{ {
@ -164,16 +166,17 @@ if ($_GET["id"] || $_GET["ref"])
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").' '; print '<td>';
print $objp->facnumber; $invoicestatic->id=$objp->facid;
print "</a></td>\n"; $invoicestatic->ref=$objp->facnumber;
print $invoicestatic->getNomUrl(1);
print "</td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'</a></td>'; print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'</a></td>';
print "<td>".$objp->code_client."</td>\n"; print "<td>".$objp->code_client."</td>\n";
print "<td align=\"center\">"; print "<td align=\"center\">";
print dolibarr_print_date($objp->date)."</td>"; print dolibarr_print_date($objp->date)."</td>";
print "<td align=\"right\">".price($objp->total_ht)."</td>\n"; print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
$fac=new Facture($db); print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
print '<td align="right">'.$fac->LibStatut($objp->paye,$objp->statut,5).'</td>';
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }

18
htdocs/product/stats/facture_fournisseur.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.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
@ -28,7 +28,7 @@
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product.class.php");
$langs->load("companies"); $langs->load("companies");
@ -57,9 +57,11 @@ if ($user->societe_id > 0)
/* /*
* Affiche fiche * View
*
*/ */
$supplierinvoicestatic=new FactureFournisseur($db);
$html = new Form($db); $html = new Form($db);
if ($_GET["id"] || $_GET["ref"]) if ($_GET["id"] || $_GET["ref"])
@ -164,9 +166,11 @@ if ($_GET["id"] || $_GET["ref"])
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").' '; print '<td>';
print $objp->facnumber; $supplierinvoicestatic->id=$objp->facid;
print "</a></td>\n"; $supplierinvoicestatic->ref=$objp->facnumber;
print $supplierinvoicestatic->getNomUrl(1);
print "</td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'</a></td>'; print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'</a></td>';
print "<td>".$objp->code_client."</td>\n"; print "<td>".$objp->code_client."</td>\n";
print "<td align=\"center\">"; print "<td align=\"center\">";