From dec4acd6a53ad6eb7e490ad46b8b01e646480948 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 15 Nov 2011 23:20:54 +0000 Subject: [PATCH] improve appearance fix bug due can_request, add new action --- html/ajax_card.php | 4 +- html/ajax_ledger.php | 4 +- html/ajax_misc.php | 6 +- html/ajax_poste.php | 4 +- html/direct.php | 2 +- html/js/scripts.js | 5 +- html/show_document_modele.php | 2 +- html/style.css | 29 ++- include/constant.security.php | 1 + include/document_modele.inc.php | 3 +- include/lettering.account.inc.php | 2 +- include/payment_middle.inc.php | 2 +- include/periode.inc.php | 5 - include/profile.inc.php | 2 +- include/search.inc.php | 2 +- include/template/category_of_card.php | 4 +- include/template/form_ledger_detail.php | 2 +- include/template/form_ledger_fin.php | 8 +- include/template/history_top.php | 6 +- include/template/ledger_detail_forbidden.php | 6 +- include/template/ledger_detail_top.php | 6 +- include/template/modele_document.php | 4 +- include/template/search_top.php | 2 +- include/template/security_list_action.php | 2 +- sql/object-6.0.sql | 227 +++++++++---------- sql/upgrade.sql | 1 + 26 files changed, 166 insertions(+), 175 deletions(-) diff --git a/html/ajax_card.php b/html/ajax_card.php index 7a58fcffb..9d79c9380 100644 --- a/html/ajax_card.php +++ b/html/ajax_card.php @@ -305,9 +305,7 @@ case 'sc': case 'fs': require_once('class_acc_ledger.php'); $r=''; - $r.='
'; - $r.= 'Fermer'; - $r.='
'; + $r.=HtmlInput::anchor_close('search_card'); $r.='
'.h2info(_('Recherche de fiche')).'
'; $r.='
'; diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php index 4231b2a5f..0312deb17 100644 --- a/html/ajax_ledger.php +++ b/html/ajax_ledger.php @@ -163,7 +163,7 @@ case 'de': } catch (Exception $e) { - echo 'Fermer'; + echo HtmlInput::anchor_close($div); echo '

Désolé il y a une erreur

'; } $html=ob_get_contents(); @@ -424,11 +424,11 @@ case 'rmr': // ask for a date for reversing the operation case 'ask_extdate': $date=new IDate('p_date'); - $html= 'Fermer'; $html.=""; $html.=HtmlInput::hidden('jr_id',$_REQUEST['jr_id']).HtmlInput::hidden('div',$div).dossier::hidden().HtmlInput::hidden('act','reverseop'); $html.='

entrez une date

'.$date->input(); $html.=HtmlInput::submit('x','accepter'); + $html=HtmlInput::button_close($div); $html.='
'; break; //////////////////////////////////////////////////////////////////////////////// diff --git a/html/ajax_misc.php b/html/ajax_misc.php index 8398dc2e5..06835237d 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -263,7 +263,7 @@ EOF; case 'dl': require_once('class_lettering.php'); $exercice = $user->get_exercice(); - if ($user->check_module("LETTERCARD") == 0 && $user->check_module("LETTERACC") == 0) exit(); + if ($user->check_module("LETCARD") == 0 && $user->check_module("LETACC") == 0) exit(); $periode = new Periode($cn); list($first_per, $last_per) = $periode->get_limit($exercice); @@ -481,10 +481,6 @@ EOF; require_once('ajax_save_predf_op.php'); break; case 'search_op': - /* put_global(array - (array('key'=>'ac','value'=>'JSSEARCH')), - (array('key'=>'ledger_type','value'=>'ALL')) - ); */ require_once 'search.inc.php'; break; case 'display_profile': diff --git a/html/ajax_poste.php b/html/ajax_poste.php index efeab07bf..d878c04b9 100644 --- a/html/ajax_poste.php +++ b/html/ajax_poste.php @@ -79,9 +79,7 @@ case "sf": $str_poste=$it->input(); $str_submit=HtmlInput::submit('sf',_('Recherche')); $r=''; - $r.='
'; - $r.= 'Fermer'; - $r.='
'; + $r=HtmlInput::anchor_close('search_account'); $r.='
'.h2info(_('Poste Comptable')).'
'; $r.='
'; diff --git a/html/direct.php b/html/direct.php index 4c6b54044..bae501119 100644 --- a/html/direct.php +++ b/html/direct.php @@ -5,7 +5,7 @@ $cn=new Database($_GET['gDossier']); $user=new User($cn); $user->Check(); $user->check_dossier($_GET['gDossier']); -$res=$cn->exec_sql("select code,description from get_profile_menu($1) where code ~* $2 limit 8",array($user->login,$_POST['acs'])); +$res=$cn->exec_sql("select code,description from get_profile_menu($1) where code ~* $2 or description ~* $3 limit 8",array($user->login,$_POST['acs'],$_POST['acs'])); $nb=Database::num_row($res); echo "