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

fetch optional extrafeild lines on propal fetch

Browse Source
This commit is contained in:
Florian HENRY 2015-01-31 13:52:23 +01:00
parent d39439437e
commit 1eb73d0e49
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/comm/propal/class/propal.class.php
View File

@ -1196,6 +1196,11 @@ class Propal extends CommonObject
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafieldsline=new ExtraFields($this->db);
$line = new PropaleLigne($this->db);
$extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i = 0; $i = 0;
@ -1205,7 +1210,8 @@ class Propal extends CommonObject
$line = new PropaleLigne($this->db); $line = new PropaleLigne($this->db);
$line->rowid = $objp->rowid; $line->rowid = $objp->rowid; //Deprecated
$line->id = $objp->rowid;
$line->fk_propal = $objp->fk_propal; $line->fk_propal = $objp->fk_propal;
$line->fk_parent_line = $objp->fk_parent_line; $line->fk_parent_line = $objp->fk_parent_line;
$line->product_type = $objp->product_type; $line->product_type = $objp->product_type;
@ -1246,6 +1252,8 @@ class Propal extends CommonObject
$line->date_start = $objp->date_start; $line->date_start = $objp->date_start;
$line->date_end = $objp->date_end; $line->date_end = $objp->date_end;
$line->fetch_optionals($line->id,$extralabelsline);
$this->lines[$i] = $line; $this->lines[$i] = $line;
//dol_syslog("1 ".$line->fk_product); //dol_syslog("1 ".$line->fk_product);
//print "xx $i ".$this->lines[$i]->fk_product; //print "xx $i ".$this->lines[$i]->fk_product;
@ -1259,12 +1267,6 @@ class Propal extends CommonObject
return -1; return -1;
} }
// Retreive all extrafield for propal
// fetch optionals attributes and labels
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields=new ExtraFields($this->db);
$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
$this->fetch_optionals($this->id,$extralabels);
return 1; return 1;
} }

1
htdocs/contrat/class/contrat.class.php
View File

@ -726,7 +726,6 @@ class Contrat extends CommonObject
// Retreive all extrafield for propal // Retreive all extrafield for propal
// fetch optionals attributes and labels // fetch optionals attributes and labels
$line->fetch_optionals($line->id,$extralabelsline); $line->fetch_optionals($line->id,$extralabelsline);
$this->lines[] = $line; $this->lines[] = $line;