From ffc6739d5976625bdb1a9cd4e9af0f01864f63a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 9 Aug 2010 17:04:05 +0000
Subject: [PATCH] Fix: Field name of date for predefined product form must
 differs from date of free product to avoid javascript conflict

---
 htdocs/core/tpl/addfreeproductform.tpl.php       | 10 +++++-----
 htdocs/core/tpl/addpredefinedproductform.tpl.php | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/tpl/addfreeproductform.tpl.php b/htdocs/core/tpl/addfreeproductform.tpl.php
index 4f0b9e0ece8..03500d8ce9d 100644
--- a/htdocs/core/tpl/addfreeproductform.tpl.php
+++ b/htdocs/core/tpl/addfreeproductform.tpl.php
@@ -19,7 +19,7 @@
  */
 ?>
 
-<!-- BEGIN PHP TEMPLATE -->
+<!-- BEGIN PHP TEMPLATE addfreeproductform.tpl.php -->
 
 <?php
 // TODO à déplacer
@@ -35,7 +35,7 @@ if ($conf->global->PRODUIT_USE_MARKUP) $colspan = 'colspan="2"';
 	<td colspan="4">&nbsp;</td>
 </tr>
 
-<form action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
+<form name="addproduct" id="addproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
 <input type="hidden" name="action" value="addline">
 <input type="hidden" name="id" value="<?php echo $this->id; ?>">
@@ -81,9 +81,9 @@ if ($conf->global->PRODUIT_USE_MARKUP) $colspan = 'colspan="2"';
 	<td colspan="9">
 	<?php
 	echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
-	echo $html->select_date('','date_start',$usehm,$usehm,1,"addline");
+	echo $html->select_date('','date_start',$usehm,$usehm,1,"addproduct");
 	echo ' '.$langs->trans('to').' ';
-	echo $html->select_date('','date_end',$usehm,$usehm,1,"addline");
+	echo $html->select_date('','date_end',$usehm,$usehm,1,"addproduct");
 	?>
 	</td>
 </tr>
@@ -91,4 +91,4 @@ if ($conf->global->PRODUIT_USE_MARKUP) $colspan = 'colspan="2"';
 
 </form>
 
-<!-- END PHP TEMPLATE -->
+<!-- END PHP TEMPLATE addfreeproductform.tpl.php -->
diff --git a/htdocs/core/tpl/addpredefinedproductform.tpl.php b/htdocs/core/tpl/addpredefinedproductform.tpl.php
index 4d7bb014d52..fbbe6ad7592 100644
--- a/htdocs/core/tpl/addpredefinedproductform.tpl.php
+++ b/htdocs/core/tpl/addpredefinedproductform.tpl.php
@@ -19,7 +19,7 @@
  */
 ?>
 
-<!-- BEGIN PHP TEMPLATE -->
+<!-- BEGIN PHP TEMPLATE addpredefinedproductform.tpl.php -->
 
 <?php
 if ($conf->global->PRODUIT_USE_MARKUP)
@@ -43,7 +43,7 @@ $colspan = 'colspan="3"';
 	<td colspan="4">&nbsp;</td>
 </tr>
 
-<form id="addpredefinedproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
+<form name="addpredefinedproduct" id="addpredefinedproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
 <input type="hidden" name="action" value="addline">
 <input type="hidden" name="id" value="<?php echo $this->id; ?>">
@@ -56,7 +56,7 @@ $colspan = 'colspan="3"';
 	$html->select_produits('','idprod','',$conf->product->limit_size,$soc->price_level);
 	else
 	$html->select_produits('','idprod','',$conf->product->limit_size);
-	
+
 	if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>';
 
 	// Editor wysiwyg
@@ -85,9 +85,9 @@ $colspan = 'colspan="3"';
 	<td colspan="9">
 	<?php
 	echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
-	echo $html->select_date('','date_start',$usehm,$usehm,1,"addline");
+	echo $html->select_date('','date_start_predef',$usehm,$usehm,1,"addpredefinedproduct");
 	echo ' '.$langs->trans('to').' ';
-	echo $html->select_date('','date_end',$usehm,$usehm,1,"addline");
+	echo $html->select_date('','date_end_predef',$usehm,$usehm,1,"addpredefinedproduct");
 	?>
 	</td>
 </tr>
@@ -95,4 +95,4 @@ $colspan = 'colspan="3"';
 
 </form>
 
-<!-- END PHP TEMPLATE -->
+<!-- END PHP TEMPLATE addpredefinedproductform.tpl.php -->