From 20f0c3fe1300dea0e0ba3e3ea1049feb24e8f524 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Fri, 4 Oct 2013 14:57:53 +0000
Subject: [PATCH] Add the SQL scripts for updating database Style are modified
 Calendar - zoom

---
 html/admin/sql/patch/upgrade107.sql |  290 +++++
 html/ajax_misc.php                  |    3 +
 html/js/scripts.js                  |   75 +-
 html/style-color.css                | 1578 +++++++++++++++------------
 html/style-epad.css                 | 1574 ++++++++++++++------------
 html/style-light.css                | 1548 ++++++++++++++------------
 html/style.css                      |    8 +-
 include/class_calendar.php          |  119 +-
 include/class_html_input.php        |   13 +-
 include/constant.php                |    2 +-
 include/dashboard.inc.php           |    3 +
 include/template/calendar.php       |    2 +-
 include/template/dashboard.php      |    1 +
 sql/upgrade.sql                     |  278 -----
 14 files changed, 3132 insertions(+), 2362 deletions(-)
 create mode 100644 html/admin/sql/patch/upgrade107.sql

diff --git a/html/admin/sql/patch/upgrade107.sql b/html/admin/sql/patch/upgrade107.sql
new file mode 100644
index 000000000..3da68f7ab
--- /dev/null
+++ b/html/admin/sql/patch/upgrade107.sql
@@ -0,0 +1,290 @@
+begin;
+
+-- si la fiche utilise le code DEPENSE PRIVEE alors ajout dans QP_DEP_PRIV
+create or replace view m as 
+select qp_id, qp_price from quant_purchase join fiche_detail on (qp_fiche=f_id and ad_id=5) where ad_value in (select p_value from parm_code where p_code='DEP_PRIV');
+
+update quant_purchase as e set qp_dep_priv=(select qp_price from m where m.qp_id=e.qp_id);
+
+update quant_purchase as e set qp_dep_priv=(select qp_price from m where m.qp_id=e.qp_id);
+
+update quant_purchase as e set qp_dep_priv=0 where qp_dep_priv is null;
+-- évite les valeurs nulles dans quant_purchase
+update quant_purchase set qp_dep_priv = 0 where qp_dep_priv is null;
+
+drop view m;
+
+-- update script insert_quant_purchase
+
+
+CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(
+    p_internal text, 
+    p_j_id numeric, 
+    p_fiche text, 
+    p_quant numeric, 
+    p_price numeric, 
+    p_vat numeric, 
+    p_vat_code integer, 
+    p_nd_amount numeric, 
+    p_nd_tva numeric, 
+    p_nd_tva_recup numeric, 
+    p_dep_priv numeric, 
+    p_client text, 
+    p_tva_sided numeric)
+  RETURNS void AS
+$BODY$
+declare
+        fid_client integer;
+        fid_good   integer;
+        account_priv    account_type;
+        fid_good_account account_type;
+        n_dep_priv numeric;
+begin
+        n_dep_priv := 0;
+        select p_value into account_priv from parm_code where p_code='DEP_PRIV';
+        select f_id into fid_client from
+                fiche_detail where ad_id=23 and ad_value=upper(trim(p_client));
+        select f_id into fid_good from
+                 fiche_detail where ad_id=23 and ad_value=upper(trim(p_fiche));
+        select ad_value into fid_good_account from fiche_detail where ad_id=5 and f_id=fid_good;
+        if strpos( fid_good_account , account_priv ) = 1 then
+                n_dep_priv=p_price;
+        end if; 
+            
+        insert into quant_purchase
+                (qp_internal,
+                j_id,
+                qp_fiche,
+                qp_quantite,
+                qp_price,
+                qp_vat,
+                qp_vat_code,
+                qp_nd_amount,
+                qp_nd_tva,
+                qp_nd_tva_recup,
+                qp_supplier,
+                qp_dep_priv,
+                qp_vat_sided)
+        values
+                (p_internal,
+                p_j_id,
+                fid_good,
+                p_quant,
+                p_price,
+                p_vat,
+                p_vat_code,
+                p_nd_amount,
+                p_nd_tva,
+                p_nd_tva_recup,
+                fid_client,
+                n_dep_priv,
+                p_tva_sided);
+        return;
+end;
+ $BODY$
+  LANGUAGE plpgsql;
+
+
+-- ajout code manquant dans parm_code
+create or replace function add_parm_code() returns void as
+$fct$
+declare
+    country_code text;
+begin 
+    select pr_value into country_code from parameter where pr_id='MY_COUNTRY';
+    if country_code='FR' then
+        insert into parm_code (p_code,p_comment,p_value) values ('DNA','Dépense non déductible','67');
+        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_DNA','TVA non déductible','');
+        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_DED_IMPOT','TVA déductible à l''impôt','');
+        insert into parm_code  (p_code,p_comment,p_value) values ('COMPTE_COURANT','Poste comptable pour le compte courant','');
+        insert into parm_code  (p_code,p_comment,p_value) values ('COMPTE_TVA','TVA à payer ou à recevoir','');
+     end if;
+end;
+$fct$
+language plpgsql;
+
+select add_parm_code();
+
+drop function add_parm_code();
+
+update parm_code set p_value='67' where p_value='6740' and p_code='DNA';
+
+ alter table menu_ref add me_description_etendue text;
+
+insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue)
+values
+('NAVI','Navigateur',null,null,'Menu simplifié pour retrouver rapidement un menu',null,'ask_navigator(<DOSSIER>)','ME','Le navigateur vous présente une liste de menu auquel vous avez accès et vous permet d''accèder plus rapidement au menu que vous souhaitez rapidement');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_display,pm_default) 
+values
+('NAVI',null,1,90,'M',0), ('NAVI',null,2,90,'M',0);
+
+insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue)
+values
+('BOOKMARK','Favori',null,null,'Raccourci vers vos menus préférés',null,'show_bookmark(<DOSSIER>)','ME','Ce menu vous présente un menu rapide des menus que vous utilisez le plus souvent');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_display,pm_default) 
+values
+('BOOKMARK',null,1,85,'M',0), ('BOOKMARK',null,2,85,'M',0);
+
+update menu_ref set me_menu='Impression Journaux' where me_code='PRINTJRN';
+update menu_ref set me_description='Impression des journaux' where me_code='PRINTJRN';
+update menu_ref set me_menu='Liste Suivi' where me_code='FOLLOW';
+update menu_ref set me_description='Document de suivi sous forme de liste' where me_code='FOLLOW';
+update menu_ref set me_javascript='popup_recherche(<DOSSIER>)' where me_code='SEARCH';
+update menu_ref set me_file=null,me_javascript='set_preference(<DOSSIER>)' , me_description_etendue='Préférence de l''utilisateur, apparence de l''application pour l''utilisateur, période par défaut et mot de passe' where me_code='PREFERENCE';
+/*
+ * Vue montrant toutes les possibilités
+ */
+CREATE OR REPLACE VIEW v_menu_description AS 
+ WITH t_menu AS (
+         SELECT mr.me_menu, pm.me_code, pm.me_code_dep, pm.p_type_display, pu.user_name, mr.me_file, mr.me_javascript, mr.me_description, mr.me_description_etendue
+           FROM profile_menu pm
+      JOIN profile_user pu ON pu.p_id = pm.p_id
+   JOIN profile p ON p.p_id = pm.p_id
+   JOIN menu_ref mr USING (me_code)
+        )
+ SELECT DISTINCT (COALESCE(v3.me_code || '/'::text, ''::text) || COALESCE(v2.me_code, ''::text)) || 
+        CASE
+            WHEN v2.me_code IS NULL THEN COALESCE(v1.me_code, ''::text)
+            WHEN v2.me_code IS NOT NULL THEN COALESCE('/'::text || v1.me_code, ''::text)
+            ELSE NULL::text
+        END AS code, v1.me_code, v1.me_description, v1.me_description_etendue, v1.me_file, v1.user_name, '> '::text || v1.me_menu AS v1menu, 
+        CASE
+            WHEN COALESCE(v3.me_menu, ''::text) <> ''::text THEN ' > '::text || v2.me_menu
+            ELSE v2.me_menu
+        END AS v2menu, v3.me_menu AS v3menu, v3.p_type_display,
+ coalesce(v1.me_javascript,coalesce(v2.me_javascript,v3.me_javascript)) as javascript
+   FROM t_menu v1
+   LEFT JOIN t_menu v2 ON v1.me_code_dep = v2.me_code
+   LEFT JOIN t_menu v3 ON v2.me_code_dep = v3.me_code
+  WHERE v1.p_type_display <> 'P'::text AND (COALESCE(v1.me_file, ''::text) <> ''::text OR COALESCE(v1.me_javascript, ''::text) <> ''::text);
+
+COMMENT ON VIEW v_menu_description
+  IS 'Description des menus';
+ 
+CREATE TABLE bookmark
+(
+b_id serial primary key,
+b_order integer default 1,
+b_action text,
+login text 
+);
+comment on table bookmark is 'Bookmark of the connected user';
+
+create table tags (
+    t_id serial primary key, 
+    t_tag text not null, 
+    t_description text
+);
+
+create table action_tags
+(
+    at_id serial primary key,
+    t_id integer references tags(t_id) on delete cascade on update cascade,
+    ag_id integer references action_gestion(ag_id) on delete cascade on update cascade
+);
+/* Config tag */
+insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue)
+values
+('CFGTAG','Configuration étiquette','cfgtags.inc.php',null,'Configuration des tags',null,null,'ME','Configuration des étiquettes. Vous pouvez en ajouter, en supprimer ou les modifier');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_display,pm_default) 
+values
+('CFGTAG','PARAM',1,390,'E',0);
+
+update fiche_def set    fd_label='Trésorerie' where fd_id=3;
+update fiche_def_ref set    frd_text='Trésorerie' where frd_id=4;
+update jrn_def set jrn_def_name='Trésorerie' where jrn_def_id=1;
+update jrn_type set jrn_desc = 'Trésorerie' where jrn_type_id='FIN';
+
+CREATE OR REPLACE FUNCTION comptaproc.insert_quick_code(nf_id integer, tav_text text)
+  RETURNS integer AS
+$BODY$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	tBase text;
+	tName text;
+	nCount Integer;
+	nDuplicate Integer;
+	begin
+	tText := lower(trim(tav_text));
+	tText := replace(tText,' ','');
+	tText := translate(tText,E' $€µ£%.+-/\\!(){}(),;_&|"#''^<>*','');
+	tText := translate(tText,E'éèêëàâäïîüûùöôç','eeeeaaaiiuuuooc');
+	nDuplicate := 0;
+	tBase := tText;
+	loop
+		-- take the next sequence
+		select nextval('s_jnt_fic_att_value') into ns;
+		if length (tText) = 0 or tText is null then
+			select count(*) into nCount from fiche_detail where f_id=nf_id and ad_id=1;
+			if nCount = 0 then
+				tText := 'FICHE'||ns::text;
+			else
+				select ad_value into tName from fiche_detail where f_id=nf_id and ad_id=1;
+				
+				tName := lower(trim(tName));
+				tName := substr(tName,1,6);
+				tName := replace(tName,' ','');
+				tName := translate(tName,E' $€µ£%.+-/\\!(){}(),;_&|"#''^<>*','');
+				tName := translate(tName,E'éèêëàâäïîüûùöôç','eeeeaaaiiuuuooc');
+				tBase := tName;
+				if nDuplicate = 0 then
+					tText := tName;
+				else
+					tText := tName||nDuplicate::text;
+				end if;
+			end if;
+		end if;
+		-- av_text already used ?
+		select count(*) into nExist
+			from fiche_detail
+		where
+			ad_id=23 and  ad_value=upper(tText);
+
+		if nExist = 0 then
+			exit;
+		end if;
+		nDuplicate := nDuplicate + 1 ;
+		tText := tBase || nDuplicate::text;
+		
+		if nDuplicate > 9999 then
+			raise Exception 'too many duplicate % duplicate# %',tText,nDuplicate;
+		end if;
+	end loop;
+
+
+	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,23,upper(tText));
+	return ns;
+	end;
+$BODY$
+
+LANGUAGE plpgsql VOLATILE
+
+alter table op_predef add od_description text;
+alter table op_predef add od_description text;
+create or replace function comptaproc.opd_limit_description() 
+returns trigger
+as
+$BEGIN$
+	declare
+		sDescription text;
+	begin
+	sDescription := NEW.od_description;
+	NEW.od_description := substr(sDescription,1,80);
+	return NEW;
+	end;
+$BEGIN$
+LANGUAGE plpgsql;
+
+create trigger opd_limit_description before update or insert on op_predef execute procedure for each row comptaproc.opd_limit_description();
+
+update menu_ref set me_menu = 'Trésorerie' where me_code='MENUFIN';
+
+
+update version set val=108;
+
+commit;
diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index a35fd1987..049343f9e 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -615,6 +615,9 @@ EOF;
         case 'search_clear_tag':
             require_once 'ajax_search_clear_tag.php';
             break;
+        case 'calendar_zoom':
+            require_once 'ajax_calendar_zoom.php';
+            break;
 	default:
 		var_dump($_GET);
 }
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 4e6f47d98..8782c7c58 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -593,15 +593,17 @@ function set_wait(name)
  *@brief add dynamically a object for AJAX
  *@param obj.
  * the attributes are
