diff --git a/README b/README
index 5547d8570..b20ca8fa7 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
 Si vous avez besoin d'aide pour l'installation 
 utilisez la mailing list 
 Pour souscrire ou faire des recherches 
-    aller à http://mail.nongnu.org/mailman/listinfo/phpcompta-support
+    aller à https://lists.nongnu.org/mailman/listinfo/noalyss-generale
diff --git a/contrib/mono-dossier/mono.sql b/contrib/mono-dossier/mono.sql
index 6ec4f93b0..fe4fef052 100644
--- a/contrib/mono-dossier/mono.sql
+++ b/contrib/mono-dossier/mono.sql
@@ -528,3 +528,11 @@ ALTER TABLE ONLY priv_user
 -- PostgreSQL database dump complete
 --
 
+begin;
+update theme set the_name='Mandarine' ,the_filestyle='style-mandarine.css' where the_name='Colored';
+update theme set the_name='Mobile' ,the_filestyle='style-mobile.css' where the_name='EPad';
+update theme set the_name = 'Classique' where the_name='classic';
+update user_global_pref set parameter_value='Classique' where parameter_type='THEME';
+update theme set the_filestyle='style-classic.css' where the_filestyle='style.css';
+update repo_version set val=15;
+commit;
diff --git a/doc/commencer-avec-noalyss.odt b/doc/commencer-avec-noalyss.odt
new file mode 100644
index 000000000..b6f8247ce
Binary files /dev/null and b/doc/commencer-avec-noalyss.odt differ
diff --git a/doc/commencer-avec-noalyss.pdf b/doc/commencer-avec-noalyss.pdf
new file mode 100644
index 000000000..286b1b679
Binary files /dev/null and b/doc/commencer-avec-noalyss.pdf differ
diff --git a/doc/commencer-avec-phpcompta.odt b/doc/commencer-avec-phpcompta.odt
deleted file mode 100644
index a8c64c12e..000000000
Binary files a/doc/commencer-avec-phpcompta.odt and /dev/null differ
diff --git a/doc/commencer-avec-phpcompta.pdf b/doc/commencer-avec-phpcompta.pdf
deleted file mode 100644
index 0ef10cc05..000000000
Binary files a/doc/commencer-avec-phpcompta.pdf and /dev/null differ
diff --git a/html/admin/sql/patch/ac-upgrade14.sql b/html/admin/sql/patch/ac-upgrade14.sql
index 599cb177c..140f72705 100644
--- a/html/admin/sql/patch/ac-upgrade14.sql
+++ b/html/admin/sql/patch/ac-upgrade14.sql
@@ -1,8 +1,8 @@
 begin;
 update theme set the_name='Mandarine' ,the_filestyle='style-mandarine.css' where the_name='Colored';
 update theme set the_name='Mobile' ,the_filestyle='style-mobile.css' where the_name='EPad';
-update user_global_pref set parameter_value='Mandarine' where parameter_value='Colored';
-update user_global_pref set parameter_value='Mobile' where parameter_value='EPad';
+update theme set the_name = 'Classique' where the_name='classic';
+update user_global_pref set parameter_value='Classique' where parameter_type='THEME';
 update theme set the_filestyle='style-classic.css' where the_filestyle='style.css';
 
 CREATE OR REPLACE FUNCTION public.upgrade_repo(p_version integer)
diff --git a/html/admin/sql/patch/upgrade115.sql b/html/admin/sql/patch/upgrade115.sql
new file mode 100644
index 000000000..f458f13b2
--- /dev/null
+++ b/html/admin/sql/patch/upgrade115.sql
@@ -0,0 +1,9 @@
+begin;
+
+INSERT INTO menu_ref(me_code, me_menu, me_file,   me_type)VALUES ('PDF:AncReceipt', 'Export pièce PDF',  'export_anc_receipt_pdf.php','PR');
+
+insert into profile_menu(me_code,p_id,p_type_display,pm_default) values ('PDF:AncReceipt',1,'P',0);
+
+update version set val=116;
+
+commit;
diff --git a/html/backup.php b/html/backup.php
index 5ddc083ad..7bb11931a 100644
--- a/html/backup.php
+++ b/html/backup.php
@@ -68,12 +68,14 @@ if ( isset ($_REQUEST['sa']) )
             putenv("PGUSER=".phpcompta_user);
             putenv("PGHOST=".phpcompta_psql_host);
             putenv("PGPORT=".phpcompta_psql_port);
