From e5085b2a1c91fbda221d5e7594447b9acc8dd451 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 4 Apr 2013 20:19:42 +0200 Subject: [PATCH 1/2] Fix : filter on payment type was not working (int instead of char) --- htdocs/compta/paiement/liste.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 7e1cf15c206..db2b3173a1c 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -110,7 +110,7 @@ else // Search criteria if (GETPOST("search_ref")) $sql .=" AND p.rowid=".GETPOST("search_ref",'int'); if (GETPOST("search_account") > 0) $sql .=" AND b.fk_account=".GETPOST("search_account",'int'); - if (GETPOST("search_paymenttype") > 0) $sql .=" AND c.code='".GETPOST("search_paymenttype",'int')."'"; + if (GETPOST("search_paymenttype") != "") $sql .=" AND c.code='".GETPOST("search_paymenttype")."'"; if (GETPOST("search_amount")) $sql .=" AND p.amount=".price2num(GETPOST("search_amount")); if (GETPOST("search_company")) $sql .=" AND s.nom LIKE '%".$db->escape(GETPOST("search_company"))."%'"; } From 9530e103e817c7af88852b627c2b5999ed8c7375 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 4 Apr 2013 20:44:00 +0200 Subject: [PATCH 2/2] Fix : price by quantity now updates the discount field only if there is not an existing discount greater than the price by quantity one --- htdocs/core/tpl/objectline_add.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php index a575034aa1e..497d4a294ba 100644 --- a/htdocs/core/tpl/objectline_add.tpl.php +++ b/htdocs/core/tpl/objectline_add.tpl.php @@ -81,7 +81,7 @@ if (! empty($conf->margin->enabled)) { 'origin_tva_tx_cache' => 'tva_tx', 'origin_price_ttc_cache' => 'price_ttc', 'qty' => 'qty' - //'remise_percent' => 'discount' + ,'remise_percent' => 'discount' ), 'update_textarea' => array( 'product_desc' => 'desc' @@ -242,7 +242,7 @@ $(document).ready(function() { $('#select_type').val(data.type).attr('disabled','disabled').trigger('change'); //$('#price_base_type_area').show(); $('#qty').val(data.qty); - //$('#remise_percent').val(data.discount); + if($('#remise_percent').val() < data.discount) $('#remise_percent').val(data.discount); if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances['product_desc'] != "undefined") { CKEDITOR.instances['product_desc'].setData(data.desc).focus();