Merge branch 'version_6_8'

Conflicts:
	html/ajax_misc.php
	html/popup.php
	include/ac_common.php
	include/ajax_mod_predf_op.php
	include/class_acc_ledger.php
	include/constant.php
	include/template/fiche_list.php
This commit is contained in:
Dany De Bontridder 2014-03-02 04:49:48 +01:00
commit 5eccf5a5a6
105 changed files with 20809 additions and 13789 deletions

View file

@ -50,7 +50,7 @@ if ($act =='P')
}
if ( $act=='X')
{
alert('Accès interdit');
alert(_('Accès interdit'));
exit();
}
// display a search box