+        } else  {
+        die ('Aucune connection');
         }
         
         if ( $_REQUEST['t'] == 'd' )
         {
             $database=domaine."dossier".$_REQUEST['d'];
-            $args= " -Fc -Z9 --no-owner -h ".noalyss_psql_host." -p ".noalyss_psql_port." ".$database;
+            $args= " -Fc -Z9 --no-owner -h ".getenv("PGHOST")." -p ".getenv("PGPORT")." ".$database;
             header('Content-type: application/octet');
             header('Content-Disposition:attachment;filename="'.$database.'.bin"',FALSE);
 
@@ -84,7 +86,7 @@ if ( isset ($_REQUEST['sa']) )
         if ( $_REQUEST['t'] == 'm' )
         {
             $database=domaine."mod".$_REQUEST['d'];
-            $args= " -Fc -Z9 --no-owner -h ".noalyss_psql_host." -p ".noalyss_psql_port." ".$database;
+            $args= " -Fc -Z9 --no-owner -h ".getenv("PGHOST")." -p ".getenv("PGPORT")." ".$database;
             header('Content-type: bin/x-application');
             header('Content-Disposition: attachment;filename="'.$database.'.bin"',FALSE);
             $a=passthru ($cmd.$args);
diff --git a/html/direct.php b/html/direct.php
index 3b4838ed5..4eb2a72cb 100644
--- a/html/direct.php
+++ b/html/direct.php
@@ -1,4 +1,23 @@
 <?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 require_once '../include/constant.php';
 require_once ("class_database.php");
 require_once 'class_user.php';
diff --git a/html/do.php b/html/do.php
index 1c299c9d7..b4a08330f 100644
--- a/html/do.php
+++ b/html/do.php
@@ -31,6 +31,7 @@ require_once('user_common.php');
 require_once('ac_common.php');
 require_once 'function_javascript.php';
 require_once 'constant.security.php';
+require_once 'class_html_input.php';
 mb_internal_encoding("UTF-8");
 
 // if gDossier is not set redirect to form to choose a folder
@@ -46,10 +47,9 @@ if ( ! isset ($_SESSION['g_theme']))
     exit();
 
   }
+$style_user=HtmlInput::default_value_post("style_user",$_SESSION['g_theme']);
 
-if (isset ($_POST["style_user"])){$_SESSION['g_theme']=$_POST['style_user'];}
-
-html_page_start($_SESSION['g_theme']);
+html_page_start($style_user);
 
 global $g_user, $cn,$g_parameter;
 
diff --git a/html/export.php b/html/export.php
index 8f8bbfb4f..90b027955 100644
--- a/html/export.php
+++ b/html/export.php
@@ -43,7 +43,14 @@ if ( $action=='X' || ! isset($_GET['act']) || $g_user->check_print($_GET['act'])
     exit();
   }
 // get file and execute it
-
- $prfile=$cn->get_value("select me_file from menu_ref where me_code=$1",array($_GET['act']));
+$action=HtmlInput::default_value_get('act', null);
+if ($action == null )
+{
+    die(_('Appel invalide'));
+}
+ $prfile=$cn->get_value("select me_file from menu_ref where me_code=$1",array($action));
+ if ( $prfile == "") {
+     die (_('Export impossible'));
+ }
  require_once $prfile;
  ?>
\ No newline at end of file
diff --git a/html/image/bg-submit5.png b/html/image/bg-submit5.png
index 00e582c76..fc0bb8cbd 100644
Binary files a/html/image/bg-submit5.png and b/html/image/bg-submit5.png differ
diff --git a/html/image/documents.png b/html/image/documents.png
new file mode 100644
index 000000000..61d9f0ff9
Binary files /dev/null and b/html/image/documents.png differ
diff --git a/html/index.php b/html/index.php
index 757323061..a71fc7705 100644
--- a/html/index.php
+++ b/html/index.php
@@ -1,4 +1,22 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 /*! \file
  * \brief default page where user access
  */
@@ -140,7 +158,7 @@ color:red;
 
 }
 .input_text {
-border:groove 1px blue;
+border:1px solid blue;
 margin:1px;
 }
 .button {
@@ -185,7 +203,7 @@ if ( strlen(domaine) > 0 )
 
 echo '
 <span style="background-color:#879ed4;color:white;padding-left:4px;padding-right:4px;">
-version  6.7.2.0 - '.$my_domain.'
+version  6.7.2.1 - '.$my_domain.'
 </span>
 <BR>
 <BR>
@@ -250,6 +268,7 @@ echo '
 <div  style="position:absolute;bottom:0em;border:1px solid red;text-align:right;width:20em;">
 <span style="display:block">Pour une meilleure expérience web, nous vous conseillons <a href="http://www.mozilla.com/fr/">firefox</a></span>
 <span style="display:block">For a better web experience, we recommend you <a href="http://www.mozilla.com/en/">firefox</a></span>
+</div>
  <script> SetFocus('p_user'); </script>
 </body>
 </html>
diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index 2eebc622b..cc9b0ac24 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -1063,6 +1063,8 @@ function gestion_add_row()
             new_tt = new_tt.replace(/sold\(0\)/g, "sold(" + nb.value + ")");
             new_tt = new_tt.replace(/compute_ledger\(0\)/g, "compute_ledger(" + nb.value + ")");
             new_tt = new_tt.replace(/clean_tva\(0\)/g, "clean_tva(" + nb.value + ")");
+            new_tt = new_tt + '<input type="hidden" id="tva_march'+nb.value+'">';
+               new_tt = new_tt + '<input type="hidden" id="htva_march'+nb.value+'">';
             newCell.innerHTML = new_tt;
             if ( mytable.rows[1].cells[e].hasClassName("num") ) {
                 newCell.addClassName("num");
diff --git a/html/js/infobulle.js b/html/js/infobulle.js
index 36015afd7..77bd8bbaf 100644
--- a/html/js/infobulle.js
+++ b/html/js/infobulle.js
@@ -64,6 +64,11 @@ content[33]='le type vaut :<ul>	<li> ME pour Menu</li>	<li> PR pour les impressi
 content[34]='Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet';
 content[35]='Cliquez sur le chemin pour ouvrir le menu';
 content[36]='En utilisant les dates d\'échéance ou de paiement, seuls les journaux de type ACH et VEN seront utilisés ,vous excluez d\'office les autres journaux';
+content[37]='Les dates sont en format DD.MM.YYYY';
+content[38]='La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer le numéro';
+content[39]='Le préfixe des pièces doit être différent pour chaque journal, on peut aussi utiliser l\'année';
+content[40]='Laissez à 0 pour ne pas changer le numéro';
+
 function showBulle(p_ctl){
     d=document.getElementById('bulle');
     d.innerHTML=content[p_ctl];
diff --git a/html/js/modele_document.js b/html/js/modele_document.js
index 795d361e5..4090dda97 100644
--- a/html/js/modele_document.js
+++ b/html/js/modele_document.js
@@ -1,3 +1,21 @@
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 /*!\brief
  * \param p_value jrn.jr_id
  */
diff --git a/html/js/prototype.js b/html/js/prototype.js
index 37dd39ac2..eab8e030e 100644
--- a/html/js/prototype.js
+++ b/html/js/prototype.js
@@ -4229,8 +4229,27 @@ Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
 
     if (options.setLeft)
       styles.left = (p[0] - delta[0] + options.offsetLeft) + 'px';
-    if (options.setTop)
-      styles.top  = (p[1] - delta[1] + options.offsetTop)  + 'px';
+   if (options.setTop) {
+       /****
+        * DDB Scroll
+        */
+                var x = 0, y = 0;
+                if( typeof( window.pageYOffset ) == 'number' ) {
+                    // Netscape
+                    x = window.pageXOffset;
+                    y = window.pageYOffset;
+                } else if( document.body && ( document.body.scrollLeft || document.body.scrollTop ) ) {
+                    // DOM
+                    x = document.body.scrollLeft;
+                    y = document.body.scrollTop;
+                } else if( document.documentElement && ( document.documentElement.scrollLeft || document.documentElement.scrollTop ) ) {
+                    // IE6 standards compliant mode
+                    x = document.documentElement.scrollLeft;
+                    y = document.documentElement.scrollTop;
+                }
+      /**** DDB ***/
+      styles.top  = (p[1] - delta[1] + options.offsetTop) + y + 'px';
+  }
 
     if (options.setWidth)
       styles.width  = layout.get('border-box-width')  + 'px';
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 31223cb93..cad9059e8 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -118,21 +118,21 @@ function g(ID)
  */
 function enable_type_periode()
 {
-    if (g('type_periode').value === 1)
+    if ($("type_periode").options[$("type_periode").selectedIndex].value == 0)
     {
-        g('from_periode').disabled = true;
-        g('to_periode').disabled = true;
-        g('from_date').disabled = false;
-        g('to_date').disabled = false;
-        g('p_step').disabled = true;
+        $('from_periode').enable();
+        $('to_periode').enable ();
+        $('from_date').disable();
+        $('to_date').disable();
+        $('p_step').enable();
     }
     else
     {
-        g('from_periode').disabled = false;
-        g('to_periode').disabled = false;
-        g('from_date').disabled = true;
-        g('to_date').disabled = true;
-        g('p_step').disabled = false;
+        $('from_periode').disable();
+        $('to_periode').disable ();
+        $('from_date').enable();
+        $('to_date').enable();
+        $('p_step').disable();
     }
 }
 
@@ -814,7 +814,7 @@ function show_ledger_choice(json_obj)
                             };
                             //var y=calcy(posY);
                             var y=posY;
-                            if (json_obj.div !== '')obj.cssclass="";
+                           if (json_obj.div != '')obj.cssclass="";
                             obj.style="top:"+y+'px;'+obj.style;
                            /* if ( json_obj.class ) 
                             { 
@@ -1717,21 +1717,21 @@ function show_fin_chdate(obj_id)
     try
     {
         var ch = $(obj_id).options[$(obj_id).selectedIndex].value;
-        if (ch === 2) {
+        if (ch == 2) {
             $('chdate_ext').hide();
             $('thdate').show();
         }
-        if (ch === 1) {
+        if (ch == 1) {
             $('chdate_ext').show();
             $('thdate').hide();
         }
         var nb = $('nb_item').value;
         for (i = 0; i < nb; i++) {
             if ($('tdchdate' + i)) {
-                if (ch === 2) {
+                if (ch == 2) {
                     $('tdchdate' + i).show();
                 }
-                if (ch === 1) {
+                if (ch == 1) {
                     $('tdchdate' + i).hide();
 
                 }
@@ -1919,8 +1919,8 @@ function display_task(p_id)
             new Effect.Highlight(obj.id, {scroll: window, queue: 'end'});
         }}
     );
-    $(p_id).style.top = posY;
-    $(p_id).style.left = posX;
+    $(p_id).style.top = posY+'px';
+    $(p_id).style.left = posX+'px';
     $(p_id).style.display = 'block';
 
 }
@@ -2336,8 +2336,8 @@ function search_display_tag(p_dossier, p_prefix)
                         code_html = unescape_xml(code_html);
                         remove_waiting_box();
                         add_div({id: p_prefix + 'tag_div', style: '', cssclass: 'inner_box', drag: 1});
-                        $(p_prefix + 'tag_div').style.top = posY - 80;
-                        $(p_prefix + 'tag_div').style.left = posX - 200;
+                        $(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;
 
diff --git a/html/popup.php b/html/popup.php
index 109d280b5..76fd02034 100644
--- a/html/popup.php
+++ b/html/popup.php
@@ -1,4 +1,21 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 require_once('../include/ac_common.php');
 require_once('function_javascript.php');
diff --git a/html/style-classic.css b/html/style-classic.css
index 36118359f..4dce94df2 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -537,11 +537,11 @@ a.document:hover {
     margin:1px;
 }
 .input_text {
-    border:groove 1px #0000FF;
+    border:solid 1px #0000FF;
     margin:1px;
 }
 .input_text:hover {
-    border:groove 1px #0000FF;
+    border:solid 1px #0000FF;
     margin:1px;
     background-color:  #F93;
 }
@@ -680,7 +680,7 @@ div.popup_content {
     filter:alpha(opacity=100);*/
 }
 div.autocomplete {
-    position:relative;
+    position:absolute;
     background-color:#FFFFFF;
     border:1px solid #888;
     margin:0px;
@@ -865,6 +865,22 @@ td.tool {
     text-align:center;
     border-radius:2px;
 }
+td.toolselected  {
+    border: solid 1px gray;
+    color: #FFFFFF;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
+    background-color:#FF0000;
+}
+td.toolselected a.mtitle {
+    border: solid 1px gray;
+    color: #FFFFFF;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
+    background-color:#FF0000;
+}
 div.topmenu {
 	font-size:14px;
 	font-size:13.6px;
@@ -1415,11 +1431,10 @@ div.box  {
     margin-left:3px;
     margin-right:3px;
     padding:2px;
-    //margin:2px;
     overflow:hidden;
     border:1px solid #00008B;
     width:30%;
-    height:312px;
+    height:350px;
     float:left;
     font-size:14px;
     font-size:0.90rem;
diff --git a/html/style-light.css b/html/style-light.css
index d8848a891..ac1227aad 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -1,7 +1,7 @@
  /* <style type="text/css"> */
 
 BODY {
-    background-color:#EDF3FF;
+    background-color: #FDFDFD;
     font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
     padding: 0px 0px 0px 0px ;
     margin:0px;
@@ -127,13 +127,16 @@ td.tool a.mtitle {
     text-decoration:none;
     display:inline;
     color: #0000FF;
+    text-align:center;
+
     
 }
 td.tool a.mtitle:hover {
     text-decoration:none;
     display:inline;
-    color: #00008B;
+    color: #FDFDFD;
     background-color:#5D90CD;
+    text-align:center;
 
 }
 #top {
@@ -151,6 +154,10 @@ td.tool a.mtitle:hover {
     font-size:12.16px;
     font-size:0.76rem;
 }
+#module table {
+    border:1px solid #5D90CD;
+    text-align:center;
+}
 div.u_subt2menu {
     background-color:#EDF3FF;
     left:1%;
@@ -243,8 +250,12 @@ table.document th{
 }
 
 table.mtitle {
-    border:0;
-    text-align:center
+    border:0px;
+    text-align:center;
+    border-collapse:separate;
+    border-spacing:5px;
+    margin-top:5px;
+    
 }
 td.mshort {
     height:15px;
@@ -258,9 +269,7 @@ td.mtitle {
     text-align:center;
     width:250px;
     height :30px;
-    background-color:#DDE6FF;
-    border:1px solid #99B1DF;
-    border-radius:5px;
+    background-color: #F1F1F1;
 }
 td.msubtitle {
     text-align:center;
@@ -282,7 +291,7 @@ span.even {
 }
 
 tr.odd {
-    background-color: #DDE6FF;
+    background-color: #F1F1F1;
 }
 tr.highlight {
     font-weight: bold;
@@ -302,15 +311,13 @@ td.cell{
     
 }
 td.selectedcell{
-    border-style:solid;
-    border-color:#0000FF;
-    border-width:1px ;
+  
     font-weight: bold;
-    background:#5D90CD ;
+    background: #909BA7;
     color:#FFFFFF;
     text-align:center;
     width:120px;
-    border-radius:5px;
+  
 }
 a.mtitle {
     text-decoration:none;
@@ -326,6 +333,14 @@ a.mtitle:hover {
     background-color:#5D90CD;
 
 }
+td.toolselected a.mtitle {
+    border: solid 1px gray;
+    color: #FFFFFF;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
+    background-color:#909BA7;
+}
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
     text-decoration:none;
     display:block;
@@ -804,7 +819,7 @@ a#anchorbutton, .button, a.button,div.content a.button {
     font-weight: bold;
     text-decoration:none;
     font-family: arial,verdana,sans-serif,helvetica;
-    background-image: url("image/bg-submit2.gif");
+    background-image: url("image/bg-submit5.png");
     background-repeat: repeat-x;
     background-position: left;
     border-color:  #0000FF;
@@ -830,7 +845,7 @@ a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
     font-weight: bold;
     text-decoration:none;
     font-family: arial,verdana,sans-serif,helvetica;
-    background-image: url("image/bg-submit2.gif");
+    background-image: url("image/bg-submit5.png");
     background-repeat: repeat-x;
     background-position: left;
     font-size:12px;
@@ -859,18 +874,31 @@ a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.content a.
 
 }
 td.tool {
-    border: solid 1px gray;
     background-color: #FFFFFF;
-    border-bottom-width: 2px;
     text-align:center;
-    border-radius:2px;
+}
+td.tool:hover,td.tool:hover a
+{
+    text-align: center;
+    text-decoration:none;
+    display:inline;
+    color: #00008B;
+    background-color:#5D90CD;
 }
 div.topmenu {
 	font-size:14px;
 	font-size:0.85rem;
         
 }
-
+div.topmenu table {
+    border-spacing:0px;
+   
+    
+}
+div.topmenu td {
+    border-width:0px;
+    border-radius:0px;
+}
 #dossier h2{
     color:#00008B;
     display:inline;
@@ -1206,7 +1234,7 @@ h1.title {
     text-transform: uppercase;
 }
 h2.title {
-    background-color:#879ED4;
+    background-color: #C4CBDB;
     color:#FFFFFF;
     text-align:center;
     padding:0.24%;
@@ -1414,11 +1442,10 @@ div.box  {
     margin-left:3px;
     margin-right:3px;
     padding:2px;
-    //margin:2px;
     overflow:hidden;
     border:1px solid #00008B;
     width:30%;
-    height:312px;
+    height:350px;
     float:left;
     font-size:14px;
     font-size:0.90rem;
diff --git a/html/style-mandarine.css b/html/style-mandarine.css
index b860098d6..398d7d208 100644
--- a/html/style-mandarine.css
+++ b/html/style-mandarine.css
@@ -327,6 +327,14 @@ a.mtitle:hover {
     background-color:#FF6600;
 
 }
+td.toolselected a.mtitle {
+    border: solid 1px gray;
+    color: #FFFFFF;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
+    background-color:#FF7F50;
+}
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
     text-decoration:none;
     display:block;
@@ -423,7 +431,7 @@ div.redcontent a {
     font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
     text-decoration: none;
     display: block;
-    color: #FF7F50;
+    color: #A52A2A;
 
 }
 
@@ -871,6 +879,14 @@ td.tool {
     text-align:center;
     border-radius:2px;
 }
+td.toolselected {
+    border: solid 1px gray;
+    color: #FFFFFF;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
+    background-color:#FF7F50;
+}
 div.topmenu {
 	font-size:14px;
 	font-size:0.85rem;
@@ -1421,11 +1437,10 @@ div.box  {
     margin-left:3px;
     margin-right:3px;
     padding:2px;
-    //margin:2px;
     overflow:hidden;
     border:1px solid #6D3F2E;
     width:30%;
-    height:312px;
+    height:350px;
     float:left;
     font-size:14px;
     font-size:0.90rem;
diff --git a/html/style-mobile.css b/html/style-mobile.css
index f1f649d21..4a8c1b095 100644
--- a/html/style-mobile.css
+++ b/html/style-mobile.css
@@ -132,10 +132,23 @@ td.tool a.mtitle {
 td.tool a.mtitle:hover {
     text-decoration:none;
     display:inline;
-    color: #00008B;
+    color: #FFFFFF;
     background-color:#5D90CD;
 
 }
+td.toolselected a.mtitle {
+    color: #FFFFFF;
+    text-align:center;
+    background-color:#909BA7;
+}
+td.toolselected {
+    border: solid 1px gray;
+    color: #FFFFFF;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
+    background-color:#909BA7;
+}
 #top {
     float:left;
     margin-bottom: 40px;
@@ -243,7 +256,9 @@ table.document th{
 }
 
 table.mtitle {
-    border:0;
+    border:0px;
+    border-collapse:separate;
+    border-spacing:5px;
     text-align:center
 }
 td.mshort {
@@ -259,8 +274,8 @@ td.mtitle {
     width:250px;
     height :30px;
     background-color:#DDE6FF;
-    border:1px solid #99B1DF;
-    border-radius:5px;
+    border:0px
+    
 }
 td.msubtitle {
     text-align:center;
@@ -310,8 +325,7 @@ td.selectedcell{
     color:#FFFFFF;
     text-align:center;
     width:120px;
-    border-radius:5px;
-}
+   }
 a.mtitle {
     text-decoration:none;
     display:inline;
@@ -870,7 +884,10 @@ div.topmenu {
 	font-size:0.85rem;
         
 }
-
+div.topmenu table {
+    border-collapse:collapse;
+  
+}
 #dossier h2{
     color:#00008B;
     display:inline;
@@ -1414,11 +1431,10 @@ div.box  {
     margin-left:3px;
     margin-right:3px;
     padding:2px;
-    //margin:2px;
     overflow:hidden;
     border:1px solid #00008B;
     width:30%;
-    height:312px;
+    height:350px;
     float:left;
     font-size:14px;
     font-size:0.90rem;
diff --git a/html/style-print.css b/html/style-print.css
index 77b09e119..2cc36fc60 100644
--- a/html/style-print.css
+++ b/html/style-print.css
@@ -1,15 +1,15 @@
 body {
-	font-size:8px;
+	font-size:11pt;
 	}
 input, select ,.input_text{
-	font-size:8px;
+	font-size:11pt;
 border:1px solid #FFFFFF;
  }
 form {
   display:none;
  }
 .print {
-	font-size:8px;
+	font-size:11pt;
 	display: block;
 	}
 .noprint  {
@@ -23,23 +23,23 @@ div.recherche_form {
 	display:none;
 	}
 table.result {
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 	width:100%
   }
 
 table.result th {
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 }
 h3,h4 {
-	font-size:10px;
+	font-size:12pt;
 	text-decoration: underline;
 	font-family:sans-serif;
 }
 
 h2 {
-	font-size:12px;
+	font-size:14pt;
 	font-weight:bold;
 	font-family:sans-serif;
 }
@@ -47,10 +47,10 @@ div.info {
 	display:none;
 }
 .content  {
-	font-size:7px;
+	font-size:11pt;
 }
 h1.content,h1,h2.info,legend {
-	font-size:14px;
+	font-size:14pt;
 	font-weight:bold;
 	font-family:sans-serif;
 }
@@ -98,20 +98,20 @@ div.debit{
 	display:none;
 }
 div.recherche{
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 }
 div.redcontent{
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 
 }
 div.redcontent{
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 }
 div.ccontent{
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 }
 div.rmenu {
@@ -147,24 +147,24 @@ span.even {
  }
 
 tr.odd {
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 }
 tr {
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 	}
 tr.even {
 
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 }
 td.odd{
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 }
 td.even{
-	font-size:7px;
+	font-size:11pt;
 	font-family:sans-serif;
 }
 td.cell{
@@ -235,7 +235,7 @@ table.doc {
 }
 a.detail
 {
-font-size:8px;
+font-size:11pt;
 font-family:sans-serif;
 }
 
@@ -251,40 +251,40 @@ a.detail:hover
 }
 .num {
 	text-align:right;
-	font-size:8px;
+	font-size:11pt;
 }
 h1.title {
-	font-size:24px;
+	font-size:14pt;
 	font-style: italic;
 }
 h2.title {
-	font-size:16px;
+	font-size:14pt;
 	font-style: italic;
-	margin-left: 15px;
+	margin-left: 10em;
 }
 h3.title {
-	font-size:14px;
-	margin-left: 30px;
+	font-size:14pt;
+	margin-left: 10em;
 }
 h4.title {
 	color: blue;
-	font-size:12px;
-	margin-left: 45px;
+	font-size:12pt;
+	margin-left: 10em;
 	text-decoration: underline;
 }
 h5.title {
 	color: blue;
-	font-size:12px;
-	margin-left: 45px;
+	font-size:12pt;
+	margin-left: 10em;
 	text-decoration: none;
 	font-style: italic;
 }
 /* </style> */
 div.myfieldset
 {
-	margin-top: 5px;
-	margin-left:5px;
-	margin-right: 5px;
+	margin-top: 3em;
+	margin-left:3em;
+	margin-right: 3em;
 	border:lightgrey 2px groove;
 }
 #info_div ,div#error_div ,div#close_div{
diff --git a/include/anc_acc_balance.inc.php b/include/anc_acc_balance.inc.php
index a68211d0f..081d43d8d 100644
--- a/include/anc_acc_balance.inc.php
+++ b/include/anc_acc_balance.inc.php
@@ -4,6 +4,7 @@
 
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once('class_anc_acc_list.php');
+echo '<div class="content">';
 $tab = new Anc_Acc_List($cn);
 $tab->get_request();
 echo '<form method="get">';
@@ -16,4 +17,5 @@ if (isset($_GET['result']))
     echo $tab->show_button();
     $tab->display_html();
 }
+echo '</div>';
 ?>
diff --git a/include/anc_balance_double.inc.php b/include/anc_balance_double.inc.php
index 6c20904ed..21af8eae8 100644
--- a/include/anc_balance_double.inc.php
+++ b/include/anc_balance_double.inc.php
@@ -11,7 +11,18 @@ echo $bc->display_form();
 echo '</form>';
 if (isset($_GET['result']))
 {
-    echo $bc->show_button();
-    echo $bc->display_html();
+    $result=$bc->display_html();
+    if ($bc->has_data > 0)
+    {
+        echo $bc->show_button();
+        echo $result;
+    }
+    else
+    {
+        echo '<p class="notice">';
+        echo _('Aucune donnée trouvée');
+        echo '</p>';
+    }
+        
 }
 ?>
diff --git a/include/anc_balance_simple.inc.php b/include/anc_balance_simple.inc.php
index 91e3b0ca6..de82efa31 100644
--- a/include/anc_balance_simple.inc.php
+++ b/include/anc_balance_simple.inc.php
@@ -11,7 +11,17 @@ echo $bs->display_form();
 echo '</form>';
 if (isset($_GET['result']))
 {
-    echo $bs->show_button();
-    echo $bs->display_html();
+    $result= $bs->display_html();
+    if ( $bs->has_data > 0)
+    {
+        echo $bs->show_button();
+        echo $result;
+    }
+ else
+    {
+        echo '<p class="notice">';
+        echo _('Aucune donnée trouvée');
+        echo '</p>';
+    }
 }
 ?>
diff --git a/include/anc_great_ledger.inc.php b/include/anc_great_ledger.inc.php
index a21335589..4c8e23383 100644
--- a/include/anc_great_ledger.inc.php
+++ b/include/anc_great_ledger.inc.php
@@ -3,17 +3,50 @@
 //see licence.txt
 
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once('class_anc_grandlivre.php');
-$gl = new Anc_GrandLivre($cn);
-$gl->get_request();
-echo '<form method="get">';
-echo $gl->display_form();
-echo '<p>' . HtmlInput::submit('Recherche', _('Recherche')) . '</p>';
+echo '<div style="content">';
+
+require_once 'class_anc_grandlivre.php';
+
+$grandLivre=new Anc_Grandlivre($cn);
+
+$grandLivre->get_request();
+
+/*
+ * Form
+ */
+echo '<form method="get" >';
+echo $grandLivre->display_form();
+echo '<p>' . HtmlInput::submit('Recherche', _('Rechercher')) . '</p>';
+echo HtmlInput::request_to_hidden(array('sa','ac','gDossier'));
 echo '</form>';
-if (isset($_GET['result']))
+
+$result=HtmlInput::default_value_request('result',null);
+
+if ($result != null)
 {
-    echo $gl->show_button();
-    echo $gl->display_html();
-    echo $gl->show_button();
+    $result=$grandLivre->display_html();
+    if ($grandLivre->has_data != 0 )
+    {
+        echo '<span style="display:block">';
+          echo _('Tout sélectionner')." ".ICheckBox::toggle_checkbox('export_pdf_bt1','export_anc_receipt_pdf');
+        echo '</span>';
+        echo $grandLivre->show_button();
+        echo '<form method="GET" id="export_anc_receipt_pdf" action="export.php" style="display:inline">';
+
+        echo $grandLivre->button_export_pdf();
+        echo $grandLivre->display_html();
+        echo $grandLivre->button_export_pdf();
+        echo HtmlInput::get_to_hidden(array('ac','gDossier','sa'));
+        echo '</form>';
+        echo $grandLivre->show_button();
+    }
+    else
+    {
+        echo '<p class="notice">';
+        echo _('Aucune donnée trouvée');
+        echo '</p>';
+    }
+    
 }
+echo '</div>';
 ?>
diff --git a/include/anc_history.inc.php b/include/anc_history.inc.php
index ca712c368..e57ab44bb 100644
--- a/include/anc_history.inc.php
+++ b/include/anc_history.inc.php
@@ -18,8 +18,18 @@ if (isset($_GET['result']))
     //--------------------------------
     // export Buttons
     //---------------------------------
-    echo $list->show_button();
-    echo $list->display_html();
+    $result=$list->display_html();
+    if ( $list->has_data > 0)
+    {
+        echo $list->show_button();
+        echo $result;
+    }
+    else
+    {
+        echo '<p class="notice">';
+        echo _('Aucune donnée trouvée');
+        echo '</p>';
+    }
     echo '</div>';
 }
 echo '</div>';
diff --git a/include/balance.inc.php b/include/balance.inc.php
index f5492213e..b426275be 100644
--- a/include/balance.inc.php
+++ b/include/balance.inc.php
@@ -102,7 +102,7 @@ echo '<li>'.$rad->input('p_filter',0)._('Aucun filtre, tous les journaux').'</li
 if (  isset($_GET['p_filter']) && $_GET['p_filter']==1) $rad->selected='t';
 else $rad->selected=false;
 echo '<li>'.$rad->input('p_filter',1)._('Filtré par journal');
-echo HtmlInput::button_choice_ledger(array('div'=>'bal','type'=>'ALL','all_type'=>1));
+echo HtmlInput::button_choice_ledger(array('div'=>'','type'=>'ALL','all_type'=>1));
 echo '</li>';
 if (  isset($_GET['p_filter']) && $_GET['p_filter']==2) $rad->selected='t';
 else $rad->selected=false;
diff --git a/include/balance_card.inc.php b/include/balance_card.inc.php
index 006168eac..19e341c79 100644
--- a/include/balance_card.inc.php
+++ b/include/balance_card.inc.php
@@ -66,7 +66,7 @@ else
       }
 
     if (   $fiche->HtmlTable($array,0,0)==-1){
-      echo h2(_("Aucune opération pour l'exercice courant",'class="error"'));
+      echo h2(_("Aucune opération pour l'exercice courant"),'class="error"');
     }
     echo $old;
 
diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php
index 4fe479eb0..f5c7868f2 100644
--- a/include/class_acc_ledger.php
+++ b/include/class_acc_ledger.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  *   This file is part of NOALYSS.
  *
@@ -996,9 +995,7 @@ class Acc_Ledger extends jrn_def_sql
 			//document
 			if ($row['jr_pj_name'] != "")
 			{
-				$image = '<IMG SRC="image/insert_table.gif" title="' . $row['jr_pj_name'] . '" border="0">';
-				$r.="<TD>" . sprintf('<A class="detail" HREF="show_pj.php?jrn=%s&jr_grpt_id=%s&%s">%s</A>', $row['jrn_def_id'], $row['jr_grpt_id'], $str_dossier, $image)
-						. "</TD>";
+                            $r.='<td>'.HtmlInput::show_receipt_document($row['jr_id']).'</td>';
 			}
 			else
 				$r.="<TD></TD>";
@@ -2201,7 +2198,79 @@ class Acc_Ledger extends jrn_def_sql
 		$Res = $this->db->exec_sql("update jrn set jr_internal='" . $p_internal . "' where " .
 				" jr_grpt_id = " . $this->grpt_id);
 	}
-
+        /**
+         * Return an array of default card for the ledger type given 
+         * 
+         * @param $p_ledger_type VEN ACH ODS or FIN
+         * @param $p_side   D for Debit or C for credit or NA No Applicable
+         */
+        function get_default_card($p_ledger_type,$p_side)
+        {
+            $array=array();
+            $fiche_def_ref=new Fiche_Def_Ref($this->db);
+            // ----- for FINANCIAL  ----
+            if ($p_ledger_type =='FIN')
+            {
+                $array=$fiche_def_ref->get_by_modele(FICHE_TYPE_CLIENT);
+                $array=array_merge ( $array , $fiche_def_ref->get_by_modele(FICHE_TYPE_FOURNISSEUR));
+                $array=array_merge ( $array , $fiche_def_ref->get_by_modele(FICHE_TYPE_FIN));
+                $array=array_merge ( $array , $fiche_def_ref->get_by_modele(FICHE_TYPE_ADM_TAX));
+                $array=array_merge ( $array , $fiche_def_ref->get_by_modele(FICHE_TYPE_EMPL));
+                
+            }
+            // --- for miscellaneous ----
+            if ($p_ledger_type == 'ODS')
+            {
+                $result=$this->db->get_array('select fd_id from fiche_def');
+                for ($i = 0;$i<count($result);$i++ )
+                {
+                    $array[$i]=$result[$i]['fd_id'];
+                }
+            }
+            if ($p_side == 'D')
+            {
+                switch($p_ledger_type) 
+                {
+                    case 'VEN':
+                        $array=$fiche_def_ref->get_by_modele(FICHE_TYPE_CLIENT);
+                        break;
+                    case 'ACH':
+                        $array=$fiche_def_ref->get_by_modele(FICHE_TYPE_ACH_SER);
+                        $array=array_merge ($array, $fiche_def_ref->get_by_modele(FICHE_TYPE_ACH_MAR));
+                        $array=array_merge ($array,$fiche_def_ref->get_by_modele(FICHE_TYPE_ACH_MAT));
+                        break;
+                    default :
+                        throw new Exception(_('get_default_card p_ledger_side is invalide ['.$p_ledger_type.']'));
+                    
+                }
+            } elseif ($p_side == 'C')
+            {
+                 switch($p_ledger_type) 
+                {
+                    case 'VEN':
+                        $array=$fiche_def_ref->get_by_modele(FICHE_TYPE_VENTE);
+                        break;
+                    case 'ACH':
+                        $array=  array_merge($array, $fiche_def_ref->get_by_modele(FICHE_TYPE_ADM_TAX));
+                        $array=  array_merge($array, $fiche_def_ref->get_by_modele(FICHE_TYPE_FOURNISSEUR));
+                        break;
+                    default :
+                        throw new Exception(_('get_default_card p_ledger_side is invalide ['.$p_ledger_type.']'));
+                    
+                }
+            }
+            return $array;
+            /*
+            $return=array();
+            $return = array_values($array);
+            for ($i = 0;$i<count($array);$i++ )
+            {
+                $return[$i]=$array[$i]['fd_id'];
+            }
+            return $return;
+             * 
+             */
+        }
 	/**
 	 * @brief retrieve all the card for this type of ledger, make them
 	 * into a string separated by comma
@@ -3343,6 +3412,7 @@ class Acc_Ledger extends jrn_def_sql
 		$min_row->prec=0;
                 
                 $description=new ITextarea('p_description');
+                $description->style='class="itextarea" style="margin:0px;"';
                 $description->value=$this->jrn_def_description;
                 $str_description=$description->input();
 
@@ -3511,7 +3581,20 @@ class Acc_Ledger extends jrn_def_sql
 		$wSearch->size = 20;
 
 		$search = $wSearch->input();
-
+                // default for ACH
+                $default_deb_purchase = $this->get_default_card('ACH', 'D');
+                $default_cred_purchase = $this->get_default_card('ACH', 'C');
+                
+                // default for VEN
+                $default_deb_sale      = $this->get_default_card('VEN', 'D');
+                $default_cred_sale     = $this->get_default_card('VEN', 'C');
+                
+                // default for FIN
+                $default_fin           = $this->get_default_card("FIN", "");
+                
+                //default ods
+                $default_ods          = $this->get_default_card("ODS", "");
+                
 		/* construct all the hidden */
 		$hidden = HtmlInput::hidden('p_jrn', -1);
 		$hidden.= HtmlInput::hidden('p_action', 'jrn');
@@ -3532,13 +3615,14 @@ class Acc_Ledger extends jrn_def_sql
                 $wType->javascript=' onchange="show_ledger_div()"';
 		$type = $wType->input();
 		$rcred = $rdeb = array();
-		$wPjPref = new IText();
+                $wPjPref = new IText();
 		$wPjPref->name = 'jrn_def_pj_pref';
 		$pj_pref = $wPjPref->input();
 		$pj_seq = '';
 		$last_seq = 0;
 		$new = 1;
                 $description=new ITextarea('p_description');
+                $description->style='class="itextarea" style="margin:0px;"';
                 $description->value="";
                 $str_description=$description->input();
 		/* bank card */
diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php
index a0875f0d9..0c50e416a 100644
--- a/include/class_acc_ledger_purchase.php
+++ b/include/class_acc_ledger_purchase.php
@@ -274,7 +274,7 @@ class  Acc_Ledger_Purchase extends Acc_Ledger
             $p_nd_amount->amount_nd_rate = $p_fiche->strAttribut(ATTR_DEF_DEPENSE_NON_DEDUCTIBLE);
             $p_nd_amount->compute_nd();
         }
-        if (!$p_fiche->empty_attribute(ATTR_DEF_TVA_NON_DEDUCTIBLE) && $tva_both == 0)
+        if (!$p_fiche->empty_attribute(ATTR_DEF_TVA_NON_DEDUCTIBLE) && $p_tva_both == 0)
         {
             $p_nd_amount->nd_vat_rate = $p_fiche->strAttribut(ATTR_DEF_TVA_NON_DEDUCTIBLE);
             $p_nd_amount->compute_nd_vat();
diff --git a/include/class_anc_balance_double.php b/include/class_anc_balance_double.php
index b0690791b..bbb8e2ab3 100644
--- a/include/class_anc_balance_double.php
+++ b/include/class_anc_balance_double.php
@@ -339,7 +339,7 @@ class Anc_Balance_Double extends Anc_Print
             '</span>';
 
         $r.='</span>';
-        $r.=HtmlInput::submit('Affiche','Affiche');
+        $r.=HtmlInput::submit('Affiche', _('Rechercher'));
         return $r;
     }
     /*!
@@ -463,7 +463,7 @@ class Anc_Balance_Double extends Anc_Print
 
 
         $res=$this->db->exec_sql($sql);
-
+        $this->has_data=Database::num_row($res);
         if ( Database::num_row($res) == 0 )
             return null;
         $a=array();
diff --git a/include/class_anc_balance_simple.php b/include/class_anc_balance_simple.php
index 4a555488d..d963d32c9 100644
--- a/include/class_anc_balance_simple.php
+++ b/include/class_anc_balance_simple.php
@@ -59,8 +59,10 @@ class Anc_Balance_Simple extends Anc_Print
         $sql.=" order by po_id";
         $res=$this->db->exec_sql($sql);
 
-        if ( Database::num_row($res) == 0 )
+        if ( Database::num_row($res) == 0 ) {
+            $this->has_data=0;
             return null;
+        }
         $a=array();
         $count=0;
         $array=Database::fetch_all($res);
@@ -74,6 +76,7 @@ class Anc_Balance_Simple extends Anc_Print
             $a[$count]['debit']=($row['sum_deb']>$row['sum_cred'])?"debit":"credit";
             $count++;
         }
+        $this->has_data=$count;
         return $a;
 
 
@@ -166,7 +169,7 @@ class Anc_Balance_Simple extends Anc_Print
     {
         $r=parent::display_form($p_string);
 
-        $r.= HtmlInput::submit('Affiche','Affiche');
+        $r.= HtmlInput::submit('Affiche', _('Rechercher'));
 
         return $r;
     }
diff --git a/include/class_anc_grandlivre.php b/include/class_anc_grandlivre.php
index d984761cd..e37525d06 100644
--- a/include/class_anc_grandlivre.php
+++ b/include/class_anc_grandlivre.php
@@ -27,7 +27,8 @@ require_once 'class_impress.php';
 
 class Anc_GrandLivre extends Anc_Print
 {
-	    function set_sql_filter()
+    
+    function set_sql_filter()
     {
         $sql="";
         $and=" and ";
@@ -73,13 +74,14 @@ class Anc_GrandLivre extends Anc_Print
 	jr_comment,
 	j_poste,
 	jrnx.f_id,
-	( select ad_value from fiche_Detail where f_id=jrnx.f_id and ad_id=23) as qcode
+	( select ad_value from fiche_Detail where f_id=jrnx.f_id and ad_id=23) as qcode,
+        jr_pj_number
 	from operation_analytique as B join poste_analytique using(po_id)
 	left join jrnx using (j_id)
 	left join jrn on  (j_grpt=jr_grpt_id)
              where $pa_id_cond oa_amount <> 0.0  $cond_poste  $filter_date
 	order by po_name,oa_date::date,qcode,j_poste");
-
+        $this->has_data=count($array);
         return $array;
     }
 
@@ -100,6 +102,7 @@ class Anc_GrandLivre extends Anc_Print
 	j_poste,
 	( select ad_value from fiche_Detail where f_id=jrnx.f_id and ad_id=23) as qcode,
 	jr_comment,
+        jr_pj_number,
 	jr_internal,
 	case when oa_debit='t' then 'D' else 'C' end,
 	oa_amount
@@ -112,7 +115,38 @@ class Anc_GrandLivre extends Anc_Print
 
         return $array;
     }
+    /* !
+     * \brief Show the button to export in PDF all the receipt
+     * 
+     * \param $p_string extra hidden value
+     * \return string with the button
+     */
 
+    function button_export_pdf($p_string = "")
+    {
+        if (CONVERT_GIF_PDF <> 'NOT' && PDFTK <> 'NOT')
+        {
+            $r = "";
+            $r.= HtmlInput::hidden("to", $this->to);
+            $r.= HtmlInput::hidden("from", $this->from);
+            $r.= HtmlInput::hidden("pa_id", $this->pa_id);
+            $r.= HtmlInput::hidden("from_poste", $this->from_poste);
+            $r.= HtmlInput::hidden("to_poste", $this->to_poste);
+            $r.= HtmlInput::hidden("act","PDF:AncReceipt");
+
+            $r.= $p_string;
+            $r.= dossier::hidden();
+            $r.=HtmlInput::submit('bt_receipt_anal_pdf', _("Export des pièces en PDF"));
+        } 
+        else 
+        {
+            
+            $r = "";
+            $msg = _("Les extensions pour convertir en pdf ne sont pas installées");
+            $r = HtmlInput::button("bt_receipt_anal", _('Export des pièces en PDF'), sprintf('onclick="alert(\'%s\')"',$msg));
+        }
+        return $r;
+    }
    /*!
      * \brief compute the html display
      *
@@ -121,77 +155,96 @@ class Anc_GrandLivre extends Anc_Print
      */
 
     function display_html()
-    {
-        $r="";
+   {
+        $r = "";
         //---Html
-        $array=$this->load();
-        if ( is_array($array) == false )
+        $array = $this->load();
+        if (is_array($array) == false || empty($array))
         {
-            return $array;
-
-        }
-
-        if ( empty($array) )
-        {
-            $r.= _("aucune donnée");
-            return $r;
+            return 0;
         }
         $r.= '<table class="result" style="width=100%">';
-	$ix=0;$prev='xx';$idx=0;
-	$tot_deb=$tot_cred=0;
-        
-        foreach ( $array as $row )
-        {
-	  if ($prev != $row['po_name'])
-	    {
-	      if ( $ix>0)
-		{
-		  $r.='<tr>';
-		  $tot_solde=bcsub($tot_cred,$tot_deb);
-		  $sign=($tot_solde>0)?'C':'D';
-		  $r.=td('').td('').td('').td('').td('').td(nbm($tot_deb),' class="num"').td(nbm($tot_cred),' class="num"').td(nbm($tot_solde).$sign,' class="num"');
-		}
-	      $r.='<tr>'.'<td colspan="7" style="width:auto">'.'<h2>'.h($row['po_name'].' '.$row['po_description']).'</td></tr>';
-	      $r.= '<tr>'.
-		'<th>'._('Date').'</th>'.
-		'<th>'._('Poste').'</th>'.
-		'<th>'._('Quick_code').'</th>'.
-		'<th>'._('libelle').'</th>'.
-		'<th>'._('Num.interne').'</th>'.
-		'<th style="text-align:right">'._('Debit').'</th>'.
-		'<th style="text-align:right">'._('Credit').'</th>'.
-		'</tr>';
+        $ix = 0;
+        $prev = 'xx';
+        $idx = 0;
+        $tot_deb = $tot_cred = 0;
 
-	      $tot_deb=$tot_cred=0;
-	      $prev=$row['po_name'];
-	      $ix++;
-	    }
-            $class=($idx%2==0)?'even':'odd'; $idx++;
-            $r.='<tr class="'.$class.'">';
-	    $detail=($row['jr_id'] != null)?HtmlInput::detail_op($row['jr_id'],$row['jr_internal']):'';
-	    $post_detail=($row['j_poste'] != null)?HtmlInput::history_account($row['j_poste'],$row['j_poste']):'';
-	    $card_detail=($row['f_id'] != null)?HtmlInput::history_card($row['f_id'],$row['qcode']):'';
-	    $amount_deb=($row['oa_debit']=='t')?$row['oa_amount']:0;
-	    $amount_cred=($row['oa_debit']=='f')?$row['oa_amount']:0;
-	    $tot_deb=bcadd($tot_deb,$amount_deb);
-	    $tot_cred=bcadd($tot_cred,$amount_cred);
+        foreach ($array as $row)
+        {
+            if ($prev != $row['po_name'])
+            {
+                if ($ix > 0)
+                {
+                    $r.='<tr>';
+                    $tot_solde = bcsub($tot_cred, $tot_deb);
+                    $sign = ($tot_solde > 0) ? 'C' : 'D';
+                    $r.=td('') . td('') . td('') . td('') . td('') . td(nbm($tot_deb), ' class="num"') . td(nbm($tot_cred), ' class="num"') . td(nbm($tot_solde) . $sign, ' class="num"');
+                }
+                $r.='<tr>' . '<td colspan="7" style="width:auto">' . '<h2>' . h($row['po_name'] . ' ' . $row['po_description']) . '</td></tr>';
+                $r.= '<tr>' .
+                        '<th>' . '</th>' .
+                        '<th>' . _('Date') . '</th>' .
+                        '<th>' . _('Poste') . '</th>' .
+                        '<th>' . _('Quick_code') . '</th>' .
+                        '<th>' . _('Libellé') . '</th>' .
+                        '<th>' . _('Document') . '</th>' .
+                        '<th>' . _('Pièce') . '</th>' .
+                        '<th>' . _('Num.interne') . '</th>' .
+                        '<th style="text-align:right">' . _('Debit') . '</th>' .
+                        '<th style="text-align:right">' . _('Credit') . '</th>' .
+                        '</tr>';
+
+                $tot_deb = $tot_cred = 0;
+                $prev = $row['po_name'];
+                $ix++;
+            }
+            $class = ($idx % 2 == 0) ? 'even' : 'odd';
+            $idx++;
+            $r.='<tr class="' . $class . '">';
+            $detail = ($row['jr_id'] != null) ? HtmlInput::detail_op($row['jr_id'], $row['jr_internal']) : '';
+            $post_detail = ($row['j_poste'] != null) ? HtmlInput::history_account($row['j_poste'], $row['j_poste']) : '';
+            $card_detail = ($row['f_id'] != null) ? HtmlInput::history_card($row['f_id'], $row['qcode']) : '';
+            $amount_deb = ($row['oa_debit'] == 't') ? $row['oa_amount'] : 0;
+            $amount_cred = ($row['oa_debit'] == 'f') ? $row['oa_amount'] : 0;
+            $tot_deb = bcadd($tot_deb, $amount_deb);
+            $tot_cred = bcadd($tot_cred, $amount_cred);
+
+            /*
+             * Checked button
+             */
+            $str_ck = "";
+            $str_document = "";
+            if ($row['jr_id'] != null)
+            {
+                /*
+                 * Get receipt info  
+                 */
+                $str_document = HtmlInput::show_receipt_document($row['jr_id']);
+                if ($str_document != "")
+                {
+                    $ck = new ICheckBox('ck[]', $row['jr_id']);
+                    $str_ck = $ck->input();
+                }
+            }
 
             $r.=
-                '<td>'.$row['oa_date'].'</td>'.
-	      td($post_detail).
-	      td($card_detail).
-	      //	      '<td>'.h($row['oa_description']).'</td>'.
-	      td($row['jr_comment']).
-	      '<td>'.$detail.'</td>'.
-	      '<td class="num">'.nbm($amount_deb).'</td>'.
-	      '<td class="num">'.nbm($amount_cred)
-	      .'</td>';
+                    '<td>' . $str_ck . '</td>' .
+                    '<td>' . $row['oa_date'] . '</td>' .
+                    td($post_detail) .
+                    td($card_detail) .
+                    td($row['jr_comment']) .
+                    '<td>' . $str_document . '</td>' .
+                    td($row['jr_pj_number']) .
+                    '<td>' . $detail . '</td>' .
+                    '<td class="num">' . nbm($amount_deb) . '</td>' .
+                    '<td class="num">' . nbm($amount_cred)
+                    . '</td>';
             $r.= '</tr>';
         }
-	$r.='<tr>';
-	$tot_solde=bcsub($tot_cred,$tot_deb);
-	$sign=($tot_solde>0)?'C':'D';
-	$r.=td('').td('').td('').td('').td('').td(nbm($tot_deb),' class="num"').td(nbm($tot_cred),' class="num"').td(nbm($tot_solde).$sign,' class="num"');
+        $r.='<tr>';
+        $tot_solde = bcsub($tot_cred, $tot_deb);
+        $sign = ($tot_solde > 0) ? 'C' : 'D';
+        $r.=td('') . td('') . td('') . td('') . td('') . td(nbm($tot_deb), ' class="num"') . td(nbm($tot_cred), ' class="num"') . td(nbm($tot_solde) . $sign, ' class="num"');
 
         $r.= '</table>';
         return $r;
@@ -208,19 +261,6 @@ class Anc_GrandLivre extends Anc_Print
     function show_button($p_string="")
     {
         $r="";
-   /*     $r.= '<form method="GET" action="export.php" style="display:inline">';
-        $r.= $p_string;
-        $r.= dossier::hidden();
-        $r.= HtmlInput::hidden("to",$this->to);
-        $r.= HtmlInput::hidden("act","PDF:AncGrandLivre");
-
-        $r.= HtmlInput::hidden("from",$this->from);
-        $r.= HtmlInput::hidden("pa_id",$this->pa_id);
-        $r.= HtmlInput::hidden("from_poste",$this->from_poste);
-        $r.= HtmlInput::hidden("to_poste",$this->to_poste);
-        $r.=HtmlInput::submit('bt_pdf',"Export en PDF");
-        $r.= '</form>';
-*/
         $r.= '<form method="GET" action="export.php"  style="display:inline">';
         $r.= HtmlInput::hidden("act","CSV:AncGrandLivre");
         $r.= HtmlInput::hidden("to",$this->to);
@@ -259,6 +299,7 @@ class Anc_GrandLivre extends Anc_Print
         $aheader[]=array("title"=>'Poste','type'=>'string');
         $aheader[]=array("title"=>'Quick_Code','type'=>'string');
         $aheader[]=array("title"=>'libelle','type'=>'string');
+        $aheader[]=array("title"=>'Pièce','type'=>'string');
         $aheader[]=array("title"=>'Num.interne','type'=>'string');
         $aheader[]=array("title"=>'Debit','type'=>'string');
         $aheader[]=array("title"=>'Credit','type'=>'num');
diff --git a/include/class_anc_group.php b/include/class_anc_group.php
index 0ba01174f..925e14c73 100644
--- a/include/class_anc_group.php
+++ b/include/class_anc_group.php
@@ -52,6 +52,8 @@ class Anc_Group extends Anc_Print
 
     function insert()
     {
+        if (strlen ($this->ga_id) > 10 )            return '<span class="notice">'.
+                _('Taille de la code trop long maximum 10 caractères').'</span>';
         $sql=" insert into groupe_analytique (ga_id,ga_description,pa_id) values ('%s','%s',%d)";
         $sql=sprintf($sql,Database::escape_string($this->ga_id),
                      Database::escape_string($this->ga_description),
diff --git a/include/class_anc_listing.php b/include/class_anc_listing.php
index 5cc9de6a0..276c70419 100644
--- a/include/class_anc_listing.php
+++ b/include/class_anc_listing.php
@@ -39,7 +39,7 @@ class Anc_Listing extends Anc_Print
     {
         echo '<form method="get">';
         $r=parent::display_form($p_string);
-        $r.=HtmlInput::submit('result','Afficher');
+        $r.=HtmlInput::submit('result', _('Rechercher'));
         $r.= '</form>';
         return $r;
 
@@ -66,16 +66,9 @@ class Anc_Listing extends Anc_Print
         $r="";
         //---Html
         $array=$this->load();
-        if ( is_array($array) == false )
+        if ( is_array($array) == false ||  empty($array) )
         {
-            return $array;
-
-        }
-
-        if ( empty($array) )
-        {
-            $r.= _("aucune donnée");
-            return $r;
+            return 0;
         }
         $r.= '<table class="result" style="width=100%">';
         $r.= '<tr>'.
@@ -123,6 +116,14 @@ class Anc_Listing extends Anc_Print
         $op=new Anc_Operation ($this->db);
         $op->pa_id=$this->pa_id;
         $array=$op->get_list($this->from,$this->to,$this->from_poste,$this->to_poste);
+        if (! $array ) 
+        {
+            $this->has_data=0;
+        }
+        else 
+        {
+            $this->has_data=count($array);
+        }
         return $array;
     }
     /*!
diff --git a/include/class_anc_operation.php b/include/class_anc_operation.php
index 6c0fd8ed2..24896b9f6 100644
--- a/include/class_anc_operation.php
+++ b/include/class_anc_operation.php
@@ -69,6 +69,7 @@ class Anc_Operation
         $this->id=$p_id;
         $this->oa_jrnx_id_source=null;
         $this->oa_positive='Y';
+        $this->has_data=0;
     }
     /*!\brief add a row  to the table operation_analytique
      * \note if $this->oa_group if 0 then a sequence id will be computed for
@@ -179,7 +180,6 @@ class Anc_Operation
 	order by jr_date,oa_group,oa_debit desc,oa_id";
 
         $RetSql=$this->db->exec_sql($sql);
-
         $array=Database::fetch_all($RetSql);
         return $array;
     }
diff --git a/include/class_anc_print.php b/include/class_anc_print.php
index 7ec4a2a8d..7596d561a 100644
--- a/include/class_anc_print.php
+++ b/include/class_anc_print.php
@@ -52,6 +52,7 @@ class Anc_Print
         $this->to="";
         $this->from_poste="";
         $this->to_poste="";
+        $this->has_data=0;
 
     }
     /*!
@@ -115,32 +116,71 @@ class Anc_Print
         $hidden=new IHidden();
         $r=dossier::hidden();
         $r.=$hidden->input("result","1");
-        $r.="Depuis : ".$from->input();
-        $r.= "jusque : ".$to->input();
-        $r.= '<span class="notice">'._('Les dates sont en format DD.MM.YYYY').'</span>';
+        
         $r.=HtmlInput::request_to_hidden(array('ac'));
         $r.=$p_hidden;
-        $r.='<span style="padding:5px;margin:5px;display:block;">';
         $plan=new Anc_Plan($this->db);
         $plan_id=new ISelect("pa_id");
         $plan_id->value=$this->db->make_array("select pa_id, pa_name from plan_analytique order by pa_name");
         $plan_id->selected=$this->pa_id;
-        $r.=_( "Plan Analytique :").$plan_id->input();
+        $choose_from=new IButton();
+        $choose_from->name=_("Choix Poste");
+        $choose_from->label=_("Recherche");
+        $choose_from->javascript="onClick=search_ca(".dossier::id().",'from_poste','pa_id')";
+        
 
+        $choose_to=new IButton();
+        $choose_to->name=_("Choix Poste");
+        $choose_to->label=_("Recherche");
+
+        
+        $choose_to->javascript="onClick=search_ca(".dossier::id().",'to_poste','pa_id')";
+      
+        $r.=HtmlInput::request_to_hidden(array('ac'));
+        ob_start();
+        ?>
+<table>
+    <tr>
+        <td>
+            <?php 
+                echo _('Depuis') ;
+                echo HtmlInput::infobulle(37);
+            ?>
+        </td>
+        <td>
+            <?php 
+                echo $from->input(); 
+            ?>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php 
+                echo _('Jusque') ;
+                echo HtmlInput::infobulle(37);
+            ?>
+        </td>
+        <td>
+            <?php 
+                echo $to->input(); 
+            ?>
+        </td>
+    </tr>
+    
+</table>
+<span style="padding:5px;margin:5px;display:block;">
+    <?php echo _( "Plan Analytique :").$plan_id->input(); ?>
+</span>
+
+<?php
+        $r.=ob_get_clean();
         $r.=_("Entre l'activité ").$from_poste->input();
-        $choose=new IButton();
-        $choose->name=_("Choix Poste");
-        $choose->label=_("Recherche");
-        $choose->javascript="onClick=search_ca(".dossier::id().",'from_poste','pa_id')";
-        $r.=$choose->input();
-
+        $r.=$choose_from->input();
         $r.=_(" et l'activité ").$to_poste->input();
-        $choose->javascript="onClick=search_ca(".dossier::id().",'to_poste','pa_id')";
-        $r.=$choose->input();
+        $r.=$choose_to->input();
         $r.='<span class="notice" style="display:block">'._('Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche').'</span>';
 
         $r.='</span>';
-        $r.=HtmlInput::request_to_hidden(array('ac'));
         return $r;
     }
     /*!
diff --git a/include/class_anticipation.php b/include/class_anticipation.php
index 775977995..3d9bd6845 100644
--- a/include/class_anticipation.php
+++ b/include/class_anticipation.php
@@ -194,6 +194,7 @@ class Anticipation
      */
     private function form_cat_mod()
     {
+        global $g_user;
         $a=new Forecast($this->cn,$this->f_id);
         $a->load();
         $name=new IText('an_name');
diff --git a/include/class_database.php b/include/class_database.php
index 70bfc78e8..2b67d630f 100644
--- a/include/class_database.php
+++ b/include/class_database.php
@@ -45,12 +45,8 @@ class Database
         $noalyss_user=(defined ("noalyss_user"))?noalyss_user:phpcompta_user;
         $password=(defined("noalyss_password"))?noalyss_password:phpcompta_password;
         $port=(defined("noalyss_psql_port"))?noalyss_psql_port:phpcompta_psql_port;
-        $host=( ! defined ("noalyss_psql_host"))?'127.0.0.1':noalyss_psql_host;
+        $host=( ! defined ("noalyss_psql_host") )?'127.0.0.1':noalyss_psql_host;
 		if (defined ("MULTI") && MULTI=="0") {
-			 $noalyss_user = noalyss_user;
-			$password = noalyss_password;
-			$port = noalyss_psql_port;
-			$host = (!defined("noalyss_psql_host")) ? '127.0.0.1' : noalyss_psql_host;
 			$l_dossier= dbname;
 		}
 		else
diff --git a/include/class_default_menu.php b/include/class_default_menu.php
index faebd4687..ef1596cf3 100644
--- a/include/class_default_menu.php
+++ b/include/class_default_menu.php
@@ -1,10 +1,22 @@
 <?php
-
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
 
 /**
  * Description of class_default_menu
diff --git a/include/class_default_menu_sql.php b/include/class_default_menu_sql.php
index 217e51966..76f5758b1 100644
--- a/include/class_default_menu_sql.php
+++ b/include/class_default_menu_sql.php
@@ -1,10 +1,22 @@
 <?php
-
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
 
 /**
  * Description of class_default_menu_sql
diff --git a/include/class_document.php b/include/class_document.php
index 1d742a5bb..dd4942c3e 100644
--- a/include/class_document.php
+++ b/include/class_document.php
@@ -935,6 +935,7 @@ class Document
 
             /* total VAT for one sold */
         case 'TVA_AMOUNT':
+        case 'VEN_TVA':
             extract ($p_array);
             $qt='e_quant'.$counter;
             $price='e_march'.$counter.'_price' ;
@@ -951,6 +952,7 @@ class Document
             break;
             /* TVA automatically computed */
         case 'VEN_ART_TVA':
+        
             extract ($p_array);
             $qt='e_quant'.$counter;
             $price='e_march'.$counter.'_price' ;
diff --git a/include/class_document_export.php b/include/class_document_export.php
new file mode 100644
index 000000000..b7e4efe08
--- /dev/null
+++ b/include/class_document_export.php
@@ -0,0 +1,201 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
+
+/**
+ * @brief Export DOCUMENT from Analytic accountancy, can transform into PDF
+ * and add a stamp on each pages
+ * 
+ * It depends on PDFTK and CONVERT_GIF_PDF
+ */
+class Document_Export
+{
+    /**
+     *@brief create 2 temporary folders, store_pdf and store_convert, initialize
+     * an array feedback containing messages
+     * 
+     */
+    function __construct()
+    {
+        // Create 2 temporary folders   1. convert to PDF + stamp
+        //                              2. store result
+        $this->feedback = array();
+        $this->store_convert = tempnam($_ENV['TMP'], 'convert_');
+        $this->store_pdf = tempnam($_ENV['TMP'], 'pdf_');
+        unlink($this->store_convert);
+        unlink($this->store_pdf);
+        umask(0);
+        mkdir($this->store_convert);
+        mkdir($this->store_pdf);
+    }
+    /**
+     * @brief concatenate all PDF into a single one and save it into the
+     * store_pdf folder
+     */
+    function concatenate_pdf()
+    {
+        $this->check_file();
+        $stmt = PDFTK . " " . $this->store_pdf . '/stamp_*pdf  output ' . $this->store_pdf . '/result.pdf';
+        $status = 0;
+        echo $stmt;
+        passthru($stmt, $status);
+
+        if ($status <> 0)
+        {
+            $cnt_feedback = count($this->feedback);
+            $this->feedback[$cnt_feedback]['file'] = 'result.pdf';
+            $this->feedback[$cnt_feedback]['message'] = ' cannot concatenate PDF';
+            $this->feedback[$cnt_feedback]['error'] = $status;
+        }
+    }
+    
+    function move_file($p_source, $target)
+    {
+        $this->check_file();
+        copy($p_source, $this->store_pdf . '/' . $target);
+    }
+    /**
+     * @brief send the resulting PDF to the browser
+     */
+    function send_pdf()
+    {
+        header('Content-Type: application/x-download');
+        header('Content-Disposition: attachment; filename="result.pdf"');
+        header('Cache-Control: private, max-age=0, must-revalidate');
+        header('Pragma: public');
+        echo file_get_contents($this->store_pdf . '/result.pdf');
+    }
+
+    function clean_folder()
+    {
+        //unlink($this->store_convert . '/*.pdf');
+    }
+
+    /**
+     * @brief export all the pieces in PDF and transform them into a PDF with
+     * a stamp
+     * @param $p_array contents all the jr_id
+     */
+    function export_all($p_array)
+    {
+        $this->check_file();
+        ob_start();
+        var_dump($p_array);
+        global $cn;
+
+        $cn->start();
+        foreach ($p_array as $value)
+        {
+            // For each file save it into the temp folder,
+            $file = $cn->get_array('select jr_pj,jr_pj_name,jr_pj_number,jr_pj_type from jrn '
+                    . ' where jr_id=$1', array($value));
+            if ($file[0]['jr_pj'] == '')
+                continue;
+
+            $cn->lo_export($file[0]['jr_pj'], $this->store_convert . '/' . $file[0]['jr_pj_name']);
+
+            // Convert this file into PDF 
+            if ($file[0]['jr_pj_type'] != 'application/pdf')
+            {
+                $status = 0;
+                passthru(OFFICE . " " . $this->store_convert . '/' . $file[0]['jr_pj_name'], $status);
+                if ($status <> 0)
+                {
+                    $this->feedback[$cnt_feedback]['file'] = $file[0]['jr_pj_name'];
+                    $this->feedback[$cnt_feedback]['message'] = ' cannot convert to PDF';
+                    $this->feedback[$cnt_feedback]['error'] = $status;
+                    $cnt_feedback++;
+                    continue;
+                }
+            }
+
+            // Create a image with the stamp + formula
+            $img = imagecreatefromgif(__DIR__ . '/template/template.gif');
+            $font = imagecolorallocatealpha($img, 100, 100, 100, 110);
+            imagettftext($img, 40, 25, 500, 1000, $font, __DIR__ . '/tfpdf/font/unifont/DejaVuSans.ttf', _("Copie certifiée conforme à l'original"));
+            imagettftext($img, 40, 25, 550, 1100, $font, __DIR__ . '/tfpdf/font/unifont/DejaVuSans.ttf', $file[0]['jr_pj_number']);
+            imagettftext($img, 40, 25, 600, 1200, $font, __DIR__ . '/tfpdf/font/unifont/DejaVuSans.ttf', $file[0]['jr_pj_name']);
+            imagegif($img, $this->store_convert . '/' . 'stamp.gif');
+
+            // transform gif file to pdf with convert tool
+            $stmt = CONVERT_GIF_PDF . " " . escapeshellarg($this->store_convert . '/' . 'stamp.gif') . " " . escapeshellarg($this->store_convert . '/stamp.pdf');
+            passthru($stmt, $status);
+
+            if ($status <> 0)
+            {
+                $this->feedback[$cnt_feedback]['file'] = 'stamp.pdf';
+                $this->feedback[$cnt_feedback]['message'] = ' cannot convert to PDF';
+                $this->feedback[$cnt_feedback]['error'] = $status;
+                $cnt_feedback++;
+                continue;
+            }
+
+            // 
+            // remove extension
+            $ext = strrpos($file[0]['jr_pj_name'], ".");
+            $file_pdf = substr($file[0]['jr_pj_name'], 0, $ext);
+            $file_pdf .=".pdf";
+
+            // output
+            $output = $this->store_convert . '/stamp_' . $file_pdf;
+
+            // Concatenate stamp + file
+            $stmt = PDFTK . " " . escapeshellarg($this->store_convert . '/' . $file_pdf) . ' stamp ' . $this->store_convert .
+                    '/stamp.pdf output ' . $output;
+
+            passthru($stmt, $status);
+            echo $stmt;
+            if ($status <> 0)
+            {
+
+                $this->feedback[$cnt_feedback]['file'] = $file_pdf;
+                $this->feedback[$cnt_feedback]['message'] = _(' ne peut pas convertir en PDF');
+                $this->feedback[$cnt_feedback]['error'] = $status;
+                $cnt_feedback++;
+                continue;
+            }
+            // Move the PDF into another temp directory 
+            $this->move_file($output, 'stamp_' . $file_pdf);
+        }
+        $this->concatenate_pdf();
+        ob_clean();
+        $this->send_pdf();
+
+        // remove files from "conversion folder"
+        $this->clean_folder();
+        var_dump($this->feedback);
+        // concatenate all pdf into one
+    }
+   /**
+    * @brief check that the files are installed
+    * throw a exception if one is missing
+    */
+    function check_file()
+    {
+        try 
+        {
+            if (CONVERT_GIF_PDF == 'NO')    throw new Exception(_("CONVERT_GIF_PDF n'est pas installé"));
+            if (PDFTK          == 'NO')     throw new Exception(_("TKPDF n'est pas installé"));
+        } catch (Exception $ex) 
+        {
+            throw ($ex);
+        }
+    }
+}
diff --git a/include/class_fiche_attr.php b/include/class_fiche_attr.php
index 186513424..30a1e549b 100644
--- a/include/class_fiche_attr.php
+++ b/include/class_fiche_attr.php
@@ -1,12 +1,10 @@
 <?php
+//This file is part of NOALYSS and is under GPL 
+//see licence.txt
 /**
  *@brief Manage the table attr_def
  *
  *
-Example
-@code
-
-@endcode
  */
 require_once('class_database.php');
 require_once('ac_common.php');
diff --git a/include/class_fiche_def_ref.php b/include/class_fiche_def_ref.php
index 49aa5aa0c..dad66407c 100644
--- a/include/class_fiche_def_ref.php
+++ b/include/class_fiche_def_ref.php
@@ -133,6 +133,21 @@ class Fiche_Def_Ref
         $this->frd_text=$r['frd_text'];
         $this->frd_class_base=$r['frd_class_base'];
     }
+    /**
+    * get category of cards by model
+    * @param $p_modele if the FRD_ID
+    * @return array of category (fd_id)
+    */
+    function get_by_modele($p_modele)
+    {
+        $array = array();
+        $result = $this->db->get_array('select fd_id from fiche_def where frd_id=$1', array($p_modele));
+        for ($i = 0; $i < count($result); $i++)
+        {
+            $array[$i] = $result[$i]['fd_id'];
+        }
+        return $array;
+    }
 
 }
 ?>
diff --git a/include/class_filetosend.php b/include/class_filetosend.php
index 76429da29..af9b4b39b 100644
--- a/include/class_filetosend.php
+++ b/include/class_filetosend.php
@@ -1,4 +1,22 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
 /**
  * @brief  file to add to a message
  *
diff --git a/include/class_follow_up.php b/include/class_follow_up.php
index 82583576e..8eadeffe5 100644
--- a/include/class_follow_up.php
+++ b/include/class_follow_up.php
@@ -497,7 +497,7 @@ class Follow_Up
 			$num->name = "e_march" . $i . "_tva_amount";
 			$num->id = "e_march" . $i . "_tva_amount";
 			$num->value = ($tmp_ad) ? $tmp_ad->get_parameter('tva_amount') : 0;
-			$num->javascript = " onchange=\"compute_ledger(' . $i . ')\"";
+			$num->javascript = " onchange=\"compute_ledger('" . $i ." ')\"";
 			$num->size = 8;
 			$aArticle[$i]['tva'] = $num->input();
 
diff --git a/include/class_html_input.php b/include/class_html_input.php
index a31949a2c..d3595882f 100755
--- a/include/class_html_input.php
+++ b/include/class_html_input.php
@@ -822,5 +822,25 @@ class HtmlInput
             echo $hid_jrn;
             echo '</span>';
         }
+        /**
+         * Returns HTML code for displaying a icon with a link to a receipt document from
+         * the ledger 
+         * @global $cn database connx
+         * @param $p_jr_id jrn.jr_id
+         * @return nothing or HTML Code for a link to the document
+         */
+        static function show_receipt_document($p_jr_id)
+        {
+            global $cn;
+            
+            $array=$cn->get_array('select jr_def_id,jr_pj_name,jr_grpt_id from jrn where jr_id=$1',array($p_jr_id));
+            if (count($array)==0) return "";
+            if ($array[0]['jr_pj_name'] == "") return "";
+            $str_dossier=Dossier::get();
+            $image='<IMG style="width:24px;height:24px;border:0px" SRC="image/documents.png" title="' . $array[0]['jr_pj_name'] . '" >';
+            $r=sprintf('<A class="detail" HREF="show_pj.php?jrn=%s&jr_grpt_id=%s&%s">%s</A>', $array[0]['jr_def_id'], $array[0]['jr_grpt_id'], $str_dossier, $image);
+            return $r;
+            
+        }
 
 }
diff --git a/include/class_idate.php b/include/class_idate.php
index 73aa2d273..016a6fbd2 100644
--- a/include/class_idate.php
+++ b/include/class_idate.php
@@ -35,7 +35,7 @@ class IDate extends HtmlInput
 	  $this->id=self::generate_id($this->name);
         $r='<input type="text" name="'.$this->name.'" id="'.$this->id.'" '.
            ' class="input_text" '.
-           'size="8" '.
+           'size="10" style="width:6em" '.
            ' value ="'.$this->value.'" '.
            '/>'.
            '<img src="image/x-office-calendar.png" id="'.$this->id.'_trigger"'.
diff --git a/include/class_jrn_def_sql.php b/include/class_jrn_def_sql.php
index d7f9edeb9..954a47ff4 100644
--- a/include/class_jrn_def_sql.php
+++ b/include/class_jrn_def_sql.php
@@ -1,4 +1,22 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
diff --git a/include/class_menu_ref.php b/include/class_menu_ref.php
index e41ab0a35..1e78be4b5 100644
--- a/include/class_menu_ref.php
+++ b/include/class_menu_ref.php
@@ -1,10 +1,22 @@
 <?php
-
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
  *@brief Menu_Ref let you manage the available menu
diff --git a/include/class_menu_ref_sql.php b/include/class_menu_ref_sql.php
index 63f0cb02a..cf3eaf18a 100644
--- a/include/class_menu_ref_sql.php
+++ b/include/class_menu_ref_sql.php
@@ -1,4 +1,22 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
diff --git a/include/class_print_ledger_detail_item.php b/include/class_print_ledger_detail_item.php
index 1c7cad45c..8a2f7404a 100644
--- a/include/class_print_ledger_detail_item.php
+++ b/include/class_print_ledger_detail_item.php
@@ -1,4 +1,22 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
 /**
  * Print detail of operation PURCHASE or SOLD plus the items
  * There is no report of the different amounts
diff --git a/include/class_profile_menu.php b/include/class_profile_menu.php
index 77508fe4d..4cf8c3932 100644
--- a/include/class_profile_menu.php
+++ b/include/class_profile_menu.php
@@ -1,8 +1,23 @@
 <?php
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
+
 require_once 'class_profile_menu_sql.php';
 
 /**
diff --git a/include/class_profile_menu_sql.php b/include/class_profile_menu_sql.php
index 0f1584863..0190e3f93 100644
--- a/include/class_profile_menu_sql.php
+++ b/include/class_profile_menu_sql.php
@@ -1,4 +1,22 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
  *@brief Manage the table public.profile_menu
diff --git a/include/class_profile_sql.php b/include/class_profile_sql.php
index 7049beb36..7e8c3c31f 100644
--- a/include/class_profile_sql.php
+++ b/include/class_profile_sql.php
@@ -1,4 +1,22 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
diff --git a/include/class_sendmail.php b/include/class_sendmail.php
index a78f2e963..248005446 100644
--- a/include/class_sendmail.php
+++ b/include/class_sendmail.php
@@ -1,4 +1,22 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
 
 
 /**
diff --git a/include/class_sort_table.php b/include/class_sort_table.php
index 5d259bde0..c93806d80 100644
--- a/include/class_sort_table.php
+++ b/include/class_sort_table.php
@@ -1,4 +1,22 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
 
 /**
  * Description of class_syn_sort_table
diff --git a/include/company.inc.php b/include/company.inc.php
index 9bcbac8c3..fe2b09591 100644
--- a/include/company.inc.php
+++ b/include/company.inc.php
@@ -1,4 +1,23 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
+
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 global $g_user;
 echo '<div class="content">';
diff --git a/include/constant.php b/include/constant.php
index 6b0df60da..7dafcbcbe 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -59,18 +59,17 @@ $g_captcha=false;
 $g_failed="<span style=\"font-size:18px;color:red\">&#x2716;</span>";
 $g_succeed="<span style=\"font-size:18px;color:green\">&#x2713;</span>";
 /* uncomment for development */
-define ('SVNINFO',6720);
-define ("DEBUG",true);
-//define ("DEBUG",false);
+define ('SVNINFO',6721);
+define ("DEBUG",false);
 
 $version_noalyss=SVNINFO;
 // If you don't want to be notified of the update
 // define ("SITE_UPDATE",'');
-define ("SITE_UPDATE",'http://www.phpcompta.eu/last_version.txt');
-define ("SITE_UPDATE_PLUGIN",'http://www.phpcompta.eu/plugin_last_version.txt');
+define ("SITE_UPDATE",'http://www.noalyss.eu/last_version.txt');
+define ("SITE_UPDATE_PLUGIN",'http://www.noalyss.eu/plugin_last_version.txt');
 
 
-define ("DBVERSION",115);
+define ("DBVERSION",116);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",15);
 define ('NOTFOUND','--not found--');
@@ -178,7 +177,8 @@ define ("FICHE_TYPE_ACH_MAR",2);
 define ("FICHE_TYPE_ACH_SER",3);
 define ("FICHE_TYPE_ACH_MAT",7);
 define ("FICHE_TYPE_PROJET",26);
-/** -- pour utiliser unoconv démarrer un server libreoffice 
+/** 
+ * -- pour utiliser unoconv démarrer un server libreoffice 
  * commande
  * libreoffice --headless --accept="socket,host=127.0.0.1,port=2002;urp;" --nofirststartwizard 
  * ou
@@ -187,6 +187,32 @@ define ("FICHE_TYPE_PROJET",26);
 define ('OFFICE','unoconv ');
 define ('GENERATE_PDF','YES');
 
+/**
+ * Pour conversion GIF en PDF
+ */
+$convert_gif_pdf='/usr/bin/convert';
+if (file_exists($convert_gif_pdf))
+{
+    define ('CONVERT_GIF_PDF',$convert_gif_pdf);
+} else {
+    define ('CONVERT_GIF_PDF','NOT');
+    
+}
+
+/**
+ * Outil pour manipuler les PDF 
+ */
+$pdftk='/usr/bin/pdftk';
+if (file_exists($pdftk))
+{
+    define ('PDFTK',$pdftk);  
+} 
+else
+{
+    define ('PDFTK','NOT');  
+}
+
+
 define ('JS_INFOBULLE','
         <DIV id="bulle" class="infobulle"></DIV>
         <script type="text/javascript" language="javascript"  src="js/infobulle.js">
diff --git a/include/constant.security.php b/include/constant.security.php
index 9d2a1e2ac..40869a3b1 100644
--- a/include/constant.security.php
+++ b/include/constant.security.php
@@ -1,4 +1,23 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
+
 define ('FICADD',800);	 /* Ajout de fiche */
 define ("FIC",805);  //Création, modification et effacement de fiche
 define ("FICCAT",910);  //création, modification et effacement de catégorie de fiche
diff --git a/include/default_menu.inc.php b/include/default_menu.inc.php
index 728350cb6..1f80e81ab 100644
--- a/include/default_menu.inc.php
+++ b/include/default_menu.inc.php
@@ -1,4 +1,23 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
+
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once 'class_default_menu.php';
 
diff --git a/include/export_anc_grandlivre_csv.php b/include/export_anc_grandlivre_csv.php
index 89a1321c6..5f4b1f016 100644
--- a/include/export_anc_grandlivre_csv.php
+++ b/include/export_anc_grandlivre_csv.php
@@ -1,4 +1,23 @@
 <?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
+
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 header('Pragma: public');
 header('Content-type: application/csv');
diff --git a/include/export_anc_receipt_pdf.php b/include/export_anc_receipt_pdf.php
new file mode 100644
index 000000000..586abc3f3
--- /dev/null
+++ b/include/export_anc_receipt_pdf.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS 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.
+ *
+ *   NOALYSS 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 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
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+
+/**
+ * export all the selected documents for Ana Accountancy in PDF
+ */
+require_once 'class_document_export.php';
+
+$ck = HtmlInput::default_value_get('ck', 0);
+if ($ck == 0)
+{
+    echo "Aucune sélection";
+    exit();
+}
+$anc=new Document_Export();
+
+$anc->export_all($ck);
diff --git a/include/export_form_csv.php b/include/export_form_csv.php
index d038cc877..a01f51a81 100644
--- a/include/export_form_csv.php
+++ b/include/export_form_csv.php
@@ -40,7 +40,8 @@ $Form=new Acc_Report($cn,$_GET['form_id']);
 $Form->get_name();
 // Step ?
 //--
-if ( $_GET['p_step'] == 0 )
+$step=HtmlInput::default_value_get("p_step", 0);
+if (  $step == 0 )
 {
     if ( $_GET ['type_periode'] == 0 )
         $array=$Form->get_row( $_GET['from_periode'],$_GET['to_periode'], $_GET['type_periode']);
@@ -64,7 +65,7 @@ if ( $_GET['p_step'] == 0 )
 
     }
 }
-else
+elseif ($step == 1)
 {
     // Gather all the data
     //---
diff --git a/include/export_form_pdf.php b/include/export_form_pdf.php
index 505908b0e..8d120c8c9 100644
--- a/include/export_form_pdf.php
+++ b/include/export_form_pdf.php
@@ -50,7 +50,9 @@ $pdf->setTitle("Rapport ".$Libelle,true);
 
 // Step ??
 //--
-if ( $_GET['p_step'] == 0 )
+$step=HtmlInput::default_value_get("p_step", 0);
+
+if ( $step == 0 )
 {
     // No step asked
     //--
@@ -78,7 +80,7 @@ else
 $pdf->SetFont('DejaVuCond','',8);
 
 // without step
-if ( $_GET['p_step'] == 0 )
+if ( $step == 0 )
 {
     if ( $_GET['type_periode'] == 0 )
     {
diff --git a/include/export_gl_csv.php b/include/export_gl_csv.php
index 8b854da81..7c91e9974 100644
--- a/include/export_gl_csv.php
+++ b/include/export_gl_csv.php
@@ -70,11 +70,11 @@ else
       {
 	if  ( $cond_poste == '')
 	  {
-	    $cond_poste =  ' where pcm_val <= upper (\''.Database::escape_string($to_poste).'\')';
+	    $cond_poste =  " where pcm_val <= upper (''".Database::escape_string($to_poste)."'')";
 	  }
 	else
 	  {
-	    $cond_poste.=' and pcm_val <= upper (\''.Database::escape_string($to_poste).'\')';
+	    $cond_poste.=" and pcm_val <= upper (''".Database::escape_string($to_poste)."'')";
 	  }
       }
 
@@ -92,7 +92,7 @@ if ( count($a_poste) == 0 )
 }
 
 // Header
-$header = array( "Date", "Référence", "Libellé", "Pièce", "Débit", "Crédit", "Solde" );
+$header = array( "Date", "Référence", "Libellé", "Pièce","Lettrage", "Débit", "Crédit", "Solde" );
 
 $l=(isset($_GET['letter']))?2:0;
 $s=(isset($_REQUEST['solded']))?1:0;
@@ -161,6 +161,7 @@ foreach ($a_poste as $poste)
         echo $detail['jr_internal'].";";
         echo $detail['description'].";";
         echo $detail['jr_pj_number'].";";
+        if ($detail['letter'] == -1) { echo ';'; } else { echo $detail['letter'].";";}
         echo ($detail['deb_montant']  > 0 ? nb($detail['deb_montant'])  : '').";";
         echo ($detail['cred_montant'] > 0 ? nb($detail['cred_montant']) : '').";";
         echo nb(abs($solde)).";";
@@ -173,6 +174,7 @@ foreach ($a_poste as $poste)
     echo ";";
     echo ";";
     echo ";";
+    echo ";";
     echo 'Total du compte '.$Poste->id.";";
     echo ($solde_d  > 0 ? nb($solde_d)  : '').";";
     echo ($solde_c  > 0 ? nb( $solde_c)  : '').";";
diff --git a/include/export_histo_csv.php b/include/export_histo_csv.php
index dcf1a0ec2..8eae32bc8 100644
--- a/include/export_histo_csv.php
+++ b/include/export_histo_csv.php
@@ -40,7 +40,7 @@ printf('"%s";',"Date");
 printf('"%s";',"Echeance");
 printf('"%s";',"Paiement");
 printf('"%s";',"Piece");
-printf('"%s";',"Tiers");
+printf('"%s";"";',"Tiers");
 printf('"%s";',"Description");
 printf('"%s";',"Note");
 printf('"%s"',"Montant opération");
diff --git a/include/forecast.inc.php b/include/forecast.inc.php
index 60a0e2132..33859bd33 100644
--- a/include/forecast.inc.php
+++ b/include/forecast.inc.php
@@ -240,8 +240,8 @@ for ($i = 0; $i < count($aForecast); $i++)
 $href = "?ac=" . $_REQUEST['ac'] . "&sa=new&" . $get_dossier;
 $menu[] = array($href, _("Ajout prévision"), _("Ajout d'une prévision"), 0);
 $def = (isset($_REQUEST['f_id'])) ? $_REQUEST['f_id'] : -1;
-echo '<div class="topmenu">';
-echo ShowItem($menu, 'H', 'mtitle', 'mtitle', $def);
+echo '<div class="topmenu2">';
+echo ShowItem($menu, 'H', 'mtitle', 'mtitle', $def,' class="mtitle" ');
 echo '</div>';
 /* * ********************************************************************
  * Ask for a new anticipation (forecast)
@@ -370,7 +370,7 @@ if (isset($_REQUEST['f_id']) && $sa == "vw")
     }
     catch (Exception $e)
     {
-	echo "<div class=\"error\"><p>" . _("Erreur : ") . $e->getMessage() . '</p><p>' . _('Vous devez corriger') . '</p></div>';
+	echo "<div class=\"error\"><p>" . _("Erreur")." : " . $e->getMessage() . '</p><p>' . _('Vous devez corriger') . '</p></div>';
 	$anc = new Anticipation($cn, $_GET['f_id']);
 	echo '<div class="content">';
 	/* display a blank form for name and category */
diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php
index f902ee48b..d6c55c01c 100644
--- a/include/impress_poste.inc.php
+++ b/include/impress_poste.inc.php
@@ -223,7 +223,7 @@ if ( isset( $_REQUEST['bt_html'] ) )
                 '(' . $fiche->id . ')' .
                 $fiche->getName() . ' ' .
                 ' [ ' . $fiche->get_quick_code() . ' ] ' .
-                '<h2>';
+                '</h2>';
             $fiche->HtmlTableHeader();
             $fiche->HtmlTable(null, $_GET['ople']);
             $fiche->HtmlTableHeader();
diff --git a/include/impress_rapport.inc.php b/include/impress_rapport.inc.php
index c09967e67..7b6c21762 100644
--- a/include/impress_rapport.inc.php
+++ b/include/impress_rapport.inc.php
@@ -40,15 +40,15 @@ if ( isset( $_GET['bt_html'] ) )
     $Form->get_name();
     // step asked ?
     //--
+    $type_periode=HtmlInput::default_value_get("type_periode", -1);
+    if ( $type_periode == 1 )
+        $array=$Form->get_row( $_GET['from_date'],$_GET['to_date'], $type_periode);
 
-    if ( $_GET['type_periode'] == 1 )
-        $array=$Form->get_row( $_GET['from_date'],$_GET['to_date'], $_GET['type_periode']);
-
-    if ($_GET['type_periode']  == 0  && $_GET['p_step'] == 0 )
-        $array=$Form->get_row( $_GET['from_periode'],$_GET['to_periode'], $_GET['type_periode']);
+    if ($type_periode == 0   && $_GET['p_step'] == 0)
+        $array=$Form->get_row( $_GET['from_periode'],$_GET['to_periode'], $type_periode);
 
 
-    if ($_GET['type_periode']  == 0  && $_GET['p_step'] == 1 )
+    if ($type_periode  == 0  && $_GET['p_step'] == 1 )
     {
         // step are asked
         //--
@@ -132,7 +132,7 @@ if ( isset( $_GET['bt_html'] ) )
     echo "</table>";
     if ( count($Form->row ) == 0 )
         exit;
-    if ( $_GET['type_periode']==0 )
+    if ( $_GET['type_periode']== 0 )
     {
         if ( $_GET['p_step'] == 0)
         { // check the step
@@ -249,6 +249,7 @@ $aStep=array(
        );
 echo '<tr>';
 echo td('Par étape de');
+$w->id='p_step';
 echo $w->input('p_step',$aStep);
 echo '</TR>';
 
diff --git a/include/restore.inc.php b/include/restore.inc.php
index ab96f3f45..9bbc34ae4 100644
--- a/include/restore.inc.php
+++ b/include/restore.inc.php
@@ -43,6 +43,8 @@ if ( isset ($_REQUEST['sa'] ))
         putenv("PGUSER=" . phpcompta_user);
         putenv("PGHOST=" . phpcompta_psql_host);
         putenv("PGPORT=" . phpcompta_psql_port);
+    } else  {
+        die ('Aucune connection');
     }
 
     $retour='<hr>'.HtmlInput::button_anchor("Retour","?action=restore");
@@ -69,8 +71,6 @@ if ( isset ($_REQUEST['sa'] ))
     // Restore a folder (dossier)
     if ( $_REQUEST['t']=='d')
     {
-        ini_set('upload_max_filesize','25M');
-        ini_set('post_max_size','25M');
         echo '<div class="content" style="width:80%;margin-left:10%">';
 
         $cn=new Database();
@@ -143,9 +143,6 @@ if ( isset ($_REQUEST['sa'] ))
 
     if ( $_REQUEST['t']=='m')
     {
-        ini_set('upload_max_filesize','25M');
-        ini_set('post_max_size','25M');
-
         echo '<div class="content">';
 
         $cn=new Database();
@@ -196,7 +193,7 @@ if ( isset ($_REQUEST['sa'] ))
 
         $new_cn->apply_patch($name,0);
 
-        echo '<span class="error">'.'Ne pas recharger la page, sinon votre base de données sera restaurée une fois de plus'.'</span>';
+        echo '<span class="error">'._('Ne pas recharger la page, sinon votre base de données sera restaurée une fois de plus').'</span>';
         echo $retour;
 
         echo '</div>';
diff --git a/include/template/dashboard.php b/include/template/dashboard.php
index fbd9f0372..e27672181 100644
--- a/include/template/dashboard.php
+++ b/include/template/dashboard.php
@@ -64,7 +64,11 @@ if ( ! empty ($array) )  {
 
 			</th>
 			<th>
+                            <?php echo date('d.m.y'); ?>
 			</th>
+                        <th>
+                            <?php echo _('En retard') ?>
+                        </th>
 		</tr>
 		<tr>
 			<td>
diff --git a/include/template/form_ledger_detail.php b/include/template/form_ledger_detail.php
index d1faf1a9e..f521275f3 100644
--- a/include/template/form_ledger_detail.php
+++ b/include/template/form_ledger_detail.php
@@ -61,7 +61,7 @@
 <?php echo $str_add_button?>
 
 <h2><?php echo $f_legend_detail?></h2>
-<table id="sold_item" width="100%" border="0">
+<table id="sold_item" style="width:100%;border-width: 0px">
 <tr>
 <th style="width:auto"colspan="2">Code <?php echo HtmlInput::infobulle(0)?></th>
       <th><?php echo _('Dénomination')?></th>
diff --git a/include/template/impress_cat_card.php b/include/template/impress_cat_card.php
index 9f773463f..46563b884 100644
--- a/include/template/impress_cat_card.php
+++ b/include/template/impress_cat_card.php
@@ -18,7 +18,7 @@
   <td><?php echo _('Jusque')?></td>
   <td><?php echo $str_end?></td>
 <tr id="allcard">
-	<td>Toutes les fiches</td>
+	<td><?php echo _('Pour toutes les catégories')?></td>
 	<td><?php echo $str_icall?></td>
 </tr>
 </tr>
diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php
index 43ca908c7..66d2fac2a 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -3,7 +3,7 @@
     $other=new IText('OTHER',$obj->info->other);
 ?>
 <div class="myfieldset">
-    <h1 class="legend">"<?php echo _("Informations")?></h1>
+    <h1 class="legend"><?php echo _("Information")?></h1>
     <table>
         <tr>
             <td><?php echo _(" Bon de commande")?>   :</td><td> <?php echo HtmlInput::infobulle(31)." ".$cmd->input();  ?></td>
diff --git a/include/template/ledger_detail_ven.php b/include/template/ledger_detail_ven.php
index f5f4f4343..c4ec3370f 100644
--- a/include/template/ledger_detail_ven.php
+++ b/include/template/ledger_detail_ven.php
@@ -1,7 +1,13 @@
 <?php
 //This file is part of NOALYSS and is under GPL 
 //see licence.txt
-?><?php require_once('template/ledger_detail_top.php'); ?>
+?><?php require_once('ledger_detail_top.php'); ?>
+<?php
+    $tab_account=$div."account";
+    $tab_rapprochement=$div."rapproch";
+    $tab_receipt=$div."receipt";
+    $tab_document=$div."document";
+ ?>
 <div class="content" style="padding:0;">
     <?php
     require_once('class_own.php');
diff --git a/include/template/module.php b/include/template/module.php
index 15104e77a..dbb1679eb 100644
--- a/include/template/module.php
+++ b/include/template/module.php
@@ -65,9 +65,10 @@ endif;?>
 			echo "</tr><tr>";
 			continue;
 		    }
+                    $style="tool";
 		    if ($row['me_code']==$selected)
 		    {
-			$style="background:red";
+			$style='toolselected';
 		    }
 		    if ( $row['me_url']!='')
 		    {
@@ -84,7 +85,7 @@ endif;?>
 				$url="do.php?gDossier=".Dossier::id()."&ac=".$row['me_code'];
 		    }
 		    ?>
-		<td class="tool" style="<?php echo $style?>">
+		<td class="<?php echo $style?>">
 			<a class="mtitle" href="<?php echo $url?>" title="<?php echo _($row['me_description'])?>" <?php echo $js?> ><?php echo _($row['me_menu'])?></a></td>
 		<?php 
 		    endforeach;
diff --git a/include/template/param_jrn.php b/include/template/param_jrn.php
index 9b1dbfe8e..74de5c458 100644
--- a/include/template/param_jrn.php
+++ b/include/template/param_jrn.php
@@ -1,7 +1,7 @@
 <?php
 //This file is part of NOALYSS and is under GPL 
 //see licence.txt
-?><TABLE>
+?><TABLE style="width: auto">
 <TR>
 
 		<TD><?php echo _('Nom journal')?> </TD>
@@ -86,20 +86,18 @@ echo $str_add_button;
 </TR>
 <TR>
 <TD><?php echo _('Préfixe pièce justificative')?>
+    <?php echo HtmlInput::infobulle(39);?>
 </TD>
 <TD>
 <?php echo $pj_pref; ?>
 </TD>
-<TD>
-<span class="notice"><?php echo _('Le préfixe des pièces doit être différent pour chaque journal, on peut aussi utiliser l\'année')?></span><br>
-<span class="notice"><?php echo _('Uniquement des chiffres')?></span>
-</TD>
 
 </TR>
 <?php if ( $new == 0 ) : ?>
 <TR>
 <TD>
   <?php echo _('Dernière pièce numérotée')?>
+  <?php echo HtmlInput::infobulle(40);?>
 </TD>
 <TD>
 <?php echo $last_seq?>
@@ -108,22 +106,19 @@ echo $str_add_button;
 
 <tr>
 <TD><?php echo _('N° pièce justificative')?>
+    <?php echo HtmlInput::infobulle(38);?>
 </TD>
 <TD>
-<?php echo $pj_seq; ?>
-</TD>
-
-<TD>
-<span class="notice" style="display:block"><?php echo _('La numérotation est propre à chaque journal')?></span>
-<span class="notice" style="display:block"><?php echo _('Laissez à 0 pour ne pas changer le numéro')?></span>
+    <?php echo $pj_seq; ?>
+   
 </TD>
 </tr>
 <?php endif; ?>
 <tr>
-    <td>
+    <td style="width: 200px">
     <?php echo _('Description') ?>
     </TD>
-    <td>
+    <td style="width: 500px">
      <?php echo $str_description; ?>   
     </td>
 </tr>    
@@ -137,10 +132,10 @@ echo $str_add_button;
     <TABLE class="result" style="width:80%;margin-left:10%;">
         <tr>
             <th>
-                Services, fournitures ou biens  achetés (C)
+                Services, fournitures ou biens  achetés (D)
             </th>
             <th>
-                Fournisseurs (D)
+                Fournisseurs (C)
             </th>
         </tr>
     
@@ -149,7 +144,13 @@ echo $str_add_button;
     // Show the fiche in deb section
     $Res=$cn->exec_sql("select fd_id,fd_label from fiche_def order by fd_label");
     $num=$cn->size();
-
+    // default card for ACH
+    if ($new == 1)
+    {
+        $rdeb=$default_deb_purchase;
+        $rcred=$default_cred_purchase;
+    }
+    
     for ($i=0;$i<$num;$i++) {
       $res=$cn->fetch($i);
       $CHECKED=" unchecked";
@@ -201,6 +202,12 @@ echo $str_add_button;
     // Show the fiche in deb section
     $Res=$cn->exec_sql("select fd_id,fd_label from fiche_def order by fd_label");
     $num=$cn->size();
+    // default card for VEN
+    if ($new == 1)
+    {
+        $rdeb=$default_deb_sale;
+        $rcred=$default_cred_sale;
+    }
 
     for ($i=0;$i<$num;$i++) {
       $res=$cn->fetch($i);
@@ -250,7 +257,11 @@ echo $str_add_button;
     // Show the fiche in deb section
     $Res=$cn->exec_sql("select fd_id,fd_label from fiche_def order by fd_label");
     $num=$cn->size();
-
+    // default card for ODS
+    if ($new == 1)
+    {
+        $rdeb=$default_ods;
+    }
     for ($i=0;$i<$num;$i++) {
       $res=$cn->fetch($i);
       $CHECKED=" unchecked";
@@ -297,7 +308,11 @@ echo $str_add_button;
     // Show the fiche in deb section
     $Res=$cn->exec_sql("select fd_id,fd_label from fiche_def order by fd_label");
     $num=$cn->size();
-
+    // default card for ACH
+    if ($new == 1)
+    {
+        $rdeb=$default_fin;
+    }
     for ($i=0;$i<$num;$i++) {
       $res=$cn->fetch($i);
       $CHECKED=" unchecked";
diff --git a/include/template/template.gif b/include/template/template.gif
new file mode 100644
index 000000000..ab44205fe
Binary files /dev/null and b/include/template/template.gif differ
diff --git a/release-note b/release-note
deleted file mode 100644
index 27a213418..000000000
--- a/release-note
+++ /dev/null
@@ -1,94 +0,0 @@
-===================================================================
-|| Done
-===================================================================
-
-Favori
-======
-Permet d'avoir une liste qui apparaît dans une fenêtre interne avec
-les menus que vous utilisez le plus
-
-Navigateur
-==========
-Permet d'accèder rapidement au menu nécessaire, il y a plus
-d'explication sur les menu
-
-Impression journaux
-===================
-Anciennement appelé impression - historique -> changer dans menu_ref
-Permet impression des journaux vente et achat avec détail pour la TVA, la partie
-non déductible et la partie privée
-
-Modéle d'opération
-==================
-Amélioration : Fenêtre interne avec filtrage et une description des
-modèles, la limite est plus élevée aussi
-
-Impression journaux 
-===================
-Anciennement appelé impression - historique -> changer dans menu_ref
-Permet impression des journaux vente et achat avec détail pour la TVA, la partie
-non déductible et la partie privée
-
-
-Protection fichier include
-==========================
-Ajout d'une sécurité supplémentaire
-
-Préférence 
-==========
-Dans fenêtre interne
-
-Action - Suivi
-===============
-1. Ajout de tags (table tag et action_tag) (v)
-2. changement présentation liste (x)
-3. Ajout menu : CFGTAG pour gèrer les tags : description, nom ...
-4. Ajout d'un ou plusieurs tags par action, un tag n'est pas un type de document
- Sécurité : vérifier que l'utilisateur peut ajouter ou enlever des tags à une action 
-Changement présentation Détail action : les détails (qui/quand) sont à mettre dans la colonne de gauche
-
-Journaux
-========
-Suivi type de journal montrer ou cacher les bons détails
-Pour ACH indiquer Fournisseur (D) et Services ou Marchandises achetés
-Pour VEN indiquer Client (C) et Services ou Marchandises vendus
-Pour FIN indiquer Compte tiers (D/C) et surtout permettre de créer un fiche de type trésorerie (frd_id=4)
-
-Fiche
-=====
-Si aucun quickcode n'est donné, il en sera calculé un en se basant sur le nom de la fiche (5ière lettre) + n° si duplicate
-code php 
-fiche_def.inc.php
-
-Action - Suivi
-===============
-Recherche par tag
-L'avoir dans les changements de page
-Tag repris dans le bouton retour
-Visible dans la recherche après une recherche
-Possibilité d'ajouter / enlever des tags à plusieurs documents
-Possibilité d'avoir une impression web de plusieurs documents
-Possibilité de changer l'état de plusieurs documents
-
-Date de paiement
-================
-Lors de rapprochement
-Dans le détail journaux ACH et VEN
-Dans l'impression PRINTJRN + export CSV
-Dans l'historique
-
-===================================================================
-|| A faire
-===================================================================
-
-
-Document à générer
-=================
-Par journal
-ou par profil
-
-
-
-
-
-