From d4a0111cbae20e68aee54282d7d8faa227b7b954 Mon Sep 17 00:00:00 2001
From: sparkyx <dany118@gmail.com>
Date: Sat, 7 Oct 2006 13:14:00 +0000
Subject: [PATCH] Finish integration

---
 doc/developper/account_repository.html |   2 +-
 doc/developper/dossier1.dia            | 466 +++++++++++--------------
 doc/developper/dossier1.html           | 234 +++++--------
 html/admin/setup.php                   |  21 +-
 html/index.php                         |   2 +-
 include/action.inc.php                 |   2 +
 include/class_action.php               |  23 +-
 include/class_fiche.php                |   4 +-
 include/user_action_ach.php            |  17 +-
 include/user_common.php                |   8 +-
 include/user_form_ach.php              |  14 +-
 11 files changed, 355 insertions(+), 438 deletions(-)
diff --git a/doc/developper/account_repository.html b/doc/developper/account_repository.html
index baf135f99..a7101f765 100644
--- a/doc/developper/account_repository.html
+++ b/doc/developper/account_repository.html
@@ -111,7 +111,7 @@
   <body>
 
     <!-- Primary Index -->
-	<p><br><br>Dumped on 2006-09-26</p>
+	<p><br><br>Dumped on 2006-10-07</p>
 <h1><a name="index">Index of database - account_repository</a></h1>
 <ul>
     
diff --git a/doc/developper/dossier1.dia b/doc/developper/dossier1.dia
index 2da2bf0d5..511b401f2 100644
--- a/doc/developper/dossier1.dia
+++ b/doc/developper/dossier1.dia
@@ -939,179 +939,6 @@
     </dia:object>
 
     <dia:object type="UML - Class" version="0" id="O6">
-      <dia:attribute name="obj_pos">
-        <dia:point val="0,0"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.05,-0.05;16.4,6.65"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="0,0"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="16.350000000000001"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="6.6000000000000005"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#b#</dia:string>
-      </dia:attribute>
-
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
-
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#  j_deb#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#double precision#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-
-            <dia:string/>
-
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="3"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#  jr_montant#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#double precision#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-
-            <dia:string/>
-
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="3"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#  jr_grpt_id#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#integer#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-
-            <dia:string/>
-
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="3"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-
-      </dia:attribute>
-
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-
-    <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -1537,7 +1364,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O8">
+    <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -1802,7 +1629,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O9">
+    <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -2044,7 +1871,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O10">
+    <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -2194,7 +2021,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O11">
+    <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -2344,7 +2171,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O12">
+    <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -2494,7 +2321,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O13">
+    <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -2713,7 +2540,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O14">
+    <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -2886,7 +2713,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O15">
+    <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -3105,7 +2932,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O16">
+    <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -3255,7 +3082,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O17">
+    <dia:object type="UML - Class" version="0" id="O16">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -3405,7 +3232,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O18">
+    <dia:object type="UML - Class" version="0" id="O17">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -3426,7 +3253,7 @@
       </dia:attribute>
 
       <dia:attribute name="comment">
-        <dia:string>#Table temporaire pour l&#39;importation ... t CSV#</dia:string>
+        <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
@@ -3570,7 +3397,7 @@
             <dia:string>#  montant#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#numeric(20,4)#</dia:string>
+            <dia:string>#text#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
 
@@ -3703,6 +3530,29 @@
           </dia:attribute>
         </dia:composite>
 
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#  status#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#character varying(1)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+
+            <dia:string>#&#39;n&#39;::character varying#</dia:string>
+
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#  bq_account#</dia:string>
@@ -3751,14 +3601,14 @@
 
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#  status#</dia:string>
+            <dia:string>#  jr_rapt#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#character varying(1)#</dia:string>
+            <dia:string>#text#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
 
-            <dia:string>#&#39;n&#39;::character varying#</dia:string>
+            <dia:string/>
 
           </dia:attribute>
           <dia:attribute name="visibility">
@@ -3781,7 +3631,7 @@
 
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#chk_status#</dia:string>
+            <dia:string>#import_tmp_status_check#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="3"/>
@@ -3795,7 +3645,7 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#CHECK ((((((status)::text = &#39;n ... xt)))#</dia:string>
+                <dia:string>#CHECK ((((((status)::text = &#39;t ... xt)))#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
                 <dia:string>##</dia:string>
@@ -3818,7 +3668,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O19">
+    <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -3991,7 +3841,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O20">
+    <dia:object type="UML - Class" version="0" id="O19">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -4164,7 +4014,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O21">
+    <dia:object type="UML - Class" version="0" id="O20">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -4337,7 +4187,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O22">
+    <dia:object type="UML - Class" version="0" id="O21">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -4855,7 +4705,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O23">
+    <dia:object type="UML - Class" version="0" id="O22">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -5120,7 +4970,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O24">
+    <dia:object type="UML - Class" version="0" id="O23">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -5500,7 +5350,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O25">
+    <dia:object type="UML - Class" version="0" id="O24">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -5673,7 +5523,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O26">
+    <dia:object type="UML - Class" version="0" id="O25">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -5823,7 +5673,7 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
-    <dia:object type="UML - Class" version="0" id="O27">
+    <dia:object type="UML - Class" version="0" id="O26">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
       </dia:attribute>
@@ -6272,6 +6122,133 @@
       <dia:attribute name="templates"/>
     </dia:object>
 
+    <dia:object type="UML - Class" version="0" id="O27">
+      <dia:attribute name="obj_pos">
+        <dia:point val="0,0"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-0.05,-0.05;16.4,6.65"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="0,0"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="16.350000000000001"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="6.6000000000000005"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#ncount_qcode#</dia:string>
+      </dia:attribute>
+
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">
+
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#  count#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+
+            <dia:string/>
+
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+
+      </dia:attribute>
+
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="operations"/>
+
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+
     <dia:object type="UML - Class" version="0" id="O28">
       <dia:attribute name="obj_pos">
         <dia:point val="0,0"/>
