Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 23:52:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: add picto for child line

Browse Source
This commit is contained in:
Regis Houssin
2011-04-09 20:54:02 +00:00
parent e72d538b1a
commit 252c8eefd5
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/class/commonobject.class.php
View File

@@ -1570,9 +1570,9 @@ class CommonObject
{
$var=!$var;
if ($line->product_type == 9 && ! empty($line->special_code))
if (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line))
{
$object->hooks[$line->special_code]->printOriginObjectLine($line,$i);
if (empty($line->fk_parent_line)) $object->hooks[$line->special_code]->printOriginObjectLine($this,$line,$i);
}
else
{
@@ -1598,12 +1598,15 @@ class CommonObject
if ($line->date_debut_reel) $date_start=$line->date_debut_reel;
$date_end=$line->date_fin_prevue;
if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
$this->tpl['label'] = '';
if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
if (($line->info_bits & 2) == 2)
{
$discount=new DiscountAbsolute($db);
$discount->fk_soc = $this->socid;
$this->tpl['label'] = $discount->getNomUrl(0,'discount');
$this->tpl['label'].= $discount->getNomUrl(0,'discount');
}
else if ($line->fk_product)
{
@@ -1611,7 +1614,7 @@ class CommonObject
$productstatic->id = $line->fk_product;
$productstatic->ref = $line->ref;
$productstatic->type = $line->fk_product_type;
$this->tpl['label'] = $productstatic->getNomUrl(1);
$this->tpl['label'].= $productstatic->getNomUrl(1);
$this->tpl['label'].= $line->label?' - '.$line->label:'';
// Dates
if ($date_start || $date_end)
@@ -1621,7 +1624,7 @@ class CommonObject
}
else
{
$this->tpl['label'] = ($line->product_type == -1 ? ' ' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
$this->tpl['label'].= ($line->product_type == -1 ? ' ' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
$this->tpl['label'].= ($line->label ? ' '.$line->label : '');
// Dates
if ($date_start || $date_end)
@@ -1658,7 +1661,7 @@ class CommonObject
$this->tpl['price'] = price($line->subprice);
$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : ' ';
$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? $line->remise_percent.'%' : ' ';
include(DOL_DOCUMENT_ROOT.'/core/tpl/originproductline.tpl.php');
}
}