Merge Master

2018-03-12 11:34:06 +01:00 · 2018-03-12 11:34:06 +01:00 · ef18c3dee5
commit ef18c3dee5
parent 8cf3a7d1ff fff18d990e
255 changed files with 17520 additions and 6609 deletions
--- a/doc/developper/Doxyfile
+++ b/doc/developper/Doxyfile
@ -673,7 +673,6 @@ EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = a?.php \
                         b?.php \
                         ?.php \
-                         test*.php \
                         calendar-*.js \
                         richtext.js \
                         builder.js \
--- a/html/admin-noalyss.php
+++ b/html/admin-noalyss.php
@ -29,6 +29,7 @@ if (file_exists("../include/config.inc.php") ) {
     * installed
     */
    define ('ALLOWED',1);
+    define ('ALLOWED_ADMIN',1);
    require_once '../include/constant.php';
    require_once NOALYSS_INCLUDE.'/admin_repo.inc.php';
 } else {
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@ -46,6 +46,7 @@ require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once  NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
+require_once NOALYSS_INCLUDE.'/lib/progress_bar.class.php';
 $http=new HttpInput();

 mb_internal_encoding("UTF-8");
@ -86,6 +87,16 @@ else
    $g_user = new User($cn);
    $g_user->check(true);
 }
+
+// For progress bar, for saving time , we check and answer directly
+if ($op == "progressBar") {
+    $task_id=$http->request("task_id");
+    $task=new Progress_Bar($task_id);
+    $task->answer();
+    return;
+}
+
+
 $html = var_export($_REQUEST, true);
 set_language();
 if ( LOGINPUT)
@ -158,12 +169,15 @@ $path = array(
    "navigator"=>"ajax_navigator",
    "preference"=>"ajax_preference",
    "bookmark"=>"ajax_bookmark",
+    // Tag 
    "tag_detail"=>"ajax_tag_detail",
    "tag_save"=>"ajax_tag_save",
    "tag_list"=>"ajax_tag_list",
    "tag_add"=>"ajax_tag_add_action",
    "tag_remove"=>"ajax_tag_remove_action",
    "tag_choose"=>"ajax_tag_choose",
+    "tag_activate"=>"ajax_tag_save",
+    // search
    "search_display_tag"=>"ajax_search_display_tag",
    "search_add_tag"=>"ajax_search_add_tag",
    "search_clear_tag"=>"ajax_search_clear_tag",
@ -189,6 +203,12 @@ $path = array(
    "modele_drop"=>"ajax_admin",
  // From admin, display the information of a template you can modify
    "modele_modify"=>"ajax_admin",
+    // From admin , upgrade Noalyss
+    "upgradeCore"=>"ajax_admin",
+    // From admin , upgrade or install plugin
+    "upgradePlugin"=>"ajax_admin",
+    // From admin , install a template
+    "installTemplate"=>"ajax_admin",
  // From dashboard, display detail about last operation     
    "action_show"=>"ajax_gestion",
  // From dashboard, display form for a new event    
@ -205,6 +225,8 @@ $path = array(
    "accounting"=>"ajax_accounting",
    // Show detail of an ANC operation
    "anc_detail_op"=>"ajax_anc_detail_operation",
+    // show history of an analytic account
+    "history_anc_account"=>"ajax_history_anc_account",
    // Display the list of filter saved
    "display_search_filter"=>"ajax_search_filter",
    // Save search filter 
@ -218,7 +240,11 @@ $path = array(
    // template category of card
    'template_cat_card'=>'ajax_template_cat_card',
    // Attribute for category of card
-    'template_cat_category'=>'ajax_template_cat_category'
+    'template_cat_category'=>'ajax_template_cat_category',
+    // From FollowUp , update a comment on a file
+    'update_comment_followUp'=>'ajax_follow_up',
+    // TVA param
+    "tva_parameter"=>"ajax_tva_parameter"
 )    ;

 if (array_key_exists($op, $path)) {
@ -227,6 +253,60 @@ if (array_key_exists($op, $path)) {
 }
 switch ($op)
 {
+    case "periode_change":
+        $field=$http->get("field");
+        $type=$http->get("type");
+        $exercice=$http->get("exercice","number");
+        $last=$http->get("last","number");
+        
+        // if last == 1 then show first and last periode of the 
+        // exercice
+        $periode_start=0;
+        $periode_end=0;
+        if ( $last==1) {
+            $t_periode=new Periode($cn);
+            list($per_max,$per_min)=$t_periode->get_limit($exercice);
+            $periode_start=$per_max->p_id;
+            $periode_end=$per_min->p_id;
+        }
+        
+        $iperiod = new IPeriod($field);
+        $iperiod->id=$field;
+        $iperiod->user = $g_user;
+        $iperiod->cn = $cn;
+        $iperiod->filter_year = true;
+        $iperiod->exercice=$exercice;
+        if ( $type=="from")
+        {
+            $iperiod->show_end_date=FALSE;
+            $iperiod->value=$periode_start;
+        } elseif ($type=="to"){
+            $iperiod->show_start_date=FALSE;
+            $iperiod->value=$periode_end;
+            
+        } else {
+            throw new Exception(_("Invalide type"));
+        }
+        
+        $iperiod->type = ALL;
+        echo $iperiod->input();
+        
+        return;
+        
+        break;
+    case "pref_exercice":
+        $iperiod = new IPeriod("period");
+        $iperiod->id="setting_period";
+        $iperiod->user = $g_user;
+        $iperiod->cn = $cn;
+        $iperiod->filter_year = true;
+        $iperiod->exercice=$http->get("exercice");
+        
+        $iperiod->type = ALL;
+        echo $iperiod->input();
+        
+        return;
+    break;
 	case "remove_anc":
 		if ($g_user->check_module('ANCODS') == 0)
 			exit();
@ -345,7 +425,28 @@ EOF;
 		break;
 	case 'dsp_tva':
 		$cn = Dossier::connect();
-		$Res = $cn->exec_sql("select * from tva_rate order by tva_rate desc");
+            // Filter the VAT 
+                $filter=$http->get("filter","string","none");
+                if ( $filter == 'sale')  {
+                    $Res = $cn->exec_sql("select * 
+                        from v_tva_rate 
+                        where 
+                        tva_sale <> '#'
+                            order by tva_rate desc");
+                    
+                } elseif ($filter == "purchase") {
+                    
+                    $Res = $cn->exec_sql("select * 
+                        from 
+                        v_tva_rate 
+                        where 
+                        tva_purchase <> '#'
+                            order by tva_rate desc");
+                }else {
+                    
+                    $Res = $cn->exec_sql("select * from v_tva_rate 
+                            order by tva_rate desc");
+                }
 		$Max = Database::num_row($Res);
 		$r = "";
 		$r.=HtmlInput::title_box(_('Choisissez la TVA'),'tva_select',"close","","y");
--- a/html/do.php
+++ b/html/do.php
@ -190,15 +190,19 @@ if ($cn->exist_table('version') == false)
 }
 if (DBVERSION < dossier::get_version($cn))
 {
-    echo '<h2 class="error" style="font-size:12px">' . _("Attention: la version de base de donnée est supérieure à la version du programme, vous devriez mettre à jour") . '</h2>';
+    $a = _("cliquez ici pour mettre à jour ");
+    $base =NOALYSS_URL."/admin-noalyss.php?action=upgrade&sb=application";
+
+    echo '<h2 class="error" style="font-size:12px">' .
+            _("Attention: la version de base de donnée est supérieure à la version du programme, vous devriez mettre à jour") ,
+        '<a hreF="' . $base . '">' . $a . '</a></h2>',
+            '</h2>';
 }
 if (DBVERSION > dossier::get_version($cn))
 {
    echo '<h2 class="error" style="font-size:12px">' . _("Votre base de données n'est pas à jour") . '   ';
    $a = _("cliquez ici pour appliquer le patch");
-    $base = dirname($_SERVER['SCRIPT_NAME']);
-    if ($base == '/') { $base = ''; }
-    $base .= '/admin-noalyss.php';
+    $base =NOALYSS_URL.'/admin-noalyss.php?action=upgrade&sb=database';
    echo '<a hreF="' . $base . '">' . $a . '</a></h2>';
 }

--- a/html/favicon.ico
+++ b/html/favicon.ico
--- a/html/image/bg-submit4.gif
+++ b/html/image/bg-submit4.gif
--- a/html/image/bg-submit4.png
+++ b/html/image/bg-submit4.png
--- a/html/image/bg-submit5.png
+++ b/html/image/bg-submit5.png
--- a/html/image/bgcolor.gif
+++ b/html/image/bgcolor.gif
--- a/html/image/blackdot.gif
+++ b/html/image/blackdot.gif
--- a/html/image/bold.gif
+++ b/html/image/bold.gif
--- a/html/image/button-edit.png
+++ b/html/image/button-edit.png
--- a/html/image/centre.gif
+++ b/html/image/centre.gif
--- a/html/image/compute.png
+++ b/html/image/compute.png
--- a/html/image/copy.gif
+++ b/html/image/copy.gif
--- a/html/image/cut.gif
+++ b/html/image/cut.gif
--- a/html/image/delete.gif
+++ b/html/image/delete.gif
--- a/html/image/edit.png
+++ b/html/image/edit.png
--- a/html/image/email.gif
+++ b/html/image/email.gif
--- a/html/image/empty.gif
+++ b/html/image/empty.gif
--- a/html/image/home.png
+++ b/html/image/home.png
--- a/html/image/hr.gif
+++ b/html/image/hr.gif
--- a/html/image/hyperlink.gif
+++ b/html/image/hyperlink.gif
--- a/html/image/icon-off.png
+++ b/html/image/icon-off.png
--- a/html/image/icon-on.png
+++ b/html/image/icon-on.png
--- a/html/image/indent.gif
+++ b/html/image/indent.gif
--- a/html/image/italic.gif
+++ b/html/image/italic.gif
--- a/html/image/justifyfull.gif
+++ b/html/image/justifyfull.gif
--- a/html/image/left_just.gif
+++ b/html/image/left_just.gif
--- a/html/image/list.gif
+++ b/html/image/list.gif
--- a/html/image/load.gif
+++ b/html/image/load.gif
--- a/html/image/logo-noalyss-7000-3.svg
+++ b/html/image/logo-noalyss-7000-3.svg
@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="412"
-   height="82"
-   id="svg3836"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="logo-noalyss-7000-2.svg">
-  <defs
-     id="defs3838">
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3997"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3855"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3861"
-       is_visible="true" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="192.67146"
-     inkscape:cy="58.488379"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1020"
-     inkscape:window-x="-2"
-     inkscape:window-y="35"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3841">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-970.36218)">
-    <g
-       id="g3935"
-       transform="matrix(0.57896041,0,0,0.56949598,-44.979175,377.29868)"
-       style="stroke:#003380">
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         style="fill:#ffffff;fill-opacity:1;stroke:#003380;stroke-width:0.82599997999999997;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         d="m 118.40641,1050.88 37.90114,0 c 6.22618,0 11.2386,5.0124 11.2386,11.2386 l 0,77.0119 c 0,6.2262 -5.01242,11.2386 -11.2386,11.2386 l -37.90114,0 c -6.22618,0 -11.2386,-5.0124 -11.2386,-11.2386 l 0,-77.0119 c 0,-6.2262 5.01242,-11.2386 11.2386,-11.2386 z"
-         id="rect2987"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         id="path2990"
-         d="m 124.51622,1060.7879 25.68152,0 c 4.21882,0 7.61519,3.3963 7.61519,7.6151 l 0,18.4669 c 0,4.2188 -3.39637,7.6152 -7.61519,7.6152 l -25.68152,0 c -4.21881,0 -7.61519,-3.3964 -7.61519,-7.6152 l 0,-18.4669 c 0,-4.2188 3.39638,-7.6151 7.61519,-7.6151 z"
-         style="fill:none;stroke:#003380;stroke-width:0.72600001000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         sodipodi:type="arc"
-         style="fill:none;stroke:#003380;stroke-width:1.42117310000000008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="path3770"
-         sodipodi:cx="211.12189"
-         sodipodi:cy="519.00165"
-         sodipodi:rx="10.101525"
-         sodipodi:ry="10.101525"
-         d="m 221.22341,519.00165 c 0,5.57892 -4.5226,10.10152 -10.10152,10.10152 -5.57892,0 -10.10153,-4.5226 -10.10153,-10.10152 0,-5.57892 4.52261,-10.10153 10.10153,-10.10153 5.57892,0 10.10152,4.52261 10.10152,10.10153 z"
-         transform="matrix(0.51084558,0,0,0.51084558,13.518379,843.80386)" />
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         transform="matrix(0.51084558,0,0,0.51084558,29.506299,843.80386)"
-         d="m 221.22341,519.00165 c 0,5.57892 -4.5226,10.10152 -10.10152,10.10152 -5.57892,0 -10.10153,-4.5226 -10.10153,-10.10152 0,-5.57892 4.52261,-10.10153 10.10153,-10.10153 5.57892,0 10.10152,4.52261 10.10152,10.10153 z"
-         sodipodi:ry="10.101525"
-         sodipodi:rx="10.101525"
-         sodipodi:cy="519.00165"
-         sodipodi:cx="211.12189"
-         id="path3772"
-         style="fill:none;stroke:#003380;stroke-width:1.42117310000000008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         sodipodi:type="arc" />
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         sodipodi:type="arc"
-         style="fill:none;stroke:#003380;stroke-width:1.42117310000000008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="path3774"
-         sodipodi:cx="211.12189"
-         sodipodi:cy="519.00165"
-         sodipodi:rx="10.101525"
-         sodipodi:ry="10.101525"
-         d="m 221.22341,519.00165 c 0,5.57892 -4.5226,10.10152 -10.10152,10.10152 -5.57892,0 -10.10153,-4.5226 -10.10153,-10.10152 0,-5.57892 4.52261,-10.10153 10.10153,-10.10153 5.57892,0 10.10152,4.52261 10.10152,10.10153 z"
-         transform="matrix(0.51084558,0,0,0.51084558,45.494218,843.80386)" />
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         transform="matrix(0.51084558,0,0,0.51084558,13.518379,864.23769)"
-         d="m 221.22341,519.00165 c 0,5.57892 -4.5226,10.10152 -10.10152,10.10152 -5.57892,0 -10.10153,-4.5226 -10.10153,-10.10152 0,-5.57892 4.52261,-10.10153 10.10153,-10.10153 5.57892,0 10.10152,4.52261 10.10152,10.10153 z"
-         sodipodi:ry="10.101525"
-         sodipodi:rx="10.101525"
-         sodipodi:cy="519.00165"
-         sodipodi:cx="211.12189"
-         id="path3776"
-         style="fill:none;stroke:#003380;stroke-width:1.42117310000000008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         sodipodi:type="arc" />
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         sodipodi:type="arc"
-         style="fill:none;stroke:#003380;stroke-width:1.42117310000000008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="path3778"
-         sodipodi:cx="211.12189"
-         sodipodi:cy="519.00165"
-         sodipodi:rx="10.101525"
-         sodipodi:ry="10.101525"
-         d="m 221.22341,519.00165 c 0,5.57892 -4.5226,10.10152 -10.10152,10.10152 -5.57892,0 -10.10153,-4.5226 -10.10153,-10.10152 0,-5.57892 4.52261,-10.10153 10.10153,-10.10153 5.57892,0 10.10152,4.52261 10.10152,10.10153 z"
-         transform="matrix(0.51084558,0,0,0.51084558,29.506299,864.23769)" />
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         transform="matrix(0.51084558,0,0,0.51084558,45.494218,864.23769)"
-         d="m 221.22341,519.00165 c 0,5.57892 -4.5226,10.10152 -10.10152,10.10152 -5.57892,0 -10.10153,-4.5226 -10.10153,-10.10152 0,-5.57892 4.52261,-10.10153 10.10153,-10.10153 5.57892,0 10.10152,4.52261 10.10152,10.10153 z"
-         sodipodi:ry="10.101525"
-         sodipodi:rx="10.101525"
-         sodipodi:cy="519.00165"
-         sodipodi:cx="211.12189"
-         id="path3780"
-         style="fill:none;stroke:#003380;stroke-width:1.42117310000000008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         sodipodi:type="arc" />
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 174.36084,1138.0706 c -0.53621,0.134 -1.07241,0.2681 0,0 z"
-         inkscape:path-effect="#path-effect3861"
-         id="path3859"
-         d="m 174.36084,1138.0706 0,0"
-         style="fill:#f8f9f9;fill-opacity:1;fill-rule:evenodd;stroke:#003380;stroke-width:0.72600001000000003;stroke-miterlimit:4;stroke-opacity:0.67058823999999995;stroke-dasharray:none;display:inline" />
-      <g
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         transform="matrix(0.36816536,0,0,0.42620989,-270.59974,810.60605)"
-         id="g3834"
-         style="display:inline;stroke:#003380">
-        <g
-           id="g5287"
-           transform="translate(771.12741,-362.11738)"
-           style="stroke:#003380;stroke-opacity:1">
-          <g
-             id="g6916"
-             transform="translate(15.732949,1.4983761)"
-             inkscape:export-filename="/home/dany/data/professional/phpcompta-noalyss/doc-image-logo/new-logo/noalyss-web5.png"
-             inkscape:export-xdpi="599"
-             inkscape:export-ydpi="599"
-             style="stroke:#003380;stroke-opacity:1">
-            <g
-               transform="translate(-1.8995956,20.879914)"
-               style="fill:#000000;fill-opacity:0;stroke:#003380;stroke-opacity:1"
-               id="g5284">
-              <path
-                 inkscape:export-filename="/home/dany/data/professional/phpcompta-noalyss/doc-image-logo/new-logo/noalyss-web5.png"
-                 inkscape:export-ydpi="599"
-                 inkscape:export-xdpi="599"
-                 sodipodi:nodetypes="cccccc"
-                 inkscape:connector-curvature="0"
-                 inkscape:original-d="m 191.70307,1059.4468 c 13.46772,-108.56263 45.84195,-117.49764 45.84195,-117.49764 609.16816,-63.20383 133.74621,171.62914 83.7126,190.70824 l 1.1011,-21.5026 20.28968,-175.46943 c 121.325,-87.26119 61.07045,67.95553 134.35537,0.46177"
-                 inkscape:path-effect="#path-effect3997"
-                 id="path3995"
-                 d="m 191.70307,1059.4468 45.84195,-117.49764 83.7126,190.70824 1.1011,-21.5026 20.28968,-175.46943 134.35537,0.46177"
-                 style="fill:#000000;fill-opacity:0;stroke:#003380;stroke-width:22.74668884000000091;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            </g>
-          </g>
-        </g>
-        <g
-           style="stroke:#003380;stroke-width:18.83109664999999922;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           transform="translate(771.12741,-362.11738)"
-           id="g3826">
-          <g
-             style="stroke:#003380;stroke-width:18.83109664999999922;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             inkscape:export-ydpi="599"
-             inkscape:export-xdpi="599"
-             inkscape:export-filename="/home/dany/data/professional/phpcompta-noalyss/doc-image-logo/new-logo/noalyss-web5.png"
-             transform="translate(15.732949,1.4983761)"
-             id="g3828">
-            <g
-               id="g3830"
-               style="fill:#000000;fill-opacity:0;stroke:#003380;stroke-width:18.83109664999999922;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               transform="translate(-1.8995956,20.879914)">
-              <path
-                 style="fill:#000000;fill-opacity:0;stroke:#003380;stroke-width:18.83109664999999922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-                 d="m 191.13372,1058.9549 46.4113,-116.02212 83.7126,189.72462 1.1011,-21.5026 20.28968,-175.46943 133.78602,-0.03"
-                 id="path3832"
-                 inkscape:path-effect="#path-effect3997"
-                 inkscape:original-d="m 191.13372,1058.9549 46.4113,-116.02212 c 0,0 133.74621,170.64552 83.7126,189.72462 l 1.1011,-21.5026 20.28968,-175.46943 c 121.325,-87.26119 60.5011,67.46373 133.78602,-0.03"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccc"
-                 inkscape:export-xdpi="599"
-                 inkscape:export-ydpi="599"
-                 inkscape:export-filename="/home/dany/data/professional/phpcompta-noalyss/doc-image-logo/new-logo/noalyss-web5.png" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <path
-         inkscape:export-ydpi="599"
-         inkscape:export-xdpi="599"
-         inkscape:export-filename="/home/dany/developpement/phpcompta/noalyss/html/image/logo6820.png"
-         inkscape:transform-center-y="-25.014409"
-         inkscape:transform-center-x="4.3352937"
-         transform="matrix(-0.02694076,1.4783429,-1.3802706,-0.02831418,492.38794,966.38714)"
-         d="m 72.240372,254.81686 5.028394,8.09605 -6.427252,-7.04076 -2.232412,9.29489 0.446711,-9.54087 -8.090641,5.01167 7.002779,-6.44997 -9.282834,-2.18751 9.559795,0.43983 -5.017192,-8.10909 6.444162,7.05015 2.156969,-9.26763 -0.396869,9.49219 8.07837,-4.97306 -7.037073,6.41136 9.308436,2.20893 z"
-         inkscape:randomized="0.002"
-         inkscape:rounded="-3.1571967e-16"
-         inkscape:flatsided="false"
-         sodipodi:arg2="0.92442315"
-         sodipodi:arg1="0.53172407"
-         sodipodi:r2="11.640957"
-         sodipodi:r1="2.3281915"
-         sodipodi:cy="253.6217"
-         sodipodi:cx="70.236176"
-         sodipodi:sides="8"
-         id="path8179"
-         style="fill:#ffffff;fill-opacity:1;stroke:#003380;stroke-width:0.50814276999999997;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(1.7188823,0,0,1.3279735,49.555559,1024.4529)"
-         d="m 44.85756,107.43829 c 0,5.67259 -5.818559,10.27113 -12.996116,10.27113 -7.177556,0 -12.996115,-4.59854 -12.996115,-10.27113 0,-5.67258 5.818559,-10.27112 12.996115,-10.27112 7.177557,0 12.996116,4.59854 12.996116,10.27112 z"
-         sodipodi:ry="10.271124"
-         sodipodi:rx="12.996116"
-         sodipodi:cy="107.43829"
-         sodipodi:cx="31.861444"
-         id="path3269-3"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#003380;stroke-width:0.66188455000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-         sodipodi:type="arc" />
-      <path
-         id="path3269-6"
-         d="m 124.02946,1138.6144 c -12.33737,0 -22.34375,6.092 -22.34375,13.625 0,5.9836 6.31493,11.0681 15.09375,12.9063 -0.66505,1.2922 -1.0625,2.6674 -1.0625,4.0937 0,7.5331 10.00638,13.625 22.34375,13.625 12.33738,0 22.34375,-6.0919 22.34375,-13.625 0,-1.5076 -0.41648,-2.9566 -1.15625,-4.3125 8.28206,-1.9956 14.15625,-6.9213 14.15625,-12.6875 0,-7.533 -10.00638,-13.625 -22.34375,-13.625 -5.08916,0 -9.77507,1.0316 -13.53125,2.7813 -3.75186,-1.7425 -8.42245,-2.7813 -13.5,-2.7813 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#003380;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         transform="matrix(1.7188823,0,0,1.3279735,114.32652,1021.9376)"
-         d="m 44.85756,107.43829 c 0,5.67259 -5.818559,10.27113 -12.996116,10.27113 -7.177556,0 -12.996115,-4.59854 -12.996115,-10.27113 0,-5.67258 5.818559,-10.27112 12.996115,-10.27112 7.177557,0 12.996116,4.59854 12.996116,10.27112 z"
-         sodipodi:ry="10.271124"
-         sodipodi:rx="12.996116"
-         sodipodi:cy="107.43829"
-         sodipodi:cx="31.861444"
-         id="path3269-7"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#003380;stroke-width:0.66188455000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-         sodipodi:type="arc" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:27.68781281000000050px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#003380;stroke-width:0.79344051999999998;stroke-opacity:1;font-family:Danube;-inkscape-font-specification:Danube"
-       x="82.762955"
-       y="830.32202"
-       id="text3959"
-       sodipodi:linespacing="125%"
-       transform="scale(0.809529,1.2352862)"><tspan
-         sodipodi:role="line"
-         id="tspan3961"
-         x="82.762955"
-         y="830.32202"
-         style="stroke-width:0.79344051999999998;stroke:#003380">Noalyss comptabilite</tspan></text>
-  </g>
-</svg>
--- a/html/image/logo6720.png
+++ b/html/image/logo6720.png
--- a/html/image/logo7.png
+++ b/html/image/logo7.png
--- a/html/image/logo7000.png
+++ b/html/image/logo7000.png
--- a/html/image/logout.png
+++ b/html/image/logout.png
--- a/html/image/magnifier13.png
+++ b/html/image/magnifier13.png
--- a/html/image/numbered_list.gif
+++ b/html/image/numbered_list.gif
--- a/html/image/orange_flower.gif
+++ b/html/image/orange_flower.gif
--- a/html/image/outdent.gif
+++ b/html/image/outdent.gif
--- a/html/image/param.png
+++ b/html/image/param.png
--- a/html/image/paste.gif
+++ b/html/image/paste.gif
--- a/html/image/popout.png
+++ b/html/image/popout.png
--- a/html/image/preference.png
+++ b/html/image/preference.png
--- a/html/image/print.png
+++ b/html/image/print.png
--- a/html/image/redo.gif
+++ b/html/image/redo.gif
--- a/html/image/right_just.gif
+++ b/html/image/right_just.gif
--- a/html/image/search.png
+++ b/html/image/search.png
--- a/html/image/smiley.gif
+++ b/html/image/smiley.gif
--- a/html/image/spellcheck.gif
+++ b/html/image/spellcheck.gif
--- a/html/image/spirale2.gif
+++ b/html/image/spirale2.gif
--- a/html/image/textcolor.gif
+++ b/html/image/textcolor.gif
--- a/html/image/trash-24.gif
+++ b/html/image/trash-24.gif
--- a/html/image/undefined.png
+++ b/html/image/undefined.png
--- a/html/image/underline.gif
+++ b/html/image/underline.gif
--- a/html/image/undo.gif
+++ b/html/image/undo.gif
--- a/html/image/warning.png
+++ b/html/image/warning.png
--- a/html/image/x-office-calendar.png
+++ b/html/image/x-office-calendar.png
--- a/html/index.css
+++ b/html/index.css
@ -1,103 +1,280 @@

 BODY {
-background-color:white;
-font-size:12px;
-font-family:sans-serif,arial;
-color:blue;
+    background-color:white;
+    font-size:12px;
+    font-family:sans-serif,arial;
+    color:blue;
 }
 .cell , #recover_box p{
-font-size : 18px;
+    font-size : 18px;
 }
 .remark {
-border: solid black 1px;
-font-family:sans-serif;
-font-size: 9px;
-color:blue;
-width:200px;
-padding:3px;
+    border: solid black 1px;
+    font-family:sans-serif;
+    font-size: 9px;
+    color:blue;
+    width:200px;
+    padding:3px;
 }

 .gras {
-font-size:12px;
-font-family:sans-serif,arial;
-color:red;
+    font-size:12px;
+    font-family:sans-serif,arial;
+    color:red;

 }
 .input_text {
-border:1px solid blue;
-margin:1px;
-padding: 10px;
-border-radius: 4px;
-font-size:16px;
-font-size:1rem;
+    border:1px solid blue;
+    margin:1px;
+    padding: 10px;
+    border-radius: 4px;
+    font-size:16px;
+    font-size:1rem;
 }
 .button {
-color:white;
-font-weight: bold;
-border:0px;
-text-decoration:none;
-font-family: helvetica,arial,sans-serif;
-background-image: url("image/bg-submit2.gif");
-background-repeat: repeat-x repeat-y;
-background-position: left;
-text-decoration:none;
-font-family: helvetica,arial,sans-serif;
-border-width:0px;
-padding:2px 4px 2px 4px;
-cursor:pointer;
-margin:31px 2px 1px 2px;
-moz-border-radius:2px 2px;
-border-radius:2px 2px;
-font-size : 1rem;
-margin-bottom: 10px;
+    color:white;
+    font-weight: bold;
+    border:0px;
+    text-decoration:none;
+    font-family: helvetica,arial,sans-serif;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x repeat-y;
+    background-position: left;
+    text-decoration:none;
+    font-family: helvetica,arial,sans-serif;
+    border-width:0px;
+    padding:2px 4px 2px 4px;
+    cursor:pointer;
+    margin:31px 2px 1px 2px;
+    -moz-border-radius:2px 2px;
+    border-radius:2px 2px;
+    font-size : 1rem;
+    margin-bottom: 10px;
 }
 .button:hover {
-cursor:pointer;
-background-color:white;
-border-style:  solid;
-border-width:  0px;
-background-image: url("image/bg-submit3.gif");
-background-repeat: repeat-x repeat-y;
+    cursor:pointer;
+    background-color:white;
+    border-style:  solid;
+    border-width:  0px;
+    background-image: url("image/bg-submit3.gif");
+    background-repeat: repeat-x repeat-y;
 }
+#logo_id {
+    width:19%;
+}
+#alternate_browser {
+    display : none;
+}
+#logo_id {
+    position:absolute;
+    z-index:-1;
+    height:30%;
+    width:auto;
+    left:0px;
+
+}
+#login_frm {
+    position:absolute;
+    left:15%;
+    top:50%;
+}
+.input_text {
+    width:8em;
+}
+#recover_link {
+    position:absolute;
+    margin-bottom:30px;
+    width: 100%;
+}
+
+#alternate_browser {
+    display : none;
+}
+#logo_id {
+    position:absolute;
+    z-index:-1;
+    height:45%;
+    width:auto;
+    left:0px;
+
+}
+#login_frm {
+    position:absolute;
+    left:15%;
+    top:50%;
+}
+.input_text {
+    width:8em;
+}
+#recover_link {
+    position:absolute;
+    bottom:30px;
+    width: 100%;
+}
+#recover_box {
+
+    display: none;
+    position: absolute;
+    top: 15%;
+    z-index: 1;
+    border: 2px solid blue;
+    width: 96%;
+    margin-left: 1%;
+    background-color: whitesmoke;
+}
+
@media only screen and (max-width : 900px) {
    #alternate_browser {
        display : none;
    }
-   #logo_id {
-    height:160px;
+    #logo_id {
+        position:absolute;
+        z-index:-1;
+        height:auto;
+        width:60%;
+        left:20%;
+        top:5%;
+
    }
    .input_text {
-        width:8em;
+        width:12rem;
+    }
+    #recover_box {
+
+        display:none;
+        position: absolute;
+        top: 15%;
+        z-index: 1;
+        border: 2px solid blue;
+        width: 96%;
+        left: 1%;
+        background-color: whitesmoke;
+
+    }
+    #login_frm {
+        position:absolute;
+        left:25%;
+        right:35%;
+        top:50%;
    }
- 
 }
-@media only screen and (min-width : 1201px) {
+@media only screen and (min-width : 901px) {
    #alternate_browser {
        position:absolute;
        bottom: 0px;
        left:0px;
-        z-index: -1
+        z-index: -1;
+        display : block;
    }
    #logo_id {
-    width:608px;
-    z-index:-1;
-    position:absolute;
-    top:230px;
-    left:688px;
-    height: 125px;
+        z-index:-1;
+        position:absolute;
+        width:19%;
+        left:7%;
+        top:9%;
    }
    #login_frm {
        position:absolute;
-        left:768px;
-        top:333px;
+        left:30%;
+        top:25%;
    }
    .input_text {
        width: 24em;
        width: 24rem;
    }
-   #recover_link {
-    position:absolute;
-    margin-top:397px;
-    left:539px;
+    #recover_link {
+        position:absolute;
+        margin-top:397px;
+        left:539px;
+        background-color: white;
+    }
 }
+@media only screen and (min-width : 1100px) {
+    #alternate_browser {
+        position:absolute;
+        bottom: 0px;
+        left:0px;
+        z-index: -1;
+        display : block;
+    }
+    #logo_id {
+        z-index:-1;
+        position:absolute;
+        width:19%;
+        left:8%;
+        top:19.5%;
+    }
+    #login_frm {
+        position:absolute;
+        left:25%;
+        top:30%;
+    }
+    .input_text {
+        width: 24em;
+        width: 24rem;
+    }
+    #recover_link {
+        position:absolute;
+        top:397px;
+        left:539px;
+        background-color: white;
+        width:auto;
+    }
+    #recover_box {
+
+        display: none;
+        position: absolute;
+        top: 15%;
+        z-index: 1;
+        border: 2px solid blue;
+        width: 96%;
+        margin-left: 1%;
+        background-color: whitesmoke;
+
+    }
+}
+@media only screen and (min-width : 1100px) {
+    #alternate_browser {
+        position:absolute;
+        bottom: 0px;
+        left:0px;
+        z-index: -1;
+        display : block;
+    }
+    #logo_id {
+        z-index:-1;
+        position:absolute;
+        width:19%;
+        left:25%;
+        top:19.5%;
+    }
+    #login_frm {
+        position:absolute;
+        left:39%;
+        top:28%;
+    }
+    .input_text {
+        width: 24em;
+        width: 24rem;
+    }
+    #recover_link {
+        position:absolute;
+        top:55%;
+        left:55%;
+        background-color: white;
+        margin-top:0px;
+    }
+    #recover_box {
+
+        display: none;
+        position: absolute;
+        top: 40%;
+        z-index: 1;
+        border: 2px solid blue;
+        width: 30%;
+        margin-left: 25%;
+        background-color: whitesmoke;
+
+    }
+
 }
--- a/html/index.php
+++ b/html/index.php
@ -132,12 +132,14 @@
 * </ul>
 */

+
 if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'include'.DIRECTORY_SEPARATOR.'config.inc.php'))
 {
    header("Location: install.php",true, 307);
    exit(0);
 }

+
 echo '<!doctype html><HTML>
 <head>
 <TITLE> NOALYSS </TITLE>
@ -153,11 +155,21 @@ require_once '../include/constant.php';
 require_once '../include/config.inc.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 if (file_exists("install.php")&& ! DEBUG ) {
