From bc0f65b73c6d81628d9ad7b7e69eae949622dad9 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 12 Oct 2013 11:58:38 +0200
Subject: [PATCH] Fix: reorder lines problem

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
---
 htdocs/core/class/commonobject.class.php | 10 +++++-----
 htdocs/core/class/html.form.class.php    | 18 +++++++++---------
 htdocs/core/tpl/objectline_view.tpl.php  |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c6413b4beae..692a340b6ca 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2011-2012 Philippe Grand	    <philippe.grand@atoo-net.com>
@@ -464,7 +464,7 @@ abstract class CommonObject
         $sql.= " WHERE tc.element='".$this->element."'";
         if ($activeonly == 1)
         	$sql.= " AND tc.active=1"; // only the active type
-        	
+
         if (! empty($source)) $sql.= " AND tc.source='".$source."'";
         $sql.= " ORDER by tc.".$order;
 
@@ -1112,9 +1112,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);
 						}
@@ -2621,7 +2621,7 @@ abstract class CommonObject
         }
     }
 
-    
+
 
     /* This is to show add lines */
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3296a879523..4f5119697d0 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        <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Sebastien Di Cintio   <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2013 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2006      Marc Barilley/Ocebo   <marc@ocebo.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
@@ -800,7 +800,7 @@ class Form
                 while ($i < $num)
                 {
                     $obj = $this->db->fetch_object($resql);
-                    
+
                     if ($conf->global->SOCIETE_ADD_REF_IN_LIST) {
                     	if (($obj->client) && (!empty($obj->code_client))) {
                     		$label = $obj->code_client. ' - ';
@@ -814,7 +814,7 @@ class Form
                     {
                     	$label=$obj->nom;
                     }
-                    
+
                     if ($showtype)
                     {
                         if ($obj->client || $obj->fournisseur) $label.=' (';
@@ -2484,9 +2484,9 @@ class Form
 
     /**
      *     Show a confirmation HTML form or AJAX popup.
-     *     Easiest way to use this is with useajax=1. 
-     *     If you use useajax='xxx', you must also add jquery code to trigger opening of box (with correct parameters) 
-     *     just after calling this method. For example: 
+     *     Easiest way to use this is with useajax=1.
+     *     If you use useajax='xxx', you must also add jquery code to trigger opening of box (with correct parameters)
+     *     just after calling this method. For example:
      *       print '<script type="text/javascript">'."\n";
      *       print 'jQuery(document).ready(function() {'."\n";
      *       print 'jQuery(".xxxlink").click(function(e) { jQuery("#aparamid").val(jQuery(this).attr("rel")); jQuery("#dialog-confirm-xxx").dialog("open"); return false; });'."\n";
@@ -2587,9 +2587,9 @@ class Form
             $more.='</table>'."\n";
         }
 
-		// JQUI method dialog is broken with jmobile, we use standard HTML. 
+		// JQUI method dialog is broken with jmobile, we use standard HTML.
 		// Note: When using dol_use_jmobile, you must also check code for button use a GET url with action=xxx and output the confirm code only when action=xxx
-        if (! empty($conf->dol_use_jmobile)) $useajax=0;	
+        if (! empty($conf->dol_use_jmobile)) $useajax=0;
 
         if ($useajax && $conf->use_javascript_ajax)
         {
@@ -3376,7 +3376,7 @@ class Form
 
         	// Disabled if seller is not subject to VAT
         	$disabled=false; $title='';
-        	if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0") 
+        	if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0")
         	{
         		$title=' title="'.$langs->trans('VATIsNotUsed').'"';
         		$disabled=true;
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 681b37f3890..5ad9ddeab5d 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2013	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Christophe Battarel	<christophe.battarel@altairis.fr>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
@@ -65,7 +65,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);
@@ -78,14 +78,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.= ' <strong>'.$line->label.'</strong>';
-				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);
 			}