lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Field name of date for predefined product form must differs from date of free product to avoid javascript conflict

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-09 17:04:05 +00:00
parent 411419c3bf
commit ffc6739d59
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/tpl/addfreeproductform.tpl.php
View File

@ -19,7 +19,7 @@
*/ */
?> ?>
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE addfreeproductform.tpl.php -->
<?php <?php
// TODO à déplacer // TODO à déplacer
@ -35,7 +35,7 @@ if ($conf->global->PRODUIT_USE_MARKUP) $colspan = 'colspan="2"';
<td colspan="4">&nbsp;</td> <td colspan="4">&nbsp;</td>
</tr> </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="token" value="<?php echo $_SESSION['newtoken']; ?>">
<input type="hidden" name="action" value="addline"> <input type="hidden" name="action" value="addline">
<input type="hidden" name="id" value="<?php echo $this->id; ?>"> <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"> <td colspan="9">
<?php <?php
echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; 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 ' '.$langs->trans('to').' ';
echo $html->select_date('','date_end',$usehm,$usehm,1,"addline"); echo $html->select_date('','date_end',$usehm,$usehm,1,"addproduct");
?> ?>
</td> </td>
</tr> </tr>
@ -91,4 +91,4 @@ if ($conf->global->PRODUIT_USE_MARKUP) $colspan = 'colspan="2"';
</form> </form>
<!-- END PHP TEMPLATE --> <!-- END PHP TEMPLATE addfreeproductform.tpl.php -->

12
htdocs/core/tpl/addpredefinedproductform.tpl.php
View File

@ -19,7 +19,7 @@
*/ */
?> ?>
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE addpredefinedproductform.tpl.php -->
<?php <?php
if ($conf->global->PRODUIT_USE_MARKUP) if ($conf->global->PRODUIT_USE_MARKUP)
@ -43,7 +43,7 @@ $colspan = 'colspan="3"';
<td colspan="4">&nbsp;</td> <td colspan="4">&nbsp;</td>
</tr> </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="token" value="<?php echo $_SESSION['newtoken']; ?>">
<input type="hidden" name="action" value="addline"> <input type="hidden" name="action" value="addline">
<input type="hidden" name="id" value="<?php echo $this->id; ?>"> <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); $html->select_produits('','idprod','',$conf->product->limit_size,$soc->price_level);
else else
$html->select_produits('','idprod','',$conf->product->limit_size); $html->select_produits('','idprod','',$conf->product->limit_size);
if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>'; if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>';
// Editor wysiwyg // Editor wysiwyg
@ -85,9 +85,9 @@ $colspan = 'colspan="3"';
<td colspan="9"> <td colspan="9">
<?php <?php
echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; 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 ' '.$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> </td>
</tr> </tr>
@ -95,4 +95,4 @@ $colspan = 'colspan="3"';
</form> </form>
<!-- END PHP TEMPLATE --> <!-- END PHP TEMPLATE addpredefinedproductform.tpl.php -->