-    /*
-     * This file shouldn't exist
-     */
-    echo _("Le fichier ".__DIR__."/install.php est encore présent, vous devez l'effacer avant d'utiliser NOALYSS");
-    return;
+    // At the end of the installation procedure , the install file must be removed
+    if (isset($_GET['remove_install'])) {
+        if (is_writable(__DIR__."/install.php") ) {
+            unlink(__DIR__."/install.php");
+        }
+    }
+    // if removed failed then
+    if (file_exists("install.php") )
+    {
+        /*
+        * This file shouldn't exist
+        */
+       echo _("Le fichier ".__DIR__."/install.php est encore présent, vous devez l'effacer avant d'utiliser NOALYSS");
+       return;
+    }
 }
 if ( strlen(domaine) > 0 )
 {
@ -175,7 +187,7 @@ if (isset ($_REQUEST['reconnect']) && isset ($_REQUEST['backurl'])) {
 }
 echo '
 <span style="background-color:#879ed4;color:white;padding-left:4px;padding-right:4px;">
-Noalyss NOALYSS_VERSION - '.$my_domain.'
+version  NOALYSS_VERSION - '.$my_domain.'
 </span>
 <BR>
 <BR>
@ -183,7 +195,7 @@ Noalyss NOALYSS_VERSION - '.$my_domain.'

 <BR>
 <center>
-<IMG SRC="image/logo-noalyss-7000-6.svg" id="logo_id" alt="NOALYSS">
+<IMG SRC="image/logo7000.png" style="opacity:0.4" id="logo_id" alt="NOALYSS">
 <BR>
 <BR>
 <BR>
@ -233,12 +245,12 @@ echo '

 ?>
 </table>
-
+</center>
 </form>
 <?php if (defined("RECOVER")) : ?>
    <a id="recover_link" href="#">Mot de passe oublié ? </a>
    
-<div id="recover_box" style="display:none;position:absolute;top:40%;z-index:1;border:solid blue 2px;width:30%;margin-left: 25%;background-color: whitesmoke">
+<div id="recover_box">
    <span style="display:block;font-size:120%;padding:10px">Indiquez votre login ou votre email <span style="cursor: pointer;background-color: white;color:block;top:-5px;float: right;position:relative;right:-5px" id="close"><a ref="#" id="close_link"><?php echo SMALLX?></a></span></span>
            <form method="POST">
                <input type="hidden" value="send_email" name="id">
--- a/html/install.php
+++ b/html/install.php
@ -67,12 +67,18 @@ session_start();
    .warning,.error {
        color:red;
    }
+    img:hover {
+    cursor: inherit;
+    background-color: inherit;
+    color: inherit;
+}
 </style>
 </head>
 <body>
 <p align="center">
-  <IMG SRC="image/logo6820.png" style="width: 365px;height: 150px" alt="NOALYSS">
+  <IMG SRC="image/logo7000.png" style="width: 400px;z-index:-1;position:fixed;top:30px;rigth:50px;opacity: 0.2" alt="NOALYSS">
 </p>
+<h1>NOALYSS : comptabilité - accountancy </h1>

 <?php
 /*
@ -100,6 +106,7 @@ session_start();
 *        This file is included in each release  for a new upgrade
 *
 */
+
 if ( ! isset($_GET['lang'])){
 ?>
 <p>
@ -132,7 +139,7 @@ if ( $_GET['lang'] == "en_US.utf8" || $_GET['lang']=='fr_FR.utf8')
 </script>
 <script>
 var content=new Array();    
-content[200]="<?php echo _("Indiquez ici le récuterpertoire où les documents temporaires peuvent être sauvés exemple c:/temp, /tmp")?>";
+content[200]="<?php echo _("Indiquez ici le répertoire où les documents temporaires peuvent être sauvés exemple c:/temp, /tmp")?>";
 content[201]="<?php echo _("Désactiver le changement de langue (requis pour MacOSX)")?>";
 content[202]="<?php echo _("Le chemin vers le repertoire contenant psql, pg_dump...")?>";
 content[203]="<?php echo _("Utilisateur de la base de donnée postgresql")?>";
@ -204,8 +211,8 @@ if (isset($_POST['save_config'])) {
  // -----
  if ( $cnx !== false ) {
       echo '<h1>'._('Important').'</h1>';
-       echo '<p>'._('Utilisateur administrateur'),' ',$cadmin,'</p>';
-       echo '<p>',_('Mot de passe'),' phpcompta','</p>';
+       echo '<p style="font-size:120%">'._('Utilisateur administrateur'),' ','<span style="color:red"> ',$cadmin,'</span>','</p>';
+       echo '<p style="font-size:120%">',_('Mot de passe'),'<span style="color:red"> phpcompta </span>','</p>';
      // Create the db
      if (is_writable(NOALYSS_INCLUDE)) { 
        $url=config_file_create($_POST,1,$os); 
@ -277,10 +284,10 @@ require_once NOALYSS_INCLUDE.'/lib/database.class.php';
 // we shouldn't use it 
 // if ( defined ("MULTI") && MULTI==1) { create_htaccess();}

-echo '<h1 class="title">'._('Configuration').'</h1>';
+echo '<h1>'._('Configuration').'</h1>';
 ?>
 <h2>Info</h2>
-<?php echo _('Vous utilisez le domaine'),domaine; ?>
+<?php echo _('Vous utilisez le domaine')," ",domaine; ?>
 <h2>PHP</h2>
 <?php

@ -312,73 +319,33 @@ echo "<li>";

 echo "</li>";
 }
+//---------------------------------------------------------------------------------------
+// Check php modules
+//---------------------------------------------------------------------------------------
 $module=get_loaded_extensions();

-echo "<li>";
 $str_error_message=_('Vous devez installer ou activer l\'extension').'<span style="font-weight:bold"> %s </span>';
-if (  in_array('mbstring',$module) == false ){
-  echo 'module mbstring '.$failed;
-  echo '<span class="warning">',
-        sprintf($str_error_message, "mbstring"),
-        ' </span>';
-  $flag_php++;
-} else echo 'module mbstring '.$succeed;
-echo "</li>";

-echo "<li>";
-if (  in_array('pgsql',$module) == false )
-{
-  echo 'module PGSQL '.$failed;
-   echo '<span class="warning">',
-        sprintf($str_error_message, "psql"),
-        ' </span>';
-  $flag_php++;
-} else echo 'module PGSQL '.$succeed;
-echo "</li>";
+$a_need_module=array("mbstring","pgsql","bcmath","gettext","zip","gd","dom","xml","SimpleXML","xmlwriter","xmlreader");

-echo "<li>";
-if ( in_array('bcmath',$module) == false )
-{
-  echo 'module BCMATH ok '.$failed;
-  echo '<span class="warning">',
-        sprintf($str_error_message, "bcmath"),
-        ' </span>';
-  $flag_php++;
-} else echo 'module BCMATH '.$succeed;
-echo "</li>";
+$nb_need_module=count($a_need_module);

-echo "<li>";
-if (in_array('gettext',$module) == false )
+for ($m=0;$m<$nb_need_module;$m++)
 {
-  echo 'module GETTEXT '.$failed;
-   echo '<span class="warning">',
-        sprintf($str_error_message, "gettext"),
-        ' </span>';
-  $flag_php++;
-} else echo 'module GETTEXT '.$succeed;
-echo "</li>";
-
-echo "<li>";
-if ( in_array('zip',$module) == false )
-{
-  echo 'module ZIP '.$failed;
-   echo '<span class="warning">',
-        sprintf($str_error_message, "zip"),
-        ' </span>';
-  $flag_php++;
-} else echo 'module ZIP '.$succeed;
-echo "</li>";
-echo "<li>";
-if ( in_array('gd',$module) == false )
-{
-  echo 'module GD '.$failed;
-   echo '<span class="warning">',
-        sprintf($str_error_message, "gd"),
-        ' </span>';
-  $flag_php++;
-} else echo 'module GD '.$succeed;
-echo "</li>";
-
+    
+    echo "<li>";
+    if (  in_array($a_need_module[$m],$module) == false ){
+      echo 'module '.$a_need_module[$m].$failed;
+      echo '<span class="warning">',
+            sprintf($str_error_message, $a_need_module[$m]),
+            ' </span>';
+      $flag_php++;
+    } else echo 'module '.$a_need_module[$m].$succeed;
+    echo "</li>";
+}
+//---------------------------------------------------------------------------------------
+// Max_execution_time , can be overriden
+//---------------------------------------------------------------------------------------
 if ( ini_get("max_execution_time") < 60 )  {
        echo "<li>";
        echo _('Avertissement').' : '.$failed;
@ -396,7 +363,15 @@ if ( ini_get("register_globals") == true)  {
 	$flag_php++;
 }
 echo "</li>";
-
+// Check for open_basedir
+if ( ini_get("open_basedir") != "") {
+        echo "<li>";
+        echo _('Avertissement').' : '.$failed;
+	print '<span class="warning"> '._('open_basedir empêche certaines fonctions de Noalyss,mettez-le à vide ').'</span>';
+        echo "</li>";
+	$flag_php++;
+    
+}
 echo "</ul>";
 if ( $flag_php==0 ) {
 	echo '<p class="info"> '._('php.ini est bien configuré ').$succeed.'</p>';
@ -422,13 +397,13 @@ $sql="select setting from pg_settings where name='server_version'";
 $version=$cn->get_value($sql);

 echo _("Version base de données :"),$version;
-
-if ( $version[0] < 9 )
+$majeur=explode(".",$version);
+if ( $majeur[0] < 9 )
  {
 ?>
-  <p><?php echo $failed . _(" Vous devez absolument utiliser au minimum une version 8.4 de PostGresql, si votre distribution n'en
+  <p><?php echo $failed . _(" Vous devez absolument utiliser au minimum une version 9.0 de PostGresql, si votre distribution n'en
 offre pas, installez-en une en la compilant. Lisez attentivement la notice sur postgresql.org pour migrer
-vos bases de donn&eacute;es")?>
+vos bases de données")?>
 </p>
 <?php exit(); //'
 } else {
@ -498,13 +473,19 @@ if ( ! isset($_POST['go']) ) {
 </span>
 <?php
 }
-if ( ! isset($_POST['go']) )
-	exit();
+if (!isset($_POST['go']))
+{
+    exit();
+}
 // Check if account_repository exists
-if (!defined("MULTI") || (defined("MULTI") && MULTI == 1))
-        $account = $cn->count_sql("select * from pg_database where datname=lower('" . domaine . "account_repository')");
+if (!defined("MULTI")||(defined("MULTI")&&MULTI==1))
+{
+    $account=$cn->count_sql("select * from pg_database where datname=lower('".domaine."account_repository')");
+}
 else
-        $account=1;
+{
+    $account=1;
+}

 // Create the account_repository
 if ($account == 0 ) {
@ -519,16 +500,22 @@ if ($account == 0 ) {
  $cn->execute_script(NOALYSS_INCLUDE."/sql/account_repository/constraint.sql");
  /* update name administrator */
  $cadmin=NOALYSS_ADMINISTRATOR;
-  $cn->exec_sql("update ac_users set use_login=$1 where use_id=1",
+  $cn->exec_sql("update ac_users set use_login=$1,use_active=1 where use_id=1",
              array(strtolower($cadmin)));

  $cn->commit($cn);

- if ( ! DEBUG) ob_end_clean();
+  if (!DEBUG)
+    {
+        ob_end_clean();
+    }

-  echo _("Creation of Modele 1");
-  if ( ! DEBUG) ob_start();
-  $cn->exec_sql("create database ".domaine."mod1 encoding='utf8'");
+    echo _("Creation of Modele 1");
+  if (!DEBUG)
+    {
+        ob_start();
+    }
+    $cn->exec_sql("create database ".domaine."mod1 encoding='utf8'");

  $cn=new Database(1,'mod');
  $cn->start();
@ -537,9 +524,12 @@ if ($account == 0 ) {
  $cn->execute_script(NOALYSS_INCLUDE.'/sql/mod1/constraint.sql');
  $cn->commit();

-  if ( ! DEBUG) ob_end_clean();
+  if (!DEBUG)
+    {
+        ob_end_clean();
+    }

-  echo _("Creation of Modele 2");
+    echo _("Creation of Modele 2");
  $cn->exec_sql("create database ".domaine."mod2 encoding='utf8'");
  $cn=new Database(2,'mod');
  $cn->start();
@ -568,8 +558,8 @@ if  (defined("MULTI") && MULTI == 0)
 	$db = new Database();
 	if ($db->exist_table("repo_version") == false) 
 	{
-            if ( ! DEBUG) { ob_start();  }
-            $db->execute_script(NOALYSS_INCLUDE.'/sql/mono/mono.sql');
+                        if ( ! DEBUG) { ob_start();  }
+                        $db->execute_script(NOALYSS_INCLUDE.'/sql/mono/mono.sql');
                     
            if ( ! DEBUG) ob_end_clean();
 	}
@ -624,22 +614,24 @@ if  (defined("MULTI") && MULTI == 0)
 * If multi folders
 */
 define ('ALLOWED',1);
-$_GET['sb']="upg_all";
+define ('ALLOWED_ADMIN',1);
+
 $rep=new Database();
-if (defined (NOALYSS_ADMINISTRATOR) )
-        $rep->exec_sql("update ac_users set use_login=$1 where use_id=1",
-              array(strtolower(NOALYSS_ADMINISTRATOR)));
-require NOALYSS_INCLUDE."/upgrade.inc.php";
+if (defined(NOALYSS_ADMINISTRATOR))
+{
+    $rep->exec_sql("update ac_users set use_login=$1 where use_id=1", array(strtolower(NOALYSS_ADMINISTRATOR)));
+}
+ Dossier::upgrade();
 echo '<h1>'._('Important').'</h1>';
 echo '<p>'._('Utilisateur administrateur'),' ',NOALYSS_ADMINISTRATOR,'</p>';
        
 echo "<h2 class=\"warning\">";
-printf (" VOUS DEVEZ EFFACER CE FICHIER %s",__FILE__);
+printf (_("VOUS DEVEZ EFFACER CE FICHIER %s"),__FILE__);
 echo "</h2>";

- echo "<p class=\"info\">"._("Tout est install&eacute;")." ". $succeed;
+ echo "<p class=\"info\">"._("Tout est installé")." ". $succeed;
 ?>
 </p>
 <p style="text-align: center">
-<A style="display:inline;margin:10px;padding:10px;" class="button" HREF="index.php"><?php echo _('Connectez-vous à NOALYSS')?></A>
+<A style="display:inline;margin:10px;padding:10px;" class="button" HREF="index.php?remove_install"><?php echo _("Essai effacement install.php et se connecter à NOALYSS")?></A>
 </p>
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@ -656,13 +656,13 @@ function go_next_concerned()
 * @param {type} dossier
 * @returns {undefined}
 */
-function view_history_account(p_value, dossier)
+function view_history_account(p_value, dossier,p_exercice)
 {
    layer++;
    var idbox = 'det' + layer;
    var popup = {'id': idbox, 'cssclass': 'inner_box', 'html': loading(), 'drag': false};

-    var querystring={'gDossier':dossier,'act':'de','pcm_val':p_value,'div':idbox,'l':layer,'op':'history'};
+    var querystring={'gDossier':dossier,'act':'de','pcm_val':p_value,'div':idbox,'l':layer,'op':'history','exercice':p_exercice};
    waiting_box();

    var action = new Ajax.Request(
@ -681,6 +681,38 @@ function view_history_account(p_value, dossier)
            }
    );

+}
+/**
+ * @brief View the history of an account
+ * @param {type} p_value
+ * @param {type} dossier
+ * @returns {undefined}
+ */
+function view_history_anc_account(p_value, dossier,p_exercice)
+{
+    layer++;
+    var idbox = 'det' + layer;
+    var popup = {'id': idbox, 'cssclass': 'inner_box', 'html': loading(), 'drag': false};
+
+    var querystring={'gDossier':dossier,'op':'history_anc_account','po_id':p_value,'div':idbox,'l':layer,'act':'history','exercice':p_exercice};
+    waiting_box();
+
+    var action = new Ajax.Request(
+            "ajax_misc.php",
+            {
+                method: 'get',
+                parameters: querystring,
+                onFailure: error_box,
+                onSuccess: function (req, xml)
+                {
+                    remove_waiting_box();
+                    add_div(popup);
+                    $(idbox).innerHTML=req.responseText;
+                    $(idbox).style.top = calcy(140 + (layer * 3)) + "px";
+                }
+            }
+    );
+
 }
 /**
 * @brief Change the view of account history
@ -696,7 +728,8 @@ function update_history_account(obj)
            "gDossier" : obj.gDossier,
            "pcm_val" : obj.pcm_val ,
            "ex" : obj.select.options[obj.select.selectedIndex].text,
-            "op":"history"
+            "op":"history",
+            "exercice":obj.exercice
        };
        waiting_box();
        var action = new Ajax.Request(
@ -722,7 +755,7 @@ function update_history_account(obj)
 /*!\brief Change the view of card history
 * \param p_value f_id of the card
 */
-function view_history_card(p_value, dossier)
+function view_history_card(p_value, dossier,p_exercice)
 {
    layer++;
    var idbox = 'det' + layer;
@ -735,7 +768,8 @@ function view_history_card(p_value, dossier)
         'f_id' : p_value , 
         'div' : idbox ,
          "l" : layer,
-          "op":"history"};
+          "op":"history",
+      "exercice":p_exercice};
    waiting_box();
    var action = new Ajax.Request(
            "ajax_misc.php",
@ -767,7 +801,8 @@ function update_history_card(obj)
            "gDossier" : obj.gDossier,
            "f_id" : obj.f_id ,
            "ex" : obj.select.options[obj.select.selectedIndex].text,
-            "op":"history"
+            "op":"history",
+            "exercice":obj.exercice
        };
        waiting_box();
        var action = new Ajax.Request(
--- a/html/js/anc_script.js
+++ b/html/js/anc_script.js
@ -338,9 +338,12 @@ function anc_remove_operation(p_dossier, p_oa_group)
                        p_oa_group, "gDossier":
                        p_dossier, "op": "remove_anc"};
            var queryString = encodeJSON(obj);
-            g(p_oa_group).style.display = 'none';
            var e = new Ajax.Request("ajax_misc.php",
-                    {method: 'get', parameters: queryString});
+                    {method: 'get', parameters: queryString,onSuccess:function req() {
+                            $("tr"+p_oa_group).remove();
+                    }
+                    
+             });
             
         } else
         {
--- a/html/js/calc.js
+++ b/html/js/calc.js
@ -27,6 +27,11 @@
 */
 var p_history="";
 var p_variable="";
+/**
+ * Compute and update the box 
+ * @see show_calc()
+ * @returns nothing
+ */
 // add input
 function cal()
 {
@ -59,23 +64,26 @@ function cal()
        return false;
    }
    p_history=p_variable+"="+result.toString()+'<br>'+p_history;
-    var str_sub="Total :"+p_variable+" = "+result.toString();
+    var str_sub="Total :"+p_variable+" = "+'<b>'+result.toString()+'</b>';
    this.document.getElementById("sub_total").innerHTML=str_sub;
    this.document.getElementById("listing").innerHTML=p_history;
-    this.document.getElementById('inp').value="";
+    this.document.getElementById('inp').value=result;
 }
 // Clean
 //
-function Clean()
+function CleanHistory()
 {
    this.document.getElementById('listing').innerHTML="";
-    this.document.getElementById('result').innerHTML="";
    this.document.getElementById('sub_total').innerHTML="";
    this.document.getElementById('inp').value="";
    this.document.getElementById('inp').focus();

 }
-
+function Clean() 
+{
+    this.document.getElementById('inp').value="";
+    this.document.getElementById('inp').focus();
+}
 function Compute()
 {
    var tot=0;
--- a/html/js/card.js
+++ b/html/js/card.js
@ -609,7 +609,9 @@ function select_card_type(obj)
                                      // Get all the category, 
                                      var answer=req.responseXML.getElementsByTagName("fiche_cat_item");
                                      if (answer.length == 0) {
-                                          alert_box(req.responseText);
+                                          removeDiv(content);
+                                          remove_waiting_box();
+                                          alert_box(getNodeText(req.responseXML.getElementsByTagName("code")[0]));
                                          return;
                                      }
                                      if ( answer.length == 1) {
@ -627,7 +629,7 @@ function select_card_type(obj)
 }
 /**
 *@brief Show a blank card
- *@param Form object (obj)
+ *@param obj Form object (obj)
 *       possible attribute :
 *        - filter is the filter but with a  fd_id list, -1 means there  is no filter
 *        - ref : reload the window after adding card
@ -723,14 +725,14 @@ function form_blank_card(obj)
 function save_card(obj)
 {
    var content=$(obj).ipopup;
-    var accounting= $(obj)['av_text25'];
-        var accounting= $(obj)['av_text5'];
-    if ( accounting.value.length > 40 ) {
+    var accounting= $(obj)['av_text5'];
+    if ( accounting && accounting.value.length > 40 ) {
      smoke.alert('Poste comptable trop grand');
      return false;
-        }
+    }
    // Data must be taken here
-    data=$('save_card').serialize(false);
+
+    var    data=$('save_card').serialize(false);
    waiting_box();
    var dossier=$('gDossier').value;
    var queryString='gDossier='+dossier;
--- a/html/js/controls.js
+++ b/html/js/controls.js
@ -220,7 +220,7 @@ Autocompleter.Base = Class.create({
  markNext: function() {
    if(this.index < this.entryCount-1) this.index++;
      else this.index = 0;
-    this.getEntry(this.index).scrollIntoView(false);
+    //this.getEntry(this.index).scrollIntoView(false);
  },

  getEntry: function(index) {
--- a/html/js/gestion.js
+++ b/html/js/gestion.js
@ -51,36 +51,7 @@ function remove_document(p_dossier,p_id)
 		);

 }
-/**
- *@brief update the description of an attached document of an action
- *@param dossier
- *@param dt_id id of the document (pk document:d_id)
-*/
-function update_document(p_dossier,p_id)
-{
-        var queryString={
-            "gDossier":p_dossier,
-            "a":"upd_doc",
-            "d_id":p_id,
-            'act':'RAW:document',
-            'value':$('input_desc_txt'+p_id).value
-        };
-	var action=new Ajax.Request (
-		"export.php",
-		{
-			method:'get',
-			parameters:queryString,
-			onFailure:errorRemoveDoc,
-			onSuccess:function(req){
-                                $('input_desc'+p_id).hide();
-                                $('print_desc'+p_id).innerHTML=$('input_desc_txt'+p_id).value+'<a class="line" id="desc'+p_id+'" onclick="javascript:show_description('+p_id+')">Modifier</a>';
-                                $('print_desc'+p_id).show();
-                        }
-		}

-		);
-    return false;
-}

 /**
 *@brief remove the concerned operation of an action
@ -377,7 +348,8 @@ function action_save_short()
        var str_hour=new String($('action_add_frm')['hour_event'].value);
        str_hour=str_hour.trim();
        
-        if ( str_hour.search(/^[0-9]{2}:[0-9]{2}$/) == -1 &&
+        if ( str_hour.trim() != "" 
+             && str_hour.search(/^[0-9]{2}:[0-9]{2}$/) == -1 &&
             str_hour.search(/^[0-9]{2}.[0-9]{2}$/) == -1)
        {
            $('action_add_frm')['hour_event'].parentNode.className="notice";
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@ -303,7 +303,7 @@ var ManageTable = function (p_table_name)
                    var obj = {id: control, "cssclass": "inner_box", "html": loading()};
                    add_div(obj);
                    var pos = calcy(250);
-                    $(obj.id).setStyle({position: "absolute", top:  '15%', width: "auto", "margin-left": "20%"});
+                    $(obj.id).setStyle({position: "fixed", top:  '15%', width: "auto", "margin-left": "20%"});
                    $(obj.id).update(x['html']);
                } catch (e) {
                    smoke.alert("ERREUR " + e.message);
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@ -496,6 +496,8 @@ function popup_select_tva(obj)
            queryString += '&code=' + obj.jcode;
        if (obj.compute)
            queryString += '&compute=' + obj.compute;
+        if (obj.filter)
+            queryString += '&filter=' + obj.filter;

        var action = new Ajax.Request(
                "ajax_misc.php",
@ -1075,10 +1077,10 @@ function show_calc()
    var sid = 'calc1';
    var shtml = '';
    shtml +="<div class=\"bxbutton\">";
-    shtml += '<a class="icon" onclick="pin(\'calc1\')" id="pin_calc1">&#xf192;</a>	<a onclick="removeDiv(\'calc1\');" href="javascript:void(0)" id="close_div">X</a>';
+    shtml += '<a class="icon" onclick="pin(\'calc1\')" id="pin_calc1">&#xf047;</a>	<a onclick="removeDiv(\'calc1\');" href="javascript:void(0)" title="" class="icon">&#10761;</a>';
    shtml +="</div>";
    shtml += '   <h2 class="title">Calculatrice</h2>';
-    shtml += '<form name="calc_line"  method="GET" onSubmit="cal();return false;" >Calculatrice simplifiée: écrivez simplement les opérations que vous voulez puis la touche retour. exemple : 1+2+3*(1/5) <input class="input_text" type="text" size="30" id="inp" name="calculator"> <input type="button" value="Efface tout" class="button" onClick="Clean();return false;" > <input type="button" class="button" value="Fermer" onClick="removeDiv(\'calc1\')" >';
+    shtml += '<form name="calc_line"  method="GET" onSubmit="cal();return false;" >Calculatrice simplifiée: écrivez simplement les opérations que vous voulez puis la touche retour. exemple : 1+2+3*(1/5) <input class="input_text" type="text" size="30" id="inp" name="calculator"> <input type="button" value="Efface" class="button" onClick="Clean();return false;" > <input type="button" value="Efface historique" class="button" onClick="CleanHistory();return false;" > <input type="button" class="button" value="Fermer" onClick="removeDiv(\'calc1\')" >';
    shtml += '</form><span class="highligth" style="display:block" id="sub_total">  Taper une formule (ex 20*5.1) puis enter  </span><span style="display:block"  id="listing"> </span>';

    var obj = {id: sid, html: shtml,
@ -1198,11 +1200,19 @@ function fill_box(req)
    }
    catch (e) {
        alert_box(e.message);
+         if (console) {
+            console.error(e);
+            console.error("log answer = "+e.responseText);
+        }
    }
    try {
        code_html.evalScripts();
    }
    catch (e) {
+        if (console) {
+            console.error(e);
+            console.error("log answer = "+e.responseText);
+        }
        alert_box("Impossible executer script de la reponse\n" + e.message);
    }

@ -1317,7 +1327,7 @@ function search_reconcile(dossier, ctl_concern, amount_id, ledger, p_id_target,p
                onFailure: null,
                onSuccess: function (req) {
                    remove_waiting_box();
-                    var div = {id: target, cssclass: 'inner_box', style: str_style, drag: 1};
+                    var div = {id: target, cssclass: 'inner_box', style: str_style, drag: 0};
                    add_div(div);
                    $(target).innerHTML = req.responseText;
                    req.responseText.evalScripts();
@ -2157,11 +2167,7 @@ function filter_table(phrase, _id, colnr, start_row) {
 */
 function display_task(p_id)
 {
-    new Draggable(p_id, {starteffect: function ()
-        {
-            new Effect.Highlight(obj.id, {scroll: window, queue: 'end'});
-        }}
-    );
+
    $(p_id).style.top = posY + 'px';
    $(p_id).style.left = "10%";
    $(p_id).style.width = "80%";
@ -2392,7 +2398,8 @@ function show_tag(p_dossier, p_ac, p_tag_id, p_post)
                        var code_html = getNodeText(html[0]);
                        code_html = unescape_xml(code_html);
                        remove_waiting_box();
-                        add_div({id: 'tag_div', cssclass: 'inner_box', drag: 1});
+                        var posy=calcy(250);
+                        add_div({id: 'tag_div', cssclass: 'inner_box', drag: 0,style:"position:fixed;top:"+posy+"px"});
                        $('tag_div').innerHTML = code_html;
                        try
                        {
@ -2464,8 +2471,8 @@ function action_tag_select(p_dossier, ag_id)
                        }
                        var code_html = getNodeText(html[0]);
                        code_html = unescape_xml(code_html);
-                        pos = fixed_position(35, 229);
-                        add_div({id: 'tag_div', style: pos, cssclass: 'inner_box tag', drag: 1});
+                        var pos = fixed_position(35, 229);
+                        add_div({id: 'tag_div', style: pos, cssclass: 'inner_box tag', drag: 0});

                        remove_waiting_box();
                        $('tag_div').innerHTML = code_html;
@ -2551,7 +2558,27 @@ function action_tag_remove(p_dossier, ag_id, t_id)
    });
 }

-
+/**
+ * Activate a tag
+ * @param int p_dossier
+ * @param int  p_tag_id
+ */
+function activate_tag(p_dossier, p_tag_id) {
+    waiting_box();
+    new Ajax.Request("ajax_misc.php",
+    {
+        method:"get",
+        parameters:{gDossier:p_dossier,op:'tag_activate',t_id:p_tag_id},
+        onSuccess:function(req) {
+            remove_waiting_box();
+            var answer=req.responseText.evalJSON();
+            var tagId="tag_onoff"+p_tag_id;
+            $(tagId).update(answer.code);
+            $(tagId).setStyle(answer.style);
+            remove_waiting_box();
+        }
+    })
+}
 /**
 * Display a div with available tags, this div can update the cell
 * tag_choose_td
@ -2579,12 +2606,12 @@ function search_display_tag(p_dossier, p_prefix)
                        var code_html = getNodeText(html[0]);
                        code_html = unescape_xml(code_html);
                        remove_waiting_box();
-                        add_div({id: p_prefix + 'tag_div', style: '', cssclass: 'inner_box', drag: 1});
+                        add_div({id: p_prefix + 'tag_div', style: 'left:10%;width:70%', cssclass: 'inner_box', drag: 1});
                        $(p_prefix + 'tag_div').style.top = posY - 80 + "px";
                        $(p_prefix + 'tag_div').style.left = posX - 200 + "px";
                        remove_waiting_box();
                        $(p_prefix + 'tag_div').innerHTML = code_html;
-
+                        code_html.evalScripts();
                    }
                }
        );
@ -2724,8 +2751,9 @@ function calendar_zoom(obj)
                            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%;' + str_style, cssclass: "inner_box", drag: 1});
+                            var str_style = 'top:10%;margin-left:2%;';
+//                            var str_style = fixed_position(0, 120);
+                            add_div({id: obj.outdiv, style: 'margin-left:3%;width:94%;' + str_style, cssclass: "inner_box", drag: 0});
                        }
                        remove_waiting_box();
                        $(obj.outdiv).innerHTML = code_html;
@ -2875,7 +2903,7 @@ function create_anchor_up()
 function init_scroll()
 {
    var up=new Element('div',{"class":"inner_box",
-            "style":"padding:5px;left:auto;width:auto;height: auto;display:none;position:fixed;top:25px;right:50px;text-align:center",
+            "style":"padding:5px;left:auto;width:auto;height: auto;display:none;position:fixed;bottom:105px;right:50px;text-align:center;font-size:20px",
            id:"go_up"
        });
        up.innerHTML=' <a class="icon" href="#up_top" >&#xe81a;</a><a href="javascript:show_calc()" class="icon">&#xf1ec;</a>';
@ -2883,7 +2911,7 @@ function init_scroll()
         window.onscroll=function () {
         if ( document.viewport.getScrollOffsets().top> 0) {
             if ($('go_up').visible() == false) {
-                $('go_up').setOpacity(0.70); 
+                $('go_up').setOpacity(0.65); 
                $('go_up').show();
                $('go_up').style.zIndex=99;
            }
@ -2988,14 +3016,14 @@ function pin (object_id) {
    if ( aDraggableElement[object_id]) {
        aDraggableElement[object_id].destroy();
        aDraggableElement[object_id]=undefined;
-        $('pin_'+object_id).innerHTML="&#xf192;";
+        $('pin_'+object_id).innerHTML="&#xf047;";
    } else {
        aDraggableElement[object_id]=new Draggable(object_id, {starteffect: function ()
                {
                    new Effect.Highlight(object_id, {scroll: window, queue: 'end'});
                }}
            ); 
-        $('pin_'+object_id).innerHTML="&#xf047;";
+        $('pin_'+object_id).innerHTML="&#xe809;";
    }
 }
 /**
@ -3373,3 +3401,115 @@ Periode.filter_exercice=function (p_table_id) {
        
    }
 };
+
+// keep track of progress bar
+var progressBar = [];
+// idx of progress bar        
+var progressIdx = 0;
+
+/**
+ * Start the progress bar 
+ * @param {string} p_taskid id to monitor
+ * @param {int} p_dossier
+ */
+function progress_bar_start(p_taskid,p_message)
+{
+    try {
+        progressIdx++;
+        // block the window
+        var message="Un instant svp";
+        if ( p_message) {
+            message=p_message;
+        }
+        add_div({id:"blocking"+progressIdx,cssclass:"smoke-base smoke-visible "});
+        
+        add_div({id:"message"+progressIdx,cssclass:"inner_box",style:"z-index:1000;position:fixed;top:30%;width:40%;left:30%"});
+        $("message"+progressIdx).update(message);
+        // Create a div
+        add_div({id: "progressDiv" + progressIdx, cssclass: "progressbar", html: '<span id="progressValue">0</span>'});
+        // Check status every sec.
+        progressBar[progressIdx] = setInterval(progress_bar_check.bind(null, progressIdx, p_taskid), 1000);
+    } catch (e) {
+        console.error(e.message);
+    }
+}
+
+/**
+ * Check every second the status 
+ * @param {integer} p_idx idx of progressbar
+ * @param {string} p_taskid  id to monitor
+ */
+function progress_bar_check(p_idx, p_taskid)
+{
+    try {
+
+        new Ajax.Request("ajax_misc.php", {
+            parameters: {gDossier: 0, task_id: p_taskid,op:"progressBar"},
+            method:"get",
+            onSuccess: function (req) {
+                try 
+                {
+                    var answer=req.responseText.evalJSON();
+                    var progress_div=$("progressDiv"+progressIdx);
+                    var a_child=progress_div.childNodes;
+                    var i=0;
+                    for (  i=0;i< a_child.length;i++) {
+                        if ( a_child[i].id="progressValue") {
+                            var progressValue = a_child[i];
+                        }
+                    }
+                    var progress = parseFloat(progressValue.innerHTML);
+                    if ( answer.value <= progress ) {
+                        return;
+                    }
+
+                    progressValue.innerHTML = answer.value;
+                    progressValue.setStyle("width:" + answer.value + "%");
+                    if (answer.value== 100) {
+                        clearInterval(progressBar[p_idx]);
+                        progressValue.innerHTML="Success";
+                        Effect.BlindUp("progressDiv"+p_idx,{duration:1.0,scaleContent:false})
+                        $("message"+p_idx).remove();
+                        $("blocking"+p_idx).remove();
+                        setTimeout(function() { $("progressDiv"+progressIdx).remove } , 1100);
+                    }
+                } catch (e) {
+                    clearInterval(progressBar[p_idx]);
+                    document.getElementById("progressValue").innerHTML=req.responseText;
+                    console.error(e.message);
+                }
+            }
+        });
+    } catch (e) {
+        clearInterval(progressBar[p_idx]);
+        console.error(e.message);
+    }
+}
+                                                
+/**
+ * In the user's setting  box, update the period list with the choosen exercice
+ * @param {int} p_dossier
+ */
+function updatePeriodePreference(p_dossier)
+{
+    waiting_box();
+    var exercice=$('exercice_setting').value;
+    new Ajax.Updater('setting_period',"ajax_misc.php",{method:"get",parameters:{ "op":"pref_exercice","gDossier":p_dossier,"exercice":exercice}});  
+    remove_waiting_box();
+}
+/**
+ * Update the from and to periode list when changing the exercice
+ * @param {int} p_dossier
+ * @param {string} p_exercice id of the exercice
+ * @param {type} p_periode_from id of the starting periode
+ * @param {type} p_periode_to id of the ending periode
+ * @param {type} p_last possible value = 1 to show last periode or 0 the first
+ */
+function updatePeriode(p_dossier,p_exercice,p_periode_from,p_periode_to,p_last)
+{
+    waiting_box();
+    var exercice=$(p_exercice).value;
+    new Ajax.Updater(p_periode_from,"ajax_misc.php",{method:"get",parameters:{op:"periode_change","gDossier":p_dossier,"exercice":exercice,field:p_periode_from,"type":"from","last":p_last}});
+    new Ajax.Updater(p_periode_to,"ajax_misc.php",{method:"get",parameters:{op:"periode_change","gDossier":p_dossier,"exercice":exercice,field:p_periode_to,"type":"to","last":p_last}});
+    remove_waiting_box();
+}
--- a/html/js/smoke.js
+++ b/html/js/smoke.js
--- a/html/js/sorttable.js
+++ b/html/js/sorttable.js
@ -100,7 +100,7 @@ var sorttable = {
        }

        // work through each column and calculate its type
-        headrow = table.tHead.rows[0].cells;
+        var headrow = table.tHead.rows[0].cells;
        for (var i = 0; i < headrow.length; i++) {
            // manually override the type with a sorttable_type attribute
            if (!headrow[i].className.match(/\bsorttable_nosort\b/)) { // skip this col
@ -113,6 +113,23 @@ var sorttable = {
                } else {
                    headrow[i].sorttable_sortfunction = sorttable.guessType(table, i);
                }
+                //--------- if already sorted , add a icon but only if the icon is not yet there ----------------
+                if (headrow[i].className.search(/\bsorttable_sorted_reverse\b/) != -1 && headrow[i].innerHTML.search(/\bsorttable_sortrevind\b/)==-1) {
+                    
+                    sortrevind = document.createElement('span');
+                    sortrevind.id = "sorttable_sortrevind";
+                    sortrevind.innerHTML = '<img src="image/down.gif">';
+                    headrow[i].appendChild(sortrevind);
+            
+                }
+                if (headrow[i].className.search(/\bsorttable_sorted\b/) != -1  && headrow[i].innerHTML.search(/\bsorttable_sortfwdind\b/)==-1) {
+            
+                    sortfwdind = document.createElement('span');
+                    sortfwdind.id = "sorttable_sortfwdind";
+                    sortfwdind.innerHTML = '<img src="image/up.gif">';
+                    headrow[i].appendChild(sortfwdind);
+        
+                }
                // make it clickable to sort
                headrow[i].sorttable_columnindex = i;
                headrow[i].sorttable_tbody = table.tBodies[0];
@ -192,13 +209,16 @@ var sorttable = {
                    }
                    delete row_array;
                    // Highlight odd and even rows properly
-                    sorttable.highlight_body(this);
+                    sorttable.highlight_body(table);
                });
            }
        }
    },
-    highlight_body:function(p_heading) {
-         var p_table=p_heading.parentNode.parentNode.parentNode;
+    /**
+     * alternate properly the rows of the table, 
+     * @param {DOMNode} p_table sorted table 
+     */ 
+    highlight_body:function(p_table) {
         var nb_row=p_table.rows;
         var e=0;
         for (e=1;e<nb_row.length;e++) {
--- a/html/popup.php
+++ b/html/popup.php
@ -24,10 +24,11 @@ require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
 require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/class/periode.class.php';

-
+$http=new HttpInput();
 /*
 * Check if the user is still connected
 */
@ -66,8 +67,13 @@ $g_user->check_dossier(Dossier::id());
 if ( basename($_GET['op']) == 'history' )
  {
    $href=dossier::get();
+    
+    $exercice=$http->get("exercice","number",0);
+    
    /* current year  */
-    $exercice=$g_user->get_exercice();
+    if ($exercice == 0 ) {
+        $exercice=$g_user->get_exercice();
+    }

    /* get date limit */
    $periode=new Periode($cn);
--- a/html/style-classic.css
+++ b/html/style-classic.css
@ -1268,7 +1268,7 @@ table.table_large tr.odd ,table.table_large tr.even {
 }
 #calc1
 {
-    position:absolute;
+    position:fixed;
    display:block;
    top:30px;
    left:150px;
@ -2278,4 +2278,30 @@ div.bxbutton .icon:hover
 {
    background-color: white;
    color: blue;
+}
+/**
+ * progressBar
+ */
+div.progressbar {
+    width:300px;
+    height:30px;
+    position:fixed;
+    top:5px;
+    left:40%;
+    background-color: white;
+    color:blue;
+    z-index:800;
+    border-color: #596a72;
+    border-width: 1px;
+    border-style: solid;
+}
+#progressValue {
+    display:block;
+    width: 0px;
+    height: 100%;
+    margin:0px;
+    padding: 0px;
+    background-color:darkblue;
+    color:antiquewhite;
+    font-weight: bolder;
 }
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@ -50,17 +50,21 @@ input:focus {
    background-color:  lightyellow;
 }
 .notice {
-    color:#FF0000;
+    color:orangered;
    font-style: italic;
+    
 }
 span.notice {
    font-weight: bold;
 }
+a.mtitle span.notice {
+    text-decoration: underline;
+}
 table.sortable, table.table_large, table.result  ,table.resultfooter {
    width:99%;
    border-spacing:  1px;
   /*border-collapse:collapse; */
-    margin  :0.5%;
+    
    border:1px #5D90CD solid;
    border-radius: 10px;
    -moz-border-radius: 10px;
@ -105,6 +109,7 @@ content h2.info,h2.info,h2.info2 {

    padding-top: 10px;
    padding-bottom: 10px;
+    margin-top:0px;
 }


@ -155,14 +160,15 @@ td.tool a.mtitle:hover {
    font-size:0.76rem;
 }
 #module table,#module table tr,#module table td {
-    border-collapse: collapse;
-    border-width: 0px;
+    border-collapse: separate;
+    border-width: 1px;
    background-color: whitesmoke;
    color: darkblue;
+    border-spacing: 3px;
 }
 #module table td.toolselected a {
    background-color: darkgray;
-    
+    display:block;
 }

 div.lmenu {
@ -235,18 +241,13 @@ td.mtitle {
    padding: 0px;
    text-align:center;
    width:250px;
-    /*! height :30px; */
-     border-radius:5px;
-     -moz-border-radius: 5px;
-     -webkit-border-radius: 5px;
+    height:42px;
+   
     background-color: #5681B7;
-    /*! border-style: solid; */
-    /*! border-width: 1px; */
    border-color: darkblue;
    border-top-right-radius: 0px;
    border-bottom-left-radius: 0px;
-    /*! padding-top: 5px; */
-    /*! padding-bottom: 5px; */
+
 }
@media only screen and (max-width:955px) {
    td.mtitle {
@ -258,11 +259,14 @@ td.mtitle {
 td.mtitle a.mtitle {
    color : white;
    display:block;
-    /*! width:100%; */
-    /*! height: 100%; */
    font-size:1rem;
-    padding-top: 8px;
-    padding-bottom: 8px;
+    font-family:OpenSansRegular;
+    width:100%;
+    padding:0px;
+    margin:0px;
+    height:100%;
+    padding:4px 0px 0px 0px;
+    
 }

 span.mtitle {
@ -307,21 +311,14 @@ td.cell{
 }
 td.selectedcell{
    
-/*    border-color:#0000FF;*/
-  border-radius:5px;
-   -moz-border-radius: 5px;
-   -webkit-border-radius: 5px;
    font-weight: bold;
-/*    background:#5D90CD ;*/
-    color:#FFFFFF;
+    /*color:#FFFFFF;*/
    width:250px;
    text-align:center;
-  /*! height:30px; */
-
-    background: #b8c6df; /* Old browsers */
- 
-border-top-right-radius: 0px;
-border-bottom-left-radius: 0px;
+    background-color: lightsteelblue;
+    border-style: solid;
+    border-width: 1px;
+    border-color:white;
 }
 .menu2 td.mtitle ,.menu2 td.selectedcell{
    border-radius: 0px;
@ -345,19 +342,20 @@ a.mtitle:hover {
    text-decoration:none;
    display:inline;
    pointer:cursor; 
-    color: #00008B;
-    background-color:#EFEBEB;
+    /*color: #00008B;*/
+    /*background-color:#EFEBEB;*/

-    color: blue;
+    color: darkblue;
+    /*! padding: 100px; */
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
    text-decoration:none;
    display:block;
-    color:#FFFFFF;
+    color:white;
    /*! height: 100%; */
-    /*! width: 100%; */
+    width: 100%;
    font-size: 1rem;
-    background-color:lightsteelblue;
+/*    background-color:lightsteelblue;*/
    font-weight: normal;
 }
 a.dossier {
@ -462,8 +460,8 @@ div.content a.mtitle {
 div.content a.mtitle:hover {
    text-decoration:none;
    display:inline;
-    background-color:#00008B;
-    color:#FFFFFF;
+    background-color:#888;
+    color:orangered;
    cursor: pointer;

 }
@ -540,7 +538,7 @@ span.action {
    height:3rem;

 }
-td.num {
+th.num , td.num,table.result th.num  {
    text-align:right;
 }
 tr.priority1 {
@ -722,7 +720,7 @@ a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover  {
    border-style:  ridge;
    /*! color: #FF0000; */
    margin:1px 2px 1px 2px;
-
+    border-color:orange;
 }
 a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
    color:#FFFFFF;
@ -736,7 +734,7 @@ a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
    font-size:0.85rem;
    font-family: SansationLight;
    border-style:  ridge ; 
-    /*! border-color: grey ; */
+    border-color: grey ;
    border-width:1px;
    padding-bottom: 5px;
    padding-top: 5px;
@ -771,7 +769,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end
     /*border-style:  inset ;*/
    /*! border-color:  darkblue; */

-    border-color: grey;
+    border-color: orange;
 }
 a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton .button {
    font-family: SansationLight;
@ -1247,18 +1245,20 @@ div.menu2 a.mtitle{
    font-size:13.6px;
    font-size:1rem;
    font-weight: normal;
-    color: darkblue;
-    padding-top: 4px;
-    padding-bottom: 4px;
-    padding-left: 10px;
-    padding-right: 10px;
-    color: whitesmoke;
+    /*color: darkblue;*/
+    padding:5px;
+    margin:0px;
+    border-radius: 5px;
    }
 div.menu2 a.mtitle:hover,div.menu a.mtitle:hover,td.mtitle a.mtitle:hover {
    color:#5681B7;
    background-color: #EFEBEB;
+    /* padding:18px 0px 18px 0px; */
    
 }
+div.menu2 a.mtitle:hover {
+    border-radius: 0px 0px;
+}
 div.menu3 {
 	font-size:13.6px;
 	font-size:0.80rem;
@ -1294,7 +1294,6 @@ textarea.itextarea{

 textarea.itextarea:focus {
    border:solid 1px orange;
-    margin:1px;
    background-color:  lightyellow;
 }
 div#notice {
@ -1405,6 +1404,18 @@ div#box_search_card {
    right:15.625%;
    top:115px;
 }
+@media only screen and (max-width:994px)
+{
+    div#box_search_card {
+    top:29%;
+    }
+}
+@media only screen and (max-width:804px)
+{
+    div#box_search_card {
+     display:none;
+    }
+}
 div.bxbutton
 {
    float:right;
@ -1493,7 +1504,7 @@ div.box  {
 }
@media only screen and (max-width: 955px) {
    div.box {
-    width: 95%;
+    width: 98%;
    height: 380px;
    }
 }
@ -1715,13 +1726,13 @@ li.highlight,tr.highlight{
    font-weight: bolder;
    font-size:14px;
    background-color: #8A8787;
-    color:white !important;
+    color:whitesmoke !important;
    border-width:  2px;
    border-style: solid;
    /*! border-color: blue; */
 }
 li.highlight a,tr.highlight a{
-    color:white !important;
+   color:whitesmoke !important;
    
 }
 *|*:link {
@ -1763,6 +1774,7 @@ table.vert_mtitle td {
    border : 1px solid #99B1DF;
     background-color:#EDEDED;
     border-top-radius:20px;
+     font-family: SansationLight;
 }
 table.vert_mtitle td a{
    padding : 20px;
@ -2066,11 +2078,13 @@ td.selectedmenu {
 * go_up
 */
 #go_up {
-    background-color: transparent;
+    background-color: gray;
    border:0px;
    box-shadow: none;
    color:blue;
    margin-right: 20px;
+    border-radius:10px;
+    padding:2px;
 }
 #go_up a ,#go_up a:visited{
    background-image: none;
@ -2080,7 +2094,7 @@ td.selectedmenu {
    font-size: 1.7rem;
    padding: 0px;
    margin: 0px;
-    background-color: whitesmoke;
+    background-color: inherit;
 }
 #go_up a:hover {
    font-size:2.8em;
@ -2102,11 +2116,11 @@ td.selectedmenu {
    float:right;
    margin-right: 5%;
    font-size:150%;
-    color :white;
    font-variant: small-caps;
-    background-color: #5D90CD;
-    padding: 3px 20px 3px 20px;
+    padding: 13px 20px 13px 20px;
    margin-top:20px;
+    background-color:#484954;
+    color:#FE8300;
 }
 /*
 * Style for the Inplace Edit element
@ -2184,14 +2198,16 @@ div.select_box a:hover,div.select_box ul li:hover {
 * Menu second level
 */
 div.menu2 td.mtitle, div.menu2 td.mtitle a{
-    background-color: white;
-    color:darkblue;
+   
    border-style: solid;
    border-width: 0.1px;
-    border-color:lightgrey;
+    border-color:white;
+    height:25px;
+    border-radius: 0px 0px 0px 10px;
 }
 div.menu2 td.mtitle a{
    border-width:0px;
+    padding:5px;
 }
 /**
 * For the icon (font-famillo fontello)
@ -2204,6 +2220,9 @@ div.menu2 td.mtitle a{
 .icon:hover {
    font-family: "fontello";
 }
+*.icon {
+    text-decoration: none;
+}
 /**
 * Icon in the title of Box
 */
@ -2224,4 +2243,30 @@ div.bxbutton .icon:hover
 {
    background-color: white;
    color: blue;
-}
+}
+/**
+ * progressBar
+ */
+div.progressbar {
+    width:300px;
+    height:30px;
+    position:fixed;
+    top:5px;
+    left:40%;
+    background-color: white;
+    color:blue;
+    z-index:800;
+    border-color: #596a72;
+    border-width: 1px;
+    border-style: solid;
+}
+#progressValue {
+    display:block;
+    width: 0px;
+    height: 100%;
+    margin:0px;
+    padding: 0px;
+    background-color:darkblue;
+    color:antiquewhite;
+    font-weight: bolder;
+}
--- a/html/style-light.css
+++ b/html/style-light.css
@ -1249,7 +1249,7 @@ table.table_large tr.odd ,table.table_large tr.even {
 }
 #calc1
 {
-    position:absolute;
+    position:fixed;
    display:block;
    top:30px;
    left:150px;
@ -2200,4 +2200,30 @@ div.bxbutton .icon:hover
 {
    background-color: white;
    color: blue;
-}
+}
+/**
+ * progressBar
+ */
+div.progressbar {
+    width:300px;
+    height:30px;
+    position:fixed;
+    top:5px;
+    left:40%;
+    background-color: white;
+    color:blue;
+    z-index:800;
+    border-color: #596a72;
+    border-width: 1px;
+    border-style: solid;
+}
+#progressValue {
+    display:block;
+    width: 0px;
+    height: 100%;
+    margin:0px;
+    padding: 0px;
+    background-color:darkblue;
+    color:antiquewhite;
+    font-weight: bolder;
+}
--- a/html/test.php
+++ b/html/test.php
@ -23,7 +23,7 @@
 * It is only a quick and dirty testing. You should use a tool as PHPUNIT for the unit testing
 * 
 *  - first do not forget to create the authorized_debug file in the html folder
- *  - secund the test must adapted to this page : if you do a post (or get) from a test, you won't get any result
+ *  - secund the test must be adapted to this page : if you do a post (or get) from a test, you won't get any result
 * if the $_REQUEST[test_select] is not set, so set it . 
 */

@ -34,6 +34,7 @@ include_once("lib/ac_common.php");
 require_once('lib/database.class.php');
 require_once ('class/dossier.class.php');
 require_once('lib/html_input.class.php');
+require_once('lib/icon_action.class.php');
 require_once ('lib/function_javascript.php');
 require_once 'class/user.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
--- a/html/user_login.php
+++ b/html/user_login.php
@ -68,7 +68,7 @@ $hi=new HttpInput();
 if ( $ac->exist_table('version') == false)
 {
    echo '<h2 class="error" style="font-size:12px">'._("Base de donnée invalide").'</h2>';
-    $base=dirname($_SERVER['REQUEST_URI']);
+    echo '<a hreF="'.NOALYSS_URL.'/user_login.php">'._("Retour").'</a></h2>';
    exit();
 }

@ -78,27 +78,30 @@ if ( $version < DBVERSIONREPO )
 {
    echo '<h2 class="error" style="font-size:12px">'._("Votre base de données n'est pas à jour").'   ';
    $a=_("cliquez ici pour appliquer le patch");
-    $base = dirname($_SERVER['REQUEST_URI']);
-    if ($base == '/') { $base = ''; }
-    $base .= '/admin-noalyss.php';
+    $base =NOALYSS_URL.'/admin-noalyss.php';
    echo '<a hreF="'.$base.'">'.$a.'</a></h2>';

 }
 if ( $User->Admin()  == 1)
 {
-	if (SITE_UPDATE !="") {
-	 $update=@file_get_contents(SITE_UPDATE);
+    if (SITE_UPDATE !="") {
+     $update=@file_get_contents(SITE_UPDATE);
 	 if ($update > $version_noalyss ) {
-		 echo '<div id="version_div" class="inner_box" style="width:25%;margin-left:10%;margin-top:3px;">';
-		 echo '<p class="notice">';
-		 printf ( "Mise à jour disponible de NOALYSS version actuelle : %s  votre version %s ",$update,$version_noalyss);
-		 echo '</p>';
-                 echo '<p style="text-align:center"> <a class="button" onclick="document.body.removeChild(document.getElementById(\'version_div\'))">'.
-                         _('Fermer').
-                         "</a></p>";
-		 echo '</div>';
-	 }
-	}
+            echo '<div id="version_div" class="inner_box" style="width:25%;margin-left:10%;margin-top:3px;">';
+            echo '<p class="notice">';
+            printf ( "Mise à jour disponible de NOALYSS version actuelle : %s  votre version %s ",$update,$version_noalyss);
+
+            // Link to admin_repo : upgrade application
+            $base =NOALYSS_URL."/admin-noalyss.php?action=upgrade&sb=application";
+
+           echo '<a hreF="' . $base . '">' . _("Cliquez ici pour mettre à jour") . '</a>';
+           echo '</p>';
+           echo '<p style="text-align:center"> <a class="button" onclick="document.body.removeChild(document.getElementById(\'version_div\'))">'.
+                   _('Fermer').
+                   "</a></p>";
+           echo '</div>';
+        }
+    }
 }

 include_once NOALYSS_INCLUDE."/lib/user_menu.php";
@ -144,12 +147,11 @@ if ( $User->admin == 0 || (defined("MULTI")&& MULTI == 0 ) )
    if ( $folder != null  && count($folder) == 1 )
    {

-            redirect('do.php?gDossier='.$folder[0]['dos_id']);
+            redirect(NOALYSS_URL.'/do.php?gDossier='.$folder[0]['dos_id']);
            exit();
    }

 }
-
 $result="";
 $result.="<table border=\"0\">";
 $result.='<TR>';
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@ -38,6 +38,7 @@ if (isset($_REQUEST['f_id']))
 if (isset($_REQUEST['sb']))
 	$supl_hidden.=HtmlInput::hidden('sb', $_REQUEST['sb']);
 $supl_hidden.=HtmlInput::hidden('ac', $_REQUEST['ac']);
+
 $correction = 0;
 $error_id=0;
 $http=new HttpInput();
@ -268,7 +269,7 @@ if ($sub_action == "list")
 }
 //--------------------------------------------------------------------------------
 // Save Follow_Up
-// Stage 2 : Save a NEW action + Files and generate eventually a document
+// Stage 2 : Save a NEW action + Files and generate a document
 //--------------------------------------------------------------------------------
 if ($sub_action == "save_action_st2")
 {
--- a/include/action.inc.php
+++ b/include/action.inc.php
@ -32,6 +32,7 @@ require_once NOALYSS_INCLUDE.'/lib/icard.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ispan.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ifile.class.php';
 require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
+require_once NOALYSS_INCLUDE.'/lib/inplace_edit.class.php';
 require_once NOALYSS_INCLUDE.'/class/follow_up.class.php';
 /*!\brief Show the list of action, this code should be common
 *        to several webpage. But for the moment we keep like that
--- a/include/admin_repo.inc.php
+++ b/include/admin_repo.inc.php
@ -22,6 +22,7 @@
 *        templates... Accessible only by the administrator
 */
 if ( ! defined ('ALLOWED')) { die (_('Non autorisé'));}
+if ( ! defined ('ALLOWED_ADMIN')) { die (_('Non autorisé'));}

 include_once NOALYSS_INCLUDE."/class/user.class.php";
 require_once NOALYSS_INCLUDE."/lib/user_common.php";
@ -29,6 +30,7 @@ include_once NOALYSS_INCLUDE."/lib/ac_common.php";
 require_once NOALYSS_INCLUDE.'/lib/database.class.php';
 require_once NOALYSS_INCLUDE."/lib/user_menu.php";
 require_once NOALYSS_INCLUDE."/lib/http_input.class.php";
+require_once NOALYSS_INCLUDE."/lib/icon_action.class.php";
 $http=new HttpInput();
 $action = $http->request("action","string", "");

@ -45,7 +47,7 @@ if ($User->admin != 1)
    echo _("Vous n'êtes pas administateur");
    echo "</h2>";
    $reconnect=http_build_query(array("reconnect"=>1,"backurl"=>"admin-noalyss.php?action=upgrade"));
-    echo '<a href="index.php?'.$reconnect.'">';
+    echo '<a href="'.NOALYSS_URL.'/index.php?'.$reconnect.'">';
    echo _("Connectez-vous comme administrateur");
    echo '</a>';
    html_page_stop();
@ -58,7 +60,7 @@ if ( $action== 'backup') {
        require_once NOALYSS_INCLUDE."/backup.inc.php";
        exit();
 }
-html_page_start();
+html_page_start($_SESSION['g_theme']);
 load_all_script();
 echo '<H2 class="info"> '._('Administration').'</H2>';
 echo '<div class="topmenu">';
@ -190,19 +192,16 @@ hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #0
    echo $html->saveHTML();
    
 }
+//------------------------------------------------------------------------------
+// Upgrade
+//------------------------------------------------------------------------------
 if ( $action == "upgrade" ) {
-?>    
-    <form method="get" id="frm_upg_all" onsubmit="return confirm_box('frm_upg_all','<?php echo _('Confirmez')?>')">
-    <input type="hidden" name="sb" value="upg_all">
-    <input type="hidden" name="action" value="upgrade">
-    <input type="submit" class="button" name="submit_upg_all" id="submit_upg_all" value="<?php echo _('Tout mettre à jour')?>">
-</form>
-<?php
+   
+    
    require_once NOALYSS_INCLUDE."/upgrade.inc.php";
 }
 ?>
 </DIV>
 <?php
-
 html_page_stop();
 ?>
--- a/include/ajax/ajax_admin.php
+++ b/include/ajax/ajax_admin.php
@ -31,10 +31,11 @@ if ($g_user->Admin()==0)
 {
    die();
 }
+session_write_close();
 set_language();
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 $http=new HttpInput();
-
+$op=$http->request("op");
 // From admin, grant  the access to a folder to an
 // user
 if ($op=='folder_add') // operation
@ -50,7 +51,7 @@ if ($op=='folder_add') // operation
        $dossiercn=new Database($dossier_id);
        // By default new user has the profile 1 (admin) and ledger's security
        // + action's security are disabled
-        $user=new User($dossiercn,$user_id);
+        $user=new User($dossiercn, $user_id);
        $user->set_status_security_action(0);
        $user->set_status_security_ledger(0);
        $user->save_profile(1);
@ -70,7 +71,7 @@ if ($op=='folder_add') // operation
        return;
    }

-        
+
    //----------------------------------------------------------------
    // Answer in XML
    header('Content-type: text/xml; charset=UTF-8');
@ -131,20 +132,20 @@ if ($op=='folder_display') // operation
    try
    {
        $user_id=$http->get("p_user", "number"); // get variable
-        $p_filter=$http->get('p_filter', "string",'');
+        $p_filter=$http->get('p_filter', "string", '');
        ob_start();
        $user=new User($cn, $user_id);
        $a_dossier=Dossier::show_dossier('X', $user->id, $p_filter, MAX_FOLDER_TO_SHOW);
        echo HtmlInput::title_box(_("Liste dossier"), 'folder_list_div');
        ?>
        <form method="get" onsubmit="folder_display('<?php echo $user_id ?>');
-                        return false">
+                return false">
            <p style="text-align: center">
                <?php echo _('Recherche'); ?>
-                
+
                <input type="text" id="database_filter_input" class="input_text" autofocus="true" autocomplete="off" nohistory autocomplete="false" value="<?php echo $p_filter ?>" 
-                       onkeyup="filter_table(this, 'folder_display_tb','1,2,3',0)"  >
-                <input type="button" class="smallbutton" onclick="$('database_filter_input').value='';filter_table($('database_filter_input'), 'folder_display_tb','1,2,3',0);" value="X">
+                       onkeyup="filter_table(this, 'folder_display_tb', '1,2,3', 0)"  >
+                <input type="button" class="smallbutton" onclick="$('database_filter_input').value = '';filter_table($('database_filter_input'), 'folder_display_tb', '1,2,3', 0);" value="X">
                <input type="submit" class="smallbutton" value="<?php echo _('Rechercher') ?>">
            </p>
        </form>    
@ -159,8 +160,6 @@ if ($op=='folder_display') // operation
        require NOALYSS_TEMPLATE.'/folder_display.php';
        $content=ob_get_clean();
        $status='OK';
-
-        
    }
    catch (Exception $exc)
    {
@ -195,14 +194,13 @@ if (in_array($op, array('modele_drop', 'modele_modify', 'folder_modify', 'folder
        $dossier=$http->get('p_dossier', "number");
        $content=_('Erreur paramètre');
        $status="NOK";
-        
    }
    catch (Exception $exc)
    {
        error_log($exc->getTraceAsString());
        $content=_('Erreur paramètre');
        $status="NOK";
-          //----------------------------------------------------------------
+        //----------------------------------------------------------------
        // Answer in XML
        header('Content-type: text/xml; charset=UTF-8');
        $dom=new DOMDocument('1.0', 'UTF-8');
@ -215,7 +213,6 @@ if (in_array($op, array('modele_drop', 'modele_modify', 'folder_modify', 'folder
        $dom->appendChild($root);
        echo $dom->saveXML();
        exit();
-
    }

    // Modify the description or the name of folder
@ -237,8 +234,8 @@ if (in_array($op, array('modele_drop', 'modele_modify', 'folder_modify', 'folder
        echo _('Description').' : <br>';
        echo $wDesc->input('desc', $dos->get_parameter('desc'));
        echo '<br>';
-        
-        echo _('Max. email / jour (-1 = illimité)')    ;
+
+        echo _('Max. email / jour (-1 = illimité)');
        $max_email_input=new INum('max_email');
        $max_email_input->value=$dos->get_parameter('max_email');
        $max_email_input->prec=0;
@ -341,4 +338,72 @@ if (in_array($op, array('modele_drop', 'modele_modify', 'folder_modify', 'folder
    echo $dom->saveXML();
    exit();
 }
+//------------------------------------------------------------------
+// Upgrade Core
+//------------------------------------------------------------------
+if ($op=='upgradeCore')
+{
+    require_once NOALYSS_INCLUDE.'/lib/progress_bar.class.php';
+    require_once NOALYSS_INCLUDE.'/class/package_repository.class.php';
+    $task_id=$http->request("task_id");
+    $progress=new Progress_Bar($task_id);
+    $progress->set_value(2);
+    $repo=new Package_Repository();
+    $core=$repo->make_object("core", " ");
+    $progress->set_value(5);
+    $core->download();
+    $progress->set_value(55);
+    if (!DEBUG)
+    {
+        $core->install();
+    }
+    $progress->set_value(100);
+
+    $url=sprintf('<a href="%s"> install.php</a>', NOALYSS_URL."/install.php");
+    printf(_("Afin de terminer l'installation aller sur %s , à la fin de la procédure , demandez à effacer le fichier install.php"),
+            $url);
+}
+//---------------------------------------------------------------------------------------------------------
+// Upgrade or install plugin
+//---------------------------------------------------------------------------------------------------------
+if ($op=='upgradePlugin')
+{
+    require_once NOALYSS_INCLUDE.'/lib/progress_bar.class.php';
+    require_once NOALYSS_INCLUDE.'/class/package_repository.class.php';
+    $task_id=$http->request("task_id");
+    $code=$http->post("code_plugin");
+    $progress=new Progress_Bar($task_id);
+    $progress->set_value(2);
+    $repo=new Package_Repository();
+    $plugin=$repo->make_object("plugin", $code);
+    $progress->set_value(5);
+    $plugin->download();
+    $progress->set_value(55);
+    $plugin->install();
+    $progress->set_value(100);
+    echo _("Le plugin doit être activée dans le dossier avec CFGPLUGIN");
+    return;
+}
+//------------------------------------------------------------------------------------------------------------------
+// Install template
+//------------------------------------------------------------------------------------------------------------------
+if ($op=="installTemplate")
+{
+    require_once NOALYSS_INCLUDE.'/lib/progress_bar.class.php';
+    require_once NOALYSS_INCLUDE.'/class/package_repository.class.php';
+    $task_id=$http->request("task_id");
+    $name=$http->post("code");
+    $progress=new Progress_Bar($task_id);
+    $progress->set_value(2);
+    $package_repository=new Package_Repository();
+    $progress->set_value(4);
+    $template=$package_repository->make_object("template", $name);
+    $progress->set_value(30);
+    $template->download();
+    $progress->set_value(70);
+    $template->install();
+    $progress->set_value(100);
+    echo _("Modèle installé ");
+    return;
+}
 ?>        
--- a/include/ajax/ajax_boxcard_search.php
+++ b/include/ajax/ajax_boxcard_search.php
@ -51,7 +51,6 @@ $max=(count($array)>MAX_CARD_SEARCH)?MAX_CARD_SEARCH:count($array);
 		</th>
 		<th class=" sorttable_sorted">
 			Nom
-		<span id="sorttable_sortfwdind">&nbsp;&#x25BE;</span>
 		</th>
 		<th>
 			<?php echo _("Categorie");?>
--- a/include/ajax/ajax_calendar_zoom.php
+++ b/include/ajax/ajax_calendar_zoom.php
@ -27,7 +27,10 @@ require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 $http=new HttpInput();

 ob_start();
-if ( $notitle== 0 ) echo HtmlInput::title_box(_("Calendrier"), "calendar_zoom_div");
+if ($notitle==0)
+{
+    echo HtmlInput::title_box(_("Calendrier"), "calendar_zoom_div", "close", "", "y");
+}
 $cal=new Calendar();
 $in=$http->get('in',"string","");
 $notitle=$http->get('notitle',"string","0");
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@ -261,27 +261,23 @@ case 'st':
    }
    if ( strpos($where," in ()") != 0)
    {
-             $html=Icon_Action::close('select_card_div');
-             $html.=h2info(_('Choix de la catégorie'));
-             $html.='<h3 class="notice">';
-             $html.=_("Aucune catégorie de fiche ne correspond à".
+             $html=_("Aucune catégorie de fiche ne correspond à".
            " votre demande, le journal pourrait n'avoir accès à aucune fiche");
-             $html.='</h3>';
             break;
    }
    $sql.=" ".$where." order by fd_label";

    $array=$cn->get_array($sql);
-    $html=HtmlInput::title_box(_("Choix de la catégorie"), $ctl);
-
+    
+    $list_fiche="";
    if ( empty($array))
    {
-        $html.=_("Aucune catégorie de fiche ne correspond  à votre demande");
+        $html=_("Aucune catégorie de fiche ne correspond  à votre demande");
        if ( DEBUG )        $html.=$sql;
    }
    else
    {
-        $list_fiche="";
+        $html=HtmlInput::title_box(_("Choix de la catégorie"), $ctl);
        $r='';
        
 	$r.='<div dd>';
--- a/include/ajax/ajax_follow_up.php
+++ b/include/ajax/ajax_follow_up.php
@ -0,0 +1,74 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2018) Author Dany De Bontridder <dany@alchimerys.be>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+require_once NOALYSS_INCLUDE."/class/document.class.php";
+require_once NOALYSS_INCLUDE."/lib/inplace_edit.class.php";
+/**
+ * @file
+ * @brief Update description on file
+ */
+$op=$http->request('op');
+global $g_user;
+
+if ($op=='update_comment_followUp')
+{
+    $input=$http->request('input');
+    $action=$http->request('ieaction', 'string', 'display');
+    $d_id=$http->request('d_id', "number");
+
+    // Build inplace input
+    $inplace_description=Inplace_Edit::build($input);
+    $inplace_description->set_callback("ajax_misc.php");
+    $inplace_description->add_json_param("d_id", $d_id);
+    $inplace_description->add_json_param("gDossier", Dossier::id());
+    $inplace_description->add_json_param("op", "update_comment_followUp");
+    switch ($action)
+    {
+        case 'display':
+            echo $inplace_description->ajax_input();
+
+            break;
+        case 'ok':
+            if ($g_user->check_action(VIEWDOC)==1)
+            {
+                $value=$http->request('value');
+                $doc=new Document($cn, $d_id);
+                $doc->get();
+                if ($g_user->can_write_action($doc->ag_id))
+                {
+                    // retrieve the document
+                    $doc->update_description(strip_tags($value));
+                }
+                $inplace_description->set_value($value);
+            }
+            
+            echo $inplace_description->value();
+            break;
+        case 'cancel':
+            echo $inplace_description->value();
+            break;
+        default:
+            throw new Exception(__FILE__.':'.__LINE__.'Invalide value');
+            break;
+    }
+}
--- a/include/ajax/ajax_history.php
+++ b/include/ajax/ajax_history.php
@ -52,8 +52,11 @@ if ( isset($_GET['f_id']))
    $old='';
    $f_id=$http->get('f_id',"number");
    $fiche=new Fiche($cn,$f_id);
-    $year=$g_user->get_exercice();
-    if ( $year == 0 )
+    
+    $year=$http->get("exercice","string","");
+    if ( $year == "") $year=$g_user->get_exercice();
+
+    if ( $year == "" )
      {
        $html=_("erreur aucune période par défaut, allez dans préférence pour en choisir une");
      }
@ -83,7 +86,7 @@ if ( isset($_GET['f_id']))
 	    $dossier=dossier::id();
 	    if ( $div != 'popup')
 	      {
-		$obj="{op:'history',div:'$div',f_id:'".$_GET['f_id']."',gDossier:'$dossier',select:this}";
+		$obj="{op:'history',div:'$div',f_id:'".$_GET['f_id']."',gDossier:'$dossier',select:this,exercice:{$year}}";
 		$is=$exercice->select('p_exercice',$default,' onchange="update_history_card('.$obj.');"');
 		$old=_("Autre exercice")." ".$is->input();
 	      }
@ -96,6 +99,7 @@ if ( isset($_GET['f_id']))
 		$old.=HtmlInput::hidden('act',$_GET['act']);
 		$old.=HtmlInput::hidden('f_id',$_GET['f_id']);
 		$old.=HtmlInput::hidden('ajax',$_GET['ajax']);
+		$old.=HtmlInput::hidden('exercice',$year);
 		$old.=dossier::hidden();
                $old.=HtmlInput::hidden('op','history');
 		$old.='</form>';
@ -135,7 +139,8 @@ if ( isset($_REQUEST['pcm_val']))
  {
    $poste=new Acc_Account_Ledger($cn,$_REQUEST['pcm_val']);
    $poste->load();
-    $year=$g_user->get_exercice();
+    $year=$http->get("exercice","string","");
+    if ( $year == "") $year=$g_user->get_exercice();
    if ( $year == 0 )
      {
        $html=_("erreur aucune période par défaut, allez dans préférence pour en choisir une");
@ -167,7 +172,7 @@ if ( isset($_REQUEST['pcm_val']))
 	    $dossier=dossier::id();
 	    if ( $div != 'popup')
 	      {
-		$obj="{op:'history',div:'$div',pcm_val:'".$_GET['pcm_val']."',gDossier:'$dossier',select:this}";
+		$obj="{op:'history',div:'$div',pcm_val:'".$_GET['pcm_val']."',gDossier:'$dossier',select:this,exercice:{$year}}";
 		$is=$exercice->select('p_exercice',$default,' onchange="update_history_account('.$obj.');"');
 		$old=_("Autre exercice")." ".$is->input();
 	      }
--- a/include/ajax/ajax_history_anc_account.php
+++ b/include/ajax/ajax_history_anc_account.php
@ -0,0 +1,69 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2018) Author Dany De Bontridder <dany@alchimerys.be>
+
+if (!defined('ALLOWED'))     die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief Display the history of an analytic account.
+ * Receives the parameters GET: 
+        - gDossier	integer
+        - act            history_anc_account
+        - po_id          integer poste_analytic.po_id
+        - div           DOM ID of the box 
+        - op            history
+        - exercice	integer
+ */
+require_once NOALYSS_INCLUDE."/class/anc_grandlivre.class.php";
+
+try {
+    $po_id=$http->get("po_id","number");
+    $exercice=$http->get("exercice","number");
+    $div=$http->get("div");
+} catch (Exception $ex) {
+    echo $ex->getTraceAsString();
+    throw $ex;
+}
+$poste_analytic=new Poste_analytique_SQL($cn, $po_id);
+
+$anc_grandlivre=new Anc_GrandLivre($cn);
+
+$anc_grandlivre->from_poste=$poste_analytic->po_name;
+$anc_grandlivre->to_poste=$poste_analytic->po_name;
+
+// Find the first and last periode
+$periode=new Periode($cn);
+$a_periode_limit=$periode->limit_year($exercice);
+
+// Find the first day
+$first_day=$periode->first_day($a_periode_limit['start']);
+
+// find the last day
+$last_day=$periode->last_day($a_periode_limit['end']);
+
+$anc_grandlivre->from=$first_day;
+$anc_grandlivre->to=$last_day;
+
+echo HtmlInput::title_box($poste_analytic->getp("po_name"), $div, "close", "", "n");
+
+echo $anc_grandlivre->display_html(0);
+$anc_grandlivre->pa_id=$poste_analytic->pa_id;
+echo $anc_grandlivre->show_button();
--- a/include/ajax/ajax_mod_predf_op.php
+++ b/include/ajax/ajax_mod_predf_op.php
@ -28,8 +28,7 @@ ob_start();
 require_once NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 $op=new Pre_Operation($cn,$_GET['id']);
 $array=$op->load();
-echo Icon_Action::close('mod_predf_op');
-echo h2(_('Modification du nom'),' class="title"');
+echo HtmlInput::title_box(_('Modification du nom'),'mod_predf_op','close','','n');

 echo '
    <form method="POST" onsubmit="save_predf_op(this);return false;">';
--- a/include/ajax/ajax_navigator.php
+++ b/include/ajax/ajax_navigator.php
@ -51,7 +51,6 @@ $a_menu=$cn->get_array($sql,array($_SESSION['g_user']));
            <th class='sorttable_sorted'>
                Code AD 
                <?php echo Icon_Action::infobulle(34); ?>
-                <span id="sorttable_sortfwdind">&nbsp<img src="image/up.gif"></span>
            </th>
            <th>
                <?php echo _("Chemin");?>
--- a/include/ajax/ajax_periode.php
+++ b/include/ajax/ajax_periode.php
@ -279,9 +279,11 @@ switch ($act)
            $a_answer['content']=ob_get_clean();
            $a_answer['status']="OK";
            $a_answer['p_id']=$p_id;
+            $a_answer['status']="OK";
        }
        catch (Exception $e)
        {
+            $a_answer['status']="NOK";
            $a_answer['content']=$e->getMessage();
        }
        break;
--- a/include/ajax/ajax_preference.php
+++ b/include/ajax/ajax_preference.php
@ -27,6 +27,7 @@ require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
 require_once NOALYSS_INCLUDE.'/lib/iperiod.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_report.class.php';
 require_once NOALYSS_INCLUDE.'/class/periode.class.php';
+require_once NOALYSS_INCLUDE.'/class/exercice.class.php';
 echo HtmlInput::title_box(_('Préférence'), 'preference_div');
 echo '<DIV class="content">';
 echo '<p class="notice">';
@ -105,21 +106,37 @@ if (isset($_REQUEST['gDossier']) && $_REQUEST['gDossier']<>0)

 		    $period->p_id = $l_user_per;
 		    $period->jrn_def_id = 0;
+                    $selected_exercice=$period->get_exercice();
+                    $js=sprintf('onchange="updatePeriodePreference(%d);"',Dossier::id());
+                    $exercice=new Exercice($cn);
+                    
 		    if ($period->is_closed($l_user_per) == 1)
 		    {
 			$msg = _('Attention cette période est fermée, vous ne pourrez rien modifier dans le module comptable');
 			$msg = '<h2 class="notice">' . $msg . '</h2>';
 		    }
-
-		    $period = new IPeriod("period");
-		    $period->user = $g_user;
-		    $period->cn = $cn;
-		    $period->filter_year = false;
-		    $period->value = $l_user_per;
-		    $period->type = ALL;
-		    $l_form_per = $period->input();
+                    
+		    $iperiod = new IPeriod("period");
+                    $iperiod->id="setting_period";
+		    $iperiod->user = $g_user;
+		    $iperiod->cn = $cn;
+		    $iperiod->filter_year = true;
+                    $iperiod->exercice=$selected_exercice;
+		    $iperiod->value = $l_user_per;
+		    $iperiod->type = ALL;
+		    $l_form_per = $iperiod->input();
 		    ?>
-    		<tr><td><?php echo _('Période');?></td>
+                <tr>
+                    <td>
+                        <?=_("Exercice")?>
+                    </td>
+                    <td>
+                        <?=$exercice->select("exercice_setting",$selected_exercice,$js)->input();?>
+                    </td>
+                </tr>
+    		<tr>
+                    
+                    <td><?php echo _('Période');?></td>
    		    <td>
 			    <?php printf(' %s ', $l_form_per);?>
    		    </td>
--- a/include/ajax/ajax_search_operation.php
+++ b/include/ajax/ajax_search_operation.php
@ -1,4 +1,5 @@
 <?php
+
 /*
 *   This file is part of NOALYSS.
 *
@ -15,12 +16,13 @@
 *   You should have received a copy of the GNU General Public License
 *   along with NOALYSS; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
-/*! \file
+/* ! \file
 * \brief Search module
 */
-if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger_search.class.php';
@ -32,104 +34,110 @@ require_once NOALYSS_INCLUDE.'/lib/database.class.php';
 /* Admin. Dossier */

 $cn=Dossier::connect();
-require_once  NOALYSS_INCLUDE.'/class/user.class.php';
+require_once NOALYSS_INCLUDE.'/class/user.class.php';
 // display a search box


 $base=basename($_SERVER['SCRIPT_NAME']);
 $inside=false;
-$tiers=$http->get("tiers","string","");
+$tiers=$http->get("tiers", "string", "");
 // With the amount id, we find the amount in a html elt
 if (isset($_GET['amount_id']))
 {
-	put_global(array(
-                        array("key"=>'amount_min','value'=>$_GET['amount_id']),
-                        array("key"=>'amount_max','value'=>$_GET['amount_id'])
-                        ));
+    put_global(array(
+        array("key"=>'amount_min', 'value'=>$_GET['amount_id']),
+        array("key"=>'amount_max', 'value'=>$_GET['amount_id'])
+    ));
 }
-$target=$http->get("target","string","");
-$ledger=new Acc_Ledger_Search('ALL',1,$target);
+$target=$http->get("target", "string", "");
+$ledger=new Acc_Ledger_Search('ALL', 1, $target);

-if ($base == 'recherche.php' || $base == 'do.php')
-	{
-	echo '<div class="content" >';
-	echo	 '<form method="GET">';
-	}
-	else
-	{
-		$action="";
-		$callback="";
-                echo HtmlInput::title_box(_('Recherche'), $target);
-		echo '<form name="search_form_ajx" id="search_form_ajx" onsubmit="search_operation(this);return false">';
-		echo HtmlInput::get_to_hidden(array('ctlc','ledger'));
-                echo HtmlInput::hidden("target",$target);
-		$inside=true;
-	}
-echo HtmlInput::hidden("tiers",$tiers);
+if ($base=='recherche.php'||$base=='do.php')
+{
+    echo '<div class="content" >';
+    echo '<form method="GET">';
+}
+else
+{
+    $action="";
+    $callback="";
+    echo HtmlInput::title_box(_('Recherche'), $target);
+    echo '<form name="search_form_ajx" id="search_form_ajx" onsubmit="search_operation(this);return false">';
+    echo HtmlInput::get_to_hidden(array('ctlc', 'ledger'));
+    echo HtmlInput::hidden("target", $target);
+    $inside=true;
+}
+echo HtmlInput::hidden("tiers", $tiers);
 echo $ledger->search_form();
-echo HtmlInput::submit("viewsearch",_("Recherche"));
+echo HtmlInput::submit("viewsearch", _("Recherche"));
 echo HtmlInput::button_close($target);
 echo '</form>';

-if ( isset ($_GET['amount_min'])&& isset($_GET['amount_max'])&& ($_GET['amount_max']!=0 ||$_GET['amount_min']!=0 ))
+if (isset($_GET['amount_min'])&&isset($_GET['amount_max'])&&($_GET['amount_max']!=0||$_GET['amount_min']!=0 ))
 {
-	$_GET['viewsearch']=1;
-	put_global(
-			array
-				(
-				array('key'=>'ledger_type','value'=>'ALL')
-				)
-
-			);
-
+    $_GET['viewsearch']=1;
+    put_global(
+            array
+                (
+                array('key'=>'ledger_type', 'value'=>'ALL')
+            )
+    );
 }
 //-----------------------------------------------------
 // Display search result
 //-----------------------------------------------------
-if ( isset ($_GET['viewsearch']) )
+if (isset($_GET['viewsearch']))
 {

    // Navigation bar
    $step=MAX_RECONCILE;
    $page=(isset($_GET['offset']))?$_GET['page']:1;
    $offset=(isset($_GET['offset']))?$_GET['offset']:0;
-    if (count ($_GET) == 0)
+    if (count($_GET)==0)
        $array=null;
    else
        $array=$_GET;
    $array['p_action']='ALL';
-    if ( ! isset ($array['date_start']) || ! isset ($array['date_end']))
+    if (!isset($array['date_start'])||!isset($array['date_end']))
    {
-            // get first date of current exercice
-            list($array['date_start'],$array['date_end'])=$g_user->get_limit_current_exercice();
+        // get first date of current exercice
+        list($array['date_start'], $array['date_end'])=$g_user->get_limit_current_exercice();
    }

-    list($sql,$where)=$ledger->build_search_sql($array);
+    list($sql, $where)=$ledger->build_search_sql($array);
    // Count nb of line
    $max_line=$cn->count_sql($sql);
    $target=$http->get("target");
-    list($count,$content)=$ledger->list_operation_to_reconcile($sql,$target);
-    $bar=navigation_bar($offset,$max_line,$step,$page);
+    list($count, $content)=$ledger->list_operation_to_reconcile($sql, $target);
+    $bar=navigation_bar($offset, $max_line, $step, $page);

-   if (! $inside ) {
-	   echo $bar;
+    if (!$inside)
+    {
+        echo $bar;
+    }
+    else
+    {
+        if ($step<$max_line)
+        {
+            echo '<h2 class="notice">'._('Liste limitée à ').$step._(' enregistrements. Le nombre d\'enregistrements trouvés est de ').$max_line.'</h2>';
+        }
+    }
+    echo '<form method="get" onsubmit="set_reconcile(this);return false">';
+    echo HtmlInput::hidden("tiers", $tiers);
+    echo HtmlInput::submit("upd_rec", _("Mettre à jour"));
+    echo HtmlInput::get_to_hidden(array('ctlc', 'amount_id', 'ledger'));
+    echo HtmlInput::get_to_hidden(array('l', 'date_start', 'date_end', 'desc', 'amount_min', 'amount_max', 'qcodesearch_op',
+        'accounting', 'unpaid', 'gDossier', 'ledger_type'));
+    echo $content;
+    echo HtmlInput::submit("upd_rec", _("Mettre à jour"));
+    if (!$inside)
+    {
+        echo $bar;
+    }

-   }   else
-   {
-	    if ($step<$max_line ) echo '<h2 class="notice">'._('Liste limitée à ').$step._(' enregistrements. Le nombre d\'enregistrements trouvés est de ') .$max_line.'</h2>';
-   }
-	echo '<form method="get" onsubmit="set_reconcile(this);return false">';
-        echo HtmlInput::hidden("tiers",$tiers);
-	echo HtmlInput::submit("upd_rec",_("Mettre à jour"));
-	echo HtmlInput::get_to_hidden(array('ctlc','amount_id','ledger'));
-	echo HtmlInput::get_to_hidden(array('l','date_start','date_end','desc','amount_min','amount_max','qcodesearch_op','accounting','unpaid','gDossier','ledger_type'));
-        echo $content;
-	echo HtmlInput::submit("upd_rec",_("Mettre à jour"));
-    if (! $inside )echo $bar;
-
-    if (isset($_GET[$op.'r_jrn'])) {
-      foreach ($_GET[$op.'r_jrn'] as $k=>$v)
-		echo HtmlInput::hidden($op.'r_jrn['.$k.']',$v);
+    if (isset($_GET[$op.'r_jrn']))
+    {
+        foreach ($_GET[$op.'r_jrn'] as $k=> $v) echo HtmlInput::hidden($op.'r_jrn['.$k.']', $v);
    }
    echo '</form>';
 }
--- a/include/ajax/ajax_tag_detail.php
+++ b/include/ajax/ajax_tag_detail.php
@ -35,6 +35,8 @@ else :
    $data=$tag->data;
    require_once NOALYSS_TEMPLATE.'/tag_detail.php';
    echo HtmlInput::submit("save_tag_sb", "Valider");
+    echo HtmlInput::button_close("tag_div");
+
    ?>
 </form>
 <?php
--- a/include/ajax/ajax_tag_list.php
+++ b/include/ajax/ajax_tag_list.php
@ -32,6 +32,7 @@ $tag->select();

 $js=sprintf("onclick=\"show_tag('%s','%s','%s','j')\"",Dossier::id(),'','-1');
 echo HtmlInput::button("tag_add", _("Ajout d'un tag"), $js);
+echo HtmlInput::button_close("tag_div");

 $response=  ob_get_clean();
 $html=escape_xml($response);
--- a/include/ajax/ajax_tag_save.php
+++ b/include/ajax/ajax_tag_save.php
@ -3,13 +3,52 @@
 //see licence.txt
 /**
 *@file
- *@brief save a new tag
+ *@brief save a new tag or disable / enable the tag
 *@see Tag
 */
 if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
+$http=new HttpInput();
+$op=$http->request("op");
+global $g_user;
+$nDossier=Dossier::id();
+///check security
+if ( $g_user->check_module('CFGTAG')==0)
+{
+    die(_("non permis"));
+}
+

 require_once NOALYSS_INCLUDE.'/class/tag.class.php';
-$tag=new Tag($cn);
-$tag->save($_GET);

+//Save a tag
+if ($op=='tag_save')
+{
+    $tag=new Tag($cn);
+    $tag->save($_GET);
+    return;
+} 
+//---------------------------------------------------------------------
+// Enable or disable a tag
+//---------------------------------------------------------------------
+if ( $op == "tag_activate")
+{
+    $tag_id=$http->get("t_id");
+    $tag=new Tag($cn, $tag_id);
+    $return=array();
+    $id=sprintf("tag_onoff%d",$tag_id);
+    if ( $tag->data->getp('t_actif') == 'Y')
+    {
+        $tag->data->t_actif='N';
+        $tag->data->save();
+        $return['code']='&#xf204;';
+        $return['style']='color:red';
+    } else {
+        $tag->data->t_actif='Y';
+        $tag->data->save();
+        $return['code']='&#xf205;';
+        $return['style']='color:green';
+    }
+    header("Content-type: text/json; charset: utf8",true);
+    echo json_encode($return);
+}
 ?>
--- a/include/ajax/ajax_tva_parameter.php
+++ b/include/ajax/ajax_tva_parameter.php
@ -0,0 +1,78 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2018) Author Dany De Bontridder <dany@alchimerys.be>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief 
+ * @param type $name Descriptionara
+ */
+require_once NOALYSS_INCLUDE."/class/tva_rate_mtable.class.php";
+
+if ( $g_user->check_module('CFGTVA') ==0 )
+{
+    return;
+}
+try
+{
+    $table=$http->request('table');
+    $action=$http->request('action');
+    $p_id=$http->request('p_id', "number");
+    $ctl_id=$http->request('ctl');
+}
+catch (Exception $e)
+{
+    record_log($e->getTraceAsString());
+    return;
+}
+
+$tva_rate=new V_Tva_Rate_SQL($cn);
+$p_id=$http->request('p_id', "number");
+$tva_rate->set_pk_value($p_id);
+$tva_rate->load();
+$manage_table=new Tva_Rate_MTable($tva_rate);
+$manage_table->set_callback("ajax_misc.php");
+$manage_table->add_json_param("op", "tva_parameter");
+
+if ($action=="input")
+{
+
+    $manage_table->set_object_name($ctl_id);
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $manage_table->ajax_input()->saveXML();
+    return;
+}
+elseif ($action=="save")
+{
+    $manage_table->set_object_name($ctl_id);
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $manage_table->ajax_save()->saveXML();
+    return;
+}
+elseif ($action=="delete")
+{
+    $manage_table->set_object_name($ctl_id);
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $manage_table->ajax_delete()->saveXML();
+}
+return;
--- a/include/anc_great_ledger.inc.php
+++ b/include/anc_great_ledger.inc.php
@ -34,10 +34,13 @@ if ($result != null)
        echo '<span style="display:block">';
          echo _('Tout sélectionner')." ".ICheckBox::toggle_checkbox('export_pdf_bt1','export_anc_receipt_pdf');
        echo '</span>';
+        $task_id=uniqid();
        echo $grandLivre->show_button();
-        printf ('<form method="GET" id="export_anc_receipt_pdf" action="export.php" style="display:inline" onsubmit="smoke.signal(\'%s\', function(e){}, {duration: 3000,classname: \'custom-class\'});return true;">',
-                _("Le traitement est en cours ,  merci de patienter sans recharger la page"));
-
+        printf ('<form method="GET" id="export_anc_receipt_pdf" action="export.php" style="display:inline" onsubmit="progress_bar_start(\'%s\',\'%s\');return true;">',
+                $task_id,
+                _("Le traitement est en cours ,  merci de patienter sans recharger la page")
+               );
+        echo HtmlInput::hidden("task_id",$task_id);
        echo $grandLivre->button_export_pdf();
        echo $grandLivre->display_html();
        echo $grandLivre->button_export_pdf();
--- a/include/anc_od.inc.php
+++ b/include/anc_od.inc.php
@ -51,9 +51,8 @@ if ( ! $m )
 // show the left menu
 //----------------------------------------------------------------------
 echo '
-<div class="content" >
 <div class="menu2">
-<table>
+<table clsas="mtitle">
 <tr>
 <td  class="mtitle" >
 <A class="mtitle" HREF="?ac='.$_REQUEST['ac'].'&new&'.$str_dossier.'"> '._('Nouveau').' </A>
@ -64,7 +63,6 @@ echo '
 </tr>
 </table>
 </div>
-</div>
 ';


--- a/include/anc_pa.inc.php
+++ b/include/anc_pa.inc.php
@ -52,7 +52,7 @@ if ($sa=="add_pa")
        $ret.=HtmlInput::title_box(_('Nouveau plan'), 'anc_div_add', 'hide');
        $ret.= '<form method="post">';
        $ret.=dossier::hidden();
-        $ret.= $new->form();
+        $ret.= $new->form_new();
        $ret.= HtmlInput::hidden("sa", "pa_write");
        $ret.=HtmlInput::submit("submit", _("Enregistre"));
        $ret.=HtmlInput::button_hide("anc_div_add");
@ -111,11 +111,12 @@ if ($sa=="pa_delete")
    $delete->delete();
    $sa="anc_menu";
 }
-
-// show the detail
+//--------------------------------------------------------------------------------------------------
+// show the detail of an analytic axis (=plan)
+// 
+//--------------------------------------------------------------------------------------------------
 if ($sa=="pa_detail")
 {
-    
    $pa_id=$http->get("pa_id","number");
    
    $new=new Anc_Plan($cn, $pa_id);
@ -127,9 +128,11 @@ if ($sa=="pa_detail")

    $ret.= $new->form();
    $ret.= $wSa;
+    $ret.="<p>";
    $ret.=HtmlInput::button_anchor(_('Efface ce plan'), '', 'remove_analytic_plan',
                    'onclick="return confirm_box(\'remove_analytic_plan\',\'Effacer ?\',function () {window.location=\'do.php?ac='.$_REQUEST['ac'].'&pa_id='.$_GET['pa_id'].'&sa=pa_delete&'.$str_dossier.'\';})"',
                    'smallbutton');
+    $ret.="</p>";
    //---------------------------------------------------------------------
    //  Detail now
    // Use Manage_Table
@ -145,6 +148,7 @@ if ($sa=="pa_detail")
    $accounting->set_callback("ajax_misc.php");
    $accounting->add_json_param("op", "anc_accounting");
    $accounting->add_json_param("pa_id", $pa_id);
+    $accounting->set_sort_column("po_name");
    ob_start();
    $accounting->display_table(" where pa_id = $1 order by po_name ",array($pa_id));
    $accounting->create_js_script();
@ -170,8 +174,8 @@ if ($sa=='anc_menu')
        $url=http_build_query(array("sa"=>"add_pa","ac"=>$ac,
                "gDossier"=>Dossier::id()));
        echo '<div class="content">';
-        echo '<TABLE>';
-        echo '<TR><TD class="vert_mtitle">';
+        echo '<TABLE class="vert_mtitle">';
+        echo '<TR><TD class="first">';
        echo '<a href="?'.$url.'">'._("Ajout d'un plan comptable").'</a>';
        echo '</TD></TR>';
        echo '</TABLE>';
--- a/include/audit_log.php
+++ b/include/audit_log.php
@ -17,14 +17,14 @@
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-// Copyright Author Dany De Bontridder danydb@aevalys.eu
+// Copyright Author Dany De Bontridder danydb@noalyss.eu

 /*!\file
 * \brief let you see the list of the connexion
 */
 if ( !defined ('ALLOWED')) die('Forbidden');
 ?>
-<DIV class="content" style="width:80%;margin-left:10%">
+<DIV class="content">
 <span class="notice">Liste limitée aux 100 dernières connexions</span>
 <?php

--- a/Show more
+++ b/Show more