From 9bbea4f385a6c22bafde19126992618af02dfc2b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 22 Oct 2012 17:02:17 +0200
Subject: [PATCH] Fix: use span is better

---
 htdocs/core/tpl/freeproductline_create.tpl.php       | 6 +++++-
 htdocs/core/tpl/objectline_add.tpl.php               | 8 ++++----
 htdocs/core/tpl/objectline_edit.tpl.php              | 2 ++
 htdocs/core/tpl/predefinedproductline_create.tpl.php | 5 ++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index 722b556fd28..17da725a80d 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -61,8 +61,10 @@
 	<tr <?php echo $bcnd[$var]; ?>>
 		<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
 			<?php
+
+			echo '<span>';
 			echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
-			if ((! empty($conf->product->enabled) && ! empty($conf->service->enabled)) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>';
+			echo '</span>';
 
 			if (is_object($hookmanager))
 			{
@@ -70,6 +72,8 @@
 				$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
 			}
 
+			if ((! empty($conf->product->enabled) && ! empty($conf->service->enabled)) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>';
+
 			// Editor wysiwyg
 			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 			$nbrows=ROWS_2;
diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php
index b9ec775b592..d9f35ad6971 100644
--- a/htdocs/core/tpl/objectline_add.tpl.php
+++ b/htdocs/core/tpl/objectline_add.tpl.php
@@ -84,9 +84,9 @@ if (! empty($conf->margin->enabled)) {
 					'update_textarea' => array(
 							'product_desc' => 'desc'
 					),
-					'show' => array(
-							'price_base_type_area'
-					),
+					//'show' => array(
+							//'price_base_type_area'
+					//),
 					'disabled' => array(
 							'select_type'
 					)
@@ -236,7 +236,7 @@ $(document).ready(function() {
 					//$('#origin_price_ttc_cache').val(data.price_ttc);
 					$('#origin_tva_tx_cache').val(data.tva_tx);
 					$('#select_type').val(data.type).attr('disabled','disabled').trigger('change');
-					$('#price_base_type_area').show();
+					//$('#price_base_type_area').show();
 
 					if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances['product_desc'] != "undefined") {
 						CKEDITOR.instances['product_desc'].setData(data.desc).focus();
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 71da7fd4e69..4629e2dcb22 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -87,6 +87,8 @@
 	    $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
 	}
 
+	echo '<br>';
+
 	// editeur wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $nbrows=ROWS_2;
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index 3fadf385543..a3dc4f412dc 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -72,8 +72,9 @@ jQuery(document).ready(function() {
 	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
 	<?php
 
+	echo '<span>';
 	$form->select_produits('','idprod','',$conf->product->limit_size,$buyer->price_level);
-	print '<br>';
+	echo '</span>';
 
 	if (is_object($hookmanager))
 	{
@@ -81,6 +82,8 @@ jQuery(document).ready(function() {
 	    $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
 	}
 
+	echo '<br>';
+
 	// Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $nbrows=ROWS_2;