admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task #1082 - Sélection d'opération par montant impossible

Browse source 
Test the amount of the operation + amount of details
This commit is contained in:
Dany De Bontridder 2015-01-21 20:48:58 +01:00
parent 0b9111d6ea
commit 2a412f2c42
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
include/class_acc_ledger.php
View file

@ -2528,7 +2528,7 @@ class Acc_Ledger extends jrn_def_sql
$bledger_param= str_replace('"', "'", $bledger_param);
$bledger=new ISmallButton('l');
$bledger->label="choix des journaux";
$bledger->label=_("choix des journaux");
$bledger->javascript=" show_ledger_choice($bledger_param)";
$f_ledger=$bledger->input();
$hid_jrn="";
@ -2839,8 +2839,17 @@ class Acc_Ledger extends jrn_def_sql
$amount_min > 0 &&
bccomp($amount_min, $amount_max, 2) == 0)
{
$fil_amount = $and . 'jr_grpt_id in ( select distinct j_grpt from jrnx where j_montant = ' . $amount_min . ')';
$and = " and ";
$fil_amount = $and . ' ( ';
// Look in detail
$fil_amount .= 'jr_grpt_id in ( select distinct j_grpt from jrnx where j_montant = ' . $amount_min . ') ';
//and the total operation
$fil_amount .= ' or ';
$fil_amount .= ' jr_montant = '.$amount_min;
$fil_amount .= ')';
$and = " and ";
}
// date
if (isset($date_start) && isDate($date_start) != null)