- * - style to add style
- * - id to add an id
- * - class to add a class
- * - html is the content
+ *   - style to add style
+ *   - id to add an id
+ *   - cssclass to add a class
+ *   - html is the content
+ *   - drag is the div can be moved
  */
 function add_div(obj)
 {
     try
     {
+        console.log(obj);
         var top=document;
         
         if ( ! $(obj.id) )  { var elt=top.createElement('div');}
@@ -646,7 +648,7 @@ new Draggable(obj.id,{starteffect:function()
     }
     catch (e)
     {
-        alert("add_div"+e.message);
+        alert("add_div "+e.message);
     }
 }
 /**
@@ -2299,4 +2301,67 @@ function action_show_checkbox()
 {
     var a=document.getElementsByName('ag_id_td');
     for (var i=0;i<a.length;i++) {    a[i].style.display='block';    }
+}
+/**
+ * 
+ * @param {type} obj
+ * object attribute : g
+ *   - Dossier dossier_id, 
+ *   - invalue DOM Element where you can find the periode to zoom
+ *   - outdiv  ID of the target (DIV)
+ *   
+ */
+function calendar_zoom(obj)
+{
+    try {
+        
+        var query="";
+        console.log(obj);
+        query="op=calendar_zoom&gDossier="+obj.gDossier+"&in="+$(obj.invalue).value+'&out='+obj.outdiv;
+        console.log(query);
+        waiting_box();
+        var action = new Ajax.Request(
+                                      "ajax_misc.php" ,
+                                      {
+                                          method:'get', parameters:query,
+                                          onFailure:ajax_misc_failure,
+                                          onSuccess:function(req,j){
+                                                    console.log(1);
+                                                    var answer=req.responseXML;
+                                                    console.log(2);
+                                                    var html=answer.getElementsByTagName('html');
+                                                    console.log(3);
+                                                    if ( html.length == 0 )
+                                                    {
+                                                    console.log(4);
+                                                        var rec=unescape_xml(req.responseText);
+                                                        error_message ('erreur :'+rec);
+                                                    }
+                                                    var code_html=getNodeText(html[0]);
+                                                    code_html=unescape_xml(code_html);
+                                                    console.log(5);
+                                                    
+                                                    // if the target doesn't exist 
+                                                    // then create it
+                                                    if ( obj.outdiv == undefined ) {
+                                                        obj.outdiv='calendar_zoom_div';
+                                                    }
+                                                    if (   $(obj.outdiv) == undefined) {
+                                                        var str_style=fixed_position(0,20);
+                                                        add_div({id:obj.outdiv,style:'margin-left:3%;width:94%;height:94%;'+str_style,cssclass:"inner_box",drag:1});
+                                                        console.log(5);
+                                                    }
+                                                    remove_waiting_box();
+                                                    console.log(6);
+                                                    $(obj.outdiv).innerHTML=code_html;
+                                                    console.log(7);
+                                                    $(obj.outdiv).show();
+                                          }
+                                      }
+                                      );
+    }catch (e) {
+         error_message('calendar_zoom '+e.getMessage);
+    }
+  
+    
 }
\ No newline at end of file
diff --git a/html/style-color.css b/html/style-color.css
index 9997befa6..225b6b8c5 100644
--- a/html/style-color.css
+++ b/html/style-color.css
@@ -1,403 +1,430 @@
 /* <style type="text/css"> */
 
 BODY {
-  background-color:#EDF3FF;
- font-size:12px;
-  font-family:verdana,helvetica,sans-serif;
-  padding: 0px 0px 0px 0px ;
-  margin:0;
-  color:blue;
+    background-color:#EDF3FF;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding: 0px 0px 0px 0px ;
+    margin:0;
+    color:blue;
+    font-size:0.90em;
 }
 .notice {
-		color:red;
-        font-style: italic;
-        }
+    color:red;
+    font-style: italic;
+}
 
 table.sortable, table.table_large, table.result  ,table.resultfooter {
-  color:blue;
-  /* border:blue solid 1px; */
-  width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    /* border:blue solid 1px; */
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
 
 }
 table.resultfooter tfoot {
-	font-size:110%;
-	font-weight: bold;
+    font-weight: bold;
 
 
 }
 table.sortable th,  table.table_large th,table.result th {
-  font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
- border-bottom:1px solid blue;
- border-top:0;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:1px solid blue;
+    border-top:0;
+    font-size:0.75em;;
 
-  color:#25238F;
-  text-align: left;
-  font-style: italic;
+    color:#25238F;
+    text-align: left;
+    font-style: italic;
 
 }
 
 h2 {
-  font-family:verdana,helvetica,sans-serif;
-  font-size:14px;
-  color:grey;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:1.35em;
+    color:grey;
+    margin:1px;
+    padding:1px;
+    font-style: italic;
 }
 div.info {
-	background:#879ed4;
-	color:white;
-	font-size:120%;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
 
 content h2.info {
-	background:#879ed4;
-  color:black;
-  font-size:14pt;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:black;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 redcontent h2.info {
-  background:#879ed4;
-  color:white;
-  font-size:14pt;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 h2.info {
-  background-color:#879ed4;
-	color:white;
-	font-size:14px;
-  text-align:center;
-  padding:0px;
-  margin:0px;
-  border:1px solid grey;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 
 }
 
+
 h3.info {
-  background:#879ed4;
-  color:white;
-  font-size:14px;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
 
 h2.info2 {
-  color:blue;
-  font-size:14px;
-  text-align:center;
+    color:blue;
+    font-size:1em;;
+    text-align:center;
 
 }
 
 
 h2.error {
-	background:red;
-	color:white;
-	font-size:14px;
+    background:red;
+    color:white;
+    font-size:0.87em;
 }
 
 
 div.u_tmenu {
-  margin-top:0px;
-  width:100%;
- /* background-color:#879ED4; */
+    margin-top:0px;
+    width:100%;
+    /* background-color:#879ED4; */
 
 
 }
 div.u_subtmenu {
-  background-color:white	;
-  float:left;
-  clear:both;
-  left:10px;
+    background-color:white	;
+    float:left;
+    clear:both;
+    left:10px;
 
 }
 div.u_tmenu div.u_tool {
-	   float:left;
+    float:left;
 
 }
 div.u_tool {
-	float:left;
-	width:  100%;
-	padding-bottom: 20px;
-	}
-div.u_tool div.name {
-       float:left;
-       margin-left:10px;
+    float:left;
+    width:  100%;
+    padding-bottom: 20px;
 }
-div.u_tool {
-	float:right;
-	margin-right:10px;
+div.u_tool #name {
+    float:left;
+    margin-left:10px;
 }
-div.module {
-	position:absolute;
-	top:0px;
-	right:5px;
-	text-align:right;
-	padding:0px;
-	margin: 0px;
+#u_tool {
+    float:right;
+    margin-right:10px;
+}
+td.tool a.mtitle {
+    text-decoration:none;
+    display:inline;
+    color: blue;
+    font-size:0.75em;
+    
+}
+td.tool a.mtitle:hover {
+    text-decoration:none;
+    display:inline;
+    font-size:0.75em;;
+    color: darkblue;
+    background-color:#5D90CD;
+
+}
+#top {
+    float:left;
+    margin-bottom: 0.9512%;
+    width: 100%;
+}
+#module {
+    position:absolute;
+    top:0px;
+    right:5px;
+    text-align:right;
+    padding:0px;
+    margin: 0px;
 }
 div.u_subt2menu {
-background-color:lightgrey;
-  left:1%;
+    background-color:lightgrey;
+    left:1%;
 
 }
 div.lmenu {
-	 float:left;
-	 clear:left;
-	font-size:9px;
+    float:left;
+    clear:left;
+    font-size:0.75em;;
 
 }
 div.lextmenu {
 
-	float:left;
-	font-family:verdana,helvetica,sans-serif;
-	font-size:9px;
+    float:left;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:0.75em;;
 
 }
 div.searchmenu {
-  left:30px;
-  width:95px;
-  top:100px;
-  position:absolute;
+    left:30px;
+    width:95px;
+    top:100px;
+    position:absolute;
 
 }
 
 div.recherche_form{
-	width:700px;
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
-  border-style:outset;
-  border-width:1px;
+    width:700px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-style:outset;
+    border-width:1px;
 
 }
 div.redcontent{
 
-         float:left;
-	 padding-top:7px;
-	 padding-left:8px;
-         font-size:9px;
-         font-family:verdana,helvetica,sans-serif;
-	 width:75%;
+    float:left;
+    padding-top:7px;
+    padding-left:8px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    width:75%;
 
 }
 div.content{
-
-		padding-top:2px;
-		margin-top:2px;
-         width:100%;
-         font-family:verdana,helvetica,sans-serif;
+    padding-top:0.0030%;
+    margin-top:0.0030%;
+    width:100%;
+    font-family:arial,verdana,sans-serif,helvetica;
 
 
 }
 div.content30{
 
-         float:left;
-	 padding-top:7px;
-         width:35%;
-         font-family:verdana,helvetica,sans-serif;
+    float:left;
+    padding-top:7px;
+    width:35%;
+    font-family:arial,verdana,sans-serif,helvetica;
 
 }
 div.no span{
-	position:static;
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:bold;
-	color:red;
+    position:static;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:bold;
+    color:red;
 
 }
 
 table.document {
-   color:blue;
-   width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
 
 }
 table.document th{
-  font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
-  border-bottom:2px solid blue;
-  border-top:0;
-  color:#25238F;
-  text-align: left;
-  background-color:#EDF3FF;
-  font-style: italic;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:2px solid blue;
+    border-top:0;
+    color:#25238F;
+    text-align: left;
+    background-color:#EDF3FF;
+    font-style: italic;
 }
 .error {
-width:60%;
-margin-left:20%;
-text-align: center;
+    width:60%;
+    margin-left:20%;
+    text-align: center;
 
-color:white;
-background-color:red;
-font-weight: bolder;
-font-size:120%;
+    color:white;
+    background-color:red;
+    font-weight: bolder;
+    font-size:0.87em;
 }
 
 table.mtitle {
-	border:0;
-	text-align:center
+    border:0;
+    text-align:center
 }
 td.mshort {
-  height:15px;
-  width:60px;
-  text-align:center;
-  border:  1px solid;
-  color:#5D90CD ;
-  background-color:#DDE6FF;
+    height:15px;
+    width:60px;
+    text-align:center;
+    border:  1px solid;
+    color:#5D90CD ;
+    background-color:#DDE6FF;
 }
 td.mtitle {
-	text-align:center;
-	width:95px;
-        height :30px;
-	font-size:10px;
+    text-align:center;
+    width:95px;
+    height :30px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
+    border-radius:5px;
 }
 td.msubtitle {
-	text-align:center;
-	height:20px;
-	font-size:10px;
+    text-align:center;
+    height:20px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
 }
 span.mtitle {
-	color:gray;
-	background-color:blue;
-	font-size:10px;
-	border-style:groove
+    color:gray;
+    background-color:blue;
+    font-size:0.75em;;
+    border-style:groove
 }
 span.odd {
-  background-color:#ECF3FF;
-  display:block;
- }
+    background-color:#ECF3FF;
+    display:block;
+}
 span.even {
-  background-color:#DDE6FF;
-  display:block;
- }
+    background-color:#DDE6FF;
+    display:block;
+}
 
 tr.odd {
-	background-color:#DDE6FF;
-	font-size:10px;
+    background-color:#DDE6FF;
+    font-size:0.87em;;
 }
-tr {
-	font-size:10px;
+tr.highlight {
+    /* background-color:whitesmoke; */
+    font-size:0.87em;
+    font-weight: bold;
+}
+tr.even {
+  font-size:0.87em;;
 }
 td.odd{
-	background-color:#DDE6FF ;
-	font-size:10px;
+    background-color:#DDE6FF ;
 }
 td.even{
-	border:0px;
-	font-size:10px;
+    border:0px;
 }
 td.cell{
-	    height:32px;
-	     padding: 1px;
+    height:32px;
+    padding: 1px;
+    
 }
 td.selectedcell{
-	border-style:inset;
-        border-color:blue;
-	border-width:1pt ;
-	font-size:10px;
-        background:#5D90CD ;
-        color:white;
-        text-align:center;
-	     width:120px;
+    border-style:inset;
+    border-color:blue;
+    border-width:1pt ;
+    font-size:1.2em;
+    font-weight: bold;
+    background:#5D90CD ;
+    color:white;
+    text-align:center;
+    width:120px;
+    border-radius:5px;
 }
 a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
- color: blue;
+    text-decoration:none;
+    display:inline;
+    color: blue;
 
 }
 a.mtitle:hover {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
+    text-decoration:none;
+    display:inline;
 
- color: darkblue;
-background-color:#5D90CD;
+    color: darkblue;
+    background-color:#5D90CD;
 
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
- font-size:1em;
- text-decoration:none;
- display:block;
- color:white;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color:white;
 }
 a.dossier {
-  font-size:10px;
-  text-decoration:none;
-  display:block;
-   color: #202267;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color: #202267;
 
 }
 tr.odd:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 tr.even:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 a.cell {
-  text-decoration:none;
-  display:block;
-  color:blue;
-  background-color:white;
-  font-size:9px;
+    text-decoration:none;
+    display:block;
+    color:blue;
+    background-color:white;
+    font-size:0.75em;;
 }
 
 a.cell:hover {
-  font-size:9px;
-  color:white;
-  background-color:#5D90CD;
-  text-decoration:none;
-  display:block;
-	}
+    font-size:0.75em;;
+    color:white;
+    background-color:#5D90CD;
+    text-decoration:none;
+    display:block;
+}
 
 
 a.one:link {
-	text-decoration:none;
-	color:#3010FF
+    text-decoration:none;
+    color:#3010FF
 }
 a.one:visited {
-	text-decoration:none;
-	color:#3010FF
-	}
+    text-decoration:none;
+    color:#3010FF
+}
 
 a.one:active {
-	background: #0000FF;
-	}
+    background: #0000FF;
+}
 
 a.one:hover {
-	    text-decoration:underline;
-	background:#3010FF;
-	color:#FFFFFF;
-	}
+    text-decoration:underline;
+    background:#3010FF;
+    color:#FFFFFF;
+}
 
 
 a.detail
 {
-  font-size:9px;
-  font-family:verdana,helvetica,sans-serif;
+    font-size:0.87em;;
+    font-family:arial,verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -405,8 +432,8 @@ a.detail
 
 a.detail:hover
 {
-  font-size:9px;
-  font-family:verdana,helvetica,sans-serif;
+/*    font-size:0.75em;; */
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -414,19 +441,19 @@ a.detail:hover
 }
 
 li.menuv,ol.menuv {
-	 display:inline;
-	 padding:1em 1em;
+    display:inline;
+    padding:1em 1em;
 }
 div.redcontent a {
-  font-family:verdana,helvetica,sans-serif;
-  text-decoration: none;
-  display: block;
-  color: blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
 
 }
 
 div.redcontent a:hover {
-  font-family:verdana,helvetica,sans-serif;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -434,17 +461,17 @@ div.redcontent a:hover {
 
 }
 div.content a {
-  font-family:verdana,helvetica,sans-serif;
-  text-decoration: none;
-  display: block;
-  color: blue;
-padding: 0;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
+    padding: 0;
 
 }
 
 
 div.content a:hover {
-  font-family:verdana,helvetica,sans-serif;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -453,477 +480,506 @@ div.content a:hover {
 }
 
 div.redcontent a.mtitle {
-  text-decoration:none;
-  display:inline;
+    text-decoration:none;
+    display:inline;
 
 
-  color:black;
+    color:black;
 
 }
 
 div.redcontent a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  color:white;
-  background-color:darkblue;
+    text-decoration:none;
+    display:inline;
+    color:white;
+    background-color:darkblue;
 
 
 }
 div.content a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
-  color:blue;
+    text-decoration:none;
+    display:inline;
+    color:blue;
 
 
 
 }
 
 div.content a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:darkblue;
-  color:white;
+    text-decoration:none;
+    display:inline;
+    background-color:darkblue;
+    color:white;
 
 
 }
 div.redcontent input.text {
-   font-family:verdana,helvetica,sans-serif;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  background-color:orange;
-  border-width:1px;
-  color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    background-color:orange;
+    border-width:1px;
+    color:blue;
 }
 div.content input.text {
-   font-family:verdana,helvetica,sans-serif;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  border-width:1px;
-  background-color:orange;
-  color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    border-width:1px;
+    background-color:orange;
+    color:blue;
 }
 
 
 
 div.redcontent input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.content input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.redcontent textarea:focus {
-background-color: orange;
+    background-color: orange;
 }
 .document {
-color: #1a207d;
-border-collapse:collapse;
+    color: #1a207d;
+    border-collapse:collapse;
 }
-a.document{
-  font-size:12px;
-  text-decoration:none;
-  display:block;
+div.content a.document, a.document{
+/*    font-size:0.75em;;*/
+    text-decoration:underline;
+    display:block;
 }
 a.document:hover {
-  text-decoration:none;
-  display:block;
+    text-decoration:none;
+    display:block;
 
 
 }
 .input_text_ro {
-	   border:solid 1px blue;
-	   background:#EDEDED;
-	   color:blue;
-	margin:1px;
+    border:solid 1px blue;
+    background:#EDEDED;
+    color:blue;
+    margin:1px;
 }
 .input_text {
-	   border:groove 1px blue;
-	margin:1px;
+    border:groove 1px blue;
+    margin:1px;
 }
 .input_text:hover {
-	border:groove 1px blue;
-	margin:1px;
-	background-color: orange;
+    border:groove 1px blue;
+    margin:1px;
+    background-color: orange;
 }
 h1.legend, legend {
-font-weight: bold;
-font-style: italic;
-font-size: 110% ;
+    font-weight: bold;
+    font-style: italic;
+    font-size: 1.2em ;
 
 }
 fieldset fieldset legend {
-	 font-size:110%;
-	 color:grey;
-	 }
+    font-size:0.87em;
+    color:grey;
+}
 select {
-border: 1px solid blue;
-margin:2px;
-background-color:white;
+    border: 1px solid blue;
+    margin:2px;
+    background-color:white;
 
 }
 
 
 
 .infobulle {
-	   position:absolute;
-	   border:1px solid black;
-	   background-color:yellow;
-	   padding-bottom: 10;
-	   padding-top: 10;
-	   padding-left: 10;
-	   padding-right: 10;
-	   color:black;
-	   top:0;left:0;
-	   visibility:hidden;
-	   width:25em;
-		z-index:20;
+    position:absolute;
+    border:1px solid black;
+    background-color:yellow;
+    padding-bottom: 10;
+    padding-top: 10;
+    padding-left: 10;
+    padding-right: 10;
+    color:black;
+    top:0;left:0;
+    visibility:hidden;
+    width:25em;
+    z-index:20;
 }
 
 span.action {
-	height:3em;
+    height:3em;
 
 }
 td.num {
-	text-align:right;
+    text-align:right;
 }
 tr.priority1 {
-	background-color: coral;
-	}
+    background-color: coral;
+}
 span.action a.action {
-  border:2px outset ;
-  padding-left: 3px;
-  padding-right:3px;
-  text-decoration:none;
-  font-size:14px;
+    border:2px outset ;
+    padding-left: 3px;
+    padding-right:3px;
+    text-decoration:none;
+    font-size:0.87em;
 
-  display:inline;
-  color:black;
-  background-color:lightgrey;
+    display:inline;
+    color:black;
+    background-color:lightgrey;
 }
 
 span.action a.action:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:lightblue;
-  color:black;
+    text-decoration:none;
+    display:inline;
+    background-color:lightblue;
+    color:black;
 }
 div.popup_back{
-	position:absolute;
-	top:0px;
-	left:0px;
-	opacity:0.6;
-	width:100%;
-	height:100%;
-	z-index:1;
-	/*background-color:lightgrey;*/
+    position:absolute;
+    top:0px;
+    left:0px;
+    opacity:0.6;
+    width:100%;
+    height:100%;
+    z-index:1;
+    /*background-color:lightgrey;*/
 
-	display:none;
+    display:none;
 }
 
 div.popup_border_title {
-	position:absolute;
-	top:20%;
-	left:10%;
-	width:60%;
-	height:80%;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 2px outset #201e87;
-	background-color:#879ED4;
-	font-size: 110% ;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/
-	color: white;
-	display:none;
-	/*opacity:1;
-	filter:alpha(opacity=100);*/
+    position:absolute;
+    top:20%;
+    left:10%;
+    width:60%;
+    height:80%;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 2px outset #201e87;
+    background-color:#879ED4;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    /*border-bottom: 2px solid #201e87;*/
+    color: white;
+    display:none;
+    /*opacity:1;
+    filter:alpha(opacity=100);*/
 
-	}
+}
 div.popup_border_notitle {
-	position:absolute;
-	top:20%;
-	left:20%;
-	width:60%;
-	height:80% ;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 3px outset #201e87;
-	background-color: #879ED4;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	display:none;
-	color: white;
-	/*opacity:0.7;
-	filter:alpha(opacity=70);
-	*/
-	}
+    position:absolute;
+    top:20%;
+    left:20%;
+    width:60%;
+    height:80% ;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 3px outset #201e87;
+    background-color: #879ED4;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    display:none;
+    color: white;
+    /*opacity:0.7;
+    filter:alpha(opacity=70);
+    */
+}
 
 div.popup_content {
-	position:absolute;
-	top:16;
-	bottom:0;
-	left:0;
-	right:0;
-	width:100%;
-	height:96%;
-	overflow: auto;
-	background-color:#DFE7FF;
-	font-size:10px ;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: normal;
-	font-weight: normal;
-	color: black;
-	text-align: left;
-	display:none;
-	z-index:10;
-	/*opacity:1;
-	filter:alpha(opacity=100);*/
+    position:absolute;
+    top:16;
+    bottom:0;
+    left:0;
+    right:0;
+    width:100%;
+    height:96%;
+    overflow: auto;
+    background-color:#DFE7FF;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: normal;
+    font-weight: normal;
+    color: black;
+    text-align: left;
+    display:none;
+    z-index:10;
+    /*opacity:1;
+    filter:alpha(opacity=100);*/
 }
 div.autocomplete {
-  position:relative;
-  background-color:white;
-  border:1px solid #888;
-  margin:0;
-  padding:0;
-  text-align:left;
-  font-size:12px;
-
+    position:relative;
+    background-color:white;
+    border:1px solid #888;
+    margin:0;
+    padding:0;
+    text-align:left;
 }
 div.autocomplete em {
-	color:blue;
-	font-weight:bold;
+    color:blue;
+    font-weight:bold;
 }
 div.autocomplete ul {
-  list-style-type:none;
-  background-color:white;
-  border:1px solid #888;
-  width:375px;
-  margin:0;
-  padding:0;
+    list-style-type:none;
+    background-color:white;
+    border:1px solid #888;
+    width:375px;
+    margin:0;
+    padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
 
 div.autocomplete ul li {
-  list-style-type:none;
-  display:block;
-  margin:0;
-  padding:0px;
-  /*height:32px;*/
-  cursor:pointer;
+    list-style-type:none;
+    display:block;
+    margin:0;
+    padding:0px;
+    /*height:32px;*/
+    cursor:pointer;
+}
+span.informal{ 
+    color:black;
 }
-span.informal{ font-size:95%; color:black;}
 
 ul.select_table  {
-	/*padding:5px;*/
-	overflow:hidden;
-	}
+    /*padding:5px;*/
+    overflow:hidden;
+}
 ul.select_table a{
-	width:100%;
-	display:block;
-	background-color:inherit;
-	color: black;
-	text-decoration:none;
-	}
+    width:100%;
+    display:block;
+    background-color:inherit;
+    color: black;
+    text-decoration:none;
+}
 ul.select_table a:hover{
-	background-color:white;
-	color:black;
-	/*text-decoration:underline;*/
-	}
+    background-color:white;
+    color:black;
+    /*text-decoration:underline;*/
+}
 ul.select_table li {
-	display:table-row;
-	list-style-type: none;
-	}
+    display:table-row;
+    list-style-type: none;
+}
 ul.select_table li span {
-	display:table-cell;
-	width:25em;
-	margin: 0px;
-	padding:  0px;
+    display:table-cell;
+    width:25em;
+    margin: 0px;
+    padding:  0px;
 }
 
 div.pc_calendar{
 
-		float:left;
+    float:left;
 
-		}
+}
 div.pc_calendar table {
-	text-align:center;
+    text-align:center;
 
 }
 div.pc_calendar tr{
-	height:40;
+    font-size:0.87em;
+}
+div.pc_calendar tr{
+    height:40;
 
 
 }
 div.pc_calendar td{
-	width:14%;
-	border:#879ed4 solid 1px;
+    width:14%;
+    border:#879ed4 solid 1px;
 }
 
 div.pc_calendar td.weekend {
-	background-color:#cce0e6;
+    background-color:#cce0e6;
 
 }
 div.pc_calendar td.workday{
-	background-color:inherit;
-
-
+    background-color:inherit;
 }
 div.pc_calendar span.day{
-	font-weight: bold;
-	display:block;
+    font-weight: bold;
+    display:block;
 
 }
 div.pc_calendar span.event{
-	font-weight: bolder;
+    font-weight: bolder;
 
 }
 span.todo  {
-	text-align: left;
-	background-color:yellow;
+    text-align: left;
+    background-color:yellow;
 
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled], select[disabled] {
-background-color:lightgrey;
-color:black;
-cursor:inherit;
--moz-user-focus:ignore;
--moz-user-input:disabled;
+    -moz-user-focus:ignore;
+    -moz-user-input:disabled;
+    background-color:lightgrey;
+    color:black;
+    cursor:inherit;
 }
 
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:10;
-	color:white;
-	font-weight: bold;
+    color:white;
+    font-weight: bold;
+    font-size:0.87em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
 
-	text-decoration:none;
-	font-family: verdana,helvetica,sans-serif;
-	background-image: url("image/bg-submit2.gif");
-	background-repeat: repeat-x;
-	background-position: left;
-
-	border-style:  outset ;
-	border-color:  blue ;
-	border-width:0;
-	padding-bottom: 4;
-	padding-top: 4;
-	padding-right: 6;
-	padding-left:  6;
-	margin-top:3px;
-	cursor:pointer;
-	margin:1 2 1 2;
-    border-radius: 4px;
-	-moz-border-radius:4px;
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0px;
+    padding:8px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 5px;
+    moz-border-radius:5px;
 
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover  {
-	cursor:pointer;
-	background-color:white;
-	border-style:  inset ;
-	color:red;
-	margin:1 2 1 2;
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
 
-	}
-	td.tool {
-	border: solid 1px gray;
-	background-color: white;
+}
+a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
+    color:white;
+    font-weight: bold;
+    font-size:0.75em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
 
-	}
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0;
+    padding-bottom: 3px;
+    padding-top: 3px;
+    padding-right: 3px;
+    padding-left:  3px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 2px;
+    moz-border-radius:2px;
+
+}
+a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.content a.smallbutton:hover  {
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
+
+}
+td.tool {
+    border: solid 1px gray;
+    background-color: white;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
+}
 div.topmenu {
-	margin-top:2px;
+
 }
 
-h2.dossier {
-	color:darkblue;
-	font-style: italic;
-	display:inline;
-	font-size:14px;
-	margin:0px;
-	padding:0px;
-	font-variant:small-caps;
+#dossier h2{
+    color:darkblue;
+    display:inline;
+    font-size:2em;
+    margin:0px;
+    padding:0px;
+    font-variant:small-caps;
 }
 /* </style> */
-div.add_todo_list {
-                    border:1px solid blue;
-                    display:none;
-                    background-color:#BFD0FF;
-                    padding:3;
-                    position:absolute;
-                    text-align:left;
-                    line-height:3em;
-                    z-index:1;
-                    width:345px;
-                }
+#add_todo_list {
+    border:1px solid blue;
+    display:none;
+    background-color:#BFD0FF;
+    padding:0.0015%;
+    position:absolute;
+    text-align:left;
+    z-index:1;
+    width:17.9687%;
+}
 div.welcome {
 
 }
 div.gest_name {
-	float:left;
-	margin-left:150;
-	margin-top:15
+    float:left;
+    margin-left:150;
+    margin-top:15
 }
 h2.gest_name {
-	border-left: 5px solid  #403a8d;
-	border-bottom:1px solid  #b4bbc2;
-		border-top:1px solid  #b4bbc2;
-		border-right:1px solid  #b4bbc2;
-	padding: 5px;
-	width: 40%;
+    border-left: 5px solid  #403a8d;
+    border-bottom:1px solid  #b4bbc2;
+    border-top:1px solid  #b4bbc2;
+    border-right:1px solid  #b4bbc2;
+    padding: 5px;
+    width: 40%;
 }
 body.op_detail_frame,div.op_detail_frame  {
-  background-color:#e4e7ed;
-  height:100%; width:100%;
+    background-color:#e4e7ed;
+    height:100%; width:100%;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 
 
 }
 div.inner_box  {
-  background-color:#e4e7ed;
- font-size:10;
-  font-family:verdana,helvetica,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:3;
-
-position:absolute;
-left:10%;
-
-
-border:1px solid darkblue;
-
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:10%;
+    border:1px solid darkblue;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
 div.op_detail_title {
-	background-color:grey;
-/*	width:500;*/
+    background-color:grey;
+    /*	width:500;*/
 
 
 }
 div#div_jrn{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-		      background-color:#EDF3FF;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
 
 }
- div#div_cat{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-             background-color:#EDF3FF;
+div#div_cat{
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
 
 }
 
@@ -932,227 +988,373 @@ div.divinfo
 
 div#search_form
 {
-              position:absolute;
-              border:1px solid black;
-              top:15%;left:100px;
-              margin-left:25%;
-              z-index:2;
-              width:50%;
-              display:none;
-	      background-color:#e4e7ed;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100px;
+    margin-left:25%;
+    z-index:2;
+    width:50%;
+    display:none;
+    background-color:#e4e7ed;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
 
 table.sortable td, table.table_large td, table.result td
 {
-	padding-left:5px;
-	padding-right:5px;
+    padding-left:5px;
+    padding-right:5px;
 }
 table.info_op
 {
-	font-size:18;
-	width:100%;
+    width:100%;
 }
 table.info_op tr
 {
-font-size:14;
-background:white;
+    background:white;
 }
 h2#jrn_name
 {
-	color:blue;
-	font-size:22;
-	margin-right:30%;
-	float: right;
-
+    color:blue;
+    font-size:2.74em;
+    margin-right:30%;
+    float: right;
 }
 tr.footer{
-	font-size:14;
-	font-style: italic;
-	font-weight: bold;
+    font-size:0.87em;
+    font-style: italic;
+    font-weight: bold;
 
 }
 span.remain {
-	font-weight: bold;
-	color:black;
-	}
+    font-weight: bold;
+    color:black;
+}
 
 div#jrn_name_div
 {
-	float: right;
-	margin-right:150;
+    float: right;
+    margin-right:150;
 
 
 }
 #predef_form {
-	margin-left:20%;
-	width:60%;
-
+    margin-left:20%;
+    width:60%;
+    position: absolute;
 }
 #direct
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
+    font-size:0.87em;;
 }
 #calc
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
 }
 div#wait_box
 {
-  background-color:#F1E6E6;
- font-size:10;
-  font-family: verdana,helvetica,arial,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:10;
+    background-color:#F1E6E6;
+    font-size:0.87em;
+    font-family: arial,verdana,helvetica,arial,sans-serif;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:10;
 
-position:absolute;
-left:30%;
-top:30%;
+    position:absolute;
+    left:30%;
+    top:30%;
 
 
-border:1px solid darkblue;
+    border:1px solid darkblue;
 
 }
 #wait_box h2
 {
-color:black;
-text-align:center;
+    color:black;
+    text-align:center;
 }
 div#div_jrnsearch_op{
 
-              border:1px solid black;
-              display:none;
-              width:50em;
-		      background-color:#EDF3FF;
-			  position:absolute;
-			  z-index: 5;
+    border:1px solid black;
+    display:none;
+    width:50em;
+    background-color:#EDF3FF;
+    position:absolute;
+    z-index: 5;
 
 }
 ul {
-	padding-left: 110px;
+    padding-left: 110px;
 }
 a.line,div.content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
- color: #0000ff;
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
-  color: #0000ff;
-     background-color: rgb(93, 144, 205);
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
+    background-color: rgb(93, 144, 205);
 }
 #close_div
 {
- background-color:white;
- color:blue;
- text-decoration:none;
- border:1px solid blue;
- margin-left: 2px;
- margin-right:2px;
- margin-top:0px;
- font-size:10px;
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:2px;
+    margin-top:0px;
+    font-size:0.90em;
 }
 #close_div:hover
 {
-	background-color: orange;
+    background-color: orange;
+}
+#popmeout
+{
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:18px;
+    font-size:0.90em;
+}
+#popmeout:hover
+{
+    background-color: orange;
 }
 table.table_large tr.odd ,table.table_large tr.even {
 
-	height:32px;
+    height:32px;
 }
 #calc1
 {
-	position:absolute;
-	display:block;
-	top:30px;
-	left:150px;
-	width:300px;
-	border:1px solid black;
-	background-color:#aec3e8;
-	font-size:16px;
-	padding: 20px 20px;
+    position:absolute;
+    display:block;
+    top:30px;
+    left:150px;
+    width:300px;
+    border:1px solid black;
+    background-color:#aec3e8;
+    font-size:0.87em;
+    padding: 20px 20px;
 }
 span.invoice
 {
-    font-size: 120%;
+    font-size: 1.2em;
     font-style: italic;
     display:block;
     margin: 20px;
     font-weight: bold;
 }
 a.nav,div.content a.nav,div.redcontent a.nav {
-	display:inline;
-	text-decoration:none;
-	font-size:1em;
+    display:inline;
+    text-decoration:none;
+    font-size:0.75em;;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
-	display:inline;
-	text-decoration:none;
-	background-color:darkblue;
-	color:white;
-	font-size:1em;
+    display:inline;
+    text-decoration:none;
+    background-color:darkblue;
+    color:white;
+    font-size:0.75em;;
 }
 #dossier {
-	display:inline;
-	float:left;
-	width:40em;
-	top:0px;
+    display:inline;
+    float:left;
+    width:100%;
+    top:0px;
+    text-align: center;
 }
 div.foldercontent {
-	padding:20px 30px 0px 40px;
-	}
+    padding:20px 30px 0px 40px;
+}
 
 h1.title {
-	color: blue;
-	font-size:18px;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    font-style: italic;
 }
 h2.title {
-	color: blue;
-	font-size:14px;
-	font-weight:bold;
-	font-style: italic;
-	margin-left: 15px;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0.24%;
+    border:1px solid darkblue;
+
 }
 h3.title {
-	color: blue;
-	font-size:14px;
-	margin-left: 30px;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 30px;
 }
 h4.title {
-	color: blue;
-	font-size:12px;
-	margin-left: 45px;
-	text-decoration: underline;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: underline;
 }
 h5.title {
-	color: blue;
-	font-size:12px;
-	margin-left: 45px;
-	text-decoration: none;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: none;
+    font-style: italic;
 }
 div.myfieldset
 {
-	margin-top: 5px;
-	margin-left:5px;
-	margin-right: 5px;
-	border:lightgrey 2px groove;
+    margin-top: 5px;
+    margin-left:5px;
+    margin-right: 5px;
+    border:lightgrey 2px groove;
+    border-radius: 4px;
 }
 #info_div {
-	display:none;
-	background-color: yellow;
-	color:black;
-	z-index: 15;
-	position: absolute;
-	top:20;
-	left:20;
-}
\ No newline at end of file
+    display:none;
+    background-color: yellow;
+    color:black;
+    z-index: 15;
+    position: absolute;
+    top:0;
+    left:45%;
+}
+div.menu2 a.mtitle{
+    
+}
+div.menu3 {
+    
+}
+#go_submit_id {
+    font-size:1.25em;
+}
+.decale {
+    margin-left:30px;
+}
+#folder {
+    font-size:1.4em;
+    width:auto;
+    border-width:0px;
+    border-collapse:collapse;
+    
+    
+}
+/*#folder tr.odd,#folder tr.even {
+    font-size : 1.2em;
+}*/
+textarea.itextarea{
+    border:solid blue 1px;
+    width:90%;
+    margin-left:5%;
+}
+div#modele_op_div{
+    display: none;
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:30%;
+    width:40%;
+    border:1px solid darkblue;
+}
+div#notice {
+    position:absolute;
+    right:5%;
+    top:200px;
+    background-color:yellow;
+    border: 1px solid black;
+}
+div.name  {
+    position:absolute;
+    top:0px;
+    left:0px;
+}
+div#box_search_card {
+    position:absolute;
+    right:15.625%;
+    top:115px;
+}
+div.bxbutton
+{
+    float:right;
+    height:10px;
+    display:block;
+    margin-top:0.48%;
+    margin-right:0.48%;
+}
+div.inner_box tr.odd {
+    background:  #CBD9F4;
+}
+#modele_op_tab tr.odd {
+    background:  #CBD9F4;
+}
+div#bookmark_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+   border:1px solid darkblue;
+   top:2em;
+   left:30%;
+   width:40%;
+}
+div#preference_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    border:1px solid darkblue;
+    top:2em;
+    left:20%;
+    width:50%;
+}
+#error_div{
+    position:absolute;
+    border:1px solid black;
+    background-color:whitesmoke;
+    padding-bottom: 2px;
+    padding-top: 2px;
+    padding-left: 2px;
+    padding-right: 2px;
+    color:red;
+    top:40%;left:25%;
+    visibility:hidden;
+    width:40em;
+    z-index:20;
+}
+#error_div h2 {
+    background: red;
+}
+div#error_content_div {
+   font-size: 1.2em;
+   color:error;
+   font-weight: bold;
+   text-align: center;
+}
+td.workday ol {
+	margin:0px;
+	padding:0px;
+	list-style-type:none;
+	text-align:left;
+}
diff --git a/html/style-epad.css b/html/style-epad.css
index 2ca270e8b..76157fbbc 100644
--- a/html/style-epad.css
+++ b/html/style-epad.css
@@ -1,413 +1,427 @@
 /* <style type="text/css"> */
 
 BODY {
-  background-color:#EDF3FF;
-  font-size:100%;
-  font-family:verdana,sans-serif,helvetica;
-  padding: 0px 0px 0px 0px ;
-  margin:0;
-  color:blue;
+    background-color:#EDF3FF;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding: 0px 0px 0px 0px ;
+    margin:0;
+    color:blue;
+    font-size:1.35em;
 }
-#info_div {
-	display:none;
-	background-color: yellow;
-	color:black;
-	z-index: 15;
-	position: absolute;
-	top:0;
-	left:45%;
-}
-
 .notice {
-	color:red;
-        font-style: italic;
-        }
+    color:red;
+    font-style: italic;
+}
 
 table.sortable, table.table_large, table.result  ,table.resultfooter {
-  color:blue;
-  /* border:blue solid 1px; */
-  width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    /* border:blue solid 1px; */
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
 
 }
 table.resultfooter tfoot {
-	font-size:110%;
-	font-weight: bold;
+    font-weight: bold;
 
 
 }
 table.sortable th,  table.table_large th,table.result th {
-  font-weight:bold;
-  font-family:verdana,sans-serif,helvetica;
- border-bottom:1px solid blue;
- border-top:0;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:1px solid blue;
+    border-top:0;
+    font-size:0.75em;;
 
-  color:#25238F;
-  text-align: left;
-  font-style: italic;
+    color:#25238F;
+    text-align: left;
+    font-style: italic;
 
 }
 
 h2 {
-  font-family:verdana,sans-serif,helvetica;
-  font-size:120%;
-  color:grey;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:1.35em;
+    color:grey;
+    margin:1px;
+    padding:1px;
+    font-style: italic;
 }
 div.info {
-	background:#879ed4;
-	color:white;
-	font-size:120%;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
 
 content h2.info {
-	background:#879ed4;
-  color:black;
-  font-size:120%;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:black;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 redcontent h2.info {
-  background:#879ed4;
-  color:white;
-  font-size:120%;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 h2.info {
-  background-color:#879ed4;
-	color:white;
-	font-size:120%;
-  text-align:center;
-  padding:0px;
-  margin:0px;
-  border:1px solid grey;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 
 }
 
+
 h3.info {
-  background:#879ed4;
-  color:white;
-  font-size:120%;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
 
 h2.info2 {
-  color:blue;
-  font-size:100%;
-  text-align:center;
+    color:blue;
+    font-size:1em;;
+    text-align:center;
 
 }
 
 
 h2.error {
-	background:red;
-	color:white;
-	font-size:120%;
+    background:red;
+    color:white;
+    font-size:0.87em;
 }
 
 
 div.u_tmenu {
-  margin-top:0px;
-  width:100%;
- /* background-color:#879ED4; */
+    margin-top:0px;
+    width:100%;
+    /* background-color:#879ED4; */
 
 
 }
 div.u_subtmenu {
-  background-color:white	;
-  float:left;
-  clear:both;
-  left:10px;
+    background-color:white	;
+    float:left;
+    clear:both;
+    left:10px;
 
 }
 div.u_tmenu div.u_tool {
-	   float:left;
+    float:left;
 
 }
 div.u_tool {
-	float:left;
-	width:  100%;
-	padding-bottom: 20px;
-	}
-div.u_tool div.name {
-       float:left;
-       margin-left:10px;
+    float:left;
+    width:  100%;
+    padding-bottom: 20px;
 }
-div.u_tool {
-	float:right;
-	margin-right:10px;
+div.u_tool #name {
+    float:left;
+    margin-left:10px;
 }
-div.module {
-	position:absolute;
-	top:0px;
-	right:5px;
-	text-align:right;
-	padding:0px;
-	margin: 0px;
+#u_tool {
+    float:right;
+    margin-right:10px;
+}
+td.tool a.mtitle {
+    text-decoration:none;
+    display:inline;
+    color: blue;
+    font-size:0.75em;
+    
+}
+td.tool a.mtitle:hover {
+    text-decoration:none;
+    display:inline;
+    font-size:0.75em;;
+    color: darkblue;
+    background-color:#5D90CD;
+
+}
+#top {
+    float:left;
+    margin-bottom: 0.9512%;
+    width: 100%;
+}
+#module {
+    position:absolute;
+    top:0px;
+    right:5px;
+    text-align:right;
+    padding:0px;
+    margin: 0px;
 }
 div.u_subt2menu {
-background-color:lightgrey;
-  left:1%;
+    background-color:lightgrey;
+    left:1%;
 
 }
 div.lmenu {
-	 float:left;
-	 clear:left;
-	font-size:90%;
+    float:left;
+    clear:left;
+    font-size:0.75em;;
 
 }
 div.lextmenu {
 
-	float:left;
-	font-family:verdana,sans-serif,helvetica;
-	font-size:90%;
+    float:left;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:0.75em;;
 
 }
 div.searchmenu {
-  left:30px;
-  width:95px;
-  top:100px;
-  position:absolute;
+    left:30px;
+    width:95px;
+    top:100px;
+    position:absolute;
 
 }
 
 div.recherche_form{
-	width:700px;
-	font-size:90%;
-	font-family:verdana,sans-serif,helvetica;
-  border-style:outset;
-  border-width:1px;
+    width:700px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-style:outset;
+    border-width:1px;
 
 }
 div.redcontent{
 
-         float:left;
-	 padding-top:7px;
-	 padding-left:8px;
-         font-size:90%;
-         font-family:verdana,sans-serif,helvetica;
-	 width:75%;
+    float:left;
+    padding-top:7px;
+    padding-left:8px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    width:75%;
 
 }
 div.content{
-
-		padding-top:2px;
-		margin-top:2px;
-         width:100%;
-         font-family:verdana,sans-serif,helvetica;
+    padding-top:0.0030%;
+    margin-top:0.0030%;
+    width:100%;
+    font-family:arial,verdana,sans-serif,helvetica;
 
 
 }
 div.content30{
 
-         float:left;
-	 padding-top:7px;
-         width:35%;
-         font-family:verdana,sans-serif,helvetica;
+    float:left;
+    padding-top:7px;
+    width:35%;
+    font-family:arial,verdana,sans-serif,helvetica;
 
 }
 div.no span{
-	position:static;
-	font-family:verdana,sans-serif,helvetica;
-	font-weight:bold;
-	color:red;
+    position:static;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:bold;
+    color:red;
 
 }
 
 table.document {
-   color:blue;
-   width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
 
 }
 table.document th{
-  font-weight:bold;
-  font-family:verdana,sans-serif,helvetica;
-  border-bottom:2px solid blue;
-  border-top:0;
-  color:#25238F;
-  text-align: left;
-  background-color:#EDF3FF;
-  font-style: italic;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:2px solid blue;
+    border-top:0;
+    color:#25238F;
+    text-align: left;
+    background-color:#EDF3FF;
+    font-style: italic;
 }
 .error {
-width:60%;
-margin-left:20%;
-text-align: center;
+    width:60%;
+    margin-left:20%;
+    text-align: center;
 
-color:white;
-background-color:red;
-font-weight: bolder;
-font-size:120%;
+    color:white;
+    background-color:red;
+    font-weight: bolder;
+    font-size:0.87em;
 }
 
 table.mtitle {
-	border:0;
-	text-align:center
+    border:0;
+    text-align:center
 }
 td.mshort {
-  height:15px;
-  width:60px;
-  text-align:center;
-  border:  1px solid;
-  color:#5D90CD ;
-  background-color:#DDE6FF;
+    height:15px;
+    width:60px;
+    text-align:center;
+    border:  1px solid;
+    color:#5D90CD ;
+    background-color:#DDE6FF;
 }
 td.mtitle {
-	text-align:center;
-	width:95px;
-        height :30px;
-	font-size:90%;
+    text-align:center;
+    width:95px;
+    height :30px;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
 }
 td.msubtitle {
-	text-align:center;
-	height:20px;
-	font-size:90%;
+    text-align:center;
+    height:20px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
 }
 span.mtitle {
-	color:gray;
-	background-color:blue;
-	font-size:90%;
-	border-style:groove
+    color:gray;
+    background-color:blue;
+    font-size:0.75em;;
+    border-style:groove
 }
 span.odd {
-  background-color:#ECF3FF;
-  display:block;
- }
+    background-color:#ECF3FF;
+    display:block;
+}
 span.even {
-  background-color:#DDE6FF;
-  display:block;
- }
+    background-color:#DDE6FF;
+    display:block;
+}
 
 tr.odd {
-	background-color:#DDE6FF;
-	font-size:90%;
+    background-color:#DDE6FF;
+    font-size:1em;;
 }
-tr {
-	font-size:90%;
+tr.highlight {
+    /* background-color:whitesmoke; */
+    font-size:0.87em;
+    font-weight: bold;
+}
+tr.even {
+  font-size:1em;;
 }
 td.odd{
-	background-color:#DDE6FF ;
-	font-size:90%;
+    background-color:#DDE6FF ;
 }
 td.even{
-	border:0px;
-	font-size:90%;
+    border:0px;
 }
 td.cell{
-	    height:32px;
-	     padding: 1px;
+    height:32px;
+    padding: 1px;
+    
 }
 td.selectedcell{
-	border-style:inset;
-        border-color:blue;
-	border-width:1pt ;
-	font-size:90%;
-        background:#5D90CD ;
-        color:white;
-        text-align:center;
-	     width:120px;
+    border-style:inset;
+    border-color:blue;
+    border-width:1pt ;
+    font-size:1.2em;
+    font-weight: bold;
+    background:#5D90CD ;
+    color:white;
+    text-align:center;
+    width:120px;
 }
 a.mtitle {
-  font-size:90%;
-  text-decoration:none;
-  display:inline;
- color: blue;
+    text-decoration:none;
+    display:inline;
+    color: blue;
 
 }
 a.mtitle:hover {
-  font-size:90%;
-  text-decoration:none;
-  display:inline;
+    text-decoration:none;
+    display:inline;
 
- color: darkblue;
-background-color:#5D90CD;
+    color: darkblue;
+    background-color:#5D90CD;
 
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
- font-size:90%;
- text-decoration:none;
- display:block;
- color:white;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color:white;
 }
 a.dossier {
-  font-size:90%;
-  text-decoration:none;
-  display:block;
-   color: #202267;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color: #202267;
 
 }
 tr.odd:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 tr.even:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 a.cell {
-  text-decoration:none;
-  display:block;
-  color:blue;
-  background-color:white;
-  font-size:90%;
+    text-decoration:none;
+    display:block;
+    color:blue;
+    background-color:white;
+    font-size:0.75em;;
 }
 
 a.cell:hover {
-  font-size:90%;
-  color:white;
-  background-color:#5D90CD;
-  text-decoration:none;
-  display:block;
-	}
+    font-size:0.75em;;
+    color:white;
+    background-color:#5D90CD;
+    text-decoration:none;
+    display:block;
+}
 
 
 a.one:link {
-	text-decoration:none;
-	color:#3010FF
+    text-decoration:none;
+    color:#3010FF
 }
 a.one:visited {
-	text-decoration:none;
-	color:#3010FF
-	}
+    text-decoration:none;
+    color:#3010FF
+}
 
 a.one:active {
-	background: #0000FF;
-	}
+    background: #0000FF;
+}
 
 a.one:hover {
-	    text-decoration:underline;
-	background:#3010FF;
-	color:#FFFFFF;
-	}
+    text-decoration:underline;
+    background:#3010FF;
+    color:#FFFFFF;
+}
 
 
 a.detail
 {
-  font-size:90%;
-  font-family:verdana,sans-serif,helvetica;
+    font-size:0.87em;;
+    font-family:arial,verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -415,8 +429,8 @@ a.detail
 
 a.detail:hover
 {
-  font-size:90%;
-  font-family:verdana,sans-serif,helvetica;
+/*    font-size:0.75em;; */
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -424,19 +438,19 @@ a.detail:hover
 }
 
 li.menuv,ol.menuv {
-	 display:inline;
-	 padding:1em 1em;
+    display:inline;
+    padding:1em 1em;
 }
 div.redcontent a {
-  font-family:verdana,sans-serif,helvetica;
-  text-decoration: none;
-  display: block;
-  color: blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
 
 }
 
 div.redcontent a:hover {
-  font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -444,17 +458,17 @@ div.redcontent a:hover {
 
 }
 div.content a {
-  font-family:verdana,sans-serif,helvetica;
-  text-decoration: none;
-  display: block;
-  color: blue;
-padding: 0;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
+    padding: 0;
 
 }
 
 
 div.content a:hover {
-  font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -463,477 +477,501 @@ div.content a:hover {
 }
 
 div.redcontent a.mtitle {
-  text-decoration:none;
-  display:inline;
+    text-decoration:none;
+    display:inline;
 
 
-  color:black;
+    color:black;
 
 }
 
 div.redcontent a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  color:white;
-  background-color:darkblue;
+    text-decoration:none;
+    display:inline;
+    color:white;
+    background-color:darkblue;
 
 
 }
 div.content a.mtitle {
-  font-size:90%;
-  text-decoration:none;
-  display:inline;
-  color:blue;
+    text-decoration:none;
+    display:inline;
+    color:blue;
 
 
 
 }
 
 div.content a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:darkblue;
-  color:white;
+    text-decoration:none;
+    display:inline;
+    background-color:darkblue;
+    color:white;
 
 
 }
 div.redcontent input.text {
-   font-family:verdana,sans-serif,helvetica;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  background-color:orange;
-  border-width:1px;
-  color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    background-color:orange;
+    border-width:1px;
+    color:blue;
 }
 div.content input.text {
-   font-family:verdana,sans-serif,helvetica;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  border-width:1px;
-  background-color:orange;
-  color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    border-width:1px;
+    background-color:orange;
+    color:blue;
 }
 
 
 
 div.redcontent input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.content input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.redcontent textarea:focus {
-background-color: orange;
+    background-color: orange;
 }
 .document {
-color: #1a207d;
-border-collapse:collapse;
+    color: #1a207d;
+    border-collapse:collapse;
 }
-a.document{
-  font-size:100%;
-  text-decoration:none;
-  display:block;
+div.content a.document, a.document{
+/*    font-size:0.75em;;*/
+    text-decoration:underline;
+    display:block;
 }
 a.document:hover {
-  text-decoration:none;
-  display:block;
+    text-decoration:none;
+    display:block;
 
 
 }
 .input_text_ro {
-	   border:solid 1px blue;
-	   background:#EDEDED;
-	   color:blue;
-	margin:1px;
+    border:solid 1px blue;
+    background:#EDEDED;
+    color:blue;
+    margin:1px;
 }
 .input_text {
-	   border:groove 1px blue;
-	margin:1px;
+    border:groove 1px blue;
+    margin:1px;
 }
 .input_text:hover {
-	border:groove 1px blue;
-	margin:1px;
-	background-color: orange;
+    border:groove 1px blue;
+    margin:1px;
+    background-color: orange;
 }
 h1.legend, legend {
-font-weight: bold;
-font-style: italic;
-font-size: 120% ;
+    font-weight: bold;
+    font-style: italic;
+    font-size: 1.2em ;
 
 }
 fieldset fieldset legend {
-	 font-size:120%;
-	 color:grey;
-	 }
+    font-size:0.87em;
+    color:grey;
+}
 select {
-border: 1px solid blue;
-margin:2px;
-background-color:white;
+    border: 1px solid blue;
+    margin:2px;
+    background-color:white;
 
 }
 
 
 
 .infobulle {
-	   position:absolute;
-	   border:1px solid black;
-	   background-color:yellow;
-	   padding-bottom: 10;
-	   padding-top: 10;
-	   padding-left: 10;
-	   padding-right: 10;
-	   color:black;
-	   top:0;left:0;
-	   visibility:hidden;
-	   width:25em;
-		z-index:20;
+    position:absolute;
+    border:1px solid black;
+    background-color:yellow;
+    padding-bottom: 10;
+    padding-top: 10;
+    padding-left: 10;
+    padding-right: 10;
+    color:black;
+    top:0;left:0;
+    visibility:hidden;
+    width:25em;
+    z-index:20;
 }
 
 span.action {
-	height:3em;
+    height:3em;
 
 }
 td.num {
-	text-align:right;
+    text-align:right;
 }
 tr.priority1 {
-	background-color: coral;
-	}
+    background-color: coral;
+}
 span.action a.action {
-  border:2px outset ;
-  padding-left: 3px;
-  padding-right:3px;
-  text-decoration:none;
-  font-size:120%;
+    border:2px outset ;
+    padding-left: 3px;
+    padding-right:3px;
+    text-decoration:none;
+    font-size:0.87em;
 
-  display:inline;
-  color:black;
-  background-color:lightgrey;
+    display:inline;
+    color:black;
+    background-color:lightgrey;
 }
 
 span.action a.action:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:lightblue;
-  color:black;
+    text-decoration:none;
+    display:inline;
+    background-color:lightblue;
+    color:black;
 }
 div.popup_back{
-	position:absolute;
-	top:0px;
-	left:0px;
-	opacity:0.6;
-	width:100%;
-	height:100%;
-	z-index:1;
-	/*background-color:lightgrey;*/
+    position:absolute;
+    top:0px;
+    left:0px;
+    opacity:0.6;
+    width:100%;
+    height:100%;
+    z-index:1;
+    /*background-color:lightgrey;*/
 
-	display:none;
+    display:none;
 }
 
 div.popup_border_title {
-	position:absolute;
-	top:20%;
-	left:10%;
-	width:60%;
-	height:80%;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 2px outset #201e87;
-	background-color:#879ED4;
-	font-size: 100% ;
-	font-family: verdana,sans-serif,helvetica;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/
-	color: white;
-	display:none;
-	/*opacity:1;
-	filter:alpha(opacity=100);*/
+    position:absolute;
+    top:20%;
+    left:10%;
+    width:60%;
+    height:80%;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 2px outset #201e87;
+    background-color:#879ED4;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    /*border-bottom: 2px solid #201e87;*/
+    color: white;
+    display:none;
+    /*opacity:1;
+    filter:alpha(opacity=100);*/
 
-	}
+}
 div.popup_border_notitle {
-	position:absolute;
-	top:20%;
-	left:20%;
-	width:60%;
-	height:80% ;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 3px outset #201e87;
-	background-color: #879ED4;
-	font-family: verdana,sans-serif,helvetica;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	display:none;
-	color: white;
-	/*opacity:0.7;
-	filter:alpha(opacity=70);
-	*/
-	}
+    position:absolute;
+    top:20%;
+    left:20%;
+    width:60%;
+    height:80% ;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 3px outset #201e87;
+    background-color: #879ED4;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    display:none;
+    color: white;
+    /*opacity:0.7;
+    filter:alpha(opacity=70);
+    */
+}
 
 div.popup_content {
-	position:absolute;
-	top:16;
-	bottom:0;
-	left:0;
-	right:0;
-	width:100%;
-	height:96%;
-	overflow: auto;
-	background-color:#DFE7FF;
-	font-size:90% ;
-	font-family: verdana,sans-serif,helvetica;
-	font-style: normal;
-	font-weight: normal;
-	color: black;
-	text-align: left;
-	display:none;
-	z-index:10;
-	/*opacity:1;
-	filter:alpha(opacity=100);*/
+    position:absolute;
+    top:16;
+    bottom:0;
+    left:0;
+    right:0;
+    width:100%;
+    height:96%;
+    overflow: auto;
+    background-color:#DFE7FF;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: normal;
+    font-weight: normal;
+    color: black;
+    text-align: left;
+    display:none;
+    z-index:10;
+    /*opacity:1;
+    filter:alpha(opacity=100);*/
 }
 div.autocomplete {
-  position:relative;
-  background-color:white;
-  border:1px solid #888;
-  margin:0;
-  padding:0;
-  text-align:left;
-  font-size:100%;
-
+    position:relative;
+    background-color:white;
+    border:1px solid #888;
+    margin:0;
+    padding:0;
+    text-align:left;
 }
 div.autocomplete em {
-	color:blue;
-	font-weight:bold;
+    color:blue;
+    font-weight:bold;
 }
 div.autocomplete ul {
-  list-style-type:none;
-  background-color:white;
-  border:1px solid #888;
-  width:375px;
-  margin:0;
-  padding:0;
+    list-style-type:none;
+    background-color:white;
+    border:1px solid #888;
+    width:375px;
+    margin:0;
+    padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
 
 div.autocomplete ul li {
-  list-style-type:none;
-  display:block;
-  margin:0;
-  padding:0px;
-  /*height:32px;*/
-  cursor:pointer;
+    list-style-type:none;
+    display:block;
+    margin:0;
+    padding:0px;
+    /*height:32px;*/
+    cursor:pointer;
+}
+span.informal{ 
+    color:black;
 }
-span.informal{ font-size:95%; color:black;}
 
 ul.select_table  {
-	/*padding:5px;*/
-	overflow:hidden;
-	}
+    /*padding:5px;*/
+    overflow:hidden;
+}
 ul.select_table a{
-	width:100%;
-	display:block;
-	background-color:inherit;
-	color: black;
-	text-decoration:none;
-	}
+    width:100%;
+    display:block;
+    background-color:inherit;
+    color: black;
+    text-decoration:none;
+}
 ul.select_table a:hover{
-	background-color:white;
-	color:black;
-	/*text-decoration:underline;*/
-	}
+    background-color:white;
+    color:black;
+    /*text-decoration:underline;*/
+}
 ul.select_table li {
-	display:table-row;
-	list-style-type: none;
-	}
+    display:table-row;
+    list-style-type: none;
+}
 ul.select_table li span {
-	display:table-cell;
-	width:25em;
-	margin: 0px;
-	padding:  0px;
+    display:table-cell;
+    width:25em;
+    margin: 0px;
+    padding:  0px;
 }
 
 div.pc_calendar{
 
-		float:left;
+    float:left;
 
-		}
+}
 div.pc_calendar table {
-	text-align:center;
+    text-align:center;
 
 }
 div.pc_calendar tr{
-	height:40;
+    font-size:0.87em;
+}
+div.pc_calendar tr{
+    height:40;
 
 
 }
 div.pc_calendar td{
-	width:14%;
-	border:#879ed4 solid 1px;
+    width:14%;
+    border:#879ed4 solid 1px;
 }
 
 div.pc_calendar td.weekend {
-	background-color:#cce0e6;
+    background-color:#cce0e6;
 
 }
 div.pc_calendar td.workday{
-	background-color:inherit;
-
-
+    background-color:inherit;
 }
 div.pc_calendar span.day{
-	font-weight: bold;
-	display:block;
+    font-weight: bold;
+    display:block;
 
 }
 div.pc_calendar span.event{
-	font-weight: bolder;
+    font-weight: bolder;
 
 }
 span.todo  {
-	text-align: left;
-	background-color:yellow;
+    text-align: left;
+    background-color:yellow;
 
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled], select[disabled] {
--moz-user-focus:ignore;
--moz-user-input:disabled;
-background-color:lightgrey;
-color:black;
-cursor:inherit;
+    -moz-user-focus:ignore;
+    -moz-user-input:disabled;
+    background-color:lightgrey;
+    color:black;
+    cursor:inherit;
 }
 
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:90%;
-	color:white;
-	font-weight: bold;
+    color:white;
+    font-weight: bold;
+    font-size:0.87em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
 
-	text-decoration:none;
-	font-family: verdana,sans-serif,helvetica;
-	background-image: url("image/bg-submit2.gif");
-	background-repeat: repeat-x;
-	background-position: left;
-
-	border-style:  outset ;
-	border-color:  blue ;
-	border-width:0;
-	padding-bottom: 4;
-	padding-top: 4;
-	padding-right: 6;
-	padding-left:  6;
-	margin-top:3px;
-	cursor:pointer;
-	margin:1 2 1 2;
-        border-radius: 4px;
-	moz-border-radius:4px;
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0px;
+    padding:8px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
 
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover  {
-	cursor:pointer;
-	background-color:white;
-	border-style:  inset ;
-	color:red;
-	margin:1 2 1 2;
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
 
-	}
-	td.tool {
-	border: solid 1px gray;
-	background-color: white;
-	border-bottom-width: 2px;
-	}
+}
+a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
+    color:white;
+    font-weight: bold;
+    font-size:0.75em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
+
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0;
+    padding-bottom: 3px;
+    padding-top: 3px;
+    padding-right: 3px;
+    padding-left:  3px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+
+}
+a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.content a.smallbutton:hover  {
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
+
+}
+td.tool {
+    border: solid 1px gray;
+    background-color: white;
+    border-bottom-width: 2px;
+    text-align:center;
+}
 div.topmenu {
-	margin-top:2px;
+
 }
 
-h2.dossier {
-	color:darkblue;
-	font-style: italic;
-	display:inline;
-	font-size:120%;
-	margin:0px;
-	padding:0px;
-	font-variant:small-caps;
+#dossier h2{
+    color:darkblue;
+    display:inline;
+    font-size:2em;
+    margin:0px;
+    padding:0px;
+    font-variant:small-caps;
 }
 /* </style> */
-div.add_todo_list {
-                    border:1px solid blue;
-                    display:none;
-                    background-color:#BFD0FF;
-                    padding:3;
-                    position:absolute;
-                    text-align:left;
-                    line-height:3em;
-                    z-index:1;
-                    width:345px;
-                }
+#add_todo_list {
+    border:1px solid blue;
+    display:none;
+    background-color:#BFD0FF;
+    padding:0.0015%;
+    position:absolute;
+    text-align:left;
+    z-index:1;
+    width:17.9687%;
+}
 div.welcome {
 
 }
 div.gest_name {
-	float:left;
-	margin-left:150;
-	margin-top:15
+    float:left;
+    margin-left:150;
+    margin-top:15
 }
 h2.gest_name {
-	border-left: 5px solid  #403a8d;
-	border-bottom:1px solid  #b4bbc2;
-		border-top:1px solid  #b4bbc2;
-		border-right:1px solid  #b4bbc2;
-	padding: 5px;
-	width: 40%;
+    border-left: 5px solid  #403a8d;
+    border-bottom:1px solid  #b4bbc2;
+    border-top:1px solid  #b4bbc2;
+    border-right:1px solid  #b4bbc2;
+    padding: 5px;
+    width: 40%;
 }
 body.op_detail_frame,div.op_detail_frame  {
-  background-color:#e4e7ed;
-  height:100%; width:100%;
+    background-color:#e4e7ed;
+    height:100%; width:100%;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 
 
 }
 div.inner_box  {
-  background-color:#e4e7ed;
- font-size:100%;
-  font-family:verdana,sans-serif,helvetica;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:3;
-
-position:absolute;
-left:10%;
-
-
-border:1px solid darkblue;
-
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:10%;
+    border:1px solid darkblue;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
 div.op_detail_title {
-	background-color:grey;
-/*	width:500;*/
+    background-color:grey;
+    /*	width:500;*/
 
 
 }
 div#div_jrn{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-		      background-color:#EDF3FF;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
 
 }
- div#div_cat{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-             background-color:#EDF3FF;
+div#div_cat{
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
 
 }
 
@@ -942,218 +980,372 @@ div.divinfo
 
 div#search_form
 {
-              position:absolute;
-              border:1px solid black;
-              top:15%;left:100px;
-              margin-left:25%;
-              z-index:2;
-              width:50%;
-              display:none;
-	      background-color:#e4e7ed;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100px;
+    margin-left:25%;
+    z-index:2;
+    width:50%;
+    display:none;
+    background-color:#e4e7ed;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
 
 table.sortable td, table.table_large td, table.result td
 {
-	padding-left:5px;
-	padding-right:5px;
+    padding-left:5px;
+    padding-right:5px;
 }
 table.info_op
 {
-	font-size:100%;
-	width:100%;
+    width:100%;
 }
 table.info_op tr
 {
-font-size:120%;
-background:white;
+    background:white;
 }
 h2#jrn_name
 {
-	color:blue;
-	font-size:120%;
-	margin-right:30%;
-	float: right;
-
+    color:blue;
+    font-size:2.74em;
+    margin-right:30%;
+    float: right;
 }
 tr.footer{
-	font-size:120%;
-	font-style: italic;
-	font-weight: bold;
+    font-size:0.87em;
+    font-style: italic;
+    font-weight: bold;
 
 }
 span.remain {
-	font-weight: bold;
-	color:black;
-	}
+    font-weight: bold;
+    color:black;
+}
 
 div#jrn_name_div
 {
-	float: right;
-	margin-right:150;
+    float: right;
+    margin-right:150;
 
 
 }
 #predef_form {
-	margin-left:20%;
-	width:60%;
-
+    margin-left:20%;
+    width:60%;
+    position: absolute;
 }
 #direct
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
+    font-size:0.87em;;
 }
 #calc
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
 }
 div#wait_box
 {
-  background-color:#F1E6E6;
- font-size:120%;
-  font-family: verdana,helvetica,arial,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:10;
+    background-color:#F1E6E6;
+    font-size:0.87em;
+    font-family: arial,verdana,helvetica,arial,sans-serif;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:10;
 
-position:absolute;
-left:30%;
-top:30%;
+    position:absolute;
+    left:30%;
+    top:30%;
 
 
-border:1px solid darkblue;
+    border:1px solid darkblue;
 
 }
 #wait_box h2
 {
-color:black;
-text-align:center;
+    color:black;
+    text-align:center;
 }
 div#div_jrnsearch_op{
 
-              border:1px solid black;
-              display:none;
-              width:50em;
-		      background-color:#EDF3FF;
-			  position:absolute;
-			  z-index: 5;
+    border:1px solid black;
+    display:none;
+    width:50em;
+    background-color:#EDF3FF;
+    position:absolute;
+    z-index: 5;
 
 }
 ul {
-	padding-left: 110px;
+    padding-left: 110px;
 }
 a.line,div.content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
- color: #0000ff;
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
-  color: #0000ff;
-     background-color: rgb(93, 144, 205);
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
+    background-color: rgb(93, 144, 205);
 }
 #close_div
 {
- background-color:white;
- color:blue;
- text-decoration:none;
- border:1px solid blue;
- margin-left: 2px;
- margin-right:2px;
- margin-top:0px;
- font-size:90%;
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:2px;
+    margin-top:0px;
+    font-size:0.90em;
 }
 #close_div:hover
 {
-	background-color: orange;
+    background-color: orange;
+}
+#popmeout
+{
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:18px;
+    font-size:0.90em;
+}
+#popmeout:hover
+{
+    background-color: orange;
 }
 table.table_large tr.odd ,table.table_large tr.even {
 
-	height:32px;
+    height:32px;
 }
 #calc1
 {
-	position:absolute;
-	display:block;
-	top:30px;
-	left:150px;
-	width:300px;
-	border:1px solid black;
-	background-color:#aec3e8;
-	font-size:120%;
-	padding: 20px 20px;
+    position:absolute;
+    display:block;
+    top:30px;
+    left:150px;
+    width:300px;
+    border:1px solid black;
+    background-color:#aec3e8;
+    font-size:0.87em;
+    padding: 20px 20px;
 }
 span.invoice
 {
-    font-size: 120%;
+    font-size: 1.2em;
     font-style: italic;
     display:block;
     margin: 20px;
     font-weight: bold;
 }
 a.nav,div.content a.nav,div.redcontent a.nav {
-	display:inline;
-	text-decoration:none;
-	font-size:100%;
+    display:inline;
+    text-decoration:none;
+    font-size:0.75em;;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
-	display:inline;
-	text-decoration:none;
-	background-color:darkblue;
-	color:white;
-	font-size:100%;
+    display:inline;
+    text-decoration:none;
+    background-color:darkblue;
+    color:white;
+    font-size:0.75em;;
 }
 #dossier {
-	display:inline;
-	float:left;
-	width:40em;
-	top:0px;
+    display:inline;
+    float:left;
+    width:100%;
+    top:0px;
+    text-align: center;
 }
 div.foldercontent {
-	padding:20px 30px 0px 40px;
-	}
+    padding:20px 30px 0px 40px;
+}
 
 h1.title {
-	color: blue;
-	font-size:120%;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    font-style: italic;
 }
 h2.title {
-	color: blue;
-	font-size:120%;
-	font-weight:bold;
-	font-style: italic;
-	margin-left: 15px;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0.24%;
+    border:1px solid darkblue;
+
 }
 h3.title {
-	color: blue;
-	font-size:120%;
-	margin-left: 30px;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 30px;
 }
 h4.title {
-	color: blue;
-	font-size:120%;
-	margin-left: 45px;
-	text-decoration: underline;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: underline;
 }
 h5.title {
-	color: blue;
-	font-size:120%;
-	margin-left: 45px;
-	text-decoration: none;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: none;
+    font-style: italic;
 }
 div.myfieldset
 {
-	margin-top: 5px;
-	margin-left:5px;
-	margin-right: 5px;
-	border:lightgrey 2px groove;
+    margin-top: 5px;
+    margin-left:5px;
+    margin-right: 5px;
+    border:lightgrey 2px groove;
+}
+#info_div {
+    display:none;
+    background-color: yellow;
+    color:black;
+    z-index: 15;
+    position: absolute;
+    top:0;
+    left:45%;
+}
+div.menu2 a.mtitle{
+    
+}
+div.menu3 {
+    
+}
+#go_submit_id {
+//    font-size:1.25em;
+}
+.decale {
+    margin-left:30px;
+}
+#folder {
+    font-size:1.4em;
+    width:auto;
+    border-width:0px;
+    border-collapse:collapse;
+    
+    
+}
+/*#folder tr.odd,#folder tr.even {
+    font-size : 1.2em;
+}*/
+textarea.itextarea{
+    border:solid blue 1px;
+    width:90%;
+    margin-left:5%;
+}
+div#modele_op_div{
+    display: none;
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:30%;
+    width:40%;
+    border:1px solid darkblue;
+}
+div#notice {
+    position:absolute;
+    right:5%;
+    top:200px;
+    background-color:yellow;
+    border: 1px solid black;
+}
+div.name  {
+    position:absolute;
+    top:0px;
+    left:0px;
+}
+div#box_search_card {
+    position:absolute;
+    right:15.625%;
+    top:115px;
+}
+div.bxbutton
+{
+    float:right;
+    height:10px;
+    display:block;
+    margin-top:0.48%;
+    margin-right:0.48%;
+}
+div.inner_box tr.odd {
+    background:  #CBD9F4;
+}
+#modele_op_tab tr.odd {
+    background:  #CBD9F4;
+}
+div#bookmark_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+   border:1px solid darkblue;
+   top:2em;
+   left:30%;
+   width:40%;
+}
+div#preference_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    border:1px solid darkblue;
+    top:2em;
+    left:20%;
+    width:50%;
+}
+#error_div{
+    position:absolute;
+    border:1px solid black;
+    background-color:whitesmoke;
+    padding-bottom: 2px;
+    padding-top: 2px;
+    padding-left: 2px;
+    padding-right: 2px;
+    color:red;
+    top:40%;left:25%;
+    visibility:hidden;
+    width:40em;
+    z-index:20;
+}
+#error_div h2 {
+    background: red;
+}
+div#error_content_div {
+   font-size: 1.2em;
+   color:error;
+   font-weight: bold;
+   text-align: center;
+}
+td.workday ol {
+	margin:0px;
+	padding:0px;
+	list-style-type:none;
+	text-align:left;
 }
diff --git a/html/style-light.css b/html/style-light.css
index a15a1509d..b41353bcc 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -1,402 +1,427 @@
 /* <style type="text/css"> */
 
 BODY {
-	background-color:#EDF3FF;
-	font-size:12px;
-	font-family:verdana,helvetica,sans-serif;
-	padding: 0px 0px 0px 0px ;
-	margin:0;
-	color:blue;
+    background-color:#EDF3FF;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding: 0px 0px 0px 0px ;
+    margin:0;
+    color:black;
+    font-size:0.85em;
 }
 .notice {
-	background: white;
-	color:red;
-	font-style: italic;
+    color:red;
+    font-style: italic;
 }
 
 table.sortable, table.table_large, table.result  ,table.resultfooter {
-	color:blue;
-	/* border:blue solid 1px; */
-	width:100%;
-	border-spacing:  0px;
-	border-collapse:collapse;
+    color:blue;
+    /* border:blue solid 1px; */
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
 
 }
 table.resultfooter tfoot {
-	font-size:110%;
-	font-weight: bold;
+    font-weight: bold;
+
+
 }
+table.sortable th,  table.table_large th,table.result th {
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:1px solid blue;
+    border-top:0;
+    font-size:0.75em;;
 
-table.table_large th,table.result th ,table.sortable th{
-	font-weight:bold;
-	font-family:verdana,helvetica,sans-serif;
-	border-bottom:1px solid blue;
-	border-top:0;
-
-	color:#25238F;
-	text-align: left;
-	font-style: italic;
+    color:#25238F;
+    text-align: left;
+    font-style: italic;
 
 }
 
 h2 {
-	font-family:verdana,helvetica,sans-serif;
-	font-size:14px;
-	color:grey;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:1.35em;
+    color:grey;
+    margin:1px;
+    padding:1px;
+    font-style: italic;
 }
 div.info {
-	background:#879ed4;
-	color:white;
-	font-size:120%;
-	text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
 
 content h2.info {
-	background:#879ed4;
-	color:black;
-	font-size:14pt;
-	text-align:center;
-	padding:0px;
-	margin:0px;
+    background:#879ed4;
+    color:black;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 redcontent h2.info {
-	background:#879ed4;
-	color:white;
-	font-size:14pt;
-	text-align:center;
-	padding:0px;
-	margin:0px;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 h2.info {
-	background-color:#C6C6D1;
-	color:white;
-	font-size:14px;
-	text-align:center;
-	padding:0px;
-	margin:0px;
-	border:1px solid grey;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 
 }
-table h2.info
-{
-	font-variant: small-caps;
-	background-color: inherit;
-	color:darkblue;
-}
+
+
 h3.info {
-	background:#879ed4;
-	color:white;
-	font-size:12px;
-	text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
 
 h2.info2 {
-	color:blue;
-	font-size:14px;
-	text-align:center;
+    color:blue;
+    font-size:1em;;
+    text-align:center;
 
 }
 
 
 h2.error {
-	background:red;
-	color:white;
-	font-size:14px;
+    background:red;
+    color:white;
+    font-size:0.87em;
 }
 
+
 div.u_tmenu {
-	margin-top:0px;
-	width:100%;
-	/* background-color:#879ED4; */
+    margin-top:0px;
+    width:100%;
+    /* background-color:#879ED4; */
 
 
 }
 div.u_subtmenu {
-	background-color:white	;
-	float:left;
-	clear:both;
-	left:10px;
+    background-color:white	;
+    float:left;
+    clear:both;
+    left:10px;
 
 }
 div.u_tmenu div.u_tool {
-	float:left;
+    float:left;
 
 }
 div.u_tool {
-	float:left;
-	width:  100%;
+    float:left;
+    width:  100%;
+    padding-bottom: 20px;
 }
-div.u_tool div.name {
-	float:left;
-	margin-left:10px;
+div.u_tool #name {
+    float:left;
+    margin-left:10px;
 }
-div.u_tool {
-	float:right;
-	margin-right:10px;
+#u_tool {
+    float:right;
+    margin-right:10px;
 }
-div.module {
-	position:absolute;
-	top:0px;
-	right:5px;
-	text-align:right;
-	padding:0px;
-	margin: 0px;
+td.tool a.mtitle {
+    text-decoration:none;
+    display:inline;
+    color: blue;
+    font-size:0.75em;
+    
+}
+td.tool a.mtitle:hover {
+    text-decoration:none;
+    display:inline;
+    font-size:0.75em;;
+    color: darkblue;
+    background-color:#5D90CD;
+
+}
+#top {
+    float:left;
+    margin-bottom: 0.9512%;
+    width: 100%;
+}
+#module {
+    position:absolute;
+    top:0px;
+    right:5px;
+    text-align:right;
+    padding:0px;
+    margin: 0px;
 }
 div.u_subt2menu {
-	background-color:lightgrey;
-	left:1%;
+    background-color:lightgrey;
+    left:1%;
 
 }
 div.lmenu {
-	float:left;
-	clear:left;
-	font-size:9px;
+    float:left;
+    clear:left;
+    font-size:0.75em;;
 
 }
 div.lextmenu {
 
-	float:left;
-	font-family:verdana,helvetica,sans-serif;
-	font-size:9px;
+    float:left;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:0.75em;;
 
 }
 div.searchmenu {
-	left:30px;
-	width:95px;
-	top:100px;
-	position:absolute;
+    left:30px;
+    width:95px;
+    top:100px;
+    position:absolute;
 
 }
 
 div.recherche_form{
-	width:700px;
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
-	border-style:outset;
-	border-width:1px;
+    width:700px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-style:outset;
+    border-width:1px;
 
 }
 div.redcontent{
 
-	float:left;
-	padding-top:7px;
-	padding-left:8px;
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
-	width:75%;
+    float:left;
+    padding-top:7px;
+    padding-left:8px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    width:75%;
 
 }
 div.content{
+    padding-top:0.0030%;
+    margin-top:0.0030%;
+    width:100%;
+    font-family:arial,verdana,sans-serif,helvetica;
+
 
-	padding-top:7px;
-	width:100%;
-	font-family:verdana,helvetica,sans-serif;
 }
 div.content30{
 
-	float:left;
-	padding-top:7px;
-	width:35%;
-	font-family:verdana,helvetica,sans-serif;
+    float:left;
+    padding-top:7px;
+    width:35%;
+    font-family:arial,verdana,sans-serif,helvetica;
 
 }
 div.no span{
-	position:static;
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:bold;
-	color:red;
+    position:static;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:bold;
+    color:red;
 
 }
 
 table.document {
-	color:blue;
-	width:100%;
-	border-spacing:  0px;
-	border-collapse:collapse;
+    color:blue;
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
 
 }
 table.document th{
-	font-weight:bold;
-	font-family:verdana,helvetica,sans-serif;
-	border-bottom:2px solid blue;
-	border-top:0;
-	color:#25238F;
-	text-align: left;
-	background-color:#EDF3FF;
-	font-style: italic;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:2px solid blue;
+    border-top:0;
+    color:#25238F;
+    text-align: left;
+    background-color:#EDF3FF;
+    font-style: italic;
 }
 .error {
-	width:60%;
-	margin-left:20%;
-	text-align: center;
+    width:60%;
+    margin-left:20%;
+    text-align: center;
 
-	color:white;
-	background-color:red;
-	font-weight: bolder;
-	font-size:120%;
+    color:white;
+    background-color:red;
+    font-weight: bolder;
+    font-size:0.87em;
 }
 
 table.mtitle {
-	border:0;
-	text-align:center
+    border:0;
+    text-align:center
 }
 td.mshort {
-	height:15px;
-	width:60px;
-	text-align:center;
-	border:  1px solid;
-	color:#5D90CD ;
-	background-color:#DDE6FF;
+    height:15px;
+    width:60px;
+    text-align:center;
+    border:  1px solid;
+    color:#5D90CD ;
+    background-color:#DDE6FF;
 }
 td.mtitle {
-	text-align:center;
-	width:95px;
-	height :30px;
-	font-size:10px;
+    text-align:center;
+    width:95px;
+    height :30px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
 }
 td.msubtitle {
-	text-align:center;
-	height:20px;
-	font-size:10px;
+    text-align:center;
+    height:20px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
 }
 span.mtitle {
-	color:gray;
-	background-color:blue;
-	font-size:10px;
-	border-style:groove
+    color:gray;
+    background-color:blue;
+    font-size:0.75em;;
+    border-style:groove
 }
 span.odd {
-	background-color:#ECF3FF;
-	display:block;
+    background-color:#ECF3FF;
+    display:block;
 }
 span.even {
-	background-color:#DDE6FF;
-	display:block;
+    background-color:#DDE6FF;
+    display:block;
 }
 
 tr.odd {
-	background-color:#DDE6FF;
-	font-size:10px;
+    background-color:#DDE6FF;
+    font-size:0.87em;;
 }
-tr {
-	font-size:10px;
+tr.highlight {
+    /* background-color:whitesmoke; */
+    font-size:0.87em;
+    font-weight: bold;
+}
+tr.even {
+  font-size:0.87em;;
 }
 td.odd{
-	background-color:#DDE6FF ;
-	font-size:10px;
+    background-color:#DDE6FF ;
 }
 td.even{
-	border:0px;
-	font-size:10px;
+    border:0px;
 }
 td.cell{
-	height:32px;
-	padding: 1px;
+    height:32px;
+    padding: 1px;
+    
 }
 td.selectedcell{
-	border-style:inset;
-	border-color:blue;
-	border-width:1pt ;
-	font-size:10px;
-	background:#5D90CD ;
-	color:white;
-	text-align:center;
-	width:120px;
+    border-style:inset;
+    border-color:blue;
+    border-width:1pt ;
+    font-size:1.2em;
+    font-weight: bold;
+    background:#5D90CD ;
+    color:white;
+    text-align:center;
+    width:120px;
+    border-radius:5px;
 }
 a.mtitle {
-	font-size:10px;
-	text-decoration:none;
-	display:inline;
-	color: blue;
-
+    text-decoration:none;
+    display:inline;
 }
 a.mtitle:hover {
-	font-size:10px;
-	text-decoration:none;
-	display:inline;
-	color: darkblue;
-	background-color:#5D90CD;
+    text-decoration:none;
+    display:inline;
+
+    color: darkblue;
+    background-color:#5D90CD;
 
 }
-td.selectedcell a.mtitle {
-	font-size:1em;
-	text-decoration:none;
-	display:block;
-	color:lightgrey;
+td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color:white;
 }
 a.dossier {
-	font-size:10px;
-	text-decoration:none;
-	display:block;
-	color: #202267;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color: #202267;
 
 }
 tr.odd:hover td
 {
-	text-decoration:none;
-	background-color: #a9d6e4;
-	color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 tr.even:hover td
 {
-	text-decoration:none;
-	background-color: #a9d6e4;
-	color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-	background-color:#a9d6e4;
-	color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-	background-color:#a9d6e4;
-	color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 a.cell {
-	text-decoration:none;
-	display:block;
-	color:blue;
-	background-color:white;
-	font-size:9px;
+    text-decoration:none;
+    display:block;
+    color:blue;
+    background-color:white;
+    font-size:0.75em;;
 }
 
 a.cell:hover {
-	font-size:9px;
-	color:white;
-	background-color:#5D90CD;
-	text-decoration:none;
-	display:block;
+    font-size:0.75em;;
+    color:white;
+    background-color:#5D90CD;
+    text-decoration:none;
+    display:block;
 }
 
 
 a.one:link {
-	text-decoration:none;
-	color:#3010FF
+    text-decoration:none;
+    color:#3010FF
 }
 a.one:visited {
-	text-decoration:none;
-	color:#3010FF
+    text-decoration:none;
+    color:#3010FF
 }
 
 a.one:active {
-	background: #0000FF;
+    background: #0000FF;
 }
 
 a.one:hover {
-	text-decoration:underline;
-	background:#3010FF;
-	color:#FFFFFF;
+    text-decoration:underline;
+    background:#3010FF;
+    color:#FFFFFF;
 }
 
 
 a.detail
 {
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
+    font-size:0.87em;;
+    font-family:arial,verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -404,8 +429,8 @@ a.detail
 
 a.detail:hover
 {
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
+/*    font-size:0.75em;; */
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -413,19 +438,19 @@ a.detail:hover
 }
 
 li.menuv,ol.menuv {
-	display:inline;
-	padding:1em 1em;
+    display:inline;
+    padding:1em 1em;
 }
 div.redcontent a {
-	font-family:verdana,helvetica,sans-serif;
-	text-decoration: none;
-	display: block;
-	color: blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
 
 }
 
 div.redcontent a:hover {
-	font-family:verdana,helvetica,sans-serif;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -433,17 +458,17 @@ div.redcontent a:hover {
 
 }
 div.content a {
-	font-family:verdana,helvetica,sans-serif;
-	text-decoration: none;
-	display: block;
-	color: blue;
-	padding: 0;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
+    padding: 0;
 
 }
 
 
 div.content a:hover {
-	font-family:verdana,helvetica,sans-serif;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -452,481 +477,500 @@ div.content a:hover {
 }
 
 div.redcontent a.mtitle {
-	text-decoration:none;
-	display:inline;
+    text-decoration:none;
+    display:inline;
 
 
-	color:black;
+    color:black;
 
 }
 
 div.redcontent a.mtitle:hover {
-	text-decoration:none;
-	display:inline;
-	color:white;
-	background-color:darkblue;
+    text-decoration:none;
+    display:inline;
+    color:white;
+    background-color:darkblue;
 
 
 }
 div.content a.mtitle {
-	font-size:10px;
-	text-decoration:none;
-	display:inline;
-	color:blue;
+    text-decoration:none;
+    display:inline;
+    color:blue;
 
 
 
 }
 
 div.content a.mtitle:hover {
-	text-decoration:none;
-	display:inline;
-	background-color:darkblue;
-	color:white;
+    text-decoration:none;
+    display:inline;
+    background-color:darkblue;
+    color:white;
 
 
 }
 div.redcontent input.text {
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:normal;
-	border-color:336699;
-	border-style:solid;
-	background-color:orange;
-	border-width:1px;
-	color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    background-color:orange;
+    border-width:1px;
+    color:blue;
 }
 div.content input.text {
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:normal;
-	border-color:336699;
-	border-style:solid;
-	border-width:1px;
-	background-color:orange;
-	color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    border-width:1px;
+    background-color:orange;
+    color:blue;
 }
 
 
 
 div.redcontent input:focus {
-	background-color:orange;
+    background-color:orange;
 }
 div.content input:focus {
-	background-color:orange;
+    background-color:orange;
 }
 div.redcontent textarea:focus {
-	background-color: orange;
+    background-color: orange;
 }
 .document {
-	color: #1a207d;
-	border-collapse:collapse;
+    color: #1a207d;
+    border-collapse:collapse;
 }
-a.document{
-	font-size:12px;
-	text-decoration:none;
-	display:block;
+div.content a.document, a.document{
+/*    font-size:0.75em;;*/
+    text-decoration:underline;
+    display:block;
 }
 a.document:hover {
-	text-decoration:none;
-	display:block;
+    text-decoration:none;
+    display:block;
 
 
 }
 .input_text_ro {
-	   border:solid 1px blue;
-	   background:#EDEDED;
-	margin:1px;
+    border:solid 1px blue;
+    background:#EDEDED;
+    color:blue;
+    margin:1px;
 }
 .input_text {
-	border:groove 1px blue;
-	margin:1px;
+    border:groove 1px blue;
+    margin:1px;
 }
 .input_text:hover {
-	border:groove 1px blue;
-	margin:1px;
-	background-color: orange;
+    border:groove 1px blue;
+    margin:1px;
+    background-color: orange;
 }
 h1.legend, legend {
-	font-weight: bold;
-	font-style: italic;
-	font-size: 120% ;
+    font-weight: bold;
+    font-style: italic;
+    font-size: 1.2em ;
 
 }
 fieldset fieldset legend {
-	font-size:110%;
-	color:grey;
+    font-size:0.87em;
+    color:grey;
 }
 select {
-	border: 1px solid blue;
-	margin:2px;
-	background-color:white;
-
+    border: 1px solid blue;
+    margin:2px;
+    background-color:white;
 
 }
 
 
 
 .infobulle {
-	position:absolute;
-	border:1px solid black;
-	background-color:yellow;
-	padding-bottom: 10;
-	padding-top: 10;
-	padding-left: 10;
-	padding-right: 10;
-	color:black;
-	top:0;left:0;
-	visibility:hidden;
-	width:25em;
-	z-index:20;
+    position:absolute;
+    border:1px solid black;
+    background-color:yellow;
+    padding-bottom: 10;
+    padding-top: 10;
+    padding-left: 10;
+    padding-right: 10;
+    color:black;
+    top:0;left:0;
+    visibility:hidden;
+    width:25em;
+    z-index:20;
 }
 
 span.action {
-	height:3em;
+    height:3em;
 
 }
 td.num {
-	text-align:right;
+    text-align:right;
 }
 tr.priority1 {
-	background-color:red;
+    background-color: coral;
 }
 span.action a.action {
-	border:2px outset ;
-	padding-left: 3px;
-	padding-right:3px;
-	text-decoration:none;
-	font-size:14px;
+    border:2px outset ;
+    padding-left: 3px;
+    padding-right:3px;
+    text-decoration:none;
+    font-size:0.87em;
 
-	display:inline;
-	color:black;
-	background-color:lightgrey;
+    display:inline;
+    color:black;
+    background-color:lightgrey;
 }
 
 span.action a.action:hover {
-	text-decoration:none;
-	display:inline;
-	background-color:lightblue;
-	color:black;
+    text-decoration:none;
+    display:inline;
+    background-color:lightblue;
+    color:black;
 }
 div.popup_back{
-	position:absolute;
-	top:0px;
-	left:0px;
-	opacity:0.6;
-	width:100%;
-	height:100%;
-	z-index:1;
-	/*background-color:lightgrey;*/
+    position:absolute;
+    top:0px;
+    left:0px;
+    opacity:0.6;
+    width:100%;
+    height:100%;
+    z-index:1;
+    /*background-color:lightgrey;*/
 
-	display:none;
+    display:none;
 }
 
 div.popup_border_title {
-	position:absolute;
-	top:20%;
-	left:10%;
-	width:60%;
-	height:80%;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 2px outset #201e87;
-	background-color:#879ED4;
-	font-size: 110% ;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/
-	color: white;
-	display:none;
-	/*opacity:1;
-	filter:alpha(opacity=100);*/
+    position:absolute;
+    top:20%;
+    left:10%;
+    width:60%;
+    height:80%;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 2px outset #201e87;
+    background-color:#879ED4;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    /*border-bottom: 2px solid #201e87;*/
+    color: white;
+    display:none;
+    /*opacity:1;
+    filter:alpha(opacity=100);*/
 
 }
 div.popup_border_notitle {
-	position:absolute;
-	top:20%;
-	left:20%;
-	width:60%;
-	height:80% ;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 3px outset #201e87;
-	background-color: #879ED4;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	display:none;
-	color: white;
-	/*opacity:0.7;
-	filter:alpha(opacity=70);
-	*/
+    position:absolute;
+    top:20%;
+    left:20%;
+    width:60%;
+    height:80% ;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 3px outset #201e87;
+    background-color: #879ED4;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    display:none;
+    color: white;
+    /*opacity:0.7;
+    filter:alpha(opacity=70);
+    */
 }
 
 div.popup_content {
-	position:absolute;
-	top:16;
-	bottom:0;
-	left:0;
-	right:0;
-	width:100%;
-	height:96%;
-	overflow: auto;
-	background-color:#DFE7FF;
-	font-size:10px ;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: normal;
-	font-weight: normal;
-	color: black;
-	text-align: left;
-	display:none;
-	z-index:10;
-	/*opacity:1;
-	filter:alpha(opacity=100);*/
+    position:absolute;
+    top:16;
+    bottom:0;
+    left:0;
+    right:0;
+    width:100%;
+    height:96%;
+    overflow: auto;
+    background-color:#DFE7FF;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: normal;
+    font-weight: normal;
+    color: black;
+    text-align: left;
+    display:none;
+    z-index:10;
+    /*opacity:1;
+    filter:alpha(opacity=100);*/
 }
 div.autocomplete {
-	position:relative;
-	background-color:white;
-	border:1px solid #888;
-	margin:0;
-	padding:0;
-	text-align:left;
-	font-size:12px;
-
+    position:relative;
+    background-color:white;
+    border:1px solid #888;
+    margin:0;
+    padding:0;
+    text-align:left;
 }
 div.autocomplete em {
-	color:blue;
-	font-weight:bold;
+    color:blue;
+    font-weight:bold;
 }
 div.autocomplete ul {
-	list-style-type:none;
-	background-color:white;
-	border:1px solid #888;
-	width:375px;
-	margin:0;
-	padding:0;
+    list-style-type:none;
+    background-color:white;
+    border:1px solid #888;
+    width:375px;
+    margin:0;
+    padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
 
 div.autocomplete ul li {
-	list-style-type:none;
-	display:block;
-	margin:0;
-	padding:0px;
-	/*height:32px;*/
-	cursor:pointer;
+    list-style-type:none;
+    display:block;
+    margin:0;
+    padding:0px;
+    /*height:32px;*/
+    cursor:pointer;
+}
+span.informal{ 
+    color:black;
 }
-span.informal{ font-size:95%; color:black;}
 
 ul.select_table  {
-	/*padding:5px;*/
-	overflow:hidden;
+    /*padding:5px;*/
+    overflow:hidden;
 }
 ul.select_table a{
-	width:100%;
-	display:block;
-	background-color:inherit;
-	color: black;
-	text-decoration:none;
+    width:100%;
+    display:block;
+    background-color:inherit;
+    color: black;
+    text-decoration:none;
 }
 ul.select_table a:hover{
-	background-color:white;
-	color:black;
-	/*text-decoration:underline;*/
+    background-color:white;
+    color:black;
+    /*text-decoration:underline;*/
 }
 ul.select_table li {
-	display:table-row;
-	list-style-type: none;
+    display:table-row;
+    list-style-type: none;
 }
 ul.select_table li span {
-	display:table-cell;
-	margin: 0px;
-	padding:  0px;
+    display:table-cell;
+    width:25em;
+    margin: 0px;
+    padding:  0px;
 }
 
 div.pc_calendar{
 
-	float:left;
+    float:left;
 
 }
 div.pc_calendar table {
-	text-align:center;
+    text-align:center;
 
 }
 div.pc_calendar tr{
-	height:40;
+    font-size:0.87em;
+}
+div.pc_calendar tr{
+    height:40;
 
 
 }
 div.pc_calendar td{
-	width:14%;
-	border:#879ed4 solid 1px;
+    width:14%;
+    border:#879ed4 solid 1px;
 }
 
 div.pc_calendar td.weekend {
-	background-color:#cce0e6;
+    background-color:#cce0e6;
 
 }
 div.pc_calendar td.workday{
-	background-color:inherit;
-
-
+    background-color:inherit;
 }
 div.pc_calendar span.day{
-	font-weight: bold;
-	display:block;
+    font-weight: bold;
+    display:block;
 
 }
 div.pc_calendar span.event{
-	font-weight: bolder;
+    font-weight: bolder;
 
 }
 span.todo  {
-	text-align: left;
-	background-color:yellow;
+    text-align: left;
+    background-color:yellow;
 
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled], select[disabled] {
-	-moz-user-focus:ignore;
-	-moz-user-input:disabled;
-background-color: teal;
-
-	color:black;
-	cursor:inherit;
+    -moz-user-focus:ignore;
+    -moz-user-input:disabled;
+    background-color:lightgrey;
+    color:black;
+    cursor:inherit;
 }
 
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:10px;
-	color:white;
-	font-weight: bold;
-	border:1px black outset  ;
+    color:white;
+    font-weight: bold;
+    font-size:0.87em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
 
-background-image: url("image/bg-submit3.gif");
-background-repeat: repeat-x;
-	background-position: left;
-	text-decoration:none;
-	font-family: arial,helvetica,sans-serif;
-	padding-bottom: 4px;
-	padding-top: 4px;
-	padding-right: 6px;
-	padding-left:  6px;
-	margin-top:3px;
-	margin-bottom:3px;
-	margin-right:3px;
-	margin-left:3px;
-	cursor:pointer;
-	font-size:1.1em;
-	    border-radius: 8px;
-	-moz-border-radius:8px;
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0px;
+    padding:8px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 5px;
+    moz-border-radius:5px;
 
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover  {
-	cursor:pointer;
-	color:#90f979;
-	margin-top:3px;
-	margin-bottom:3px;
-	margin-right:3px;
-	margin-left:3px;
-    border-radius: px;
-	-moz-border-radius:8px;
-border:1px #90f979 inset;
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
+
+}
+a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
+    color:white;
+    font-weight: bold;
+    font-size:0.75em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
+
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0;
+    padding-bottom: 3px;
+    padding-top: 3px;
+    padding-right: 3px;
+    padding-left:  3px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 2px;
+    moz-border-radius:2px;
+
+}
+a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.content a.smallbutton:hover  {
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
+
 }
 td.tool {
-	border: solid 1px gray;
-	border-bottom-width: 3px;
+    border: solid 1px gray;
+    background-color: white;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
 }
 div.topmenu {
 
-	width:100%;
-
 }
 
-h2.dossier {
-	color:darkblue;
-	font-style: italic;
-	display:inline;
-
-	font-size:14px;
-	margin:0;
-	padding:0;
-	text-align:center;
+#dossier h2{
+    color:darkblue;
+    display:inline;
+    font-size:2em;
+    margin:0px;
+    padding:0px;
+    font-variant:small-caps;
 }
 /* </style> */
-div.add_todo_list {
-	border:1px solid blue;
-	display:none;
-	background-color:#BFD0FF;
-	padding:3;
-	position:absolute;
-	text-align:left;
-	line-height:3em;
-	z-index:1;
-        width:345px;
+#add_todo_list {
+    border:1px solid blue;
+    display:none;
+    background-color:#BFD0FF;
+    padding:0.0015%;
+    position:absolute;
+    text-align:left;
+    z-index:1;
+    width:17.9687%;
 }
 div.welcome {
 
 }
 div.gest_name {
-	float:right;
-	margin-right:150;
-	margin-top:15
+    float:left;
+    margin-left:150;
+    margin-top:15
 }
 h2.gest_name {
-	border-left: 5px solid  #403a8d;
-	border-bottom:1px solid  #b4bbc2;
-	border-top:1px solid  #b4bbc2;
-	border-right:1px solid  #b4bbc2;
-	padding: 5px;
+    border-left: 5px solid  #403a8d;
+    border-bottom:1px solid  #b4bbc2;
+    border-top:1px solid  #b4bbc2;
+    border-right:1px solid  #b4bbc2;
+    padding: 5px;
+    width: 40%;
 }
 body.op_detail_frame,div.op_detail_frame  {
-	background-color:#e4e7ed;
-	height:100%; width:100%;
-
+    background-color:#e4e7ed;
+    height:100%; width:100%;
 
 }
 div.inner_box  {
-	background-color:#e4e7ed;
-	font-size:10;
-	font-family:verdana,helvetica,sans-serif;
-	padding:0;
-	margin:0;
-	overflow:hidden;
-	z-index:3;
-
-	position:absolute;
-	left:10%;
-
-
-	border:1px solid darkblue;
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:10%;
+    border:1px solid darkblue;
 
 }
 div.op_detail_title {
-	background-color:grey;
-	/*	width:500;*/
+    background-color:grey;
+    /*	width:500;*/
 
 
 }
 div#div_jrn{
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	visibility:hidden;
-	z-index:2;
-	width:50em;
-	background-color:#EDF3FF;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
 
 }
 div#div_cat{
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	visibility:hidden;
-	z-index:2;
-	width:50em;
-	background-color:#EDF3FF;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
 
 }
 
@@ -935,221 +979,373 @@ div.divinfo
 
 div#search_form
 {
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	margin-left:25%
-		z-index:2;
-	width:50%;
-	display:none;
-	background-color:#e4e7ed;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100px;
+    margin-left:25%;
+    z-index:2;
+    width:50%;
+    display:none;
+    background-color:#e4e7ed;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
 
-table.table_large td, table.result td,table.sortable td
+table.sortable td, table.table_large td, table.result td
 {
-	padding-left:5px;
-	padding-right:5px;
+    padding-left:5px;
+    padding-right:5px;
 }
 table.info_op
 {
-	font-size:18;
-	width:100%;
+    width:100%;
 }
 table.info_op tr
 {
-	font-size:14;
-	background:white;
+    background:white;
 }
 h2#jrn_name
 {
-	margin-right:30%;
-	float: right;
-
+    color:blue;
+    font-size:2.74em;
+    margin-right:30%;
+    float: right;
 }
 tr.footer{
-	font-size:14;
-	font-style: italic;
-	font-weight: bold;
+    font-size:0.87em;
+    font-style: italic;
+    font-weight: bold;
 
 }
 span.remain {
-	font-weight: bold;
-	color:black;
+    font-weight: bold;
+    color:black;
 }
 
 div#jrn_name_div
 {
-	float: right;
-	margin-right:150;
+    float: right;
+    margin-right:150;
 
 
 }
 #predef_form {
-	margin-left:20%;
-	width:60%;
-
+    margin-left:20%;
+    width:60%;
+    position: absolute;
 }
 #direct
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
+    font-size:0.87em;;
 }
 #calc
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
 }
 div#wait_box
 {
-	background-color:#F1E6E6;
-	font-size:10;
-	font-family: verdana,helvetica,arial,sans-serif;
-	padding:0;
-	margin:0;
-	overflow:hidden;
-	z-index:10;
+    background-color:#F1E6E6;
+    font-size:0.87em;
+    font-family: arial,verdana,helvetica,arial,sans-serif;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:10;
 
-	position:absolute;
-	left:30%;
-	top:30%;
+    position:absolute;
+    left:30%;
+    top:30%;
 
 
-	border:1px solid darkblue;
+    border:1px solid darkblue;
 
 }
 #wait_box h2
 {
-	color:black;
-	text-align:center;
+    color:black;
+    text-align:center;
 }
 div#div_jrnsearch_op{
 
-	border:1px solid black;
-	display:none;
-	width:50em;
-	background-color:#EDF3FF;
-	position:absolute;
-	z-index: 5;
+    border:1px solid black;
+    display:none;
+    width:50em;
+    background-color:#EDF3FF;
+    position:absolute;
+    z-index: 5;
 
 }
 ul {
-	padding-left: 110px;
+    padding-left: 110px;
 }
 a.line,div.content a.line
 {
-	font-size:110%;
-	text-decoration:underline;
-	display:inline;
-	color: #0000ff;
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-	font-size:110%;
-	text-decoration:underline;
-	display:inline;
-	color: #0000ff;
-	background-color: rgb(93, 144, 205);
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
+    background-color: rgb(93, 144, 205);
 }
 #close_div
 {
-	background-color:white;
-	color:black;
-	font-family: arial;
-	text-decoration:none;
-	border:1px solid black;
-	margin-left: 2px;
-	margin-right:2px;
-	margin-top:0px;
-	font-size:10px;
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:2px;
+    margin-top:0px;
+    font-size:0.90em;
+}
+#close_div:hover
+{
+    background-color: orange;
+}
+#popmeout
+{
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:18px;
+    font-size:0.90em;
+}
+#popmeout:hover
+{
+    background-color: orange;
 }
 table.table_large tr.odd ,table.table_large tr.even {
 
-	height:32px;
+    height:32px;
 }
 #calc1
 {
-	position:absolute;
-	display:block;
-	top:30px;
-	left:150px;
-	width:300px;
-	border:1px solid black;
-	background-color:#aec3e8;
-	font-size:16px;
-	padding: 20px 20px;
+    position:absolute;
+    display:block;
+    top:30px;
+    left:150px;
+    width:300px;
+    border:1px solid black;
+    background-color:#aec3e8;
+    font-size:0.87em;
+    padding: 20px 20px;
 }
 span.invoice
 {
-    font-size: 120%;
+    font-size: 1.2em;
     font-style: italic;
     display:block;
     margin: 20px;
     font-weight: bold;
 }
 a.nav,div.content a.nav,div.redcontent a.nav {
-	display:inline;
-	text-decoration:none;
-	font-size:1em;
+    display:inline;
+    text-decoration:none;
+    font-size:0.75em;;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
-	display:inline;
-	text-decoration:none;
-	background-color:darkblue;
-	color:white;
-	font-size:1em;
+    display:inline;
+    text-decoration:none;
+    background-color:darkblue;
+    color:white;
+    font-size:0.75em;;
 }
 #dossier {
-	display:inline;
-	float:left;
-	width:40em;
-	top:0px;
+    display:inline;
+    float:left;
+    width:100%;
+    top:0px;
+    text-align: center;
 }
 div.foldercontent {
-	padding:20px 30px 0px 40px;
-	}
+    padding:20px 30px 0px 40px;
+}
 
 h1.title {
-	color: #046fff;
-	font-size:24px;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    font-style: italic;
 }
 h2.title {
-	color: #046fff;
-	font-size:16px;
-	font-style: italic;
-	margin-left: 15px;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0.24%;
+    border:1px solid darkblue;
+
 }
 h3.title {
-	color: #046fff;
-	font-size:14px;
-	margin-left: 30px;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 30px;
 }
 h4.title {
-	color: #046fff;
-	font-size:12px;
-	margin-left: 45px;
-	text-decoration: underline;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: underline;
 }
 h5.title {
-	color: #046fff;
-	font-size:12px;
-	margin-left: 45px;
-	text-decoration: none;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: none;
+    font-style: italic;
 }
 div.myfieldset
 {
-	margin-top: 5px;
-	margin-left:5px;
-	margin-right: 5px;
-	border:lightgrey 2px groove;
+    margin-top: 5px;
+    margin-left:5px;
+    margin-right: 5px;
+    border:lightgrey 2px groove;
+    border-radius: 4px;
 }
 #info_div {
-	display:none;
-	background-color: blue;
-	color:white;
-	z-index: 15;
-	position: absolute;
-	top:0;
-	left:0;
-}
\ No newline at end of file
+    display:none;
+    background-color: yellow;
+    color:black;
+    z-index: 15;
+    position: absolute;
+    top:0;
+    left:45%;
+}
+div.menu2 a.mtitle{
+    
+}
+div.menu3 {
+    
+}
+#go_submit_id {
+    font-size:1.25em;
+}
+.decale {
+    margin-left:30px;
+}
+#folder {
+    font-size:1.4em;
+    width:auto;
+    border-width:0px;
+    border-collapse:collapse;
+    
+    
+}
+/*#folder tr.odd,#folder tr.even {
+    font-size : 1.2em;
+}*/
+textarea.itextarea{
+    border:solid blue 1px;
+    width:90%;
+    margin-left:5%;
+}
+div#modele_op_div{
+    display: none;
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:30%;
+    width:40%;
+    border:1px solid darkblue;
+}
+div#notice {
+    position:absolute;
+    right:5%;
+    top:200px;
+    background-color:yellow;
+    border: 1px solid black;
+}
+div.name  {
+    position:absolute;
+    top:0px;
+    left:0px;
+}
+div#box_search_card {
+    position:absolute;
+    right:15.625%;
+    top:115px;
+}
+div.bxbutton
+{
+    float:right;
+    height:10px;
+    display:block;
+    margin-top:0.48%;
+    margin-right:0.48%;
+}
+div.inner_box tr.odd {
+    background:  #CBD9F4;
+}
+#modele_op_tab tr.odd {
+    background:  #CBD9F4;
+}
+div#bookmark_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+   border:1px solid darkblue;
+   top:2em;
+   left:30%;
+   width:40%;
+}
+div#preference_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    border:1px solid darkblue;
+    top:2em;
+    left:20%;
+    width:50%;
+}
+#error_div{
+    position:absolute;
+    border:1px solid black;
+    background-color:whitesmoke;
+    padding-bottom: 2px;
+    padding-top: 2px;
+    padding-left: 2px;
+    padding-right: 2px;
+    color:red;
+    top:40%;left:25%;
+    visibility:hidden;
+    width:40em;
+    z-index:20;
+}
+#error_div h2 {
+    background: red;
+}
+div#error_content_div {
+   font-size: 1.2em;
+   color:error;
+   font-weight: bold;
+   text-align: center;
+}
+td.workday ol {
+	margin:0px;
+	padding:0px;
+	list-style-type:none;
+	text-align:left;
+}
diff --git a/html/style.css b/html/style.css
index 777e4748a..225b6b8c5 100644
--- a/html/style.css
+++ b/html/style.css
@@ -803,8 +803,6 @@ div.pc_calendar td.weekend {
 }
 div.pc_calendar td.workday{
     background-color:inherit;
-
-
 }
 div.pc_calendar span.day{
     font-weight: bold;
@@ -1354,3 +1352,9 @@ div#error_content_div {
    font-weight: bold;
    text-align: center;
 }
+td.workday ol {
+	margin:0px;
+	padding:0px;
+	list-style-type:none;
+	text-align:left;
+}
diff --git a/include/class_calendar.php b/include/class_calendar.php
index a254a492b..b613565a2 100644
--- a/include/class_calendar.php
+++ b/include/class_calendar.php
@@ -45,14 +45,15 @@ class Calendar
 
     /*!\brief fill the array given as parameter with the data from action_gestion
      *\param $p_array array of the date of the month
+     * \param $p_style is either short or long, short: for a small title, long for a complete one
      */
-    function fill_from_action(&$p_array)
+    function fill_from_action(&$p_array,$p_style)
     {
 		global $g_user;
 		$profile=$g_user->get_profile();
 
         $cn=new Database(dossier::id());
-        $sql="select ag_id,to_char(ag_remind_date,'DD')::integer as ag_timestamp_day,ag_title
+        $sql="select ag_id,to_char(ag_remind_date,'DD')::integer as ag_timestamp_day,ag_title,ag_hour
 			".
              " from action_gestion ".
              " where ".
@@ -66,17 +67,21 @@ class Calendar
         for ($i=0;$i<count($array);$i++)
         {
             $ind=$array[$i]['ag_timestamp_day'];
-
-			$this->action[$ind][]=$array[$i]['ag_id'];
-			$this->title[$ind][]=$array[$i]['ag_title'];
+            $this->action[$ind][]=$array[$i]['ag_id'];
+            $this->title[$ind][]=$array[$i]['ag_title'];
+            $this->hour[$ind][]=$array[$i]['ag_hour'];
 
         }
 		/*
 		 * Fill foreach day
 		 */
+        if ( $p_style == "short")
+        {
 		foreach ($this->action as $day=>$aAction)
 		{
-			if ($p_array[$day]=="")  $p_array[$day]='<span class="input_text" onclick="display_task(\'tsk'.$day.'\');">'." ".count($aAction)." "._("Tâches").'</span>';
+			if ($p_array[$day]=="")  {
+                                $p_array[$day]='<span class="input_text" onclick="display_task(\'tsk'.$day.'\');">'." ".count($aAction)." "._("Tâches").'</span>';
+                        }
 			$this->action_div[$day]='<div id="tsk'.$day.'" class="inner_box" style="width:200;display:none">';
 			$this->action_div[$day].=HtmlInput::title_box($day."/".$this->month."/".$this->year, "tsk".$day, "hide");
 			 $this->action_div[$day].="<ol>";
@@ -86,24 +91,56 @@ class Calendar
 			}
 			$this->action_div[$day].='</ol></div>';
 		}
+        }
+        else if ( $p_style == "long")
+        {
+		foreach ($this->action as $day=>$aAction)
+		{
+                        $p_array[$day].="<ol>";
+			for ($i=0;$i<count($aAction);$i++)
+			{
+				$p_array[$day].='<li>&rarr;'.HtmlInput::detail_action($aAction[$i], $this->hour[$day][$i]." ".$this->title[$day][$i]).'</li>';
+			}
+			$p_array[$day].='</ol>';
+		}
+        }
     }
     /*!\brief fill the array given as parameter with the data from todo
      *\param $p_array array of the date of the month
+     * \param $p_style is either short or long, short: for a small title, long for a complete one
      */