@@ -7004,37 +6981,6 @@
       </dia:attribute>
       <dia:attribute name="operations">
 
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#$1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="3"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters">
-            <dia:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#CHECK ((p_end &gt;= p_start))#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>##</dia:string>
-              </dia:attribute>
-              <dia:attribute name="value">
-                <dia:string/>
-              </dia:attribute>
-              <dia:attribute name="kind">
-                <dia:enum val="0"/>
-              </dia:attribute>
-            </dia:composite>
-          </dia:attribute>
-        </dia:composite>
-
         <dia:composite type="umloperation">
           <dia:attribute name="name">
             <dia:string>#parm_periode_check#</dia:string>
@@ -10566,7 +10512,7 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="8"/>
-        <dia:connection handle="1" to="O14" connection="9"/>
+        <dia:connection handle="1" to="O13" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10618,7 +10564,7 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O5" connection="8"/>
-        <dia:connection handle="1" to="O20" connection="9"/>
+        <dia:connection handle="1" to="O19" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10643,8 +10589,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="20"/>
-        <dia:connection handle="1" to="O24" connection="9"/>
+        <dia:connection handle="0" to="O6" connection="20"/>
+        <dia:connection handle="1" to="O23" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10669,7 +10615,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="22"/>
+        <dia:connection handle="0" to="O6" connection="22"/>
         <dia:connection handle="1" to="O34" connection="9"/>
       </dia:connections>
     </dia:object>
@@ -10695,8 +10641,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O9" connection="14"/>
-        <dia:connection handle="1" to="O11" connection="9"/>
+        <dia:connection handle="0" to="O8" connection="14"/>
+        <dia:connection handle="1" to="O10" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10721,8 +10667,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O12" connection="10"/>
-        <dia:connection handle="1" to="O13" connection="9"/>
+        <dia:connection handle="0" to="O11" connection="10"/>
+        <dia:connection handle="1" to="O12" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10747,8 +10693,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O13" connection="16"/>
-        <dia:connection handle="1" to="O14" connection="9"/>
+        <dia:connection handle="0" to="O12" connection="16"/>
+        <dia:connection handle="1" to="O13" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10773,8 +10719,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O15" connection="10"/>
-        <dia:connection handle="1" to="O17" connection="9"/>
+        <dia:connection handle="0" to="O14" connection="10"/>
+        <dia:connection handle="1" to="O16" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10799,8 +10745,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O20" connection="10"/>
-        <dia:connection handle="1" to="O12" connection="9"/>
+        <dia:connection handle="0" to="O19" connection="10"/>
+        <dia:connection handle="1" to="O11" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10825,7 +10771,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O20" connection="12"/>
+        <dia:connection handle="0" to="O19" connection="12"/>
         <dia:connection handle="1" to="O3" connection="9"/>
       </dia:connections>
     </dia:object>
@@ -10851,8 +10797,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="8"/>
-        <dia:connection handle="1" to="O13" connection="9"/>
+        <dia:connection handle="0" to="O20" connection="8"/>
+        <dia:connection handle="1" to="O12" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10877,7 +10823,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="10"/>
+        <dia:connection handle="0" to="O20" connection="10"/>
         <dia:connection handle="1" to="O3" connection="9"/>
       </dia:connections>
     </dia:object>
@@ -10903,8 +10849,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O22" connection="10"/>
-        <dia:connection handle="1" to="O24" connection="9"/>
+        <dia:connection handle="0" to="O21" connection="10"/>
+        <dia:connection handle="1" to="O23" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10929,8 +10875,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O23" connection="20"/>
-        <dia:connection handle="1" to="O26" connection="9"/>
+        <dia:connection handle="0" to="O22" connection="20"/>
+        <dia:connection handle="1" to="O25" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10955,8 +10901,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O24" connection="28"/>
-        <dia:connection handle="1" to="O26" connection="9"/>
+        <dia:connection handle="0" to="O23" connection="28"/>
+        <dia:connection handle="1" to="O25" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -10981,7 +10927,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O27" connection="14"/>
+        <dia:connection handle="0" to="O26" connection="14"/>
         <dia:connection handle="1" to="O34" connection="9"/>
       </dia:connections>
     </dia:object>
@@ -11007,8 +10953,8 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O27" connection="20"/>
-        <dia:connection handle="1" to="O24" connection="9"/>
+        <dia:connection handle="0" to="O26" connection="20"/>
+        <dia:connection handle="1" to="O23" connection="9"/>
       </dia:connections>
     </dia:object>
 
@@ -11060,7 +11006,7 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O38" connection="12"/>
-        <dia:connection handle="1" to="O24" connection="9"/>
+        <dia:connection handle="1" to="O23" connection="9"/>
       </dia:connections>
     </dia:object>
 
diff --git a/doc/developper/dossier1.html b/doc/developper/dossier1.html
index 701a21b40..79746ac8f 100644
--- a/doc/developper/dossier1.html
+++ b/doc/developper/dossier1.html
@@ -111,13 +111,13 @@
   <body>
 
     <!-- Primary Index -->
-	<p><br><br>Dumped on 2006-09-26</p>
+	<p><br><br>Dumped on 2006-10-07</p>
 <h1><a name="index">Index of database - dossier1</a></h1>
 <ul>
     
     <li><a name="public.schema">public</a></li><ul>
-    	<li><a href="#public.table.action">action</a></li><li><a href="#public.table.action-gestion">action_gestion</a></li><li><a href="#public.table.attr-def">attr_def</a></li><li><a href="#public.table.attr-min">attr_min</a></li><li><a href="#public.table.attr-value">attr_value</a></li><li><a href="#public.table.b">b</a></li><li><a href="#public.table.centralized">centralized</a></li><li><a href="#public.table.document">document</a></li><li><a href="#public.table.document-modele">document_modele</a></li><li><a href="#public.table.document-state">document_state</a></li><li><a href="#public.table.document-type">document_type</a></li><li><a href="#public.table.fiche">fiche</a></li><li><a href="#public.table.fiche-def">fiche_def</a></li><li><a href="#public.table.fiche-def-ref">fiche_def_ref</a></li><li><a href="#public.table.form">form</a></li><li><a href="#public.table.format-csv-banque">format_csv_banque</a></li><li><a href="#public.table.formdef">formdef</a></li><li><a href="#public.table.import-tmp">import_tmp</a></li><li><a href="#public.table.invoice">invoice</a></li><li><a href="#public.table.jnt-fic-att-value">jnt_fic_att_value</a></li><li><a href="#public.table.jnt-fic-attr">jnt_fic_attr</a></li><li><a href="#public.table.jrn">jrn</a></li><li><a href="#public.table.jrn-action">jrn_action</a></li><li><a href="#public.table.jrn-def">jrn_def</a></li><li><a href="#public.table.jrn-rapt">jrn_rapt</a></li><li><a href="#public.table.jrn-type">jrn_type</a></li><li><a href="#public.table.jrnx">jrnx</a></li><li><a href="#public.table.parameter">parameter</a></li><li><a href="#public.table.parm-code">parm_code</a></li><li><a href="#public.table.parm-money">parm_money</a></li><li><a href="#public.table.parm-periode">parm_periode</a></li><li><a href="#public.table.quant-sold">quant_sold</a></li><li><a href="#public.table.stock-goods">stock_goods</a></li><li><a href="#public.table.tmp-pcmn">tmp_pcmn</a></li><li><a href="#public.table.tva-rate">tva_rate</a></li><li><a href="#public.table.user-local-pref">user_local_pref</a></li><li><a href="#public.table.user-sec-act">user_sec_act</a></li><li><a href="#public.table.user-sec-jrn">user_sec_jrn</a></li><li><a href="#public.table.version">version</a></li><li><a href="#public.view.vw-client">vw_client</a></li><li><a href="#public.view.vw-fiche-attr">vw_fiche_attr</a></li><li><a href="#public.view.vw-fiche-def">vw_fiche_def</a></li><li><a href="#public.view.vw-fiche-min">vw_fiche_min</a></li><li><a href="#public.view.vw-poste-qcode">vw_poste_qcode</a></li><li><a href="#public.view.vw-supplier">vw_supplier</a></li>
-  	<li><a href="#public.function.account-add-p-id-public.poste-comptable-p-name-character-varying">account_add( p_id public.poste_comptable, p_name character varying )</a></li><li><a href="#public.function.account-auto-p-fd-id-integer">account_auto( p_fd_id integer )</a></li><li><a href="#public.function.account-compute-p-f-id-integer">account_compute( p_f_id integer )</a></li><li><a href="#public.function.account-insert-p-f-id-integer-p-account-public.poste-comptable">account_insert( p_f_id integer, p_account public.poste_comptable )</a></li><li><a href="#public.function.account-parent-p-account-public.poste-comptable">account_parent( p_account public.poste_comptable )</a></li><li><a href="#public.function.account-update-p-f-id-integer-p-account-public.poste-comptable">account_update( p_f_id integer, p_account public.poste_comptable )</a></li><li><a href="#public.function.attribut-insert-p-f-id-integer-p-ad-id-integer-p-value-character-varying">attribut_insert( p_f_id integer, p_ad_id integer, p_value character varying )</a></li><li><a href="#public.function.card-class-base-p-f-id-integer">card_class_base( p_f_id integer )</a></li><li><a href="#public.function.check-balance-p-grpt-integer">check_balance( p_grpt integer )</a></li><li><a href="#public.function.correct-sequence-p-sequence-text-p-col-text-p-table-text">correct_sequence( p_sequence text, p_col text, p_table text )</a></li><li><a href="#public.function.drop-it-p-constraint-character-varying">drop_it( p_constraint character varying )</a></li><li><a href="#public.function.fiche-account-parent-p-f-id-integer">fiche_account_parent( p_f_id integer )</a></li><li><a href="#public.function.insert-jrnx-p-date-character-varying-p-montant-numeric-p-poste-integer-p-grpt-integer-p-jrn-def-integer-p-debit-boolean-p-tech-user-text-p-tech-per-integer-p-qcode-text">insert_jrnx( p_date character varying, p_montant numeric, p_poste integer, p_grpt integer, p_jrn_def integer, p_debit boolean, p_tech_user text, p_tech_per integer, p_qcode text )</a></li><li><a href="#public.function.insert-quant-sold-p-internal-text-p-fiche-character-varying-p-quant-integer-p-price-numeric-p-vat-numeric-p-vat-code-integer-p-client-character-varying">insert_quant_sold( p_internal text, p_fiche character varying, p_quant integer, p_price numeric, p_vat numeric, p_vat_code integer, p_client character varying )</a></li><li><a href="#public.function.insert-quick-code-nf-id-integer-tav-text-text">insert_quick_code( nf_id integer, tav_text text )</a></li><li><a href="#public.function.plpgsql-validator-oid">plpgsql_validator( oid )</a></li><li><a href="#public.function.proc-check-balance">proc_check_balance(  )</a></li><li><a href="#public.function.t-document-type-insert">t_document_type_insert(  )</a></li><li><a href="#public.function.t-jrn-def-sequence">t_jrn_def_sequence(  )</a></li><li><a href="#public.function.trim-cvs-quote">trim_cvs_quote(  )</a></li><li><a href="#public.function.trim-space-format-csv-banque">trim_space_format_csv_banque(  )</a></li><li><a href="#public.function.tva-delete-integer">tva_delete( integer )</a></li><li><a href="#public.function.tva-insert-integer-text-numeric-text-text">tva_insert( integer, text, numeric, text, text )</a></li><li><a href="#public.function.tva-modify-integer-text-numeric-text-text">tva_modify( integer, text, numeric, text, text )</a></li><li><a href="#public.function.update-quick-code-njft-id-integer-tav-text-text">update_quick_code( njft_id integer, tav_text text )</a></li>
+    	<li><a href="#public.table.action">action</a></li><li><a href="#public.table.action-gestion">action_gestion</a></li><li><a href="#public.table.attr-def">attr_def</a></li><li><a href="#public.table.attr-min">attr_min</a></li><li><a href="#public.table.attr-value">attr_value</a></li><li><a href="#public.table.centralized">centralized</a></li><li><a href="#public.table.document">document</a></li><li><a href="#public.table.document-modele">document_modele</a></li><li><a href="#public.table.document-state">document_state</a></li><li><a href="#public.table.document-type">document_type</a></li><li><a href="#public.table.fiche">fiche</a></li><li><a href="#public.table.fiche-def">fiche_def</a></li><li><a href="#public.table.fiche-def-ref">fiche_def_ref</a></li><li><a href="#public.table.form">form</a></li><li><a href="#public.table.format-csv-banque">format_csv_banque</a></li><li><a href="#public.table.formdef">formdef</a></li><li><a href="#public.table.import-tmp">import_tmp</a></li><li><a href="#public.table.invoice">invoice</a></li><li><a href="#public.table.jnt-fic-att-value">jnt_fic_att_value</a></li><li><a href="#public.table.jnt-fic-attr">jnt_fic_attr</a></li><li><a href="#public.table.jrn">jrn</a></li><li><a href="#public.table.jrn-action">jrn_action</a></li><li><a href="#public.table.jrn-def">jrn_def</a></li><li><a href="#public.table.jrn-rapt">jrn_rapt</a></li><li><a href="#public.table.jrn-type">jrn_type</a></li><li><a href="#public.table.jrnx">jrnx</a></li><li><a href="#public.table.ncount-qcode">ncount_qcode</a></li><li><a href="#public.table.parameter">parameter</a></li><li><a href="#public.table.parm-code">parm_code</a></li><li><a href="#public.table.parm-money">parm_money</a></li><li><a href="#public.table.parm-periode">parm_periode</a></li><li><a href="#public.table.quant-sold">quant_sold</a></li><li><a href="#public.table.stock-goods">stock_goods</a></li><li><a href="#public.table.tmp-pcmn">tmp_pcmn</a></li><li><a href="#public.table.tva-rate">tva_rate</a></li><li><a href="#public.table.user-local-pref">user_local_pref</a></li><li><a href="#public.table.user-sec-act">user_sec_act</a></li><li><a href="#public.table.user-sec-jrn">user_sec_jrn</a></li><li><a href="#public.table.version">version</a></li><li><a href="#public.view.vw-client">vw_client</a></li><li><a href="#public.view.vw-fiche-attr">vw_fiche_attr</a></li><li><a href="#public.view.vw-fiche-def">vw_fiche_def</a></li><li><a href="#public.view.vw-fiche-min">vw_fiche_min</a></li><li><a href="#public.view.vw-poste-qcode">vw_poste_qcode</a></li><li><a href="#public.view.vw-supplier">vw_supplier</a></li>
+  	<li><a href="#public.function.account-add-p-id-public.poste-comptable-p-name-character-varying">account_add( p_id public.poste_comptable, p_name character varying )</a></li><li><a href="#public.function.account-auto-p-fd-id-integer">account_auto( p_fd_id integer )</a></li><li><a href="#public.function.account-compute-p-f-id-integer">account_compute( p_f_id integer )</a></li><li><a href="#public.function.account-insert-p-f-id-integer-p-account-public.poste-comptable">account_insert( p_f_id integer, p_account public.poste_comptable )</a></li><li><a href="#public.function.account-parent-p-account-public.poste-comptable">account_parent( p_account public.poste_comptable )</a></li><li><a href="#public.function.account-update-p-f-id-integer-p-account-public.poste-comptable">account_update( p_f_id integer, p_account public.poste_comptable )</a></li><li><a href="#public.function.attribut-insert-p-f-id-integer-p-ad-id-integer-p-value-character-varying">attribut_insert( p_f_id integer, p_ad_id integer, p_value character varying )</a></li><li><a href="#public.function.card-class-base-p-f-id-integer">card_class_base( p_f_id integer )</a></li><li><a href="#public.function.check-balance-p-grpt-integer">check_balance( p_grpt integer )</a></li><li><a href="#public.function.correct-sequence-p-sequence-text-p-col-text-p-table-text">correct_sequence( p_sequence text, p_col text, p_table text )</a></li><li><a href="#public.function.drop-it-p-constraint-character-varying">drop_it( p_constraint character varying )</a></li><li><a href="#public.function.fiche-account-parent-p-f-id-integer">fiche_account_parent( p_f_id integer )</a></li><li><a href="#public.function.insert-jrnx-p-date-character-varying-p-montant-numeric-p-poste-integer-p-grpt-integer-p-jrn-def-integer-p-debit-boolean-p-tech-user-text-p-tech-per-integer-p-qcode-text">insert_jrnx( p_date character varying, p_montant numeric, p_poste integer, p_grpt integer, p_jrn_def integer, p_debit boolean, p_tech_user text, p_tech_per integer, p_qcode text )</a></li><li><a href="#public.function.insert-quant-sold-p-internal-text-p-fiche-character-varying-p-quant-integer-p-price-numeric-p-vat-numeric-p-vat-code-integer-p-client-character-varying">insert_quant_sold( p_internal text, p_fiche character varying, p_quant integer, p_price numeric, p_vat numeric, p_vat_code integer, p_client character varying )</a></li><li><a href="#public.function.insert-quick-code-nf-id-integer-tav-text-text">insert_quick_code( nf_id integer, tav_text text )</a></li><li><a href="#public.function.proc-check-balance">proc_check_balance(  )</a></li><li><a href="#public.function.t-document-type-insert">t_document_type_insert(  )</a></li><li><a href="#public.function.t-jrn-def-sequence">t_jrn_def_sequence(  )</a></li><li><a href="#public.function.trim-cvs-quote">trim_cvs_quote(  )</a></li><li><a href="#public.function.trim-space-format-csv-banque">trim_space_format_csv_banque(  )</a></li><li><a href="#public.function.tva-delete-integer">tva_delete( integer )</a></li><li><a href="#public.function.tva-insert-integer-text-numeric-text-text">tva_insert( integer, text, numeric, text, text )</a></li><li><a href="#public.function.tva-modify-integer-text-numeric-text-text">tva_modify( integer, text, numeric, text, text )</a></li><li><a href="#public.function.update-quick-code-njft-id-integer-tav-text-text">update_quick_code( njft_id integer, tav_text text )</a></li>
     </ul>
     
 </ul>
@@ -668,93 +668,6 @@
 		
 		
 
-        <!-- Constraint List -->
-		
-
-        <!-- Foreign Key Discovery -->
-		
-
-	<!-- View Definition -->
-	
-
-	<!-- List off permissions -->
-	
-
-	<p>
-		<a href="#index">Index</a> -
-		<a href="#public.schema">Schema public</a>
-    </p>
-	
-        <hr>
-		<h2>Table:
-			<a name="public.table.b">b</a>
-		</h2>
-        
-
-
-        <table width="100%" cellspacing="0" cellpadding="3">
-                <caption>b Structure</caption>
-                <tr>
-                <th>F-Key</th>
-                <th>Name</th>
-                <th>Type</th>
-                <th>Description</th>
-                </tr>
-            
-            <tr class="tr0">
-				<td>
-                
-                </td>
-            	<td>j_deb</td>
-            	<td>double precision</td>
-                <td><i>
-				
-
-				
-				
-				</i>
-				
-				</td>
-			 </tr>
-            
-            <tr class="tr1">
-				<td>
-                
-                </td>
-            	<td>jr_montant</td>
-            	<td>double precision</td>
-                <td><i>
-				
-
-				
-				
-				</i>
-				
-				</td>
-			 </tr>
-            
-            <tr class="tr0">
-				<td>
-                
-                </td>
-            	<td>jr_grpt_id</td>
-            	<td>integer</td>
-                <td><i>
-				
-
-				
-				
-				</i>
-				
-				</td>
-			 </tr>
-            
-        </table>
-
-		
-		
-		
-
         <!-- Constraint List -->
 		
 
