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

Merge pull request #804 from atm-maxime/develop

Browse Source 
Fixes on invoice payment list and for price by quantity
This commit is contained in:
Laurent Destailleur 2013-04-05 13:49:52 -07:00
commit 5f2ea4c65c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/paiement/liste.php
View File

@ -110,7 +110,7 @@ else
// Search criteria // Search criteria
if (GETPOST("search_ref")) $sql .=" AND p.rowid=".GETPOST("search_ref",'int'); 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_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_amount")) $sql .=" AND p.amount=".price2num(GETPOST("search_amount"));
if (GETPOST("search_company")) $sql .=" AND s.nom LIKE '%".$db->escape(GETPOST("search_company"))."%'"; if (GETPOST("search_company")) $sql .=" AND s.nom LIKE '%".$db->escape(GETPOST("search_company"))."%'";
} }

4
htdocs/core/tpl/objectline_add.tpl.php
View File

@ -81,7 +81,7 @@ if (! empty($conf->margin->enabled)) {
'origin_tva_tx_cache' => 'tva_tx', 'origin_tva_tx_cache' => 'tva_tx',
'origin_price_ttc_cache' => 'price_ttc', 'origin_price_ttc_cache' => 'price_ttc',
'qty' => 'qty' 'qty' => 'qty'
//'remise_percent' => 'discount' ,'remise_percent' => 'discount'
), ),
'update_textarea' => array( 'update_textarea' => array(
'product_desc' => 'desc' 'product_desc' => 'desc'
@ -242,7 +242,7 @@ $(document).ready(function() {
$('#select_type').val(data.type).attr('disabled','disabled').trigger('change'); $('#select_type').val(data.type).attr('disabled','disabled').trigger('change');
//$('#price_base_type_area').show(); //$('#price_base_type_area').show();
$('#qty').val(data.qty); $('#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") { if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances['product_desc'] != "undefined") {
CKEDITOR.instances['product_desc'].setData(data.desc).focus(); CKEDITOR.instances['product_desc'].setData(data.desc).focus();