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:
commit
5eccf5a5a6
105 changed files with 20809 additions and 13789 deletions
|
|
@ -50,7 +50,7 @@ if ($act =='P')
|
|||
}
|
||||
if ( $act=='X')
|
||||
{
|
||||
alert('Accès interdit');
|
||||
alert(_('Accès interdit'));
|
||||
exit();
|
||||
}
|
||||
// display a search box
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue