Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss

This commit is contained in:
Dany De Bontridder 2018-08-03 15:44:38 +02:00
commit dd763dc45d
2 changed files with 6 additions and 3 deletions

View file

@ -318,7 +318,7 @@ function result_card_search(req)
sx=document.body.scrollTop+60;
}
var div_style="top:"+sx+"px;height:auto";
var div_style="top:"+sx+"px;min-height:80%;height:auto";
add_div({id:'search_card',cssclass:'inner_box',html:"",style:div_style,drag:false,effect:'blinddown'});
$('search_card').innerHTML=code_html;
@ -1022,4 +1022,4 @@ function delete_card(obj) {
});
}
});
}
}

View file

@ -126,7 +126,10 @@ define ('COMPTA_MAX_YEAR',2100);
define ('COMPTA_MIN_YEAR',1900);
define ('MAX_RECONCILE',25);
define ('MAX_QCODE',4);
define ('MAX_SEARCH_CARD',20);
if ( ! defined ('MAX_SEARCH_CARD') ) {
define ('MAX_SEARCH_CARD',20);
}
define ('MAX_FOLDER_TO_SHOW',80);
define ('MAX_ACTION_SHOW',20);