From aea97075f1ca830e4210aefe500f4cb6921f0300 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Mar 2012 21:45:17 +0100 Subject: [PATCH] Fix: Fix some bugs (phpunit is now ok with pgsql too) --- .../install/mysql/migration/3.1.0-3.2.0.sql | 2 + htdocs/install/mysql/tables/llx_societe.sql | 4 +- htdocs/product/class/product.class.php | 2 +- htdocs/product/stock/class/entrepot.class.php | 50 +++++++++++-------- htdocs/societe/class/societe.class.php | 3 +- htdocs/user/class/user.class.php | 10 ++-- test/phpunit/AllTests.php | 2 +- 7 files changed, 41 insertions(+), 32 deletions(-) diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql index d37e89e72c3..c5b333bcc6b 100755 --- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql +++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql @@ -36,6 +36,8 @@ ALTER TABLE llx_societe MODIFY siret varchar(128); ALTER TABLE llx_societe MODIFY ape varchar(128); ALTER TABLE llx_societe MODIFY idprof4 varchar(128); ALTER TABLE llx_societe ADD COLUMN idprof5 varchar(128); +ALTER TABLE llx_societe MODIFY code_compta varchar(24); +ALTER TABLE llx_societe MODIFY code_compta_fournisseur varchar(24); ALTER TABLE llx_chargesociales ADD COLUMN tms timestamp; diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index e0ac91bf360..23be7cdd29c 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -38,8 +38,8 @@ create table llx_societe code_client varchar(24), -- code client code_fournisseur varchar(24), -- code founisseur - code_compta varchar(15), -- code compta client - code_compta_fournisseur varchar(15), -- code compta founisseur + code_compta varchar(24), -- code compta client + code_compta_fournisseur varchar(24), -- code compta founisseur address varchar(255), -- company adresse cp varchar(10), -- zipcode ville varchar(50), -- town diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 95471deea91..ff3b788f80b 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -747,7 +747,7 @@ class Product extends CommonObject // Add new price $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,tosell,tva_tx,recuperableonly,"; $sql.= " localtax1_tx, localtax2_tx, price_min,price_min_ttc) "; - $sql.= " VALUES(".($level?$level:1).", ".$this->db->idate($now).",".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx.",".$this->tva_npr.","; + $sql.= " VALUES(".($level?$level:1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx.",".$this->tva_npr.","; $sql.= " ".$this->localtax1_tx.",".$this->localtax2_tx.",".$this->price_min.",".$this->price_min_ttc; $sql.= ")"; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 8ff30ceebec..ca670fcba2a 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -43,9 +43,16 @@ class Entrepot extends CommonObject var $lieu; var $address; //! Code Postal - var $cp; - var $ville; - var $pays_id; + var $cp; // deprecated + var $ville; // deprecated + var $zip; + var $town; + + var $country; + var $country_id; + var $country_code; + var $pays_id; // deprecated + /** * Constructor @@ -81,7 +88,7 @@ class Entrepot extends CommonObject $this->db->begin(); $sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (datec, fk_user_author, label)"; - $sql .= " VALUES (".$this->db->idate($now).",".$user->id.",'".$this->db->escape($this->libelle)."')"; + $sql .= " VALUES ('".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->libelle)."')"; dol_syslog(get_class($this)."::create sql=".$sql); $result=$this->db->query($sql); @@ -133,22 +140,21 @@ class Entrepot extends CommonObject $this->description=$this->db->escape(trim($this->description)); $this->lieu=$this->db->escape(trim($this->lieu)); + $this->address=$this->db->escape(trim($this->address)); - $this->cp=trim($this->cp); - $this->ville=$this->db->escape(trim($this->ville)); - $this->zip=trim($this->cp); - $this->town=$this->db->escape(trim($this->ville)); - $this->country_id=($this->country_id > 0 ? $this->country_id:$this->pays_id); + $this->zip=$this->zip?trim($this->zip):trim($this->cp); + $this->town=$this->town?trim($this->town):trim($this->ville); + $this->country_id=($this->country_id > 0 ? $this->country_id : $this->pays_id); $sql = "UPDATE ".MAIN_DB_PREFIX."entrepot "; - $sql .= " SET label = '" . $this->libelle ."'"; - $sql .= ",description = '" . $this->description ."'"; - $sql .= ",statut = " . $this->statut ; - $sql .= ",lieu = '" . $this->lieu ."'"; - $sql .= ",address = '" . $this->address ."'"; - $sql .= ",cp = '" . $this->zip ."'"; - $sql .= ",ville = '" . $this->town ."'"; - $sql .= ",fk_pays = " . $this->country_id; + $sql .= " SET label = '" . $this->db->escape($this->libelle) ."'"; + $sql .= ", description = '" . $this->db->escape($this->description) ."'"; + $sql .= ", statut = " . $this->statut; + $sql .= ", lieu = '" . $this->db->escape($this->lieu) ."'"; + $sql .= ", address = '" . $this->db->escape($this->address) ."'"; + $sql .= ", cp = '" . $this->db->escape($this->zip) ."'"; + $sql .= ", ville = '" . $this->db->escape($this->town) ."'"; + $sql .= ", fk_pays = " . $this->country_id; $sql .= " WHERE rowid = " . $id; $this->db->begin(); @@ -247,17 +253,17 @@ class Entrepot extends CommonObject $this->statut = $obj->statut; $this->lieu = $obj->lieu; $this->address = $obj->address; - $this->cp = $obj->zip; - $this->ville = $obj->town; - $this->pays_id = $obj->country_id; + $this->cp = $obj->zip; // deprecated + $this->ville = $obj->town; // deprecated + $this->pays_id = $obj->country_id; // deprecated $this->zip = $obj->zip; $this->town = $obj->town; $this->country_id = $obj->country_id; include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); $tmp=getCountry($this->country_id,'all'); - $this->pays=$tmp['label']; - $this->pays_code=$tmp['code']; + $this->pays=$tmp['label']; // deprecated + $this->pays_code=$tmp['code']; // deprecated $this->country=$tmp['label']; $this->country_code=$tmp['code']; diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 557f37cbb3a..77730fb5c31 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -31,8 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); /** - * \class Societe - * \brief Class to manage third parties objects (customers, suppliers, prospects...) + * Class to manage third parties objects (customers, suppliers, prospects...) */ class Societe extends CommonObject { diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index c446edf05bb..0120cac0419 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -719,6 +719,7 @@ class User extends CommonObject function create($user,$notrigger=0) { global $conf,$langs; + global $mysoc; // Clean parameters $this->login = trim($this->login); @@ -743,7 +744,7 @@ class User extends CommonObject $sql.= " WHERE login ='".$this->db->escape($this->login)."'"; $sql.= " AND entity IN (0,".$conf->entity.")"; - dol_syslog("User::Create sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -789,9 +790,10 @@ class User extends CommonObject require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); $langs->load("stocks"); $entrepot = new Entrepot($this->db); - $entrepot->libelle = $langs->trans("PersonalStock",$this->nom); - $entrepot->description = $langs->trans("ThisWarehouseIsPersonalStock",$this->prenom,$this->nom); + $entrepot->libelle = $langs->trans("PersonalStock",$this->getFullName($langs)); + $entrepot->description = $langs->trans("ThisWarehouseIsPersonalStock",$this->getFullName($langs)); $entrepot->statut = 1; + $entrepot->country_id = $mysoc->country_id; $entrepot->create($user); } @@ -1203,7 +1205,7 @@ class User extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."user SET"; $sql.= " datepreviouslogin = datelastlogin,"; - $sql.= " datelastlogin = ".$this->db->idate($now).","; + $sql.= " datelastlogin = '".$this->db->idate($now)."',"; $sql.= " tms = tms"; // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion $sql.= " WHERE rowid = ".$this->id; diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index 6efaf25d002..7bb39e25bdc 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -63,7 +63,7 @@ class AllTests //require_once dirname(__FILE__).'/CoreTest.php'; //$suite->addTestSuite('CoreTest'); require_once dirname(__FILE__).'/AdminLibTest.php'; - $suite->addTestSuite('DateLibTest'); + $suite->addTestSuite('AdminLibTest'); require_once dirname(__FILE__).'/DateLibTest.php'; $suite->addTestSuite('DateLibTest'); require_once dirname(__FILE__).'/FilesLibTest.php';