From 166fda490969ab1d92e4c96fe55d493c30a588a1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 11:26:23 +0100 Subject: [PATCH] Normalize class names --- .../class/askpricesupplier.class.php | 26 +++++++++---------- htdocs/core/tpl/objectline_create.tpl.php | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php index ee0ad10d2e3..844e851a20c 100644 --- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php +++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php @@ -185,7 +185,7 @@ class AskPriceSupplier extends CommonObject $price = $prod->price; } - $line = new AskPriceSupplierLigne($this->db); + $line = new AskPriceSupplierLine($this->db); $line->fk_product=$idproduct; $line->desc=$productdesc; @@ -225,7 +225,7 @@ class AskPriceSupplier extends CommonObject return -5; } - $askpricesupplierligne=new AskPriceSupplierLigne($this->db); + $askpricesupplierligne=new AskPriceSupplierLine($this->db); $askpricesupplierligne->fk_askpricesupplier=$this->id; $askpricesupplierligne->fk_remise_except=$remise->id; $askpricesupplierligne->desc=$remise->description; // Description ligne @@ -376,7 +376,7 @@ class AskPriceSupplier extends CommonObject } // Insert line - $this->line=new AskPriceSupplierLigne($this->db); + $this->line=new AskPriceSupplierLine($this->db); $this->line->fk_askpricesupplier=$this->id; $this->line->label=$label; @@ -525,10 +525,10 @@ class AskPriceSupplier extends CommonObject } // Update line - $this->line=new AskPriceSupplierLigne($this->db); + $this->line=new AskPriceSupplierLine($this->db); // Stock previous line records - $staticline=new AskPriceSupplierLigne($this->db); + $staticline=new AskPriceSupplierLine($this->db); $staticline->fetch($rowid); $this->line->oldline = $staticline; @@ -621,7 +621,7 @@ class AskPriceSupplier extends CommonObject { if ($this->statut == 0) { - $line=new AskPriceSupplierLigne($this->db); + $line=new AskPriceSupplierLine($this->db); // For triggers $line->fetch($lineid); @@ -1106,7 +1106,7 @@ class AskPriceSupplier extends CommonObject { $objp = $this->db->fetch_object($result); - $line = new AskPriceSupplierLigne($this->db); + $line = new AskPriceSupplierLine($this->db); $line->rowid = $objp->rowid; $line->fk_askpricesupplier = $objp->fk_askpricesupplier; @@ -2088,7 +2088,7 @@ class AskPriceSupplier extends CommonObject $xnbp = 0; while ($xnbp < $nbp) { - $line=new AskPriceSupplierLigne($this->db); + $line=new AskPriceSupplierLine($this->db); $line->desc=$langs->trans("Description")." ".$xnbp; $line->qty=1; $line->subprice=100; @@ -2287,7 +2287,7 @@ class AskPriceSupplier extends CommonObject { $obj = $this->db->fetch_object($resql); - $this->lines[$i] = new AskPriceSupplierLigne($this->db); + $this->lines[$i] = new AskPriceSupplierLine($this->db); $this->lines[$i]->id = $obj->rowid; // for backward compatibility $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; @@ -2412,10 +2412,10 @@ class AskPriceSupplier extends CommonObject /** - * \class AskPriceSupplierLigne + * \class AskPriceSupplierLine * \brief Class to manage askpricesupplier lines */ -class AskPriceSupplierLigne extends CommonObject +class AskPriceSupplierLine extends CommonObject { var $db; var $error; @@ -2689,7 +2689,7 @@ class AskPriceSupplierLigne extends CommonObject $this->db->begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."askpricesupplierdet WHERE rowid = ".$this->rowid; - dol_syslog("AskPriceSupplierLigne::delete", LOG_DEBUG); + dol_syslog("AskPriceSupplierLine::delete", LOG_DEBUG); if ($this->db->query($sql) ) { @@ -2852,7 +2852,7 @@ class AskPriceSupplierLigne extends CommonObject $sql.= ",total_ttc=".price2num($this->total_ttc,'MT').""; $sql.= " WHERE rowid = ".$this->rowid; - dol_syslog("AskPriceSupplierLigne::update_total", LOG_DEBUG); + dol_syslog("AskPriceSupplierLine::update_total", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index c7c6f455168..027e6b3d816 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -274,7 +274,7 @@ else { $newline = new PropaleLigne($this->db); } elseif ($this->table_element_line=='askpricesupplierdet') { - $newline = new AskPriceSupplierLigne($this->db); + $newline = new AskPriceSupplierLine($this->db); } elseif ($this->table_element_line=='facturedet') { $newline = new FactureLigne($this->db);