@@ -2192,8 +2105,6 @@
 			<a name="public.table.import-tmp">import_tmp</a>
 		</h2>
         
-         <p>Table temporaire pour l&#39;importation des banques en format CSV</p>
-        
 
 
         <table width="100%" cellspacing="0" cellpadding="3">
@@ -2214,7 +2125,7 @@
                 <td><i>
 				
 
-				NOT NULL
+				
 				
 				</i>
 				
@@ -2230,7 +2141,7 @@
                 <td><i>
 				
 
-				NOT NULL
+				
 				
 				</i>
 				
@@ -2246,7 +2157,7 @@
                 <td><i>
 				
 
-				NOT NULL
+				
 				
 				</i>
 				
@@ -2258,11 +2169,11 @@
                 
                 </td>
             	<td>montant</td>
-            	<td>numeric(20,4)</td>
+            	<td>text</td>
                 <td><i>
 				
 
-				NOT NULL
+				
 				
 				</i>
 				
@@ -2353,13 +2264,13 @@
 				<td>
                 
                 </td>
-            	<td>bq_account</td>
-            	<td>integer</td>
+            	<td>status</td>
+            	<td>character varying(1)</td>
                 <td><i>
 				
 
 				NOT NULL
-				
+				DEFAULT &#39;n&#39;::character varying
 				</i>
 				
 				</td>
@@ -2369,7 +2280,7 @@
 				<td>
                 
                 </td>
-            	<td>jrn</td>
+            	<td>bq_account</td>
             	<td>integer</td>
                 <td><i>
 				
@@ -2385,15 +2296,31 @@
 				<td>
                 
                 </td>
-            	<td>status</td>
-            	<td>character varying(1)</td>
+            	<td>jrn</td>
+            	<td>integer</td>
+                <td><i>
+				
+
+				NOT NULL
+				
+				</i>
+				
+				</td>
+			 </tr>
+            
+            <tr class="tr0">
+				<td>
+                
+                </td>
+            	<td>jr_rapt</td>
+            	<td>text</td>
                 <td><i>
 				
 
 				
-				DEFAULT &#39;n&#39;::character varying
+				
 				</i>
-				<br><br>Status doit �tre w pour en attente, t pour transf�rer ou d � effacer
+				
 				</td>
 			 </tr>
             
@@ -2414,8 +2341,8 @@
             </tr>
 			
             <tr class="tr0">
