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

Normalize class names

Browse Source
This commit is contained in:
Laurent Destailleur 2015-03-17 11:26:23 +01:00
parent 6e251690ab
commit 166fda4909
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
View File

@ -185,7 +185,7 @@ class AskPriceSupplier extends CommonObject
$price = $prod->price; $price = $prod->price;
} }
$line = new AskPriceSupplierLigne($this->db); $line = new AskPriceSupplierLine($this->db);
$line->fk_product=$idproduct; $line->fk_product=$idproduct;
$line->desc=$productdesc; $line->desc=$productdesc;
@ -225,7 +225,7 @@ class AskPriceSupplier extends CommonObject
return -5; return -5;
} }
$askpricesupplierligne=new AskPriceSupplierLigne($this->db); $askpricesupplierligne=new AskPriceSupplierLine($this->db);
$askpricesupplierligne->fk_askpricesupplier=$this->id; $askpricesupplierligne->fk_askpricesupplier=$this->id;
$askpricesupplierligne->fk_remise_except=$remise->id; $askpricesupplierligne->fk_remise_except=$remise->id;
$askpricesupplierligne->desc=$remise->description; // Description ligne $askpricesupplierligne->desc=$remise->description; // Description ligne
@ -376,7 +376,7 @@ class AskPriceSupplier extends CommonObject
} }
// Insert line // Insert line
$this->line=new AskPriceSupplierLigne($this->db); $this->line=new AskPriceSupplierLine($this->db);
$this->line->fk_askpricesupplier=$this->id; $this->line->fk_askpricesupplier=$this->id;
$this->line->label=$label; $this->line->label=$label;
@ -525,10 +525,10 @@ class AskPriceSupplier extends CommonObject
} }
// Update line // Update line
$this->line=new AskPriceSupplierLigne($this->db); $this->line=new AskPriceSupplierLine($this->db);
// Stock previous line records // Stock previous line records
$staticline=new AskPriceSupplierLigne($this->db); $staticline=new AskPriceSupplierLine($this->db);
$staticline->fetch($rowid); $staticline->fetch($rowid);
$this->line->oldline = $staticline; $this->line->oldline = $staticline;
@ -621,7 +621,7 @@ class AskPriceSupplier extends CommonObject
{ {
if ($this->statut == 0) if ($this->statut == 0)
{ {
$line=new AskPriceSupplierLigne($this->db); $line=new AskPriceSupplierLine($this->db);
// For triggers // For triggers
$line->fetch($lineid); $line->fetch($lineid);
@ -1106,7 +1106,7 @@ class AskPriceSupplier extends CommonObject
{ {
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$line = new AskPriceSupplierLigne($this->db); $line = new AskPriceSupplierLine($this->db);
$line->rowid = $objp->rowid; $line->rowid = $objp->rowid;
$line->fk_askpricesupplier = $objp->fk_askpricesupplier; $line->fk_askpricesupplier = $objp->fk_askpricesupplier;
@ -2088,7 +2088,7 @@ class AskPriceSupplier extends CommonObject
$xnbp = 0; $xnbp = 0;
while ($xnbp < $nbp) while ($xnbp < $nbp)
{ {
$line=new AskPriceSupplierLigne($this->db); $line=new AskPriceSupplierLine($this->db);
$line->desc=$langs->trans("Description")." ".$xnbp; $line->desc=$langs->trans("Description")." ".$xnbp;
$line->qty=1; $line->qty=1;
$line->subprice=100; $line->subprice=100;
@ -2287,7 +2287,7 @@ class AskPriceSupplier extends CommonObject
{ {
$obj = $this->db->fetch_object($resql); $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]->id = $obj->rowid; // for backward compatibility
$this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->rowid = $obj->rowid;
$this->lines[$i]->label = $obj->custom_label; $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 * \brief Class to manage askpricesupplier lines
*/ */
class AskPriceSupplierLigne extends CommonObject class AskPriceSupplierLine extends CommonObject
{ {
var $db; var $db;
var $error; var $error;
@ -2689,7 +2689,7 @@ class AskPriceSupplierLigne extends CommonObject
$this->db->begin(); $this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."askpricesupplierdet WHERE rowid = ".$this->rowid; $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) ) if ($this->db->query($sql) )
{ {
@ -2852,7 +2852,7 @@ class AskPriceSupplierLigne extends CommonObject
$sql.= ",total_ttc=".price2num($this->total_ttc,'MT').""; $sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
$sql.= " WHERE rowid = ".$this->rowid; $sql.= " WHERE rowid = ".$this->rowid;
dol_syslog("AskPriceSupplierLigne::update_total", LOG_DEBUG); dol_syslog("AskPriceSupplierLine::update_total", LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)

2
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -274,7 +274,7 @@ else {
$newline = new PropaleLigne($this->db); $newline = new PropaleLigne($this->db);
} }
elseif ($this->table_element_line=='askpricesupplierdet') { elseif ($this->table_element_line=='askpricesupplierdet') {
$newline = new AskPriceSupplierLigne($this->db); $newline = new AskPriceSupplierLine($this->db);
} }
elseif ($this->table_element_line=='facturedet') { elseif ($this->table_element_line=='facturedet') {
$newline = new FactureLigne($this->db); $newline = new FactureLigne($this->db);