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

Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a

Browse Source 
product (on supplier order part)
This commit is contained in:
Florian HENRY 2014-06-20 09:36:31 +02:00
parent 0645189432
commit 40f5911f52
2 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@ Fix: Link element from element project pages
Fix: [ bug #1349 ] AJAX contact selector does not work fine in Project card Fix: [ bug #1349 ] AJAX contact selector does not work fine in Project card
Fix: [ bug #1452 ] variable used but not defined Fix: [ bug #1452 ] variable used but not defined
Fix: If multiprice level is used the VAT on addline is not correct Fix: If multiprice level is used the VAT on addline is not correct
Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a product (on supplier order part)
***** ChangeLog for 3.5.3 compared to 3.5.2 ***** ***** ChangeLog for 3.5.3 compared to 3.5.2 *****
Fix: Error on field accountancy code for export profile of invoices. Fix: Error on field accountancy code for export profile of invoices.

64
htdocs/fourn/commande/fiche.php
View File

@ -1731,6 +1731,30 @@ elseif (! empty($object->id))
// TODO Use the predefinedproductline_create.tpl.php file // TODO Use the predefinedproductline_create.tpl.php file
// Add free products/services form // Add free products/services form
//Fix Bug [ bug #1254 ] Error when using "Enter" on qty input box of a product
//this Fix Will be obsolete in 3.6 because 3.6 get one form to do every things
if (! empty($conf->use_javascript_ajax)) {
print '<script type="text/javascript">
jQuery(document).ready(function() {
$("#qty").bind("keypress", {}, keypressInBox);
$("#remise_percent").bind("keypress", {}, keypressInBox);
$("#pu").bind("keypress", {}, keypressInBox);
});
function keypressInBox(e) {
var code = (e.keyCode ? e.keyCode : e.which);
if (code == 13) { //Enter keycode
e.preventDefault();
$(\'#addFreeProductButton\').click();
}
};
</script>';
}
$var=true; $var=true;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td>'; print '<td>';
@ -1755,22 +1779,40 @@ elseif (! empty($object->id))
print '<td align="center">'; print '<td align="center">';
print $form->load_tva('tva_tx',(GETPOST('tva_tx')?GETPOST('tva_tx'):-1),$object->thirdparty,$mysoc); print $form->load_tva('tva_tx',(GETPOST('tva_tx')?GETPOST('tva_tx'):-1),$object->thirdparty,$mysoc);
print '</td>'; print '</td>';
print '<td align="right"><input type="text" name="pu" size="5" value="'.GETPOST('pu').'"></td>'; print '<td align="right"><input type="text" id="pu" name="pu" size="5" value="'.GETPOST('pu').'"></td>';
print '<td align="right"><input type="text" name="qty" value="'.(GETPOST('qty')?GETPOST('qty'):'1').'" size="2"></td>'; print '<td align="right"><input type="text" id="qty" name="qty" value="'.(GETPOST('qty')?GETPOST('qty'):'1').'" size="2"></td>';
print '<td align="right" class="nowrap"><input type="text" name="remise_percent" size="1" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):$object->thirdparty->remise_percent).'"><span class="hideonsmartphone">%</span></td>'; print '<td align="right" class="nowrap"><input type="text" id="remise_percent" name="remise_percent" size="1" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):$object->thirdparty->remise_percent).'"><span class="hideonsmartphone">%</span></td>';
print '<td align="center" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline_libre"></td>'; print '<td align="center" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline_libre" id="addFreeProductButton"></td>';
print '</tr>'; print '</tr>';
// Ajout de produits/services predefinis // Ajout de produits/services predefinis
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
{ {
print '<script type="text/javascript">
jQuery(document).ready(function() { if (! empty($conf->use_javascript_ajax)) {
jQuery(\'#idprodfournprice\').change(function() { print '<script type="text/javascript">
if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus(); jQuery(document).ready(function() {
}); jQuery(\'#idprodfournprice\').change(function() {
}); if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
</script>'; });
//Fix Bug [ bug #1254 ] Error when using "Enter" on qty input box of a product
//this Fix Will be obsolete in 3.6 because 3.6 get one form to do every things
$("#qty_predef").bind("keypress", {}, keypressInBox);
$("#remise_percent_predef").bind("keypress", {}, keypressInBox);
});
function keypressInBox(e) {
var code = (e.keyCode ? e.keyCode : e.which);
if (code == 13) { //Enter keycode
e.preventDefault();
$(\'#addPredefinedProductButton\').click();
}
};
</script>';
}
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'; print '<td colspan="3">';