diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index efd73f4bcde..f6a1d7ef32c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2010-2011 Juanjo Menent * Copyright (C) 2012 Christophe Battarel * Copyright (C) 2011-2012 Philippe Grand @@ -1093,9 +1093,9 @@ abstract class CommonObject $row = $this->db->fetch_row($resql); $rows[] = $row[0]; // Add parent line into array rows $childrens = $this->getChildrenOfLine($row[0]); - if (! empty($children)) + if (! empty($childrens)) { - foreach($children as $child) + foreach($childrens as $child) { array_push($rows, $child); } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index ad538e49431..3e74876383b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2006 Marc Barilley/Ocebo * Copyright (C) 2007 Franky Van Liedekerke @@ -1332,15 +1332,15 @@ class Form /** * _construct_product_list_option - * + * * @param resultset &$objp Resultset of fetch * @param string $opt Option * @param string $optJson Option * @param int $price_level Price level * @param string $selected Preselected value - * @return + * @return */ - private function _construct_product_list_option(&$objp, &$opt, &$optJson, $price_level, $selected) + private function _construct_product_list_option(&$objp, &$opt, &$optJson, $price_level, $selected) { global $langs,$conf,$user,$db; diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index b2e777660f7..dcb46ac1857 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-2013 Regis Houssin * Copyright (C) 2010-2011 Laurent Destailleur * Copyright (C) 2012 Christophe Battarel * @@ -64,7 +64,7 @@ { if ($line->fk_product > 0) { - echo $form->textwithtooltip($text,$description,3,'','',$i,0,($line->fk_parent_line?img_picto('', 'rightarrow'):'')); + echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):'')); // Show range echo get_date_range($line->date_start, $line->date_end); @@ -77,14 +77,14 @@ } else { - if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow'); if ($type==1) $text = img_object($langs->trans('Service'),'service'); else $text = img_object($langs->trans('Product'),'product'); if (! empty($line->label)) { $text.= ' '.$line->label.''; - echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,($line->fk_parent_line?img_picto('', 'rightarrow'):'')); + echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):'')); } else { + if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow'); echo $text.' '.dol_htmlentitiesbr($line->description); }