This commit is contained in:
Laurent Destailleur
2009-07-29 22:59:18 +00:00
parent 051f4e2983
commit 4e8b96e405
7 changed files with 49 additions and 53 deletions

View File

@@ -561,22 +561,19 @@ EXCLUDE = mssql \
htdocs/conf/conf.php \
htdocs/includes/adodbtime \
htdocs/includes/barcode \
htdocs/includes/cryptograph \
htdocs/includes/fckeditor \
htdocs/includes/fpdf \
htdocs/includes/jpgraph2 \
htdocs/includes/magpierss \
htdocs/includes/nusoap \
htdocs/includes/pear \
htdocs/includes/php_excelreader \
htdocs/includes/php_writeexcel \
htdocs/includes/phpexcelreader \
htdocs/includes/phplot \
htdocs/includes/phplot5 \
htdocs/includes/pwc \
htdocs/includes/scriptaculous \
htdocs/includes/treemenu \
htdocs/includes/xmlrpc \
htdocs/lib/jabber \
htdocs/lib/vcard \
htdocs/includes/smtps \
htdocs/includes/vcard \
htdocs/avoir \
htdocs/document \
htdocs/documents \

View File

@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
*
*
* 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
* the Free Software Foundation; either version 2 of the License, or
@@ -18,26 +18,23 @@
*/
/**
\file htdocs/client.class.php
\ingroup societe
\brief Fichier de la classe des clients
\version $Id$
*/
/**
\class Client
\brief Classe permettant la gestion des clients
*/
* \file htdocs/client.class.php
* \ingroup societe
* \brief File for class of customers
* \version $Id$
*/
include_once(DOL_DOCUMENT_ROOT."/societe.class.php");
/**
* \class Client
* \brief Class to manage customers
*/
class Client extends Societe
{
var $db;
/**
* \brief Constructeur de la classe
* \param DB handler acces base de donnees
@@ -46,41 +43,41 @@ class Client extends Societe
function Client($DB, $id=0)
{
global $config;
$this->db = $DB;
$this->id = $id;
$this->factures = array();
return 0;
}
function read_factures()
{
$sql = "SELECT rowid, facnumber";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql .= " WHERE f.fk_soc = ".$this->id;
$sql .= " ORDER BY datef DESC";
$result = $this->db->query($sql) ;
$i = 0;
if ( $result )
{
$num = $this->db->num_rows();
while ($i < $num )
{
$row = $this->db->fetch_row();
$this->factures[$i][0] = $row[0];
$this->factures[$i][1] = $row[1];
$i++;
}
}
return $result;
}
/**
* \brief Charge indicateurs this->nb de tableau de bord
* \return int <0 si ko, >0 si ok
@@ -88,7 +85,7 @@ class Client extends Societe
function load_state_board()
{
global $conf, $user;
$this->nb=array("customers" => 0,"prospects" => 0);
$clause = "WHERE";
@@ -103,7 +100,7 @@ class Client extends Societe
$sql.= " ".$clause." s.client in (1,2)";
$sql.= " AND s.entity = ".$conf->entity;
$sql.= " GROUP BY s.client";
$resql=$this->db->query($sql);
if ($resql)
{
@@ -114,7 +111,7 @@ class Client extends Societe
}
return 1;
}
else
else
{
dol_print_error($this->db);
$this->error=$this->db->error();
@@ -122,6 +119,6 @@ class Client extends Societe
}
}
}
?>

View File

@@ -17,12 +17,14 @@
*/
/*
* \version $Id$
* \files htdocs/companybankaccount.class.php
* \ingroup societe
* \brief File of class to manage bank accounts description
* \version $Id$
*/
/**
* \brief Class
*
* \brief Class to manage bank accounts description
*/
class CompanyBankAccount
{
@@ -180,7 +182,7 @@ class CompanyBankAccount
return $this->error;
}
/**
*
*
@@ -205,7 +207,7 @@ class CompanyBankAccount
return 0;
}
}
/**
* \brief Return account country code
* \return String country code
@@ -217,7 +219,7 @@ class CompanyBankAccount
// If IBAN defined, we can know country of account from it
if (eregi("^([a-zA-Z][a-zA-Z])",$this->iban,$reg)) return $reg[1];
}
// We return country code
$company=new Societe($this->db);
$result=$company->fetch($this->socid);
@@ -235,8 +237,8 @@ class CompanyBankAccount
if ($this->getCountryCode() == 'FR') return true;
if ($this->getCountryCode() == 'ES') return true;
return false;
}
}
}
?>

View File

@@ -548,9 +548,9 @@ class DoliDb
/**
* \brief Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
* \param string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
* 19700101020000 -> 3600 with TZ+1
* \param string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
* \return date Date TMS
* \example 19700101020000 -> 3600 with TZ+1
*/
function jdate($string)
{

View File

@@ -538,9 +538,9 @@ class DoliDb
/**
* \brief Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
* \param string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
* 19700101020000 -> 3600 with TZ+1
* \param string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
* \return date Date TMS
* \example 19700101020000 -> 3600 with TZ+1
*/
function jdate($string)
{
@@ -794,7 +794,7 @@ class DoliDb
}
return $listtables;
}
/**
* \brief Liste les informations des champs d'une table.
* \param table Nom de la table
@@ -805,7 +805,7 @@ class DoliDb
$infotables=array();
$sql="SHOW FULL COLUMNS FROM ".$table.";";
dol_syslog($sql,LOG_DEBUG);
$result = $this->query($sql);
while($row = $this->fetch_row($result))

View File

@@ -553,9 +553,9 @@ class DoliDb
/**
* \brief Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
* \param string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
* 19700101020000 -> 3600 with TZ+1
* \param string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
* \return date Date TMS
* \example 19700101020000 -> 3600 with TZ+1
*/
function jdate($string)
{

View File

@@ -671,9 +671,9 @@ class DoliDb
/**
* \brief Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
* \param string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
* 19700101020000 -> 3600 with TZ+1
* \param string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
* \return date Date TMS
* \example 19700101020000 -> 3600 with TZ+1
*/
function jdate($string)
{
@@ -881,7 +881,7 @@ class DoliDb
$this->results = pg_query($this->db, "SHOW TABLES;");
return $this->results;
}
/**
* \brief Liste les informations des champs d'une table.
* \param table Nom de la table
@@ -894,7 +894,7 @@ class DoliDb
$infotables=array();
$sql="SHOW FULL COLUMNS FROM ".$table.";";
dol_syslog($sql,LOG_DEBUG);
$result = $this->pg_query($this->db,$sql);
while($row = $this->fetch_row($result))