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

FS#104 Add the ability to select several ledgers for the search

Browse source
This commit is contained in:
Dany De Bontridder 2010-07-13 19:04:10 +00:00
parent d19e2b9ad5
commit 4a75de6f8c
4 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/developper/create_doc.sh
View file

@ -3,7 +3,7 @@ cd html; sed -i "s/utf-8/utf-8/g" *
cd ..
if [ ! -z "$PGUSER" ] ; then
echo "DOMAINE = $DOMAIN"
postgresql_autodoc -u $PGUSER --password $PGPASSWORD -h localhost -d ${DOMAIN}mod1
postgresql_autodoc -u $PGUSER --password $PGPASSWORD -h localhost -d ${DOMAIN}account_repository
postgresql_autodoc -u $PGUSER --password=$PGPASSWORD -h localhost -d ${DOMAIN}mod1
postgresql_autodoc -u $PGUSER --password=$PGPASSWORD -h localhost -d ${DOMAIN}account_repository
fi
cd ../../ && bash dev/compose_list.sh

50
include/class_acc_ledger.php
View file

@ -2027,24 +2027,12 @@ function get_last_date()
$user=new User($this->db);
$r='';
/* security : filter ledger on user */
$filter_ledger=$user->get_ledger_sql($p_type,3);
$filter_ledger=$user->get_ledger($p_type,3);
$f_ledger=new ISelect('p_jrn');
$aLedger=$this->db->make_array('select jrn_def_id,jrn_def_name from jrn_def where '.$filter_ledger);
if ( $all_type_ledger==1)
$aLedger[]=array('value'=>-1,'label'=>'Tous les journaux');
/* if not p_jrn then all */
if( ! isset($_REQUEST['p_jrn'])) {
/* By default all ledger of this type */
$this->id=-1;
} else {
$this->id=$_REQUEST['p_jrn'];
}
$f_ledger->selected=$this->id;
$f_ledger->value=$aLedger;
/* widget for date_start */
$selected=(isset($_REQUEST['r_jrn']))?$_REQUEST['r_jrn']:null;
$f_ledger=HtmlInput::select_ledger($filter_ledger,$selected);
/* widget for date_start */
$f_date_start=new IDate('date_start');
/* all periode or only the selected one */
if ( isset($_REQUEST['date_start'])) {
@ -2160,6 +2148,7 @@ function get_last_date()
if ( $p_array != null )
extract($p_array);
$r_jrn=(isset($r_jrn))?$r_jrn:-1;
/* if no variable are set then give them a default
* value */
@ -2174,7 +2163,6 @@ function get_last_date()
list($date_start,$date_end)=$per->get_date_limit();
}
$desc='';
$p_jrn=(isset($p_jrn))?$p_jrn:-1;
$qcode=(isset($qcode))?$qcode:"";
$accounting=(isset($accounting))?$accounting:"";
@ -2192,8 +2180,9 @@ function get_last_date()
$fil_paid='';
$and='';
if ( $p_jrn == -1 ) {
$user=new User($this->db);
$user=new User($this->db);
if ( $r_jrn == -1 ) {
/* Specific action allow to see all the ledgers in once */
if ( $p_action == 'gl') $p_action='ALL';
/* actions from commercial.php */
@ -2205,11 +2194,24 @@ function get_last_date()
$fil_ledger=$user->get_ledger_sql($p_action,3);
$and=' and ';
} else if ( $p_jrn != 0 ){
$fil_ledger = ' jrn_def_id = '.$p_jrn;
$and=' and ';
}
} else {
if ( $p_action == 'gl') $p_action='ALL';
$aLedger=$user->get_ledger($p_action,3);
$fil_ledger='';$sp='';
for ($i=0;$i < count($aLedger) ;$i ++) {
if ( isset($r_jrn[$i])) {$fil_ledger.=$sp.$aLedger[$i]['jrn_def_id'];$sp=',';}
}
$fil_ledger=' jrn_def_id in ('.$fil_ledger.')';
$and=' and ';
/* no ledger selected */
if ( $sp == '' ) {
$fil_ledger='';$and='';
}
}
/* format the number */
$amount_min=toNumber($amount_min);
$amount_max=toNumber($amount_max);

2
include/class_html_input.php
View file

@ -240,7 +240,7 @@ echo $string => {'prop':'1','prop2':'2','prop3':'3'};
static function select_ledger($p_array,$p_selected) {
ob_start();
$ledger=new IButton('l');
$ledger->label="Journaux";
$ledger->label="choix des journaux";
$ledger->javascript=" show_ledger_choice()";
echo $ledger->input();

2
include/template/ledger_search.php
View file

@ -5,7 +5,7 @@
<?=_('Dans le journal')?>
</span>
<span>
<?php echo $f_ledger->input() ?>
<?php echo $f_ledger; ?>
</span>
</li>