';
$detail=new Acc_Misc($cn,$obj->jr_id);
@@ -233,7 +236,7 @@ echo '';
$row.=td($view_history);
if ( $q['j_qcode'] !='') {
- // nom de la fiche
+ // nom de la fiche
$ff=new Fiche($cn);
$ff->get_by_qcode( $q['j_qcode']);
$row.=td($ff->strAttribut(h(ATTR_DEF_NAME)));
diff --git a/include/template/module.php b/include/template/module.php
index 590a5295f..3e1dd79cf 100644
--- a/include/template/module.php
+++ b/include/template/module.php
@@ -21,11 +21,11 @@ if ( $cn->get_value("select count(*) from profile join profile_user using (p_id)
$direct=new IText('ac');
$direct->style='class="direct"';
$direct->value='';
- $direct->size=(strlen($direct->value)<10)?10:strlen($direct->value);
+ $direct->size=20;
echo $direct->input();
$gDossier=dossier::id();
?>
-
+
diff --git a/sql/ajax-direct-form.sql b/sql/ajax-direct-form.sql
index e8f6dc9c6..90b7f20fe 100644
--- a/sql/ajax-direct-form.sql
+++ b/sql/ajax-direct-form.sql
@@ -1,19 +1,55 @@
--- Function: comptaproc.get_pcm_tree(account_type)
-
-DROP FUNCTION comptaproc.get_menu_tree(text);
-
-CREATE OR REPLACE FUNCTION comptaproc.get_menu_tree(p_code text)
- RETURNS SETOF text AS
+create type menu_tree as (code text,description text);
+
+create or replace function comptaproc.get_profile_menu(login text)
+returns setof menu_tree
+as
$BODY$
declare
- i record;
- e RECORD;
+ a menu_tree;
+ e menu_tree;
begin
- for i in select me_code from profile_menu where me_code_dep=p_code
- loop
+for a in select me_code,me_description from v_all_menu where user_name=login
+ and me_code_dep is null and me_type <> 'PR' and me_type <>'SP'
+loop
+ return next a;
+
+ for e in select * from get_menu_tree(a.code,login)
+ loop
+ return next e;
+ end loop;
+
+ end loop;
+return;
+end;
+$BODY$ language plpgsql;
+
+
+
+
+CREATE OR REPLACE FUNCTION comptaproc.get_menu_tree(p_code text,login text)
+ RETURNS SETOF menu_tree AS
+$BODY$
+declare
+ i menu_tree;
+ e menu_tree;
+ a text;
+ x v_all_menu%ROWTYPE;
+begin
+ for x in select * from v_all_menu where me_code_dep=p_code::text and user_name=login::text
+ loop
+ if x.me_code_dep is not null then
+ i.code := x.me_code_dep||'/'||x.me_code;
+ else
+ i.code := x.me_code;
+ end if;
+
+ i.description := x.me_description;
+
return next i;
- for e in select get_pcm_tree from get_menu_tree(i)
+
+ for e in select * from get_menu_tree(x.me_code,login)
loop
+ e.code:=x.me_code_dep||'/'||e.code;
return next e;
end loop;
@@ -21,6 +57,5 @@ begin
return;
end;
$BODY$
- LANGUAGE plpgsql VOLATILE
- COST 100
- ROWS 1000;
+ LANGUAGE plpgsql;
+
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index d23731c63..fc3a05a2d 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -22,6 +22,7 @@ script SQL to run
\i account_add.sql
\i object-6.0.sql
\i extension.sql
+\i ajax-direct-form.sql
-- for account repository
\i change_account_repo.sql
\i style-epad.sql