-    function fill_from_todo(&$p_array)
+    function fill_from_todo(&$p_array,$p_style)
     {
         $cn=new Database(dossier::id());
-        $sql="select count(*) as nb,to_char(tl_date,'DD')::integer as tl_date_day ".
-             " from todo_list ".
-             " where ".
-             " to_char(tl_date,'MM')::integer=$1 ".
-             " and to_char(tl_date,'YYYY')::integer=$2 ".
-             " and use_login=$3 group by to_char(tl_date,'DD')::integer ";
-        $array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION['g_user']));
-        for ($i=0;$i<count($array);$i++)
+        if ($p_style=="short")
         {
-            $ind=$array[$i]['tl_date_day'];
-            $p_array[$ind].="<span style=\"display:block\" class=\"todo\">".h($array[$i]['nb'])." "._('Notes').'</span>';
+            $sql="select count(*) as nb,to_char(tl_date,'DD')::integer as tl_date_day ".
+                 " from todo_list ".
+                 " where ".
+                 " to_char(tl_date,'MM')::integer=$1 ".
+                 " and to_char(tl_date,'YYYY')::integer=$2 ".
+                 " and use_login=$3 group by to_char(tl_date,'DD')::integer ";
+            $array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION['g_user']));
+            for ($i=0;$i<count($array);$i++)
+            {
+                $ind=$array[$i]['tl_date_day'];
+                $p_array[$ind].="<span style=\"display:block\" class=\"todo\">".h($array[$i]['nb'])." "._('Notes').'</span>';
+            }
+        } else if ($p_style=="long")
+        {
+            $sql="select to_char(tl_date,'DD')::integer as tl_date_day,tl_title ".
+                 " from todo_list ".
+                 " where ".
+                 " to_char(tl_date,'MM')::integer=$1 ".
+                 " and to_char(tl_date,'YYYY')::integer=$2 ".
+                 " and use_login=$3  ";
+            $array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION['g_user']));
+            for ($i=0;$i<count($array);$i++)
+            {
+                $ind=$array[$i]['tl_date_day'];
+                
+               $p_array[$ind].="<span style=\"display:block\" class=\"todo\">".h($array[$i]['tl_title']).'</span>';
+            }
         }
     }
     /*!\brief display a calendar after a call to Calendar::fill
@@ -124,8 +161,8 @@ class Calendar
         /* weekday */
         $week=array(_('Dimanche'),_('Lundi'),_('Mardi'),_('Mercredi'),_('Jeudi'),_('Vendredi'),_('Samedi'));
 
-        $this->fill_from_action($cell);
-        $this->fill_from_todo($cell);
+        $this->fill_from_action($cell,"short");
+        $this->fill_from_todo($cell,"short");
         $wMonth=new ISelect('per');
         $cn=new Database(dossier::id());
         $wMonth->value=$cn->make_array("select p_id,to_char(p_start,'MM/YYYY') from parm_periode where p_exercice = '$exercice_user' order by p_start");
@@ -193,5 +230,49 @@ class Calendar
     {
         $this->default_periode=$p_per;
     }
+    /**
+     * @brief zoom the calendar
+     */
+    function zoom()
+    {
+        global $g_user;
+        $exercice_user=$g_user->get_exercice();
+        /* day */
+        $cell=array();
+        for ($i=0;$i<42;$i++)
+        {
+            $cell[$i]="";
+        }
+        $this->set_month_year();
+        /* weekday */
+        $week=array(_('Dimanche'),_('Lundi'),_('Mardi'),_('Mercredi'),_('Jeudi'),_('Vendredi'),_('Samedi'));
+
+        $this->fill_from_action($cell,"long");
+        $this->fill_from_todo($cell,"long");
+        $wMonth=new ISelect('per_div');
+        $cn=new Database(dossier::id());
+        $wMonth->value=$cn->make_array("select p_id,to_char(p_start,'MM/YYYY') from parm_periode where p_exercice = '$exercice_user' order by p_start");
+        $wMonth->selected=$this->default_periode;
+        $wMonth->javascript=sprintf("onchange=calendar_zoom({gDossier:%d,invalue:'%s',outvalue:'%s'})",
+            dossier::id(),'per_div','calendar_zoom_div');
+        $wMonth->set_attribute('gDossier',dossier::id());
+        $month_year=$wMonth->input().$wMonth->get_js_attr();
+        ob_start();
+        require_once('template/calendar.php');
+
+        if (count($this->action_div) > 0)
+        {
+                foreach ($this->action_div as $day)
+                {
+                        echo $day;
+                }
+        }
+	$ret=ob_get_contents();
+        ob_end_clean();
+        return $ret;
+    }
+    static function test_me() {
+        
+    }
 
 }
diff --git a/include/class_html_input.php b/include/class_html_input.php
index 08383ee2e..2ad7e687d 100755
--- a/include/class_html_input.php
+++ b/include/class_html_input.php
@@ -242,7 +242,7 @@ class HtmlInput
 	 * @param $p_modify let you modify an operation
 	 *
 	 */
-	 static function detail_action($ag_id,$p_mesg,$p_modify=1)
+    static function detail_action($ag_id,$p_mesg,$p_modify=1)
     {
         return sprintf('<A class="detail" style="text-decoration:underline;display:inline" HREF="javascript:view_action(%d,%d,%d)">%s</A>',
                        $ag_id,dossier::id(),$p_modify,$p_mesg);
@@ -745,5 +745,16 @@ class HtmlInput
 		$r = '<A  style="color:red;text-decoration:underline" href="javascript:void(0)" onclick="show_reconcile(\'' . $p_div . '\',\'' . $let . '\')">' . $let . '</A>';
 		return $r;
 	}
+        /**
+         * Zoom the calendar
+         * @param type $obj objet json for the javascript
+         * @see calendar_zoom in scripts.js 
+         */
+        static function calendar_zoom($obj)
+        {
+            $button=new ISmallButton("calendar", "Calendrier");
+            $button->javascript="calendar_zoom($obj)";
+            return $button->input();
+        }
 
 }
\ No newline at end of file
diff --git a/include/constant.php b/include/constant.php
index 6f733f259..2b400ed91 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -81,7 +81,7 @@ define ('MAX_ARTICLE',5);
 define ('MAX_CAT',15);
 define ('MAX_CARD_SEARCH',550);
 define ('MAX_FORECAST_ITEM',10);
-define ('MAX_PREDEFINED_OPERATION',30);
+define ('MAX_PREDEFINED_OPERATION',50);
 define ('MAX_COMPTE_CARD',4);
 define ('COMPTA_MAX_YEAR',2100);
 define ('COMPTA_MIN_YEAR',1990);
diff --git a/include/dashboard.inc.php b/include/dashboard.inc.php
index 82f4d8267..4783f9546 100644
--- a/include/dashboard.inc.php
+++ b/include/dashboard.inc.php
@@ -20,6 +20,9 @@ global $g_user;
 /* others report */
 $cal=new Calendar();
 $cal->get_preference();
+
+$obj=sprintf("{gDossier:%d,invalue:'%s',outdiv:'%s'}",
+        dossier::id(),'per','calendar_zoom_div');
 $Operation=new Follow_Up($cn);
 $last_operation=$Operation->get_today();
 $late_operation=$Operation->get_late();
diff --git a/include/template/calendar.php b/include/template/calendar.php
index e51591d24..136a22e09 100644
--- a/include/template/calendar.php
+++ b/include/template/calendar.php
@@ -1,6 +1,6 @@
 <div class="pc_calendar" id="user_cal" style="width:100%">
 <?php echo $month_year?>
-<table width="100%">
+<table style="width:100%;height:80%">
 <tr>
 <?php
 for ($i=0;$i<=6;$i++){
diff --git a/include/template/dashboard.php b/include/template/dashboard.php
index ddaef8011..23ecdbca1 100644
--- a/include/template/dashboard.php
+++ b/include/template/dashboard.php
@@ -2,6 +2,7 @@
 <fieldset >
 <legend><?php echo _('Calendrier')?>
 </legend>
+<?php echo HtmlInput::calendar_zoom($obj); ?>
 <?php echo $cal->display(); ?>
 </fieldset>
 </div>
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 89b0dd36e..e69de29bb 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,278 +0,0 @@
--- si la fiche utilise le code DEPENSE PRIVEE alors ajout dans QP_DEP_PRIV
-create or replace view m as 
-select qp_id, qp_price from quant_purchase join fiche_detail on (qp_fiche=f_id and ad_id=5) where ad_value in (select p_value from parm_code where p_code='DEP_PRIV');
-
-update quant_purchase as e set qp_dep_priv=(select qp_price from m where m.qp_id=e.qp_id);
-
-update quant_purchase as e set qp_dep_priv=(select qp_price from m where m.qp_id=e.qp_id);
-
-update quant_purchase as e set qp_dep_priv=0 where qp_dep_priv is null;
--- évite les valeurs nulles dans quant_purchase
-update quant_purchase set qp_dep_priv = 0 where qp_dep_priv is null;
-
-drop view m;
-
--- update script insert_quant_purchase
-
-
-CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(
-    p_internal text, 
-    p_j_id numeric, 
-    p_fiche text, 
-    p_quant numeric, 
-    p_price numeric, 
-    p_vat numeric, 
-    p_vat_code integer, 
-    p_nd_amount numeric, 
-    p_nd_tva numeric, 
-    p_nd_tva_recup numeric, 
-    p_dep_priv numeric, 
-    p_client text, 
-    p_tva_sided numeric)
-  RETURNS void AS
-$BODY$
-declare
-        fid_client integer;
-        fid_good   integer;
-        account_priv    account_type;
-        fid_good_account account_type;
-        n_dep_priv numeric;
-begin
-        n_dep_priv := 0;
-        select p_value into account_priv from parm_code where p_code='DEP_PRIV';
-        select f_id into fid_client from
-                fiche_detail where ad_id=23 and ad_value=upper(trim(p_client));
-        select f_id into fid_good from
-                 fiche_detail where ad_id=23 and ad_value=upper(trim(p_fiche));
-        select ad_value into fid_good_account from fiche_detail where ad_id=5 and f_id=fid_good;
-        if strpos( fid_good_account , account_priv ) = 1 then
-                n_dep_priv=p_price;
-        end if; 
-            
-        insert into quant_purchase
-                (qp_internal,
-                j_id,
-                qp_fiche,
-                qp_quantite,
-                qp_price,
-                qp_vat,
-                qp_vat_code,
-                qp_nd_amount,
-                qp_nd_tva,
-                qp_nd_tva_recup,
-                qp_supplier,
-                qp_dep_priv,
-                qp_vat_sided)
-        values
-                (p_internal,
-                p_j_id,
-                fid_good,
-                p_quant,
-                p_price,
-                p_vat,
-                p_vat_code,
-                p_nd_amount,
-                p_nd_tva,
-                p_nd_tva_recup,
-                fid_client,
-                n_dep_priv,
-                p_tva_sided);
-        return;
-end;
- $BODY$
-  LANGUAGE plpgsql;
-
-
--- ajout code manquant dans parm_code
-create or replace function add_parm_code() returns void as
-$fct$
-declare
-    country_code text;
-begin 
-    select pr_value into country_code from parameter where pr_id='MY_COUNTRY';
-    if country_code='FR' then
-        insert into parm_code (p_code,p_comment,p_value) values ('DNA','Dépense non déductible','67');
-        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_DNA','TVA non déductible','');
-        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_DED_IMPOT','TVA déductible à l''impôt','');
-        insert into parm_code  (p_code,p_comment,p_value) values ('COMPTE_COURANT','Poste comptable pour le compte courant','');
-        insert into parm_code  (p_code,p_comment,p_value) values ('COMPTE_TVA','TVA à payer ou à recevoir','');
-     end if;
-end;
-$fct$
-language plpgsql;
-
-select add_parm_code();
-
-drop function add_parm_code();
-
-update parm_code set p_value='67' where p_value='6740' and p_code='DNA';
-
- alter table menu_ref add me_description_etendue text;
-
-insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue)
-values
-('NAVI','Navigateur',null,null,'Menu simplifié pour retrouver rapidement un menu',null,'ask_navigator(<DOSSIER>)','ME','Le navigateur vous présente une liste de menu auquel vous avez accès et vous permet d''accèder plus rapidement au menu que vous souhaitez rapidement');
-
-insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_display,pm_default) 
-values
-('NAVI',null,1,90,'M',0), ('NAVI',null,2,90,'M',0);
-
-insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue)
-values
-('BOOKMARK','Favori',null,null,'Raccourci vers vos menus préférés',null,'show_bookmark(<DOSSIER>)','ME','Ce menu vous présente un menu rapide des menus que vous utilisez le plus souvent');
-
-insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_display,pm_default) 
-values
-('BOOKMARK',null,1,85,'M',0), ('BOOKMARK',null,2,85,'M',0);
-
-update menu_ref set me_menu='Impression Journaux' where me_code='PRINTJRN';
-update menu_ref set me_description='Impression des journaux' where me_code='PRINTJRN';
-update menu_ref set me_menu='Liste Suivi' where me_code='FOLLOW';
-update menu_ref set me_description='Document de suivi sous forme de liste' where me_code='FOLLOW';
-update menu_ref set me_javascript='popup_recherche(<DOSSIER>)' where me_code='SEARCH';
-update menu_ref set me_file=null,me_javascript='set_preference(<DOSSIER>)' , me_description_etendue='Préférence de l''utilisateur, apparence de l''application pour l''utilisateur, période par défaut et mot de passe' where me_code='PREFERENCE';
-/*
- * Vue montrant toutes les possibilités
- */
-CREATE OR REPLACE VIEW v_menu_description AS 
- WITH t_menu AS (
-         SELECT mr.me_menu, pm.me_code, pm.me_code_dep, pm.p_type_display, pu.user_name, mr.me_file, mr.me_javascript, mr.me_description, mr.me_description_etendue
-           FROM profile_menu pm
-      JOIN profile_user pu ON pu.p_id = pm.p_id
-   JOIN profile p ON p.p_id = pm.p_id
-   JOIN menu_ref mr USING (me_code)
-        )
- SELECT DISTINCT (COALESCE(v3.me_code || '/'::text, ''::text) || COALESCE(v2.me_code, ''::text)) || 
-        CASE
-            WHEN v2.me_code IS NULL THEN COALESCE(v1.me_code, ''::text)
-            WHEN v2.me_code IS NOT NULL THEN COALESCE('/'::text || v1.me_code, ''::text)
-            ELSE NULL::text
-        END AS code, v1.me_code, v1.me_description, v1.me_description_etendue, v1.me_file, v1.user_name, '> '::text || v1.me_menu AS v1menu, 
-        CASE
-            WHEN COALESCE(v3.me_menu, ''::text) <> ''::text THEN ' > '::text || v2.me_menu
-            ELSE v2.me_menu
-        END AS v2menu, v3.me_menu AS v3menu, v3.p_type_display,
- coalesce(v1.me_javascript,coalesce(v2.me_javascript,v3.me_javascript)) as javascript
-   FROM t_menu v1
-   LEFT JOIN t_menu v2 ON v1.me_code_dep = v2.me_code
-   LEFT JOIN t_menu v3 ON v2.me_code_dep = v3.me_code
-  WHERE v1.p_type_display <> 'P'::text AND (COALESCE(v1.me_file, ''::text) <> ''::text OR COALESCE(v1.me_javascript, ''::text) <> ''::text);
-
-COMMENT ON VIEW v_menu_description
-  IS 'Description des menus';
- 
-CREATE TABLE bookmark
-(
-b_id serial primary key,
-b_order integer default 1,
-b_action text,
-login text 
-);
-comment on table bookmark is 'Bookmark of the connected user';
-
-create table tags (
-    t_id serial primary key, 
-    t_tag text not null, 
-    t_description text
-);
-
-create table action_tags
-(
-    at_id serial primary key,
-    t_id integer references tags(t_id) on delete cascade on update cascade,
-    ag_id integer references action_gestion(ag_id) on delete cascade on update cascade
-);
-/* Config tag */
-insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue)
-values
-('CFGTAG','Configuration étiquette','cfgtags.inc.php',null,'Configuration des tags',null,null,'ME','Configuration des étiquettes. Vous pouvez en ajouter, en supprimer ou les modifier');
-
-insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_display,pm_default) 
-values
-('CFGTAG','PARAM',1,390,'E',0);
-
-update fiche_def set    fd_label='Trésorerie' where fd_id=3;
-update fiche_def_ref set    frd_text='Trésorerie' where frd_id=4;
-update jrn_def set jrn_def_name='Trésorerie' where jrn_def_id=1;
-update jrn_type set jrn_desc = 'Trésorerie' where jrn_type_id='FIN';
-
-CREATE OR REPLACE FUNCTION comptaproc.insert_quick_code(nf_id integer, tav_text text)
-  RETURNS integer AS
-$BODY$
-	declare
-	ns integer;
-	nExist integer;
-	tText text;
-	tBase text;
-	tName text;
-	nCount Integer;
-	nDuplicate Integer;
-	begin
-	tText := lower(trim(tav_text));
-	tText := replace(tText,' ','');
-	tText := translate(tText,E' $€µ£%.+-/\\!(){}(),;_&|"#''^<>*','');
-	tText := translate(tText,E'éèêëàâäïîüûùöôç','eeeeaaaiiuuuooc');
-	nDuplicate := 0;
-	tBase := tText;
-	loop
-		-- take the next sequence
-		select nextval('s_jnt_fic_att_value') into ns;
-		if length (tText) = 0 or tText is null then
-			select count(*) into nCount from fiche_detail where f_id=nf_id and ad_id=1;
-			if nCount = 0 then
-				tText := 'FICHE'||ns::text;
-			else
-				select ad_value into tName from fiche_detail where f_id=nf_id and ad_id=1;
-				
-				tName := lower(trim(tName));
-				tName := substr(tName,1,6);
-				tName := replace(tName,' ','');
-				tName := translate(tName,E' $€µ£%.+-/\\!(){}(),;_&|"#''^<>*','');
-				tName := translate(tName,E'éèêëàâäïîüûùöôç','eeeeaaaiiuuuooc');
-				tBase := tName;
-				if nDuplicate = 0 then
-					tText := tName;
-				else
-					tText := tName||nDuplicate::text;
-				end if;
-			end if;
-		end if;
-		-- av_text already used ?
-		select count(*) into nExist
-			from fiche_detail
-		where
-			ad_id=23 and  ad_value=upper(tText);
-
-		if nExist = 0 then
-			exit;
-		end if;
-		nDuplicate := nDuplicate + 1 ;
-		tText := tBase || nDuplicate::text;
-		
-		if nDuplicate > 9999 then
-			raise Exception 'too many duplicate % duplicate# %',tText,nDuplicate;
-		end if;
-	end loop;
-
-
-	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,23,upper(tText));
-	return ns;
-	end;
-$BODY$
-  LANGUAGE plpgsql VOLATILE
-
-create or replace function comptaproc.opd_limit_description() 
-returns trigger
-as
-$BEGIN$
-	declare
-		sDescription text;
-	begin
-	sDescription := NEW.od_description;
-	NEW.od_description := substr(sDescription,1,80);
-	return NEW;
-	end;
-$BEGIN$
-LANGUAGE plpgsql;
-
-create trigger opd_limit_description before update or insert on op_predef execute procedure for each row comptaproc.opd_limit_description();