-				<td>chk_status</td>
-                <td>CHECK ((((((status)::text = &#39;n&#39;::text) OR ((status)::text = &#39;w&#39;::text)) OR ((status)::text = &#39;d&#39;::text)) OR ((status)::text = &#39;t&#39;::text)))</td>
+				<td>import_tmp_status_check</td>
+                <td>CHECK ((((((status)::text = &#39;t&#39;::text) OR ((status)::text = &#39;d&#39;::text)) OR ((status)::text = &#39;w&#39;::text)) OR ((status)::text = &#39;n&#39;::text)))</td>
             </tr>
 			
 		</table>
@@ -4028,6 +3955,61 @@
 		
 		
 
+        <!-- Constraint List -->
+		
+
+        <!-- Foreign Key Discovery -->
+		
+
+	<!-- View Definition -->
+	
+
+	<!-- List off permissions -->
+	
+
+	<p>
+		<a href="#index">Index</a> -
+		<a href="#public.schema">Schema public</a>
+    </p>
+	
+        <hr>
+		<h2>Table:
+			<a name="public.table.ncount-qcode">ncount_qcode</a>
+		</h2>
+        
+
+
+        <table width="100%" cellspacing="0" cellpadding="3">
+                <caption>ncount_qcode Structure</caption>
+                <tr>
+                <th>F-Key</th>
+                <th>Name</th>
+                <th>Type</th>
+                <th>Description</th>
+                </tr>
+            
+            <tr class="tr0">
+				<td>
+                
+                </td>
+            	<td>count</td>
+            	<td>bigint</td>
+                <td><i>
+				
+
+				
+				
+				</i>
+				
+				</td>
+			 </tr>
+            
+        </table>
+
+		
+		
+		
+
         <!-- Constraint List -->
 		
 
@@ -4451,11 +4433,6 @@
             </tr>
 			
             <tr class="tr0">
-				<td>$1</td>
-                <td>CHECK ((p_end &gt;= p_start))</td>
-            </tr>
-			
-            <tr class="tr1">
 				<td>parm_periode_check</td>
                 <td>CHECK ((p_end &gt;= p_start))</td>
             </tr>
@@ -7392,7 +7369,6 @@ end ;
 declare
 	l_auto bool;
 begin
-
 	select fd_create_account into l_auto from fiche_def where fd_id=p_fd_id;
 	if l_auto is null then
 		l_auto:=false;
@@ -7536,25 +7512,18 @@ sName varchar;
 nJft_id attr_value.jft_id%type;
 begin
 	
-	-- if p_value empty
 	if length(trim(p_account)) != 0 then
-	-- does the account exist ?
 		select count(*) into nCount from tmp_pcmn where pcm_val=p_account;
 		if nCount = 0 then
-		-- retrieve name
 		select av_text into sName from 
 			attr_value join jnt_fic_att_value using (jft_id)
 			where
 			ad_id=1 and f_id=p_f_id;
-		-- get parent
 		nParent:=fiche_account_parent(p_f_id);
-		-- account doesn&#39;t exist we need to add id
 		insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_account,sName,nParent);
 		end if;		
 	end if;
-	-- we retrieve jft_id
 	select jft_id into njft_id from jnt_fic_att_value where f_id=p_f_id and ad_id=5;
-	-- we update the account
 	update attr_value set av_text=p_account where jft_id=njft_id;
 		
 return njft_id;
@@ -7619,18 +7588,15 @@ begin
 		where 
 	j_grpt=p_grpt
 	and j_debit=false;
-
 	select sum (j_montant) into amount_jrnx_debit 
 	from jrnx 
 		where 
 	j_grpt=p_grpt
 	and j_debit=true;
-
 	select jr_montant into amount_jrn 
 	from jrn
 	where
 	jr_grpt_id=p_grpt;
-
 	if ( amount_jrnx_debit != amount_jrnx_credit ) 
 		then
 		return abs(amount_jrnx_debit-amount_jrnx_credit);
@@ -7730,14 +7696,9 @@ declare
 	nCount_qcode integer;
 begin
 	sCode=trim(p_qcode);
-
-	-- if p_qcode is empty try to find one	
 	if length(sCode) = 0 or p_qcode is null then
-
 		select count(*) into nCount_qcode 	
 			from vw_poste_qcode where j_poste=p_poste;
-	-- if we find only one q_code for a accountancy account
-	-- then retrieve it
 		if nCount_qcode = 1 then
 			select j_qcode into sCode 
 			from vw_poste_qcode where j_poste=p_poste;
@@ -7772,7 +7733,6 @@ begin
 		p_tech_per,
 		sCode
 	);
-
 return;
 end;
 </pre>
@@ -7821,39 +7781,25 @@ end;
 	tText := replace(tText,&#39; &#39;,&#39;&#39;);
 	
 	loop
-		-- take the next sequence
 		select nextval(&#39;s_jnt_fic_att_value&#39;) into ns;
 		if length (tText) = 0 or tText is null then
 			tText := &#39;FID&#39;||ns;
 		end if;
-		-- av_text already used ?
 		select count(*) into nExist 
 			from jnt_fic_att_value join attr_value using (jft_id) 
 		where 
 			ad_id=23 and  av_text=upper(tText);
-
 		if nExist = 0 then
 			exit;
 		end if;
 		tText:=&#39;FID&#39;||ns;
 	end loop;
-	-- insert into table jnt_fic_att_value
 	insert into jnt_fic_att_value values (ns,nf_id,23);
-	-- insert value into attr_value
 	insert into attr_value values (ns,upper(tText));
 	return ns;
 	end;
 </pre>
 	
-		<hr>
-		<h2>Function: 
-			<a href="#public.schema"><a name="public.function.plpgsql-validator-oid">plpgsql_validator( oid )</a>
-		</h2>
-<h3>Returns: void</h3>
-<h3>Language: C</h3>
-        
-        <pre>plpgsql_validator</pre>
-	
 		<hr>
 		<h2>Function: 
 			<a href="#public.schema"><a name="public.function.proc-check-balance">proc_check_balance(  )</a>
@@ -7947,7 +7893,6 @@ begin
 		if ( length(modified.include_file) = 0 ) then
 			modified.include_file=null;
 		end if;
-
         return modified;
 end;
 </pre>
@@ -8035,7 +7980,6 @@ begin
 if length(trim(p_tva_label)) = 0 then
 	return 3;
 end if;
-
 if length(trim(p_tva_poste)) != 0 then
 	if position (&#39;,&#39; in p_tva_poste) = 0 then return 4; end if;
 	debit  = split_part(p_tva_poste,&#39;,&#39;,1);
diff --git a/html/admin/setup.php b/html/admin/setup.php
index 910a0a83e..898ff02e9 100644
--- a/html/admin/setup.php
+++ b/html/admin/setup.php
@@ -347,15 +347,16 @@ if ($account == 0 ) {
 // Add a french accountancy model
 //--
 $cn=DbConnect();
-$Res=CountSql($cn,"select * from modeledef where mod_id=2");
+
 // ----------------------------------------------------------------------
 // to be remove 
-if ( $Res == 1 )
- {
-  $cn=DbConnect();
-  ExecSql($cn,"drop database ".domaine."mod2;");
-  ExecSql($cn,"delete from modeledef where mod_id=2");
- }
+// $Res=CountSql($cn,"select * from modeledef where mod_id=2");
+// if ( $Res == 1 )
+//  {
+//   $cn=DbConnect();
+//   ExecSql($cn,"drop database ".domaine."mod2;");
+//   ExecSql($cn,"delete from modeledef where mod_id=2");
+//  }
 //----------------------------------------------------------------------
 $Res=CountSql($cn,"select * from modeledef where mod_id=2");
 if ( $Res == 0) {
@@ -483,6 +484,9 @@ if ( DEBUG=='false' ) ob_start();
   if ( GetVersion($db) == 20 ) { 
     ExecuteScript($db,'sql/patch/upgrade20.sql');
   } // version 
+  if ( GetVersion($db) == 21 ) { 
+    ExecuteScript($db,'sql/patch/upgrade21.sql');
+  } // version 
 
 if ( DEBUG == 'false') ob_end_clean();
  }//for
@@ -580,6 +584,9 @@ if (DEBUG == 'false' ) ob_start();
   if ( GetVersion($db) == 20 ) { 
     ExecuteScript($db,'sql/patch/upgrade20.sql');
   } // version 
+  if ( GetVersion($db) == 21 ) { 
+    ExecuteScript($db,'sql/patch/upgrade21.sql');
+  } // version 
 
 if ( DEBUG == 'false') ob_end_clean();
  }
diff --git a/html/index.php b/html/index.php
index 2f2d25beb..f17231ed1 100644
--- a/html/index.php
+++ b/html/index.php
@@ -76,7 +76,7 @@ BODY {
 <script src="scripts.js" type="text/javascript"></script>
 </head>
 <BODY onLoad="SetFocus(\'login\',0)">
-Version  dev-dany
+Version  2.1.0
 <div class="remark">
  <p class="gras">Il est conseill&eacute; de ne PAS utiliser Internet Explorer.
  </p><p>
diff --git a/include/action.inc.php b/include/action.inc.php
index a08bd6b74..c60406e80 100644
--- a/include/action.inc.php
+++ b/include/action.inc.php
@@ -165,6 +165,8 @@ if ( $sub_action=="update" )
       $act->qcode_dest=$_POST['qcode_dest'];
       $act->ag_title=$_POST['ag_title'];
       $act->d_id=(isset($_POST['d_id']))?$_POST['d_id']:0;
+      $act->ag_ref_ag_id=(isset($_POST['ag_ref_ag_id']))?$_POST['ag_ref_ag_id']:0;
+
       if ( $act->Update() == false ) {
 	$sub_action="detail";
       } 
diff --git a/include/class_action.php b/include/class_action.php
index ffa6f06e1..5bd3f5055 100644
--- a/include/class_action.php
+++ b/include/class_action.php
@@ -26,20 +26,22 @@ require_once("user_common.php");
 /*!\file 
  * \brief class_action for manipulating actions
  * action can be :
- * - an invoice
- * - a meeting
- * - an order
- * - a letter
- *
+ * <ul>
+ * <li>an invoice
+ * <li>a meeting
+ * <li>an order
+ * <li>a letter
+ *</ul>
  * The table document_type are the possible actions
  */
 /*!
  * \brief class_action for manipulating actions
  * action can be :
- * - a meeting
- * - an order
- * - a letter
- *
+ * <ul>
+ * <li> a meeting
+ * <li>an order
+ * <li>a letter
+ * </ul>
  * The table document_type are the possible actions
  */
 
@@ -578,6 +580,9 @@ class action
       $r.='<input type="hidden" name="d_id" value="'.$this->d_id.'">'; 
       // ag_comment must be saved in urlcode
       $r.='<input type="hidden" name="ag_comment" value="'.urlencode($this->ag_comment).'">';
+      // add hidden code for qcode_exp, qcode_dest
+      $r.='<input type="hidden" name="qcode_dest" value="'.$this->qcode_dest.'">';
+      $r.='<input type="hidden" name="qcode_exp" value="'.$this->qcode_exp.'">';
       // Value for the generated document
       if ( $this->gen == 'on' ) 
 	{
diff --git a/include/class_fiche.php b/include/class_fiche.php
index ce6300c74..186ab273b 100644
--- a/include/class_fiche.php
+++ b/include/class_fiche.php
@@ -487,7 +487,7 @@ class fiche {
 	  $value2=FormatString($value);
 
 	  $sql=sprintf("select attribut_insert(%d,%d,'%s')",
-		       $fiche_id,$id,$value2);
+		       $fiche_id,$id,trim($value2));
 	  ExecSql($this->cn,$sql);
 	}
       Commit($this->cn);
@@ -600,7 +600,7 @@ class fiche {
            // Normal traitement
            $value2=FormatString($value);
            $sql=sprintf("update attr_value set av_text='%s' where jft_id=%d",
-                        $value2,$jft_id);
+                        trim($value2),$jft_id);
            ExecSql($this->cn,$sql);
          }
        return;
diff --git a/include/user_action_ach.php b/include/user_action_ach.php
index c73dba3ad..3643fd425 100644
--- a/include/user_action_ach.php
+++ b/include/user_action_ach.php
@@ -29,6 +29,8 @@ require_once("class_widget.php");
 require_once("class_jrn.php");
 $cn=DbConnect($_SESSION['g_dossier']);
 
+$msg_tva='<i>Si le montant de TVA est &eacute;gal &agrave; 0, il sera automatiquement calcul&eacute;</i>';
+
 if ( ! isset ($_GET['action']) && ! isset ($_POST["action"]) ) {
   exit;
 
@@ -52,7 +54,8 @@ if ( $action == 'new' ) {
 	  $r=FormAchInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$HTTP_POST_VARS,$submit,false,$jrn->getDefLine());
 	  echo '<div class="u_redcontent">';
 	  echo $r;
-	  echo "<div><h4>On-line calculator</h4>".JS_CALC_LINE."<div>";
+	  echo $msg_tva;
+	  echo "<div>".JS_CALC_LINE."<div>";
 	  echo "</div>";
 
 
@@ -72,7 +75,9 @@ if ( $action == 'new' ) {
 			  $nb_number);
 	  echo '<div class="u_redcontent">';
 	  echo $r;
-	  echo "<div><h4>On-line calculator</h4>".JS_CALC_LINE."<div>";
+	  echo $msg_tva;
+
+	  echo "<div>".JS_CALC_LINE."<div>";
 	  echo "</div>";
 	}
 	// Correct it
@@ -87,7 +92,9 @@ if ( $action == 'new' ) {
 	  $r=FormAchInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$HTTP_POST_VARS,$submit,false,  $nb_number);
 	  echo '<div class="u_redcontent">';
 	  echo $r;
-	  echo "<div><h4>On-line calculator</h4>".JS_CALC_LINE."<div>";
+	  echo $msg_tva;
+
+	  echo "<div>".JS_CALC_LINE."<div>";
 	  echo "</div>";
 	  return;
 	}
@@ -111,7 +118,9 @@ if ( $action == 'new' ) {
 	}
 	echo '<div class="u_redcontent">';
 	echo $r;
-	echo "<div><h4>On-line calculator</h4>".JS_CALC_LINE."<div>";
+	echo $msg_tva;
+
+	echo "<div>".JS_CALC_LINE."<div>";
 	echo "</div>";
 	}
 	// Save the charge into database
diff --git a/include/user_common.php b/include/user_common.php
index 6025c704d..11a4bbee6 100644
--- a/include/user_common.php
+++ b/include/user_common.php
@@ -110,7 +110,7 @@ echo_debug('user_common.php',__LINE__,"ComputeTotalVat $a_fiche $a_quant $a_pric
 	if ( $a_vat_amount != null && 
 	     $a_vat_amount[$idx] != 0 )
 	  $vat_amount= $a_vat_amount[$idx] ;
-	
+	echo_debug('user_common',__LINE__,"vat amount = $vat_amount");
 	// only the deductible vat
 	if ( $all == false ) 
 	  {
@@ -124,7 +124,7 @@ echo_debug('user_common.php',__LINE__,"ComputeTotalVat $a_fiche $a_quant $a_pric
 		// if tva amount is given we do not compute it
 		if ( $a_vat_amount != null && 
 		     $a_vat_amount[$idx] != 0 )
-		  $nd_amount=round($a_price[$idx]*$a_quant[$idx]*$nd,2)+$a_vat_amount[$idx];
+		  $nd_amount=round($vat_amount*$nd,2);
 		else
 		  $nd_amount=round($a_price[$idx]*$a_vat['tva_rate']*$a_quant[$idx]*$nd,2);
 
@@ -145,7 +145,7 @@ echo_debug('user_common.php',__LINE__,"ComputeTotalVat $a_fiche $a_quant $a_pric
 		// if tva amount is given we do not compute it
 		if ( $a_vat_amount != null && 
 		     $a_vat_amount[$idx] != 0 )
-		  $nd_amount2=round($a_price[$idx]*$a_quant[$idx]*$nd,2)+$a_vat_amount[$idx];
+		  $nd_amount2=round($a_vat_amount[$idx]*$nd,2);
 		else
 		  $nd_amount2=round($a_price[$idx]*$a_vat['tva_rate']*$a_quant[$idx]*$nd,2);
 		
@@ -446,7 +446,7 @@ function ListJrn($p_cn,$p_jrn,$p_where="",$p_array=null,$p_value=0,$p_paid=0)
       {
 	$l_qcode=FormatString($l_qcode);
 	$sql.=$l_and."  jr_grpt_id in ( select j_grpt from 
-             jrnx where j_qcode = '$l_qcode')";
+             jrnx where trim(j_qcode) = upper(trim('$l_qcode')))";
 	$l_and=" and ";
       }
     // if not admin check filter 
diff --git a/include/user_form_ach.php b/include/user_form_ach.php
index 643899319..62ee62323 100644
--- a/include/user_form_ach.php
+++ b/include/user_form_ach.php
@@ -734,7 +734,8 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn)
     echo_debug('user_form_ach.php',__LINE__,"value non ded : $non_dedu");
     if ( $non_dedu != null && strlen(trim($non_dedu)) != 0)
       {
-	$nd_amount=round($a_quant[$i]*$a_price[$i]*$non_dedu,2);
+	// if vat if given we use it to compute ND
+	$nd_amount=($a_vat_amount[$i]==0)?round($a_quant[$i]*$a_price[$i]*$non_dedu,2):round($a_vat_amount*$non_dedu,2);
 
 	// save it
 	  echo_debug('user_form_ach.php',__LINE__,"InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,'6740',$e_date,round($nd_amount,2),$seq,$periode);");
@@ -748,8 +749,10 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn)
     echo_debug('user_form_ach.php',__LINE__,"TVA value non ded : $non_dedu");
     if ( $non_dedu != null && strlen(trim($non_dedu)) != 0)
       {
-	$lvat=ComputeVat($p_cn,	$a_good[$i],$a_quant[$i],$a_price[$i],
-			    $a_vat_good[$i],$a_vat_amount[$i] );
+	//We don't compute vat if it's given
+	$lvat=($a_vat_amount[$i]==0)?ComputeVat($p_cn,	$a_good[$i],$a_quant[$i],$a_price[$i],
+			    $a_vat_good[$i],$a_vat_amount[$i] ):$a_vat_amount[$i]
+;
 	$ded_vat=($lvat != null )?$lvat*$non_dedu:0;
 	$ded_vat=round($ded_vat,2);
 	$sum_tva_nd+=$ded_vat;
@@ -768,8 +771,9 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn)
     echo_debug('user_form_ach.php',__LINE__,"TVA value non ded : $non_dedu");
     if ( $non_dedu != null && strlen(trim($non_dedu)) != 0 )
 	{
-	  $lvat=ComputeVat($p_cn,	$a_good[$i],$a_quant[$i],$a_price[$i],
-			   $a_vat_good[$i],$a_vat_amount[$i] );
+	  //We don't compute vat if it's given
+	  $lvat=($a_vat_amount[$i]==0)?ComputeVat($p_cn,$a_good[$i],$a_quant[$i],$a_price[$i],  $a_vat_good[$i],$a_vat_amount[$i] ):$a_vat_amount[$i];
+
 	  $ded_vat=($lvat != null )?$lvat*$non_dedu:0;
 	  
 	  $sum_tva_nd+=round($ded_vat,2);

F-Key	Name	Type	Description
- -	j_deb	double precision	- - - - - - -
- -	jr_montant	double precision	- - - - - - -
- -	jr_grpt_id	integer	- - - - - - -