From MAILER-DAEMON Thu May 02 16:56:58 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UY0Yk-0002oG-0I
	for mharc-phpcompta-dev@gnu.org; Thu, 02 May 2013 16:56:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  2 May 2013 22:54:29 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1329152.1367528217.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5214 - phpcompta/tags/rel650/html/js
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 May 2013 20:56:57 -0000

Author: danydb
Date: 2013-05-02 22:54:28 +0200 (Thu, 02 May 2013)
New Revision: 5214

Modified:
   phpcompta/tags/rel650/html/js/sorttable.js
Log:
improve doc

Modified: phpcompta/tags/rel650/html/js/sorttable.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/html/js/sorttable.js	2013-04-24 21:28:32 UTC (r=
ev 5213)
+++ phpcompta/tags/rel650/html/js/sorttable.js	2013-05-02 20:54:28 UTC (r=
ev 5214)
@@ -22,6 +22,8 @@
 example:
 <th class=3D" sorttable_sorted_reverse">
 ....<span id=3D"sorttable_sortrevind">&nbsp;&blacktriangle;</span>
+<th class=3D" sorttable_sorted">
+....<span id=3D"sorttable_sortfwdind">&nbsp;&nbsp;&#x25BE;</span>
=20
 Sort on date
 <td sorttable_customkey=3D"<?=3D$row_bank['b_date']?>"> // format YYYYMM=
DD



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 02 17:21:02 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UY0w2-0000E1-Pk
	for mharc-phpcompta-dev@gnu.org; Thu, 02 May 2013 17:21:02 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  2 May 2013 23:18:36 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1329169.1367529662.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r489 - trunk/rapport_avance
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 May 2013 21:21:01 -0000

Author: danydb
Date: 2013-05-02 23:18:36 +0200 (Thu, 02 May 2013)
New Revision: 489

Modified:
   trunk/rapport_avance/ajax_declaration_display.php
   trunk/rapport_avance/raw.php
Log:
Export of the modele

Modified: trunk/rapport_avance/ajax_declaration_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_declaration_display.php	2013-04-30 22:05:26=
 UTC (rev 488)
+++ trunk/rapport_avance/ajax_declaration_display.php	2013-05-02 21:18:36=
 UTC (rev 489)
@@ -32,6 +32,8 @@
 $decl->d_id =3D $_GET['d_id'];
 $decl->load();
 $decl->display();
+echo $decl->anchor_document();
+echo '<hr>';
 $ref=3DHtmlInput::array_to_string(array('gDossier','plugin_code','d_id')=
,$_GET,'extension.raw.php?');
 $ref.=3D"&amp;act=3Dexport_decla_csv";
 echo HtmlInput::button_anchor("Export CSV",$ref,'export_id');

Modified: trunk/rapport_avance/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/raw.php	2013-04-30 22:05:26 UTC (rev 488)
+++ trunk/rapport_avance/raw.php	2013-05-02 21:18:36 UTC (rev 489)
@@ -81,4 +81,48 @@
=20
 	$cn->commit();
 }
+if ($act =3D=3D 'export_definition_modele')
+{
+	$decl =3D new RAPAV_Formulaire();
+	$decl->f_id =3D $id;
+	$decl->load();
+
+	$cn->start();
+	if ($decl->f_filename =3D=3D "")
+	{
+		ini_set('zlib.output_compression', 'Off');
+		header("Pragma: public");
+		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Cache-Control: must-revalidate");
+		header('Content-type: ' . 'text/plain');
+		header('Content-Disposition: attachment;filename=3Dvide.txt', FALSE);
+		header("Accept-Ranges: bytes");
+		echo "******************";
+		echo _("Fichier effac=C3=A9");
+		echo "******************";
+		exit();
+	}
+	$tmp =3D tempnam($_ENV['TMP'], 'document_');
+
+	$cn->lo_export($decl->f_lob, $tmp);
+
+	ini_set('zlib.output_compression', 'Off');
+	header("Pragma: public");
+	header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+	header("Cache-Control: must-revalidate");
+	header('Content-type: ' . $decl->f_mimetype);
+	header('Content-Disposition: attachment;filename=3D"' . $decl->f_filena=
me . '"', FALSE);
+	header("Accept-Ranges: bytes");
+	$file =3D fopen($tmp, 'r');
+	while (!feof($file))
+		echo fread($file, 8192);
+
+	fclose($file);
+
+	unlink($tmp);
+
+	$cn->commit();
+}
 ?>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 02 17:21:29 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UY0wS-0000GO-Uj
	for mharc-phpcompta-dev@gnu.org; Thu, 02 May 2013 17:21:28 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  2 May 2013 23:19:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1329170.1367529688.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r490 - trunk/rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 May 2013 21:21:27 -0000

Author: danydb
Date: 2013-05-02 23:18:59 +0200 (Thu, 02 May 2013)
New Revision: 490

Added:
   trunk/rapport_avance/include/formulaire_definition_show.inc.php
Log:
Forgotten file

Added: trunk/rapport_avance/include/formulaire_definition_show.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/formulaire_definition_show.inc.php	     =
                   (rev 0)
+++ trunk/rapport_avance/include/formulaire_definition_show.inc.php	2013-=
05-02 21:18:59 UTC (rev 490)
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief
+ *
+ */
+echo '<h1>D=C3=A9finition </h1>';
+$form =3D new RAPAV_formulaire($_REQUEST['f_id']);
+$form->load_definition();
+echo '<form method=3D"POST" enctype=3D"multipart/form-data" class=3D"pri=
nt">';
+$form->input_formulaire();
+$form->input_definition();
+echo '<p>';
+$delete =3D new ICheckBox('delete');
+echo "Cochez la case pour effacer ce formulaire " . $delete->input();
+echo '</p>';
+echo HtmlInput::submit('form_def_sub', 'Sauve');
+echo '</form>';
+?>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 02 17:22:30 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UY0xS-0000cB-Eq
	for mharc-phpcompta-dev@gnu.org; Thu, 02 May 2013 17:22:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  2 May 2013 23:20:02 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1329171.1367529749.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r491 - in trunk/rapport_avance: include
	include/template sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 May 2013 21:22:28 -0000

Author: danydb
Date: 2013-05-02 23:20:02 +0200 (Thu, 02 May 2013)
New Revision: 491

Modified:
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/include/class_rapav_formulaire.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/declaration.inc.php
   trunk/rapport_avance/include/formulaire.inc.php
   trunk/rapport_avance/include/historique.inc.php
   trunk/rapport_avance/include/template/declaration_display.php
   trunk/rapport_avance/include/template/formulaire_definition.php
   trunk/rapport_avance/include/template/formulaire_listing.php
   trunk/rapport_avance/sql/upgrade3.sql
Log:
Add a description
In history : show comment + sorttable table
Add notice when saving a definition

Modified: trunk/rapport_avance/include/class_rapav_declaration.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_declaration.php	2013-05-02 2=
1:18:59 UTC (rev 490)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-05-02 2=
1:20:02 UTC (rev 491)
@@ -227,7 +227,7 @@
 	{
 		global $cn,$g_parameter;
 		// Retrieve all the code + libelle
-		$array[]=3Darray('code'=3D>'PERIODE_DECLARATION','value'=3D>  format_d=
ate($this->d_end)." - ".format_date($this->d_start));
+		$array[]=3Darray('code'=3D>'PERIODE_DECLARATION','value'=3D>  format_d=
ate($this->d_start)." - ".format_date($this->d_end));
 		$array[]=3Darray('code'=3D>'TITRE','value'=3D>$this->d_title);
 		$array[]=3Darray('code'=3D>'DOSSIER','value'=3D>$cn->format_name($_REQ=
UEST['gDossier'],'dos'));
 		$array[]=3Darray('code'=3D>'NAME','value'=3D>$g_parameter->MY_NAME);
@@ -238,6 +238,7 @@
 		$array[]=3Darray('code'=3D>'PHONE','value'=3D>$g_parameter->MY_TEL);
 		$array[]=3Darray('code'=3D>'CEDEX','value'=3D>$g_parameter->MY_CP);
 		$array[]=3Darray('code'=3D>'FAX','value'=3D>$g_parameter->MY_FAX);
+		$array[]=3Darray('code'=3D>'NOTE','value'=3D>$this->d_description);
=20
 		// open the files
 		$ifile=3Dfopen($p_dir.'/'.$p_filename,'r');
@@ -267,9 +268,9 @@
 				{
 					$replace=3D'&lt;&lt;'.$value['code'].'&gt;&gt;';
 					$fmt_value=3D$value['value'];
+					$fmt_value=3Dstr_replace('&','&amp;',$fmt_value);
 					$fmt_value=3Dstr_replace('<','&lt;',$fmt_value);
 					$fmt_value=3Dstr_replace('>','&gt;',$fmt_value);
-					$fmt_value=3Dstr_replace('&','&amp;',$fmt_value);
 					$fmt_value=3Dstr_replace('"','&quot;',$fmt_value);
 					$fmt_value=3Dstr_replace("'",'&apos;',$fmt_value);
 				} else {

Modified: trunk/rapport_avance/include/class_rapav_formulaire.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_formulaire.php	2013-05-02 21=
:18:59 UTC (rev 490)
+++ trunk/rapport_avance/include/class_rapav_formulaire.php	2013-05-02 21=
:20:02 UTC (rev 491)
@@ -43,15 +43,24 @@
 	 *  show a list of all existing declaration
 	 * @global type $cn database connection
 	 */
-	static
-			function listing()
+	static	function listing()
 	{
 		global $cn;
-		$alist =3D $cn->get_array("select f_id,f_title,f_description from rapp=
ort_advanced.formulaire order by 2");
+		$alist =3D $cn->get_array("select f_id,f_title,f_description
+			from rapport_advanced.formulaire order by 2");
 		require 'template/formulaire_listing.php';
 	}
-
 	/**
+	 * Anchor to the template
+	 * @return html anchor string
+	 */
+	function anchor_document()
+	{
+		$url=3DHtmlInput::request_to_string(array('gDossier','ac','plugin_code=
'));
+		$url=3D'extension.raw.php'.$url.'&amp;act=3Dexport_definition_modele&a=
mp;id=3D'.$this->f_id;
+		return HtmlInput::anchor($this->f_filename,$url);
+	}
+	/**
 	 * Get data from database, from the table rapport_advanced.formulaire_p=
aram
 	 */
 	function load_definition()
@@ -122,7 +131,7 @@
 		for ($i =3D 0; $i < $nb_line ; $i++)
 		{
 			$form_param =3D new formulaire_param_sql($p_array['p_id'][$i]);
-			$form_param->p_code =3D $p_array['p_code'][$i];
+			$form_param->p_code =3D (trim($p_array['p_code'][$i])!=3D"")?$p_array=
['p_code'][$i]:'C'.$i.microtime();
 			$form_param->p_libelle =3D $p_array['p_libelle'][$i];
 			$form_param->p_type =3D $p_array['p_type'][$i];
 			$form_param->p_order =3D (isNumber($p_array['p_order'][$i]) =3D=3D 0)=
 ?  ($i+1) * 10 : $p_array['p_order'][$i];

Modified: trunk/rapport_avance/include/class_rapport_avance_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-05-02 =
21:18:59 UTC (rev 490)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-05-02 =
21:20:02 UTC (rev 491)
@@ -167,6 +167,7 @@
 		$this->name =3D array(
 			"d_id"=3D>"d_id",
 			"d_title"=3D>"d_title",
+			"d_description"=3D>'d_description',
 			"d_start"=3D>"d_start",
 			"d_end"=3D>"d_end",
 			"to_keep"=3D>"to_keep",
@@ -181,6 +182,7 @@
 		$this->type =3D array(
 				"d_id"=3D>"numeric",
 			"d_title"=3D>"text",
+			"d_description"=3D>'text',
 			"d_start"=3D>"date",
 			"d_end"=3D>"date",
 			"to_keep"=3D>"text",

Modified: trunk/rapport_avance/include/declaration.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/declaration.inc.php	2013-05-02 21:18:59 =
UTC (rev 490)
+++ trunk/rapport_avance/include/declaration.inc.php	2013-05-02 21:20:02 =
UTC (rev 491)
@@ -41,7 +41,7 @@
 	$decl->save();
 	$decl->generate_document();
 	$decl->display();
-	echo '<h2 class=3D"notice">'._(' Sauv=C3=A9 ').date('d-m-Y H:i').'</h2>=
';
+	echo '<p class=3D"notice">'._(' Sauv=C3=A9 ').date('d-m-Y H:i').'</p>';
=20
 	$ref_csv =3D HtmlInput::array_to_string(array('gDossier', 'plugin_code'=
, 'd_id'), $_REQUEST, 'extension.raw.php?');
 	$ref_csv.=3D"&amp;act=3Dexport_decla_csv";
@@ -61,6 +61,7 @@
 	}
 	else
 	{
+		$decl->d_description=3D$_GET['p_description'];
 		$decl->compute($_GET['p_form'], $_GET['p_start'], $_GET['p_end']);
 		echo '<form class=3D"print" method=3D"POST">';
 		echo HtmlInput::hidden('p_form', $_GET['p_form']);
@@ -75,6 +76,8 @@
 $hidden =3D HtmlInput::array_to_hidden(array('gDossier', 'ac', 'plugin_c=
ode', 'sa'), $_GET);
 $select =3D new ISelect('p_form');
 $select->value =3D $cn->make_array('select f_id,f_title from rapport_adv=
anced.formulaire order by 2');
+$description=3Dnew IText('p_description');
+$description->size=3D80;
 ?>
 <form id=3D"declaration_form_id" method=3D"GET" onsubmit=3D"return valid=
ate()">
 	<?=3D $hidden?>
@@ -86,6 +89,10 @@
 			<td>
 				<?=3D $select->input()?>
 			</td>
+			</tr>
+	</table>
+	<p> Description <?=3D$description->input()?>
+	<table>
 		<tr>
 			<td>
 				Date de d=C3=A9but
@@ -103,11 +110,12 @@
 			</td>
 		</tr>
 	</table>
+	</p>
 	<?=3D HtmlInput::submit('compute', 'G=C3=A9n=C3=A9rer')?>
 </form>
 <script charset=3D"UTF8" lang=3D"javascript">
 	function validate() {
-		if ( check_date_id('<?=3D $date_start->id?>') =3D=3D false ) {alert('D=
ate de d=C3=A9but incorrecte');return false;}
-		if ( check_date_id('<?=3D $date_end->id?>') =3D=3D false ) {alert('Dat=
e de fin incorrecte');return false;}
+		if ( check_date_id('<?=3D $date_start->id?>') =3D=3D false ) {alert('D=
ate de d=C3=A9but incorrecte');$('<?=3D $date_start->id?>').style.borderC=
olor=3D'red';$('<?=3D $date_start->id?>').style.borderWidth=3D2;return fa=
lse;}
+		if ( check_date_id('<?=3D $date_end->id?>') =3D=3D false ) {alert('Dat=
e de fin incorrecte');$('<?=3D $date_end->id?>').style.borderColor=3D'red=
';$('<?=3D $date_end->id?>').style.borderWidth=3D2;return false;}
 	}
 </script>
\ No newline at end of file

Modified: trunk/rapport_avance/include/formulaire.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/formulaire.inc.php	2013-05-02 21:18:59 U=
TC (rev 490)
+++ trunk/rapport_avance/include/formulaire.inc.php	2013-05-02 21:20:02 U=
TC (rev 491)
@@ -36,8 +36,10 @@
 	}
 	else
 	{
+		echo '<p class=3D"notice">'._(' derni=C3=A8re sauvegarde ').date('d-m-=
Y H:i').'</p>';
 		RAPAV_formulaire::save_definition($_POST);
 		require_once 'formulaire_definition_show.inc.php';
+		echo '<p class=3D"notice">'._(' derni=C3=A8re sauvegarde ').date('d-m-=
Y H:i').'</p>';
 		exit();
 	}
 }

Modified: trunk/rapport_avance/include/historique.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/historique.inc.php	2013-05-02 21:18:59 U=
TC (rev 490)
+++ trunk/rapport_avance/include/historique.inc.php	2013-05-02 21:20:02 U=
TC (rev 491)
@@ -29,7 +29,11 @@
 global $cn;
 $cn->exec_sql("delete from rapport_advanced.declaration where to_keep=3D=
'N' and d_generated < now() - interval '5 hours'");
 $data=3D$cn->get_array("select d_id,d_title,
-		d_start,d_end
+		d_start,d_end,to_char(d_generated,'DD/MM/YY HH24:MI') as fmt_generated=
,
+		d_description,d_generated,
+		to_char(d_start,'YYMMDD') as fmt_start,
+		to_char(d_end,'YYMMDD') as fmt_end,
+		to_char(d_end,'YYMMDDHH24MI') as fmt_order_generated
 		from rapport_advanced.declaration
 		where to_keep=3D'Y'
 		order by d_start,d_title");
@@ -37,8 +41,9 @@
 <div id=3D"declaration_list_div">
 <table class=3D"sortable">
 	<tr>
-		<th>
-			Date d=C3=A9but
+		<th class=3D" sorttable_sorted_reverse">
+			Date d=C3=A9but <?php echo HtmlInput::infobulle(17);?>
+			<span id=3D"sorttable_sortrevind">&nbsp;&blacktriangle;</span>
 		</th>
 		<th>
 			Date Fin
@@ -47,6 +52,12 @@
 			D=C3=A9claration
 		</th>
 		<th>
+			Description
+		</th>
+		<th>
+			Date g=C3=A9n=C3=A9ration
+		</th>
+		<th>
=20
 		</th>
 		<th>
@@ -55,19 +66,26 @@
 	</tr>
 	<? for ($i=3D0;$i<count($data);$i++) :?>
 	<tr id=3D"tr_<?=3D$data[$i]['d_id']?>">
-		<td>
+		<td sortable_customkey=3D"<?=3D$data[$i]['fmt_start']?>">
+
 			<?=3Dformat_date($data[$i]['d_start'])?>
 		</td>
-		<td>
+		<td sortable_customkey=3D"<?=3D$data[$i]['fmt_end']?>">
 			<?=3Dformat_date($data[$i]['d_end'])?>
 		</td>
 		<td>
 			<?=3Dh($data[$i]['d_title'])?>
 		</td>
-		<td id=3D"mod_<?=3D$data[$i]['d_id']?>">
+		<td>
+			<?=3Dh($data[$i]['d_description'])?>
+		</td>
+		<td sortable_customkey=3D"<?=3D$data[$i]['fmt_order_generated']?>">
+			<?=3Dh($data[$i]['fmt_generated'])?>
+		</td>
+		<td  id=3D"mod_<?=3D$data[$i]['d_id']?>">
 			<?=3DHtmlInput::anchor("Afficher","",sprintf("onclick=3D\"rapav_decla=
ration_display('%s','%s','%s','%s')\"",$_REQUEST['plugin_code'],$_REQUEST=
['ac'],$_REQUEST['gDossier'],$data[$i]['d_id']))?>
 		</td>
-		<td id=3D"del_<?=3D$data[$i]['d_id']?>">
+		<td  id=3D"del_<?=3D$data[$i]['d_id']?>">
 			<?=3DHtmlInput::anchor("Efface","",sprintf("onclick=3D\"rapav_declara=
tion_delete('%s','%s','%s','%s')\"",$_REQUEST['plugin_code'],$_REQUEST['a=
c'],$_REQUEST['gDossier'],$data[$i]['d_id']))?>
 		</td>
 	</tr>

Modified: trunk/rapport_avance/include/template/declaration_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/declaration_display.php	2013-05=
-02 21:18:59 UTC (rev 490)
+++ trunk/rapport_avance/include/template/declaration_display.php	2013-05=
-02 21:20:02 UTC (rev 491)
@@ -29,6 +29,9 @@
 ?>
 <h1><?=3D$this->d_title?></h1>
 <h2> Du <?=3D$this->d_start?> au <?=3D$this->d_end?></h2>
+<p>
+	Note : <?=3Dh($this->d_description)?>
+</p>
 <?
 	if ( empty($array) ) { echo 'Aucune donn=C3=A9e'; exit();}
=20
@@ -57,7 +60,7 @@
 		echo '<p>'.$row['dr_libelle'].'</p>';
 		break;
 	case 8:
-		echo '<span class=3D"notice" > '.$row['dr_libelle'].'</span>';
+		echo '<p class=3D"notice" > '.$row['dr_libelle'].'</p>';
 		break;
=20
 }

Modified: trunk/rapport_avance/include/template/formulaire_definition.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/formulaire_definition.php	2013-=
05-02 21:18:59 UTC (rev 490)
+++ trunk/rapport_avance/include/template/formulaire_definition.php	2013-=
05-02 21:20:02 UTC (rev 491)
@@ -129,7 +129,7 @@
 						$_REQUEST['gDossier'],
 						$this->f_id
 				));
-		echo '<span id=3D"rapav_template"> '.$this->f_filename.'</span>';
+		echo '<span id=3D"rapav_template"> '.$this->anchor_document().'</span>=
';
 		echo '<span id=3D"rapav_template_ctl"> '.$remove_doc.'</span>';
 		echo '<span id=3D"rapav_new_file" style=3D"display:none"> '.$file->inp=
ut().'</span>';
 	}

Modified: trunk/rapport_avance/include/template/formulaire_listing.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/formulaire_listing.php	2013-05-=
02 21:18:59 UTC (rev 490)
+++ trunk/rapport_avance/include/template/formulaire_listing.php	2013-05-=
02 21:20:02 UTC (rev 491)
@@ -32,6 +32,7 @@
 	<tr>
 		<th>Nom du formulaire</th>
 		<th>Description</th>
+
 		<th></th>
 		<th></th>
 		<th></th>

Modified: trunk/rapport_avance/sql/upgrade3.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/sql/upgrade3.sql	2013-05-02 21:18:59 UTC (rev 49=
0)
+++ trunk/rapport_avance/sql/upgrade3.sql	2013-05-02 21:20:02 UTC (rev 49=
1)
@@ -30,3 +30,4 @@
=20
 ALTER TABLE rapport_advanced.declaration ADD COLUMN d_size bigint;
 COMMENT ON COLUMN rapport_advanced.declaration.d_size IS 'Size of the fi=
le';
+



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 03 17:59:07 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UYO0R-0006J8-Hn
	for mharc-phpcompta-dev@gnu.org; Fri, 03 May 2013 17:59:07 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  3 May 2013 23:56:43 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1331456.1367618346.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5215 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 May 2013 21:59:06 -0000

Author: danydb
Date: 2013-05-03 23:56:40 +0200 (Fri, 03 May 2013)
New Revision: 5215

Modified:
   phpcompta/tags/rel650/include/class_document.php
Log:
#0000822: G?\195?\169n?\195?\169ration document : changer le type de cell=
ule

Attention probl?\195?\168me si on a utiliser =3D devant le tag pour force=
r le type num?\195?\169rique

Modified: phpcompta/tags/rel650/include/class_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_document.php	2013-05-02 20:54:28 =
UTC (rev 5214)
+++ phpcompta/tags/rel650/include/class_document.php	2013-05-03 21:56:40 =
UTC (rev 5215)
@@ -235,13 +235,23 @@
=20
 			$to_remove=3D$pattern;
 			// we remove the < and > from the pattern
-			$pattern=3Dstr_replace($lt,'',$pattern);
-			$pattern=3Dstr_replace($gt,'',$pattern);
+			$tag=3Dstr_replace($lt,'',$pattern);
+			$tag=3Dstr_replace($gt,'',$tag);
=20
=20
 			// if the pattern if found we replace it
-			$value=3D$this->Replace($pattern,$p_array);
+			$value=3D$this->Replace($tag,$p_array);
 			if ( strpos($value,'ERROR') !=3D false ) 		  $value=3D"";
+                        /*
+                         * Change type of cell to numeric
+                         *  allow numeric cel in ODT for the formatting =
and formula=20
+                         */
+			if ( is_numeric($value) && $p_type=3D=3D'OOo')
+			  {
+			    $searched=3D'/office:value-type=3D"string"><text:p>'.$pattern.'/'=
;
+			    $replaced=3D'office:value-type=3D"float" office:value=3D"'.$value=
.'"><text:p>'.$pattern;
+			    $buffer=3Dpreg_replace($searched, $replaced, $buffer,1);
+			  }
 			// replace into the $buffer
 			// take the position in the buffer
 			$pos=3Dstrpos($buffer,$to_remove);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 03 18:35:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UYOZE-0002Ot-7y
	for mharc-phpcompta-dev@gnu.org; Fri, 03 May 2013 18:35:04 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  4 May 2013 00:31:42 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1331495.1367620503.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5216 - in phpcompta/trunk: . contrib/document_test
	doc doc/developper html html/admin html/admin/sql/mod2
	html/admin/sql/patch html/document/fr_be html/js html/js/lang
	include include/template include/tfpdf sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 May 2013 22:35:03 -0000

Author: danydb
Date: 2013-05-04 00:31:33 +0200 (Sat, 04 May 2013)
New Revision: 5216

Added:
   phpcompta/trunk/html/admin/sql/patch/upgrade103.sql
   phpcompta/trunk/html/admin/sql/patch/upgrade104.sql
   phpcompta/trunk/html/admin/sql/patch/upgrade105.sql
   phpcompta/trunk/html/js/nicEdit.js
   phpcompta/trunk/html/js/nicEditorIcons.gif
   phpcompta/trunk/html/js/sorttable.js
   phpcompta/trunk/include/ajax_boxcard_search.php
   phpcompta/trunk/include/ajax_view_action.php
   phpcompta/trunk/include/template/operation_detail_ach.php
   phpcompta/trunk/include/template/operation_detail_fin.php
   phpcompta/trunk/include/template/operation_detail_misc.php
   phpcompta/trunk/include/template/operation_detail_ven.php
Modified:
   phpcompta/trunk/
   phpcompta/trunk/contrib/document_test/
   phpcompta/trunk/contrib/document_test/all_tags.odt
   phpcompta/trunk/doc/developper/Doxyfile
   phpcompta/trunk/doc/manuel-fr.odt
   phpcompta/trunk/doc/manuel-fr.pdf
   phpcompta/trunk/html/admin/setup.php
   phpcompta/trunk/html/admin/sql/mod2/data.sql
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/html/ajax_history.php
   phpcompta/trunk/html/ajax_ledger.php
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/ajax_poste.php
   phpcompta/trunk/html/do.php
   phpcompta/trunk/html/document/fr_be/bnb.form
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/js/accounting_item.js
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/html/js/card.js
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/html/js/lang/calendar-al.js
   phpcompta/trunk/html/js/lang/calendar-he-utf8.js
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/show_document.php
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-epad.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style-print.css
   phpcompta/trunk/html/style-test.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/action.common.inc.php
   phpcompta/trunk/include/action.inc.php
   phpcompta/trunk/include/ajax_add_menu.php
   phpcompta/trunk/include/ajax_get_menu_detail.php
   phpcompta/trunk/include/ajax_get_profile.php
   phpcompta/trunk/include/ajax_mod_document.php
   phpcompta/trunk/include/ajax_mod_periode.php
   phpcompta/trunk/include/ajax_mod_predf_op.php
   phpcompta/trunk/include/category_followup.inc.php
   phpcompta/trunk/include/class_acc_account_ledger.php
   phpcompta/trunk/include/class_acc_balance.php
   phpcompta/trunk/include/class_acc_compute.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_acc_operation.php
   phpcompta/trunk/include/class_acc_payment.php
   phpcompta/trunk/include/class_anticipation.php
   phpcompta/trunk/include/class_calendar.php
   phpcompta/trunk/include/class_database.php
   phpcompta/trunk/include/class_document.php
   phpcompta/trunk/include/class_document_type.php
   phpcompta/trunk/include/class_exercice.php
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/class_fiche_def.php
   phpcompta/trunk/include/class_follow_up.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_iaction.php
   phpcompta/trunk/include/class_ianccard.php
   phpcompta/trunk/include/class_ibutton.php
   phpcompta/trunk/include/class_icard.php
   phpcompta/trunk/include/class_icheckbox.php
   phpcompta/trunk/include/class_iconcerned.php
   phpcompta/trunk/include/class_idate.php
   phpcompta/trunk/include/class_ihidden.php
   phpcompta/trunk/include/class_impress.php
   phpcompta/trunk/include/class_inum.php
   phpcompta/trunk/include/class_iperiod.php
   phpcompta/trunk/include/class_iposte.php
   phpcompta/trunk/include/class_iradio.php
   phpcompta/trunk/include/class_irelated_action.php
   phpcompta/trunk/include/class_iselect.php
   phpcompta/trunk/include/class_itext.php
   phpcompta/trunk/include/class_itextarea.php
   phpcompta/trunk/include/class_itva_popup.php
   phpcompta/trunk/include/class_lettering.php
   phpcompta/trunk/include/class_periode.php
   phpcompta/trunk/include/class_phpcompta_sql.php
   phpcompta/trunk/include/class_print_ledger_fin.php
   phpcompta/trunk/include/class_print_ledger_simple.php
   phpcompta/trunk/include/class_print_ledger_simple_without_vat.php
   phpcompta/trunk/include/class_profile_menu.php
   phpcompta/trunk/include/class_tool_uos.php
   phpcompta/trunk/include/class_user.php
   phpcompta/trunk/include/client.inc.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/compta_fin.inc.php
   phpcompta/trunk/include/compta_fin_rec.inc.php
   phpcompta/trunk/include/compta_fin_saldo.inc.php
   phpcompta/trunk/include/compta_ods.inc.php
   phpcompta/trunk/include/compta_ven.inc.php
   phpcompta/trunk/include/config_file.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/contact.inc.php
   phpcompta/trunk/include/doc_state.inc.php
   phpcompta/trunk/include/dossier.inc.php
   phpcompta/trunk/include/export_balance_pdf.php
   phpcompta/trunk/include/export_fiche_balance_csv.php
   phpcompta/trunk/include/export_fiche_balance_pdf.php
   phpcompta/trunk/include/export_fiche_detail_csv.php
   phpcompta/trunk/include/export_fiche_detail_pdf.php
   phpcompta/trunk/include/export_fiche_pdf.php
   phpcompta/trunk/include/export_histo_csv.php
   phpcompta/trunk/include/export_poste_detail_csv.php
   phpcompta/trunk/include/export_poste_detail_pdf.php
   phpcompta/trunk/include/fiche.inc.php
   phpcompta/trunk/include/forecast.inc.php
   phpcompta/trunk/include/function_javascript.php
   phpcompta/trunk/include/history_operation.inc.php
   phpcompta/trunk/include/impress_gl_comptes.inc.php
   phpcompta/trunk/include/impress_jrn.inc.php
   phpcompta/trunk/include/impress_poste.inc.php
   phpcompta/trunk/include/lettering.account.inc.php
   phpcompta/trunk/include/lettering.card.inc.php
   phpcompta/trunk/include/menu.inc.php
   phpcompta/trunk/include/modele.inc.php
   phpcompta/trunk/include/opening.inc.php
   phpcompta/trunk/include/operation_ods_confirm.inc.php
   phpcompta/trunk/include/operation_ods_new.inc.php
   phpcompta/trunk/include/param_pcmn.inc.php
   phpcompta/trunk/include/param_sec.inc.php
   phpcompta/trunk/include/pref.inc.php
   phpcompta/trunk/include/profile.inc.php
   phpcompta/trunk/include/search.inc.php
   phpcompta/trunk/include/template/action_search.php
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/include/template/detail-action.php
   phpcompta/trunk/include/template/document_mod_change.php
   phpcompta/trunk/include/template/fiche_list.php
   phpcompta/trunk/include/template/form_ledger_detail.php
   phpcompta/trunk/include/template/form_ledger_fin.php
   phpcompta/trunk/include/template/history_top.php
   phpcompta/trunk/include/template/ledger_detail_ach.php
   phpcompta/trunk/include/template/ledger_detail_bottom.php
   phpcompta/trunk/include/template/ledger_detail_fin.php
   phpcompta/trunk/include/template/ledger_detail_misc.php
   phpcompta/trunk/include/template/ledger_detail_top.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
   phpcompta/trunk/include/template/letter_all.php
   phpcompta/trunk/include/template/letter_prop.php
   phpcompta/trunk/include/template/module.php
   phpcompta/trunk/include/template/periode_add_exercice.php
   phpcompta/trunk/include/template/search_top.php
   phpcompta/trunk/include/template/user_sec_profile.php
   phpcompta/trunk/include/tfpdf/tfpdf.php
   phpcompta/trunk/include/tva.inc.php
   phpcompta/trunk/include/user_detail.inc.php
   phpcompta/trunk/include/user_menu.php
   phpcompta/trunk/sql/upgrade.sql
Log:
Merged revisions 5056,5058-5206,5209-5215 via svnmerge from=20
svn+ssh://danydb@svn/svn/phpcompta/tags/rel650

........
  r5056 | danydb | 2012-06-30 14:39:28 +0200 (Sat, 30 Jun 2012) | 2 lines
 =20
  0000666: Limiter dans le tableau accueil, le calendrier ?\195?\160 exer=
cice courant=20
  0000667: DASHBOAD : agrandir les ?\195?\169l?\195?\169ments
........
  r5058 | danydb | 2012-06-30 18:43:34 +0200 (Sat, 30 Jun 2012) | 6 lines
 =20
  -----------------------------------------------------------------------=
-
  r5057 | danydb | 2012-06-30 18:40:12 +0200 (Sat, 30 Jun 2012) | 1 line
 =20
  bug follow_up::get_late
  -----------------------------------------------------------------------=
-
........
  r5059 | danydb | 2012-06-30 18:57:18 +0200 (Sat, 30 Jun 2012) | 1 line
 =20
  bug follow_up::get_late
........
  r5060 | danydb | 2012-06-30 18:58:55 +0200 (Sat, 30 Jun 2012) | 1 line
 =20
  bug follow_up::get_late
........
  r5061 | danydb | 2012-06-30 19:03:29 +0200 (Sat, 30 Jun 2012) | 1 line
 =20
  bug follow_up::get_late
........
  r5062 | danydb | 2012-06-30 19:36:51 +0200 (Sat, 30 Jun 2012) | 1 line
 =20
  bug follow_up::get_late
........
  r5063 | danydb | 2012-07-01 17:42:31 +0200 (Sun, 01 Jul 2012) | 1 line
 =20
  correct check_formula
........
  r5064 | danydb | 2012-07-03 00:56:38 +0200 (Tue, 03 Jul 2012) | 1 line
 =20
  Due to rewrite of parse formula, formula are not evaluated properly
........
  r5065 | danydb | 2012-07-08 20:58:45 +0200 (Sun, 08 Jul 2012) | 1 line
 =20
  Bug cannot create a new profile due a javascript error
........
  r5066 | danydb | 2012-07-09 18:43:20 +0200 (Mon, 09 Jul 2012) | 1 line
 =20
  0000674: Deux actions-gestion ne peuvent avoir le m?\195?\170me num?\19=
5?\169ro de pi?\195?\168ce
........
  r5067 | danydb | 2012-07-10 12:34:55 +0200 (Tue, 10 Jul 2012) | 1 line
 =20
  duplicate Ref=20
........
  r5068 | danydb | 2012-07-15 11:14:27 +0200 (Sun, 15 Jul 2012) | 2 lines
 =20
  New function : select exercice with end & start date
........
  r5069 | danydb | 2012-07-15 11:15:05 +0200 (Sun, 15 Jul 2012) | 2 lines
 =20
  Javascript var ask_global to reload window if it is <> 0
........
  r5070 | danydb | 2012-07-16 01:10:32 +0200 (Mon, 16 Jul 2012) | 1 line
 =20
  Fix bug in tool_uos
........
  r5071 | danydb | 2012-07-19 02:22:15 +0200 (Thu, 19 Jul 2012) | 1 line
 =20
  Improve printing of action - gestion
........
  r5072 | danydb | 2012-07-19 12:50:48 +0200 (Thu, 19 Jul 2012) | 2 lines
 =20
  0000672: Am?\195?\169lioration apparence
........
  r5073 | danydb | 2012-07-19 12:51:27 +0200 (Thu, 19 Jul 2012) | 2 lines
 =20
  Enl?\195?\168ve background blanc pour les notices
........
  r5074 | danydb | 2012-07-19 13:49:10 +0200 (Thu, 19 Jul 2012) | 1 line
 =20
  Improve printing of action - gestion
........
  r5075 | danydb | 2012-07-19 16:31:11 +0200 (Thu, 19 Jul 2012) | 1 line
 =20
  Add script for Javascript sort of table
........
  r5076 | danydb | 2012-07-19 17:52:24 +0200 (Thu, 19 Jul 2012) | 1 line
 =20
  Add script for Javascript sort of table
........
  r5077 | danydb | 2012-07-19 18:13:18 +0200 (Thu, 19 Jul 2012) | 1 line
 =20
  Add script for Javascript sort of table for reconciliation bank
........
  r5078 | danydb | 2012-07-20 14:55:50 +0200 (Fri, 20 Jul 2012) | 1 line
 =20
  Show default sorted column=20
........
  r5079 | danydb | 2012-07-20 14:57:16 +0200 (Fri, 20 Jul 2012) | 1 line
 =20
  add documentation
........
  r5080 | danydb | 2012-07-26 17:31:54 +0200 (Thu, 26 Jul 2012) | 1 line
 =20
  Add ID=20
........
  r5081 | danydb | 2012-07-29 13:56:59 +0200 (Sun, 29 Jul 2012) | 4 lines
 =20
  add new function=20
  default_value_get
  default_value_post
  default_value_request
........
  r5082 | danydb | 2012-07-29 14:14:51 +0200 (Sun, 29 Jul 2012) | 1 line
 =20
  improve documentation
........
  r5083 | danydb | 2012-07-29 14:50:29 +0200 (Sun, 29 Jul 2012) | 1 line
 =20
  Add constant for year
........
  r5084 | danydb | 2012-07-29 15:08:11 +0200 (Sun, 29 Jul 2012) | 1 line
 =20
  Message for exercice
........
  r5085 | danydb | 2012-07-29 15:08:56 +0200 (Sun, 29 Jul 2012) | 1 line
 =20
  New constant for date range
........
  r5086 | danydb | 2012-07-30 20:13:30 +0200 (Mon, 30 Jul 2012) | 1 line
 =20
  cosmetic
........
  r5087 | danydb | 2012-07-30 20:38:17 +0200 (Mon, 30 Jul 2012) | 1 line
 =20
  cosmetic
........
  r5088 | danydb | 2012-07-30 21:28:46 +0200 (Mon, 30 Jul 2012) | 1 line
 =20
  define max_card_search
........
  r5089 | danydb | 2012-07-30 21:36:55 +0200 (Mon, 30 Jul 2012) | 1 line
 =20
  0000695: ajout d'un bouton pour chercher une fiche
........
  r5090 | danydb | 2012-07-30 21:42:06 +0200 (Mon, 30 Jul 2012) | 1 line
 =20
  Am?\195?\169lioration recherche
........
  r5091 | danydb | 2012-07-30 21:44:23 +0200 (Mon, 30 Jul 2012) | 1 line
 =20
  Am?\195?\169lioration recherche
........
  r5092 | danydb | 2012-08-23 20:29:52 +0200 (Thu, 23 Aug 2012) | 1 line
 =20
  add a field hidden
........
  r5093 | danydb | 2012-08-23 22:52:06 +0200 (Thu, 23 Aug 2012) | 2 lines
 =20
  0000705: Perte info lettrage lors de l'export .csv
  Nom de fichier comprennent la date et le poste comptable
........
  r5094 | danydb | 2012-08-23 23:00:58 +0200 (Thu, 23 Aug 2012) | 1 line
 =20
  0000700: CARD : historique, Dans le PDF, il manque le quick code et dan=
s le CSV, il manque le nom
........
  r5095 | danydb | 2012-08-23 23:06:00 +0200 (Thu, 23 Aug 2012) | 1 line
 =20
  recherche aussi sur quick-code
........
  r5096 | danydb | 2012-08-23 23:20:32 +0200 (Thu, 23 Aug 2012) | 1 line
 =20
  #699 CARD : liste des fiches=20
........
  r5097 | danydb | 2012-08-24 22:27:20 +0200 (Fri, 24 Aug 2012) | 1 line
 =20
  replace ob_clean by ob_end_clean
........
  r5098 | danydb | 2012-09-04 19:55:56 +0200 (Tue, 04 Sep 2012) | 1 line
 =20
  ajout ag_ref dans action aujourd'hui et action en retard
........
  r5099 | danydb | 2012-09-06 18:47:29 +0200 (Thu, 06 Sep 2012) | 1 line
 =20
  0000721: Nouveaux tag pour les stocks dans g?\195?\169n?\195?\169ration=
 de documents
........
  r5100 | danydb | 2012-09-12 23:05:12 +0200 (Wed, 12 Sep 2012) | 1 line
 =20
  fix bug : when a value is empty then value is n ull
........
  r5101 | danydb | 2012-09-15 00:30:02 +0200 (Sat, 15 Sep 2012) | 1 line
 =20
  fix : missing closing tag </a>
........
  r5102 | danydb | 2012-09-15 15:22:08 +0200 (Sat, 15 Sep 2012) | 1 line
 =20
  Show type of menu
........
  r5103 | danydb | 2012-09-15 17:39:55 +0200 (Sat, 15 Sep 2012) | 1 line
 =20
  Improve add menu printing
........
  r5104 | danydb | 2012-09-15 17:48:42 +0200 (Sat, 15 Sep 2012) | 1 line
 =20
  Improve the profile configuration
........
  r5105 | danydb | 2012-09-16 03:01:44 +0200 (Sun, 16 Sep 2012) | 1 line
 =20
  Improve the style sheet with hx.title
........
  r5106 | danydb | 2012-09-16 18:40:59 +0200 (Sun, 16 Sep 2012) | 1 line
 =20
  bug : Impossible d'avoir impression GRAND LIVRE Pour compte non sold?\1=
95?\169
........
  r5107 | danydb | 2012-09-16 18:53:59 +0200 (Sun, 16 Sep 2012) | 1 line
 =20
  Am?\195?\169liore apparence calculatrice
........
  r5108 | danydb | 2012-09-17 20:28:04 +0200 (Mon, 17 Sep 2012) | 1 line
 =20
  When adding a menu it cannot depend on itself
........
  r5109 | danydb | 2012-09-17 20:29:23 +0200 (Mon, 17 Sep 2012) | 1 line
 =20
  When adding a menu it cannot depend on itself (update)
........
  r5110 | danydb | 2012-09-17 20:46:17 +0200 (Mon, 17 Sep 2012) | 1 line
 =20
  Show default menu
........
  r5111 | danydb | 2012-09-17 20:55:13 +0200 (Mon, 17 Sep 2012) | 1 line
 =20
  bug : show default module
........
  r5112 | danydb | 2012-09-17 20:57:00 +0200 (Mon, 17 Sep 2012) | 1 line
 =20
  bug : show default module, otherwise menu
........
  r5113 | danydb | 2012-09-17 21:07:25 +0200 (Mon, 17 Sep 2012) | 1 line
 =20
  Default module otherwise try to find default menu if several results th=
en returns the first one
........
  r5114 | danydb | 2012-09-17 21:13:43 +0200 (Mon, 17 Sep 2012) | 1 line
 =20
  Fix bug when clicking several times on search_poste
........
  r5115 | danydb | 2012-09-18 23:37:02 +0200 (Tue, 18 Sep 2012) | 1 line
 =20
  probl?\195?\168me quand utilisateur est administrateur global, impossib=
le de voir les postes comptables
........
  r5116 | danydb | 2012-09-18 23:46:37 +0200 (Tue, 18 Sep 2012) | 1 line
 =20
  Improve the style sheet with hx.title
........
  r5117 | danydb | 2012-09-18 23:47:27 +0200 (Tue, 18 Sep 2012) | 1 line
 =20
  improve html widget with un ID
........
  r5118 | danydb | 2012-09-19 22:55:43 +0200 (Wed, 19 Sep 2012) | 1 line
 =20
  Bug locale must be in uppercase=20
........
  r5119 | danydb | 2012-09-29 23:28:46 +0200 (Sat, 29 Sep 2012) | 1 line
 =20
  add the javascript function check_date and check_date_id
........
  r5120 | danydb | 2012-09-30 00:04:17 +0200 (Sun, 30 Sep 2012) | 1 line
 =20
  correct javascript function check_date_id
........
  r5121 | danydb | 2012-10-01 19:57:15 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  0000736: Totaux dans ?\195?\169cran
........
  r5122 | danydb | 2012-10-01 20:47:26 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  0000733: Impression op?\195?\169ration depuis POP ME OUT
........
  r5123 | danydb | 2012-10-01 20:47:56 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  Bug : id inconnu dans irelated_action
........
  r5124 | danydb | 2012-10-01 20:56:07 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  0000733: Impression op?\195?\169ration depuis POP ME OUT
........
  r5125 | danydb | 2012-10-01 20:58:53 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  bug css for select
........
  r5126 | danydb | 2012-10-01 21:07:00 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  0000732: Pouvoir imprimer les op?\195?\169rations avant confirmation
........
  r5127 | danydb | 2012-10-01 21:16:04 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  bug financier le nom de la banque n'est pas mis ?\195?\160 jour
........
  r5128 | danydb | 2012-10-01 21:23:16 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  CSS cosmetic nom de journal en h2.title
........
  r5129 | danydb | 2012-10-01 21:30:20 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  Grand Livre : surlign?\195?\169 ligne paire
........
  r5130 | danydb | 2012-10-01 22:03:42 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  CSS pr?\195?\169sentation, remplace fieldset
........
  r5131 | danydb | 2012-10-01 22:04:03 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  Ne surligne pas les actions clotur?\195?\169es
........
  r5132 | danydb | 2012-10-01 22:04:19 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  Les readonly sont en bleus
........
  r5133 | danydb | 2012-10-01 22:16:55 +0200 (Mon, 01 Oct 2012) | 1 line
 =20
  Bug in the search button if id was  not set
........
  r5134 | danydb | 2012-10-02 18:49:40 +0200 (Tue, 02 Oct 2012) | 1 line
 =20
  underline properly=20
........
  r5135 | danydb | 2012-10-02 18:58:09 +0200 (Tue, 02 Oct 2012) | 3 lines
 =20
  Fix several some bugs :=20
  * PRINTJRN column name for ledget ACH, simple without VAT
  * PRINTPOSTE show everything even when unlettered is choosen
........
  r5136 | danydb | 2012-10-02 18:58:34 +0200 (Tue, 02 Oct 2012) | 1 line
 =20
  Improve documentation
........
  r5137 | danydb | 2012-10-02 23:01:27 +0200 (Tue, 02 Oct 2012) | 1 line
 =20
  Fix problem with date suggest
........
  r5138 | danydb | 2012-10-03 11:27:52 +0200 (Wed, 03 Oct 2012) | 1 line
 =20
  Bug auto compute for action
........
  r5139 | danydb | 2012-10-16 00:58:52 +0200 (Tue, 16 Oct 2012) | 1 line
 =20
   Sugg?\195?\169rer la date =3D oui ne met plus la date ?\195?\160 jour =
dans les achats=20
........
  r5140 | danydb | 2012-10-16 01:13:30 +0200 (Tue, 16 Oct 2012) | 1 line
 =20
  Sugg?\195?\169rer la date =3D oui ne met plus la date ?\195?\160 jour d=
ans les achats
........
  r5141 | danydb | 2012-10-16 01:14:01 +0200 (Tue, 16 Oct 2012) | 1 line
 =20
  Sugg?\195?\169rer la date =3D oui ne met plus la date ?\195?\160 jour d=
ans les achats
........
  r5142 | danydb | 2012-10-17 17:54:22 +0200 (Wed, 17 Oct 2012) | 1 line
 =20
  0000749: poste alphanum?\195?\169rique (fournisseur 44xxx)
........
  r5143 | danydb | 2012-10-20 19:13:04 +0200 (Sat, 20 Oct 2012) | 2 lines
 =20
  #754  Les totaux dans Pr?\195?\169visions=20
  #753  Les totaux dans FOURNISSEUR, CLIENT et ADMINISTRATION incorrectes=
=20
........
  r5144 | danydb | 2012-10-30 20:41:29 +0100 (Tue, 30 Oct 2012) | 1 line
 =20
  #372 syst?\195?\168me de nouvelles
........
  r5145 | danydb | 2012-10-30 20:42:45 +0100 (Tue, 30 Oct 2012) | 1 line
 =20
  add id to submit button
........
  r5146 | danydb | 2012-10-30 20:43:04 +0100 (Tue, 30 Oct 2012) | 1 line
 =20
  add a label to ibutton
........
  r5147 | danydb | 2012-10-30 20:43:43 +0100 (Tue, 30 Oct 2012) | 1 line
 =20
  add niceEdit.js
........
  r5148 | danydb | 2012-10-30 20:44:20 +0100 (Tue, 30 Oct 2012) | 1 line
 =20
  get_folder_access must also test global admin
........
  r5149 | danydb | 2012-10-30 22:14:26 +0100 (Tue, 30 Oct 2012) | 1 line
 =20
  0000755: Erreur en cr?\195?\169ation de fiche avec un compte (455) d?\1=
95?\169j?\195?\160 utilis?\195?\169.
........
  r5150 | danydb | 2012-10-30 22:20:07 +0100 (Tue, 30 Oct 2012) | 2 lines
 =20
  0000744: (classe) 5Actif
  0000746: ajouter un espace l?\195?\160 o?\195?\185 il faut
........
  r5151 | danydb | 2012-10-30 22:25:19 +0100 (Tue, 30 Oct 2012) | 1 line
 =20
  0000743: le pointeur se trouve sur 'effacer'
........
  r5152 | danydb | 2012-11-11 20:47:20 +0100 (Sun, 11 Nov 2012) | 1 line
 =20
  0000756: Achat ou vente pour rembourser de la TVA, marchandise ou quant=
. =3D 0
........
  r5153 | danydb | 2012-11-11 20:51:40 +0100 (Sun, 11 Nov 2012) | 1 line
 =20
  0000750: place de nouvelle fiche et effacer
........
  r5154 | danydb | 2012-11-11 20:55:08 +0100 (Sun, 11 Nov 2012) | 1 line
 =20
  0000742: remplacer le mot 'classe ' par le mot ' poste (comptable)'
........
  r5155 | danydb | 2012-11-22 21:50:27 +0100 (Thu, 22 Nov 2012) | 1 line
 =20
  fix problem with french accounting
........
  r5156 | danydb | 2012-11-29 23:17:33 +0100 (Thu, 29 Nov 2012) | 1 line
 =20
  #738: Attribut en pourcent doit ?\195?\170tre compris entre 0 et 100 au=
 lieu de 0 et 1
........
  r5157 | danydb | 2012-12-05 21:08:07 +0100 (Wed, 05 Dec 2012) | 2 lines
 =20
  0000766: Utilisation des moyens de paiements : libell?\195?\169 diff?\1=
95?\169rent pour l'op?\195?\169ration de paiement et d'achat/vente.
  0000765: affichage des colonnes Prix HTVA quand la soci?\195?\169t?\195=
?\169 n'est pas assujettie ?\195?\160 la TVA
........
  r5158 | danydb | 2012-12-06 21:42:51 +0100 (Thu, 06 Dec 2012) | 1 line
 =20
  0000762: TVA intracommunautaire
........
  r5159 | danydb | 2012-12-06 21:43:22 +0100 (Thu, 06 Dec 2012) | 1 line
 =20
  Bug : the history doesn't show the first_name for VEN
........
  r5160 | danydb | 2012-12-06 21:51:09 +0100 (Thu, 06 Dec 2012) | 1 line
 =20
  0000762: TVA intracommunautaire typo
........
  r5161 | danydb | 2012-12-06 22:56:36 +0100 (Thu, 06 Dec 2012) | 1 line
 =20
  0000762: TVA intracommunautaire : montant facture au lieu montant op?\1=
95?\169ration
........
  r5162 | danydb | 2012-12-06 23:09:20 +0100 (Thu, 06 Dec 2012) | 1 line
 =20
  0000745: en bas de page il appara?\195?\174t un pop up
........
  r5163 | danydb | 2012-12-08 19:10:52 +0100 (Sat, 08 Dec 2012) | 1 line
 =20
  patch version 104
........
  r5164 | danydb | 2012-12-08 20:48:57 +0100 (Sat, 08 Dec 2012) | 1 line
 =20
  patch version 104
........
  r5165 | danydb | 2012-12-08 21:12:14 +0100 (Sat, 08 Dec 2012) | 1 line
 =20
  cosmetique
........
  r5166 | danydb | 2012-12-08 21:30:44 +0100 (Sat, 08 Dec 2012) | 1 line
 =20
  rewriting
........
  r5167 | danydb | 2012-12-08 23:48:30 +0100 (Sat, 08 Dec 2012) | 1 line
 =20
  Ajout IMPJRN, d?\195?\169tail op?\195?\169ration
........
  r5168 | danydb | 2012-12-14 19:35:46 +0100 (Fri, 14 Dec 2012) | 1 line
 =20
  add personal expense
........
  r5169 | danydb | 2012-12-14 19:58:23 +0100 (Fri, 14 Dec 2012) | 1 line
 =20
  remove "choississez votre exercice"
........
  r5170 | danydb | 2013-01-03 21:15:40 +0100 (Thu, 03 Jan 2013) | 1 line
 =20
  0000773: Bug sur fiches avec double postes comptables
........
  r5171 | danydb | 2013-01-19 00:28:52 +0100 (Sat, 19 Jan 2013) | 1 line
 =20
  0000778: Si dossier n'existe pas alors il y a une erreur dans administr=
ation > dossier
........
  r5172 | danydb | 2013-01-20 15:57:40 +0100 (Sun, 20 Jan 2013) | 1 line
 =20
  0000778: Si dossier n'existe pas alors il y a une erreur dans administr=
ation > dossier
........
  r5173 | danydb | 2013-01-23 22:38:28 +0100 (Wed, 23 Jan 2013) | 2 lines
 =20
 =20
  #780 & #776 forbids some character in the quickcode
........
  r5174 | danydb | 2013-01-23 22:58:53 +0100 (Wed, 23 Jan 2013) | 1 line
 =20
  Improve format_name=20
........
  r5175 | danydb | 2013-01-23 22:59:52 +0100 (Wed, 23 Jan 2013) | 1 line
 =20
  #778 skip the unexisting folder=20
........
  r5176 | danydb | 2013-02-06 19:34:25 +0100 (Wed, 06 Feb 2013) | 1 line
 =20
  0000783: Apparence dans HISTO des notes
........
  r5177 | danydb | 2013-02-06 19:53:39 +0100 (Wed, 06 Feb 2013) | 1 line
 =20
  0000783: Apparence dans HISTO des notes
........
  r5178 | danydb | 2013-02-13 18:05:32 +0100 (Wed, 13 Feb 2013) | 1 line
 =20
  0000788: Lettrage : date invalide, bloque
........
  r5179 | danydb | 2013-02-13 18:15:46 +0100 (Wed, 13 Feb 2013) | 1 line
 =20
  0000788: Lettrage : date invalide, bloque
........
  r5180 | danydb | 2013-02-13 18:25:43 +0100 (Wed, 13 Feb 2013) | 1 line
 =20
  0000787: Rapprochement bancaire
........
  r5181 | danydb | 2013-02-13 19:13:10 +0100 (Wed, 13 Feb 2013) | 1 line
 =20
  Erreur si db inexistante alors echec
........
  r5182 | danydb | 2013-02-28 14:04:44 +0100 (Thu, 28 Feb 2013) | 1 line
 =20
  small bugs in javascript : typo
........
  r5183 | danydb | 2013-03-05 15:40:08 +0100 (Tue, 05 Mar 2013) | 2 lines
 =20
  0000791: Afficher dans la vue Param?\195?\168tres / Divers / TVA le cod=
e TVA
........
  r5184 | danydb | 2013-03-13 16:23:22 +0100 (Wed, 13 Mar 2013) | 2 lines
 =20
  0000795: Orthographe : dans le calendrier : t?\195?\162che suivi
........
  r5185 | danydb | 2013-03-13 16:30:37 +0100 (Wed, 13 Mar 2013) | 2 lines
 =20
  0000796: Lettrage : en code Hexad?\195?\169cimal ou en base 36 (A ?\195=
?\160 Z + 0 ?\195?\160 10)
........
  r5186 | danydb | 2013-03-13 22:10:15 +0100 (Wed, 13 Mar 2013) | 2 lines
 =20
  0000796: Lettrage : en code Hexad?\195?\169cimal ou en base 36 (A ?\195=
?\160 Z + 0 ?\195?\160 10)
........
  r5187 | danydb | 2013-03-14 00:04:53 +0100 (Thu, 14 Mar 2013) | 2 lines
 =20
  esth?\195?\169tique
........
  r5188 | danydb | 2013-03-17 01:24:05 +0100 (Sun, 17 Mar 2013) | 3 lines
 =20
  0000797: Am?\195?\169lioration du workflow : statut des documents / act=
ions
........
  r5189 | danydb | 2013-03-20 13:57:01 +0100 (Wed, 20 Mar 2013) | 1 line
 =20
  code cleaning : remove function Acc_Payment::row
........
  r5190 | danydb | 2013-03-20 14:02:36 +0100 (Wed, 20 Mar 2013) | 1 line
 =20
  Code cleaning
........
  r5191 | danydb | 2013-03-25 23:42:49 +0100 (Mon, 25 Mar 2013) | 1 line
 =20
  Documentation : doxygen tag misplaced due to netbeans
........
  r5192 | danydb | 2013-03-27 19:54:37 +0100 (Wed, 27 Mar 2013) | 1 line
 =20
  cosmetic : width div for operation detail=20
........
  r5193 | danydb | 2013-03-27 20:08:09 +0100 (Wed, 27 Mar 2013) | 1 line
 =20
  cosmetic : orthographe profile -> profil
........
  r5194 | danydb | 2013-03-27 20:17:51 +0100 (Wed, 27 Mar 2013) | 1 line
 =20
  cosmetic : ajout bouton fermeture si d?\195?\169tail non disponible
........
  r5195 | danydb | 2013-03-27 20:20:33 +0100 (Wed, 27 Mar 2013) | 1 line
 =20
  0000802: Bug : visibilit?\195?\169 des actions
........
  r5196 | danydb | 2013-03-27 20:22:53 +0100 (Wed, 27 Mar 2013) | 1 line
 =20
  0000802: Bug : visibilit?\195?\169 des actions
........
  r5197 | danydb | 2013-03-27 23:25:34 +0100 (Wed, 27 Mar 2013) | 1 line
 =20
  0000801: Ajouter un lien vers l'action
........
  r5198 | danydb | 2013-03-27 23:26:17 +0100 (Wed, 27 Mar 2013) | 1 line
 =20
  typo profile -> profil
........
  r5199 | danydb | 2013-03-28 00:12:02 +0100 (Thu, 28 Mar 2013) | 1 line
 =20
  javascript bug
........
  r5200 | danydb | 2013-03-28 00:12:25 +0100 (Thu, 28 Mar 2013) | 1 line
 =20
  bug last_operation <> late_operation
........
  r5201 | danydb | 2013-03-28 00:14:27 +0100 (Thu, 28 Mar 2013) | 1 line
 =20
  cosmetic
........
  r5202 | danydb | 2013-03-28 18:05:08 +0100 (Thu, 28 Mar 2013) | 1 line
 =20
  Add patch upgrade105
........
  r5203 | danydb | 2013-03-28 18:13:22 +0100 (Thu, 28 Mar 2013) | 1 line
 =20
  0000799: Pouvoir augmenter le nombre de lignes propos?\195?\169es pour =
un rapprochement
........
  r5204 | danydb | 2013-03-28 18:54:15 +0100 (Thu, 28 Mar 2013) | 1 line
 =20
  voir les heures dans commentaire
........
  r5205 | danydb | 2013-03-28 22:58:34 +0100 (Thu, 28 Mar 2013) | 1 line
 =20
  Cannot save a detail operation
........
  r5206 | danydb | 2013-03-28 23:23:50 +0100 (Thu, 28 Mar 2013) | 1 line
 =20
  Cannot save financial
........
  r5209 | danydb | 2013-04-04 20:53:49 +0200 (Thu, 04 Apr 2013) | 1 line
 =20
  0000807: Legend n'est pas agrandi
........
  r5210 | danydb | 2013-04-14 23:46:39 +0200 (Sun, 14 Apr 2013) | 1 line
 =20
  0000819: Note de d?\195?\169bit et de cr?\195?\169dit n?\195?\169gative=
 avec TVA autoliquidation
........
  r5211 | danydb | 2013-04-15 18:57:05 +0200 (Mon, 15 Apr 2013) | 1 line
 =20
  Impossible de sauver dans journaux financiers dans certains cas
........
  r5212 | danydb | 2013-04-15 19:56:50 +0200 (Mon, 15 Apr 2013) | 1 line
 =20
  0000819: Note de d?\195?\169bit et de cr?\195?\169dit n?\195?\169gative=
 avec TVA autoliquidation
........
  r5213 | danydb | 2013-04-24 23:28:32 +0200 (Wed, 24 Apr 2013) | 1 line
 =20
  0000824: Impossible de rechercher une action pour les actions li?\195?\=
169es
........
  r5214 | danydb | 2013-05-02 22:54:28 +0200 (Thu, 02 May 2013) | 1 line
 =20
  improve doc
........
  r5215 | danydb | 2013-05-03 23:56:40 +0200 (Fri, 03 May 2013) | 3 lines
 =20
  #0000822: G?\195?\169n?\195?\169ration document : changer le type de ce=
llule
 =20
  Attention probl?\195?\168me si on a utiliser =3D devant le tag pour for=
cer le type num?\195?\169rique
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel650:1-5054
   + /phpcompta/tags/rel650:1-5215


Property changes on: phpcompta/trunk/contrib/document_test
___________________________________________________________________
Name: svn:ignore
   + .~lock.all_tags.odt#


Modified: phpcompta/trunk/contrib/document_test/all_tags.odt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: phpcompta/trunk/doc/developper/Doxyfile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/doc/developper/Doxyfile	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/doc/developper/Doxyfile	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -585,8 +585,9 @@
 # with spaces.
=20
 INPUT                  =3D ../../include \
-                         ../../html
+                         ../../html=20
=20
+
 # This tag can be used to specify the character encoding of the source f=
iles
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which=
 is
 # also the default input encoding. Doxygen uses libiconv (or the iconv b=
uilt
@@ -660,7 +661,7 @@
 # directories that are symbolic links (a Unix filesystem feature) are ex=
cluded
 # from the input.
=20
-EXCLUDE_SYMLINKS       =3D YES
+EXCLUDE_SYMLINKS       =3D NO
=20
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclu=
de

Modified: phpcompta/trunk/doc/manuel-fr.odt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: phpcompta/trunk/doc/manuel-fr.pdf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-03 21:56:40 UTC (rev 521=
5)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -461,11 +461,21 @@
 //----------------------------------------------------------------------
=20
 for ($e=3D0;$e < $MaxDossier;$e++) {
-  $db_row=3D$cn->fetch($e);
+   $db_row=3DDatabase::fetch_array($Resdossier,$e);
   echo "<h3>Patching ".$db_row['dos_name'].'</h3>';
-  $db=3Dnew Database($db_row['dos_id'],'dos');
-  $db->apply_patch($db_row['dos_name']);
-  Dossier::synchro_admin($db_row['dos_id']);
+
+  $name=3D$cn->format_name($db_row['dos_id'],'dos');
+
+  if ( $cn->exist_database($name)> 0 )
+  {
+    $db=3Dnew Database($db_row['dos_id'],'dos');
+    $db->apply_patch($db_row['dos_name']);
+    Dossier::synchro_admin($db_row['dos_id']);
+
+  } else
+  {
+      echo_warning(_("Dossier inexistant")." $name");
+  }
  }
=20
 //----------------------------------------------------------------------
@@ -476,10 +486,18 @@
 echo "<h2>Mise &agrave; jour mod&egrave;le</h2>";
=20
 for ($e=3D0;$e < $MaxDossier;$e++) {
-  $db_row=3D$cn->fetch($e);
+  $db_row=3DDatabase::fetch_array($Resdossier,$e);
   echo "<h3>Patching ".$db_row['mod_name']."</h3>";
-  $db=3Dnew Database($db_row['mod_id'],'mod');
-  $db->apply_patch($db_row['mod_name']);
+  $name=3D$cn->format_name($db_row['mod_id'],'mod');
+
+  if ( $cn->exist_database($name)> 0 )
+  {
+    $db=3Dnew Database($db_row['mod_id'],'mod');
+    $db->apply_patch($db_row['mod_name']);
+   } else
+  {
+      echo_warning(_("Mod=C3=A8le inexistant")." $name");
+  }
  }
=20
 //----------------------------------------------------------------------

Modified: phpcompta/trunk/html/admin/sql/mod2/data.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/mod2/data.sql	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/html/admin/sql/mod2/data.sql	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -578,10 +578,10 @@
=20
=20
=20
-INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account=
, frd_id) VALUES (2, '400', 'Client', true, 9);
+INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account=
, frd_id) VALUES (2, '410', 'Client', true, 9);
 INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account=
, frd_id) VALUES (1, '604', 'Marchandises', true, 2);
-INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account=
, frd_id) VALUES (3, '5500', 'Banque', true, 4);
-INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account=
, frd_id) VALUES (4, '440', 'Fournisseur', true, 8);
+INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account=
, frd_id) VALUES (3, '51', 'Banque', true, 4);
+INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account=
, frd_id) VALUES (4, '400', 'Fournisseur', true, 8);
 INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account=
, frd_id) VALUES (5, '61', 'S & B D', true, 3);
 INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account=
, frd_id) VALUES (6, '700', 'Vente', true, 1);
=20

Copied: phpcompta/trunk/html/admin/sql/patch/upgrade103.sql (from rev 521=
5, phpcompta/tags/rel650/html/admin/sql/patch/upgrade103.sql)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade103.sql	                 =
       (rev 0)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade103.sql	2013-05-03 22:31:=
33 UTC (rev 5216)
@@ -0,0 +1,37 @@
+begin;
+CREATE OR REPLACE FUNCTION comptaproc.format_account(p_account account_t=
ype)
+  RETURNS account_type AS
+$BODY$
+
+declare
+
+sResult account_type;
+
+begin
+sResult :=3D lower(p_account);
+
+sResult :=3D translate(sResult,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=
=A4=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+sResult :=3D translate(sResult,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;=
_&|"#''^<>*','');
+
+return upper(sResult);
+
+end;
+$BODY$
+  LANGUAGE plpgsql ;
+
+COMMENT ON FUNCTION comptaproc.format_account(account_type) IS 'format t=
he accounting :
+- upper case
+- remove space and special char.
+';
+
+update tmp_pcmn  set pcm_val_parent  =3D '62' where pcm_val=3D'6202';
+
+update fiche_detail set ad_value =3D (to_number(ad_value,'9.99')*100)::t=
ext where ad_id in  (21,22,20,31) and ad_value is not null and ad_value <=
> '';
+
+update menu_ref set me_code=3D'ACHISTO' WHERE me_code=3D'ACHIMP';
+update menu_ref set me_code=3D'VEHISTO' WHERE me_code=3D'VENIMP';
+update menu_ref set me_code=3D'FIHISTO' WHERE me_code=3D'FIMP';
+update menu_ref set me_code=3D'ODHISTO' WHERE me_code=3D'ODSIMP';
+update version set val=3D104;
+
+commit;
\ No newline at end of file

Copied: phpcompta/trunk/html/admin/sql/patch/upgrade104.sql (from rev 521=
5, phpcompta/tags/rel650/html/admin/sql/patch/upgrade104.sql)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade104.sql	                 =
       (rev 0)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade104.sql	2013-05-03 22:31:=
33 UTC (rev 5216)
@@ -0,0 +1,105 @@
+begin;
+CREATE OR REPLACE FUNCTION comptaproc.insert_quick_code(nf_id integer, t=
av_text text)
+  RETURNS integer AS
+$BODY$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	begin
+	tText :=3D lower(trim(tav_text));
+	tText :=3D replace(tText,' ','');
+	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
+	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+
+
+	loop
+		-- take the next sequence
+		select nextval('s_jnt_fic_att_value') into ns;
+		if length (tText) =3D 0 or tText is null then
+			tText :=3D 'FID'||ns;
+		end if;
+		-- av_text already used ?
+		select count(*) into nExist
+			from fiche_detail
+		where
+			ad_id=3D23 and  ad_value=3Dupper(tText);
+
+		if nExist =3D 0 then
+			exit;
+		end if;
+		tText:=3D'FID'||ns;
+	end loop;
+
+
+	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,2=
3,upper(tText));
+	return ns;
+	end;
+$BODY$
+LANGUAGE plpgsql;
+
+
+
+CREATE OR REPLACE FUNCTION comptaproc.update_quick_code(njft_id integer,=
 tav_text text)
+  RETURNS integer AS
+$BODY$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	old_qcode varchar;
+	begin
+	-- get current value
+	select ad_value into old_qcode from fiche_detail where jft_id=3Dnjft_id=
;
+	-- av_text didn't change so no update
+	if tav_text =3D upper( trim(old_qcode)) then
+		return 0;
+	end if;
+
+	tText :=3D trim(lower(tav_text));
+	tText :=3D replace(tText,' ','');
+	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
+	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+	tText :=3D upper(tText);
+	if length ( tText) =3D 0 or tText is null then
+		return 0;
+	end if;
+
+	ns :=3D njft_id;
+
+	loop
+		-- av_text already used ?
+		select count(*) into nExist
+			from fiche_detail
+		where
+			ad_id=3D23 and ad_value=3DtText;
+
+		if nExist =3D 0 then
+			exit;
+		end if;
+		if tText =3D 'FID'||ns then
+			-- take the next sequence
+			select nextval('s_jnt_fic_att_value') into ns;
+		end if;
+		tText  :=3D'FID'||ns;
+
+	end loop;
+	update fiche_detail set ad_value =3D tText where jft_id=3Dnjft_id;
+
+	-- update also the contact
+	update fiche_detail set ad_value =3D tText
+		where jft_id in
+			( select jft_id
+				from fiche_detail
+			where ad_id=3D25 and ad_value=3Dold_qcode);
+
+
+	update jrnx set j_qcode=3DtText where j_qcode =3D old_qcode;
+	return ns;
+	end;
+$BODY$
+LANGUAGE plpgsql;
+
+update version set val=3D105;
+
+commit;
\ No newline at end of file

Copied: phpcompta/trunk/html/admin/sql/patch/upgrade105.sql (from rev 521=
5, phpcompta/tags/rel650/html/admin/sql/patch/upgrade105.sql)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade105.sql	                 =
       (rev 0)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade105.sql	2013-05-03 22:31:=
33 UTC (rev 5216)
@@ -0,0 +1,109 @@
+begin;
+
+CREATE OR REPLACE FUNCTION comptaproc.insert_quick_code(nf_id integer, t=
av_text text)
+  RETURNS integer AS
+$BODY$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	begin
+	tText :=3D lower(trim(tav_text));
+	tText :=3D replace(tText,' ','');
+	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
+	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+
+
+	loop
+		-- take the next sequence
+		select nextval('s_jnt_fic_att_value') into ns;
+		if length (tText) =3D 0 or tText is null then
+			tText :=3D 'FID'||ns;
+		end if;
+		-- av_text already used ?
+		select count(*) into nExist
+			from fiche_detail
+		where
+			ad_id=3D23 and  ad_value=3Dupper(tText);
+
+		if nExist =3D 0 then
+			exit;
+		end if;
+		tText:=3D'FID'||ns;
+	end loop;
+
+
+	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,2=
3,upper(tText));
+	return ns;
+	end;
+$BODY$
+  LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION comptaproc.update_quick_code(njft_id integer,=
 tav_text text)
+  RETURNS integer AS
+$BODY$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	old_qcode varchar;
+	begin
+	-- get current value
+	select ad_value into old_qcode from fiche_detail where jft_id=3Dnjft_id=
;
+	-- av_text didn't change so no update
+	if tav_text =3D upper( trim(old_qcode)) then
+		return 0;
+	end if;
+
+	tText :=3D trim(lower(tav_text));
+	tText :=3D replace(tText,' ','');
+	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
+	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+	tText :=3D upper(tText);
+	if length ( tText) =3D 0 or tText is null then
+		return 0;
+	end if;
+
+	ns :=3D njft_id;
+
+	loop
+		-- av_text already used ?
+		select count(*) into nExist
+			from fiche_detail
+		where
+			ad_id=3D23 and ad_value=3DtText;
+
+		if nExist =3D 0 then
+			exit;
+		end if;
+		if tText =3D 'FID'||ns then
+			-- take the next sequence
+			select nextval('s_jnt_fic_att_value') into ns;
+		end if;
+		tText  :=3D'FID'||ns;
+
+	end loop;
+	update fiche_detail set ad_value =3D tText where jft_id=3Dnjft_id;
+
+	-- update also the contact
+	update fiche_detail set ad_value =3D tText
+		where jft_id in
+			( select jft_id
+				from fiche_detail
+			where ad_id=3D25 and ad_value=3Dold_qcode);
+
+
+	update jrnx set j_qcode=3DtText where j_qcode =3D old_qcode;
+	return ns;
+	end;
+$BODY$
+  LANGUAGE plpgsql;
+
+
+alter table document_state add s_status char(1);
+
+update document_state set s_status=3D'C' where s_id in (1,4);
+
+update version set val=3D106;
+
+commit;

Modified: phpcompta/trunk/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_card.php	2013-05-03 21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/html/ajax_card.php	2013-05-03 22:31:33 UTC (rev 5216)
@@ -116,7 +116,7 @@
         echo $e->getMessage();
     }
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
     /* ------------------------------------------------------------ */
     /* Display card detail */
@@ -327,9 +327,11 @@
     $r.=3D'<form method=3D"GET" onsubmit=3D"this.ctl=3D\'ipop_card\';sea=
rch_get_card(this);return false;">';
     $q=3Dnew IText('query');
     $q->value=3D(isset($query))?$query:'';
-    $r.=3D_('Fiche contenant');
+	$r.=3D'<span style=3D"margin-left:50px">';
+    $r.=3D_('Fiche contenant').HtmlInput::infobulle(19);
     $r.=3D$q->input();
     $r.=3DHtmlInput::submit('fs',_('Recherche'));
+	$r.=3D'</span>';
     $r.=3Ddossier::hidden().HtmlInput::hidden('op','fs');
     $array=3Darray();
     foreach (array('query','inp','jrn','label','typecard','price','tvaid=
') as $i)
@@ -393,7 +395,7 @@
     ob_start();
     require_once('template/card_result.php');
     $r.=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     $ctl=3D$ctl.'_content';
     $html=3D$r;
     break;
@@ -442,7 +444,7 @@
         ob_start();
         require('template/category_of_card.php');
         $html.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
=20
     }
     else
@@ -511,7 +513,7 @@
 	  ob_start();
 	  $f->update($_GET);
 	  $html.=3Dob_get_contents();
-	  ob_clean();
+	  ob_end_clean();
 	  $html.=3D$f->Display(true);
 	  $html.=3DHtmlInput::button('close_'.$ctl,'Fermer',"onclick=3D\"remove=
Div('$ctl')\"");
 	}

Modified: phpcompta/trunk/html/ajax_history.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_history.php	2013-05-03 21:56:40 UTC (rev 52=
15)
+++ phpcompta/trunk/html/ajax_history.php	2013-05-03 22:31:33 UTC (rev 52=
16)
@@ -115,7 +115,7 @@
 	echo $old;
=20
         $html=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
       }
   }
 ////////////////////////////////////////////////////////////////////////=
///
@@ -185,7 +185,7 @@
 	echo $old;
=20
         $html=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
       }
   }
 $html=3Descape_xml($html);

Modified: phpcompta/trunk/html/ajax_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_ledger.php	2013-05-03 21:56:40 UTC (rev 521=
5)
+++ phpcompta/trunk/html/ajax_ledger.php	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -71,8 +71,9 @@
 {
     ob_start();
     require_once ('template/ledger_detail_forbidden.php');
+	echo HtmlInput::button_close($div);
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     $html=3Descape_xml($html);
     header('Content-type: text/xml; charset=3DUTF-8');
     echo <<<EOF
@@ -97,8 +98,9 @@
     ob_start();
 	echo HtmlInput::title_box(_("Information"), $div);
     require_once ('template/ledger_detail_forbidden.php');
+	echo HtmlInput::button_close($div);
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
=20
     $html=3Descape_xml($html);
     header('Content-type: text/xml; charset=3DUTF-8');
@@ -118,9 +120,9 @@
     ob_start();
 	echo HtmlInput::title_box(_("Information"), $div);
     require_once ('template/ledger_detail_forbidden.php');
+	echo HtmlInput::button_close($div);
     $html=3Dob_get_contents();
-    ob_clean();
-
+    ob_end_clean();
     $html=3Descape_xml($html);
     header('Content-type: text/xml; charset=3DUTF-8');
     echo <<<EOF
@@ -158,7 +160,7 @@
                 $cn->rollback;
             }
             $html=3Dob_get_contents();
-            ob_clean();
+            ob_end_clean();
         }
     break;
     ////////////////////////////////////////////////////////////////////=
//
@@ -197,7 +199,7 @@
         echo '<h2 class=3D"error">D=C3=A9sol=C3=A9 il y a une erreur</h2=
>';
     }
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
=20
     break;
     ////////////////////////////////////////////////////////////////////=
/////////
@@ -221,7 +223,7 @@
 			echo "<div>";
=20
 		}
-		echo "<h2>Document</h2>";
+		echo "<h1 class=3D\"legend\">Document</h1>";
         if ( $access=3D=3D'W')
         {
             echo '<FORM METHOD=3D"POST" ENCTYPE=3D"multipart/form-data" =
id=3D"form_file">';
@@ -278,7 +280,7 @@
 			echo "<div>";
=20
 		}
-		echo "<h2>Document</h2>";
+		echo "<h1 class=3D\"legend\">Document</h1>";
         echo '<div class=3D"op_detail_frame">';
         $x=3D'';
         if ($access=3D=3D'W')
@@ -477,7 +479,7 @@
       alert( "Changement impossible: on ne peut pas changer la date dans=
 une p=C3=A9riode ferm=C3=A9e");
     }
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
=20
     break;
 ////////////////////////////////////////////////////////////////////////=
/////
@@ -525,7 +527,7 @@
         }
     }
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
 }
 $html=3Descape_xml($html);

Modified: phpcompta/trunk/html/ajax_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_misc.php	2013-05-03 21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/html/ajax_misc.php	2013-05-03 22:31:33 UTC (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief this file respond to an ajax request
  * The parameters are
  * - gDossier
@@ -323,14 +323,33 @@
 		$line.=3Dtd($max->input());
 		$r.=3Dtr($line);
=20
+		$date_error=3D"";
 		// start date
 		$start =3D new IDate('search_start');
+
+		/*  check if date are valid */
+		if (isset($search_start) && isDate($search_start) =3D=3D null)
+		{
+			ob_start();
+			alert(_('Date malform=C3=A9e'));
+			$date_error =3D ob_get_contents();
+			ob_end_clean();
+			$search_start=3D$first_per->first_day();
+		}
 		$start->value =3D (isset($search_start)) ? $search_start : $first_per-=
>first_day();
=20
-
 		$line =3D td('Date Debut') . td($start->input());
 		// end date
 		$end =3D new IDate('search_end');
+						/*  check if date are valid */
+		if (isset($search_end) && isDate($search_end) =3D=3D null)
+		{
+			ob_start();
+			alert(_('Date malform=C3=A9e'));
+			$date_error =3D ob_get_contents();
+			ob_end_clean();
+			$search_end=3D$last_per->last_day();
+		}
 		$end->value =3D (isset($search_end)) ? $search_end : $last_per->last_d=
ay();
 		$line.=3Dtd('Date Fin') . td($end->input());
 		$r.=3Dtr($line);
@@ -396,28 +415,8 @@
 			$form.=3DHtmlInput::hidden('sb', $_REQUEST['sb']);
 		if (isset($_REQUEST['f_id']))
 			$form.=3DHtmlInput::hidden('f_id', $_REQUEST['f_id']);
-		/*  check if date are valid */
-		if ((isset($search_end) && isDate($search_end) =3D=3D null) ||
-				(isset($search_start) && isDate($search_start) =3D=3D null))
-		{
-			ob_start();
-			alert(_('Date malform=C3=A9e, d=C3=A9sol=C3=A9'));
-			$html =3D ob_get_contents();
-			ob_clean();
=20
-			$html =3D escape_xml($html);
=20
-			header('Content-type: text/xml; charset=3DUTF-8');
-			echo <<<EOF
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<data>
-<code>detail</code>
-<value>$html</value>
-</data>
-EOF;
-			exit();
-		}
-
 		// display a list of operation from the other side + box button
 		if ($ot =3D=3D 'account')
 		{
@@ -458,7 +457,9 @@
 		$form.=3DHtmlInput::submit('record', _('Sauver')) . $ret->input();
 		$form.=3D'</FORM>';
 		$form.=3D'</div>';
+
 		$html =3D $r . $form;
+		$html.=3D$date_error;
 		//       echo $html;exit;
 		$html =3D escape_xml($html);
=20
@@ -501,6 +502,9 @@
 	case 'add_menu':
 		require_once 'ajax_add_menu.php';
 		break;
+	case 'cardsearch':
+		require_once 'ajax_boxcard_search.php';
+		break;
 	case 'add_plugin':
 		$me_code =3D new IText('me_code');
 		$me_file =3D new IText('me_file');
@@ -561,6 +565,9 @@
 	case 'fddetail':
 		require_once 'ajax_fiche_def_detail.php';
 		break;
+	case 'vw_action':
+		require_once 'ajax_view_action.php';
+		break;
 	default:
 		var_dump($_GET);
 }

Modified: phpcompta/trunk/html/ajax_poste.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_poste.php	2013-05-03 21:56:40 UTC (rev 5215=
)
+++ phpcompta/trunk/html/ajax_poste.php	2013-05-03 22:31:33 UTC (rev 5216=
)
@@ -62,7 +62,7 @@
 global $g_user;
 $g_user=3Dnew User($cn);
 $g_user->Check();
-if  ($g_user->get_folder_access(dossier::id()) =3D=3D 'X') exit();
+if  ($g_user->check_dossier(dossier::id()) =3D=3D 'X') exit();
 $xml=3D"";
=20
 switch ($op)
@@ -88,7 +88,7 @@
     ob_start();
     require_once('template/account_search.php');
     $r.=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     $r.=3Ddossier::hidden();
     $r.=3D(isset ($c))?HtmlInput::hidden('account',$c):"";
     $r.=3D(isset ($l))?HtmlInput::hidden('label',$l):"";
@@ -163,7 +163,7 @@
=20
     require_once('template/account_result.php');
     $r.=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
=20
     $html=3D$r;
     break;

Modified: phpcompta/trunk/html/do.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/do.php	2013-05-03 21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/html/do.php	2013-05-03 22:31:33 UTC (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief Main file
  */
 require_once 'class_database.php';

Modified: phpcompta/trunk/html/document/fr_be/bnb.form
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/document/fr_be/bnb.form	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/html/document/fr_be/bnb.form	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -1,147 +1,147 @@
 # Les postesg*(-1)
- $C10=3Dround([10%S],2)*(-1)
- $C100=3Dround([100%S],2)*(-1)
- $C101=3Dround([101%S],2)
- $C11=3Dround([11%S],2)*(-1)
- $C12=3Dround([12%S],2)*(-1)
- $C13=3Dround([13%S],2)*(-1)
- $C130=3Dround([130%S],2)*(-1)
- $C131=3Dround([131%S],2)*(-1)
- $C1310=3Dround([1310%S],2)*(-1)
- $C1311=3Dround([1311%S],2)*(-1)
- $C132=3Dround([132%S],2)*(-1)
- $C133=3Dround([133%S],2)*(-1)
- $C14=3Dround([14%S],2)*(-1)
- $C140=3Dround([140%S],2)*(-1)
- $C141=3Dround([141%S],2)
- $C15=3Dround([15%S],2)*(-1)
- $C16=3Dround([16%S],2)*(-1)
- $C160=3Dround([160%S],2)*(-1)
- $C161=3Dround([161%S],2)*(-1)
- $C162=3Dround([162%S],2)*(-1)
- $C163=3Dround([163%S],2)*(-1)
- $C164=3Dround([164%S],2)*(-1)
- $C165=3Dround([165%S],2)*(-1)
- $C168=3Dround([168%S],2)*(-1)
-$C17=3Dround([17%S],2)*(-1)
- $C170=3Dround([170%S],2)*(-1)
- $C171=3Dround([171%S],2)*(-1)
- $C172=3Dround([172%S],2)*(-1)
- $C173=3Dround([173%S],2)*(-1)
- $C174=3Dround([174%S],2)*(-1)
- $C175=3Dround([175%S],2)*(-1)
- $C176=3Dround([176%S],2)*(-1)
- $C178=3Dround([178%S],2)*(-1)
- $C179=3Dround([179%S],2)*(-1)
-$C2=3Dround([2%S],2)*(-1)
- $C20=3Dround([20%S],2)
- $C21=3Dround([21%S],2)
- $C22=3Dround([22%S],2)
- $C23=3Dround([23%S],2)
- $C24=3Dround([24%S],2)
- $C25=3Dround([25%S],2)
- $C26=3Dround([26%S],2)
- $C27=3Dround([27%S],2)
- $C28=3Dround([28%S],2)
- $C29=3Dround([29%S],2)
- $C290=3Dround([290%S],2)
- $C291=3Dround([291%S],2)
-$C3=3Dround([3%S],2)
- $C30=3Dround([30%S],2)
- $C31=3Dround([31%S],2)
- $C32=3Dround([32%S],2)
- $C33=3Dround([33%S],2)
- $C34=3Dround([34%S],2)
- $C35=3Dround([35%S],2)
- $C36=3Dround([36%S],2)
- $C37=3Dround([37%S],2)
- $C40=3Dround([40%S],2)
- $C41=3Dround([41%S],2)
- $C42=3Dround([42%S],2)*(-1)
- $C43=3Dround([43%S],2)*(-1)
- $C439=3Dround([439%S],2)*(-1)
- $C44=3Dround([44%S],2)*(-1)
- $C440=3Dround([440%S],2)*(-1)
- $C441=3Dround([441%S],2)*(-1)
- $C444=3Dround([444%S],2)*(-1)
- $C45=3Dround([45%S],2)*(-1)
- $C450=3Dround([450%S],2)*(-1)
- $C451=3Dround([451%S],2)*(-1)
- $C452=3Dround([452%S],2)*(-1)
- $C453=3Dround([453%S],2)*(-1)
- $C454=3Dround([454%S],2)*(-1)
-$C455=3Dround([455%S],2)*(-1)
-$C456=3Dround([456%S],2)*(-1)
-$C457=3Dround([457%S],2)*(-1)
-$C458=3Dround([458%S],2)*(-1)
- $C459=3Dround([459%S],2)*(-1)
- $C46=3Dround([46%S],2)
- $C47=3Dround([47%S],2)*(-1)
- $C48=3Dround([48%S],2)*(-1)
- $C49=3Dround([49%S],2)
- $C490=3Dround([490%S],2)
- $C491=3Dround([491%S],2)
- $C492=3Dround([492%S],2)*(-1)
- $C493=3Dround([493%S],2)*(-1)
- $C50=3Dround([50%S],2)
- $C51=3Dround([51%S],2)
- $C52=3Dround([52%S],2)
- $C53=3Dround([53%S],2)
- $C54=3Dround([54%S],2)
- $C55=3Dround([55%S],2)
- $C56=3Dround([56%S],2)
- $C57=3Dround([57%S],2)
- $C58=3Dround([58%S],2)
- $C60=3Dround([60%S],2)
- $C61=3Dround([61%S],2)
- $C62=3Dround([62%S],2)
- $C63=3Dround([63%S],2)
-$C630=3Dround([630%S],2)
-$C631=3Dround([631%S],2)
-$C632=3Dround([632%S],2)
-$C633=3Dround([633%S],2)
-$C634=3Dround([634%S],2)
-$C635=3Dround([635%S],2)
-$C636=3Dround([636%S],2)
-$C637=3Dround([637%S],2)
+ $C10=3Dround([10%s],2)*(-1)
+ $C100=3Dround([100%s],2)*(-1)
+ $C101=3Dround([101%s],2)
+ $C11=3Dround([11%s],2)*(-1)
+ $C12=3Dround([12%s],2)*(-1)
+ $C13=3Dround([13%s],2)*(-1)
+ $C130=3Dround([130%s],2)*(-1)
+ $C131=3Dround([131%s],2)*(-1)
+ $C1310=3Dround([1310%s],2)*(-1)
+ $C1311=3Dround([1311%s],2)*(-1)
+ $C132=3Dround([132%s],2)*(-1)
+ $C133=3Dround([133%s],2)*(-1)
+ $C14=3Dround([14%s],2)*(-1)
+ $C140=3Dround([140%s],2)*(-1)
+ $C141=3Dround([141%s],2)
+ $C15=3Dround([15%s],2)*(-1)
+ $C16=3Dround([16%s],2)*(-1)
+ $C160=3Dround([160%s],2)*(-1)
+ $C161=3Dround([161%s],2)*(-1)
+ $C162=3Dround([162%s],2)*(-1)
+ $C163=3Dround([163%s],2)*(-1)
+ $C164=3Dround([164%s],2)*(-1)
+ $C165=3Dround([165%s],2)*(-1)
+ $C168=3Dround([168%s],2)*(-1)
+$C17=3Dround([17%s],2)*(-1)
+ $C170=3Dround([170%s],2)*(-1)
+ $C171=3Dround([171%s],2)*(-1)
+ $C172=3Dround([172%s],2)*(-1)
+ $C173=3Dround([173%s],2)*(-1)
+ $C174=3Dround([174%s],2)*(-1)
+ $C175=3Dround([175%s],2)*(-1)
+ $C176=3Dround([176%s],2)*(-1)
+ $C178=3Dround([178%s],2)*(-1)
+ $C179=3Dround([179%s],2)*(-1)
+$C2=3Dround([2%s],2)*(-1)
+ $C20=3Dround([20%s],2)
+ $C21=3Dround([21%s],2)
+ $C22=3Dround([22%s],2)
+ $C23=3Dround([23%s],2)
+ $C24=3Dround([24%s],2)
+ $C25=3Dround([25%s],2)
+ $C26=3Dround([26%s],2)
+ $C27=3Dround([27%s],2)
+ $C28=3Dround([28%s],2)
+ $C29=3Dround([29%s],2)
+ $C290=3Dround([290%s],2)
+ $C291=3Dround([291%s],2)
+$C3=3Dround([3%s],2)
+ $C30=3Dround([30%s],2)
+ $C31=3Dround([31%s],2)
+ $C32=3Dround([32%s],2)
+ $C33=3Dround([33%s],2)
+ $C34=3Dround([34%s],2)
+ $C35=3Dround([35%s],2)
+ $C36=3Dround([36%s],2)
+ $C37=3Dround([37%s],2)
+ $C40=3Dround([40%s],2)
+ $C41=3Dround([41%s],2)
+ $C42=3Dround([42%s],2)*(-1)
+ $C43=3Dround([43%s],2)*(-1)
+ $C439=3Dround([439%s],2)*(-1)
+ $C44=3Dround([44%s],2)*(-1)
+ $C440=3Dround([440%s],2)*(-1)
+ $C441=3Dround([441%s],2)*(-1)
+ $C444=3Dround([444%s],2)*(-1)
+ $C45=3Dround([45%s],2)*(-1)
+ $C450=3Dround([450%s],2)*(-1)
+ $C451=3Dround([451%s],2)*(-1)
+ $C452=3Dround([452%s],2)*(-1)
+ $C453=3Dround([453%s],2)*(-1)
+ $C454=3Dround([454%s],2)*(-1)
+$C455=3Dround([455%s],2)*(-1)
+$C456=3Dround([456%s],2)*(-1)
+$C457=3Dround([457%s],2)*(-1)
+$C458=3Dround([458%s],2)*(-1)
+ $C459=3Dround([459%s],2)*(-1)
+ $C46=3Dround([46%s],2)
+ $C47=3Dround([47%s],2)*(-1)
+ $C48=3Dround([48%s],2)*(-1)
+ $C49=3Dround([49%s],2)
+ $C490=3Dround([490%s],2)
+ $C491=3Dround([491%s],2)
+ $C492=3Dround([492%s],2)*(-1)
+ $C493=3Dround([493%s],2)*(-1)
+ $C50=3Dround([50%s],2)
+ $C51=3Dround([51%s],2)
+ $C52=3Dround([52%s],2)
+ $C53=3Dround([53%s],2)
+ $C54=3Dround([54%s],2)
+ $C55=3Dround([55%s],2)
+ $C56=3Dround([56%s],2)
+ $C57=3Dround([57%s],2)
+ $C58=3Dround([58%s],2)
+ $C60=3Dround([60%s],2)
+ $C61=3Dround([61%s],2)
+ $C62=3Dround([62%s],2)
+ $C63=3Dround([63%s],2)
+$C630=3Dround([630%s],2)
+$C631=3Dround([631%s],2)
+$C632=3Dround([632%s],2)
+$C633=3Dround([633%s],2)
+$C634=3Dround([634%s],2)
+$C635=3Dround([635%s],2)
+$C636=3Dround([636%s],2)
+$C637=3Dround([637%s],2)
 =20
- $C649=3Dround([649%S],2)*(-1)
- $C64=3Dround([64%S],2)
+ $C649=3Dround([649%s],2)*(-1)
+ $C64=3Dround([64%s],2)
=20
- $C65=3Dround([65%S],2)
- $C66=3Dround([66%S],2)
- $C67=3Dround([67%S],2)
- $C68=3Dround([68%S],2)
- $C680=3Dround([680%S],2)
-$C689=3Dround([689%S],2)
- $C69=3Dround([69%S],2)
- $C690=3Dround([690%S],2)
- $C691=3Dround([691%S],2)
- $C692=3Dround([692%S],2)
- $C6920=3Dround([6920%S],2)
- $C6921=3Dround([6921%S],2)
- $C693=3Dround([693%S],2)
- $C694=3Dround([694%S],2)
- $C695=3Dround([695%S],2)
- $C696=3Dround([696%S],2)
+ $C65=3Dround([65%s],2)
+ $C66=3Dround([66%s],2)
+ $C67=3Dround([67%s],2)
+ $C68=3Dround([68%s],2)
+ $C680=3Dround([680%s],2)
+$C689=3Dround([689%s],2)
+ $C69=3Dround([69%s],2)
+ $C690=3Dround([690%s],2)
+ $C691=3Dround([691%s],2)
+ $C692=3Dround([692%s],2)
+ $C6920=3Dround([6920%s],2)
+ $C6921=3Dround([6921%s],2)
+ $C693=3Dround([693%s],2)
+ $C694=3Dround([694%s],2)
+ $C695=3Dround([695%s],2)
+ $C696=3Dround([696%s],2)
=20
-$C7=3Dround([7%S],2)*(-1)
- $C70=3Dround([70%S],2)*(-1)
- $C71=3Dround([71%S],2)*(-1)
- $C73=3Dround([73%S],2)*(-1)
- $C72=3Dround([72%S],2)*(-1)
- $C74=3Dround([74%S],2)*(-1)
- $C75=3Dround([75%S],2)*(-1)
- $C76=3Dround([76%S],2)*(-1)
- $C77=3Dround([77%S],2)*(-1)
-$C780=3Dround([780%S],2)*(-1)
-$C789=3Dround([789%S],2)*(-1)
- $C79=3Dround([79%S],2)*(-1)
-$C790=3Dround([790%S],2)*(-1)
-$C791=3Dround([791%S],2)*(-1)
-$C792=3Dround([792%S],2)*(-1)
-$C793=3Dround([793%S],2)*(-1)
-$C794=3Dround([794%S],2)*(-1)
+$C7=3Dround([7%s],2)*(-1)
+ $C70=3Dround([70%s],2)*(-1)
+ $C71=3Dround([71%s],2)*(-1)
+ $C73=3Dround([73%s],2)*(-1)
+ $C72=3Dround([72%s],2)*(-1)
+ $C74=3Dround([74%s],2)*(-1)
+ $C75=3Dround([75%s],2)*(-1)
+ $C76=3Dround([76%s],2)*(-1)
+ $C77=3Dround([77%s],2)*(-1)
+$C780=3Dround([780%s],2)*(-1)
+$C789=3Dround([789%s],2)*(-1)
+ $C79=3Dround([79%s],2)*(-1)
+$C790=3Dround([790%s],2)*(-1)
+$C791=3Dround([791%s],2)*(-1)
+$C792=3Dround([792%s],2)*(-1)
+$C793=3Dround([793%s],2)*(-1)
+$C794=3Dround([794%s],2)*(-1)
 # Les formules (*-1)
 #
 $S1=3Dabs($C2-$C29)

Modified: phpcompta/trunk/html/js/acc_ledger.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/acc_ledger.js	2013-05-03 21:56:40 UTC (rev 52=
15)
+++ phpcompta/trunk/html/js/acc_ledger.js	2013-05-03 22:31:33 UTC (rev 52=
16)
@@ -324,6 +324,7 @@
         a=3Dtrim(g("e_march"+p_ctl_nb+'_tva_amount').value);
         g("e_march"+p_ctl_nb+'_tva_amount').value=3Da;
     }
+	if ( ! document.getElementById("e_march"+p_ctl_nb))  {return;}
     g("e_march"+p_ctl_nb).value=3Dtrim(g("e_march"+p_ctl_nb).value);
     var qcode=3Dg("e_march"+p_ctl_nb).value;
=20
@@ -375,12 +376,12 @@
     for (var i=3D0;i<g("nb_item").value;i++)
     {
         if( g('tva_march'+i))  tva+=3Dg('tva_march'+i).value*1;
-        htva+=3Dg('htva_march'+i).value*1;
-        tvac+=3Dg('tvac_march'+i).value*1;
+        if (g('htva_march'+i)) htva+=3Dg('htva_march'+i).value*1;
+        if (g('tvac_march'+i)) tvac+=3Dg('tvac_march'+i).value*1;
     }
=20
     if ( g('tva') ) g('tva').innerHTML=3DMath.round(tva*100)/100;
-    g('htva').innerHTML=3DMath.round(htva*100)/100;
+    if (g('htva')) g('htva').innerHTML=3DMath.round(htva*100)/100;
     if (g('tvac'))    g('tvac').innerHTML=3DMath.round(tvac*100)/100;
 }
 /**
@@ -449,12 +450,12 @@
     for (var i=3D0;i<g("nb_item").value;i++)
     {
         if ( g('tva_march') ) tva+=3Dg('tva_march'+i).value*1;
-        htva+=3Dg('htva_march'+i).value*1;
-        tvac+=3Dg('tvac_march'+i).value*1;
+        if( g('htva_march'+i)) htva+=3Dg('htva_march'+i).value*1;
+        if( g('tvac_march'+i))tvac+=3Dg('tvac_march'+i).value*1;
     }
=20
     if ( g('tva') ) g('tva').innerHTML=3DMath.round(tva*100)/100;
-    g('htva').innerHTML=3DMath.round(htva*100)/100;
+    if (g('htva')) g('htva').innerHTML=3DMath.round(htva*100)/100;
     if (g('tvac'))g('tvac').innerHTML=3DMath.round(tvac*100)/100;
=20
=20
@@ -564,17 +565,22 @@
=20
     querystring=3D'gDossier=3D'+dossier+'&act=3Dde&pcm_val=3D'+p_value+'=
&div=3D'+id;
     add_div(popup);
+
     var action=3Dnew Ajax.Request(
                    "ajax_history.php",
                    {
                    method:'get',
                    parameters:querystring,
                    onFailure:error_box,
-                   onSuccess:success_box
+                   onSuccess:function (req,xml)
+					{
+						success_box(req,xml);
+						g(id).style.top=3Dcalcy(140+(layer*3));
+						g(id).style.left=3D"10%";
+						g(id).style.width=3D'80%';
+					}
                    }
                );
-    g(id).style.top=3DposY-40;
-    g(id).style.left=3DposX-10;
=20
 }
=20
@@ -588,7 +594,13 @@
 		method:'get',
 		parameters:querystring,
 		onFailure:error_box,
-		onSuccess:success_box
+		  onSuccess:function (req,xml)
+					{
+						success_box(req,xml);
+						g(obj.div).style.top=3Dcalcy(140+(layer*3));
+						g(obj.div).style.left=3D"10%";
+						g(obj.div).style.width=3D'80%';
+					}
 	    });
     } catch (e)
     {
@@ -618,12 +630,15 @@
                    method:'get',
                    parameters:querystring,
                    onFailure:error_box,
-                   onSuccess:success_box
+                   onSuccess:function (req,xml)
+					{
+						success_box(req,xml);
+						g(id).style.top=3Dcalcy(140+(layer*3));
+						g(id).style.left=3D"10%";
+						g(id).style.width=3D'80%';
+					}
                    }
                );
-    g(id).style.top=3DposY-40;
-    g(id).style.left=3DposX-10;
-
 }
=20
 function update_history_card(obj)
@@ -636,7 +651,13 @@
 		method:'get',
 		parameters:querystring,
 		onFailure:error_box,
-		onSuccess:success_box
+		  onSuccess:function (req,xml)
+					{
+						success_box(req,xml);
+						g(obj.div).style.top=3Dcalcy(140+(layer*3));
+						g(obj.div).style.left=3D"10%";
+						g(obj.div).style.width=3D'80%';
+					}
 	    });
     } catch (e)
     {
@@ -693,29 +714,31 @@
 /*!\brief
  * \param p_value jrn.jr_id
  */
-function modifyOperation(p_value,dossier)
+function modifyOperation(p_value, dossier)
 {
-    layer++;
-    id=3D'det'+layer;
-    var popup=3D{'id':
-           id,'cssclass':'inner_box'
-           ,'html':
-           loading(),'drag':
-               true};
-    querystring=3D'gDossier=3D'+dossier+'&act=3Dde&jr_id=3D'+p_value+'&d=
iv=3D'+id;
-    add_div(popup);
-    var action=3Dnew Ajax.Request(
-                   "ajax_ledger.php",
-                   {
-                   method:'get',
-                   parameters:querystring,
-                   onFailure:error_box,
-                   onSuccess:success_box
-                   }
-               );
-    g(id).style.top=3DposY-40;
-    g(id).style.left=3D300;
-
+	layer++;
+	id =3D 'det' + layer;
+	var popup =3D {'id':
+				id, 'cssclass': 'inner_box'
+				, 'html':
+				loading(), 'drag':
+				true};
+	querystring =3D 'gDossier=3D' + dossier + '&act=3Dde&jr_id=3D' + p_valu=
e + '&div=3D' + id;
+	add_div(popup);
+	var action =3D new Ajax.Request(
+			"ajax_ledger.php",
+			{
+				method: 'get',
+				parameters: querystring,
+				onFailure: error_box,
+				onSuccess: function(xml, txt) {
+					success_box(xml, txt);
+					g(id).style.top =3D calcy(100 + (layer * 3));
+					g(id).style.left =3D '10%';
+					g(id).style.width =3D "80%";
+				}
+			}
+	);
 }
=20
 /*!\brief
@@ -868,10 +891,11 @@
 *@brief save an operation in ajax, it concerns only the
 * comment, the pj and the rapt
 * the form elements are access by their name
-*@param form
+*@param obj form
 */
 function op_save(obj)
 {
+	try {
     var queryString=3D$(obj).serialize();
     queryString+=3D"&lib=3D"+obj.lib.value;
     queryString+=3D"&gDossier=3D"+obj.gDossier.value;
@@ -906,6 +930,8 @@
                                     );
     }
     return false;
+	} catch (e)
+	{ alert(e.message);}
 }
 function  get_history_account(ctl,dossier) {
 	if ( $(ctl).value !=3D '')

Modified: phpcompta/trunk/html/js/accounting_item.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/accounting_item.js	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/html/js/accounting_item.js	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -76,6 +76,7 @@
 	}
=20
 	var div_style=3D"z-index:15;top:"+sx;
+	removeDiv('search_account');
 	add_div({id:'search_account',cssclass:'inner_box',html:loading(),style:=
div_style,drag:true});
=20
     var dossier=3D$('gDossier').value;

Modified: phpcompta/trunk/html/js/anc_script.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/anc_script.js	2013-05-03 21:56:40 UTC (rev 52=
15)
+++ phpcompta/trunk/html/js/anc_script.js	2013-05-03 22:31:33 UTC (rev 52=
16)
@@ -124,6 +124,9 @@
  */
 function verify_ca(div)
 {
+	try
+	{
+
     var idx=3D0;
     var amount_error=3D0;
     // put a maximum
@@ -168,6 +171,12 @@
         return false;
     }
     return true;
+	}
+	catch  (e)
+	{
+		alert(e.message);
+		return false;
+	}
 }
 /*!
  * \brief open a window for searching a CA account,
@@ -209,7 +218,7 @@
         }
     }
     );
-   =20
+
 }
 function search_anc_form(obj)
 {

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2013-05-03 21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/html/js/card.js	2013-05-03 22:31:33 UTC (rev 5216)
@@ -25,6 +25,35 @@
=20
 var card_layer=3D1;
 /**
+ *@brief search a card an display the result into a inner box
+ */
+function boxsearch_card(p_dossier)
+{
+	try
+	{
+	waiting_box();
+	removeDiv('boxsearch_card_div');
+	var queryString=3D"gDossier=3D"+p_dossier+"&op=3Dcardsearch"+"&card=3D"=
+$(card_search).value;
+	var action =3D new Ajax.Request(
+				  "ajax_misc.php" ,
+				  {
+				      method:'get', parameters:queryString,
+				      onFailure:ajax_misc_failure,
+				      onSuccess:function(req){
+						remove_waiting_box();
+						var y=3DposY+15;
+						var div_style=3D"left:10%;width:80%;"+";top:"+y;
+						add_div({id:'boxsearch_card_div',cssclass:'inner_box',html:loading=
(),style:div_style,drag:true});
+						$('boxsearch_card_div').innerHTML=3Dreq.responseText;
+				      }
+				  }
+				  );
+	}catch( e)
+	{
+		alert(e.getMessage);
+	}
+}
+/**
  *@brief show the ipopup with the form to search a card
  * the properties
  *  - jrn for the ledger

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-05-03 21:56:40 UTC (rev 521=
5)
+++ phpcompta/trunk/html/js/infobulle.js	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -44,7 +44,11 @@
 content[14]=3D"Attention, le poste comptable doit exister, il ne sera pa=
s v=C3=A9rifi=C3=A9";
 content[15]=3D"Laissez =C3=A0 0 pour ne rien changer";
 content[16]=3D"Vous devez donner la date par op=C3=A9ration";
-
+content[17]=3D"Cliquez sur le titre d'une colonne pour trier";
+content[18]=3D"Donnez une partie du nom, pr=C3=A9nom, de la description,=
 du poste comptable, du n=C2=B0 de TVA ou quick code";
+content[19]=3D"Donnez une partie du nom, de la description,  du n=C2=B0 =
de TVA ou quick code";
+content[20]=3D"Les menus ne peuvent d=C3=A9pendre que dans d'un menu pri=
ncipal ou d'un menu, si cette liste est vide, ajouter des modules ou menu=
 principal sans donner de d=C3=A9pendance";
+content[21]=3D"Donnez un nombre entre 0 & 100";
 function showBulle(p_ctl)
 {
     d=3Ddocument.getElementById('bulle');

Modified: phpcompta/trunk/html/js/lang/calendar-al.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/lang/calendar-al.js	2013-05-03 21:56:40 UTC (=
rev 5215)
+++ phpcompta/trunk/html/js/lang/calendar-al.js	2013-05-03 22:31:33 UTC (=
rev 5216)
@@ -89,8 +89,7 @@
=20
 Calendar._TT["CLOSE"] =3D "Mbyll";
 Calendar._TT["TODAY"] =3D "Sot";
-Calendar._TT["TIME_PART"] =3D "Kliko me (Shift-)ose terhiqe per te ndrys=
huar=20
-vleren";
+Calendar._TT["TIME_PART"] =3D "Kliko me (Shift-)ose terhiqe per te ndrys=
huar vleren";
=20
 // date formats
 Calendar._TT["DEF_DATE_FORMAT"] =3D "%Y-%m-%d";

Modified: phpcompta/trunk/html/js/lang/calendar-he-utf8.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/lang/calendar-he-utf8.js	2013-05-03 21:56:40 =
UTC (rev 5215)
+++ phpcompta/trunk/html/js/lang/calendar-he-utf8.js	2013-05-03 22:31:33 =
UTC (rev 5216)
@@ -83,7 +83,7 @@
 "=D7=94=D7=92=D7=99=D7=A8=D7=A1=D7=90 =D7=94=D7=90=D7=97=D7=A8=D7=95=D7=A0=
=D7=94 =D7=96=D7=9E=D7=99=D7=A0=D7=94 =D7=91: http://www.dynarch.com/proj=
ects/calendar/\n" +
 "=D7=9E=D7=95=D7=A4=D7=A5 =D7=AA=D7=97=D7=AA =D7=96=D7=99=D7=9B=D7=99=D7=
=95=D7=9F =D7=94 GNU LGPL.  =D7=A2=D7=99=D7=99=D7=9F =D7=91 http://gnu.or=
g/licenses/lgpl.html =D7=9C=D7=A4=D7=A8=D7=98=D7=99=D7=9D =D7=A0=D7=95=D7=
=A1=D7=A4=D7=99=D7=9D." +
 "\n\n" +
-=D7=91=D7=97=D7=99=D7=A8=D7=AA =D7=AA=D7=90=D7=A8=D7=99=D7=9A:\n" +
+"=D7=91=D7=97=D7=99=D7=A8=D7=AA =D7=AA=D7=90=D7=A8=D7=99=D7=9A:\n" +
 "- =D7=94=D7=A9=D7=AA=D7=9E=D7=A9 =D7=91=D7=9B=D7=A4=D7=AA=D7=95=D7=A8=D7=
=99=D7=9D \xab, \xbb =D7=9C=D7=91=D7=97=D7=99=D7=A8=D7=AA =D7=A9=D7=A0=D7=
=94\n" +
 "- =D7=94=D7=A9=D7=AA=D7=9E=D7=A9 =D7=91=D7=9B=D7=A4=D7=AA=D7=95=D7=A8=D7=
=99=D7=9D " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x=
203a) + " =D7=9C=D7=91=D7=97=D7=99=D7=A8=D7=AA =D7=97=D7=95=D7=93=D7=A9\n=
" +
 "- =D7=94=D7=97=D7=96=D7=A7 =D7=94=D7=A2=D7=9B=D7=91=D7=A8 =D7=9C=D7=97=D7=
=95=D7=A5 =D7=9E=D7=A2=D7=9C =D7=94=D7=9B=D7=A4=D7=AA=D7=95=D7=A8=D7=99=D7=
=9D =D7=94=D7=9E=D7=95=D7=96=D7=9B=D7=A8=D7=99=D7=9D =D7=9C=D7=A2=D7=99=D7=
=9C =D7=9C=D7=91=D7=97=D7=99=D7=A8=D7=94 =D7=9E=D7=94=D7=99=D7=A8=D7=94 =D7=
=99=D7=95=D7=AA=D7=A8.";

Copied: phpcompta/trunk/html/js/nicEdit.js (from rev 5215, phpcompta/tags=
/rel650/html/js/nicEdit.js)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/nicEdit.js	                        (rev 0)
+++ phpcompta/trunk/html/js/nicEdit.js	2013-05-03 22:31:33 UTC (rev 5216)
@@ -0,0 +1,112 @@
+/* NicEdit - Micro Inline WYSIWYG
+ * Copyright 2007-2008 Brian Kirchoff
+ *
+ * NicEdit is distributed under the terms of the MIT license
+ * For more information visit http://nicedit.com/
+ * Do not remove this copyright message
+ */
+var bkExtend=3Dfunction(){var A=3Darguments;if(A.length=3D=3D1){A=3D[thi=
s,A[0]]}for(var B in A[1]){A[0][B]=3DA[1][B]}return A[0]};function bkClas=
s(){}bkClass.prototype.construct=3Dfunction(){};bkClass.extend=3Dfunction=
(C){var A=3Dfunction(){if(arguments[0]!=3D=3DbkClass){return this.constru=
ct.apply(this,arguments)}};var B=3Dnew this(bkClass);bkExtend(B,C);A.prot=
otype=3DB;A.extend=3Dthis.extend;return A};var bkElement=3DbkClass.extend=
({construct:function(B,A){if(typeof (B)=3D=3D"string"){B=3D(A||document).=
createElement(B)}B=3D$BK(B);return B},appendTo:function(A){A.appendChild(=
this);return this},appendBefore:function(A){A.parentNode.insertBefore(thi=
s,A);return this},addEvent:function(B,A){bkLib.addEvent(this,B,A);return =
this},setContent:function(A){this.innerHTML=3DA;return this},pos:function=
(){var C=3Dcurtop=3D0;var B=3Dobj=3Dthis;if(obj.offsetParent){do{C+=3Dobj=
.offsetLeft;curtop+=3Dobj.offsetTop}while(obj=3Dobj.offsetParent)}var A=3D=
(!window.opera)?parseInt(this.getStyle("border-width")||this.style.border=
)||0:0;return[C+A,curtop+A+this.offsetHeight]},noSelect:function(){bkLib.=
noSelect(this);return this},parentTag:function(A){var B=3Dthis;do{if(B&&B=
.nodeName&&B.nodeName.toUpperCase()=3D=3DA){return B}B=3DB.parentNode}whi=
le(B);return false},hasClass:function(A){return this.className.match(new =
RegExp("(\\s|^)nicEdit-"+A+"(\\s|$)"))},addClass:function(A){if(!this.has=
Class(A)){this.className+=3D" nicEdit-"+A}return this},removeClass:functi=
on(A){if(this.hasClass(A)){this.className=3Dthis.className.replace(new Re=
gExp("(\\s|^)nicEdit-"+A+"(\\s|$)")," ")}return this},setStyle:function(A=
){var B=3Dthis.style;for(var C in A){switch(C){case"float":B.cssFloat=3DB=
.styleFloat=3DA[C];break;case"opacity":B.opacity=3DA[C];B.filter=3D"alpha=
(opacity=3D"+Math.round(A[C]*100)+")";break;case"className":this.classNam=
e=3DA[C];break;default:B[C]=3DA[C]}}return this},getStyle:function(A,C){v=
ar B=3D(!C)?document.defaultView:C;if(this.nodeType=3D=3D1){return(B&&B.g=
etComputedStyle)?B.getComputedStyle(this,null).getPropertyValue(A):this.c=
urrentStyle[bkLib.camelize(A)]}},remove:function(){this.parentNode.remove=
Child(this);return this},setAttributes:function(A){for(var B in A){this[B=
]=3DA[B]}return this}});var bkLib=3D{isMSIE:(navigator.appVersion.indexOf=
("MSIE")!=3D-1),addEvent:function(C,B,A){(C.addEventListener)?C.addEventL=
istener(B,A,false):C.attachEvent("on"+B,A)},toArray:function(C){var B=3DC=
.length,A=3Dnew Array(B);while(B--){A[B]=3DC[B]}return A},noSelect:functi=
on(B){if(B.setAttribute&&B.nodeName.toLowerCase()!=3D"input"&&B.nodeName.=
toLowerCase()!=3D"textarea"){B.setAttribute("unselectable","on")}for(var =
A=3D0;A<B.childNodes.length;A++){bkLib.noSelect(B.childNodes[A])}},cameli=
ze:function(A){return A.replace(/\-(.)/g,function(B,C){return C.toUpperCa=
se()})},inArray:function(A,B){return(bkLib.search(A,B)!=3Dnull)},search:f=
unction(A,C){for(var B=3D0;B<A.length;B++){if(A[B]=3D=3DC){return B}}retu=
rn null},cancelEvent:function(A){A=3DA||window.event;if(A.preventDefault&=
&A.stopPropagation){A.preventDefault();A.stopPropagation()}return false},=
domLoad:[],domLoaded:function(){if(arguments.callee.done){return }argumen=
ts.callee.done=3Dtrue;for(i=3D0;i<bkLib.domLoad.length;i++){bkLib.domLoad=
[i]()}},onDomLoaded:function(A){this.domLoad.push(A);if(document.addEvent=
Listener){document.addEventListener("DOMContentLoaded",bkLib.domLoaded,nu=
ll)}else{if(bkLib.isMSIE){document.write("<style>.nicEdit-main p { margin=
: 0; }</style><script id=3D__ie_onload defer "+((location.protocol=3D=3D"=
https:")?"src=3D'javascript:void(0)'":"src=3D//0")+"><\/script>");$BK("__=
ie_onload").onreadystatechange=3Dfunction(){if(this.readyState=3D=3D"comp=
lete"){bkLib.domLoaded()}}}}window.onload=3DbkLib.domLoaded}};function $B=
K(A){if(typeof (A)=3D=3D"string"){A=3Ddocument.getElementById(A)}return(A=
&&!A.appendTo)?bkExtend(A,bkElement.prototype):A}var bkEvent=3D{addEvent:=
function(A,B){if(B){this.eventList=3Dthis.eventList||{};this.eventList[A]=
=3Dthis.eventList[A]||[];this.eventList[A].push(B)}return this},fireEvent=
:function(){var A=3DbkLib.toArray(arguments),C=3DA.shift();if(this.eventL=
ist&&this.eventList[C]){for(var B=3D0;B<this.eventList[C].length;B++){thi=
s.eventList[C][B].apply(this,A)}}}};function __(A){return A}Function.prot=
otype.closure=3Dfunction(){var A=3Dthis,B=3DbkLib.toArray(arguments),C=3D=
B.shift();return function(){if(typeof (bkLib)!=3D"undefined"){return A.ap=
ply(C,B.concat(bkLib.toArray(arguments)))}}};Function.prototype.closureLi=
stener=3Dfunction(){var A=3Dthis,C=3DbkLib.toArray(arguments),B=3DC.shift=
();return function(E){E=3DE||window.event;if(E.target){var D=3DE.target}e=
lse{var D=3DE.srcElement}return A.apply(B,[E,D].concat(C))}};
+
+
+
+var nicEditorConfig =3D bkClass.extend({
+	buttons : {
+		'bold' : {name : __('Click to Bold'), command : 'Bold', tags : ['B','S=
TRONG'], css : {'font-weight' : 'bold'}, key : 'b'},
+		'italic' : {name : __('Click to Italic'), command : 'Italic', tags : [=
'EM','I'], css : {'font-style' : 'italic'}, key : 'i'},
+		'underline' : {name : __('Click to Underline'), command : 'Underline',=
 tags : ['U'], css : {'text-decoration' : 'underline'}, key : 'u'},
+		'left' : {name : __('Left Align'), command : 'justifyleft', noActive :=
 true},
+		'center' : {name : __('Center Align'), command : 'justifycenter', noAc=
tive : true},
+		'right' : {name : __('Right Align'), command : 'justifyright', noActiv=
e : true},
+		'justify' : {name : __('Justify Align'), command : 'justifyfull', noAc=
tive : true},
+		'ol' : {name : __('Insert Ordered List'), command : 'insertorderedlist=
', tags : ['OL']},
+		'ul' : 	{name : __('Insert Unordered List'), command : 'insertunordere=
dlist', tags : ['UL']},
+		'subscript' : {name : __('Click to Subscript'), command : 'subscript',=
 tags : ['SUB']},
+		'superscript' : {name : __('Click to Superscript'), command : 'supersc=
ript', tags : ['SUP']},
+		'strikethrough' : {name : __('Click to Strike Through'), command : 'st=
rikeThrough', css : {'text-decoration' : 'line-through'}},
+		'removeformat' : {name : __('Remove Formatting'), command : 'removefor=
mat', noActive : true},
+		'indent' : {name : __('Indent Text'), command : 'indent', noActive : t=
rue},
+		'outdent' : {name : __('Remove Indent'), command : 'outdent', noActive=
 : true},
+		'hr' : {name : __('Horizontal Rule'), command : 'insertHorizontalRule'=
, noActive : true}
+	},
+	iconsPath : '../nicEditorIcons.gif',
+	buttonList : ['save','bold','italic','underline','left','center','right=
','justify','ol','ul','fontSize','fontFamily','fontFormat','indent','outd=
ent','image','upload','link','unlink','forecolor','bgcolor'],
+	iconList : {"bgcolor":1,"forecolor":2,"bold":3,"center":4,"hr":5,"inden=
t":6,"italic":7,"justify":8,"left":9,"ol":10,"outdent":11,"removeformat":=
12,"right":13,"save":24,"strikethrough":15,"subscript":16,"superscript":1=
7,"ul":18,"underline":19,"image":20,"link":21,"unlink":22,"close":23,"arr=
ow":25,"upload":26}
+=09
+});
+;
+var nicEditors=3D{nicPlugins:[],editors:[],registerPlugin:function(B,A){=
this.nicPlugins.push({p:B,o:A})},allTextAreas:function(C){var A=3Ddocumen=
t.getElementsByTagName("textarea");for(var B=3D0;B<A.length;B++){nicEdito=
rs.editors.push(new nicEditor(C).panelInstance(A[B]))}return nicEditors.e=
ditors},findEditor:function(C){var B=3DnicEditors.editors;for(var A=3D0;A=
<B.length;A++){if(B[A].instanceById(C)){return B[A].instanceById(C)}}}};v=
ar nicEditor=3DbkClass.extend({construct:function(C){this.options=3Dnew n=
icEditorConfig();bkExtend(this.options,C);this.nicInstances=3Dnew Array()=
;this.loadedPlugins=3Dnew Array();var A=3DnicEditors.nicPlugins;for(var B=
=3D0;B<A.length;B++){this.loadedPlugins.push(new A[B].p(this,A[B].o))}nic=
Editors.editors.push(this);bkLib.addEvent(document.body,"mousedown",this.=
selectCheck.closureListener(this))},panelInstance:function(B,C){B=3Dthis.=
checkReplace($BK(B));var A=3Dnew bkElement("DIV").setStyle({width:(parseI=
nt(B.getStyle("width"))||B.clientWidth)+"px"}).appendBefore(B);this.setPa=
nel(A);return this.addInstance(B,C)},checkReplace:function(B){var A=3Dnic=
Editors.findEditor(B);if(A){A.removeInstance(B);A.removePanel()}return B}=
,addInstance:function(B,C){B=3Dthis.checkReplace($BK(B));if(B.contentEdit=
able||!!window.opera){var A=3Dnew nicEditorInstance(B,C,this)}else{var A=3D=
new nicEditorIFrameInstance(B,C,this)}this.nicInstances.push(A);return th=
is},removeInstance:function(C){C=3D$BK(C);var B=3Dthis.nicInstances;for(v=
ar A=3D0;A<B.length;A++){if(B[A].e=3D=3DC){B[A].remove();this.nicInstance=
s.splice(A,1)}}},removePanel:function(A){if(this.nicPanel){this.nicPanel.=
remove();this.nicPanel=3Dnull}},instanceById:function(C){C=3D$BK(C);var B=
=3Dthis.nicInstances;for(var A=3D0;A<B.length;A++){if(B[A].e=3D=3DC){retu=
rn B[A]}}},setPanel:function(A){this.nicPanel=3Dnew nicEditorPanel($BK(A)=
,this.options,this);this.fireEvent("panel",this.nicPanel);return this},ni=
cCommand:function(B,A){if(this.selectedInstance){this.selectedInstance.ni=
cCommand(B,A)}},getIcon:function(D,A){var C=3Dthis.options.iconList[D];va=
r B=3D(A.iconFiles)?A.iconFiles[D]:"";return{backgroundImage:"url('"+((C)=
?this.options.iconsPath:B)+"')",backgroundPosition:((C)?((C-1)*-18):0)+"p=
x 0px"}},selectCheck:function(C,A){var B=3Dfalse;do{if(A.className&&A.cla=
ssName.indexOf("nicEdit")!=3D-1){return false}}while(A=3DA.parentNode);th=
is.fireEvent("blur",this.selectedInstance,A);this.lastSelectedInstance=3D=
this.selectedInstance;this.selectedInstance=3Dnull;return false}});nicEdi=
tor=3DnicEditor.extend(bkEvent);
+var nicEditorInstance=3DbkClass.extend({isSelected:false,construct:funct=
ion(G,D,C){this.ne=3DC;this.elm=3Dthis.e=3DG;this.options=3DD||{};newX=3D=
parseInt(G.getStyle("width"))||G.clientWidth;newY=3DparseInt(G.getStyle("=
height"))||G.clientHeight;this.initialHeight=3DnewY-8;var H=3D(G.nodeName=
.toLowerCase()=3D=3D"textarea");if(H||this.options.hasPanel){var B=3D(bkL=
ib.isMSIE&&!((typeof document.body.style.maxHeight!=3D"undefined")&&docum=
ent.compatMode=3D=3D"CSS1Compat"));var E=3D{width:newX+"px",border:"1px s=
olid #ccc",borderTop:0,overflowY:"auto",overflowX:"hidden"};E[(B)?"height=
":"maxHeight"]=3D(this.ne.options.maxHeight)?this.ne.options.maxHeight+"p=
x":null;this.editorContain=3Dnew bkElement("DIV").setStyle(E).appendBefor=
e(G);var A=3Dnew bkElement("DIV").setStyle({width:(newX-8)+"px",margin:"4=
px",minHeight:newY+"px"}).addClass("main").appendTo(this.editorContain);G=
.setStyle({display:"none"});A.innerHTML=3DG.innerHTML;if(H){A.setContent(=
G.value);this.copyElm=3DG;var F=3DG.parentTag("FORM");if(F){bkLib.addEven=
t(F,"submit",this.saveContent.closure(this))}}A.setStyle((B)?{height:newY=
+"px"}:{overflow:"hidden"});this.elm=3DA}this.ne.addEvent("blur",this.blu=
r.closure(this));this.init();this.blur()},init:function(){this.elm.setAtt=
ribute("contentEditable","true");if(this.getContent()=3D=3D""){this.setCo=
ntent("<br />")}this.instanceDoc=3Ddocument.defaultView;this.elm.addEvent=
("mousedown",this.selected.closureListener(this)).addEvent("keypress",thi=
s.keyDown.closureListener(this)).addEvent("focus",this.selected.closure(t=
his)).addEvent("blur",this.blur.closure(this)).addEvent("keyup",this.sele=
cted.closure(this));this.ne.fireEvent("add",this)},remove:function(){this=
.saveContent();if(this.copyElm||this.options.hasPanel){this.editorContain=
.remove();this.e.setStyle({display:"block"});this.ne.removePanel()}this.d=
isable();this.ne.fireEvent("remove",this)},disable:function(){this.elm.se=
tAttribute("contentEditable","false")},getSel:function(){return(window.ge=
tSelection)?window.getSelection():document.selection},getRng:function(){v=
ar A=3Dthis.getSel();if(!A||A.rangeCount=3D=3D=3D0){return }return(A.rang=
eCount>0)?A.getRangeAt(0):A.createRange()},selRng:function(A,B){if(window=
.getSelection){B.removeAllRanges();B.addRange(A)}else{A.select()}},selElm=
:function(){var C=3Dthis.getRng();if(!C){return }if(C.startContainer){var=
 D=3DC.startContainer;if(C.cloneContents().childNodes.length=3D=3D1){for(=
var B=3D0;B<D.childNodes.length;B++){var A=3DD.childNodes[B].ownerDocumen=
t.createRange();A.selectNode(D.childNodes[B]);if(C.compareBoundaryPoints(=
Range.START_TO_START,A)!=3D1&&C.compareBoundaryPoints(Range.END_TO_END,A)=
!=3D-1){return $BK(D.childNodes[B])}}}return $BK(D)}else{return $BK((this=
.getSel().type=3D=3D"Control")?C.item(0):C.parentElement())}},saveRng:fun=
ction(){this.savedRange=3Dthis.getRng();this.savedSel=3Dthis.getSel()},re=
storeRng:function(){if(this.savedRange){this.selRng(this.savedRange,this.=
savedSel)}},keyDown:function(B,A){if(B.ctrlKey){this.ne.fireEvent("key",t=
his,B)}},selected:function(C,A){if(!A&&!(A=3Dthis.selElm)){A=3Dthis.selEl=
m()}if(!C.ctrlKey){var B=3Dthis.ne.selectedInstance;if(B!=3Dthis){if(B){t=
his.ne.fireEvent("blur",B,A)}this.ne.selectedInstance=3Dthis;this.ne.fire=
Event("focus",B,A)}this.ne.fireEvent("selected",B,A);this.isFocused=3Dtru=
e;this.elm.addClass("selected")}return false},blur:function(){this.isFocu=
sed=3Dfalse;this.elm.removeClass("selected")},saveContent:function(){if(t=
his.copyElm||this.options.hasPanel){this.ne.fireEvent("save",this);(this.=
copyElm)?this.copyElm.value=3Dthis.getContent():this.e.innerHTML=3Dthis.g=
etContent()}},getElm:function(){return this.elm},getContent:function(){th=
is.content=3Dthis.getElm().innerHTML;this.ne.fireEvent("get",this);return=
 this.content},setContent:function(A){this.content=3DA;this.ne.fireEvent(=
"set",this);this.elm.innerHTML=3Dthis.content},nicCommand:function(B,A){d=
ocument.execCommand(B,false,A)}});
+var nicEditorIFrameInstance=3DnicEditorInstance.extend({savedStyles:[],i=
nit:function(){var B=3Dthis.elm.innerHTML.replace(/^\s+|\s+$/g,"");this.e=
lm.innerHTML=3D"";(!B)?B=3D"<br />":B;this.initialContent=3DB;this.elmFra=
me=3Dnew bkElement("iframe").setAttributes({src:"javascript:;",frameBorde=
r:0,allowTransparency:"true",scrolling:"no"}).setStyle({height:"100px",wi=
dth:"100%"}).addClass("frame").appendTo(this.elm);if(this.copyElm){this.e=
lmFrame.setStyle({width:(this.elm.offsetWidth-4)+"px"})}var A=3D["font-si=
ze","font-family","font-weight","color"];for(itm in A){this.savedStyles[b=
kLib.camelize(itm)]=3Dthis.elm.getStyle(itm)}setTimeout(this.initFrame.cl=
osure(this),50)},disable:function(){this.elm.innerHTML=3Dthis.getContent(=
)},initFrame:function(){var B=3D$BK(this.elmFrame.contentWindow.document)=
;B.designMode=3D"on";B.open();var A=3Dthis.ne.options.externalCSS;B.write=
("<html><head>"+((A)?'<link href=3D"'+A+'" rel=3D"stylesheet" type=3D"tex=
t/css" />':"")+'</head><body id=3D"nicEditContent" style=3D"margin: 0 !im=
portant; background-color: transparent !important;">'+this.initialContent=
+"</body></html>");B.close();this.frameDoc=3DB;this.frameWin=3D$BK(this.e=
lmFrame.contentWindow);this.frameContent=3D$BK(this.frameWin.document.bod=
y).setStyle(this.savedStyles);this.instanceDoc=3Dthis.frameWin.document.d=
efaultView;this.heightUpdate();this.frameDoc.addEvent("mousedown",this.se=
lected.closureListener(this)).addEvent("keyup",this.heightUpdate.closureL=
istener(this)).addEvent("keydown",this.keyDown.closureListener(this)).add=
Event("keyup",this.selected.closure(this));this.ne.fireEvent("add",this)}=
,getElm:function(){return this.frameContent},setContent:function(A){this.=
content=3DA;this.ne.fireEvent("set",this);this.frameContent.innerHTML=3Dt=
his.content;this.heightUpdate()},getSel:function(){return(this.frameWin)?=
this.frameWin.getSelection():this.frameDoc.selection},heightUpdate:functi=
on(){this.elmFrame.style.height=3DMath.max(this.frameContent.offsetHeight=
,this.initialHeight)+"px"},nicCommand:function(B,A){this.frameDoc.execCom=
mand(B,false,A);setTimeout(this.heightUpdate.closure(this),100)}});
+var nicEditorPanel=3DbkClass.extend({construct:function(E,B,A){this.elm=3D=
E;this.options=3DB;this.ne=3DA;this.panelButtons=3Dnew Array();this.butto=
nList=3DbkExtend([],this.ne.options.buttonList);this.panelContain=3Dnew b=
kElement("DIV").setStyle({overflow:"hidden",width:"100%",border:"1px soli=
d #cccccc",backgroundColor:"#efefef"}).addClass("panelContain");this.pane=
lElm=3Dnew bkElement("DIV").setStyle({margin:"2px",marginTop:"0px",zoom:1=
,overflow:"hidden"}).addClass("panel").appendTo(this.panelContain);this.p=
anelContain.appendTo(E);var C=3Dthis.ne.options;var D=3DC.buttons;for(but=
ton in D){this.addButton(button,C,true)}this.reorder();E.noSelect()},addB=
utton:function(buttonName,options,noOrder){var button=3Doptions.buttons[b=
uttonName];var type=3D(button.type)?eval("(typeof("+button.type+') =3D=3D=
 "undefined") ? null : '+button.type+";"):nicEditorButton;var hasButton=3D=
bkLib.inArray(this.buttonList,buttonName);if(type&&(hasButton||this.ne.op=
tions.fullPanel)){this.panelButtons.push(new type(this.panelElm,buttonNam=
e,options,this.ne));if(!hasButton){this.buttonList.push(buttonName)}}},fi=
ndButton:function(B){for(var A=3D0;A<this.panelButtons.length;A++){if(thi=
s.panelButtons[A].name=3D=3DB){return this.panelButtons[A]}}},reorder:fun=
ction(){var C=3Dthis.buttonList;for(var B=3D0;B<C.length;B++){var A=3Dthi=
s.findButton(C[B]);if(A){this.panelElm.appendChild(A.margin)}}},remove:fu=
nction(){this.elm.remove()}});
+var nicEditorButton=3DbkClass.extend({construct:function(D,A,C,B){this.o=
ptions=3DC.buttons[A];this.name=3DA;this.ne=3DB;this.elm=3DD;this.margin=3D=
new bkElement("DIV").setStyle({"float":"left",marginTop:"2px"}).appendTo(=
D);this.contain=3Dnew bkElement("DIV").setStyle({width:"20px",height:"20p=
x"}).addClass("buttonContain").appendTo(this.margin);this.border=3Dnew bk=
Element("DIV").setStyle({backgroundColor:"#efefef",border:"1px solid #efe=
fef"}).appendTo(this.contain);this.button=3Dnew bkElement("DIV").setStyle=
({width:"18px",height:"18px",overflow:"hidden",zoom:1,cursor:"pointer"}).=
addClass("button").setStyle(this.ne.getIcon(A,C)).appendTo(this.border);t=
his.button.addEvent("mouseover",this.hoverOn.closure(this)).addEvent("mou=
seout",this.hoverOff.closure(this)).addEvent("mousedown",this.mouseClick.=
closure(this)).noSelect();if(!window.opera){this.button.onmousedown=3Dthi=
s.button.onclick=3DbkLib.cancelEvent}B.addEvent("selected",this.enable.cl=
osure(this)).addEvent("blur",this.disable.closure(this)).addEvent("key",t=
his.key.closure(this));this.disable();this.init()},init:function(){},hide=
:function(){this.contain.setStyle({display:"none"})},updateState:function=
(){if(this.isDisabled){this.setBg()}else{if(this.isHover){this.setBg("hov=
er")}else{if(this.isActive){this.setBg("active")}else{this.setBg()}}}},se=
tBg:function(A){switch(A){case"hover":var B=3D{border:"1px solid #666",ba=
ckgroundColor:"#ddd"};break;case"active":var B=3D{border:"1px solid #666"=
,backgroundColor:"#ccc"};break;default:var B=3D{border:"1px solid #efefef=
",backgroundColor:"#efefef"}}this.border.setStyle(B).addClass("button-"+A=
)},checkNodes:function(A){var B=3DA;do{if(this.options.tags&&bkLib.inArra=
y(this.options.tags,B.nodeName)){this.activate();return true}}while(B=3DB=
.parentNode&&B.className!=3D"nicEdit");B=3D$BK(A);while(B.nodeType=3D=3D3=
){B=3D$BK(B.parentNode)}if(this.options.css){for(itm in this.options.css)=
{if(B.getStyle(itm,this.ne.selectedInstance.instanceDoc)=3D=3Dthis.option=
s.css[itm]){this.activate();return true}}}this.deactivate();return false}=
,activate:function(){if(!this.isDisabled){this.isActive=3Dtrue;this.updat=
eState();this.ne.fireEvent("buttonActivate",this)}},deactivate:function()=
{this.isActive=3Dfalse;this.updateState();if(!this.isDisabled){this.ne.fi=
reEvent("buttonDeactivate",this)}},enable:function(A,B){this.isDisabled=3D=
false;this.contain.setStyle({opacity:1}).addClass("buttonEnabled");this.u=
pdateState();this.checkNodes(B)},disable:function(A,B){this.isDisabled=3D=
true;this.contain.setStyle({opacity:0.6}).removeClass("buttonEnabled");th=
is.updateState()},toggleActive:function(){(this.isActive)?this.deactivate=
():this.activate()},hoverOn:function(){if(!this.isDisabled){this.isHover=3D=
true;this.updateState();this.ne.fireEvent("buttonOver",this)}},hoverOff:f=
unction(){this.isHover=3Dfalse;this.updateState();this.ne.fireEvent("butt=
onOut",this)},mouseClick:function(){if(this.options.command){this.ne.nicC=
ommand(this.options.command,this.options.commandArgs);if(!this.options.no=
Active){this.toggleActive()}}this.ne.fireEvent("buttonClick",this)},key:f=
unction(A,B){if(this.options.key&&B.ctrlKey&&String.fromCharCode(B.keyCod=
e||B.charCode).toLowerCase()=3D=3Dthis.options.key){this.mouseClick();if(=
B.preventDefault){B.preventDefault()}}}});
+var nicPlugin=3DbkClass.extend({construct:function(B,A){this.options=3DA=
;this.ne=3DB;this.ne.addEvent("panel",this.loadPanel.closure(this));this.=
init()},loadPanel:function(C){var B=3Dthis.options.buttons;for(var A in B=
){C.addButton(A,this.options)}C.reorder()},init:function(){}});
+
+
+var nicPaneOptions =3D { };
+
+var nicEditorPane=3DbkClass.extend({construct:function(D,C,B,A){this.ne=3D=
C;this.elm=3DD;this.pos=3DD.pos();this.contain=3Dnew bkElement("div").set=
Style({zIndex:"99999",overflow:"hidden",position:"absolute",left:this.pos=
[0]+"px",top:this.pos[1]+"px"});this.pane=3Dnew bkElement("div").setStyle=
({fontSize:"12px",border:"1px solid #ccc",overflow:"hidden",padding:"4px"=
,textAlign:"left",backgroundColor:"#ffffc9"}).addClass("pane").setStyle(B=
).appendTo(this.contain);if(A&&!A.options.noClose){this.close=3Dnew bkEle=
ment("div").setStyle({"float":"right",height:"16px",width:"16px",cursor:"=
pointer"}).setStyle(this.ne.getIcon("close",nicPaneOptions)).addEvent("mo=
usedown",A.removePane.closure(this)).appendTo(this.pane)}this.contain.noS=
elect().appendTo(document.body);this.position();this.init()},init:functio=
n(){},position:function(){if(this.ne.nicPanel){var B=3Dthis.ne.nicPanel.e=
lm;var A=3DB.pos();var C=3DA[0]+parseInt(B.getStyle("width"))-(parseInt(t=
his.pane.getStyle("width"))+8);if(C<this.pos[0]){this.contain.setStyle({l=
eft:C+"px"})}}},toggle:function(){this.isVisible=3D!this.isVisible;this.c=
ontain.setStyle({display:((this.isVisible)?"block":"none")})},remove:func=
tion(){if(this.contain){this.contain.remove();this.contain=3Dnull}},appen=
d:function(A){A.appendTo(this.pane)},setContent:function(A){this.pane.set=
Content(A)}});
+
+var nicEditorAdvancedButton=3DnicEditorButton.extend({init:function(){th=
is.ne.addEvent("selected",this.removePane.closure(this)).addEvent("blur",=
this.removePane.closure(this))},mouseClick:function(){if(!this.isDisabled=
){if(this.pane&&this.pane.pane){this.removePane()}else{this.pane=3Dnew ni=
cEditorPane(this.contain,this.ne,{width:(this.width||"270px"),backgroundC=
olor:"#fff"},this);this.addPane();this.ne.selectedInstance.saveRng()}}},a=
ddForm:function(C,G){this.form=3Dnew bkElement("form").addEvent("submit",=
this.submit.closureListener(this));this.pane.append(this.form);this.input=
s=3D{};for(itm in C){var D=3DC[itm];var F=3D"";if(G){F=3DG.getAttribute(i=
tm)}if(!F){F=3DD.value||""}var A=3DC[itm].type;if(A=3D=3D"title"){new bkE=
lement("div").setContent(D.txt).setStyle({fontSize:"14px",fontWeight:"bol=
d",padding:"0px",margin:"2px 0"}).appendTo(this.form)}else{var B=3Dnew bk=
Element("div").setStyle({overflow:"hidden",clear:"both"}).appendTo(this.f=
orm);if(D.txt){new bkElement("label").setAttributes({"for":itm}).setConte=
nt(D.txt).setStyle({margin:"2px 4px",fontSize:"13px",width:"50px",lineHei=
ght:"20px",textAlign:"right","float":"left"}).appendTo(B)}switch(A){case"=
text":this.inputs[itm]=3Dnew bkElement("input").setAttributes({id:itm,val=
ue:F,type:"text"}).setStyle({margin:"2px 0",fontSize:"13px","float":"left=
",height:"20px",border:"1px solid #ccc",overflow:"hidden"}).setStyle(D.st=
yle).appendTo(B);break;case"select":this.inputs[itm]=3Dnew bkElement("sel=
ect").setAttributes({id:itm}).setStyle({border:"1px solid #ccc","float":"=
left",margin:"2px 0"}).appendTo(B);for(opt in D.options){var E=3Dnew bkEl=
ement("option").setAttributes({value:opt,selected:(opt=3D=3DF)?"selected"=
:""}).setContent(D.options[opt]).appendTo(this.inputs[itm])}break;case"co=
ntent":this.inputs[itm]=3Dnew bkElement("textarea").setAttributes({id:itm=
}).setStyle({border:"1px solid #ccc","float":"left"}).setStyle(D.style).a=
ppendTo(B);this.inputs[itm].value=3DF}}}new bkElement("input").setAttribu=
tes({type:"submit"}).setStyle({backgroundColor:"#efefef",border:"1px soli=
d #ccc",margin:"3px 0","float":"left",clear:"both"}).appendTo(this.form);=
this.form.onsubmit=3DbkLib.cancelEvent},submit:function(){},findElm:funct=
ion(B,A,E){var D=3Dthis.ne.selectedInstance.getElm().getElementsByTagName=
(B);for(var C=3D0;C<D.length;C++){if(D[C].getAttribute(A)=3D=3DE){return =
$BK(D[C])}}},removePane:function(){if(this.pane){this.pane.remove();this.=
pane=3Dnull;this.ne.selectedInstance.restoreRng()}}});
+
+var nicButtonTips=3DbkClass.extend({construct:function(A){this.ne=3DA;A.=
addEvent("buttonOver",this.show.closure(this)).addEvent("buttonOut",this.=
hide.closure(this))},show:function(A){this.timer=3DsetTimeout(this.create=
.closure(this,A),400)},create:function(A){this.timer=3Dnull;if(!this.pane=
){this.pane=3Dnew nicEditorPane(A.button,this.ne,{fontSize:"12px",marginT=
op:"5px"});this.pane.setContent(A.options.name)}},hide:function(A){if(thi=
s.timer){clearTimeout(this.timer)}if(this.pane){this.pane=3Dthis.pane.rem=
ove()}}});nicEditors.registerPlugin(nicButtonTips);
+
+
+var nicSelectOptions =3D {
+	buttons : {
+		'fontSize' : {name : __('Select Font Size'), type : 'nicEditorFontSize=
Select', command : 'fontsize'},
+		'fontFamily' : {name : __('Select Font Family'), type : 'nicEditorFont=
FamilySelect', command : 'fontname'},
+		'fontFormat' : {name : __('Select Font Format'), type : 'nicEditorFont=
FormatSelect', command : 'formatBlock'}
+	}
+};
+
+var nicEditorSelect=3DbkClass.extend({construct:function(D,A,C,B){this.o=
ptions=3DC.buttons[A];this.elm=3DD;this.ne=3DB;this.name=3DA;this.selOpti=
ons=3Dnew Array();this.margin=3Dnew bkElement("div").setStyle({"float":"l=
eft",margin:"2px 1px 0 1px"}).appendTo(this.elm);this.contain=3Dnew bkEle=
ment("div").setStyle({width:"90px",height:"20px",cursor:"pointer",overflo=
w:"hidden"}).addClass("selectContain").addEvent("click",this.toggle.closu=
re(this)).appendTo(this.margin);this.items=3Dnew bkElement("div").setStyl=
e({overflow:"hidden",zoom:1,border:"1px solid #ccc",paddingLeft:"3px",bac=
kgroundColor:"#fff"}).appendTo(this.contain);this.control=3Dnew bkElement=
("div").setStyle({overflow:"hidden","float":"right",height:"18px",width:"=
16px"}).addClass("selectControl").setStyle(this.ne.getIcon("arrow",C)).ap=
pendTo(this.items);this.txt=3Dnew bkElement("div").setStyle({overflow:"hi=
dden","float":"left",width:"66px",height:"14px",marginTop:"1px",fontFamil=
y:"sans-serif",textAlign:"center",fontSize:"12px"}).addClass("selectTxt")=
.appendTo(this.items);if(!window.opera){this.contain.onmousedown=3Dthis.c=
ontrol.onmousedown=3Dthis.txt.onmousedown=3DbkLib.cancelEvent}this.margin=
.noSelect();this.ne.addEvent("selected",this.enable.closure(this)).addEve=
nt("blur",this.disable.closure(this));this.disable();this.init()},disable=
:function(){this.isDisabled=3Dtrue;this.close();this.contain.setStyle({op=
acity:0.6})},enable:function(A){this.isDisabled=3Dfalse;this.close();this=
.contain.setStyle({opacity:1})},setDisplay:function(A){this.txt.setConten=
t(A)},toggle:function(){if(!this.isDisabled){(this.pane)?this.close():thi=
s.open()}},open:function(){this.pane=3Dnew nicEditorPane(this.items,this.=
ne,{width:"88px",padding:"0px",borderTop:0,borderLeft:"1px solid #ccc",bo=
rderRight:"1px solid #ccc",borderBottom:"0px",backgroundColor:"#fff"});fo=
r(var C=3D0;C<this.selOptions.length;C++){var B=3Dthis.selOptions[C];var =
A=3Dnew bkElement("div").setStyle({overflow:"hidden",borderBottom:"1px so=
lid #ccc",width:"88px",textAlign:"left",overflow:"hidden",cursor:"pointer=
"});var D=3Dnew bkElement("div").setStyle({padding:"0px 4px"}).setContent=
(B[1]).appendTo(A).noSelect();D.addEvent("click",this.update.closure(this=
,B[0])).addEvent("mouseover",this.over.closure(this,D)).addEvent("mouseou=
t",this.out.closure(this,D)).setAttributes("id",B[0]);this.pane.append(A)=
;if(!window.opera){D.onmousedown=3DbkLib.cancelEvent}}},close:function(){=
if(this.pane){this.pane=3Dthis.pane.remove()}},over:function(A){A.setStyl=
e({backgroundColor:"#ccc"})},out:function(A){A.setStyle({backgroundColor:=
"#fff"})},add:function(B,A){this.selOptions.push(new Array(B,A))},update:=
function(A){this.ne.nicCommand(this.options.command,A);this.close()}});va=
r nicEditorFontSizeSelect=3DnicEditorSelect.extend({sel:{1:"1&nbsp;(8pt)"=
,2:"2&nbsp;(10pt)",3:"3&nbsp;(12pt)",4:"4&nbsp;(14pt)",5:"5&nbsp;(18pt)",=
6:"6&nbsp;(24pt)"},init:function(){this.setDisplay("Font&nbsp;Size...");f=
or(itm in this.sel){this.add(itm,'<font size=3D"'+itm+'">'+this.sel[itm]+=
"</font>")}}});var nicEditorFontFamilySelect=3DnicEditorSelect.extend({se=
l:{arial:"Arial","comic sans ms":"Comic Sans","courier new":"Courier New"=
,georgia:"Georgia",helvetica:"Helvetica",impact:"Impact","times new roman=
":"Times","trebuchet ms":"Trebuchet",verdana:"Verdana"},init:function(){t=
his.setDisplay("Font&nbsp;Family...");for(itm in this.sel){this.add(itm,'=
<font face=3D"'+itm+'">'+this.sel[itm]+"</font>")}}});var nicEditorFontFo=
rmatSelect=3DnicEditorSelect.extend({sel:{p:"Paragraph",pre:"Pre",h6:"Hea=
ding&nbsp;6",h5:"Heading&nbsp;5",h4:"Heading&nbsp;4",h3:"Heading&nbsp;3",=
h2:"Heading&nbsp;2",h1:"Heading&nbsp;1"},init:function(){this.setDisplay(=
"Font&nbsp;Format...");for(itm in this.sel){var A=3Ditm.toUpperCase();thi=
s.add("<"+A+">","<"+itm+' style=3D"padding: 0px; margin: 0px;">'+this.sel=
[itm]+"</"+A+">")}}});nicEditors.registerPlugin(nicPlugin,nicSelectOption=
s);
+
+
+var nicLinkOptions =3D {
+	buttons : {
+		'link' : {name : 'Add Link', type : 'nicLinkButton', tags : ['A']},
+		'unlink' : {name : 'Remove Link',  command : 'unlink', noActive : true=
}
+	}
+};
+
+var nicLinkButton=3DnicEditorAdvancedButton.extend({addPane:function(){t=
his.ln=3Dthis.ne.selectedInstance.selElm().parentTag("A");this.addForm({"=
":{type:"title",txt:"Add/Edit Link"},href:{type:"text",txt:"URL",value:"h=
ttp://",style:{width:"150px"}},title:{type:"text",txt:"Title"},target:{ty=
pe:"select",txt:"Open In",options:{"":"Current Window",_blank:"New Window=
"},style:{width:"100px"}}},this.ln)},submit:function(C){var A=3Dthis.inpu=
ts.href.value;if(A=3D=3D"http://"||A=3D=3D""){alert("You must enter a URL=
 to Create a Link");return false}this.removePane();if(!this.ln){var B=3D"=
javascript:nicTemp();";this.ne.nicCommand("createlink",B);this.ln=3Dthis.=
findElm("A","href",B)}if(this.ln){this.ln.setAttributes({href:this.inputs=
.href.value,title:this.inputs.title.value,target:this.inputs.target.optio=
ns[this.inputs.target.selectedIndex].value})}}});nicEditors.registerPlugi=
n(nicPlugin,nicLinkOptions);
+
+
+var nicColorOptions =3D {
+	buttons : {
+		'forecolor' : {name : __('Change Text Color'), type : 'nicEditorColorB=
utton', noClose : true},
+		'bgcolor' : {name : __('Change Background Color'), type : 'nicEditorBg=
ColorButton', noClose : true}
+	}
+};
+
+var nicEditorColorButton=3DnicEditorAdvancedButton.extend({addPane:funct=
ion(){var D=3D{0:"00",1:"33",2:"66",3:"99",4:"CC",5:"FF"};var H=3Dnew bkE=
lement("DIV").setStyle({width:"270px"});for(var A in D){for(var F in D){f=
or(var E in D){var I=3D"#"+D[A]+D[E]+D[F];var C=3Dnew bkElement("DIV").se=
tStyle({cursor:"pointer",height:"15px","float":"left"}).appendTo(H);var G=
=3Dnew bkElement("DIV").setStyle({border:"2px solid "+I}).appendTo(C);var=
 B=3Dnew bkElement("DIV").setStyle({backgroundColor:I,overflow:"hidden",w=
idth:"11px",height:"11px"}).addEvent("click",this.colorSelect.closure(thi=
s,I)).addEvent("mouseover",this.on.closure(this,G)).addEvent("mouseout",t=
his.off.closure(this,G,I)).appendTo(G);if(!window.opera){C.onmousedown=3D=
B.onmousedown=3DbkLib.cancelEvent}}}}this.pane.append(H.noSelect())},colo=
rSelect:function(A){this.ne.nicCommand("foreColor",A);this.removePane()},=
on:function(A){A.setStyle({border:"2px solid #000"})},off:function(A,B){A=
.setStyle({border:"2px solid "+B})}});var nicEditorBgColorButton=3DnicEdi=
torColorButton.extend({colorSelect:function(A){this.ne.nicCommand("hilite=
Color",A);this.removePane()}});nicEditors.registerPlugin(nicPlugin,nicCol=
orOptions);
+
+
+var nicImageOptions =3D {
+	buttons : {
+		'image' : {name : 'Add Image', type : 'nicImageButton', tags : ['IMG']=
}
+	}
+=09
+};
+
+var nicImageButton=3DnicEditorAdvancedButton.extend({addPane:function(){=
this.im=3Dthis.ne.selectedInstance.selElm().parentTag("IMG");this.addForm=
({"":{type:"title",txt:"Add/Edit Image"},src:{type:"text",txt:"URL",value=
:"http://",style:{width:"150px"}},alt:{type:"text",txt:"Alt Text",style:{=
width:"100px"}},align:{type:"select",txt:"Align",options:{none:"Default",=
left:"Left",right:"Right"}}},this.im)},submit:function(B){var C=3Dthis.in=
puts.src.value;if(C=3D=3D""||C=3D=3D"http://"){alert("You must enter a Im=
age URL to insert");return false}this.removePane();if(!this.im){var A=3D"=
javascript:nicImTemp();";this.ne.nicCommand("insertImage",A);this.im=3Dth=
is.findElm("IMG","src",A)}if(this.im){this.im.setAttributes({src:this.inp=
uts.src.value,alt:this.inputs.alt.value,align:this.inputs.align.value})}}=
});nicEditors.registerPlugin(nicPlugin,nicImageOptions);
+
+
+var nicSaveOptions =3D {
+	buttons : {
+		'save' : {name : __('Save this content'), type : 'nicEditorSaveButton'=
}
+	}
+};
+
+var nicEditorSaveButton=3DnicEditorButton.extend({init:function(){if(!th=
is.ne.options.onSave){this.margin.setStyle({display:"none"})}},mouseClick=
:function(){var B=3Dthis.ne.options.onSave;var A=3Dthis.ne.selectedInstan=
ce;B(A.getContent(),A.elm.id,A)}});nicEditors.registerPlugin(nicPlugin,ni=
cSaveOptions);
+
+
+var nicUploadOptions =3D {
+	buttons : {
+		'upload' : {name : 'Upload Image', type : 'nicUploadButton'}
+	}
+=09
+};
+
+var nicUploadButton=3DnicEditorAdvancedButton.extend({nicURI:"http://api=
.imgur.com/2/upload.json",errorText:"Failed to upload image",addPane:func=
tion(){if(typeof window.FormData=3D=3D=3D"undefined"){return this.onError=
("Image uploads are not supported in this browser, use Chrome, Firefox, o=
r Safari instead.")}this.im=3Dthis.ne.selectedInstance.selElm().parentTag=
("IMG");var A=3Dnew bkElement("div").setStyle({padding:"10px"}).appendTo(=
this.pane.pane);new bkElement("div").setStyle({fontSize:"14px",fontWeight=
:"bold",paddingBottom:"5px"}).setContent("Insert an Image").appendTo(A);t=
his.fileInput=3Dnew bkElement("input").setAttributes({type:"file"}).appen=
dTo(A);this.progress=3Dnew bkElement("progress").setStyle({width:"100%",d=
isplay:"none"}).setAttributes("max",100).appendTo(A);this.fileInput.oncha=
nge=3Dthis.uploadFile.closure(this)},onError:function(A){this.removePane(=
);alert(A||"Failed to upload image")},uploadFile:function(){var B=3Dthis.=
fileInput.files[0];if(!B||!B.type.match(/image.*/)){this.onError("Only im=
age files can be uploaded");return }this.fileInput.setStyle({display:"non=
e"});this.setProgress(0);var A=3Dnew FormData();A.append("image",B);A.app=
end("key","b7ea18a4ecbda8e92203fa4968d10660");var C=3Dnew XMLHttpRequest(=
);C.open("POST",this.ne.options.uploadURI||this.nicURI);C.onload=3Dfuncti=
on(){try{var D=3DJSON.parse(C.responseText)}catch(E){return this.onError(=
)}this.onUploaded(D.upload)}.closure(this);C.onerror=3Dthis.onError.closu=
re(this);C.upload.onprogress=3Dfunction(D){this.setProgress(D.loaded/D.to=
tal)}.closure(this);C.send(A)},setProgress:function(A){this.progress.setS=
tyle({display:"block"});if(A<0.98){this.progress.value=3DA}else{this.prog=
ress.removeAttribute("value")}},onUploaded:function(B){this.removePane();=
var D=3DB.links.original;if(!this.im){this.ne.selectedInstance.restoreRng=
();var C=3D"javascript:nicImTemp();";this.ne.nicCommand("insertImage",D);=
this.im=3Dthis.findElm("IMG","src",D)}var A=3DparseInt(this.ne.selectedIn=
stance.elm.getStyle("width"));if(this.im){this.im.setAttributes({src:D,wi=
dth:(A&&B.image.width)?Math.min(A,B.image.width):""})}}});nicEditors.regi=
sterPlugin(nicPlugin,nicUploadOptions);
+

Copied: phpcompta/trunk/html/js/nicEditorIcons.gif (from rev 5215, phpcom=
pta/tags/rel650/html/js/nicEditorIcons.gif)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-05-03 21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/html/js/scripts.js	2013-05-03 22:31:33 UTC (rev 5216)
@@ -23,6 +23,8 @@
  * \brief javascript script, always added to every page
  *
  */
+
+var ask_reload=3D0;
 /**
 * callback function when we just need to update a hidden div with an inf=
o
 * message
@@ -135,7 +137,7 @@
=20
 /**
  *@brief will reload the window but it is dangerous if we have submitted
- * a form
+ * a form with POST
  */
 function refresh_window()
 {
@@ -653,6 +655,13 @@
     {
         document.body.removeChild(g(elt));
     }
+	// if reloaded if asked the window will be reloaded when
+	// the box is closed
+	if ( ask_reload =3D=3D 1)
+	{
+		// avoid POST window.location =3D window.location.href;
+		window.location.reload();
+	}
 }
 /**
  *show a box while loading
@@ -664,6 +673,7 @@
 	obj=3D{
 		id:'wait_box',html:loading()
 		};
+	obj.style=3Dfixed_position(350,200)+";width:200px";
 	if ($('wait_box')){
 		removeDiv('wait_box');
 		}
@@ -892,6 +902,8 @@
     }
     var sid=3D'calc1';
     var shtml=3D'';
+	shtml+=3D'<div style=3D"float:right;height:10px;display:block;margin-to=
p:2px;margin-right:2px">	<a onclick=3D"removeDiv(\'calc1\');" href=3D"jav=
ascript:void(0)" id=3D"close_div">Fermer</a></div>';
+	shtml+=3D'<div>   <h2 class=3D"info">Calculatrice</h2></div>';
     shtml+=3D'<form name=3D"calc_line"  method=3D"GET" onSubmit=3D"cal()=
;return false;" >Calculatrice simplifi=C3=A9e: =C3=A9crivez simplement le=
s op=C3=A9rations que vous voulez puis la touche retour. exemple : 1+2+3*=
(1/5) <input class=3D"input_text" type=3D"text" size=3D"30" id=3D"inp" na=
me=3D"calculator"> <input type=3D"button" value=3D"Efface tout" class=3D"=
button" onClick=3D"Clean();return false;" > <input type=3D"button" class=3D=
"button" value=3D"Fermer" onClick=3D"removeDiv(\'calc1\')" >';
     shtml+=3D'</form><span id=3D"result">  </span><br><span id=3D"sub_to=
tal">  Taper une formule (ex 20*5.1) puis enter  </span><br><span id=3D"l=
isting"> </span>';
=20
@@ -1080,7 +1092,7 @@
 	var target=3D"search_op";
 	removeDiv(target);
 	var str_style=3Dfixed_position(77, 99);
-        str_style+=3D";width:80%";
+        str_style+=3D";width:92%;overflow:auto;";
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20
@@ -1184,7 +1196,7 @@
 						  $('detail_profile').innerHTML=3Dreq.responseText;
 						  req.responseText.evalScripts();
 						  $('detail_profile').show();
-						  profile_show('profile_gen_div');
+						  if ( profile_id !=3D "-1" ) profile_show('profile_gen_div');
 					  }
 				  }
 				);
@@ -1248,11 +1260,12 @@
 }
 function add_menu(obj)
 {
-	pdossier=3Dobj.dossier;
-	p_id=3Dobj.p_id
+	var pdossier=3Dobj.dossier;
+	var p_id=3Dobj.p_id;
+	var p_type=3Dobj.type;
 	waiting_box();
 	removeDiv('divdm'+p_id);
-	var qs=3D"op=3Dadd_menu&gDossier=3D"+pdossier+"&p_id=3D"+p_id+"&ctl=3Dd=
ivdm"+p_id;
+	var qs=3D"op=3Dadd_menu&gDossier=3D"+pdossier+"&p_id=3D"+p_id+"&ctl=3Dd=
ivdm"+p_id+"&type=3D"+p_type;
 	var pos=3Dfixed_position(250,150);
 	var action=3Dnew Ajax.Request ( 'ajax_misc.php',
 				  {
@@ -1626,4 +1639,77 @@
 				      }
 				  }
 				  );
+}
+/**
+ * @brief check if the parameter is a valid a valid date or not, returns=
 true if it is valid otherwise
+ * false
+ * @parameter p_str_date the string of the date (format DD.MM.YYYY)
+ */
+function check_date(p_str_date)
+{
+    var format =3D /^\d{2}\.\d{2}\.\d{4}$/;
+    if(!format.test(p_str_date)){
+	return false;
+    }
+    else{
+	var date_temp =3D p_str_date.split('.');
+        var nMonth=3DparseFloat(date_temp[1])-1;
+	var ma_date =3D new Date(date_temp[2], nMonth, date_temp[0]);
+	if(ma_date.getFullYear()=3D=3Ddate_temp[2] && ma_date.getMonth()=3D=3Dn=
Month && ma_date.getDate()=3D=3Ddate_temp[0]){
+	    return true;
+	}
+	else{
+	    return false;
+	}
+    }
+
+}
+/**
+ * @brief get the string in the id and check if the date is valid
+ * @parameter p_id_date is the id of the element to check
+ * @return true if the date is valid
+ * @see check_date
+ */
+function check_date_id(p_id_date)
+{
+	var str_date=3D$(p_id_date).value;
+	return check_date(str_date);
+}
+/**
+ *
+ * @param ag_id to view
+ * @param dossier is the folder
+ * @param modify : show the modify button values : 0 for no 1 for yes
+ */
+function view_action(ag_id,dossier,modify)
+{
+	waiting_box();
+	layer++;
+	id =3D 'action' + layer;
+
+	querystring =3D 'gDossier=3D' + dossier + '&op=3Dvw_action&ag_id=3D' + =
ag_id + '&div=3D' + id+'&mod=3D'+modify;
+	var action =3D new Ajax.Request(
+			"ajax_misc.php",
+			{
+				method: 'get',
+				parameters: querystring,
+				onFailure: error_box,
+				onSuccess: function(req) {
+					try {
+						remove_waiting_box();
+						var pos =3D fixed_position(0, 50) + ";width:90%;left:5%;";
+						add_div({
+							id: id,
+							drag: 1,
+							cssclass: "inner_box",
+							style: pos
+						});
+						$(id).innerHTML =3D req.responseText;
+						compute_all_ledger();
+					} catch (e) {
+						alert(e.message);
+					}
+				}
+			}
+	);
 }
\ No newline at end of file

Copied: phpcompta/trunk/html/js/sorttable.js (from rev 5215, phpcompta/ta=
gs/rel650/html/js/sorttable.js)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/sorttable.js	                        (rev 0)
+++ phpcompta/trunk/html/js/sorttable.js	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -0,0 +1,515 @@
+/**
+ *
+  SortTable
+  version 2
+  7th April 2007
+  Stuart Langridge, http://www.kryogenix.org/code/browser/sorttable/
+
+  Instructions:
+  Download this file
+  Add <script src=3D"sorttable.js"></script> to your HTML
+  Add class=3D"sortable" to any table you'd like to make sortable
+  Click on the headers to sort
+
+  Thanks to many, many people for contributions and suggestions.
+  Licenced as X11: http://www.kryogenix.org/code/browser/licence.html
+  This basically means: do what you want with it.
+
+@note
+Documentation http://www.kryogenix.org/code/browser/sorttable/
+
+Show the default order
+example:
+<th class=3D" sorttable_sorted_reverse">
+....<span id=3D"sorttable_sortrevind">&nbsp;&blacktriangle;</span>
+<th class=3D" sorttable_sorted">
+....<span id=3D"sorttable_sortfwdind">&nbsp;&nbsp;&#x25BE;</span>
+
+Sort on date
+<td sorttable_customkey=3D"<?=3D$row_bank['b_date']?>"> // format YYYYMM=
DD
+
+force as numeric (normally useless):
+<th class=3D"sorttable_numeric">Part number</th>
+
+To avoid the sort on the last row, use tfoot
+
+*/
+
+
+var stIsIE =3D /*@cc_on!@*/false;
+
+sorttable =3D {
+  init: function() {
+    // quit if this function has already been called
+    if (arguments.callee.done) return;
+    // flag this function so we don't do the same thing twice
+    arguments.callee.done =3D true;
+    // kill the timer
+    if (_timer) clearInterval(_timer);
+
+    if (!document.createElement || !document.getElementsByTagName) retur=
n;
+
+    sorttable.DATE_RE =3D /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/;
+
+    forEach(document.getElementsByTagName('table'), function(table) {
+      if (table.className.search(/\bsortable\b/) !=3D -1) {
+        sorttable.makeSortable(table);
+      }
+    });
+
+  },
+
+  makeSortable: function(table) {
+    if (table.getElementsByTagName('thead').length =3D=3D 0) {
+      // table doesn't have a tHead. Since it should have, create one an=
d
+      // put the first table row in it.
+      the =3D document.createElement('thead');
+      the.appendChild(table.rows[0]);
+      table.insertBefore(the,table.firstChild);
+    }
+    // Safari doesn't support table.tHead, sigh
+    if (table.tHead =3D=3D null) table.tHead =3D table.getElementsByTagN=
ame('thead')[0];
+
+    if (table.tHead.rows.length !=3D 1) return; // can't cope with two h=
eader rows
+
+    // Sorttable v1 put rows with a class of "sortbottom" at the bottom =
(as
+    // "total" rows, for example). This is B&R, since what you're suppos=
ed
+    // to do is put them in a tfoot. So, if there are sortbottom rows,
+    // for backwards compatibility, move them to tfoot (creating it if n=
eeded).
+    sortbottomrows =3D [];
+    for (var i=3D0; i<table.rows.length; i++) {
+      if (table.rows[i].className.search(/\bsortbottom\b/) !=3D -1) {
+        sortbottomrows[sortbottomrows.length] =3D table.rows[i];
+      }
+    }
+    if (sortbottomrows) {
+      if (table.tFoot =3D=3D null) {
+        // table doesn't have a tfoot. Create one.
+        tfo =3D document.createElement('tfoot');
+        table.appendChild(tfo);
+      }
+      for (var i=3D0; i<sortbottomrows.length; i++) {
+        tfo.appendChild(sortbottomrows[i]);
+      }
+      delete sortbottomrows;
+    }
+
+    // work through each column and calculate its type
+    headrow =3D table.tHead.rows[0].cells;
+    for (var i=3D0; i<headrow.length; i++) {
+      // manually override the type with a sorttable_type attribute
+      if (!headrow[i].className.match(/\bsorttable_nosort\b/)) { // skip=
 this col
+        mtch =3D headrow[i].className.match(/\bsorttable_([a-z0-9]+)\b/)=
;
+        if (mtch) { override =3D mtch[1]; }
+	      if (mtch && typeof sorttable["sort_"+override] =3D=3D 'function')=
 {
+	        headrow[i].sorttable_sortfunction =3D sorttable["sort_"+overrid=
e];
+	      } else {
+	        headrow[i].sorttable_sortfunction =3D sorttable.guessType(table=
,i);
+	      }
+	      // make it clickable to sort
+	      headrow[i].sorttable_columnindex =3D i;
+	      headrow[i].sorttable_tbody =3D table.tBodies[0];
+	      dean_addEvent(headrow[i],"click", function(e) {
+
+          if (this.className.search(/\bsorttable_sorted\b/) !=3D -1) {
+            // if we're already sorted by this column, just
+            // reverse the table, which is quicker
+            sorttable.reverse(this.sorttable_tbody);
+            this.className =3D this.className.replace('sorttable_sorted'=
,
+                                                    'sorttable_sorted_re=
verse');
+            this.removeChild(document.getElementById('sorttable_sortfwdi=
nd'));
+            sortrevind =3D document.createElement('span');
+            sortrevind.id =3D "sorttable_sortrevind";
+            sortrevind.innerHTML =3D stIsIE ? '&nbsp<font face=3D"webdin=
gs">5</font>' : '&nbsp;&#x25B4;';
+            this.appendChild(sortrevind);
+            return;
+          }
+          if (this.className.search(/\bsorttable_sorted_reverse\b/) !=3D=
 -1) {
+            // if we're already sorted by this column in reverse, just
+            // re-reverse the table, which is quicker
+            sorttable.reverse(this.sorttable_tbody);
+            this.className =3D this.className.replace('sorttable_sorted_=
reverse',
+                                                    'sorttable_sorted');
+            this.removeChild(document.getElementById('sorttable_sortrevi=
nd'));
+            sortfwdind =3D document.createElement('span');
+            sortfwdind.id =3D "sorttable_sortfwdind";
+            sortfwdind.innerHTML =3D stIsIE ? '&nbsp<font face=3D"webdin=
gs">6</font>' : '&nbsp;&#x25BE;';
+            this.appendChild(sortfwdind);
+            return;
+          }
+
+          // remove sorttable_sorted classes
+          theadrow =3D this.parentNode;
+          forEach(theadrow.childNodes, function(cell) {
+            if (cell.nodeType =3D=3D 1) { // an element
+              cell.className =3D cell.className.replace('sorttable_sorte=
d_reverse','');
+              cell.className =3D cell.className.replace('sorttable_sorte=
d','');
+            }
+          });
+          sortfwdind =3D document.getElementById('sorttable_sortfwdind')=
;
+          if (sortfwdind) { sortfwdind.parentNode.removeChild(sortfwdind=
); }
+          sortrevind =3D document.getElementById('sorttable_sortrevind')=
;
+          if (sortrevind) { sortrevind.parentNode.removeChild(sortrevind=
); }
+
+          this.className +=3D ' sorttable_sorted';
+          sortfwdind =3D document.createElement('span');
+          sortfwdind.id =3D "sorttable_sortfwdind";
+          sortfwdind.innerHTML =3D stIsIE ? '&nbsp<font face=3D"webdings=
">6</font>' : '&nbsp;&#x25BE;';
+          this.appendChild(sortfwdind);
+
+	        // build an array to sort. This is a Schwartzian transform thin=
g,
+	        // i.e., we "decorate" each row with the actual sort key,
+	        // sort based on the sort keys, and then put the rows back in o=
rder
+	        // which is a lot faster because you only do getInnerText once =
per row
+	        row_array =3D [];
+	        col =3D this.sorttable_columnindex;
+	        rows =3D this.sorttable_tbody.rows;
+	        for (var j=3D0; j<rows.length; j++) {
+	          row_array[row_array.length] =3D [sorttable.getInnerText(rows[=
j].cells[col]), rows[j]];
+	        }
+	        /* If you want a stable sort, uncomment the following line */
+	        //sorttable.shaker_sort(row_array, this.sorttable_sortfunction)=
;
+	        /* and comment out this one */
+	        row_array.sort(this.sorttable_sortfunction);
+
+	        tb =3D this.sorttable_tbody;
+	        for (var j=3D0; j<row_array.length; j++) {
+	          tb.appendChild(row_array[j][1]);
+	        }
+
+	        delete row_array;
+	      });
+	    }
+    }
+  },
+
+  guessType: function(table, column) {
+    // guess the type of a column based on its first non-blank row
+    sortfn =3D sorttable.sort_alpha;
+    for (var i=3D0; i<table.tBodies[0].rows.length; i++) {
+      text =3D sorttable.getInnerText(table.tBodies[0].rows[i].cells[col=
umn]);
+      if (text !=3D '') {
+        if (text.match(/^-?[=EF=BF=BD$=EF=BF=BD]?[\d,.]+%?$/)) {
+          return sorttable.sort_numeric;
+        }
+        // check for a date: dd/mm/yyyy or dd/mm/yy
+        // can have / or . or - as separator
+        // can be mm/dd as well
+        possdate =3D text.match(sorttable.DATE_RE)
+        if (possdate) {
+          // looks like a date
+          first =3D parseInt(possdate[1]);
+          second =3D parseInt(possdate[2]);
+          if (first > 12) {
+            // definitely dd/mm
+            return sorttable.sort_ddmm;
+          } else if (second > 12) {
+            return sorttable.sort_mmdd;
+          } else {
+            // looks like a date, but we can't tell which, so assume
+            // that it's dd/mm (English imperialism!) and keep looking
+            sortfn =3D sorttable.sort_ddmm;
+          }
+        }
+      }
+    }
+    return sortfn;
+  },
+
+  getInnerText: function(node) {
+    // gets the text we want to use for sorting for a cell.
+    // strips leading and trailing whitespace.
+    // this is *not* a generic getInnerText function; it's special to so=
rttable.
+    // for example, you can override the cell text with a customkey attr=
ibute.
+    // it also gets .value for <input> fields.
+
+    if (!node) return "";
+
+    hasInputs =3D (typeof node.getElementsByTagName =3D=3D 'function') &=
&
+                 node.getElementsByTagName('input').length;
+
+    if (node.getAttribute("sorttable_customkey") !=3D null) {
+      return node.getAttribute("sorttable_customkey");
+    }
+    else if (typeof node.textContent !=3D 'undefined' && !hasInputs) {
+      return node.textContent.replace(/^\s+|\s+$/g, '');
+    }
+    else if (typeof node.innerText !=3D 'undefined' && !hasInputs) {
+      return node.innerText.replace(/^\s+|\s+$/g, '');
+    }
+    else if (typeof node.text !=3D 'undefined' && !hasInputs) {
+      return node.text.replace(/^\s+|\s+$/g, '');
+    }
+    else {
+      switch (node.nodeType) {
+        case 3:
+          if (node.nodeName.toLowerCase() =3D=3D 'input') {
+            return node.value.replace(/^\s+|\s+$/g, '');
+          }
+        case 4:
+          return node.nodeValue.replace(/^\s+|\s+$/g, '');
+          break;
+        case 1:
+        case 11:
+          var innerText =3D '';
+          for (var i =3D 0; i < node.childNodes.length; i++) {
+            innerText +=3D sorttable.getInnerText(node.childNodes[i]);
+          }
+          return innerText.replace(/^\s+|\s+$/g, '');
+          break;
+        default:
+          return '';
+      }
+    }
+  },
+
+  reverse: function(tbody) {
+    // reverse the rows in a tbody
+    newrows =3D [];
+    for (var i=3D0; i<tbody.rows.length; i++) {
+      newrows[newrows.length] =3D tbody.rows[i];
+    }
+    for (var i=3Dnewrows.length-1; i>=3D0; i--) {
+       tbody.appendChild(newrows[i]);
+    }
+    delete newrows;
+  },
+
+  /* sort functions
+     each sort function takes two parameters, a and b
+     you are comparing a[0] and b[0] */
+  sort_numeric: function(a,b) {
+    aa =3D parseFloat(a[0].replace(/[^0-9.-]/g,''));
+    if (isNaN(aa)) aa =3D 0;
+    bb =3D parseFloat(b[0].replace(/[^0-9.-]/g,''));
+    if (isNaN(bb)) bb =3D 0;
+    return aa-bb;
+  },
+  sort_alpha: function(a,b) {
+    if (a[0]=3D=3Db[0]) return 0;
+    if (a[0]<b[0]) return -1;
+    return 1;
+  },
+  sort_ddmm: function(a,b) {
+    mtch =3D a[0].match(sorttable.DATE_RE);
+    y =3D mtch[3]; m =3D mtch[2]; d =3D mtch[1];
+    if (m.length =3D=3D 1) m =3D '0'+m;
+    if (d.length =3D=3D 1) d =3D '0'+d;
+    dt1 =3D y+m+d;
+    mtch =3D b[0].match(sorttable.DATE_RE);
+    y =3D mtch[3]; m =3D mtch[2]; d =3D mtch[1];
+    if (m.length =3D=3D 1) m =3D '0'+m;
+    if (d.length =3D=3D 1) d =3D '0'+d;
+    dt2 =3D y+m+d;
+    if (dt1=3D=3Ddt2) return 0;
+    if (dt1<dt2) return -1;
+    return 1;
+  },
+  sort_mmdd: function(a,b) {
+    mtch =3D a[0].match(sorttable.DATE_RE);
+    y =3D mtch[3]; d =3D mtch[2]; m =3D mtch[1];
+    if (m.length =3D=3D 1) m =3D '0'+m;
+    if (d.length =3D=3D 1) d =3D '0'+d;
+    dt1 =3D y+m+d;
+    mtch =3D b[0].match(sorttable.DATE_RE);
+    y =3D mtch[3]; d =3D mtch[2]; m =3D mtch[1];
+    if (m.length =3D=3D 1) m =3D '0'+m;
+    if (d.length =3D=3D 1) d =3D '0'+d;
+    dt2 =3D y+m+d;
+    if (dt1=3D=3Ddt2) return 0;
+    if (dt1<dt2) return -1;
+    return 1;
+  },
+
+  shaker_sort: function(list, comp_func) {
+    // A stable sort function to allow multi-level sorting of data
+    // see: http://en.wikipedia.org/wiki/Cocktail_sort
+    // thanks to Joseph Nahmias
+    var b =3D 0;
+    var t =3D list.length - 1;
+    var swap =3D true;
+
+    while(swap) {
+        swap =3D false;
+        for(var i =3D b; i < t; ++i) {
+            if ( comp_func(list[i], list[i+1]) > 0 ) {
+                var q =3D list[i]; list[i] =3D list[i+1]; list[i+1] =3D =
q;
+                swap =3D true;
+            }
+        } // for
+        t--;
+
+        if (!swap) break;
+
+        for(var i =3D t; i > b; --i) {
+            if ( comp_func(list[i], list[i-1]) < 0 ) {
+                var q =3D list[i]; list[i] =3D list[i-1]; list[i-1] =3D =
q;
+                swap =3D true;
+            }
+        } // for
+        b++;
+
+    } // while(swap)
+  }
+}
+
+/* ******************************************************************
+   Supporting functions: bundled here to avoid depending on a library
+   ****************************************************************** */
+
+// Dean Edwards/Matthias Miller/John Resig
+
+/* for Mozilla/Opera9 */
+if (document.addEventListener) {
+    document.addEventListener("DOMContentLoaded", sorttable.init, false)=
;
+}
+
+/* for Internet Explorer */
+/*@cc_on @*/
+/*@if (@_win32)
+    document.write("<script id=3D__ie_onload defer src=3Djavascript:void=
(0)><\/script>");
+    var script =3D document.getElementById("__ie_onload");
+    script.onreadystatechange =3D function() {
+        if (this.readyState =3D=3D "complete") {
+            sorttable.init(); // call the onload handler
+        }
+    };
+/*@end @*/
+
+/* for Safari */
+if (/WebKit/i.test(navigator.userAgent)) { // sniff
+    var _timer =3D setInterval(function() {
+        if (/loaded|complete/.test(document.readyState)) {
+            sorttable.init(); // call the onload handler
+        }
+    }, 10);
+}
+
+/* for other browsers */
+window.onload =3D sorttable.init;
+
+// written by Dean Edwards, 2005
+// with input from Tino Zijdel, Matthias Miller, Diego Perini
+
+// http://dean.edwards.name/weblog/2005/10/add-event/
+
+function dean_addEvent(element, type, handler) {
+	if (element.addEventListener) {
+		element.addEventListener(type, handler, false);
+	} else {
+		// assign each event handler a unique ID
+		if (!handler.$$guid) handler.$$guid =3D dean_addEvent.guid++;
+		// create a hash table of event types for the element
+		if (!element.events) element.events =3D {};
+		// create a hash table of event handlers for each element/event pair
+		var handlers =3D element.events[type];
+		if (!handlers) {
+			handlers =3D element.events[type] =3D {};
+			// store the existing event handler (if there is one)
+			if (element["on" + type]) {
+				handlers[0] =3D element["on" + type];
+			}
+		}
+		// store the event handler in the hash table
+		handlers[handler.$$guid] =3D handler;
+		// assign a global event handler to do all the work
+		element["on" + type] =3D handleEvent;
+	}
+};
+// a counter used to create unique IDs
+dean_addEvent.guid =3D 1;
+
+function removeEvent(element, type, handler) {
+	if (element.removeEventListener) {
+		element.removeEventListener(type, handler, false);
+	} else {
+		// delete the event handler from the hash table
+		if (element.events && element.events[type]) {
+			delete element.events[type][handler.$$guid];
+		}
+	}
+};
+
+function handleEvent(event) {
+	var returnValue =3D true;
+	// grab the event object (IE uses a global event object)
+	event =3D event || fixEvent(((this.ownerDocument || this.document || th=
is).parentWindow || window).event);
+	// get a reference to the hash table of event handlers
+	var handlers =3D this.events[event.type];
+	// execute each event handler
+	for (var i in handlers) {
+		this.$$handleEvent =3D handlers[i];
+		if (this.$$handleEvent(event) =3D=3D=3D false) {
+			returnValue =3D false;
+		}
+	}
+	return returnValue;
+};
+
+function fixEvent(event) {
+	// add W3C standard event methods
+	event.preventDefault =3D fixEvent.preventDefault;
+	event.stopPropagation =3D fixEvent.stopPropagation;
+	return event;
+};
+fixEvent.preventDefault =3D function() {
+	this.returnValue =3D false;
+};
+fixEvent.stopPropagation =3D function() {
+  this.cancelBubble =3D true;
+}
+
+// Dean's forEach: http://dean.edwards.name/base/forEach.js
+/*
+	forEach, version 1.0
+	Copyright 2006, Dean Edwards
+	License: http://www.opensource.org/licenses/mit-license.php
+*/
+
+// array-like enumeration
+if (!Array.forEach) { // mozilla already supports this
+	Array.forEach =3D function(array, block, context) {
+		for (var i =3D 0; i < array.length; i++) {
+			block.call(context, array[i], i, array);
+		}
+	};
+}
+
+// generic enumeration
+Function.prototype.forEach =3D function(object, block, context) {
+	for (var key in object) {
+		if (typeof this.prototype[key] =3D=3D "undefined") {
+			block.call(context, object[key], key, object);
+		}
+	}
+};
+
+// character enumeration
+String.forEach =3D function(string, block, context) {
+	Array.forEach(string.split(""), function(chr, index) {
+		block.call(context, chr, index, string);
+	});
+};
+
+// globally resolve forEach enumeration
+var forEach =3D function(object, block, context) {
+	if (object) {
+		var resolve =3D Object; // default
+		if (object instanceof Function) {
+			// functions have a "length" property
+			resolve =3D Function;
+		} else if (object.forEach instanceof Function) {
+			// the object implements a custom forEach method so use that
+			object.forEach(block, context);
+			return;
+		} else if (typeof object =3D=3D "string") {
+			// the object is a string
+			resolve =3D String;
+		} else if (typeof object.length =3D=3D "number") {
+			// the object is array-like
+			resolve =3D Array;
+		}
+		resolve.forEach(object, block, context);
+	}
+};
+

Modified: phpcompta/trunk/html/show_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_document.php	2013-05-03 21:56:40 UTC (rev 5=
215)
+++ phpcompta/trunk/html/show_document.php	2013-05-03 22:31:33 UTC (rev 5=
216)
@@ -20,7 +20,7 @@
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 // Verify parameters
-/* ! \file
+/** \file
  * \brief retrieve a document
  */
=20

Modified: phpcompta/trunk/html/style-color.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-color.css	2013-05-03 21:56:40 UTC (rev 521=
5)
+++ phpcompta/trunk/html/style-color.css	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -13,7 +13,7 @@
 	font-style: italic;
 }
=20
-table.table_large, table.result  ,table.resultfooter {
+table.sortable, table.table_large, table.result  ,table.resultfooter {
 	color:blue;
 	/* border:blue solid 1px; */
 	width:100%;
@@ -27,7 +27,7 @@
=20
=20
 }
-table.table_large th,table.result th {
+table.sortable th, table.table_large th,table.result th {
 	font-weight:bold;
 	font-family:verdana,helvetica,sans-serif;
 	border-bottom:1px solid blue;
@@ -104,11 +104,6 @@
 	font-size:14px;
 }
=20
-h1.title {
-	color: blue;
-	font-size:25px;
-}
-
 div.u_tmenu {
 	margin-top:0px;
 	width:100%;
@@ -555,7 +550,7 @@
 	margin:1px;
 	background-color: orange;
 }
-legend {
+h1.legend, legend {
 	font-weight: bold;
 	font-style: italic;
 	font-size: 120% ;
@@ -945,14 +940,14 @@
 	position:absolute;
 	border:1px solid black;
 	top:15%;left:100;
-	margin-left:25%
-		z-index:2;
+	margin-left:25%;
+	z-index:2;
 	width:50%;
 	display:none;
 	background-color:#e4e7ed;
 }
=20
-table.table_large td, table.result td
+table.sortable td,table.table_large td, table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -1117,4 +1112,40 @@
 div.foldercontent {
 	width:80%;
 	margin-left:10%;
-	}
\ No newline at end of file
+	}
+h1.title {
+	color: #046fff;
+	font-size:24px;
+	font-style: italic;
+}
+h2.title {
+	color: #046fff;
+	font-size:16px;
+	font-style: italic;
+	margin-left: 15px;
+}
+h3.title {
+	color: #046fff;
+	font-size:14px;
+	margin-left: 30px;
+}
+h4.title {
+	color: #046fff;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: underline;
+}
+h5.title {
+	color: #046fff;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: none;
+	font-style: italic;
+}
+div.myfieldset
+{
+	margin-top: 5px;
+	margin-left:5px;
+	margin-right: 5px;
+	border:lightgrey 2px groove;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-epad.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-epad.css	2013-05-03 21:56:40 UTC (rev 5215=
)
+++ phpcompta/trunk/html/style-epad.css	2013-05-03 22:31:33 UTC (rev 5216=
)
@@ -13,7 +13,7 @@
 	font-style: italic;
 }
=20
-table.table_large, table.result  ,table.resultfooter {
+table.table_large, table.result  ,table.resultfooter,table.sortable  {
 	color:blue;
 	/* border:blue solid 1px; */
 	width:100%;
@@ -27,7 +27,7 @@
=20
=20
 }
-table.table_large th,table.result th {
+table.table_large th,table.result th,table.sortable th {
 	font-weight:bold;
 	font-family:verdana,helvetica,sans-serif;
 	border-bottom:1px solid blue;
@@ -104,11 +104,6 @@
 	font-size:16px;
 }
=20
-h1.title {
-	color: blue;
-	font-size:27px;
-}
-
 div.u_tmenu {
 	margin-top:0px;
 	width:100%;
@@ -555,7 +550,7 @@
 	margin:1px;
 	background-color: orange;
 }
-legend {
+h1.legend,legend {
 	font-weight: bold;
 	font-style: italic;
 	font-size: 120% ;
@@ -947,7 +942,7 @@
 	background-color:#e4e7ed;
 }
=20
-table.table_large td, table.result td
+table.table_large td, table.result td,table.sortable td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -1104,4 +1099,40 @@
 	display:inline;
 	float:left;
 	top:0px;
+}
+h1.title {
+	color: #046fff;
+	font-size:30px;
+	font-style: italic;
+}
+h2.title {
+	color: #046fff;
+	font-size:24px;
+	font-style: italic;
+	margin-left: 15px;
+}
+h3.title {
+	color: #046fff;
+	font-size:16px;
+	margin-left: 30px;
+}
+h4.title {
+	color: blue;
+	font-size:14px;
+	margin-left: 45px;
+	text-decoration: underline;
+}
+h5.title {
+	color: blue;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: none;
+	font-style: italic;
+}
+div.myfieldset
+{
+	margin-top: 5px;
+	margin-left:5px;
+	margin-right: 5px;
+	border:lightgrey 2px groove;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2013-05-03 21:56:40 UTC (rev 521=
5)
+++ phpcompta/trunk/html/style-light.css	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -9,11 +9,12 @@
 	color:blue;
 }
 .notice {
+	background: white;
 	color:red;
 	font-style: italic;
 }
=20
-table.table_large, table.result  ,table.resultfooter {
+table.sortable, table.table_large, table.result  ,table.resultfooter {
 	color:blue;
 	/* border:blue solid 1px; */
 	width:100%;
@@ -24,10 +25,9 @@
 table.resultfooter tfoot {
 	font-size:110%;
 	font-weight: bold;
+}
=20
-
-}
-table.table_large th,table.result th {
+table.table_large th,table.result th ,table.sortable th{
 	font-weight:bold;
 	font-family:verdana,helvetica,sans-serif;
 	border-bottom:1px solid blue;
@@ -86,7 +86,7 @@
 h3.info {
 	background:#879ed4;
 	color:white;
-	font-size:14px;
+	font-size:12px;
 	text-align:center;
 }
=20
@@ -104,11 +104,6 @@
 	font-size:14px;
 }
=20
-h1.title {
-	color: blue;
-	font-size:25px;
-}
-
 div.u_tmenu {
 	margin-top:0px;
 	width:100%;
@@ -550,7 +545,7 @@
 	margin:1px;
 	background-color: orange;
 }
-legend {
+h1.legend, legend {
 	font-weight: bold;
 	font-style: italic;
 	font-size: 120% ;
@@ -947,7 +942,7 @@
 	background-color:#e4e7ed;
 }
=20
-table.table_large td, table.result td
+table.table_large td, table.result td,table.sortable td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -1108,4 +1103,41 @@
 }
 div.foldercontent {
 	padding:20px 30px 0px 40px;
-	}
\ No newline at end of file
+	}
+
+h1.title {
+	color: #046fff;
+	font-size:24px;
+	font-style: italic;
+}
+h2.title {
+	color: #046fff;
+	font-size:16px;
+	font-style: italic;
+	margin-left: 15px;
+}
+h3.title {
+	color: #046fff;
+	font-size:14px;
+	margin-left: 30px;
+}
+h4.title {
+	color: #046fff;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: underline;
+}
+h5.title {
+	color: #046fff;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: none;
+	font-style: italic;
+}
+div.myfieldset
+{
+	margin-top: 5px;
+	margin-left:5px;
+	margin-right: 5px;
+	border:lightgrey 2px groove;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-print.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-print.css	2013-05-03 21:56:40 UTC (rev 521=
5)
+++ phpcompta/trunk/html/style-print.css	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -1,13 +1,15 @@
 body {
-	font-size:7px;
+	font-size:8px;
 	}
-select ,.input_text{
+input, select ,.input_text{
+	font-size:8px;
 border:1px solid #FFFFFF;
  }
 form {
   display:none;
  }
 .print {
+	font-size:8px;
 	display: block;
 	}
 .noprint  {
@@ -30,6 +32,11 @@
 	font-size:7px;
 	font-family:sans-serif;
 }
+h3,h4 {
+	font-size:10px;
+	text-decoration: underline;
+	font-family:sans-serif;
+}
=20
 h2 {
 	font-size:12px;
@@ -42,7 +49,7 @@
 .content  {
 	font-size:7px;
 }
-h1.content,h1,h2.info {
+h1.content,h1,h2.info,legend {
 	font-size:14px;
 	font-weight:bold;
 	font-family:sans-serif;
@@ -244,6 +251,39 @@
 }
 .num {
 	text-align:right;
+	font-size:8px;
 }
-
+h1.title {
+	font-size:24px;
+	font-style: italic;
+}
+h2.title {
+	font-size:16px;
+	font-style: italic;
+	margin-left: 15px;
+}
+h3.title {
+	font-size:14px;
+	margin-left: 30px;
+}
+h4.title {
+	color: blue;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: underline;
+}
+h5.title {
+	color: blue;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: none;
+	font-style: italic;
+}
 /* </style> */
+div.myfieldset
+{
+	margin-top: 5px;
+	margin-left:5px;
+	margin-right: 5px;
+	border:lightgrey 2px groove;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-test.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-test.css	2013-05-03 21:56:40 UTC (rev 5215=
)
+++ phpcompta/trunk/html/style-test.css	2013-05-03 22:31:33 UTC (rev 5216=
)
@@ -1,6 +1,6 @@
 span.tmenu {
-	   padding-left:20px;=20
-	   padding-right:20px;=20
+	   padding-left:20px;
+	   padding-right:20px;
 	   border:solid 1px blue;
 	   background-color: #6699dd ;
 }
@@ -14,8 +14,7 @@
 	  width:150px;
 }
 a.tmenu:link {
-	   background-color: #6699dd ;=09
-//	    color:#683af2;
+	   background-color: #6699dd ;
 	    color:white;
 	    }
 a.tmenu:visited {
@@ -47,7 +46,7 @@
 }
 div.ddownload {
 	      color:white;
-	      background-color:#6699dd ;=09
+	      background-color:#6699dd ;
 }
 div.content {
 	    margin-left:10%;
@@ -60,7 +59,7 @@
    color:blue;
    background-color:white;
 }
-table.result td=20
+table.sortable td,table.result td
 {
 	padding-left:5px;
 	padding-right:5px;

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-05-03 21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/html/style.css	2013-05-03 22:31:33 UTC (rev 5216)
@@ -13,7 +13,7 @@
         font-style: italic;
         }
=20
-table.table_large, table.result  ,table.resultfooter {
+table.sortable, table.table_large, table.result  ,table.resultfooter {
   color:blue;
   /* border:blue solid 1px; */
   width:100%;
@@ -27,7 +27,7 @@
=20
=20
 }
-table.table_large th,table.result th {
+table.sortable th,  table.table_large th,table.result th {
   font-weight:bold;
   font-family:verdana,helvetica,sans-serif;
  border-bottom:1px solid blue;
@@ -99,10 +99,6 @@
 	font-size:14px;
 }
=20
-h1.title {
-	color: blue;
-	font-size:25px;
-}
=20
 div.u_tmenu {
   margin-top:0px;
@@ -539,6 +535,7 @@
 .input_text_ro {
 	   border:solid 1px blue;
 	   background:#EDEDED;
+	   color:blue;
 	margin:1px;
 }
 .input_text {
@@ -550,10 +547,10 @@
 	margin:1px;
 	background-color: orange;
 }
-legend {
+h1.legend, legend {
 font-weight: bold;
 font-style: italic;
-font-size: 120% ;
+font-size: 110% ;
=20
 }
 fieldset fieldset legend {
@@ -565,7 +562,6 @@
 margin:2px;
 background-color:white;
=20
-
 }
=20
=20
@@ -880,7 +876,7 @@
 		border-top:1px solid  #b4bbc2;
 		border-right:1px solid  #b4bbc2;
 	padding: 5px;
-	width: 30%;
+	width: 40%;
 }
 body.op_detail_frame,div.op_detail_frame  {
   background-color:#e4e7ed;
@@ -946,7 +942,7 @@
 	      background-color:#e4e7ed;
 }
=20
-table.table_large td, table.result td
+table.sortable td, table.table_large td, table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -1107,3 +1103,41 @@
 div.foldercontent {
 	padding:20px 30px 0px 40px;
 	}
+
+h1.title {
+	color: blue;
+	font-size:18px;
+	font-style: italic;
+}
+h2.title {
+	color: blue;
+	font-size:14px;
+	font-weight:bold;
+	font-style: italic;
+	margin-left: 15px;
+}
+h3.title {
+	color: blue;
+	font-size:14px;
+	margin-left: 30px;
+}
+h4.title {
+	color: blue;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: underline;
+}
+h5.title {
+	color: blue;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: none;
+	font-style: italic;
+}
+div.myfieldset
+{
+	margin-top: 5px;
+	margin-left:5px;
+	margin-right: 5px;
+	border:lightgrey 2px groove;
+}

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2013-05-03 21:56:40 UTC (rev 52=
15)
+++ phpcompta/trunk/include/ac_common.php	2013-05-03 22:31:33 UTC (rev 52=
16)
@@ -29,7 +29,7 @@
 require_once('class_database.php');
 require_once('class_periode.php');
=20
-/* !\brief to protect again bad characters which can lead to a cross scr=
ipting attack
+/**\brief to protect again bad characters which can lead to a cross scri=
pting attack
   the string to be diplayed must be protected
  */
=20
@@ -71,7 +71,7 @@
 {
     return '<h1 ' . $p_class . '>' . htmlspecialchars($p_string) . '</h1=
>';
 }
-/* !\brief surround the string with td
+/**\brief surround the string with td
  * \param $p_string string to surround by TD
  * \param $p_extra extra info (class, style, javascript...)
  * \return string surrounded by td
@@ -87,7 +87,7 @@
     return '<tr  ' . $p_extra . '>' . $p_string . '</tr>';
 }
=20
-/* !\brief escape correctly php string to javascript */
+/**\brief escape correctly php string to javascript */
=20
 function j($p_string)
 {
@@ -133,7 +133,7 @@
     return $r;
 }
=20
-/* !
+/**
  * \brief  log error into the /tmp/phpcompta_error.log it doesn't work o=
n windows
  *
  * \param p_log message
@@ -155,7 +155,7 @@
     }
 }
=20
-/* !
+/**
  * \brief  Compare 2 dates
  * \param p_date
  * \param p_date_oth
@@ -230,7 +230,7 @@
 	if (sizeof($l_date) !=3D 3)
 	    return null;
=20
-	if ($l_date[2] > 2050)
+	if ($l_date[2] > COMPTA_MAX_YEAR || $l_date[2] < COMPTA_MIN_YEAR)
 	{
 	    return null;
 	}
@@ -243,7 +243,7 @@
     return $p_date;
 }
=20
-/* !
+/**
  * \brief Default page header for each page
  *
  * \param p_theme default theme
@@ -317,7 +317,7 @@
=20
 }
=20
-/* !
+/**
  * \brief Minimal  page header for each page, used for small popup windo=
w
  *
  * \param p_theme default theme
@@ -372,7 +372,7 @@
     }
 }
=20
-/* !
+/**
  * \brief end tag
  *
  */
@@ -383,7 +383,7 @@
     echo "</HTML>";
 }
=20
-/* !
+/**
  * \brief Echo no access and stop
  *
  * \return nothing
@@ -413,7 +413,7 @@
 {
     return sql_string($p_string);
 }
-/* !
+/**
  * \brief Fix the problem with the quote char for the database
  *
  * \param $p_string
@@ -430,7 +430,7 @@
     return $p_string;
 }
=20
-/* !
+/**
   /* \brief store the string which print
  *           the content of p_array in a table
  *           used to display the menu
@@ -499,7 +499,7 @@
     return $ret;
 }
=20
-/* !
+/**
  * \brief warns
  *
  * \param p_string error message
@@ -514,7 +514,7 @@
     echo '<H2 class=3D"error">' . $p_string . "</H2>";
 }
=20
-/* !
+/**
  * \brief Show the periode which found thanks its id
  *
  *
@@ -534,7 +534,7 @@
     return $ret;
 }
=20
-/* !
+/**
  * \brief Return the period corresponding to the
  *           date
  *
@@ -554,7 +554,7 @@
     return $R;
 }
=20
-/* !\brief Decode the html for the widegt richtext and remove newline
+/**\brief Decode the html for the widegt richtext and remove newline
  * \param $p_html string to decode
  * \return the html code without new line
  */
@@ -567,7 +567,7 @@
     return $p_html;
 }
=20
-/* !\brief Create the condition to filter on the j_tech_per
+/**\brief Create the condition to filter on the j_tech_per
  *        thanks a from and to date.
  * \param $p_cn database conx
  * \param $p_from start date (date)
@@ -611,7 +611,7 @@
     return $periode;
 }
=20
-/* !\brief alert in javascript
+/**\brief alert in javascript
  * \param $p_msg is the message
  * \param $buffer if false, echo directly and execute the javascript, if=
 $buffer is true, the alert javascript
  * is in the return string
@@ -853,27 +853,53 @@
 	    p_type_display=3D'M' and
 	    user_name=3D$1 and pm_default=3D1", array($g_user->login));
=20
+	/*
+	 * Try to find the smallest order for module
+	 */
     if (empty($default_module))
     {
 		$default_module =3D $cn->get_array("select me_code
-			from profile_menu join profile_user using (p_id)
-			where
-			user_name=3D$1 and p_order=3D(select min(p_order) from profile_menu j=
oin profile_user using (p_id)
-			where user_name=3D$2) limit 1", array($g_user->login, $g_user->login)=
);
-		/*
-		 * if nothing found, there is no profile for this user =3D> exit
-		 */
+	    from profile_menu join profile_user using (p_id)
+	    where
+	    p_type_display=3D'M' and
+	    user_name=3D$1 order by p_order limit 1", array($g_user->login));
+
+		// if no default try to find the default menu
 		if ( empty ($default_module))
 		{
-			echo_warning(_("Utilisateur n'a pas de profile"));
-			exit();
+			$default_module =3D $cn->get_array("select me_code
+			 from profile_menu join profile_user using (p_id)
+			   where
+			   p_type_display=3D'E' and
+			   user_name=3D$1 and pm_default=3D1 ", array($g_user->login));
+			/*
+			 * Try to find a default menu by order
+			 */
+			if (empty ($default_module))
+			{
+				$default_module =3D $cn->get_array("select me_code
+				from profile_menu join profile_user using (p_id)
+				where
+				user_name=3D$1 and p_order=3D(select min(p_order) from profile_menu =
join profile_user using (p_id)
+				where user_name=3D$2) limit 1", array($g_user->login, $g_user->login=
));
+			}
+
+			/*
+			* if nothing found, there is no profile for this user =3D> exit
+			*/
+			if (empty ($default_module))
+			{
+				echo_warning(_("Utilisateur n'a pas de profile"));
+				exit();
+			}
 		}
 		return $default_module[0]['me_code'];
     }
=20
     if (count($default_module) > 1)
     {
-		echo_error(_("Plusieurs modules sont le module par d=C3=A9faut"), __LI=
NE__, __FILE__);
+		// return the first module found
+		return $default_module[0]['me_code'];
     }
     elseif (count($default_module) =3D=3D 1)
     {

Modified: phpcompta/trunk/include/action.common.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/action.common.inc.php	2013-05-03 21:56:40 UTC=
 (rev 5215)
+++ phpcompta/trunk/include/action.common.inc.php	2013-05-03 22:31:33 UTC=
 (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief this file is common to suivi client, suivi fournisseur, suivi
  * administration.
  * The needed variables are
@@ -84,19 +84,16 @@
 	{
 		$act2 =3D new Follow_Up($cn);
 		$act2->fromArray($_POST);
-		$sub_action =3D "detail";
-		put_global(array(array('key' =3D> "sa", "value" =3D> "detail")));
-		if ($g_user->can_write_action($act2->ag_id))
+		if ($g_user->can_write_action($act2->ag_id) =3D=3D false )
 		{
-			$act2->Update();
-		}
-		else
-		{
 			echo '<div class=3D"redcontent">';
 			echo '<h2 class=3D"error"> Cette action ne vous est pas autoris=C3=A9=
e Contactez votre responsable</h2>';
 			echo '</div>';
 			exit();
 		}
+		$sub_action =3D "detail";
+		put_global(array(array('key' =3D> "sa", "value" =3D> "detail")));
+		$act2->Update() ;
 	}
 	//---------------------------------------------------------------------=
-
 	// Add a related action
@@ -194,7 +191,7 @@
 	Follow_Up::show_action_list($cn, $base);
 	// Add a button to export to Csv
 	echo '<form method=3D"GET" ACTION=3D"export.php">';
-	echo HtmlInput::request_to_hidden(array("remind_date_end","remind_date"=
,"sag_ref", "remind_date","only_internal", "state", "gDossier", "qcode", =
"start_date", "end_date", "ag_id", "ag_dest_query",
+	echo HtmlInput::request_to_hidden(array("closed_action","remind_date_en=
d","remind_date","sag_ref", "remind_date","only_internal", "state", "gDos=
sier", "qcode", "start_date", "end_date", "ag_id", "ag_dest_query",
 		"tdoc",   "query"));
 	echo HtmlInput::hidden("act", "CSV:ActionGestion");
 	echo HtmlInput::submit("follow_up_csv", "Export CSV");

Modified: phpcompta/trunk/include/action.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/action.inc.php	2013-05-03 21:56:40 UTC (rev 5=
215)
+++ phpcompta/trunk/include/action.inc.php	2013-05-03 22:31:33 UTC (rev 5=
216)
@@ -24,7 +24,7 @@
 require_once('class_ipopup.php');
 global $g_user;
 $retour=3DHtmlInput::button_anchor(_('Retour liste'),
-		HtmlInput::request_to_string(array("remind_date_end","remind_date","sa=
g_ref","only_internal","state","ac","gDossier","qcode","ag_dest_query","q=
uery","tdoc","date_start","date_end","hsstate")));
+		HtmlInput::request_to_string(array("closed_action","remind_date_end","=
remind_date","sag_ref","only_internal","state","ac","gDossier","qcode","a=
g_dest_query","query","tdoc","date_start","date_end","hsstate")));
 //-----------------------------------------------------
 // Follow_Up
 //-----------------------------------------------------

Modified: phpcompta/trunk/include/ajax_add_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_add_menu.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/ajax_add_menu.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -25,6 +25,9 @@
  * @file
  * @brief show the form to add a menu
  */
+$type=3D$_GET['type'];
+if ( $type=3D=3D'me')
+{
 $ame_code_dep=3D$cn->make_array("
 	select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') =
from
 	menu_ref
@@ -38,10 +41,20 @@
 	order by 1
 	",1);
 $ame_code=3D$cn->make_array("
-	select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') =
from
+select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_desc=
ription,'')
+	||'('|| case when me_type=3D'SP' then 'Special'
+		when me_type=3D'PR' then 'Impression'
+		when me_type=3D'PL' then 'Plugin'
+		when me_type=3D'ME' and me_file is null and me_javascript is null and =
me_url is null then 'Module - Menu principal'
+		when me_type=3D'ME' then 'Menu'
+		else
+		me_type
+		end||')'
+	from
 	menu_ref
 	order by 1
 	");
+
 $p_order=3Dnew INum("p_order","10");
 $atype=3D$cn->make_array("select pm_type,pm_desc from profile_menu_type =
order by 1");
=20
@@ -67,7 +80,7 @@
 	<td><?=3D$me_code->input()?></td>
 </tr>
 <tr>
-	<td>D=C3=A9pendant de </td>
+	<td>D=C3=A9pendant de <?=3DHtmlInput::infobulle(20)?></td>
 	<td><?=3D$me_code_dep->input()?></td>
 </tr>
=20
@@ -87,4 +100,47 @@
 <?
 echo HtmlInput::submit('add_menu',"Valider");
 echo '</form>';
+}
+if ($type=3D=3D'pr')
+{
+
+$ame_code=3D$cn->make_array("
+select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_desc=
ription,'')
+	from
+	menu_ref
+	where me_type=3D'PR'
+	and me_code not in (select me_code from profile_menu where p_id=3D".sql=
_string($p_id).")
+	order by 1
+	");
+
+$me_code=3Dnew ISelect('me_code');
+$me_code->value=3D$ame_code;
+
+	echo HtmlInput::title_box("Nouveau menu", $ctl);
+	if (count($ame_code)=3D=3D0)
+	{
+		echo h2("Aucune impression disponible =C3=A0 ajouter",'class=3D"notice=
"');
+		return;
+	}
 ?>
+<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
+	<?
+	echo HtmlInput::hidden('tab','profile_print_div');
+	?>
+	<?=3DHtmlInput::hidden('p_id',$p_id)?>
+	<?=3DHtmlInput::hidden('p_order',10)?>
+	<?=3DHtmlInput::hidden('me_code_dep','')?>
+	<?=3DHtmlInput::hidden('p_type','PR')?>
+<table>
+<tr>
+	<td>Code</td>
+	<td><?=3D$me_code->input()?></td>
+</tr>
+
+</table>
+<?
+echo HtmlInput::submit('add_impress',"Valider");
+echo '</form>';
+}
+
+?>

Copied: phpcompta/trunk/include/ajax_boxcard_search.php (from rev 5215, p=
hpcompta/tags/rel650/include/ajax_boxcard_search.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_boxcard_search.php	                     =
   (rev 0)
+++ phpcompta/trunk/include/ajax_boxcard_search.php	2013-05-03 22:31:33 U=
TC (rev 5216)
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show result card search
+ *
+ */
+$sql=3D"
+	select vw.f_id,vw_name,vw_first_name,vw_description,fd_label,quick_code=
,pc.ad_value as poste,tva_num
+	from vw_fiche_attr as vw
+	join fiche_def as fd on (vw.fd_id=3Dfd.fd_id)
+	left join (select f_id,ad_value from fiche_detail where ad_id=3D5) as p=
c on (pc.f_id=3Dvw.f_id)
+	where
+	vw_name ~* $1
+	or vw_first_name ~* $1
+	or vw_description ~* $1
+	or tva_num ~* $1
+	or pc.ad_value like $1||'%'
+	or quick_code like upper($1||'%')
+	order by 2
+";
+$array=3D$cn->get_array($sql,array($_GET['card']));
+echo HtmlInput::title_box("R=C3=A9sultat recherche", "boxsearch_card_div=
");
+$max=3D(count($array)>MAX_CARD_SEARCH)?MAX_CARD_SEARCH:count($array);
+?>
+<? if (count($array)>MAX_CARD_SEARCH ): ?>
+<h2 class=3D"notice">R=C3=A9sultat limit=C3=A9 =C3=A0 <?=3DMAX_CARD_SEAR=
CH?>, nombre de fiches trouv=C3=A9es : <?=3Dcount($array)?> </h2>
+
+<? endif?>
+<table class=3D"sortable">
+	<tr>
+		<th>
+			Categorie
+		</th>
+		<th>
+			Quick Code
+		</th>
+		<th>
+			Nom
+		</th>
+		<th>
+			Description
+		</th>
+		<th>
+			Num=C3=A9ro TVA
+		</th>
+		<th>
+			Poste comptable
+		</th>
+
+	</tr>
+<? if (count($array)=3D=3D0) : ?>
+	<h2 class=3D"notice"> Aucun r=C3=A9sultat</h2>
+<?endif?>
+<? for ($i=3D0;$i<$max;$i++):?>
+	<tr>
+		<td>
+			<?=3Dh($array[$i]['fd_label'])?>
+		</td>
+		<td>
+			<?=3DHtmlInput::card_detail($array[$i]['quick_code'])?>
+		</td>
+		<td>
+			<?=3Dh($array[$i]['vw_name'])?>&nbsp;
+			<?=3Dh($array[$i]['vw_first_name'])?>
+		</td>
+		<td>
+			<?=3Dh($array[$i]['vw_description'])?>
+
+		</td>
+		<td>
+			<?=3Dh($array[$i]['tva_num'])?>
+
+		</td>
+		<td>
+			<?=3Dh($array[$i]['poste'])?>
+
+		</td>
+	</tr>
+
+
+<? endfor; ?>
+</table>
+<?=3DHtmlInput::button_close("boxsearch_card_div")?>
\ No newline at end of file

Modified: phpcompta/trunk/include/ajax_get_menu_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_get_menu_detail.php	2013-05-03 21:56:40 =
UTC (rev 5215)
+++ phpcompta/trunk/include/ajax_get_menu_detail.php	2013-05-03 22:31:33 =
UTC (rev 5216)
@@ -94,12 +94,15 @@
 <? endif;?>
 </table>
 	<p>
-Cochez cette case si vous souhaitez effacer ce menu=20
+Cochez cette case si vous souhaitez effacer ce menu
 <?
 $delete=3Dnew ICheckBox('delete',"1");
 echo $delete->input();
 ?>
 </p>
+<?
+if ($array[0]['p_type_display']!=3D'P'):
+?>
 	<p>
 Cochez cette case si vous souhaitez effacer ce menu ainsi que ceux qui e=
n d=C3=A9pendent
 <?
@@ -107,6 +110,7 @@
 echo $delete->input();
 ?>
 </p>
+<? endif;?>
 <?
 echo HtmlInput::submit('mod',"Valider");
 echo '</form>';

Modified: phpcompta/trunk/include/ajax_get_profile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_get_profile.php	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/include/ajax_get_profile.php	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -31,7 +31,8 @@
 require_once 'class_profile_menu.php';
 $profile=3Dnew Profile_sql($cn,$p_id);
 $gDossier=3DDossier::id();
-$add_one=3DHtmlInput::button("add", "Ajout Menu","onclick=3D\"add_menu({=
dossier:$gDossier,p_id:$p_id})\"");
+$add_menu=3DHtmlInput::button("add", "Ajout Menu","onclick=3D\"add_menu(=
{dossier:$gDossier,p_id:$p_id,type:'me'})\"");
+$add_impression=3DHtmlInput::button("add", "Ajout Menu","onclick=3D\"add=
_menu({dossier:$gDossier,p_id:$p_id,type:'pr'})\"");
 ?>
 <hr>
 <h1>Profil <?=3D$profile->p_name?></h1>
@@ -89,21 +90,21 @@
         echo '<div style=3D"display:none" id=3D"profile_menu_div">';
 	//Menu / Module /plugin in this profile
 	echo "<h2>Menu</h2>";
-	echo $add_one;
+	echo $add_menu;
 	$profile_menu =3D new Profile_Menu($cn);
 	$profile_menu->listing_profile($p_id);
         echo '</div>';
         echo '<div style=3D"display:none" id=3D"profile_print_div">';
 	echo "<h2>Impression</h2>";
 	$profile_menu->printing($p_id);
-	echo $add_one;
+	echo $add_impression;
         echo '</div>';
         echo '<div style=3D"display:none" id=3D"profile_gestion_div">';
-	echo "<h1>Action gestion accessible</h1>";
+	echo "<h2>Action gestion accessible</h2>";
 	$profile_menu->available_profile($p_id);
         echo '</div>';
         echo '<div style=3D"display:none" id=3D"profile_repo_div">';
-	echo "<h1>D=C3=A9p=C3=B4t de stock accessible</h1>";
+	echo "<h2>D=C3=A9p=C3=B4t de stock accessible</h2>";
 	$profile_menu->available_repository($p_id);
         echo '</div>';
         if ( isset ($_POST['tab']))

Modified: phpcompta/trunk/include/ajax_mod_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_mod_document.php	2013-05-03 21:56:40 UTC=
 (rev 5215)
+++ phpcompta/trunk/include/ajax_mod_document.php	2013-05-03 22:31:33 UTC=
 (rev 5216)
@@ -38,7 +38,7 @@
 require('template/modele_document.php');
=20
 $html=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 $html=3Descape_xml($html);
 header('Content-type: text/xml; charset=3DUTF-8');
=20

Modified: phpcompta/trunk/include/ajax_mod_periode.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_mod_periode.php	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/include/ajax_mod_periode.php	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -22,7 +22,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 require_once('class_periode.php');
=20
-/* !\file
+/**\file
  * \brief display or save a periode
  * variable received $op, $cn $g_user
  */

Modified: phpcompta/trunk/include/ajax_mod_predf_op.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_mod_predf_op.php	2013-05-03 21:56:40 UTC=
 (rev 5215)
+++ phpcompta/trunk/include/ajax_mod_predf_op.php	2013-05-03 22:31:33 UTC=
 (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief display a form to change the name of a predefined operation
  */
 ob_start();
@@ -41,7 +41,7 @@
=20
=20
 $html =3D ob_get_contents();
-ob_clean();
+ob_end_clean();
 $html =3D escape_xml($html);
=20
 header('Content-type: text/xml; charset=3DUTF-8');

Copied: phpcompta/trunk/include/ajax_view_action.php (from rev 5215, phpc=
ompta/tags/rel650/include/ajax_view_action.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_view_action.php	                        =
(rev 0)
+++ phpcompta/trunk/include/ajax_view_action.php	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show the detail of an action
+ *
+ */
+require_once 'class_follow_up.php';
+echo HtmlInput::title_box(_("D=C3=A9tail action"), $div);
+$act =3D new Follow_Up($cn);
+$act->ag_id =3D $ag_id;
+$act->get();
+if ($g_user->can_write_action($ag_id) =3D=3D true || $g_user->can_read_a=
ction($ag_id) =3D=3D true || $act->ag_dest =3D=3D -1)
+{
+	echo $act->Display('READ', false, "ajax", "");
+	$action=3DHtmlInput::array_to_string(array("gDossier","ag_id"), $_GET).=
"&ac=3DFOLLOW&sa=3Ddetail";
+	if ( $_GET['mod']=3D=3D 1) :
+	?>
+<a href=3D"<?=3D$action?>" target=3D"_blank" class=3D"button">Modifier <=
/a>
+    <?
+	endif;
+}
+else
+{
+	echo h2(_("Ce document n'est pas accessible"),"error");
+	?>
+	<div style=3D"margin:0;padding:0;background-color:red;text-align:center=
;">
+<h2 class=3D"error">Acc=C3=A8s interdit : vous n'avez pas acc=C3=A8s =C3=
=A0 cette information, contactez votre responsable</h2>;
+</div>
+	<?
+}
+echo HtmlInput::button_close($div);
+
+?>
\ No newline at end of file

Modified: phpcompta/trunk/include/category_followup.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/category_followup.inc.php	2013-05-03 21:56:40=
 UTC (rev 5215)
+++ phpcompta/trunk/include/category_followup.inc.php	2013-05-03 22:31:33=
 UTC (rev 5216)
@@ -36,8 +36,10 @@
  */
 $sub_action=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list";
 $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0;
+if (! isset($_GET['submit_query'])) {$_REQUEST['closed_action']=3D1;$_GE=
T['closed_action']=3D1;}
+
 $p_action=3D$_REQUEST['ac'];
-$base=3D"ac=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_id']."=
&".HtmlInput::request_to_string(array("remind_date_end","remind_date","sa=
g_ref","only_internal","state","gDossier","qcode","ag_dest","query","tdoc=
","date_start","date_end","hsstate","sb","sc"),"");
+$base=3D"ac=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_id']."=
&".HtmlInput::request_to_string(array("closed_action","remind_date_end","=
remind_date","sag_ref","only_internal","state","gDossier","qcode","ag_des=
t","query","tdoc","date_start","date_end","hsstate","sb","sc"),"");
 $retour=3DHtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base=
);
 $fiche=3Dnew Fiche($cn,$_REQUEST['f_id']);
=20

Modified: phpcompta/trunk/include/class_acc_account_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_account_ledger.php	2013-05-03 21:56=
:40 UTC (rev 5215)
+++ phpcompta/trunk/include/class_acc_account_ledger.php	2013-05-03 22:31=
:33 UTC (rev 5216)
@@ -127,7 +127,8 @@
 	if ( $solded =3D=3D 1)
 	  {
 	    $filter=3Dstr_replace('jrn_def_id','jr_def_id',$filter_sql);
-	    $bal_sql=3D"select sum(amount_deb) as s_deb,sum(amount_cred) as s_c=
red, j_poste from 						(select case when j_debit=3D't' then j_montant el=
se 0 end as amount_deb,
+	    $bal_sql=3D"select sum(amount_deb) as s_deb,sum(amount_cred) as s_c=
red, j_poste
+				from 						(select case when j_debit=3D't' then j_montant else 0 end=
 as amount_deb,
 								case when j_debit=3D'f' then j_montant else 0 end as amount_cred=
,
 								j_poste
 								from jrnx join jrn on (j_grpt =3D jr_grpt_id)
@@ -354,7 +355,7 @@
             $vw_operation=3Dsprintf('<A class=3D"detail" style=3D"text-d=
ecoration:underline" HREF=3D"javascript:modifyOperation(\'%s\',\'%s\')" >=
%s</A>',
                                   $op['jr_id'], dossier::id(), $op['jr_i=
nternal']);
             $let=3D'';
-            if ( $op['letter'] !=3D-1) $let=3D$op['letter'];
+            if ( $op['letter'] !=3D-1) $let=3D  strtoupper (base_convert=
 ( $op['letter'],10,36));
 	    $tmp_diff=3Dbcsub($op['deb_montant'],$op['cred_montant']);
=20
 	    /*

Modified: phpcompta/trunk/include/class_acc_balance.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_balance.php	2013-05-03 21:56:40 UTC=
 (rev 5215)
+++ phpcompta/trunk/include/class_acc_balance.php	2013-05-03 22:31:33 UTC=
 (rev 5216)
@@ -33,7 +33,7 @@
     var $jrn;						/*!< idx of a table of ledger create by user->get_led=
ger */
     var $from_poste;				/*!< from_poste  filter on the post */
     var $to_poste;				/*!< to_poste filter on the post*/
-    var $unsold;				/*!< if true only the no solded account (saldo !=3D =
0) */
+    var $unsold;				/**=3D 0) */
     function Acc_Balance($p_cn)
     {
         $this->db=3D$p_cn;

Modified: phpcompta/trunk/include/class_acc_compute.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_compute.php	2013-05-03 21:56:40 UTC=
 (rev 5215)
+++ phpcompta/trunk/include/class_acc_compute.php	2013-05-03 22:31:33 UTC=
 (rev 5216)
@@ -49,7 +49,7 @@
 		  'nd_vat_rate'=3D>'nd_vat_rate',
 		  'amount_perso'=3D>'amount_perso',
 		  'amount_perso_rate'=3D>'amount_perso_rate'				  );
-=20
+
  */
=20
=20
@@ -126,9 +126,11 @@
         if ( $this->check && $this->order > 2 )  throw new Exception ('O=
RDER NOT RESPECTED');
=20
         $this->amount_nd=3Dbcmul($this->amount,$this->amount_nd_rate);
+        $this->amount_nd=3Dbcdiv($this->amount_nd,100);
         $this->amount_nd=3Dround($this->amount_nd,2);
         // the nd part for the vat
         $nd_vat=3Dbcmul($this->amount_vat,$this->amount_nd_rate);
+        $nd_vat=3Dbcdiv($nd_vat,100);
         $nd_vat=3Dround($nd_vat,2);
=20
     }
@@ -139,6 +141,7 @@
=20
         if ($this->amount_vat =3D=3D 0 ) $this->compute_vat();
         $this->nd_vat=3Dbcmul($this->amount_vat,$this->nd_vat_rate);
+        $this->nd_vat=3Dbcdiv($this->nd_vat,100);
         $this->nd_vat=3Dround($this->nd_vat,2);
     }
=20
@@ -149,6 +152,7 @@
=20
         if ($this->amount_vat =3D=3D 0 ) $this->compute_vat();
         $this->nd_ded_vat=3Dbcmul($this->amount_vat,$this->nd_ded_vat_ra=
te);
+        $this->nd_ded_vat=3Dbcdiv($this->nd_ded_vat,100);
         $this->nd_ded_vat=3Dround($this->nd_ded_vat,2);
     }
=20
@@ -158,6 +162,7 @@
         $this->order=3D2;
         if ( $this->amount =3D=3D 0 ) return;
         $this->amount_perso=3Dbcmul($this->amount,$this->amount_perso_ra=
te);
+        $this->amount_perso=3Dbcdiv($this->amount_perso,100);
         $this->amount_perso=3Dround($this->amount_perso,2);
=20
=20

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -44,24 +44,24 @@
 require_once 'class_sort_table.php';
 require_once 'class_jrn_def_sql.php';
 require_once 'class_acc_payment.php';
-/* !\file
- * \brief Class for jrn,  class acc_ledger for manipulating the ledger
+/** \file
+ * @brief Class for jrn,  class acc_ledger for manipulating the ledger
  */
=20
-/* !\brief Class for jrn,  class acc_ledger for manipulating the ledger
+/** @brief Class for jrn,  class acc_ledger for manipulating the ledger
  *
  */
=20
 class Acc_Ledger extends jrn_def_sql
 {
=20
-	var $id;   /* !< jrn_def.jrn_def_id */
-	var $name;   /* !< jrn_def.jrn_def_name */
-	var $db;   /* !< database connextion */
-	var $row;   /* !< row of the ledger */
-	var $type;   /* !< type of the ledger ACH ODS FIN
+	var $id;   /**< jrn_def.jrn_def_id */
+	var $name;   /**< jrn_def.jrn_def_name */
+	var $db;   /**< database connextion */
+	var $row;   /**< row of the ledger */
+	var $type;   /**< type of the ledger ACH ODS FIN
 	  VEN or GL */
-	var $nb;   /* !< default number of rows by
+	var $nb;   /**< default number of rows by
 	  default 10 */
=20
 	/**
@@ -84,7 +84,7 @@
 		{
 			$ret =3D $this->db->get_array("select last_value,is_called from s_jrn=
_pj" . $this->id);
 			$last =3D $ret[0]['last_value'];
-			/* !
+			/**
 			 * \note  With PSQL sequence , the last_value column is 1 when before=
   AND after the first call, to make the difference between them
 			 * I have to check whether the sequence has been already called or no=
t */
 			if ($ret[0]['is_called'] =3D=3D 'f')
@@ -96,8 +96,8 @@
 		return 0;
 	}
=20
-	/* !
-	 * \brief Return the type of a ledger (ACH,VEN,ODS or FIN) or GL
+	/**
+	 * @brief Return the type of a ledger (ACH,VEN,ODS or FIN) or GL
 	 *
 	 */
=20
@@ -331,8 +331,8 @@
 		}
 	}
=20
-	/* !
-	 * \brief Return the name of a ledger
+	/**
+	 * @brief Return the name of a ledger
 	 *
 	 */
=20
@@ -354,14 +354,14 @@
 		return $ret['jrn_def_name'];
 	}
=20
-	/* ! \function  get_row
-	 * \brief  Get The data
+	/** \function  get_row
+	 * @brief  Get The data
 	 *
 	 *
-	 * \param p_from from periode
-	 * \param p_to to periode
-	 * \param p_limit starting line
-	 * \param p_offset number of lines
+	 * @paramp_from from periode
+	 * @paramp_to to periode
+	 * @paramp_limit starting line
+	 * @paramp_offset number of lines
 	 * \return Array with the asked data
 	 *
 	 */
@@ -509,13 +509,13 @@
 		return $a;
 	}
=20
-	/* ! \brief  Get simplified row from ledger
+	/** @brief  Get simplified row from ledger
 	 *
-	 * \param from periode
-	 * \param to periode
-	 * \param p_limit starting line
-	 * \param p_offset number of lines
-	 * \param trunc if data must be truncated (pdf export)
+	 * @paramfrom periode
+	 * @paramto periode
+	 * @paramp_limit starting line
+	 * @paramp_offset number of lines
+	 * @paramtrunc if data must be truncated (pdf export)
 	 *
 	 * \return an Array with the asked data
 	 */
@@ -545,7 +545,7 @@
              jrn_def_type,
              jrn.jr_tech_per
              FROM jrn join jrn_def on (jrn_def_id=3Djr_def_id)
-             WHERE $periode $jrn order by jr_date $cond_limite";
+             WHERE $periode $jrn order by jr_date,substring(jrn.jr_pj_nu=
mber,'\\\d+$')::numeric asc  $cond_limite";
=20
 		$Res =3D $this->db->exec_sql($sql);
 		$Max =3D Database::num_row($Res);
@@ -580,7 +580,8 @@
=20
 // end function get_rowSimple
=20
-	/* !\brief guess what  the next pj should be
+	/**
+	 * @brief guess what  the next pj should be
 	 */
=20
 	function guess_pj()
@@ -591,10 +592,11 @@
 		return $pj_pref . $pj_seq;
 	}
=20
-	/* !\brief Show all the operation
-	 * \param $sql is the sql stmt, normally created by build_search_sql
-	 * \param $offset the offset
-	 * \param $p_paid if we want to see info about payment
+	/**
+	 * @brief Show all the operation
+	 * @param$sql is the sql stmt, normally created by build_search_sql
+	 * @param$offset the offset
+	 * @param$p_paid if we want to see info about payment
 	  \code
 	  // Example
 	  // Build the sql
@@ -625,7 +627,7 @@
 	{
 		global $g_parameter, $g_user;
 		$gDossier =3D dossier::id();
-		$limit =3D " LIMIT 25";
+		$limit =3D " LIMIT ".MAX_RECONCILE;
 		// Sort
 		// Count
 		$count =3D $this->db->count_sql($sql);
@@ -716,7 +718,7 @@
 			$tmp_jr_comment =3D h($row['jr_comment']);
 			$r.=3D$tmp_jr_comment;
 			$r.=3D"</TD>";
-			$r.=3Dtd(h($row['n_text']), ' style=3D"font-size:6"');
+			$r.=3Dtd(h($row['n_text']), ' style=3D"font-size:90%"');
 			// Amount
 			// If the ledger is financial :
 			// the credit must be negative and written in red
@@ -766,10 +768,11 @@
 		return array($count, $r);
 	}
=20
-	/* !\brief Show all the operation
-	 * \param $sql is the sql stmt, normally created by build_search_sql
-	 * \param $offset the offset
-	 * \param $p_paid if we want to see info about payment
+	/**
+	 * @brief Show all the operation
+	 * @param$sql is the sql stmt, normally created by build_search_sql
+	 * @param$offset the offset
+	 * @param$p_paid if we want to see info about payment
 	  \code
 	  // Example
 	  // Build the sql
@@ -799,6 +802,7 @@
 	public function list_operation($sql, $offset, $p_paid =3D 0)
 	{
 		global $g_parameter, $g_user;
+		bcscale(2);
 		$table =3D new Sort_Table();
 		$gDossier =3D dossier::id();
 		$amount_paid =3D 0.0;
@@ -910,7 +914,7 @@
 			$tmp_jr_comment =3D h($row['jr_comment']);
 			$r.=3D$tmp_jr_comment;
 			$r.=3D"</TD>";
-			$r.=3Dtd(h($row['n_text']), ' style=3D"font-size:6"');
+			$r.=3Dtd(h($row['n_text']), ' style=3D"font-size:90%"');
 			// Amount
 			// If the ledger is financial :
 			// the credit must be negative and written in red
@@ -924,10 +928,19 @@
 					$positive =3D ($positive < 0) ? 1 : 0;
 			}
 			$r.=3D"<TD align=3D\"right\">";
-
-			$tot =3D ($positive !=3D 0) ? $tot - $row['jr_montant'] : $tot + $row=
['jr_montant'];
+			$t_amount=3D$row['jr_montant'];
+			if ($row['total_invoice'] !=3D null && $row['total_invoice'] !=3D $ro=
w['jr_montant'])
+				$t_amount=3D$row['total_invoice'];
+			$tot =3D ($positive !=3D 0) ? bcsub($tot , $t_amount ): bcadd($tot , =
$t_amount);
 			//STAN $positive always =3D=3D 0
-			$r.=3D( $positive !=3D 0 ) ? "<font color=3D\"red\">  - " . nbm($row[=
'jr_montant']) . "</font>" : nbm($row['jr_montant']);
+			if ($row [ 'jrn_def_type']=3D=3D'FIN')
+			{
+				$r.=3D( $positive !=3D 0 ) ? "<font color=3D\"red\">  - " . nbm($t_a=
mount) . "</font>" : nbm($t_amount);
+			}
+			else
+			{
+				$r.=3D( $t_amount <  0 ) ? "<font color=3D\"red\">  " . nbm($t_amoun=
t) . "</font>" : nbm($t_amount);
+			}
 			$r.=3D"</TD>";
=20
=20
@@ -943,9 +956,9 @@
 				$h->name =3D "set_jr_id" . $row['jr_id'];
 				$r.=3D'<TD>' . $w->input() . $h->input() . '</TD>';
 				if ($row['jr_rapt'] =3D=3D 'paid')
-					$amount_paid+=3D$row['jr_montant'];
+					$amount_paid=3Dbcadd($amount_paid,$t_amount);
 				else
-					$amount_unpaid+=3D$row['jr_montant'];
+					$amount_unpaid=3Dbcadd($amount_unpaid,$t_amount);
 			}
=20
 			// Rapprochement
@@ -1011,8 +1024,8 @@
 		return array($count, $r);
 	}
=20
-	/* !
-	 * \brief get_detail gives the detail of row
+	/**
+	 * @brief get_detail gives the detail of row
 	 * this array must contains at least the field
 	 *       <ul>
 	 *       <li> montant</li>
@@ -1029,12 +1042,12 @@
 	 *          </ul>
 	 *       </ul>
 	 *
-	 * \param p_array the structure is set in get_rowSimple, this array is
+	 * @paramp_array the structure is set in get_rowSimple, this array is
 	 *        modified,
-	 * \param $trunc if the data must be truncated, usefull for pdf export
-	 * \param p_jrn_type is the type of the ledger (ACH or VEN)
-	 * \param $a_TVA TVA Array (default null)
-	 * \param $a_ParmCode Array (default null)
+	 * @param$trunc if the data must be truncated, usefull for pdf export
+	 * @paramp_jrn_type is the type of the ledger (ACH or VEN)
+	 * @param$a_TVA TVA Array (default null)
+	 * @param$a_ParmCode Array (default null)
 	 * \return p_array
 	 */
=20
@@ -1193,8 +1206,8 @@
 	}
=20
 // retrieve data from jrnx
-	/* !
-	 * \brief  Get the properties of a journal
+	/**
+	 * @brief  Get the properties of a journal
 	 *
 	 * \return an array containing properties
 	 *
@@ -1219,9 +1232,9 @@
 		return Database::fetch_array($Res, 0);
 	}
=20
-	/* ! \function GetDefLine
-	 * \brief Get the number of lines of a journal
-	 * \param $p_cred deb or cred
+	/** \function GetDefLine
+	 * @brief Get the number of lines of a journal
+	 * @param$p_cred deb or cred
 	 *
 	 * \return an integer
 	 */
@@ -1237,9 +1250,10 @@
 		return $Res[0]['value'];
 	}
=20
-	/* !\brief get the saldo of a ledger for a specific period
-	 * \param $p_from start period
-	 * \param $p_to end period
+	/**
+	 * @brief get the saldo of a ledger for a specific period
+	 * @param$p_from start period
+	 * @param$p_to end period
 	 */
=20
 	function get_solde($p_from, $p_to)
@@ -1270,11 +1284,11 @@
 		return $response;
 	}
=20
-	/* !
-	 * \brief Show a select list   of the ledgers you can access in
+	/**
+	 * @brief Show a select list   of the ledgers you can access in
 	 * writing, reading or simply accessing.
-	 * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS)
-	 * \param $p_access =3D3 for READ and WRITE, 2 for write and 1 for read=
only
+	 * @param$p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS)
+	 * @param$p_access =3D3 for READ and WRITE, 2 for write and 1 for reado=
nly
 	 * \return     object HtmlInput select
 	 */
=20
@@ -1302,8 +1316,8 @@
 		return $select;
 	}
=20
-	/* !
-	 * \brief retrieve the jrn_def_fiche and return them into a array
+	/**
+	 * @brief retrieve the jrn_def_fiche and return them into a array
 	 *        index deb, cred
 	 * \param
 	 * \param
@@ -1328,8 +1342,8 @@
 		return $res[0];
 	}
=20
-	/* !
-	 * \brief retrieve the jrn_def_class_deb and return it
+	/**
+	 * @brief retrieve the jrn_def_class_deb and return it
 	 *
 	 *
 	 * \return return an string
@@ -1351,10 +1365,10 @@
 		return $res[0];
 	}
=20
-	/* !
-	 * \brief show the result of the array to confirm
+	/**
+	 * @brief show the result of the array to confirm
 	 * before inserting
-	 * \param $p_array array from the form
+	 * @param$p_array array from the form
 	 * \return string
 	 */
=20
@@ -1514,10 +1528,10 @@
 		return $ret;
 	}
=20
-	/* !
-	 * \brief Show the form to encode your operation
-	 * \param $p_array if you correct or use a predef operation (default =3D=
 null)
-	 * \param $p_readonly 1 for readonly 0 for writable (default 0)
+	/**
+	 * @brief Show the form to encode your operation
+	 * @param$p_array if you correct or use a predef operation (default =3D=
 null)
+	 * @param$p_readonly 1 for readonly 0 for writable (default 0)
 	 *
 	 * \return a string containing the form
 	 */
@@ -1536,8 +1550,10 @@
 		{
 			$add_js =3D "update_pj();";
 		}
-		$add_js.=3D'get_last_date();';
-
+		if ($g_parameter->MY_DATE_SUGGEST=3D=3D'Y')
+		{
+			$add_js.=3D'get_last_date();';
+		}
 		$ret =3D "";
 		if ($g_user->check_action(FICADD) =3D=3D 1)
 		{
@@ -1750,7 +1766,8 @@
 		return $ret;
 	}
=20
-	/* !\brief
+	/**
+	 * @brief
 	 * check if the current ledger is closed
 	 * \return 1 for yes, otherwise 0
 	 * \see Periode::is_closed
@@ -1765,9 +1782,9 @@
 		return $ret;
 	}
=20
-	/* !
-	 * \brief verify that the operation can be saved
-	 * \param $p_array array of data same layout that the $_POST from show_=
form
+	/**
+	 * @brief verify that the operation can be saved
+	 * @param$p_array array of data same layout that the $_POST from show_f=
orm
 	 *
 	 *
 	 * \throw  the getcode  value is 1 incorrect balance,  2 date
@@ -1897,11 +1914,11 @@
 		return $msg;
 	}
=20
-	/* !
-	 * \brief compute the internal code of the saved operation and set the =
$this->jr_internal to
+	/**
+	 * @brief compute the internal code of the saved operation and set the =
$this->jr_internal to
 	 *  the computed value
 	 *
-	 * \param $p_grpt id in jr_grpt_
+	 * @param$p_grpt id in jr_grpt_
 	 *
 	 * \return string internal_code
 	 *      -
@@ -1920,10 +1937,10 @@
 		return $internal_code;
 	}
=20
-	/* !
-	 * \brief save the operation into the jrnx,jrn, ,
+	/**
+	 * @brief save the operation into the jrnx,jrn, ,
 	 *  CA and pre_def
-	 * \param $p_array
+	 * @param$p_array
 	 *
 	 * \return array with [0] =3D false if failed otherwise true, [1] error
 	 * code
@@ -2087,8 +2104,8 @@
 		return true;
 	}
=20
-	/* !
-	 * \brief get all the data from request and build the object
+	/**
+	 * @brief get all the data from request and build the object
 	 */
=20
 	function get_request()
@@ -2096,10 +2113,10 @@
 		$this->id =3D $_REQUEST['p_jrn'];
 	}
=20
-	/* !
-	 * \brief retrieve the next number for this type of ledger
-	 * \param p_cn connx
-	 * \param p_type ledger type
+	/**
+	 * @brief retrieve the next number for this type of ledger
+	 * @paramp_cn connx
+	 * @paramp_type ledger type
 	 *
 	 * \return the number
 	 *
@@ -2113,8 +2130,9 @@
 		return $Ret + 1;
 	}
=20
-	/* !\brief get the first ledger
-	 * \param the type
+	/**
+	 * @brief get the first ledger
+	 * @paramthe type
 	 * \return the j_id
 	 */
=20
@@ -2125,8 +2143,9 @@
 		return $all[0];
 	}
=20
-	/* !\brief Update the paiment  in the list of operation
-	 * \param $p_array is normally $_GET
+	/**
+	 * @brief Update the paiment  in the list of operation
+	 * @param$p_array is normally $_GET
 	 */
=20
 	function update_paid($p_array)
@@ -2161,9 +2180,10 @@
 				" jr_grpt_id =3D " . $this->grpt_id);
 	}
=20
-	/* !\brief retrieve all the card for this type of ledger, make them
+	/**
+	 * @brief retrieve all the card for this type of ledger, make them
 	 * into a string separated by comma
-	 * \param none
+	 * @paramnone
 	 * \return all the card or null is nothing is found
 	 */
=20
@@ -2197,8 +2217,9 @@
 		return $card;
 	}
=20
-	/* !\brief get the saldo of an exercice, used for the opening of a fold=
er
-	 * \param $p_exercice is the exercice we want
+	/**
+	 * @brief get the saldo of an exercice, used for the opening of a folde=
r
+	 * @param$p_exercice is the exercice we want
 	 * \return an array
 	 * index =3D
 	 * - solde (debit > 0 ; credit < 0)
@@ -2225,8 +2246,8 @@
 		return $res;
 	}
=20
-	/* !
-	 * \brief Check if a Dossier is using the strict mode or not
+	/**
+	 * @brief Check if a Dossier is using the strict mode or not
 	 * \return true if we are using the strict_mode
 	 */
=20
@@ -2240,8 +2261,8 @@
 		exit("Valeur invalid " . __FILE__ . ':' . __LINE__);
 	}
=20
-	/* !
-	 * \brief Check if a Dossier is using the check on the periode, if true=
 than the user has to enter the date
+	/**
+	 * @brief Check if a Dossier is using the check on the periode, if true=
 than the user has to enter the date
 	 * and the periode, it is a security check
 	 * \return true if we are using the double encoding (date+periode)
 	 */
@@ -2256,7 +2277,8 @@
 		exit("Valeur invalid " . __FILE__ . ':' . __LINE__);
 	}
=20
-	/* !\brief get the date of the last operation
+	/**
+	 * @brief get the date of the last operation
 	 */
=20
 	function get_last_date()
@@ -2268,9 +2290,10 @@
 		return $date;
 	}
=20
-	/* !\brief retrieve the jr_id thanks the internal code, do not change
+	/**
+	 * @brief retrieve the jr_id thanks the internal code, do not change
 	 * anything to the current object
-	 * \param the internal code
+	 * @paramthe internal code
 	 * \return the jr_id or 0 if not found
 	 */
=20
@@ -2283,10 +2306,11 @@
 		return $value;
 	}
=20
-	/* !\brief create the invoice and saved it as attachment to the
+	/**
+	 * @brief create the invoice and saved it as attachment to the
 	 * operation,
-	 * \param $internal is the internal code
-	 * \param $p_array is normally the $_POST
+	 * @param$internal is the internal code
+	 * @param$p_array is normally the $_POST
 	 * \return a string
 	 */
=20
@@ -2309,8 +2333,9 @@
 		return h($doc->d_name . ' (' . $doc->d_filename . ')');
 	}
=20
-	/* !\brief check if the payment method is valid
-	 * \param $e_mp is the value and $e_mp_qcode is the quickcode
+	/**
+	 * @brief check if the payment method is valid
+	 * @param$e_mp is the value and $e_mp_qcode is the quickcode
 	 * \return nothing throw an Exception
 	 */
=20
@@ -2346,7 +2371,8 @@
 		}
 	}
=20
-	/* !\brief increment the sequence for the pj */
+	/**
+	 * @brief increment the sequence for the pj */
=20
 	function inc_seq_pj()
 	{
@@ -2354,7 +2380,8 @@
 		$this->db->exec_sql($sql);
 	}
=20
-	/* !@brief return a HTML string with the form for the search
+	/**
+	 * @brief return a HTML string with the form for the search
 	 * @param $p_type if the type of ledger possible values=3DALL,VEN,ACH,O=
DS,FIN
 	 * @param $all_type_ledger
 	 *       values :
@@ -2462,15 +2489,16 @@
 		ob_start();
 		require_once('template/ledger_search.php');
 		$r.=3Dob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		return $r;
 	}
=20
-	/* !\brief this function will create a sql stmt to use to create the li=
st for
+	/**
+	 * @brief this function will create a sql stmt to use to create the lis=
t for
 	 * the ledger,
-	 * \param $p_array is usually the $_GET,
-	 * \param $p_order the order of the row
-	 * \param $p_where is the sql condition if not null then the $p_array w=
ill not be used
+	 * @param$p_array is usually the $_GET,
+	 * @param$p_order the order of the row
+	 * @param$p_where is the sql condition if not null then the $p_array wi=
ll not be used
 	 * \note the p_action will be used to filter the ledger but gl means AL=
L
 	 * struct array $p_array
 	  \verbatim
@@ -2526,7 +2554,7 @@
 		and f_id=3D(select qf_other from quant_fin where quant_fin.jr_id=3Dx.j=
r_id))
 	    end as name,
 	   case
-	     when jrn_def_type=3D'VEB' then (select ad_value from fiche_detail =
where ad_id=3D32 and f_id=3D(select max(qs_client) from quant_sold join j=
rnx using (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.jr_id=3D=
x.jr_id))
+	     when jrn_def_type=3D'VEN' then (select ad_value from fiche_detail =
where ad_id=3D32 and f_id=3D(select max(qs_client) from quant_sold join j=
rnx using (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.jr_id=3D=
x.jr_id))
 	    when jrn_def_type =3D 'ACH' then (select ad_value from fiche_detail=
 where ad_id=3D32 and f_id=3D(select max(qp_supplier) from quant_purchase=
 join jrnx using (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.=
jr_id=3Dx.jr_id))
 	    when jrn_def_type =3D 'FIN' then (select ad_value from fiche_detail=
 where ad_id=3D32 and f_id=3D(select qf_other from quant_fin where quant_=
fin.jr_id=3Dx.jr_id))
 	    end as first_name,
@@ -2534,7 +2562,20 @@
 	     when jrn_def_type=3D'VEN' then (select ad_value from fiche_detail =
where ad_id=3D23 and f_id=3D(select max(qs_client) from quant_sold join j=
rnx using (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.jr_id=3D=
x.jr_id))
 	    when jrn_def_type =3D 'ACH' then (select ad_value from fiche_detail=
 where ad_id=3D23 and f_id=3D(select max(qp_supplier) from quant_purchase=
 join jrnx using (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.=
jr_id=3Dx.jr_id))
 	    when jrn_def_type =3D 'FIN' then (select ad_value from fiche_detail=
 where ad_id=3D23 and f_id=3D(select qf_other from quant_fin where quant_=
fin.jr_id=3Dx.jr_id))
-	    end as quick_code
+	    end as quick_code,
+	    case
+	     when jrn_def_type=3D'VEN' then
+		     (select sum(qs_price)+sum(vat) from
+				(select qs_internal,qs_price,case when qs_vat_sided<>0 then 0 else q=
s_vat end as vat from quant_sold where qs_internal=3DX.jr_internal) as ve=
n_invoice
+			  )
+	    when jrn_def_type =3D 'ACH' then
+			(
+				select sum(qp_price)+sum(vat)+sum(qp_nd_tva)+sum(qp_nd_tva_recup)
+				from
+				 (select qp_internal,qp_price,qp_nd_tva,qp_nd_tva_recup,case when qp=
_vat_sided<>0 then 0 else qp_vat end as vat from quant_purchase where qp_=
internal=3DX.jr_internal) as invoice_purchase
+			)
+		else null
+		end as total_invoice
=20
=20
              from
@@ -2708,7 +2749,8 @@
 		return array($sql, $where);
 	}
=20
-	/* !\brief return a html string with the search_form
+	/**
+	 * @brief return a html string with the search_form
 	 * \return a HTML string with the FORM
 	 * \see build_search_sql
 	 * \see search_form
@@ -2753,8 +2795,9 @@
 		return $r;
 	}
=20
-	/* !\brief return the last p_limit operation into an array
-	 * \param $p_limit is the max of operation to return
+	/**
+	 * @brief return the last p_limit operation into an array
+	 * @param$p_limit is the max of operation to return
 	 * \return $p_array of Follow_Up object
 	 */
=20
@@ -2977,8 +3020,8 @@
 	///////////////////////////////////////////////////////////////////////=
/////////
 	// TEST MODULE
 	///////////////////////////////////////////////////////////////////////=
/////////
-	/* !
-	 * \brief this function is intended to test this class
+	/**
+	 * @brief this function is intended to test this class
 	 */
 	static function test_me($pCase =3D '')
 	{

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2013-05-03 21:56:40 =
UTC (rev 5215)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2013-05-03 22:31:33 =
UTC (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief the class Acc_Ledger_Fin inherits from Acc_Ledger, this
  * object permit to manage the financial ledger
  */
@@ -46,7 +46,7 @@
 		$this->type =3D 'FIN';
 	}
=20
-	/* !\brief verify that the data are correct before inserting or confirm=
ing
+	/**\brief verify that the data are correct before inserting or confirmi=
ng
 	 * \param an array (usually $_POST)
 	 * \return String
 	 * \throw Exception on error occurs
@@ -223,7 +223,7 @@
 		}
 	}
=20
-	/* !\brief
+	/**\brief
 	 * \param $p_array contains the value usually it is $_POST
 	 * \return string with html code
 	 * \note the form tag are not  set here
@@ -291,12 +291,14 @@
=20
 		// Ledger (p_jrn)
 		//--
+		$onchange=3D"update_bank();ajax_saldo('first_sold');update_name();";
=20
-		$add_js =3D 'onchange=3D"update_pj();update_bank();get_last_date();aja=
x_saldo(\'first_sold\');update_name();"';
-
 		if ($g_parameter->MY_DATE_SUGGEST =3D=3D 'Y')
-			$add_js =3D 'onchange=3D"update_pj();update_bank();get_last_date();aj=
ax_saldo(\'first_sold\')";';
+			$onchange .=3D 'get_last_date();';
+		if ($g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
+			$onchange .=3D 'update_pj();';
=20
+		$add_js =3D 'onchange=3D"'.$onchange.'"';
 		$wLedger =3D $this->select_ledger('FIN', 2);
 		if ($wLedger =3D=3D null)
 			exit('Pas de journal disponible');
@@ -367,6 +369,7 @@
 			$W1 =3D new ICard();
 			$W1->label =3D "";
 			$W1->name =3D "e_other" . $i;
+			$W1->id =3D "e_other" . $i;
 			$W1->value =3D $tiers;
 			$W1->extra =3D 'deb';  // credits
 			$W1->typecard =3D 'deb';
@@ -396,6 +399,7 @@
 			}
=20
 			$wcard_name =3D new IText("e_other_name" . $i, $card_name);
+			$wcard_name->id=3D$wcard_name->name;
 			$wcard_name->readOnly =3D true;
 			$array[$i]['cname'] =3D $wcard_name->input();
=20
@@ -425,13 +429,13 @@
 		ob_start();
 		require_once('template/form_ledger_fin.php');
 		$r.=3Dob_get_contents();
-		ob_clean();
+		ob_end_clean();
=20
=20
 		return $r;
 	}
=20
-	/* !\brief show the summary before inserting into the database, it
+	/**\brief show the summary before inserting into the database, it
 	 * calls the function for adding a attachment. The function verify
 	 * should be called before
 	 * \param $p_array an array usually is $_POST
@@ -440,7 +444,7 @@
=20
 	public function confirm($p_array, $p_nothing =3D 0)
 	{
-		global $g_parameter;
+		global $g_parameter,$g_user;
 		$r =3D "";
 		bcscale(2);
 		extract($p_array);
@@ -451,7 +455,11 @@
 		}
 		else
 		{
-			$pPeriode->find_periode($e_date);
+			if (isDate($e_date) !=3D null) {
+				$pPeriode->find_periode($e_date);
+			} else {
+				$pPeriode->p_id=3D$g_user->get_periode();
+			}
 		}
=20
 		list ($l_date_start, $l_date_end) =3D $pPeriode->get_date_limit();
@@ -459,7 +467,7 @@
 		$r.=3D'';
 		$r.=3D'<fieldset><legend>Banque, caisse </legend>';
 		$r.=3D '<div id=3D"jrn_name_div">';
-		$r.=3D'<h2 id=3D"jrn_name" style=3D"display:inline">' . $this->get_nam=
e() . '</h2>';
+		$r.=3D'<h2 class=3D"title" id=3D"jrn_name" style=3D"display:inline">' =
. $this->get_name() . '</h2>';
 		$r.=3D '</div>';
 		$r.=3D'<TABLE  width=3D"100%">';
 		//  Date
@@ -502,23 +510,22 @@
=20
 		$r.=3D'</fieldset>';
=20
-		$r.=3D'<fieldset><legend>Op=C3=A9rations financi=C3=A8res</legend>';
+		$r.=3D'<div class=3D"myfieldset"><h1 class=3D"legend">Extrait de compt=
e</h1>';
 		//--------------------------------------------------
 		// Saldo begin end
 		//-------------------------------------------------
-		$r.=3D'<fieldset><legend>Extrait de compte</legend>';
 		$r.=3D'<table>';
 		$r.=3D'<tr>';
 		// Extrait
 		//--
-		$r.=3D'<td> Num=C3=A9ro d\'extrait</td>' . h($e_pj);
-		$r.=3D'<td >Solde d=C3=A9but extrait </td>';
-		$r.=3D'<td>' . $first_sold . '</td>';
-		$r.=3D'<td>Solde fin extrait </td>';
-		$r.=3D'<td>' . $last_sold . '</td>';
+		$r.=3Dtr('<td> Num=C3=A9ro d\'extrait</td>' . td(h($e_pj)));
+		$r.=3D'<tr><td >Solde d=C3=A9but extrait </td>';
+		$r.=3D'<td style=3D"num">' . nbm($first_sold) . '</td></tr>';
+		$r.=3D'<tr><td>Solde fin extrait </td>';
+		$r.=3D'<td style=3D"num">' . nbm($last_sold) . '</td></tr>';
 		$r.=3D'</table>';
-		$r.=3D'</fieldset>';
=20
+		$r.=3D'<h1 class=3D"legend">Op=C3=A9rations financi=C3=A8res</h1>';
 		//--------------------------------------------------
 		// financial operation
 		//-------------------------------------------------
@@ -582,9 +589,11 @@
 			if (${"e_concerned" . $i} !=3D '')
 			{
 				$jr_internal =3D $this->db->get_array("select jr_internal from jrn w=
here jr_id in (" . ${"e_concerned" . $i} . ")");
+				$comma=3D"";
 				for ($x =3D 0; $x < count($jr_internal); $x++)
 				{
-					$r.=3DHtmlInput::detail_op(${"e_concerned" . $i}, $jr_internal[$x][=
'jr_internal']);
+					$r.=3D$comma.HtmlInput::detail_op(${"e_concerned" . $i}, $jr_intern=
al[$x]['jr_internal']);
+					$comma=3D" , ";
 				}
 			}
 			$r.=3D'</td>';
@@ -618,7 +627,7 @@
 		$r.=3D"<br>Ajoutez une pi&egrave;ce justificative ";
 		$r.=3D$file->input("pj", "");
=20
-		$r.=3D'</fieldset>';
+		$r.=3D'</div>';
 		//--------------------------------------------------
 		// Hidden variables
 		//--------------------------------------------------
@@ -652,7 +661,7 @@
 		return $r;
 	}
=20
-	/* !\brief save the data into the database, included the attachment,
+	/**\brief save the data into the database, included the attachment,
 	 * and the reconciliations
 	 * \param $p_array usually $_POST
 	 * \return string with HTML code
@@ -718,7 +727,7 @@
 			$get_solde=3Dtrue;
 			for ($i =3D 0; $i < $nb_item; $i++)
 			{
-				// if tiers is set and amount !=3D 0 insert it into the database
+				// insert it into the database
 				// and quit the loop ?
 				if (strlen(trim(${"e_other$i"})) =3D=3D 0)
 					continue;
@@ -949,7 +958,7 @@
 		return $ret;
 	}
=20
-	/* !\brief display operation of a FIN ledger
+	/**\brief display operation of a FIN ledger
 	 * \return html code into a string
 	 */
=20

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-03 21:5=
6:40 UTC (rev 5215)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-03 22:3=
1:33 UTC (rev 5216)
@@ -342,18 +342,19 @@
             $tot_perso=3D0;
             $tot_tva_nd=3D0;
             $tot_tva_ndded=3D0;
+			$tva=3Darray();
             /* Save all the items without vat and no deductible vat and =
expense*/
             for ($i=3D0;$i< $nb_item;$i++)
             {
 				$n_both=3D0;
                 if ( strlen(trim(${'e_march'.$i})) =3D=3D 0 ) continue;
-                if ( ${'e_march'.$i.'_price'} =3D=3D 0 ) continue;
+           /*     if ( ${'e_march'.$i.'_price'} =3D=3D 0 ) continue;
                 if ( ${'e_quant'.$i} =3D=3D 0 ) continue;
-
+*/
                 /* First we save all the items without vat */
                 $fiche=3Dnew Fiche($this->db);
                 $fiche->get_by_qcode(${"e_march".$i});
-
+				$tva_both=3D0;
                 /* tva */
                 if ($g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
@@ -361,6 +362,7 @@
                     $oTva=3Dnew Acc_Tva($this->db);
                     $oTva->set_parameter('id',$idx_tva);
                     $oTva->load();
+					$tva_both=3D$oTva->get_parameter("both_side");
                 }
=20
                 /* We have to compute all the amount thanks Acc_Compute =
*/
@@ -381,7 +383,7 @@
                         $acc_amount->amount_vat=3D ${'e_march'.$i.'_tva_=
amount'};
=20
                     }
-                    if ($oTva->get_parameter("both_side")=3D=3D0) $tot_t=
va=3Dbcadd($tot_tva,$acc_amount->amount_vat);
+                    if ($tva_both=3D=3D0) $tot_tva=3Dbcadd($tot_tva,$acc=
_amount->amount_vat);
                 }
=20
                 $acc_operation=3Dnew Acc_Operation($this->db);
@@ -414,7 +416,7 @@
                     $tot_perso+=3D$acc_amount->amount_perso;
                 }
=20
-                if ( ! $fiche->empty_attribute(ATTR_DEF_TVA_NON_DEDUCTIB=
LE))
+                if ( ! $fiche->empty_attribute(ATTR_DEF_TVA_NON_DEDUCTIB=
LE) && $tva_both=3D=3D0)
                 {
                     $acc_amount->nd_vat_rate=3D$fiche->strAttribut(ATTR_=
DEF_TVA_NON_DEDUCTIBLE);
                     $acc_amount->compute_nd_vat();
@@ -422,7 +424,7 @@
                     /* save op. */
=20
                 }
-                if ( ! $fiche->empty_attribute(ATTR_DEF_TVA_NON_DEDUCTIB=
LE_RECUP))
+                if ( ! $fiche->empty_attribute(ATTR_DEF_TVA_NON_DEDUCTIB=
LE_RECUP) && $tva_both=3D=3D0)
                 {
                     $acc_amount->nd_ded_vat_rate=3D$fiche->strAttribut(A=
TTR_DEF_TVA_NON_DEDUCTIBLE_RECUP);
                     $acc_amount->compute_ndded_vat();
@@ -449,7 +451,6 @@
                 $acc_operation->amount=3D$acc_amount->amount;
                 $acc_operation->qcode=3D${"e_march".$i};
                 if( $acc_amount->amount > 0 ) $tot_debit=3Dbcadd($tot_de=
bit,$acc_amount->amount);
-
                 $j_id=3D$acc_operation->insert_jrnx();
=20
                 /* Compute sum vat */
@@ -491,7 +492,7 @@
                 //-----
                 if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
-                    if ( $oTva->get_parameter("both_side")=3D=3D1) $n_bo=
th=3D$acc_amount->amount_vat;
+                    if ( $tva_both=3D=3D1) $n_both=3D$acc_amount->amount=
_vat;
=20
                     $r=3D$this->db->exec_sql("select insert_quant_purcha=
se ".
                                            "(null".
@@ -539,7 +540,8 @@
             $acc_operation->type=3D'c';
             $acc_operation->periode=3D$tperiode;
             $acc_operation->qcode=3D${"e_client"};
-            if ( $cust_amount < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($c=
ust_amount));
+            if ( $cust_amount < 0 )
+				$tot_debit=3Dbcadd($tot_debit,abs($cust_amount));
             $let_client=3D$acc_operation->insert_jrnx();
             /*
              * Save all the no deductible
@@ -601,7 +603,7 @@
                 /* save op. */
                 $acc_operation->type=3D'd';
                 $acc_operation->qcode=3D'';
-	      if ( ! $fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND_TVA_ND))
+	      if ( ! $fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND_TVA_ND) && $tv=
a_both=3D=3D0)
 		{
 		  $dna=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT_ND_TVA_ND);
 		}
@@ -621,7 +623,7 @@
             {
 	      $dna_default=3Dnew Acc_Parm_Code($this->db,'TVA_DED_IMPOT');
                 /* save op. */
-	      if ( ! $fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND_TVA))
+	      if ( ! $fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND_TVA) && $tva_b=
oth=3D=3D0)
 		{
 		  $dna=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT_ND_TVA);
 		}
@@ -665,7 +667,7 @@
                     $acc_operation->jrn=3D$p_jrn;
                     $acc_operation->type=3D'd';
                     $acc_operation->periode=3D$tperiode;
-                    if ( $value > 0 ) $tot_debit=3Dbcadd($tot_debit,$val=
ue);
+                    if ( $value > 0 ) $tot_debit=3Dbcadd($tot_debit,abs(=
$value));
                     $acc_operation->insert_jrnx();
                     // if TVA is on both side, we deduce it immediately
                     if ( $oTva->get_parameter("both_side")=3D=3D1)
@@ -681,6 +683,7 @@
                         $acc_operation->type=3D'c';
                         $acc_operation->periode=3D$tperiode;
                         $acc_operation->insert_jrnx();
+						 if ( $value < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($value));
                     }
=20
                 }
@@ -706,7 +709,7 @@
             $this->db->exec_sql('update quant_purchase set qp_internal =3D=
 $1 where j_id in (select j_id from jrnx where j_grpt=3D$2)',
                                 array($internal,$seq));
=20
-            /* if e_suggest !=3D e_pj then do not increment sequence */
+            /**=3D e_pj then do not increment sequence */
             if ( strcmp($e_pj,$e_pj_suggest) =3D=3D 0 && strlen(trim($e_=
pj)) !=3D 0 )
             {
                 $this->inc_seq_pj();
@@ -794,7 +797,7 @@
=20
                 /* insert into jrn */
                 $acc_pay->mt=3D$mt;
-				$acc_pay->desc=3D$e_comm;
+				$acc_pay->desc=3D(!isset($e_comm_paiement) || strlen(trim($e_comm_pa=
iement)) =3D=3D 0) ?$e_comm:$e_comm_paiement;
                 $mp_jr_id=3D$acc_pay->insert_jrn();
                 $acjrn->grpt_id=3D$acseq;
                 $acjrn->update_internal_code($acinternal);
@@ -972,7 +975,10 @@
         {
             $add_js=3D"update_pj();";
         }
-        $add_js.=3D'get_last_date();';
+		if ($g_parameter->MY_DATE_SUGGEST =3D=3D 'Y')
+		{
+			$add_js.=3D'get_last_date();';
+		}
 		$add_js.=3D'update_name();';
 		$add_js.=3D'update_pay_method()';
=20
@@ -1083,10 +1089,8 @@
             /* use vat */
             if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
-                $march_tva_id=3D(isset(${"e_march$i"."_tva_id"}))?${"e_m=
arch$i"."_tva_id"}:""
-                              ;
-                $march_tva_amount=3D(isset(${"e_march$i"."_tva_amount"})=
)?${"e_march$i"."_tva_amount"}:""
-                                  ;
+                $march_tva_id=3D(isset(${"e_march$i"."_tva_id"}))?${"e_m=
arch$i"."_tva_id"}:"";
+                $march_tva_amount=3D(isset(${"e_march$i"."_tva_amount"})=
)?${"e_march$i"."_tva_amount"}:"";
             }
=20
=20
@@ -1210,7 +1214,7 @@
         ob_start();
         require_once('template/form_ledger_detail.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
=20
         // Set correctly the REQUEST param for jrn_type
         $r.=3D HtmlInput::hidden('jrn_type','ACH');
@@ -1267,7 +1271,7 @@
         $r.=3D"<fieldset>";
         $r.=3D"<legend>"._('En-t=C3=AAte facture fournisseur')."  </lege=
nd>";
 		$r.=3D'<div id=3D"jrn_name_div">';
-		$r.=3D'<h2 id=3D"jrn_name">'.$this->get_name().'</h2>';
+		$r.=3D'<h2 class=3D"title"  id=3D"jrn_name">'.$this->get_name().'</h2>=
';
 		$r.=3D'</div>';
         $r.=3D'<TABLE  width=3D"100%">';
         $r.=3D'<tr>';
@@ -1525,13 +1529,16 @@
         {
             $r.=3DHtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.=
$e_mp});
             $r.=3DHtmlInput::hidden('acompte',$acompte);
+			$r.=3DHtmlInput::hidden('e_comm_paiement',$e_comm_paiement);
             /* needed for generating a invoice */
             $r.=3DHtmlInput::hidden('qcode_benef', ${'e_mp_qcode_' . $e_=
mp});
 			$fname =3D new Fiche($this->db);
 			$fname->get_by_qcode(${'e_mp_qcode_' . $e_mp});
 			$r.=3D"<div style=3D\"clear:both\"></div>";
 			$r.=3D'<div style=3D"float:left"><h2 class=3D"info">' . "Pay=C3=A9 pa=
r " . ${'e_mp_qcode_' . $e_mp} .
-					" ".$fname->getName() ."</h2> ". _('D=C3=A9duction acompte ').h($ac=
ompte).'</div>';
+					" ".$fname->getName() ."</h2> ".
+					'<p>'._('D=C3=A9duction acompte ').h($acompte).'</p>'.
+					_('Libell=C3=A9 :' ).h($e_comm_paiement).'</div>';
             $r.=3D'<br>';
         }
         // check for upload piece

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-03 21:56:40=
 UTC (rev 5215)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-03 22:31:33=
 UTC (rev 5216)
@@ -1,4 +1,4 @@
-<?php
+ <?php
 /*
  *   This file is part of PhpCompta.
  *
@@ -275,13 +275,12 @@
             $tot_tva=3D0;
             $tot_debit=3D0;
             $this->db->start();
+			$tva=3Darray();
             /* Save all the items without vat */
             for ($i=3D0;$i< $nb_item;$i++)
             {
 				$n_both=3D0;
                 if ( strlen(trim(${'e_march'.$i})) =3D=3D 0 ) continue;
-                if ( ${'e_march'.$i.'_price'} =3D=3D 0 ) continue;
-                if ( ${'e_quant'.$i} =3D=3D 0 ) continue;
=20
                 /* First we save all the items without vat */
                 $fiche=3Dnew Fiche($this->db);
@@ -325,8 +324,8 @@
                     $oTva=3Dnew Acc_Tva($this->db);
                     $idx_tva=3D${'e_march'.$i.'_tva_id'};
                     $tva_item=3D${'e_march'.$i.'_tva_amount'};
-		    $oTva->set_parameter("id",$idx_tva);
-		    $oTva->load();
+					$oTva->set_parameter("id",$idx_tva);
+					$oTva->load();
                     /* if empty then we need to compute it */
                     if (trim($tva_item)=3D=3D'')
                     {
@@ -339,18 +338,19 @@
                         $tva[$idx_tva]+=3D$tva_item;
                     else
                         $tva[$idx_tva]=3D$tva_item;
-                    if ($oTva->get_parameter("both_side")=3D=3D0) $tot_t=
va=3Dround(bcadd($tva_item,$tot_tva),2);
-                    else $n_both=3D$tva_item;
+                    if ($oTva->get_parameter("both_side")=3D=3D0) {
+						$tot_tva=3Dround(bcadd($tva_item,$tot_tva),2);
+					}else {
+							$n_both=3D$tva_item;
+							if ( $n_both < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($n_both));
+					}
                 }
=20
                 /* Save the stock */
                 /* if the quantity is < 0 then the stock increase (retur=
n of
                  *  material)
                  */
-                $nNeg=3D($
-                       {"e_quant".$i
-                       }
-                       <0)?-1:1;
+                $nNeg=3D(${"e_quant".$i}<0)?-1:1;
=20
                 // always save quantity but in withStock we can find
                 // what card need a stock management
@@ -478,7 +478,7 @@
=20
             $this->pj=3D$acc_operation->set_pj();
=20
-            /* if e_suggest !=3D e_pj then do not increment sequence */
+            /**=3D e_pj then do not increment sequence */
             /* and e_pj is not null */
             if ( strcmp($e_pj,$e_pj_suggest) =3D=3D 0 && strlen( trim($e=
_pj)) !=3D 0 )
             {
@@ -566,8 +566,9 @@
                 $let_other=3D$acc_pay->insert_jrnx();
=20
                 /* insert into jrn */
-				$acjrn->desc=3D$e_comm;
+				$acc_pay->mt=3D$mt;
                 $acjrn->grpt_id=3D$acseq;
+				$acc_pay->desc=3D(!isset($e_comm_paiement) || strlen(trim($e_comm_pa=
iement)) =3D=3D 0) ?$e_comm:$e_comm_paiement;
                 $mp_jr_id=3D$acc_pay->insert_jrn();
                 $acjrn->update_internal_code($acinternal);
=20
@@ -664,7 +665,7 @@
         $r.=3D"<fieldset>";
         $r.=3D"<legend>"._('En-t=C3=AAte facture client')."  </legend>";
 		$r.=3D'<div id=3D"jrn_name_div">';
-		$r.=3D'<h2 id=3D"jrn_name" style=3D"display:inline">' . $this->get_nam=
e() . '</h2>';
+		$r.=3D'<h2 class=3D"title"  id=3D"jrn_name" style=3D"display:inline">'=
 . $this->get_name() . '</h2>';
 		$r.=3D '</div>';
         $r.=3D'<TABLE  width=3D"100%">';
         $r.=3D'<tr>';
@@ -906,6 +907,7 @@
         {
             $r.=3DHtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.=
$e_mp});
             $r.=3DHtmlInput::hidden('acompte',$acompte);
+			$r.=3DHtmlInput::hidden('e_comm_paiement',$e_comm_paiement);
             /* needed for generating a invoice */
             $r.=3DHtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp}=
);
=20
@@ -913,7 +915,8 @@
 			$fname->get_by_qcode(${'e_mp_qcode_'.$e_mp});
 			$r.=3D"<div style=3D\"clear:both\"></div>";
 			$r.=3D'<div style=3D"float:left"><h2 class=3D"info">'."Pay=C3=A9 par =
".${'e_mp_qcode_'.$e_mp}.
-				   " ".$fname->getName().'</H2> '._('D=C3=A9duction acompte ').h($ac=
ompte).'</div>';
+				   " ".$fname->getName().'</H2> '.'<p>'._('D=C3=A9duction acompte ')=
.h($acompte).'</p>'.
+					_('Libell=C3=A9 :' ).h($e_comm_paiement).'</div>';
             $r.=3D'<br>';
         }
=20
@@ -1104,7 +1107,10 @@
         {
             $add_js=3D"update_pj();";
         }
-        $add_js.=3D'get_last_date();';
+		if ($g_parameter->MY_DATE_SUGGEST =3D=3D 'Y')
+		{
+			$add_js.=3D'get_last_date();';
+		}
 		$add_js.=3D'update_name();';
 		$add_js.=3D'update_pay_method()';
=20
@@ -1336,7 +1342,7 @@
         ob_start();
         require_once('template/form_ledger_detail.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
=20
=20
=20

Modified: phpcompta/trunk/include/class_acc_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_operation.php	2013-05-03 21:56:40 U=
TC (rev 5215)
+++ phpcompta/trunk/include/class_acc_operation.php	2013-05-03 22:31:33 U=
TC (rev 5216)
@@ -306,7 +306,7 @@
         $csv=3D"";
         foreach ($show as $l)
         {
-            if ( $l['j_poste'] =3D=3D $this->poste || $l['j_qcode']=3D=3D=
$this->qcode)
+            if ( $l['j_poste'] =3D=3D $this->poste || ($l['j_qcode']=3D=3D=
$this->qcode && trim($this->qcode) !=3D ''))
                 $border=3D' style=3D"border-bottom:1px solid red;"';
             else
                 $border=3D'';
@@ -468,7 +468,7 @@
     }
     /**
     *@brief retrieve data from jrnx and jrn
-    *@return return an object=20
+    *@return return an object
     *@note
     *@see
     @code
@@ -562,7 +562,7 @@
 /**
  *@brief this class manage data from the JRNX and JRN
  * table
- *@note Data member are the column of the table=20
+ *@note Data member are the column of the table
  */
 class Acc_Misc extends Acc_Detail
 {
@@ -588,7 +588,7 @@
 /**
  *@brief this class manage data from the QUANT_SOLD
  * table
- *@note Data member are the column of the table=20
+ *@note Data member are the column of the table
  */
 class Acc_Sold extends Acc_Detail
 {
@@ -602,7 +602,7 @@
     {
         parent::get();
         $sql=3D"SELECT qs_id, qs_internal, qs_fiche, qs_quantite, qs_pri=
ce, qs_vat,
-             qs_vat_code, qs_client, qs_valid, j_id,j_text
+             qs_vat_code, qs_client, qs_valid, j_id,j_text,qs_vat_sided
              FROM quant_sold  join jrnx using(j_id) where j_grpt=3D$1";
         $this->det->array=3D$this->db->get_array($sql,array($this->det->=
jr_grpt_id));
     }
@@ -611,8 +611,8 @@
 /**
  *@brief this class manage data from the QUANT_PURCHASE
  * table
- *@note Data member are the column of the table=20
-=20
+ *@note Data member are the column of the table
+
  */
 class Acc_Purchase extends Acc_Detail
 {
@@ -627,7 +627,7 @@
         parent::get();
         $sql=3D"SELECT qp_id, qp_internal, j_id, qp_fiche, qp_quantite, =
qp_price, qp_vat,
              qp_vat_code, qp_nd_amount, qp_nd_tva, qp_nd_tva_recup, qp_s=
upplier,
-             qp_valid, qp_dep_priv,j_text
+             qp_valid, qp_dep_priv,j_text,qp_vat_sided
              FROM quant_purchase  join jrnx using(j_id) where j_grpt=3D$=
1";
         $this->det->array=3D$this->db->get_array($sql,array($this->det->=
jr_grpt_id));
     }
@@ -636,7 +636,7 @@
 /**
  *@brief this class manage data from the QUANT_FIN
  * table
- *@note Data member are the column of the table=20
+ *@note Data member are the column of the table
  */
 class Acc_Fin extends Acc_Detail
 {

Modified: phpcompta/trunk/include/class_acc_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_payment.php	2013-05-03 21:56:40 UTC=
 (rev 5215)
+++ phpcompta/trunk/include/class_acc_payment.php	2013-05-03 22:31:33 UTC=
 (rev 5216)
@@ -225,50 +225,6 @@
         }
         return $ret;
     }
-    /**
-     *@deprecated
-     * @return string
-     */
-    public function row_deprecated()
-    {
-        //--------------------------------------------------------------=
-------------
-        // Common variable
-        $td=3D'<TD>';
-        $etd=3D'</td>';
-        $tr=3D'<tr>';
-        $etr=3D'</tr>';
-        $th=3D'<th>';
-        $eth=3D'</th>';
-
-        $r=3D'';
-        if ( $this->jrn_def_id !=3D '' )
-        {
-            $name=3D$this->cn->get_value("select jrn_def_name from jrn_d=
ef where jrn_def_id=3D$1",
-                    array($this->jrn_def_id));
-        }
-        $r.=3Dtd($this->mp_lib);
-
-        if ( $this->mp_fd_id !=3D NULL && $this->mp_fd_id !=3D0)
-        {
-            $fiche=3Dnew Fiche_Def($this->cn,$this->mp_fd_id);
-            $fiche->Get();
-            $r.=3Dtd($fiche->label);
-        }
-        else
-            $r.=3D$td.$etd;
-        $jrn=3Dnew Acc_Ledger($this->cn,$this->mp_jrn_def_id);
-        $r.=3D$td.$jrn->get_name().$etd;
-        if ( strlen(trim($this->mp_qcode)) !=3D 0 )
-        {
-            $f=3Dnew Fiche($this->cn);
-            $f->get_by_qcode($this->mp_qcode);
-            $r.=3Dtd($f->strAttribut(ATTR_DEF_NAME));
-
-        }
-        else
-            $r.=3D$td.$etd;
-        return $r;
-    }
     /*!\brief return a string with a form (into a table)
      *\param none
      *\return a html string
@@ -335,7 +291,16 @@
             $acompte->value=3D0;
             $r.=3D_(" Acompte =C3=A0 d=C3=A9duire");
             $r.=3D$acompte->input();
-        }
+			$r.=3D'<p>';
+			$e_comm_paiement=3Dnew IText('e_comm_paiement');
+			$e_comm_paiement->table =3D 0;
+			$e_comm_paiement->setReadOnly(false);
+			$e_comm_paiement->size =3D 60;
+			$e_comm_paiement->tabindex =3D 3;
+			$r.=3D_(" Libell=C3=A9 du paiement");
+			$r.=3D$e_comm_paiement->input();
+			$r.=3D'</p>';
+		}
=20
         $r.=3D'<ol>';
         $r.=3D'<li ><input type=3D"radio" name=3D"e_mp" value=3D"0" chec=
ked>'._('Paiement encod=C3=A9 plus tard');
@@ -350,7 +315,7 @@
                 {
                     $a=3Dnew ICard();
                     $a->jrn=3D$row->mp_jrn_def_id;
-		    $a->set_attribute('typecard',$row->mp_fd_id);
+					$a->set_attribute('typecard',$row->mp_fd_id);
                     $a->name=3D'e_mp_qcode_'.$row->mp_id;
                     $a->set_dblclick("fill_ipopcard(this);");
                     $a->set_callback('filter_card');

Modified: phpcompta/trunk/include/class_anticipation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_anticipation.php	2013-05-03 21:56:40 UT=
C (rev 5215)
+++ phpcompta/trunk/include/class_anticipation.php	2013-05-03 22:31:33 UT=
C (rev 5216)
@@ -112,6 +112,7 @@
      */
     public function display()
     {
+		bcscale(4);
         $forecast=3Dnew Forecast($this->cn,$this->f_id);
         $forecast->load();
         $str_name=3Dh($forecast->get_parameter('name'));
@@ -176,7 +177,7 @@
         ob_start();
         require_once('template/forecast_result.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     public static function div()
@@ -246,7 +247,7 @@
         ob_start();
         require_once('template/forecast_cat.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     /**
@@ -309,7 +310,7 @@
         ob_start();
         require_once('template/forecast_cat.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
=20
     }
@@ -342,7 +343,7 @@
         $cat=3Dnew Forecast_Cat($this->cn);
         $array=3D$cat->make_array($this->f_id);
         $periode=3Dnew Periode($this->cn);
-        $aPeriode=3D$this->cn->make_array("select p_id,to_char(p_start,'=
MM.YYYY') as label from parm_periode=20
+        $aPeriode=3D$this->cn->make_array("select p_id,to_char(p_start,'=
MM.YYYY') as label from parm_periode
                                   where p_start >=3D (select p_start fro=
m parm_periode where p_id=3D$str_start)
                                    and p_end <=3D (select p_end from par=
m_periode where p_id=3D$str_end)
 				   order by p_start");
@@ -433,7 +434,7 @@
         ob_start();
         require_once('template/forecast-detail.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     /**

Modified: phpcompta/trunk/include/class_calendar.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_calendar.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/class_calendar.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -61,7 +61,7 @@
         for ($i=3D0;$i<count($array);$i++)
         {
             $ind=3D$array[$i]['ag_timestamp_day'];
-            $p_array[$ind].=3D"<span class=3D\"notice\">".$array[$i]['nb=
']." "._("T=C3=A2ches suivis").'</span>';
+            $p_array[$ind].=3D"<span class=3D\"notice\">".$array[$i]['nb=
']." "._("T=C3=A2ches suivies").'</span>';
=20
         }
     }
@@ -90,6 +90,8 @@
      */
     function display()
     {
+        global $g_user;
+        $exercice_user=3D$g_user->get_exercice();
         /* day */
         $cell=3Darray();
         for ($i=3D0;$i<42;$i++)
@@ -104,7 +106,7 @@
         $this->fill_from_todo($cell);
         $wMonth=3Dnew ISelect('per');
         $cn=3Dnew Database(dossier::id());
-        $wMonth->value=3D$cn->make_array("select p_id,to_char(p_start,'M=
M/YYYY') from parm_periode order by p_start");
+        $wMonth->value=3D$cn->make_array("select p_id,to_char(p_start,'M=
M/YYYY') from parm_periode where p_exercice =3D '$exercice_user' order by=
 p_start");
         $wMonth->selected=3D$this->default_periode;
         $wMonth->javascript=3D"onchange=3Dchange_month(this)";
         $wMonth->set_attribute('gDossier',dossier::id());

Modified: phpcompta/trunk/include/class_database.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_database.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/class_database.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -550,6 +550,39 @@
         return false;
     }
     /**
+     * return the name of the database with the domain name
+     * @param $p_id of the folder WITHOUT the domain name
+     * @param $p_type dos for folder mod for template
+     * @return formatted name
+     */
+    function format_name($p_id,$p_type)
+    {
+        switch ($p_type)
+        {
+            case 'dos':
+                $sys_name=3Dsprintf("%sdossier%d",strtolower(domaine),$p=
_id);
+                break;
+            case 'mod':
+                $sys_name=3Dsprintf("%smod%d",strtolower(domaine),$p_id)=
;
+                break;
+            default:
+                echo_error(__FILE__." format_name invalid type ".$p_type=
, __LINE__);
+		exit();
+        }
+        return $sys_name;
+    }
+    /**
+     * Count the database name in a system view
+     * @param $p_name string database name
+     * @return number of database found (normally 0 or 1)
+     */
+    function exist_database($p_name)
+    {
+        $database_exist=3D$this->get_value('select count(*)=20
+                from pg_catalog.pg_database where datname =3D lower($1)'=
,array($p_name));
+        return $database_exist;
+    }
+    /**
      *@brief check if the large object exists
      *@param $p_oid of the large object
      *@return return true if the large obj exist or false if not

Modified: phpcompta/trunk/include/class_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_document.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/class_document.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -235,13 +235,23 @@
=20
 			$to_remove=3D$pattern;
 			// we remove the < and > from the pattern
-			$pattern=3Dstr_replace($lt,'',$pattern);
-			$pattern=3Dstr_replace($gt,'',$pattern);
+			$tag=3Dstr_replace($lt,'',$pattern);
+			$tag=3Dstr_replace($gt,'',$tag);
=20
=20
 			// if the pattern if found we replace it
-			$value=3D$this->Replace($pattern,$p_array);
+			$value=3D$this->Replace($tag,$p_array);
 			if ( strpos($value,'ERROR') !=3D false ) 		  $value=3D"";
+                        /*
+                         * Change type of cell to numeric
+                         *  allow numeric cel in ODT for the formatting =
and formula=20
+                         */
+			if ( is_numeric($value) && $p_type=3D=3D'OOo')
+			  {
+			    $searched=3D'/office:value-type=3D"string"><text:p>'.$pattern.'/'=
;
+			    $replaced=3D'office:value-type=3D"float" office:value=3D"'.$value=
.'"><text:p>'.$pattern;
+			    $buffer=3Dpreg_replace($searched, $replaced, $buffer,1);
+			  }
 			// replace into the $buffer
 			// take the position in the buffer
 			$pos=3Dstrpos($buffer,$to_remove);
@@ -368,7 +378,7 @@
         $r=3D'<A class=3D"mtitle" HREF=3D"show_document.php?d_id=3D'.$th=
is->d_id.'&'.dossier::get().'">'.$image.'</A>';
         return $r;
     }
-    /* ! Get
+    /** Get
      * \brief Send the document
      */
     function Send()
@@ -1080,7 +1090,28 @@
                 return $p_array['acompte'];
 			return "0";
             break;
-        }
+		case 'STOCK_NAME':
+			if ( ! isset ($p_array['repo'])) return "";
+			$ret=3D$this->db->get_value('select r_name from public.stock_reposito=
ry where r_id=3D$1',array($p_array['repo']));
+			return $ret;
+		case 'STOCK_ADRESS':
+			if ( ! isset ($p_array['repo'])) return "";
+			$ret=3D$this->db->get_value('select r_adress from public.stock_reposi=
tory where r_id=3D$1',array($p_array['repo']));
+			return $ret;
+		case 'STOCK_COUNTRY':
+			if ( ! isset ($p_array['repo'])) return "";
+			$ret=3D$this->db->get_value('select r_country from public.stock_repos=
itory where r_id=3D$1',array($p_array['repo']));
+			return $ret;
+		case 'STOCK_CITY':
+			if ( ! isset ($p_array['repo'])) return "";
+			$ret=3D$this->db->get_value('select r_city from public.stock_reposito=
ry where r_id=3D$1',array($p_array['repo']));
+			return $ret;
+		case 'STOCK_PHONE':
+			if ( ! isset ($p_array['repo'])) return "";
+			$ret=3D$this->db->get_value('select r_phone from public.stock_reposit=
ory where r_id=3D$1',array($p_array['repo']));
+			return $ret;
+
+		}
         /*
          * retrieve the value of ATTR for e_march
          */

Modified: phpcompta/trunk/include/class_document_type.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_document_type.php	2013-05-03 21:56:40 U=
TC (rev 5215)
+++ phpcompta/trunk/include/class_document_type.php	2013-05-03 22:31:33 U=
TC (rev 5216)
@@ -20,17 +20,17 @@
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* ! \file
+/** \file
  * \brief  class for the table document_type
  */
=20
-/* ! \brief class for the table document_type
+/** \brief class for the table document_type
  * < dt_id pk document_type
  * < dt_value value
  */
 class Document_type
 {
-	/* ! document_type
+	/** document_type
 	 * \brief constructor
 	 * \param $p_cn database connx
 	 */
@@ -41,7 +41,7 @@
 		$this->dt_id =3D $p_id;
 	}
=20
-	/* !
+	/**
 	 * \brief Get all the data for this dt_id
 	 */
=20

Modified: phpcompta/trunk/include/class_exercice.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_exercice.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/class_exercice.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -21,7 +21,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 /*!\file
- * \brief about the accountant exercice=20
+ * \brief about the accountant exercice
  */
 require_once('class_database.php');
 require_once('class_iselect.php');
@@ -56,4 +56,23 @@
      $iselect->javascript=3D$js;
      return $iselect;
    }
+   /**
+    *Show a ISelect with the different exercices, display start and end =
date
+    *@param $name of the iselect
+    *@param $selected the selected year  (default =3D '')
+    *@param $js javascript (default =3D '')
+    *@return ISelect object
+    */
+   function select_date($name,$selected=3D'',$js=3D'')
+   {
+     $iselect=3Dnew ISelect($name);
+     $iselect->value=3D$this->cn->make_array("select distinct p_exercice=
,to_char (min(p_start),'DD.MM.YY')
+																	 ||' - '
+																	 ||to_char (max(p_end),'DD.MM.YY')
+											from parm_periode
+											group by p_exercice order by 1");
+     $iselect->selected=3D$selected;
+     $iselect->javascript=3D$js;
+     return $iselect;
+   }
 }

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/class_fiche.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -178,7 +178,9 @@
         if ( sizeof($this->attribut) !=3D sizeof($e->attribut ) )
         {
=20
-            // !!! Missing attribute
+            /*
+			 * !! Missing attribute
+			 */
             foreach ($e->attribut as $f )
             {
                 $flag=3D0;
@@ -428,7 +430,7 @@
         foreach ($array as $attr)
         {
             $table=3D0;
-            $msg=3D"";
+            $msg=3D"";$bulle=3D'';
             if ( $attr->ad_id =3D=3D ATTR_DEF_ACCOUNT)
             {
                 $w=3Dnew IPoste("av_text".$attr->ad_id);
@@ -521,8 +523,11 @@
 			$w->table =3D $table;
 			$w->label =3D $attr->ad_text;
 			$w->name =3D "av_text" . $attr->ad_id;
-
-			$r.=3D"<TR>" . td($w->label, ' class=3D"input_text" ') . td($w->input=
()." $msg")." </TR>";
+			if ($attr->ad_id =3D=3D 21 || $attr->ad_id=3D=3D22||$attr->ad_id=3D=3D=
20||$attr->ad_id=3D=3D31)
+			{
+				$bulle=3DHtmlInput::infobulle(21);
+			}
+			$r.=3D"<TR>" . td($w->label." $bulle", ' class=3D"input_text" ') . td=
($w->input()." $msg")." </TR>";
 		}
 		$r.=3D '</table>';
         return $r;
@@ -690,7 +695,10 @@
 			$w->name =3D "av_text" . $r->ad_id;
 			$w->readOnly =3D $p_readonly;
=20
-
+			if ($r->ad_id =3D=3D 21 || $r->ad_id=3D=3D22||$r->ad_id=3D=3D20||$r->=
ad_id=3D=3D31)
+			{
+				$bulle=3DHtmlInput::infobulle(21);
+			}
 			$ret.=3D"<TR>" . td($r->ad_text . $bulle) . td($w->input()." ". $msg)=
 . " </TR>";
 		}
=20
@@ -774,6 +782,19 @@
=20
                         if ( strlen(trim($v)) !=3D 0)
                         {
+							if( strpos($value,',')=3D=3D0)
+							{
+								$v=3D$this->cn->get_value("select format_account($1)",array($val=
ue));
+							} else {
+								$ac_array =3D explode(",", $value);
+								if (count($ac_array) <> 2)
+									throw new Exception('D=C3=A9sol=C3=A9, il y a trop de virgule d=
ans le poste comptable ' . h($value));
+								$part1 =3D $ac_array[0];
+								$part2 =3D $ac_array[1];
+								$part1 =3D $this->cn->get_value('select format_account($1)', arr=
ay($part1));
+								$part2 =3D $this->cn->get_value('select format_account($1)', arr=
ay($part2));
+								$v =3D $part1 . ',' . $part2;
+							}
                             $parameter=3Darray($this->id,$v);
                         }
                         else
@@ -895,6 +916,10 @@
 							$part2 =3D $this->cn->get_value('select format_account($1)', arra=
y($part2));
 							$v =3D $part1 . ',' . $part2;
 						}
+						else
+						{
+							$v=3D$this->cn->get_value('select format_account($1)',array($valu=
e));
+						}
 						$sql =3D sprintf("select account_update(%d,'%s')", $this->id, $v);
 						try
 						{
@@ -1262,7 +1287,7 @@
             $vw_operation=3Dsprintf('<A class=3D"detail" style=3D"text-d=
ecoration:underline" HREF=3D"javascript:modifyOperation(\'%s\',\'%s\')" >=
%s</A>',
                                   $op['jr_id'], dossier::id(), $op['jr_i=
nternal']);
             $let=3D'';
-            if ( $op['letter'] !=3D-1) $let=3D$op['letter'];
+            if ( $op['letter'] !=3D-1) $let=3D  strtoupper(base_convert(=
$op['letter'],10,36));
=20
 	    $tmp_diff=3Dbcsub($op['deb_montant'],$op['cred_montant']);
=20
@@ -1483,6 +1508,7 @@
     function Summary($p_search=3D"",$p_action=3D"",$p_sql=3D"",$p_amount=
=3Dfalse)
     {
         global $g_user;
+		bcscale(4);
         $str_dossier=3Ddossier::get();
         $p_search=3Dsql_string($p_search);
         $script=3D$_SERVER['PHP_SELF'];
@@ -1535,7 +1561,7 @@
             return $r;
=20
         $i=3D0;
-
+		$deb=3D0;$cred=3D0;
         foreach ($step_tiers as $tiers )
         {
             $i++;
@@ -1559,14 +1585,18 @@
                          " ".$tiers->strAttribut(ATTR_DEF_PAYS)).
                 "</TD>";
=20
-            $r.=3D'<TD align=3D"right"> '.(($amount['debit']=3D=3D0)?0:n=
bm($amount['debit'])).'&euro;</TD>';
-	    $r.=3D'<TD align=3D"right"> '.(($amount['credit']=3D=3D0)?0:nbm($am=
ount['credit'])).'&euro;</TD>';
-	    $r.=3D'<TD align=3D"right"> '.nbm($amount['solde'])."&euro;</TD>";
+            $r.=3D'<TD align=3D"right"> '.(($amount['debit']=3D=3D0)?0:n=
bm($amount['debit'])).'</TD>';
+			$r.=3D'<TD align=3D"right"> '.(($amount['credit']=3D=3D0)?0:nbm($amou=
nt['credit'])).'</TD>';
+			$r.=3D'<TD align=3D"right"> '.nbm($amount['solde'])."</TD>";
+			$deb=3Dbcadd($deb,$amount['debit']);
+			$cred=3Dbcadd($cred,$amount['credit']);
=20
-
             $r.=3D"</TR>";
=20
         }
+		$r.=3D"<tr>";
+		$solde=3Dbcsub($deb,$cred);
+		$r.=3Dtd("").td("").td("Totaux").td(nbm($deb),'class=3D"num"').td(nbm(=
$cred),'class=3D"num"').td(nbm($solde),'class=3D"num"');
         $r.=3D"</TABLE>";
         $r.=3D$bar;
         return $r;

Modified: phpcompta/trunk/include/class_fiche_def.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche_def.php	2013-05-03 21:56:40 UTC (=
rev 5215)
+++ phpcompta/trunk/include/class_fiche_def.php	2013-05-03 22:31:33 UTC (=
rev 5216)
@@ -206,7 +206,7 @@
 			alert (_('Le nom de la cat=C3=A9gorie ne peut pas =C3=AAtre vide'));
             return 1;
 		}
-        // $p_FICHE_REF cannot be null !!! (=3D=3D fiche_def_ref.frd_id
+        /**!! (=3D=3D fiche_def_ref.frd_id
         if (! isset ($p_FICHE_REF) || strlen($p_FICHE_REF) =3D=3D 0 )
         {
             echo alert (_('Vous devez choisir une categorie'));
@@ -254,15 +254,13 @@
                 $sql=3D"select account_add($1,$2)";
                 $Res=3D$this->cn->exec_sql($sql,array($p_class_base,$p_n=
om_mod));
             }
+			// Get the fd_id
+			$fd_id=3D$this->cn->get_current_seq('s_fdef');
=20
-            // Get the fd_id
-            $fd_id=3D$this->cn->get_current_seq('s_fdef');
-
-            // update jnt_fic_attr
-            $sql=3Dsprintf("insert into jnt_fic_attr(fd_id,ad_id,jnt_ord=
er)
-                         values (%d,%d,10)",$fd_id,ATTR_DEF_ACCOUNT);
-            $Res=3D$this->cn->exec_sql($sql);
-
+			// update jnt_fic_attr
+			$sql=3Dsprintf("insert into jnt_fic_attr(fd_id,ad_id,jnt_order)
+					 values (%d,%d,10)",$fd_id,ATTR_DEF_ACCOUNT);
+			$Res=3D$this->cn->exec_sql($sql);
         }
         else
         {
@@ -291,11 +289,15 @@
 				$order=3D$jnt_order;
                 if ( $v['ad_id'] =3D=3D ATTR_DEF_NAME )
                     $order=3D0;
-                $sql=3Dsprintf("insert into jnt_fic_Attr(fd_id,ad_id,jnt=
_order)
+				$count=3D$this->cn->get_value("select count(*) from jnt_fic_attr whe=
re fd_id=3D$1 and ad_id=3D$2",array($fd_id,$v['ad_id']));
+				if ($count =3D=3D 0)
+				{
+					$sql=3Dsprintf("insert into jnt_fic_Attr(fd_id,ad_id,jnt_order)
                              values (%d,%s,%d)",
                              $fd_id,$v['ad_id'],$order);
-                $this->cn->exec_sql($sql);
-				$jnt_order+=3D10;
+					$this->cn->exec_sql($sql);
+					$jnt_order+=3D10;
+				}
             }
         }
         $this->id=3D$fd_id;

Modified: phpcompta/trunk/include/class_follow_up.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_follow_up.php	2013-05-03 21:56:40 UTC (=
rev 5215)
+++ phpcompta/trunk/include/class_follow_up.php	2013-05-03 22:31:33 UTC (=
rev 5216)
@@ -38,7 +38,8 @@
 require_once 'class_sort_table.php';
 require_once 'class_irelated_action.php';
=20
-/* !\file
+/**
+ * \file
  * \brief class_action for manipulating actions
  * action can be :
  * <ul>
@@ -49,7 +50,7 @@
  * </ul>
  * The table document_type are the possible actions
  */
-/* !
+/**
  * \brief class_action for manipulating actions
  * action can be :
  * <ul>
@@ -62,24 +63,25 @@
=20
 class Follow_Up
 {
+   =20
=20
-	var $db; /* !<  $db  database connexion    */
-	var $ag_timestamp;  /* !<   $ag_timestamp document date (ag_gestion.ag_=
timestamp) */
-	var $dt_id;   /* !<   $dt_id type of the document (document_type.dt_id)=
 */
-	var $ag_state; /* !<   $ag_state stage of the document (printed, send t=
o client...) */
-	var $d_number;   /* !<   $d_number number of the document */
-	var $d_filename; /* !<   $d_filename filename's document      */
-	var $d_mimetype; /* !<   $d_mimetype document's filename      */
-	var $ag_title;   /* !<   $ag_title title document	      */
-	var $f_id; /* !<   $f_id_dest fiche id (From field )  */
-	var $ag_ref;  /* !< $ag_ref is the ref  */
-	var $ag_hour;  /* !< $ag_hour is the hour of the meeting, action */
-	var $ag_priority; /* !< $ag_priority is the priority 1 High, 2 medium, =
3 low */
-	var $ag_dest;  /* !< $ag_dest person who is in charged */
-	var $ag_contact;  /* !< $ag_contact contact */
-	var $ag_remind_date;  /* !< $ag_contact contact */
+	var $db; /*!<  $db  database connexion    */
+	var $ag_timestamp;  /*!<   $ag_timestamp document date (ag_gestion.ag_t=
imestamp) */
+	var $dt_id;   /*!<   $dt_id type of the document (document_type.dt_id) =
*/
+	var $ag_state; /*!<   $ag_state stage of the document (printed, send to=
 client...) */
+	var $d_number;   /*!<   $d_number number of the document */
+	var $d_filename; /*!<   $d_filename filename's document      */
+	var $d_mimetype; /*!<   $d_mimetype document's filename      */
+	var $ag_title;   /*!<   $ag_title title document	      */
+	var $f_id; /*!<   $f_id_dest fiche id (From field )  */
+	var $ag_ref;  /*!< $ag_ref is the ref  */
+	var $ag_hour;  /*!< $ag_hour is the hour of the meeting, action */
+	var $ag_priority; /*!< $ag_priority is the priority 1 High, 2 medium, 3=
 low */
+	var $ag_dest;  /*!< $ag_dest person who is in charged */
+	var $ag_contact;  /*!< $ag_contact contact */
+	var $ag_remind_date;  /*!< $ag_contact contact */
=20
-	/* !  constructor
+	/**  constructor
 	 * \brief constructor
 	 * \param p_cn database connection
 	 */
@@ -106,7 +108,7 @@
 		return $sql;
 	}
 	//---------------------------------------------------------------------=
-
-	/* !
+	/**
 	 * \brief Display the object, the tags for the FORM
 	 *        are in the caller. It will be used for adding and updating
 	 *        action
@@ -114,7 +116,7 @@
 	 *        it is a new document
 	 *
 	 * \param $p_view if set to true the form will be in readonly mode (val=
ue: true or false)
-	 * \param $p_gen true we show the tag for generating a doc (value : tru=
e or false)
+	 * \param $p_gen true we show the tag for generating a doc (value : tru=
e or false) and adding files
 	 * \param $p_base is the ac parameter
 	 * \param $retour is the html code for the return button
 	 * \note  update the reference number or the document type is not allow=
ed
@@ -177,7 +179,7 @@
 			$desc->width =3D 120;
 			$desc->heigh =3D 40;
 		}
-		$acomment =3D $this->db->get_array("SELECT agc_id, ag_id, to_char(agc_=
date,'DD.MM.YYYY') as str_agc_date, agc_comment, tech_user
+		$acomment =3D $this->db->get_array("SELECT agc_id, ag_id, to_char(agc_=
date,'DD.MM.YYYY HH24:MI') as str_agc_date, agc_comment, tech_user
 				 FROM action_gestion_comment where ag_id=3D$1 order by agc_id;", arr=
ay($this->ag_id)
 		);
=20
@@ -414,7 +416,7 @@
 		/* TVA */
 		$itva =3D new ITva_Popup($this->db);
 		$itva->in_table =3D true;
-
+		$aCard=3Darray();
 		/* create aArticle for the detail section */
 		for ($i =3D 0; $i < MAX_ARTICLE; $i++)
 		{
@@ -428,6 +430,7 @@
 			$tmp_ad =3D (isset($this->aAction_detail[$i])) ? $this->aAction_detai=
l[$i] : false;
 			$icard->readOnly=3D$readonly;
 			$icard->value =3D '';
+			$aCard[$i]=3D0;
 			if ($tmp_ad)
 			{
 				$march =3D new Fiche($this->db);
@@ -436,6 +439,7 @@
 				{
 					$march->id =3D $f;
 					$icard->value =3D $march->get_quick_code();
+					$aCard[$i]=3D$f;
 				}
 			}
 			$icard->set_dblclick("fill_ipopcard(this);");
@@ -451,6 +455,7 @@
=20
 			$text->javascript =3D ' onchange=3D"clean_tva(' . $i . ');compute_led=
ger(' . $i . ')"';
 			$text->name =3D "e_march" . $i . "_label";
+			$text->id =3D "e_march" . $i . "_label";
 			$text->size =3D 40;
 			$text->value =3D ($tmp_ad) ? $tmp_ad->get_parameter('text') : "";
 			$text->readOnly=3D$readonly;
@@ -458,17 +463,20 @@
=20
 			$num->javascript =3D ' onchange=3D"format_number(this);clean_tva(' . =
$i . ');compute_ledger(' . $i . ')"';
 			$num->name =3D "e_march" . $i . "_price";
+			$num->id =3D "e_march" . $i . "_price";
 			$num->size =3D 8;
 			$num->readOnly=3D$readonly;
 			$num->value =3D ($tmp_ad) ? $tmp_ad->get_parameter('price_unit') : 0;
 			$aArticle[$i]['pu'] =3D $num->input();
=20
 			$num->name =3D "e_quant" . $i;
+			$num->id =3D "e_quant" . $i;
 			$num->size =3D 8;
 			$num->value =3D ($tmp_ad) ? $tmp_ad->get_parameter('quantity') : 0;
 			$aArticle[$i]['quant'] =3D $num->input();
=20
 			$itva->name =3D 'e_march' . $i . '_tva_id';
+			$itva->id =3D 'e_march' . $i . '_tva_id';
 			$itva->value =3D ($tmp_ad) ? $tmp_ad->get_parameter('tva_id') : 0;
 			$itva->readOnly=3D$readonly;
 			$itva->js =3D ' onchange=3D"format_number(this);clean_tva(' . $i . ')=
;compute_ledger(' . $i . ')"';
@@ -477,12 +485,14 @@
 			$aArticle[$i]['tvaid'] =3D $itva->input();
=20
 			$num->name =3D "e_march" . $i . "_tva_amount";
+			$num->id =3D "e_march" . $i . "_tva_amount";
 			$num->value =3D ($tmp_ad) ? $tmp_ad->get_parameter('tva_amount') : 0;
 			$num->javascript =3D " onchange=3D\"compute_ledger(' . $i . ')\"";
 			$num->size =3D 8;
 			$aArticle[$i]['tva'] =3D $num->input();
=20
 			$num->name =3D "tvac_march" . $i;
+			$num->id =3D "tvac_march" . $i;
 			$num->value =3D ($tmp_ad) ? $tmp_ad->get_parameter('total') : 0;
 			$num->size =3D 8;
 			$aArticle[$i]['tvac'] =3D $num->input();
@@ -498,7 +508,7 @@
 		/* add the number of item */
 		$Hid =3D new IHidden();
 		$r.=3D$Hid->input("nb_item", MAX_ARTICLE);
-		$r.=3DHtmlInput::request_to_hidden(array("remind_date_end","remind_dat=
e","sag_ref","only_internal","state","qcode", "ag_dest_query", "query", "=
tdoc", "date_start", "date_end", "hsstate"));
+		$r.=3DHtmlInput::request_to_hidden(array("closed_action","remind_date_=
end","remind_date","sag_ref","only_internal","state","qcode", "ag_dest_qu=
ery", "query", "tdoc", "date_start", "date_end", "hsstate"));
 		/* get template */
 		ob_start();
 		require_once 'template/detail-action.php';
@@ -518,7 +528,7 @@
 	}
=20
 	//---------------------------------------------------------------------=
-
-	/* !\brief This function shows the detail of an action thanks the ag_id
+	/**\brief This function shows the detail of an action thanks the ag_id
 	 */
 	function get()
 	{
@@ -565,7 +575,7 @@
 		$this->qcode_dest =3D $aexp->strAttribut(ATTR_DEF_QUICKCODE);
 	}
=20
-	/* !
+	/**
 	 * \brief Save the document and propose to save the generated document =
or
 	 *  to upload one, the data are included except the file. Temporary the=
 generated
 	 * document is save
@@ -656,7 +666,7 @@
 		$this->insert_action();
 	}
=20
-	/* ! myList($p_filter=3D"")
+	/** myList($p_filter=3D"")
 	 * \brief Show list of action by default if sorted on date
 	 * \param $p_base base url with ac...
 	 * \param $p_filter filters on the document_type
@@ -667,7 +677,7 @@
 	function myList($p_base, $p_filter =3D "", $p_search =3D "")
 	{
 		// for the sort
-		$url =3D HtmlInput::get_to_string(array("remind_date_end","remind_date=
","sag_ref","only_internal","state","qcode", "ag_dest_query", "query", "t=
doc", "date_start", "date_end", "hsstate")) . '&' . $p_base;
+		$url =3D HtmlInput::get_to_string(array("closed_action","remind_date_e=
nd","remind_date","sag_ref","only_internal","state","qcode", "ag_dest_que=
ry", "query", "tdoc", "date_start", "date_end", "hsstate")) . '&' . $p_ba=
se;
=20
 		$table =3D new Sort_Table();
 		$table->add('Date', $url, 'order by ag_timestamp asc', 'order by ag_ti=
mestamp desc', 'da', 'dd');
@@ -741,7 +751,7 @@
 		//show the sub_action
 		foreach ($a_row as $row)
 		{
-			$href =3D '<A class=3D"document" HREF=3D"do.php?'  . $p_base .HtmlInp=
ut::get_to_string(array("remind_date_end","remind_date","sag_ref","only_i=
nternal","state","gDossier", "qcode", "ag_dest_query", "query", "tdoc", "=
date_start", "date_end", "hsstate", "ac"),"&") . '&sa=3Ddetail&ag_id=3D' =
. $row['ag_id'] . '">';
+			$href =3D '<A class=3D"document" HREF=3D"do.php?'  . $p_base .HtmlInp=
ut::get_to_string(array("closed_action","remind_date_end","remind_date","=
sag_ref","only_internal","state","gDossier", "qcode", "ag_dest_query", "q=
uery", "tdoc", "date_start", "date_end", "hsstate", "ac"),"&") . '&sa=3Dd=
etail&ag_id=3D' . $row['ag_id'] . '">';
 			$i++;
 			$tr =3D ($i % 2 =3D=3D 0) ? 'even' : 'odd';
 			if ($row['ag_priority'] < 2)
@@ -751,9 +761,9 @@
 				$st =3D ' style=3D"font-weight:bold; border:2px solid orange;"';
 			$date_remind =3D format_date($row['my_remind'], 'DD.MM.YYYY', 'YYYYMM=
DD');
 			$date_today =3D date('Ymd');
-			if ($date_remind !=3D "" && $date_remind =3D=3D $date_today)
+			if ($date_remind !=3D "" && $date_remind =3D=3D $date_today && $row['=
ag_state']!=3D1 && $row['ag_state']!=3D3)
 				$st =3D ' style=3D"font-weight:bold;background:orange"';
-			if ($date_remind !=3D "" && $date_remind < $date_today)
+			if ($date_remind !=3D "" && $date_remind < $date_today && $row['ag_st=
ate']!=3D1 && $row['ag_state']!=3D3)
 				$st =3D ' style=3D"font-weight:bold;background:#FF0000"';
 			$r.=3D"<tr class=3D\"$tr\" $st>";
 			$r.=3D"<td>" . $href . smaller_date($row['my_date']) . '</a>' . "</td=
>";
@@ -817,7 +827,7 @@
 	}
=20
 	//---------------------------------------------------------------------=
-
-	/* !\brief Update the data into the database
+	/**\brief Update the data into the database
 	 *
 	 * \return true on success otherwise false
 	 */
@@ -847,7 +857,23 @@
 		if ($contact->get_by_qcode($this->ag_contact) =3D=3D -1)
 			$contact->id =3D 0;
=20
+		// reload the old one
+		$old=3Dnew Follow_Up($this->db);
+		$old->ag_id=3D$this->ag_id;
+		$old->get();
=20
+		// If ag_ref changed then check if unique
+		if ($old->ag_ref !=3D $this->ag_ref)
+		{
+			$nAg_ref=3D$this->db->get_value("select count(*) from action_gestion =
where ag_ref=3D$1",array($this->ag_ref));
+			if ($nAg_ref !=3D 0 )
+			{
+				echo h2("R=C3=A9f=C3=A9rence en double, r=C3=A9f=C3=A9rence non sauv=
=C3=A9e",'class=3D"error"');
+				$this->ag_ref=3D$old->ag_ref;
+			}
+		}
+
+
 		if ($this->ag_remind_date !=3D null)
 		{
 			$this->db->exec_sql("update action_gestion set " .
@@ -930,7 +956,7 @@
 		return true;
 	}
=20
-	/* !\brief generate the document and add it to the action
+	/**\brief generate the document and add it to the action
 	 * \param md_id is the id of the document_modele
 	 * \param $p_array contains normally the $_POST
 	 */
@@ -946,7 +972,7 @@
 		$doc->Generate($p_array);
 	}
=20
-	/* !\brief put an array in the variable member, the indice
+	/**\brief put an array in the variable member, the indice
 	 * is the member name
 	 * \param $p_array to parse
 	 * \return nothing
@@ -976,7 +1002,7 @@
 		$this->action =3D (isset($p_array['action'])) ? $p_array['action'] : n=
ull;
 	}
=20
-	/* !\brief remove the action
+	/**\brief remove the action
 	 *
 	 */
=20
@@ -1000,7 +1026,7 @@
 		}
 	}
=20
-	/* !\brief return the last p_limit operation into an array
+	/**\brief return the last p_limit operation into an array
 	 * \param $p_limit is the max of operation to return
 	 * \return $p_array of Follow_Up object
 	 */
@@ -1019,10 +1045,10 @@
          */
 	function get_today()
 	{
-		$sql =3D "select coalesce(vw_name,'Interne') as vw_name,ag_id,ag_title=
,ag_ref, dt_value,to_char(ag_timestamp,'DD.MM.YYYY') as ag_timestamp_fmt,=
ag_timestamp " .
+		$sql =3D "select ag_ref,coalesce(vw_name,'Interne') as vw_name,ag_id,a=
g_title,ag_ref, dt_value,to_char(ag_remind_date,'DD.MM.YYYY') as ag_times=
tamp_fmt,ag_timestamp " .
 				" from action_gestion join document_type " .
 				" on (ag_type=3Ddt_id) left join vw_fiche_attr on (f_id=3Df_id_dest)=
 where ag_state not in (1,4)
-				and to_char(ag_remind_date,'DDMMYYYY')=3Dto_char(now(),'DDMMYYYY') "=
;
+					and to_char(ag_remind_date,'DDMMYYYY')=3Dto_char(now(),'DDMMYYYY') =
";
 		$array =3D $this->db->get_array($sql);
 		return $array;
 	}
@@ -1032,10 +1058,10 @@
          */
 	function get_late()
 	{
-		$sql =3D "select coalesce(vw_name,'Interne') as vw_name,ag_id,ag_title=
,ag_ref, dt_value,to_char(ag_timestamp,'DD.MM.YYYY') as ag_timestamp_fmt,=
ag_timestamp " .
+		$sql =3D "select ag_ref,coalesce(vw_name,'Interne') as vw_name,ag_id,a=
g_title,ag_ref, dt_value,to_char(ag_remind_date,'DD.MM.YYYY') as ag_times=
tamp_fmt,ag_timestamp " .
 				" from action_gestion join document_type " .
 				" on (ag_type=3Ddt_id) left join vw_fiche_attr on (f_id=3Df_id_dest)=
 where ag_state not in  (1,4)
-				and ag_remind_date > trunc (now()) ";
+				and ag_remind_date < now() ";
 		$array =3D $this->db->get_array($sql);
 		return $array;
 	}
@@ -1141,6 +1167,11 @@
 		$end =3D new IDate('date_end');
 		$end->value =3D (isset($_GET['date_end'])) ? $_GET['date_end'] : "";
=20
+		// Closed action
+		$closed_action=3Dnew ICheckBox('closed_action');
+		$closed_action->selected=3D(isset($_GET['closed_action']))?true:false;
+
+		// Internal
 		$only_internal=3D new ICheckBox('only_internal');
 		$only_internal->selected =3D (isset($_GET['only_internal'])) ? true : =
false;
 		// select profile
@@ -1173,7 +1204,7 @@
 		Follow_Up::display_search($cn);
=20
 		$act =3D new Follow_Up($cn);
-		/* ! \brief
+		/** \brief
 		 *  \note The field 'recherche' is   about a part of the title or a re=
f. number
 		 */
 		$query =3D Follow_Up::create_query($cn);
@@ -1199,7 +1230,7 @@
 		$query =3D "";
=20
=20
-                if (isset($_REQUEST['query']))
+        if (isset($_REQUEST['query']))
 		{
 			// if a query is request build the sql stmt
 			$query =3D "and (ag_title ~* '" . sql_string($_REQUEST['query']) . "'=
 " .
@@ -1254,12 +1285,13 @@
 		}
 		if (isset($ag_dest_query) && $ag_dest_query !=3D -2 )
 		{
-                    $query.=3D " and ag_dest =3D " . sql_string($ag_dest=
_query);
+                    $query.=3D " and ((ag_dest =3D " . sql_string($ag_de=
st_query)." and ".self::sql_security_filter($cn, "R").") or ".
+				" ag_owner=3D'" . $_SESSION['g_user'] . "')";
 		}
-                else
-                {
-                    $query .=3D" and (ag_owner=3D'" . $_SESSION['g_user'=
] . "' or ".self::sql_security_filter($cn, "R")." or ag_dest=3D-1 )";
-                }
+		else
+		{
+			$query .=3D" and (ag_owner=3D'" . $_SESSION['g_user'] . "' or ".self:=
:sql_security_filter($cn, "R")." or ag_dest=3D-1 )";
+		}
=20
=20
 		if (isNumber($ag_id) =3D=3D 1 && $ag_id !=3D 0)
@@ -1274,6 +1306,9 @@
 		{
 			$query .=3D " and to_date('".sql_string($remind_date_end)."','DD.MM.Y=
YYY')>=3D ag_remind_date";
 		}
+		if ( ! isset ($closed_action)) {
+			$query.=3D" and s_status is null ";
+		}
 		return $query . $str;
 	}
=20
@@ -1292,6 +1327,7 @@
 				(select ad_value from fiche_Detail where f_id=3Daction_gestion.f_id_=
dest and ad_id=3D1) as name
              from action_gestion
              join document_type on (ag_type=3Ddt_id)
+			 join document_state on (s_id=3Dag_state)
              where $p_sql";
 		$max_line =3D $cn->count_sql($sql);
=20
@@ -1342,6 +1378,7 @@
 			coalesce((select p_name from profile where p_id=3Dag_dest),'Aucun gro=
upe') as dest
              from action_gestion
              join document_type on (ag_type=3Ddt_id)
+			 join document_state on(ag_state=3Ds_id)
              where  true  $p_search order by ag_timestamp,ag_id";
 		$ret=3D$this->db->exec_sql($sql);
=20
@@ -1360,5 +1397,16 @@
 				)
 			);
 	}
-
+	static function get_all_operation($p_jr_id)
+	{
+		global $cn;
+		$array=3D$cn->get_array("
+			select ag_id,ag_ref,
+				ag_title
+				from action_gestion
+				join action_gestion_operation using(ag_id)
+				where
+				jr_id=3D$1",array($p_jr_id));
+		return $array;
+	}
 }

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/include/class_html_input.php	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -70,7 +70,7 @@
     var $ctrl;						/*!<$ctrl is the control to update (see js_search_ca=
rd_control) */
=20
     var $tabindex;
-    function __construct($p_name=3D"",$p_value=3D"")
+    function __construct($p_name=3D"",$p_value=3D"",$p_id=3D"")
     {
         $this->name=3D$p_name;
         $this->readOnly=3Dfalse;
@@ -84,6 +84,7 @@
         $this->javascript=3D"";
         $this->extra2=3D"all";
         $this->attribute=3Darray();
+        $this->id=3D$p_id;
=20
     }
     function setReadOnly($p_read)
@@ -177,7 +178,7 @@
     static   function submit ($p_name,$p_value,$p_javascript=3D"")
     {
=20
-        return '<INPUT TYPE=3D"SUBMIT" class=3D"button" NAME=3D"'.$p_nam=
e.'" VALUE=3D"'.$p_value.'" '.$p_javascript.'>';
+        return '<INPUT TYPE=3D"SUBMIT" class=3D"button" NAME=3D"'.$p_nam=
e.'" ID=3D"'.$p_name.'_submit_id"  VALUE=3D"'.$p_value.'" '.$p_javascript=
.'>';
     }
     static   function button ($p_name,$p_value,$p_javascript=3D"")
     {
@@ -189,9 +190,10 @@
     {
         return '<INPUT TYPE=3D"RESET" class=3D"button" VALUE=3D"'.$p_val=
ue.'">';
     }
-    static function hidden($p_name,$p_value)
+    static function hidden($p_name,$p_value,$p_id=3D"")
     {
-        return '<INPUT TYPE=3D"hidden" id=3D"'.$p_name.'" NAME=3D"'.$p_n=
ame.'" VALUE=3D"'.$p_value.'">';
+		if ($p_id=3D=3D"") $p_id=3D$p_name;
+        return '<INPUT TYPE=3D"hidden" id=3D"'.$p_id.'" NAME=3D"'.$p_nam=
e.'" VALUE=3D"'.$p_value.'">';
     }
=20
     static function extension()
@@ -233,6 +235,18 @@
         return sprintf('<A class=3D"detail" style=3D"text-decoration:und=
erline;display:inline" HREF=3D"javascript:modifyOperation(%d,%d)">%s</A>'=
,
                        $p_jr_id,dossier::id(),$p_mesg);
     }
+	/**
+	 * @brief return an anchor to view the detail of an action
+	 * @param $ag_id
+	 * @param $p_mesg
+	 * @param $p_modify let you modify an operation
+	 *
+	 */
+	 static function detail_action($ag_id,$p_mesg,$p_modify=3D1)
+    {
+        return sprintf('<A class=3D"detail" style=3D"text-decoration:und=
erline;display:inline" HREF=3D"javascript:view_action(%d,%d,%d)">%s</A>',
+                       $ag_id,dossier::id(),$p_modify,$p_mesg);
+    }
     /**
      * return a string containing the html code for calling the modifyMo=
deleDocument
      */
@@ -324,7 +338,7 @@
=20
         echo '</div>';
         $ret=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $ret;
     }
     /**
@@ -365,7 +379,7 @@
=20
         echo '</div>';
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     static function display_periode($p_id)
@@ -575,7 +589,7 @@
       return $r;
     }
     /**
-     * return default if the value if the array doesn't exist
+     * return default if the value if the value doesn't exist in the arr=
ay
      *@param $ind the index to check
      *@param $default the value to return
      *@param $array the array
@@ -588,6 +602,48 @@
 	}
       return $array[$ind];
     }
+	/**
+	 *  return default if the value if the value doesn't exist in $_GET
+	 * @param  $ind name of the variable
+	 * @param type $default
+	 * @return type
+	 */
+	static function default_value_get($ind, $default)
+	{
+		if (!isset($_GET[$ind]))
+		{
+			return $default;
+		}
+		return $_GET[$ind];
+	}
+	/**
+	 *  return default if the value if the value doesn't exist in $_POST
+	 * @param  $ind name of the variable
+	 * @param type $default
+	 * @return type
+	 */
+	static function default_value_post($ind, $default)
+	{
+		if (!isset($_POST[$ind]))
+		{
+			return $default;
+		}
+		return $_POST[$ind];
+	}
+	/**
+	 *  return default if the value if the value doesn't exist in $_REQUEST
+	 * @param  $ind name of the variable
+	 * @param type $default
+	 * @return type
+	 */
+	static function default_value_request($ind, $default)
+	{
+		if (!isset($_REQUEST[$ind]))
+		{
+			return $default;
+		}
+		return $_REQUEST[$ind];
+	}
 	static function title_box($name,$div,$mod=3D"close")
 	{
 		if ($mod=3D=3D'close')		$r=3DHtmlInput::anchor_close($div);

Modified: phpcompta/trunk/include/class_iaction.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iaction.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/class_iaction.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -33,17 +33,18 @@
     {
         $this->name=3D($p_name=3D=3D"")?$this->name:$p_name;
         $this->value=3D($p_value=3D=3D"")?$this->value:$p_value;
+        $this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
         $this->javascript=3D (!isset ($this->javascript))?"":$this->java=
script;
         if ( $this->value !=3D"")
             $r=3Dsprintf('<span id=3D"%s" class=3D"action"> <A class=3D"=
action" HREF=3D"%s" %s>%s</A></span>',
-                       $this->name,
+                       $this->id,
                        $this->value,
                        $this->javascript,
                        $this->label);
         else
             $r=3Dsprintf('<span id=3D"%s" class=3D"action"> <A class=3D"=
action" href=3D"javascript: %s">%s</A></span>',
-                       $this->name,
+                       $this->id,
                        $this->javascript,
                        $this->label);
=20

Modified: phpcompta/trunk/include/class_ianccard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_ianccard.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/class_ianccard.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -26,16 +26,16 @@
  */
=20
 /*!
- * \brief=20
+ * \brief
 */
 require_once('class_html_input.php');
 require_once('function_javascript.php');
=20
 class IAncCard extends HtmlInput
 {
-    function __construct($name=3D"",$value=3D"")
+    function __construct($name=3D"",$value=3D"",$p_id=3D"")
     {
-        parent::__construct($name,$value);
+        parent::__construct($name,$value,$p_id);
         $this->fct=3D'update_value';
         $this->dblclick=3D'';
         $this->callback=3D'null';
@@ -63,7 +63,7 @@
     {
         $this->fct=3D$p_name;
     }
-  =20
+
     /*!\brief set the extra javascript property for a double click on
      *  INPUT field
      *\param $p_action action when a double click happens
@@ -82,9 +82,10 @@
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
+        $this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
-      =20
=20
+
         $label=3D'';
         if ( $this->dblclick !=3D '')
         {
@@ -106,7 +107,7 @@
         $div=3Dsprintf('<div id=3D"%s_choices"  class=3D"autocomplete"><=
/div>',
                      $this->name);
         $query=3D"op=3Dautoanc&".dossier::get();
-       =20
+
         // add parameter to search into a plan (pa_id) or get the value =
from
         // a HtmlObject
         if ($this->plan <> 0)
@@ -138,7 +139,7 @@
     /*!\brief print in html the readonly value of the widget*/
     public function display()
     {
-        $r=3Dsprintf('        =20
+        $r=3Dsprintf('
                     <INPUT TYPE=3D"hidden" NAME=3D"%s" VALUE=3D"%s" SIZE=
=3D"8">',
                    $this->name,
                    $this->value
@@ -195,6 +196,6 @@
=20
     static public function test_me()
     {
-     =20
+
     }
 }

Modified: phpcompta/trunk/include/class_ibutton.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_ibutton.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/class_ibutton.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -21,7 +21,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 /*!\file
- * \brief Html Input=20
+ * \brief Html Input
  */
 require_once('class_html_input.php');
 class IButton extends HtmlInput
@@ -32,12 +32,13 @@
     {
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
+		$this->label=3D(trim($this->label) !=3D '')?$this->label:$this->value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
         $extra=3D ( isset($this->extra))?$this->extra:"";
-
+        $this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
         $r=3D'<input type=3D"BUTTON" name=3D"'.$this->name.'"'.
            ' class=3D"button" '.
-           ' id=3D"'.$this->name.'"'.
+           ' id=3D"'.$this->id.'"'.
            ' value=3D"'.$this->label.'"'.
            ' onClick=3D"'.$this->javascript.'"'.$extra.'>';
         $attr=3D$this->get_js_attr();

Modified: phpcompta/trunk/include/class_icard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_icard.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/class_icard.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -120,7 +120,7 @@
=20
 class ICard extends HtmlInput
 {
-    function __construct($name=3D"",$value=3D"")
+    function __construct($name=3D"",$value=3D"",$p_id=3D"")
     {
         parent::__construct($name,$value);
         $this->fct=3D'update_value';
@@ -128,6 +128,7 @@
         $this->callback=3D'null';
         $this->javascript=3D'';
 		$this->autocomplete=3D1;
+		$this->id=3D($p_id !=3D "")?$p_id:$name;
     }
     /*!\brief set the javascript callback function
      * by default it is update_value called BEFORE the querystring is se=
nd
@@ -191,7 +192,7 @@
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
-		if ( ! isset($this->id )) $this->id=3D$this->name;
+		 $this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         $attr=3D$this->get_js_attr();
=20
@@ -293,8 +294,10 @@
             if (isset($this->$att) )
                 $a.=3D"this.".$att."=3D'".$this->$att."';";
         }
-        if (isset($this->id))
+        if (isset($this->id) && $this->id !=3D "")
             $a.=3D"this.inp=3D'".$this->id."';";
+		else
+            $a.=3D"this.inp=3D'".$this->name."';";
         $a.=3D"this.popup=3D'ipop_card';";
=20
         $button->javascript=3D$a.' search_card(this)';

Modified: phpcompta/trunk/include/class_icheckbox.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_icheckbox.php	2013-05-03 21:56:40 UTC (=
rev 5215)
+++ phpcompta/trunk/include/class_icheckbox.php	2013-05-03 22:31:33 UTC (=
rev 5216)
@@ -21,7 +21,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 /*!\file
- * \brief Html Input=20
+ * \brief Html Input
  */
 require_once('class_html_input.php');
 class ICheckBox extends HtmlInput
@@ -32,9 +32,10 @@
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
+		 $this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         $check=3D( $this->selected=3D=3Dtrue )?"checked":"unchecked";
-        $r=3D'<input type=3D"CHECKBOX" id=3D"'.$this->name.'" name=3D"'.=
$this->name.'"'.' value=3D"'.$this->value.'"';
+        $r=3D'<input type=3D"CHECKBOX" id=3D"'.$this->id.'" name=3D"'.$t=
his->name.'"'.' value=3D"'.$this->value.'"';
         $r.=3D"  $check";
         $r.=3D' '.$this->disabled."  ".$this->javascript.'>';
=20

Modified: phpcompta/trunk/include/class_iconcerned.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iconcerned.php	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/include/class_iconcerned.php	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -30,12 +30,13 @@
 class IConcerned extends HtmlInput
 {
=20
-	public function __construct($p_name=3D'',$p_value=3D'')
+	public function __construct($p_name=3D'',$p_value=3D'',$p_id=3D"")
 	{
 		$this->name=3D$p_name;
 		$this->value=3D$p_value;
 		$this->amount_id=3Dnull;
 		$this->paid=3D'';
+		$this->id=3D$p_id;
 	}
     /*!\brief show the html  input of the widget*/
     public function input($p_name=3Dnull,$p_value=3Dnull)
@@ -44,6 +45,7 @@
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
+	    $this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
=20
         $r=3Dsprintf("
@@ -56,9 +58,9 @@
                    $this->amount_id,
                    $this->paid,
                    $this->name,
-                   $this->name,
+                   $this->id,
                    $this->value,
-                   $this->name
+                   $this->id
                   );
         return $r;
     }

Modified: phpcompta/trunk/include/class_idate.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_idate.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/class_idate.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -32,7 +32,7 @@
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
-	if( ! isset ($this->id))
+	if( $this->id=3D=3D"")
 	  $this->id=3Dself::generate_id($this->name);
         $r=3D'<input type=3D"text" name=3D"'.$this->name.'" id=3D"'.$thi=
s->id.'"'.
            'style=3D"border:solid 1px blue;"'.

Modified: phpcompta/trunk/include/class_ihidden.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_ihidden.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/class_ihidden.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -21,7 +21,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 /*!\file
- * \brief Html Input=20
+ * \brief Html Input
  */
 require_once('class_html_input.php');
 class IHidden extends HtmlInput
@@ -31,7 +31,9 @@
     {
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
-        $r=3D'<INPUT TYPE=3D"HIDDEN" id=3D"'.$this->name.'" name=3D"'.$t=
his->name.'" value=3D"'.$this->value.'">';
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+
+        $r=3D'<INPUT TYPE=3D"HIDDEN" id=3D"'.$this->id.'" name=3D"'.$thi=
s->name.'" value=3D"'.$this->value.'">';
         return $r;
=20
     }

Modified: phpcompta/trunk/include/class_impress.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_impress.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/class_impress.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -21,7 +21,6 @@
 // $Revision$
 /*!\file
  * \brief contains function for the printing
- * \todo the functions of class_impress.php should be replaced in a OO w=
ay
 */
 require_once('class_periode.php');
=20
@@ -208,8 +207,9 @@
         $p_string=3Dstr_replace("<=3D","+",$p_string);
         $p_string=3Dstr_replace(">","+",$p_string);
         $p_string=3Dstr_replace("<","+",$p_string);
-        // eat Space
+        // eat Space + comma
         $p_string=3Dstr_replace(" ","",$p_string);
+        $p_string=3Dstr_replace(",","",$p_string);
         // Remove D/C/S
         $p_string=3Dstr_replace("c","",$p_string);
         $p_string=3Dstr_replace("d","",$p_string);
@@ -219,11 +219,18 @@
=20
 		// remove date
 		$p_string=3D  preg_replace("/FROM*=3D*[0-9]+/", "", $p_string);
+		// remove comment
+		$p_string=3D  preg_replace("/#.*/", "", $p_string);
+		// remove $C=3D
+		$p_string=3D  preg_replace('/\$[a-z]*[A-Z]*[0-9]*[A-Z]*[a-z]*/', "", $=
p_string);
+		$p_string=3D  preg_replace('/=3D/', "", $p_string);
=20
 		// remove account
 		$p_string=3D  preg_replace("/\[[0-9]*[A-Z]*%*\]/", "", $p_string);
=20
-		$p_string=3D  preg_replace("/\+|-|\/\*/", "", $p_string);
+		$p_string=3D  preg_replace("/\+|-|\/|\*/", "", $p_string);
+		$p_string=3D  preg_replace("/[0-9]*\.*[0-9]/", "", $p_string);
+
 		//********************************************************************=
************************************************
 		// If the string is empty then formula should be good
 		//

Modified: phpcompta/trunk/include/class_inum.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_inum.php	2013-05-03 21:56:40 UTC (rev 5=
215)
+++ phpcompta/trunk/include/class_inum.php	2013-05-03 22:31:33 UTC (rev 5=
216)
@@ -27,7 +27,15 @@
 /*!\brief
  * This class handles only the numeric input, the input will
  * call a javascript
- * to change comma to period  and will round it (2 decimal)
+ * to change comma to period  and will round it (2 decimal), the precisi=
on is given by
+ * the attribute prec
+ * attribute
+ *  extra =3D extra code (free)
+ *  size =3D size of the field
+ *  prec =3D precision default =3D 2
+ *  name =3D name of the html object
+ *  javascript =3D javascript to execute (default =3D onchange=3D"format=
_number(this,2);)
+ *  value =3D value of the widget
  *
  */
 class INum extends IText
@@ -45,10 +53,12 @@
     {
=20
         $readonly=3D" readonly ";
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+
         $style=3D'style=3D"border:solid 1px blue;color:black;background:=
#EDEDED;text-align:right"';
         $this->value=3Dstr_replace('"','',$this->value);
         $r=3D'<INPUT '.$style.' TYPE=3D"TEXT" id=3D"'.
-           $this->name.'"'.
+           $this->id.'"'.
            'NAME=3D"'.$this->name.'" VALUE=3D"'.$this->value.'"  '.
            'SIZE=3D"'.$this->size.'" '.$this->javascript." $readonly $th=
is->extra >";
=20
@@ -66,6 +76,8 @@
 		}
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
         $t=3D ((isset($this->title)))?'title=3D"'.$this->title.'"   ':' =
';
@@ -76,13 +88,13 @@
         if ( ! isset ($this->css_size))
         {
         $r=3D'<INPUT '.$this->style.' TYPE=3D"TEXT" id=3D"'.
-           $this->name.'"'.$t.
+           $this->id.'"'.$t.
            'NAME=3D"'.$this->name.'" VALUE=3D"'.$this->value.'"  '.
            'SIZE=3D"'.$this->size.'" '.$this->javascript."  $this->extra=
 >";
         /* add tag for column if inside a table */
         } else {
            $r=3D'<INPUT '.$this->style.' TYPE=3D"TEXT" id=3D"'.
-           $this->name.'"'.$t.
+           $this->id.'"'.$t.
            'NAME=3D"'.$this->name.'" VALUE=3D"'.$this->value.'"  '.
            ' style=3D"width:'.$this->css_size.';" '.$this->javascript." =
 $this->extra >";
=20

Modified: phpcompta/trunk/include/class_iperiod.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iperiod.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/class_iperiod.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -21,11 +21,11 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 /*!\file
- * \brief Html Input=20
+ * \brief Html Input
  */
 /*! \brief          Generate the form for the periode
 * Data Members
- *   - $cn connexion to the current folder=20
+ *   - $cn connexion to the current folder
  *   - $type the type of the periode OPEN CLOSE NOTCENTRALIZED or ALL, I=
T MUST BE SET
  *   - $filter_year make a filter on the default exercice by default tru=
e
  *   - $user if a filter_year is required then we need who is the user (=
object User)
@@ -56,7 +56,7 @@
         $this->extra2=3D"all";
         $this->show_start_date=3Dtrue;
         $this->show_end_date=3Dtrue;
-	$this->exercice=3D$p_exercice;
+		$this->exercice=3D$p_exercice;
     }
     /*!
      * \brief show the input html for a periode
@@ -64,8 +64,8 @@
      *\param $p_value is the default value
      *\param $p_exercice is the exercice, if not set then the user prefe=
rence is used
      * \return string containing html code for the HTML
-     *      =20
      *
+     *
      */
     public function input($p_name=3Dnull,$p_value=3Dnull)
     {

Modified: phpcompta/trunk/include/class_iposte.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iposte.php	2013-05-03 21:56:40 UTC (rev=
 5215)
+++ phpcompta/trunk/include/class_iposte.php	2013-05-03 22:31:33 UTC (rev=
 5216)
@@ -80,7 +80,7 @@
 class IPoste extends HtmlInput
 {
=20
-    function __construct($p_name=3D"",$p_value=3D"")
+    function __construct($p_name=3D"",$p_value=3D"",$p_id=3D"")
     {
         $this->name=3D$p_name;
         $this->readOnly=3Dfalse;
@@ -92,6 +92,7 @@
         $this->javascript=3D"";
         $this->extra2=3D"all";
         $this->attribute=3Darray();
+		$this->id=3D$p_id;
=20
     }
=20
@@ -116,7 +117,7 @@
         {
             list($name,$value)=3D$this->attribute[$i];
             $tmp1=3Dsprintf("$('%s_bt').%s=3D'%s';",
-                          $this->name,
+                          $this->id,
                           $name,
                           $value);
             $attr.=3D$tmp1;
@@ -127,7 +128,8 @@
=20
     public function dsp_button()
     {
-        $ib=3Dnew IButton($this->name.'_bt');
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+        $ib=3Dnew IButton($this->id.'_bt');
         $ib->javascript=3D'search_poste(this)';
=20
         /*  add the property */
@@ -144,9 +146,10 @@
         if ( ! isset($this->ctrl) ) $this->ctrl=3D'none';
=20
         if ( ! isset($this->javascript)) $this->javascript=3D"";
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         /* create the text  */
-        $itext=3Dnew IText($this->name,$this->value);
+        $itext=3Dnew IText($this->name,$this->value,$this->id);
=20
 	if ( isset ($this->css_size))
 	     $itext->css_size=3D$this->css_size;

Modified: phpcompta/trunk/include/class_iradio.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iradio.php	2013-05-03 21:56:40 UTC (rev=
 5215)
+++ phpcompta/trunk/include/class_iradio.php	2013-05-03 22:31:33 UTC (rev=
 5216)
@@ -21,14 +21,14 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief Html Input=20
  */
 require_once('class_html_input.php');
=20
 class IRadio extends HtmlInput
     {
-    /* !\brief show the html  input of the widget */
+    /**\brief show the html  input of the widget */
=20
     public function input($p_name=3Dnull, $p_value=3Dnull)
         {
@@ -45,7 +45,7 @@
         return $r;
         }
=20
-    /* !\brief print in html the readonly value of the widget */
+    /**\brief print in html the readonly value of the widget */
=20
     public function display()
         {

Modified: phpcompta/trunk/include/class_irelated_action.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_irelated_action.php	2013-05-03 21:56:40=
 UTC (rev 5215)
+++ phpcompta/trunk/include/class_irelated_action.php	2013-05-03 22:31:33=
 UTC (rev 5216)
@@ -33,6 +33,7 @@
 		$this->value=3D$p_value;
 		$this->amount_id=3Dnull;
 		$this->paid=3D'';
+		$this->id=3D$p_name;
 	}
     /*!\brief show the html  input of the widget*/
     public function input($p_name=3Dnull,$p_value=3Dnull)
@@ -41,6 +42,7 @@
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
=20
         $r=3Dsprintf("
@@ -49,11 +51,11 @@
 				   <INPUT TYPE=3D\"button\" onClick=3D\"$('%s').value=3D''\" value=3D=
\"X\">
=20
                    ",
+                   $this->id,
                    $this->name,
-                   $this->name,
-                   $this->name,
+                   $this->id,
                    $this->value,
-                   $this->name
+                   $this->id
                   );
         return $r;
     }

Modified: phpcompta/trunk/include/class_iselect.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iselect.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/class_iselect.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -33,12 +33,13 @@
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
         $style=3D(isset($this->style))?$this->style:"";
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         $disabled=3D($this->disabled=3D=3Dtrue)?"disabled":"";
=20
         $r=3D"";
=20
-        $a=3D"<SELECT  id=3D\"$this->name\" NAME=3D\"$this->name\" $styl=
e $this->javascript $disabled>";
+        $a=3D"<SELECT  id=3D\"$this->id\" NAME=3D\"$this->name\" $style =
$this->javascript $disabled>";
=20
         if (empty($this->value)) return '';
         for ( $i=3D0;$i<sizeof($this->value);$i++)

Modified: phpcompta/trunk/include/class_itext.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_itext.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/class_itext.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -26,9 +26,9 @@
 require_once('class_html_input.php');
 class IText extends HtmlInput
 {
-    function __construct($name=3D'',$value=3D'')
+    function __construct($name=3D'',$value=3D'',$p_id=3D"")
     {
-        parent::__construct($name,$value);
+        parent::__construct($name,$value,$p_id);
         $this->style=3D' class=3D"input_text" ';
     }
     /*!\brief show the html  input of the widget*/
@@ -37,6 +37,7 @@
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         $t=3D ((isset($this->title)))?'title=3D"'.$this->title.'"   ':' =
';
=20
@@ -46,13 +47,13 @@
         if ( ! isset ($this->css_size))
         {
         $r=3D'<INPUT '.$this->style.' TYPE=3D"TEXT" id=3D"'.
-           $this->name.'"'.$t.
+           $this->id.'"'.$t.
            'NAME=3D"'.$this->name.'" VALUE=3D"'.$this->value.'"  '.
            'SIZE=3D"'.$this->size.'" '.$this->javascript."  $this->extra=
 >";
         /* add tag for column if inside a table */
         } else {
            $r=3D'<INPUT '.$this->style.' TYPE=3D"TEXT" id=3D"'.
-           $this->name.'"'.$t.
+           $this->id.'"'.$t.
            'NAME=3D"'.$this->name.'" VALUE=3D"'.$this->value.'"  '.
            ' style=3D"width:'.$this->css_size.';" '.$this->javascript." =
 $this->extra >";
=20
@@ -76,12 +77,12 @@
          if ( ! isset ($this->css_size))
         {
         $r=3D'<INPUT '.$this->style.' TYPE=3D"TEXT" id=3D"'.
-           $this->name.'"'.$t.
+           $this->id.'"'.$t.
            'NAME=3D"'.$this->name.'" VALUE=3D"'.$this->value.'"  '.
            'SIZE=3D"'.$this->size.'" '.$this->javascript." $readonly $th=
is->extra >";
         } else {
                $r=3D'<INPUT '.$this->style.' TYPE=3D"TEXT" id=3D"'.
-           $this->name.'"'.$t.
+           $this->id.'"'.$t.
            'NAME=3D"'.$this->name.'" VALUE=3D"'.$this->value.'"  '.
            ' style=3D"width:'.$this->css_size.'" '.$this->javascript." $=
readonly  $this->extra >";
         }

Modified: phpcompta/trunk/include/class_itextarea.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_itextarea.php	2013-05-03 21:56:40 UTC (=
rev 5215)
+++ phpcompta/trunk/include/class_itextarea.php	2013-05-03 22:31:33 UTC (=
rev 5216)
@@ -32,10 +32,12 @@
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
 		if ( !isset ($this->style )) $this->style=3D' style=3D"border:solid bl=
ue 1px" ';
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
         $r=3D"";
-        $r.=3D'<TEXTAREA '.$this->style.'  name=3D"'.$this->name.'" id=3D=
"'.$this->name.'"';
+        $r.=3D'<TEXTAREA '.$this->style.'  name=3D"'.$this->name.'" id=3D=
"'.$this->id.'"';
         $r.=3D" rows=3D\"$this->heigh\" ";
         $r.=3D" cols=3D\"$this->width\" ";
         $r.=3D'>';

Modified: phpcompta/trunk/include/class_itva_popup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_itva_popup.php	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/include/class_itva_popup.php	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -55,11 +55,13 @@
      * to have its own javascript for the button you can use this->but_j=
avascript)
      * by default it is 'popup_select_tva(this)';
      */
-    public function __construct($p_name=3Dnull)
+    public function __construct($p_name=3Dnull,$p_value=3D"",$p_id=3D"")
     {
         $this->name=3D$p_name;
         $this->button=3Dtrue;
         $this->in_table=3Dfalse;
+		$this->value=3D$p_value;
+		$this->id=3D$p_id;
     }
     function with_button($p)
     {
@@ -74,10 +76,12 @@
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         $this->js=3D(isset($this->js))?$this->js:'onchange=3D"format_num=
ber(this);"';
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
         $str=3D'<input type=3D"TEXT" class=3D"input_text" name=3D"%s" va=
lue=3D"%s" id=3D"%s" size=3D"3" %s>';
-        $r=3Dsprintf($str,$this->name,$this->value,$this->name,$this->js=
);
+        $r=3Dsprintf($str,$this->name,$this->value,$this->id,$this->js);
=20
         if ($this->in_table)
             $table=3D'<table>'.'<tr>'.td($r);
@@ -120,11 +124,13 @@
     function dbutton()
     {
         if( trim($this->name)=3D=3D'') throw new Exception (_('Le nom ne=
 peut =C3=AAtre vide'));
+		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+
         // button
-        $bt=3Dnew IButton('bt_'.$this->name);
+        $bt=3Dnew IButton('bt_'.$this->id);
         $bt->label=3D_(' TVA ');
         $bt->set_attribute('gDossier',dossier::id());
-        $bt->set_attribute('ctl',$this->name);
+        $bt->set_attribute('ctl',$this->id);
         $bt->set_attribute('popup','popup_tva');
         if ( isset($this->code))
             $bt->set_attribute('jcode',$this->code->name);

Modified: phpcompta/trunk/include/class_lettering.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_lettering.php	2013-05-03 21:56:40 UTC (=
rev 5215)
+++ phpcompta/trunk/include/class_lettering.php	2013-05-03 22:31:33 UTC (=
rev 5216)
@@ -261,7 +261,7 @@
         ob_start();
         include('template/letter_all.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
 	function get_linked($p_jlid)
@@ -289,7 +289,7 @@
         ob_start();
         include('template/letter_all.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
 	/**
@@ -303,7 +303,7 @@
         ob_start();
         include('template/letter_all.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
=20
@@ -319,7 +319,7 @@
         ob_start();
         include('template/letter_all.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     /**
@@ -369,7 +369,7 @@
         ob_start();
         require_once('template/letter_prop.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         $r.=3DHtmlInput::hidden('j_id',$p_jid);
         $r.=3DHtmlInput::hidden('jnt_id',$jnt_id);
=20

Modified: phpcompta/trunk/include/class_periode.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_periode.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/class_periode.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -352,7 +352,7 @@
                 isDate($p_date_end) =3D=3D null ||
                 strlen (trim($p_exercice)) =3D=3D 0 ||
                 (string) $p_exercice !=3D (string)(int) $p_exercice
-	  ||$p_exercice < 2000 || $p_exercice > 2099 )
+	  ||$p_exercice < COMPTA_MIN_YEAR || $p_exercice > COMPTA_MAX_YEAR)
=20
         {
 	  throw new Exception ("Param=C3=A8tre invalide");

Modified: phpcompta/trunk/include/class_phpcompta_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_phpcompta_sql.php	2013-05-03 21:56:40 U=
TC (rev 5215)
+++ phpcompta/trunk/include/class_phpcompta_sql.php	2013-05-03 22:31:33 U=
TC (rev 5216)
@@ -239,13 +239,16 @@
 			{
 				$this->$value=3D$p_array[$value];
 			}
+			else
+			{
+				$this->$value=3Dnull;
+			}
 		}
 		return $this;
 	}
 	 function seek($cond=3D'', $p_array=3Dnull)
 	{
 		$sql =3D "select * from ".$this->table."  $cond";
-		$aobj =3D array();
 		$ret =3D $this->cn->exec_sql($sql, $p_array);
 		return $ret;
 	}

Modified: phpcompta/trunk/include/class_print_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_fin.php	2013-05-03 21:56:4=
0 UTC (rev 5215)
+++ phpcompta/trunk/include/class_print_ledger_fin.php	2013-05-03 22:31:3=
3 UTC (rev 5216)
@@ -22,7 +22,6 @@
=20
 /*!\file
  * \brief print a listing of financial
- *\todo Must add the third part
  */
 require_once('class_pdf.php');
 class Print_Ledger_Financial extends PDF
@@ -65,11 +64,7 @@
=20
     }
     /**
-     *@brief print the pdf
-     *@param
-     *@param
-     *@return
-     *@see
+     *@brief print the pdf for a financial ledger
      */
     function export()
     {

Modified: phpcompta/trunk/include/class_print_ledger_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_simple.php	2013-05-03 21:5=
6:40 UTC (rev 5215)
+++ phpcompta/trunk/include/class_print_ledger_simple.php	2013-05-03 22:3=
1:33 UTC (rev 5216)
@@ -23,7 +23,6 @@
 /*!\file
  * \brief this class extends PDF and let you export the detailled printi=
ng
  *  of any ledgers
- *\todo Must add the third part
  */
 require_once('class_pdf.php');
=20

Modified: phpcompta/trunk/include/class_print_ledger_simple_without_vat.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_simple_without_vat.php	201=
3-05-03 21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/class_print_ledger_simple_without_vat.php	201=
3-05-03 22:31:33 UTC (rev 5216)
@@ -23,7 +23,6 @@
 /*!\file
  * \brief this class extends PDF and let you export the detailled printi=
ng
  *  of any ledgers
- * *\todo Must add the third part
  */
 require_once('class_pdf.php');
=20
@@ -78,11 +77,11 @@
         else
             $this->Cell(60,6,'Fournisseur');
         $this->Cell(105,6,'Commentaire');
-        $this->Cell(15,6,'Prix',0,0,'R');
         if ( $this->jrn_type=3D=3D'ACH')
         {
             $this->Cell(15,6,'Priv=C3=A9',0,0,'R');
         }
+        $this->Cell(15,6,'Prix',0,0,'R');
=20
         $this->Ln(5);
=20

Modified: phpcompta/trunk/include/class_profile_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_profile_menu.php	2013-05-03 21:56:40 UT=
C (rev 5215)
+++ phpcompta/trunk/include/class_profile_menu.php	2013-05-03 22:31:33 UT=
C (rev 5216)
@@ -17,7 +17,11 @@
 	{
 		$this->cn =3D $p_cn;
 	}
-
+	/**
+	 * Display the content of a profile
+	 * @param type $resource
+	 * @param type $p_id
+	 */
 	function sub_menu($resource, $p_id)
 	{
 		if (Database::num_row($resource) !=3D 0)
@@ -35,13 +39,15 @@
=20
 				$me_menu =3D $menu['me_menu'];
 				$me_desc =3D $menu['me_description'];
+				$me_def=3D($menu['pm_default']=3D=3D'1')?'<span class=3D"notice" sty=
le=3D"display:inline">D=C3=A9faut</span>':'';
 				$js =3D sprintf(
 						'<a class=3D"line" href=3D"javascript:void(0)" onclick=3D"mod_menu=
(\'%s\',\'%s\')">%s</A>', $gDossier, $menu['pm_id'], $me_code);
 				?>
 				<li>
+
 					<?=3D $me_menu?>
 					( <?=3D $js?> )
-					<?=3D $me_desc?>
+					<?=3D $me_desc?>  <?=3D$me_def?>
 					<?
 					$ret2 =3D $this->cn->exec_sql("
 									SELECT pm_id,
@@ -145,9 +151,10 @@
 				$gDossier =3D Dossier::id();
 				for ($i =3D 0; $i < count($array); $i++)
 				{
+					$me_def=3D($array[$i]['pm_default']=3D=3D'1')?'<span class=3D"notic=
e" style=3D"display:inline">D=C3=A9faut</span>':'';
 					$js =3D sprintf('<a class=3D"line" style=3D"display:inline;text-dec=
oration:underline"
 						href=3D"javascript:void(0)" onclick=3D"mod_menu(\'%s\',\'%s\')">%s=
</A>', $gDossier, $array[$i]['pm_id'], $array[$i]['me_code']);
-					echo "<li>" . $array[$i]['me_menu'] . " (" . $js . ")" . $array[$i]=
['me_description'];
+					echo "<li>" . $array[$i]['me_menu'] . " (" . $js . ")" . $array[$i]=
['me_description']." ".$me_def;
=20
 					$ret =3D $this->cn->execute("menu", array($p_id, $array[$i]['me_cod=
e']));
 					$this->sub_menu($ret, $p_id);

Modified: phpcompta/trunk/include/class_tool_uos.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_tool_uos.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/class_tool_uos.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -19,13 +19,19 @@
 /* $Revision: $Revision $ */
 /**
  * @file
- * Objec to check a double insert into the database, this duplicate occu=
rs after
+ * @brief Objec to check a double insert into the database, this duplica=
te occurs after
  * a refresh of the web page
  */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 require_once 'class_database.php';
 define ('CODE_EXCP_DUPLICATE',901);
+/**
+ * @brief Objec to check a double insert into the database, this duplica=
te occurs after
+ * a refresh of the web page
+ * in
+ */
+
 class Tool_Uos
 {
     /**
@@ -54,15 +60,17 @@
      * @global $cn Database connx
      * @throws Exception if the value $p_id is not unique
      */
-    function save()
+    function save($p_array=3Dnull)
     {
         global $cn;
+		if ( $p_array =3D=3D null ) $p_array=3D$_POST;
+		$this->id=3D$_POST[$this->name];
         $sql=3D"insert into tool_uos(uos_value) values ($1)";
         try {
             $cn->exec_sql($sql,array($this->id));
         } catch (Exception $e)
         {
-            throw new Exception('Duplicate value','CODE_EXCP_DUPLICATE',=
$e);
+            throw new Exception('Duplicate value');
         }
     }
     /**
@@ -89,7 +97,7 @@
         try
         {
             $count=3D$cn->get_value('select count(*) from tool_uos where=
 uos_value=3D$1',
-                    array($p_id));
+                    array($this->id));
             if ($count !=3D 0 ) throw new Exception ('DUPLICATE',CODE_EX=
CP_DUPLICATE);
         }catch (Exception $e)
         {

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2013-05-03 21:56:40 UTC (rev 5=
215)
+++ phpcompta/trunk/include/class_user.php	2013-05-03 22:31:33 UTC (rev 5=
216)
@@ -19,11 +19,11 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* ! \file
+/** \file
  * \brief
  *   Data & function about connected users
  */
-/* !
+/**
  * \brief
  *   Data & function about connected users
  */
@@ -79,7 +79,7 @@
 		}
 	}
=20
-	/* !\brief load data from database.
+	/**\brief load data from database.
 	 * if this->id =3D=3D -1, it is unknown so we have to retrieve it
 	  from the database by the login
 	 * return -1 if nothing is found
@@ -130,7 +130,7 @@
 		$Res =3D $cn->exec_sql($Sql, array($this->first_name, $this->last_name=
, $this->active, $this->admin, $this->pass, $this->id));
 	}
=20
-	/* !
+	/**
 	 * \brief Check if user is active and exists in therepository
 	 * Automatically redirect, it doesn't check if a user can access a fold=
er
 	 * \param $silent false, echo an error message and exit, true : exit wi=
thout warning
@@ -190,7 +190,7 @@
 		return $ret;
 	}
=20
-	/* !\brief return  the access to a folder,
+	/**\brief return  the access to a folder,
 	 * \param $p_dossier id if it is =3D=3D 0 then we take the value from $=
_SESSION
 	 * \return the priv_priv
 	 *          - X no access
@@ -204,7 +204,7 @@
=20
 		if ($p_dossier =3D=3D 0)
 			$p_dossier =3D dossier::id();
-		if ($this->is_local_admin($p_dossier) =3D=3D 1)
+		if ($this->is_local_admin($p_dossier) =3D=3D 1 || $this->admin =3D=3D =
1)
 			return 'L';
 		$cn =3D new Database();
=20
@@ -238,7 +238,7 @@
 		$Res =3D $cn->exec_sql("update priv_user set priv_priv=3D$1 where priv=
_jnt=3D$2", array($priv, $jnt));
 	}
=20
-	/* !\brief check that a user is valid and the access to the folder
+	/**\brief check that a user is valid and the access to the folder
 	 * \param $p_ledger the ledger to check
 	 * \return the priv_priv
 	 * - O only predefined operation
@@ -264,7 +264,7 @@
 		return $res;
 	}
=20
-	/* !
+	/**
 	 * \brief get all the available ledgers for the current user
 	 * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS)
 	 * \param $p_access =3D3 for Read or WRITE, 2  write, 1 for readonly
@@ -326,7 +326,7 @@
 		return $array;
 	}
=20
-	/* !\brief return an sql condition for filtering the permitted ledger
+	/**\brief return an sql condition for filtering the permitted ledger
 	 * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS)
 	 * \param $p_access =3D3 for READ or WRITE, 2 READ and write, 1 for rea=
donly
 	 *
@@ -347,7 +347,7 @@
 		return $sql;
 	}
=20
-	/* !
+	/**
 	 * \brief  Check if an user is an admin
 	 *
 	 * \return 1 for yes 0 for no
@@ -373,7 +373,7 @@
 		return $this->admin;
 	}
=20
-	/* !
+	/**
 	 * \brief  Set the selected periode in the user's preferences
 	 *
 	 * \param $p_periode periode
@@ -415,7 +415,7 @@
 		$Res =3D $this->db->exec_sql($sql);
 	}
=20
-	/* !
+	/**
 	 * \brief  Get the default periode from the user's preferences
 	 *
 	 * \return the default periode
@@ -435,7 +435,7 @@
 		return $array['PERIODE'];
 	}
=20
-	/* !\brief return the mini rapport to display on the welcome page
+	/**\brief return the mini rapport to display on the welcome page
 	 * \return 0 if nothing if found or the report to display (formdef.fr_i=
d)
 	 */
=20
@@ -446,7 +446,7 @@
 		return $fr_id;
 	}
=20
-	/* !\brief set the mini rapport to display on the welcome page
+	/**\brief set the mini rapport to display on the welcome page
 	 */
=20
 	function set_mini_report($p_id)
@@ -485,7 +485,7 @@
 		}
 	}
=20
-	/* !
+	/**
 	 * \brief  Get the default user's preferences
 	 * \return array of (parameter_type =3D> parameter_value)
 	 */
@@ -524,7 +524,7 @@
 		return 1;
 	}
=20
-	/* !
+	/**
 	 * \brief  Check if an user is allowed to do an action
 	 * \param p_action_id
 	 * \return
@@ -561,7 +561,7 @@
 		exit();
 	}
=20
-	/* !
+	/**
 	 * \brief  Get the global preferences from user_global_pref
 	 *        in the account_repository db
 	 *
@@ -605,7 +605,7 @@
 		}
 	}
=20
-	/* !
+	/**
 	 * \brief  insert default pref
 	 *        if no parameter are given insert all the existing
 	 *        parameter otherwise only the requested
@@ -640,7 +640,7 @@
 		}
 	}
=20
-	/* !
+	/**
 	 * \brief  update default pref
 	 *           if value is not given then use the default value
 	 *
@@ -663,7 +663,7 @@
 	}
=20
 //end function
-	/* !\brief Return the year of current Periode
+	/**\brief Return the year of current Periode
 	 *        it is the parm_periode.p_exercice col
 	 *        if an error occurs return 0
 	 */
@@ -681,7 +681,7 @@
 			return 0;
 	}
=20
-	/* !\brief Check if the user can access
+	/**\brief Check if the user can access
 	 * otherwise warn and exit
 	 * \param $p_action requested action
 	 * \param $p_js =3D 1 javascript, or 0 just a text
@@ -729,7 +729,7 @@
 		return $res;
 	}
=20
-	/* !\brief Check if the user can print (in menu_ref p_type_display=3Dp)
+	/**\brief Check if the user can print (in menu_ref p_type_display=3Dp)
 	 * otherwise warn and exit
 	 * \param $p_action requested action
 	 * \return nothing the program exits automatically
@@ -756,7 +756,7 @@
 		}
 	}
=20
-	/* !
+	/**
 	 * \brief  Check if an user is an local administrator
 	 *
 	 *
@@ -822,7 +822,7 @@
 		}
 		return $r;
 	}
-	/* !
+	/**
 	 * \brief return an array with all the users who can access $p_dossier =
including the global admin. The user
 	 * must be activated
 	 *
@@ -853,7 +853,7 @@
 		return $array;
 	}
=20
-	/* !
+	/**
 	 * \brief check the access of an user on a ledger
 	 *
 	 * \param $p_jrn the ledger id
@@ -870,7 +870,7 @@
 		return $this->get_ledger_access($p_jrn);
 	}
=20
-	/* !\brief check if an user can access a folder, if he cannot display a=
 dialog box
+	/**\brief check if an user can access a folder, if he cannot display a =
dialog box
 	 * and exit
 	 * \param the folder if
 	 * \param $silent false, echo an error message and exit, true : exit wi=
thout warning
@@ -916,7 +916,7 @@
 		return array($start, $end);
 	}
=20
-	/* !
+	/**
 	 * \brief   Show all the available folder  for the users
 	 *          at the login page. For the special case 'E'
 	 *          go directly to extension and bypasse the dashboard
@@ -973,7 +973,7 @@
 		return $result;
 	}
=20
-	/* !
+	/**
 	 * \brief   Get all the available folders
 	 *          for the users, checked with the security
 	 *
@@ -1032,7 +1032,7 @@
 			}
 			$cn =3D new Database();
 			if (isset($_REQUEST['gDossier']))
-				$p_module.=3D "dossier : " . $_REQUEST['gDossier'];
+				$p_module.=3D " dossier : " . $_REQUEST['gDossier'];
 			$sql =3D "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,a=
c_state) values ($1,$2,$3,$4,$5)";
=20
 			$cn->exec_sql($sql, array(

Modified: phpcompta/trunk/include/client.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/client.inc.php	2013-05-03 21:56:40 UTC (rev 5=
215)
+++ phpcompta/trunk/include/client.inc.php	2013-05-03 22:31:33 UTC (rev 5=
216)
@@ -18,7 +18,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\brief include from client.inc.php and concerned only the customer c=
ard and
+/**\brief include from client.inc.php and concerned only the customer ca=
rd and
  * the customer category
  */
 require_once("class_iselect.php");
@@ -30,7 +30,7 @@
=20
=20
 $low_action =3D (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list";
-/* ! \file
+/** \file
  * \brief Called from the module "Gestion" to manage the customer
  */
 $href=3Dbasename($_SERVER['PHP_SELF']);

Modified: phpcompta/trunk/include/compta_ach.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ach.inc.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/compta_ach.inc.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief file included to manage all the sold operation
  */
 require_once("class_icheckbox.php");
@@ -29,7 +29,7 @@
 require_once ('class_pre_op_ach.php');
 require_once('class_ipopup.php');
 $gDossier =3D dossier::id();
-
+global $g_parameter;
 $cn =3D new Database(dossier::id());
 //menu =3D show a list of ledger
 $str_dossier =3D dossier::get();
@@ -62,7 +62,7 @@
 		echo '<div class=3D"content">';
 		echo h2info('Confirmation');
=20
-		echo '<form enctype=3D"multipart/form-data" method=3D"post">';
+		echo '<form enctype=3D"multipart/form-data" method=3D"post" class=3D"p=
rint">';
 		echo dossier::hidden();
=20
 		echo $Ledger->confirm($_POST);
@@ -232,7 +232,7 @@
 echo '</div>';
 echo "</FORM>";
=20
-if (!isset($_POST['e_date']))
+if (!isset($_POST['e_date']) && $g_parameter->MY_DATE_SUGGEST=3D=3D'Y')
 	echo create_script(" get_last_date()");
=20
 echo '</div>';

Modified: phpcompta/trunk/include/compta_fin.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin.inc.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/compta_fin.inc.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -25,7 +25,7 @@
  */
 require_once ('class_acc_ledger_fin.php');
 require_once('class_ipopup.php');
-global $g_user;
+global $g_user,$g_parameter;
=20
 $gDossier=3Ddossier::id();
=20
@@ -76,7 +76,7 @@
 	{
 		echo '<div class=3D"content">';
 		echo '<h2 class=3D"info">'._('Confirmation').' </h2>';
-		echo '<form name=3D"form_detail" class=3D"print" enctype=3D"multipart/=
form-data"  METHOD=3D"POST">';
+		echo '<form name=3D"form_detail" class=3D"print" enctype=3D"multipart/=
form-data" class=3D"print" METHOD=3D"POST">';
 		echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 		echo $Ledger->confirm($_POST);
 		echo HtmlInput::submit('confirm',_('Confirmer'));
@@ -131,7 +131,7 @@
 echo '<div class=3D"content">';
=20
=20
-echo '<form class=3D"print" name=3D"form_detail" enctype=3D"multipart/fo=
rm-data" METHOD=3D"POST">';
+echo '<form class=3D"print" name=3D"form_detail" enctype=3D"multipart/fo=
rm-data" class=3D"print" METHOD=3D"POST">';
 echo HtmlInput::hidden('ledger_type','fin');
 echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 $array=3D( isset($correct))?$_POST:null;
@@ -142,9 +142,11 @@
 echo HtmlInput::submit('save',_('Sauve'));
 echo HtmlInput::reset(_('Effacer'));
=20
-if ( ! isset ($_POST['e_date']) )
+if ( ! isset ($_POST['e_date'])&& $g_parameter->MY_DATE_SUGGEST=3D=3D'Y'=
)
 {
 	echo create_script(" get_last_date();ajax_saldo('first_sold');");
+}else {
+	echo create_script(" ajax_saldo('first_sold');");
 }
=20
 exit();
\ No newline at end of file

Modified: phpcompta/trunk/include/compta_fin_rec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin_rec.inc.php	2013-05-03 21:56:40 UT=
C (rev 5215)
+++ phpcompta/trunk/include/compta_fin_rec.inc.php	2013-05-03 22:31:33 UT=
C (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief reconcile operation
@@ -74,7 +74,7 @@
 		  {
 		    echo '<div class=3D"content">'.$g_succeed.' Mise =C3=A0 jour extra=
it '.$_POST['ext'].'</div>';
 		  }
-	=09
+
 		$cn->commit();
 	}
 }
@@ -101,7 +101,11 @@
 echo dossier::hidden();
 echo HtmlInput::get_to_hidden(array('sa', 'p_action', 'p_jrn'));
=20
-$operation =3D $cn->get_array("select jr_id,jr_internal,jr_comment,to_ch=
ar(jr_date,'DD.MM.YYYY') as fmt_date,jr_montant
+$operation =3D $cn->get_array("select jr_id,jr_internal,
+								jr_comment,
+								to_char(jr_date,'DD.MM.YYYY') as fmt_date,
+								jr_montant,
+								to_char(jr_date,'YYYYMMDD') as raw_date
                               from jrn where jr_def_id=3D$1 and (jr_pj_n=
umber is null or jr_pj_number=3D'') order by jr_date", array($Ledger->id)=
);
 echo '<span id=3D"bkname">' . hb(h($Ledger->get_bank_name())) . '</span>=
';
 echo '<p>';
@@ -118,8 +122,8 @@
 echo IButton::tooggle_checkbox('rec1');
 echo '</p>';
 echo HtmlInput::submit('save', 'Mettre =C3=A0 jour le n=C2=B0 de relev=C3=
=A9 bancaire');
-echo '<table class=3D"result" style=3D"width:80%;margin-left:10%">';
-$r =3D th('Date');
+echo '<table class=3D"sortable" style=3D"width:80%;margin-left:10%">';
+$r =3D'<th class=3D" sorttable_sorted_reverse">'.'Date '.HtmlInput::info=
bulle(17).'<span id=3D"sorttable_sortrevind">&nbsp;&blacktriangle;</span>=
'.'</th>';
 $r.=3Dth('Libell=C3=A9');
 $r.=3Dth('N=C2=B0 interne');
 $r.=3Dth('Montant', ' style=3D"text-align:right"');
@@ -133,11 +137,11 @@
 	$row =3D $operation[$i];
 	$r =3D '';
 	$js =3D HtmlInput::detail_op($row['jr_id'], $row['jr_internal']);
-	$r.=3Dtd($row['fmt_date']);
+	$r.=3D'<td sorttable_customkey=3D"'.$row['raw_date'].'">'.$row['fmt_dat=
e'].'</td>';
 	$r.=3Dtd($row['jr_comment']);
 	$r.=3Dtd($js);
 	$amount=3D$cn->get_value('select qf_amount from quant_fin where jr_id=3D=
$1', array($row['jr_id']));
-	$r.=3Dtd(nbm ($amount), ' class=3D"num" ');
+	$r.=3D'<td class=3D"num" class=3D"sorttable_numeric" sortable_customeke=
y=3D"'.$amount.'" style=3D"text-align:right">'.nbm ($amount).'</td>';
=20
 	$diff=3Dbcadd($diff,$amount);
 	$tot_not_reconcilied+=3D$row['jr_montant'];
@@ -154,11 +158,11 @@
 			}
 		}
 	}
-	$r.=3Dtd(HtmlInput::hidden('jrid[]', $row['jr_id']) . $iradio->input(),=
 ' style=3D"text-align:center" ');
+	$r.=3Dtd(HtmlInput::hidden('jrid['.$i.']', $row['jr_id']) . $iradio->in=
put(), ' style=3D"text-align:center" ');
 	if ($i % 2 =3D=3D 0)
 		echo tr($r, ' class=3D"odd" ');
 	else
-		echo tr($r);
+		echo tr($r,' class=3D"even" ');
 }
 echo '</table>';
 $bk_card =3D new Fiche($cn);

Modified: phpcompta/trunk/include/compta_fin_saldo.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin_saldo.inc.php	2013-05-03 21:56:40 =
UTC (rev 5215)
+++ phpcompta/trunk/include/compta_fin_saldo.inc.php	2013-05-03 22:31:33 =
UTC (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief show bank saldo

Modified: phpcompta/trunk/include/compta_ods.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ods.inc.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/compta_ods.inc.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -20,7 +20,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief to write directly into the ledgers,the stock and the tables
@@ -49,7 +49,7 @@
 }
 $ledger->id =3D ($ledger->id =3D=3D -1) ? $first_ledger['jrn_def_id'] : =
$id;
=20
-/* !\brief show a form for quick_writing */
+/**\brief show a form for quick_writing */
 $def =3D -1;
 $ledger->with_concerned =3D true;
=20
@@ -96,7 +96,7 @@
 		printf('<a class=3D"detail" style=3D"display:inline" href=3D"javascrip=
t:modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), $ledger->in=
ternal);
=20
 		// show feedback
-		echo '<div id=3D"jrn_name_div">'; echo '<h2 id=3D"jrn_name" style=3D"d=
isplay:inline">' . $ledger->get_name() . '</h2>'; echo '</div>';
+		echo '<div id=3D"jrn_name_div">'; echo '<h2 id=3D"jrn_name" class=3D"t=
itle"  style=3D"display:inline">' . $ledger->get_name() . '</h2>'; echo '=
</div>';
 		echo $ledger->confirm($_POST, true);
 	}
 	catch (Exception $e)

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/compta_ven.inc.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -251,8 +251,12 @@
     /* if we suggest the pj n# the run the script */
     if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
     {
-		if ( ! isset($_POST['e_date'])) echo '<script> update_pj();get_last_da=
te()</script>';
+		echo '<script> update_pj()</script>';
     }
+	if (!isset($_POST['e_date']) && $g_parameter->MY_DATE_SUGGEST=3D=3D'Y')
+	{
+		echo create_script(" get_last_date()");
+	}
     exit();
=20
=20

Modified: phpcompta/trunk/include/config_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config_file.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/config_file.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -147,7 +147,7 @@
     fputs($hFile, 'define ("phpcompta_psql_host","127.0.0.1");');
     fputs($hFile,"\r\n");
=20
-    fputs($hFile, 'define ("locale",'.$clocale.');');
+    fputs($hFile, 'define ("LOCALE",'.$clocale.');');
     fputs($hFile,"\r\n");
=20
     fputs($hFile, 'define ("domaine","");');

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-03 21:56:40 UTC (rev 521=
5)
+++ phpcompta/trunk/include/constant.php	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -47,7 +47,7 @@
 define ("SITE_UPDATE_PLUGIN",'http://www.phpcompta.eu/plugin_last_versio=
n.txt');
=20
=20
-define ("DBVERSION",103);
+define ("DBVERSION",106);
=20
 define ("DBVERSIONREPO",14);
 define ('NOTFOUND','--not found--');
@@ -55,9 +55,13 @@
 define ("MAX_COMPTE",4);
 define ('MAX_ARTICLE',12);
 define ('MAX_CAT',15);
+define ('MAX_CARD_SEARCH',50);
 define ('MAX_FORECAST_ITEM',10);
 define ('MAX_PREDEFINED_OPERATION',30);
 define ('MAX_COMPTE_CARD',4);
+define ('COMPTA_MAX_YEAR',2100);
+define ('COMPTA_MIN_YEAR',1990);
+define ('MAX_RECONCILE',25);
=20
 if ( DEBUG ) error_reporting(2147483647);  else error_reporting(0);
 // Erreur

Modified: phpcompta/trunk/include/contact.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/contact.inc.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/contact.inc.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -18,7 +18,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\brief include from client.inc.php and concerned only the contact ca=
rd and
+/**\brief include from client.inc.php and concerned only the contact car=
d and
  * the contact category
  */
 require_once("class_iselect.php");
@@ -30,7 +30,7 @@
=20
=20
 $low_action =3D (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list";
-/* ! \file
+/** \file
  * \brief Called from the module "Gestion" to manage the contact
  */
 $href=3Dbasename($_SERVER['PHP_SELF']);

Modified: phpcompta/trunk/include/doc_state.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/doc_state.inc.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/doc_state.inc.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -32,10 +32,17 @@
 {
 	if (trim ($_POST['s_value'])!=3D"")
 	{
-		$cn->exec_sql('insert into document_state(s_value) values ($1)',array(=
$_POST['s_value']));
+		if ( isset($_POST['s_state']))
+		{
+			$cn->exec_sql('insert into document_state(s_value,s_status) values ($=
1,$2)',array($_POST['s_value'],'C'));
+		}
+		else
+		{
+			$cn->exec_sql('insert into document_state(s_value) values ($1)',array=
($_POST['s_value']));
+		}
 	}
 }
-$a_stat=3D$cn->get_array("select s_value   from document_state order by =
1");
+$a_stat=3D$cn->get_array("select s_value,s_status from document_state or=
der by 1");
 ?>
=20
 <table>
@@ -45,10 +52,20 @@
 		<td>
 			<?=3Dh($a_stat[$i]['s_value'])?>
 		</td>
+
+		<td>
+			<? if ($a_stat[$i]['s_status']=3D=3D'C') { echo _("Ferme l'action"); =
} ?>
+		</td>
 	</tr>
 	<?	endfor;?>
 </table>
+<h2>Ajout d'un =C3=A9tat</h2>
 <form method=3D"post" onsubmit=3D"return confirm ('Vous confirmez ?'); "=
>
-	<? $value=3Dnew IText("s_value",""); echo $value->input()?>
-	<?=3DHtmlInput::submit("add", "Ajouter")?>
+	<p>
+		Nom de l'=C3=A9tat <? $value=3Dnew IText("s_value",""); echo $value->i=
nput()?>
+	</p>
+	<p>
+		Cochez la case si cet =C3=A9tat ferme une action <? $state=3Dnew IChec=
kBox("s_state",""); echo $state->input()?>
+		<?=3DHtmlInput::submit("add", "Ajouter")?>
+	</p>
 </form>
\ No newline at end of file

Modified: phpcompta/trunk/include/dossier.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/dossier.inc.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/dossier.inc.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -195,22 +195,32 @@
             echo "<TR $cl><TD style=3D\"vertical-align:top\"> ".
 	      $Dossier['dos_id']."</td><td> <B>".h($Dossier['dos_name'])."</B> =
</TD>";
 	    $str_name=3Ddomaine.'dossier'.$Dossier['dos_id'];
-	    $size=3D$repocn->get_value("select pg_database_size($1)/(1024*1024)=
::float",
-				 array($str_name));
+
 	    echo "<TD><I>  ".h($Dossier['dos_description'])."</I></td>";
-	    echo td(nbm($size)."MB",' style=3D"text-align:right"');
=20
+            $database_exist=3D$repocn->exist_database($str_name);
+
+            if ($database_exist > 0 )
+            {
+                $size=3D$repocn->get_value("select pg_database_size($1)/=
(1024*1024)::float",
+                                     array($str_name));
+                echo td(nbm($size)."MB",' style=3D"text-align:right"');
+            } else {
+                echo td(_("Dossier inexistant"),'style=3D"color:red"');
+            }
 	    echo td($str_name);
             echo "<TD>";
-            echo td(HtmlInput::button_anchor(_('Effacer'),'?action=3Ddos=
sier_mgt&sa=3Ddel&d=3D'.$Dossier['dos_id']));
+            if ( $database_exist > 0)
+            {
+                echo td(HtmlInput::button_anchor(_('Effacer'),'?action=3D=
dossier_mgt&sa=3Ddel&d=3D'.$Dossier['dos_id']));
=20
-	    echo td(HtmlInput::button_anchor(_('Modifier'),'?action=3Ddossier_m=
gt&sa=3Dmod&d=3D'
-					     .$Dossier['dos_id']));
+                echo td(HtmlInput::button_anchor(_('Modifier'),'?action=3D=
dossier_mgt&sa=3Dmod&d=3D'
+                                                 .$Dossier['dos_id']));
=20
-	    echo td(HtmlInput::button_anchor(_('Backup'),'backup.php?action=3Db=
ackup&sa=3Db&t=3Dd&d=3D'
-					  .$Dossier['dos_id']));
-	    echo '</td>';
-
+                echo td(HtmlInput::button_anchor(_('Backup'),'backup.php=
?action=3Dbackup&sa=3Db&t=3Dd&d=3D'
+                                              .$Dossier['dos_id']));
+                echo '</td>';
+            }
             echo '<tr>';
             $compteur++;
=20

Modified: phpcompta/trunk/include/export_balance_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_balance_pdf.php	2013-05-03 21:56:40 UT=
C (rev 5215)
+++ phpcompta/trunk/include/export_balance_pdf.php	2013-05-03 22:31:33 UT=
C (rev 5216)
@@ -215,7 +215,7 @@
     $pdf->Cell(20,6,nbm($tp_sold),'T',0,'R',0);
     $pdf->Cell(20,6,nbm($tp_solc),'T',0,'R',0);
     $pdf->Ln();
-  } // if ! empty
+  } /** empty */
=20
 $fDate=3Ddate('dmy-Hi');
 $pdf->Output('balance-'.$fDate.'.pdf','D');

Modified: phpcompta/trunk/include/export_fiche_balance_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_balance_csv.php	2013-05-03 21:56=
:40 UTC (rev 5215)
+++ phpcompta/trunk/include/export_fiche_balance_csv.php	2013-05-03 22:31=
:33 UTC (rev 5216)
@@ -133,7 +133,7 @@
 			/* skip if nothing to display */
 			if (count($letter->content) =3D=3D 0)
 				continue;
-			printf('"%s"'."\n",$row->strAttribut(ATTR_DEF_QUICKCODE), $row->strAt=
tribut(ATTR_DEF_NAME));
+			printf('"%s";"%s"'."\n",$row->strAttribut(ATTR_DEF_QUICKCODE), $row->=
strAttribut(ATTR_DEF_NAME));
=20
 			printf('"%s";"%s";"%s";"%s";"%s";"%s";"%s";"%s";"%s"',
 					_('Date'),
@@ -175,7 +175,7 @@
 				printf ("%s;\"%s\";",abs(nb($prog)),$fic->get_amount_side($prog));
 				if ($row['letter'] !=3D -1)
 				{
-					printf('"%s";',$row['letter']);
+					printf('"%s";',  strtoupper(base_convert($row['letter'],10,36)));
 					printf("%s",nb($row['letter_diff']));
 				}
 				else

Modified: phpcompta/trunk/include/export_fiche_balance_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_balance_pdf.php	2013-05-03 21:56=
:40 UTC (rev 5215)
+++ phpcompta/trunk/include/export_fiche_balance_pdf.php	2013-05-03 22:31=
:33 UTC (rev 5216)
@@ -120,11 +120,11 @@
 	$side=3D'';
 	if(bcsub($solde['credit'],$solde['debit']) < 0) $side=3D'Deb.';
 	if(bcsub($solde['credit'],$solde['debit']) > 0) $side=3D'Cred.';
-       =20
+
         $sum_cred=3Dbcadd($sum_cred,$solde['credit']);
         $sum_deb=3Dbcadd($sum_deb,$solde['debit']);
         $sum_solde=3Dbcsub($sum_deb,$sum_cred);
-       =20
+
         $pdf->Cell(30,7,$oCard->strAttribut(ATTR_DEF_QUICKCODE),0,0,'L',=
$fill);
         $pdf->Cell(80,7,$oCard->strAttribut(ATTR_DEF_NAME),0,0,'L',$fill=
);
         $pdf->Cell(20,7,nbm($solde['debit']),0,0,'R',$fill);
@@ -140,7 +140,7 @@
         $pdf->Cell(20,7,nbm($sum_cred),0,0,'R',$fill);
         $pdf->Cell(20,7,nbm(abs($sum_solde)),0,0,'R',$fill);
         $side=3D" =3D ";
-        if ( $sum_solde > 0 )=20
+        if ( $sum_solde > 0 )
         {
             $side=3D'Deb.';
         }
@@ -148,7 +148,7 @@
         {
             $side=3D'Cred.';
         }
-       =20
+
         $pdf->Cell(20,7,$side,0,0,'C',$fill);
         $pdf->Ln();
 	}
@@ -210,7 +210,7 @@
 				continue;
 			$pdf->SetFont('DejaVuCond', '', 10);
 			$fiche =3D new Fiche($cn, $row_fiche['f_id']);
-			$pdf->Cell(0, 7, $fiche->strAttribut(ATTR_DEF_NAME), 1, 1, 'C');
+			$pdf->Cell(0, 7, $fiche->strAttribut(ATTR_DEF_NAME)." [".$fiche->strA=
ttribut(ATTR_DEF_QUICKCODE)."]", 1, 1, 'C');
=20
 			$pdf->SetFont('DejaVuCond', '', 7);
=20
@@ -265,7 +265,7 @@
 				}
 				if ($row['letter'] !=3D -1)
 				{
-					$pdf->Cell($tab[6], 4, $row['letter'], 0, 0, $align[6], $fill);
+					$pdf->Cell($tab[6], 4, strtoupper(base_convert($row['letter'],10,36=
)), 0, 0, $align[6], $fill);
 					// get sum for this lettering
=20
 					$pdf->Cell($tab[7], 4, sprintf('%s', nbm($row['letter_diff'])), '0'=
, '0', $align[7], $fill);

Modified: phpcompta/trunk/include/export_fiche_detail_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_detail_csv.php	2013-05-03 21:56:=
40 UTC (rev 5215)
+++ phpcompta/trunk/include/export_fiche_detail_csv.php	2013-05-03 22:31:=
33 UTC (rev 5216)
@@ -74,7 +74,7 @@
 	  nb($op['deb_montant']).";".
 	  nb($op['cred_montant']).";".
 	  nb(abs($progress)).';'.
-	  '"'.(($op['letter']=3D=3D-1)?'':$op['letter']).'"';
+	  '"'.(($op['letter']=3D=3D-1)?'':strtoupper(base_convert($op['letter']=
,10,36))).'"';
         printf("\n");
=20
     }

Modified: phpcompta/trunk/include/export_fiche_detail_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_detail_pdf.php	2013-05-03 21:56:=
40 UTC (rev 5215)
+++ phpcompta/trunk/include/export_fiche_detail_pdf.php	2013-05-03 22:31:=
33 UTC (rev 5216)
@@ -107,7 +107,7 @@
     $pdf->LongLine($size[$l],6,($row['description'].'('.$row['jr_interna=
l'].")"),0,$align[$l]);
=20
     $l++;
-    $pdf->Cell($size[$l],6,(($row['letter']!=3D-1)?$row['letter']:''),0,=
0,$align[$l]);
+    $pdf->Cell($size[$l],6,(($row['letter']!=3D-1)?strtoupper(base_conve=
rt($row['letter'],10,36)):''),0,0,$align[$l]);
     $l++;
     $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$row['deb_montant'])),0,0,=
$align[$l]);
     $l++;

Modified: phpcompta/trunk/include/export_fiche_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_pdf.php	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/include/export_fiche_pdf.php	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -197,7 +197,7 @@
             }
             if ($row['letter'] !=3D -1 )
             {
-                $pdf->Cell($tab[5],4,$row['letter'],0,0,$align[5],$fill)=
;
+                $pdf->Cell($tab[5],4,strtoupper(base_convert($row['lette=
r'],10,36)),0,0,$align[5],$fill);
                 // get sum for this lettering
                 $sql=3D"select sum(j_montant) from jrnx where j_debit=3D=
$1 and j_id in ".
                      " (select j_id from jnt_letter join letter_deb usin=
g (jl_id) where jl_id=3D$2 union ".

Modified: phpcompta/trunk/include/export_histo_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_histo_csv.php	2013-05-03 21:56:40 UTC =
(rev 5215)
+++ phpcompta/trunk/include/export_histo_csv.php	2013-05-03 22:31:33 UTC =
(rev 5216)
@@ -43,7 +43,7 @@
 printf('"%s";',"Tiers");
 printf('"%s";',"Description");
 printf('"%s";',"Note");
-printf('"%s"',"Montant");
+printf('"%s"',"Montant op=C3=A9ration");
 printf("\r\n");
=20
 for ($i=3D0;$i<count($res);$i++)
@@ -60,12 +60,13 @@
=20
     $amount=3D$res[$i]['jr_montant'];
=20
+	if ( $res[$i]['total_invoice']!=3Dnull && $res[$i]['jr_montant']!=3D$re=
s[$i]['total_invoice'])
+		$amount=3D$res[$i]['total_invoice'];
     if ( $res[$i]['jrn_def_type'] =3D=3D 'FIN')
       {
-	$positive =3D $cn->get_value("select qf_amount from quant_fin where jr_=
id=3D$1",array($res[$i]['jr_id']));
-	if ( $positive !=3D'' ) $amount=3D$positive;
+		$positive =3D $cn->get_value("select qf_amount from quant_fin where jr=
_id=3D$1",array($res[$i]['jr_id']));
+		if ( $positive !=3D'' ) $amount=3D$positive;
       }
-
     printf('%s',nb($amount));
=20
     printf("\r\n");

Modified: phpcompta/trunk/include/export_poste_detail_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_poste_detail_csv.php	2013-05-03 21:56:=
40 UTC (rev 5215)
+++ phpcompta/trunk/include/export_poste_detail_csv.php	2013-05-03 22:31:=
33 UTC (rev 5216)
@@ -25,10 +25,10 @@
 require_once('class_database.php');
 require_once("class_acc_account_ledger.php");
 require_once ('class_acc_operation.php');
-
+$fDate=3Ddate('dmy-Hi');
 header('Pragma: public');
 header('Content-type: application/csv');
-header('Content-Disposition: attachment;filename=3D"poste.csv"',FALSE);
+header('Content-Disposition: attachment;filename=3D"poste-'.$fDate.'-'.$=
_REQUEST['poste_id'].'.csv"',FALSE);
 require_once('class_dossier.php');
 $gDossier=3Ddossier::id();
=20
@@ -68,7 +68,8 @@
         "\"Description\";".
         "\"D=C3=A9bit\";".
         "\"Cr=C3=A9dit\";".
-        "\"Prog.\"";
+        "\"Prog.\";".
+		"\"Let.\"";
         printf("\n");
=20
         $prog=3D0;
@@ -84,7 +85,8 @@
             '"'.$op['description'].'";'.
             nb($op['deb_montant']).";".
             nb($op['cred_montant']).";".
-            nb(abs($prog));
+            nb(abs($prog)).";".
+			(($op['letter']!=3D-1)?strtoupper(base_convert($op['letter'],10,36)):=
"");
             printf("\n");
=20
=20
@@ -109,7 +111,8 @@
         $Poste=3Dnew Acc_Account_Ledger($cn,$pos['pcm_val']);
         $Poste->get_name();
         list($array,$tot_deb,$tot_cred)=3D$Poste->get_row_date( $_REQUES=
T['from_periode'],
-                                        $_REQUEST['to_periode']
+                                        $_REQUEST['to_periode'],
+									      $_GET['ople']
                                                             );
         if ( count($Poste->row ) =3D=3D 0 )
             continue;

Modified: phpcompta/trunk/include/export_poste_detail_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_poste_detail_pdf.php	2013-05-03 21:56:=
40 UTC (rev 5215)
+++ phpcompta/trunk/include/export_poste_detail_pdf.php	2013-05-03 22:31:=
33 UTC (rev 5216)
@@ -198,5 +198,5 @@
=20
 }
 $fDate=3Ddate('dmy-Hi');
-$pdf->Output('poste-'.$fDate.'.pdf','D');
+$pdf->Output('poste-'.$fDate.'-'.$poste_id.'.pdf','D');
 ?>

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-05-03 21:56:40 UTC (rev 52=
15)
+++ phpcompta/trunk/include/fiche.inc.php	2013-05-03 22:31:33 UTC (rev 52=
16)
@@ -19,7 +19,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\file
+/**\file
  * \brief printing of category of card  : balance, historic
  */
 include_once('class_database.php');
@@ -82,6 +82,16 @@
 require_once('template/impress_cat_card.php');
 echo HtmlInput::submit('cat_display', _('Recherche'));
 echo '</FORM>';
+$search_card=3Dnew IText('card_search');
+$search_card_js=3Dsprintf('onclick=3D"boxsearch_card(\'%d\')"',dossier::=
id());
+?>
+<div style=3D"position:absolute;right:230px;top:110px">
+
+		<?=3D_('Recherche de fiche')?> <?=3DHtmlInput::infobulle(18)?> :<?=3D$=
search_card->input()?>
+		<?=3DHtmlInput::button_anchor("Chercher","javascript:void(0)","",$sear=
ch_card_js)?>
+</div>
+<?
+echo '</div>';
 $str =3D "if (g('histo').value=3D=3D3 || g('histo').value=3D=3D -1 ) {
      g('trstart').style.display=3D'none';g('trend').style.display=3D'non=
e';g('allcard').style.display=3D'none';}
      else  {g('trstart').style.display=3D'';g('trend').style.display=3D'=
';g('allcard').style.display=3D'';}
@@ -155,8 +165,8 @@
 				}
 				if ($msg !=3D "")
 				{
-					echo h2("Fiche non effac=C3=A9es", ' class=3D"error"  ');
-					echo '<p class=3D"error">'." Ces fiches n'ont pas =C3=A9t=C3=A9 eff=
ac=C3=A9es  ".$msg;
+					echo h2(_("Fiche non effac=C3=A9es"), ' class=3D"error"  ');
+					echo '<p class=3D"error">'._(" Ces fiches n'ont pas =C3=A9t=C3=A9 e=
ffac=C3=A9es  ").$msg;
 				}
 			}
 		}
@@ -172,10 +182,10 @@
 	}
 	else
 	{
-		$cond =3D " where fd_id =3D " . sql_string($_GET['cat']);
+		$cond =3D " where f.fd_id =3D " . sql_string($_GET['cat']);
 	}
 	// Create nav bar
-	$max =3D $cn->get_value("select count(*) from fiche " . $cond);
+	$max =3D $cn->get_value("select count(*) from fiche as f " . $cond);
=20
 	$step =3D $_SESSION['g_pagesize'];
 	$page =3D (isset($_GET['offset'])) ? $_GET['page'] : 1;
@@ -185,13 +195,15 @@
 	$res =3D $cn->exec_sql("
 		select f_id,
 			(select ad_value from fiche_detail as fd1 where ad_id=3D1 and fd1.f_i=
d=3Df.f_id) as name,
-			(select ad_value from fiche_detail as fd1 where ad_id=3D23 and fd1.f_=
id=3Df.f_id) as qcode
-		from fiche as f
-		$cond   order by 1 offset $offset $limit
+			(select ad_value from fiche_detail as fd1 where ad_id=3D23 and fd1.f_=
id=3Df.f_id) as qcode,
+			fd_label
+		from fiche as f join fiche_def as fd on (fd.fd_id=3Df.fd_id)
+		$cond   order by 2 offset $offset $limit
 	");
 	$nb_line =3D Database::num_row($res);
+	if ($write !=3D 1 || $allcard !=3D 0 )  $str_add_card=3D"";
 	require_once 'template/fiche_list.php';
-	if ($write =3D=3D 1 && $allcard =3D=3D 0 ) echo $str_add_card;
+	echo '<hr>'.$bar;
 	exit();
 }
 /* * *******************************************************************=
**************************************************************
@@ -281,7 +293,7 @@
 		{
 			if ($allcard =3D=3D 0)
 			{
-				echo "Aucune fiche trouv=C3=A9e";
+				echo _("Aucune fiche trouv=C3=A9e");
 				exit;
 			} else
 				continue;
@@ -324,9 +336,9 @@
 					td(nbm(abs($solde['solde'])), 'style=3D"text-align:right"') .
 					td((($solde['debit'] < $solde['credit']) ? 'CRED' : 'DEB'), 'style=3D=
"text-align:right"'), $class
 			);
-                     =20
-                               =20
-                               =20
+
+
+
 		}
                 echo tr(
                                 td('').
@@ -452,7 +464,7 @@
 				$span_error =3D "";
 				if ($row['letter_diff'] !=3D 0)
 					$span_error =3D $g_failed;
-				echo td($row['letter'] . $span_error);
+				echo td(strtoupper(base_convert($row['letter'],10,36)) . $span_error=
);
 			}
 			else
 				echo td('');

Modified: phpcompta/trunk/include/forecast.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/forecast.inc.php	2013-05-03 21:56:40 UTC (rev=
 5215)
+++ phpcompta/trunk/include/forecast.inc.php	2013-05-03 22:31:33 UTC (rev=
 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief display, add, delete and modify forecast
  */
=20

Modified: phpcompta/trunk/include/function_javascript.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/function_javascript.php	2013-05-03 21:56:40 U=
TC (rev 5215)
+++ phpcompta/trunk/include/function_javascript.php	2013-05-03 22:31:33 U=
TC (rev 5216)
@@ -2755,6 +2755,8 @@
     echo js_include('gestion.js');
     echo js_include('todo_list.js');
     echo js_include('anc_script.js');
+    echo js_include('sorttable.js');
+    echo js_include('nicEdit.js');
=20
=20
 }

Modified: phpcompta/trunk/include/history_operation.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/history_operation.inc.php	2013-05-03 21:56:40=
 UTC (rev 5215)
+++ phpcompta/trunk/include/history_operation.inc.php	2013-05-03 22:31:33=
 UTC (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief

Modified: phpcompta/trunk/include/impress_gl_comptes.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_gl_comptes.inc.php	2013-05-03 21:56:4=
0 UTC (rev 5215)
+++ phpcompta/trunk/include/impress_gl_comptes.inc.php	2013-05-03 22:31:3=
3 UTC (rev 5216)
@@ -168,7 +168,8 @@
             continue;
         }
=20
-        echo '<tr>
+
+        echo '<tr >
         <td colspan=3D"8" style=3D"width:auto">
         <h2 class=3D"info">'. $poste_id['pcm_val'].' '.h($Poste->label).=
'</h2>
         </td>
@@ -189,6 +190,7 @@
         $solde_d =3D 0.0;
         $solde_c =3D 0.0;
 	bcscale(2);
+	$i=3D0;
         foreach ($Poste->row as $detail)
         {
 	  if ($a=3D=3D0) {var_dump($detail);$a=3D1;}
@@ -216,8 +218,10 @@
 	      $solde_d =3D bcadd($solde_d,$detail['deb_montant']);
             }
 			$side=3D"&nbsp;".$Poste->get_amount_side($solde);
-	    $letter=3D($detail['letter']!=3D-1)?hi($detail['letter']):'';
-            echo '<tr>
+	    $letter=3D($detail['letter']!=3D-1)?hi(strtoupper(base_convert($det=
ail['letter'],10,36))):'';
+		$i++;
+		if (($i % 2 ) =3D=3D 0) $class=3D"odd"; else $class=3D"even";
+            echo '<tr class=3D"'.$class.'">
             <td>'.$detail['j_date_fmt'].'</td>
             <td>'.HtmlInput::detail_op($detail['jr_id'],$detail['jr_inte=
rnal']).'</td>
             <td>'.$detail['description'].'</td>
@@ -228,7 +232,7 @@
             <td  style=3D"text-align:right;color:red">'.$letter.'</td>
             </tr>';
         }
-        echo '<tr>
+        echo '<tr >
         <td>'.''.'</td>
         <td>'.''.'</td>
         <td>'.'<b>'.'Total du compte '.$poste_id['pcm_val'].'</b>'.'</td=
>

Modified: phpcompta/trunk/include/impress_jrn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_jrn.inc.php	2013-05-03 21:56:40 UTC (=
rev 5215)
+++ phpcompta/trunk/include/impress_jrn.inc.php	2013-05-03 22:31:33 UTC (=
rev 5216)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,10 +16,10 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/*! \file
+/** \file
  * \brief ask for Printing the ledger (pdf,html)
  */
=20
@@ -28,32 +29,34 @@
 require_once('class_exercice.php');
 require_once('class_dossier.php');
 load_all_script();
-$gDossier=3Ddossier::id();
+$gDossier =3D dossier::id();
 global $g_user;
 //-----------------------------------------------------
 // Show the jrn and date
 //-----------------------------------------------------
 require_once('class_database.php');
=20
-if ( $g_user->Admin() =3D=3D 0 && $g_user->is_local_admin()=3D=3D0)
+if ($g_user->Admin() =3D=3D 0 && $g_user->is_local_admin() =3D=3D 0)
 {
-    $sql=3D"select jrn_def_id,jrn_def_name
+	$sql =3D "select jrn_def_id,jrn_def_name
          from jrn_def join jrn_type on jrn_def_type=3Djrn_type_id
          join user_sec_jrn on uj_jrn_id=3Djrn_def_id
          where
          uj_login=3D'$g_user->login'
          and uj_priv in ('R','W')
+		 order by jrn_def_name
          ";
-    $ret=3D$cn->make_array($sql);
+	$ret =3D $cn->make_array($sql);
 }
 else
 {
-    $ret=3D$cn->make_array("select jrn_def_id,jrn_def_name
-                         from jrn_def join jrn_type on jrn_def_type=3Djr=
n_type_id");
-
+	$ret =3D $cn->make_array("select jrn_def_id,jrn_def_name
+                         from jrn_def join jrn_type on jrn_def_type=3Djr=
n_type_id
+						 order by jrn_def_name
+						 ");
 }
 // Count the forbidden journaux
-$NoPriv=3D$cn->count_sql("select jrn_def_id,jrn_def_name,jrn_def_class_d=
eb,jrn_def_class_cred,jrn_type_id,jrn_desc,uj_priv,
+$NoPriv =3D $cn->count_sql("select jrn_def_id,jrn_def_name,jrn_def_class=
_deb,jrn_def_class_cred,jrn_type_id,jrn_desc,uj_priv,
                        jrn_deb_max_line,jrn_cred_max_line
                        from jrn_def join jrn_type on jrn_def_type=3Djrn_=
type_id
                        join  user_sec_jrn on uj_jrn_id=3Djrn_def_id
@@ -62,15 +65,15 @@
                        and uj_priv =3D'X'
                        ");
 // Pour voir tout les journal ?
-if ( $NoPriv =3D=3D 0 && $ret !=3D null )
+if ($NoPriv =3D=3D 0 && $ret !=3D null)
 {
-    $a=3Dcount($ret);
-    $all=3Darray('value'=3D>0,'label'=3D>'Tous les journaux');
-    $ret[$a]=3D$all;
+	$a =3D count($ret);
+	$all =3D array('value' =3D> 0, 'label' =3D> 'Tous les journaux');
+	$ret[$a] =3D $all;
 }
-if ( count($ret) < 1 )
-    NoAccess();
-$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex=
ercice();
+if (count($ret) < 1)
+	NoAccess();
+$exercice =3D (isset($_GET['exercice'])) ? $_GET['exercice'] : $g_user->=
get_exercice();
=20
 //-----------------------------------------------------
 // Form
@@ -79,56 +82,58 @@
 /*
  * Let you change the exercice
  */
-echo '<fieldset><legend>'._('Choississez un autre exercice').'</legend>'=
;;
 echo '<form method=3D"GET">';
+echo '<fieldset><legend>' . _('Choississez un autre exercice') . '</lege=
nd>';
+;
 echo 'Choississez un autre exercice :';
-$ex=3Dnew Exercice($cn);
-$wex=3D$ex->select('exercice',$exercice,' onchange=3D"submit(this)"');
+$ex =3D new Exercice($cn);
+$wex =3D $ex->select('exercice', $exercice, ' onchange=3D"submit(this)"'=
);
 echo $wex->input();
 echo dossier::hidden();
-echo HtmlInput::get_to_hidden(array('ac','type'));
+echo HtmlInput::get_to_hidden(array('ac', 'type'));
+echo '</fieldset>';
 echo '</form>';
-echo '</fieldset>';
=20
=20
=20
-echo '<FORM METHOD=3D"GET">'.dossier::hidden();
-echo HtmlInput::get_to_hidden(array('ac','type'));
-echo HtmlInput::hidden('type','jrn');
+echo '<FORM METHOD=3D"GET">' . dossier::hidden();
+echo HtmlInput::get_to_hidden(array('ac', 'type'));
+echo HtmlInput::hidden('type', 'jrn');
 echo HtmlInput::get_to_hidden(array('exercice'));
 echo '<TABLE  ><TR>';
-$w=3Dnew ISelect();
-$w->table=3D1;
-$label=3D"Choississez le journal";
-$w->selected=3D(isset($_GET['jrn_id']))?$_GET['jrn_id']:'';
-print td($label).$w->input("jrn_id",$ret);
+$w =3D new ISelect();
+$w->table =3D 1;
+$label =3D "Choississez le journal";
+$w->selected =3D (isset($_GET['jrn_id'])) ? $_GET['jrn_id'] : '';
+print td($label) . $w->input("jrn_id", $ret);
 print '</TR>';
 print '<TR>';
 // filter on the current year
-$filter_year=3D" where p_exercice=3D'".sql_string($exercice)."'";
+$filter_year =3D " where p_exercice=3D'" . sql_string($exercice) . "'";
=20
-$periode_start=3D$cn->make_array("select p_id,to_char(p_start,'DD-MM-YYY=
Y') from parm_periode $filter_year order by p_start,p_end");
-$w->selected=3D(isset($_GET['from_periode']))?$_GET['from_periode']:'';
-print td('Depuis').$w->input('from_periode',$periode_start);
+$periode_start =3D $cn->make_array("select p_id,to_char(p_start,'DD-MM-Y=
YYY') from parm_periode $filter_year order by p_start,p_end");
+$w->selected =3D (isset($_GET['from_periode'])) ? $_GET['from_periode'] =
: '';
+print td('Depuis') . $w->input('from_periode', $periode_start);
 print '</TR>';
 print '<TR>';
=20
-$periode_end=3D$cn->make_array("select p_id,to_char(p_end,'DD-MM-YYYY') =
from parm_periode $filter_year order by p_start,p_end");
-$w->selected=3D(isset($_GET['to_periode']))?$_GET['to_periode']:'';
-print td('Jusque ').$w->input('to_periode',$periode_end);
+$periode_end =3D $cn->make_array("select p_id,to_char(p_end,'DD-MM-YYYY'=
) from parm_periode $filter_year order by p_start,p_end");
+$w->selected =3D (isset($_GET['to_periode'])) ? $_GET['to_periode'] : ''=
;
+print td('Jusque ') . $w->input('to_periode', $periode_end);
 print "</TR><TR>";
-$a=3Darray(
-       array('value'=3D>0,'label'=3D>'Detaill=C3=A9'),
-       array('value'=3D>1,'label'=3D>'Simple')
-   );
-$w->selected=3D1;
+$a =3D array(
+	array('value' =3D> 0, 'label' =3D> 'Ecriture comptable'),
+	array('value' =3D> 1, 'label' =3D> 'Liste op=C3=A9rations'),
+	array('value' =3D> 2, 'label' =3D> 'Avec D=C3=A9tails op=C3=A9rations '=
)
+);
+$w->selected =3D 1;
 print '</TR>';
 print '<TR>';
-$w->selected=3D(isset($_GET['p_simple']))?$_GET['p_simple']:'';
-echo td('Style d\'impression').$w->input('p_simple',$a);
+$w->selected =3D (isset($_GET['p_simple'])) ? $_GET['p_simple'] : '';
+echo td('Style d\'impression') . $w->input('p_simple', $a);
 print "</TR>";
 echo '</TABLE>';
-print HtmlInput::submit('bt_html','Visualisation');
+print HtmlInput::submit('bt_html', 'Visualisation');
=20
 echo '</FORM>';
=20
@@ -139,162 +144,239 @@
 // First time in html
 // after in pdf or cvs
 //-----------------------------------------------------
-if ( isset( $_REQUEST['bt_html'] ) )
+if (isset($_REQUEST['bt_html']))
 {
-    require_once("class_acc_ledger.php");
+	require_once("class_acc_ledger.php");
=20
-    $d=3Dvar_export($_GET,true);
-    $Jrn=3Dnew Acc_Ledger($cn,$_GET['jrn_id']);
-    $Jrn->get_name();
-    if ( $_GET['p_simple']=3D=3D0 )
-    {
-        $Row=3D$Jrn->get_row( $_GET['from_periode'],
-                            $_GET['to_periode']
-                          );
-    }
-    else
-    {
-        $Row=3D$Jrn->get_rowSimple($_GET['from_periode'],
-                                 $_GET['to_periode']
-                                );
-    }
-    $rep=3D"";
-    $hid=3Dnew IHidden();
-    echo '<div class=3D"content">';
-    echo '<h2 class=3D"info">'.h($Jrn->name).'</h2>';
-    echo "<table>";
-    echo '<TR>';
-    echo '<TD><form method=3D"GET" ACTION=3D"?">'.dossier::hidden().
-    $hid->input("type","jrn").$hid->input('p_action','impress')."</form>=
</TD>";
+	$d =3D var_export($_GET, true);
+	$Jrn =3D new Acc_Ledger($cn, $_GET['jrn_id']);
+	$Jrn->get_name();
+	switch ($_GET['p_simple'])
+	{
+		case "0":
+			$Row =3D $Jrn->get_row($_GET['from_periode'], $_GET['to_periode']);
+			break;
+		case "1":
+			$Row =3D $Jrn->get_rowSimple($_GET['from_periode'], $_GET['to_periode=
']);
+			break;
+		case "2":
+			$Row =3D $Jrn->get_rowSimple($_GET['from_periode'], $_GET['to_periode=
']);
+			break;
+		default:
+			var_dump($_GET['p_simple']);
+			die(__FILE__ . ":" . __LINE__ . " error unknown style ");
+	}
+	$rep =3D "";
+	$hid =3D new IHidden();
+	echo '<div class=3D"content">';
+	echo '<h2 class=3D"info">' . h($Jrn->name) . '</h2>';
+	echo "<table>";
+	echo '<TR>';
+	if ($_GET['p_simple'] =3D=3D 0 || $_GET['p_simple'] =3D=3D 1)
+	{
+		echo '<TD><form method=3D"GET" ACTION=3D"?">' . dossier::hidden() .
+		$hid->input("type", "jrn") . $hid->input('p_action', 'impress') . "</f=
orm></TD>";
=20
-    echo '<TD><form method=3D"GET" ACTION=3D"export.php">'.dossier::hidd=
en().
-    HtmlInput::submit('bt_pdf',"Export PDF").
-      HtmlInput::hidden('act','PDF:ledger').
-    $hid->input("type","jrn").
-    $hid->input("jrn_id",$Jrn->id).
-    $hid->input("from_periode",$_GET['from_periode']).
-    $hid->input("to_periode",$_GET['to_periode']);
-    echo $hid->input("p_simple",$_GET['p_simple']);
-    echo HtmlInput::get_to_hidden(array('ac','type'));
-    echo "</form></TD>";
+		echo '<TD><form method=3D"GET" ACTION=3D"export.php">' . dossier::hidd=
en() .
+		HtmlInput::submit('bt_pdf', "Export PDF") .
+		HtmlInput::hidden('act', 'PDF:ledger') .
+		$hid->input("type", "jrn") .
+		$hid->input("jrn_id", $Jrn->id) .
+		$hid->input("from_periode", $_GET['from_periode']) .
+		$hid->input("to_periode", $_GET['to_periode']);
+		echo $hid->input("p_simple", $_GET['p_simple']);
+		echo HtmlInput::get_to_hidden(array('ac', 'type'));
+		echo "</form></TD>";
=20
-    echo '<TD><form method=3D"GET" ACTION=3D"export.php">'.dossier::hidd=
en().
-    HtmlInput::submit('bt_csv',"Export CSV").
-      HtmlInput::hidden('act','CSV:ledger').
-    $hid->input("type","jrn").
-    $hid->input("jrn_id",$Jrn->id).
-    $hid->input("from_periode",$_GET['from_periode']).
-    $hid->input("to_periode",$_GET['to_periode']);
-    echo $hid->input("p_simple",$_GET['p_simple']);
-    echo HtmlInput::get_to_hidden(array('ac','type'));
-    echo "</form></TD>";
+		echo '<TD><form method=3D"GET" ACTION=3D"export.php">' . dossier::hidd=
en() .
+		HtmlInput::submit('bt_csv', "Export CSV") .
+		HtmlInput::hidden('act', 'CSV:ledger') .
+		$hid->input("type", "jrn") .
+		$hid->input("jrn_id", $Jrn->id) .
+		$hid->input("from_periode", $_GET['from_periode']) .
+		$hid->input("to_periode", $_GET['to_periode']);
+		echo $hid->input("p_simple", $_GET['p_simple']);
+		echo HtmlInput::get_to_hidden(array('ac', 'type'));
+		echo "</form></TD>";
+	}
 	echo '<td style=3D"vertical-align:top">';
 	echo HtmlInput::print_window();
 	echo '</td>';
-    echo "</TR>";
+	echo "</TR>";
=20
-    echo "</table>";
-    if ( count($Jrn->row ) =3D=3D 0
-            && $Row=3D=3Dnull)
-        exit;
+	echo "</table>";
+	if (count($Jrn->row) =3D=3D 0
+			&& $Row =3D=3D null)
+		exit;
=20
-    echo '<TABLE class=3D"result">';
=20
-    if ( $_GET['p_simple'] =3D=3D 0 )
-    {
-        // detailled printing
-        //---
-        foreach ( $Jrn->row as $op )
-        {
-	    $class=3D"";
-	    if ( $op['j_date'] !=3D '' )
-	      {
-		$class=3D"odd";
-	      }
+	///////////////////////////////////////////////////////////////////////=
//////////////
+	// Ecriture comptable
+	///////////////////////////////////////////////////////////////////////=
//////////////
+	if ($_GET['p_simple'] =3D=3D 0)
+	{
+		echo '<TABLE class=3D"result">';
+		// detailled printing
+		//---
+		foreach ($Jrn->row as $op)
+		{
+			$class =3D "";
+			if ($op['j_date'] !=3D '')
+			{
+				$class =3D "odd";
+			}
=20
-            echo "<TR  class=3D\"$class\">";
+			echo "<TR  class=3D\"$class\">";
=20
-            echo "<TD>".$op['j_date']."</TD>";
-            echo "<TD >".$op['jr_pj_number']."</TD>";
+			echo "<TD>" . $op['j_date'] . "</TD>";
+			echo "<TD >" . $op['jr_pj_number'] . "</TD>";
=20
=20
-            if ( $op['internal']!=3D'')
-                echo "<TD>".HtmlInput::detail_op($op['jr_id'],$op['inter=
nal'])."</TD>";
-            else
-                echo td();
+			if ($op['internal'] !=3D '')
+				echo "<TD>" . HtmlInput::detail_op($op['jr_id'], $op['internal']) . =
"</TD>";
+			else
+				echo td();
=20
-            echo "<TD >".$op['poste']."</TD>".
-            "<TD  >".$op['description']."</TD>".
-	      "<TD   style=3D\"text-align:right\">".nbm($op['deb_montant'])."</=
TD>".
-	      "<TD style=3D\"text-align:right\">".nbm($op['cred_montant'])."</T=
D>".
-            "</TR>";
-        }// end loop
-    } // if
-    else
-    {
-        // Simple printing
-        //---
+			echo "<TD >" . $op['poste'] . "</TD>" .
+			"<TD  >" . $op['description'] . "</TD>" .
+			"<TD   style=3D\"text-align:right\">" . nbm($op['deb_montant']) . "</=
TD>" .
+			"<TD style=3D\"text-align:right\">" . nbm($op['cred_montant']) . "</T=
D>" .
+			"</TR>";
+		}// end loop
+		echo "</table>";
+		// show the saldo
=20
-        echo "<TR>".
-        "<th> operation </td>".
-        "<th>Date</th>".
-        "<th> n=C2=B0 de pi=C3=A8ce </th>".
-        "<th>internal</th>".
-	  th('Tiers').
-        "<th>Commentaire</th>".
-        "<th> montant</th>".
-        "</TR>";
-        // set a filter for the FIN
+		$solde =3D $Jrn->get_solde($_GET['from_periode'], $_GET['to_periode'])=
;
+		echo "solde d&eacute;biteur:" . $solde[0] . "<br>";
+		echo "solde cr&eacute;diteur:" . $solde[1];
+	} // if
+	///////////////////////////////////////////////////////////////////////=
//////////////
+	// Liste op=C3=A9rations
+	///////////////////////////////////////////////////////////////////////=
//////////////
+	elseif ($_GET['p_simple'] =3D=3D 1)
+	{
+		// Simple printing
+		//---
+		echo '<TABLE class=3D"result">';
+		echo "<TR>" .
+		"<th> operation </td>" .
+		"<th>Date</th>" .
+		"<th> n=C2=B0 de pi=C3=A8ce </th>" .
+		"<th>internal</th>" .
+		th('Tiers') .
+		"<th>Commentaire</th>" .
+		"<th>Total op=C3=A9ration</th>" .
+		"</TR>";
+		// set a filter for the FIN
+		$i =3D 0;
+		foreach ($Row as $line)
+		{
+			$i++;
+			$class =3D ($i % 2 =3D=3D 0) ? ' class=3D"even" ' : ' class=3D"odd" '=
;
+			echo "<tr $class>";
+			echo "<TD>" . $line['num'] . "</TD>";
+			echo "<TD>" . $line['date'] . "</TD>";
+			echo "<TD>" . h($line['jr_pj_number']) . "</TD>";
+			echo "<TD>" . HtmlInput::detail_op($line['jr_id'], $line['jr_internal=
']) . "</TD>";
+			$tiers =3D $Jrn->get_tiers($line['jrn_def_type'], $line['jr_id']);
+			echo td($tiers);
+			echo "<TD>" . h($line['comment']) . "</TD>";
=20
-        foreach ($Row as $line)
-        {
-            echo "<tr>";
-            echo "<TD>".$line['num']."</TD>";
-            echo "<TD>".$line['date']."</TD>";
-            echo "<TD>".h($line['jr_pj_number'])."</TD>";
-	    echo "<TD>".HtmlInput::detail_op($line['jr_id'],$line['jr_internal'=
])."</TD>";
-	    $tiers=3D$Jrn->get_tiers($line['jrn_def_type'],$line['jr_id']);
-	    echo td($tiers);
-            echo "<TD>".h($line['comment'])."</TD>";
=20
+			//	  echo "<TD>".$line['pj']."</TD>";
+			// If the ledger is financial :
+			// the credit must be negative and written in red
+			// Get the jrn type
+			if ($line['jrn_def_type'] =3D=3D 'FIN')
+			{
+				$positive =3D $cn->get_value("select qf_amount from quant_fin where =
jr_id=3D$1", array($line['jr_id']));
+				if ($cn->count() =3D=3D 0)
+					$positive =3D 1;
+				else
+					$positive =3D ($positive > 0) ? 1 : 0;
=20
-            //	  echo "<TD>".$line['pj']."</TD>";
-            // If the ledger is financial :
-            // the credit must be negative and written in red
-            // Get the jrn type
-            if ( $line['jrn_def_type'] =3D=3D 'FIN' )
-            {
-	      $positive =3D $cn->get_value("select qf_amount from quant_fin whe=
re jr_id=3D$1",
-					       array($line['jr_id']));
-	      if ($cn->count() !=3D 0)
-		$positive =3D 1;
-	      else
-                $positive =3D ($positive > 0)?1:0;
+				echo "<TD align=3D\"right\">";
+				echo ( $positive =3D=3D 0 ) ? "<font color=3D\"red\">  - " . nbm($li=
ne['montant']) . "</font>" : nbm($line['montant']);
+				echo "</TD>";
+			}
+			else
+			{
+				echo "<TD align=3D\"right\">" . nbm($line['montant']) . "</TD>";
+			}
=20
-                echo "<TD align=3D\"right\">";
-                echo ( $positive !=3D 0 )?"<font color=3D\"red\">  - ".n=
bm($line['montant'])."</font>":nbm($line['montant']);
-                echo "</TD>";
-            }
-            else
-            {
-	      echo "<TD align=3D\"right\">".nbm($line['montant'])."</TD>";
-            }
+			echo "</tr>";
+		}
+		echo "</table>";
+	}
+	///////////////////////////////////////////////////////////////////////=
//////////////
+	// D=C3=A9taill=C3=A9
+	///////////////////////////////////////////////////////////////////////=
//////////////
+	elseif ($_GET['p_simple'] =3D=3D 2)
+	{
+		foreach ($Row as $line)
+		{
+			echo '<div style=3D"margin-top:2px;margin-bottom:10px;border:solid 1p=
x black">';
+			$class =3D ' class=3D"odd" style=3D"font-stretch: expanded;font-size:=
12px;"';
+			echo '<table class=3D"result" style=3D"font-weight: bolder;font-varia=
nt: small-caps;width:100%;">';
+			echo "<tr $class>";
+			echo '<TD style=3D"width:5%">' . $line['date'] . "</TD>";
+			echo '<TD style=3D"width:10%">' . h($line['jr_pj_number']) . "</TD>";
+			echo '<TD style=3D"width:5%">' . HtmlInput::detail_op($line['jr_id'],=
 $line['jr_internal']) . "</TD>";
+			$tiers =3D $Jrn->get_tiers($line['jrn_def_type'], $line['jr_id']);
+			$ledger_name =3D $cn->get_value("select jrn_def_name from jrn_def whe=
re jrn_def_id=3D$1", array($line['jr_def_id']));
+			echo '<TD style=3D"width:20%">' . h($ledger_name) . ' </td>';
+			echo '<TD style=3D"width:20%">' . h($tiers) . ' </td>';
+			echo '<TD style=3D"width:30%">' . h($line['comment']) . "</TD>";
+			echo '<TD style=3D"text-align:right">';
+			if ($line['jrn_def_type'] =3D=3D 'FIN')
+			{
+				$positive =3D $cn->get_value("select qf_amount from quant_fin where =
jr_id=3D$1", array($line['jr_id']));
+				if ($cn->count() =3D=3D 0)
+					$positive =3D 1;
+				else
+					$positive =3D ($positive > 0) ? 1 : 0;
=20
-            echo "</tr>";
-        }
+				echo ( $positive =3D=3D 0 ) ? "<font color=3D\"red\">  - " . nbm($li=
ne['montant']) . "</font>" : nbm($line['montant']);
+			}
+			else
+			{
+				echo  nbm($line['montant']) ;
+			}
+			echo  "</TD>";
+			echo "</tr>";
+			echo '</table>';
+			/////////////////////////////////////////////////////////////////////=
/////////////////////////////////
+			// Add detail for each operation
+			/////////////////////////////////////////////////////////////////////=
/////////////////////////////////
+			$op =3D new Acc_Operation($cn);
+			$op->jr_id =3D $line['jr_id'];
+			$op->get();
+			$obj =3D $op->get_quant();
+			switch ($obj->signature)
+			{
+				case 'FIN':
+					require 'template/operation_detail_fin.php';
+					break;
+				case 'ACH':
+					require 'template/operation_detail_ach.php';
+					break;
+				case 'VEN':
+					require 'template/operation_detail_ven.php';
+					break;
+				case 'ODS':
+					require 'template/operation_detail_misc.php';
+					break;
+				default:
+					die("unknown type of ledger");
+					break;
+			}
+			echo '</div>';
+			//echo '<div style=3D"display:block;height:15px"></div>';
+		} // end loop
+	}
=20
-    } //else
-    echo "</table>";
-    // show the saldo
-
-    $solde=3D$Jrn->get_solde( $_GET['from_periode'],
-                            $_GET['to_periode']
-                          );
-    echo "solde d&eacute;biteur:".$solde[0]."<br>";
-    echo "solde cr&eacute;diteur:".$solde[1];
-
-    echo "</div>";
-    exit;
+	echo "</div>";
+	exit;
 }
=20
 echo '</div>';

Modified: phpcompta/trunk/include/impress_poste.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_poste.inc.php	2013-05-03 21:56:40 UTC=
 (rev 5215)
+++ phpcompta/trunk/include/impress_poste.inc.php	2013-05-03 22:31:33 UTC=
 (rev 5216)
@@ -280,7 +280,7 @@
             {
                 $Poste=3Dnew Acc_Account_Ledger ($cn,$poste_id['pcm_val'=
]);
                 $Poste->load();
-                $Poste->get_row_date( $_GET['from_periode'], $_GET['to_p=
eriode']);
+                $Poste->get_row_date( $_GET['from_periode'], $_GET['to_p=
eriode'],$_GET['ople']);
                 if ( empty($Poste->row)) continue;
                 echo '<tr><td  class=3D"mtitle" style=3D"width:auto" col=
span=3D"6"><h2 class=3D"info">'. $poste_id['pcm_val'].' '.h($Poste->label=
).'</h2></td></tr>';
=20

Modified: phpcompta/trunk/include/lettering.account.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/lettering.account.inc.php	2013-05-03 21:56:40=
 UTC (rev 5215)
+++ phpcompta/trunk/include/lettering.account.inc.php	2013-05-03 22:31:33=
 UTC (rev 5216)
@@ -54,12 +54,25 @@
 list($first_per,$last_per)=3D$periode->get_limit($exercice);
=20
 $start=3Dnew IDate('start');
+if ( isset ($_GET['start']) && isDate($_GET['start']) =3D=3D null )
+{
+    echo alert(_('Date malform=C3=A9e, d=C3=A9sol=C3=A9'));
+	$_GET['start']=3D$first_per->first_day();
+
+}
 $start->value=3D(isset($_GET['start']))?$_GET['start']:$first_per->first=
_day();
+
 $r=3Dtd(_('Date d=C3=A9but'));
 $r.=3Dtd($start->input());
 echo tr($r);
=20
 $end=3Dnew IDate('end');
+if ( isset($_GET['end']) && isDate($_GET['end']) =3D=3D null )
+{
+    echo alert(_('Date malform=C3=A9e, d=C3=A9sol=C3=A9'));
+	$_GET['end']=3D$last_per->last_day();
+
+}
 $end->value=3D(isset($_GET['end']))?$_GET['end']:$last_per->last_day();
 $r=3Dtd(_('Date fin'));
 $r.=3Dtd($end->input());

Modified: phpcompta/trunk/include/lettering.card.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/lettering.card.inc.php	2013-05-03 21:56:40 UT=
C (rev 5215)
+++ phpcompta/trunk/include/lettering.card.inc.php	2013-05-03 22:31:33 UT=
C (rev 5216)
@@ -57,13 +57,28 @@
 list($first_per,$last_per)=3D$periode->get_limit($exercice);
=20
 $start=3Dnew IDate('start');
+if ( isset ($_GET['start']) && isDate($_GET['start']) =3D=3D null )
+{
+    echo alert(_('Date malform=C3=A9e, d=C3=A9sol=C3=A9'));
+	$_GET['start']=3D$first_per->first_day();
+
+}
 $start->value=3D(isset($_GET['start']))?$_GET['start']:$first_per->first=
_day();
+
+
 $r=3Dtd(_('Date d=C3=A9but'));
 $r.=3Dtd($start->input());
 echo tr($r);
=20
 $end=3Dnew IDate('end');
+if ( isset($_GET['end']) && isDate($_GET['end']) =3D=3D null )
+{
+    echo alert(_('Date malform=C3=A9e, d=C3=A9sol=C3=A9'));
+	$_GET['end']=3D$last_per->last_day();
+
+}
 $end->value=3D(isset($_GET['end']))?$_GET['end']:$last_per->last_day();
+
 $r=3Dtd(_('Date fin'));
 $r.=3Dtd($end->input());
 echo tr($r);
@@ -101,12 +116,8 @@
 // Show the result
 //----------------------------------------------------------------------=
----------
 echo '<div id=3D"list">';
-if ( isDate($_GET['start']) =3D=3D null || isDate($_GET['end']) =3D=3D n=
ull )
-{
-    echo alert(_('Date malform=C3=A9e, d=C3=A9sol=C3=A9'));
-    exit();
-}
=20
+
 $letter=3Dnew Lettering_Card($cn);
 $quick_code=3Dstrtoupper(trim($_GET['acc']));
 $letter->set_parameter('quick_code',$quick_code);

Modified: phpcompta/trunk/include/menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/menu.inc.php	2013-05-03 21:56:40 UTC (rev 521=
5)
+++ phpcompta/trunk/include/menu.inc.php	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief Show the table menu and let you add your own

Modified: phpcompta/trunk/include/modele.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/modele.inc.php	2013-05-03 21:56:40 UTC (rev 5=
215)
+++ phpcompta/trunk/include/modele.inc.php	2013-05-03 22:31:33 UTC (rev 5=
216)
@@ -20,7 +20,8 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**
+ * \file
  *
  *
  * \brief concerne only the template

Modified: phpcompta/trunk/include/opening.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/opening.inc.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/opening.inc.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -20,7 +20,7 @@
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\file
+/**\file
  * \brief The opening of the exercices. it takes the saldo of the
  * choosen foolder / exercice and import it as a misc operation in the
  * current folder

Modified: phpcompta/trunk/include/operation_ods_confirm.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_confirm.inc.php	2013-05-03 21:5=
6:40 UTC (rev 5215)
+++ phpcompta/trunk/include/operation_ods_confirm.inc.php	2013-05-03 22:3=
1:33 UTC (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief confirm ODS operation
@@ -34,7 +34,7 @@
 echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $ledger->get_name=
() . '</h2>';
 echo '</div>';
=20
-echo '<FORM METHOD=3D"POST">';
+echo '<FORM METHOD=3D"POST" class=3D"print">';
 echo HtmlInput::request_to_hidden(array('ac'));
 echo $ledger->confirm($_POST,false);
=20

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	2013-05-03 21:56:40=
 UTC (rev 5215)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2013-05-03 22:31:33=
 UTC (rev 5216)
@@ -28,7 +28,7 @@
 require_once 'class_pre_op_ods.php';
 require_once 'class_iconcerned.php';
=20
-global $g_user;
+global $g_user,$g_parameter;
 $cn=3Dnew Database(dossier::id());
=20
 $id =3D (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : -1;
@@ -59,7 +59,7 @@
 echo '</form>';
 echo '</div>';
 echo '<div id=3D"jrn_name_div">';
-echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $ledger->get_name=
() . '</h2>';
+echo '<h2 class=3D"title" id=3D"jrn_name" style=3D"display:inline">' . $=
ledger->get_name() . '</h2>';
 echo '</div>';
=20
 // Show the predef operation
@@ -107,8 +107,10 @@
=20
 echo "<script>checkTotalDirect();</script>";
=20
-echo create_script(" get_last_date()");
-
+if ($g_parameter->MY_DATE_SUGGEST=3D=3D'Y')
+{
+	echo create_script(" get_last_date()");
+}
 echo '</div>';
=20
 ?>

Modified: phpcompta/trunk/include/param_pcmn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_pcmn.inc.php	2013-05-03 21:56:40 UTC (r=
ev 5215)
+++ phpcompta/trunk/include/param_pcmn.inc.php	2013-05-03 22:31:33 UTC (r=
ev 5216)
@@ -38,7 +38,8 @@
=20
 include_once ("user_menu.php");
=20
-echo '<div id=3D"acc_update" style=3D"border:1px solid blue;width:40%;di=
splay:none;background-color:lightgrey;padding:3;position:absolute;text-al=
ign:left;line-height:3em;z-index:1">';
+echo '<div id=3D"acc_update" style=3D"border:1px solid blue;width:40%;di=
splay:none;background-color:lightgrey;padding:0;position:absolute;text-al=
ign:left;z-index:1">';
+echo HtmlInput::title_box("Poste comptable", "acc_update", "hide");
 echo '<form method=3D"post">';
 $val=3Dnew IText('p_valu');
 $parent=3Dnew IText('p_parentu');
@@ -249,11 +250,11 @@
 //echo HtmlInput::hidden('sa','detail');
 echo dossier::hidden();
 ?>
-<TABLE ALIGN=3D"center" BORDER=3D0 CELLPADDING=3D0 CELLSPACING=3D0>
+<TABLE class=3D"result">
                              <TR>
-                             <TH> Classe </TH>
+                             <TH> Poste comptable </TH>
                              <TH> Libell=C3=A9 </TH>
-                             <TH> Parent </TH>
+                             <TH> Poste comptable Parent </TH>
                              <TH> Type </TH>
                              </TR>
                              <?php
@@ -273,19 +274,21 @@
     if ( $i%2 =3D=3D 0 )
     {
         $td =3D'<TD class=3D"odd">';
+        $tr =3D'<TR class=3D"odd">';
     }
     else
     {
         $td=3D'<TD class=3D"even">';
+        $tr=3D'<TR class=3D"even">';
     }
-    echo "<TR> ";
+    echo $tr;
     echo "$td";
     echo $A['pcm_val'];
     echo '</td>';
     echo "$td";
-    printf ("<A HREF=3D\"javascript:PcmnUpdate('%s','%s','%s','%s',%d)\"=
>",
+    printf ("<A HREF=3D\"javascript:void(0)\" onclick=3D\"PcmnUpdate('%s=
','%s','%s','%s',%d)\">",
             $A['pcm_val'],
-            sql_string($A['pcm_lib']),
+			str_replace("'","\'",$A['pcm_lib']),
             $A['pcm_val_parent'],
             $A['pcm_type'],
             dossier::id());

Modified: phpcompta/trunk/include/param_sec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_sec.inc.php	2013-05-03 21:56:40 UTC (re=
v 5215)
+++ phpcompta/trunk/include/param_sec.inc.php	2013-05-03 22:31:33 UTC (re=
v 5216)
@@ -82,7 +82,7 @@
 	echo '<th>'.$header->get_header(0).'</th>';
 	echo '<th>'.$header->get_header(1).'</th>';
 	echo th('pr=C3=A9nom');
-	echo th('profile');
+	echo th('profil');
 	echo '<th>'.$header->get_header(2).'</th>';
     for ($i =3D 0;$i < $MaxUser;$i++)
     {
@@ -269,7 +269,7 @@
 	$i_profile->selected=3D$sec_User->get_profile();
=20
 	echo "<p>";
-	echo " Profile ".$i_profile->input();
+	echo _("Profil")." ".$i_profile->input();
 	echo "</p>";
     echo '<Fieldset><legend>Journaux </legend>';
     echo '<table>';

Modified: phpcompta/trunk/include/pref.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/pref.inc.php	2013-05-03 21:56:40 UTC (rev 521=
5)
+++ phpcompta/trunk/include/pref.inc.php	2013-05-03 22:31:33 UTC (rev 521=
6)
@@ -18,7 +18,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\file
+/**\file
  * \brief this file is always included and then executed
  *        it permits to change the user preferences
  * \see user_pref.php

Modified: phpcompta/trunk/include/profile.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/profile.inc.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/profile.inc.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -218,7 +218,11 @@
 				$p_type =3D 'P';
 				$me_code_dep =3D -1;
 			}
-
+			/**
+			 * Check if we don't add a menu depending on itself
+			 */
+			if ( $me_code =3D=3D $me_code_dep )
+				 throw new Exception("Un menu ne peut pas d=C3=A9pendre de lui-m=C3=AA=
me");
 			$cn->start();
 			$me_code_dep =3D ($me_code_dep =3D=3D -1) ? null : $me_code_dep;
 			$pm_default =3D (isset($pm_default)) ? 1 : 0;
@@ -244,7 +248,7 @@
 //****************************************************
 // Add a menu, module, submenu,plugin...
 //****************************************************
-if (isset($_POST['add_menu']))
+if (isset($_POST['add_menu']) || isset($_POST['add_impress']))
 {
 	extract($_POST);
 	try
@@ -276,6 +280,13 @@
 		if ($inf > 0)
 			throw new Exception("Boucle infinie");
 		/**
+		 * Check if we don't add a menu depending on itself
+		 */
+		if ( $me_code =3D=3D $me_code_dep )
+			 throw new Exception("Un menu ne peut pas d=C3=A9pendre de lui-m=C3=AA=
me");
+
+
+		/**
 		 * if me_code_dep =3D=3D -1, it means it is null
 		 */
 		$me_code_dep =3D ($me_code_dep =3D=3D -1) ? null : $me_code_dep;

Modified: phpcompta/trunk/include/search.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/search.inc.php	2013-05-03 21:56:40 UTC (rev 5=
215)
+++ phpcompta/trunk/include/search.inc.php	2013-05-03 22:31:33 UTC (rev 5=
216)
@@ -90,7 +90,7 @@
 {
=20
     // Navigation bar
-    $step=3D25;
+    $step=3DMAX_RECONCILE;
     $page=3D(isset($_GET['offset']))?$_GET['page']:1;
     $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
     if (count ($_GET) =3D=3D 0)

Modified: phpcompta/trunk/include/template/action_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/action_search.php	2013-05-03 21:56:4=
0 UTC (rev 5215)
+++ phpcompta/trunk/include/template/action_search.php	2013-05-03 22:31:3=
3 UTC (rev 5216)
@@ -59,6 +59,10 @@
 					<?=3D$remind_date_end->input();?>
 				</td>
 			<tr>
+			<tr>
+				<td style=3D"width:180px;text-align:right"> Affiche aussi les action=
s ferm=C3=A9es</td>
+				<td><?=3D$closed_action->input();?></td>
+			</tr>
 			<td style=3D"width:180px;text-align:right"> R=C3=A9f=C3=A9rence</td>
 				<td>
 					<?=3D$osag_ref->input();?>
@@ -75,7 +79,7 @@
 				<td ><?=3D $w->input() . $w->search()?><span id=3D"<?=3D$label?>"></=
span></td>
 			<tr>
 			<tr>
-				<td style=3D"text-align:right" ><?=3D _("Profile")?></td>
+				<td style=3D"text-align:right" ><?=3D _("Profil")?></td>
 				<td><?=3D $str_ag_dest?></td>
 			</tr>
 			<tr>

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-05-03 21:56:40 UT=
C (rev 5215)
+++ phpcompta/trunk/include/template/dashboard.php	2013-05-03 22:31:33 UT=
C (rev 5216)
@@ -1,4 +1,4 @@
-<div style=3D"float:left;width: 45%">
+<div style=3D"float:left;width: 49%">
 <fieldset >
 <legend><?=3D_('Calendrier')?>
 </legend>
@@ -24,7 +24,7 @@
 $array=3D$todo->load_all();
 ?>
=20
-<div style=3D"float:right;width: 45%">
+<div style=3D"float:right;width: 49%">
 <fieldset> <legend><?=3D_('Pense-B=C3=AAte')?></legend>
=20
 <?php
@@ -58,7 +58,7 @@
 </fieldset>
 </div>
 <div style=3D"float:left;clear:both"></div>
-<div style=3D"float:right;width: 45%">
+<div style=3D"float:right;width: 49%">
 <? if (count($last_operation)> 0) : ?>
 	<fieldset>
 	<legend><?=3D_('Action pour aujourd\'hui')?>
@@ -68,6 +68,7 @@
 	for($i=3D0;$i<count($last_operation);$i++):
 	?>
 	<li>
+		<?=3DHtmlInput::detail_action($last_operation[$i]['ag_id'],h($last_ope=
ration[$i]['ag_ref']))?>
 	<span>
 	<?=3Dsmaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
 	</span>
@@ -75,7 +76,7 @@
 			<?=3Dh($last_operation[$i]['vw_name'])?>
 		</span>
 	<span>
-	<?=3Dh(mb_substr($last_operation[$i]['ag_title'],0,60,'UTF-8'))?>
+	<?=3Dh(mb_substr($last_operation[$i]['ag_title'],0,50,'UTF-8'))?>
 	</span>
 	<span style=3D"font-style: italic">
 	<?=3D$last_operation[$i]['dt_value']?>
@@ -95,6 +96,7 @@
 	for($i=3D0;$i<count($late_operation);$i++):
 	?>
 	<li>
+		<?=3DHtmlInput::detail_action($late_operation[$i]['ag_id'],h($late_ope=
ration[$i]['ag_ref']))?>
 	<span>
 	<?=3Dsmaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
 	</span>
@@ -102,7 +104,7 @@
 			<?=3Dh($late_operation[$i]['vw_name'])?>
 		</span>
 	<span>
-	<?=3Dh(mb_substr($late_operation[$i]['ag_title'],0,60,'UTF-8'))?>
+	<?=3Dh(mb_substr($late_operation[$i]['ag_title'],0,50,'UTF-8'))?>
 	</span>
 	<span style=3D"font-style: italic">
 	<?=3D$late_operation[$i]['dt_value']?>
@@ -113,7 +115,7 @@
 	</fieldset>
 <? endif; ?>
 </div>
-	<div style=3D"float:left;width: 45%">
+	<div style=3D"float:left;width: 49%">
 <?php
 /*
  * Mini Report
@@ -161,7 +163,7 @@
 ?>
 </div>
=20
-<div style=3D"float:right;width: 45%">
+<div style=3D"float:right;width: 49%">
 <fieldset>
 <legend><?=3D_('Derni=C3=A8res op=C3=A9rations')?>
 </legend>

Modified: phpcompta/trunk/include/template/detail-action.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/detail-action.php	2013-05-03 21:56:4=
0 UTC (rev 5215)
+++ phpcompta/trunk/include/template/detail-action.php	2013-05-03 22:31:3=
3 UTC (rev 5216)
@@ -132,7 +132,7 @@
 </div>
 <div style=3D"float:right;clear:both"></div>
 	<div style=3D"float:left;width:45%">
-		<h4 style=3D"display:inline">Op=C3=A9rations</h4>
+		<h4 style=3D"display:inline">Op=C3=A9rations concern=C3=A9es</h4>
 		<ol>
=20
 		<?
@@ -156,7 +156,7 @@
=20
 		?>
 		</ol>
-		<? if ($p_view !=3D 'READ') echo $iconcerned->input()?>
+		<? if ($p_view !=3D 'READ')   echo '<span class=3D"noprint">'.$iconcer=
ned->input().'</span>';?>
 	</div>
=20
 	<div style=3D"float:left;width:45%">
@@ -187,13 +187,13 @@
=20
 		?>
 		</ol>
-		<? if ( $p_view !=3D 'READ') echo $iaction->input()?>
+		<? if ( $p_view !=3D 'READ') echo '<span class=3D"noprint">'.$iaction-=
>input().'</span>';?>
 	</div>
 </fieldset>
-<fieldset>
-  <legend>
+<div style=3D"margin-left:15px;margin-right: 15px">
+  <h1 class=3D"legend">
 	    <?=3D_('Description')?>
-  </legend>
+  </h1>
   <p>
 <script language=3D"javascript">
    function enlarge(p_id_textarea){
@@ -228,39 +228,64 @@
 						dossier::id(),
 						$acomment[$c]['agc_id']);
 				$js=3D '<a class=3D"mtitle" style=3D"color:orange" id=3D"accom'.$aco=
mment[$c]['agc_id'].'" href=3D"'.$rmComment.'">Effacer</a>';
-		echo 'n=C2=B0'.$acomment[$c]['agc_id'].'('.h($acomment[$c]['tech_user'=
])." ".smaller_date($acomment[$c]['str_agc_date']).')'.$js.
+		echo 'n=C2=B0'.$acomment[$c]['agc_id'].'('.h($acomment[$c]['tech_user'=
])." ".$acomment[$c]['str_agc_date'].')'.$js.
 				'<pre style=3D"white-space: -moz-pre-wrap;white-space: pre-wrap;bord=
er:1px solid blue;width:70%;" id=3D"com'.$acomment[$c]['agc_id'].'"> '.
 				" ".h($acomment[$c]['agc_comment']).'</pre>'
 				;
 	}
 	else
 	{
-		echo 'n=C2=B0'.$acomment[$c]['agc_id'].'('.h($acomment[$c]['tech_user'=
])." ".smaller_date($acomment[$c]['str_agc_date']).')'.
+		echo 'n=C2=B0'.$acomment[$c]['agc_id'].'('.h($acomment[$c]['tech_user'=
])." ".$acomment[$c]['str_agc_date'].')'.
 				'<pre style=3D"white-space: -moz-pre-wrap;white-space: pre-wrap;bord=
er:1px solid blue;width:70%;" id=3D"com'.$acomment[$c]['agc_id'].'"> '.
 				" ".h($acomment[$c]['agc_comment']).'</pre>'
 				;
=20
 	}
 }
+echo '<span class=3D"noprint">';
 echo $desc->input();
+echo '</span>';
 ?>
 <? if ($p_view !=3D "READ" ): ?>
+<p class=3D"noprint">
 <input type=3D"button" id=3D"bt_enlarge" <?=3D$style_enl?> value=3D"+" o=
nclick=3D"enlarge('ag_comment');return false;">
 <input type=3D"button" id=3D"bt_small"  <?=3D$style_small?> value=3D"-" =
style=3D"display:none" onclick=3D"small('ag_comment');return false;">
+</p>
 <? endif; ?>
   </div>
-</fieldset>
-<input type=3D'button' class=3D"button" value=3D'Montrer articles' id=3D=
"toggleButton" onclick=3D'toggleShowDetail()'>
+</div>
+<? if ( $p_base !=3D 'ajax' ) :?>
+<input type=3D'button' class=3D"button" class=3D"noprint" value=3D'Montr=
er articles' id=3D"toggleButton" onclick=3D'toggleShowDetail()'>
+<? endif; ?>
+<?
+/**
+ * check if there card to show,
+ */
+$show_row=3D0;
+for ($i=3D0;$i<count($aArticle);$i++) :
+	if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ=
'){ $show_row=3D1;break;}
+endfor;
+?>
+<?
+/*
+ * display detail if there card or if we are in UPDATE or NEW mode
+ */
+if ($show_row !=3D0 ) :
+
+	?>
 <fieldset id=3D"fldDetail" style=3D'display:block'>
    <LEGEND> <?=3D_('D=C3=A9tail des articles')?>
 </LEGEND>
 <?php // hidden fields
+$show_row=3D0;
 for ($i=3D0;$i<count($aArticle);$i++) :
 	echo $aArticle[$i]['ad_id'];
 	echo $aArticle[$i]['hidden_tva'];
 	echo $aArticle[$i]['hidden_htva'];
+	if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ=
'){ $show_row=3D1;}
 endfor;
 ?>
+
 <table id=3D"art" >
 <tr>
   <th><?=3D_('Fiche')?></th>
@@ -272,8 +297,11 @@
 <th><?=3D_('Montant TVAC')?></th>
=20
 </tr>
-
 <?for ($i=3D0;$i<count($aArticle);$i++): ?>
+<?
+if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ'=
):
+	$show_row++;
+	?>
 <TR>
 <TD><?php echo $aArticle[$i]['fid'] ?></TD>
 <TD><?php echo $aArticle[$i]['desc'] ?></TD>
@@ -282,10 +310,11 @@
 <TD class=3D"num"><?php echo $aArticle[$i]['tvaid'] ?></TD>
 <TD class=3D"num"><?php echo $aArticle[$i]['tva'] ?></TD>
 <TD class=3D"num"><?php echo $aArticle[$i]['tvac'] ?></TD>
-
 </TR>
+<? endif; ?>
 <?php endfor; ?>
 </table>
+
 <script language=3D"JavaScript">
 if ( $('e_march0') && $('e_march0').value =3D=3D'') { toggleShowDetail()=
;}
 function toggleShowDetail() {
@@ -297,6 +326,7 @@
 	}
=20
 </script>
+<? if ( $show_row !=3D 0 ): ?>
 <div style=3D"float: left; text-align: right; padding-right: 5px; font-s=
ize: 1.2em; font-weight: bold; color: blue;">
   <input name=3D"act" id=3D"act" class=3D"button" value=3D"<?=3D_('Actua=
liser')?>" onclick=3D"compute_all_ledger();" type=3D"button">
=20
@@ -312,11 +342,12 @@
     <br>Total TVAC
  </div>
 </div>
-
+<? endif; ?>
 </fieldset>
+<?endif; ?>
=20
 <? if ($p_view !=3D 'READ' && $str_select_doc !=3D '') : ?>
-<fieldset >
+<fieldset class=3D"noprint" >
   <legend>
      <?=3D_('Document =C3=A0 g=C3=A9n=C3=A9rer')?>
   </legend>
@@ -331,11 +362,13 @@
   <legend>
      <?=3D_('Pi=C3=A8ces attach=C3=A9es')?>
   </legend>
+  <div class=3D"print">
+  <ol>
   <?php
 for ($i=3D0;$i<sizeof($aAttachedFile);$i++) :
   ?>
-  <p>
-    <A class=3D"mtitle" id=3D"<?php echo "doc".$aAttachedFile[$i]['d_id'=
];?>" href=3D"<?php echo $aAttachedFile[$i]['link']?>"><?php echo $aAttac=
hedFile[$i]['d_filename'];?>
+
+	  <li> <A class=3D"print" style=3D"display:inline" id=3D"<?php echo "do=
c".$aAttachedFile[$i]['d_id'];?>" href=3D"<?php echo $aAttachedFile[$i]['=
link']?>"><?php echo $aAttachedFile[$i]['d_filename'];?>
     </A>
 <?php $rmDoc=3Dsprintf("javascript:if ( confirm('"._('Voulez-vous efface=
r le document')." %s')=3D=3Dtrue ) {remove_document('%s','%s');}",
 	$aAttachedFile[$i]['d_filename'],
@@ -343,10 +376,12 @@
 	$aAttachedFile[$i]['d_id']);
     ?>
   <? if ($p_view !=3D 'READ') : ?>  <a class=3D"mtitle" style=3D"color:o=
range" id=3D"<?php echo "ac".$aAttachedFile[$i]['d_id'];?>" href=3D"<?php=
 echo $rmDoc;?>">Effacer</a><? endif;?>
-  </p>
+  </li>
   <?php
 endfor;
   ?>
+  </ol>
+  </div>
   <script language=3D"javascript">
 function addFiles() {
 try {
@@ -358,17 +393,19 @@
 catch(exception) { alert('<?=3Dj(_('Je ne peux pas ajouter de fichier'))=
?>'); alert(exception.message);}
 }
 </script>
-  <p >
-     <h3>Fichiers =C3=A0 ajouter: </h3>
-    <ol id=3D'add_file' >
+<? if ($p_view !=3D 'READ') : ?>
+  <div class=3D"noprint">
+     <h3 >Fichiers =C3=A0 ajouter: </h3>
+    <ol id=3D'add_file'  >
       <li>
         <?php echo $upload->input();
         ?>
       </li>
     </ol>
-  <span >
-<? if ($p_view !=3D 'READ') : ?> <input type=3D"button" class=3D"button"=
 onclick=3D"addFiles();" value=3D"Ajouter un fichier"> <? endif;?>
+  <span   >
+ <input type=3D"button" class=3D"button" onclick=3D"addFiles();" value=3D=
"Ajouter un fichier">
   </span>
-  </p>
+  </div>
+ <? endif;?>
 </fieldset>
 <script>compute_all_ledger()</script>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/document_mod_change.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/document_mod_change.php	2013-05-03 2=
1:56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/document_mod_change.php	2013-05-03 2=
2:31:33 UTC (rev 5216)
@@ -18,7 +18,7 @@
  */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief this file respond to an ajax request to modify a type of docum=
ent
  */
 require_once 'class_document_type.php';

Modified: phpcompta/trunk/include/template/fiche_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/fiche_list.php	2013-05-03 21:56:40 U=
TC (rev 5215)
+++ phpcompta/trunk/include/template/fiche_list.php	2013-05-03 22:31:33 U=
TC (rev 5216)
@@ -28,7 +28,7 @@
 ?>
 <?=3D $bar?>
 <form method=3D"POST" class=3D"print" style=3D"display:inline" onsubmit=3D=
"return confirm('Vous confirmez ?')">
-	<table>
+	<table class=3D"result">
 		<tr>
 			<th>
 				Quick Code
@@ -37,13 +37,19 @@
 				Nom
=20
 			</th>
+			<? if ($allcard =3D=3D 1 ) : ?>
 			<th>
+				Cat=C3=A9gorie
+			</th>
+			<? endif; ?>
+			<th>
 				Selection
 			</th>
 		</tr>
 		<? for ($i =3D 0; $i < $nb_line; $i++) :?>
 			<? $row =3D Database::fetch_array($res, $i);?>
-			<tr>
+			<? $class=3D($i%2 =3D=3D 0)?' class=3D"even" ':' class=3D"odd" ';?>
+			<tr <?=3D$class?> >
 				<td>
 					<?=3D HtmlInput::card_detail($row['qcode'], "", ' class=3D"line" ')=
?>
=20
@@ -51,7 +57,12 @@
 				<td>
 					<?=3D h($row['name'])?>
 				</td>
+				<? if ($allcard =3D=3D 1 ) : ?>
 				<td>
+					<?=3D h($row['fd_label'])?>
+				</td>
+				<? endif; ?>
+				<td>
 					<?
 					if ($write =3D=3D 1)
 					{
@@ -65,6 +76,7 @@
=20
=20
 	</table>
+	<?=3D$str_add_card?>
 <?=3DHtmlInput::hidden('action',"1");?>
 <?=3DHtmlInput::submit('delete','Effacer la s=C3=A9lection ')?>
 <? if ( $allcard =3D=3D  0  ): ?>
@@ -74,7 +86,6 @@
 $iselect->value=3D$cn->make_array("select fd_id,fd_label from fiche_def =
order by 2");
 echo $iselect->input();
 ?>
-   =20
+
 <? endif ; ?>
-</form>
-<?=3D $bar?>
\ No newline at end of file
+</form>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/form_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_detail.php	2013-05-03 21=
:56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/form_ledger_detail.php	2013-05-03 22=
:31:33 UTC (rev 5216)
@@ -5,7 +5,7 @@
 <legend><?=3D$f_legend ?>
 </legend>
 	<div id=3D"jrn_name_div">
-	<h2 id=3D"jrn_name"> <?=3D$this->get_name()?></h2>
+	<h2 class=3D"title" id=3D"jrn_name"> <?=3D$this->get_name()?></h2>
 </div>
       <?=3D_('Date').':'?> <?=3D$f_date ?> <?=3D_('Echeance')?> : <?=3D$=
f_echeance?>
 <?=3D$f_periode?><br>
@@ -22,13 +22,17 @@
 <tr>
 <th style=3D"width:auto"colspan=3D"2">Code <?=3DHtmlInput::infobulle(0)?=
></th>
       <th><?=3D_('D=C3=A9nomination')?></th>
+<? if ($flag_tva =3D=3D'Y') : ?>
       <th><?=3D_('prix/unit=C3=A9 htva')?><?=3DHtmlInput::infobulle(6)?>=
</th>
       <th><?=3D_('quantit=C3=A9')?></th>
       <th><?=3D_('Total HTVA')?></th>
-<? if ($flag_tva =3D=3D'Y') : ?>
- <th><?=3D_('tva')?></th>
- <th><?=3D_('tot.tva')?></th>
-<th><?=3D_('tvac')?></th>
+	  <th><?=3D_('tva')?></th>
+      <th><?=3D_('tot.tva')?></th>
+      <th><?=3D_('tvac')?></th>
+<? else: ?>
+	  <th><?=3D_('prix/unit=C3=A9 ')?><?=3DHtmlInput::infobulle(6)?></th>
+      <th><?=3D_('quantit=C3=A9')?></th>
+      <th><?=3D_('Total ')?></th>
 <? endif;?>
=20
=20

Modified: phpcompta/trunk/include/template/form_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_fin.php	2013-05-03 21:56=
:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/form_ledger_fin.php	2013-05-03 22:31=
:33 UTC (rev 5216)
@@ -1,6 +1,6 @@
 <fieldset>
 	<div id=3D"jrn_name_div">
-	<h2 id=3D"jrn_name"> <?=3D$this->get_name()?></h2>
+	<h2 class=3D"title" id=3D"jrn_name"> <?=3D$this->get_name()?></h2>
 </div>
 <legend><?=3D$f_legend ?> </legend>
 <?

Modified: phpcompta/trunk/include/template/history_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/history_top.php	2013-05-03 21:56:40 =
UTC (rev 5215)
+++ phpcompta/trunk/include/template/history_top.php	2013-05-03 22:31:33 =
UTC (rev 5216)
@@ -4,7 +4,7 @@
    {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3Dde&ajax=3D$callback";
-     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'toolbar=3D0,width=3D600,h=
eight=3D400,scrollbars=3Dyes,resizable=3Dyes,status=3D0,location=3D0\'); =
a.focus();removeDiv(\''.$div.'\')">
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'fullscreen=3Dyes,location=
=3Dno,toolbar=3Dno,scrollbars=3Dyes,resizable=3Dyes,status=3Dno,location=3D=
no\'); a.focus();removeDiv(\''.$div.'\')">
 !pop me out ! </A>';
 echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"removeD=
iv(\''.$div.'\');">Fermer</A>';
 }

Modified: phpcompta/trunk/include/template/ledger_detail_ach.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_ach.php	2013-05-03 21:=
56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php	2013-05-03 22:=
31:33 UTC (rev 5216)
@@ -97,8 +97,8 @@
 				</tr>
=20
 </table>
-
-<fieldset><legend><?=3D_('D=C3=A9tail')?></legend>
+<div class=3D"myfieldset">
+	<h1 class=3D"legend"><?=3D_('D=C3=A9tail')?></h1>
 <table class=3D"result">
 <?
   bcscale(2);
@@ -161,7 +161,8 @@
     }
     $row.=3Dtd($input->input().$hidden);
     $row.=3Dtd($sym_tva,'style=3D"text-align:center"');
-	$pu=3Dbcdiv($q['qp_price'],$q['qp_quantite']);
+	$pu=3D0;
+	if ( $q['qp_quantite'] !=3D 0 ) $pu=3Dbcdiv($q['qp_price'],$q['qp_quant=
ite']);
     $row.=3Dtd(nbm($pu),'class=3D"num"');
     $row.=3Dtd(nbm($q['qp_quantite']),'class=3D"num"');
=20
@@ -178,10 +179,15 @@
=20
     if ($owner->MY_TVA_USE=3D=3D'Y')
       {
-	$tva_amount=3Dbcadd($q['qp_vat'],$q['qp_nd_tva']);
-	$tva_amount=3Dbcadd($tva_amount,$q['qp_nd_tva_recup']);
-	$row.=3Dtd(nbm($tva_amount),'class=3D"num"');
-	$row.=3Dtd(nbm($tvac),'class=3D"num"');
+		$tva_amount=3Dbcadd($q['qp_vat'],$q['qp_nd_tva']);
+		$tva_amount=3Dbcadd($tva_amount,$q['qp_nd_tva_recup']);
+		$class=3D"";
+		if ($q['qp_vat_sided']<>0) {
+			$class=3D' style=3D"text-decoration:line-through"';
+			$tvac=3Dbcsub($tvac,$q['qp_vat']);
+		}
+		$row.=3Dtd(nbm($tva_amount),'class=3D"num" '.$class);
+		$row.=3Dtd(nbm($tvac),'class=3D"num"');
       }
     $total_tvac+=3D$tvac;
     $total_htva+=3D$htva;
@@ -205,9 +211,9 @@
=20
   }
   if ($owner->MY_TVA_USE=3D=3D'Y')
-	  $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;f=
ont-weight: bolder;widtg:auto" colspan=3D"6"');
+	  $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;f=
ont-weight: bolder;width:auto" colspan=3D"6"');
   else
-	  $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;f=
ont-weight: bolder;widtg:auto" colspan=3D"6"');
+	  $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;f=
ont-weight: bolder;width:auto" colspan=3D"6"');
 $row.=3Dtd(nbm($total_htva),'class=3D"num" style=3D"font-style:italic;fo=
nt-weight: bolder;"');
 if ($owner->MY_TVA_USE=3D=3D'Y')
   $row.=3Dtd("").td(nbm($total_tvac),'class=3D"num" style=3D"font-style:=
italic;font-weight: bolder;"');
@@ -216,12 +222,11 @@
 </table>
=20
=20
-</fieldset>
-<fieldset>
-<legend>
-<?=3D_('Ecritures comptables')?>
-</legend>
+</div>
+	<div class=3D"myfieldset">
+	<h1 class=3D"legend"><?=3D_('Ecritures comptables')?></h1>
=20
+
 <?
   /* if it is not in a popup, the details are hidden */
   if ( $div !=3D 'popup') {
@@ -284,7 +289,7 @@
 ?>
 </table>
 </div>
-</fieldset>
+</div>
=20
 <?
 require_once('ledger_detail_bottom.php');

Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_bottom.php	2013-05-03 =
21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/ledger_detail_bottom.php	2013-05-03 =
22:31:33 UTC (rev 5216)
@@ -1,7 +1,8 @@
-<fieldset>
-<legend>
+<div class=3D"myfieldset">
+
+<h1 class=3D"legend">
 <? echo _('Rapprochement');?>
-</legend>
+</h1>
 <?
 $oRap=3Dnew Acc_Reconciliation($cn);
 $oRap->jr_id=3D$jr_id;
@@ -36,17 +37,45 @@
   echo '</table>';
 }
 ?>
-</legend>
 <?
 if ( $access=3D=3D'W') {
      $wConcerned=3Dnew IConcerned("rapt".$div);
      $wConcerned->amount_id=3D$obj->det->jr_montant;
-    echo $wConcerned->input();   =20
-   =20
+    echo $wConcerned->input();
+
 }
+?>
+</div>
+<?
+$array =3D Follow_Up::get_all_operation($jr_id);
+if (count($array) > 0)
+{
+	?>
+	<div class=3D"myfieldset">
+		<h1 class=3D"legend">Actions li=C3=A9es</h1>
+	<?
+	/**
+	 * show eventually action
+	 */
+	$array =3D Follow_Up::get_all_operation($jr_id);
+	echo '<ul style=3D"list-style-type:square;">';
+	for ($i =3D 0; $i < count($array); $i++)
+	{
+		if ( $div =3D=3D 'popup')
+		{
+			echo '<li>'.HtmlInput::detail_action($array[$i]['ag_id'], h($array[$i=
]['ag_ref']." ".$array[$i]['ag_title']),0).'</li>';
+		}
+		else
+		{
+			echo '<li>'.HtmlInput::detail_action($array[$i]['ag_id'], h($array[$i=
]['ag_ref']." ".$array[$i]['ag_title']),1).'</li>';
+		}
+	}
+	echo '</ul>';
=20
+	echo '</div>';
+}
 ?>
-</fieldset>
+
 <?
=20
 require_once('template/ledger_detail_file.php');
@@ -62,7 +91,12 @@
 }
=20
 ?>
-<?if ( $access=3D=3D'W') {
+<?
+
+/**
+ * if you can write
+ */
+  if ( $access=3D=3D'W') {
   echo HtmlInput::submit('save',_('Sauver'),'onClick=3D"return verify_ca=
(\'popup\');"');
   $owner=3Dnew Own($cn);
   if ($owner->MY_ANALYTIC !=3D 'nu' && $div=3D=3D'popup'){

Modified: phpcompta/trunk/include/template/ledger_detail_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_fin.php	2013-05-03 21:=
56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/ledger_detail_fin.php	2013-05-03 22:=
31:33 UTC (rev 5216)
@@ -88,14 +88,14 @@
 </table>
=20
 </td>
-<fieldset>
-<legend>
+<div class=3D"myfieldset">
+	<h1 class=3D"legend">
 <?=3D_('D=C3=A9tail')?>
 <?
   $detail=3Dnew Acc_Misc($cn,$obj->jr_id);
 $detail->get();
 ?>
-</legend>
+</h1>
 <table class=3D"result">
 <tr>
 <?
@@ -168,7 +168,7 @@
   }
 ?>
 </table>
-</fieldset>
+</div>
 <?
 require_once('ledger_detail_bottom.php');
 ?>

Modified: phpcompta/trunk/include/template/ledger_detail_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_misc.php	2013-05-03 21=
:56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/ledger_detail_misc.php	2013-05-03 22=
:31:33 UTC (rev 5216)
@@ -72,14 +72,12 @@
 </tr>
 </table>
=20
-<fieldset>
-<legend>
-<?=3D_('D=C3=A9tail')?>
+<div class=3D"myfieldset">
+	<h1 class=3D"legend"><?=3D_('D=C3=A9tail')?></h1>
 <?
   require_once('class_own.php');
   $owner=3Dnew Own($cn);
 ?>
-</legend>
 <table class=3D"result">
 <tr>
 <?
@@ -152,7 +150,7 @@
     /* Analytic accountancy */
     if ( $owner->MY_ANALYTIC !=3D "nu" && $div=3D=3D'popup'){
       if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) {
-=09
+
 	echo HtmlInput::hidden("amount_t".$amount_idx,$q[$e]['j_montant']);
 	$anc_op=3Dnew Anc_Operation($cn);
 	$anc_op->j_id=3D$q[$e]['j_id'];
@@ -168,8 +166,7 @@
   }
 ?>
 </table>
-</fieldset>
-
+</div>
 <?
 require_once('ledger_detail_bottom.php');
 ?>

Modified: phpcompta/trunk/include/template/ledger_detail_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_top.php	2013-05-03 21:=
56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/ledger_detail_top.php	2013-05-03 22:=
31:33 UTC (rev 5216)
@@ -3,7 +3,7 @@
    if ($div !=3D "popup") {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3D$action&ajax=3D$callback";
-     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'toolbar=3D0,width=3D600,h=
eight=3D400,scrollbars=3Dyes,resizable=3Dyes,status=3D0,location=3D0\'); =
a.focus();removeDiv(\''.$div.'\')">
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'location=3Dno,toolbar=3Dn=
o,fullscreen=3Dyes,scrollbars=3Dyes,resizable=3Dyes,status=3Dno\'); a.foc=
us();removeDiv(\''.$div.'\')">
 !pop me out ! </A>';
      echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"re=
moveDiv(\''.$div.'\');">Fermer</A>';
    }

Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_ven.php	2013-05-03 21:=
56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php	2013-05-03 22:=
31:33 UTC (rev 5216)
@@ -97,8 +97,10 @@
 </td>
 </tr>
 </table>
-
-<fieldset><legend><?=3D_('D=C3=A9tail')?></legend>
+<div class=3D"myfieldset">
+	<h1 class=3D"legend">
+<?=3D_('D=C3=A9tail')?>
+	</h1>
 <table class=3D"result">
 <?
   bcscale(2);
@@ -152,7 +154,8 @@
=20
     $row.=3Dtd($input->input().$hidden);
     $sym_tva=3D'';
-	$pu=3Dbcdiv($q['qs_price'],$q['qs_quantite']);
+	$pu=3D0;
+	if ($q['qs_quantite'] !=3D 0)	$pu=3Dbcdiv($q['qs_price'],$q['qs_quantit=
e']);
     $row.=3Dtd(nbm($pu),'class=3D"num"');
     $row.=3Dtd(nbm($q['qs_quantite']),'class=3D"num"');
 	$sym_tva=3D'';
@@ -172,8 +175,13 @@
     $tvac=3Dbcadd($htva,$q['qs_vat']);
     if ($owner->MY_TVA_USE=3D=3D'Y')
       {
-	$row.=3Dtd(nbm($q['qs_vat']),'class=3D"num"');
-	$row.=3Dtd(nbm($tvac),'class=3D"num"');
+		$class=3D"";
+		if ($q['qs_vat_sided'] !=3D 0) {
+			$class=3D' style=3D"text-decoration:line-through"';
+			$tvac=3Dbcsub($tvac,$q['qs_vat']);
+		}
+		$row.=3Dtd(nbm($q['qs_vat']),'class=3D"num"'.$class);
+		$row.=3Dtd(nbm($tvac),'class=3D"num"');
       }
     $total_tvac=3Dbcadd($total_tvac,$tvac);
     $total_htva=3Dbcadd($total_htva,$htva);
@@ -212,13 +220,12 @@
 </td>
 </tr>
 </table>
-
-</fieldset>
-<fieldset>
-<legend>
+</div>
+<div class=3D"myfieldset">
+	<h1 class=3D"legend">
 <?=3D_('Ecritures comptables')?>
-</legend>
-<?
+	</h1>
+	<?
   /* if it is not in a popup, the details are hidden */
   if ( $div !=3D 'popup') {
     $ib=3Dnew IButton ("a".$div);
@@ -281,7 +288,7 @@
 ?>
 </table>
 </div>
-</fieldset>
+</div>
 <?
 require_once('ledger_detail_bottom.php');
 ?>

Modified: phpcompta/trunk/include/template/letter_all.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/letter_all.php	2013-05-03 21:56:40 U=
TC (rev 5215)
+++ phpcompta/trunk/include/template/letter_all.php	2013-05-03 22:31:33 U=
TC (rev 5216)
@@ -11,7 +11,7 @@
=20
 <?      exit();
 endif;?>
-<table class=3D"result">
+  <table class=3D"result">
 <tr>
 <th>
    <?=3D_('Lettrage')?>
@@ -28,14 +28,14 @@
 <th>
    <?=3D_('Description')?>
 </th>
-<th>
-   <?=3D_('Montant')?>
+<th style=3D"text-align:right">
+   <?=3D_('D=C3=A9bit')?>
 </th>
-<th>
-   <?=3D_('Debit / Credit')?>
+<th style=3D"text-align:right">
+   <?=3D_('Cr=C3=A9dit')?>
 </th>
-<th>
-  <?=3D_('Op. concern=C3=A9')?>
+<th style=3D"text-align:center">
+  <?=3D_('Op. concern=C3=A9e')?>
 </th>
 </tr>
=20
@@ -47,14 +47,14 @@
   <tr <? echo "class=3D\"$class\""; ?> >
 <td>
 <?php
-$letter=3D($this->content[$i]['letter']=3D=3D-1)?"x":$this->content[$i][=
'letter'];
+$letter=3D($this->content[$i]['letter']=3D=3D-1)?" aucun lettrage ":strt=
oupper(base_convert($this->content[$i]['letter'],10,36));
 $js=3D"this.gDossier=3D".dossier::id().
   ";this.j_id=3D".$this->content[$i]['j_id'].
   ";this.obj_type=3D'".$this->object_type."'".
   ";dsp_letter(this)";
=20
 ?>
-<A class=3D"detail" href=3D"javascript:<?=3D$js?>"><?=3D$letter?>
+<A class=3D"detail" style=3D"text-decoration: underline" href=3D"javascr=
ipt:<?=3D$js?>"><?=3D$letter?>
 <? if ( $this->content[$i]['letter_diff'] !=3D 0) echo $g_failed;	?>
 	</A>
 </td>
@@ -67,9 +67,14 @@
 ?>
   <td> <?=3D$r?> </td>
   <td> <?=3Dh($this->content[$i]['jr_comment'])?> </td>
+  <? if ($this->content[$i]['j_debit']=3D=3D't') : ?>
   <td style=3D"text-align:right"> <?=3Dnb($this->content[$i]['j_montant'=
])?> </td>
-<td> <?=3D($this->content[$i]['j_debit']=3D=3D't')?'D':'C'?> </td>
-<td>
+  <td></td>
+  <? else : ?>
+  <td></td>
+  <td style=3D"text-align:right"> <?=3Dnb($this->content[$i]['j_montant'=
])?> </td>
+  <? endif ?>
+<td style=3D"text-align:center">
 <?php
     // Rapprochement
     $rec=3Dnew Acc_Reconciliation($this->db);
@@ -97,14 +102,14 @@
     endfor;
 ?>
 </table>
-<h2 class=3D"info2" style=3D"margin:0 0"> Solde d=C3=A9bit  : <?=3Dnb($a=
mount_deb);?>
-<h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9dit : <?=3Dnb($=
amount_cred);?>
+<h2 class=3D"info2" style=3D"margin:0 0"> Solde d=C3=A9bit  : <?=3Dnb($a=
mount_deb);?></h2>
+<h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9dit : <?=3Dnb($=
amount_cred);?></h2>
   <?
 bcscale(2);
   $solde=3Dbcsub($amount_deb,$amount_cred);
 if ( $solde > 0 ) :
 ?>
-  <h2 class=3D"info2"  style=3D"margin:0 0"> Solde d=C3=A9biteur       :=
 <?=3Dnb($solde)?>
+  <h2 class=3D"info2"  style=3D"margin:0 0"> Solde d=C3=A9biteur       :=
 <?=3Dnb($solde)?></h2>
 <? else : ?>
-     <h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9diteur    =
   : <?=3Dnb(abs($solde))?>
+     <h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9diteur    =
   : <?=3Dnb(abs($solde))?></h2>
 <? endif; ?>

Modified: phpcompta/trunk/include/template/letter_prop.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/letter_prop.php	2013-05-03 21:56:40 =
UTC (rev 5215)
+++ phpcompta/trunk/include/template/letter_prop.php	2013-05-03 22:31:33 =
UTC (rev 5216)
@@ -3,7 +3,6 @@
 require_once ('class_acc_reconciliation.php');
=20
 $gDossier=3Ddossier::id();
-
 if ( count($this->content) =3D=3D 0 ) :
 ?>
   <h2 class=3D"info2"><?=3D_('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat trouv=
=C3=A9')?></h2>
@@ -27,14 +26,14 @@
 <th>
    <?=3D_('Description')?>
 </th>
-<th>
-   <?=3D_('Montant')?>
+<th style=3D"text-align:right">
+   <?=3D_('D=C3=A9bit')?>
 </th>
-<th>
-   <?=3D_('Debit / Credit')?>
+<th style=3D"text-align:right">
+   <?=3D_('Cr=C3=A9dit')?>
 </th>
-<th>
-  <?=3D_('Op. concern=C3=A9')?>
+<th style=3D"text-align:center">
+  <?=3D_('Op. concern=C3=A9e')?>
 </th>
 </tr>
=20
@@ -67,14 +66,14 @@
 <th>
    <?=3D_('Description')?>
 </th>
-<th>
-   <?=3D_('Montant')?>
+<th style=3D"text-align:right">
+   <?=3D_('D=C3=A9bit')?>
 </th>
-<th>
-   <?=3D_('Debit / Credit')?>
+<th style=3D"text-align:right">
+   <?=3D_('Cr=C3=A9dit')?>
 </th>
-<th>
-  <?=3D_('Op. concern=C3=A9')?>
+<th style=3D"text-align:center">
+  <?=3D_('Op. concern=C3=A9e')?>
 </th>
 </tr>
 <?
@@ -98,7 +97,7 @@
 </td>
 <td>
 <?php
-$letter=3D($this->content[$i]['letter']< 0)?" ":$this->content[$i]['lett=
er'];
+$letter=3D($this->content[$i]['letter']< 0)?" ":strtoupper(base_convert(=
$this->content[$i]['letter'],10,36));
 ?>
 <?=3D$letter?>
 </td>
@@ -109,9 +108,14 @@
 ?>
 <td> <?=3D$r?> </td>
 <td> <?=3D$this->content[$i]['jr_comment']?> </td>
-  <td> <?=3Dnb($this->content[$i]['j_montant'])?> </td>
-<td> <?=3D($this->content[$i]['j_debit']=3D=3D't')?'D':'C'?> </td>
-<td>
+ <? if ($this->content[$i]['j_debit']=3D=3D't') : ?>
+  <td style=3D"text-align:right"> <?=3Dnb($this->content[$i]['j_montant'=
])?> </td>
+  <td></td>
+  <? else : ?>
+  <td></td>
+  <td style=3D"text-align:right"> <?=3Dnb($this->content[$i]['j_montant'=
])?> </td>
+  <? endif ?>
+<td style=3D"text-align:center">
 <?php
     // Rapprochement
     $rec=3Dnew Acc_Reconciliation($this->db);

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2013-05-03 21:56:40 UTC (=
rev 5215)
+++ phpcompta/trunk/include/template/module.php	2013-05-03 22:31:33 UTC (=
rev 5216)
@@ -78,7 +78,8 @@
 				$url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['me_code'];
 		    }
 		    ?>
-		<td class=3D"tool" style=3D"<?=3D$style?>"><a class=3D"mtitle" href=3D=
"<?=3D$url?>" title=3D"<?=3D_($row['me_description'])?>" <?=3D$js?> ><?=3D=
_($row['me_menu'])?></td>
+		<td class=3D"tool" style=3D"<?=3D$style?>">
+			<a class=3D"mtitle" href=3D"<?=3D$url?>" title=3D"<?=3D_($row['me_des=
cription'])?>" <?=3D$js?> ><?=3D_($row['me_menu'])?></a></td>
 		<?
 		    endforeach;
 		?>

Copied: phpcompta/trunk/include/template/operation_detail_ach.php (from r=
ev 5215, phpcompta/tags/rel650/include/template/operation_detail_ach.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/operation_detail_ach.php	           =
             (rev 0)
+++ phpcompta/trunk/include/template/operation_detail_ach.php	2013-05-03 =
22:31:33 UTC (rev 5216)
@@ -0,0 +1,124 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show detail of a operation of purchase
+ *
+ */
+global $g_parameter;
+?>
+<table class=3D"result" >
+	<?
+	bcscale(2);
+	$total_htva =3D 0;
+	$total_tvac =3D 0;
+	echo th(_('Quick Code'));
+	echo th(_('Description'));
+	if ($g_parameter->MY_TVA_USE =3D=3D 'Y')
+	{
+		echo th(_('Taux TVA'), 'style=3D"text-align:right"');
+	}
+	else
+	{
+		echo th('');
+	}
+	echo th(_('Prix/Un.'), 'style=3D"text-align:right"');
+	echo th(_('Quantit=C3=A9'), 'style=3D"text-align:right"');
+	echo th(_('Personnel'), 'style=3D"text-align:right"');
+	echo th(_('Non ded'), 'style=3D"text-align:right"');
+
+	if ($g_parameter->MY_TVA_USE =3D=3D 'Y')
+	{
+		echo th(_('HTVA'), 'style=3D"text-align:right"');
+		echo th(_('TVA'), 'style=3D"text-align:right"');
+		echo th(_('TVAC'), 'style=3D"text-align:right"');
+	}else
+		echo th(_('Total'), 'style=3D"text-align:right"');
+
+	echo '</tr>';
+	for ($e =3D 0; $e < count($obj->det->array); $e++)
+	{
+		$row =3D '';
+		$q =3D $obj->det->array[$e];
+		$fiche =3D new Fiche($cn, $q['qp_fiche']);
+		$view_card_detail =3D HtmlInput::card_detail($fiche->strAttribut(ATTR_=
DEF_QUICKCODE), "", ' class=3D"line" ');
+		$row =3D td($view_card_detail);
+		$sym_tva =3D '';
+
+		if ($g_parameter->MY_TVA_USE =3D=3D 'Y' && $q['qp_vat_code'] !=3D '')
+		{
+			/* retrieve TVA symbol */
+			$tva =3D new Acc_Tva($cn, $q['qp_vat_code']);
+			$tva->load();
+			$sym_tva =3D h($tva->get_parameter('label'));
+		}
+		$input =3D new ISpan("e_march" . $q['j_id'] . "_label");
+		$hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']);
+		$input->value =3D $fiche->strAttribut(ATTR_DEF_NAME);
+		$row.=3Dtd($input->input() . $hidden);
+		$row.=3Dtd($sym_tva, 'style=3D"text-align:center"');
+		$pu =3D 0;
+		if ($q['qp_quantite'] !=3D 0)
+			$pu =3D bcdiv($q['qp_price'], $q['qp_quantite']);
+		$row.=3Dtd(nbm($pu), 'class=3D"num"');
+		$row.=3Dtd(nbm($q['qp_quantite']), 'class=3D"num"');
+
+		$no_ded =3D $q['qp_nd_amount'];
+		$row.=3Dtd(nbm($q['qp_dep_priv']), 'style=3D"text-align:right"');
+		$row.=3Dtd(nbm($no_ded), ' style=3D"text-align:right"');
+		$htva =3D $q['qp_price'];
+
+
+		$row.=3Dtd(nbm($htva), 'class=3D"num"');
+		$tvac =3D bcadd($htva, $q['qp_vat']);
+		$tvac =3D bcadd($tvac, $q['qp_nd_tva']);
+		$tvac =3D bcadd($tvac, $q['qp_nd_tva_recup']);
+
+
+		if ($g_parameter->MY_TVA_USE =3D=3D 'Y')
+		{
+			$tva_amount =3D bcadd($q['qp_vat'], $q['qp_nd_tva']);
+			$tva_amount =3D bcadd($tva_amount, $q['qp_nd_tva_recup']);
+			$class =3D "";
+			if ($q['qp_vat_sided'] <> 0)
+			{
+				$class =3D ' style=3D"text-decoration:line-through"';
+				$tvac =3D bcsub($tvac, $q['qp_vat']);
+			}
+			$row.=3Dtd(nbm($tva_amount), 'class=3D"num" ' . $class);
+			$row.=3Dtd(nbm($tvac), 'class=3D"num"');
+		}
+		$total_tvac+=3D$tvac;
+		$total_htva+=3D$htva;
+		echo tr($row);
+	}
+	if ($g_parameter->MY_TVA_USE =3D=3D 'Y')
+		$row =3D td(_('Total'), ' style=3D"font-style:italic;text-align:right;=
font-weight: bolder;width:auto" colspan=3D"6"');
+	else
+		$row =3D td(_('Total'), ' style=3D"font-style:italic;text-align:right;=
font-weight: bolder;width:auto" colspan=3D"6"');
+	$row.=3Dtd(nbm($total_htva), 'class=3D"num" style=3D"font-style:italic;=
font-weight: bolder;"');
+	if ($g_parameter->MY_TVA_USE =3D=3D 'Y')
+		$row.=3Dtd("") . td(nbm($total_tvac), 'class=3D"num" style=3D"font-sty=
le:italic;font-weight: bolder;"');
+	echo tr($row);
+	?>
+</table>

Copied: phpcompta/trunk/include/template/operation_detail_fin.php (from r=
ev 5215, phpcompta/tags/rel650/include/template/operation_detail_fin.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/operation_detail_fin.php	           =
             (rev 0)
+++ phpcompta/trunk/include/template/operation_detail_fin.php	2013-05-03 =
22:31:33 UTC (rev 5216)
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show detail of a operation of fin
+ *
+ */
+echo '<table class=3D"result">';
+echo '<tr>';
+echo th('Compte en banque');
+echo th('Tiers');
+echo th('Libell=C3=A9');
+echo th('Montant');
+echo '</tr>';
+
+echo '<tr>';
+$bk =3D new Fiche($cn, $obj->det->array[0]['qf_bank']);
+$view_card_detail =3D HtmlInput::card_detail($bk->get_quick_code(), h($b=
k->getName()), ' class=3D"line" ');
+echo  td($view_card_detail);
+$other =3D new Fiche($cn, $obj->det->array[0]['qf_other']);
+$view_card_detail =3D HtmlInput::card_detail($other->get_quick_code(), h=
($other->getName()), ' class=3D"line" ');
+echo  td($view_card_detail);
+$comment =3D strip_tags($obj->det->jr_comment);
+echo  td($comment);
+echo td(nbm($obj->det->array[0]['qf_amount']), ' class=3D"inum"');
+echo '</tr>';
+echo '</table>';
+?>
+

Copied: phpcompta/trunk/include/template/operation_detail_misc.php (from =
rev 5215, phpcompta/tags/rel650/include/template/operation_detail_misc.ph=
p)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/operation_detail_misc.php	          =
              (rev 0)
+++ phpcompta/trunk/include/template/operation_detail_misc.php	2013-05-03=
 22:31:33 UTC (rev 5216)
@@ -0,0 +1,86 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief how detail of a misc operation
+ *
+ */
+?>
+<table class=3D"result">
+<tr>
+<?
+    echo th(_('Poste Comptable'));
+    echo th(_('Quick Code'));
+    echo th(_('Libell=C3=A9'));
+echo th(_('D=C3=A9bit'), 'style=3D"text-align:right"');
+echo th(_('Cr=C3=A9dit'), 'style=3D"text-align:right"');
+echo '</tr>';
+$amount_idx=3D0;
+for ($e =3D 0; $e < count($obj->det->array); $e++)
+{
+	$row =3D '';
+	$q =3D $obj->det->array;
+	$view_history =3D sprintf('<A class=3D"detail" style=3D"text-decoration=
:underline" HREF=3D"javascript:view_history_account(\'%s\',\'%s\')" >%s</=
A>', $q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']);
+
+	$row.=3Dtd($view_history);
+
+	if ($q[$e]['j_qcode'] !=3D '')
+	{
+		$fiche =3D new Fiche($cn);
+		$fiche->get_by_qcode($q[$e]['j_qcode']);
+		$view_history =3D sprintf('<A class=3D"detail" style=3D"text-decoratio=
n:underline" HREF=3D"javascript:view_history_card(\'%s\',\'%s\')" >%s</A>=
', $fiche->id, $gDossier, $q[$e]['j_qcode']);
+	}
+	else
+		$view_history =3D '';
+	$row.=3Dtd($view_history);
+	$l_lib =3D $q[$e]['j_text'];
+
+	if ($l_lib !=3D '')
+	{
+		$l_lib =3D $q[$e]['j_text'];
+	}
+	else if ($q[$e]['j_qcode'] !=3D '')
+	{
+		// nom de la fiche
+		$ff =3D new Fiche($cn);
+		$ff->get_by_qcode($q[$e]['j_qcode']);
+		$l_lib =3D $ff->strAttribut(ATTR_DEF_NAME);
+	}
+	else
+	{
+		// libell=C3=A9 du compte
+		$name =3D $cn->get_value('select pcm_lib from tmp_pcmn where pcm_val=3D=
$1', array($q[$e]['j_poste']));
+		$l_lib =3D $name;
+	}
+	$l_lib =3D strip_tags($l_lib);
+	$input =3D new ISpan("e_march" . $q[$e]['j_id'] . "_label");
+	$input->value =3D $l_lib;
+	$hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']);
+	$row.=3Dtd($input->input() . $hidden);
+	$montant =3D td(nbm($q[$e]['j_montant']), 'class=3D"num"');
+	$row.=3D($q[$e]['j_debit'] =3D=3D 't') ? $montant : td('');
+	$row.=3D($q[$e]['j_debit'] =3D=3D 'f') ? $montant : td('');
+	echo tr($row);
+}
+?>
+</table>
\ No newline at end of file

Copied: phpcompta/trunk/include/template/operation_detail_ven.php (from r=
ev 5215, phpcompta/tags/rel650/include/template/operation_detail_ven.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/operation_detail_ven.php	           =
             (rev 0)
+++ phpcompta/trunk/include/template/operation_detail_ven.php	2013-05-03 =
22:31:33 UTC (rev 5216)
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show detail of a operation of sale
+ *
+ */
+global $g_parameter;
+?>
+<table class=3D"result">
+<?
+  bcscale(2);
+  $total_htva=3D0;$total_tvac=3D0;
+  echo th(_('Quick Code'));
+echo th(_('Description'));
+echo th(_('Prix/Un'), 'style=3D"text-align:right"');
+echo th(_('Quantit=C3=A9'), 'style=3D"text-align:right"');
+if ( $g_parameter->MY_TVA_USE =3D=3D 'Y')
+  echo th(_('Taux TVA'), 'style=3D"text-align:right"');
+else
+  echo th('');
+if ( $g_parameter->MY_TVA_USE =3D=3D 'Y') {
+  echo th(_('HTVA'), 'style=3D"text-align:right"');
+  echo th(_('TVA'), 'style=3D"text-align:right"');
+  echo th(_('TVAC'), 'style=3D"text-align:right"');
+} else
+  echo th(_('Total'), 'style=3D"text-align:right"');
+
+
+echo '</tr>';
+  for ($e=3D0;$e<count($obj->det->array);$e++) {
+    $row=3D'';
+    $q=3D$obj->det->array[$e];
+    $fiche=3Dnew Fiche($cn,$q['qs_fiche']);
+	$view_card_detail=3DHtmlInput::card_detail($fiche->strAttribut(ATTR_DEF=
_QUICKCODE),"", ' class=3D"line" ');
+	$row.=3Dtd($view_card_detail);
+        $input =3D new ISpan("e_march" . $q['j_id'] . "_label");
+        $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']);
+        $input->value =3D $fiche->strAttribut(ATTR_DEF_NAME);
+
+    $row.=3Dtd($input->input().$hidden);
+    $sym_tva=3D'';
+	$pu=3D0;
+	if ($q['qs_quantite'] !=3D 0)	$pu=3Dbcdiv($q['qs_price'],$q['qs_quantit=
e']);
+    $row.=3Dtd(nbm($pu),'class=3D"num"');
+    $row.=3Dtd(nbm($q['qs_quantite']),'class=3D"num"');
+	$sym_tva=3D'';
+   if ( $g_parameter->MY_TVA_USE=3D=3D'Y' && $q['qs_vat_code'] !=3D '') =
{
+     /* retrieve TVA symbol */
+     $tva=3Dnew Acc_Tva($cn,$q['qs_vat_code']);
+     $tva->load();
+     $sym_tva=3D(h($tva->get_parameter('label')));
+     //     $sym_tva=3D$sym
+   }
+
+   $row.=3Dtd($sym_tva,'style=3D"text-align:center"');
+
+    $htva=3D$q['qs_price'];
+
+    $row.=3Dtd(nbm($htva),'class=3D"num"');
+    $tvac=3Dbcadd($htva,$q['qs_vat']);
+    if ($g_parameter->MY_TVA_USE=3D=3D'Y')
+      {
+		$class=3D"";
+		if ($q['qs_vat_sided'] !=3D 0) {
+			$class=3D' style=3D"text-decoration:line-through"';
+			$tvac=3Dbcsub($tvac,$q['qs_vat']);
+		}
+		$row.=3Dtd(nbm($q['qs_vat']),'class=3D"num"'.$class);
+		$row.=3Dtd(nbm($tvac),'class=3D"num"');
+      }
+    $total_tvac=3Dbcadd($total_tvac,$tvac);
+    $total_htva=3Dbcadd($total_htva,$htva);
+    echo tr($row);
+
+  }
+  if ($g_parameter->MY_TVA_USE=3D=3D'Y')
+	$row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;fon=
t-weight: bolder;" colspan=3D"5"');
+  else
+	$row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;fon=
t-weight: bolder;" colspan=3D"5"');
+$row.=3Dtd(nbm($total_htva),'class=3D"num" style=3D"font-style:italic;fo=
nt-weight: bolder;"');
+if ($g_parameter->MY_TVA_USE=3D=3D'Y')
+  $row.=3Dtd("").td(nbm($total_tvac),'class=3D"num" style=3D"font-style:=
italic;font-weight: bolder;"');
+echo tr($row);
+?>
+</table>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/periode_add_exercice.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/periode_add_exercice.php	2013-05-03 =
21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/periode_add_exercice.php	2013-05-03 =
22:31:33 UTC (rev 5216)
@@ -2,8 +2,11 @@
 <ul>
 <li>
 Exercice en 12 p=C3=A9riodes : Ajout d'un exercice comptable de 12 p=C3=A9=
riodes, commen=C3=A7ant le 1 janvier et terminant le 31 d=C3=A9cembre. </=
li>
-<li>   Exercice en 13 p=C3=A9riodes: Ajout d'une p=C3=A9riode d'un jour =
le 31/12. Cette p=C3=A9riode est utilis=C3=A9e=20
+<li>   Exercice en 13 p=C3=A9riodes: Ajout d'une p=C3=A9riode d'un jour =
le 31/12. Cette p=C3=A9riode est utilis=C3=A9e
 pour faire toutes les =C3=A9critures de fin d'exercice: amortissements, =
r=C3=A9gulations de compte... Avec une 13i=C3=A8me p=C3=A9riode, cela sim=
plifie les pr=C3=A9visions, les rapports...</li>
+<li>
+	Pour ajouter des ann=C3=A9es, ne commen=C3=A7ant pas en janvier ou comp=
tant un nombre de mois sup=C3=A9rieur =C3=A0 12, utilisez le plugin "Outi=
ls Comptables"
+</li>
 </ul>
=20
 <form method=3D"post" onsubmit=3D"return confirm('Confirmez vous l\'ajou=
t d\'un exercice comptable ?')">

Modified: phpcompta/trunk/include/template/search_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/search_top.php	2013-05-03 21:56:40 U=
TC (rev 5215)
+++ phpcompta/trunk/include/template/search_top.php	2013-05-03 22:31:33 U=
TC (rev 5216)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief

Modified: phpcompta/trunk/include/template/user_sec_profile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/user_sec_profile.php	2013-05-03 21:5=
6:40 UTC (rev 5215)
+++ phpcompta/trunk/include/template/user_sec_profile.php	2013-05-03 22:3=
1:33 UTC (rev 5216)
@@ -32,7 +32,7 @@
 	<?=3DHtmlInput::hidden("p_id", $p_id);?>
 	<table>
 		<tr>
-			<th><?=3D_("Profile")?></th>
+			<th><?=3D_("Profil")?></th>
 			<th><?=3D_("Acc=C3=A8s")?></th>
 		</tr>
 		<? for ($i=3D0;$i<count($array);$i++): ?>

Modified: phpcompta/trunk/include/tfpdf/tfpdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/tfpdf/tfpdf.php	2013-05-03 21:56:40 UTC (rev =
5215)
+++ phpcompta/trunk/include/tfpdf/tfpdf.php	2013-05-03 22:31:33 UTC (rev =
5216)
@@ -1279,7 +1279,7 @@
 		if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents()))
 		{
 			// It contains only a UTF-8 BOM and/or whitespace, let's clean it
-			ob_clean();
+			ob_end_clean();
 		}
 		else
 			$this->Error("Some data has already been output, can't send PDF file"=
);

Modified: phpcompta/trunk/include/tva.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/tva.inc.php	2013-05-03 21:56:40 UTC (rev 5215=
)
+++ phpcompta/trunk/include/tva.inc.php	2013-05-03 22:31:33 UTC (rev 5216=
)
@@ -18,7 +18,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* ! \file
+/** \file
  * \brief included file for customizing with the vat (account,rate...)
  */
 require_once('class_own.php');
@@ -100,6 +100,7 @@
 ?>
 <TABLE>
     <TR>
+        <th>Id</th>
 	<th>Label</TH>
 	<th>Taux</th>
 	<th>Commentaire</th>
@@ -123,8 +124,10 @@
     echo "<TR>";
     echo '<FORM METHOD=3D"POST">';
=20
+    echo '<td>';
+    echo $row['tva_id'];
+    echo '</td>';
=20
-
     echo "<TD>";
     echo HtmlInput::hidden('tva_id', $row['tva_id']);
     echo h($row['tva_label']);

Modified: phpcompta/trunk/include/user_detail.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user_detail.inc.php	2013-05-03 21:56:40 UTC (=
rev 5215)
+++ phpcompta/trunk/include/user_detail.inc.php	2013-05-03 22:31:33 UTC (=
rev 5216)
@@ -17,7 +17,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
  */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* ! \file
+/** \file
  * \brief Users Security
  */
 include_once("ac_common.php");
@@ -75,8 +75,12 @@
             {
                 $db_id =3D mb_substr($name, 4);
                 $cn =3D new Database();
-                $UserChange->set_folder_access($db_id, $elem);
-				Dossier::synchro_admin($db_id);
+				$name=3D$cn->format_name($db_id, "dos");
+				if ( $cn->exist_database($name) =3D=3D 1 )
+				{
+					$UserChange->set_folder_access($db_id, $elem);
+					Dossier::synchro_admin($db_id);
+				}
             }
         }
     }

Modified: phpcompta/trunk/include/user_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user_menu.php	2013-05-03 21:56:40 UTC (rev 52=
15)
+++ phpcompta/trunk/include/user_menu.php	2013-05-03 22:31:33 UTC (rev 52=
16)
@@ -135,15 +135,15 @@
     $base=3D"?ac=3D".$_REQUEST['ac'];
     $str_dossier=3D"&".dossier::get();
     echo '<TABLE>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle"  HREF=3D"'.$base.=
'&p_start=3D0'.$str_dossier.'">0'._(' Hors Bilan').' </A></TD></TR>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle"  HREF=3D"'.$base.=
'&p_start=3D1'.$str_dossier.'">1'._(' Immobilis=C3=A9').' </A></TD></TR>'=
;
+    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle"  HREF=3D"'.$base.=
'&p_start=3D0'.$str_dossier.'">0 '._(' Hors Bilan').' </A></TD></TR>';
+    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle"  HREF=3D"'.$base.=
'&p_start=3D1'.$str_dossier.'">1 '._(' Immobilis=C3=A9').' </A></TD></TR>=
';
     echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle"  HREF=3D"'.$base.=
'&p_start=3D2'.$str_dossier.'">2 '._('Actif a un an au plus').'</A></TD><=
/TR>';
     echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle"  HREF=3D"'.$base.=
'&p_start=3D3'.$str_dossier.'">3 '._('Stock et commande').'</A></TD></TR>=
';
     echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle"  HREF=3D"'.$base.=
'&p_start=3D4'.$str_dossier.'">4 '._('Compte tiers').'</A></TD></TR>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"'.$base.'=
&p_start=3D5'.$str_dossier.'">5'._('Actif').'</A></TD></TR>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle"  HREF=3D"'.$base.=
'&p_start=3D6'.$str_dossier.'">6'._('Charges').'</A></TD></TR>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"'.$base.'=
&p_start=3D7'.$str_dossier.'">7'._('Produits').'</A></TD></TR>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"'.$base.'=
&p_start=3D8'.$str_dossier.'">8'._('Hors Comptabilit=C3=A9').'</A></TD></=
TR>';
+    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"'.$base.'=
&p_start=3D5'.$str_dossier.'">5 '._('Financier').'</A></TD></TR>';
+    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle"  HREF=3D"'.$base.=
'&p_start=3D6'.$str_dossier.'">6 '._('Charges').'</A></TD></TR>';
+    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"'.$base.'=
&p_start=3D7'.$str_dossier.'">7 '._('Produits').'</A></TD></TR>';
+    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"'.$base.'=
&p_start=3D8'.$str_dossier.'">8 '._('Hors Comptabilit=C3=A9').'</A></TD><=
/TR>';
     echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"'.$base.'=
&p_start=3D9'.$str_dossier.'">9 '._('Hors Comptabilit=C3=A9').'</A></TD><=
/TR>';
     echo "</TABLE>";
 }

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-05-03 21:56:40 UTC (rev 5215)
+++ phpcompta/trunk/sql/upgrade.sql	2013-05-03 22:31:33 UTC (rev 5216)
@@ -0,0 +1,104 @@
+
+CREATE OR REPLACE FUNCTION comptaproc.insert_quick_code(nf_id integer, t=
av_text text)
+  RETURNS integer AS
+$BODY$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	begin
+	tText :=3D lower(trim(tav_text));
+	tText :=3D replace(tText,' ','');
+	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
+	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+
+
+	loop
+		-- take the next sequence
+		select nextval('s_jnt_fic_att_value') into ns;
+		if length (tText) =3D 0 or tText is null then
+			tText :=3D 'FID'||ns;
+		end if;
+		-- av_text already used ?
+		select count(*) into nExist
+			from fiche_detail
+		where
+			ad_id=3D23 and  ad_value=3Dupper(tText);
+
+		if nExist =3D 0 then
+			exit;
+		end if;
+		tText:=3D'FID'||ns;
+	end loop;
+
+
+	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,2=
3,upper(tText));
+	return ns;
+	end;
+$BODY$
+  LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION comptaproc.update_quick_code(njft_id integer,=
 tav_text text)
+  RETURNS integer AS
+$BODY$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	old_qcode varchar;
+	begin
+	-- get current value
+	select ad_value into old_qcode from fiche_detail where jft_id=3Dnjft_id=
;
+	-- av_text didn't change so no update
+	if tav_text =3D upper( trim(old_qcode)) then
+		return 0;
+	end if;
+
+	tText :=3D trim(lower(tav_text));
+	tText :=3D replace(tText,' ','');
+	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
+	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+	tText :=3D upper(tText);
+	if length ( tText) =3D 0 or tText is null then
+		return 0;
+	end if;
+
+	ns :=3D njft_id;
+
+	loop
+		-- av_text already used ?
+		select count(*) into nExist
+			from fiche_detail
+		where
+			ad_id=3D23 and ad_value=3DtText;
+
+		if nExist =3D 0 then
+			exit;
+		end if;
+		if tText =3D 'FID'||ns then
+			-- take the next sequence
+			select nextval('s_jnt_fic_att_value') into ns;
+		end if;
+		tText  :=3D'FID'||ns;
+
+	end loop;
+	update fiche_detail set ad_value =3D tText where jft_id=3Dnjft_id;
+
+	-- update also the contact
+	update fiche_detail set ad_value =3D tText
+		where jft_id in
+			( select jft_id
+				from fiche_detail
+			where ad_id=3D25 and ad_value=3Dold_qcode);
+
+
+	update jrnx set j_qcode=3DtText where j_qcode =3D old_qcode;
+	return ns;
+	end;
+$BODY$
+  LANGUAGE plpgsql;
+
+
+alter table document_state add s_status char(1);
+
+update document_state set s_status=3D'C' where s_id in (1,4)
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 06 16:16:30 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZRpm-00061R-Gl
	for mharc-phpcompta-dev@gnu.org; Mon, 06 May 2013 16:16:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon,  6 May 2013 22:14:15 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1334628.1367871389.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5217 - in phpcompta/trunk: html html/image include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 May 2013 20:16:28 -0000

Author: danydb
Date: 2013-05-06 22:14:14 +0200 (Mon, 06 May 2013)
New Revision: 5217

Added:
   phpcompta/trunk/html/image/logo7.png
Removed:
   phpcompta/trunk/html/image/logo7.gif
   phpcompta/trunk/html/image/logo7.jpg
Modified:
   phpcompta/trunk/html/index.php
   phpcompta/trunk/include/ac_common.php
Log:
task 833 : ajout nouveau logos

Deleted: phpcompta/trunk/html/image/logo7.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Deleted: phpcompta/trunk/html/image/logo7.jpg
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Added: phpcompta/trunk/html/image/logo7.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: phpcompta/trunk/html/image/logo7.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: phpcompta/trunk/html/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/index.php	2013-05-03 22:31:33 UTC (rev 5216)
+++ phpcompta/trunk/html/index.php	2013-05-06 20:14:14 UTC (rev 5217)
@@ -119,6 +119,7 @@
 <HTML>
 <head>
 <TITLE> PhpCompta </TITLE>
+<link rel=3D"shortcut icon" type=3D"image/ico" href=3D"favicon.ico" />
 <style>
 BODY {
 background-color:white;
@@ -194,7 +195,7 @@
 <BR>
 <BR>
 <center>
-<IMG SRC=3D"image/logo7.jpg" alt=3D"Logo">
+<IMG SRC=3D"image/logo7.png" alt=3D"PhpCompta">
 <BR>
 <BR>
 <BR>

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2013-05-03 22:31:33 UTC (rev 52=
16)
+++ phpcompta/trunk/include/ac_common.php	2013-05-06 20:14:14 UTC (rev 52=
17)
@@ -296,6 +296,7 @@
=20
     echo "<HEAD>
     <TITLE>$title</TITLE>
+	<link rel=3D\"icon\" type=3D\"image/ico\" href=3D\"favicon.ico\" />
     <META http-equiv=3D\"Content-Type\" content=3D\"text/html; charset=3D=
UTF8\">
     <LINK REL=3D\"stylesheet\" type=3D\"text/css\" href=3D\"$style\" med=
ia=3D\"screen\">
     <link rel=3D\"stylesheet\" type=3D\"text/css\" href=3D\"style-print.=
css\" media=3D\"print\">" .



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 06 16:19:22 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZRsY-0006GK-CO
	for mharc-phpcompta-dev@gnu.org; Mon, 06 May 2013 16:19:22 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon,  6 May 2013 22:17:06 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1334631.1367871561.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5218 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 May 2013 20:19:21 -0000

Author: danydb
Date: 2013-05-06 22:17:06 +0200 (Mon, 06 May 2013)
New Revision: 5218

Added:
   phpcompta/trunk/html/favicon.ico
Log:
task #833 : missing file favicon.ico

Added: phpcompta/trunk/html/favicon.ico
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: phpcompta/trunk/html/favicon.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 06 19:23:59 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZUlD-0003x1-Pn
	for mharc-phpcompta-dev@gnu.org; Mon, 06 May 2013 19:23:59 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  7 May 2013 01:21:37 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1334848.1367882638.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5219 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 May 2013 23:23:58 -0000

Author: danydb
Date: 2013-05-07 01:21:37 +0200 (Tue, 07 May 2013)
New Revision: 5219

Modified:
   phpcompta/trunk/include/fiche.inc.php
Log:
Bug : CARD when nothing then give an error : sum_solde not set

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-05-06 20:17:06 UTC (rev 52=
18)
+++ phpcompta/trunk/include/fiche.inc.php	2013-05-06 23:21:37 UTC (rev 52=
19)
@@ -308,7 +308,7 @@
 				th('Solde', 'style=3D"text-align:right"') .
 				th('D/C', 'style=3D"text-align:right"')
 		);
-		$idx =3D 0;$sum_deb=3D0;$sum_cred=3D0;bcscale(4);
+		$idx =3D 0;$sum_deb=3D0;$sum_cred=3D0;$sum_solde=3D0;bcscale(4);
 		for ($i =3D 0; $i < Database::num_row($ret); $i++)
 		{
 			$filter =3D " (j_date >=3D to_date('" . $_REQUEST['start'] . "','DD.M=
M.YYYY') " .



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 06 19:37:24 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZUyB-0004jq-Vo
	for mharc-phpcompta-dev@gnu.org; Mon, 06 May 2013 19:37:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  7 May 2013 01:35:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1334849.1367883443.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5220 - in phpcompta/trunk: html html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 May 2013 23:37:22 -0000

Author: danydb
Date: 2013-05-07 01:35:00 +0200 (Tue, 07 May 2013)
New Revision: 5220

Modified:
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/user_login.php
   phpcompta/trunk/include/balance.inc.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_user.php
   phpcompta/trunk/include/compta_fin_rec.inc.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/dossier.inc.php
   phpcompta/trunk/include/modele.inc.php
   phpcompta/trunk/include/user.inc.php
Log:
task #0000832: Filtrage simple de table

Ajout pour les utilisateurs, dossier, mod?\195?\168les, balances (PRINTBA=
L),
rapprochements bancaires(FREC)

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-05-06 23:21:37 UTC (rev 521=
9)
+++ phpcompta/trunk/html/js/infobulle.js	2013-05-06 23:35:00 UTC (rev 522=
0)
@@ -49,6 +49,11 @@
 content[19]=3D"Donnez une partie du nom, de la description,  du n=C2=B0 =
de TVA ou quick code";
 content[20]=3D"Les menus ne peuvent d=C3=A9pendre que dans d'un menu pri=
ncipal ou d'un menu, si cette liste est vide, ajouter des modules ou menu=
 principal sans donner de d=C3=A9pendance";
 content[21]=3D"Donnez un nombre entre 0 & 100";
+content[22]=3D"Donnez une partie du nom du dossier,du nom, du pr=C3=A9no=
m ou du login pour filtrer";
+content[23]=3D"Donnez une partie du nom du dossier ou de la description =
pour filtrer";
+content[24]=3D"Donnez une partie du poste comptable ou du libell=C3=A9 p=
our filtrer";
+content[25]=3D"Donnez une partie du libell=C3=A9, la date, le montant ou=
 le num=C3=A9ro d'op=C3=A9ration pour filtrer, cela n'efface pas ce qui a=
 d=C3=A9j=C3=A0 =C3=A9t=C3=A9 s=C3=A9lectionn=C3=A9";
+
 function showBulle(p_ctl)
 {
     d=3Ddocument.getElementById('bulle');

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-05-06 23:21:37 UTC (rev 5219)
+++ phpcompta/trunk/html/js/scripts.js	2013-05-06 23:35:00 UTC (rev 5220)
@@ -1712,4 +1712,45 @@
 				}
 			}
 	);
+}
+/**
+ * @brief filter quickly a table
+ * @param  phrase : phrase to seach
+ * @param  _id : id of the table
+ * @param  colnr : string containing the column number where you're sear=
ching separated by a comma
+ * @param start_row : first row (1 if you have table header)
+ * @returns nothing
+ * @see HtmlInput::filter_table
+ */
+function filter_table(phrase, _id, colnr,start_row) {
+	var words =3D phrase.value.toLowerCase();
+	var table =3D document.getElementById(_id);
+	// if colnr contains a comma then check several columns
+	var aCol =3D new Array();
+	if (colnr.indexOf(',') >=3D 0) {
+		aCol =3D colnr.split(',');
+	} else {
+		aCol[0] =3D colnr;
+	}
+	var ele;
+	for (var r =3D start_row; r < table.rows.length; r++) {
+		var found=3D0;
+		for (var col =3D0;col < aCol.length;col++)
+		{
+			var idx=3DaCol[col];
+			console.log(r);
+			if (table.rows[r].cells[idx])
+				 {
+					ele =3D table.rows[r].cells[idx].innerHTML.replace(/<[^>]+>/g, "");
+						//var displayStyle =3D 'none';
+					if (ele.toLowerCase().indexOf(words) >=3D 0){ found=3D1; }
+				 }
+
+		}
+		if (found =3D=3D 1 ){
+			table.rows[r].style.display =3D '';
+		} else {
+			table.rows[r].style.display =3D 'none';
+		}
+	}
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/user_login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_login.php	2013-05-06 23:21:37 UTC (rev 5219=
)
+++ phpcompta/trunk/html/user_login.php	2013-05-06 23:35:00 UTC (rev 5220=
)
@@ -25,6 +25,7 @@
 include_once ("ac_common.php");
 require_once('class_database.php');
 require_once('class_itext.php');
+require_once 'function_javascript.php';
 @html_page_start($_SESSION['g_theme']);
 $rep=3Dnew Database();
 include_once ("class_user.php");
@@ -93,6 +94,7 @@
=20
 include_once("user_menu.php");
 $priv=3D($User->admin=3D=3D1)?"Administrateur":"Utilisateur";
+load_all_script();
 echo '<div class=3D"welcome"> ';
 /**
  *
@@ -140,29 +142,18 @@
 ?>
 <div class=3D"foldercontent">
 <?php echo '<h2 >'._('Choississez votre dossier').'</h2>';?>
-<form method=3D"get" action=3D"?">
-                          <input type=3D"submit" class=3D"button" value=3D=
"<?php echo _('Rechercher');?>">
-                                                                 <?php
-                                                                 $w=3Dne=
w IText();
-$p_nom=3Disset($_GET ['p_nom'])?$_GET['p_nom']:"";
-echo $w->input('p_nom',$p_nom);
-
+	<span style=3D"display:block">
+ <?php
+                        echo _('Filtre').HtmlInput::infobulle(23);
 ?>
-<span class=3D"notice">
-                        <?php
-                        echo _('Donnez une partie du nom du dossier ou d=
e la description =C3=A0 rechercher');
+<?php
+	echo HtmlInput::filter_table("folder", '1,2',0);
 ?>
 </span>
-</form>
 <?php
-$filtre=3D"";
-if ( isset ($_GET ['p_nom']))
-{
-    $filtre=3D$_GET['p_nom'];
-}
=20
 // If admin show everything otherwise only the available dossier
-$res=3D$User->show_dossier($filtre);
+$res=3D$User->show_dossier("");
 echo $res;
 ?>
 <P>

Modified: phpcompta/trunk/include/balance.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/balance.inc.php	2013-05-06 23:21:37 UTC (rev =
5219)
+++ phpcompta/trunk/include/balance.inc.php	2013-05-06 23:35:00 UTC (rev =
5220)
@@ -172,6 +172,7 @@
=20
     $hid=3Dnew IHidden();
=20
+
     echo "<table>";
     echo '<TR>';
     echo '<TD><form method=3D"GET" ACTION=3D"export.php">'.
@@ -255,8 +256,11 @@
     $a=3D$periode->get_date_limit($_GET['from_periode']);
     $b=3D$periode->get_date_limit($_GET['to_periode']);
     echo "<h2 class=3D\"info\"> p=C3=A9riode du ".$a['p_start']." au ".$=
b['p_end']."</h2>";
-
-    echo '<table width=3D"100%">';
+	echo '<span style=3D"display:block">';
+	echo _('Filtre').HtmlInput::infobulle(24);
+	echo HtmlInput::filter_table("t_balance", "0,1","1");
+	echo '</span>';
+    echo '<table id=3D"t_balance" width=3D"100%">';
     echo '<th>Poste Comptable</th>';
     echo '<th>Libell&eacute;</th>';
     echo '<th>D&eacute;bit</th>';

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-05-06 23:21:37 UTC =
(rev 5219)
+++ phpcompta/trunk/include/class_html_input.php	2013-05-06 23:35:00 UTC =
(rev 5220)
@@ -713,4 +713,13 @@
 		      return $sel;
 			}
 	}
+	static function filter_table($p_table_id,$p_col,$start_row)
+	{
+		$r=3D "
+			<form style=3D\"display:inline\">
+			<input class=3D\"input_text\" name=3D\"filter\" onkeyup=3D\"filter_ta=
ble(this, '$p_table_id','$p_col',$start_row )\" type=3D\"text\">
+			</form>
+			";
+		return $r;
+	}
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2013-05-06 23:21:37 UTC (rev 5=
219)
+++ phpcompta/trunk/include/class_user.php	2013-05-06 23:35:00 UTC (rev 5=
220)
@@ -935,7 +935,7 @@
 		if ($p_array =3D=3D 0)
 			return $result . " * Aucun dossier *";
=20
-		$result.=3D"<TABLE style=3D\"width:auto;border-width:0px;border-collap=
se:collapse;\">";
+		$result.=3D"<TABLE id=3D\"folder\" style=3D\"width:auto;border-width:0=
px;border-collapse:collapse;\">";
 		for ($i =3D 0; $i < sizeof($p_array); $i++)
 		{
=20

Modified: phpcompta/trunk/include/compta_fin_rec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin_rec.inc.php	2013-05-06 23:21:37 UT=
C (rev 5219)
+++ phpcompta/trunk/include/compta_fin_rec.inc.php	2013-05-06 23:35:00 UT=
C (rev 5220)
@@ -122,7 +122,11 @@
 echo IButton::tooggle_checkbox('rec1');
 echo '</p>';
 echo HtmlInput::submit('save', 'Mettre =C3=A0 jour le n=C2=B0 de relev=C3=
=A9 bancaire');
-echo '<table class=3D"sortable" style=3D"width:80%;margin-left:10%">';
+echo '<span style=3D"display:block">';
+	echo _('Filtre').HtmlInput::infobulle(25);
+	echo HtmlInput::filter_table("t_rec_bk", "0,1,2,3","1");
+	echo '</span>';
+echo '<table id=3D"t_rec_bk" class=3D"sortable" style=3D"width:80%;margi=
n-left:10%">';
 $r =3D'<th class=3D" sorttable_sorted_reverse">'.'Date '.HtmlInput::info=
bulle(17).'<span id=3D"sorttable_sortrevind">&nbsp;&blacktriangle;</span>=
'.'</th>';
 $r.=3Dth('Libell=C3=A9');
 $r.=3Dth('N=C2=B0 interne');

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-06 23:21:37 UTC (rev 521=
9)
+++ phpcompta/trunk/include/constant.php	2013-05-06 23:35:00 UTC (rev 522=
0)
@@ -35,8 +35,9 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
+define ('SVNINFO',5666);
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",false);
+define ("DEBUG",true);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);

Modified: phpcompta/trunk/include/dossier.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/dossier.inc.php	2013-05-06 23:21:37 UTC (rev =
5219)
+++ phpcompta/trunk/include/dossier.inc.php	2013-05-06 23:35:00 UTC (rev =
5220)
@@ -172,7 +172,11 @@
 	$compteur=3D1;
     $template=3D"";
 	echo '<div class=3D"content">';
-    echo '<TABLE class=3D"table_large" >';
+	echo '<span style=3D"display:block">';
+	echo _('Filtre').HtmlInput::infobulle(23);
+	echo HtmlInput::filter_table("t_dossier", "0,1,2","1");
+	echo '</span>';
+    echo '<TABLE id=3D"t_dossier" class=3D"table_large" >';
 	$r=3D"";
 	$r.=3D'<th>'.$header->get_header(0).'</td>';
 	$r.=3D'<th>'.$header->get_header(1).'</td>';

Modified: phpcompta/trunk/include/modele.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/modele.inc.php	2013-05-06 23:21:37 UTC (rev 5=
219)
+++ phpcompta/trunk/include/modele.inc.php	2013-05-06 23:35:00 UTC (rev 5=
220)
@@ -232,8 +232,11 @@
=20
 		echo HtmlInput::button_anchor('Rafra&icirc;chir', 'admin_repo.php?acti=
on=3Dmodele_mgt');
 		echo HtmlInput::button_anchor('Ajouter', 'admin_repo.php?action=3Dmode=
le_mgt&sa=3Dadd');
-
-		echo '<table class=3D"result" style=3D"border-spacing:10;border-collap=
se:separate" >';
+		echo '<span style=3D"display:block;margin-top:10">';
+		echo _('Filtre').HtmlInput::infobulle(23);
+		echo HtmlInput::filter_table("t_modele", "0,1,2","1");
+		echo '</span>';
+		echo '<table id=3D"t_modele" class=3D"table_large" style=3D"border-spa=
cing:10;border-collapse:separate" >';
 		echo "<TR>".
 				"<TH>".$header->get_header(0)."</TH>" .
 				"<TH>".$header->get_header(1)."</TH>" .

Modified: phpcompta/trunk/include/user.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user.inc.php	2013-05-06 23:21:37 UTC (rev 521=
9)
+++ phpcompta/trunk/include/user.inc.php	2013-05-06 23:35:00 UTC (rev 522=
0)
@@ -112,7 +112,11 @@
=20
 if ( !empty ($a_user) )
 {
-    echo '<table class=3D"result">';
+	echo '<span style=3D"display:block">';
+	echo _('Filtre').HtmlInput::infobulle(22);
+	echo HtmlInput::filter_table("user", "0,1,2,5","1");
+	echo '</span>';
+    echo '<table id=3D"user" class=3D"result">';
     echo '<tr>';
     echo '<th>'.$header->get_header(0).'</th>';
     echo '<th>'.$header->get_header(1).'</th>';



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 06 19:49:37 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZVA1-0005cR-Cm
	for mharc-phpcompta-dev@gnu.org; Mon, 06 May 2013 19:49:37 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  7 May 2013 01:47:16 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1334850.1367884176.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r492 - in trunk/rapport_avance: . include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 May 2013 23:49:35 -0000

Author: danydb
Date: 2013-05-07 01:47:15 +0200 (Tue, 07 May 2013)
New Revision: 492

Modified:
   trunk/rapport_avance/include/historique.inc.php
   trunk/rapport_avance/rapav_javascript.js
Log:
task #0000834: Filtre dans l'historique

Modified: trunk/rapport_avance/include/historique.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/historique.inc.php	2013-05-02 21:20:02 U=
TC (rev 491)
+++ trunk/rapport_avance/include/historique.inc.php	2013-05-06 23:47:15 U=
TC (rev 492)
@@ -39,7 +39,13 @@
 		order by d_start,d_title");
 ?>
 <div id=3D"declaration_list_div">
-<table class=3D"sortable">
+<?php
+echo '<span style=3D"display:block">';
+	echo _('Filtre').HtmlInput::infobulle(204);
+	echo HtmlInput::filter_table("t_declaration", "0,1,2,3","1");
+	echo '</span>';
+?>
+<table id=3D"t_declaration" class=3D"sortable">
 	<tr>
 		<th class=3D" sorttable_sorted_reverse">
 			Date d=C3=A9but <?php echo HtmlInput::infobulle(17);?>

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-05-02 21:20:02 UTC (rev=
 491)
+++ trunk/rapport_avance/rapav_javascript.js	2013-05-06 23:47:15 UTC (rev=
 492)
@@ -3,6 +3,7 @@
 content[200]=3D"Le code doit =C3=AAtre unique pour ce formulaire";
 content[201]=3D"Formula TODO";
 content[203]=3D"Utiliser le % pour indiquer les postes comptables qui en=
 d=C3=A9pendent ex: 70% pour reprendre tous les comptes commen=C3=A7ant p=
ar 70";
+content[204]=3D"Filtrer en donnant une date, partie de la description ou=
 de la d=C3=A9claration";
=20
 /**
  *@brief show the definition of a form and let it modify it



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 06 19:51:25 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZVBl-0005nP-Kr
	for mharc-phpcompta-dev@gnu.org; Mon, 06 May 2013 19:51:25 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  7 May 2013 01:49:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1334853.1367884284.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5221 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 May 2013 23:51:24 -0000

Author: danydb
Date: 2013-05-07 01:48:59 +0200 (Tue, 07 May 2013)
New Revision: 5221

Modified:
   phpcompta/trunk/include/constant.php
Log:
Overwrite by accident constant.php

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-06 23:35:00 UTC (rev 522=
0)
+++ phpcompta/trunk/include/constant.php	2013-05-06 23:48:59 UTC (rev 522=
1)
@@ -35,9 +35,8 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
-define ('SVNINFO',5666);
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",true);
+define ("DEBUG",false);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 06 19:52:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZVCh-0005q0-RA
	for mharc-phpcompta-dev@gnu.org; Mon, 06 May 2013 19:52:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  7 May 2013 01:50:07 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1334854.1367884343.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r493 - trunk/rapport_avance
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 May 2013 23:52:23 -0000

Author: danydb
Date: 2013-05-07 01:50:07 +0200 (Tue, 07 May 2013)
New Revision: 493

Modified:
   trunk/rapport_avance/index.php
Log:
Minimum version is 5220

Modified: trunk/rapport_avance/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/index.php	2013-05-06 23:47:15 UTC (rev 492)
+++ trunk/rapport_avance/index.php	2013-05-06 23:50:07 UTC (rev 493)
@@ -27,7 +27,7 @@
=20
 global $version_plugin;
 $version_plugin =3D SVNINFO;
-Extension::check_version(5100);
+Extension::check_version(5220);
 require_once 'class_phpcompta_sql.php';
 require_once 'rapav_constant.php';
 require_once 'class_impress.php';



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 07 20:00:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZrnd-0006RG-BD
	for mharc-phpcompta-dev@gnu.org; Tue, 07 May 2013 20:00:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  8 May 2013 01:57:45 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1336585.1367971200.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r494 - in trunk/rapport_avance/include: . template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 May 2013 23:59:59 -0000

Author: danydb
Date: 2013-05-08 01:57:44 +0200 (Wed, 08 May 2013)
New Revision: 494

Modified:
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/include/class_rapav_formulaire.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/declaration.inc.php
   trunk/rapport_avance/include/template/declaration_display.php
   trunk/rapport_avance/include/template/formulaire_definition.php
Log:
Task #0000818: Possibilit?\195?\169 d'avoir des ?\195?\169tapes dans d?\1=
95?\169claration

Ajout 7 jours, 14 jours, 1 mois, 3 mois

Modified: trunk/rapport_avance/include/class_rapav_declaration.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_declaration.php	2013-05-06 2=
3:50:07 UTC (rev 493)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-05-07 2=
3:57:44 UTC (rev 494)
@@ -50,8 +50,9 @@
 	static function to_csv($p_id)
 	{
 		global $cn;
-		$a_row=3D$cn->get_array('select dr_code,dr_libelle,dr_amount from rapp=
ort_advanced.declaration_row
-			where d_id=3D$1 order by dr_order',array($p_id));
+		$a_row=3D$cn->get_array('select dr_code,dr_libelle,dr_amount,dr_start,=
dr_end
+			from rapport_advanced.declaration_row
+			where d_id=3D$1 order by dr_order,dr_start',array($p_id));
=20
 		$a_title=3D$cn->get_array("select d_title
 			,to_char(d_start,'DD.MM.YYYY') as start
@@ -72,10 +73,12 @@
=20
 		for ($i =3D 0; $i < count($a_row); $i++)
 		{
-			printf ('"%s";"%s";%s'."\r\n",
+			printf ('"%s";"%s";%s;"%s";"%s"'."\r\n",
 					$a_row[$i]['dr_code'],
 					$a_row[$i]['dr_libelle'],
-					nb($a_row[$i]['dr_amount'])
+					nb($a_row[$i]['dr_amount']),
+					format_date($a_row[$i]['dr_start']),
+					format_date($a_row[$i]['dr_end'])
 					);
 		}
 	}
@@ -315,7 +318,15 @@
=20
=20
 	}
-	function compute($p_id, $p_start, $p_end)
+	/**
+	 *
+	 * @global $cn $cn
+	 * @param type $p_id
+	 * @param type $p_start
+	 * @param type $p_end
+	 * @param type $p_step
+	 */
+	function compute($p_id, $p_start, $p_end,$p_step)
 	{
 		global $cn;
 		$cn->start();
@@ -333,6 +344,7 @@
 		$this->d_filename=3D$this->form->f_filename;
 		$this->d_mimetype=3D$this->form->f_mimetype;
 		$this->d_size=3D$this->form->f_size;
+		$this->d_step=3D$p_step;
 		$this->insert();
 		/*
 		 * First we compute the formula and tva_code for each detail
@@ -341,38 +353,90 @@
 			from rapport_advanced.formulaire_param
 			where
 			f_id=3D$1
-			and p_type =3D3
 			order by p_order", array($p_id));
-		for ($i =3D 0; $i < count($array); $i++)
-		{
-			$row =3D new Rapav_Declaration_Param();
-			$row->d_id =3D $this->d_id;
-			$row->dr_id =3D $cn->get_next_seq('rapport_advanced.declaration_param=
_seq');
-			$row->from_array($array[$i]);
-			$row->compute($p_start, $p_end);
-			$row->insert();
-		}
-
 		/**
-		 * Add the lines missing lines
+		 * if step !=3D 0, recompute the date
 		 */
-		$array =3D $cn->get_array("select fp.p_id,p_code,p_libelle,p_type,p_or=
der,f_id,t_id
-			from rapport_advanced.formulaire_param as fp
-			where
-			f_id=3D$1
-			and p_type in (1,2,6,7,8)", array($p_id));
-		for ($i =3D 0; $i < count($array); $i++)
+		if ($p_step =3D=3D 0)
 		{
-			$row =3D new Rapav_Declaration_Param();
-			$row->d_id =3D $this->d_id;
-			$row->dr_id =3D $cn->get_next_seq('rapport_advanced.declaration_param=
_seq');
-			$row->from_array($array[$i]);
-			$row->amount =3D 0;
-			$row->insert();
+			// compute each row
+			for ($i =3D 0; $i < count($array); $i++)
+			{
+				$row =3D new Rapav_Declaration_Param();
+				$row->d_id =3D $this->d_id;
+				$row->dr_id =3D $cn->get_next_seq('rapport_advanced.declaration_para=
m_seq');
+				$row->from_array($array[$i]);
+				if ( $array[$i]['p_type']=3D=3D3) {
+					$row->compute($p_start, $p_end);
+				} else {
+					$row->amount =3D 0;
+				}
+				$row->dr_start=3D$p_start;
+				$row->dr_end=3D$p_end;
+				$row->insert();
+			}
 		}
+		else
+		{
+			// compute new date, stored in $this->start and $this->end
+			while ($this->compute_interval($p_start, $p_end, $p_step) =3D=3D 1)
+			{
+				for ($i =3D 0; $i < count($array); $i++)
+				{
+					$row =3D new Rapav_Declaration_Param();
+					$row->d_id =3D $this->d_id;
+					$row->dr_id =3D $cn->get_next_seq('rapport_advanced.declaration_par=
am_seq');
+					$row->from_array($array[$i]);
+					if ($array[$i]['p_type'] =3D=3D 3)
+					{
+						$row->compute($this->start, $this->end);
+						$row->dr_start=3D$this->start;
+						$row->dr_end=3D$this->end;
+						$row->insert();
+					}
+				}
+			}
=20
+
+		}
 		$cn->commit();
 	}
+	function compute_interval($p_start, $p_end, $p_step)
+	{
+		static $s_start =3D "";
+		static $s_count =3D 0;
+
+		if ($s_start =3D=3D "")
+		{
+			$s_start =3D $p_start;
+		}
+		$s_count++;
+		// initialize datetime object
+		$date_start =3D new DateTime(format_date($s_start, 'DD.MM.YYYY', 'YYYY=
/MM/DD'));
+		$date_end =3D new DateTime(format_date($s_start, 'DD.MM.YYYY', 'YYYY/M=
M/DD'));
+		$date_finish =3D new DateTime(format_date($p_end, 'DD.MM.YYYY', 'YYYY/=
MM/DD'));
+
+		$add =3D $this->get_interval($p_step);
+
+
+		if ($s_count > 1)	{ $date_start->add($add); $date_end->add($add);}
+		// compute date_end
+		$date_end->add($add);
+		$date_end->sub(new DateInterval('P1D'));
+
+		// if date_end > date_finish then stop
+		if ($date_end > $date_finish) 			return 0;
+
+		$this->start =3D $date_start->format("d.m.Y");
+		$this->end =3D $date_end->format("d.m.Y");
+		$s_start =3D $this->start;
+		return 1;
+	}
+	function get_interval($p_step)
+	{
+		$array_interval=3Darray("","P7D","P14D","P1M","P3M");
+		return new DateInterval($array_interval[$p_step]);
+	}
 	function anchor_document()
 	{
 		$url=3DHtmlInput::request_to_string(array('gDossier','ac','plugin_code=
'));
@@ -382,7 +446,7 @@
 	function display()
 	{
 		global $cn;
-		$array =3D $cn->get_array('select * from rapport_advanced.declaration_=
row where d_id=3D$1 order by dr_order', array($this->d_id));
+		$array =3D $cn->get_array('select * from rapport_advanced.declaration_=
row where d_id=3D$1 order by dr_order,dr_start', array($this->d_id));
 		require_once 'template/declaration_display.php';
 	}
=20
@@ -430,6 +494,8 @@
 		$data->d_id =3D $this->d_id;
 		$data->dr_id =3D $this->dr_id;
 		$data->dr_type =3D $this->param->p_type;
+		$data->dr_start=3D$this->dr_start;
+		$data->dr_end=3D$this->dr_end;
 		$data->insert();
 	}
=20
@@ -469,55 +535,55 @@
 	function compute_date($p_start, $p_end)
 	{
 		global $g_user;
-		switch ($this->param->t_id)
-		{
-			case 1:
-				$this->start =3D $p_start;
-				$this->end =3D $p_end;
+			switch ($this->param->t_id)
+			{
+				case 1:
+					$this->start =3D $p_start;
+					$this->end =3D $p_end;
 				return;
-				break;
-			case 2:
-				list($this->start, $this->end) =3D $g_user->get_limit_current_exerci=
ce();
+					break;
+				case 2:
+					list($this->start, $this->end) =3D $g_user->get_limit_current_exerc=
ice();
 				return;
-				break;
-			case 3:
-				$exercice =3D $g_user->get_exercice();
-				$exercice--;
-				break;
-			case 4:
-				$exercice =3D $g_user->get_exercice();
-				$exercice-=3D2;
-				break;
-			case 5:
-				$exercice =3D $g_user->get_exercice();
-				$exercice-=3D3;
-				break;
-			case 6:
-				list($this->start, $this->end) =3D $g_user->get_limit_current_exerci=
ce();
+					break;
+				case 3:
+					$exercice =3D $g_user->get_exercice();
+					$exercice--;
+					break;
+				case 4:
+					$exercice =3D $g_user->get_exercice();
+					$exercice-=3D2;
+					break;
+				case 5:
+					$exercice =3D $g_user->get_exercice();
+					$exercice-=3D3;
+					break;
+				case 6:
+					list($this->start, $this->end) =3D $g_user->get_limit_current_exerc=
ice();
 				$this->end=3D$p_end;
 				return;
-				break;
-			default:
-				throw new Exception('compute_date : t_id est incorrect');
-		}
-		global $cn;
+					break;
+				default:
+					throw new Exception('compute_date : t_id est incorrect');
+			}
+			global $cn;
=20
-		// If exercice does not exist then
-		// set the date end and start to 01.01.1900
+			// If exercice does not exist then
+			// set the date end and start to 01.01.1900
=20
-		$exist_exercice =3D $cn->get_value('select count(p_id) from parm_perio=
de where p_exercice=3D$1', array($exercice));
-		if ($exist_exercice =3D=3D 0)
-		{
-			$this->start =3D '01.01.1900';
-			$this->end =3D '01.01.1900';
+			$exist_exercice =3D $cn->get_value('select count(p_id) from parm_peri=
ode where p_exercice=3D$1', array($exercice));
+			if ($exist_exercice =3D=3D 0)
+			{
+				$this->start =3D '01.01.1900';
+				$this->end =3D '01.01.1900';
 			return;
+			}
+			// Retrieve start & end date
+			$periode =3D new Periode($cn);
+			list($per_start, $per_end) =3D $periode->get_limit($exercice);
+			$this->start =3D $per_start->first_day();
+			$this->end =3D $per_end->last_day();
 		}
-		// Retrieve start & end date
-		$periode =3D new Periode($cn);
-		list($per_start, $per_end) =3D $periode->get_limit($exercice);
-		$this->start =3D $per_start->first_day();
-		$this->end =3D $per_end->last_day();
-	}
=20
 	/*	 * *
 	 * @brief compute amount of all the detail of apport_advanced.formulair=
e_param

Modified: trunk/rapport_avance/include/class_rapav_formulaire.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_formulaire.php	2013-05-06 23=
:50:07 UTC (rev 493)
+++ trunk/rapport_avance/include/class_rapav_formulaire.php	2013-05-07 23=
:57:44 UTC (rev 494)
@@ -148,7 +148,6 @@
 		{
 			for ($i=3D0;$i<count($p_array['del_row']);$i++)
 			{
-				echo $p_array['del_row'][$i];
 				if (isNumber($p_array['del_row'][$i]) =3D=3D 1 &&  $p_array['del_row=
'][$i]!=3D-1) {
 					$cn->exec_sql('delete from rapport_advanced.formulaire_param where =
p_id=3D$1',array($p_array['del_row'][$i]));
 				}

Modified: trunk/rapport_avance/include/class_rapport_avance_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-05-06 =
23:50:07 UTC (rev 493)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-05-07 =
23:57:44 UTC (rev 494)
@@ -176,7 +176,8 @@
 			"d_filename"=3D>"d_filename",
 			"d_mimetype"=3D>"d_mimetype",
 			"d_size"=3D>"d_size",
-			"f_id"=3D>"f_id"
+			"f_id"=3D>"f_id",
+			'd_step'=3D>'d_step'
 		);
=20
 		$this->type =3D array(
@@ -192,7 +193,7 @@
 			"d_filename"=3D>"text",
 			"d_mimetype"=3D>"text",
 			"d_size"=3D>"numeric",
-
+			'd_step'=3D>'numeric'
 		);
=20
 		$this->default =3D array(
@@ -222,7 +223,9 @@
 			"dr_order"=3D>"dr_order",
 			"dr_code"=3D>"dr_code",
 			"dr_amount"=3D>"dr_amount",
-			"dr_type"=3D>"dr_type"
+			"dr_type"=3D>"dr_type",
+			"dr_start"=3D>"dr_start",
+			"dr_end"=3D>"dr_end"
 		);
=20
 		$this->type =3D array(
@@ -232,14 +235,15 @@
 			"dr_order"=3D>"text",
 			"dr_code"=3D>"numeric",
 			"dr_amount"=3D>"numeric",
-			"dr_type"=3D>"numeric"
-
+			"dr_type"=3D>"numeric",
+			"dr_start"=3D>"date",
+			"dr_end"=3D>"date"
 		);
=20
 		$this->default =3D array(
 		);
 		global $cn;
-
+		$this->date_format=3D'DD.MM.YYYY';
 		parent::__construct($cn, $p_id);
 	}
 }

Modified: trunk/rapport_avance/include/declaration.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/declaration.inc.php	2013-05-06 23:50:07 =
UTC (rev 493)
+++ trunk/rapport_avance/include/declaration.inc.php	2013-05-07 23:57:44 =
UTC (rev 494)
@@ -39,14 +39,14 @@
 	$decl->to_keep =3D 'Y';
 	$decl->f_id =3D $_POST['p_form'];
 	$decl->save();
-	$decl->generate_document();
+	if ( $decl->d_step =3D=3D 0 ) $decl->generate_document();
 	$decl->display();
 	echo '<p class=3D"notice">'._(' Sauv=C3=A9 ').date('d-m-Y H:i').'</p>';
=20
 	$ref_csv =3D HtmlInput::array_to_string(array('gDossier', 'plugin_code'=
, 'd_id'), $_REQUEST, 'extension.raw.php?');
 	$ref_csv.=3D"&amp;act=3Dexport_decla_csv";
 	echo HtmlInput::button_anchor("Export CSV", $ref_csv, 'export_id');
-	if ( $decl->d_filename !=3D '' ) echo $decl->anchor_document();
+	if ( $decl->d_filename !=3D '' && $decl->d_step=3D=3D0) echo $decl->anc=
hor_document();
 	exit();
 }
 /*
@@ -62,7 +62,7 @@
 	else
 	{
 		$decl->d_description=3D$_GET['p_description'];
-		$decl->compute($_GET['p_form'], $_GET['p_start'], $_GET['p_end']);
+		$decl->compute($_GET['p_form'], $_GET['p_start'], $_GET['p_end'],$_GET=
['p_step']);
 		echo '<form class=3D"print" method=3D"POST">';
 		echo HtmlInput::hidden('p_form', $_GET['p_form']);
 		$decl->display();
@@ -76,8 +76,18 @@
 $hidden =3D HtmlInput::array_to_hidden(array('gDossier', 'ac', 'plugin_c=
ode', 'sa'), $_GET);
 $select =3D new ISelect('p_form');
 $select->value =3D $cn->make_array('select f_id,f_title from rapport_adv=
anced.formulaire order by 2');
-$description=3Dnew IText('p_description');
-$description->size=3D80;
+$description=3Dnew ITextArea('p_description');
+$description->heigh=3D2;
+$description->width=3D80;
+
+$istep=3Dnew ISelect('p_step');
+$istep->value=3Darray(
+		array('label'=3D>'Aucun','value'=3D>0),
+		array('label'=3D>'7 jours','value'=3D>1),
+		array('label'=3D>'14 jours','value'=3D>2),
+		array('label'=3D>'1 mois','value'=3D>3),
+		array('label'=3D>'3 mois','value'=3D>4)
+		);
 ?>
 <form id=3D"declaration_form_id" method=3D"GET" onsubmit=3D"return valid=
ate()">
 	<?=3D $hidden?>
@@ -90,9 +100,9 @@
 				<?=3D $select->input()?>
 			</td>
 			</tr>
-	</table>
-	<p> Description <?=3D$description->input()?>
-	<table>
+			<tr>
+	<td> Description</td><td> <?=3D$description->input()?></td>
+	</tr>
 		<tr>
 			<td>
 				Date de d=C3=A9but
@@ -109,6 +119,14 @@
 				<?=3D $date_end->input()?>
 			</td>
 		</tr>
+		<tr>
+			<td>
+				Etape de
+			</td>
+			<td>
+				<?=3D $istep->input()?>
+			</td>
+		</tr>
 	</table>
 	</p>
 	<?=3D HtmlInput::submit('compute', 'G=C3=A9n=C3=A9rer')?>

Modified: trunk/rapport_avance/include/template/declaration_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/declaration_display.php	2013-05=
-06 23:50:07 UTC (rev 493)
+++ trunk/rapport_avance/include/template/declaration_display.php	2013-05=
-07 23:57:44 UTC (rev 494)
@@ -39,6 +39,7 @@
 	echo HtmlInput::hidden('d_id',$this->d_id);
 for ($i=3D0;$i<count($array);$i++):
 	$row=3D$array[$i];
+if ($this->d_step <> 0 ) $per=3D $row['dr_start']." : ".$row['dr_end'];
 switch($row['dr_type'])
 {
 	case 1:
@@ -54,7 +55,7 @@
 		$input=3Dnew INum('amount[]',$row['dr_amount']);
 		$input->size=3D15;
 		echo HtmlInput::hidden('code[]',$row['dr_id']);
-		echo '<p>'.$row['dr_code']." ".$row['dr_libelle']." =3D ".$input->inpu=
t().'</p>';
+		echo '<p>'.$row['dr_code']." ".$row['dr_libelle']." =3D ".$input->inpu=
t()."  $per ".' </p>';
 		break;
 	case 7:
 		echo '<p>'.$row['dr_libelle'].'</p>';
@@ -64,5 +65,6 @@
 		break;
=20
 }
+
 endfor;
 ?>
\ No newline at end of file

Modified: trunk/rapport_avance/include/template/formulaire_definition.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/formulaire_definition.php	2013-=
05-06 23:50:07 UTC (rev 493)
+++ trunk/rapport_avance/include/template/formulaire_definition.php	2013-=
05-07 23:57:44 UTC (rev 494)
@@ -33,7 +33,7 @@
 	<thead>
 	<tr>
 	<th>
-		A effacer
+		Effacer
 	</th>
 	<th style=3D"width:92px">
 		Code <?=3DHtmlInput::infobulle(200)?>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 07 20:00:43 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZroJ-0006yR-O0
	for mharc-phpcompta-dev@gnu.org; Tue, 07 May 2013 20:00:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  8 May 2013 01:58:32 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1336586.1367971243.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5222 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 May 2013 00:00:42 -0000

Author: danydb
Date: 2013-05-08 01:58:32 +0200 (Wed, 08 May 2013)
New Revision: 5222

Modified:
   phpcompta/trunk/include/ac_common.php
Log:
format_date vers 'YYYY/MM/DD'

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2013-05-06 23:48:59 UTC (rev 52=
21)
+++ phpcompta/trunk/include/ac_common.php	2013-05-07 23:58:32 UTC (rev 52=
22)
@@ -742,6 +742,9 @@
        case 'YYYYMMDD':
             $str_date =3D $date[0] . $date[1] . $date[2];
             break;
+		 case 'YYYY/MM/DD':
+            $str_date =3D $date[0] . '/' . $date[1] . '/' . $date[2];
+            break;
=20
 		}
     return $str_date;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 07 20:01:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZroq-00075G-UA
	for mharc-phpcompta-dev@gnu.org; Tue, 07 May 2013 20:01:16 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  8 May 2013 01:59:05 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1336587.1367971276.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5223 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 May 2013 00:01:15 -0000

Author: danydb
Date: 2013-05-08 01:59:05 +0200 (Wed, 08 May 2013)
New Revision: 5223

Modified:
   phpcompta/trunk/include/class_phpcompta_sql.php
Log:
Throw an exception if trying to use $this->date_format and date_format is=
 not defined

Modified: phpcompta/trunk/include/class_phpcompta_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_phpcompta_sql.php	2013-05-07 23:58:32 U=
TC (rev 5222)
+++ phpcompta/trunk/include/class_phpcompta_sql.php	2013-05-07 23:59:05 U=
TC (rev 5223)
@@ -135,6 +135,7 @@
 			switch ($this->type[$value])
 			{
 				case "date":
+					if ($this->date_format=3D=3D"")						throw new Exception('Format Da=
te invalide');
 					$par .=3D$sep. 'to_date($' . $idx . ",'" . $this->date_format . "')=
" ;
 					break;
 				default:



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 08 08:44:21 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ua3jJ-0005Dr-GI
	for mharc-phpcompta-dev@gnu.org; Wed, 08 May 2013 08:44:21 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  8 May 2013 14:42:08 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1337029.1368017060.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r495 - trunk/rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 May 2013 12:44:19 -0000

Author: danydb
Date: 2013-05-08 14:42:07 +0200 (Wed, 08 May 2013)
New Revision: 495

Modified:
   trunk/rapport_avance/include/class_rapav_declaration.php
Log:
Bug in datetime constructor, a format is given

Modified: trunk/rapport_avance/include/class_rapav_declaration.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_declaration.php	2013-05-07 2=
3:57:44 UTC (rev 494)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-05-08 1=
2:42:07 UTC (rev 495)
@@ -405,16 +405,16 @@
 	{
 		static $s_start =3D "";
 		static $s_count =3D 0;
-
+           =20
 		if ($s_start =3D=3D "")
 		{
 			$s_start =3D $p_start;
 		}
 		$s_count++;
 		// initialize datetime object
-		$date_start =3D new DateTime(format_date($s_start, 'DD.MM.YYYY', 'YYYY=
/MM/DD'));
-		$date_end =3D new DateTime(format_date($s_start, 'DD.MM.YYYY', 'YYYY/M=
M/DD'));
-		$date_finish =3D new DateTime(format_date($p_end, 'DD.MM.YYYY', 'YYYY/=
MM/DD'));
+		$date_start =3D DateTime::createFromFormat('d.m.Y',$s_start);
+		$date_end =3D DateTime::createFromFormat('d.m.Y',$s_start);
+		$date_finish =3D DateTime::createFromFormat('d.m.Y',$p_end);
=20
 		$add =3D $this->get_interval($p_step);
=20
@@ -423,10 +423,8 @@
 		// compute date_end
 		$date_end->add($add);
 		$date_end->sub(new DateInterval('P1D'));
-
 		// if date_end > date_finish then stop
 		if ($date_end > $date_finish) 			return 0;
-
 		$this->start =3D $date_start->format("d.m.Y");
 		$this->end =3D $date_end->format("d.m.Y");
 		$s_start =3D $this->start;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 15:21:31 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uassl-0002mP-91
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 15:21:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 10 May 2013 21:19:26 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340155.1368213690.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r496 - in trunk/rapport_avance: include sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 19:21:30 -0000

Author: danydb
Date: 2013-05-10 21:19:25 +0200 (Fri, 10 May 2013)
New Revision: 496

Modified:
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/include/declaration.inc.php
   trunk/rapport_avance/sql/upgrade3.sql
Log:
Add step of 2 months
Adapt SQL script

Modified: trunk/rapport_avance/include/class_rapav_declaration.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_declaration.php	2013-05-08 1=
2:42:07 UTC (rev 495)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-05-10 1=
9:19:25 UTC (rev 496)
@@ -432,7 +432,7 @@
 	}
 	function get_interval($p_step)
 	{
-		$array_interval=3Darray("","P7D","P14D","P1M","P3M");
+		$array_interval =3D array("", "P7D", "P14D", "P1M", "P2M", "P3M");
 		return new DateInterval($array_interval[$p_step]);
 	}
 	function anchor_document()

Modified: trunk/rapport_avance/include/declaration.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/declaration.inc.php	2013-05-08 12:42:07 =
UTC (rev 495)
+++ trunk/rapport_avance/include/declaration.inc.php	2013-05-10 19:19:25 =
UTC (rev 496)
@@ -39,7 +39,17 @@
 	$decl->to_keep =3D 'Y';
 	$decl->f_id =3D $_POST['p_form'];
 	$decl->save();
-	if ( $decl->d_step =3D=3D 0 ) $decl->generate_document();
+	if ( $decl->d_step =3D=3D 0 ) {
+		$decl->generate_document();
+	}	else
+	{
+		// get empty lob
+		$decl->d_filename =3D null;
+		$decl->d_size =3D null;
+		$decl->d_mimetype =3D null;
+		$decl->d_lob =3D null;
+		$decl->update();
+	}
 	$decl->display();
 	echo '<p class=3D"notice">'._(' Sauv=C3=A9 ').date('d-m-Y H:i').'</p>';
=20
@@ -86,8 +96,9 @@
 		array('label'=3D>'7 jours','value'=3D>1),
 		array('label'=3D>'14 jours','value'=3D>2),
 		array('label'=3D>'1 mois','value'=3D>3),
-		array('label'=3D>'3 mois','value'=3D>4)
-		);
+		array('label' =3D> '2 mois', 'value' =3D> 4),
+	array('label' =3D> '3 mois', 'value' =3D> 5)
+);
 ?>
 <form id=3D"declaration_form_id" method=3D"GET" onsubmit=3D"return valid=
ate()">
 	<?=3D $hidden?>

Modified: trunk/rapport_avance/sql/upgrade3.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/sql/upgrade3.sql	2013-05-08 12:42:07 UTC (rev 49=
5)
+++ trunk/rapport_avance/sql/upgrade3.sql	2013-05-10 19:19:25 UTC (rev 49=
6)
@@ -31,3 +31,8 @@
 ALTER TABLE rapport_advanced.declaration ADD COLUMN d_size bigint;
 COMMENT ON COLUMN rapport_advanced.declaration.d_size IS 'Size of the fi=
le';
=20
+ALTER TABLE rapport_advanced.declaration ADD COLUMN d_step numeric;
+
+ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_start date;
+
+ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_end date;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 15:36:36 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uat7M-0005hx-PC
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 15:36:36 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 10 May 2013 21:34:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340164.1368214595.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5224 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 19:36:35 -0000

Author: danydb
Date: 2013-05-10 21:34:30 +0200 (Fri, 10 May 2013)
New Revision: 5224

Modified:
   phpcompta/trunk/include/template/forecast_result.php
Log:
task #0000835: FORECAST : ajout totaux

Ajout du total r?\195?\169el dans les pr?\195?\169visions

Modified: phpcompta/trunk/include/template/forecast_result.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/forecast_result.php	2013-05-07 23:59=
:05 UTC (rev 5223)
+++ phpcompta/trunk/include/template/forecast_result.php	2013-05-10 19:34=
:30 UTC (rev 5224)
@@ -76,7 +76,21 @@
 <?php echo nbm( $tot);?>
 </td>
 </tr>
+		<tr>
+			<td>
+						<?php echo _('Total r=C3=A9el');
+						$tot_cat_real =3D 0;?>
+					</td>
+				<?php for ($h =3D 0; $h < count($aPeriode); $h++):?>
+				<td align=3D"right">
+				<?php=20
+				$tot_cat_real =3D bcadd($tot_cat_real, $aReal[$i][$e][$h]);
+				echo nbm($tot_cat_real);
+			?>
+			</td>
+				<?php endfor;?>
=20
+		</tr>
 <tr>
 <td>
 <?php echo _('Diff=C3=A9rence');?>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 16:42:40 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uau9I-0001MK-Qt
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 16:42:40 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 10 May 2013 22:40:38 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340225.1368218560.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5225 - in phpcompta/trunk: html html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 20:42:39 -0000

Author: danydb
Date: 2013-05-10 22:40:38 +0200 (Fri, 10 May 2013)
New Revision: 5225

Modified:
   phpcompta/trunk/html/ajax_history.php
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/include/class_acc_account_ledger.php
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/class_html_input.php
Log:
task #0000823: Mise en evidence des op?\195?\169rations lettr?\195?\169es

Mise en ?\195?\169vidence dans les d?\195?\169tails op?\195?\169ration

Modified: phpcompta/trunk/html/ajax_history.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_history.php	2013-05-10 19:34:30 UTC (rev 52=
24)
+++ phpcompta/trunk/html/ajax_history.php	2013-05-10 20:40:38 UTC (rev 52=
25)
@@ -44,7 +44,7 @@
 /* security */
 if ( $g_user->check_dossier(dossier::id(),true) =3D=3D 'X' ) exit();
=20
-$from_div=3D(isset ($_REQUEST['ajax']))?1:0;
+$from_div =3D (isset($_REQUEST['ajax'])) ? 1 : $_GET['l'];
=20
 ////////////////////////////////////////////////////////////////////////=
///
 /* first detail for a card */

Modified: phpcompta/trunk/html/js/acc_ledger.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/acc_ledger.js	2013-05-10 19:34:30 UTC (rev 52=
24)
+++ phpcompta/trunk/html/js/acc_ledger.js	2013-05-10 20:40:38 UTC (rev 52=
25)
@@ -563,7 +563,7 @@
     id=3D'det'+layer;
     var popup=3D{'id':  id,'cssclass':'inner_box','html':loading(),'drag=
':true};
=20
-    querystring=3D'gDossier=3D'+dossier+'&act=3Dde&pcm_val=3D'+p_value+'=
&div=3D'+id;
+    querystring=3D'gDossier=3D'+dossier+'&act=3Dde&pcm_val=3D'+p_value+'=
&div=3D'+id+"&l=3D"+layer;
     add_div(popup);
=20
     var action=3Dnew Ajax.Request(
@@ -622,7 +622,7 @@
            ,'html':
            loading(),'drag':
                true};
-    querystring=3D'gDossier=3D'+dossier+'&act=3Dde&f_id=3D'+p_value+'&di=
v=3D'+id;
+    querystring=3D'gDossier=3D'+dossier+'&act=3Dde&f_id=3D'+p_value+'&di=
v=3D'+id+"&l=3D"+layer;
     add_div(popup);
     var action=3Dnew Ajax.Request(
                    "ajax_history.php",
@@ -938,4 +938,35 @@
 		{
 			view_history_account($(ctl).value, dossier);
 		}
+}
+var previous=3D[];
+function show_reconcile(p_div,p_let)
+{
+	try
+	{
+		if (previous.length !=3D 0)
+			{
+				var count_elt=3Dprevious.length;
+				var i=3D0;
+				for (i=3D0;i<count_elt;i++){
+					previous[i].style.backgroundColor=3D'';
+					previous[i].style.color=3D'';
+				}
+			}
+		var name=3D'tr_'+p_let+'_'+p_div;
+		var elt=3Ddocument.getElementsByName(name);
+		previous=3Delt;
+		var count_elt=3Delt.length;
+		var i=3D0;
+		for (i=3D0;i<count_elt;i++){
+			elt[i].style.backgroundColor=3D'#000066';
+			elt[i].style.color=3D'white';
+		}
+
+	} catch (e)
+	{
+		alert(e.message);
+	}
+
+
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/class_acc_account_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_account_ledger.php	2013-05-10 19:34=
:30 UTC (rev 5224)
+++ phpcompta/trunk/include/class_acc_account_ledger.php	2013-05-10 20:40=
:38 UTC (rev 5225)
@@ -352,11 +352,15 @@
 	$idx=3D0;
         foreach ( $this->row as $op )
         {
-            $vw_operation=3Dsprintf('<A class=3D"detail" style=3D"text-d=
ecoration:underline" HREF=3D"javascript:modifyOperation(\'%s\',\'%s\')" >=
%s</A>',
-                                  $op['jr_id'], dossier::id(), $op['jr_i=
nternal']);
-            $let=3D'';
-            if ( $op['letter'] !=3D-1) $let=3D  strtoupper (base_convert=
 ( $op['letter'],10,36));
-	    $tmp_diff=3Dbcsub($op['deb_montant'],$op['cred_montant']);
+            $vw_operation =3D sprintf('<A class=3D"detail" style=3D"text=
-decoration:underline;color:red" HREF=3D"javascript:modifyOperation(\'%s\=
',\'%s\')" >%s</A>', $op['jr_id'], dossier::id(), $op['jr_internal']);
+            $let =3D '';
+			$html_let =3D "";
+			if ($op['letter'] !=3D -1)
+			{
+				$let =3D strtoupper(base_convert($op['letter'], 10, 36));
+				$html_let =3D HtmlInput::show_reconcile($from_div, $let);
+			}
+			$tmp_diff=3Dbcsub($op['deb_montant'],$op['cred_montant']);
=20
 	    /*
 	     * reset prog. balance to zero if we change of exercice
@@ -390,8 +394,8 @@
 		if ($idx%2 =3D=3D 0) $class=3D'class=3D"odd"'; else $class=3D' class=3D=
"even"';
 		$idx++;
=20
-	    echo "<TR $class>".
-	      "<TD>".smaller_date(format_date($op['j_date']))."</TD>".
+	    echo "<TR $class name=3D\"tr_" . $let . "_" . $from_div . "\">" .
+			"<TD>".smaller_date(format_date($op['j_date']))."</TD>".
 	      td(h($op['jr_pj_number'])).
 	      "<TD>".$vw_operation."</TD>".
 	      "<TD>".h($op['description'])."</TD>".
@@ -399,8 +403,8 @@
 	      "<TD style=3D\"text-align:right\">".nbm($op['cred_montant'])."</T=
D>".
 	      td(nbm(abs($progress)).$side,'style=3D"text-align:right"').
=20
-	      td($let,' style=3D"color:red;text-align:right"').
-	      "</TR>";
+	      td($html_let, ' style=3D"color:red;text-align:right"') .
+			"</TR>";
 	    $old_exercice=3D$op['p_exercice'];
         }
         echo '<tfoot>';

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-05-10 19:34:30 UTC (rev =
5224)
+++ phpcompta/trunk/include/class_fiche.php	2013-05-10 20:40:38 UTC (rev =
5225)
@@ -1265,8 +1265,8 @@
 	  }
 	else
 	  {
-	    echo "<TABLE class=3D\"result\" style=3D\"width:100%;border-collaps=
e:separate;border-spacing:2px\">";
-	  }
+	    echo "<TABLE id=3D\"tb" . $from_div . "\"class=3D\"result\" style=3D=
\"width:100%;border-collapse:separate;border-spacing:2px\">";
+		}
         echo '<tbody>';
         echo "<TR>".
         "<TH style=3D\"text-align:left\">"._('Date')."</TH>".
@@ -1284,13 +1284,16 @@
 	$idx=3D0;
         foreach ( $this->row as $op )
         {
-            $vw_operation=3Dsprintf('<A class=3D"detail" style=3D"text-d=
ecoration:underline" HREF=3D"javascript:modifyOperation(\'%s\',\'%s\')" >=
%s</A>',
-                                  $op['jr_id'], dossier::id(), $op['jr_i=
nternal']);
-            $let=3D'';
-            if ( $op['letter'] !=3D-1) $let=3D  strtoupper(base_convert(=
$op['letter'],10,36));
+            $vw_operation =3D sprintf('<A class=3D"detail" style=3D"text=
-decoration:underline;color:red" HREF=3D"javascript:modifyOperation(\'%s\=
',\'%s\')" >%s</A>', $op['jr_id'], dossier::id(), $op['jr_internal']);
+            $let =3D '';
+			$html_let =3D "";
+			if ($op['letter'] !=3D -1)
+			{
+				$let =3D strtoupper(base_convert($op['letter'], 10, 36));
+				$html_let =3D HtmlInput::show_reconcile($from_div, $let);
+			}
+			$tmp_diff=3Dbcsub($op['deb_montant'],$op['cred_montant']);
=20
-	    $tmp_diff=3Dbcsub($op['deb_montant'],$op['cred_montant']);
-
 	    /*
 	     * reset prog. balance to zero if we change of exercice
 	     */
@@ -1322,16 +1325,16 @@
 		if ($idx%2 =3D=3D 0) $class=3D'class=3D"odd"'; else $class=3D' class=3D=
"even"';
 		$idx++;
=20
-	    echo "<TR $class>".
-	      "<TD>".smaller_date(format_date($op['j_date_fmt']))."</TD>".
+	    echo "<TR $class name=3D\"tr_" . $let . "_" . $from_div . "\">" .
+			"<TD>".smaller_date(format_date($op['j_date_fmt']))."</TD>".
 	      td(h($op['jr_pj_number'])).
             "<TD>".$vw_operation."</TD>".
             "<TD>".h($op['description'])."</TD>".
             "<TD style=3D\"text-align:right\">".nbm($op['deb_montant']).=
"</TD>".
 	      "<TD style=3D\"text-align:right\">".nbm($op['cred_montant'])."</T=
D>".
 	      td(nbm(abs($progress)).$side,'style=3D"text-align:right"').
-            td($let,' style=3D"color:red;text-align:right"').
-            "</TR>";
+            td($html_let, ' style=3D"text-align:right"') .
+			"</TR>";
 	    $old_exercice=3D$op['p_exercice'];
=20
         }

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-05-10 19:34:30 UTC =
(rev 5224)
+++ phpcompta/trunk/include/class_html_input.php	2013-05-10 20:40:38 UTC =
(rev 5225)
@@ -722,4 +722,11 @@
 			";
 		return $r;
 	}
+
+	static function show_reconcile($p_div, $let)
+	{
+		$r =3D '<A  style=3D"color:red;" href=3D"javascript:void(0)" onclick=3D=
"show_reconcile(\'' . $p_div . '\',\'' . $let . '\')">' . $let . '</A>';
+		return $r;
+	}
+
 }
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 16:43:18 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uau9u-0001P8-0l
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 16:43:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 10 May 2013 22:41:17 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340226.1368218597.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5226 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 20:43:16 -0000

Author: danydb
Date: 2013-05-10 22:41:17 +0200 (Fri, 10 May 2013)
New Revision: 5226

Modified:
   phpcompta/trunk/html/style.css
Log:
Am?\195?\169liore apparence

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-05-10 20:40:38 UTC (rev 5225)
+++ phpcompta/trunk/html/style.css	2013-05-10 20:41:17 UTC (rev 5226)
@@ -68,7 +68,7 @@
   margin:0px;
 }
 h2.info {
-  background-color:darkblue;
+  background-color:#879ed4;
 	color:white;
 	font-size:14px;
   text-align:center;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 16:48:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UauF1-0002gw-JJ
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 16:48:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 10 May 2013 22:46:35 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340229.1368218915.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5227 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 20:48:34 -0000

Author: danydb
Date: 2013-05-10 22:46:34 +0200 (Fri, 10 May 2013)
New Revision: 5227

Modified:
   phpcompta/trunk/include/class_html_input.php
Log:
task #0000830: GESTION : sous-?\195?\169cran lettrage

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-05-10 20:41:17 UTC =
(rev 5226)
+++ phpcompta/trunk/include/class_html_input.php	2013-05-10 20:46:34 UTC =
(rev 5227)
@@ -725,7 +725,7 @@
=20
 	static function show_reconcile($p_div, $let)
 	{
-		$r =3D '<A  style=3D"color:red;" href=3D"javascript:void(0)" onclick=3D=
"show_reconcile(\'' . $p_div . '\',\'' . $let . '\')">' . $let . '</A>';
+		$r =3D '<A  style=3D"color:red;text-decoration:underline" href=3D"java=
script:void(0)" onclick=3D"show_reconcile(\'' . $p_div . '\',\'' . $let .=
 '\')">' . $let . '</A>';
 		return $r;
 	}
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 17:47:05 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uav9d-0007h1-OO
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 17:47:05 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 10 May 2013 23:45:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340261.1368222425.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5228 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 21:47:04 -0000

Author: danydb
Date: 2013-05-10 23:45:03 +0200 (Fri, 10 May 2013)
New Revision: 5228

Modified:
   phpcompta/trunk/include/balance_card.inc.php
   phpcompta/trunk/include/category_card.inc.php
   phpcompta/trunk/include/category_followup.inc.php
   phpcompta/trunk/include/category_operation.inc.php
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/lettering.gestion.inc.php
Log:
task #827 : ajout nom tiers + quick_code

Modified: phpcompta/trunk/include/balance_card.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/balance_card.inc.php	2013-05-10 20:46:34 UTC =
(rev 5227)
+++ phpcompta/trunk/include/balance_card.inc.php	2013-05-10 21:45:03 UTC =
(rev 5228)
@@ -26,6 +26,7 @@
 require_once('class_exercice.php');
 global $g_user;
 echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
+echo $f->get_gestion_title();
 $exercice=3Dnew Exercice($cn);
 $old=3D'';
 $fiche=3Dnew Fiche($cn,$_GET['f_id']);

Modified: phpcompta/trunk/include/category_card.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/category_card.inc.php	2013-05-10 20:46:34 UTC=
 (rev 5227)
+++ phpcompta/trunk/include/category_card.inc.php	2013-05-10 21:45:03 UTC=
 (rev 5228)
@@ -109,9 +109,11 @@
 if ( $ss_action =3D=3D 'cn')
 {
     echo '<div class=3D"content">';
-    echo dossier::hidden();
-    $f=3Dnew Fiche($cn,$_REQUEST['f_id']);
-    $contact=3Dnew Contact($cn);
+
+	echo dossier::hidden();
+	$f =3D new Fiche($cn, $_REQUEST['f_id']);
+	echo $f->get_gestion_title();
+	$contact=3Dnew Contact($cn);
     $contact->company=3D$f->get_quick_code();
     echo $contact->summary("");
=20

Modified: phpcompta/trunk/include/category_followup.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/category_followup.inc.php	2013-05-10 20:46:34=
 UTC (rev 5227)
+++ phpcompta/trunk/include/category_followup.inc.php	2013-05-10 21:45:03=
 UTC (rev 5228)
@@ -44,7 +44,9 @@
 $fiche=3Dnew Fiche($cn,$_REQUEST['f_id']);
=20
 $_GET['qcode']=3D$fiche->get_quick_code();
-$_REQUEST['qcode']=3D$fiche->get_quick_code();
+$_REQUEST['qcode'] =3D $fiche->get_quick_code();
+
 echo '<div class=3D"content">';
+echo $fiche->get_gestion_title();
 require_once('action.common.inc.php');
 echo '</div>';

Modified: phpcompta/trunk/include/category_operation.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/category_operation.inc.php	2013-05-10 20:46:3=
4 UTC (rev 5227)
+++ phpcompta/trunk/include/category_operation.inc.php	2013-05-10 21:45:0=
3 UTC (rev 5228)
@@ -36,5 +36,7 @@
 $_REQUEST['qcode']=3D$qcode;
 $var_array=3Dcompute_variable('ledger_type=3DALL');
 put_global($var_array);
+echo $f->get_gestion_title();
+
 require_once ('history_operation.inc.php');
=20

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-05-10 20:46:34 UTC (rev =
5227)
+++ phpcompta/trunk/include/class_fiche.php	2013-05-10 21:45:03 UTC (rev =
5228)
@@ -1899,5 +1899,12 @@
             print_r($empty);
         }
     }
+
+	function get_gestion_title()
+	{
+		$r =3D "<h2>" . h($this->getName()) . " " . h($this->getAttribut(ATTR_=
DEF_FIRST_NAME)) . '[' . $this->get_quick_code() . ']</h2>';
+		return $r;
+	}
 }
+
 ?>

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-10 20:46:34 UTC (rev 522=
7)
+++ phpcompta/trunk/include/constant.php	2013-05-10 21:45:03 UTC (rev 522=
8)
@@ -35,6 +35,7 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
+ define ('SVNINFO',5900);
 $version_phpcompta=3DSVNINFO;
 define ("DEBUG",false);
 /* define ('SVNINFO',5015);

Modified: phpcompta/trunk/include/lettering.gestion.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/lettering.gestion.inc.php	2013-05-10 20:46:34=
 UTC (rev 5227)
+++ phpcompta/trunk/include/lettering.gestion.inc.php	2013-05-10 21:45:03=
 UTC (rev 5228)
@@ -2,6 +2,8 @@
 require_once('class_lettering.php');
 global $g_user;
 echo '<div class=3D"content">';
+echo $f->get_gestion_title();
+
 echo '<div id=3D"search">';
 echo '<FORM METHOD=3D"GET">';
 echo dossier::hidden();



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 18:05:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UavR6-00023P-6G
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 18:05:08 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 00:03:05 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340264.1368223507.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5229 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 22:05:06 -0000

Author: danydb
Date: 2013-05-11 00:03:05 +0200 (Sat, 11 May 2013)
New Revision: 5229

Modified:
   phpcompta/trunk/include/template/letter_all.php
   phpcompta/trunk/include/template/letter_prop.php
Log:
task #0000836: Dans lettrage -> d?\195?\169tail il faut la diff?\195?\169=
rence

Modified: phpcompta/trunk/include/template/letter_all.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/letter_all.php	2013-05-10 21:45:03 U=
TC (rev 5228)
+++ phpcompta/trunk/include/template/letter_all.php	2013-05-10 22:03:05 U=
TC (rev 5229)
@@ -9,8 +9,8 @@
 ?>
   <h2 class=3D"info2"><?=3D_('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat trouv=
=C3=A9')?></h2>
=20
-<?      exit();
-endif;?>
+<?php exit();
+  endif;?>
   <table class=3D"result">
 <tr>
 <th>

Modified: phpcompta/trunk/include/template/letter_prop.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/letter_prop.php	2013-05-10 21:45:03 =
UTC (rev 5228)
+++ phpcompta/trunk/include/template/letter_prop.php	2013-05-10 22:03:05 =
UTC (rev 5229)
@@ -7,8 +7,9 @@
 ?>
   <h2 class=3D"info2"><?=3D_('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat trouv=
=C3=A9')?></h2>
=20
-<?
+    <?php
   else :
+$delta=3D0;
 ?>
 <table class=3D"result">
 <tr>
@@ -136,18 +137,25 @@
 </td>
=20
 </tr>
-<?
+<?php
 if ($i<$linked_limit)
 {
   $amount_deb+=3D( $jnt_id =3D=3D $this->content[$i]['letter'] && $this-=
>content[$i]['j_debit']=3D=3D't')?$this->content[$i]['j_montant']:0;
   $amount_cred+=3D( $jnt_id =3D=3D $this->content[$i]['letter'] && $this=
->content[$i]['j_debit']=3D=3D'f')?$this->content[$i]['j_montant']:0;
 }
     endfor;
+$delta =3D bcsub($amount_deb, $amount_cred);
+$side =3D 'Cr=C3=A9diteur';
+if ($delta < 0 ) {
+$side =3D "D=C3=A9biteur";
+$delta =3D abs($delta);
+}
 ?>
 </TABLE>
   <h2 class=3D"info"> Total lettr=C3=A9</h2>
 <span style=3D"display:block;font-size:14px"><?=3D_('Total Debit')?>   <=
?=3D$amount_deb?></span>
 <span style=3D"display:block;font-size:14px"><?=3D_('Total Credit')?>   =
<?=3D$amount_cred?></span>
+<span style=3D"display:block;font-size:14px"><?=3D_('Total ').$side?>   =
<?=3D$delta?></span>
=20
 <?php endif;?>
 <?=3DHtmlInput::button('check_all','S=C3=A9lectionner tout',' onclick=3D=
"select_checkbox(\'letter_form\')"');?>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 18:07:59 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UavTr-0002I0-Ps
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 18:07:59 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 00:05:58 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340267.1368223679.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5230 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 22:07:59 -0000

Author: danydb
Date: 2013-05-11 00:05:58 +0200 (Sat, 11 May 2013)
New Revision: 5230

Modified:
   phpcompta/trunk/include/template/dashboard.php
Log:
task #0000806: Apparence Tableau de bord

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-05-10 22:03:05 UT=
C (rev 5229)
+++ phpcompta/trunk/include/template/dashboard.php	2013-05-10 22:05:58 UT=
C (rev 5230)
@@ -157,9 +157,16 @@
  } else {
   echo '<fieldset style=3D"width:50%;background-color:white"><legend>'._=
('Aucun rapport d=C3=A9fini').'</legend>';
   echo '<a href=3D"do.php?'.dossier::get().'&ac=3DPREFERENCE">'._('Cliqu=
ez ici pour mettre =C3=A0 jour vos pr=C3=A9f=C3=A9rences').'</a>';
-  echo '</fieldset>';
- }
+echo '<table>';
+for ($e =3D 0;$e<10;$e++){
+echo '<tr><td></td></tr>';
+}
+echo '</table>';
=20
+echo '</fieldset>';
+echo '</div>';
+}
+
 ?>
 </div>
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 18:15:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uavaf-0003Ph-Jm
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 18:15:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 00:12:59 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340270.1368224100.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5231 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 22:15:00 -0000

Author: danydb
Date: 2013-05-11 00:12:58 +0200 (Sat, 11 May 2013)
New Revision: 5231

Modified:
   phpcompta/trunk/include/adm.inc.php
   phpcompta/trunk/include/bank.inc.php
   phpcompta/trunk/include/client.inc.php
   phpcompta/trunk/include/supplier.inc.php
Log:
task #0000829: GESTION : ajout exercice

Modified: phpcompta/trunk/include/adm.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/adm.inc.php	2013-05-10 22:05:58 UTC (rev 5230=
)
+++ phpcompta/trunk/include/adm.inc.php	2013-05-10 22:12:58 UTC (rev 5231=
)
@@ -73,9 +73,10 @@
     ?>
     <div class=3D"content">
                            <div>
-                                        <form method=3D"get" action=3D"<=
?php echo $href; ?>">
-                                                                  <?php
-                                                                  echo d=
ossier::hidden();
+	<form method=3D"get" action=3D"<?php echo $href; ?>">
+	<?php
+	echo '<h2>' . "Exercice " . $g_user->get_exercice() . '</h2>';
+	echo dossier::hidden();
     $a=3D(isset($_GET['query']))?$_GET['query']:"";
     printf (_('Recherche').' <input class=3D"input_text" type=3D"text" n=
ame=3D"query" value=3D"%s">',
             $a);

Modified: phpcompta/trunk/include/bank.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/bank.inc.php	2013-05-10 22:05:58 UTC (rev 523=
0)
+++ phpcompta/trunk/include/bank.inc.php	2013-05-10 22:12:58 UTC (rev 523=
1)
@@ -66,10 +66,11 @@
=20
     ?>
     <div class=3D"content">
-                           <div>
-                                        <form method=3D"get" action=3D"<=
?php echo $href; ?>">
-                                                                  <?php
-                                                                  echo d=
ossier::hidden();
+	<div>
+				 <form method=3D"get" action=3D"<?php echo $href; ?>">
+	<?php
+	echo dossier::hidden();
+	echo '<h2>' . "Exercice " . $g_user->get_exercice() . '</h2>';
     $a=3D(isset($_GET['query']))?$_GET['query']:"";
     printf (_('Recherche').' <input class=3D"input_text" type=3D"text" n=
ame=3D"query" value=3D"%s">',
             $a);

Modified: phpcompta/trunk/include/client.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/client.inc.php	2013-05-10 22:05:58 UTC (rev 5=
230)
+++ phpcompta/trunk/include/client.inc.php	2013-05-10 22:12:58 UTC (rev 5=
231)
@@ -68,6 +68,7 @@
         <div>
     	<form method=3D"get" action=3D"<?php echo $href;?>">
 		<?php
+		echo '<h2>' . "Exercice " . $g_user->get_exercice() . '</h2>';
 		echo dossier::hidden();
 		$a =3D (isset($_GET['query'])) ? $_GET['query'] : "";
 		printf(_('Recherche') . ' <input class=3D"input_text" type=3D"text" na=
me=3D"query" value=3D"%s">', $a);

Modified: phpcompta/trunk/include/supplier.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/supplier.inc.php	2013-05-10 22:05:58 UTC (rev=
 5230)
+++ phpcompta/trunk/include/supplier.inc.php	2013-05-10 22:12:58 UTC (rev=
 5231)
@@ -72,8 +72,9 @@
     <div class=3D"content">
                            <div>
                                         <form method=3D"get" action=3D"<=
?php echo $href; ?>">
-                                                                  <?php
-                                                                  echo d=
ossier::hidden();
+	<?php
+	echo '<h2>' . "Exercice " . $g_user->get_exercice() . '</h2>';
+	echo dossier::hidden();
     $a=3D(isset($_GET['query']))?$_GET['query']:"";
     printf (_('Recherche').' <input class=3D"input_text" type=3D"text" n=
ame=3D"query" value=3D"%s">',
             $a);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 18:23:57 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UavjJ-0004Zg-DH
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 18:23:57 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 00:21:56 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340273.1368224637.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5232 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 22:23:56 -0000

Author: danydb
Date: 2013-05-11 00:21:56 +0200 (Sat, 11 May 2013)
New Revision: 5232

Modified:
   phpcompta/trunk/include/class_fiche.php
Log:
task #0000828: GESTION : Bouton exercice

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-05-10 22:12:58 UTC (rev =
5231)
+++ phpcompta/trunk/include/class_fiche.php	2013-05-10 22:21:56 UTC (rev =
5232)
@@ -1248,12 +1248,15 @@
         if ( $p_array =3D=3D null)
             $p_array=3D$_REQUEST;
         $progress=3D0;
-        $name=3Dh($this->getName()).'['.$this->strAttribut(ATTR_DEF_QUIC=
KCODE).']';
+		// if from_periode is greater than to periode then swap the values
+		if (cmpDate($p_array['from_periode'],$p_array['to_periode']) > 0)
+		{
+			$tmp=3D$p_array['from_periode'];
+			$p_array['from_periode']=3D$p_array['to_periode'];
+			$p_array['to_periode']=3D$tmp;
=20
-        list($array,$tot_deb,$tot_cred)=3D$this->get_row_date( $p_array[=
'from_periode'],
-                                        $p_array['to_periode'],
-                                        $op_let
-                                                           );
+		}
+        list($array, $tot_deb, $tot_cred) =3D $this->get_row_date($p_arr=
ay['from_periode'], $p_array['to_periode'], $op_let);
=20
         if ( count($this->row ) =3D=3D 0 )
             return -1;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 10 18:24:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UavjU-0004aG-I4
	for mharc-phpcompta-dev@gnu.org; Fri, 10 May 2013 18:24:08 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 00:22:07 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340274.1368224648.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5233 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 22:24:07 -0000

Author: danydb
Date: 2013-05-11 00:22:07 +0200 (Sat, 11 May 2013)
New Revision: 5233

Modified:
   phpcompta/trunk/include/balance_card.inc.php
Log:
cosmetic

Modified: phpcompta/trunk/include/balance_card.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/balance_card.inc.php	2013-05-10 22:21:56 UTC =
(rev 5232)
+++ phpcompta/trunk/include/balance_card.inc.php	2013-05-10 22:22:07 UTC =
(rev 5233)
@@ -25,7 +25,7 @@
  */
 require_once('class_exercice.php');
 global $g_user;
-echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
+echo '<div class=3D"content" style=3D"width:90%;margin-left:5%">';
 echo $f->get_gestion_title();
 $exercice=3Dnew Exercice($cn);
 $old=3D'';



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 13:17:06 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbDPu-0005Zh-TH
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 13:17:06 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 19:15:07 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340781.1368292626.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5234 - phpcompta/trunk/html/js
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 17:17:06 -0000

Author: danydb
Date: 2013-05-11 19:15:06 +0200 (Sat, 11 May 2013)
New Revision: 5234

Modified:
   phpcompta/trunk/html/js/card.js
Log:
centre detail fiche

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2013-05-10 22:22:07 UTC (rev 5233)
+++ phpcompta/trunk/html/js/card.js	2013-05-11 17:15:06 UTC (rev 5234)
@@ -327,7 +327,8 @@
=20
     var content=3D'card_'+card_layer;
     var nTop=3DposY-40;
-    var nLeft=3DposX-20;
+    //var nLeft=3DposX-20;
+	var nLeft=3D"20%";
     var str_style=3D"top:"+nTop+";left:"+nLeft+";width:45em;height:auto"=
;
=20
     var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 13:20:18 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbDT0-0006FM-Q3
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 13:20:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 19:18:20 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340786.1368292818.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5235 - in phpcompta/trunk: html html/js include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 17:20:17 -0000

Author: danydb
Date: 2013-05-11 19:18:19 +0200 (Sat, 11 May 2013)
New Revision: 5235

Modified:
   phpcompta/trunk/html/ajax_poste.php
   phpcompta/trunk/html/js/accounting_item.js
   phpcompta/trunk/include/param_pcmn.inc.php
   phpcompta/trunk/include/template/account_result.php
Log:
task #0000813: plan comptable - quick code

Visible dans le popup quand on remplit les fiches et dans CFGPCMN

Modified: phpcompta/trunk/html/ajax_poste.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_poste.php	2013-05-11 17:15:06 UTC (rev 5234=
)
+++ phpcompta/trunk/html/ajax_poste.php	2013-05-11 17:18:19 UTC (rev 5235=
)
@@ -99,8 +99,9 @@
=20
=20
     $r.=3D'</form>';
-    $sql=3D"select pcm_val,pcm_lib,pcm_val_parent,pcm_type ".
-         " from tmp_pcmn ";
+    $sql=3D"
+		select pcm_val,pcm_lib,array_to_string(array_agg(j_qcode) , ',') as ac=
ode
+		from tmp_pcmn left join vw_poste_qcode on (j_poste=3Dpcm_val) ";
     $sep=3D" where ";
     /* build the sql stmt */
     if ( isset($j) && $j > 0 && isNumber($j))
@@ -121,7 +122,7 @@
         $sql.=3Dsprintf(" $sep ( pcm_val::text like '%s%%' or pcm_lib::t=
ext ilike '%%%s%%') ",
                       $q,$q);
     }
-    $sql.=3D' order by pcm_val::text limit 50';
+    $sql.=3D' group by pcm_val,pcm_lib,pcm_val_parent, pcm_type  order b=
y pcm_val::text limit 50';
     if ( isset($q) && strlen(trim($q))> 0 )
     {
         $array=3D$cn->get_array($sql);

Modified: phpcompta/trunk/html/js/accounting_item.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/accounting_item.js	2013-05-11 17:15:06 UTC (r=
ev 5234)
+++ phpcompta/trunk/html/js/accounting_item.js	2013-05-11 17:18:19 UTC (r=
ev 5235)
@@ -75,7 +75,7 @@
             sx=3Ddocument.body.scrollTop+60;
 	}
=20
-	var div_style=3D"z-index:15;top:"+sx;
+	var div_style=3D"top:"+sx;
 	removeDiv('search_account');
 	add_div({id:'search_account',cssclass:'inner_box',html:loading(),style:=
div_style,drag:true});
=20

Modified: phpcompta/trunk/include/param_pcmn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_pcmn.inc.php	2013-05-11 17:15:06 UTC (r=
ev 5234)
+++ phpcompta/trunk/include/param_pcmn.inc.php	2013-05-11 17:18:19 UTC (r=
ev 5235)
@@ -239,7 +239,9 @@
     }
 }
=20
-$Ret=3D$cn->exec_sql("select pcm_val,pcm_lib,pcm_val_parent,pcm_type fro=
m tmp_pcmn where substr(pcm_val::text,1,1)=3D'".$_SESSION['g_start']."' o=
rder by pcm_val::text");
+$Ret=3D$cn->exec_sql("select pcm_val,pcm_lib,pcm_val_parent,pcm_type,arr=
ay_to_string(array_agg(j_qcode) , ',') as acode
+	from tmp_pcmn left join vw_poste_qcode on (j_poste=3Dpcm_val) where sub=
str(pcm_val::text,1,1)=3D'".$_SESSION['g_start']."'".
+		"  group by pcm_val,pcm_lib,pcm_val_parent, pcm_type  order by pcm_val=
::text");
 $MaxRow=3DDatabase::num_row($Ret);
=20
 ?>
@@ -256,11 +258,13 @@
                              <TH> Libell=C3=A9 </TH>
                              <TH> Poste comptable Parent </TH>
                              <TH> Type </TH>
+                             <TH> Fiche</TH>
                              </TR>
-                             <?php
-                             $line=3Dnew Acc_Account($cn);
+<?php
+$line=3Dnew Acc_Account($cn);
 echo $line->form(false);
 ?>
+							 <td></td>
 <TD>
 <INPUT TYPE=3D"SUBMIT" class=3D"button" Value=3D"Ajout" Name=3D"Ajout">
                                        </TD>
@@ -301,6 +305,20 @@
     echo $A['pcm_type'];
     echo "</TD>";
=20
+	echo $td;
+	if ( strlen($A['acode']) >0 ) {
+		if (strpos($A['acode'], ",") >0 ) {
+			$det_qcode=3D  split(",", $A['acode']);
+			echo '<ul style=3D"paddding:0;margin:0;padding-left:0;list-style-type=
:none;padding-start-value:0">';
+			for ($e=3D0;$e<count($det_qcode);$e++) {
+				echo '<li style=3D"padding-start-value:0">'.HtmlInput::card_detail($=
det_qcode[$e]).'</li>';
+			}
+			echo '</ol>';
+		} else {
+			echo HtmlInput::card_detail($A['acode']);
+		}
+	}
+	echo '</td>';
=20
     echo $td;
     printf ('<A href=3D"?ac=3D'.$_REQUEST['ac'].'&l=3D%s&action=3Ddel&%s=
">Efface</A>',$A['pcm_val'],$str_dossier);

Modified: phpcompta/trunk/include/template/account_result.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/account_result.php	2013-05-11 17:15:=
06 UTC (rev 5234)
+++ phpcompta/trunk/include/template/account_result.php	2013-05-11 17:18:=
19 UTC (rev 5235)
@@ -16,6 +16,22 @@
 <?=3D$array[$i]['pcm_lib']?>
 </span>
 </td>
+<td>
+	<?php
+	if ( strlen($array[$i]['acode']) >0 ) {
+		if (strpos($array[$i]['acode'], ",") >0 ) {
+			$det_qcode=3D  split(",", $array[$i]['acode']);
+			$sep=3D"";
+			for ($e=3D0;$e<count($det_qcode);$e++) {
+				echo $sep.HtmlInput::card_detail($det_qcode[$e]);
+				$sep=3D" , ";
+			}
+		} else {
+			echo HtmlInput::card_detail($array[$i]['acode']);
+		}
+	}
+	?>
+</td>
 </tr>
=20
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 13:32:17 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbDeb-00009Z-3N
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 13:32:17 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 19:30:15 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340795.1368293536.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5236 - in phpcompta/trunk/include: . template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 17:32:16 -0000

Author: danydb
Date: 2013-05-11 19:30:15 +0200 (Sat, 11 May 2013)
New Revision: 5236

Modified:
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/param_pcmn.inc.php
   phpcompta/trunk/include/template/account_result.php
Log:
task #0000813: plan comptable - quick code

Limite des qcode visibles=20

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-11 17:18:19 UTC (rev 523=
5)
+++ phpcompta/trunk/include/constant.php	2013-05-11 17:30:15 UTC (rev 523=
6)
@@ -63,6 +63,7 @@
 define ('COMPTA_MAX_YEAR',2100);
 define ('COMPTA_MIN_YEAR',1990);
 define ('MAX_RECONCILE',25);
+define ('MAX_QCODE',4);
=20
 if ( DEBUG ) error_reporting(2147483647);  else error_reporting(0);
 // Erreur

Modified: phpcompta/trunk/include/param_pcmn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_pcmn.inc.php	2013-05-11 17:18:19 UTC (r=
ev 5235)
+++ phpcompta/trunk/include/param_pcmn.inc.php	2013-05-11 17:30:15 UTC (r=
ev 5236)
@@ -251,6 +251,7 @@
              echo HtmlInput::hidden('p_action','pcmn');
 //echo HtmlInput::hidden('sa','detail');
 echo dossier::hidden();
+$limite=3DMAX_QCODE;
 ?>
 <TABLE class=3D"result">
                              <TR>
@@ -310,10 +311,14 @@
 		if (strpos($A['acode'], ",") >0 ) {
 			$det_qcode=3D  split(",", $A['acode']);
 			echo '<ul style=3D"paddding:0;margin:0;padding-left:0;list-style-type=
:none;padding-start-value:0">';
-			for ($e=3D0;$e<count($det_qcode);$e++) {
+			$max=3D(count($det_qcode)>MAX_QCODE)?MAX_QCODE:count($det_qcode);
+			for ($e=3D0;$e<$max;$e++) {
 				echo '<li style=3D"padding-start-value:0">'.HtmlInput::card_detail($=
det_qcode[$e]).'</li>';
 			}
 			echo '</ol>';
+			if ($max < count($det_qcode)) {
+				echo "...";
+			}
 		} else {
 			echo HtmlInput::card_detail($A['acode']);
 		}

Modified: phpcompta/trunk/include/template/account_result.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/account_result.php	2013-05-11 17:18:=
19 UTC (rev 5235)
+++ phpcompta/trunk/include/template/account_result.php	2013-05-11 17:30:=
15 UTC (rev 5236)
@@ -1,7 +1,16 @@
 <fieldset id=3D"asearch" style=3D"height:88%">
 <legend><? echo _('R=C3=A9sultats')?></legend>
 <div style=3D"height:88%;overflow:auto;">
-<table>
+	<?php
+		$limite=3D5;
+		?>
+<table
+	<tr>
+		<th>Poste comptable</th>
+		<th>Libell=C3=A9</th>
+		<th>Fiche (limite:<?php echo $limite; ?>)</th>
+
+	</tr>
 <? for ($i=3D0;$i<sizeof($array);$i++) : ?>
 <tr>
 <td>
@@ -20,12 +29,17 @@
 	<?php
 	if ( strlen($array[$i]['acode']) >0 ) {
 		if (strpos($array[$i]['acode'], ",") >0 ) {
+
 			$det_qcode=3D  split(",", $array[$i]['acode']);
 			$sep=3D"";
-			for ($e=3D0;$e<count($det_qcode);$e++) {
+			$max=3D(count($det_qcode)>$limite)?$limite:count($det_qcode);
+			for ($e=3D0;$e<$max;$e++) {
 				echo $sep.HtmlInput::card_detail($det_qcode[$e]);
 				$sep=3D" , ";
 			}
+			if ($max < count($det_qcode)) {
+				echo "...";
+			}
 		} else {
 			echo HtmlInput::card_detail($array[$i]['acode']);
 		}



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 13:46:29 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbDsL-0003vd-HI
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 13:46:29 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 19:44:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340804.1368294389.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5237 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 17:46:28 -0000

Author: danydb
Date: 2013-05-11 19:44:31 +0200 (Sat, 11 May 2013)
New Revision: 5237

Modified:
   phpcompta/trunk/include/class_document_modele.php
   phpcompta/trunk/include/document_modele.inc.php
Log:
task #0000811: Nouveau Documents doivent ?\195?\170tre dans popup

Modified: phpcompta/trunk/include/class_document_modele.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_document_modele.php	2013-05-11 17:30:15=
 UTC (rev 5236)
+++ phpcompta/trunk/include/class_document_modele.php	2013-05-11 17:44:31=
 UTC (rev 5237)
@@ -103,8 +103,9 @@
 	}
 	$b=3Dnew IButton('show');
 	$b->label=3D"Ajout d'un document";
-	$b->javascript=3D"$('add_modele').style.display=3D'block';$('show').sty=
le.display=3D'none';";
-	$r.=3D$b->input();
+	$b->javascript=3D"$('add_modele').style.display=3D'block';new Draggable=
('add_modele',{starteffect:function(){
+                      new Effect.Highlight(obj.id,{scroll:window,queue:'=
end'});}});";
+		$r.=3D$b->input();
         $r.=3D"</form></p>";
         return $r;
     }
@@ -217,12 +218,12 @@
         $this->cn->commit();
     }
=20
-    /*!
-     * \brief show the form for loading a template
-     * \param p_action for the field action =3D destination url
+    /**
+     * @brief show the form for loading a template
+     * @param p_action for the field action =3D destination url
      *
      *
-     * \return string containing the forms
+     * @return string containing the forms
      */
     function form()
     {

Modified: phpcompta/trunk/include/document_modele.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/document_modele.inc.php	2013-05-11 17:30:15 U=
TC (rev 5236)
+++ phpcompta/trunk/include/document_modele.inc.php	2013-05-11 17:44:31 U=
TC (rev 5237)
@@ -76,7 +76,8 @@
 // Default action : Show the list
 //-----------------------------------------------------
 echo $doc->myList();
-echo '<div id=3D"add_modele" style=3D"display:none">';
+echo '<div id=3D"add_modele" class=3D"inner_box" style=3D"display:none">=
';
+echo HtmlInput::title_box("Ajout d'un mod=C3=A8le", "add_modele", "hide"=
);
 echo $doc->form('');
 echo '</div>';
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 15:50:40 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbFoW-0003bb-K3
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 15:50:40 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 21:48:34 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340981.1368301840.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5238 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 19:50:39 -0000

Author: danydb
Date: 2013-05-11 21:48:34 +0200 (Sat, 11 May 2013)
New Revision: 5238

Modified:
   phpcompta/trunk/include/function_javascript.php
Log:
Short open tag =3D> long open tag

Modified: phpcompta/trunk/include/function_javascript.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/function_javascript.php	2013-05-11 17:44:31 U=
TC (rev 5237)
+++ phpcompta/trunk/include/function_javascript.php	2013-05-11 19:48:34 U=
TC (rev 5238)
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
 PHP URL encoding/decoding functions for Javascript interaction V3.0
 (C) 2006 www.captain.at - all rights reserved



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 15:51:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbFor-0003cy-Nk
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 15:51:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 21:49:01 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1340982.1368301861.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5239 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 19:51:00 -0000

Author: danydb
Date: 2013-05-11 21:49:00 +0200 (Sat, 11 May 2013)
New Revision: 5239

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_document.php
Log:
task #0000820: Nom des documents g?\195?\169n?\195?\169r?\195?\169s

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-05-11 19:48:34 UTC =
(rev 5238)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-05-11 19:49:00 UTC =
(rev 5239)
@@ -2305,7 +2305,7 @@
 			$value =3D 0;
 		return $value;
 	}
-
+=09
 	/**
 	 * @brief create the invoice and saved it as attachment to the
 	 * operation,
@@ -2321,7 +2321,8 @@
 		$doc->f_id =3D $e_client;
 		$doc->md_id =3D $gen_doc;
 		$doc->ag_id =3D 0;
-		$doc->Generate($p_array);
+		$filename=3D"";
+		$doc->Generate($p_array,$p_array['e_pj']);
 		// Move the document to the jrn
 		$doc->MoveDocumentPj($internal);
 		// Update the comment with invoice number, if the comment is empty

Modified: phpcompta/trunk/include/class_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_document.php	2013-05-11 19:48:34 UTC (r=
ev 5238)
+++ phpcompta/trunk/include/class_document.php	2013-05-11 19:49:00 UTC (r=
ev 5239)
@@ -62,16 +62,28 @@
         $this->db->exec_sql($sql);
=20
     }
-
+	function compute_filename($pj,$filename)
+	{
+		foreach (array('/','*','<','>',';',',','\\','.',':') as $i) {
+			$pj=3D str_replace($i, "-",$pj);
+		}
+		// save the suffix
+		$pos_prefix=3Dstrrpos($filename,".");
+		if ($pos_prefix =3D=3D 0) $pos_prefix=3Dstrlen($filename);
+		$filename_no=3Dsubstr($filename,0,$pos_prefix);
+		$filename_suff=3Dsubstr($filename,$pos_prefix,strlen($filename));
+		$new_filename=3D  strtolower($filename_no."-".$pj.$filename_suff);
+		return $new_filename;
+	}
     /*!
      * \brief Generate the document, Call $this-\>Replace to replace
      *        tag by value
-     *\p_array contains the data normally it is the $_POST
-     *
+     *@param p_array contains the data normally it is the $_POST
+     *@param contains the new filename
      * \return an array : the url where the generated doc can be found, =
the name
      * of the file and his mimetype
      */
-    function Generate($p_array)
+    function Generate($p_array,$p_filename=3D"")
     {
         // create a temp directory in /tmp to unpack file and to parse i=
t
         $dirname=3Dtempnam($_ENV['TMP'],'doc_');
@@ -144,7 +156,10 @@
=20
             $file_to_parse=3D$filename;
         }
+		if ( $p_filename !=3D"") {
=20
+			$this->d_filename=3D$this->compute_filename($p_filename, $this->d_fil=
ename);
+		}
         $this->SaveGenerated($dirname.DIRECTORY_SEPARATOR.$file_to_parse=
);
         // Invoice
         $ret=3D'<A class=3D"mtitle" HREF=3D"show_document.php?d_id=3D'.$=
this->d_id.'&'.dossier::get().'">Document g&eacute;n&eacute;r&eacute;</A>=
';
@@ -244,7 +259,7 @@
 			if ( strpos($value,'ERROR') !=3D false ) 		  $value=3D"";
                         /*
                          * Change type of cell to numeric
-                         *  allow numeric cel in ODT for the formatting =
and formula=20
+                         *  allow numeric cel in ODT for the formatting =
and formula
                          */
 			if ( is_numeric($value) && $p_type=3D=3D'OOo')
 			  {



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 16:03:52 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbG1I-0000V9-P2
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 16:03:52 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 22:01:52 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341019.1368302632.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5240 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 20:03:51 -0000

Author: danydb
Date: 2013-05-11 22:01:52 +0200 (Sat, 11 May 2013)
New Revision: 5240

Modified:
   phpcompta/trunk/include/ajax_boxcard_search.php
   phpcompta/trunk/include/constant.php
Log:
0000817: CARD Recherche Fiche

Ajout d'un filtre javascript + max ligne =3D 550

Modified: phpcompta/trunk/include/ajax_boxcard_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_boxcard_search.php	2013-05-11 19:49:00 U=
TC (rev 5239)
+++ phpcompta/trunk/include/ajax_boxcard_search.php	2013-05-11 20:01:52 U=
TC (rev 5240)
@@ -27,17 +27,12 @@
  *
  */
 $sql=3D"
-	select vw.f_id,vw_name,vw_first_name,vw_description,fd_label,quick_code=
,pc.ad_value as poste,tva_num
+	select distinct vw.f_id,vw_name,vw_first_name,vw_description,fd_label,q=
uick_code,tva_num
 	from vw_fiche_attr as vw
 	join fiche_def as fd on (vw.fd_id=3Dfd.fd_id)
-	left join (select f_id,ad_value from fiche_detail where ad_id=3D5) as p=
c on (pc.f_id=3Dvw.f_id)
+	left join fiche_detail as pc on (pc.f_id=3Dvw.f_id)
 	where
-	vw_name ~* $1
-	or vw_first_name ~* $1
-	or vw_description ~* $1
-	or tva_num ~* $1
-	or pc.ad_value like $1||'%'
-	or quick_code like upper($1||'%')
+	ad_value ~* $1
 	order by 2
 ";
 $array=3D$cn->get_array($sql,array($_GET['card']));
@@ -48,18 +43,20 @@
 <h2 class=3D"notice">R=C3=A9sultat limit=C3=A9 =C3=A0 <?=3DMAX_CARD_SEAR=
CH?>, nombre de fiches trouv=C3=A9es : <?=3Dcount($array)?> </h2>
=20
 <? endif?>
-<table class=3D"sortable">
+Filtre  .<?php echo HtmlInput::filter_table("tb_fiche", "0,1,2,3,4,5", 1=
); ?>
+<table id=3D"tb_fiche" class=3D"sorttable">
 	<tr>
+
 		<th>
-			Categorie
-		</th>
-		<th>
 			Quick Code
 		</th>
 		<th>
 			Nom
 		</th>
 		<th>
+			Categorie
+		</th>
+		<th>
 			Description
 		</th>
 		<th>
@@ -74,11 +71,9 @@
 	<h2 class=3D"notice"> Aucun r=C3=A9sultat</h2>
 <?endif?>
 <? for ($i=3D0;$i<$max;$i++):?>
-	<tr>
+	<tr class=3D"<?php echo ($i%2 =3D=3D 0)?'even':'odd';?>">
+
 		<td>
-			<?=3Dh($array[$i]['fd_label'])?>
-		</td>
-		<td>
 			<?=3DHtmlInput::card_detail($array[$i]['quick_code'])?>
 		</td>
 		<td>
@@ -86,6 +81,9 @@
 			<?=3Dh($array[$i]['vw_first_name'])?>
 		</td>
 		<td>
+			<?=3Dh($array[$i]['fd_label'])?>
+		</td>
+		<td>
 			<?=3Dh($array[$i]['vw_description'])?>
=20
 		</td>

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-11 19:49:00 UTC (rev 523=
9)
+++ phpcompta/trunk/include/constant.php	2013-05-11 20:01:52 UTC (rev 524=
0)
@@ -56,7 +56,7 @@
 define ("MAX_COMPTE",4);
 define ('MAX_ARTICLE',12);
 define ('MAX_CAT',15);
-define ('MAX_CARD_SEARCH',50);
+define ('MAX_CARD_SEARCH',550);
 define ('MAX_FORECAST_ITEM',10);
 define ('MAX_PREDEFINED_OPERATION',30);
 define ('MAX_COMPTE_CARD',4);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 16:30:43 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbGRH-00050V-Sv
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 16:30:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 22:28:46 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341034.1368304242.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5241 - phpcompta/trunk/html/js
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 20:30:42 -0000

Author: danydb
Date: 2013-05-11 22:28:46 +0200 (Sat, 11 May 2013)
New Revision: 5241

Modified:
   phpcompta/trunk/html/js/card.js
Log:
0000817: CARD Recherche Fiche

Table triable (javascript)

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2013-05-11 20:01:52 UTC (rev 5240)
+++ phpcompta/trunk/html/js/card.js	2013-05-11 20:28:46 UTC (rev 5241)
@@ -45,6 +45,7 @@
 						var div_style=3D"left:10%;width:80%;"+";top:"+y;
 						add_div({id:'boxsearch_card_div',cssclass:'inner_box',html:loading=
(),style:div_style,drag:true});
 						$('boxsearch_card_div').innerHTML=3Dreq.responseText;
+						sorttable.makeSortable($('tb_fiche'));
 				      }
 				  }
 				  );



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 16:31:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbGS7-000542-4g
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 16:31:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 22:29:36 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341037.1368304294.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5242 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 20:31:34 -0000

Author: danydb
Date: 2013-05-11 22:29:36 +0200 (Sat, 11 May 2013)
New Revision: 5242

Modified:
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/include/ajax_boxcard_search.php
Log:
0000817: CARD Recherche Fiche

Poste comptable appel historique + infobulle

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-05-11 20:28:46 UTC (rev 524=
1)
+++ phpcompta/trunk/html/js/infobulle.js	2013-05-11 20:29:36 UTC (rev 524=
2)
@@ -53,6 +53,7 @@
 content[23]=3D"Donnez une partie du nom du dossier ou de la description =
pour filtrer";
 content[24]=3D"Donnez une partie du poste comptable ou du libell=C3=A9 p=
our filtrer";
 content[25]=3D"Donnez une partie du libell=C3=A9, la date, le montant ou=
 le num=C3=A9ro d'op=C3=A9ration pour filtrer, cela n'efface pas ce qui a=
 d=C3=A9j=C3=A0 =C3=A9t=C3=A9 s=C3=A9lectionn=C3=A9";
+content[26]=3D"Donnez une partie du quickcode, nom, description... pour =
filtrer";
=20
 function showBulle(p_ctl)
 {

Modified: phpcompta/trunk/include/ajax_boxcard_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_boxcard_search.php	2013-05-11 20:28:46 U=
TC (rev 5241)
+++ phpcompta/trunk/include/ajax_boxcard_search.php	2013-05-11 20:29:36 U=
TC (rev 5242)
@@ -27,7 +27,7 @@
  *
  */
 $sql=3D"
-	select distinct vw.f_id,vw_name,vw_first_name,vw_description,fd_label,q=
uick_code,tva_num
+	select distinct vw.f_id,vw_name,vw_first_name,vw_description,fd_label,q=
uick_code,tva_num,(select ad_value from fiche_Detail where f_id=3Dpc.f_id=
 and ad_id=3D5) as poste
 	from vw_fiche_attr as vw
 	join fiche_def as fd on (vw.fd_id=3Dfd.fd_id)
 	left join fiche_detail as pc on (pc.f_id=3Dvw.f_id)
@@ -43,15 +43,15 @@
 <h2 class=3D"notice">R=C3=A9sultat limit=C3=A9 =C3=A0 <?=3DMAX_CARD_SEAR=
CH?>, nombre de fiches trouv=C3=A9es : <?=3Dcount($array)?> </h2>
=20
 <? endif?>
-Filtre  .<?php echo HtmlInput::filter_table("tb_fiche", "0,1,2,3,4,5", 1=
); ?>
-<table id=3D"tb_fiche" class=3D"sorttable">
+Filtre  <?php echo HtmlInput::infobulle(26);echo HtmlInput::filter_table=
("tb_fiche", "0,1,2,3,4,5", 1); ?>
+<table id=3D"tb_fiche" class=3D"sorttable" style=3D"width:100%">
 	<tr>
-
 		<th>
-			Quick Code
+			Quick Code <?php echo HtmlInput::infobulle(17); ?>
 		</th>
-		<th>
+		<th class=3D" sorttable_sorted">
 			Nom
+		<span id=3D"sorttable_sortfwdind">&nbsp;&#x25BE;</span>
 		</th>
 		<th>
 			Categorie
@@ -91,8 +91,8 @@
 			<?=3Dh($array[$i]['tva_num'])?>
=20
 		</td>
-		<td>
-			<?=3Dh($array[$i]['poste'])?>
+		<td style=3D"text-align:right">
+			<?=3DHtmlInput::history_account($array[$i]['poste'],$array[$i]['poste=
'])?>
=20
 		</td>
 	</tr>
@@ -100,4 +100,4 @@
=20
 <? endfor; ?>
 </table>
-<?=3DHtmlInput::button_close("boxsearch_card_div")?>
\ No newline at end of file
+<?=3DHtmlInput::button_close("boxsearch_card_div")?>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 16:33:41 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbGU9-0005Bz-EX
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 16:33:41 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 22:31:43 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341040.1368304420.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5243 - phpcompta/trunk/html/js
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 20:33:40 -0000

Author: danydb
Date: 2013-05-11 22:31:43 +0200 (Sat, 11 May 2013)
New Revision: 5243

Modified:
   phpcompta/trunk/html/js/infobulle.js
Log:
0000817: CARD Recherche Fiche

Message pour recherche

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-05-11 20:29:36 UTC (rev 524=
2)
+++ phpcompta/trunk/html/js/infobulle.js	2013-05-11 20:31:43 UTC (rev 524=
3)
@@ -45,7 +45,7 @@
 content[15]=3D"Laissez =C3=A0 0 pour ne rien changer";
 content[16]=3D"Vous devez donner la date par op=C3=A9ration";
 content[17]=3D"Cliquez sur le titre d'une colonne pour trier";
-content[18]=3D"Donnez une partie du nom, pr=C3=A9nom, de la description,=
 du poste comptable, du n=C2=B0 de TVA ou quick code";
+content[18]=3D"Donnez une partie du nom, pr=C3=A9nom, de la description,=
 du poste comptable, du n=C2=B0 de TVA,quick code ... ";
 content[19]=3D"Donnez une partie du nom, de la description,  du n=C2=B0 =
de TVA ou quick code";
 content[20]=3D"Les menus ne peuvent d=C3=A9pendre que dans d'un menu pri=
ncipal ou d'un menu, si cette liste est vide, ajouter des modules ou menu=
 principal sans donner de d=C3=A9pendance";
 content[21]=3D"Donnez un nombre entre 0 & 100";



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 16:44:47 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbGet-0006Vr-RL
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 16:44:47 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 22:42:48 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341045.1368305087.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5244 - in phpcompta/trunk/include: . template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 20:44:46 -0000

Author: danydb
Date: 2013-05-11 22:42:48 +0200 (Sat, 11 May 2013)
New Revision: 5244

Modified:
   phpcompta/trunk/include/fiche.inc.php
   phpcompta/trunk/include/template/fiche_list.php
Log:
task #0000837: CARD liste ajout du poste comptable

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-05-11 20:31:43 UTC (rev 52=
43)
+++ phpcompta/trunk/include/fiche.inc.php	2013-05-11 20:42:48 UTC (rev 52=
44)
@@ -196,9 +196,10 @@
 		select f_id,
 			(select ad_value from fiche_detail as fd1 where ad_id=3D1 and fd1.f_i=
d=3Df.f_id) as name,
 			(select ad_value from fiche_detail as fd1 where ad_id=3D23 and fd1.f_=
id=3Df.f_id) as qcode,
-			fd_label
+			fd_label,
+			(select ad_value from fiche_detail as fd1 where ad_id=3D5 and fd1.f_i=
d=3Df.f_id) as poste
 		from fiche as f join fiche_def as fd on (fd.fd_id=3Df.fd_id)
-		$cond   order by 2 offset $offset $limit
+		$cond   order by 2,4 offset $offset $limit
 	");
 	$nb_line =3D Database::num_row($res);
 	if ($write !=3D 1 || $allcard !=3D 0 )  $str_add_card=3D"";

Modified: phpcompta/trunk/include/template/fiche_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/fiche_list.php	2013-05-11 20:31:43 U=
TC (rev 5243)
+++ phpcompta/trunk/include/template/fiche_list.php	2013-05-11 20:42:48 U=
TC (rev 5244)
@@ -37,6 +37,9 @@
 				Nom
=20
 			</th>
+			<th>
+				Poste Comptable
+			</th>
 			<? if ($allcard =3D=3D 1 ) : ?>
 			<th>
 				Cat=C3=A9gorie
@@ -57,6 +60,9 @@
 				<td>
 					<?=3D h($row['name'])?>
 				</td>
+				<td>
+					<?=3DHtmlInput::history_account($row['poste'],$row['poste'])?>
+				</td>
 				<? if ($allcard =3D=3D 1 ) : ?>
 				<td>
 					<?=3D h($row['fd_label'])?>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 16:58:00 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbGrg-0000MM-Nr
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 16:58:00 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 11 May 2013 22:56:02 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341054.1368305880.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5245 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 20:57:59 -0000

Author: danydb
Date: 2013-05-11 22:56:02 +0200 (Sat, 11 May 2013)
New Revision: 5245

Modified:
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/fiche.inc.php
Log:
task #814
Dans CARD, il faut afficher le poste comptable pour Balance & Historique.

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-05-11 20:42:48 UTC (rev 524=
4)
+++ phpcompta/trunk/html/js/infobulle.js	2013-05-11 20:56:02 UTC (rev 524=
5)
@@ -54,7 +54,7 @@
 content[24]=3D"Donnez une partie du poste comptable ou du libell=C3=A9 p=
our filtrer";
 content[25]=3D"Donnez une partie du libell=C3=A9, la date, le montant ou=
 le num=C3=A9ro d'op=C3=A9ration pour filtrer, cela n'efface pas ce qui a=
 d=C3=A9j=C3=A0 =C3=A9t=C3=A9 s=C3=A9lectionn=C3=A9";
 content[26]=3D"Donnez une partie du quickcode, nom, description... pour =
filtrer";
-
+content[27]=3D"Attention, <b>SI</b> la fiche a chang=C3=A9 de poste comp=
table, c'est seulement la derni=C3=A8re qui est affich=C3=A9e";
 function showBulle(p_ctl)
 {
     d=3Ddocument.getElementById('bulle');

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-05-11 20:42:48 UTC (rev =
5244)
+++ phpcompta/trunk/include/class_fiche.php	2013-05-11 20:56:02 UTC (rev =
5245)
@@ -1908,6 +1908,10 @@
 		$r =3D "<h2>" . h($this->getName()) . " " . h($this->getAttribut(ATTR_=
DEF_FIRST_NAME)) . '[' . $this->get_quick_code() . ']</h2>';
 		return $r;
 	}
+	function get_all_account()
+	{
+	=09
+	}
 }
=20
 ?>

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-05-11 20:42:48 UTC (rev 52=
44)
+++ phpcompta/trunk/include/fiche.inc.php	2013-05-11 20:56:02 UTC (rev 52=
45)
@@ -304,6 +304,7 @@
 		echo tr(
 				th('Quick Code') .
 				th('Libell=C3=A9') .
+				'<th>Poste'.HtmlInput::infobulle(27).'</th>'.
 				th('D=C3=A9bit', 'style=3D"text-align:right"') .
 				th('Cr=C3=A9dit', 'style=3D"text-align:right"') .
 				th('Solde', 'style=3D"text-align:right"') .
@@ -332,6 +333,7 @@
 			echo tr(
 					td(HtmlInput::history_card($oCard->id, $oCard->strAttribut(ATTR_DEF=
_QUICKCODE))) .
 					td($oCard->strAttribut(ATTR_DEF_NAME)) .
+					td($oCard->strAttribut(ATTR_DEF_ACCOUNT)).
 					td(nbm($solde['debit']), 'style=3D"text-align:right"') .
 					td(nbm($solde['credit']), 'style=3D"text-align:right"') .
 					td(nbm(abs($solde['solde'])), 'style=3D"text-align:right"') .
@@ -344,6 +346,7 @@
                 echo tr(
                                 td('').
                                 td(_('Totaux')).
+                                td('').
                                 td(nbm($sum_deb), 'style=3D"text-align:r=
ight"').
                                 td(nbm($sum_cred), 'style=3D"text-align:=
right"').
                                 td(nbm(abs($sum_solde)), 'style=3D"text-=
align:right"').
@@ -415,7 +418,7 @@
 		/* skip if nothing to display */
 		if (count($letter->content) =3D=3D 0)
 			continue;
-		$detail_card =3D HtmlInput::card_detail($row->strAttribut(ATTR_DEF_QUI=
CKCODE), $row->strAttribut(ATTR_DEF_NAME));
+		$detail_card =3D HtmlInput::card_detail($row->strAttribut(ATTR_DEF_QUI=
CKCODE), $row->strAttribut(ATTR_DEF_NAME))."poste :".HtmlInput::infobulle=
(27).$row->strAttribut(ATTR_DEF_ACCOUNT);
=20
 		echo '<h2 style=3D"font-size:14px;text-align:left;margin-left:10px;pad=
ding-left:50px;border:solid 1px blue;width:70%;text-decoration:underline"=
>' . $detail_card . '</h2>';
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 18:02:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbHrk-0001jG-F7
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 18:02:08 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 00:00:09 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341093.1368309727.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5246 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 22:02:07 -0000

Author: danydb
Date: 2013-05-12 00:00:07 +0200 (Sun, 12 May 2013)
New Revision: 5246

Modified:
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/include/class_pdf.php
   phpcompta/trunk/include/class_print_ledger_detail.php
   phpcompta/trunk/include/class_print_ledger_fin.php
   phpcompta/trunk/include/class_print_ledger_misc.php
   phpcompta/trunk/include/class_print_ledger_simple.php
   phpcompta/trunk/include/class_print_ledger_simple_without_vat.php
Log:
Bug #0000838: Bug : PDF Les lignes trop longues cassent le saut de page

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-05-11 20:56:02 UTC (rev 524=
5)
+++ phpcompta/trunk/html/js/infobulle.js	2013-05-11 22:00:07 UTC (rev 524=
6)
@@ -54,7 +54,7 @@
 content[24]=3D"Donnez une partie du poste comptable ou du libell=C3=A9 p=
our filtrer";
 content[25]=3D"Donnez une partie du libell=C3=A9, la date, le montant ou=
 le num=C3=A9ro d'op=C3=A9ration pour filtrer, cela n'efface pas ce qui a=
 d=C3=A9j=C3=A0 =C3=A9t=C3=A9 s=C3=A9lectionn=C3=A9";
 content[26]=3D"Donnez une partie du quickcode, nom, description... pour =
filtrer";
-content[27]=3D"Attention, <b>SI</b> la fiche a chang=C3=A9 de poste comp=
table, c'est seulement la derni=C3=A8re qui est affich=C3=A9e";
+content[27]=3D"Attention, <b>SI</b> la fiche a chang=C3=A9 de poste comp=
table, c'est seulement le dernier qui est affich=C3=A9";
 function showBulle(p_ctl)
 {
     d=3Ddocument.getElementById('bulle');

Modified: phpcompta/trunk/include/class_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pdf.php	2013-05-11 20:56:02 UTC (rev 52=
45)
+++ phpcompta/trunk/include/class_pdf.php	2013-05-11 22:00:07 UTC (rev 52=
46)
@@ -91,6 +91,11 @@
 		$x_m=3D$this->GetX();
 		$y_m=3D$this->GetY();
 		$txt =3D str_replace("\\", "", $txt);
+		if ( $y_m > ($this->h-$this->bMargin-10 ))		{
+			$this->AddPage ();
+			$y_m=3D$this->GetY();
+
+		}
 		$this->MultiCell($w,$h,$txt,$border,$align,$fill);
 		$x_m=3D$x_m+$w;
 		$tmp=3D$this->GetY()-$y_m;

Modified: phpcompta/trunk/include/class_print_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_detail.php	2013-05-11 20:5=
6:02 UTC (rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_detail.php	2013-05-11 22:0=
0:07 UTC (rev 5246)
@@ -93,7 +93,7 @@
             $this->SetFont('DejaVuCond','B',7);
             $row=3D$array[$i];
=20
-            $this->Cell(20,7,$row['pj']);
+            $this->LongLine(20,7,$row['pj']);
             $this->Cell(15,7,$row['date_fmt']);
             $this->Cell(20,7,$row['internal']);
             $this->LongLine(170,7,$row['comment']);

Modified: phpcompta/trunk/include/class_print_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_fin.php	2013-05-11 20:56:0=
2 UTC (rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_fin.php	2013-05-11 22:00:0=
7 UTC (rev 5246)
@@ -75,7 +75,7 @@
         for ( $i=3D0;$i<count($a_jrn);$i++)
         {
             $row=3D$a_jrn[$i];
-            $this->Cell(30,5,$row['pj']);
+            $this->LongLine(30,5,$row['pj']);
             $this->Cell(10,5,$row['date_fmt']);
             $this->Cell(20,5,$row['internal']);
=20

Modified: phpcompta/trunk/include/class_print_ledger_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_misc.php	2013-05-11 20:56:=
02 UTC (rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_misc.php	2013-05-11 22:00:=
07 UTC (rev 5246)
@@ -78,7 +78,7 @@
         for ( $i=3D0;$i<count($a_jrn);$i++)
         {
             $row=3D$a_jrn[$i];
-            $this->Cell(30,5,$row['pj']);
+            $this->LongLine(30,5,$row['pj']);
             $this->Cell(10,5,$row['date_fmt']);
             $this->Cell(20,5,$row['internal']);
 	    $type=3D$this->cn->get_value("select jrn_def_type from jrn_def wher=
e jrn_def_id=3D$1",array($a_jrn[$i]['jr_def_id']));

Modified: phpcompta/trunk/include/class_print_ledger_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_simple.php	2013-05-11 20:5=
6:02 UTC (rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_simple.php	2013-05-11 22:0=
0:07 UTC (rev 5246)
@@ -224,7 +224,7 @@
             }
=20
             $row=3D$a_jrn[$i];
-            $this->Cell(15,5,($row['pj']),0,0);
+            $this->LongLine(15,5,($row['pj']),0);
             $this->Cell(10,5,$row['date_fmt'],0,0);
             $this->Cell(13,5,$row['internal'],0,0);
             list($qc,$name)=3D$this->get_tiers($row['id'],$this->jrn_typ=
e);

Modified: phpcompta/trunk/include/class_print_ledger_simple_without_vat.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_simple_without_vat.php	201=
3-05-11 20:56:02 UTC (rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_simple_without_vat.php	201=
3-05-11 22:00:07 UTC (rev 5246)
@@ -157,7 +157,7 @@
         {
=20
             $row=3D$a_jrn[$i];
-            $this->Cell(15,5,($row['pj']),0,0);
+            $this->LongLine(15,5,($row['pj']),0);
             $this->Cell(15,5,$row['date_fmt'],0,0);
             $this->Cell(20,5,$row['internal'],0,0);
             list($qc,$name)=3D$this->get_tiers($row['id'],$this->jrn_typ=
e);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 18:02:43 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbHsJ-0001ln-KR
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 18:02:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 00:00:43 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341094.1368309762.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5247 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 22:02:42 -0000

Author: danydb
Date: 2013-05-12 00:00:42 +0200 (Sun, 12 May 2013)
New Revision: 5247

Modified:
   phpcompta/trunk/include/export_fiche_balance_csv.php
   phpcompta/trunk/include/export_fiche_balance_pdf.php
   phpcompta/trunk/include/fiche.inc.php
Log:
Bug #0000838: Bug : PDF Les lignes trop longues cassent le saut de page
Task #0000837: CARD liste ajout du poste comptable

Modified: phpcompta/trunk/include/export_fiche_balance_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_balance_csv.php	2013-05-11 22:00=
:07 UTC (rev 5246)
+++ phpcompta/trunk/include/export_fiche_balance_csv.php	2013-05-11 22:00=
:42 UTC (rev 5247)
@@ -52,7 +52,7 @@
 	{
 		$afiche[0]=3Darray('fd_id'=3D>$_REQUEST['cat']);
 	}
-	printf('"Quick code";"Nom";"debit";"credit";"solde";"D/C";');
+	printf('"Quick code";"Nom";"poste comptable";"debit";"credit";"solde";"=
D/C";');
 		printf("\n");
 	for ($e =3D 0; $e < count($afiche); $e++)
 	{
@@ -82,7 +82,7 @@
 			if (bcsub($solde['credit'], $solde['debit']) > 0)
 				$side =3D 'Cred.';
=20
-			printf('"%s";"%s";%s;%s;%s;"%s"', $oCard->strAttribut(ATTR_DEF_QUICKC=
ODE), $oCard->strAttribut(ATTR_DEF_NAME), nb($solde['debit']), nb($solde[=
'credit']), nb(abs($solde['solde'])), $side);
+			printf('"%s";"%s";"%s";%s;%s;%s;"%s"', $oCard->strAttribut(ATTR_DEF_Q=
UICKCODE), $oCard->strAttribut(ATTR_DEF_NAME),  $oCard->strAttribut(ATTR_=
DEF_ACCOUNT),nb($solde['debit']), nb($solde['credit']), nb(abs($solde['so=
lde'])), $side);
 			printf("\n");
 		}
 	}
@@ -133,7 +133,7 @@
 			/* skip if nothing to display */
 			if (count($letter->content) =3D=3D 0)
 				continue;
-			printf('"%s";"%s"'."\n",$row->strAttribut(ATTR_DEF_QUICKCODE), $row->=
strAttribut(ATTR_DEF_NAME));
+			printf('"%s";"%s";"%s"'."\n",$row->strAttribut(ATTR_DEF_QUICKCODE), $=
row->strAttribut(ATTR_DEF_NAME),$row->strAttribut(ATTR_DEF_ACCOUNT));
=20
 			printf('"%s";"%s";"%s";"%s";"%s";"%s";"%s";"%s";"%s"',
 					_('Date'),

Modified: phpcompta/trunk/include/export_fiche_balance_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_balance_pdf.php	2013-05-11 22:00=
:07 UTC (rev 5246)
+++ phpcompta/trunk/include/export_fiche_balance_pdf.php	2013-05-11 22:00=
:42 UTC (rev 5247)
@@ -43,13 +43,14 @@
 $pdf->setDossierInfo("  Periode : ".$_GET['start']." - ".$_GET['end']);
 $pdf->AliasNbPages();
 $pdf->AddPage();
-$name=3D$cn->get_value('select fd_label from fiche_def where fd_id=3D$1'=
,array($_GET['cat']));
-$pdf->SetFont('DejaVu','BI',14);
-$pdf->Cell(0,8,$name,0,1,'C');
+
 $pdf->SetTitle($name,1);
 $pdf->SetAuthor('Phpcompta');
 /* balance */
 $allcard=3D(isset($_GET['allcard']))?1:0;
+/*
+ * Balance
+ */
 if ( $_GET['histo'] =3D=3D 4 || $_GET['histo']=3D=3D5)
 {
     $fd=3Dnew Fiche_Def($cn,$_REQUEST['cat']);
@@ -78,19 +79,22 @@
         $pdf->Output("category-$fDate.pdf", 'D');
         exit;
     }
+	for ($e =3D 0; $e < count($afiche); $e++)
+	{
+    $aCard=3D$cn->get_array("select f_id,ad_value from fiche join fiche_=
Detail using (f_id)  where ad_id=3D1 and fd_id=3D$1 order by 2 ",array($a=
fiche[$e]['fd_id']));
+	$name=3D$cn->get_value('select fd_label from fiche_def where fd_id=3D$1=
',array($afiche[$e]['fd_id']));
+	$pdf->SetFont('DejaVu','BI',14);
+	$pdf->Cell(0,8,$name,0,1,'C');
+
 	$pdf->SetFont('DejaVuCond','',7);
-    $pdf->Cell(30,7,'Quick Code',0,0,'L',0);
-    $pdf->Cell(80,7,'Libell=C3=A9',0,0,'L',0);
+    $pdf->LongLine(30,7,'Quick Code',0,'L',0);
+    $pdf->LongLine(80,7,'Libell=C3=A9',0,'L',0);
     $pdf->Cell(20,7,'D=C3=A9bit',0,0,'R',0);
     $pdf->Cell(20,7,'Cr=C3=A9dit',0,0,'R',0);
     $pdf->Cell(20,7,'Solde',0,0,'R',0);
     $pdf->Cell(20,7,'D/C',0,0,'C',0);
     $pdf->Ln();
-	for ($e =3D 0; $e < count($afiche); $e++)
-	{
-    $aCard=3D$cn->get_array("select f_id,ad_value from fiche join fiche_=
Detail using (f_id)  where ad_id=3D1 and fd_id=3D$1 order by 2 ",array($a=
fiche[$e]['fd_id']));
=20
-
 	if (empty($aCard)) continue;
=20
=20
@@ -126,13 +130,24 @@
         $sum_solde=3Dbcsub($sum_deb,$sum_cred);
=20
         $pdf->Cell(30,7,$oCard->strAttribut(ATTR_DEF_QUICKCODE),0,0,'L',=
$fill);
-        $pdf->Cell(80,7,$oCard->strAttribut(ATTR_DEF_NAME),0,0,'L',$fill=
);
+        $pdf->LongLine(80,7,$oCard->strAttribut(ATTR_DEF_NAME)." (".$oCa=
rd->strAttribut(ATTR_DEF_ACCOUNT).")",0,'L',$fill);
         $pdf->Cell(20,7,nbm($solde['debit']),0,0,'R',$fill);
         $pdf->Cell(20,7,nbm($solde['credit']),0,0,'R',$fill);
         $pdf->Cell(20,7,nbm(abs($solde['solde'])),0,0,'R',$fill);
         $pdf->Cell(20,7,$side,0,0,'C',$fill);
         $pdf->Ln();
         }
+		if ( $idx % 2 =3D=3D 0 )
+        {
+            $pdf->SetFillColor(220,221,255);
+            $fill=3D1;
+        }
+        else
+        {
+            $pdf->SetFillColor(0,0,0);
+            $fill=3D0;
+        }
+		$idx++;
         // Sum by category
         $pdf->Cell(30,7,"",0,0,'L',$fill);
         $pdf->Cell(80,7,_("Totaux"),0,0,'L',$fill);
@@ -155,6 +170,7 @@
 }
 else
 {
+	// History
 	// all card
 	if ($allcard =3D=3D 1)
 	{
@@ -210,10 +226,10 @@
 				continue;
 			$pdf->SetFont('DejaVuCond', '', 10);
 			$fiche =3D new Fiche($cn, $row_fiche['f_id']);
-			$pdf->Cell(0, 7, $fiche->strAttribut(ATTR_DEF_NAME)." [".$fiche->strA=
ttribut(ATTR_DEF_QUICKCODE)."]", 1, 1, 'C');
+			$pdf->Cell(0, 7, $fiche->strAttribut(ATTR_DEF_NAME)." [".$fiche->strA=
ttribut(ATTR_DEF_QUICKCODE).":".$fiche->strAttribut(ATTR_DEF_ACCOUNT)."]"=
, 1, 'C');
=20
 			$pdf->SetFont('DejaVuCond', '', 7);
-
+			$pdf->Ln();
 			$pdf->Cell($tab[0], 7, 'Date');
 			$pdf->Cell($tab[1], 7, 'ref');
 			$pdf->Cell($tab[2], 7, 'Internal');
@@ -243,7 +259,7 @@
 				$row =3D $letter->content[$i];
 				$str_date =3D shrink_date($row['j_date_fmt']);
=20
-				$pdf->Cell($tab[0], 4, $str_date, 0, 0, $align[0], $fill);
+				$pdf->LongLine($tab[0], 4, $str_date, 0, $align[0], $fill);
 				$pdf->Cell($tab[1], 4, $row['jr_pj_number'], 0, 0, $align[1], $fill)=
;
 				$pdf->LongLine($tab[2], 4, $row['jr_internal'], 0, $align[1], $fill)=
;
 				$pdf->LongLine($tab[3], 4, $row['jr_comment'], 0,  $align[2], $fill)=
;

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-05-11 22:00:07 UTC (rev 52=
46)
+++ phpcompta/trunk/include/fiche.inc.php	2013-05-11 22:00:42 UTC (rev 52=
47)
@@ -418,7 +418,7 @@
 		/* skip if nothing to display */
 		if (count($letter->content) =3D=3D 0)
 			continue;
-		$detail_card =3D HtmlInput::card_detail($row->strAttribut(ATTR_DEF_QUI=
CKCODE), $row->strAttribut(ATTR_DEF_NAME))."poste :".HtmlInput::infobulle=
(27).$row->strAttribut(ATTR_DEF_ACCOUNT);
+		$detail_card =3D HtmlInput::card_detail($row->strAttribut(ATTR_DEF_QUI=
CKCODE), $row->strAttribut(ATTR_DEF_NAME))."poste :".$row->strAttribut(AT=
TR_DEF_ACCOUNT).HtmlInput::infobulle(27);
=20
 		echo '<h2 style=3D"font-size:14px;text-align:left;margin-left:10px;pad=
ding-left:50px;border:solid 1px blue;width:70%;text-decoration:underline"=
>' . $detail_card . '</h2>';
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 18:21:56 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbIAu-000594-JD
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 18:21:56 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 00:19:54 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341103.1368310915.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5248 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 22:21:55 -0000

Author: danydb
Date: 2013-05-12 00:19:53 +0200 (Sun, 12 May 2013)
New Revision: 5248

Modified:
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
Log:
Task #0000809: Journaux achat/vente : TVA diff?\195?\169rente de celle ca=
lcul?\195?\169e

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-05-11 22:00:42 UTC (rev 524=
7)
+++ phpcompta/trunk/html/js/infobulle.js	2013-05-11 22:19:53 UTC (rev 524=
8)
@@ -55,6 +55,7 @@
 content[25]=3D"Donnez une partie du libell=C3=A9, la date, le montant ou=
 le num=C3=A9ro d'op=C3=A9ration pour filtrer, cela n'efface pas ce qui a=
 d=C3=A9j=C3=A0 =C3=A9t=C3=A9 s=C3=A9lectionn=C3=A9";
 content[26]=3D"Donnez une partie du quickcode, nom, description... pour =
filtrer";
 content[27]=3D"Attention, <b>SI</b> la fiche a chang=C3=A9 de poste comp=
table, c'est seulement le dernier qui est affich=C3=A9";
+content[28]=3D"Attention Diff=C3=A9rence entre TVA calcul=C3=A9e et donn=
=C3=A9e";
 function showBulle(p_ctl)
 {
     d=3Ddocument.getElementById('bulle');

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-11 22:0=
0:42 UTC (rev 5247)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-11 22:1=
9:53 UTC (rev 5248)
@@ -1353,21 +1353,19 @@
=20
             if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
+				$op=3Dnew Acc_Compute();
+
+				$op->set_parameter("amount",$amount);
+				$op->set_parameter('amount_vat_rate',$oTva->get_parameter('rate'));
+				$op->compute_vat();
+				 $tva_computed=3D$op->get_parameter('amount_vat');
                 //----- if tva_amount is not given we compute the vat --=
--
                 if ( strlen (trim (${'e_march'.$i.'_tva_amount'})) =3D=3D=
 0)
                 {
-                    $op=3Dnew Acc_Compute();
-
-                    $op->set_parameter("amount",$amount);
-                    $op->set_parameter('amount_vat_rate',$oTva->get_para=
meter('rate'));
-                    $op->compute_vat();
                     $tva_item=3D$op->get_parameter('amount_vat');
                 }
                 else
-                    $tva_item=3Dround($
-                                    {'e_march'.$i.'_tva_amount'
-                                    }
-                                    ,2);
+                    $tva_item=3Dround(${'e_march'.$i.'_tva_amount'},2);
=20
                 if (isset($tva[$idx_tva] ) )
                     $tva[$idx_tva]+=3D$tva_item;
@@ -1396,8 +1394,21 @@
                 $r.=3D'<td class=3D"num">';
                 $r.=3D$oTva->get_parameter('label');
                 $r.=3D'</td>';
-                $r.=3D'<td class=3D"num">';
-                $r.=3Dnbm($tva_item);
+                /* warning if tva_computed and given are not the
+                   same */
+				bcscale(2);
+                if ( bcsub($tva_item,$tva_computed) !=3D 0)
+                {
+
+					 $r.=3D'<td style=3D"background-color:red" class=3D"num">';
+					 $r.=3DHtmlInput::infobulle(28);
+                    $r.=3D'<a href=3D"#" class=3D"error" style=3D"displa=
y:inline" title=3D"'. _("Attention Diff=C3=A9rence entre TVA calcul=C3=A9=
e et donn=C3=A9e").'">'
+							.nbm($tva_item).'<a>';
+                }
+				else{
+					 $r.=3D'<td  class=3D"num">';
+					$r.=3Dnbm($tva_item);
+				}
                 $r.=3D'</td>';
 				$r.=3D'<td class=3D"num">';
 				$r.=3Dnbm(round($amount,2));

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-11 22:00:42=
 UTC (rev 5247)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-11 22:19:53=
 UTC (rev 5248)
@@ -625,7 +625,8 @@
     }
=20
=20
-    /*!@brief show the summary of the operation and propose to save it
+    /*!
+	 *@brief show the summary of the operation and propose to save it
      *@param array contains normally $_POST. It proposes also to save
      * the Analytic accountancy
 	 *@param $p_summary false for the feedback, true to show the summary
@@ -772,16 +773,20 @@
                 $r.=3D'<td class=3D"num">';
                 $r.=3D$oTva->get_parameter('label');
                 $r.=3D'</td>';
-                $r.=3D'<td class=3D"num">';
+
                 /* warning if tva_computed and given are not the
                    same */
                 if ( bcsub($tva_item,$tva_computed) !=3D 0)
                 {
+					 $r.=3D'<td style=3D"background-color:red" class=3D"num">';
+					 $r.=3DHtmlInput::infobulle(28);
                     $r.=3D'<a href=3D"#" class=3D"error" style=3D"displa=
y:inline" title=3D"'. _("Attention Diff=C3=A9rence entre TVA calcul=C3=A9=
e et donn=C3=A9e").'">'
 							.nbm($tva_item).'<a>';
                 }
-				else
+				else{
+					 $r.=3D'<td  class=3D"num">';
 					$r.=3Dnbm($tva_item);
+				}
                 $r.=3D'</td>';
 				$r.=3D'<td class=3D"num">';
 				$r.=3Dnbm($amount);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 18:29:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbIHo-00074P-4L
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 18:29:04 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 00:27:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341108.1368311343.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5249 - phpcompta/trunk/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 22:29:02 -0000

Author: danydb
Date: 2013-05-12 00:27:02 +0200 (Sun, 12 May 2013)
New Revision: 5249

Modified:
   phpcompta/trunk/sql/upgrade.sql
Log:
task #0000803: Changement attribut 'N?\194?\176 de compte' par 'Compte ba=
ncaire'

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-05-11 22:19:53 UTC (rev 5248)
+++ phpcompta/trunk/sql/upgrade.sql	2013-05-11 22:27:02 UTC (rev 5249)
@@ -1,104 +1 @@
-
-CREATE OR REPLACE FUNCTION comptaproc.insert_quick_code(nf_id integer, t=
av_text text)
-  RETURNS integer AS
-$BODY$
-	declare
-	ns integer;
-	nExist integer;
-	tText text;
-	begin
-	tText :=3D lower(trim(tav_text));
-	tText :=3D replace(tText,' ','');
-	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
-	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
-
-
-	loop
-		-- take the next sequence
-		select nextval('s_jnt_fic_att_value') into ns;
-		if length (tText) =3D 0 or tText is null then
-			tText :=3D 'FID'||ns;
-		end if;
-		-- av_text already used ?
-		select count(*) into nExist
-			from fiche_detail
-		where
-			ad_id=3D23 and  ad_value=3Dupper(tText);
-
-		if nExist =3D 0 then
-			exit;
-		end if;
-		tText:=3D'FID'||ns;
-	end loop;
-
-
-	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,2=
3,upper(tText));
-	return ns;
-	end;
-$BODY$
-  LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION comptaproc.update_quick_code(njft_id integer,=
 tav_text text)
-  RETURNS integer AS
-$BODY$
-	declare
-	ns integer;
-	nExist integer;
-	tText text;
-	old_qcode varchar;
-	begin
-	-- get current value
-	select ad_value into old_qcode from fiche_detail where jft_id=3Dnjft_id=
;
-	-- av_text didn't change so no update
-	if tav_text =3D upper( trim(old_qcode)) then
-		return 0;
-	end if;
-
-	tText :=3D trim(lower(tav_text));
-	tText :=3D replace(tText,' ','');
-	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
-	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
-	tText :=3D upper(tText);
-	if length ( tText) =3D 0 or tText is null then
-		return 0;
-	end if;
-
-	ns :=3D njft_id;
-
-	loop
-		-- av_text already used ?
-		select count(*) into nExist
-			from fiche_detail
-		where
-			ad_id=3D23 and ad_value=3DtText;
-
-		if nExist =3D 0 then
-			exit;
-		end if;
-		if tText =3D 'FID'||ns then
-			-- take the next sequence
-			select nextval('s_jnt_fic_att_value') into ns;
-		end if;
-		tText  :=3D'FID'||ns;
-
-	end loop;
-	update fiche_detail set ad_value =3D tText where jft_id=3Dnjft_id;
-
-	-- update also the contact
-	update fiche_detail set ad_value =3D tText
-		where jft_id in
-			( select jft_id
-				from fiche_detail
-			where ad_id=3D25 and ad_value=3Dold_qcode);
-
-
-	update jrnx set j_qcode=3DtText where j_qcode =3D old_qcode;
-	return ns;
-	end;
-$BODY$
-  LANGUAGE plpgsql;
-
-
-alter table document_state add s_status char(1);
-
-update document_state set s_status=3D'C' where s_id in (1,4)
\ No newline at end of file
+update attr_def set ad_text=3D'Compte bancaire' where ad_id=3D3;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 18:35:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbINg-000084-MR
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 18:35:08 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 00:33:10 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341111.1368311708.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5250 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 22:35:08 -0000

Author: danydb
Date: 2013-05-12 00:33:09 +0200 (Sun, 12 May 2013)
New Revision: 5250

Modified:
   phpcompta/trunk/include/template/dashboard.php
Log:
task #0000806: Apparence Tableau de bord

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-05-11 22:27:02 UT=
C (rev 5249)
+++ phpcompta/trunk/include/template/dashboard.php	2013-05-11 22:33:09 UT=
C (rev 5250)
@@ -130,7 +130,7 @@
 }
=20
 if ( $report !=3D 0 ) {
-  echo '<fieldset ><legend>'.$rapport->get_name().'</legend>';
+  echo '<fieldset style=3D"height:70%;"><legend>'.$rapport->get_name().'=
</legend>';
   $exercice=3D$g_user->get_exercice();
   if ( $exercice =3D=3D 0 ) {
     alert(_('Aucune periode par defaut'));
@@ -155,14 +155,10 @@
   echo '</fieldset>';
   echo '</div>';
  } else {
-  echo '<fieldset style=3D"width:50%;background-color:white"><legend>'._=
('Aucun rapport d=C3=A9fini').'</legend>';
+  echo '<fieldset style=3D"height:70%;width:80%;background-color:white">=
<legend>'._('Aucun rapport d=C3=A9fini').'</legend>';
   echo '<a href=3D"do.php?'.dossier::get().'&ac=3DPREFERENCE">'._('Cliqu=
ez ici pour mettre =C3=A0 jour vos pr=C3=A9f=C3=A9rences').'</a>';
-echo '<table>';
-for ($e =3D 0;$e<10;$e++){
-echo '<tr><td></td></tr>';
-}
-echo '</table>';
=20
+
 echo '</fieldset>';
 echo '</div>';
 }



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 18:47:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbIZj-0001bE-AC
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 18:47:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 00:45:38 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341128.1368312454.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5251 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 22:47:34 -0000

Author: danydb
Date: 2013-05-12 00:45:37 +0200 (Sun, 12 May 2013)
New Revision: 5251

Modified:
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/include/restore.inc.php
Log:
Task #0000808: Restaure : agrandir la zone de texte pour le nom

Ajout explication pour nom dossier

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-05-11 22:33:09 UTC (rev 525=
0)
+++ phpcompta/trunk/html/js/infobulle.js	2013-05-11 22:45:37 UTC (rev 525=
1)
@@ -56,6 +56,7 @@
 content[26]=3D"Donnez une partie du quickcode, nom, description... pour =
filtrer";
 content[27]=3D"Attention, <b>SI</b> la fiche a chang=C3=A9 de poste comp=
table, c'est seulement le dernier qui est affich=C3=A9";
 content[28]=3D"Attention Diff=C3=A9rence entre TVA calcul=C3=A9e et donn=
=C3=A9e";
+content[29]=3D"Si vous ne donnez pas de nom, ce sera le nom du fichier q=
ui sera utilis=C3=A9";
 function showBulle(p_ctl)
 {
     d=3Ddocument.getElementById('bulle');

Modified: phpcompta/trunk/include/restore.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/restore.inc.php	2013-05-11 22:33:09 UTC (rev =
5250)
+++ phpcompta/trunk/include/restore.inc.php	2013-05-11 22:45:37 UTC (rev =
5251)
@@ -36,7 +36,7 @@
     putenv("PGUSER=3D".phpcompta_user);
     putenv("PGPORT=3D".phpcompta_psql_port);
 	putenv("PGHOST=3D").phpcompta_psql_host;
-=09
+
     $retour=3D'<hr>'.HtmlInput::button_anchor("Retour","?action=3Drestor=
e");
     if ( ! isset($_REQUEST['t']))
     {
@@ -69,12 +69,24 @@
         $id=3D$cn->get_next_seq('dossier_id');
=20
         if ( strlen(trim($_REQUEST['database'])) =3D=3D 0 )
+		{
             $lname=3D$id." Restauration :".sql_string($_FILES['file']['n=
ame']);
+		}
         else
+		{
             $lname=3D$id." ".$_REQUEST['database'];
+		}
=20
+		if (strlen(trim($_REQUEST['desc']))=3D=3D0)
+		{
+			$ldesc=3D$lname;
+		}
+		else
+		{
+			$ldesc=3Dsql_string($_REQUEST['desc']);
+		}
=20
-        $sql=3D"insert into ac_dossier (dos_id,dos_name) values (".$id."=
,'".$lname."') ";
+        $sql=3D"insert into ac_dossier (dos_id,dos_name,dos_description)=
 values (".$id.",'".$lname."','".$ldesc."') ";
         $cn->start();
         try
         {
@@ -137,7 +149,7 @@
             $lname=3D$id." ".$_REQUEST['database'];
=20
=20
-        $sql=3D"insert into modeledef (mod_id,mod_name) values (".$id.",=
'Restauration".$lname."') ";
+        $sql=3D"insert into modeledef (mod_id,mod_name,mod_desc) values =
(".$id.",'Restauration".$lname."','".$ldesc."') ";
         $cn->start();
         try
         {
@@ -189,10 +201,11 @@
     echo HtmlInput::hidden('action','restore');
     echo HtmlInput::hidden('sa','r');
     echo '<table>';
-    echo '<tr><td>'."Nom de la base de donn=C3=A9e".'</td>';
+    echo '<tr><td>'."Nom de la base de donn=C3=A9e".HtmlInput::infobulle=
(29)
+			.'</td>';
     $wNom=3Dnew IText();
     $wNom->name=3D"database";
-    $wNom->size=3D12;
+    $wNom->size=3D30;
     echo '<td>'.$wNom->input().'</td></tr>';
     echo '<tr><td>'."Type de backup :".'</td>';
     $chk=3Dnew IRadio();
@@ -209,9 +222,15 @@
     $file->value=3D"mod";
     echo td('Fichier ').
     td($file->input());
-    echo '</tr>';
+	$desc=3Dnew ITextarea('desc');
+	echo '</tr>';
     echo '</table>';
+	echo "<p>Description </p>";
+	$desc->heigh=3D4;$desc->width=3D60;
+	echo $desc->input();
+	echo '<p>';
     echo HtmlInput::submit("","Restauration");
+	echo '</p>';
     echo '</form>';
     echo '</div>';
 }



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 18:54:48 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbIgi-0002Rf-Fl
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 18:54:48 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 00:52:49 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341131.1368312887.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5252 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 22:54:47 -0000

Author: danydb
Date: 2013-05-12 00:52:49 +0200 (Sun, 12 May 2013)
New Revision: 5252

Modified:
   phpcompta/trunk/include/class_html_input.php
Log:
Filtre dynamique: ajout bouton reset

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-05-11 22:45:37 UTC =
(rev 5251)
+++ phpcompta/trunk/include/class_html_input.php	2013-05-11 22:52:49 UTC =
(rev 5252)
@@ -717,7 +717,8 @@
 	{
 		$r=3D "
 			<form style=3D\"display:inline\">
-			<input class=3D\"input_text\" name=3D\"filter\" onkeyup=3D\"filter_ta=
ble(this, '$p_table_id','$p_col',$start_row )\" type=3D\"text\">
+			<input id=3D\"lk_".$p_table_id."\" class=3D\"input_text\" name=3D\"fi=
lter\" onkeyup=3D\"filter_table(this, '$p_table_id','$p_col',$start_row )=
\" type=3D\"text\">
+			<input type=3D\"button\" onclick=3D\"$('lk_".$p_table_id."').value=3D=
'';filter_table($('lk_".$p_table_id."'), '$p_table_id','$p_col',$start_ro=
w );\" value=3D\"X\">
 			</form>
 			";
 		return $r;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 18:57:42 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbIjW-0002kI-SF
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 18:57:42 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 00:55:44 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341134.1368313062.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5253 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 May 2013 22:57:41 -0000

Author: danydb
Date: 2013-05-12 00:55:44 +0200 (Sun, 12 May 2013)
New Revision: 5253

Modified:
   phpcompta/trunk/include/class_html_input.php
Log:
Filtre dynamique: ajout bouton reset

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-05-11 22:52:49 UTC =
(rev 5252)
+++ phpcompta/trunk/include/class_html_input.php	2013-05-11 22:55:44 UTC =
(rev 5253)
@@ -718,7 +718,7 @@
 		$r=3D "
 			<form style=3D\"display:inline\">
 			<input id=3D\"lk_".$p_table_id."\" class=3D\"input_text\" name=3D\"fi=
lter\" onkeyup=3D\"filter_table(this, '$p_table_id','$p_col',$start_row )=
\" type=3D\"text\">
-			<input type=3D\"button\" onclick=3D\"$('lk_".$p_table_id."').value=3D=
'';filter_table($('lk_".$p_table_id."'), '$p_table_id','$p_col',$start_ro=
w );\" value=3D\"X\">
+			<input type=3D\"button\" class=3D\"button\" onclick=3D\"$('lk_".$p_ta=
ble_id."').value=3D'';filter_table($('lk_".$p_table_id."'), '$p_table_id'=
,'$p_col',$start_row );\" value=3D\"X\">
 			</form>
 			";
 		return $r;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 20:47:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbKRJ-00068q-U5
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 20:47:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 02:45:04 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341171.1368319621.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5254 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 00:47:00 -0000

Author: danydb
Date: 2013-05-12 02:45:03 +0200 (Sun, 12 May 2013)
New Revision: 5254

Modified:
   phpcompta/trunk/include/param_pcmn.inc.php
Log:
task #0000813: plan comptable - quick code
Cosmetique

Modified: phpcompta/trunk/include/param_pcmn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_pcmn.inc.php	2013-05-11 22:55:44 UTC (r=
ev 5253)
+++ phpcompta/trunk/include/param_pcmn.inc.php	2013-05-12 00:45:03 UTC (r=
ev 5254)
@@ -326,7 +326,7 @@
 	echo '</td>';
=20
     echo $td;
-    printf ('<A href=3D"?ac=3D'.$_REQUEST['ac'].'&l=3D%s&action=3Ddel&%s=
">Efface</A>',$A['pcm_val'],$str_dossier);
+    printf ('<A class=3D"input_text" href=3D"?ac=3D'.$_REQUEST['ac'].'&l=
=3D%s&action=3Ddel&%s">Efface</A>',$A['pcm_val'],$str_dossier);
     echo "</TD>";
=20
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 11 20:47:30 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbKRm-0006AF-2a
	for mharc-phpcompta-dev@gnu.org; Sat, 11 May 2013 20:47:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 02:45:32 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1341172.1368319649.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5255 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 00:47:29 -0000

Author: danydb
Date: 2013-05-12 02:45:32 +0200 (Sun, 12 May 2013)
New Revision: 5255

Modified:
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/class_calendar.php
Log:
task #0000811: Nouveau Documents doivent ?\195?\170tre dans popup

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-05-12 00:45:03 UTC (rev 5254)
+++ phpcompta/trunk/html/js/scripts.js	2013-05-12 00:45:32 UTC (rev 5255)
@@ -1753,4 +1753,16 @@
 			table.rows[r].style.display =3D 'none';
 		}
 	}
+}
+function display_task(p_id)
+{
+	new Draggable(p_id,{starteffect:function()
+                                  {
+									 new Effect.Highlight(obj.id,{scroll:window,queue:'end'});
+                                  }}
+                         );
+    $(p_id).style.top=3DposY;
+    $(p_id).style.left=3DposX;
+	$(p_id).style.display=3D'block';
+
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/class_calendar.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_calendar.php	2013-05-12 00:45:03 UTC (r=
ev 5254)
+++ phpcompta/trunk/include/class_calendar.php	2013-05-12 00:45:32 UTC (r=
ev 5255)
@@ -35,6 +35,10 @@
         $this->month=3D$this->current_date['mon'];
         $this->day=3Dself::$nb_day[$this->month-1];
         $this->year=3D$this->current_date['year'];
+		$this->action_div=3Darray();
+		$this->action=3Darray();
+		$this->title=3Darray();
+
         if ( $this->year % 4 =3D=3D 0 && $this->month=3D2)
             $this->day=3D29;
     }
@@ -48,22 +52,40 @@
 		$profile=3D$g_user->get_profile();
=20
         $cn=3Dnew Database(dossier::id());
-        $sql=3D"select count(*) as nb,to_char(ag_remind_date,'DD')::inte=
ger as ag_timestamp_day ".
+        $sql=3D"select ag_id,to_char(ag_remind_date,'DD')::integer as ag=
_timestamp_day,ag_title
+			".
              " from action_gestion ".
              " where ".
              " to_char(ag_remind_date,'MM')::integer=3D$1 ".
              " and to_char(ag_remind_date,'YYYY')::integer=3D$2 ".
              "  and ag_dest in (select p_granted from user_sec_action_pr=
ofile where p_id =3D$3)
 				 and ag_state IN (2, 3)
-				 group by to_char(ag_remind_date,'DD')::integer";
+				";
=20
 		$array=3D$cn->get_array($sql,array($this->month,$this->year,$profile))=
;
         for ($i=3D0;$i<count($array);$i++)
         {
             $ind=3D$array[$i]['ag_timestamp_day'];
-            $p_array[$ind].=3D"<span class=3D\"notice\">".$array[$i]['nb=
']." "._("T=C3=A2ches suivies").'</span>';
=20
+			$this->action[$ind][]=3D$array[$i]['ag_id'];
+			$this->title[$ind][]=3D$array[$i]['ag_title'];
+
         }
+		/*
+		 * Fill foreach day
+		 */
+		foreach ($this->action as $day=3D>$aAction)
+		{
+			if ($p_array[$day]=3D=3D"")  $p_array[$day]=3D'<span class=3D"input_t=
ext" onclick=3D"display_task(\'tsk'.$day.'\');">'." ".count($aAction)." "=
._("T=C3=A2ches").'</span>';
+			$this->action_div[$day]=3D'<div id=3D"tsk'.$day.'" class=3D"inner_box=
" style=3D"width:200;display:none">';
+			$this->action_div[$day].=3DHtmlInput::title_box($day."/".$this->month=
."/".$this->year, "tsk".$day, "hide");
+			 $this->action_div[$day].=3D"<ol>";
+			for ($i=3D0;$i<count($aAction);$i++)
+			{
+				$this->action_div[$day].=3D'<li>'.HtmlInput::detail_action($aAction[=
$i], $this->title[$day][$i]).'</li>';
+			}
+			$this->action_div[$day].=3D'</ol></div>';
+		}
     }
     /*!\brief fill the array given as parameter with the data from todo
      *\param $p_array array of the date of the month
@@ -113,7 +135,15 @@
         $month_year=3D$wMonth->input().$wMonth->get_js_attr();
         ob_start();
         require_once('template/calendar.php');
-        $ret=3Dob_get_contents();
+
+		if (count($this->action_div) > 0)
+		{
+			foreach ($this->action_div as $day)
+			{
+				echo $day;
+			}
+		}
+		$ret=3Dob_get_contents();
         ob_end_clean();
         return $ret;
     }
@@ -133,7 +163,7 @@
     }
     /**
      *@brief get the periode from the preference of the current user
-     * change the value of default_periode
+     * change the value of default_periode to today
      *@return $this->default_periode
      */
     function get_preference()
@@ -152,7 +182,7 @@
         {
             $p_id=3D$g_user->get_periode();
         }
-	$this->default_periode=3D$p_id;
+		$this->default_periode=3D$p_id;
         return  $p_id;
     }
     /**



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 12 16:30:19 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbcuR-0003dz-2e
	for mharc-phpcompta-dev@gnu.org; Sun, 12 May 2013 16:30:19 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 12 May 2013 22:28:13 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1342028.1368390617.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5256 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 20:30:17 -0000

Author: danydb
Date: 2013-05-12 22:28:12 +0200 (Sun, 12 May 2013)
New Revision: 5256

Modified:
   phpcompta/trunk/include/constant.php
Log:
remove debug

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-12 00:45:32 UTC (rev 525=
5)
+++ phpcompta/trunk/include/constant.php	2013-05-12 20:28:12 UTC (rev 525=
6)
@@ -35,7 +35,7 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
- define ('SVNINFO',5900);
+//define ('SVNINFO',5900);
 $version_phpcompta=3DSVNINFO;
 define ("DEBUG",false);
 /* define ('SVNINFO',5015);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 13 15:55:29 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UbyqG-0003O0-VZ
	for mharc-phpcompta-dev@gnu.org; Mon, 13 May 2013 15:55:28 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 13 May 2013 21:53:35 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1343642.1368474928.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r497 - trunk/amortis/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 19:55:27 -0000

Author: danydb
Date: 2013-05-13 21:53:34 +0200 (Mon, 13 May 2013)
New Revision: 497

Modified:
   trunk/amortis/include/class_am_generate.php
Log:
Alert si qq chose se passe mal

Modified: trunk/amortis/include/class_am_generate.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/class_am_generate.php	2013-05-10 19:19:25 UTC (=
rev 496)
+++ trunk/amortis/include/class_am_generate.php	2013-05-13 19:53:34 UTC (=
rev 497)
@@ -172,7 +172,13 @@
     $ledger->with_concerned=3Dfalse;
     echo '<div style=3D"width:80%;margin-left:10%">';
     echo '<form method=3D"POST" style=3D"display:inline">';
+	try {
     echo $ledger->input($array,true);
+	}
+	catch (Exception $e){
+		echo alert($e->getMessage());
+		return false;
+	}
     echo HtmlInput::submit('save','Sauver');
     echo HtmlInput::hidden('sa',$p_array['sa']);
     echo HtmlInput::hidden('sb',$p_array['sb']);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 13 17:18:06 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uc08E-0006kw-8Y
	for mharc-phpcompta-dev@gnu.org; Mon, 13 May 2013 17:18:06 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 13 May 2013 23:16:15 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1343735.1368479885.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5257 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 21:18:05 -0000

Author: danydb
Date: 2013-05-13 23:16:14 +0200 (Mon, 13 May 2013)
New Revision: 5257

Modified:
   phpcompta/trunk/html/style.css
Log:
Mise en ?\195?\169vidence span close

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-05-12 20:28:12 UTC (rev 5256)
+++ phpcompta/trunk/html/style.css	2013-05-13 21:16:14 UTC (rev 5257)
@@ -1058,6 +1058,10 @@
  margin-top:0px;
  font-size:10px;
 }
+#close_div:hover
+{
+	background-color: orange;
+}
 table.table_large tr.odd ,table.table_large tr.even {
=20
 	height:32px;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 13 17:24:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uc0EB-00085Z-4q
	for mharc-phpcompta-dev@gnu.org; Mon, 13 May 2013 17:24:15 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 13 May 2013 23:22:21 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1343740.1368480254.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5258 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 21:24:13 -0000

Author: danydb
Date: 2013-05-13 23:22:21 +0200 (Mon, 13 May 2013)
New Revision: 5258

Modified:
   phpcompta/trunk/html/style.css
Log:
Cosmetique

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-05-13 21:16:14 UTC (rev 5257)
+++ phpcompta/trunk/html/style.css	2013-05-13 21:22:21 UTC (rev 5258)
@@ -959,6 +959,8 @@
 }
 h2#jrn_name
 {
+	color:blue;
+	font-size:22;
 	margin-right:30%;
 	float: right;
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 13 17:53:54 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uc0gs-00018k-Dt
	for mharc-phpcompta-dev@gnu.org; Mon, 13 May 2013 17:53:54 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 13 May 2013 23:52:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1343771.1368482034.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5259 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 21:53:53 -0000

Author: danydb
Date: 2013-05-13 23:52:03 +0200 (Mon, 13 May 2013)
New Revision: 5259

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
task #0000833: new logo

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-13 21:22:21 UTC (rev 525=
8)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-13 21:52:03 UTC (rev 525=
9)
@@ -77,7 +77,7 @@
 </head>
 <body>
 <p align=3D"center">
-  <IMG SRC=3D"../image/logo7.gif" alt=3D"Logo PhpCompta">
+  <IMG SRC=3D"../image/logo7.png" alt=3D"Logo PhpCompta">
 </p>
 <?php
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 13 17:54:42 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uc0he-0001Af-K9
	for mharc-phpcompta-dev@gnu.org; Mon, 13 May 2013 17:54:42 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 13 May 2013 23:52:50 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1343772.1368482082.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5260 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 21:54:41 -0000

Author: danydb
Date: 2013-05-13 23:52:50 +0200 (Mon, 13 May 2013)
New Revision: 5260

Modified:
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/include/class_html_input.php
Log:
Bug : ne peut pas changer exercice dans fenetre detail=20

Modified: phpcompta/trunk/html/js/acc_ledger.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/acc_ledger.js	2013-05-13 21:52:03 UTC (rev 52=
59)
+++ phpcompta/trunk/html/js/acc_ledger.js	2013-05-13 21:52:50 UTC (rev 52=
60)
@@ -587,7 +587,7 @@
 function update_history_account(obj)
 {
     try{
-	var querystring=3D"div=3D"+obj.div+"&gDossier=3D"+obj.gDossier+"&pcm_va=
l=3D"+obj.pcm_val+"&ex=3D"+obj.select.options[obj.select.selectedIndex].t=
ext;
+	var querystring=3D"l=3D"+obj.div+"&div=3D"+obj.div+"&gDossier=3D"+obj.g=
Dossier+"&pcm_val=3D"+obj.pcm_val+"&ex=3D"+obj.select.options[obj.select.=
selectedIndex].text;
 	var action=3Dnew Ajax.Request(
 	    "ajax_history.php",
 	    {
@@ -644,7 +644,7 @@
 function update_history_card(obj)
 {
     try{
-	var querystring=3D"div=3D"+obj.div+"&gDossier=3D"+obj.gDossier+"&f_id=3D=
"+obj.f_id+"&ex=3D"+obj.select.options[obj.select.selectedIndex].text;
+	var querystring=3D"l=3D"+obj.div+"&div=3D"+obj.div+"&gDossier=3D"+obj.g=
Dossier+"&f_id=3D"+obj.f_id+"&ex=3D"+obj.select.options[obj.select.select=
edIndex].text;
 	var action=3Dnew Ajax.Request(
 	    "ajax_history.php",
 	    {

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-05-13 21:52:03 UTC =
(rev 5259)
+++ phpcompta/trunk/include/class_html_input.php	2013-05-13 21:52:50 UTC =
(rev 5260)
@@ -412,7 +412,7 @@
     {
 	$r=3D'';
 	$r.=3D'<div style=3D"float:right;margin-right:2px;margin-top:1px;paddin=
g:0">';
-	$r.=3D '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"remo=
veDiv(\''.$div.'\');">Fermer</A>';
+	$r.=3D '<A id=3D"close_div" class=3D"input_text" HREF=3D"javascript:voi=
d(0)" onclick=3D"removeDiv(\''.$div.'\');">Fermer</A>';
 	$r.=3D'</div>';
 	return $r;
     }
@@ -439,7 +439,7 @@
     {
 	$r=3D'';
 	$r.=3D'<div style=3D"float:right;right;margin:2;">';
-	$r.=3D '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"'.$j=
avascript.'">'.$action.'</A>';
+	$r.=3D '<span id=3D"close_div" class=3D"input_text"  HREF=3D"javascript=
:void(0)" onclick=3D"'.$javascript.'">'.$action.'</span>';
 	$r.=3D'</div>';
 	return $r;
     }
@@ -716,7 +716,7 @@
 	static function filter_table($p_table_id,$p_col,$start_row)
 	{
 		$r=3D "
-			<form style=3D\"display:inline\">
+			<form style=3D\"display:inline\" class=3D\"noprint\">
 			<input id=3D\"lk_".$p_table_id."\" class=3D\"input_text\" name=3D\"fi=
lter\" onkeyup=3D\"filter_table(this, '$p_table_id','$p_col',$start_row )=
\" type=3D\"text\">
 			<input type=3D\"button\" class=3D\"button\" onclick=3D\"$('lk_".$p_ta=
ble_id."').value=3D'';filter_table($('lk_".$p_table_id."'), '$p_table_id'=
,'$p_col',$start_row );\" value=3D\"X\">
 			</form>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 13 17:56:13 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uc0j7-0001UQ-2m
	for mharc-phpcompta-dev@gnu.org; Mon, 13 May 2013 17:56:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 13 May 2013 23:54:20 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1343773.1368482172.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r498 - trunk/amortis/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 21:56:12 -0000

Author: danydb
Date: 2013-05-13 23:54:20 +0200 (Mon, 13 May 2013)
New Revision: 498

Modified:
   trunk/amortis/include/template/material_detail.php
Log:
Permet de voir fiche & historique

Modified: trunk/amortis/include/template/material_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/material_detail.php	2013-05-13 19:53:3=
4 UTC (rev 497)
+++ trunk/amortis/include/template/material_detail.php	2013-05-13 21:54:2=
0 UTC (rev 498)
@@ -6,7 +6,7 @@
 <table>
 <tr>
 	<td>Fiche</td>
-	<td><?=3D$card->strAttribut(ATTR_DEF_QUICKCODE)?></td>
+	<td><?=3DHtmlInput::card_detail($card->strAttribut(ATTR_DEF_QUICKCODE))=
?></td>
 </tr>
=20
 <tr>
@@ -80,7 +80,7 @@
 	echo HtmlInput::hidden("ad_id[]",$array[$i]->ad_id);
 	$amount=3Dnew INum("amount[]");
 	$amount->value=3D$array[$i]->ad_amount;
-	echo $amount->input();=09
+	echo $amount->input();
         ?>
=20
 </td>
@@ -89,10 +89,10 @@
=20
 	$x=3D$cn->get_array('select ha_id,h_pj,jr_internal,h_amount from amorti=
ssement.amortissement_histo where a_id=3D$1 and h_year=3D$2',
 	                   array($value_a_id,$array[$i]->ad_year));
-	if ( count ($x) =3D=3D 1)=20
+	if ( count ($x) =3D=3D 1)
 	{
 	echo HtmlInput::hidden('h[]',$x[0]['ha_id']);
-=09
+
 	$done=3Dbcadd($done,$x[0]['h_amount']);
 	$acte=3Dnew INum('p_histo[]');
         $acte->value=3D$x[0]['h_amount'];
@@ -102,7 +102,7 @@
 	$pj->value=3D$x[0]['h_pj'];
 	echo td($pj->input());
=20
-	if ( $x[0]['jr_internal'] !=3D '' ) {=20
+	if ( $x[0]['jr_internal'] !=3D '' ) {
 	$jr_id=3D$cn->get_value('select jr_id from jrn where jr_internal=3D$1',=
array($x[0]['jr_internal']));
 	echo td(HtmlInput::detail_op($jr_id,$x[0]['jr_internal']));
 	} else {
@@ -130,7 +130,7 @@
 	echo '<h2>';
  }
  ?>
-</fieldset>=20
+</fieldset>
 <?
    echo HtmlInput::submit('sauver','Sauver',"onclick=3D\"return confirm(=
'Vous confirmez ?')\" ");
    $rm=3Dsprintf("remove_mat(%d,'%s',%d)",dossier::id(),$_REQUEST['plugi=
n_code'],$value_a_id);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 13 17:58:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uc0lD-0001is-Mq
	for mharc-phpcompta-dev@gnu.org; Mon, 13 May 2013 17:58:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 13 May 2013 23:56:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1343774.1368482302.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r499 - in trunk/amortis: . include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 21:58:22 -0000

Author: danydb
Date: 2013-05-13 23:56:31 +0200 (Mon, 13 May 2013)
New Revision: 499

Modified:
   trunk/amortis/amortize_javascript.js
   trunk/amortis/include/template/material_listing.php
   trunk/amortis/index.php
Log:
Table tri dynamique + filtre javascript + version minimum =3D 5255


Modified: trunk/amortis/amortize_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/amortize_javascript.js	2013-05-13 21:54:20 UTC (rev 498=
)
+++ trunk/amortis/amortize_javascript.js	2013-05-13 21:56:31 UTC (rev 499=
)
@@ -1,3 +1,4 @@
+content[400]=3D"Filtrer sur quick-code, nom, date d'acquisition ou Ann=C3=
=A9e d'achat";
 /**
  *javascript
  */

Modified: trunk/amortis/include/template/material_listing.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/material_listing.php	2013-05-13 21:54:=
20 UTC (rev 498)
+++ trunk/amortis/include/template/material_listing.php	2013-05-13 21:56:=
31 UTC (rev 499)
@@ -1,8 +1,13 @@
-<table class=3D"result" style=3D"width:80%;margin-left:10%">
+<br>
+Filtre <?php echo HtmlInput::infobulle(400)?> <?php echo HtmlInput::filt=
er_table("list_amortissement","0,1,2,3,4",1)?>
+
+<table id=3D"list_amortissement" class=3D"sortable" style=3D"width:80%;m=
argin-left:10%">
 <tr>
-<th></th>
 <th>Quickcode</th>
-<th>Nom</th>
+<th class=3D" sorttable_sorted">
+	Nom
+<span id=3D"sorttable_sortfwdind">&nbsp;&nbsp;&#x25BE;</span>
+</th>
 <th>Date acquisition</th>
 <th>Ann=C3=A9e achat</th>
 <th style=3D"text-align:right">Montant Initial</th>
@@ -20,9 +25,9 @@
=20
         $detail=3Ddetail_material($ret[$i]->f_id,$fiche->strAttribut(ATT=
R_DEF_QUICKCODE));
         echo td($detail);
-	echo td($fiche->strAttribut(ATTR_DEF_QUICKCODE));
 	echo td($fiche->strAttribut(ATTR_DEF_NAME));
-	echo td(format_date($ret[$i]->a_date));
+	// <td sorttable_customkey=3D"<?=3D$row_bank['b_date']
+	echo '<td sorttable_customkey=3D"'.$ret[$i]->a_date.'">'.format_date($r=
et[$i]->a_date).'</td>';
 	echo td($ret[$i]->a_start);
         echo td(nbm($ret[$i]->a_amount),'style=3D"text-align:right"');
         $amortized=3D$cn->get_value("select sum(h_amount) from amortisse=
ment.amortissement_histo where a_id=3D$1",array($ret[$i]->a_id));

Modified: trunk/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/index.php	2013-05-13 21:54:20 UTC (rev 498)
+++ trunk/amortis/index.php	2013-05-13 21:56:31 UTC (rev 499)
@@ -21,7 +21,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 global $version_plugin;
 $version_plugin=3DSVNINFO;
-Extension::check_version(4400);
+Extension::check_version(5255);
 /*!\file
  * \brief main entry
  */



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 14 16:55:31 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcMFv-0007f9-G4
	for mharc-phpcompta-dev@gnu.org; Tue, 14 May 2013 16:55:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 14 May 2013 22:53:30 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1345560.1368564930.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5261 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 May 2013 20:55:30 -0000

Author: danydb
Date: 2013-05-14 22:53:30 +0200 (Tue, 14 May 2013)
New Revision: 5261

Modified:
   phpcompta/trunk/include/template/dashboard.php
Log:
change height mini-report

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-05-13 21:52:50 UT=
C (rev 5260)
+++ phpcompta/trunk/include/template/dashboard.php	2013-05-14 20:53:30 UT=
C (rev 5261)
@@ -130,7 +130,7 @@
 }
=20
 if ( $report !=3D 0 ) {
-  echo '<fieldset style=3D"height:70%;"><legend>'.$rapport->get_name().'=
</legend>';
+  echo '<fieldset style=3D"height:50%;"><legend>'.$rapport->get_name().'=
</legend>';
   $exercice=3D$g_user->get_exercice();
   if ( $exercice =3D=3D 0 ) {
     alert(_('Aucune periode par defaut'));
@@ -155,7 +155,7 @@
   echo '</fieldset>';
   echo '</div>';
  } else {
-  echo '<fieldset style=3D"height:70%;width:80%;background-color:white">=
<legend>'._('Aucun rapport d=C3=A9fini').'</legend>';
+  echo '<fieldset style=3D"height:60%;width:80%;background-color:white">=
<legend>'._('Aucun rapport d=C3=A9fini').'</legend>';
   echo '<a href=3D"do.php?'.dossier::get().'&ac=3DPREFERENCE">'._('Cliqu=
ez ici pour mettre =C3=A0 jour vos pr=C3=A9f=C3=A9rences').'</a>';
=20
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 13:53:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcftD-0000gK-13
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 13:53:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 15 May 2013 19:51:35 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1346990.1368640402.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5262 - phpcompta/trunk/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 17:53:21 -0000

Author: danydb
Date: 2013-05-15 19:51:34 +0200 (Wed, 15 May 2013)
New Revision: 5262

Modified:
   phpcompta/trunk/sql/upgrade.sql
Log:
Bug #842 : effacement de journal et moyen de paiement

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-05-14 20:53:30 UTC (rev 5261)
+++ phpcompta/trunk/sql/upgrade.sql	2013-05-15 17:51:34 UTC (rev 5262)
@@ -1 +1,5 @@
 update attr_def set ad_text=3D'Compte bancaire' where ad_id=3D3;
+ALTER TABLE mod_payment  DROP CONSTRAINT mod_payment_mp_fd_id_fkey ;
+ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_fd_id_fkey FOREIG=
N KEY (mp_fd_id)      REFERENCES fiche_def (fd_id) MATCH SIMPLE      ON U=
PDATE cascade ON DELETE cascade;
+ALTER TABLE mod_payment  DROP CONSTRAINT mod_payment_mp_jrn_def_id_fkey =
;
+ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_jrn_def_id_fkey F=
OREIGN KEY (mp_jrn_def_id)      REFERENCES jrn_def (jrn_def_id) MATCH SIM=
PLE ON UPDATE 	CASCADE ON DELETE CASCADE;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 14:11:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcgAy-0000eE-9i
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 14:11:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 15 May 2013 20:09:51 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347021.1368641503.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5263 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 18:11:43 -0000

Author: danydb
Date: 2013-05-15 20:09:51 +0200 (Wed, 15 May 2013)
New Revision: 5263

Modified:
   phpcompta/trunk/include/class_acc_ledger_fin.php
Log:
Bug #842 : Solde incorrect lors enregistrement banque

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2013-05-15 17:51:34 =
UTC (rev 5262)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2013-05-15 18:09:51 =
UTC (rev 5263)
@@ -500,8 +500,11 @@
 		$filter_year =3D "  j_tech_per in (select p_id from parm_periode where=
  p_exercice=3D'" . $exercice . "')";
=20
 		$acc_account =3D new Acc_Account_Ledger($this->db, $fBank->strAttribut=
(ATTR_DEF_ACCOUNT));
-		$solde =3D $acc_account->get_solde($filter_year);
-		$new_solde =3D $solde;
+		$asolde=3D $acc_account->get_solde_detail($filter_year);
+		$deb=3D$asolde['debit'];
+		$cred=3D$asolde['credit'];
+		$solde=3D  bcsub($deb, $cred);
+		$new_solde=3D$solde;
=20
 		$r.=3D"<TR><td colspan=3D\"4\"> Banque ";
 		$r.=3D$e_bank_account_label;
@@ -708,8 +711,11 @@
 			}
 			$exercice =3D $pPeriode->get_exercice();
 			$filter_year =3D "  j_tech_per in (select p_id from parm_periode wher=
e  p_exercice=3D'" . $exercice . "')";
-			$solde =3D $acc_account->get_solde($filter_year);
-			$new_solde =3D $solde;
+			$asolde=3D $acc_account->get_solde_detail($filter_year);
+			$deb=3D$asolde['debit'];
+			$cred=3D$asolde['credit'];
+			$solde=3D  bcsub($deb, $cred);
+			$new_solde=3D$solde;
 		}
=20
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 14:36:51 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcgZH-0002Qg-Pp
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 14:36:51 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 15 May 2013 20:35:04 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347042.1368643011.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5264 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 18:36:50 -0000

Author: danydb
Date: 2013-05-15 20:35:03 +0200 (Wed, 15 May 2013)
New Revision: 5264

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_ibutton.php
   phpcompta/trunk/include/class_icard.php
   phpcompta/trunk/include/class_itva_popup.php
   phpcompta/trunk/include/compta_ven.inc.php
Log:
task #841 : am?\195?\169lioration encodage, passe d'un champs ?\195?\160 =
l'autre avec TAB, la date a le focus

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-05-15 18:09:51 UTC =
(rev 5263)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-05-15 18:35:03 UTC =
(rev 5264)
@@ -1763,6 +1763,7 @@
 			$w->value =3D (isset($jrn_concerned)) ? $jrn_concerned : "";
 			$ret.=3D"R&eacute;conciliation/rapprochements : " . $w->input();
 		}
+		$ret.=3D create_script("$('".$wDate->id."').focus()");
 		return $ret;
 	}
=20
@@ -2305,7 +2306,7 @@
 			$value =3D 0;
 		return $value;
 	}
-=09
+
 	/**
 	 * @brief create the invoice and saved it as attachment to the
 	 * operation,

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2013-05-15 18:09:51 =
UTC (rev 5263)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2013-05-15 18:35:03 =
UTC (rev 5264)
@@ -430,8 +430,8 @@
 		require_once('template/form_ledger_fin.php');
 		$r.=3Dob_get_contents();
 		ob_end_clean();
+		$r.=3D create_script("$('".$Date->id."').focus()");
=20
-
 		return $r;
 	}
=20

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-15 18:0=
9:51 UTC (rev 5263)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-15 18:3=
5:03 UTC (rev 5264)
@@ -890,11 +890,13 @@
         /* Add button */
         $f_add_button=3Dnew IButton('add_card');
         $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche');
+		$f_add_button->tabindex=3D-1;
         $f_add_button->set_attribute('ipopup','ipop_newcard');
         $f_add_button->set_attribute('jrn',$this->id);
         $f_add_button->javascript=3D" this.jrn=3D\$('p_jrn').value;selec=
t_card_type(this);";
=20
         $f_add_button2=3Dnew IButton('add_card2');
+		$f_add_button2->tabindex=3D-1;
         $f_add_button2->label=3D_('Cr=C3=A9er une nouvelle fiche');
         $f_add_button2->set_attribute('ipopup','ipop_newcard');
         $f_add_button2->set_attribute('filter',$this->get_all_fiche_def =
());
@@ -1227,6 +1229,8 @@
         {
             $r.=3D'<script> update_pj();</script>';
         }
+		// set focus on date
+		$r.=3D create_script("$('".$Date->id."').focus()");
         return $r;
     }
=20

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-15 18:09:51=
 UTC (rev 5263)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-15 18:35:03=
 UTC (rev 5264)
@@ -1032,12 +1032,14 @@
         $flag_tva=3D$g_parameter->MY_TVA_USE;
         /* Add button */
         $f_add_button=3Dnew IButton('add_card');
+		$f_add_button->tabindex=3D-1;
         $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche');
         $f_add_button->set_attribute('ipopup','ipop_newcard');
         $f_add_button->set_attribute('jrn',$this->id);
         $f_add_button->javascript=3D"this.jrn=3D\$('p_jrn').value; selec=
t_card_type(this);";
=20
         $f_add_button2=3Dnew IButton('add_card2');
+		$f_add_button2->tabindex=3D-1;
         $f_add_button2->label=3D_('Cr=C3=A9er une nouvelle fiche');
         $f_add_button2->set_attribute('ipopup','ipop_newcard');
         $f_add_button2->set_attribute('filter',$this->get_all_fiche_def =
());
@@ -1355,7 +1357,7 @@
         $r.=3DHtmlInput::hidden('jrn_type','VEN');
=20
         $r.=3DHtmlInput::button('add_item',_('Ajout article'),      ' on=
Click=3D"ledger_add_row()"');
-
+		$r.=3D create_script("$('".$Date->id."').focus()");
         return $r;
     }
=20

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-05-15 18:09:51 UTC =
(rev 5263)
+++ phpcompta/trunk/include/class_html_input.php	2013-05-15 18:35:03 UTC =
(rev 5264)
@@ -219,12 +219,12 @@
     }
     static function infobulle($p_comment)
     {
-        $r=3D'<A HREF=3D"#" style=3D"display:inline;color:black;backgrou=
nd-color:yellow;padding-left:4px;width:2em;padding-right:4px;text-decorat=
ion:none;" onmouseover=3D"showBulle(\''.$p_comment.'\')"  onclick=3D"show=
Bulle(\''.$p_comment.'\')" onmouseout=3D"hideBulle(0)">?</A>';
+        $r=3D'<A HREF=3D"#" tabindex=3D"-1" style=3D"display:inline;colo=
r:black;background-color:yellow;padding-left:4px;width:2em;padding-right:=
4px;text-decoration:none;" onmouseover=3D"showBulle(\''.$p_comment.'\')" =
 onclick=3D"showBulle(\''.$p_comment.'\')" onmouseout=3D"hideBulle(0)">?<=
/A>';
         return $r;
     }
     static function warnbulle($p_comment)
     {
-        $r=3D'<A HREF=3D"#" style=3D"display:inline;color:red;background=
-color:white;padding-left:4px;padding-right:4px;text-decoration:none;" on=
mouseover=3D"showBulle(\''.$p_comment.'\')"  onclick=3D"showBulle(\''.$p_=
comment.'\')" onmouseout=3D"hideBulle(0)">&Delta;</A>';
+        $r=3D'<A HREF=3D"#" tabindex=3D"-1" style=3D"display:inline;colo=
r:red;background-color:white;padding-left:4px;padding-right:4px;text-deco=
ration:none;" onmouseover=3D"showBulle(\''.$p_comment.'\')"  onclick=3D"s=
howBulle(\''.$p_comment.'\')" onmouseout=3D"hideBulle(0)">&Delta;</A>';
         return $r;
     }
     /**

Modified: phpcompta/trunk/include/class_ibutton.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_ibutton.php	2013-05-15 18:09:51 UTC (re=
v 5263)
+++ phpcompta/trunk/include/class_ibutton.php	2013-05-15 18:35:03 UTC (re=
v 5264)
@@ -36,8 +36,10 @@
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
         $extra=3D ( isset($this->extra))?$this->extra:"";
         $this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+		$tab=3D(isset($this->tabindex))?' tabindex=3D"'.$this->tabindex.'"':""=
;
         $r=3D'<input type=3D"BUTTON" name=3D"'.$this->name.'"'.
            ' class=3D"button" '.
+				$tab.
            ' id=3D"'.$this->id.'"'.
            ' value=3D"'.$this->label.'"'.
            ' onClick=3D"'.$this->javascript.'"'.$extra.'>';
@@ -46,6 +48,7 @@
         return $r;
=20
     }
+
     /*!\brief print in html the readonly value of the widget*/
     public function display()
     {

Modified: phpcompta/trunk/include/class_icard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_icard.php	2013-05-15 18:09:51 UTC (rev =
5263)
+++ phpcompta/trunk/include/class_icard.php	2013-05-15 18:35:03 UTC (rev =
5264)
@@ -299,7 +299,7 @@
 		else
             $a.=3D"this.inp=3D'".$this->name."';";
         $a.=3D"this.popup=3D'ipop_card';";
-
+		$button->tabindex=3D-1;
         $button->javascript=3D$a.' search_card(this)';
         return $button->input();
     }

Modified: phpcompta/trunk/include/class_itva_popup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_itva_popup.php	2013-05-15 18:09:51 UTC =
(rev 5263)
+++ phpcompta/trunk/include/class_itva_popup.php	2013-05-15 18:35:03 UTC =
(rev 5264)
@@ -80,7 +80,7 @@
=20
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
-        $str=3D'<input type=3D"TEXT" class=3D"input_text" name=3D"%s" va=
lue=3D"%s" id=3D"%s" size=3D"3" %s>';
+        $str=3D'<input type=3D"TEXT"  class=3D"input_text" name=3D"%s" v=
alue=3D"%s" id=3D"%s" size=3D"3" %s>';
         $r=3Dsprintf($str,$this->name,$this->value,$this->id,$this->js);
=20
         if ($this->in_table)
@@ -128,6 +128,7 @@
=20
         // button
         $bt=3Dnew IButton('bt_'.$this->id);
+		$bt->tabindex=3D"-1";
         $bt->label=3D_(' TVA ');
         $bt->set_attribute('gDossier',dossier::id());
         $bt->set_attribute('ctl',$this->id);

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2013-05-15 18:09:51 UTC (r=
ev 5263)
+++ phpcompta/trunk/include/compta_ven.inc.php	2013-05-15 18:35:03 UTC (r=
ev 5264)
@@ -257,6 +257,7 @@
 	{
 		echo create_script(" get_last_date()");
 	}
+=09
     exit();
=20
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 14:40:59 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcgdH-0000B3-9Q
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 14:40:59 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 15 May 2013 20:39:06 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347043.1368643256.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5265 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 18:40:56 -0000

Author: danydb
Date: 2013-05-15 20:39:06 +0200 (Wed, 15 May 2013)
New Revision: 5265

Modified:
   phpcompta/trunk/include/template/dashboard.php
Log:
task #806 : cosmetic, size mini report

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-05-15 18:35:03 UT=
C (rev 5264)
+++ phpcompta/trunk/include/template/dashboard.php	2013-05-15 18:39:06 UT=
C (rev 5265)
@@ -155,7 +155,7 @@
   echo '</fieldset>';
   echo '</div>';
  } else {
-  echo '<fieldset style=3D"height:60%;width:80%;background-color:white">=
<legend>'._('Aucun rapport d=C3=A9fini').'</legend>';
+  echo '<fieldset style=3D"height:50%;width:80%;background-color:white">=
<legend>'._('Aucun rapport d=C3=A9fini').'</legend>';
   echo '<a href=3D"do.php?'.dossier::get().'&ac=3DPREFERENCE">'._('Cliqu=
ez ici pour mettre =C3=A0 jour vos pr=C3=A9f=C3=A9rences').'</a>';
=20
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 14:51:18 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcgnG-00006U-C6
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 14:51:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 15 May 2013 20:49:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347048.1368643877.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r500 - trunk/rapport_avance/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 18:51:17 -0000

Author: danydb
Date: 2013-05-15 20:49:31 +0200 (Wed, 15 May 2013)
New Revision: 500

Modified:
   trunk/rapport_avance/include/template/declaration_display.php
Log:
Undefined variable $per  when not step

Modified: trunk/rapport_avance/include/template/declaration_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/declaration_display.php	2013-05=
-13 21:56:31 UTC (rev 499)
+++ trunk/rapport_avance/include/template/declaration_display.php	2013-05=
-15 18:49:31 UTC (rev 500)
@@ -40,6 +40,7 @@
 for ($i=3D0;$i<count($array);$i++):
 	$row=3D$array[$i];
 if ($this->d_step <> 0 ) $per=3D $row['dr_start']." : ".$row['dr_end'];
+$per=3D(isset($per))?$per:"";
 switch($row['dr_type'])
 {
 	case 1:



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 14:52:18 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcgoE-0000Vh-Ha
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 14:52:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 15 May 2013 20:50:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347049.1368643937.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r501 - trunk/rapport_avance/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 18:52:17 -0000

Author: danydb
Date: 2013-05-15 20:50:31 +0200 (Wed, 15 May 2013)
New Revision: 501

Modified:
   trunk/rapport_avance/sql/upgrade3.sql
Log:
int?\195?\169gre script mise ?\195?\160 jour

Modified: trunk/rapport_avance/sql/upgrade3.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/sql/upgrade3.sql	2013-05-15 18:49:31 UTC (rev 50=
0)
+++ trunk/rapport_avance/sql/upgrade3.sql	2013-05-15 18:50:31 UTC (rev 50=
1)
@@ -1,3 +1,4 @@
+begin;
 ALTER TABLE rapport_advanced.formulaire ADD COLUMN f_lob oid;
 COMMENT ON COLUMN rapport_advanced.formulaire.f_lob IS 'OID for file';
=20
@@ -36,3 +37,9 @@
 ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_start date;
=20
 ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_end date;
+
+ALTER TABLE rapport_advanced.declaration ADD COLUMN d_description text;
+
+insert into rapport_advanced.version  (version_id,version_note)values(3,=
'G=C3=A9n=C3=A9ration de document');
+
+commit;
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 14:52:24 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcgoK-0000Y9-Lq
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 14:52:24 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 15 May 2013 20:50:38 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347050.1368643943.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r502 - trunk/rapport_avance
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 18:52:23 -0000

Author: danydb
Date: 2013-05-15 20:50:38 +0200 (Wed, 15 May 2013)
New Revision: 502

Modified:
   trunk/rapport_avance/rapav_constant.php
Log:
int?\195?\169gre script mise ?\195?\160 jour

Modified: trunk/rapport_avance/rapav_constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_constant.php	2013-05-15 18:50:31 UTC (rev =
501)
+++ trunk/rapport_avance/rapav_constant.php	2013-05-15 18:50:38 UTC (rev =
502)
@@ -11,5 +11,5 @@
=20
 global $cn,$rapav_version;
 $cn=3Dnew Database (dossier::id());
-$rapav_version=3D2;
+$rapav_version=3D3;
 ?>
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 18:08:47 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcjsN-0007Ck-2l
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 18:08:47 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 16 May 2013 00:07:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347279.1368655726.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5266 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 22:08:45 -0000

Author: danydb
Date: 2013-05-16 00:06:59 +0200 (Thu, 16 May 2013)
New Revision: 5266

Modified:
   phpcompta/trunk/include/compta_fin_rec.inc.php
Log:
Bug : rapprochement bancaire bloqu?\195?\169

Modified: phpcompta/trunk/include/compta_fin_rec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin_rec.inc.php	2013-05-15 18:39:06 UT=
C (rev 5265)
+++ phpcompta/trunk/include/compta_fin_rec.inc.php	2013-05-15 22:06:59 UT=
C (rev 5266)
@@ -95,7 +95,9 @@
 echo $wLedger->input();
 echo HtmlInput::submit('ref', 'Rafra=C3=AEchir');
 echo '</form>';
-
+echo '<span id=3D"bkname" style=3D"display:block">' . hb(h($Ledger->get_=
bank_name())) . '</span>';
+echo _('Filtre').HtmlInput::infobulle(25);
+echo HtmlInput::filter_table("t_rec_bk", "0,1,2,3","1");
 echo '<form method=3D"post" id=3D"rec1">';
=20
 echo dossier::hidden();
@@ -107,7 +109,7 @@
 								jr_montant,
 								to_char(jr_date,'YYYYMMDD') as raw_date
                               from jrn where jr_def_id=3D$1 and (jr_pj_n=
umber is null or jr_pj_number=3D'') order by jr_date", array($Ledger->id)=
);
-echo '<span id=3D"bkname">' . hb(h($Ledger->get_bank_name())) . '</span>=
';
+
 echo '<p>';
 $iextrait =3D new IText('ext');
 if ( isset ($_POST['ext'])) $iextrait->value=3D$_POST['ext']; else $iext=
rait->value =3D $Ledger->guess_pj();
@@ -123,8 +125,8 @@
 echo '</p>';
 echo HtmlInput::submit('save', 'Mettre =C3=A0 jour le n=C2=B0 de relev=C3=
=A9 bancaire');
 echo '<span style=3D"display:block">';
-	echo _('Filtre').HtmlInput::infobulle(25);
-	echo HtmlInput::filter_table("t_rec_bk", "0,1,2,3","1");
+
+
 	echo '</span>';
 echo '<table id=3D"t_rec_bk" class=3D"sortable" style=3D"width:80%;margi=
n-left:10%">';
 $r =3D'<th class=3D" sorttable_sorted_reverse">'.'Date '.HtmlInput::info=
bulle(17).'<span id=3D"sorttable_sortrevind">&nbsp;&blacktriangle;</span>=
'.'</th>';



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 18:09:30 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ucjt4-0007Gh-CA
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 18:09:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 16 May 2013 00:07:45 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347282.1368655770.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5267 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 22:09:30 -0000

Author: danydb
Date: 2013-05-16 00:07:45 +0200 (Thu, 16 May 2013)
New Revision: 5267

Modified:
   phpcompta/trunk/include/template/menu.php
Log:
Correct html : 2 fois le tag table

Modified: phpcompta/trunk/include/template/menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu.php	2013-05-15 22:06:59 UTC (re=
v 5266)
+++ phpcompta/trunk/include/template/menu.php	2013-05-15 22:07:45 UTC (re=
v 5267)
@@ -2,7 +2,6 @@
     <? if ( count($amenu) > 4 && $idx =3D=3D 0) :
 	$style =3D "width:100%";
     ?>
-<table style=3D"<?=3D$style?>" >
     <? elseif ($idx=3D=3D0):
 switch (count($amenu))
 {
@@ -10,7 +9,7 @@
 case 3:
    $width=3Dcount($amenu)*20;
    $left=3Dround((100-$width)/2);
-$style=3D"width:$width%;margin-left:$left%";
+$style=3D"style=3D\"width:$width%;margin-left:$left%\"";
 break;
 default:
 $style=3D"";
@@ -19,7 +18,7 @@
 		$style=3D" class=3D\"mtitle\"";
=20
     	endif;?>
-<table style=3D"<?=3D$style?>" >
+<table  <?=3D$style?> >
=20
=20
     <tr>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 18:24:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uck7S-00012a-TE
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 18:24:22 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 16 May 2013 00:22:29 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347294.1368656662.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5268 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 22:24:21 -0000

Author: danydb
Date: 2013-05-16 00:22:29 +0200 (Thu, 16 May 2013)
New Revision: 5268

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
ferme tag commentaire

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-15 22:07:45 UTC (rev 526=
7)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-15 22:22:29 UTC (rev 526=
8)
@@ -74,6 +74,7 @@
   background-color:lightgrey;
 }
 </style>
+-->
 </head>
 <body>
 <p align=3D"center">



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 15 18:24:45 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uck7p-00014K-6E
	for mharc-phpcompta-dev@gnu.org; Wed, 15 May 2013 18:24:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 16 May 2013 00:22:52 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1347295.1368656684.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5269 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 22:24:43 -0000

Author: danydb
Date: 2013-05-16 00:22:52 +0200 (Thu, 16 May 2013)
New Revision: 5269

Modified:
   phpcompta/trunk/include/template/menu.php
Log:
cosmetique : menu

Modified: phpcompta/trunk/include/template/menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu.php	2013-05-15 22:22:29 UTC (re=
v 5268)
+++ phpcompta/trunk/include/template/menu.php	2013-05-15 22:22:52 UTC (re=
v 5269)
@@ -1,6 +1,6 @@
 <div class=3D"topmenu">
     <? if ( count($amenu) > 4 && $idx =3D=3D 0) :
-	$style =3D "width:100%";
+	$style =3D'style=3D "width:100%"';
     ?>
     <? elseif ($idx=3D=3D0):
 switch (count($amenu))



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 14:01:36 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud2Ui-0000eN-9P
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 14:01:36 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 16 May 2013 19:59:44 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348506.1368727295.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5270 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 18:01:35 -0000

Author: danydb
Date: 2013-05-16 19:59:43 +0200 (Thu, 16 May 2013)
New Revision: 5270

Modified:
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/class_html_input.php
Log:
Task #0000832: Filtrage simple de table
Le form devient un span

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-05-15 22:22:52 UTC (rev 5269)
+++ phpcompta/trunk/html/js/scripts.js	2013-05-16 17:59:43 UTC (rev 5270)
@@ -1723,7 +1723,7 @@
  * @see HtmlInput::filter_table
  */
 function filter_table(phrase, _id, colnr,start_row) {
-	var words =3D phrase.value.toLowerCase();
+	var words =3D $(phrase).value.toLowerCase();
 	var table =3D document.getElementById(_id);
 	// if colnr contains a comma then check several columns
 	var aCol =3D new Array();

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-05-15 22:22:52 UTC =
(rev 5269)
+++ phpcompta/trunk/include/class_html_input.php	2013-05-16 17:59:43 UTC =
(rev 5270)
@@ -716,10 +716,10 @@
 	static function filter_table($p_table_id,$p_col,$start_row)
 	{
 		$r=3D "
-			<form style=3D\"display:inline\" class=3D\"noprint\">
+			<span>
 			<input id=3D\"lk_".$p_table_id."\" class=3D\"input_text\" name=3D\"fi=
lter\" onkeyup=3D\"filter_table(this, '$p_table_id','$p_col',$start_row )=
\" type=3D\"text\">
 			<input type=3D\"button\" class=3D\"button\" onclick=3D\"$('lk_".$p_ta=
ble_id."').value=3D'';filter_table($('lk_".$p_table_id."'), '$p_table_id'=
,'$p_col',$start_row );\" value=3D\"X\">
-			</form>
+			</span>
 			";
 		return $r;
 	}



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 14:02:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud2V6-0001TI-Kl
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 14:02:00 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 16 May 2013 20:00:09 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348507.1368727320.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5271 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 18:01:59 -0000

Author: danydb
Date: 2013-05-16 20:00:08 +0200 (Thu, 16 May 2013)
New Revision: 5271

Modified:
   phpcompta/trunk/include/compta_fin_rec.inc.php
Log:
Task #0000832: Filtrage simple de table
Position du filtre dans les rapprochements bancaires

Modified: phpcompta/trunk/include/compta_fin_rec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin_rec.inc.php	2013-05-16 17:59:43 UT=
C (rev 5270)
+++ phpcompta/trunk/include/compta_fin_rec.inc.php	2013-05-16 18:00:08 UT=
C (rev 5271)
@@ -96,8 +96,7 @@
 echo HtmlInput::submit('ref', 'Rafra=C3=AEchir');
 echo '</form>';
 echo '<span id=3D"bkname" style=3D"display:block">' . hb(h($Ledger->get_=
bank_name())) . '</span>';
-echo _('Filtre').HtmlInput::infobulle(25);
-echo HtmlInput::filter_table("t_rec_bk", "0,1,2,3","1");
+
 echo '<form method=3D"post" id=3D"rec1">';
=20
 echo dossier::hidden();
@@ -123,6 +122,10 @@
 echo 'solde Fin' . $nend_extrait->input();
 echo IButton::tooggle_checkbox('rec1');
 echo '</p>';
+echo '<p>';
+echo _('Filtre').HtmlInput::infobulle(25);
+echo HtmlInput::filter_table("t_rec_bk", "0,1,2,3","1");
+echo '</p>';
 echo HtmlInput::submit('save', 'Mettre =C3=A0 jour le n=C2=B0 de relev=C3=
=A9 bancaire');
 echo '<span style=3D"display:block">';
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 17:36:30 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud5qg-0000ux-KQ
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 17:36:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 16 May 2013 23:34:18 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348659.1368740190.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5272 - in phpcompta/trunk: html html/admin include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 21:36:30 -0000

Author: danydb
Date: 2013-05-16 23:34:17 +0200 (Thu, 16 May 2013)
New Revision: 5272

Added:
   phpcompta/trunk/html/admin/setup.js
   phpcompta/trunk/html/admin/template_config_form.php
Modified:
   phpcompta/trunk/html/admin/setup.php
   phpcompta/trunk/html/direct.php
   phpcompta/trunk/html/popup.php
   phpcompta/trunk/include/adm.inc.php
   phpcompta/trunk/include/ajax_add_menu.php
   phpcompta/trunk/include/ajax_auto_anc_card.php
   phpcompta/trunk/include/ajax_boxcard_search.php
   phpcompta/trunk/include/ajax_get_menu_detail.php
   phpcompta/trunk/include/ajax_get_profile.php
   phpcompta/trunk/include/ajax_mod_stock_repo.php
   phpcompta/trunk/include/ajax_plugin_detail.php
   phpcompta/trunk/include/ajax_view_action.php
   phpcompta/trunk/include/ajax_view_mod_stock.php
   phpcompta/trunk/include/audit_log.php
   phpcompta/trunk/include/bank.inc.php
   phpcompta/trunk/include/class_profile_menu.php
   phpcompta/trunk/include/client.inc.php
   phpcompta/trunk/include/config_file.php
   phpcompta/trunk/include/contact.inc.php
   phpcompta/trunk/include/doc_state.inc.php
   phpcompta/trunk/include/export_stock_resume_list.php
   phpcompta/trunk/include/fiche.inc.php
   phpcompta/trunk/include/menu.inc.php
   phpcompta/trunk/include/pref.inc.php
   phpcompta/trunk/include/stock_cfg.inc.php
   phpcompta/trunk/include/stock_inv_histo.inc.php
   phpcompta/trunk/include/supplier.inc.php
   phpcompta/trunk/include/template/account_result.php
   phpcompta/trunk/include/template/account_search.php
   phpcompta/trunk/include/template/action_button.php
   phpcompta/trunk/include/template/action_search.php
   phpcompta/trunk/include/template/action_search_result.php
   phpcompta/trunk/include/template/calendar.php
   phpcompta/trunk/include/template/card_result.php
   phpcompta/trunk/include/template/category_of_card.php
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/include/template/detail-action.php
   phpcompta/trunk/include/template/document_mod_change.php
   phpcompta/trunk/include/template/fiche_def_input.php
   phpcompta/trunk/include/template/fiche_def_list.php
   phpcompta/trunk/include/template/fiche_list.php
   phpcompta/trunk/include/template/forecast-detail.php
   phpcompta/trunk/include/template/forecast_cat.php
   phpcompta/trunk/include/template/forecast_result.php
   phpcompta/trunk/include/template/form_ledger_detail.php
   phpcompta/trunk/include/template/form_ledger_fin.php
   phpcompta/trunk/include/template/impress_cat_card.php
   phpcompta/trunk/include/template/impress_reconciliation.php
   phpcompta/trunk/include/template/ledger_detail_ach.php
   phpcompta/trunk/include/template/ledger_detail_bottom.php
   phpcompta/trunk/include/template/ledger_detail_file.php
   phpcompta/trunk/include/template/ledger_detail_fin.php
   phpcompta/trunk/include/template/ledger_detail_misc.php
   phpcompta/trunk/include/template/ledger_detail_top.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
   phpcompta/trunk/include/template/ledger_search.php
   phpcompta/trunk/include/template/letter_all.php
   phpcompta/trunk/include/template/letter_prop.php
   phpcompta/trunk/include/template/list_category_document.php
   phpcompta/trunk/include/template/list_mod_payment.php
   phpcompta/trunk/include/template/menu.php
   phpcompta/trunk/include/template/menu_detail.php
   phpcompta/trunk/include/template/modele_document.php
   phpcompta/trunk/include/template/module.php
   phpcompta/trunk/include/template/new_mod_payment.php
   phpcompta/trunk/include/template/operation_detail_ach.php
   phpcompta/trunk/include/template/operation_detail_misc.php
   phpcompta/trunk/include/template/operation_detail_ven.php
   phpcompta/trunk/include/template/param_jrn.php
   phpcompta/trunk/include/template/periode_add_exercice.php
   phpcompta/trunk/include/template/profile.php
   phpcompta/trunk/include/template/profile_sec_repository.php
   phpcompta/trunk/include/template/result_cat_card_summary.php
   phpcompta/trunk/include/template/search_top.php
   phpcompta/trunk/include/template/stock_histo.php
   phpcompta/trunk/include/template/stock_histo_search.php
   phpcompta/trunk/include/template/stock_inv.php
   phpcompta/trunk/include/template/stock_state_search.php
   phpcompta/trunk/include/template/stock_summary_list.php
   phpcompta/trunk/include/template/stock_summary_table.php
   phpcompta/trunk/include/template/user_sec_profile.php
   phpcompta/trunk/include/user_detail.inc.php
Log:
Task #0000839: R?\195?\169?\195?\169criture de la proc?\195?\169dure d'in=
stallation

Setup.php en partie r?\195?\169?\195?\169crit
Tous les tags <? ont ?\195?\169t?\195?\169 chang?\195?\169s en <?php pour=
 les servers mutualis?\195?\169s

Added: phpcompta/trunk/html/admin/setup.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.js	                        (rev 0)
+++ phpcompta/trunk/html/admin/setup.js	2013-05-16 21:34:17 UTC (rev 5272=
)
@@ -0,0 +1,11 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+content[200]=3D"Indiquez ici le r=C3=A9cuterpertoire o=C3=B9 les documen=
ts temporaires peuvent =C3=AAtre sauv=C3=A9s exemple c:/temp, /tmp"
+content[201]=3D"D=C3=A9sactiver le changement de langue (requis pour Mac=
OSX)";
+content[202]=3D"Le chemin vers le repertoire contenant psql, pg_dump..."=
;
+content[203]=3D"Utilisateur de la base de donn=C3=A9e postgresql";
+content[204]=3D"Mot de passe de l'utilisateur ";
+content[205]=3D"Port de postgresql";
\ No newline at end of file

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-16 18:00:08 UTC (rev 527=
1)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-16 21:34:17 UTC (rev 527=
2)
@@ -3,78 +3,11 @@
     <META http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUT=
F8">
     </title>
 <head>
-<style type=3D"text/css">
-<!--
-body {
-   	font-family:Verdana,arial,sans-serif;
-	font-size:12px;
-	color:blue;
-        background-color:#EDF3FF;
- }
-p.info {
-	color:blue;
-	font-family:Verdana,arial,sans-serif;
-        padding: 30px;
-        border : 1px solid green;
-        width:70%;
-        margin-left: 15%;
-        margin-right: 15%;
-
-}
-h2.error {
-	color:red;
-	font-size:12px;
-	font-family:Verdana,arial,sans-serif;
-}
-h1 {
-	color:blue;
-	font-size:16px;
-	font-family:Verdana,arial,sans-serif;
-        border : 1px solid blue;
-        text-align: center;
-        padding-top: 10px;
-        padding-bottom: 10px;
-}
-h2 {
-	color:blue;
-	font-size:14px;
-	font-family:Verdana,arial,sans-serif;
-        font-style: italic;
-}
-h3 {
-	color:blue;
-	font-size:12px;
-	font-family:Verdana,arial,sans-serif;
-        font-style: normal;
-        text-decoration: underline;
-}
-p.warning  {
-   	font-family:Verdana,arial,sans-serif;
-	font-size:12px;
-	color:red;
-        border: 1px solid red;
-        padding:30px;
- }
-.info {
-	color:blue;
-	font-size:12px;
-	font-family:Verdana,arial,sans-serif;
-}
-a:hover{
-color:blue;
-	background-color:blue;
-	color:lightgrey;
-	}
-a {
-color:blue;
-padding:5px;
-  font-size:15px;
-border:groove 2px blue;
-  text-decoration:none;
-  background-color:lightgrey;
-}
-</style>
--->
+<LINK REL=3D"stylesheet" type=3D"text/css" href=3D"../style.css" media=3D=
"screen">
+<link rel=3D"icon" type=3D"image/ico" href=3D"../favicon.ico" />
+ <META http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF8"=
>
+ <script type=3D"text/javascript" charset=3D"utf8" language=3D"javascrip=
t" src=3D"../js/prototype.js"></script>
+ <script type=3D"text/javascript" charset=3D"utf8" language=3D"javascrip=
t" src=3D"../js/infobulle.js"></script>
 </head>
 <body>
 <p align=3D"center">
@@ -107,6 +40,12 @@
  *        This file is included in each release  for a new upgrade
  *
  */
+?>
+<DIV id=3D"bulle" class=3D"infobulle"></DIV>
+        <script type=3D"text/javascript" language=3D"javascript"  src=3D=
"../js/infobulle.js"> </script>
+		 <script type=3D"text/javascript" charset=3D"utf8" language=3D"javascr=
ipt" src=3D"setup.js"></script>
+
+<?php
 $failed=3D"<span style=3D\"font-size:18px;color:red\">&#x2716;</span>";
 $succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</span>=
";
 $inc_path=3Dget_include_path();
@@ -173,23 +112,24 @@
 echo '
 <form method=3D"post" >
     Les informations sont sauv&eacute;es vous pouvez continuer
-<input type=3D"submit" value=3D"Continuer">
+<input type=3D"submit" class=3D"button" value=3D"Continuer">
 </form>';
  exit();
  }
 if ( is_writable ('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'inc=
lude'.DIRECTORY_SEPARATOR.'constant.php') =3D=3D false ) {
-    echo '<h2 class=3D"error"> Ecriture non possible </h2><p class=3D"wa=
rning"> On ne peut pas &eacute;crire dans le r&eacute;pertoire de phpcomp=
ta, changez-en les droits </p>';
+    echo '<h2 class=3D"notice"> Ecriture non possible </h2><p class=3D"w=
arning"> On ne peut pas &eacute;crire dans le r&eacute;pertoire de phpcom=
pta, changez-en les droits </p>';
     exit();
   }
 create_htaccess();
=20
 if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'in=
clude'.DIRECTORY_SEPARATOR.'config.inc.php')) {
-  echo '<form method=3D"post">';
   echo '<h1 class=3D"info">Entrez les informations n&eacute;cessaires &a=
grave; phpcompta</h1>';
+  echo '<form method=3D"post">';
   require_once('config_file.php');
-
   echo config_file_form();
+  echo '<div style=3D"position:float;float:left;"></div>';
   echo HtmlInput::submit('save_config','Sauver la configuration');
+  echo "</div>";
   echo '</form>';
   exit();
 }
@@ -337,7 +277,7 @@
      )
   {
 ?>
-  <p><?=3D$failed?> Vous devez absolument utiliser au minimum une versio=
n 8.4 de PostGresql, si votre distribution n'en
+  <p><?php echo $failed?> Vous devez absolument utiliser au minimum une =
version 8.4 de PostGresql, si votre distribution n'en
 offre pas, installez en une en la compilant. </p><p>Lisez attentivement =
la notice sur postgresql.org pour migrer
 vos bases de donn&eacute;es
 </p>
@@ -352,7 +292,7 @@
 $sql=3D"select lanname from pg_language where lanname=3D'plpgsql'";
 $Res=3D$cn->count_sql($sql);
 if ( $Res=3D=3D0) { ?>
-<p><?=3D$failed?> Vous devez installer le langage plpgsql pour permettre=
 aux fonctions SQL de fonctionner.</p>
+<p><?php echo $failed?> Vous devez installer le langage plpgsql pour per=
mettre aux fonctions SQL de fonctionner.</p>
 <p>Pour cela, sur la ligne de commande en tant qu\'utilisateur postgres,=
 faites createlang plpgsql template1
 </p>
=20
@@ -518,5 +458,5 @@
  if (! DEBUG) ob_end_clean();
  echo "<p class=3D\"info\">Tout est install&eacute; $succeed";
 ?>
-<A style=3D"display:block;text-align: center" HREF=3D"../index.php">Conn=
ectez-vous =C3=A0 PhpCompta</A>
 </p>
+<A style=3D"" class=3D"button" HREF=3D"../index.php">Connectez-vous =C3=A0=
 PhpCompta</A>

Added: phpcompta/trunk/html/admin/template_config_form.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/template_config_form.php	                 =
       (rev 0)
+++ phpcompta/trunk/html/admin/template_config_form.php	2013-05-16 21:34:=
17 UTC (rev 5272)
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief
+ *
+ */
+?>
+<div style=3D"margin-left: 30">
+<table>
+	<tr>
+		<TD> R=C3=A9pertoire temporaire </TD>
+		<TD> <?php echo $ictmp->input(); echo HtmlInput::infobulle(200);?></TD=
>
+
+	</tr>
+	<TR>
+
+		<TD>Changement de langue</TD>
+		<TD> <?php echo $iclocale->input();echo HtmlInput::infobulle(201)?></T=
D>
+	</TR>
+	<TR>
+		<TD>Chemin complet vers les executable de Postgresql </TD>
+		<TD><?php echo $icpath->input();echo HtmlInput::infobulle(202)?></TD>
+	</TR>
+	<TR>
+		<TD>Utilisateur de la base de donn=C3=A9e </TD>
+		<TD><?php echo $icuser->input();echo HtmlInput::infobulle(203)?></TD>
+	</TR>
+	<TR>
+		<TD>Mot de passe de l'utilisateur </TD>
+		<TD><?php echo $icpasswd->input();echo HtmlInput::infobulle(204)?></TD=
>
+</TR>
+<TR>
+	<TD>Port de postgresql </TD>
+	<TD><?php echo $icport->input();echo HtmlInput::infobulle(205)?></TD>
+</TR>
+</table>
+</div>
+<div class=3D"notice">
+	<?php
+	if ( $os =3D=3D 1 )
+	{
+		?>
+	Attention : si vous installez sous windows n'utilisez pas le \ mais plu=
t=C3=B4t le / dans les nom de r=C3=A9pertoire (c=C3=A0d les chemins ou pa=
th)
+	<?php
+	}
+	?>
+</div>
\ No newline at end of file

Modified: phpcompta/trunk/html/direct.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/direct.php	2013-05-16 18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/html/direct.php	2013-05-16 21:34:17 UTC (rev 5272)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 require_once ("class_database.php");
 require_once 'class_user.php';
 $cn=3Dnew Database($_GET['gDossier']);

Modified: phpcompta/trunk/html/popup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/popup.php	2013-05-16 18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/html/popup.php	2013-05-16 21:34:17 UTC (rev 5272)
@@ -1,4 +1,4 @@
-<?
+<?php=20
=20
 require_once('ac_common.php');
 require_once('function_javascript.php');

Modified: phpcompta/trunk/include/adm.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/adm.inc.php	2013-05-16 18:00:08 UTC (rev 5271=
)
+++ phpcompta/trunk/include/adm.inc.php	2013-05-16 21:34:17 UTC (rev 5272=
)
@@ -90,7 +90,7 @@
     echo _('Cat=C3=A9gorie :').$sel_card->input();
=20
     ?>
-    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D_('recherche')?>">
+    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?php echo _('recherche')?>">
 	 <input type=3D"hidden" name=3D"p_action" value=3D"adm">
                                                                      </f=
orm>
                                                                      </d=
iv>

Modified: phpcompta/trunk/include/ajax_add_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_add_menu.php	2013-05-16 18:00:08 UTC (re=
v 5271)
+++ phpcompta/trunk/include/ajax_add_menu.php	2013-05-16 21:34:17 UTC (re=
v 5272)
@@ -70,34 +70,34 @@
 echo HtmlInput::title_box("Nouveau menu", $ctl);
 ?>
 <form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
-	<?
+	<?php=20
 	echo HtmlInput::hidden('tab','profile_menu_div');
 	?>
-	<?=3DHtmlInput::hidden('p_id',$p_id)?>
+	<?php echo HtmlInput::hidden('p_id',$p_id)?>
 <table>
 <tr>
 	<td>Code</td>
-	<td><?=3D$me_code->input()?></td>
+	<td><?php echo $me_code->input()?></td>
 </tr>
 <tr>
-	<td>D=C3=A9pendant de <?=3DHtmlInput::infobulle(20)?></td>
-	<td><?=3D$me_code_dep->input()?></td>
+	<td>D=C3=A9pendant de <?php echo HtmlInput::infobulle(20)?></td>
+	<td><?php echo $me_code_dep->input()?></td>
 </tr>
=20
 <tr>
 	<td>Ordre d'apparition</td>
-	<td><?=3D$p_order->input()?></td>
+	<td><?php echo $p_order->input()?></td>
 </tr>
 <tr>
 	<td>Menu par d=C3=A9faut</td>
-	<td><?=3D$pm_default->input()?></td>
+	<td><?php echo $pm_default->input()?></td>
 </tr>
 <tr>
 	<td>Type de menu</td>
-	<td><?=3D$p_type->input()?></td>
+	<td><?php echo $p_type->input()?></td>
 </tr>
 </table>
-<?
+<?php=20
 echo HtmlInput::submit('add_menu',"Valider");
 echo '</form>';
 }
@@ -124,21 +124,21 @@
 	}
 ?>
 <form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
-	<?
+	<?php=20
 	echo HtmlInput::hidden('tab','profile_print_div');
 	?>
-	<?=3DHtmlInput::hidden('p_id',$p_id)?>
-	<?=3DHtmlInput::hidden('p_order',10)?>
-	<?=3DHtmlInput::hidden('me_code_dep','')?>
-	<?=3DHtmlInput::hidden('p_type','PR')?>
+	<?php echo HtmlInput::hidden('p_id',$p_id)?>
+	<?php echo HtmlInput::hidden('p_order',10)?>
+	<?php echo HtmlInput::hidden('me_code_dep','')?>
+	<?php echo HtmlInput::hidden('p_type','PR')?>
 <table>
 <tr>
 	<td>Code</td>
-	<td><?=3D$me_code->input()?></td>
+	<td><?php echo $me_code->input()?></td>
 </tr>
=20
 </table>
-<?
+<?php=20
 echo HtmlInput::submit('add_impress',"Valider");
 echo '</form>';
 }

Modified: phpcompta/trunk/include/ajax_auto_anc_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_auto_anc_card.php	2013-05-16 18:00:08 UT=
C (rev 5271)
+++ phpcompta/trunk/include/ajax_auto_anc_card.php	2013-05-16 21:34:17 UT=
C (rev 5272)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 require_once ("class_database.php");
 require_once 'class_user.php';
 $cn=3Dnew Database($_GET['gDossier']);

Modified: phpcompta/trunk/include/ajax_boxcard_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_boxcard_search.php	2013-05-16 18:00:08 U=
TC (rev 5271)
+++ phpcompta/trunk/include/ajax_boxcard_search.php	2013-05-16 21:34:17 U=
TC (rev 5272)
@@ -39,10 +39,10 @@
 echo HtmlInput::title_box("R=C3=A9sultat recherche", "boxsearch_card_div=
");
 $max=3D(count($array)>MAX_CARD_SEARCH)?MAX_CARD_SEARCH:count($array);
 ?>
-<? if (count($array)>MAX_CARD_SEARCH ): ?>
-<h2 class=3D"notice">R=C3=A9sultat limit=C3=A9 =C3=A0 <?=3DMAX_CARD_SEAR=
CH?>, nombre de fiches trouv=C3=A9es : <?=3Dcount($array)?> </h2>
+<?php if (count($array)>MAX_CARD_SEARCH ): ?>
+<h2 class=3D"notice">R=C3=A9sultat limit=C3=A9 =C3=A0 <?php echo MAX_CAR=
D_SEARCH?>, nombre de fiches trouv=C3=A9es : <?php echo count($array)?> <=
/h2>
=20
-<? endif?>
+<?php endif?>
 Filtre  <?php echo HtmlInput::infobulle(26);echo HtmlInput::filter_table=
("tb_fiche", "0,1,2,3,4,5", 1); ?>
 <table id=3D"tb_fiche" class=3D"sorttable" style=3D"width:100%">
 	<tr>
@@ -67,37 +67,37 @@
 		</th>
=20
 	</tr>
-<? if (count($array)=3D=3D0) : ?>
+<?php if (count($array)=3D=3D0) : ?>
 	<h2 class=3D"notice"> Aucun r=C3=A9sultat</h2>
 <?endif?>
-<? for ($i=3D0;$i<$max;$i++):?>
+<?php for ($i=3D0;$i<$max;$i++):?>
 	<tr class=3D"<?php echo ($i%2 =3D=3D 0)?'even':'odd';?>">
=20
 		<td>
-			<?=3DHtmlInput::card_detail($array[$i]['quick_code'])?>
+			<?php echo HtmlInput::card_detail($array[$i]['quick_code'])?>
 		</td>
 		<td>
-			<?=3Dh($array[$i]['vw_name'])?>&nbsp;
-			<?=3Dh($array[$i]['vw_first_name'])?>
+			<?php echo h($array[$i]['vw_name'])?>&nbsp;
+			<?php echo h($array[$i]['vw_first_name'])?>
 		</td>
 		<td>
-			<?=3Dh($array[$i]['fd_label'])?>
+			<?php echo h($array[$i]['fd_label'])?>
 		</td>
 		<td>
-			<?=3Dh($array[$i]['vw_description'])?>
+			<?php echo h($array[$i]['vw_description'])?>
=20
 		</td>
 		<td>
-			<?=3Dh($array[$i]['tva_num'])?>
+			<?php echo h($array[$i]['tva_num'])?>
=20
 		</td>
 		<td style=3D"text-align:right">
-			<?=3DHtmlInput::history_account($array[$i]['poste'],$array[$i]['poste=
'])?>
+			<?php echo HtmlInput::history_account($array[$i]['poste'],$array[$i][=
'poste'])?>
=20
 		</td>
 	</tr>
=20
=20
-<? endfor; ?>
+<?php endfor; ?>
 </table>
-<?=3DHtmlInput::button_close("boxsearch_card_div")?>
+<?php echo HtmlInput::button_close("boxsearch_card_div")?>

Modified: phpcompta/trunk/include/ajax_get_menu_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_get_menu_detail.php	2013-05-16 18:00:08 =
UTC (rev 5271)
+++ phpcompta/trunk/include/ajax_get_menu_detail.php	2013-05-16 21:34:17 =
UTC (rev 5272)
@@ -68,50 +68,50 @@
=20
 ?>
 <form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
-	<?=3DHtmlInput::hidden('pm_id',$array[0]['pm_id'])?>
-	<?=3DHtmlInput::hidden('p_id',$array[0]['p_id'])?>
+	<?php echo HtmlInput::hidden('pm_id',$array[0]['pm_id'])?>
+	<?php echo HtmlInput::hidden('p_id',$array[0]['p_id'])?>
 <table>
 <tr>
 	<td>Code</td>
-	<td><?=3D$me_code->input()?></td>
+	<td><?php echo $me_code->input()?></td>
 </tr>
-<?
+<?php=20
 if ($array[0]['p_type_display']!=3D'P'):
 ?>
 <tr>
 	<td>D=C3=A9pendant de </td>
-	<td><?=3D$me_code_dep->input()?></td>
+	<td><?php echo $me_code_dep->input()?></td>
 </tr>
=20
 <tr>
 	<td>Ordre d'apparition</td>
-	<td><?=3D$p_order->input()?></td>
+	<td><?php echo $p_order->input()?></td>
 </tr>
 <tr>
 	<td>Menu par d=C3=A9faut</td>
-	<td><?=3D$pm_default->input()?></td>
+	<td><?php echo $pm_default->input()?></td>
 </tr>
-<? endif;?>
+<?php endif;?>
 </table>
 	<p>
 Cochez cette case si vous souhaitez effacer ce menu
-<?
+<?php=20
 $delete=3Dnew ICheckBox('delete',"1");
 echo $delete->input();
 ?>
 </p>
-<?
+<?php=20
 if ($array[0]['p_type_display']!=3D'P'):
 ?>
 	<p>
 Cochez cette case si vous souhaitez effacer ce menu ainsi que ceux qui e=
n d=C3=A9pendent
-<?
+<?php=20
 $delete=3Dnew ICheckBox('del_dep',"1");
 echo $delete->input();
 ?>
 </p>
-<? endif;?>
-<?
+<?php endif;?>
+<?php=20
 echo HtmlInput::submit('mod',"Valider");
 echo '</form>';
=20

Modified: phpcompta/trunk/include/ajax_get_profile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_get_profile.php	2013-05-16 18:00:08 UTC =
(rev 5271)
+++ phpcompta/trunk/include/ajax_get_profile.php	2013-05-16 21:34:17 UTC =
(rev 5272)
@@ -35,16 +35,16 @@
 $add_impression=3DHtmlInput::button("add", "Ajout Menu","onclick=3D\"add=
_menu({dossier:$gDossier,p_id:$p_id,type:'pr'})\"");
 ?>
 <hr>
-<h1>Profil <?=3D$profile->p_name?></h1>
-<? if ($p_id > 0 ) : ?>
-<a href=3D"javascript:void(0)" class=3D"line" onclick=3D"profile_show('p=
rofile_gen_div')"><?=3D_('Nom')?></a>&nbsp;
-<a href=3D"javascript:void(0)" class=3D"line" onclick=3D"profile_show('p=
rofile_menu_div')"><?=3D_('D=C3=A9tail Menus')?></a>&nbsp;
-<a href=3D"javascript:void(0)" class=3D"line" onclick=3D"profile_show('p=
rofile_print_div')"><?=3D_('D=C3=A9tail Impressions')?></a>&nbsp;
-<a href=3D"javascript:void(0)" class=3D"line" style=3D"" onclick=3D"prof=
ile_show('profile_gestion_div')"><?=3D_('Action Gestion')?> </a>&nbsp;
-<a href=3D"javascript:void(0)" class=3D"line" onclick=3D"profile_show('p=
rofile_repo_div')"><?=3D_('D=C3=A9p=C3=B4ts')?></a>&nbsp;
-<? endif; ?>
+<h1>Profil <?php echo $profile->p_name?></h1>
+<?php if ($p_id > 0 ) : ?>
+<a href=3D"javascript:void(0)" class=3D"line" onclick=3D"profile_show('p=
rofile_gen_div')"><?php echo _('Nom')?></a>&nbsp;
+<a href=3D"javascript:void(0)" class=3D"line" onclick=3D"profile_show('p=
rofile_menu_div')"><?php echo _('D=C3=A9tail Menus')?></a>&nbsp;
+<a href=3D"javascript:void(0)" class=3D"line" onclick=3D"profile_show('p=
rofile_print_div')"><?php echo _('D=C3=A9tail Impressions')?></a>&nbsp;
+<a href=3D"javascript:void(0)" class=3D"line" style=3D"" onclick=3D"prof=
ile_show('profile_gestion_div')"><?php echo _('Action Gestion')?> </a>&nb=
sp;
+<a href=3D"javascript:void(0)" class=3D"line" onclick=3D"profile_show('p=
rofile_repo_div')"><?php echo _('D=C3=A9p=C3=B4ts')?></a>&nbsp;
+<?php endif; ?>
=20
-<?
+<?php=20
 $id=3DHtmlInput::hidden('p_id',$profile->p_id);
 $name=3Dnew IText("p_name",$profile->p_name);
 $desc=3Dnew IText("p_desc",$profile->p_desc);

Modified: phpcompta/trunk/include/ajax_mod_stock_repo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_mod_stock_repo.php	2013-05-16 18:00:08 U=
TC (rev 5271)
+++ phpcompta/trunk/include/ajax_mod_stock_repo.php	2013-05-16 21:34:17 U=
TC (rev 5272)
@@ -30,16 +30,16 @@
 $st=3Dnew Stock_Sql($_GET['r_id']);
=20
 ?>
-<?=3DHtmlInput::title_box("Ajouter un d=C3=A9p=C3=B4t","change_stock_rep=
o_div","close")?>
+<?php echo HtmlInput::title_box("Ajouter un d=C3=A9p=C3=B4t","change_sto=
ck_repo_div","close")?>
 	<form method=3D"post">
-		<?=3DHtmlInput::hidden("r_id",$_GET['r_id']);?>
+		<?php echo HtmlInput::hidden("r_id",$_GET['r_id']);?>
 		<table>
 			<tr>
 				<td>
 					Nom
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_name",$st->r_name); echo $name->input();?>
+					<?php $name=3Dnew IText("r_name",$st->r_name); echo $name->input();=
?>
 				</td>
 			</tr>
 			<tr>
@@ -47,7 +47,7 @@
 					Adresse
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_adress",$st->r_adress); echo $name->input()=
;?>
+					<?php $name=3Dnew IText("r_adress",$st->r_adress); echo $name->inpu=
t();?>
 				</td>
 			</tr>
 			<tr>
@@ -55,7 +55,7 @@
 					Ville
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_city",$st->r_city); echo $name->input();?>
+					<?php $name=3Dnew IText("r_city",$st->r_city); echo $name->input();=
?>
 				</td>
 			</tr>
 			<tr>
@@ -63,7 +63,7 @@
 					Pays
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_country",$st->r_country); echo $name->input=
();?>
+					<?php $name=3Dnew IText("r_country",$st->r_country); echo $name->in=
put();?>
 				</td>
 			</tr>
 			<tr>
@@ -71,10 +71,10 @@
 					T=C3=A9l=C3=A9phone
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_phone",$st->r_phone); echo $name->input();?=
>
+					<?php $name=3Dnew IText("r_phone",$st->r_phone); echo $name->input(=
);?>
 				</td>
 			</tr>
=20
 		</table>
-		<?=3DHtmlInput::submit("mod_stock","Sauver")?>
+		<?php echo HtmlInput::submit("mod_stock","Sauver")?>
 	</form>
\ No newline at end of file

Modified: phpcompta/trunk/include/ajax_plugin_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_plugin_detail.php	2013-05-16 18:00:08 UT=
C (rev 5271)
+++ phpcompta/trunk/include/ajax_plugin_detail.php	2013-05-16 21:34:17 UT=
C (rev 5272)
@@ -33,22 +33,22 @@
 <table>
 	<tr>
 		<TD>Label</td>
-		<td><?=3D$me_menu->input();?></td>
+		<td><?php echo $me_menu->input();?></td>
 	</tr>
 	<tr>
 		<TD>Code</td>
-		<td><?=3D$me_code->input();?></td>
+		<td><?php echo $me_code->input();?></td>
 	</tr>
 	<tr>
 		<TD>Description</td>
-		<td><?=3D$me_description->input();?></td>
+		<td><?php echo $me_description->input();?></td>
 	</tr>
 	<tr>
 		<TD>Fichier</td>
-		<td><?=3D$me_file->input();?></td>
+		<td><?php echo $me_file->input();?></td>
 	</tr>
 </table>
-	<?
+	<?php=20
 	if ($new =3D=3D1 )
 	{
 		echo HtmlInput::submit("save_plugin","Ajouter ce plugin");

Modified: phpcompta/trunk/include/ajax_view_action.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_view_action.php	2013-05-16 18:00:08 UTC =
(rev 5271)
+++ phpcompta/trunk/include/ajax_view_action.php	2013-05-16 21:34:17 UTC =
(rev 5272)
@@ -37,8 +37,8 @@
 	$action=3DHtmlInput::array_to_string(array("gDossier","ag_id"), $_GET).=
"&ac=3DFOLLOW&sa=3Ddetail";
 	if ( $_GET['mod']=3D=3D 1) :
 	?>
-<a href=3D"<?=3D$action?>" target=3D"_blank" class=3D"button">Modifier <=
/a>
-    <?
+<a href=3D"<?php echo $action?>" target=3D"_blank" class=3D"button">Modi=
fier </a>
+    <?php=20
 	endif;
 }
 else
@@ -48,7 +48,7 @@
 	<div style=3D"margin:0;padding:0;background-color:red;text-align:center=
;">
 <h2 class=3D"error">Acc=C3=A8s interdit : vous n'avez pas acc=C3=A8s =C3=
=A0 cette information, contactez votre responsable</h2>;
 </div>
-	<?
+	<?php=20
 }
 echo HtmlInput::button_close($div);
=20

Modified: phpcompta/trunk/include/ajax_view_mod_stock.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_view_mod_stock.php	2013-05-16 18:00:08 U=
TC (rev 5271)
+++ phpcompta/trunk/include/ajax_view_mod_stock.php	2013-05-16 21:34:17 U=
TC (rev 5272)
@@ -46,13 +46,13 @@
 echo $st->input($p_array,true);
 ?>
 <form method=3D"POST">
-	<?=3DHtmlInput::hidden('c_id',$_GET['c_id']);?>
+	<?php echo HtmlInput::hidden('c_id',$_GET['c_id']);?>
 	<p>
-	<? $ck=3Dnew ICheckBox("ok"," 1");
+	<?php $ck=3Dnew ICheckBox("ok"," 1");
 			$ck->label=3D "Cochez pour confirmer effacement ";
 			echo $ck->input();?>
 	</p>
-	<?=3DHtmlInput::submit("del", "Effacer");?>
-	<?=3DHtmlInput::button_close($_GET['ctl'])?>
-	<?=3DHtmlInput::hidden('r_id',$p_array['p_depot'])?>
+	<?php echo HtmlInput::submit("del", "Effacer");?>
+	<?php echo HtmlInput::button_close($_GET['ctl'])?>
+	<?php echo HtmlInput::hidden('r_id',$p_array['p_depot'])?>
 </form>

Modified: phpcompta/trunk/include/audit_log.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/audit_log.php	2013-05-16 18:00:08 UTC (rev 52=
71)
+++ phpcompta/trunk/include/audit_log.php	2013-05-16 21:34:17 UTC (rev 52=
72)
@@ -47,23 +47,23 @@
     $r=3D$cn->fetch($i);
 ?>
 <td>
-    <?=3Dh($r['ac_user']);?>
+    <?php echo h($r['ac_user']);?>
 </td>
=20
 <td>
-<?=3D$r['fmt_date'];?>
+<?php echo $r['fmt_date'];?>
 </td>
=20
 <td>
-<?=3D$r['ac_ip'];?>
+<?php echo $r['ac_ip'];?>
 </td>
=20
 <td>
-<?=3D$r['ac_module'];?>
+<?php echo $r['ac_module'];?>
 </td>
=20
=20
-<?
+<?php=20
 switch ( $r['ac_state'] )
   {
   case 'FAIL';
@@ -76,11 +76,11 @@
 	  echo '<td>';
   }
 ?>
-<?=3D$r['ac_state']?>
+<?php echo $r['ac_state']?>
 </td>
=20
 </TR>
-<?
+<?php=20
   endfor;
 ?>
=20

Modified: phpcompta/trunk/include/bank.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/bank.inc.php	2013-05-16 18:00:08 UTC (rev 527=
1)
+++ phpcompta/trunk/include/bank.inc.php	2013-05-16 21:34:17 UTC (rev 527=
2)
@@ -86,8 +86,8 @@
     echo _('Inclure les banques sans op=C3=A9ration :').$nooperation->in=
put();
=20
     ?>
-    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D_('recherche')?>">
-                                           <input type=3D"hidden" name=3D=
"ac" value=3D"<?=3D$_REQUEST['ac']?>">
+    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?php echo _('recherche')?>">
+                                           <input type=3D"hidden" name=3D=
"ac" value=3D"<?php echo $_REQUEST['ac']?>">
                                                                      </f=
orm>
                                                                      </d=
iv>
                                                                      <?p=
hp

Modified: phpcompta/trunk/include/class_profile_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_profile_menu.php	2013-05-16 18:00:08 UT=
C (rev 5271)
+++ phpcompta/trunk/include/class_profile_menu.php	2013-05-16 21:34:17 UT=
C (rev 5272)
@@ -45,10 +45,10 @@
 				?>
 				<li>
=20
-					<?=3D $me_menu?>
-					( <?=3D $js?> )
-					<?=3D $me_desc?>  <?=3D$me_def?>
-					<?
+					<?php echo  $me_menu?>
+					( <?php echo  $js?> )
+					<?php echo  $me_desc?>  <?php echo $me_def?>
+					<?php=20
 					$ret2 =3D $this->cn->exec_sql("
 									SELECT pm_id,
 										pm.me_code,

Modified: phpcompta/trunk/include/client.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/client.inc.php	2013-05-16 18:00:08 UTC (rev 5=
271)
+++ phpcompta/trunk/include/client.inc.php	2013-05-16 21:34:17 UTC (rev 5=
272)
@@ -84,8 +84,8 @@
=20
 		echo _('Inclure les clients sans op=C3=A9ration :') . $nooperation->in=
put();
 		?>
-    	    <input type=3D"submit" class=3D"button" name=3D"submit_query" v=
alue=3D"<?=3D _('recherche')?>">
-    	    <input type=3D"hidden" name=3D"ac" value=3D"<?=3D $_REQUEST['ac=
']?>">
+    	    <input type=3D"submit" class=3D"button" name=3D"submit_query" v=
alue=3D"<?php echo  _('recherche')?>">
+    	    <input type=3D"hidden" name=3D"ac" value=3D"<?php echo  $_REQUE=
ST['ac']?>">
     	</form>
         </div>
 	<?php

Modified: phpcompta/trunk/include/config_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config_file.php	2013-05-16 18:00:08 UTC (rev =
5271)
+++ phpcompta/trunk/include/config_file.php	2013-05-16 21:34:17 UTC (rev =
5272)
@@ -25,6 +25,8 @@
  */
=20
 require_once("class_itext.php");
+require_once '../../include/class_iselect.php';
+
 function is_unix()
 {
     $inc_path=3Dget_include_path();
@@ -52,12 +54,13 @@
  */
 function config_file_form($p_array=3Dnull)
 {
+	$os=3Dis_unix();
     if ( $p_array =3D=3D null )
     {
-        $os=3Dis_unix();
+
         /* default value */
-        $ctmp=3D($os=3D=3D1)?'/tmp':'c:\tmp';
-        $cpath=3D($os=3D=3D1)?'/usr/bin':'c:\phpcompta\postgresql\bin';
+        $ctmp=3D($os=3D=3D1)?'/tmp':'c:/tmp';
+        $cpath=3D($os=3D=3D1)?'/usr/bin':'c:/phpcompta/postgresql/bin';
         $cuser=3D'phpcompta';
         $cpasswd=3D'dany';
         $cport=3D5432;
@@ -66,45 +69,24 @@
     }
     else extract ($p_array);
=20
-    $text=3Dnew IText();
-    $text->size=3D25;
-    $r=3D'';
-    $r.=3D'<div style=3D"position:float;float:left;text-align:right;line=
-height:1.8em;padding:0 0.9em 0 0">';
+    $ictmp=3Dnew IText('ctmp',$ctmp);
+    $ictmp->size=3D25;
=20
-    $r.=3D'R&eacute;pertoire temporaire : ';
-    $text->title=3D'Indiquez ici le r&eacute;pertoire o&ugrave; les docu=
ments temporaires peuvent &ecirc;tre sauv&eacute; exemple c:\\\\temp, /tm=
p';
-    $r.=3D$text->input('ctmp',$ctmp);
-    $r.=3D'<A href=3D"#" title=3D"'.$text->title.'" onclick=3D"alert(\''=
.$text->title.'\')">(?)</a>';
-    $r.=3D'<br>';
+    $iclocale=3Dnew ISelect('clocale');
+	$iclocale->value=3Darray(
+		array("value"=3D>1,"label"=3D>"Activ=C3=A9"),
+		array("value"=3D>0,"label"=3D>"D=C3=A9sactiv=C3=A9")
+	);
+	$iclocale->selected=3D1;
=20
-    $r.=3D'D&eacute;sactivation changement de langue: 1 activ=C3=A9, 0 d=
=C3=A9sactiv=C3=A9 ';
-    $text->title=3D'D&eacute;sactiver le changement de langue (requis po=
ur MacOSX';
-    $r.=3D$text->input('clocale',$clocale);
-    $r.=3D'<A href=3D"#" title=3D"'.$text->title.'" onclick=3D"alert(\''=
.$text->title.'\')">(?)</a>';
-    $r.=3D'<br>';
+	$icpath=3Dnew IText("cpath",$cpath);
+	$icpath->size=3D30;
=20
-    $r.=3D'Chemin complet vers les executable de Postgresql : ';
-    $text->title=3D'Le chemin vers le repertoire contenant psql, pg_dump=
...';
-    $r.=3D$text->input('cpath',$cpath);
-    $r.=3D'<A href=3D"#" title=3D"'.$text->title.'" onclick=3D"alert(\''=
.$text->title.'\')">(?)</a>';
-    $r.=3D'<br>';
-    $text->title=3D"Utilisateur de la base de donn&eacute;e postgresql";
-    $r.=3D'Utilisateur de la base de donn&eacute;e : ';
-    $r.=3D$text->input('cuser',$cuser);
-    $r.=3D'<A href=3D"#" title=3D"'.$text->title.'" onclick=3D"alert(\''=
.$text->title.'\')">(?)</a>';
-    $r.=3D'<br>';
-    $text->title=3D"Mot de passe de l\' utilisateur";
-    $r.=3D'Mot de passe de l\'utilisateur : ';
-    $r.=3D$text->input('cpasswd',$cpasswd);
-    $r.=3D'<A href=3D"#" title=3D"'.$text->title.'" onclick=3D"alert(\''=
.$text->title.'\')">(?)</a>';
-    $r.=3D'<br>';
-    $text->title=3D"Port ";
-    $r.=3D'Port de postgresql : ';
-    $r.=3D$text->input('cport',$cport);
-    $r.=3D'<A href=3D"#" title=3D"'.$text->title.'" onclick=3D"alert(\''=
.$text->title.'\')">(?)</a>';
-    $r.=3D'<br>';
-    $r.=3D'</div>';
-    return $r;
+	$icuser=3Dnew IText('cuser',$cuser);
+	$icpasswd=3Dnew IText('cpasswd',$cpasswd);
+	$icport=3Dnew IText("cport",$cport);
+
+	require 'template_config_form.php';
 }
 /*!\brief create the config file
  */

Modified: phpcompta/trunk/include/contact.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/contact.inc.php	2013-05-16 18:00:08 UTC (rev =
5271)
+++ phpcompta/trunk/include/contact.inc.php	2013-05-16 21:34:17 UTC (rev =
5272)
@@ -90,8 +90,8 @@
 		echo _('Soci=C3=A9t=C3=A9 :') . $sl_company->input();
=20
 		?>
-    	    <input type=3D"submit" class=3D"button" name=3D"submit_query" v=
alue=3D"<?=3D _('recherche')?>">
-    	    <input type=3D"hidden" name=3D"ac" value=3D"<?=3D $_REQUEST['ac=
']?>">
+    	    <input type=3D"submit" class=3D"button" name=3D"submit_query" v=
alue=3D"<?php echo  _('recherche')?>">
+    	    <input type=3D"hidden" name=3D"ac" value=3D"<?php echo  $_REQUE=
ST['ac']?>">
     	</form>
         </div>
 	<?php

Modified: phpcompta/trunk/include/doc_state.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/doc_state.inc.php	2013-05-16 18:00:08 UTC (re=
v 5271)
+++ phpcompta/trunk/include/doc_state.inc.php	2013-05-16 21:34:17 UTC (re=
v 5272)
@@ -46,26 +46,26 @@
 ?>
=20
 <table>
-	<? for ($i=3D0;$i<count($a_stat);$i++):?>
+	<?php for ($i=3D0;$i<count($a_stat);$i++):?>
=20
 	<tr>
 		<td>
-			<?=3Dh($a_stat[$i]['s_value'])?>
+			<?php echo h($a_stat[$i]['s_value'])?>
 		</td>
=20
 		<td>
-			<? if ($a_stat[$i]['s_status']=3D=3D'C') { echo _("Ferme l'action"); =
} ?>
+			<?php if ($a_stat[$i]['s_status']=3D=3D'C') { echo _("Ferme l'action"=
); } ?>
 		</td>
 	</tr>
-	<?	endfor;?>
+	<?php endfor;?>
 </table>
 <h2>Ajout d'un =C3=A9tat</h2>
 <form method=3D"post" onsubmit=3D"return confirm ('Vous confirmez ?'); "=
>
 	<p>
-		Nom de l'=C3=A9tat <? $value=3Dnew IText("s_value",""); echo $value->i=
nput()?>
+		Nom de l'=C3=A9tat <?php $value=3Dnew IText("s_value",""); echo $value=
->input()?>
 	</p>
 	<p>
-		Cochez la case si cet =C3=A9tat ferme une action <? $state=3Dnew IChec=
kBox("s_state",""); echo $state->input()?>
-		<?=3DHtmlInput::submit("add", "Ajouter")?>
+		Cochez la case si cet =C3=A9tat ferme une action <?php $state=3Dnew IC=
heckBox("s_state",""); echo $state->input()?>
+		<?php echo HtmlInput::submit("add", "Ajouter")?>
 	</p>
 </form>
\ No newline at end of file

Modified: phpcompta/trunk/include/export_stock_resume_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_stock_resume_list.php	2013-05-16 18:00=
:08 UTC (rev 5271)
+++ phpcompta/trunk/include/export_stock_resume_list.php	2013-05-16 21:34=
:17 UTC (rev 5272)
@@ -37,7 +37,7 @@
=20
 ?>
 "Depot";"Adresse";"Ville";"Pays";"Code Stock";"Fiches";"IN";"OUT";"DIFF"
-<?
+<?php=20
 $a_repo=3D$cn->get_array("select distinct t.r_id,r_name,r_adress,r_city,=
r_country from stock_repository as s join tmp_stockgood_detail as t
 	on (s.r_id=3Dt.r_id)
 	where

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-05-16 18:00:08 UTC (rev 52=
71)
+++ phpcompta/trunk/include/fiche.inc.php	2013-05-16 21:34:17 UTC (rev 52=
72)
@@ -87,10 +87,10 @@
 ?>
 <div style=3D"position:absolute;right:230px;top:110px">
=20
-		<?=3D_('Recherche de fiche')?> <?=3DHtmlInput::infobulle(18)?> :<?=3D$=
search_card->input()?>
-		<?=3DHtmlInput::button_anchor("Chercher","javascript:void(0)","",$sear=
ch_card_js)?>
+		<?php echo _('Recherche de fiche')?> <?php echo HtmlInput::infobulle(1=
8)?> :<?php echo $search_card->input()?>
+		<?php echo HtmlInput::button_anchor("Chercher","javascript:void(0)",""=
,$search_card_js)?>
 </div>
-<?
+<?php=20
 echo '</div>';
 $str =3D "if (g('histo').value=3D=3D3 || g('histo').value=3D=3D -1 ) {
      g('trstart').style.display=3D'none';g('trend').style.display=3D'non=
e';g('allcard').style.display=3D'none';}

Modified: phpcompta/trunk/include/menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/menu.inc.php	2013-05-16 18:00:08 UTC (rev 527=
1)
+++ phpcompta/trunk/include/menu.inc.php	2013-05-16 21:34:17 UTC (rev 527=
2)
@@ -143,9 +143,9 @@
 ?>
 <fieldset><legend>Recherche</legend>
 <form method=3D"GET">
-	<?=3D$iselect->input()?>
-	<?=3DHtmlInput::submit("search", "Recherche")?>
-	<?=3DHtmlInput::request_to_hidden(array('ac','gDossier','ord'))?>
+	<?php echo $iselect->input()?>
+	<?php echo HtmlInput::submit("search", "Recherche")?>
+	<?php echo HtmlInput::request_to_hidden(array('ac','gDossier','ord'))?>
 </form>
 </fieldset>
 <p class=3D"info"> le type vaut :
@@ -157,7 +157,7 @@
 	</ul>
=20
 	</p>
-<?
+<?php=20
 $gDossier=3DDossier::id();
 echo HtmlInput::button("Add_plugin", "Ajout d'un plugin", "onclick=3Dadd=
_plugin($gDossier)");
 echo HtmlInput::button("Add_menu", "Ajout d'un menu", "onclick=3Dcreate_=
menu($gDossier)");

Modified: phpcompta/trunk/include/pref.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/pref.inc.php	2013-05-16 18:00:08 UTC (rev 527=
1)
+++ phpcompta/trunk/include/pref.inc.php	2013-05-16 21:34:17 UTC (rev 527=
2)
@@ -149,7 +149,7 @@
     		    </td>
     		    <td>  <?php echo $msg;?></td>
     		<tr>
-    		    <td><? echo _('Taille des pages');?></td>
+    		    <td><?php echo _('Taille des pages');?></td>
     		    <td>
     			<SELECT NAME=3D"p_size">
     			    <option value=3D"15">15
@@ -167,7 +167,7 @@
=20
     		    </td>
     		</tr>
-		    <?
+		    <?php=20
 		}
 		?>
 	    </table>

Modified: phpcompta/trunk/include/stock_cfg.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/stock_cfg.inc.php	2013-05-16 18:00:08 UTC (re=
v 5271)
+++ phpcompta/trunk/include/stock_cfg.inc.php	2013-05-16 21:34:17 UTC (re=
v 5272)
@@ -74,31 +74,31 @@
=20
 <table class=3D"result">
 	<tr>
-		<th><?=3D$tb->get_header(0)?></th>
-		<th><?=3D$tb->get_header(1)?></th>
-		<th><?=3D$tb->get_header(2)?></th>
-		<th><?=3D$tb->get_header(3)?></th>
-		<th><?=3D$tb->get_header(4)?></th>
+		<th><?php echo $tb->get_header(0)?></th>
+		<th><?php echo $tb->get_header(1)?></th>
+		<th><?php echo $tb->get_header(2)?></th>
+		<th><?php echo $tb->get_header(3)?></th>
+		<th><?php echo $tb->get_header(4)?></th>
 	</tr>
-<? for ($i=3D0;$i<count($array);$i++): ?>
+<?php for ($i=3D0;$i<count($array);$i++): ?>
 	<tr>
 		<td>
-			<?=3Dh($array[$i]['r_name'])?>
+			<?php echo h($array[$i]['r_name'])?>
 		</td>
 		<td>
-			<?=3Dh($array[$i]['r_adress'])?>
+			<?php echo h($array[$i]['r_adress'])?>
 		</td>
 		<td>
-			<?=3Dh($array[$i]['r_city'])?>
+			<?php echo h($array[$i]['r_city'])?>
 		</td>
 		<td>
-			<?=3Dh($array[$i]['r_country'])?>
+			<?php echo h($array[$i]['r_country'])?>
 		</td>
 		<td>
-			<?=3Dh($array[$i]['r_phone'])?>
+			<?php echo h($array[$i]['r_phone'])?>
 		</td>
 		<td>
-			<?
+			<?php=20
 				$js=3D' onclick=3D"stock_repo_change(\''.dossier::id().'\',\''.$arra=
y[$i]['r_id'].'\')"';
 				echo HtmlInput::button("mod", _("Modifier"), $js);
 			?>
@@ -107,9 +107,9 @@
=20
 <?endfor;?>
 </table>
-	<?=3DHtmlInput::button("show_add_depot_d", "Ajout d'un d=C3=A9pot", "on=
click=3D\"$('add_depot_d').show();\"");?>
+	<?php echo HtmlInput::button("show_add_depot_d", "Ajout d'un d=C3=A9pot=
", "onclick=3D\"$('add_depot_d').show();\"");?>
 	<div id=3D"add_depot_d" class=3D"inner_box" style=3D"display:none">
-	<?=3DHtmlInput::title_box("Ajouter un d=C3=A9p=C3=B4t","add_depot_d","h=
ide")?>
+	<?php echo HtmlInput::title_box("Ajouter un d=C3=A9p=C3=B4t","add_depot=
_d","hide")?>
 	<form method=3D"post">
 		<table>
 			<tr>
@@ -117,7 +117,7 @@
 					Nom
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_name",""); echo $name->input();?>
+					<?php $name=3Dnew IText("r_name",""); echo $name->input();?>
 				</td>
 			</tr>
 			<tr>
@@ -125,7 +125,7 @@
 					Adresse
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_adress",""); echo $name->input();?>
+					<?php $name=3Dnew IText("r_adress",""); echo $name->input();?>
 				</td>
 			</tr>
 			<tr>
@@ -133,7 +133,7 @@
 					Ville
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_city",""); echo $name->input();?>
+					<?php $name=3Dnew IText("r_city",""); echo $name->input();?>
 				</td>
 			</tr>
 			<tr>
@@ -141,7 +141,7 @@
 					Pays
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_country",""); echo $name->input();?>
+					<?php $name=3Dnew IText("r_country",""); echo $name->input();?>
 				</td>
 			</tr>
 			<tr>
@@ -149,12 +149,12 @@
 					T=C3=A9l=C3=A9phone
 				</td>
 				<td>
-					<? $name=3Dnew IText("r_phone",""); echo $name->input();?>
+					<?php $name=3Dnew IText("r_phone",""); echo $name->input();?>
 				</td>
 			</tr>
=20
 		</table>
-		<?=3DHtmlInput::submit("add_stock","Sauver")?>
+		<?php echo HtmlInput::submit("add_stock","Sauver")?>
 	</form>
 	</div>
 </div>

Modified: phpcompta/trunk/include/stock_inv_histo.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/stock_inv_histo.inc.php	2013-05-16 18:00:08 U=
TC (rev 5271)
+++ phpcompta/trunk/include/stock_inv_histo.inc.php	2013-05-16 21:34:17 U=
TC (rev 5272)
@@ -70,27 +70,27 @@
=20
 		</th>
 	</tr>
-	<? for ($e=3D0;$e<count($a_change);$e++): ?>
-	<? $class=3D($e%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" '; ?>
-	<tr <?=3D$class?>>
+	<?php for ($e=3D0;$e<count($a_change);$e++): ?>
+	<?php $class=3D($e%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" '; ?>
+	<tr <?php echo $class?>>
=20
 		<td>
-			<?=3D  $a_change[$e]['str_date']?>
+			<?php echo   $a_change[$e]['str_date']?>
 		</td>
 		<td>
-			<?=3Dh($a_change[$e]['c_comment'])?>
+			<?php echo h($a_change[$e]['c_comment'])?>
 		</td>
 		<td>
-			<?=3Dh($a_change[$e]['r_name'])?>
+			<?php echo h($a_change[$e]['r_name'])?>
 		</td>
 		<td>
-			<?=3D$a_change[$e]['tech_user']?>
+			<?php echo $a_change[$e]['tech_user']?>
 		</td>
 		<td>
-			<?=3DHtmlInput::button_action("D=C3=A9tail",sprintf("stock_inv_detail=
('%s','%s')",$gDossier,$a_change[$e]['c_id']));?>
+			<?php echo HtmlInput::button_action("D=C3=A9tail",sprintf("stock_inv_=
detail('%s','%s')",$gDossier,$a_change[$e]['c_id']));?>
 		</td>
=20
 	</tr>
-	<? endfor; ?>
+	<?php endfor; ?>
 </table>
 </div>

Modified: phpcompta/trunk/include/supplier.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/supplier.inc.php	2013-05-16 18:00:08 UTC (rev=
 5271)
+++ phpcompta/trunk/include/supplier.inc.php	2013-05-16 21:34:17 UTC (rev=
 5272)
@@ -90,8 +90,8 @@
     echo _('Inclure les fournisseurs sans op=C3=A9ration :').$nooperatio=
n->input();
=20
     ?>
-    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D_('recherche')?>">
-                                           <input type=3D"hidden" name=3D=
"ac" value=3D"<?=3D$_REQUEST['ac']?>">
+    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?php echo _('recherche')?>">
+                                           <input type=3D"hidden" name=3D=
"ac" value=3D"<?php echo $_REQUEST['ac']?>">
                                                                      </f=
orm>
                                                                      </d=
iv>
                                                                      <?p=
hp

Modified: phpcompta/trunk/include/template/account_result.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/account_result.php	2013-05-16 18:00:=
08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/account_result.php	2013-05-16 21:34:=
17 UTC (rev 5272)
@@ -1,5 +1,5 @@
 <fieldset id=3D"asearch" style=3D"height:88%">
-<legend><? echo _('R=C3=A9sultats')?></legend>
+<legend><?php echo _('R=C3=A9sultats')?></legend>
 <div style=3D"height:88%;overflow:auto;">
 	<?php
 		$limite=3D5;
@@ -11,18 +11,18 @@
 		<th>Fiche (limite:<?php echo $limite; ?>)</th>
=20
 	</tr>
-<? for ($i=3D0;$i<sizeof($array);$i++) : ?>
+<?php for ($i=3D0;$i<sizeof($array);$i++) : ?>
 <tr>
 <td>
-<a href=3D"javascript:void(0)" onclick=3D"<?=3D$array[$i]['javascript']?=
>">
-<span  id=3D"val<?=3D$i?>">
-<?=3D$array[$i]['pcm_val']?>
+<a href=3D"javascript:void(0)" onclick=3D"<?php echo $array[$i]['javascr=
ipt']?>">
+<span  id=3D"val<?php echo $i?>">
+<?php echo $array[$i]['pcm_val']?>
 </span>
 </a>
 </td>
 <td>
-<span id=3D"lib<?=3D$i?>">
-<?=3D$array[$i]['pcm_lib']?>
+<span id=3D"lib<?php echo $i?>">
+<?php echo $array[$i]['pcm_lib']?>
 </span>
 </td>
 <td>
@@ -49,10 +49,10 @@
 </tr>
=20
=20
-<? endfor; ?>
+<?php endfor; ?>
 </table>
 <span style=3D"font-style:italic">
-<? echo _("Nombre d'enregistrements")." ".$i;?>
+<?php echo _("Nombre d'enregistrements")." ".$i;?>
 </span>
=20
 </div>

Modified: phpcompta/trunk/include/template/account_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/account_search.php	2013-05-16 18:00:=
08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/account_search.php	2013-05-16 21:34:=
17 UTC (rev 5272)
@@ -1,3 +1,3 @@
-<? echo _('Partie du poste comptable ou du libell=C3=A9'); ?>
-<?=3D$str_poste?>
-<?=3D$str_submit?>
\ No newline at end of file
+<?php echo _('Partie du poste comptable ou du libell=C3=A9'); ?>
+<?php echo $str_poste?>
+<?php echo $str_submit?>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/action_button.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/action_button.php	2013-05-16 18:00:0=
8 UTC (rev 5271)
+++ phpcompta/trunk/include/template/action_button.php	2013-05-16 21:34:1=
7 UTC (rev 5272)
@@ -32,11 +32,11 @@
 		<form  method=3D"get" action=3D"do.php">
 			<?php echo dossier::hidden();
 			?>
-			<input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D _("Ajout Action")?>">
-			<input type=3D"hidden" name=3D"ac" value=3D"<?=3D $_REQUEST['ac']?>">
+			<input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?php echo  _("Ajout Action")?>">
+			<input type=3D"hidden" name=3D"ac" value=3D"<?php echo  $_REQUEST['ac=
']?>">
 			<input type=3D"hidden" name=3D"sa" value=3D"add_action">
-			<?=3D $supl_hidden?>
-			<input id=3D"bt_search" type=3D"button" class=3D"button" onclick=3D"$=
('search_action').style.display=3D'block'" value=3D"<?=3D _('Recherche')?=
>">
+			<?php echo  $supl_hidden?>
+			<input id=3D"bt_search" type=3D"button" class=3D"button" onclick=3D"$=
('search_action').style.display=3D'block'" value=3D"<?php echo  _('Recher=
che')?>">
=20
=20
=20

Modified: phpcompta/trunk/include/template/action_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/action_search.php	2013-05-16 18:00:0=
8 UTC (rev 5271)
+++ phpcompta/trunk/include/template/action_search.php	2013-05-16 21:34:1=
7 UTC (rev 5272)
@@ -26,103 +26,103 @@
  *
  */
 ?>
-<? if (! $inner ) : ?>
+<?php if (! $inner ) : ?>
 <div id=3D"search_action" class=3D"op_detail_frame" style=3D"position:ab=
solute;display:none;margin-left:120px;width:70%;clear:both;z-index:2;heig=
ht:auto;border:1px #000080 solid">
-	<? echo HtmlInput::anchor_hide('Fermer', "$('search_action').style.disp=
lay=3D'none';");?>
-<? endif; ?>
-<? if ( $inner ) : ?>
+	<?php echo HtmlInput::anchor_hide('Fermer', "$('search_action').style.d=
isplay=3D'none';");?>
+<?php endif; ?>
+<?php if ( $inner ) : ?>
 <div id=3D"search_action" class=3D"op_detail_frame">
-	<? echo HtmlInput::anchor_hide('Fermer', "removeDiv('search_action_div'=
);");?>
+	<?php echo HtmlInput::anchor_hide('Fermer', "removeDiv('search_action_d=
iv');");?>
=20
-	<? endif; ?>
+	<?php endif; ?>
 	<h2 class=3D"info">
-		<?=3D _('Recherche avanc=C3=A9e')?>
+		<?php echo  _('Recherche avanc=C3=A9e')?>
 	</h2>
-<? if (! $inner ) : ?>
+<?php if (! $inner ) : ?>
 	<form method=3D"get" action=3D"do.php" style=3D"padding:10px">
-<? endif; ?>
-<? if ( $inner ) : ?>
+<?php endif; ?>
+<?php if ( $inner ) : ?>
 	<form method=3D"get" id=3D"fsearchaction" style=3D"padding:10px" onsubm=
it=3D"result_search_action('fsearchaction');return false;">
-		<?=3DHtmlInput::hidden('ctlc',$_GET['ctlc'])?>
-<? endif; ?>
-		<?=3D dossier::hidden()?>
+		<?php echo HtmlInput::hidden('ctlc',$_GET['ctlc'])?>
+<?php endif; ?>
+		<?php echo  dossier::hidden()?>
 		<table style=3D"width:100%">
 			<tr>
 				<td style=3D"width:180px;text-align:right"> Date de rappel apr=C3=A8=
s</td>
 				<td>
-					<?=3D$remind_date->input();?>
+					<?php echo $remind_date->input();?>
 				</td>
 			<tr>
 			<tr>
 				<td style=3D"width:180px;text-align:right"> Date de rappel avant</td=
>
 				<td>
-					<?=3D$remind_date_end->input();?>
+					<?php echo $remind_date_end->input();?>
 				</td>
 			<tr>
 			<tr>
 				<td style=3D"width:180px;text-align:right"> Affiche aussi les action=
s ferm=C3=A9es</td>
-				<td><?=3D$closed_action->input();?></td>
+				<td><?php echo $closed_action->input();?></td>
 			</tr>
 			<td style=3D"width:180px;text-align:right"> R=C3=A9f=C3=A9rence</td>
 				<td>
-					<?=3D$osag_ref->input();?>
+					<?php echo $osag_ref->input();?>
 				</td>
 			<tr>
 			<tr>
 				<td style=3D"width:180px;text-align:right"> Num=C3=A9ro document</td=
>
 				<td>
-					<? $num=3Dnew INum('ag_id');echo $num->input();?>
+					<?php $num=3Dnew INum('ag_id');echo $num->input();?>
 				</td>
 			<tr>
-				<td style=3D"width:180px;text-align:right"><? echo _('Destinataire')=
?></td>
-				<? $label=3D$w->id."_label";?>
-				<td ><?=3D $w->input() . $w->search()?><span id=3D"<?=3D$label?>"></=
span></td>
+				<td style=3D"width:180px;text-align:right"><?php echo _('Destinatair=
e')?></td>
+				<?php $label=3D$w->id."_label";?>
+				<td ><?php echo  $w->input() . $w->search()?><span id=3D"<?php echo =
$label?>"></span></td>
 			<tr>
 			<tr>
-				<td style=3D"text-align:right" ><?=3D _("Profil")?></td>
-				<td><?=3D $str_ag_dest?></td>
+				<td style=3D"text-align:right" ><?php echo  _("Profil")?></td>
+				<td><?php echo  $str_ag_dest?></td>
 			</tr>
 			<tr>
-				<td style=3D"text-align:right" ><?=3D _("Etat")?></td>
-				<td><?=3D $type_state->input()?></td>
+				<td style=3D"text-align:right" ><?php echo  _("Etat")?></td>
+				<td><?php echo  $type_state->input()?></td>
 			</tr>
 			<tr>
-				<td style=3D"text-align:right" ><?=3D _("Exclure Etat")?></td>
-				<td><?=3D $hsExcptype_state->input()?></td>
+				<td style=3D"text-align:right" ><?php echo  _("Exclure Etat")?></td>
+				<td><?php echo  $hsExcptype_state->input()?></td>
 			</tr>
-			<td style=3D"text-align:right"><? printf(_('contenant le mot'))?></td=
>
-			<td ><input class=3D"input_text" style=3D"width:100%" type=3D"text" n=
ame=3D"query" value=3D"<?=3D $a?>"></td>
+			<td style=3D"text-align:right"><?php printf(_('contenant le mot'))?><=
/td>
+			<td ><input class=3D"input_text" style=3D"width:100%" type=3D"text" n=
ame=3D"query" value=3D"<?php echo  $a?>"></td>
 			</tr>
 			<tr>
-				<td style=3D"text-align:right"><?=3D _('Type de document')?></td>
-				<td><? echo $type_doc->input();?></td>
+				<td style=3D"text-align:right"><?php echo  _('Type de document')?></=
td>
+				<td><?php echo $type_doc->input();?></td>
 			</tr>
 			<tr>
 				<td style=3D"text-align:right">
-					<? printf(_("Apr=C3=A8s le "))?>
+					<?php printf(_("Apr=C3=A8s le "))?>
 				</td>
 				<td >
-					<?=3D $start->input()?>
+					<?php echo  $start->input()?>
 				</td>
 			</tr>
 			<tr>
-				<td style=3D"text-align:right"><?=3D _('Avant le')?></td>
+				<td style=3D"text-align:right"><?php echo  _('Avant le')?></td>
 				<td>
-					<?=3D $end->input()?>
+					<?php echo  $end->input()?>
 				</td>
 			</tr>
 			</tr>
 			<tr>
-				<td style=3D"text-align:right"><?=3D _('Uniquement actions internes'=
)?></td>
-				<td><?=3D $only_internal->input()?>
+				<td style=3D"text-align:right"><?php echo  _('Uniquement actions int=
ernes')?></td>
+				<td><?php echo  $only_internal->input()?>
 				</td>
 			</tr>
 		</table>
-		<input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D _('recherche')?>">
+		<input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?php echo  _('recherche')?>">
 		<input type=3D"hidden" name=3D"sa" value=3D"list">
=20
-		<?=3D $supl_hidden?>
-		<? echo HtmlInput::button_anchor(_('Fermer'), 'javascript:void(0)', 'f=
search_form', 'onclick=3D"$(\'search_action\').style.display=3D\'none\';"=
');?>
+		<?php echo  $supl_hidden?>
+		<?php echo HtmlInput::button_anchor(_('Fermer'), 'javascript:void(0)',=
 'fsearch_form', 'onclick=3D"$(\'search_action\').style.display=3D\'none\=
';"');?>
 	</form>
 </div>
=20

Modified: phpcompta/trunk/include/template/action_search_result.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/action_search_result.php	2013-05-16 =
18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/action_search_result.php	2013-05-16 =
21:34:17 UTC (rev 5272)
@@ -28,10 +28,10 @@
  */
 ?>
 <form onsubmit=3D"set_action_related('fresultaction');return false;" id=3D=
"fresultaction">
-	<?=3DHtmlInput::hidden('ctlc',$_GET['ctlc'])?>
-	<?=3DHtmlInput::submit("save_action", "Mettre =C3=A0 jour")?>
-<? if (isset($limit)) : ?>
-	<h2 class=3D"notice">Recherche limit=C3=A9e =C3=A0 <?=3D$limit?> r=C3=A9=
sultats</h2>
+	<?php echo HtmlInput::hidden('ctlc',$_GET['ctlc'])?>
+	<?php echo HtmlInput::submit("save_action", "Mettre =C3=A0 jour")?>
+<?php if (isset($limit)) : ?>
+	<h2 class=3D"notice">Recherche limit=C3=A9e =C3=A0 <?php echo $limit?> =
r=C3=A9sultats</h2>
 <?endif;?>
=20
 <table class=3D"result">
@@ -56,34 +56,34 @@
 			Type
 		</th>
 	</tr>
-<? for ($i=3D0;$i<$limit;$i++):?>
-	<? $class=3D($i%2=3D=3D0)?' class=3D"odd" ':' class=3D"info"'; ?>
-	<tr  <?=3D$class?>>
+<?php for ($i=3D0;$i<$limit;$i++):?>
+	<?php $class=3D($i%2=3D=3D0)?' class=3D"odd" ':' class=3D"info"'; ?>
+	<tr  <?php echo $class?>>
 		<td>
-			<?
+			<?php=20
 			$ck=3Dnew ICheckBox('ag_id[]');
 			 $ck->value=3D$a_row[$i]['ag_id'];
 			 echo $ck->input();
 			?>
 		</td>
 		<td >
-			<?=3Dh($a_row[$i]['my_date'])?>
+			<?php echo h($a_row[$i]['my_date'])?>
 		</td>
 		<td>
-			<?=3Dh($a_row[$i]['ag_ref'])?>
+			<?php echo h($a_row[$i]['ag_ref'])?>
 		</td>
 		<td>
-			<?=3Dh($a_row[$i]['sub_ag_title'])?>
+			<?php echo h($a_row[$i]['sub_ag_title'])?>
 		</td>
 		<td>
-			<?=3Dh($a_row[$i]['name'])?>
+			<?php echo h($a_row[$i]['name'])?>
 		</td>
 		<td>
-			<?=3Dh($a_row[$i]['dt_value'])?>
+			<?php echo h($a_row[$i]['dt_value'])?>
 		</td>
 	</tr>
=20
-<? endfor;?>
+<?php endfor;?>
 </table>
-	<?=3DHtmlInput::submit("save_action", "Mettre =C3=A0 jour")?>
+	<?php echo HtmlInput::submit("save_action", "Mettre =C3=A0 jour")?>
 </form>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/calendar.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/calendar.php	2013-05-16 18:00:08 UTC=
 (rev 5271)
+++ phpcompta/trunk/include/template/calendar.php	2013-05-16 21:34:17 UTC=
 (rev 5272)
@@ -1,5 +1,5 @@
 <div class=3D"pc_calendar" id=3D"user_cal" style=3D"width:100%">
-<?=3D$month_year?>
+<?php echo $month_year?>
 <table width=3D"100%">
 <tr>
 <?php

Modified: phpcompta/trunk/include/template/card_result.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/card_result.php	2013-05-16 18:00:08 =
UTC (rev 5271)
+++ phpcompta/trunk/include/template/card_result.php	2013-05-16 21:34:17 =
UTC (rev 5272)
@@ -1,31 +1,31 @@
 <fieldset id=3D"asearch" style=3D"height:88%">
-   <legend><? echo _('R=C3=A9sultats'); ?></legend>
+   <legend><?php echo _('R=C3=A9sultats'); ?></legend>
 <div style=3D"height:88%;overflow:auto;">
 <table >
-<? for ($i=3D0;$i<sizeof($array);$i++) : ?>
+<?php for ($i=3D0;$i<sizeof($array);$i++) : ?>
 <tr>
 <td style=3D"padding-right:55">
-<a href=3D"javascript:void(0)" class=3D"one" onclick=3D"<?=3D$array[$i][=
'javascript']?>">
-<?=3D$array[$i]['quick_code']?>
+<a href=3D"javascript:void(0)" class=3D"one" onclick=3D"<?php echo $arra=
y[$i]['javascript']?>">
+<?php echo $array[$i]['quick_code']?>
 </a>
 </td>
 <td>
-   <?=3D$array[$i]['name']?>
+   <?php echo $array[$i]['name']?>
 </td>
 <td>
-   <?=3D$array[$i]['first_name']?>
+   <?php echo $array[$i]['first_name']?>
 </td>
 <td>
-<?=3D$array[$i]['description']?>
+<?php echo $array[$i]['description']?>
 </td>
=20
 </tr>
=20
=20
-<? endfor; ?>
+<?php endfor; ?>
 </table>
 <span style=3D"font-style: italic;">
-   <? echo _("Nombre d'enregistrements:$i"); ?>
+   <?php echo _("Nombre d'enregistrements:$i"); ?>
 </span>
 <br>
 </div>

Modified: phpcompta/trunk/include/template/category_of_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/category_of_card.php	2013-05-16 18:0=
0:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/category_of_card.php	2013-05-16 21:3=
4:17 UTC (rev 5272)
@@ -1,42 +1,42 @@
-<?
+<?php=20
      echo HtmlInput::anchor_close($ctl);
 ?>
-   <? echo h2info(_("Ajout d'une cat=C3=A9gorie").$msg); ?>
+   <?php echo h2info(_("Ajout d'une cat=C3=A9gorie").$msg); ?>
=20
 <div class=3D"content">
-<form id=3D"newcat" name=3D"newcat" method=3D"get" onsubmit=3D"this.ipop=
up=3D'<?=3D$ipopup?>';save_card_category(this);return false;">
-<?
+<form id=3D"newcat" name=3D"newcat" method=3D"get" onsubmit=3D"this.ipop=
up=3D'<?php echo $ipopup?>';save_card_category(this);return false;">
+<?php=20
  echo HtmlInput::get_to_hidden(array('gDossier','cat'));
  ?>
=20
 	<TABLE BORDER=3D"0" CELLSPACING=3D"0">
 <TR>
-   <TD><?=3D_('Nom de la cat=C3=A9gorie de fiche')?> </TD>
-<TD><?=3D$nom_mod->input()?></TD>
+   <TD><?php echo _('Nom de la cat=C3=A9gorie de fiche')?> </TD>
+<TD><?php echo $nom_mod->input()?></TD>
 </TR>
 <TR>
-   <TD> <?=3D_('Classe de base')?> </TD>
+   <TD> <?php echo _('Classe de base')?> </TD>
 <TD>
-<?=3D$str_poste?>
+<?php echo $str_poste?>
 </TD>
 <td><span id=3D"class_base_label"></span></td>
 </TR>
 <TR>
-   <TD> <INPUT TYPE=3D"CHECKBOX" NAME=3D"create" UNCHECKED><?=3D_('Cr=C3=
=A9ation automatique du poste comptable')?></TD>
+   <TD> <INPUT TYPE=3D"CHECKBOX" NAME=3D"create" UNCHECKED><?php echo _(=
'Cr=C3=A9ation automatique du poste comptable')?></TD>
 </TR>
 </TABLE>
 <p class=3D"info">
-   <?=3D_('Si vous utilisez la cr=C3=A9ation automatique de poste, chaqu=
e nouvelle fiche de cette cat=C3=A9gorie aura son propre poste comptable.=
 Ce poste comptable sera la classe de base augment=C3=A9 de 1.')?>
+   <?php echo _('Si vous utilisez la cr=C3=A9ation automatique de poste,=
 chaque nouvelle fiche de cette cat=C3=A9gorie aura son propre poste comp=
table. Ce poste comptable sera la classe de base augment=C3=A9 de 1.')?>
 </p>
 <p class=3D"info">
-   <?=3D_('Si vous n\'utilisez pas la cr=C3=A9ation automatique, toutes =
les nouvelles fiches auront par d=C3=A9faut le m=C3=AAme poste comptable.=
 Ce poste comptable par d=C3=A9faut est la classe de base.')?>
+   <?php echo _('Si vous n\'utilisez pas la cr=C3=A9ation automatique, t=
outes les nouvelles fiches auront par d=C3=A9faut le m=C3=AAme poste comp=
table. Ce poste comptable par d=C3=A9faut est la classe de base.')?>
 </p>
 <p class=3D"info">
-<?=3D_(' A moins qu\'en cr=C3=A9ant la fiche, vous forcez un autre poste=
 comptable')?>
+<?php echo _(' A moins qu\'en cr=C3=A9ant la fiche, vous forcez un autre=
 poste comptable')?>
 </p>
=20
 <p>
-<?=3D$submit?> <?=3DHtmlInput::button_close($ipopup)?>
+<?php echo $submit?> <?php echo HtmlInput::button_close($ipopup)?>
 </p>
 </form>
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-05-16 18:00:08 UT=
C (rev 5271)
+++ phpcompta/trunk/include/template/dashboard.php	2013-05-16 21:34:17 UT=
C (rev 5272)
@@ -1,6 +1,6 @@
 <div style=3D"float:left;width: 49%">
 <fieldset >
-<legend><?=3D_('Calendrier')?>
+<legend><?php echo _('Calendrier')?>
 </legend>
 <?php echo $cal->display(); ?>
 </fieldset>
@@ -25,7 +25,7 @@
 ?>
=20
 <div style=3D"float:right;width: 49%">
-<fieldset> <legend><?=3D_('Pense-B=C3=AAte')?></legend>
+<fieldset> <legend><?php echo _('Pense-B=C3=AAte')?></legend>
=20
 <?php
 echo HtmlInput::button('add',_('Ajout'),'onClick=3D"add_todo()"');
@@ -59,61 +59,61 @@
 </div>
 <div style=3D"float:left;clear:both"></div>
 <div style=3D"float:right;width: 49%">
-<? if (count($last_operation)> 0) : ?>
+<?php if (count($last_operation)> 0) : ?>
 	<fieldset>
-	<legend><?=3D_('Action pour aujourd\'hui')?>
+	<legend><?php echo _('Action pour aujourd\'hui')?>
 	</legend>
 	<ol>
 	<?php
 	for($i=3D0;$i<count($last_operation);$i++):
 	?>
 	<li>
-		<?=3DHtmlInput::detail_action($last_operation[$i]['ag_id'],h($last_ope=
ration[$i]['ag_ref']))?>
+		<?php echo HtmlInput::detail_action($last_operation[$i]['ag_id'],h($la=
st_operation[$i]['ag_ref']))?>
 	<span>
-	<?=3Dsmaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
+	<?php echo smaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
 	</span>
 		<span  style=3D"font-weight: bolder ">
-			<?=3Dh($last_operation[$i]['vw_name'])?>
+			<?php echo h($last_operation[$i]['vw_name'])?>
 		</span>
 	<span>
-	<?=3Dh(mb_substr($last_operation[$i]['ag_title'],0,50,'UTF-8'))?>
+	<?php echo h(mb_substr($last_operation[$i]['ag_title'],0,50,'UTF-8'))?>
 	</span>
 	<span style=3D"font-style: italic">
-	<?=3D$last_operation[$i]['dt_value']?>
+	<?php echo $last_operation[$i]['dt_value']?>
 	</span>
 	</li>
-	<? endfor;?>
+	<?php endfor;?>
 	</ol>
 	</fieldset>
-<? endif; ?>
+<?php endif; ?>
=20
-<? if (count($late_operation)> 0) : ?>
+<?php if (count($late_operation)> 0) : ?>
 		<fieldset>
-	<legend><?=3D_('Action en retard ')?>
+	<legend><?php echo _('Action en retard ')?>
 	</legend>
 	<ol>
 	<?php
 	for($i=3D0;$i<count($late_operation);$i++):
 	?>
 	<li>
-		<?=3DHtmlInput::detail_action($late_operation[$i]['ag_id'],h($late_ope=
ration[$i]['ag_ref']))?>
+		<?php echo HtmlInput::detail_action($late_operation[$i]['ag_id'],h($la=
te_operation[$i]['ag_ref']))?>
 	<span>
-	<?=3Dsmaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
+	<?php echo smaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
 	</span>
 		<span  style=3D"font-weight: bolder ">
-			<?=3Dh($late_operation[$i]['vw_name'])?>
+			<?php echo h($late_operation[$i]['vw_name'])?>
 		</span>
 	<span>
-	<?=3Dh(mb_substr($late_operation[$i]['ag_title'],0,50,'UTF-8'))?>
+	<?php echo h(mb_substr($late_operation[$i]['ag_title'],0,50,'UTF-8'))?>
 	</span>
 	<span style=3D"font-style: italic">
-	<?=3D$late_operation[$i]['dt_value']?>
+	<?php echo $late_operation[$i]['dt_value']?>
 	</span>
 	</li>
-	<? endfor;?>
+	<?php endfor;?>
 	</ol>
 	</fieldset>
-<? endif; ?>
+<?php endif; ?>
 </div>
 	<div style=3D"float:left;width: 49%">
 <?php
@@ -168,31 +168,31 @@
=20
 <div style=3D"float:right;width: 49%">
 <fieldset>
-<legend><?=3D_('Derni=C3=A8res op=C3=A9rations')?>
+<legend><?php echo _('Derni=C3=A8res op=C3=A9rations')?>
 </legend>
 <table style=3D"width: 100%">
 <?php
 for($i=3D0;$i<count($last_ledger);$i++):
 	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
 ?>
-<tr <?=3D$class ?>>
-	<td><?=3D  smaller_date($last_ledger[$i]['jr_date_fmt'])?>
+<tr <?php echo $class ?>>
+	<td><?php echo   smaller_date($last_ledger[$i]['jr_date_fmt'])?>
 	</td>
 	<td>
-		<?=3D$last_ledger[$i]['jrn_def_code']?>
+		<?php echo $last_ledger[$i]['jrn_def_code']?>
 	</td>
 <td>
-   <?=3Dh(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?>
+   <?php echo h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?=
>
 </td>
 <td>
-<?=3DHtmlInput::detail_op($last_ledger[$i]['jr_id'], $last_ledger[$i]['j=
r_internal'])?>
+<?php echo HtmlInput::detail_op($last_ledger[$i]['jr_id'], $last_ledger[=
$i]['jr_internal'])?>
 </td>
 <td class=3D"num">
-<?=3Dnbm($last_ledger[$i]['jr_montant'])?>
+<?php echo nbm($last_ledger[$i]['jr_montant'])?>
 </td>
=20
 </tr>
-<? endfor;?>
+<?php endfor;?>
 </ul></table>
 </fieldset>
 </div>

Modified: phpcompta/trunk/include/template/detail-action.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/detail-action.php	2013-05-16 18:00:0=
8 UTC (rev 5271)
+++ phpcompta/trunk/include/template/detail-action.php	2013-05-16 21:34:1=
7 UTC (rev 5272)
@@ -1,7 +1,7 @@
=20
 <fieldset>
   <legend>
-<?=3D_('Informations g=C3=A9n=C3=A9rales')?>
+<?php echo _('Informations g=C3=A9n=C3=A9rales')?>
   </legend>
   <div style=3D"float:right">
     <?echo $retour;
@@ -14,7 +14,7 @@
         <table >
 			<tr>
             <TD>
-	    <?=3D_('N=C2=B0 document')?>
+	    <?php echo _('N=C2=B0 document')?>
             </TD>
             <TD style=3D"font-weight: bolder;" >
               <?php echo $this->ag_id;?>
@@ -22,7 +22,7 @@
           </TR>
 			 <tr>
             <TD>
-	    <?=3D_('Reference')?>
+	    <?php echo _('Reference')?>
             </TD>
             <TD>
               <?php echo $str_ag_ref;
@@ -31,7 +31,7 @@
           </TR>
=20
             <TD>
-   <?=3D_('Date')?>
+   <?php echo _('Date')?>
             </TD>
             <TD>
               <?php echo $date->input();
@@ -40,7 +40,7 @@
           </TR>
           <TR>
             <TD>
-	    <?=3D_('Heure')?>
+	    <?php echo _('Heure')?>
             </TD>
             <TD>
               <?php echo $str_ag_hour;
@@ -50,7 +50,7 @@
           <tr>
 		<TR>
             <TD>
-	    <?=3D_('Date limite')?>
+	    <?php echo _('Date limite')?>
             </TD>
             <TD>
               <?php echo $remind_date->input();
@@ -60,7 +60,7 @@
=20
 	<tr>
           <TD>
-	    <?=3D_('Destinataire')?>
+	    <?php echo _('Destinataire')?>
           </TD>
           <TD>
   <?php echo $w->search().$w->input();
@@ -69,7 +69,7 @@
           </Tr>
 	<tr>
           <TD>
-	  <?=3D_('Contact')?>
+	  <?php echo _('Contact')?>
           </TD>
           <TD>
   <?php echo $ag_contact->search().$ag_contact->input();
@@ -90,7 +90,7 @@
=20
           <tr>
             <TD>
-	    <?=3D_('Type')?>
+	    <?php echo _('Type')?>
             </TD>
             <TD>
               <?php echo $str_doc_type;
@@ -100,7 +100,7 @@
=20
           <tr>
             <TD>
-	    <?=3D_('Etat')?>
+	    <?php echo _('Etat')?>
             </TD>
             <td>
               <?php echo $str_state;
@@ -110,7 +110,7 @@
           </TR>
           <tr>
             <TD>
-	    <?=3D_('Priorit=C3=A9')?>
+	    <?php echo _('Priorit=C3=A9')?>
             </TD>
             <td>
               <?php echo $str_ag_priority;
@@ -120,7 +120,7 @@
           </TR>
           <tr>
             <TD>
-	    <?=3D_('Affect=C3=A9')?>
+	    <?php echo _('Affect=C3=A9')?>
             </TD>
             <td>
               <?php echo $str_ag_dest;?>
@@ -135,7 +135,7 @@
 		<h4 style=3D"display:inline">Op=C3=A9rations concern=C3=A9es</h4>
 		<ol>
=20
-		<?
+		<?php=20
 		for ($o=3D0;$o<count($operation);$o++)
 		{
 			if ( $p_view !=3D 'READ')
@@ -156,14 +156,14 @@
=20
 		?>
 		</ol>
-		<? if ($p_view !=3D 'READ')   echo '<span class=3D"noprint">'.$iconcer=
ned->input().'</span>';?>
+		<?php if ($p_view !=3D 'READ')   echo '<span class=3D"noprint">'.$icon=
cerned->input().'</span>';?>
 	</div>
=20
 	<div style=3D"float:left;width:45%">
 		<h4 style=3D"display:inline">Actions concern=C3=A9es</h4>
 		<ol>
=20
-		<?
+		<?php=20
 		$base=3DHtmlInput::request_to_string(array("gDossier","ac","sa","sb","=
sc","f_id"));
 		for ($o=3D0;$o<count($action);$o++)
 		{
@@ -187,12 +187,12 @@
=20
 		?>
 		</ol>
-		<? if ( $p_view !=3D 'READ') echo '<span class=3D"noprint">'.$iaction-=
>input().'</span>';?>
+		<?php if ( $p_view !=3D 'READ') echo '<span class=3D"noprint">'.$iacti=
on->input().'</span>';?>
 	</div>
 </fieldset>
 <div style=3D"margin-left:15px;margin-right: 15px">
   <h1 class=3D"legend">
-	    <?=3D_('Description')?>
+	    <?php echo _('Description')?>
   </h1>
   <p>
 <script language=3D"javascript">
@@ -208,15 +208,15 @@
=20
    }
 </script>
-<? if  ($p_view !=3D 'NEW') : ?>
-Document cr=C3=A9=C3=A9 le <?=3D$this->ag_timestamp ?> par <?=3D$this->a=
g_owner?>
-<? endif; ?>
-   <h4 class=3D"info"><?=3D_('Titre')?></h4>
+<?php if  ($p_view !=3D 'NEW') : ?>
+Document cr=C3=A9=C3=A9 le <?php echo $this->ag_timestamp ?> par <?php e=
cho $this->ag_owner?>
+<?php endif; ?>
+   <h4 class=3D"info"><?php echo _('Titre')?></h4>
     <p style=3D"margin-left:100">
     <?php echo $title->input();
     ?>
 </p>
-<h4 class=3D"info">   <?=3D_('Commentaire')?></h4>
+<h4 class=3D"info">   <?php echo _('Commentaire')?></h4>
     <div style=3D"margin-left:100">
    <?php
    $style_enl=3D'style=3D"display:inline"';$style_small=3D'style=3D"disp=
lay:none"';
@@ -246,18 +246,18 @@
 echo $desc->input();
 echo '</span>';
 ?>
-<? if ($p_view !=3D "READ" ): ?>
+<?php if ($p_view !=3D "READ" ): ?>
 <p class=3D"noprint">
-<input type=3D"button" id=3D"bt_enlarge" <?=3D$style_enl?> value=3D"+" o=
nclick=3D"enlarge('ag_comment');return false;">
-<input type=3D"button" id=3D"bt_small"  <?=3D$style_small?> value=3D"-" =
style=3D"display:none" onclick=3D"small('ag_comment');return false;">
+<input type=3D"button" id=3D"bt_enlarge" <?php echo $style_enl?> value=3D=
"+" onclick=3D"enlarge('ag_comment');return false;">
+<input type=3D"button" id=3D"bt_small"  <?php echo $style_small?> value=3D=
"-" style=3D"display:none" onclick=3D"small('ag_comment');return false;">
 </p>
-<? endif; ?>
+<?php endif; ?>
   </div>
 </div>
-<? if ( $p_base !=3D 'ajax' ) :?>
+<?php if ( $p_base !=3D 'ajax' ) :?>
 <input type=3D'button' class=3D"button" class=3D"noprint" value=3D'Montr=
er articles' id=3D"toggleButton" onclick=3D'toggleShowDetail()'>
-<? endif; ?>
-<?
+<?php endif; ?>
+<?php=20
 /**
  * check if there card to show,
  */
@@ -266,7 +266,7 @@
 	if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ=
'){ $show_row=3D1;break;}
 endfor;
 ?>
-<?
+<?php=20
 /*
  * display detail if there card or if we are in UPDATE or NEW mode
  */
@@ -274,7 +274,7 @@
=20
 	?>
 <fieldset id=3D"fldDetail" style=3D'display:block'>
-   <LEGEND> <?=3D_('D=C3=A9tail des articles')?>
+   <LEGEND> <?php echo _('D=C3=A9tail des articles')?>
 </LEGEND>
 <?php // hidden fields
 $show_row=3D0;
@@ -288,17 +288,17 @@
=20
 <table id=3D"art" >
 <tr>
-  <th><?=3D_('Fiche')?></th>
-  <th><?=3D_('Description')?></th>
-  <th><?=3D_('prix unitaire')?></th>
-<th><?=3D_('quantit=C3=A9')?></th>
-<th><?=3D_('Code TVA')?></th>
-<th><?=3D_('Montant TVA')?></th>
-<th><?=3D_('Montant TVAC')?></th>
+  <th><?php echo _('Fiche')?></th>
+  <th><?php echo _('Description')?></th>
+  <th><?php echo _('prix unitaire')?></th>
+<th><?php echo _('quantit=C3=A9')?></th>
+<th><?php echo _('Code TVA')?></th>
+<th><?php echo _('Montant TVA')?></th>
+<th><?php echo _('Montant TVAC')?></th>
=20
 </tr>
 <?for ($i=3D0;$i<count($aArticle);$i++): ?>
-<?
+<?php=20
 if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ'=
):
 	$show_row++;
 	?>
@@ -311,7 +311,7 @@
 <TD class=3D"num"><?php echo $aArticle[$i]['tva'] ?></TD>
 <TD class=3D"num"><?php echo $aArticle[$i]['tvac'] ?></TD>
 </TR>
-<? endif; ?>
+<?php endif; ?>
 <?php endfor; ?>
 </table>
=20
@@ -320,15 +320,15 @@
 function toggleShowDetail() {
 	try {var detail=3Dg('fldDetail');
 	var but=3Dg('toggleButton');
-	if (detail.style.display=3D=3D'block' ) { but.value=3D"<?=3D_("Montrer =
les d=C3=A9tails")?>";detail.style.display=3D'none';}
-	else { but.value=3D"<?=3D_("Cacher les d=C3=A9tails")?>";detail.style.d=
isplay=3D'block';} }
+	if (detail.style.display=3D=3D'block' ) { but.value=3D"<?php echo _("Mo=
ntrer les d=C3=A9tails")?>";detail.style.display=3D'none';}
+	else { but.value=3D"<?php echo _("Cacher les d=C3=A9tails")?>";detail.s=
tyle.display=3D'block';} }
 	catch (error)  {alert(error);}
 	}
=20
 </script>
-<? if ( $show_row !=3D 0 ): ?>
+<?php if ( $show_row !=3D 0 ): ?>
 <div style=3D"float: left; text-align: right; padding-right: 5px; font-s=
ize: 1.2em; font-weight: bold; color: blue;">
-  <input name=3D"act" id=3D"act" class=3D"button" value=3D"<?=3D_('Actua=
liser')?>" onclick=3D"compute_all_ledger();" type=3D"button">
+  <input name=3D"act" id=3D"act" class=3D"button" value=3D"<?php echo _(=
'Actualiser')?>" onclick=3D"compute_all_ledger();" type=3D"button">
=20
     <div style=3D"float: right; text-align: left; font-size: 1.2em; font=
-weight: bold; color: blue;" id=3D"sum">
     <br><span id=3D"htva">0.0</span>
@@ -342,25 +342,25 @@
     <br>Total TVAC
  </div>
 </div>
-<? endif; ?>
+<?php endif; ?>
 </fieldset>
 <?endif; ?>
=20
-<? if ($p_view !=3D 'READ' && $str_select_doc !=3D '') : ?>
+<?php if ($p_view !=3D 'READ' && $str_select_doc !=3D '') : ?>
 <fieldset class=3D"noprint" >
   <legend>
-     <?=3D_('Document =C3=A0 g=C3=A9n=C3=A9rer')?>
+     <?php echo _('Document =C3=A0 g=C3=A9n=C3=A9rer')?>
   </legend>
   <?php echo $str_select_doc;
  echo $str_submit_generate;
   ?>
 </fieldset>
-<? endif; ?>
+<?php endif; ?>
=20
=20
 <fieldset>
   <legend>
-     <?=3D_('Pi=C3=A8ces attach=C3=A9es')?>
+     <?php echo _('Pi=C3=A8ces attach=C3=A9es')?>
   </legend>
   <div class=3D"print">
   <ol>
@@ -375,7 +375,7 @@
 	dossier::id(),
 	$aAttachedFile[$i]['d_id']);
     ?>
-  <? if ($p_view !=3D 'READ') : ?>  <a class=3D"mtitle" style=3D"color:o=
range" id=3D"<?php echo "ac".$aAttachedFile[$i]['d_id'];?>" href=3D"<?php=
 echo $rmDoc;?>">Effacer</a><? endif;?>
+  <?php if ($p_view !=3D 'READ') : ?>  <a class=3D"mtitle" style=3D"colo=
r:orange" id=3D"<?php echo "ac".$aAttachedFile[$i]['d_id'];?>" href=3D"<?=
php echo $rmDoc;?>">Effacer</a><?php endif;?>
   </li>
   <?php
 endfor;
@@ -390,10 +390,10 @@
 	new_element.innerHTML=3D'<input class=3D"inp" type=3D"file" value=3D"" =
name=3D"file_upload[]"/>';
 	docAdded.appendChild(new_element);
 }
-catch(exception) { alert('<?=3Dj(_('Je ne peux pas ajouter de fichier'))=
?>'); alert(exception.message);}
+catch(exception) { alert('<?php echo j(_('Je ne peux pas ajouter de fich=
ier'))?>'); alert(exception.message);}
 }
 </script>
-<? if ($p_view !=3D 'READ') : ?>
+<?php if ($p_view !=3D 'READ') : ?>
   <div class=3D"noprint">
      <h3 >Fichiers =C3=A0 ajouter: </h3>
     <ol id=3D'add_file'  >
@@ -406,6 +406,6 @@
  <input type=3D"button" class=3D"button" onclick=3D"addFiles();" value=3D=
"Ajouter un fichier">
   </span>
   </div>
- <? endif;?>
+ <?php endif;?>
 </fieldset>
 <script>compute_all_ledger()</script>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/document_mod_change.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/document_mod_change.php	2013-05-16 1=
8:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/document_mod_change.php	2013-05-16 2=
1:34:17 UTC (rev 5272)
@@ -28,13 +28,13 @@
 $doc_type->get();
 ?>
 <form method=3D"POST" id=3D"cat_doc_f" onsubmit=3D"cat_doc_change_record=
('cat_doc_f');">
-	<?=3DHtmlInput::request_to_hidden(array("ac","gDossier","dt_id"))?>
+	<?php echo HtmlInput::request_to_hidden(array("ac","gDossier","dt_id"))=
?>
 <table>
 <tr>
-  <td> <?=3D_('Nom')?>
+  <td> <?php echo _('Nom')?>
   </td>
   <td>
-	  <?
+	  <?php=20
 	  $name=3Dnew IText('dt_name',$doc_type->dt_value);
 	  echo $name->input();
 	  ?>
@@ -42,10 +42,10 @@
 </tr>
=20
 <tr>
-  <td><?=3D_('Pr=C3=A9fixe')?>
+  <td><?php echo _('Pr=C3=A9fixe')?>
   </td>
   <td>
-	  <?
+	  <?php=20
 	  $prefix=3Dnew IText('dt_prefix',$doc_type->dt_prefix);
 	  echo $prefix->input();
 	  ?>
@@ -53,10 +53,10 @@
 </tr>
=20
 <tr>
-  <td><?=3D_('num=C3=A9ro actuel')?>
+  <td><?php echo _('num=C3=A9ro actuel')?>
   </td>
   <td>
-	<?
+	<?php=20
 	$ret=3D $cn->get_array("select last_value,is_called from seq_doc_type_"=
.$doc_type->dt_id) ;
=20
     $last=3D$ret[0]['last_value'];
@@ -68,13 +68,13 @@
 	?>
   </td>
   <tr>
-  <td><?=3D_('Prochain num=C3=A9ro')?>
-	  <?=3D
+  <td><?php echo _('Prochain num=C3=A9ro')?>
+	  <?php echo=20
 		HtmlInput::infobulle(15);
 	?>
   </td>
    <td>
-	  <?
+	  <?php=20
 	  $seq=3Dnew INum('seq',0);
 	  echo $seq->input();
 	  ?>
@@ -83,5 +83,5 @@
=20
 </table>
=20
-  <? echo HtmlInput::submit("save",_('Sauver'));?>
+  <?php echo HtmlInput::submit("save",_('Sauver'));?>
 </form>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/fiche_def_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/fiche_def_input.php	2013-05-16 18:00=
:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/fiche_def_input.php	2013-05-16 21:34=
:17 UTC (rev 5272)
@@ -1,21 +1,21 @@
 <TABLE BORDER=3D"0" CELLSPACING=3D"0">
 <TR>
-<TD><?=3D('Cat=C3=A9gorie de fiche')?> </TD>
+<TD><?php echo ('Cat=C3=A9gorie de fiche')?> </TD>
 <TD><INPUT TYPE=3D"INPUT" NAME=3D"nom_mod"></TD>
 </TR>
 <TR>
-   <TD> <?=3D_('Classe de base')?> </TD>
-<TD><?=3D$f_class_base?> </TD>
+   <TD> <?php echo _('Classe de base')?> </TD>
+<TD><?php echo $f_class_base?> </TD>
 <td><span id=3D"class_base_label"></span></td>
 </TR>
 <TR>
-<TD colspan=3D'2'> <INPUT TYPE=3D"CHECKBOX" NAME=3D"create" CHECKED><?=3D=
_('Cr=C3=A9ation automatique du poste comptable uniquement s\'il n\y a qu=
\'un seul poste')?></TD>
+<TD colspan=3D'2'> <INPUT TYPE=3D"CHECKBOX" NAME=3D"create" CHECKED><?ph=
p echo _('Cr=C3=A9ation automatique du poste comptable uniquement s\'il n=
\y a qu\'un seul poste')?></TD>
 </TR>
 <?php
   if ( sizeof($ref)  ) {
     foreach ($ref as $i=3D>$v) { ?>
 <TR><TD COLSPAN=3D"2">
-<? echo $iradio->input("FICHE_REF",$v['frd_id']);
+<?php echo $iradio->input("FICHE_REF",$v['frd_id']);
    echo $v['frd_text'];
    if ( sizeof ($v['frd_class_base']) !=3D 0 )
 	   echo "&nbsp;&nbsp<I>Class base =3D ".$v['frd_class_base']."</I>";

Modified: phpcompta/trunk/include/template/fiche_def_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/fiche_def_list.php	2013-05-16 18:00:=
08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/fiche_def_list.php	2013-05-16 21:34:=
17 UTC (rev 5272)
@@ -32,48 +32,48 @@
 <table class=3D"result">
 	<tR>
 		<th>
-			<?=3D$tab->get_header(0)?>
+			<?php echo $tab->get_header(0)?>
 		</th>
 		<th>
-			<?=3D$tab->get_header(1)?>
+			<?php echo $tab->get_header(1)?>
 		</th>
 		<th>
-			<?=3D$tab->get_header(2)?>
+			<?php echo $tab->get_header(2)?>
 		</th>
 		<th>
-			<?=3D$tab->get_header(3)?>
+			<?php echo $tab->get_header(3)?>
 		</th>
 	</tR>
-<?
+<?php=20
 $dossier=3DDossier::id();
 for ($i=3D0;$i<$max;$i++):
 	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
 	$row=3DDatabase::fetch_array($res, $i);
 ?>
-	<tr <?=3D$class?> >
+	<tr <?php echo $class?> >
 		<td>
-		<?=3DHtmlInput::anchor(h($row['fd_label']), "javascript:void(0)", "onc=
lick=3D\"detail_category_show('detail_category_div','".$dossier."','".$ro=
w['fd_id']."')\"")?>
+		<?php echo HtmlInput::anchor(h($row['fd_label']), "javascript:void(0)"=
, "onclick=3D\"detail_category_show('detail_category_div','".$dossier."',=
'".$row['fd_id']."')\"")?>
 		</td>
 		<td>
-			<?=3Dh($row['fd_class_base'])?>
+			<?php echo h($row['fd_class_base'])?>
 		</td>
 		<td>
-			<?
+			<?php=20
 			 $v=3D($row['fd_create_account']=3D=3D't')?"Automatique":"Manuel";
 			 echo $v;
 			?>
 		</td>
 		<td>
-			<?=3D$row['frd_text']?>
+			<?php echo $row['frd_text']?>
 		</td>
 	</tr>
=20
=20
-<?
+<?php=20
 endfor;
 ?>
 </table>
-<?
+<?php=20
 echo HtmlInput::button("cat_fiche_def_add","Ajout d'une nouvelle cat=C3=A9=
gorie", "onclick=3D\"detail_category_show('detail_category_div','".$dossi=
er."','-1')\"");
 ?>
 </div>

Modified: phpcompta/trunk/include/template/fiche_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/fiche_list.php	2013-05-16 18:00:08 U=
TC (rev 5271)
+++ phpcompta/trunk/include/template/fiche_list.php	2013-05-16 21:34:17 U=
TC (rev 5272)
@@ -26,7 +26,7 @@
  *
  */
 ?>
-<?=3D $bar?>
+<?php echo  $bar?>
 <form method=3D"POST" class=3D"print" style=3D"display:inline" onsubmit=3D=
"return confirm('Vous confirmez ?')">
 	<table class=3D"result">
 		<tr>
@@ -40,36 +40,36 @@
 			<th>
 				Poste Comptable
 			</th>
-			<? if ($allcard =3D=3D 1 ) : ?>
+			<?php if ($allcard =3D=3D 1 ) : ?>
 			<th>
 				Cat=C3=A9gorie
 			</th>
-			<? endif; ?>
+			<?php endif; ?>
 			<th>
 				Selection
 			</th>
 		</tr>
-		<? for ($i =3D 0; $i < $nb_line; $i++) :?>
-			<? $row =3D Database::fetch_array($res, $i);?>
-			<? $class=3D($i%2 =3D=3D 0)?' class=3D"even" ':' class=3D"odd" ';?>
-			<tr <?=3D$class?> >
+		<?php for ($i =3D 0; $i < $nb_line; $i++) :?>
+			<?php $row =3D Database::fetch_array($res, $i);?>
+			<?php $class=3D($i%2 =3D=3D 0)?' class=3D"even" ':' class=3D"odd" ';?=
>
+			<tr <?php echo $class?> >
 				<td>
-					<?=3D HtmlInput::card_detail($row['qcode'], "", ' class=3D"line" ')=
?>
+					<?php echo  HtmlInput::card_detail($row['qcode'], "", ' class=3D"li=
ne" ')?>
=20
 				</td>
 				<td>
-					<?=3D h($row['name'])?>
+					<?php echo  h($row['name'])?>
 				</td>
 				<td>
-					<?=3DHtmlInput::history_account($row['poste'],$row['poste'])?>
+					<?php echo HtmlInput::history_account($row['poste'],$row['poste'])?=
>
 				</td>
-				<? if ($allcard =3D=3D 1 ) : ?>
+				<?php if ($allcard =3D=3D 1 ) : ?>
 				<td>
-					<?=3D h($row['fd_label'])?>
+					<?php echo  h($row['fd_label'])?>
 				</td>
-				<? endif; ?>
+				<?php endif; ?>
 				<td>
-					<?
+					<?php=20
 					if ($write =3D=3D 1)
 					{
 						$ck =3D new ICheckBox('f_id[]', $row['f_id']);
@@ -78,20 +78,20 @@
 					?>
 				</td>
 			</tr>
-		<? endfor;?>
+		<?php endfor;?>
=20
=20
 	</table>
-	<?=3D$str_add_card?>
-<?=3DHtmlInput::hidden('action',"1");?>
-<?=3DHtmlInput::submit('delete','Effacer la s=C3=A9lection ')?>
-<? if ( $allcard =3D=3D  0  ): ?>
-<?=3DHtmlInput::submit('move','D=C3=A9placer la s=C3=A9lection  vers')?>
-<?
+	<?php echo $str_add_card?>
+<?php echo HtmlInput::hidden('action',"1");?>
+<?php echo HtmlInput::submit('delete','Effacer la s=C3=A9lection ')?>
+<?php if ( $allcard =3D=3D  0  ): ?>
+<?php echo HtmlInput::submit('move','D=C3=A9placer la s=C3=A9lection  ve=
rs')?>
+<?php=20
 $iselect=3Dnew ISelect('move_to');
 $iselect->value=3D$cn->make_array("select fd_id,fd_label from fiche_def =
order by 2");
 echo $iselect->input();
 ?>
=20
-<? endif ; ?>
+<?php endif ; ?>
 </form>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/forecast-detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/forecast-detail.php	2013-05-16 18:00=
:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/forecast-detail.php	2013-05-16 21:34=
:17 UTC (rev 5272)
@@ -24,7 +24,7 @@
 </tr>
 <?php endfor;?>
 </table>
-<?=3D$f_add_row ?>
+<?php echo $f_add_row ?>
 </fieldset>
=20
=20

Modified: phpcompta/trunk/include/template/forecast_cat.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/forecast_cat.php	2013-05-16 18:00:08=
 UTC (rev 5271)
+++ phpcompta/trunk/include/template/forecast_cat.php	2013-05-16 21:34:17=
 UTC (rev 5272)
@@ -2,8 +2,8 @@
 <legend>
 <?php echo $str_action;?></legend>
 <?php echo $str_name;?>
-Date de d=C3=A9but <?=3D$str_start_date?>
-Date de fin <?=3D$str_end_date ?>
+Date de d=C3=A9but <?php echo $str_start_date?>
+Date de fin <?php echo $str_end_date ?>
=20
 <h2> <?php echo _('Cat=C3=A9gories');?></h2>
 <table>

Modified: phpcompta/trunk/include/template/forecast_result.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/forecast_result.php	2013-05-16 18:00=
:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/forecast_result.php	2013-05-16 21:34=
:17 UTC (rev 5272)
@@ -1,5 +1,5 @@
 <h1><?php echo $str_name;?></h1>
-P=C3=A9riode du <?=3D$str_start?> =C3=A0 <?=3D$str_end;?>
+P=C3=A9riode du <?php echo $str_start?> =C3=A0 <?php echo $str_end;?>
 <?php  for ($i=3D0;$i<count($aCat);$i++): // foreach category ?>
 <?php if (count($aItem[$i])=3D=3D0) continue;?>
 <fieldset>
@@ -180,18 +180,18 @@
=20
=20
 <?php endfor;?>
-<? if ( ! empty ($error) ) : ?>
+<?php if ( ! empty ($error) ) : ?>
 <div class=3D"error">
 D=C3=A9sol=C3=A9 il y a des formules incorrectes=20
 <ul style=3D"list-style-type:none">
=20
-   <? $last=3D"";?>
-   <? for ($i=3D0;$i<count($error);$i++) : ?>
-<?
+   <?php $last=3D"";?>
+   <?php for ($i=3D0;$i<count($error);$i++) : ?>
+<?php=20
    if ( $last !=3D $error[$i] ) {  echo h($error[$i]); }
 $last=3D$error[$i];
 endfor;
 ?>
 </ul>
 </div>
-<? endif; ?>
\ No newline at end of file
+<?php endif; ?>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/form_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_detail.php	2013-05-16 18=
:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/form_ledger_detail.php	2013-05-16 21=
:34:17 UTC (rev 5272)
@@ -2,49 +2,49 @@
=20
 ?>
 <fieldset>
-<legend><?=3D$f_legend ?>
+<legend><?php echo $f_legend ?>
 </legend>
 	<div id=3D"jrn_name_div">
-	<h2 class=3D"title" id=3D"jrn_name"> <?=3D$this->get_name()?></h2>
+	<h2 class=3D"title" id=3D"jrn_name"> <?php echo $this->get_name()?></h2=
>
 </div>
-      <?=3D_('Date').':'?> <?=3D$f_date ?> <?=3D_('Echeance')?> : <?=3D$=
f_echeance?>
-<?=3D$f_periode?><br>
-      <?=3D_('Journal')?> <?=3D$f_jrn?><br><hr>
-<?=3D$f_type?><?=3D$f_client_qcode?><?=3D$f_client_bt?> <?=3D$f_client?>=
<br>
-      <?=3D_('Libell=C3=A9')?> <?=3D$f_desc?>
-      <?=3D_('Num Pj')?> <?=3D$f_pj?><br>
-<?=3D$str_add_button?>
+      <?php echo _('Date').':'?> <?php echo $f_date ?> <?php echo _('Ech=
eance')?> : <?php echo $f_echeance?>
+<?php echo $f_periode?><br>
+      <?php echo _('Journal')?> <?php echo $f_jrn?><br><hr>
+<?php echo $f_type?><?php echo $f_client_qcode?><?php echo $f_client_bt?=
> <?php echo $f_client?><br>
+      <?php echo _('Libell=C3=A9')?> <?php echo $f_desc?>
+      <?php echo _('Num Pj')?> <?php echo $f_pj?><br>
+<?php echo $str_add_button?>
 </fieldset>
=20
 <fieldset>
-<legend><?=3D$f_legend_detail?></legend>
+<legend><?php echo $f_legend_detail?></legend>
 <table id=3D"sold_item" width=3D"100%" border=3D"0">
 <tr>
-<th style=3D"width:auto"colspan=3D"2">Code <?=3DHtmlInput::infobulle(0)?=
></th>
-      <th><?=3D_('D=C3=A9nomination')?></th>
-<? if ($flag_tva =3D=3D'Y') : ?>
-      <th><?=3D_('prix/unit=C3=A9 htva')?><?=3DHtmlInput::infobulle(6)?>=
</th>
-      <th><?=3D_('quantit=C3=A9')?></th>
-      <th><?=3D_('Total HTVA')?></th>
-	  <th><?=3D_('tva')?></th>
-      <th><?=3D_('tot.tva')?></th>
-      <th><?=3D_('tvac')?></th>
-<? else: ?>
-	  <th><?=3D_('prix/unit=C3=A9 ')?><?=3DHtmlInput::infobulle(6)?></th>
-      <th><?=3D_('quantit=C3=A9')?></th>
-      <th><?=3D_('Total ')?></th>
-<? endif;?>
+<th style=3D"width:auto"colspan=3D"2">Code <?php echo HtmlInput::infobul=
le(0)?></th>
+      <th><?php echo _('D=C3=A9nomination')?></th>
+<?php if ($flag_tva =3D=3D'Y') : ?>
+      <th><?php echo _('prix/unit=C3=A9 htva')?><?php echo HtmlInput::in=
fobulle(6)?></th>
+      <th><?php echo _('quantit=C3=A9')?></th>
+      <th><?php echo _('Total HTVA')?></th>
+	  <th><?php echo _('tva')?></th>
+      <th><?php echo _('tot.tva')?></th>
+      <th><?php echo _('tvac')?></th>
+<?php else: ?>
+	  <th><?php echo _('prix/unit=C3=A9 ')?><?php echo HtmlInput::infobulle=
(6)?></th>
+      <th><?php echo _('quantit=C3=A9')?></th>
+      <th><?php echo _('Total ')?></th>
+<?php endif;?>
=20
=20
=20
 </tr>
-<? foreach ($array as $item) {
+<?php foreach ($array as $item) {
 echo '<tr>';
 echo $item['quick_code'];
 echo '<td>'.$item['bt'].'</td>';
 ?>
-<td style=3D"border-bottom: 1px dotted grey; width: 75%;"><?=3D$item['de=
nom'] ?></td>
-<?
+<td style=3D"border-bottom: 1px dotted grey; width: 75%;"><?php echo $it=
em['denom'] ?></td>
+<?php=20
 echo td($item['pu']);
 echo td($item['quantity' ]);
 echo td($item['htva']);
@@ -61,7 +61,7 @@
 </table>
=20
 <div style=3D"position:float;float:right;text-align:right;padding-right:=
5px;font-size:1.2em;font-weight:bold;color:blue">
-      <?=3DHtmlInput::button('act',_('Actualiser'),'onClick=3D"compute_a=
ll_ledger();"'); ?>
+      <?php echo HtmlInput::button('act',_('Actualiser'),'onClick=3D"com=
pute_all_ledger();"'); ?>
  </div>
=20
     <div style=3D"position:float;float:right;text-align:left;font-size:1=
.2em;font-weight:bold;color:blue" id=3D"sum">
@@ -78,11 +78,11 @@
 <?php
 	if ( $flag_tva =3D=3D'Y') :
 	?>
-  <br><?=3D_('Total HTVA')?>
-  <br><?=3D_('Total TVA')?>
-  <br><?=3D_('Total TVAC')?>
+  <br><?php echo _('Total HTVA')?>
+  <br><?php echo _('Total TVA')?>
+  <br><?php echo _('Total TVAC')?>
  <?php else:  ?>
-     <br><?=3D_('Total')?>
+     <br><?php echo _('Total')?>
 <?php endif; ?>
 </div>
=20

Modified: phpcompta/trunk/include/template/form_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_fin.php	2013-05-16 18:00=
:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/form_ledger_fin.php	2013-05-16 21:34=
:17 UTC (rev 5272)
@@ -1,9 +1,9 @@
 <fieldset>
 	<div id=3D"jrn_name_div">
-	<h2 class=3D"title" id=3D"jrn_name"> <?=3D$this->get_name()?></h2>
+	<h2 class=3D"title" id=3D"jrn_name"> <?php echo $this->get_name()?></h2=
>
 </div>
-<legend><?=3D$f_legend ?> </legend>
-<?
+<legend><?php echo $f_legend ?> </legend>
+<?php=20
 	$wchdate=3Dnew ISelect('chdate');
 	$wchdate->value=3Darray(
 			array('value'=3D>1,'label'=3D>"Avec date d'extrait"),
@@ -12,37 +12,37 @@
 	$wchdate->selected=3D(isset($chdate))?$chdate:1;
 	$wchdate->javascript=3D'onchange=3D"show_fin_chdate(\'chdate\')"';
 ?>
-<?=3D$wchdate->input();?>
+<?php echo $wchdate->input();?>
 <span id=3D"chdate_ext">
-   <?=3D_('Date').' '.$f_date ?>
+   <?php echo _('Date').' '.$f_date ?>
 </span>
=20
-<?=3D$f_period?><br>
-<?=3D$f_jrn?><br>
-<?=3D_('Banque')?><?=3D$f_bank ?>
+<?php echo $f_period?><br>
+<?php echo $f_jrn?><br>
+<?php echo _('Banque')?><?php echo $f_bank ?>
=20
 </fieldset>
=20
 <fieldset>
-<legend><?=3D$f_legend_detail?></legend>
-   <fieldset><legend><?=3D_('Extrait de compte')?></legend>
-   <?=3D_('Num=C3=A9ro extrait')?> <?=3D$f_extrait?>
-   <?=3D_('Solde d=C3=A9but') ?> <?=3D$wFirst->input();?>
-<?=3D_('Solde Fin')?> <?=3D$wLast->input();?>
+<legend><?php echo $f_legend_detail?></legend>
+   <fieldset><legend><?php echo _('Extrait de compte')?></legend>
+   <?php echo _('Num=C3=A9ro extrait')?> <?php echo $f_extrait?>
+   <?php echo _('Solde d=C3=A9but') ?> <?php echo $wFirst->input();?>
+<?php echo _('Solde Fin')?> <?php echo $wLast->input();?>
 </fieldset>
-<?=3D$str_add_button?>
-   <fieldset><legend><?=3D_('Op=C3=A9rations')?></legend>
+<?php echo $str_add_button?>
+   <fieldset><legend><?php echo _('Op=C3=A9rations')?></legend>
 <table id=3D"fin_item" width=3D"100%" border=3D"0">
 <tr>
-<th id=3D"thdate" style=3D"display:none;text-align: left"><?=3D_('Date')=
?><?=3DHtmlInput::infobulle(16)?></TH>
+<th id=3D"thdate" style=3D"display:none;text-align: left"><?php echo _('=
Date')?><?php echo HtmlInput::infobulle(16)?></TH>
 <th style=3D"text-align: left;width: auto">code<?HtmlInput::infobulle(0)=
?></TH>
-   <th style=3D"text-align: left"><?=3D_('Fiche')?></TH>
-   <th style=3D"text-align: left"><?=3D_('Commentaire')?></TH>
-   <th style=3D"text-align: left"><?=3D_('Montant')?></TH>
-   <th style=3D"text-align: left;width:auto"colspan=3D"2"> <?=3D_('Op. C=
oncern=C3=A9e(s)')?></th>
+   <th style=3D"text-align: left"><?php echo _('Fiche')?></TH>
+   <th style=3D"text-align: left"><?php echo _('Commentaire')?></TH>
+   <th style=3D"text-align: left"><?php echo _('Montant')?></TH>
+   <th style=3D"text-align: left;width:auto"colspan=3D"2"> <?php echo _(=
'Op. Concern=C3=A9e(s)')?></th>
 </tr>
=20
-<?
+<?php=20
 $i=3D0;
 foreach ($array as $item) {
=20

Modified: phpcompta/trunk/include/template/impress_cat_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/impress_cat_card.php	2013-05-16 18:0=
0:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/impress_cat_card.php	2013-05-16 21:3=
4:17 UTC (rev 5272)
@@ -1,22 +1,22 @@
 <table>
 <tr>
-  <td><?=3D_('Categorie')?> </td>
-  <td><?=3D$str_categorie?></td>
+  <td><?php echo _('Categorie')?> </td>
+  <td><?php echo $str_categorie?></td>
 </tr>
 <tr>
-  <td><?=3D_('Type')?></td>
-  <td><?=3D$str_histo?></td>
+  <td><?php echo _('Type')?></td>
+  <td><?php echo $str_histo?></td>
 </tr>
 <tr id=3D"trstart">
-  <td><?=3D_('Depuis')?></td>
-  <td> <?=3D$str_start?></td>
+  <td><?php echo _('Depuis')?></td>
+  <td> <?php echo $str_start?></td>
 </tr>
 <tr id=3D"trend">
-  <td><?=3D_('Jusque')?></td>
-  <td><?=3D$str_end?></td>
+  <td><?php echo _('Jusque')?></td>
+  <td><?php echo $str_end?></td>
 <tr id=3D"allcard">
 	<td>Toutes les fiches</td>
-	<td><?=3D$str_icall?></td>
+	<td><?php echo $str_icall?></td>
 </tr>
 </tr>
 </table>

Modified: phpcompta/trunk/include/template/impress_reconciliation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/impress_reconciliation.php	2013-05-1=
6 18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/impress_reconciliation.php	2013-05-1=
6 21:34:17 UTC (rev 5272)
@@ -19,7 +19,7 @@
 Montant
 </th>
 </tr>
-<?
+<?php=20
 for ($i=3D0;$i<count($array);$i++) {
 	$r=3D'';
 	$r.=3Dtd($i);

Modified: phpcompta/trunk/include/template/ledger_detail_ach.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_ach.php	2013-05-16 18:=
00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php	2013-05-16 21:=
34:17 UTC (rev 5272)
@@ -1,15 +1,15 @@
-<? require_once('template/ledger_detail_top.php'); ?>
+<?php require_once('template/ledger_detail_top.php'); ?>
 <div class=3D"content" style=3D"padding:0;">
-<?
+<?php=20
   require_once('class_own.php');
   $owner=3Dnew Own($cn);
 ?>
=20
-    <? if ( $access=3D=3D'W') : ?>
+    <?php if ( $access=3D=3D'W') : ?>
 <form  class=3D"print" onsubmit=3D"return op_save(this);">
-   <? endif; ?>
+   <?php endif; ?>
=20
-    <? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',=
$jr_id).dossier::hidden();?>
+    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
     <table style=3D"width:100%">
     <tr><td>
 							<table>
@@ -33,7 +33,7 @@
 							</tr>
=20
 							<tr><td>
-							<?
+							<?php=20
 							$bk=3Dnew Fiche($cn,$obj->det->array[0]['qp_supplier']);
 							echo td(_('Fournisseur'));
=20
@@ -44,7 +44,7 @@
 							</tr>
 							<tr>
 							<td>
-							<?
+							<?php=20
 							$itext=3Dnew IText('npj');
 							$itext->value=3Dstrip_tags($obj->det->jr_pj_number);
 							echo td(_('Pi=C3=A8ce')).td($itext->input());
@@ -52,7 +52,7 @@
 							</td>
 							<tr>
 							<td>
-							<?
+							<?php=20
 							  $itext=3Dnew IText('lib');
 							  $itext->value=3Dstrip_tags($obj->det->jr_comment);
 							  $itext->size=3D40;
@@ -66,7 +66,7 @@
 															   <td></td>
                                                             <td>Pay=C3=A9=
</td>
                                                             <td>
-                                                                <?
+                                                                <?php=20
                                                                 $ipaid=3D=
new ICheckBox("ipaid",'paid');
                                                                 $ipaid->=
selected=3D($obj->det->jr_rapt=3D=3D'paid');
                                                                 echo $ip=
aid->input();
@@ -82,7 +82,7 @@
 				</td></tr>
 				<tr>
 				<td>
-				<?
+				<?php=20
 				$inote=3Dnew ITextarea('jrn_note');
 				$inote->width=3D25;
 				$inote->heigh=3D5;
@@ -98,9 +98,9 @@
=20
 </table>
 <div class=3D"myfieldset">
-	<h1 class=3D"legend"><?=3D_('D=C3=A9tail')?></h1>
+	<h1 class=3D"legend"><?php echo _('D=C3=A9tail')?></h1>
 <table class=3D"result">
-<?
+<?php=20
   bcscale(2);
   $total_htva=3D0;$total_tvac=3D0;
   echo th(_('Quick Code'));
@@ -224,10 +224,10 @@
=20
 </div>
 	<div class=3D"myfieldset">
-	<h1 class=3D"legend"><?=3D_('Ecritures comptables')?></h1>
+	<h1 class=3D"legend"><?php echo _('Ecritures comptables')?></h1>
=20
=20
-<?
+<?php=20
   /* if it is not in a popup, the details are hidden */
   if ( $div !=3D 'popup') {
     $ib=3Dnew IButton ("a".$div);
@@ -246,7 +246,7 @@
 ?>
 <table class=3D"result">
 <tr>
-<?
+<?php=20
  echo th(_('Poste Comptable'));
     echo th(_('Quick Code'));
     echo th(_('Libell=C3=A9'));
@@ -291,7 +291,7 @@
 </div>
 </div>
=20
-<?
+<?php=20
 require_once('ledger_detail_bottom.php');
 ?>
 </div>

Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_bottom.php	2013-05-16 =
18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/ledger_detail_bottom.php	2013-05-16 =
21:34:17 UTC (rev 5272)
@@ -1,9 +1,9 @@
 <div class=3D"myfieldset">
=20
 <h1 class=3D"legend">
-<? echo _('Rapprochement');?>
+<?php echo _('Rapprochement');?>
 </h1>
-<?
+<?php=20
 $oRap=3Dnew Acc_Reconciliation($cn);
 $oRap->jr_id=3D$jr_id;
 $aRap=3D$oRap->get();
@@ -37,7 +37,7 @@
   echo '</table>';
 }
 ?>
-<?
+<?php=20
 if ( $access=3D=3D'W') {
      $wConcerned=3Dnew IConcerned("rapt".$div);
      $wConcerned->amount_id=3D$obj->det->jr_montant;
@@ -46,14 +46,14 @@
 }
 ?>
 </div>
-<?
+<?php=20
 $array =3D Follow_Up::get_all_operation($jr_id);
 if (count($array) > 0)
 {
 	?>
 	<div class=3D"myfieldset">
 		<h1 class=3D"legend">Actions li=C3=A9es</h1>
-	<?
+	<?php=20
 	/**
 	 * show eventually action
 	 */
@@ -76,12 +76,12 @@
 }
 ?>
=20
-<?
+<?php=20
=20
 require_once('template/ledger_detail_file.php');
 ?>
 <hr>
-<?
+<?php=20
=20
 if ( $div !=3D 'popup' ) {
   $a=3Dnew IButton('Fermer','Fermer');
@@ -91,7 +91,7 @@
 }
=20
 ?>
-<?
+<?php=20
=20
 /**
  * if you can write

Modified: phpcompta/trunk/include/template/ledger_detail_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_file.php	2013-05-16 18=
:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/ledger_detail_file.php	2013-05-16 21=
:34:17 UTC (rev 5272)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 /**
  *@brief  show an iframe, the iframe contains either
  * - a input type to save a file
@@ -8,5 +8,5 @@
 if ( isset ($_REQUEST['ajax'])) $str.=3D"&ajax=3D1";
 ?>
 <div class=3D"noprint">
-<iframe frameborder=3D0 scrolling=3D"no" style=3D"margin:0;padding: 0;bo=
rder:0;width:100%;height:90;overflow:hidden" src=3D"<? echo 'ajax_ledger.=
php'.$str; ?>"></iframe>
+<iframe frameborder=3D0 scrolling=3D"no" style=3D"margin:0;padding: 0;bo=
rder:0;width:100%;height:90;overflow:hidden" src=3D"<?php echo 'ajax_ledg=
er.php'.$str; ?>"></iframe>
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/ledger_detail_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_fin.php	2013-05-16 18:=
00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/ledger_detail_fin.php	2013-05-16 21:=
34:17 UTC (rev 5272)
@@ -1,17 +1,17 @@
-<? require_once('template/ledger_detail_top.php'); ?>
+<?php require_once('template/ledger_detail_top.php'); ?>
 <div class=3D"content" style=3D"padding:0;">
-<?
+<?php=20
   require_once('class_own.php');
   $owner=3Dnew Own($cn);
 require_once ('class_anc_plan.php');
 require_once('class_anc_operation.php');
=20
 ?>
-    <? if ( $access=3D=3D'W') : ?>
+    <?php if ( $access=3D=3D'W') : ?>
 <form class=3D"print" onsubmit=3D"return op_save(this);">
-   <? endif; ?>
+   <?php endif; ?>
=20
-    <? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',=
$jr_id).dossier::hidden();?>
+    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
             <table style=3D"width:100%"><tr><td>
 <table>
 <tr>
@@ -25,7 +25,7 @@
 </tr>
=20
 <tr>
-<?
+<?php=20
 $bk=3Dnew Fiche($cn,$obj->det->array[0]['qf_bank']);
 $view_card_detail=3DHtmlInput::card_detail($bk->get_quick_code(),h($bk->=
getName()), ' class=3D"line" ');
 echo td('Compte en banque').td($view_card_detail).td();;
@@ -33,7 +33,7 @@
 ?>
 </tr>
 <tr>
-<?
+<?php=20
=20
 $bk=3Dnew Fiche($cn,$obj->det->array[0]['qf_other']);
 $view_card_detail=3DHtmlInput::card_detail($bk->get_quick_code(),h($bk->=
getName()), ' class=3D"line" ');
@@ -43,7 +43,7 @@
 </tr>
=20
 <tr>
-<?
+<?php=20
   $itext=3Dnew IText('lib');
   $itext->value=3Dstrip_tags($obj->det->jr_comment);
   $itext->size=3D40;
@@ -53,10 +53,10 @@
 ?>
 </tr>
 <tr>
-<? echo td('montant').td(nbm($obj->det->array[0]['qf_amount']),' class=3D=
"inum"');?>
+<?php echo td('montant').td(nbm($obj->det->array[0]['qf_amount']),' clas=
s=3D"inum"');?>
 </tr>
 <tr>
-<?
+<?php=20
 $itext=3Dnew IText('npj');
 $itext->value=3Dstrip_tags($obj->det->jr_pj_number);
 echo td(_('Pi=C3=A8ce')).td($itext->input());
@@ -72,7 +72,7 @@
 </td></tr>
 <tr>
 <td>
-<?
+<?php=20
 $inote=3Dnew ITextarea('jrn_note');
 $inote->width=3D25;
 $inote->heigh=3D5;
@@ -90,15 +90,15 @@
 </td>
 <div class=3D"myfieldset">
 	<h1 class=3D"legend">
-<?=3D_('D=C3=A9tail')?>
-<?
+<?php echo _('D=C3=A9tail')?>
+<?php=20
   $detail=3Dnew Acc_Misc($cn,$obj->jr_id);
 $detail->get();
 ?>
 </h1>
 <table class=3D"result">
 <tr>
-<?
+<?php=20
  echo th(_('Poste Comptable'));
     echo th(_('Quick Code'));
     echo th(_('Libell=C3=A9'));
@@ -169,7 +169,7 @@
 ?>
 </table>
 </div>
-<?
+<?php=20
 require_once('ledger_detail_bottom.php');
 ?>
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/ledger_detail_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_misc.php	2013-05-16 18=
:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/ledger_detail_misc.php	2013-05-16 21=
:34:17 UTC (rev 5272)
@@ -1,20 +1,20 @@
-<?
+<?php=20
 require_once('template/ledger_detail_top.php');
 require_once('class_anc_operation.php');
 require_once('class_anc_plan.php');
=20
 ?>
-<?
+<?php=20
 require_once('class_own.php');
 require_once ('class_anc_plan.php');
 ?>
 <div class=3D"content" style=3D"padding:0">
=20
-    <? if ( $access=3D=3D'W') : ?>
+    <?php if ( $access=3D=3D'W') : ?>
 <form class=3D"print" onsubmit=3D"return op_save(this);">
-   <? endif; ?>
+   <?php endif; ?>
=20
-    <? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',=
$jr_id).dossier::hidden();?>
+    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
   <table style=3D"width:100%"><tr><td>
 					<table>
 								<tr><td>
@@ -28,7 +28,7 @@
 								</tr>
=20
 								<tr><td>
-								<?
+								<?php=20
 								  $itext=3Dnew IText('lib');
 								  $itext->value=3Dstrip_tags($obj->det->jr_comment);
 								  $itext->size=3D40;
@@ -38,10 +38,10 @@
 								?>
 								</td></tr>
 								<tr><td>
-								<? echo td('montant').td(nbm($obj->det->jr_montant),' class=3D"i=
num"');?>
+								<?php echo td('montant').td(nbm($obj->det->jr_montant),' class=3D=
"inum"');?>
 								</td></tr>
 								<tr><td>
-								<?
+								<?php=20
 								$itext=3Dnew IText('npj');
 								$itext->value=3Dstrip_tags($obj->det->jr_pj_number);
 								echo td(_('Pi=C3=A8ce')).td($itext->input());
@@ -57,7 +57,7 @@
 						</td></tr>
 						<tr>
 						<td>
-						<?
+						<?php=20
 						$inote=3Dnew ITextarea('jrn_note');
 						$inote->width=3D25;
 						$inote->heigh=3D5;
@@ -73,14 +73,14 @@
 </table>
=20
 <div class=3D"myfieldset">
-	<h1 class=3D"legend"><?=3D_('D=C3=A9tail')?></h1>
-<?
+	<h1 class=3D"legend"><?php echo _('D=C3=A9tail')?></h1>
+<?php=20
   require_once('class_own.php');
   $owner=3Dnew Own($cn);
 ?>
 <table class=3D"result">
 <tr>
-<?
+<?php=20
     echo th(_('Poste Comptable'));
     echo th(_('Quick Code'));
     echo th(_('Libell=C3=A9'));
@@ -167,7 +167,7 @@
 ?>
 </table>
 </div>
-<?
+<?php=20
 require_once('ledger_detail_bottom.php');
 ?>
 </div>

Modified: phpcompta/trunk/include/template/ledger_detail_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_top.php	2013-05-16 18:=
00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/ledger_detail_top.php	2013-05-16 21:=
34:17 UTC (rev 5272)
@@ -1,5 +1,5 @@
 <div style=3D"float:right;height:10px;display:block;margin-top:2px;margi=
n-right:2px">
-<?
+<?php=20
    if ($div !=3D "popup") {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3D$action&ajax=3D$callback";
@@ -10,9 +10,9 @@
 ?>
 </div>
 <div>
-   <? echo h2info($oLedger->get_name()); ?>
+   <?php echo h2info($oLedger->get_name()); ?>
 </div>
-<? echo "Op=C3=A9ration ID=3D".hb($obj->det->jr_internal); ?>
-<div id=3D"<?=3D$div.'info'?>" class=3D"divinfo"></div>
-<? require_once('class_itextarea.php');
+<?php echo "Op=C3=A9ration ID=3D".hb($obj->det->jr_internal); ?>
+<div id=3D"<?php echo $div.'info'?>" class=3D"divinfo"></div>
+<?php require_once('class_itextarea.php');
 ?>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_ven.php	2013-05-16 18:=
00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php	2013-05-16 21:=
34:17 UTC (rev 5272)
@@ -1,15 +1,15 @@
-<? require_once('template/ledger_detail_top.php'); ?>
+<?php require_once('template/ledger_detail_top.php'); ?>
 <div class=3D"content" style=3D"padding:0;">
-<?
+<?php=20
   require_once('class_own.php');
   $owner=3Dnew Own($cn);
 ?>
=20
-    <? if ( $access=3D=3D'W') : ?>
+    <?php if ( $access=3D=3D'W') : ?>
 <form class=3D"print" onsubmit=3D"return op_save(this);">
-   <? endif; ?>
+   <?php endif; ?>
=20
-    <? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',=
$jr_id).dossier::hidden();?>
+    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
   <table style=3D"width:100%">
   <tr><td>
 						<table>
@@ -33,7 +33,7 @@
 							</td>
 						<tr>
 						<td>
-						<?
+						<?php=20
 						$bk=3Dnew Fiche($cn,$obj->det->array[0]['qs_client']);
 						echo td(_('Client'));
=20
@@ -44,7 +44,7 @@
 						</tr>
 						<tr>
 						<td>
-						<?
+						<?php=20
 						$itext=3Dnew IText('npj');
 						$itext->value=3Dstrip_tags($obj->det->jr_pj_number);
 						echo td(_('Pi=C3=A8ce')).td($itext->input());
@@ -52,7 +52,7 @@
 						</td>
 						<tr>
 						<td>
-						<?
+						<?php=20
 						  $itext=3Dnew IText('lib');
 						  $itext->value=3Dstrip_tags($obj->det->jr_comment);
 						  $itext->size=3D40;
@@ -66,7 +66,7 @@
 												   <td></td>
                                                         <td>Pay=C3=A9</t=
d>
                                                         <td>
-                                                            <?
+                                                            <?php=20
                                                             $ipaid=3Dnew=
 ICheckBox("ipaid",'paid');
                                                             $ipaid->sele=
cted=3D($obj->det->jr_rapt=3D=3D'paid');
                                                             echo $ipaid-=
>input();
@@ -83,7 +83,7 @@
 			</td></tr>
 			<tr>
 			<td>
-			<?
+			<?php=20
 			$inote=3Dnew ITextarea('jrn_note');
 			$inote->width=3D25;
 			$inote->heigh=3D5;
@@ -99,10 +99,10 @@
 </table>
 <div class=3D"myfieldset">
 	<h1 class=3D"legend">
-<?=3D_('D=C3=A9tail')?>
+<?php echo _('D=C3=A9tail')?>
 	</h1>
 <table class=3D"result">
-<?
+<?php=20
   bcscale(2);
   $total_htva=3D0;$total_tvac=3D0;
   echo th(_('Quick Code'));
@@ -223,9 +223,9 @@
 </div>
 <div class=3D"myfieldset">
 	<h1 class=3D"legend">
-<?=3D_('Ecritures comptables')?>
+<?php echo _('Ecritures comptables')?>
 	</h1>
-	<?
+	<?php=20
   /* if it is not in a popup, the details are hidden */
   if ( $div !=3D 'popup') {
     $ib=3Dnew IButton ("a".$div);
@@ -246,7 +246,7 @@
=20
 <table class=3D"result">
 <tr>
-<?
+<?php=20
  echo th(_('Poste Comptable'));
     echo th(_('Quick Code'));
     echo th(_('Libell=C3=A9'));
@@ -289,7 +289,7 @@
 </table>
 </div>
 </div>
-<?
+<?php=20
 require_once('ledger_detail_bottom.php');
 ?>
 </div>

Modified: phpcompta/trunk/include/template/ledger_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_search.php	2013-05-16 18:00:0=
8 UTC (rev 5271)
+++ phpcompta/trunk/include/template/ledger_search.php	2013-05-16 21:34:1=
7 UTC (rev 5272)
@@ -2,7 +2,7 @@
 <table>
 <tr>
 <td style=3D"text-align:right;width:30em">
-<?=3D_('Dans le journal')?>
+<?php echo _('Dans le journal')?>
 </td>
 <td>
    <?php echo $f_ledger; ?>
@@ -11,16 +11,16 @@
=20
 <tr>
 <td style=3D"text-align:right;width:30em">
-<?=3D_('Et Compris entre les date')?>
+<?php echo _('Et Compris entre les date')?>
 </td>
 <td>
-<?php echo $f_date_start->input();  ?> <?=3D_('et')?> <?php echo $f_date=
_end->input();  ?>
+<?php echo $f_date_start->input();  ?> <?php echo _('et')?> <?php echo $=
f_date_end->input();  ?>
 </td>
 </tr>
=20
 <tr>
 <td style=3D"text-align:right;width:30em">
-<?=3D_('Et contenant dans le libell=C3=A9, pi=C3=A8ce justificative ou n=
=C2=B0 interne')?>
+<?php echo _('Et contenant dans le libell=C3=A9, pi=C3=A8ce justificativ=
e ou n=C2=B0 interne')?>
 </td>
=20
 <td>
@@ -29,15 +29,15 @@
 </tr>
 <tr>
 <td style=3D"text-align:right;width:30em">
-<?=3D_('Et compris entre les montants')?>
+<?php echo _('Et compris entre les montants')?>
 </td>
 <td >
-<?php echo $f_amount_min->input();  ?> <?=3D_('et')?> <?php echo $f_amou=
nt_max->input(); ; ?>
+<?php echo $f_amount_min->input();  ?> <?php echo _('et')?> <?php echo $=
f_amount_max->input(); ; ?>
 </td>
 </tr>
 <tr>
 <td style=3D"text-align:right;width:30em">
-	<?=3D_('Et utilisant la fiche (quick code)')?>
+	<?php echo _('Et utilisant la fiche (quick code)')?>
 </td>
 <td>
    <?php echo $f_qcode->input(); echo $f_qcode->search(); ?>
@@ -55,7 +55,7 @@
=20
 <tr>
 <td style=3D"text-align:right;width:30em">
-	<?=3D_('Et uniquement non pay=C3=A9es')?>
+	<?php echo _('Et uniquement non pay=C3=A9es')?>
 </td>
=20
 <td>

Modified: phpcompta/trunk/include/template/letter_all.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/letter_all.php	2013-05-16 18:00:08 U=
TC (rev 5271)
+++ phpcompta/trunk/include/template/letter_all.php	2013-05-16 21:34:17 U=
TC (rev 5272)
@@ -7,35 +7,35 @@
=20
 if ( count($this->content) =3D=3D 0 ) :
 ?>
-  <h2 class=3D"info2"><?=3D_('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat trouv=
=C3=A9')?></h2>
+  <h2 class=3D"info2"><?php echo _('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat=
 trouv=C3=A9')?></h2>
=20
 <?php exit();
   endif;?>
   <table class=3D"result">
 <tr>
 <th>
-   <?=3D_('Lettrage')?>
+   <?php echo _('Lettrage')?>
 </th>
 <th>
-   <?=3D_('Date')?>
+   <?php echo _('Date')?>
 </th>
 <th>
-   <?=3D_('Ref')?>
+   <?php echo _('Ref')?>
 </th>
 <th>
-   <?=3D_('Interne')?>
+   <?php echo _('Interne')?>
 </th>
 <th>
-   <?=3D_('Description')?>
+   <?php echo _('Description')?>
 </th>
 <th style=3D"text-align:right">
-   <?=3D_('D=C3=A9bit')?>
+   <?php echo _('D=C3=A9bit')?>
 </th>
 <th style=3D"text-align:right">
-   <?=3D_('Cr=C3=A9dit')?>
+   <?php echo _('Cr=C3=A9dit')?>
 </th>
 <th style=3D"text-align:center">
-  <?=3D_('Op. concern=C3=A9e')?>
+  <?php echo _('Op. concern=C3=A9e')?>
 </th>
 </tr>
=20
@@ -44,7 +44,7 @@
   $class=3D"";
 if ( ($i % 2) =3D=3D 0 ) $class=3D"odd";
 ?>
-  <tr <? echo "class=3D\"$class\""; ?> >
+  <tr <?php echo "class=3D\"$class\""; ?> >
 <td>
 <?php
 $letter=3D($this->content[$i]['letter']=3D=3D-1)?" aucun lettrage ":strt=
oupper(base_convert($this->content[$i]['letter'],10,36));
@@ -54,26 +54,26 @@
   ";dsp_letter(this)";
=20
 ?>
-<A class=3D"detail" style=3D"text-decoration: underline" href=3D"javascr=
ipt:<?=3D$js?>"><?=3D$letter?>
-<? if ( $this->content[$i]['letter_diff'] !=3D 0) echo $g_failed;	?>
+<A class=3D"detail" style=3D"text-decoration: underline" href=3D"javascr=
ipt:<?php echo $js?>"><?php echo $letter?>
+<?php if ( $this->content[$i]['letter_diff'] !=3D 0) echo $g_failed;	?>
 	</A>
 </td>
-<td> <?=3D  smaller_date($this->content[$i]['j_date_fmt'])?> </td>
-<td> <?=3D$this->content[$i]['jr_pj_number']?> </td>
+<td> <?php echo   smaller_date($this->content[$i]['j_date_fmt'])?> </td>
+<td> <?php echo $this->content[$i]['jr_pj_number']?> </td>
=20
 <?php
 $r=3Dsprintf('<A class=3D"detail" style=3D"text-decoration:underline" HR=
EF=3D"javascript:viewOperation(\'%s\',\'%s\')" >%s</A>',
 	     $this->content[$i]['jr_id'], $gDossier, $this->content[$i]['jr_int=
ernal']);
 ?>
-  <td> <?=3D$r?> </td>
-  <td> <?=3Dh($this->content[$i]['jr_comment'])?> </td>
-  <? if ($this->content[$i]['j_debit']=3D=3D't') : ?>
-  <td style=3D"text-align:right"> <?=3Dnb($this->content[$i]['j_montant'=
])?> </td>
+  <td> <?php echo $r?> </td>
+  <td> <?php echo h($this->content[$i]['jr_comment'])?> </td>
+  <?php if ($this->content[$i]['j_debit']=3D=3D't') : ?>
+  <td style=3D"text-align:right"> <?php echo nb($this->content[$i]['j_mo=
ntant'])?> </td>
   <td></td>
-  <? else : ?>
+  <?php else : ?>
   <td></td>
-  <td style=3D"text-align:right"> <?=3Dnb($this->content[$i]['j_montant'=
])?> </td>
-  <? endif ?>
+  <td style=3D"text-align:right"> <?php echo nb($this->content[$i]['j_mo=
ntant'])?> </td>
+  <?php endif ?>
 <td style=3D"text-align:center">
 <?php
     // Rapprochement
@@ -102,14 +102,14 @@
     endfor;
 ?>
 </table>
-<h2 class=3D"info2" style=3D"margin:0 0"> Solde d=C3=A9bit  : <?=3Dnb($a=
mount_deb);?></h2>
-<h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9dit : <?=3Dnb($=
amount_cred);?></h2>
-  <?
+<h2 class=3D"info2" style=3D"margin:0 0"> Solde d=C3=A9bit  : <?php echo=
 nb($amount_deb);?></h2>
+<h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9dit : <?php ech=
o nb($amount_cred);?></h2>
+  <?php=20
 bcscale(2);
   $solde=3Dbcsub($amount_deb,$amount_cred);
 if ( $solde > 0 ) :
 ?>
-  <h2 class=3D"info2"  style=3D"margin:0 0"> Solde d=C3=A9biteur       :=
 <?=3Dnb($solde)?></h2>
-<? else : ?>
-     <h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9diteur    =
   : <?=3Dnb(abs($solde))?></h2>
-<? endif; ?>
+  <h2 class=3D"info2"  style=3D"margin:0 0"> Solde d=C3=A9biteur       :=
 <?php echo nb($solde)?></h2>
+<?php else : ?>
+     <h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9diteur    =
   : <?php echo nb(abs($solde))?></h2>
+<?php endif; ?>

Modified: phpcompta/trunk/include/template/letter_prop.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/letter_prop.php	2013-05-16 18:00:08 =
UTC (rev 5271)
+++ phpcompta/trunk/include/template/letter_prop.php	2013-05-16 21:34:17 =
UTC (rev 5272)
@@ -5,7 +5,7 @@
 $gDossier=3Ddossier::id();
 if ( count($this->content) =3D=3D 0 ) :
 ?>
-  <h2 class=3D"info2"><?=3D_('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat trouv=
=C3=A9')?></h2>
+  <h2 class=3D"info2"><?php echo _('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat=
 trouv=C3=A9')?></h2>
=20
     <?php
   else :
@@ -16,25 +16,25 @@
 <th>
 </th>
 <th>
-   <?=3D_('Lettrage')?>
+   <?php echo _('Lettrage')?>
 </th>
 <th>
-   <?=3D_('Date')?>
+   <?php echo _('Date')?>
 </th>
 <th>
-   <?=3D_('Ref')?>
+   <?php echo _('Ref')?>
 </th>
 <th>
-   <?=3D_('Description')?>
+   <?php echo _('Description')?>
 </th>
 <th style=3D"text-align:right">
-   <?=3D_('D=C3=A9bit')?>
+   <?php echo _('D=C3=A9bit')?>
 </th>
 <th style=3D"text-align:right">
-   <?=3D_('Cr=C3=A9dit')?>
+   <?php echo _('Cr=C3=A9dit')?>
 </th>
 <th style=3D"text-align:center">
-  <?=3D_('Op. concern=C3=A9e')?>
+  <?php echo _('Op. concern=C3=A9e')?>
 </th>
 </tr>
=20
@@ -56,32 +56,32 @@
 <th>
 </th>
 <th>
-   <?=3D_('Lettrage')?>
+   <?php echo _('Lettrage')?>
 </th>
 <th>
-   <?=3D_('Date')?>
+   <?php echo _('Date')?>
 </th>
 <th>
-   <?=3D_('Ref')?>
+   <?php echo _('Ref')?>
 </th>
 <th>
-   <?=3D_('Description')?>
+   <?php echo _('Description')?>
 </th>
 <th style=3D"text-align:right">
-   <?=3D_('D=C3=A9bit')?>
+   <?php echo _('D=C3=A9bit')?>
 </th>
 <th style=3D"text-align:right">
-   <?=3D_('Cr=C3=A9dit')?>
+   <?php echo _('Cr=C3=A9dit')?>
 </th>
 <th style=3D"text-align:center">
-  <?=3D_('Op. concern=C3=A9e')?>
+  <?php echo _('Op. concern=C3=A9e')?>
 </th>
 </tr>
-<?
+<?php=20
=20
 }
 ?>
-  <tr <? echo "class=3D\"$class\""; ?> >
+  <tr <?php echo "class=3D\"$class\""; ?> >
 <td>
 <?php
=20
@@ -100,22 +100,22 @@
 <?php
 $letter=3D($this->content[$i]['letter']< 0)?" ":strtoupper(base_convert(=
$this->content[$i]['letter'],10,36));
 ?>
-<?=3D$letter?>
+<?php echo $letter?>
 </td>
-<td> <?=3Dsmaller_date($this->content[$i]['j_date_fmt'])?> </td>
+<td> <?php echo smaller_date($this->content[$i]['j_date_fmt'])?> </td>
 <?php
 $r=3Dsprintf('<A class=3D"detail" style=3D"text-decoration:underline"  H=
REF=3D"javascript:viewOperation(\'%s\',\'%s\')" >%s</A>',
 	   $this->content[$i]['jr_id'], $gDossier,  $this->content[$i]['jr_inte=
rnal']);
 ?>
-<td> <?=3D$r?> </td>
-<td> <?=3D$this->content[$i]['jr_comment']?> </td>
- <? if ($this->content[$i]['j_debit']=3D=3D't') : ?>
-  <td style=3D"text-align:right"> <?=3Dnb($this->content[$i]['j_montant'=
])?> </td>
+<td> <?php echo $r?> </td>
+<td> <?php echo $this->content[$i]['jr_comment']?> </td>
+ <?php if ($this->content[$i]['j_debit']=3D=3D't') : ?>
+  <td style=3D"text-align:right"> <?php echo nb($this->content[$i]['j_mo=
ntant'])?> </td>
   <td></td>
-  <? else : ?>
+  <?php else : ?>
   <td></td>
-  <td style=3D"text-align:right"> <?=3Dnb($this->content[$i]['j_montant'=
])?> </td>
-  <? endif ?>
+  <td style=3D"text-align:right"> <?php echo nb($this->content[$i]['j_mo=
ntant'])?> </td>
+  <?php endif ?>
 <td style=3D"text-align:center">
 <?php
     // Rapprochement
@@ -153,10 +153,10 @@
 ?>
 </TABLE>
   <h2 class=3D"info"> Total lettr=C3=A9</h2>
-<span style=3D"display:block;font-size:14px"><?=3D_('Total Debit')?>   <=
?=3D$amount_deb?></span>
-<span style=3D"display:block;font-size:14px"><?=3D_('Total Credit')?>   =
<?=3D$amount_cred?></span>
-<span style=3D"display:block;font-size:14px"><?=3D_('Total ').$side?>   =
<?=3D$delta?></span>
+<span style=3D"display:block;font-size:14px"><?php echo _('Total Debit')=
?>   <?php echo $amount_deb?></span>
+<span style=3D"display:block;font-size:14px"><?php echo _('Total Credit'=
)?>   <?php echo $amount_cred?></span>
+<span style=3D"display:block;font-size:14px"><?php echo _('Total ').$sid=
e?>   <?php echo $delta?></span>
=20
 <?php endif;?>
-<?=3DHtmlInput::button('check_all','S=C3=A9lectionner tout',' onclick=3D=
"select_checkbox(\'letter_form\')"');?>
-<?=3DHtmlInput::button('check_none','Tout D=C3=A9s=C3=A9lectionner ',' o=
nclick=3D"unselect_checkbox(\'letter_form\')"');?>
\ No newline at end of file
+<?php echo HtmlInput::button('check_all','S=C3=A9lectionner tout',' oncl=
ick=3D"select_checkbox(\'letter_form\')"');?>
+<?php echo HtmlInput::button('check_none','Tout D=C3=A9s=C3=A9lectionner=
 ',' onclick=3D"unselect_checkbox(\'letter_form\')"');?>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/list_category_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/list_category_document.php	2013-05-1=
6 18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/list_category_document.php	2013-05-1=
6 21:34:17 UTC (rev 5272)
@@ -7,39 +7,39 @@
   $row=3D$aList[$i];
 ?>
=20
-<tr id=3D"row<?=3D$row['dt_id']?>">
+<tr id=3D"row<?php echo $row['dt_id']?>">
 <td colspan=3D"2">
-<?=3Dh($row['dt_value']);?>
+<?php echo h($row['dt_value']);?>
 </td>
 <td colspan=3D"2">
-<?=3Dh($row['dt_prefix']);?>
+<?php echo h($row['dt_prefix']);?>
 </td>
 <td>
-<?=3D$row['js_mod'];?>
+<?php echo $row['js_mod'];?>
 </td>
 <td>
-<?=3D$row['js_remove'];?>
+<?php echo $row['js_remove'];?>
 </td>
=20
=20
 </tr>
-<?
+<?php=20
 endfor;
 ?>
 <tr>
 <td>
-<?=3D$str_addCat?>
+<?php echo $str_addCat?>
 </td>
 <td>
-<?=3D$str_addPrefix?>
+<?php echo $str_addPrefix?>
 </td>
 <td>
-   <?=3D$str_submit?>
+   <?php echo $str_submit?>
 </td>
 </tr>
=20
 </table>
-<?
+<?php=20
 echo dossier::hidden();
 echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 ?>

Modified: phpcompta/trunk/include/template/list_mod_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/list_mod_payment.php	2013-05-16 18:0=
0:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/list_mod_payment.php	2013-05-16 21:3=
4:17 UTC (rev 5272)
@@ -31,56 +31,56 @@
  <table class=3D"table_large" >
 	 <tr >
 		 <th>
-			 <?=3D$header->get_header(0)?>
+			 <?php echo $header->get_header(0)?>
 		 </th>
 		 <th style=3D"text-align:center">
-			 <?=3D$header->get_header(1)?>
+			 <?php echo $header->get_header(1)?>
 		 </th>
 		 <th style=3D"text-align:center">
-			 <?=3D$header->get_header(2)?>
+			 <?php echo $header->get_header(2)?>
 		 </th>
 		 <th style=3D"text-align:center">
-			 <?=3D$header->get_header(3)?>
+			 <?php echo $header->get_header(3)?>
 		 </th>
 		 <th style=3D"text-align:center">
-			 <?=3D$header->get_header(4)?>
+			 <?php echo $header->get_header(4)?>
 		 </th>
 		 <th>
=20
 		 </th>
 	 </tr>
-<? for ($i=3D0;$i<count($array);$i++):
+<?php for ($i=3D0;$i<count($array);$i++):
 	if ($i%2=3D=3D0):
 		$class=3D'class=3D"odd" ';
 	else:
 		$class=3D'class=3D"even"';
 	endif;
 ?>
-	 <tr <?=3D$class?>>
+	 <tr <?php echo $class?>>
 		 <td>
-			 <?=3Dh($array[$i]['mp_lib'])?>
+			 <?php echo h($array[$i]['mp_lib'])?>
 		 </td>
 		 <td style=3D"text-align:center">
-			 <?=3Dh($array[$i]['jrn_def_name'])?>
+			 <?php echo h($array[$i]['jrn_def_name'])?>
=20
 		 </td>
 		 <td style=3D"text-align:center">
-			 <?=3Dh($array[$i]['fd_label'])?>
+			 <?php echo h($array[$i]['fd_label'])?>
=20
 		 </td>
 		 <td style=3D"text-align:center">
-			 <?=3Dh($array[$i]['jrn_target'])?>
+			 <?php echo h($array[$i]['jrn_target'])?>
 		 </td>
 		 <td style=3D"text-align:center">
-			 <?=3Dh($array[$i]['vw_name'])?>
+			 <?php echo h($array[$i]['vw_name'])?>
 		 </td>
=20
-<?
+<?php=20
 echo $td.HtmlInput::button_anchor(_('Modifie'),'?ac=3D'.$_REQUEST['ac'].=
'&sa=3Dmp&sb=3Dchange&'.dossier::get().
                                               '&id=3D'.$array[$i]['mp_id=
']);
 ?>
=20
 	 </tr>
-<? endfor;?>
+<?php endfor;?>
=20
 </table>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu.php	2013-05-16 18:00:08 UTC (re=
v 5271)
+++ phpcompta/trunk/include/template/menu.php	2013-05-16 21:34:17 UTC (re=
v 5272)
@@ -1,8 +1,8 @@
 <div class=3D"topmenu">
-    <? if ( count($amenu) > 4 && $idx =3D=3D 0) :
+    <?php if ( count($amenu) > 4 && $idx =3D=3D 0) :
 	$style =3D'style=3D "width:100%"';
     ?>
-    <? elseif ($idx=3D=3D0):
+    <?php elseif ($idx=3D=3D0):
 switch (count($amenu))
 {
 case 4:
@@ -18,7 +18,7 @@
 		$style=3D" class=3D\"mtitle\"";
=20
     	endif;?>
-<table  <?=3D$style?> >
+<table  <?php echo $style?> >
=20
=20
     <tr>
@@ -29,12 +29,12 @@
 	    if ( (count($amenu)=3D=3D1)|| (isset($module[$idx+1]) && $module[$i=
dx+1]=3D=3D$amenu[$i]['me_code'])):
 		$class=3D"selectedcell";
 ?>
-	<td class=3D"<?=3D$class?>">
-	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$_REQUEST['ac']?>" title=3D"<?=3Dh(_($amenu[$i]['me_description=
']))?>" >
-	    <?=3D_($amenu[$i]['me_menu'])?>
+	<td class=3D"<?php echo $class?>">
+	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?php echo Dossier::i=
d()?>&ac=3D<?php echo $_REQUEST['ac']?>" title=3D"<?php echo h(_($amenu[$=
i]['me_description']))?>" >
+	    <?php echo _($amenu[$i]['me_menu'])?>
 	    </a>
 	</td>
-<?
+<?php=20
 	    else:
 		$class=3D"mtitle";
 	    $url=3D"";$pt=3D"";
@@ -57,18 +57,18 @@
 			$url.=3D$pt.$amenu[$i]['me_code'];
 		}
=20
-?>	<td class=3D"<?=3D$class?>">
-	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$url?>" <?=3D$js?> title=3D"<?=3Dh(_($amenu[$i]['me_description=
']))?>">
-	    <?=3D_($amenu[$i]['me_menu'])?>
+?>	<td class=3D"<?php echo $class?>">
+	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?php echo Dossier::i=
d()?>&ac=3D<?php echo $url?>" <?php echo $js?> title=3D"<?php echo h(_($a=
menu[$i]['me_description']))?>">
+	    <?php echo _($amenu[$i]['me_menu'])?>
 	    </a>
 	</td>
=20
=20
-<?
+<?php=20
 endif;
=20
 	?>
-	<?
+	<?php=20
 	    endfor;
     	?>
     </tr>

Modified: phpcompta/trunk/include/template/menu_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu_detail.php	2013-05-16 18:00:08 =
UTC (rev 5271)
+++ phpcompta/trunk/include/template/menu_detail.php	2013-05-16 21:34:17 =
UTC (rev 5272)
@@ -19,7 +19,7 @@
             Code du menu
         </td>
         <td>
-            <?=3D$str_code->input()?>
+            <?php echo $str_code->input()?>
         </td>
     </tr>
         <tr>
@@ -27,7 +27,7 @@
             Libell=C3=A9 du menu
         </td>
         <td>
-            <?=3D$str_menu->input()?>
+            <?php echo $str_menu->input()?>
         </td>
     </tr>
         <tr>
@@ -35,7 +35,7 @@
             Description
         </td>
         <td>
-            <?=3D$str_desc->input()?>
+            <?php echo $str_desc->input()?>
         </td>
     </tr>
          <tr>
@@ -43,7 +43,7 @@
             Fichier =C3=A0 inclure (depuis le r=C3=A9pertoire include)
         </td>
         <td>
-            <?=3D$str_file->input()?>
+            <?php echo $str_file->input()?>
         </td>
     </tr>
     <tr>
@@ -51,7 +51,7 @@
             URL
         </td>
         <td>
-            <?=3D$str_url->input()?>
+            <?php echo $str_url->input()?>
         </td>
     </tr>
      <tr>
@@ -59,7 +59,7 @@
             Param=C3=A8ttre
         </td>
         <td>
-            <?=3D$str_parameter->input()?>
+            <?php echo $str_parameter->input()?>
         </td>
     </tr>
      <tr>
@@ -67,7 +67,7 @@
             Javascript
         </td>
         <td>
-            <?=3D$str_js->input()?>
+            <?php echo $str_js->input()?>
         </td>
     </tr>
 </table>

Modified: phpcompta/trunk/include/template/modele_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/modele_document.php	2013-05-16 18:00=
:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/modele_document.php	2013-05-16 21:34=
:17 UTC (rev 5272)
@@ -1,4 +1,4 @@
-<?=3DHtmlInput::anchor_close('mod_doc');?>
+<?php echo HtmlInput::anchor_close('mod_doc');?>
 <h2 class=3D"info">Mod=C3=A8le de document</h2>
 <form  method=3D"post" enctype=3D"multipart/form-data">
 <table>

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2013-05-16 18:00:08 UTC (=
rev 5271)
+++ phpcompta/trunk/include/template/module.php	2013-05-16 21:34:17 UTC (=
rev 5272)
@@ -15,9 +15,9 @@
 ?>
 	<div id=3D"direct">
 	<form method=3D"get">
-		<?=3DHtmlInput::default_value('ac', '', $_REQUEST)?>
-		<?=3DDossier::hidden()?>
-		<?
+		<?php echo HtmlInput::default_value('ac', '', $_REQUEST)?>
+		<?php echo Dossier::hidden()?>
+		<?php=20
=20
 			$direct=3Dnew IText('ac');
 			$direct->style=3D'class=3D"input_text"';
@@ -27,7 +27,7 @@
 			$gDossier=3Ddossier::id();
 			?>
 		<div id=3D"ac_choices" class=3D"autocomplete" style=3D"width:150"></di=
v>
-		<?
+		<?php=20
 			echo HtmlInput::submit('go','aller');
 			?>
=20
@@ -35,16 +35,16 @@
 	<script charset=3D"utf8" language=3D"javascript">
=20
 		try {
-			new Ajax.Autocompleter("ac","ac_choices","direct.php?gDossier=3D<?=3D=
$gDossier?>",
+			new Ajax.Autocompleter("ac","ac_choices","direct.php?gDossier=3D<?php=
 echo $gDossier?>",
                             {paramName:"acs",minChars:1,indicator:null,
                             callback:null,
                              afterUpdateElement:null});} catch (e){alert=
(e.message);};
 		</script>
 	</div>
-<?
+<?php=20
 endif;?>
 	<div id=3D"dossier">
-	<H2 class=3D"dossier"> Dossier : <?=3Dh(dossier::name())?></h2>
+	<H2 class=3D"dossier"> Dossier : <?php echo h(dossier::name())?></h2>
 	</div>
     </div>
=20
@@ -78,9 +78,9 @@
 				$url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['me_code'];
 		    }
 		    ?>
-		<td class=3D"tool" style=3D"<?=3D$style?>">
-			<a class=3D"mtitle" href=3D"<?=3D$url?>" title=3D"<?=3D_($row['me_des=
cription'])?>" <?=3D$js?> ><?=3D_($row['me_menu'])?></a></td>
-		<?
+		<td class=3D"tool" style=3D"<?php echo $style?>">
+			<a class=3D"mtitle" href=3D"<?php echo $url?>" title=3D"<?php echo _(=
$row['me_description'])?>" <?php echo $js?> ><?php echo _($row['me_menu']=
)?></a></td>
+		<?php=20
 		    endforeach;
 		?>
 	    </tr>

Modified: phpcompta/trunk/include/template/new_mod_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/new_mod_payment.php	2013-05-16 18:00=
:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/new_mod_payment.php	2013-05-16 21:34=
:17 UTC (rev 5272)
@@ -1,50 +1,50 @@
 <fieldset>
-<legend><?=3D$msg?>
+<legend><?php echo $msg?>
 </legend>
 <table>
 <tr>
 <td>
-   <?=3D_('Pour le journal')?>
+   <?php echo _('Pour le journal')?>
 </td>
 <td>
-<?=3D$f_source?>
+<?php echo $f_source?>
 </td>
 </tr>
=20
 <tr>
 <td>
-   <?=3D_('Libell=C3=A9')?>
+   <?php echo _('Libell=C3=A9')?>
 </td>
 <td>
-<?=3D$f_lib?>
+<?php echo $f_lib?>
 </td>
 </tr>
=20
 <tr>
 <td>
-   <?=3D_('Type de fiche')?>
+   <?php echo _('Type de fiche')?>
 </td>
 <td>
-<?=3D$f_type_fiche?>
+<?php echo $f_type_fiche?>
 </td>
 </tr>
=20
=20
 <tr>
 <td>
-   <?=3D_('Paiement enregistr=C3=A9 dans ')?>
+   <?php echo _('Paiement enregistr=C3=A9 dans ')?>
 </td>
 <td>
-<?=3D$f_ledger_record?>
+<?php echo $f_ledger_record?>
 </td>
 </tr>
=20
 <tr>
 <td>
-   <?=3D_('Avec la fiche')?>
+   <?php echo _('Avec la fiche')?>
 </td>
 <td>
-<?=3D$f_qcode?>
+<?php echo $f_qcode?>
 </td>
 </tr>
 </table>

Modified: phpcompta/trunk/include/template/operation_detail_ach.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/operation_detail_ach.php	2013-05-16 =
18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/operation_detail_ach.php	2013-05-16 =
21:34:17 UTC (rev 5272)
@@ -28,7 +28,7 @@
 global $g_parameter;
 ?>
 <table class=3D"result" >
-	<?
+	<?php=20
 	bcscale(2);
 	$total_htva =3D 0;
 	$total_tvac =3D 0;

Modified: phpcompta/trunk/include/template/operation_detail_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/operation_detail_misc.php	2013-05-16=
 18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/operation_detail_misc.php	2013-05-16=
 21:34:17 UTC (rev 5272)
@@ -28,7 +28,7 @@
 ?>
 <table class=3D"result">
 <tr>
-<?
+<?php=20
     echo th(_('Poste Comptable'));
     echo th(_('Quick Code'));
     echo th(_('Libell=C3=A9'));

Modified: phpcompta/trunk/include/template/operation_detail_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/operation_detail_ven.php	2013-05-16 =
18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/operation_detail_ven.php	2013-05-16 =
21:34:17 UTC (rev 5272)
@@ -29,7 +29,7 @@
 global $g_parameter;
 ?>
 <table class=3D"result">
-<?
+<?php=20
   bcscale(2);
   $total_htva=3D0;$total_tvac=3D0;
   echo th(_('Quick Code'));

Modified: phpcompta/trunk/include/template/param_jrn.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/param_jrn.php	2013-05-16 18:00:08 UT=
C (rev 5271)
+++ phpcompta/trunk/include/template/param_jrn.php	2013-05-16 21:34:17 UT=
C (rev 5272)
@@ -1,43 +1,43 @@
 <TABLE>
 <TR>
=20
-		<TD><?=3D_('Nom journal')?> </TD>
+		<TD><?php echo _('Nom journal')?> </TD>
 		<TD> <INPUT TYPE=3D"text" class=3D"input_text" NAME=3D"p_jrn_name" VAL=
UE=3D"<?php	echo $name;	?>"></TD>
 </TR>
-<?
+<?php=20
 if ($new || $type=3D=3D'ODS' ):
 ?>
 <TR>
-<td><?=3D_('Postes utilisables journal (d=C3=A9bit/cr=C3=A9dit) ')?>
+<td><?php echo _('Postes utilisables journal (d=C3=A9bit/cr=C3=A9dit) ')=
?>
 </TD>
 <td>
 <?php echo $search;?>
 </TD>
 <TD CLASS=3D"notice">
-<?=3D_("Uniquement pour les journaux d'Op=C3=A9rations Diverses, les val=
eurs sont s=C3=A9par=C3=A9es par des espaces, on peut aussi
+<?php echo _("Uniquement pour les journaux d'Op=C3=A9rations Diverses, l=
es valeurs sont s=C3=A9par=C3=A9es par des espaces, on peut aussi
 	utiliser le * pour indiquer 'tous les postes qui en d=C3=A9pendent' exe=
mple: 4*")?>
 </TD>
 </TR>
-<?
+<?php=20
 endif;
 ?>
-<?
+<?php=20
 if ( $new || $type=3D=3D'FIN') {
 ?>
 <tr>
 <td>
-    <?=3D_('Num=C3=A9rotation de chaque op=C3=A9ration')?>
+    <?php echo _('Num=C3=A9rotation de chaque op=C3=A9ration')?>
 </td>
 <td>
-    <?=3D$num_op->input();?>
+    <?php echo $num_op->input();?>
 </td>
 </tr>
 <tr>
 <TD>
-<?=3D_('Compte en banque')?>
+<?php echo _('Compte en banque')?>
 </td>
 <TD>
-<?
+<?php=20
 $card=3Dnew ICard();
 $card->name=3D'bank';
 $card->extra=3D$cn->make_list('select fd_id from fiche_def where frd_id=3D=
4');
@@ -53,9 +53,9 @@
 ?>
 </td>
 <td class=3D"notice">
-<?=3D_("Obligatoire pour les journaux FIN : donner ici la fiche de la ba=
nque utilis=C3=A9e")?>
+<?php echo _("Obligatoire pour les journaux FIN : donner ici la fiche de=
 la banque utilis=C3=A9e")?>
 </td>
-<?
+<?php=20
 }
 ?>
 </TR>
@@ -69,45 +69,45 @@
 </tr>
=20
 <TR>
-<TD><?=3D_('Type de journal')?> </TD>
+<TD><?php echo _('Type de journal')?> </TD>
 <TD>
 <?php echo $type;?>
 </TD>
 </TR>
 <TR>
-<TD><?=3D_('Pr=C3=A9fixe code interne')?> </TD><TD>
+<TD><?php echo _('Pr=C3=A9fixe code interne')?> </TD><TD>
 <?php echo $code?> </TD>
 </TR>
 <TR>
-<TD><?=3D_('Pr=C3=A9fixe pi=C3=A8ce justificative')?>
+<TD><?php echo _('Pr=C3=A9fixe pi=C3=A8ce justificative')?>
 </TD>
 <TD>
 <?php echo $pj_pref; ?>
 </TD>
 <TD>
-<span class=3D"notice"><?=3D_('Le pr=C3=A9fixe des pi=C3=A8ces doit =C3=AA=
tre diff=C3=A9rent pour chaque journal, on peut aussi utiliser l\'ann=C3=A9=
e')?></span><br>
-<span class=3D"notice"><?=3D_('Uniquement des chiffres')?></span>
+<span class=3D"notice"><?php echo _('Le pr=C3=A9fixe des pi=C3=A8ces doi=
t =C3=AAtre diff=C3=A9rent pour chaque journal, on peut aussi utiliser l\=
'ann=C3=A9e')?></span><br>
+<span class=3D"notice"><?php echo _('Uniquement des chiffres')?></span>
 </TD>
=20
 </TR>
 <TR>
 <TD>
-  <?=3D_('Derni=C3=A8re pi=C3=A8ce num=C3=A9rot=C3=A9e')?>
+  <?php echo _('Derni=C3=A8re pi=C3=A8ce num=C3=A9rot=C3=A9e')?>
 </TD>
 <TD>
-<?=3D$last_seq?>
+<?php echo $last_seq?>
 </TD>
 </TR>
 <tr>
-<TD><?=3D_('N=C2=B0 pi=C3=A8ce justificative')?>
+<TD><?php echo _('N=C2=B0 pi=C3=A8ce justificative')?>
 </TD>
 <TD>
 <?php echo $pj_seq; ?>
 </TD>
=20
 <TD>
-<span class=3D"notice" style=3D"display:block"><?=3D_('La num=C3=A9rotat=
ion est propre =C3=A0 chaque journal')?></span>
-<span class=3D"notice" style=3D"display:block"><?=3D_('Laissez =C3=A0 0 =
pour ne pas changer le num=C3=A9ro')?></span>
+<span class=3D"notice" style=3D"display:block"><?php echo _('La num=C3=A9=
rotation est propre =C3=A0 chaque journal')?></span>
+<span class=3D"notice" style=3D"display:block"><?php echo _('Laissez =C3=
=A0 0 pour ne pas changer le num=C3=A9ro')?></span>
 </TD>
 </tr>
=20
@@ -116,12 +116,12 @@
 <H2 class=3D"info"> Fiches </H2>
 <TABLE width=3D"100%">
 <TR>
-<?
+<?php=20
 if ( $new || ($type !=3D 'ODS' && $type !=3D 'FIN')) {
 ?>
-<th style=3D"text-align:left"><?=3D_('Fiches D=C3=A9bit')?></TH>
-<th style=3D"text-align:left"><?=3D_('Fiches Cr=C3=A9dit')?></TH>
-<?
+<th style=3D"text-align:left"><?php echo _('Fiches D=C3=A9bit')?></TH>
+<th style=3D"text-align:left"><?php echo _('Fiches Cr=C3=A9dit')?></TH>
+<?php=20
 }
 ?>
 </TR>

Modified: phpcompta/trunk/include/template/periode_add_exercice.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/periode_add_exercice.php	2013-05-16 =
18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/periode_add_exercice.php	2013-05-16 =
21:34:17 UTC (rev 5272)
@@ -10,7 +10,7 @@
 </ul>
=20
 <form method=3D"post" onsubmit=3D"return confirm('Confirmez vous l\'ajou=
t d\'un exercice comptable ?')">
-<?
+<?php=20
 echo HtmlInput::hidden("ac",$_REQUEST['ac']);
 echo $nb_exercice->input();
 echo HtmlInput::hidden("jrn_def_id","0");

Modified: phpcompta/trunk/include/template/profile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/profile.php	2013-05-16 18:00:08 UTC =
(rev 5271)
+++ phpcompta/trunk/include/template/profile.php	2013-05-16 21:34:17 UTC =
(rev 5272)
@@ -31,18 +31,18 @@
 <table>
 <tr>
 	<td>Nom</td>
-	<td><?=3D$name->input();?></td>
+	<td><?php echo $name->input();?></td>
 </tr>
 <tr>
 	<td>Description</td>
-	<td><?=3D$desc->input()?></td>
+	<td><?php echo $desc->input()?></td>
 </tr>
 <tr>
 	<td>Avec Calculatrice</td>
-	<td><?=3D$with_calc->input()?></td>
+	<td><?php echo $with_calc->input()?></td>
 </tr>
 <tr>
 	<td>Avec Direct Form</td>
-	<td><?=3D$with_direct_form->input()?></td>
+	<td><?php echo $with_direct_form->input()?></td>
 </tr>
 </table>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/profile_sec_repository.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/profile_sec_repository.php	2013-05-1=
6 18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/profile_sec_repository.php	2013-05-1=
6 21:34:17 UTC (rev 5272)
@@ -27,27 +27,27 @@
  */
 ?>
 <form method=3D"POST" class=3D"print">
-<?=3DHtmlInput::hidden('tab','profile_repo_div')?>
+<?php echo HtmlInput::hidden('tab','profile_repo_div')?>
=20
-	<?=3DHtmlInput::hidden("p_id", $p_id);?>
+	<?php echo HtmlInput::hidden("p_id", $p_id);?>
 	<table>
 		<tr>
-			<th><?=3D_("D=C3=A9pot")?></th>
-			<th><?=3D_("Acc=C3=A8s")?></th>
+			<th><?php echo _("D=C3=A9pot")?></th>
+			<th><?php echo _("Acc=C3=A8s")?></th>
 		</tr>
-		<? for ($i=3D0;$i<count($array);$i++): ?>
+		<?php for ($i=3D0;$i<count($array);$i++): ?>
 		<tr>
 			<td>
-				<?=3D$array[$i]['r_name']?>
-				<?=3DHtmlInput::hidden('ur_id[]',$array[$i]['ur_id'])?>
-				<?=3DHtmlInput::hidden('ar_id[]',$array[$i]['r_id'])?>
+				<?php echo $array[$i]['r_name']?>
+				<?php echo HtmlInput::hidden('ur_id[]',$array[$i]['ur_id'])?>
+				<?php echo HtmlInput::hidden('ar_id[]',$array[$i]['r_id'])?>
 			</td>
-                         <?
+                         <?php=20
                             $color=3D($array[$i]['ur_right']!=3D'X')?"bo=
rder:lightgreen 2px solid; ":"border:red 2px solid; ";
                         ?>
-			<td style=3D"<?=3D$color?>">
+			<td style=3D"<?php echo $color?>">
=20
-				<?
+				<?php=20
 				$isel=3Dnew ISelect("right[]");
 				$isel->value=3D$aright_value;
 				$isel->selected=3D$array[$i]['ur_right'];
@@ -56,4 +56,4 @@
 		</tr>
 		<?endfor;?>
 	</table>
-<?=3DHtmlInput::submit("change_stock", "Sauver")?>
+<?php echo HtmlInput::submit("change_stock", "Sauver")?>

Modified: phpcompta/trunk/include/template/result_cat_card_summary.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/result_cat_card_summary.php	2013-05-=
16 18:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/result_cat_card_summary.php	2013-05-=
16 21:34:17 UTC (rev 5272)
@@ -1,14 +1,14 @@
 <div class=3D"content">
 <table >
 <tr>
-<?
+<?php=20
    echo th('D=C3=A9tail');
 for ($i=3D0;$i<count($aHeading);$i++) :
    echo th($aHeading[$i]->ad_text,'style=3D"color:blue;padding: 0 5 1 10=
"');
    endfor;
 ?>
 </tr>
-<?
+<?php=20
 $e=3D0;
 foreach ($array as $row ) :
  $e++;

Modified: phpcompta/trunk/include/template/search_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/search_top.php	2013-05-16 18:00:08 U=
TC (rev 5271)
+++ phpcompta/trunk/include/template/search_top.php	2013-05-16 21:34:17 U=
TC (rev 5272)
@@ -29,7 +29,7 @@
  */
 ?>
 <div style=3D"float:right;height:10px;display:block;margin-top:2px;margi=
n-right:2px">
-<?
+<?php=20
    if ($div =3D=3D "search_op") {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D"recherche.php?".Dossier::get().'&ac=3DSEARCH';
@@ -38,5 +38,5 @@
 ?>
 </div>
 <div>
-	<? echo h2info('Recherche')?>
+	<?php echo h2info('Recherche')?>
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/stock_histo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_histo.php	2013-05-16 18:00:08 =
UTC (rev 5271)
+++ phpcompta/trunk/include/template/stock_histo.php	2013-05-16 21:34:17 =
UTC (rev 5272)
@@ -29,59 +29,59 @@
=20
 ?>
 <div class=3D"content">
-	<?=3D$nav_bar?>
+	<?php echo $nav_bar?>
 <table class=3D"result">
 	<tr>
-		<th><?=3D$tb->get_header(0);?></th>
-		<th><?=3D$tb->get_header(1);?></th>
-		<th><?=3D$tb->get_header(2);?></th>
-		<th><?=3D$tb->get_header(3);?></th>
+		<th><?php echo $tb->get_header(0);?></th>
+		<th><?php echo $tb->get_header(1);?></th>
+		<th><?php echo $tb->get_header(2);?></th>
+		<th><?php echo $tb->get_header(3);?></th>
 		<th>Op=C3=A9ration</th>
-		<th><?=3D$tb->get_header(4);?></th>
-		<th><?=3D$tb->get_header(5);?></th>
-		<th><?=3D$tb->get_header(6);?></th>
-		<th><?=3D$tb->get_header(7);?></th>
+		<th><?php echo $tb->get_header(4);?></th>
+		<th><?php echo $tb->get_header(5);?></th>
+		<th><?php echo $tb->get_header(6);?></th>
+		<th><?php echo $tb->get_header(7);?></th>
 	</tr>
-	<?
+	<?php=20
=20
 	for ($i=3D0;$i<$max_row;$i++):
 		$row=3DDatabase::fetch_array($res, $i);
 		$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
 	?>
-	<tr <?=3D$class?>>
+	<tr <?php echo $class?>>
 		<td>
-			<?=3D$row['cdate']?>
+			<?php echo $row['cdate']?>
 		</td>
 		<td>
-			<?=3DHtmlInput::card_detail($row['sg_code'],"",' class=3D"line" ')?>
+			<?php echo HtmlInput::card_detail($row['sg_code'],"",' class=3D"line"=
 ')?>
 		</td>
 		<td>
-			<?=3D$row['r_name']?>
+			<?php echo $row['r_name']?>
 		</td>
 		<td>
-			<? if (trim($row['qcode'])!=3D'') : ?>
-			<?=3DHtmlInput::card_detail($row['qcode'],$row['fname'],' class=3D"li=
ne" ')?>
-			<? endif; ?>
+			<?php if (trim($row['qcode'])!=3D'') : ?>
+			<?php echo HtmlInput::card_detail($row['qcode'],$row['fname'],' class=
=3D"line" ')?>
+			<?php endif; ?>
 		</td>
 		<td>
-			<? if (trim($row['jr_internal'])!=3D'') : ?>
-			<?=3DHtmlInput::detail_op($row['jr_id'],$row['jr_internal'])?>
-			<? endif; ?>
+			<?php if (trim($row['jr_internal'])!=3D'') : ?>
+			<?php echo HtmlInput::detail_op($row['jr_id'],$row['jr_internal'])?>
+			<?php endif; ?>
 		</td>
 		<td>
-			<?=3D$row['ccomment']?>
+			<?php echo $row['ccomment']?>
 		</td>
 		<td class=3D"num">
-			<?=3Dnbm($row['j_montant'])?>
+			<?php echo nbm($row['j_montant'])?>
 		</td>
 		<td class=3D"num">
-			<?=3Dnbm($row['sg_quantity'])?>
+			<?php echo nbm($row['sg_quantity'])?>
 		</td>
 		<td>
-			<?=3D$row['direction']?>
+			<?php echo $row['direction']?>
 		</td>
 	</tr>
-	<? endfor;?>
+	<?php endfor;?>
 </table>
-	<?=3D$nav_bar?>
+	<?php echo $nav_bar?>
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/stock_histo_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_histo_search.php	2013-05-16 18=
:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/stock_histo_search.php	2013-05-16 21=
:34:17 UTC (rev 5272)
@@ -27,45 +27,45 @@
  */
 ?>
 <div id=3D"histo_search_d" class=3D"inner_box" style=3D"width:60%;height=
:280px;display:none">
-	<?=3D HtmlInput::title_box("Recherche", "histo_search_d", "hide")?>
+	<?php echo  HtmlInput::title_box("Recherche", "histo_search_d", "hide")=
?>
 	<form method=3D"GET">
-		<?=3D HtmlInput::get_to_hidden(array("gDossier", "ac"))?>
+		<?php echo  HtmlInput::get_to_hidden(array("gDossier", "ac"))?>
 		<table>
 			<tr>
 				<td> Code Stock </td>
-				<td> <?=3D $wcode_stock->input()?><?=3D $wcode_stock->search()?> </t=
d>
+				<td> <?php echo  $wcode_stock->input()?><?php echo  $wcode_stock->se=
arch()?> </td>
 			</tr>
 			<tr>
 				<td> Fiche </td>
-				<td> <?=3D $wcard->input()?><?=3D $wcard->search()?> </td>
+				<td> <?php echo  $wcard->input()?><?php echo  $wcard->search()?> </t=
d>
 			</tr>
 			<tr>
 				<td> A partir de </td>
-				<td> <?=3D $wdate_start->input()?> </td>
+				<td> <?php echo  $wdate_start->input()?> </td>
 			</tr>
 			<tr>
 				<td> Jusque </td>
-				<td> <?=3D $wdate_end->input()?> </td>
+				<td> <?php echo  $wdate_end->input()?> </td>
 			</tr>
 			<tr>
 				<td> D=C3=A9p=C3=B4t </td>
-				<td> <?=3D $wrepo->input()?> </td>
+				<td> <?php echo  $wrepo->input()?> </td>
 			</tr>
 			<tr>
 				<td> Montant sup=C3=A9rieur ou =C3=A9gal =C3=A0  </td>
-				<td> <?=3D $wamount_start->input()?> </td>
+				<td> <?php echo  $wamount_start->input()?> </td>
 			</tr>
 			<tr>
 				<td> Montant inf=C3=A9rieur ou =C3=A9gal =C3=A0  </td>
-				<td> <?=3D $wamount_end->input()?> </td>
+				<td> <?php echo  $wamount_end->input()?> </td>
 			</tr>
=20
 			<tr>
 				<td> Direction </td>
-				<td> <?=3D $wdirection->input()?> </td>
+				<td> <?php echo  $wdirection->input()?> </td>
 			</tr>
 		</table>
-		<?=3D HtmlInput::submit("search_histo_b", "Recherche")?>
+		<?php echo  HtmlInput::submit("search_histo_b", "Recherche")?>
 	</form>
 </div>
=20

Modified: phpcompta/trunk/include/template/stock_inv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_inv.php	2013-05-16 18:00:08 UT=
C (rev 5271)
+++ phpcompta/trunk/include/template/stock_inv.php	2013-05-16 21:34:17 UT=
C (rev 5272)
@@ -34,7 +34,7 @@
 			Date
 		</td>
 		<td>
-			<?=3D$date->input()?>
+			<?php echo $date->input()?>
 		</td>
 	</tr>
 	<tr>
@@ -42,7 +42,7 @@
 			D=C3=A9pot
 		</td>
 		<td>
-			<?=3D$idepo->input()?>
+			<?php echo $idepo->input()?>
 		</td>
 	</tr>
 	<tr>
@@ -50,7 +50,7 @@
 			Motif de changement
 		</td>
 		<td>
-			<?=3D$motif->input()?>
+			<?php echo $motif->input()?>
 		</td>
 	</tr>
 </table>
@@ -59,47 +59,47 @@
 		<th style=3D"text-align: left">
 			Code Stock
 		</th>
-<? if ( $p_readonly =3D=3D true ) :?>
+<?php if ( $p_readonly =3D=3D true ) :?>
 		<th style=3D"text-align: left">
 			Fiche
 		</th>
-<? endif;?>
+<?php endif;?>
 		<th style=3D"text-align:right">
 			Quantit=C3=A9
 		</th>
 	</tr>
-<? for($i=3D0;$i<MAX_ARTICLE;$i++): ?>
+<?php for($i=3D0;$i<MAX_ARTICLE;$i++): ?>
 	<tr>
 		<td>
-<? if ( $p_readonly =3D=3D false) : ?>
-			<?=3D$sg_code[$i]->input()?>
-			<?=3D$sg_code[$i]->search()?>
-			<?=3D$label[$i]->input()?>
-<? else: ?>
-			<? if ( trim($sg_code[$i]->value) !=3D "")  echo HtmlInput::card_deta=
il($sg_code[$i]->value,h($sg_code[$i]->value),' class=3D"line"')?>
-<? endif ?>
+<?php if ( $p_readonly =3D=3D false) : ?>
+			<?php echo $sg_code[$i]->input()?>
+			<?php echo $sg_code[$i]->search()?>
+			<?php echo $label[$i]->input()?>
+<?php else: ?>
+			<?php if ( trim($sg_code[$i]->value) !=3D "")  echo HtmlInput::card_d=
etail($sg_code[$i]->value,h($sg_code[$i]->value),' class=3D"line"')?>
+<?php endif ?>
=20
 		</td>
-<? if ( $p_readonly =3D=3D true && isset ($fiche[$i])) :?>
+<?php if ( $p_readonly =3D=3D true && isset ($fiche[$i])) :?>
 		<td>
-			<?=3DHtmlInput::card_detail($fiche[$i]->get_quick_code(),h($fiche[$i]=
->getName()),' class=3D"line"');?>
+			<?php echo HtmlInput::card_detail($fiche[$i]->get_quick_code(),h($fic=
he[$i]->getName()),' class=3D"line"');?>
 		</td>
-<? endif;?>
+<?php endif;?>
 		<TD class=3D"num"">
-			<? if ($sg_quantity[$i]->value=3D=3D0 && $p_readonly=3D=3Dtrue):?>
+			<?php if ($sg_quantity[$i]->value=3D=3D0 && $p_readonly=3D=3Dtrue):?>
=20
-			<? else : ?>
-			<?=3D$sg_quantity[$i]->input()?>
-			<? endif;?>
+			<?php else : ?>
+			<?php echo $sg_quantity[$i]->input()?>
+			<?php endif;?>
 		</td>
 		<TD class=3D"num"">
-			<? if (isset ($sg_type[$i])):?>
-			<?=3D$sg_type[$i]?>
-			<? endif;?>
+			<?php if (isset ($sg_type[$i])):?>
+			<?php echo $sg_type[$i]?>
+			<?php endif;?>
 		</td>
 	</tr>
-<? endfor; ?>
+<?php endfor; ?>
 </table>
-<? if ($p_readonly =3D=3D false) echo HtmlInput::submit('save','Sauver')=
?>
+<?php if ($p_readonly =3D=3D false) echo HtmlInput::submit('save','Sauve=
r')?>
 	</form>
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/stock_state_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_state_search.php	2013-05-16 18=
:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/stock_state_search.php	2013-05-16 21=
:34:17 UTC (rev 5272)
@@ -28,14 +28,14 @@
  */
 ?>
 <form method=3D"GET">
-	<?=3DHtmlInput::get_to_hidden(array("gDossier","ac"));?>
+	<?php echo HtmlInput::get_to_hidden(array("gDossier","ac"));?>
 	<table>
 		<tr>
 			<td>
 				Exercice
 			</td>
 			<td>
-				<?=3D$iexercice->input()?>
+				<?php echo $iexercice->input()?>
 			</td>
 		</tr>
 		<tr>
@@ -43,9 +43,9 @@
 				Pr=C3=A9sentation
 			</td>
 			<td>
-				<?=3D$presentation->input()?>
+				<?php echo $presentation->input()?>
 			</td>
 		</tr>
 	</table>
-	<?=3DHtmlInput::submit('sfilter','Filtrer')?>
+	<?php echo HtmlInput::submit('sfilter','Filtrer')?>
 </form>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/stock_summary_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_summary_list.php	2013-05-16 18=
:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/stock_summary_list.php	2013-05-16 21=
:34:17 UTC (rev 5272)
@@ -34,12 +34,12 @@
 	",array($tmp_id));
 ?>
 <div class=3D"content">
-<? for ($r=3D0;$r<count($a_repo);$r++):?>
-<h1><?=3D$a_repo[$r]['r_name']?></h1>
-<p>Adresse <?=3D$a_repo[$r]['r_adress']?></p>
-<p>Ville <?=3D$a_repo[$r]['r_city']?></p>
-<p>Pays <?=3D$a_repo[$r]['r_country']?></p>
-<p>T=C3=A9l=C3=A9phone <?=3D$a_repo[$r]['r_phone']?></p>
+<?php for ($r=3D0;$r<count($a_repo);$r++):?>
+<h1><?php echo $a_repo[$r]['r_name']?></h1>
+<p>Adresse <?php echo $a_repo[$r]['r_adress']?></p>
+<p>Ville <?php echo $a_repo[$r]['r_city']?></p>
+<p>Pays <?php echo $a_repo[$r]['r_country']?></p>
+<p>T=C3=A9l=C3=A9phone <?php echo $a_repo[$r]['r_phone']?></p>
 <table class=3D"result">
 	<tr>
 		<th>Code</th>
@@ -48,7 +48,7 @@
 		<th style=3D"text-align: right">OUT</th>
 		<th style=3D"text-align: right">En Stock</th>
 	</tr>
-	<?
+	<?php=20
 		$a_stock=3D$cn->get_array(
 				"
 					select coalesce(sum(s_qin),0) as qin,coalesce(sum(s_qout),0) as qou=
t,sg_code
@@ -75,10 +75,10 @@
 	?>
 	<tr>
 		<td>
-			<?=3DHtmlInput::card_detail($a_stock[$s]['sg_code'])?>
+			<?php echo HtmlInput::card_detail($a_stock[$s]['sg_code'])?>
 		</td>
 		<td>
-			<?
+			<?php=20
 				$sep=3D"";
 				for ( $c=3D0;$c<count($a_card);$c++):
 					echo $sep.HtmlInput::card_detail($a_card[$c]['quick_code'], $a_card=
[$c]['vw_name'], ' class=3D"line" ');
@@ -88,18 +88,18 @@
 			?>
 		</td>
 		<td class=3D"num">
-			<?=3Dnbm($a_stock[$s]['qin'])?>
+			<?php echo nbm($a_stock[$s]['qin'])?>
 		</td>
 		<td class=3D"num">
-			<?=3Dnbm($a_stock[$s]['qout'])?>
+			<?php echo nbm($a_stock[$s]['qout'])?>
=20
 		</td>
 		<td class=3D"num">
-			<?=3Dnbm(bcsub($a_stock[$s]['qin'],$a_stock[$s]['qout']))?>
+			<?php echo nbm(bcsub($a_stock[$s]['qin'],$a_stock[$s]['qout']))?>
 		</td>
 	</tr>
-<? endfor; ?>
+<?php endfor; ?>
 </table>
-<? endfor; ?>
+<?php endfor; ?>
=20
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/stock_summary_table.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_summary_table.php	2013-05-16 1=
8:00:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/stock_summary_table.php	2013-05-16 2=
1:34:17 UTC (rev 5272)
@@ -32,25 +32,25 @@
 		<th>
 			Code Stock
 		</th>
-		<? for ($i =3D 0; $i < count($a_repository); $i++):?>
+		<?php for ($i =3D 0; $i < count($a_repository); $i++):?>
 			<th>
-				<?=3Dh( $a_repository[$i]['r_name'])?>
+				<?php echo h( $a_repository[$i]['r_name'])?>
 			</th>
-		<? endfor;?>
+		<?php endfor;?>
 			<th>
 				Total
 			</th>
 	</tr>
-	<?
+	<?php=20
 	for ($x =3D 0; $x < count($a_code); $x++):
 		$class=3D($x%2=3D=3D0)?' class=3D"odd" ':' class=3D"even" ';
 		?>
=20
-		<tr <?=3D$class?> >
+		<tr <?php echo $class?> >
 			<td>
-				<?=3DHtmlInput::card_detail($a_code[$x]['sg_code'])?>
+				<?php echo HtmlInput::card_detail($a_code[$x]['sg_code'])?>
 			</td>
-			<?
+			<?php=20
 			$n_in=3D0;$n_out=3D0;
 			for ($e =3D 0; $e < count($a_repository); $e++):
=20
@@ -60,7 +60,7 @@
 						, array($a_repository[$e]['r_id'], $a_code[$x]['sg_code'],$tmp_id)=
);
 				?>
 			<td>
-				<?
+				<?php=20
 					if (count($array)=3D=3D0):
 						echo 0;
 					else:
@@ -73,7 +73,7 @@
 									IN  :
 								</td>
 								<td class=3D"num">
-									<?=3Dnbm($array[0]['s_qin'])?>
+									<?php echo nbm($array[0]['s_qin'])?>
 								</td>
 							</tr>
 							<tr>
@@ -81,7 +81,7 @@
 									OUT  :
 								</td>
 								<td class=3D"num">
-									<?=3Dnbm($array[0]['s_qout'])?>
+									<?php echo nbm($array[0]['s_qout'])?>
 								</td>
 							</tr>
 							<tr>
@@ -89,15 +89,15 @@
 									DIFF  :
 								</td>
 								<td class=3D"num">
-									<?=3Dnbm((bcsub($array[0]['s_qin'],$array[0]['s_qout'])))?>
+									<?php echo nbm((bcsub($array[0]['s_qin'],$array[0]['s_qout'])))=
?>
 								</td>
 							</tr>
 						</table>
-						<?
+						<?php=20
 					endif;
 				?>
  			</td>
-				<?
+				<?php=20
 			endfor;  // loop e
 			?>
 			<td>
@@ -107,7 +107,7 @@
 									IN  :
 								</td>
 								<td class=3D"num">
-									<?=3Dnbm($n_in)?>
+									<?php echo nbm($n_in)?>
 								</td>
 							</tr>
 							<tr>
@@ -115,7 +115,7 @@
 									OUT  :
 								</td>
 								<td class=3D"num">
-									<?=3Dnbm($n_out)?>
+									<?php echo nbm($n_out)?>
 								</td>
 							</tr>
 							<tr>
@@ -123,13 +123,13 @@
 									DIFF  :
 								</td>
 								<td class=3D"num">
-									<?=3Dnbm((bcsub($n_in,$n_out)))?>
+									<?php echo nbm((bcsub($n_in,$n_out)))?>
 								</td>
 							</tr>
 						</table>
 			</td>
 		</tr>
-		<?
+		<?php=20
 	endfor; // loop x
 	?>
 </table>

Modified: phpcompta/trunk/include/template/user_sec_profile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/user_sec_profile.php	2013-05-16 18:0=
0:08 UTC (rev 5271)
+++ phpcompta/trunk/include/template/user_sec_profile.php	2013-05-16 21:3=
4:17 UTC (rev 5272)
@@ -28,25 +28,25 @@
  */
 ?>
 <form method=3D"POST" class=3D"print">
-    <?=3DHtmlInput::hidden('tab','profile_gestion_div')?>
-	<?=3DHtmlInput::hidden("p_id", $p_id);?>
+    <?php echo HtmlInput::hidden('tab','profile_gestion_div')?>
+	<?php echo HtmlInput::hidden("p_id", $p_id);?>
 	<table>
 		<tr>
-			<th><?=3D_("Profil")?></th>
-			<th><?=3D_("Acc=C3=A8s")?></th>
+			<th><?php echo _("Profil")?></th>
+			<th><?php echo _("Acc=C3=A8s")?></th>
 		</tr>
-		<? for ($i=3D0;$i<count($array);$i++): ?>
+		<?php for ($i=3D0;$i<count($array);$i++): ?>
 		<tr>
 			<td>
-				<?=3D$array[$i]['p_name']?>
-				<?=3DHtmlInput::hidden('ua_id[]',$array[$i]['ua_id'])?>
-				<?=3DHtmlInput::hidden('ap_id[]',$array[$i]['p_id'])?>
+				<?php echo $array[$i]['p_name']?>
+				<?php echo HtmlInput::hidden('ua_id[]',$array[$i]['ua_id'])?>
+				<?php echo HtmlInput::hidden('ap_id[]',$array[$i]['p_id'])?>
 			</td>
-                        <?
+                        <?php=20
                             $color=3D($array[$i]['ua_right']!=3D'X')?"bo=
rder:lightgreen 2px solid; ":"border:red 2px solid; ";
                         ?>
-			<td style=3D"<?=3D$color?>">
-				<?
+			<td style=3D"<?php echo $color?>">
+				<?php=20
 				$isel=3Dnew ISelect("right[]");
 				$isel->value=3D$aright_value;
 				$isel->selected=3D$array[$i]['ua_right'];
@@ -55,5 +55,5 @@
 		</tr>
 		<?endfor;?>
 	</table>
-<?=3DHtmlInput::submit("change_profile", "Sauver")?>
+<?php echo HtmlInput::submit("change_profile", "Sauver")?>
 </form>
\ No newline at end of file

Modified: phpcompta/trunk/include/user_detail.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user_detail.inc.php	2013-05-16 18:00:08 UTC (=
rev 5271)
+++ phpcompta/trunk/include/user_detail.inc.php	2013-05-16 21:34:17 UTC (=
rev 5272)
@@ -105,10 +105,10 @@
 $it_pass->value=3D"";
 ?>
 <h1 class=3D"info">Modification</h1>
-<? echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Duser=
_mgt'); ?>
+<?php echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Du=
ser_mgt'); ?>
 <FORM  METHOD=3D"POST">
=20
-<?=3DHtmlInput::hidden('UID',$uid)?>
+<?php echo HtmlInput::hidden('UID',$uid)?>
     <TABLE BORDER=3D0>
         <TR>
=20
@@ -131,7 +131,7 @@
                 Mot de passe :<span class=3D"info">Laisser =C3=A0 VIDE p=
our ne PAS le changer</span>
             </td>
             <td>
-                <?=3D$it_pass->input();?>
+                <?php echo $it_pass->input();?>
             </td>
         </tr>
     </table>
@@ -228,7 +228,7 @@
         <input type=3D"Submit" class=3D"button" NAME=3D"SAVE" VALUE=3D"S=
auver les changements" onclick=3D"return confirm('Confirmer changement ?'=
);">
=20
         <input type=3D"Submit"  class=3D"button" NAME=3D"DELETE" VALUE=3D=
"Effacer" onclick=3D"return confirm('Confirmer effacement ?');" >
-<? echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Duser=
_mgt'); ?>
+<?php echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Du=
ser_mgt'); ?>
 </FORM>
=20
 </DIV>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 17:44:40 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud5ya-0002Ma-5W
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 17:44:40 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 16 May 2013 23:42:55 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348668.1368740680.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5273 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 21:44:39 -0000

Author: danydb
Date: 2013-05-16 23:42:55 +0200 (Thu, 16 May 2013)
New Revision: 5273

Modified:
   phpcompta/trunk/include/constant.php
Log:
task #843 : include_path automatique

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-16 21:34:17 UTC (rev 527=
2)
+++ phpcompta/trunk/include/constant.php	2013-05-16 21:42:55 UTC (rev 527=
3)
@@ -27,6 +27,18 @@
 require_once('constant.security.php');
 // SVNVERSION
 global $version_phpcompta;
+/*
+ * Include path
+ */
+$inc_path=3Dget_include_path();
+$dirname=3Ddirname(__FILE__);
+if ( strpos($inc_path,";") !=3D 0 ) {
+  $new_path=3D$inc_path.';'.$dirname;
+  $os=3D0;			/* $os is 0 for windoz */
+} else {
+  $new_path=3D$inc_path.':'.$dirname;
+  $os=3D1;			/* $os is 1 for unix */
+}
=20
=20
 global $g_captcha,$g_failed,$g_succeed;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 18:15:05 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud6S1-0002Mr-QV
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 18:15:05 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 17 May 2013 00:13:12 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348677.1368742505.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5274 - in phpcompta/trunk: html include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 22:15:05 -0000

Author: danydb
Date: 2013-05-17 00:13:12 +0200 (Fri, 17 May 2013)
New Revision: 5274

Modified:
   phpcompta/trunk/html/admin_repo.php
   phpcompta/trunk/html/ajax.php
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/html/ajax_history.php
   phpcompta/trunk/html/ajax_ledger.php
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/ajax_poste.php
   phpcompta/trunk/html/ajax_todo_list.php
   phpcompta/trunk/html/backup.php
   phpcompta/trunk/html/compute.php
   phpcompta/trunk/html/direct.php
   phpcompta/trunk/html/do.php
   phpcompta/trunk/html/export.php
   phpcompta/trunk/html/extension.raw.php
   phpcompta/trunk/html/fid.php
   phpcompta/trunk/html/fid_card.php
   phpcompta/trunk/html/index.php
   phpcompta/trunk/html/login.php
   phpcompta/trunk/html/recherche.php
   phpcompta/trunk/html/show_document.php
   phpcompta/trunk/html/show_document_modele.php
   phpcompta/trunk/html/show_pj.php
   phpcompta/trunk/html/user_login.php
   phpcompta/trunk/html/user_pref.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/ajax_boxcard_search.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/stock_cfg.inc.php
   phpcompta/trunk/include/template/action_search_result.php
   phpcompta/trunk/include/template/detail-action.php
   phpcompta/trunk/include/template/profile_sec_repository.php
   phpcompta/trunk/include/template/user_sec_profile.php
Log:
Task #0000839: R?\195?\169?\195?\169criture de la proc?\195?\169dure d'in=
stallation

Inclu en premier lieu constant.php pour avoir la bonne valeur dans includ=
e_path
Tous les tags <? ont ?\195?\169t?\195?\169 chang?\195?\169s en <?php pour=
 les servers mutualis?\195?\169s

Modified: phpcompta/trunk/html/admin_repo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin_repo.php	2013-05-16 21:42:55 UTC (rev 5273=
)
+++ phpcompta/trunk/html/admin_repo.php	2013-05-16 22:13:12 UTC (rev 5274=
)
@@ -22,6 +22,7 @@
  * \brief Administration of the repository : creation of user, folder, s=
ecurity,
  *        templates... Accessible only by the administrator
  */
+require_once '../include/constant.php';
 require_once("user_common.php");
 include_once("ac_common.php");
 require_once('class_database.php');

Modified: phpcompta/trunk/html/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/ajax.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -7,6 +7,7 @@
  *  - gDossier
  *  - plugin_code
  */
+require_once '../include/constant.php';
 require_once('class_database.php');
 require_once('class_user.php');
 require_once('class_extension.php');

Modified: phpcompta/trunk/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_card.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/ajax_card.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -54,6 +54,7 @@
  * - ref if we want to refresh the window
  *\see fiche fiche::Save constant.php
  */
+require_once '../include/constant.php';
 require_once('class_database.php');
 require_once ('class_fiche.php');
 require_once('class_iradio.php');

Modified: phpcompta/trunk/html/ajax_history.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_history.php	2013-05-16 21:42:55 UTC (rev 52=
73)
+++ phpcompta/trunk/html/ajax_history.php	2013-05-16 22:13:12 UTC (rev 52=
74)
@@ -24,6 +24,7 @@
    * \brief show the history of a card of an accounting
    * for the card f_id is set and for an accounting : pcm_val
    */
+require_once '../include/constant.php';
 require_once('class_database.php');
 require_once('class_user.php');
 require_once('class_dossier.php');

Modified: phpcompta/trunk/html/ajax_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_ledger.php	2013-05-16 21:42:55 UTC (rev 527=
3)
+++ phpcompta/trunk/html/ajax_ledger.php	2013-05-16 22:13:12 UTC (rev 527=
4)
@@ -29,6 +29,7 @@
     - for reconcialiation
     - update of analytic content
 */
+require_once '../include/constant.php';
 require_once('class_database.php');
 require_once('class_user.php');
 require_once('class_acc_operation.php');

Modified: phpcompta/trunk/html/ajax_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_misc.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/ajax_misc.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -35,6 +35,7 @@
  * dl : display form to modify, add and delete lettering for a given ope=
ration
  *
  */
+require_once '../include/constant.php';
 require_once('class_database.php');
 require_once ('class_fiche.php');
 require_once('class_iradio.php');

Modified: phpcompta/trunk/html/ajax_poste.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_poste.php	2013-05-16 21:42:55 UTC (rev 5273=
)
+++ phpcompta/trunk/html/ajax_poste.php	2013-05-16 22:13:12 UTC (rev 5274=
)
@@ -33,6 +33,7 @@
  *
  *
  */
+require_once '../include/constant.php';
 require_once  ("ac_common.php");
 require_once('class_acc_ledger.php');
 require_once ('class_database.php');

Modified: phpcompta/trunk/html/ajax_todo_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_todo_list.php	2013-05-16 21:42:55 UTC (rev =
5273)
+++ phpcompta/trunk/html/ajax_todo_list.php	2013-05-16 22:13:12 UTC (rev =
5274)
@@ -34,6 +34,7 @@
  * - gDossier
  * - i id
  */
+require_once '../include/constant.php';
 require_once ('class_dossier.php');
 require_once ('class_todo_list.php');
 require_once ('class_database.php');

Modified: phpcompta/trunk/html/backup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/backup.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/backup.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -19,6 +19,7 @@
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+require_once '../include/constant.php';
 require_once("constant.php");
 require_once('class_database.php');
 require_once  ("class_user.php");

Modified: phpcompta/trunk/html/compute.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/compute.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/compute.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -31,8 +31,7 @@
  * - gDossier
  * Must return at least tva, htva and tvac
  */
-
-require_once ('constant.php');
+require_once '../include/constant.php';
 require_once ('class_database.php');
 require_once ('class_acc_compute.php');
 require_once('class_dossier.php');

Modified: phpcompta/trunk/html/direct.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/direct.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/direct.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -1,4 +1,5 @@
-<?php=20
+<?php
+require_once '../include/constant.php';
 require_once ("class_database.php");
 require_once 'class_user.php';
 $cn=3Dnew Database($_GET['gDossier']);

Modified: phpcompta/trunk/html/do.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/do.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/do.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -24,6 +24,7 @@
 /**\file
  * \brief Main file
  */
+require_once '../include/constant.php';
 require_once 'class_database.php';
 require_once ('class_dossier.php');
 require_once('user_common.php');

Modified: phpcompta/trunk/html/export.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/export.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/export.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -25,7 +25,7 @@
  *   act can be
  *
  */
-
+require_once '../include/constant.php';
 global $g_user,$cn,$g_parameter;
 require_once('class_database.php');
 require_once('class_user.php');

Modified: phpcompta/trunk/html/extension.raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/extension.raw.php	2013-05-16 21:42:55 UTC (rev 5=
273)
+++ phpcompta/trunk/html/extension.raw.php	2013-05-16 22:13:12 UTC (rev 5=
274)
@@ -24,6 +24,7 @@
  * \brief this file includes the called plugin. It  check first
  * the security. Load several javascript files
  */
+require_once '../include/constant.php';
 require_once('class_database.php');
 require_once('class_dossier.php');
 require_once("ac_common.php");

Modified: phpcompta/trunk/html/fid.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/fid.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/fid.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -33,7 +33,7 @@
  * - FID is the QuickCode
    *\note if the j is -1 then all the card are shown
  */
-
+require_once '../include/constant.php';
 require_once('class_own.php');
 require_once  ("constant.php");
 require_once('class_database.php');

Modified: phpcompta/trunk/html/fid_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/fid_card.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/fid_card.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -26,7 +26,7 @@
  *\see ICard
  */
=20
-
+require_once '../include/constant.php';
 require_once('class_database.php');
 require_once('class_dossier.php');
 /*!\brief

Modified: phpcompta/trunk/html/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/index.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/index.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -180,7 +180,8 @@
 </head>
 <BODY>';
 $my_domain=3D"";
-require ('config.inc.php');
+require_once '../include/constant.php';
+require_once ('config.inc.php');
 if ( strlen(domaine) > 0 )
 {
     $my_domain=3D"Domaine : ".domaine;

Modified: phpcompta/trunk/html/login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/login.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/login.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -17,6 +17,8 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
 */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+require_once '../include/constant.php';
+
 include_once ("ac_common.php");
 require_once('constant.php');
=20
@@ -41,7 +43,7 @@
     /*
      * Check repository version
      */
-    if ( $rep->get_value('select val from version') !=3D DBVERSIONREPO)=20
+    if ( $rep->get_value('select val from version') !=3D DBVERSIONREPO)
       {
 	echo alert('Version de base de donn=C3=A9es incorrectes, vous devez met=
tre =C3=A0 jour');
 	echo "<META HTTP-EQUIV=3D\"REFRESH\" content=3D\"0;url=3Dadmin/setup.ph=
p\">";
@@ -51,12 +53,12 @@
     include_once ("class_user.php");
     $User=3Dnew User($rep);
     $User->Check(false,'LOGIN');
-    if ($g_captcha =3D=3D true)=20
+    if ($g_captcha =3D=3D true)
       {
 	include("securimage/securimage.php");
 	$img =3D new Securimage();
 	$valid =3D $img->check($_POST['captcha_code']);
-	if ( $valid =3D=3D false )=20
+	if ( $valid =3D=3D false )
 	  {
 	    echo alert('Code invalide');
 	    echo "<META HTTP-EQUIV=3D\"REFRESH\" content=3D\"0;url=3Dindex.php\=
">";
@@ -74,7 +76,7 @@
      * Check repository version
      */
=20
-    if ( $rep->get_value('select val from version') !=3D DBVERSIONREPO)=20
+    if ( $rep->get_value('select val from version') !=3D DBVERSIONREPO)
       {
 	echo alert('Version de base de donn=C3=A9es incorrectes, vous devez met=
tre =C3=A0 jour');
 	echo "<META HTTP-EQUIV=3D\"REFRESH\" content=3D\"1;url=3Dadmin/setup.ph=
p\">";

Modified: phpcompta/trunk/html/recherche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/recherche.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/recherche.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -21,6 +21,7 @@
 /*! \file
  * \brief Search module
  */
+require_once '../include/constant.php';
 require_once('class_dossier.php');
 include_once("ac_common.php");
 include_once ("constant.php");

Modified: phpcompta/trunk/html/show_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_document.php	2013-05-16 21:42:55 UTC (rev 5=
273)
+++ phpcompta/trunk/html/show_document.php	2013-05-16 22:13:12 UTC (rev 5=
274)
@@ -23,7 +23,7 @@
 /** \file
  * \brief retrieve a document
  */
-
+require_once '../include/constant.php';
 require_once('class_database.php');
 require_once("ac_common.php");
 require_once( "class_document.php");

Modified: phpcompta/trunk/html/show_document_modele.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_document_modele.php	2013-05-16 21:42:55 UTC=
 (rev 5273)
+++ phpcompta/trunk/html/show_document_modele.php	2013-05-16 22:13:12 UTC=
 (rev 5274)
@@ -22,7 +22,7 @@
 /*! \file
  * \brief send the document template
  */
-
+require_once '../include/constant.php';
 require_once('class_database.php');
 require_once("ac_common.php");
=20

Modified: phpcompta/trunk/html/show_pj.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_pj.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/show_pj.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -22,6 +22,7 @@
 /*!\file
  * \brief show an attach of an operation
  */
+require_once '../include/constant.php';
 include_once ("ac_common.php");
 require_once('class_dossier.php');
 $gDossier=3Ddossier::id();

Modified: phpcompta/trunk/html/user_login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_login.php	2013-05-16 21:42:55 UTC (rev 5273=
)
+++ phpcompta/trunk/html/user_login.php	2013-05-16 22:13:12 UTC (rev 5274=
)
@@ -22,6 +22,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 // $Revision$
+require_once '../include/constant.php';
 include_once ("ac_common.php");
 require_once('class_database.php');
 require_once('class_itext.php');

Modified: phpcompta/trunk/html/user_pref.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_pref.php	2013-05-16 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/html/user_pref.php	2013-05-16 22:13:12 UTC (rev 5274)
@@ -22,7 +22,7 @@
 /*! \file
  * \brief Page for the personal preference (theme, password,...)
  */
-
+require_once '../include/constant.php';
 include_once ("ac_common.php");
 require_once('class_database.php');
 /* Admin. Dossier */

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2013-05-16 21:42:55 UTC (rev 52=
73)
+++ phpcompta/trunk/include/ac_common.php	2013-05-16 22:13:12 UTC (rev 52=
74)
@@ -297,7 +297,7 @@
     echo "<HEAD>
     <TITLE>$title</TITLE>
 	<link rel=3D\"icon\" type=3D\"image/ico\" href=3D\"favicon.ico\" />
-    <META http-equiv=3D\"Content-Type\" content=3D\"text/html; charset=3D=
UTF8\">
+    <META http-equiv=3D\"Content-Type\" content=3D\"text/html; charset=3D=
UTF-8\">
     <LINK REL=3D\"stylesheet\" type=3D\"text/css\" href=3D\"$style\" med=
ia=3D\"screen\">
     <link rel=3D\"stylesheet\" type=3D\"text/css\" href=3D\"style-print.=
css\" media=3D\"print\">" .
     $p_script2 . "

Modified: phpcompta/trunk/include/ajax_boxcard_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_boxcard_search.php	2013-05-16 21:42:55 U=
TC (rev 5273)
+++ phpcompta/trunk/include/ajax_boxcard_search.php	2013-05-16 22:13:12 U=
TC (rev 5274)
@@ -69,7 +69,7 @@
 	</tr>
 <?php if (count($array)=3D=3D0) : ?>
 	<h2 class=3D"notice"> Aucun r=C3=A9sultat</h2>
-<?endif?>
+<?php endif?>
 <?php for ($i=3D0;$i<$max;$i++):?>
 	<tr class=3D"<?php echo ($i%2 =3D=3D 0)?'even':'odd';?>">
=20

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-16 21:42:55 UTC (rev 527=
3)
+++ phpcompta/trunk/include/constant.php	2013-05-16 22:13:12 UTC (rev 527=
4)
@@ -1,4 +1,5 @@
 <?php
+ini_set("session.auto_start","1");
 /*
  *   This file is part of PhpCompta.
  *
@@ -39,17 +40,23 @@
   $new_path=3D$inc_path.':'.$dirname;
   $os=3D1;			/* $os is 1 for unix */
 }
+set_include_path($new_path);
+session_start();
+/*
+ * Ini session
+ */
=20
=20
+
 global $g_captcha,$g_failed,$g_succeed;
 $g_captcha=3Dfalse;
 $g_failed=3D"<span style=3D\"font-size:18px;color:red\">&#x2716;</span>"=
;
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
-//define ('SVNINFO',5900);
+define ('SVNINFO',5900);
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",false);
+define ("DEBUG",true);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);

Modified: phpcompta/trunk/include/stock_cfg.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/stock_cfg.inc.php	2013-05-16 21:42:55 UTC (re=
v 5273)
+++ phpcompta/trunk/include/stock_cfg.inc.php	2013-05-16 22:13:12 UTC (re=
v 5274)
@@ -98,14 +98,14 @@
 			<?php echo h($array[$i]['r_phone'])?>
 		</td>
 		<td>
-			<?php=20
+			<?php
 				$js=3D' onclick=3D"stock_repo_change(\''.dossier::id().'\',\''.$arra=
y[$i]['r_id'].'\')"';
 				echo HtmlInput::button("mod", _("Modifier"), $js);
 			?>
 		</td>
 	</tr>
=20
-<?endfor;?>
+<?php endfor;?>
 </table>
 	<?php echo HtmlInput::button("show_add_depot_d", "Ajout d'un d=C3=A9pot=
", "onclick=3D\"$('add_depot_d').show();\"");?>
 	<div id=3D"add_depot_d" class=3D"inner_box" style=3D"display:none">

Modified: phpcompta/trunk/include/template/action_search_result.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/action_search_result.php	2013-05-16 =
21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/include/template/action_search_result.php	2013-05-16 =
22:13:12 UTC (rev 5274)
@@ -32,7 +32,7 @@
 	<?php echo HtmlInput::submit("save_action", "Mettre =C3=A0 jour")?>
 <?php if (isset($limit)) : ?>
 	<h2 class=3D"notice">Recherche limit=C3=A9e =C3=A0 <?php echo $limit?> =
r=C3=A9sultats</h2>
-<?endif;?>
+<?php endif;?>
=20
 <table class=3D"result">
=20
@@ -60,7 +60,7 @@
 	<?php $class=3D($i%2=3D=3D0)?' class=3D"odd" ':' class=3D"info"'; ?>
 	<tr  <?php echo $class?>>
 		<td>
-			<?php=20
+			<?php
 			$ck=3Dnew ICheckBox('ag_id[]');
 			 $ck->value=3D$a_row[$i]['ag_id'];
 			 echo $ck->input();

Modified: phpcompta/trunk/include/template/detail-action.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/detail-action.php	2013-05-16 21:42:5=
5 UTC (rev 5273)
+++ phpcompta/trunk/include/template/detail-action.php	2013-05-16 22:13:1=
2 UTC (rev 5274)
@@ -82,7 +82,7 @@
           </td>
           </Tr>
         </table>
- <?if ($p_view !=3D 'READ') echo $str_add_button;?>
+ <?php if ($p_view !=3D 'READ') echo $str_add_button;?>
=20
 </div>
 <div style=3D"float:left;width:45%">
@@ -135,7 +135,7 @@
 		<h4 style=3D"display:inline">Op=C3=A9rations concern=C3=A9es</h4>
 		<ol>
=20
-		<?php=20
+		<?php
 		for ($o=3D0;$o<count($operation);$o++)
 		{
 			if ( $p_view !=3D 'READ')
@@ -163,7 +163,7 @@
 		<h4 style=3D"display:inline">Actions concern=C3=A9es</h4>
 		<ol>
=20
-		<?php=20
+		<?php
 		$base=3DHtmlInput::request_to_string(array("gDossier","ac","sa","sb","=
sc","f_id"));
 		for ($o=3D0;$o<count($action);$o++)
 		{
@@ -257,7 +257,7 @@
 <?php if ( $p_base !=3D 'ajax' ) :?>
 <input type=3D'button' class=3D"button" class=3D"noprint" value=3D'Montr=
er articles' id=3D"toggleButton" onclick=3D'toggleShowDetail()'>
 <?php endif; ?>
-<?php=20
+<?php
 /**
  * check if there card to show,
  */
@@ -266,7 +266,7 @@
 	if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ=
'){ $show_row=3D1;break;}
 endfor;
 ?>
-<?php=20
+<?php
 /*
  * display detail if there card or if we are in UPDATE or NEW mode
  */
@@ -297,8 +297,8 @@
 <th><?php echo _('Montant TVAC')?></th>
=20
 </tr>
-<?for ($i=3D0;$i<count($aArticle);$i++): ?>
-<?php=20
+<?php for ($i=3D0;$i<count($aArticle);$i++): ?>
+<?php
 if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ'=
):
 	$show_row++;
 	?>
@@ -344,7 +344,7 @@
 </div>
 <?php endif; ?>
 </fieldset>
-<?endif; ?>
+<?php endif; ?>
=20
 <?php if ($p_view !=3D 'READ' && $str_select_doc !=3D '') : ?>
 <fieldset class=3D"noprint" >

Modified: phpcompta/trunk/include/template/profile_sec_repository.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/profile_sec_repository.php	2013-05-1=
6 21:42:55 UTC (rev 5273)
+++ phpcompta/trunk/include/template/profile_sec_repository.php	2013-05-1=
6 22:13:12 UTC (rev 5274)
@@ -1,4 +1,4 @@
-<?php
+<<?php
=20
 /*
  *   This file is part of PhpCompta.
@@ -42,18 +42,18 @@
 				<?php echo HtmlInput::hidden('ur_id[]',$array[$i]['ur_id'])?>
 				<?php echo HtmlInput::hidden('ar_id[]',$array[$i]['r_id'])?>
 			</td>
-                         <?php=20
+                         <?php
                             $color=3D($array[$i]['ur_right']!=3D'X')?"bo=
rder:lightgreen 2px solid; ":"border:red 2px solid; ";
                         ?>
 			<td style=3D"<?php echo $color?>">
=20
-				<?php=20
+				<?php
 				$isel=3Dnew ISelect("right[]");
 				$isel->value=3D$aright_value;
 				$isel->selected=3D$array[$i]['ur_right'];
 				echo $isel->input();?>
 			</td>
 		</tr>
-		<?endfor;?>
+		<?php endfor;?>
 	</table>
 <?php echo HtmlInput::submit("change_stock", "Sauver")?>

Modified: phpcompta/trunk/include/template/user_sec_profile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/user_sec_profile.php	2013-05-16 21:4=
2:55 UTC (rev 5273)
+++ phpcompta/trunk/include/template/user_sec_profile.php	2013-05-16 22:1=
3:12 UTC (rev 5274)
@@ -42,18 +42,18 @@
 				<?php echo HtmlInput::hidden('ua_id[]',$array[$i]['ua_id'])?>
 				<?php echo HtmlInput::hidden('ap_id[]',$array[$i]['p_id'])?>
 			</td>
-                        <?php=20
+                        <?php
                             $color=3D($array[$i]['ua_right']!=3D'X')?"bo=
rder:lightgreen 2px solid; ":"border:red 2px solid; ";
                         ?>
 			<td style=3D"<?php echo $color?>">
-				<?php=20
+				<?php
 				$isel=3Dnew ISelect("right[]");
 				$isel->value=3D$aright_value;
 				$isel->selected=3D$array[$i]['ua_right'];
 				echo $isel->input();?>
 			</td>
 		</tr>
-		<?endfor;?>
+		<?php endfor;?>
 	</table>
 <?php echo HtmlInput::submit("change_profile", "Sauver")?>
 </form>
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 18:34:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud6kL-0004qP-4R
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 18:34:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 17 May 2013 00:32:18 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348694.1368743640.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5275 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 22:34:00 -0000

Author: danydb
Date: 2013-05-17 00:32:18 +0200 (Fri, 17 May 2013)
New Revision: 5275

Modified:
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/include/impress_gl_comptes.inc.php
Log:
Task #0000823: Mise en evidence des op?\195?\169rations lettr?\195?\169es
Police en gras et ajout dans grand livre

Modified: phpcompta/trunk/html/js/acc_ledger.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/acc_ledger.js	2013-05-16 22:13:12 UTC (rev 52=
74)
+++ phpcompta/trunk/html/js/acc_ledger.js	2013-05-16 22:32:18 UTC (rev 52=
75)
@@ -951,6 +951,7 @@
 				for (i=3D0;i<count_elt;i++){
 					previous[i].style.backgroundColor=3D'';
 					previous[i].style.color=3D'';
+					previous[i].style.fontWeight=3D"";
 				}
 			}
 		var name=3D'tr_'+p_let+'_'+p_div;
@@ -961,6 +962,8 @@
 		for (i=3D0;i<count_elt;i++){
 			elt[i].style.backgroundColor=3D'#000066';
 			elt[i].style.color=3D'white';
+			elt[i].style.fontWeight=3D'bolder';
+
 		}
=20
 	} catch (e)

Modified: phpcompta/trunk/include/impress_gl_comptes.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_gl_comptes.inc.php	2013-05-16 22:13:1=
2 UTC (rev 5274)
+++ phpcompta/trunk/include/impress_gl_comptes.inc.php	2013-05-16 22:32:1=
8 UTC (rev 5275)
@@ -218,10 +218,15 @@
 	      $solde_d =3D bcadd($solde_d,$detail['deb_montant']);
             }
 			$side=3D"&nbsp;".$Poste->get_amount_side($solde);
-	    $letter=3D($detail['letter']!=3D-1)?hi(strtoupper(base_convert($det=
ail['letter'],10,36))):'';
+	    $letter=3D"";
+		$html_let=3D"";
+		if ($detail['letter']!=3D-1) {
+			$letter=3Dstrtoupper(base_convert($detail['letter'],10,36));
+			$html_let =3D HtmlInput::show_reconcile("", $letter);
+		}
 		$i++;
 		if (($i % 2 ) =3D=3D 0) $class=3D"odd"; else $class=3D"even";
-            echo '<tr class=3D"'.$class.'">
+            echo '<tr name=3D"tr_'.$letter.'_" class=3D"'.$class.'">
             <td>'.$detail['j_date_fmt'].'</td>
             <td>'.HtmlInput::detail_op($detail['jr_id'],$detail['jr_inte=
rnal']).'</td>
             <td>'.$detail['description'].'</td>
@@ -229,7 +234,7 @@
             <td align=3D"right">'.($detail['deb_montant']  > 0 ? nbm($de=
tail['deb_montant'])  : '').'</td>
             <td align=3D"right">'.($detail['cred_montant'] > 0 ? nbm($de=
tail['cred_montant']) : '').'</td>
             <td align=3D"right">'.nbm(abs($solde)).$side.'</td>
-            <td  style=3D"text-align:right;color:red">'.$letter.'</td>
+            <td  style=3D"text-align:right;color:red">'.$html_let.'</td>
             </tr>';
         }
         echo '<tr >



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 18:34:31 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud6kp-0004sW-9p
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 18:34:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 17 May 2013 00:32:49 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348699.1368743670.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5276 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 22:34:30 -0000

Author: danydb
Date: 2013-05-17 00:32:49 +0200 (Fri, 17 May 2013)
New Revision: 5276

Modified:
   phpcompta/trunk/include/template/account_result.php
Log:
Remplace split qui est d?\195?\169pr?\195?\169ci?\195?\169 par explode

Modified: phpcompta/trunk/include/template/account_result.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/account_result.php	2013-05-16 22:32:=
18 UTC (rev 5275)
+++ phpcompta/trunk/include/template/account_result.php	2013-05-16 22:32:=
49 UTC (rev 5276)
@@ -30,7 +30,7 @@
 	if ( strlen($array[$i]['acode']) >0 ) {
 		if (strpos($array[$i]['acode'], ",") >0 ) {
=20
-			$det_qcode=3D  split(",", $array[$i]['acode']);
+			$det_qcode=3D  explode(",", $array[$i]['acode']);
 			$sep=3D"";
 			$max=3D(count($det_qcode)>$limite)?$limite:count($det_qcode);
 			for ($e=3D0;$e<$max;$e++) {



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 18:44:28 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud6uS-00080S-Gp
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 18:44:28 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 17 May 2013 00:42:11 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348702.1368744267.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r503 - in trunk: amortis amortis/include
	amortis/include/template backup_noadmin/include/template
	coprop coprop/include coprop/include/template
	import_card/include/template import_doli/include/template
	importbank/include importbank/include/template modop
	rapport_avance rapport_avance/include
	rapport_avance/include/template skel tool_pcmn/include tools
	tools/include/template tva
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 22:44:26 -0000

Author: danydb
Date: 2013-05-17 00:42:11 +0200 (Fri, 17 May 2013)
New Revision: 503

Modified:
   trunk/amortis/amortis_constant.php
   trunk/amortis/include/class_pdf_card.php
   trunk/amortis/include/material_delete.inc.php
   trunk/amortis/include/print_all.inc.php
   trunk/amortis/include/template/listing_histo.php
   trunk/amortis/include/template/listing_year.php
   trunk/amortis/include/template/material_add.php
   trunk/amortis/include/template/material_detail.php
   trunk/amortis/include/template/material_display.php
   trunk/amortis/include/template/material_listing.php
   trunk/amortis/include/template/util_generate.php
   trunk/backup_noadmin/include/template/home.php
   trunk/coprop/coprop-constant.php
   trunk/coprop/include/copro-parameter.inc.php
   trunk/coprop/include/key.inc.php
   trunk/coprop/include/template/appel_fond.php
   trunk/coprop/include/template/bud_detail.php
   trunk/coprop/include/template/budget.php
   trunk/coprop/include/template/budget_list.php
   trunk/coprop/include/template/coprop_lot_list.php
   trunk/coprop/include/template/historic.php
   trunk/coprop/include/template/key_detail.php
   trunk/import_card/include/template/input_file.php
   trunk/import_card/include/template/test_file.php
   trunk/import_doli/include/template/input_file.php
   trunk/import_doli/include/template/parameter.php
   trunk/import_doli/include/template/parameter_tva_add.php
   trunk/import_doli/include/template/test_file.php
   trunk/import_doli/include/template/test_operation.php
   trunk/import_doli/include/template/upload_operation.php
   trunk/importbank/include/import_bank.php
   trunk/importbank/include/template/confirm_transfer.php
   trunk/importbank/include/template/delete_item.php
   trunk/importbank/include/template/detail_item.php
   trunk/importbank/include/template/import_new.php
   trunk/importbank/include/template/input_file.php
   trunk/importbank/include/template/show_field.php
   trunk/importbank/include/template/show_import.php
   trunk/importbank/include/template/show_list.php
   trunk/importbank/include/template/show_transfer.php
   trunk/importbank/include/template/test_file.php
   trunk/modop/index.php
   trunk/modop/template_ledger_fin.php
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/ajax_search_code.php
   trunk/rapport_avance/include/declaration.inc.php
   trunk/rapport_avance/include/historique.inc.php
   trunk/rapport_avance/include/template/declaration_display.php
   trunk/rapport_avance/include/template/formulaire_definition.php
   trunk/rapport_avance/include/template/formulaire_listing.php
   trunk/rapport_avance/include/template/formulaire_titre.php
   trunk/rapport_avance/include/template/param_detail_new.php
   trunk/rapport_avance/rapav_constant.php
   trunk/skel/skel_constant.php
   trunk/tool_pcmn/include/export_plan.php
   trunk/tool_pcmn/include/import_plan.php
   trunk/tools/include/template/numbering.php
   trunk/tools/include/template/result_receipt.php
   trunk/tools/include/template/search_box.php
   trunk/tools/include/template/search_view.php
   trunk/tools/include/template/tool_exercice_input.php
   trunk/tools/tools_constant.php
   trunk/tva/form_decl.php
   trunk/tva/form_decl_info.php
   trunk/tva/form_parameter.php
   trunk/tva/form_periode.php
   trunk/tva/index.php
   trunk/tva/list_tva.inc.php
Log:
Task #0000839: R?\195?\169?\195?\169criture de la proc?\195?\169dure d'in=
stallation


Tous les tags <? ont ?\195?\169t?\195?\169 chang?\195?\169s en <?php pour=
 les servers mutualis?\195?\169s

Modified: trunk/amortis/amortis_constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/amortis_constant.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/amortis/amortis_constant.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 /**
  *@file
  *Contains all the needed variable for the plugin

Modified: trunk/amortis/include/class_pdf_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/class_pdf_card.php	2013-05-15 18:50:38 UTC (rev=
 502)
+++ trunk/amortis/include/class_pdf_card.php	2013-05-16 22:42:11 UTC (rev=
 503)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 require_once('class_pdf.php');
=20
=20

Modified: trunk/amortis/include/material_delete.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/material_delete.inc.php	2013-05-15 18:50:38 UTC=
 (rev 502)
+++ trunk/amortis/include/material_delete.inc.php	2013-05-16 22:42:11 UTC=
 (rev 503)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 $cn->exec_sql('delete from amortissement.amortissement where a_id=3D$1',
 	      array($a_id));
 echo HtmlInput::anchor_close($t);

Modified: trunk/amortis/include/print_all.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/print_all.inc.php	2013-05-15 18:50:38 UTC (rev =
502)
+++ trunk/amortis/include/print_all.inc.php	2013-05-16 22:42:11 UTC (rev =
503)
@@ -33,10 +33,10 @@
 echo HtmlInput::print_window();
 ?>
 <form method=3D"GET" action=3D"extension.raw.php" style=3D"display:inlin=
e">
-<?=3Ddossier::hidden()?>
-<?=3DHtmlInput::hidden('material','1');?>
-<?=3DHtmlInput::hidden('ac',$_REQUEST['ac']);?>
-<?=3DHtmlInput::extension()?>
-<?=3DHtmlInput::submit('csv','Export CSV');?>
+<?php echo dossier::hidden()?>
+<?php echo HtmlInput::hidden('material','1');?>
+<?php echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
+<?php echo HtmlInput::extension()?>
+<?php echo HtmlInput::submit('csv','Export CSV');?>
 </form>
 </div>
\ No newline at end of file

Modified: trunk/amortis/include/template/listing_histo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/listing_histo.php	2013-05-15 18:50:38 =
UTC (rev 502)
+++ trunk/amortis/include/template/listing_histo.php	2013-05-16 22:42:11 =
UTC (rev 503)
@@ -1,7 +1,7 @@
 <div class=3D"content" style=3D"width:80%;margin-left:10%">
 <!-- <h2 class=3D"info">Historique</h2> -->
 <form method=3D"POST">
-<?
+<?php=20
 echo HtmlInput::hidden('sa',$_REQUEST['sa']);
 echo HtmlInput::hidden('sb',$_REQUEST['sb']);
 echo HtmlInput::hidden('ac',$_REQUEST['ac']);
@@ -10,15 +10,15 @@
 ?>
 <table class=3D"result">
 <tr>
-<th><?=3D$header->get_header(0)?></th>
-<th><?=3D$header->get_header(1)?></th>
-<th style=3D"text-align:right"><?=3D$header->get_header(2)?></th>
-<th style=3D"text-align:center"><?=3D$header->get_header(3)?></th>
-<th><?=3D$header->get_header(4)?></th>
-<th><?=3D$header->get_header(5)?></th>
+<th><?php echo $header->get_header(0)?></th>
+<th><?php echo $header->get_header(1)?></th>
+<th style=3D"text-align:right"><?php echo $header->get_header(2)?></th>
+<th style=3D"text-align:center"><?php echo $header->get_header(3)?></th>
+<th><?php echo $header->get_header(4)?></th>
+<th><?php echo $header->get_header(5)?></th>
=20
 </tr>
-<?
+<?php=20
=20
 for ($i=3D0;$i<count($array);$i++) :
 	echo '<tr>';
@@ -46,6 +46,6 @@
 ?>
=20
 </table>
-<? echo HtmlInput::submit('remove','Effacer la s=C3=A9lection','onclick=3D=
"confirm(\'Confirmez Effacement ?\')"')?>
+<?php echo HtmlInput::submit('remove','Effacer la s=C3=A9lection','oncli=
ck=3D"confirm(\'Confirmez Effacement ?\')"')?>
 </form>
 </div>

Modified: trunk/amortis/include/template/listing_year.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/listing_year.php	2013-05-15 18:50:38 U=
TC (rev 502)
+++ trunk/amortis/include/template/listing_year.php	2013-05-16 22:42:11 U=
TC (rev 503)
@@ -1,4 +1,4 @@
-<h2 class=3D"info">Liste  pour <?=3D$year?></h2>
+<h2 class=3D"info">Liste  pour <?php echo $year?></h2>
 <style>
 @PAGE landscape {size: landscape;}
 TABLE {PAGE: landscape;}
@@ -16,7 +16,7 @@
   <th style=3D"text-align:right">Pourcentage</th>
   <th style=3D"text-align:right">Reste =C3=A0 amortir</th>
 </tr>
-<?
+<?php=20
 $tot_amort=3D0;$tot_net=3D0;bcscale(2);
 for ($i=3D0;$i < count($array) ; $i++):
 	echo '<tr>';
@@ -57,7 +57,7 @@
 <hr>
 <table class=3D"result" style=3D"width:50%;margin-left:25%">
 <tr>
-<?
+<?php=20
 echo td("Acquisition de l'ann=C3=A9e");
    $tot=3D$cn->get_value(" select coalesce(sum(a_amount),0) from amortis=
sement.amortissement where a_start=3D$1",
 			array($year));
@@ -65,24 +65,24 @@
 ?>
 </tr>
 <tr>
-<?
+<?php=20
 echo td("Amortissement ");
 echo td(nbm($tot_amort),"align=3D\"right\"");
 ?>
 </tr>
 <tr>
-<?
+<?php=20
 echo td("Valeur net ");
 echo td(nbm($tot_net),"align=3D\"right\"");
=20
 ?>
 </tr>
-<?=3Ddate('d.m.Y')?>
+<?php echo date('d.m.Y')?>
 <form method=3D"GET" action=3D"extension.raw.php">
-<?=3Ddossier::hidden()?>
-<?=3DHtmlInput::hidden('list_year',$year);?>
-<?=3DHtmlInput::hidden('ac',$_REQUEST['ac']);?>
-<?=3DHtmlInput::extension()?>
-<?=3DHtmlInput::submit('csv','Export CSV');?>
+<?php echo dossier::hidden()?>
+<?php echo HtmlInput::hidden('list_year',$year);?>
+<?php echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
+<?php echo HtmlInput::extension()?>
+<?php echo HtmlInput::submit('csv','Export CSV');?>
 </form>
=20

Modified: trunk/amortis/include/template/material_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/material_add.php	2013-05-15 18:50:38 U=
TC (rev 502)
+++ trunk/amortis/include/template/material_add.php	2013-05-16 22:42:11 U=
TC (rev 503)
@@ -4,35 +4,35 @@
 <table>
 <tr>
 	<td>Fiche</td>
-	<td><?=3D$p_card->input()?><?=3D$p_card->search()?></td>
+	<td><?php echo $p_card->input()?><?php echo $p_card->search()?></td>
 </tr>
 <tr>
 	<td>Date d'acquisition</td>
-	<td><?=3D$p_date->input()?></td>
+	<td><?php echo $p_date->input()?></td>
 </tr>
=20
 <tr>
 	<td>Montant =C3=A0 amortir</td>
-	<td><?=3D$p_amount->input()?></td>
+	<td><?php echo $p_amount->input()?></td>
 </tr>
=20
 <tr>
 	<td>Ann=C3=A9e comptable d'achat</td>
-	<td> <?=3D$p_year->input();?></td>
+	<td> <?php echo $p_year->input();?></td>
 </tr>
 <tr>
 	<td>Poste de charge dotations amortissement (d=C3=A9bit)</td>
-	<td><?=3D$p_deb->input()?></td>
-	<td><?=3D$deb_span->input()?></td>
+	<td><?php echo $p_deb->input()?></td>
+	<td><?php echo $deb_span->input()?></td>
 </tr>
 <tr>
 	<td>Poste amortissement en contrepartie</td>
-	<td><?=3D$p_cred->input();?></td>
-	<td><?=3D$cred_span->input();?></td>
+	<td><?php echo $p_cred->input();?></td>
+	<td><?php echo $cred_span->input();?></td>
 </tr>
 <tr>
 	<td>Nombre d'ann=C3=A9es amortissement</td>
-	<td><?=3D$p_number->input()?></td>
+	<td><?php echo $p_number->input()?></td>
 </tr>
 <tr>
 	<td></td>
@@ -47,7 +47,7 @@
 	<td></td>
 </tr>
 </table>
-<?
+<?php=20
 	echo HtmlInput::button('close','Annuler',"onclick=3D\"removeDiv('$t')\"=
");
 	echo HtmlInput::submit('sauver','Sauver',"onclick=3D\"return confirm('V=
ous confirmez ?')\" ");
 	echo HtmlInput::extension();

Modified: trunk/amortis/include/template/material_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/material_detail.php	2013-05-15 18:50:3=
8 UTC (rev 502)
+++ trunk/amortis/include/template/material_detail.php	2013-05-16 22:42:1=
1 UTC (rev 503)
@@ -1,44 +1,44 @@
 <h2 class=3D"info">Modification de mat=C3=A9riel</h2>
 <form onsubmit=3D"save_modify(this);return false">
-<?=3D$p_card?>
-<?=3D$a_id?>
-<span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  ><?=3D $card->strAttribut(ATTR_DEF_NAME)?></span>
+<?php echo $p_card?>
+<?php echo $a_id?>
+<span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  ><?php echo  $card->strAttribut(ATTR_DEF_NAME)?></span>
 <table>
 <tr>
 	<td>Fiche</td>
-	<td><?=3DHtmlInput::card_detail($card->strAttribut(ATTR_DEF_QUICKCODE))=
?></td>
+	<td><?php echo HtmlInput::card_detail($card->strAttribut(ATTR_DEF_QUICK=
CODE))?></td>
 </tr>
=20
 <tr>
 	<td>Date Acquisition</td>
-	<td><?=3D$p_date->input()?></td>
+	<td><?php echo $p_date->input()?></td>
 </tr>
 <tr>
 	<td>Montant =C3=A0 amortir</td>
-	<td><?=3D$p_amount->input()?></td>
+	<td><?php echo $p_amount->input()?></td>
 </tr>
=20
 <tr>
 	<td>Ann=C3=A9e comptable d'achat</td>
-	<td> <? echo $p_year->input();?></td>
+	<td> <?php echo $p_year->input();?></td>
 </tr>
 <tr>
 	<td>Poste de charge dotations amortissement (d=C3=A9bit)</td>
-	<td><?=3D$p_deb->input()?></td>
-	<td><?=3D$deb_span->input()?></td>
+	<td><?php echo $p_deb->input()?></td>
+	<td><?php echo $deb_span->input()?></td>
 </tr>
 <tr>
 	<td>Poste amortissement en contrepartie</td>
-	<td><?=3D$p_cred->input();?></td>
-	<td><?=3D$cred_span->input();?></td>
+	<td><?php echo $p_cred->input();?></td>
+	<td><?php echo $cred_span->input();?></td>
 </tr>
 <tr>
 	<td>Nombre d'ann=C3=A9es amortissement (non modifiable)</td>
-	<td><? echo $p_number->input()?></td>
+	<td><?php echo $p_number->input()?></td>
 </tr>
 <tr>
 	<td>Visible <span class=3D"notice">Y pour oui ou N pour non</span></td>
-	<td><? echo $p_visible->input();?></td>
+	<td><?php echo $p_visible->input();?></td>
 </tr>
 <tr>
 	<td> </td>
@@ -61,7 +61,7 @@
=20
 <th>Pourcent</th>
=20
-<?
+<?php=20
 bcscale(2);
 echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
 echo dossier::hidden();
@@ -72,11 +72,11 @@
 	       $pct->value=3D$array[$i]->ad_percentage;
 ?>
 <tr>
-	<td><?=3DHtmlInput::hidden('ad_year[]',$array[$i]->ad_year)?>
-	  <?=3D$array[$i]->ad_year?>
+	<td><?php echo HtmlInput::hidden('ad_year[]',$array[$i]->ad_year)?>
+	  <?php echo $array[$i]->ad_year?>
 	</td>
 	<td>
-	<?
+	<?php=20
 	echo HtmlInput::hidden("ad_id[]",$array[$i]->ad_id);
 	$amount=3Dnew INum("amount[]");
 	$amount->value=3D$array[$i]->ad_amount;
@@ -84,7 +84,7 @@
         ?>
=20
 </td>
-	<?
+	<?php=20
 	$annuite=3Dbcadd($annuite,$array[$i]->ad_amount);
=20
 	$x=3D$cn->get_array('select ha_id,h_pj,jr_internal,h_amount from amorti=
ssement.amortissement_histo where a_id=3D$1 and h_year=3D$2',
@@ -114,15 +114,15 @@
 </tr>
=20
=20
-<?
+<?php=20
 endfor;
 ?>
 </table>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Total =3D <?=3Dnbm($annuite)?></span>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Amorti =3D <?=3Dnbm($done)?></span>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Reste =3D <?=3Dnbm($p_amount->value-$done)?>=
</span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Total =3D <?php echo nbm($annuite)?></span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Amorti =3D <?php echo nbm($done)?></span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Reste =3D <?php echo nbm($p_amount->value-$d=
one)?></span>
=20
-<?
+<?php=20
 if ( $annuite !=3D  $p_amount->value)
  {
  	echo '<h2 class=3D"error">Diff=C3=A9rence entre le montant =C3=A0 amor=
tir et le montant amorti =3D';
@@ -131,7 +131,7 @@
  }
  ?>
 </fieldset>
-<?
+<?php=20
    echo HtmlInput::submit('sauver','Sauver',"onclick=3D\"return confirm(=
'Vous confirmez ?')\" ");
    $rm=3Dsprintf("remove_mat(%d,'%s',%d)",dossier::id(),$_REQUEST['plugi=
n_code'],$value_a_id);
    echo HtmlInput::button('remove','Effacer',"onclick=3D\"$rm\" ");

Modified: trunk/amortis/include/template/material_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/material_display.php	2013-05-15 18:50:=
38 UTC (rev 502)
+++ trunk/amortis/include/template/material_display.php	2013-05-16 22:42:=
11 UTC (rev 503)
@@ -1,38 +1,38 @@
 <h2 class=3D"info">D=C3=A9tail de mat=C3=A9riel</h2>
-<span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  ><?=3D $card->strAttribut(ATTR_DEF_NAME)?></span>
+<span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  ><?php echo  $card->strAttribut(ATTR_DEF_NAME)?></span>
 <table>
 <tr>
 	<td>Fiche</td>
-	<td><?=3D$card->strAttribut(ATTR_DEF_QUICKCODE)?></td>
+	<td><?php echo $card->strAttribut(ATTR_DEF_QUICKCODE)?></td>
 </tr>
=20
 <tr>
 	<td>Date d'acquisition</td>
-	<td><?=3D$p_date?></td>
+	<td><?php echo $p_date?></td>
 </tr>
=20
 <tr>
 	<td>Montant =C3=A0 amortir</td>
-	<td><?=3D$p_amount?></td>
+	<td><?php echo $p_amount?></td>
 </tr>
=20
 <tr>
 	<td>Ann=C3=A9e comptable d'achat</td>
-	<td> <? echo $p_year;?></td>
+	<td> <?php echo $p_year;?></td>
 </tr>
 <tr>
 	<td>Poste de charge dotations amortissement (d=C3=A9bit)</td>
-	<td><?=3D$p_deb?></td>
-	<td><?=3D$deb_span?></td>
+	<td><?php echo $p_deb?></td>
+	<td><?php echo $deb_span?></td>
 </tr>
 <tr>
 	<td>Poste amortissement en contrepartie</td>
-	<td><?=3D$p_cred?></td>
-	<td><?=3D$cred_span?></td>
+	<td><?php echo $p_cred?></td>
+	<td><?php echo $cred_span?></td>
 </tr>
 <tr>
 	<td>Nombre d'ann=C3=A9es amortissement (non modifiable)</td>
-	<td><? echo $p_number?></td>
+	<td><?php echo $p_number?></td>
 </tr>
 </table>
=20
@@ -47,7 +47,7 @@
=20
 <th>Pourcent</th>
=20
-<?
+<?php=20
 bcscale(2);
 $annuite=3D0;
 $done=3D0;
@@ -55,15 +55,15 @@
 ?>
 <tr>
 	<td>
-	  <?=3D$array[$i]->ad_year?>
+	  <?php echo $array[$i]->ad_year?>
 	</td>
 	<td>
-	<?
+	<?php=20
 	echo nbm($array[$i]->ad_amount);
         ?>
=20
 </td>
-	<?
+	<?php=20
 	$annuite=3Dbcadd($annuite,$array[$i]->ad_amount);
=20
 	$x=3D$cn->get_array('select ha_id,h_pj,jr_internal,h_amount from amorti=
ssement.amortissement_histo where a_id=3D$1 and h_year=3D$2',
@@ -88,15 +88,15 @@
 </tr>
=20
=20
-<?
+<?php=20
 endfor;
 ?>
 </table>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Total =3D <?=3Dnbm($annuite)?></span>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Amorti =3D <?=3Dnbm($done)?></span>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Reste =3D <?=3Dnbm($p_amount-$done)?></span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Total =3D <?php echo nbm($annuite)?></span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Amorti =3D <?php echo nbm($done)?></span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Reste =3D <?php echo nbm($p_amount-$done)?><=
/span>
=20
-<?
+<?php=20
 if ( $annuite !=3D  $p_amount)
  {
  	echo '<h2 class=3D"error">Diff=C3=A9rence entre le montant =C3=A0 amor=
tir et le montant amorti =3D';
@@ -105,6 +105,6 @@
  }
  ?>
 </fieldset>
-<? echo "Date ".date ('d.m.Y');?>
-<? echo HtmlInput::print_window()?>
+<?php echo "Date ".date ('d.m.Y');?>
+<?php echo HtmlInput::print_window()?>
=20

Modified: trunk/amortis/include/template/material_listing.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/material_listing.php	2013-05-15 18:50:=
38 UTC (rev 502)
+++ trunk/amortis/include/template/material_listing.php	2013-05-16 22:42:=
11 UTC (rev 503)
@@ -16,7 +16,7 @@
=20
 </tr>
=20
-<?
+<?php=20
 bcscale(2);
 for ($i =3D0 ;$i < count($ret);$i++) :
=20
@@ -26,7 +26,7 @@
         $detail=3Ddetail_material($ret[$i]->f_id,$fiche->strAttribut(ATT=
R_DEF_QUICKCODE));
         echo td($detail);
 	echo td($fiche->strAttribut(ATTR_DEF_NAME));
-	// <td sorttable_customkey=3D"<?=3D$row_bank['b_date']
+	// <td sorttable_customkey=3D"<?php echo $row_bank['b_date']
 	echo '<td sorttable_customkey=3D"'.$ret[$i]->a_date.'">'.format_date($r=
et[$i]->a_date).'</td>';
 	echo td($ret[$i]->a_start);
         echo td(nbm($ret[$i]->a_amount),'style=3D"text-align:right"');

Modified: trunk/amortis/include/template/util_generate.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/util_generate.php	2013-05-15 18:50:38 =
UTC (rev 502)
+++ trunk/amortis/include/template/util_generate.php	2013-05-16 22:42:11 =
UTC (rev 503)
@@ -25,37 +25,37 @@
  */
  ?>
 <form id=3D"gen_amort" method=3D"post">
-<?=3DHtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);?>
-<?=3DHtmlInput::hidden('sa',$_REQUEST['sa']);?>
-<?=3DHtmlInput::hidden('sb',$_REQUEST['sb']);?>
-<?=3Ddossier::hidden()?>
+<?php echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);?>
+<?php echo HtmlInput::hidden('sa',$_REQUEST['sa']);?>
+<?php echo HtmlInput::hidden('sb',$_REQUEST['sb']);?>
+<?php echo dossier::hidden()?>
=20
 <table>
 <tr>
 <td>Ann=C3=A9e</td>
-<td><?=3D$year->input();?></td>
+<td><?php echo $year->input();?></td>
 </tr>
 <tr>
 <td>Journal dans lequel l'=C3=A9criture sera pass=C3=A9e</td>
-<td><?=3D$sel_ledger->input()?></td>
+<td><?php echo $sel_ledger->input()?></td>
 </tr>
 <tr>
 <td>Date de l'op=C3=A9ration</td>
-<td><?=3D$p_date->input()?></td>
+<td><?php echo $p_date->input()?></td>
 </tr>
-<? if ( isset ($f_periode)) : ?>
+<?php if ( isset ($f_periode)) : ?>
 <tr>
 	<td>
-		<?=3D$f_periode?>
+		<?php echo $f_periode?>
 	</td>
 	<td>
-		 <?=3D$l_form_per?>
+		 <?php echo $l_form_per?>
 	</td>
 </tr>
-<? endif; ?>
+<?php endif; ?>
 <tr>
 <td>Pi=C3=A8ce</td>
-<td><?=3D$pj->input()?></td>
+<td><?php echo $pj->input()?></td>
 </tr>
 </table>
=20
@@ -67,7 +67,7 @@
 	<th>Nom</th>
 	<th>Description</th>
 </tr>
-<?
+<?php=20
 /*
  * get all the material
  */
@@ -80,22 +80,22 @@
=20
 ?>
 <tr>
-<?
+<?php=20
 if ( isset($_POST['p_ck'.$i])) $ck->selected=3Dtrue;else $ck->selected=3D=
false;
 $view_history=3D sprintf('<A class=3D"detail" style=3D"text-decoration:u=
nderline" HREF=3D"javascript:view_history_card(\'%s\',\'%s\')" >%s</A>',
                         $fiche->id, dossier::id(), $fiche->get_quick_cod=
e());
 ?>
-	<td><?=3D$ck->input()?></td>
-	<td><?=3D$view_history?></td>
-	<td><?=3D$fiche->strAttribut(ATTR_DEF_NAME)?></td>
-	<td>	<?=3D$fiche->strAttribut(9)?></td>
+	<td><?php echo $ck->input()?></td>
+	<td><?php echo $view_history?></td>
+	<td><?php echo $fiche->strAttribut(ATTR_DEF_NAME)?></td>
+	<td>	<?php echo $fiche->strAttribut(9)?></td>
 	<td></td>
 </tr>
-<?
+<?php=20
 endfor;
 ?>
 </table>
-<?=3DHtmlInput::submit('generate',"G=C3=A9n=C3=A9rer l'=C3=A9criture");?=
>
+<?php echo HtmlInput::submit('generate',"G=C3=A9n=C3=A9rer l'=C3=A9critu=
re");?>
 </form>
-<?=3DHtmlInput::button('check_all','S=C3=A9lectionner tout',' onclick=3D=
"select_checkbox(\'gen_amort\')"');?>
-<?=3DHtmlInput::button('check_none','Tout D=C3=A9s=C3=A9lectionner ',' o=
nclick=3D"unselect_checkbox(\'gen_amort\')"');?>
+<?php echo HtmlInput::button('check_all','S=C3=A9lectionner tout',' oncl=
ick=3D"select_checkbox(\'gen_amort\')"');?>
+<?php echo HtmlInput::button('check_none','Tout D=C3=A9s=C3=A9lectionner=
 ',' onclick=3D"unselect_checkbox(\'gen_amort\')"');?>

Modified: trunk/backup_noadmin/include/template/home.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/backup_noadmin/include/template/home.php	2013-05-15 18:50:38 UT=
C (rev 502)
+++ trunk/backup_noadmin/include/template/home.php	2013-05-16 22:42:11 UT=
C (rev 503)
@@ -1,8 +1,8 @@
 <h2> Backup du dossier courant </h2>
 <form method=3D"get" ACTION=3D"extension.raw.php">
 Voulez-vous avoir une copie de ce dossier
-<?=3DHtmlInput::submit('backup','backup')?>
-<?=3Ddossier::hidden()?>
-<?=3DHtmlInput::extension();?>
-<?=3DHtmlInput::hidden('ac',$_REQUEST['ac']);?>
+<?php echo HtmlInput::submit('backup','backup')?>
+<?php echo dossier::hidden()?>
+<?php echo HtmlInput::extension();?>
+<?php echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
 </form>
\ No newline at end of file

Modified: trunk/coprop/coprop-constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/coprop-constant.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/coprop/coprop-constant.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 /**
  *@file
  *Contains all the needed variable for the plugin

Modified: trunk/coprop/include/copro-parameter.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/copro-parameter.inc.php	2013-05-15 18:50:38 UTC =
(rev 502)
+++ trunk/coprop/include/copro-parameter.inc.php	2013-05-16 22:42:11 UTC =
(rev 503)
@@ -85,7 +85,7 @@
 			Cat=C3=A9gorie de fiches pour les immeubles
 		</td>
 		<td>
-			<?=3D$categorie_immeuble->input()?>
+			<?php echo $categorie_immeuble->input()?>
 		</td>
 	</tr>
 		<tr>
@@ -93,7 +93,7 @@
 			Cat=C3=A9gorie de fiches pour les copropri=C3=A9taires
 		</td>
 		<td>
-			<?=3D$cat_coprop->input();?>
+			<?php echo $cat_coprop->input();?>
 		</td>
 	</tr>
 	<tr>
@@ -101,7 +101,7 @@
 			Cat=C3=A9gorie de fiches pour les lots
 		</td>
 		<td>
-			<?=3D$cat_lot->input()?>
+			<?php echo $cat_lot->input()?>
 		</td>
 	</tr>
 		<tr>
@@ -109,7 +109,7 @@
 			Cat=C3=A9gorie de fiches pour les appels de fond
 		</td>
 		<td>
-			<?=3D$categorie_appel->input();?>
+			<?php echo $categorie_appel->input();?>
 		</td>
 	</tr>
 		<tr>
@@ -117,7 +117,7 @@
 			Cat=C3=A9gorie de fiches pour les charges
 		</td>
 		<td>
-			<?=3D$categorie_charge->input();?>
+			<?php echo $categorie_charge->input();?>
 		</td>
 	</tr>
 	<tr>
@@ -125,9 +125,9 @@
 			Journal Appel de fond
 		</td>
 		<td>
-			<?=3D$journal_appel->input();?>
+			<?php echo $journal_appel->input();?>
 		</td>
 	</tr>
 </table>
-	<?=3DHtmlInput::submit("save","Sauver")?>
+	<?php echo HtmlInput::submit("save","Sauver")?>
 </form>
\ No newline at end of file

Modified: trunk/coprop/include/key.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/key.inc.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/coprop/include/key.inc.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -77,37 +77,37 @@
=20
                 </th>
 	</tr>
-<?
+<?php=20
 for ($i=3D0;$i < count($a_key);$i++):
 	$js=3Dsprintf("mod_key('%s','%s','%s','%s')",$gDossier,$_REQUEST['plugi=
n_code'],$_REQUEST['ac'],$a_key[$i]['cr_id']);
 	$mod_key=3DHtmlInput::anchor($a_key[$i]['cr_name'],"","onclick=3D\"$js\=
"");
 ?>
-	<tr id=3D"row<?=3D$a_key[$i]['cr_id']?>">
+	<tr id=3D"row<?php echo $a_key[$i]['cr_id']?>">
 		<td>
-			<?=3D$mod_key?>
+			<?php echo $mod_key?>
 		</td>
 		<td>
-			<?=3Dh($a_key[$i]['cr_note'])?>
+			<?php echo h($a_key[$i]['cr_note'])?>
 		</td>
                 <td class=3D"num">
-                    <?=3Dnbm($a_key[$i]['cr_tantieme'])?>
+                    <?php echo nbm($a_key[$i]['cr_tantieme'])?>
                 </td>
                 <td class=3D"num">
-                    <?=3Dnbm($a_key[$i]['delta'])?>
+                    <?php echo nbm($a_key[$i]['delta'])?>
                 </td>
-		<td id=3D"col<?=3D$a_key[$i]['cr_id']?>">
-                    <?
+		<td id=3D"col<?php echo $a_key[$i]['cr_id']?>">
+                    <?php=20
                     $js=3D"onclick=3Dremove_key('".$_REQUEST['plugin_cod=
e']."','".$_REQUEST['ac']."','".$_REQUEST['gDossier']."','".$a_key[$i]['c=
r_id']."')";
 			echo HtmlInput::anchor("enlever","",$js);
                         ?>
                 </td>
=20
 	</tr>
-<?
+<?php=20
 endfor;
 ?>
 </table>
-	<? $js=3Dsprintf("add_key('%s','%s','%s')",$gDossier,$_REQUEST['plugin_=
code'],$_REQUEST['ac']);
+	<?php $js=3Dsprintf("add_key('%s','%s','%s')",$gDossier,$_REQUEST['plug=
in_code'],$_REQUEST['ac']);
  echo HtmlInput::button("add_key","Ajout clef","onclick=3D\"$js\"");
 	?>
  </div>

Modified: trunk/coprop/include/template/appel_fond.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/template/appel_fond.php	2013-05-15 18:50:38 UTC =
(rev 502)
+++ trunk/coprop/include/template/appel_fond.php	2013-05-16 22:42:11 UTC =
(rev 503)
@@ -32,24 +32,24 @@
 			Date de l'op=C3=A9ration
 		</td>
 		<td>
-			<?=3D$date->input()?>
+			<?php echo $date->input()?>
 		</td>
 	</tr>
 		<td>Journal pour l'appel de fond</td>
 		<td>
-			<?=3D$led_appel_fond->input()?>
+			<?php echo $led_appel_fond->input()?>
 		</td>
         </tr>
         <tr>
             <td> Fiche pour l'appel</td>
            =20
-            <td><?=3D$f_categorie_appel_bt?><?=3D$categorie_appel->input=
()?></td>
-		<td><?=3D$f_categorie_appel_label?></td>
-		<td><?=3D$str_add_appel?></td>
+            <td><?php echo $f_categorie_appel_bt?><?php echo $categorie_=
appel->input()?></td>
+		<td><?php echo $f_categorie_appel_label?></td>
+		<td><?php echo $str_add_appel?></td>
 	</tr>
=20
 </table>
-appel de fond par <?=3D$appel_fond_type->input()?>
+appel de fond par <?php echo $appel_fond_type->input()?>
 <div style=3D"margin-left:150px">
 <table id=3D"appel_fond_budget">
         	<tr >
@@ -58,7 +58,7 @@
 			Budget =C3=A0 utiliser
 		</td>
 		<td>
-			<?=3D$budget_sel->input()?>
+			<?php echo $budget_sel->input()?>
 		</td>
         </tr>
         <tr>
@@ -66,7 +66,7 @@
 			Pourcentage du budget
 		</td>
 		<td>
-			<?=3D$budget_pct->input()?>
+			<?php echo $budget_pct->input()?>
 		</td>
 	</tr>
 </table>
@@ -77,7 +77,7 @@
 			Montant =C3=A0 r=C3=A9partir
 		</td>
 		<td>
-			<?=3D$amount->input()?>
+			<?php echo $amount->input()?>
 		</td>
         </tr>
         <tr>
@@ -85,7 +85,7 @@
 			Clef de r=C3=A9partiton =C3=A0 utiliser
 		</td>
 		<td>
-			<?=3D$key->input()?>
+			<?php echo $key->input()?>
 		</td>
 	</tr>
=20

Modified: trunk/coprop/include/template/bud_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/template/bud_detail.php	2013-05-15 18:50:38 UTC =
(rev 502)
+++ trunk/coprop/include/template/bud_detail.php	2013-05-16 22:42:11 UTC =
(rev 503)
@@ -14,30 +14,30 @@
         <th>Clef de r=C3=A9partition </th>
         <th>Montant</th>
     </tr>
-<? for ($i=3D0;$i < count($a_input);$i++):?>
+<?php for ($i=3D0;$i < count($a_input);$i++):?>
     <tr>
         <td>
-            <?=3D$a_input[$i]['card']?>
+            <?php echo $a_input[$i]['card']?>
         </td>
         <td>
-            <?=3D$a_input[$i]['card_label']?>
+            <?php echo $a_input[$i]['card_label']?>
         </td>
         <td>
-            <?=3D$a_input[$i]['key']?>
+            <?php echo $a_input[$i]['key']?>
=20
         </td>
=20
         <td>
-            <?=3D$a_input[$i]['amount']?>
+            <?php echo $a_input[$i]['amount']?>
=20
         </td>
     </tr>
=20
-<? endfor?>
+<?php endfor?>
=20
 </table>
 <p>
-	Total <span id=3D"sbud_total"><?=3Dnbm($bud_amount)?></span>
+	Total <span id=3D"sbud_total"><?php echo nbm($bud_amount)?></span>
 </p>
 <p>
 Diff=C3=A9rence <span id=3D"span_diff"></span>

Modified: trunk/coprop/include/template/budget.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/template/budget.php	2013-05-15 18:50:38 UTC (rev=
 502)
+++ trunk/coprop/include/template/budget.php	2013-05-16 22:42:11 UTC (rev=
 503)
@@ -34,7 +34,7 @@
 			Nom
 		</td>
 		<td>
-			<?=3D$name->input()?>
+			<?php echo $name->input()?>
 		</td
 	</tr>
 	<tr>
@@ -42,7 +42,7 @@
 			Exercice
 		</td>
 		<td>
-			<?=3D$exercice->input()?>
+			<?php echo $exercice->input()?>
 		</td>
 	</tr>
 	<tr>
@@ -50,7 +50,7 @@
 			Type de budget
 		</td>
 		<td>
-			<?=3D$type->input()?>
+			<?php echo $type->input()?>
 		</td>
 	</tr>
 	<tr>
@@ -58,7 +58,7 @@
 		Montant
 		</td>
 		<td>
-			<?=3D$amount->input()?>
+			<?php echo $amount->input()?>
 		</td>
=20
 	</tr>

Modified: trunk/coprop/include/template/budget_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/template/budget_list.php	2013-05-15 18:50:38 UTC=
 (rev 502)
+++ trunk/coprop/include/template/budget_list.php	2013-05-16 22:42:11 UTC=
 (rev 503)
@@ -12,7 +12,7 @@
         <th> Type de budget </th>
         <th style=3D"text-align: right"> Montant </th>
     </tr>
-<?
+<?php=20
 for ($i=3D0;$i<count($array);$i++):
     $class=3D($i%2=3D=3D0)?' class=3D"evend" ':' class=3D"odd" ';
     $str_js=3Dsprintf(" onclick=3D\"budget_detail('%s','%s','%s','%s'); =
 \"",
@@ -22,27 +22,27 @@
             $_REQUEST['plugin_code'],$_REQUEST['ac'],$_REQUEST['gDossier=
'],$array[$i]['b_id']);
     $js_del=3DHtmlInput::anchor("Effacer","",$str_js_del);
 ?>
-    <tr id=3D"row<?=3D$array[$i]['b_id']?>" <?=3D$class?> >
+    <tr id=3D"row<?php echo $array[$i]['b_id']?>" <?php echo $class?> >
         <td>
-            <?=3D$array[$i]['b_name']?>
+            <?php echo $array[$i]['b_name']?>
         </td>
          <td>
-            <?=3D$array[$i]['b_exercice']?>
+            <?php echo $array[$i]['b_exercice']?>
         </td>
         <td>
-            <?=3D$array[$i]['str_type']?>
+            <?php echo $array[$i]['str_type']?>
         </td>
         <td CLASS=3D"num">
-            <?=3Dnbm($array[$i]['b_amount'])?>
+            <?php echo nbm($array[$i]['b_amount'])?>
         </td>
-        <td  id=3D"col1<?=3D$array[$i]['b_id']?>">
-            <?=3D$js?>
+        <td  id=3D"col1<?php echo $array[$i]['b_id']?>">
+            <?php echo $js?>
         </td>
-        <td  id=3D"col2<?=3D$array[$i]['b_id']?>">
-            <?=3D$js_del?>
+        <td  id=3D"col2<?php echo $array[$i]['b_id']?>">
+            <?php echo $js_del?>
         </td>
     </tr>
-<?
+<?php=20
 endfor;
 ?>
=20

Modified: trunk/coprop/include/template/coprop_lot_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/template/coprop_lot_list.php	2013-05-15 18:50:38=
 UTC (rev 502)
+++ trunk/coprop/include/template/coprop_lot_list.php	2013-05-16 22:42:11=
 UTC (rev 503)
@@ -29,10 +29,10 @@
 $gDossier=3DDossier::id();
 ?>
 <h1 class=3D"title">Lots affect=C3=A9s</h1>
-<? for ( $i=3D0;$i<count($a_immeuble);$i++):?>
-<h2 class=3D"title">Immeuble : <?=3DHtmlInput::card_detail($a_immeuble[$=
i]['quick_code'],$a_immeuble[$i]['vw_name'],' style=3D"display:inline;tex=
t-decoration:underline"')?></h2>
+<?php for ( $i=3D0;$i<count($a_immeuble);$i++):?>
+<h2 class=3D"title">Immeuble : <?php echo HtmlInput::card_detail($a_imme=
uble[$i]['quick_code'],$a_immeuble[$i]['vw_name'],' style=3D"display:inli=
ne;text-decoration:underline"')?></h2>
=20
-<?
+<?php=20
 $ret_coprop=3D$cn->execute("coprop",array($a_immeuble[$i]['f_id']));
 $max_coprop=3DDatabase::num_row($ret_coprop);
 if ($max_coprop=3D=3D0)
@@ -42,13 +42,13 @@
 }
 ?>
 <ul style=3D"list-style-type: none;margin-top:10px;margin-bottom:10px;">
-<?for ($e=3D0;$e<$max_coprop;$e++):
+<?php for ($e=3D0;$e<$max_coprop;$e++):
     $r=3DDatabase::fetch_array($ret_coprop,$e);
     ?>
 <li style=3D"margin-top:4px;margin-bottom:4px;">
-Copropri=C3=A9taire : <?=3DHtmlInput::card_detail($r['copro_qcode'],'','=
 style=3D"display:inline;text-decoration:underline"').' '.h($r['copro_nam=
e']." ".$r['copro_first_name'])?>
+Copropri=C3=A9taire : <?php echo HtmlInput::card_detail($r['copro_qcode'=
],'',' style=3D"display:inline;text-decoration:underline"').' '.h($r['cop=
ro_name']." ".$r['copro_first_name'])?>
 </li>
-    <?
+    <?php=20
     $ret_lot=3D$cn->execute("lot",array($a_immeuble[$i]['f_id'],$r['copr=
op_id']));
    $max_lot=3DDatabase::num_row($ret_lot);
     if ($max_lot=3D=3D0)
@@ -58,20 +58,20 @@
     }
     ?>
     <ul>
-    <?for ($l=3D0;$l<$max_lot;$l++):
+    <?php for ($l=3D0;$l<$max_lot;$l++):
     $s=3DDatabase::fetch_array($ret_lot,$l);
     ?>
-       <li style=3D"list-style-type: square;margin-top:2px;margin-bottom=
:2px;">Lot : <?=3DHtmlInput::card_detail($s['lot_qcode'],'',' style=3D"di=
splay:inline;text-decoration:underline"')." ".h($s['lot_name']." ".$s['lo=
t_desc'])?></li>
-    <? endfor;?>
+       <li style=3D"list-style-type: square;margin-top:2px;margin-bottom=
:2px;">Lot : <?php echo HtmlInput::card_detail($s['lot_qcode'],'',' style=
=3D"display:inline;text-decoration:underline"')." ".h($s['lot_name']." ".=
$s['lot_desc'])?></li>
+    <?php endfor;?>
     </ul>
-    <? endfor;?>
+    <?php endfor;?>
 </ul>
=20
-<? endfor; ?>
+<?php endfor; ?>
=20
 <h1 class=3D"title">Lot sans immeuble ou sans copropri=C3=A9taires</h1>
 <ul>
-<? for($e=3D0;$e<count($a_undef_lot);$e++):?>
-      <li><?=3DHtmlInput::card_detail($a_undef_lot[$e]['lot_qcode'],'','=
 style=3D"display:inline;text-decoration:underline"')." ".h($a_undef_lot[=
$e]['lot_name']." ".$a_undef_lot[$e]['lot_desc'])?></li>
-<? endfor; ?>
+<?php for($e=3D0;$e<count($a_undef_lot);$e++):?>
+      <li><?php echo HtmlInput::card_detail($a_undef_lot[$e]['lot_qcode'=
],'',' style=3D"display:inline;text-decoration:underline"')." ".h($a_unde=
f_lot[$e]['lot_name']." ".$a_undef_lot[$e]['lot_desc'])?></li>
+<?php endfor; ?>
 </ul>

Modified: trunk/coprop/include/template/historic.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/template/historic.php	2013-05-15 18:50:38 UTC (r=
ev 502)
+++ trunk/coprop/include/template/historic.php	2013-05-16 22:42:11 UTC (r=
ev 503)
@@ -53,30 +53,30 @@
 		</th>
=20
 	</tr>
-<? for ($i=3D0;$i<count($array);$i++): ?>
+<?php for ($i=3D0;$i<count($array);$i++): ?>
 	<tr>
 		<td>
-			<?=3D$array[$i]['str_date']?>
+			<?php echo $array[$i]['str_date']?>
 		</td>
 		<td>
-			<?=3D$array[$i]['b_name']?>
+			<?php echo $array[$i]['b_name']?>
 		</td>
 		<td>
-			<?=3D$array[$i]['cr_name']?>
+			<?php echo $array[$i]['cr_name']?>
 		</td>
 		<td>
-			<?=3Dnb($array[$i]['af_amount'])?>
+			<?php echo nb($array[$i]['af_amount'])?>
 		</td>
 		<td>
-			<?=3DHtmlInput::detail_op($array[$i]['jr_id'], $array[$i]['jr_interna=
l'])?>
+			<?php echo HtmlInput::detail_op($array[$i]['jr_id'], $array[$i]['jr_i=
nternal'])?>
 		</td>
 		<td>
-			<?=3D$array[$i]['af_percent']?>
+			<?php echo $array[$i]['af_percent']?>
 		</td>
 		<td>
-			<?=3D$array[$i]['b_exercice']?>
+			<?php echo $array[$i]['b_exercice']?>
 		</td>
 	</tr>
-<? endfor; ?>
+<?php endfor; ?>
=20
 </table>
\ No newline at end of file

Modified: trunk/coprop/include/template/key_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/template/key_detail.php	2013-05-15 18:50:38 UTC =
(rev 502)
+++ trunk/coprop/include/template/key_detail.php	2013-05-16 22:42:11 UTC =
(rev 503)
@@ -28,8 +28,8 @@
  */
 ?>
 <div class=3D"content" style=3D"margin-left: 20px">
-	<?=3DHtmlInput::button('rlist','Retour liste',' onclick=3D"$(\'key_list=
\').show();$(\'keydetail_div\').hide()"')?>
-<h1><?=3D$str_message?></h1>
+	<?php echo HtmlInput::button('rlist','Retour liste',' onclick=3D"$(\'ke=
y_list\').show();$(\'keydetail_div\').hide()"')?>
+<h1><?php echo $str_message?></h1>
=20
=20
 <h2> Caract=C3=A9ristique</h2>
@@ -40,7 +40,7 @@
                         Nom
 		</td>
 		<td>
-			<?=3D$name->input()?>
+			<?php echo $name->input()?>
 		</td>
         </tr>
         <tr>
@@ -48,13 +48,13 @@
                 Total tanti=C3=A8me
             </td>
                 <td>
-                    <?=3D$tantieme->input()?>
+                    <?php echo $tantieme->input()?>
                 </td>
 	</tr>
=20
 </table>
 Description
-<?=3D$note->input()?>
+<?php echo $note->input()?>
 <h2>D=C3=A9tail des lots</h2>
 <table class=3D"result">
 	<tr>
@@ -65,23 +65,23 @@
 		<th>B=C3=A2timent</th>
 		<th>Montant</th>
 	</tr>
-<?
+<?php=20
 	for ($i=3D0;$i<count($alot);$i++):
 		if ( $alot[$i]['qcode'] =3D=3D "" ) continue;
 ?>
 	<tr>
 		<td>
-			<?=3DHtmlInput::card_detail($alot[$i]['qcode'],$alot[$i]['qcode'],' c=
lass=3D"line"')?>
-			<?=3DHtmlInput::hidden('f_id[]',$alot[$i]['f_id'])?>
+			<?php echo HtmlInput::card_detail($alot[$i]['qcode'],$alot[$i]['qcode=
'],' class=3D"line"')?>
+			<?php echo HtmlInput::hidden('f_id[]',$alot[$i]['f_id'])?>
 		</td>
 		<td>
-			<?=3D$alot[$i]['name']?>
+			<?php echo $alot[$i]['name']?>
 		</td>
                 <td>
-                    <?=3D$alot[$i]['desc']?>
+                    <?php echo $alot[$i]['desc']?>
                 </td>
 				<td>
-					<?
+					<?php=20
 						$copro=3D$cn->get_value ("select ad_value
 							from fiche_Detail
 							where ad_id=3D1
@@ -90,7 +90,7 @@
 					?>
 				</td>
 				<td>
-					<?
+					<?php=20
 						$batiment=3D$cn->get_value ("select ad_value
 							from fiche_Detail
 							where ad_id=3D1
@@ -99,7 +99,7 @@
 					?>
 				</td>
 		<td>
-			<?
+			<?php=20
 			$num=3Dnew INum('part'.$alot[$i]['f_id']);
 			$num->javascript=3D'onchange=3D"format_number(this,0);compute_key();"=
';
 			$num->value=3Dround($alot[$i]['l_part'],0);
@@ -107,27 +107,27 @@
 			?>
 		</td>
 	</tr>
-<?
+<?php=20
 	endfor;
 ?>
 </table>
 <p>
-Total tanti=C3=A8mes : <span id=3D"span_tantieme"><?=3Dround($init_tanti=
eme)?></span>
+Total tanti=C3=A8mes : <span id=3D"span_tantieme"><?php echo round($init=
_tantieme)?></span>
 </p>
=20
 <p>
   Diff=C3=A9rence :
=20
-<?
+<?php=20
  bcscale(0);
 if ( bcsub ($init_tantieme,$tantieme->value) !=3D 0):
 ?>
-<span id=3D"span_diff" style=3D"color:red"><?=3Dbcsub ($init_tantieme,$t=
antieme->value)?></span>
-<?
+<span id=3D"span_diff" style=3D"color:red"><?php echo bcsub ($init_tanti=
eme,$tantieme->value)?></span>
+<?php=20
 else:
     ?>
-<span id=3D"span_diff" style=3D"color:green"><?=3Dbcsub ($init_tantieme,=
$tantieme->value)?></span>
-<?
+<span id=3D"span_diff" style=3D"color:green"><?php echo bcsub ($init_tan=
tieme,$tantieme->value)?></span>
+<?php=20
 endif;
 ?>
=20

Modified: trunk/import_card/include/template/input_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_card/include/template/input_file.php	2013-05-15 18:50:38=
 UTC (rev 502)
+++ trunk/import_card/include/template/input_file.php	2013-05-16 22:42:11=
 UTC (rev 503)
@@ -10,24 +10,24 @@
    Par d=C3=A9faut, correspond =C3=A0 un export CSV depuis Calc (OpenOff=
ice.org ou libreoffice);
 </p>
 <form method=3D"POST" enctype=3D"multipart/form-data">
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
-<td>D=C3=A9limiteur </td><TD> <? echo $delimiter->input()?></td>
+<td>D=C3=A9limiteur </td><TD> <?php echo $delimiter->input()?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><TD> <? echo $file->input()?></td>
+<td>Fichier =C3=A0 charger</td><TD> <?php echo $file->input()?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><TD> <? echo $fd->input();?></td>
+<td>Cat=C3=A9gorie de fiche</td><TD> <?php echo $fd->input();?></td>
 </tr>
 <tr>
-<td>Encodage unicode</td><TD> <? echo $encodage->input()?></td>
+<td>Encodage unicode</td><TD> <?php echo $encodage->input()?></td>
 </tr>
 <tr>
 <td>  Texte entour=C3=A9 du signe </td><TD><input type=3D"text" name=3D"=
rsurround" value=3D'"' size=3D"1"></td>
 </tr>
 </table>
-<? echo HtmlInput::submit('test_import','Valider');?>
+<?php echo HtmlInput::submit('test_import','Valider');?>
=20
 </form>

Modified: trunk/import_card/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_card/include/template/test_file.php	2013-05-15 18:50:38 =
UTC (rev 502)
+++ trunk/import_card/include/template/test_file.php	2013-05-16 22:42:11 =
UTC (rev 503)
@@ -9,26 +9,26 @@
 </p>
=20
 <form method=3D"POST" >
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
 <td>D=C3=A9limiteur </td>
-<td> <? echo $_POST['rdelimiter']?></td>
+<td> <?php echo $_POST['rdelimiter']?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><td> <? echo $_FILES['csv_file']['name']?=
></td>
+<td>Fichier =C3=A0 charger</td><td> <?php echo $_FILES['csv_file']['name=
']?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><td> <? echo $file_cat;?></td>
+<td>Cat=C3=A9gorie de fiche</td><td> <?php echo $file_cat;?></td>
 </tr>
 <tr>
-<td>Encodage </td><td> <? echo $encoding?></td>
+<td>Encodage </td><td> <?php echo $encoding?></td>
 </tr>
 <tr>
-<td>Texte entour=C3=A9 par</td><td> <? echo $_POST['rsurround'];?></td>
+<td>Texte entour=C3=A9 par</td><td> <?php echo $_POST['rsurround'];?></t=
d>
 </tr>
 </table>
-<?
+<?php=20
 foreach (array('rfichedef','rdelimiter','encodage') as $e)
 {
   if ( isset($_POST[$e])) echo HtmlInput::hidden($e,$_POST[$e]);
@@ -37,11 +37,11 @@
=20
  echo HtmlInput::submit('record_import','Valider');
 ?>
-<input type=3D"hidden" name=3D"rsurround" value=3D'<?=3D$_POST['rsurroun=
d']?>'>
+<input type=3D"hidden" name=3D"rsurround" value=3D'<?php echo $_POST['rs=
urround']?>'>
=20
=20
=20
-<?
+<?php=20
    global $cn;
    ob_start();
   /**

Modified: trunk/import_doli/include/template/input_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/include/template/input_file.php	2013-05-15 18:50:38=
 UTC (rev 502)
+++ trunk/import_doli/include/template/input_file.php	2013-05-16 22:42:11=
 UTC (rev 503)
@@ -10,24 +10,24 @@
    Par d=C3=A9faut, correspond =C3=A0 un export CSV depuis Calc (OpenOff=
ice.org ou libreoffice);
 </p>
 <form method=3D"POST" enctype=3D"multipart/form-data">
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
-<td>D=C3=A9limiteur </td><TD> <? echo $delimiter->input()?></td>
+<td>D=C3=A9limiteur </td><TD> <?php echo $delimiter->input()?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><TD> <? echo $file->input()?></td>
+<td>Fichier =C3=A0 charger</td><TD> <?php echo $file->input()?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><TD> <? echo $fd->input();?></td>
+<td>Cat=C3=A9gorie de fiche</td><TD> <?php echo $fd->input();?></td>
 </tr>
 <tr>
-<td>Encodage unicode</td><TD> <? echo $encodage->input()?></td>
+<td>Encodage unicode</td><TD> <?php echo $encodage->input()?></td>
 </tr>
 <tr>
 <td>  Texte entour=C3=A9 du signe </td><TD><input type=3D"text" name=3D"=
rsurround" value=3D'"' size=3D"1"></td>
 </tr>
 </table>
-<? echo HtmlInput::submit('test_import','Valider');?>
+<?php echo HtmlInput::submit('test_import','Valider');?>
=20
 </form>

Modified: trunk/import_doli/include/template/parameter.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/include/template/parameter.php	2013-05-15 18:50:38 =
UTC (rev 502)
+++ trunk/import_doli/include/template/parameter.php	2013-05-16 22:42:11 =
UTC (rev 503)
@@ -1,5 +1,5 @@
=20
-<?
+<?php=20
 	$bt=3Dnew IButton("but_tva_add");
 	$bt->label=3D"Ajout d'une correspondance";
 	$bt->javascript=3D" $('dtvaadd').show()";
@@ -9,7 +9,7 @@
 <table class=3D"result" style=3D"width:60%;margin-left:20%">
 	<tr>
 		<th>Fiche TVA</th>
-		<th>Taux correspondant <?=3DHtmlInput::infobulle(50)?></th>
+		<th>Taux correspondant <?php echo HtmlInput::infobulle(50)?></th>
 	</tr>
 	<?php
 	for ($i =3D 0; $i < count($atva); $i++):

Modified: trunk/import_doli/include/template/parameter_tva_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/include/template/parameter_tva_add.php	2013-05-15 1=
8:50:38 UTC (rev 502)
+++ trunk/import_doli/include/template/parameter_tva_add.php	2013-05-16 2=
2:42:11 UTC (rev 503)
@@ -36,21 +36,21 @@
 					TVA
 				</td>
 				<td>
-					<? $tva_id =3D new ITva_Popup('tva_id');
+					<?php $tva_id =3D new ITva_Popup('tva_id');
 					echo $tva_id->input()?>
 				</td>
 			</tr>
 			<tr>
 				<td>
-					Taux dans le fichier <?=3D HtmlInput::infobulle(50)?>
+					Taux dans le fichier <?php echo  HtmlInput::infobulle(50)?>
 				</td>
 				<td>
-					<? $w =3D new INum('pt_rate');echo $w->input();?>
+					<?php $w =3D new INum('pt_rate');echo $w->input();?>
 				</td>
 			</tr>
 		</table>
-		<?=3D HtmlInput::submit("ftvaadd", "Ajout");?>
-		<?
+		<?php echo  HtmlInput::submit("ftvaadd", "Ajout");?>
+		<?php=20
 		$bt =3D new IButton("but_tva_close");
 		$bt->label =3D "Fermer";
 		$bt->javascript =3D " $('dtvaadd').hide()";

Modified: trunk/import_doli/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/include/template/test_file.php	2013-05-15 18:50:38 =
UTC (rev 502)
+++ trunk/import_doli/include/template/test_file.php	2013-05-16 22:42:11 =
UTC (rev 503)
@@ -9,26 +9,26 @@
 </p>
=20
 <form method=3D"POST" >
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
 <td>D=C3=A9limiteur </td>
-<td> <? echo $_POST['rdelimiter']?></td>
+<td> <?php echo $_POST['rdelimiter']?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><td> <? echo $_FILES['csv_file']['name']?=
></td>
+<td>Fichier =C3=A0 charger</td><td> <?php echo $_FILES['csv_file']['name=
']?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><td> <? echo $file_cat;?></td>
+<td>Cat=C3=A9gorie de fiche</td><td> <?php echo $file_cat;?></td>
 </tr>
 <tr>
-<td>Encodage </td><td> <? echo $encoding?></td>
+<td>Encodage </td><td> <?php echo $encoding?></td>
 </tr>
 <tr>
-<td>Texte entour=C3=A9 par</td><td> <? echo $_POST['rsurround'];?></td>
+<td>Texte entour=C3=A9 par</td><td> <?php echo $_POST['rsurround'];?></t=
d>
 </tr>
 </table>
-<?
+<?php=20
 foreach (array('rfichedef','rdelimiter','encodage') as $e)
 {
   if ( isset($_POST[$e])) echo HtmlInput::hidden($e,$_POST[$e]);
@@ -37,11 +37,11 @@
=20
  echo HtmlInput::submit('record_import','Valider');
 ?>
-<input type=3D"hidden" name=3D"rsurround" value=3D'<?=3D$_POST['rsurroun=
d']?>'>
+<input type=3D"hidden" name=3D"rsurround" value=3D'<?php echo $_POST['rs=
urround']?>'>
=20
=20
=20
-<?
+<?php=20
    global $cn;
    ob_start();
   /**

Modified: trunk/import_doli/include/template/test_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/include/template/test_operation.php	2013-05-15 18:5=
0:38 UTC (rev 502)
+++ trunk/import_doli/include/template/test_operation.php	2013-05-16 22:4=
2:11 UTC (rev 503)
@@ -9,26 +9,26 @@
 </p>
=20
 <form method=3D"POST" >
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
 <td>D=C3=A9limiteur </td>
-<td> <? echo $_POST['rdelimiter']?></td>
+<td> <?php echo $_POST['rdelimiter']?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><td> <? echo $_FILES['csv_file']['name']?=
></td>
+<td>Fichier =C3=A0 charger</td><td> <?php echo $_FILES['csv_file']['name=
']?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><td> <? echo $file_cat;?></td>
+<td>Cat=C3=A9gorie de fiche</td><td> <?php echo $file_cat;?></td>
 </tr>
 <tr>
-<td>Encodage </td><td> <? echo $encoding?></td>
+<td>Encodage </td><td> <?php echo $encoding?></td>
 </tr>
 <tr>
-<td>Texte entour=C3=A9 par</td><td> <? echo $_POST['rsurround'];?></td>
+<td>Texte entour=C3=A9 par</td><td> <?php echo $_POST['rsurround'];?></t=
d>
 </tr>
 </table>
-<?
+<?php=20
 foreach (array('rfichedef','rdelimiter','encodage') as $e)
 {
   if ( isset($_POST[$e])) echo HtmlInput::hidden($e,$_POST[$e]);
@@ -37,11 +37,11 @@
=20
  echo HtmlInput::submit('record_import','Valider');
 ?>
-<input type=3D"hidden" name=3D"rsurround" value=3D'<?=3D$_POST['rsurroun=
d']?>'>
+<input type=3D"hidden" name=3D"rsurround" value=3D'<?php echo $_POST['rs=
urround']?>'>
=20
=20
=20
-<?
+<?php=20
    global $cn;
    ob_start();
   /**

Modified: trunk/import_doli/include/template/upload_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/include/template/upload_operation.php	2013-05-15 18=
:50:38 UTC (rev 502)
+++ trunk/import_doli/include/template/upload_operation.php	2013-05-16 22=
:42:11 UTC (rev 503)
@@ -37,9 +37,9 @@
 <table>
 <tr>
 <tr>
-	<td>Fichier =C3=A0 charger</td><TD> <? $file =3D new IFile('csv_operati=
on');echo $file->input()?></td>
+	<td>Fichier =C3=A0 charger</td><TD> <?php $file =3D new IFile('csv_oper=
ation');echo $file->input()?></td>
 </tr>
 </table>
-<? echo HtmlInput::submit('upload','Valider');?>
+<?php echo HtmlInput::submit('upload','Valider');?>
=20
 </form>
\ No newline at end of file

Modified: trunk/importbank/include/import_bank.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/import_bank.php	2013-05-15 18:50:38 UTC (rev=
 502)
+++ trunk/importbank/include/import_bank.php	2013-05-16 22:42:11 UTC (rev=
 503)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 /*
  * Step 1/4
  */

Modified: trunk/importbank/include/template/confirm_transfer.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/confirm_transfer.php	2013-05-15 18:=
50:38 UTC (rev 502)
+++ trunk/importbank/include/template/confirm_transfer.php	2013-05-16 22:=
42:11 UTC (rev 503)
@@ -49,7 +49,7 @@
 	Nom du format
 	</td>
 	<td>
-	<?=3D$format->input()?>
+	<?php echo $format->input()?>
 	</td>
 </tr>
 <tr>
@@ -57,7 +57,7 @@
 	A importer dans le journal de banque
 	</td>
 	<td>
-	<?=3D$jrn_def->input()?>
+	<?php echo $jrn_def->input()?>
 	</td>
 </tr>
 <tr>
@@ -65,7 +65,7 @@
 Format de date
 	</td>
 	<td>
-	<?=3D$format_date->input()?>
+	<?php echo $format_date->input()?>
 	</td>
 </tr>
=20
@@ -74,7 +74,7 @@
 	S=C3=A9parateur de champs
 	</td>
 	<td>
-	<?=3D$sep_field->input()?>
+	<?php echo $sep_field->input()?>
 	</td>
 </tr>
=20
@@ -83,7 +83,7 @@
 	S=C3=A9parateur de millier
 	</td>
 	<td>
-	<?=3D$sep_thousand->input()?>
+	<?php echo $sep_thousand->input()?>
 	</td>
 </tr>
=20
@@ -92,7 +92,7 @@
 	S=C3=A9parateur d=C3=A9cimal
 	</td>
 	<td>
-	<?=3D$sep_decimal->input()?>
+	<?php echo $sep_decimal->input()?>
 	</td>
 </tr>
 <tr>
@@ -100,7 +100,7 @@
 	Ligne d'en-t=C3=AAte =C3=A0 ne pas prendre en consid=C3=A9ration
 	</td>
 	<td>
-	<?=3D$skip->input()?>
+	<?php echo $skip->input()?>
 	</td>
 </tr>
 <tr>
@@ -108,7 +108,7 @@
 	Les lignes ayant ce nombre de colonnes sont valides
 	</td>
 	<td>
-	<?=3D$nb_col->input()?>
+	<?php echo $nb_col->input()?>
 	</td>
 </tr>
=20
@@ -181,5 +181,5 @@
=20
 ?>
 </table>
-<?=3DHtmlInput::submit('transfer_submit','Enregistrer les op=C3=A9ration=
s')?>
+<?php echo HtmlInput::submit('transfer_submit','Enregistrer les op=C3=A9=
rations')?>
 </form>
\ No newline at end of file

Modified: trunk/importbank/include/template/delete_item.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/delete_item.php	2013-05-15 18:50:38=
 UTC (rev 502)
+++ trunk/importbank/include/template/delete_item.php	2013-05-16 22:42:11=
 UTC (rev 503)
@@ -1,5 +1,5 @@
-<div id=3D"<?=3D$ctl?>">
-<?=3DHtmlInput::anchor_close($ctl)?>
+<div id=3D"<?php echo $ctl?>">
+<?php echo HtmlInput::anchor_close($ctl)?>
=20
 <?php
 echo h2info('D=C3=A9tail op=C3=A9ration');
@@ -14,37 +14,37 @@
=20
 <table>
 <TR>
-<TD>Date</TD><td><?=3D$bi->tp_date?></td></tr>
-<tr><td>n=C2=B0 op=C3=A9ration </td><td><?=3Dh($bi->ref_operation)?></td=
></tr>
+<TD>Date</TD><td><?php echo $bi->tp_date?></td></tr>
+<tr><td>n=C2=B0 op=C3=A9ration </td><td><?php echo h($bi->ref_operation)=
?></td></tr>
 <tr><TD>
 	Tiers
     </TD>
     <td>
-	<?=3Dh($bi->tp_third)?>
+	<?php echo h($bi->tp_third)?>
     </td>
 </tr>
 <tr>
 	<TD>Montant
 	</TD>
-	<td><?=3Dnbm($bi->amount)?>
+	<td><?php echo nbm($bi->amount)?>
 	</td>
 </tr>
 <tr>
 	<TD>Libelle
 	</TD>
-	<td><?=3Dh($bi->libelle)?>
+	<td><?php echo h($bi->libelle)?>
 	</td>
 </tr>
 <tr>
 	<TD>Autre information
 	</TD>
-	<td><?=3Dh($bi->tp_extra)?>
+	<td><?php echo h($bi->tp_extra)?>
 	</td>
 </tr>
 <tr>
 	<TD>Journal
 	</TD>
-	<td><?=3D$jrn?>
+	<td><?php echo $jrn?>
 	</td>
 </tr>
 <!--
@@ -52,13 +52,13 @@
 	<TD>Contrepartie
 	</TD>
 <?php $w->readOnly=3Dtrue;$wConcerned->readOnly=3Dtrue;?>
-	<td><? /* $w->input() */ ?><? /* $w->search() */?><span id=3D"e_third">=
</span>
+	<td><?php /* $w->input() */ ?><?php /* $w->search() */?><span id=3D"e_t=
hird"></span>
 	</td>
 </tr>
 <tr>
 	<TD>reconciliation
 	</TD>
-	<td><? /* $wConcerned->input();*/ ?>
+	<td><?php /* $wConcerned->input();*/ ?>
 	</td>
 </tr>
 -->

Modified: trunk/importbank/include/template/detail_item.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/detail_item.php	2013-05-15 18:50:38=
 UTC (rev 502)
+++ trunk/importbank/include/template/detail_item.php	2013-05-16 22:42:11=
 UTC (rev 503)
@@ -1,5 +1,5 @@
-<div id=3D"<?=3D$ctl?>">
-<?=3DHtmlInput::anchor_close($ctl)?>
+<div id=3D"<?php echo $ctl?>">
+<?php echo HtmlInput::anchor_close($ctl)?>
=20
 <?php
 echo h2info('D=C3=A9tail op=C3=A9ration');
@@ -18,73 +18,73 @@
=20
 <table>
 <TR>
-<TD>Date</TD><td><?=3D$date->input()?></td></tr>
+<TD>Date</TD><td><?php echo $date->input()?></td></tr>
 <tr>
 	<TD>Journal
 	</TD>
-	<td><span class=3D"notice"><?=3D$jrn?></span>
+	<td><span class=3D"notice"><?php echo $jrn?></span>
 	</td>
 </tr>
 <tr>
 	<TD>Contrepartie
 	</TD>
-	<td><?=3D$w->input()?><?=3D$w->search()?><span id=3D"e_third"><?=3Dh($n=
ame)?></span>
+	<td><?php echo $w->input()?><?php echo $w->search()?><span id=3D"e_thir=
d"><?php echo h($name)?></span>
 	</td>
 </tr>
=20
-<tr><td>n=C2=B0 op=C3=A9ration </td><td><?=3Dh($bi->ref_operation)?></td=
></tr>
+<tr><td>n=C2=B0 op=C3=A9ration </td><td><?php echo h($bi->ref_operation)=
?></td></tr>
 <tr><TD>
 	Tiers
     </TD>
     <td>
-	<?=3D$third->input()?>
+	<?php echo $third->input()?>
     </td>
 </tr>
 <tr>
 	<TD>Montant
 	</TD>
-	<td><?=3D$amount->input()?>
+	<td><?php echo $amount->input()?>
 	</td>
 </tr>
 <tr>
 	<TD>Libelle
 	</TD>
-	<td><?=3D$libelle->input()?>
+	<td><?php echo $libelle->input()?>
 	</td>
 </tr>
 <tr>
 	<TD>Autre information
 	</TD>
-	<td><?=3D$extra->input()?>
+	<td><?php echo $extra->input()?>
 	</td>
 </tr>
 <tr>
 	<TD>reconciliation
 	</TD>
-	<td><?=3D$wConcerned->input();?>
+	<td><?php echo $wConcerned->input();?>
 	</td>
 </tr>
-<? $style=3D($bi->status =3D=3D 'E') ? 'style=3D"color:red;font-weight:b=
old"' : '';?>
+<?php $style=3D($bi->status =3D=3D 'E') ? 'style=3D"color:red;font-weigh=
t:bold"' : '';?>
=20
 <tr>
 	<TD>statut</TD>
-	<td <?=3D$style?> ><?=3D$status?></td>
+	<td <?php echo $style?> ><?php echo $status?></td>
 </tr>
-<? if ($bi->status !=3D 'D') : ?>
+<?php if ($bi->status !=3D 'D') : ?>
 <tr>
 	<TD>A effacer</TD>
-	<td><?=3D$remove->input();?>
+	<td><?php echo $remove->input();?>
 </td>
 </tr>
-<? else :?>
+<?php else :?>
 <tr>
 	<TD>A ne pas effacer</TD>
-	<td><?=3D$recup->input();?>
+	<td><?php echo $recup->input();?>
 </td>
 </tr>
-<? endif; ?>
+<?php endif; ?>
 </table>
-<?=3DHtmlInput::submit('save','Sauve');?>
-<?=3DHtmlInput::button_close($ctl)?>
+<?php echo HtmlInput::submit('save','Sauve');?>
+<?php echo HtmlInput::button_close($ctl)?>
 </form>
 </div>

Modified: trunk/importbank/include/template/import_new.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/import_new.php	2013-05-15 18:50:38 =
UTC (rev 502)
+++ trunk/importbank/include/template/import_new.php	2013-05-16 22:42:11 =
UTC (rev 503)
@@ -1,4 +1,4 @@
 <h2>Etape 1 /4  : choix du format</h2>
 <p>
-Choississez un format <?=3D$iselect->input();?>
+Choississez un format <?php echo $iselect->input();?>
 </p>

Modified: trunk/importbank/include/template/input_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/input_file.php	2013-05-15 18:50:38 =
UTC (rev 502)
+++ trunk/importbank/include/template/input_file.php	2013-05-16 22:42:11 =
UTC (rev 503)
@@ -10,24 +10,24 @@
    Par d=C3=A9faut, correspond =C3=A0 un export CSV depuis Calc (OpenOff=
ice.org ou libreoffice);
 </p>
 <form method=3D"POST" enctype=3D"multipart/form-data">
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
-<td>D=C3=A9limiteur </td><TD> <? echo $delimiter->input()?></td>
+<td>D=C3=A9limiteur </td><TD> <?php echo $delimiter->input()?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><TD> <? echo $file->input()?></td>
+<td>Fichier =C3=A0 charger</td><TD> <?php echo $file->input()?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><TD> <? echo $fd->input();?></td>
+<td>Cat=C3=A9gorie de fiche</td><TD> <?php echo $fd->input();?></td>
 </tr>
 <tr>
-<td>Encodage unicode</td><TD> <? echo $encodage->input()?></td>
+<td>Encodage unicode</td><TD> <?php echo $encodage->input()?></td>
 </tr>
 <tr>
 <td>  Texte entour=C3=A9 du signe </td><TD><input type=3D"text" name=3D"=
rsurround" value=3D'"' size=3D"1"></td>
 </tr>
 </table>
-<? echo HtmlInput::submit('test_import','Valider');?>
+<?php echo HtmlInput::submit('test_import','Valider');?>
=20
 </form>

Modified: trunk/importbank/include/template/show_field.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/show_field.php	2013-05-15 18:50:38 =
UTC (rev 502)
+++ trunk/importbank/include/template/show_field.php	2013-05-16 22:42:11 =
UTC (rev 503)
@@ -7,7 +7,7 @@
 	Nom du format
 	</td>
 	<td>
-	<?=3D$format->input()?>
+	<?php echo $format->input()?>
 	</td>
 </tr>
 <tr>
@@ -15,7 +15,7 @@
 	A importer dans le journal de banque
 	</td>
 	<td>
-	<?=3D$jrn_def->input()?>
+	<?php echo $jrn_def->input()?>
 	</td>
 </tr>
 <tr>
@@ -23,7 +23,7 @@
 Format de date
 	</td>
 	<td>
-	<?=3D$format_date->input()?>
+	<?php echo $format_date->input()?>
 	</td>
 </tr>
=20
@@ -32,7 +32,7 @@
 	S=C3=A9parateur de champs
 	</td>
 	<td>
-	<?=3D$sep_field->input()?>
+	<?php echo $sep_field->input()?>
 	</td>
 </tr>
=20
@@ -41,7 +41,7 @@
 	S=C3=A9parateur de millier
 	</td>
 	<td>
-	<?=3D$sep_thousand->input()?>
+	<?php echo $sep_thousand->input()?>
 	</td>
 </tr>
=20
@@ -50,7 +50,7 @@
 	S=C3=A9parateur d=C3=A9cimal
 	</td>
 	<td>
-	<?=3D$sep_decimal->input()?>
+	<?php echo $sep_decimal->input()?>
 	</td>
 </tr>
 <tr>
@@ -58,7 +58,7 @@
 	Ligne d'en-t=C3=AAte =C3=A0 ne pas prendre en consid=C3=A9ration
 	</td>
 	<td>
-	<?=3D$skip->input()?>
+	<?php echo $skip->input()?>
 	</td>
 </tr>
=20
@@ -67,7 +67,7 @@
 	Les lignes ayant ce nombre de colonnes sont valides, laissez =C3=A0 vid=
e si vous ne savez pas
 	</td>
 	<td>
-	<?=3D$nb_col->input()?>
+	<?php echo $nb_col->input()?>
 	</td>
 </tr>
=20
@@ -75,9 +75,9 @@
=20
 </table>
=20
-Fichier =C3=A0 importer <?=3D$file->input()?>
+Fichier =C3=A0 importer <?php echo $file->input()?>
=20
-<?
+<?php=20
 echo HtmlInput::submit('input_file','Valider');
 echo HtmlInput::get_to_hidden(array('format','gDossier','sa','plugin_cod=
e','format'));
 echo HtmlInput::hidden('sb',$sb);

Modified: trunk/importbank/include/template/show_import.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/show_import.php	2013-05-15 18:50:38=
 UTC (rev 502)
+++ trunk/importbank/include/template/show_import.php	2013-05-16 22:42:11=
 UTC (rev 503)
@@ -38,25 +38,25 @@
=20
=20
 ?>
-<tr <?=3D$class?>>
-<td><?=3D$row['id']?></td>
+<tr <?php echo $class?>>
+<td><?php echo $row['id']?></td>
 <td>
-<?=3DHtmlInput::hidden('id[]',$row['id']);?>
-<?=3Dformat_date($row['str_date'])?>
+<?php echo HtmlInput::hidden('id[]',$row['id']);?>
+<?php echo format_date($row['str_date'])?>
 </td>
 <td>
-<?=3Dh($row['format_name'])?>
+<?php echo h($row['format_name'])?>
 </td>
=20
-<td><?=3D$nnew[0]?></td>
-<td><?=3D$ntransf[0]?></td>
-<td><?=3D$nrec[0]?></td>
+<td><?php echo $nnew[0]?></td>
+<td><?php echo $ntransf[0]?></td>
+<td><?php echo $nrec[0]?></td>
=20
-<td><?=3D$nerror[0]?></td>
-<td><?=3D$ndelete[0]?></td>
+<td><?php echo $nerror[0]?></td>
+<td><?php echo $ndelete[0]?></td>
=20
 <td>
-<?
+<?php=20
     $select=3Dnew ICheckBox('s_del[]',$row['id']);
=20
 echo $select->input()
@@ -72,7 +72,7 @@
 </tr>
=20
 </tr>
-<?
+<?php=20
 	endfor;
 ?>
 </table>

Modified: trunk/importbank/include/template/show_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/show_list.php	2013-05-15 18:50:38 U=
TC (rev 502)
+++ trunk/importbank/include/template/show_list.php	2013-05-16 22:42:11 U=
TC (rev 503)
@@ -1,14 +1,14 @@
-<h2 class=3D"info"> Journal cible =3D <?=3D$jrn_name?> Compte de ce jour=
nal <?=3D$jrn_account?></h2>
+<h2 class=3D"info"> Journal cible =3D <?php echo $jrn_name?> Compte de c=
e journal <?php echo $jrn_account?></h2>
 <form method=3D"get">
=20
-Filtrer : <?=3D$filter->input()?>
-<?=3DHtmlInput::request_to_hidden(array('gDossier','plugin_code','ac','s=
b','sa','id'))?>
-<?=3DHtmlInput::submit('refresh','Recharger')?>
+Filtrer : <?php echo $filter->input()?>
+<?php echo HtmlInput::request_to_hidden(array('gDossier','plugin_code','=
ac','sb','sa','id'))?>
+<?php echo HtmlInput::submit('refresh','Recharger')?>
 </form>
 <form method=3D"get" onsubmit=3D"return confirm ('Vous confirmez ?')">
-<?=3DHtmlInput::request_to_hidden(array('gDossier','plugin_code','ac','s=
b','sa','id',$filter->name))?>
-<?=3DHtmlInput::submit('delete_record','Effacer')?>
-<?=3DHtmlInput::submit('transfer_record','Transf=C3=A8rer')?>
+<?php echo HtmlInput::request_to_hidden(array('gDossier','plugin_code','=
ac','sb','sa','id',$filter->name))?>
+<?php echo HtmlInput::submit('delete_record','Effacer')?>
+<?php echo HtmlInput::submit('transfer_record','Transf=C3=A8rer')?>
 </form>
=20
 <table class=3D"table_large">
@@ -22,7 +22,7 @@
 	<th>Libell=C3=A9</th>
 	<th>Extra</th>
 </TR>
-<?
+<?php=20
 	$gdossier=3DDossier::id();
 	$plugin_code=3D$_REQUEST['plugin_code'];
 	for ($i=3D0;$i<Database::num_row($ret);$i++):
@@ -32,46 +32,46 @@
 		$javascript=3D"onclick=3D\"reconcilie('div${row['id']}','$gdossier','$=
{row['id']}','$plugin_code')\"";
=20
 ?>
-<tr <?=3D$class?> >
+<tr <?php echo $class?> >
 <td>
-	<?=3DHtmlInput::button('bt'.$row['id'],'Reconcilie',$javascript)?>
+	<?php echo HtmlInput::button('bt'.$row['id'],'Reconcilie',$javascript)?=
>
 </td>
 <TD>
-<?=3D$row['ref_operation']?>
+<?php echo $row['ref_operation']?>
 </TD>
=20
 <TD>
-<?=3Dformat_date($row['tp_date'])?>
+<?php echo format_date($row['tp_date'])?>
 </TD>
=20
 <td class=3D"num">
-<?=3Dnbm($row['amount'])?>
+<?php echo nbm($row['amount'])?>
 </td>
-<td id=3D"<?=3D'st'.$row['id']?>" <?=3DImport_Bank::color_status($row['s=
tatus'])?>  >
-<?=3D$row['f_status']?>
+<td id=3D"<?php echo 'st'.$row['id']?>" <?php echo Import_Bank::color_st=
atus($row['status'])?>  >
+<?php echo $row['f_status']?>
 </td>
=20
 <td>
-<?=3Dh($row['tp_third'])?>
+<?php echo h($row['tp_third'])?>
 </td>
=20
 <td>
-<?=3Dh($row['libelle'])?>
+<?php echo h($row['libelle'])?>
 </td>
=20
=20
=20
 <td >
-<?=3Dh($row['tp_extra'])?>
+<?php echo h($row['tp_extra'])?>
 </td>
 </tr>
-<?
+<?php=20
 	endfor;
 ?>
=20
 </table>
 <form method=3D"get" onsubmit=3D"return confirm ('Vous confirmez?')">
-<?=3DHtmlInput::request_to_hidden(array('gDossier','plugin_code','ac','s=
b','sa','id',$filter->name))?>
-<?=3DHtmlInput::submit('delete_record','Effacer')?>
-<?=3DHtmlInput::submit('transfer_record','Transf=C3=A8rer')?>
+<?php echo HtmlInput::request_to_hidden(array('gDossier','plugin_code','=
ac','sb','sa','id',$filter->name))?>
+<?php echo HtmlInput::submit('delete_record','Effacer')?>
+<?php echo HtmlInput::submit('transfer_record','Transf=C3=A8rer')?>
 </form>

Modified: trunk/importbank/include/template/show_transfer.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/show_transfer.php	2013-05-15 18:50:=
38 UTC (rev 502)
+++ trunk/importbank/include/template/show_transfer.php	2013-05-16 22:42:=
11 UTC (rev 503)
@@ -108,7 +108,7 @@
 	Nom du format
 	</td>
 	<td>
-	<?=3D$format->input()?>
+	<?php echo $format->input()?>
 	</td>
 </tr>
 <tr>
@@ -116,7 +116,7 @@
 	A importer dans le journal de banque
 	</td>
 	<td>
-	<?=3D$jrn_def->input()?>
+	<?php echo $jrn_def->input()?>
 	</td>
 </tr>
 <tr>
@@ -124,7 +124,7 @@
 Format de date
 	</td>
 	<td>
-	<?=3D$format_date->input()?>
+	<?php echo $format_date->input()?>
 	</td>
 </tr>
=20
@@ -133,7 +133,7 @@
 	S=C3=A9parateur de champs
 	</td>
 	<td>
-	<?=3D$sep_field->input()?>
+	<?php echo $sep_field->input()?>
 	</td>
 </tr>
=20
@@ -142,7 +142,7 @@
 	S=C3=A9parateur de millier
 	</td>
 	<td>
-	<?=3D$sep_thousand->input()?>
+	<?php echo $sep_thousand->input()?>
 	</td>
 </tr>
=20
@@ -151,7 +151,7 @@
 	S=C3=A9parateur d=C3=A9cimal
 	</td>
 	<td>
-	<?=3D$sep_decimal->input()?>
+	<?php echo $sep_decimal->input()?>
 	</td>
 </tr>
 <tr>
@@ -159,7 +159,7 @@
 	Ligne d en-t=C3=AAte =C3=A0 ne pas prendre en consid=C3=A9ration
 	</td>
 	<td>
-	<?=3D$skip->input()?>
+	<?php echo $skip->input()?>
 	</td>
 </tr>
=20
@@ -168,7 +168,7 @@
 	Les lignes ayant ce nombre de colonnes sont valides
 	</td>
 	<td>
-	<?=3D$nb_col->input()?>
+	<?php echo $nb_col->input()?>
 	</td>
 </tr>
=20
@@ -221,5 +221,5 @@
=20
 ?>
 </table>
-<?=3D$table?>
+<?php echo $table?>
 </form>
\ No newline at end of file

Modified: trunk/importbank/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/test_file.php	2013-05-15 18:50:38 U=
TC (rev 502)
+++ trunk/importbank/include/template/test_file.php	2013-05-16 22:42:11 U=
TC (rev 503)
@@ -9,26 +9,26 @@
 </p>
=20
 <form method=3D"POST" >
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
 <td>D=C3=A9limiteur </td>
-<td> <? echo $_POST['rdelimiter']?></td>
+<td> <?php echo $_POST['rdelimiter']?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><td> <? echo $_FILES['csv_file']['name']?=
></td>
+<td>Fichier =C3=A0 charger</td><td> <?php echo $_FILES['csv_file']['name=
']?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><td> <? echo $file_cat;?></td>
+<td>Cat=C3=A9gorie de fiche</td><td> <?php echo $file_cat;?></td>
 </tr>
 <tr>
-<td>Encodage </td><td> <? echo $encoding?></td>
+<td>Encodage </td><td> <?php echo $encoding?></td>
 </tr>
 <tr>
-<td>Texte entour=C3=A9 par</td><td> <? echo $_POST['rsurround'];?></td>
+<td>Texte entour=C3=A9 par</td><td> <?php echo $_POST['rsurround'];?></t=
d>
 </tr>
 </table>
-<?
+<?php=20
 foreach (array('rfichedef','rdelimiter','encodage') as $e)
 {
   if ( isset($_POST[$e])) echo HtmlInput::hidden($e,$_POST[$e]);
@@ -37,11 +37,11 @@
=20
  echo HtmlInput::submit('record_import','Valider');
 ?>
-<input type=3D"hidden" name=3D"rsurround" value=3D'<?=3D$_POST['rsurroun=
d']?>'>
+<input type=3D"hidden" name=3D"rsurround" value=3D'<?php echo $_POST['rs=
urround']?>'>
=20
=20
=20
-<?
+<?php=20
    global $cn;
    ob_start();
   /**

Modified: trunk/modop/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/index.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/modop/index.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -37,11 +37,11 @@
=20
 ?>
 <FORM METHOD=3D"GET">
-  <? echo HtmlInput::extension().dossier::hidden();?>
-  <? echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
-<?=3D_("Code interne de l'op=C3=A9ration =C3=A0 modifier") ?>
-  <?=3D$str->input()?>
-	<?
+  <?php echo HtmlInput::extension().dossier::hidden();?>
+  <?php echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
+<?php echo _("Code interne de l'op=C3=A9ration =C3=A0 modifier") ?>
+  <?php echo $str->input()?>
+	<?php=20
=20
 	echo HtmlInput::submit('seek','retrouver')?>
 </FORM>

Modified: trunk/modop/template_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/template_ledger_fin.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/modop/template_ledger_fin.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -1,26 +1,26 @@
 <fieldset>
-<legend><?=3D$f_legend ?> </legend>
-   <?=3D_('Date').' '.$f_date ?><br>
-<?=3D$f_jrn?><br>
-<?=3D_('Banque')?><?=3D$ibank->input(); ?><?=3D$ibank->search()?> <span =
id=3D'e_bank_account_label'><?$f_bank_label?></span>
+<legend><?php echo $f_legend ?> </legend>
+   <?php echo _('Date').' '.$f_date ?><br>
+<?php echo $f_jrn?><br>
+<?php echo _('Banque')?><?php echo $ibank->input(); ?><?php echo $ibank-=
>search()?> <span id=3D'e_bank_account_label'><?$f_bank_label?></span>
 </fieldset>
=20
 <fieldset>
-<legend><?=3D$f_legend_detail?></legend>
-   <fieldset><legend><?=3D_('Extrait de compte')?></legend>
-   <?=3D_('Num=C3=A9ro extrait')?> <?=3D$f_extrait?>
+<legend><?php echo $f_legend_detail?></legend>
+   <fieldset><legend><?php echo _('Extrait de compte')?></legend>
+   <?php echo _('Num=C3=A9ro extrait')?> <?php echo $f_extrait?>
 <input type=3D"text" disabled  id=3D"first_sold"></span>
 </fieldset>
-<?=3D$str_add_button?>
-   <fieldset><legend><?=3D_('Op=C3=A9rations')?></legend>
+<?php echo $str_add_button?>
+   <fieldset><legend><?php echo _('Op=C3=A9rations')?></legend>
 <table id=3D"fin_item" width=3D"100%" border=3D"0">
 <tr>
 <th colspan=3D"2">code<?HtmlInput::infobulle(0)?></TH>
-   <th><?=3D_('Commentaire')?></TH>
-   <th><?=3D_('Montant')?></TH>
+   <th><?php echo _('Commentaire')?></TH>
+   <th><?php echo _('Montant')?></TH>
   </tr>
=20
-<? foreach ($array as $item) {
+<?php foreach ($array as $item) {
 echo '<tr>';
 echo td($item['search'].$item['qcode']);
 echo td($item['span']);

Modified: trunk/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/rapport_avance/ajax.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -24,43 +24,43 @@
 			Nouv.
 		</td>
 		<td>
-			<?=3D HtmlInput::hidden('p_id[]', -1)?>
-			<?
+			<?php echo  HtmlInput::hidden('p_id[]', -1)?>
+			<?php=20
 			$p_code =3D new IText('p_code[]');
 			$p_code->size =3D "10";
 			echo $p_code->input();
 			?>
 		</td>
 		<td>
-			<?
+			<?php=20
 			$p_libelle =3D new IText('p_libelle[]');
 			$p_libelle->css_size =3D "100%";
 			echo $p_libelle->input();
 			?>
 		</td>
 		<td>
-			<?
+			<?php=20
 			$p_type =3D new ISelect('p_type[]');
 			$p_type->value =3D $type_row;
 			echo $p_type->input();
 			?>
 		</td>
 		<td>
-			<?
+			<?php=20
 			$p_type_periode =3D new ISelect('t_id[]');
 			$p_type_periode->value =3D $type_periode;
 			echo $p_type_periode->input();
 			?>
 		</td>
 		<td>
-			<?
+			<?php=20
 			$p_order =3D new INum('p_order[]');
 			$p_order->prec =3D 0;
 			$p_order->size =3D 4;
 			echo $p_order->input();
 			?>
 		</td>
-		<?
+		<?php=20
 		break;
 	/*	 * *****************************************************************=
*********************************************
 	 * Montre le r=C3=A9sultat et permet de changer les param=C3=A8trages d=
'un formulaire

Modified: trunk/rapport_avance/ajax_search_code.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_search_code.php	2013-05-15 18:50:38 UTC (re=
v 502)
+++ trunk/rapport_avance/ajax_search_code.php	2013-05-16 22:42:11 UTC (re=
v 503)
@@ -39,14 +39,14 @@
 			Libell=C3=A9
 		</th>
 	</tr>
-	<? for ($i=3D0;$i<count($array);$i++): ?>
+	<?php for ($i=3D0;$i<count($array);$i++): ?>
 	<tr>
 		<td>
-			<?=3DHtmlInput::anchor(h($array[$i]['p_code']),"",'onclick=3D"$(\'for=
m_compute\').value+=3D\'['.$array[$i]['p_code'].']\';removeDiv(\'search_c=
ode_div\');"')?>
+			<?php echo HtmlInput::anchor(h($array[$i]['p_code']),"",'onclick=3D"$=
(\'form_compute\').value+=3D\'['.$array[$i]['p_code'].']\';removeDiv(\'se=
arch_code_div\');"')?>
 		</td>
 		<td>
-			<?=3Dh($array[$i]['p_libelle'])?>
+			<?php echo h($array[$i]['p_libelle'])?>
 		</td>
 	</tr>
-	<?endfor;?>
-</table>
\ No newline at end of file
+	<?php endfor;?>
+</table>

Modified: trunk/rapport_avance/include/declaration.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/declaration.inc.php	2013-05-15 18:50:38 =
UTC (rev 502)
+++ trunk/rapport_avance/include/declaration.inc.php	2013-05-16 22:42:11 =
UTC (rev 503)
@@ -101,25 +101,25 @@
 );
 ?>
 <form id=3D"declaration_form_id" method=3D"GET" onsubmit=3D"return valid=
ate()">
-	<?=3D $hidden?>
+	<?php echo  $hidden?>
 	<table>
 		<tr>
 			<td>
 				D=C3=A9claration
 			</td>
 			<td>
-				<?=3D $select->input()?>
+				<?php echo  $select->input()?>
 			</td>
 			</tr>
 			<tr>
-	<td> Description</td><td> <?=3D$description->input()?></td>
+	<td> Description</td><td> <?php echo $description->input()?></td>
 	</tr>
 		<tr>
 			<td>
 				Date de d=C3=A9but
 			</td>
 			<td>
-				<?=3D $date_start->input()?>
+				<?php echo  $date_start->input()?>
 			</td>
 		</tr>
 		<tr>
@@ -127,7 +127,7 @@
 				Date de fin
 			</td>
 			<td>
-				<?=3D $date_end->input()?>
+				<?php echo  $date_end->input()?>
 			</td>
 		</tr>
 		<tr>
@@ -135,16 +135,16 @@
 				Etape de
 			</td>
 			<td>
-				<?=3D $istep->input()?>
+				<?php echo  $istep->input()?>
 			</td>
 		</tr>
 	</table>
 	</p>
-	<?=3D HtmlInput::submit('compute', 'G=C3=A9n=C3=A9rer')?>
+	<?php echo  HtmlInput::submit('compute', 'G=C3=A9n=C3=A9rer')?>
 </form>
 <script charset=3D"UTF8" lang=3D"javascript">
 	function validate() {
-		if ( check_date_id('<?=3D $date_start->id?>') =3D=3D false ) {alert('D=
ate de d=C3=A9but incorrecte');$('<?=3D $date_start->id?>').style.borderC=
olor=3D'red';$('<?=3D $date_start->id?>').style.borderWidth=3D2;return fa=
lse;}
-		if ( check_date_id('<?=3D $date_end->id?>') =3D=3D false ) {alert('Dat=
e de fin incorrecte');$('<?=3D $date_end->id?>').style.borderColor=3D'red=
';$('<?=3D $date_end->id?>').style.borderWidth=3D2;return false;}
+		if ( check_date_id('<?php echo  $date_start->id?>') =3D=3D false ) {al=
ert('Date de d=C3=A9but incorrecte');$('<?php echo  $date_start->id?>').s=
tyle.borderColor=3D'red';$('<?php echo  $date_start->id?>').style.borderW=
idth=3D2;return false;}
+		if ( check_date_id('<?php echo  $date_end->id?>') =3D=3D false ) {aler=
t('Date de fin incorrecte');$('<?php echo  $date_end->id?>').style.border=
Color=3D'red';$('<?php echo  $date_end->id?>').style.borderWidth=3D2;retu=
rn false;}
 	}
 </script>
\ No newline at end of file

Modified: trunk/rapport_avance/include/historique.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/historique.inc.php	2013-05-15 18:50:38 U=
TC (rev 502)
+++ trunk/rapport_avance/include/historique.inc.php	2013-05-16 22:42:11 U=
TC (rev 503)
@@ -70,32 +70,32 @@
=20
 		</th>
 	</tr>
-	<? for ($i=3D0;$i<count($data);$i++) :?>
-	<tr id=3D"tr_<?=3D$data[$i]['d_id']?>">
-		<td sortable_customkey=3D"<?=3D$data[$i]['fmt_start']?>">
+	<?php for ($i=3D0;$i<count($data);$i++) :?>
+	<tr id=3D"tr_<?php echo $data[$i]['d_id']?>">
+		<td sortable_customkey=3D"<?php echo $data[$i]['fmt_start']?>">
=20
-			<?=3Dformat_date($data[$i]['d_start'])?>
+			<?php echo format_date($data[$i]['d_start'])?>
 		</td>
-		<td sortable_customkey=3D"<?=3D$data[$i]['fmt_end']?>">
-			<?=3Dformat_date($data[$i]['d_end'])?>
+		<td sortable_customkey=3D"<?php echo $data[$i]['fmt_end']?>">
+			<?php echo format_date($data[$i]['d_end'])?>
 		</td>
 		<td>
-			<?=3Dh($data[$i]['d_title'])?>
+			<?php echo h($data[$i]['d_title'])?>
 		</td>
 		<td>
-			<?=3Dh($data[$i]['d_description'])?>
+			<?php echo h($data[$i]['d_description'])?>
 		</td>
-		<td sortable_customkey=3D"<?=3D$data[$i]['fmt_order_generated']?>">
-			<?=3Dh($data[$i]['fmt_generated'])?>
+		<td sortable_customkey=3D"<?php echo $data[$i]['fmt_order_generated']?=
>">
+			<?php echo h($data[$i]['fmt_generated'])?>
 		</td>
-		<td  id=3D"mod_<?=3D$data[$i]['d_id']?>">
-			<?=3DHtmlInput::anchor("Afficher","",sprintf("onclick=3D\"rapav_decla=
ration_display('%s','%s','%s','%s')\"",$_REQUEST['plugin_code'],$_REQUEST=
['ac'],$_REQUEST['gDossier'],$data[$i]['d_id']))?>
+		<td  id=3D"mod_<?php echo $data[$i]['d_id']?>">
+			<?php echo HtmlInput::anchor("Afficher","",sprintf("onclick=3D\"rapav=
_declaration_display('%s','%s','%s','%s')\"",$_REQUEST['plugin_code'],$_R=
EQUEST['ac'],$_REQUEST['gDossier'],$data[$i]['d_id']))?>
 		</td>
-		<td  id=3D"del_<?=3D$data[$i]['d_id']?>">
-			<?=3DHtmlInput::anchor("Efface","",sprintf("onclick=3D\"rapav_declara=
tion_delete('%s','%s','%s','%s')\"",$_REQUEST['plugin_code'],$_REQUEST['a=
c'],$_REQUEST['gDossier'],$data[$i]['d_id']))?>
+		<td  id=3D"del_<?php echo $data[$i]['d_id']?>">
+			<?php echo HtmlInput::anchor("Efface","",sprintf("onclick=3D\"rapav_d=
eclaration_delete('%s','%s','%s','%s')\"",$_REQUEST['plugin_code'],$_REQU=
EST['ac'],$_REQUEST['gDossier'],$data[$i]['d_id']))?>
 		</td>
 	</tr>
-	<? endfor; ?>
+	<?php endfor; ?>
 </table>
 </div>
 <div id=3D"declaration_display_div">

Modified: trunk/rapport_avance/include/template/declaration_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/declaration_display.php	2013-05=
-15 18:50:38 UTC (rev 502)
+++ trunk/rapport_avance/include/template/declaration_display.php	2013-05=
-16 22:42:11 UTC (rev 503)
@@ -27,12 +27,12 @@
  *
  */
 ?>
-<h1><?=3D$this->d_title?></h1>
-<h2> Du <?=3D$this->d_start?> au <?=3D$this->d_end?></h2>
+<h1><?php echo $this->d_title?></h1>
+<h2> Du <?php echo $this->d_start?> au <?php echo $this->d_end?></h2>
 <p>
-	Note : <?=3Dh($this->d_description)?>
+	Note : <?php echo h($this->d_description)?>
 </p>
-<?
+<?php=20
 	if ( empty($array) ) { echo 'Aucune donn=C3=A9e'; exit();}
=20
 	// Create infobulle

Modified: trunk/rapport_avance/include/template/formulaire_definition.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/formulaire_definition.php	2013-=
05-15 18:50:38 UTC (rev 502)
+++ trunk/rapport_avance/include/template/formulaire_definition.php	2013-=
05-16 22:42:11 UTC (rev 503)
@@ -36,7 +36,7 @@
 		Effacer
 	</th>
 	<th style=3D"width:92px">
-		Code <?=3DHtmlInput::infobulle(200)?>
+		Code <?php echo HtmlInput::infobulle(200)?>
 	</th>
 	<th>
 		Libell=C3=A9
@@ -53,24 +53,24 @@
 	</tr>
 	</thead>
 	<tbody id=3D"table_body_id">
-	<? for ($i=3D0;$i<$max;$i++):?>
-	<tr id=3D"row_<?=3D$i?>">
+	<?php for ($i=3D0;$i<$max;$i++):?>
+	<tr id=3D"row_<?php echo $i?>">
 		<td>
-			<?
+			<?php=20
 			$a=3Dnew ICheckBox('del_row[]',$this->definition[$i]->p_id);
 			echo $a->input();
 			?>
 		</td>
 		<td>
-			<?=3DHtmlInput::hidden('p_id[]',$this->definition[$i]->p_id) ?>
-			<?
+			<?php echo HtmlInput::hidden('p_id[]',$this->definition[$i]->p_id) ?>
+			<?php=20
 				$p_code=3Dnew IText('p_code[]',$this->definition[$i]->p_code);
 				$p_code->size=3D"10";
 				echo $p_code->input();
 			?>
 		</td>
 		<td>
-			<?
+			<?php=20
 				$p_libelle=3Dnew IText('p_libelle[]',$this->definition[$i]->p_libell=
e);
 				$p_libelle->size=3D"50";
 				//$p_libelle->css_size=3D"100%";
@@ -78,7 +78,7 @@
 			?>
 		</td>
 		<td>
-			<?
+			<?php=20
 				$p_type=3Dnew ISelect('p_type[]');
 				$p_type->value=3D$type_row;
 				$p_type->selected=3D$this->definition[$i]->p_type;
@@ -86,7 +86,7 @@
 			?>
 		</td>
 		<td>
-			<?
+			<?php=20
 				$p_type_periode=3Dnew ISelect('t_id[]');
 				$p_type_periode->value=3D$type_periode;
 				$p_type_periode->selected=3D$this->definition[$i]->t_id;
@@ -94,7 +94,7 @@
 			?>
 		</td>
 		<td>
-			<?
+			<?php=20
 				if ($this->definition[$i]->p_order=3D=3D'')
 					$value=3D$i*10;
 				else
@@ -106,11 +106,11 @@
 			?>
 		</td>
 	</tr>
-	<?endfor;?>
+	<?php endfor;?>
 	</tbody>
 </table>
 <p>
-<?=3DHtmlInput::button_anchor("Ajout d'une ligne","javascript:void(0)","=
add_def",
+<?php echo HtmlInput::button_anchor("Ajout d'une ligne","javascript:void=
(0)","add_def",
 		sprintf('onclick=3D"add_row_definition(\'%s\',\'%s\',\'%s\')"',$_REQUE=
ST['plugin_code'],$_REQUEST['ac'],$_REQUEST['gDossier']))?>
 </p>
 <p>
@@ -134,4 +134,4 @@
 		echo '<span id=3D"rapav_new_file" style=3D"display:none"> '.$file->inp=
ut().'</span>';
 	}
 		?>
-</p>
\ No newline at end of file
+</p>

Modified: trunk/rapport_avance/include/template/formulaire_listing.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/formulaire_listing.php	2013-05-=
15 18:50:38 UTC (rev 502)
+++ trunk/rapport_avance/include/template/formulaire_listing.php	2013-05-=
16 22:42:11 UTC (rev 503)
@@ -37,30 +37,30 @@
 		<th></th>
 		<th></th>
 	</tr>
-<?
+<?php=20
 	for ($i=3D0;$i<count($alist);$i++):
 ?>
 	<tr>
 		<td>
-			<?=3Dh($alist[$i]['f_title'])?>
+			<?php echo h($alist[$i]['f_title'])?>
 		</td>
 		<td>
-			<?=3Dh($alist[$i]['f_description'])?>
+			<?php echo h($alist[$i]['f_description'])?>
 		</td>
 		<td>
-			<?=3DHtmlInput::anchor('D=C3=A9finition', "",sprintf('onclick=3D"rapa=
v_form_def(\'%s\',\'%s\',\'%s\',\'%s\')"',$_REQUEST['plugin_code'],$_REQU=
EST['ac'],dossier::id(),$alist[$i]['f_id']))?>
+			<?php echo HtmlInput::anchor('D=C3=A9finition', "",sprintf('onclick=3D=
"rapav_form_def(\'%s\',\'%s\',\'%s\',\'%s\')"',$_REQUEST['plugin_code'],$=
_REQUEST['ac'],dossier::id(),$alist[$i]['f_id']))?>
 		</td>
 		<td>
-			<?=3DHtmlInput::anchor('Param=C3=A8tre', "",sprintf('onclick=3D"rapav=
_form_param(\'%s\',\'%s\',\'%s\',\'%s\')"',$_REQUEST['plugin_code'],$_REQ=
UEST['ac'],dossier::id(),$alist[$i]['f_id']))?>
+			<?php echo HtmlInput::anchor('Param=C3=A8tre', "",sprintf('onclick=3D=
"rapav_form_param(\'%s\',\'%s\',\'%s\',\'%s\')"',$_REQUEST['plugin_code']=
,$_REQUEST['ac'],dossier::id(),$alist[$i]['f_id']))?>
 		</td>
 		<td>
-			<?=3DHtmlInput::anchor('Export d=C3=A9finition', sprintf("extension.r=
aw.php?plugin_code=3D%s&ac=3D%s&gDossier=3D%s&d_id=3D%s&act=3Drapav_form_=
export",$_REQUEST['plugin_code'],$_REQUEST['ac'],dossier::id(),$alist[$i]=
['f_id']))?>
+			<?php echo HtmlInput::anchor('Export d=C3=A9finition', sprintf("exten=
sion.raw.php?plugin_code=3D%s&ac=3D%s&gDossier=3D%s&d_id=3D%s&act=3Drapav=
_form_export",$_REQUEST['plugin_code'],$_REQUEST['ac'],dossier::id(),$ali=
st[$i]['f_id']))?>
 		</td>
 	</tr>
=20
-<?	endfor; ?>
+<?php endfor; ?>
 </table>
-	<?
+	<?php=20
 	echo HtmlInput::button("add_form_bt","Ajout d'un formulaire",'onclick=3D=
"$(\'add_form_div\').show();$(\'add_form_bt\').hide()"');
 echo '<div id=3D"add_form_div" style=3D"display:none">';
 echo '<form method=3D"POST">';

Modified: trunk/rapport_avance/include/template/formulaire_titre.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/formulaire_titre.php	2013-05-15=
 18:50:38 UTC (rev 502)
+++ trunk/rapport_avance/include/template/formulaire_titre.php	2013-05-16=
 22:42:11 UTC (rev 503)
@@ -27,14 +27,14 @@
  *
  */
 ?>
-<?=3DHtmlInput::hidden('f_id',$this->f_id)?>
+<?php echo HtmlInput::hidden('f_id',$this->f_id)?>
 <table>
 	<tr>
 		<td>
 			Nom
 		</td>
 		<td>
-			<?
+			<?php=20
 			$title=3Dnew IText("f_title",$this->f_title);
 			$title->size=3D50;
 			echo $title->input();
@@ -46,7 +46,7 @@
 			Description
 		</td>
 		<td>
-			<?
+			<?php=20
 			$description=3Dnew IText("f_description",$this->f_description);
 			$description->size=3D100;
 			echo $description->input();

Modified: trunk/rapport_avance/include/template/param_detail_new.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/param_detail_new.php	2013-05-15=
 18:50:38 UTC (rev 502)
+++ trunk/rapport_avance/include/template/param_detail_new.php	2013-05-16=
 22:42:11 UTC (rev 503)
@@ -72,12 +72,12 @@
 	</p>
=20
 <form id=3D"new_padef" method=3D"POST" onsubmit=3D"save_param_detail('ne=
w_padef');return false">
-	<?=3DHtmlInput::request_to_hidden(array('gDossier','ac','plugin_code','=
p_id'))?>
+	<?php echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_c=
ode','p_id'))?>
 	<p>
-	<?=3DHtmlInput::hidden('tab','formula')?>
-		<?=3DRAPAV_Formula::new_row()?>
+	<?php echo HtmlInput::hidden('tab','formula')?>
+		<?php echo RAPAV_Formula::new_row()?>
 	</p>
-<?=3DHtmlInput::submit('save','Sauve')?>
+<?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
 </div>
@@ -86,11 +86,11 @@
 	Entrer un poste comptable et un code de TVA
 	</p>
 <form id=3D"new_padea" method=3D"POST" onsubmit=3D"save_param_detail('ne=
w_padea');return false">
-	<?=3DHtmlInput::request_to_hidden(array('gDossier','ac','plugin_code','=
p_id'))?>
+	<?php echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_c=
ode','p_id'))?>
=20
-	<?=3DHtmlInput::hidden('tab','account_tva')?>
-		<?=3DRAPAV_Account_Tva::new_row()?>
-<?=3DHtmlInput::submit('save','Sauve')?>
+	<?php echo HtmlInput::hidden('tab','account_tva')?>
+		<?php echo RAPAV_Account_Tva::new_row()?>
+<?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
 </div>
@@ -99,33 +99,33 @@
 	Entrer une formule avec des codes utilis=C3=A9s dans ce formulaires
 	</p>
 <form id=3D"new_padec" method=3D"POST" onsubmit=3D"save_param_detail('ne=
w_padec');return false">
-	<?=3DHtmlInput::request_to_hidden(array('gDossier','ac','plugin_code','=
p_id'))?>
+	<?php echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_c=
ode','p_id'))?>
=20
-	<?=3DHtmlInput::hidden('tab','compute_id')?>
-		<?=3DRAPAV_Compute::new_row($p_id)?>
-<?=3DHtmlInput::submit('save','Sauve')?>
+	<?php echo HtmlInput::hidden('tab','compute_id')?>
+		<?php echo RAPAV_Compute::new_row($p_id)?>
+<?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
 </div>
 	<div id=3D"new_account_id" style=3D"display: none">
 <form id=3D"new_paded" method=3D"POST" onsubmit=3D"save_param_detail('ne=
w_paded');return false">
=20
-	<?=3DHtmlInput::request_to_hidden(array('gDossier','ac','plugin_code','=
p_id'))?>
+	<?php echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_c=
ode','p_id'))?>
=20
-	<?=3DHtmlInput::hidden('tab','new_account_id')?>
-		<?=3DRAPAV_Account::new_row($p_id)?>
-<?=3DHtmlInput::submit('save','Sauve')?>
+	<?php echo HtmlInput::hidden('tab','new_account_id')?>
+		<?php echo RAPAV_Account::new_row($p_id)?>
+<?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
 </div>
 		<div id=3D"new_reconcile_id" style=3D"display: none">
 <form id=3D"new_padee" method=3D"POST" onsubmit=3D"save_param_detail('ne=
w_padee');return false">
=20
-	<?=3DHtmlInput::request_to_hidden(array('gDossier','ac','plugin_code','=
p_id'))?>
+	<?php echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_c=
ode','p_id'))?>
=20
-	<?=3DHtmlInput::hidden('tab','new_reconcile_id')?>
-		<?=3DRAPAV_Reconcile::new_row($p_id)?>
-<?=3DHtmlInput::submit('save','Sauve')?>
+	<?php echo HtmlInput::hidden('tab','new_reconcile_id')?>
+		<?php echo RAPAV_Reconcile::new_row($p_id)?>
+<?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
 </div>

Modified: trunk/rapport_avance/rapav_constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_constant.php	2013-05-15 18:50:38 UTC (rev =
502)
+++ trunk/rapport_avance/rapav_constant.php	2013-05-16 22:42:11 UTC (rev =
503)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 /**
  *@file
  *Contains all the needed variable for the plugin

Modified: trunk/skel/skel_constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/skel/skel_constant.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/skel/skel_constant.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 /**
  *@file
  *Contains all the needed variable for the plugin

Modified: trunk/tool_pcmn/include/export_plan.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tool_pcmn/include/export_plan.php	2013-05-15 18:50:38 UTC (rev =
502)
+++ trunk/tool_pcmn/include/export_plan.php	2013-05-16 22:42:11 UTC (rev =
503)
@@ -29,7 +29,7 @@
 Exporter le plan comptable
 <form method=3D"get" action=3D"extension.raw.php">
=20
-<?
+<?php=20
     echo HtmlInput::hidden('sa',$_GET['sa']);
     echo HtmlInput::extension();
 echo dossier::hidden();

Modified: trunk/tool_pcmn/include/import_plan.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tool_pcmn/include/import_plan.php	2013-05-15 18:50:38 UTC (rev =
502)
+++ trunk/tool_pcmn/include/import_plan.php	2013-05-16 22:42:11 UTC (rev =
503)
@@ -42,7 +42,7 @@
 		<li>Le poste parent</li>
 	    <li>Le type de poste : PAS pour passif, ACT pour actif, PRO pour pr=
oduit, CHA pour charge, CON suivant contexte, pour les comptes invers=C3=A9=
s ajouter INV =C3=A0 la fin, exemple PROINV (produit compte invers=C3=A9)=
</li>
 	</ol>
-	<?
+	<?php=20
 	echo ' <form method=3D"post" enctype=3D"multipart/form-data" >';
 	echo HtmlInput::hidden('sa', $_GET ['sa']);
 	echo HtmlInput::extension();
@@ -63,7 +63,7 @@
=20
=20
 	</form>
-	<?
+	<?php=20
 }
=20
 // Import the file and ask to confirm

Modified: trunk/tools/include/template/numbering.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/template/numbering.php	2013-05-15 18:50:38 UTC (r=
ev 502)
+++ trunk/tools/include/template/numbering.php	2013-05-16 22:42:11 UTC (r=
ev 503)
@@ -1,28 +1,28 @@
-<?
+<?php=20
 echo  HtmlInput::button('receipt_bt','Renum=C3=A9roter les pi=C3=A8ces',=
'onclick=3D"$(\'div_receipt\').show();"');
 ?>
 <div id=3D"div_receipt" class=3D"inner_box" style=3D"top:230;margin:5;ov=
erflow:visible;display:none;">
 <h2 class=3D"info" >R=C3=A9num=C3=A9roter les pi=C3=A8ces, donner le pr=C3=
=A9fixe puis le num=C3=A9ro</h2>
 <p class=3D"notice">Il vaut mieux que le pr=C3=A9fixe se termine par aut=
re chose qu'un chiffre</p>
 <form method=3D"POST" id=3D"form1" onsubmit=3D"return confirm('Vous conf=
irmez ?')">
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 	<TR>
 	<TD>Pr=C3=A9fixe</TD>
-	<td><?=3D$prefix->input()?></td>
+	<td><?php echo $prefix->input()?></td>
 	</TR>
 	<TR>
 	<TD>A partir de </TD>
-	<td><?=3D$number->input()?></td>
+	<td><?php echo $number->input()?></td>
 	</TR>
 	<TR>
 	<TD>Les op=C3=A9rations ont le m=C3=AAme num=C3=A9ro (ex:relev=C3=A9 de=
 banque) </TD>
-	<td><?=3D$with_step->input()?></td>
+	<td><?php echo $with_step->input()?></td>
 	</TR>
 =09
 </table>
-<?=3D$submit?>
-<?=20
+<?php echo $submit?>
+<?php=20
    echo  HtmlInput::button('receipt_hide_bt','Annuler','onclick=3D"$(\'d=
iv_receipt\').hide();"');
 ?>
=20

Modified: trunk/tools/include/template/result_receipt.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/template/result_receipt.php	2013-05-15 18:50:38 U=
TC (rev 502)
+++ trunk/tools/include/template/result_receipt.php	2013-05-16 22:42:11 U=
TC (rev 503)
@@ -13,15 +13,15 @@
 	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
 	$checkbox->value=3D$row['jr_id'];
 ?>
-<tr <?=3D$class?> >
-	<TD><?=3D$row['str_date']?></TD>
-	<td><?=3DHtmlInput::detail_op($row['jr_id'],$row['jr_internal'])?></td>
-	<td><?=3Dh($row['jr_comment'])?>
-	<td><?=3D$row['jr_pj_number']?></td>
-	<td class=3D"num"><?=3Dnbm($row['jr_montant'])?></td>
-	<td><?=3D$checkbox->input();?></td>
+<tr <?php echo $class?> >
+	<TD><?php echo $row['str_date']?></TD>
+	<td><?php echo HtmlInput::detail_op($row['jr_id'],$row['jr_internal'])?=
></td>
+	<td><?php echo h($row['jr_comment'])?>
+	<td><?php echo $row['jr_pj_number']?></td>
+	<td class=3D"num"><?php echo nbm($row['jr_montant'])?></td>
+	<td><?php echo $checkbox->input();?></td>
 	</tr>
-<?
+<?php=20
 endfor;
 ?>
 </table>

Modified: trunk/tools/include/template/search_box.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/template/search_box.php	2013-05-15 18:50:38 UTC (=
rev 502)
+++ trunk/tools/include/template/search_box.php	2013-05-16 22:42:11 UTC (=
rev 503)
@@ -1,31 +1,31 @@
 <FORM METHOD=3D"GET" onsubmit=3D"return validate();">
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 	<TR>
 	<TD>Choississez le journal</TD>
-	<td><?=3D$iledger->input()?></td>
+	<td><?php echo $iledger->input()?></td>
 	</TR>
 	<tr>
 	<TD>Date d=C3=A9but</TD>
-	<td><?=3D$idate_start->input()?></td>
+	<td><?php echo $idate_start->input()?></td>
 	</tr>
 	<tr>
 	<TD>Date fin</TD>
-	<td><?=3D$idate_end->input()?></td>
+	<td><?php echo $idate_end->input()?></td>
 	</tr>
 </table>
-	<?=3DHtmlInput::request_to_hidden(array('ac','plugin_code'));?>
-<?=3D$submit?>
+	<?php echo HtmlInput::request_to_hidden(array('ac','plugin_code'));?>
+<?php echo $submit?>
 </FORM>
 <script charset=3D"UTF8" lang=3D"javascript">
 	function validate() {
-		if ( check_date_id('<?=3D$idate_start->id?>') =3D=3D false ) {
+		if ( check_date_id('<?php echo $idate_start->id?>') =3D=3D false ) {
 			alert('Date de d=C3=A9but incorrecte');
-			$('<?=3D$idate_start->id?>').style.borderColor=3D'red';
+			$('<?php echo $idate_start->id?>').style.borderColor=3D'red';
 			return false;}
-		if ( check_date_id('<?=3D$idate_end->id?>') =3D=3D false ) {
+		if ( check_date_id('<?php echo $idate_end->id?>') =3D=3D false ) {
 			alert('Date de fin incorrecte');
-			$('<?=3D$idate_end->id?>').style.borderColor=3D'red';
+			$('<?php echo $idate_end->id?>').style.borderColor=3D'red';
 			return false;}
 	}
 </script>
\ No newline at end of file

Modified: trunk/tools/include/template/search_view.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/template/search_view.php	2013-05-15 18:50:38 UTC =
(rev 502)
+++ trunk/tools/include/template/search_view.php	2013-05-16 22:42:11 UTC =
(rev 503)
@@ -7,7 +7,7 @@
=20
 ?>
 <form method=3D"POST" id=3D"form1" onsubmit=3D"return confirm('Vous conf=
irmez?')">
-<?
+<?php=20
 	echo HtmlInput::extension();
 	echo HtmlInput::get_to_hidden(array('sa','ac'));
 	echo Dossier::hidden();
@@ -16,7 +16,7 @@
 <div id=3D"div_poste" class=3D"inner_box" style=3D"top:230;margin:5;over=
flow:visible;display:none;">
 	<h2 class=3D"info">Poste comptable </h2>
 	<p class=3D"notice">Changera dans les op=C3=A9rations s=C3=A9lectionn=C3=
=A9es le poste comptable.Attention, cela ne changera pas la fiche, soyez =
prudent</p>
-<?
+<?php=20
 	$target=3Dnew IPoste('tposte');
 	$source=3Dnew IPoste('sposte');
 	$target->set_attribute('gDossier',Dossier::id());
@@ -34,14 +34,14 @@
 <table>
 	<TR><TD>Changer le poste comptable </TD>
 	<TD>
-		<?=3D$source->input()?>
+		<?php echo $source->input()?>
  	<td> <span id=3D"sposte_label"></span></td>
 	<td>Par le poste comptable</td>
-	<td><?=3D$target->input()?></td>
+	<td><?php echo $target->input()?></td>
 	<td> <span id=3D"tposte_label"></span>'</td>
 	</TR>
-	<tr><TD><?=3DHtmlInput::submit('chg_poste','Changer le poste comptable'=
)?></TD>
-<td><?
+	<tr><TD><?php echo HtmlInput::submit('chg_poste','Changer le poste comp=
table')?></TD>
+<td><?php=20
 echo  HtmlInput::button('accounting_hide_bt','Annuler','onclick=3D"$(\'d=
iv_poste\').hide();"');
 ?>
 </TD>
@@ -52,7 +52,7 @@
 <div id=3D"div_card" class=3D"inner_box" style=3D"top:230;margin:5;overf=
low:visible;display:none;">
 <h2 class=3D"info">Changer  la fiche </h2>
 	<p class=3D"notice">Attention, dans les op=C3=A9rations s=C3=A9lectionn=
=C3=A9es cela changera la fiche et le poste comptable: ce sera celui de l=
a fiche qui sera utilis=C3=A9, soyez prudent</p>
-<?
+<?php=20
 	$csource=3Dnew ICard('csource');
   	$csource->set_attribute('label','csource_label');
 	$csource->set_dblclick("fill_ipopcard(this);");
@@ -75,20 +75,20 @@
 <table>
 <TR>
 	<TD>Changer</TD>
-	<TD><?=3D$csource->input();?></TD>
-	<td><?=3D$csource->search()?></td>
+	<TD><?php echo $csource->input();?></TD>
+	<td><?php echo $csource->search()?></td>
 	<td><span id=3D"csource_label"></span></td>
 </tr>
 <tr>
 	<TD>par </TD>
=20
-	<TD><?=3D$ctarget->input()?></TD>
-	<td><?=3D$ctarget->search()?></td>
+	<TD><?php echo $ctarget->input()?></TD>
+	<td><?php echo $ctarget->search()?></td>
 	<td><span id=3D"ctarget_label"></span></td>
 </tr>
 </table>
-	<? echo HtmlInput::submit('chg_card','Changer la fiche'); ?>
-<?
+	<?php echo HtmlInput::submit('chg_card','Changer la fiche'); ?>
+<?php=20
 echo  HtmlInput::button('card_hide_bt','Annuler','onclick=3D"$(\'div_car=
d\').hide();"');
 ?>
=20
@@ -96,7 +96,7 @@
 <div id=3D"div_card_account" class=3D"inner_box" style=3D"top:230;margin=
:5;overflow:visible;display:none;">
 <h2 class=3D"info">Changer un poste comptable par une fiche</h2>
 	<p class=3D"notice">Attention, dans les op=C3=A9rations s=C3=A9lectionn=
=C3=A9es, le poste comptable sera chang=C3=A9 par une fiche et par son po=
ste comptable, soyez prudent</p>
-<?
+<?php=20
 	$csource=3Dnew IPoste('csource1');
 	$csource->set_attribute('gDossier',Dossier::id());
 	$csource->set_attribute('jrn',0);
@@ -118,19 +118,19 @@
 <table>
 <TR>
 	<TD>Changer</TD>
-	<TD><?=3D$csource->input();?></TD>
+	<TD><?php echo $csource->input();?></TD>
 	<td><span id=3D"csource1_label"></span></td>
 </tr>
 <tr>
 	<TD>par </TD>
=20
-	<TD><?=3D$ctarget->input()?></TD>
-	<td><?=3D$ctarget->search()?></td>
+	<TD><?php echo $ctarget->input()?></TD>
+	<td><?php echo $ctarget->search()?></td>
 	<td><span id=3D"ctarget1_label"></span></td>
 </tr>
 </table>
-	<? echo HtmlInput::submit('chg_card_account','Changer le poste comptabl=
e par la fiche'); ?>
-<?
+	<?php echo HtmlInput::submit('chg_card_account','Changer le poste compt=
able par la fiche'); ?>
+<?php=20
 echo  HtmlInput::button('card_hide_bt','Annuler','onclick=3D"$(\'div_car=
d_account\').hide();"');
 ?>
=20
@@ -139,7 +139,7 @@
 <h2 class=3D"info">D=C3=A9placer dans un autre journal </h2>
 	<p class=3D"notice">Attention, pour les op=C3=A9rations s=C3=A9lectionn=
=C3=A9es,cela  transf=C3=A8rera les op=C3=A9rations vers le journal chois=
i mais il faut que ce journal soit de m=C3=AAme type (achat vers achat, v=
ente vers vente...), les pi=C3=A8ces justificatives ne seront pas mises =C3=
=A0 jour, soyez prudent</p>
=20
-<?
+<?php=20
 	$sql=3D"select jrn_def_id, '('||jrn_def_type||') '||jrn_def_name from j=
rn_def order by jrn_def_name asc";
 $aledger=3D$cn->make_array($sql);
 $sledger=3Dnew ISelect('sledger');
@@ -148,10 +148,10 @@
 $tledger->value=3D$aledger;
 ?>
 <p>
-Les op=C3=A9rations appartenant au journal <?=3D$sledger->input()?> vers=
 le journal <?=3D$tledger->input()?>
+Les op=C3=A9rations appartenant au journal <?php echo $sledger->input()?=
> vers le journal <?php echo $tledger->input()?>
 </p>
-	<? echo HtmlInput::submit('chg_ledger','D=C3=A9placer dans le journal')=
; ?>
-<?
+	<?php echo HtmlInput::submit('chg_ledger','D=C3=A9placer dans le journa=
l'); ?>
+<?php=20
 echo  HtmlInput::button('ledger_hide_bt','Annuler','onclick=3D"$(\'div_l=
edger\').hide();"');
 ?>
=20
@@ -171,7 +171,7 @@
 	<TH class=3D"num">Montant</TH>
 	<TH><INPUT TYPE=3D"CHECKBOX" onclick=3D"toggle_checkbox('form1')"></TH>
 </TR>
-<?
+<?php=20
 for ($i =3D 0;$i < $nb_row;$i++) :
 	$row=3D$cn->fetch_array($ret,$i);
 	$odd=3D($i%2=3D=3D0)?' class=3D"odd"':' class=3D"even"';
@@ -181,12 +181,12 @@
=20
=20
=20
-	<TR <?=3D$odd?> >
-	<TD><?=3D$row['str_jr_date']?></TD>
-	<td><?=3DHtmlInput::detail_op($row['jr_id'],$row['jr_internal'])?></td>
-	<td><?=3D$row['jr_pj_number']?></td>
-	<td><?=3D$row['jrn_def_name']?></td>
-	<td><?=3D$row['jr_comment']?></td>
+	<TR <?php echo $odd?> >
+	<TD><?php echo $row['str_jr_date']?></TD>
+	<td><?php echo HtmlInput::detail_op($row['jr_id'],$row['jr_internal'])?=
></td>
+	<td><?php echo $row['jr_pj_number']?></td>
+	<td><?php echo $row['jrn_def_name']?></td>
+	<td><?php echo $row['jr_comment']?></td>
=20
 <?php
 $positive=3D0;
@@ -200,8 +200,8 @@
             }
=20
 ?>
-	<td class=3D"num"><?=3D( $positive !=3D 0 )?"<font color=3D\"red\">  - =
".nbm($row['jr_montant'])."</font>":nbm($row['jr_montant'])?> </td>
-	<td><?=3D$checkbox->input();?></td>
+	<td class=3D"num"><?php echo ( $positive !=3D 0 )?"<font color=3D\"red\=
">  - ".nbm($row['jr_montant'])."</font>":nbm($row['jr_montant'])?> </td>
+	<td><?php echo $checkbox->input();?></td>
 	</TR>
 <?php
 endfor;

Modified: trunk/tools/include/template/tool_exercice_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/template/tool_exercice_input.php	2013-05-15 18:50=
:38 UTC (rev 502)
+++ trunk/tools/include/template/tool_exercice_input.php	2013-05-16 22:42=
:11 UTC (rev 503)
@@ -34,7 +34,7 @@
 				Exercice
 			</td>
 			<td>
-				<?=3D$exercice->input()?>
+				<?php echo $exercice->input()?>
 			</td>
 		</tr>
 		<tr>
@@ -42,7 +42,7 @@
 				Ann=C3=A9e
 			</td>
 			<td>
-				<?=3D$year->input()?>
+				<?php echo $year->input()?>
 			</td>
 		</tr>
 		<tr>
@@ -50,7 +50,7 @@
 				Nombre de mois
 			</td>
 			<td>
-				<?=3D$nb_month->input()?>
+				<?php echo $nb_month->input()?>
 			</td>
 		</tr>
 		<tr>
@@ -58,11 +58,11 @@
 				A partir du mois de
 			</td>
 			<td>
-				<?=3D$from->input()?>
+				<?php echo $from->input()?>
 			</td>
 		</tr>
 	</table>
-<?
+<?php=20
 echo HtmlInput::submit('save','Valider');
 echo HtmlInput::request_to_hidden(array('sa','ac','plugin_code','gDossie=
r'));
 ?>
@@ -70,18 +70,18 @@
 <script charset=3D"UTF8" lang=3D"javascript">
 	function validate()
 	{
-		if (trim($('<?=3D$exercice->id?>').value)=3D=3D'') {
-						$('<?=3D$exercice->id?>').style.borderColor=3D'red';
+		if (trim($('<?php echo $exercice->id?>').value)=3D=3D'') {
+						$('<?php echo $exercice->id?>').style.borderColor=3D'red';
 						alert('Exercice invalide');
 						return false;
 					}
-		if (trim($('<?=3D$nb_month->id?>').value)=3D=3D'') {
-						$('<?=3D$nb_month->id?>').style.borderColor=3D'red';
+		if (trim($('<?php echo $nb_month->id?>').value)=3D=3D'') {
+						$('<?php echo $nb_month->id?>').style.borderColor=3D'red';
 						alert('Nombre de mois invalide');
 						return false;
 					}
-		if (trim($('<?=3D$year->id?>').value)=3D=3D'') {
-						$('<?=3D$year->id?>').style.borderColor=3D'red';
+		if (trim($('<?php echo $year->id?>').value)=3D=3D'') {
+						$('<?php echo $year->id?>').style.borderColor=3D'red';
 						alert('Ann=C3=A9e invalide');
 						return false;
 					}

Modified: trunk/tools/tools_constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/tools_constant.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/tools/tools_constant.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 /**
  *@file
  *Contains all the needed variable for the plugin

Modified: trunk/tva/form_decl.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/form_decl.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/tva/form_decl.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -14,7 +14,7 @@
 A. Op=C3=A9rations soumises =C3=A0 un r=C3=A9gime particulier [00]
 </td>
 <td>
-<?=3D$str_00;?>
+<?php echo $str_00;?>
 </td>
 </tr><tr>
 <td>
@@ -22,43 +22,43 @@
  </tr><tr>
  <td>&nbsp;&nbsp;&nbsp;&nbsp;- au taux de 6% [01]</td>
 <td>
-<?=3D$str_01;?>
+<?php echo $str_01;?>
 </td>
  </tr><tr><td>&nbsp;&nbsp;&nbsp;&nbsp;- au taux de 12% [02]</td>
 <td>
-<?=3D$str_02;?>
+<?php echo $str_02;?>
 </td>
  </tr><tr><td>&nbsp;&nbsp;&nbsp;&nbsp;- au taux de 21% [03] </td>
 <td>
-<?=3D$str_03;?>
+<?php echo $str_03;?>
 </td>
 </tr><tr>
 <td>
 C. Services pour lesquels la T.V.A. =C3=A9trang=C3=A8re est due par le c=
ocontractant [44]
 </td>
 <td>
-<?=3D$str_44;?>
+<?php echo $str_44;?>
 </td>
 </tr><tr>
 <td>
 D. Op=C3=A9rations pour lesquelles la T.V.A. est due par le cocontractan=
t [45]
 </td>
 <td>
-<?=3D$str_45;?>
+<?php echo $str_45;?>
 </td>
 </tr><tr>
 <td>
 E. Livraisons intracommunautaires exempt=C3=A9es effectu=C3=A9es en Belg=
ique et ventes ABC [46]
 </td>
 <td>
-<?=3D$str_46;?>
+<?php echo $str_46;?>
 </td>
 </tr><tr>
 <td>
  F. Autres op=C3=A9rations exempt=C3=A9es et autres op=C3=A9rations effe=
ctu=C3=A9es =C3=A0 l'=C3=A9tranger [47]
 </td>
 <td>
-<?=3D$str_47;?>
+<?php echo $str_47;?>
 </td>
 </tr><tr>
 <td>
@@ -66,13 +66,13 @@
  </tr><tr>
  <td>&nbsp;&nbsp;&nbsp;&nbsp;- relatif aux op=C3=A9rations inscrites en =
grilles 44 et 46 [48] </td>
 <td>
-<?=3D$str_48;?>
+<?php echo $str_48;?>
 </td>
=20
  </tr><tr>
  <td>&nbsp;&nbsp;&nbsp;&nbsp;- relatif aux autres op=C3=A9rations du cad=
re II [49]</td>
 <td>
-<?=3D$str_49;?>
+<?php echo $str_49;?>
 </td>
=20
  </tr><tr>
@@ -86,19 +86,19 @@
 <tr>
 <td>&nbsp;&nbsp;&nbsp;&nbsp;- marchandises, mati=C3=A8res premi=C3=A8res=
 et mati=C3=A8res auxiliaires [81] </td>
 <td>
-<?=3D$str_81;?>
+<?php echo $str_81;?>
 </td>
 </tr>
 <tr>
 <td>&nbsp;&nbsp;&nbsp;&nbsp;- services et biens divers [82]  </td>
 <td>
-<?=3D$str_82;?>
+<?php echo $str_82;?>
 </td>
 </tr>
 <tr>
 <td>&nbsp;&nbsp;&nbsp;&nbsp;- biens d'investissement [83]  </td>
 <td>
-<?=3D$str_83;?>
+<?php echo $str_83;?>
 </td>
 </tr>
 <tr>
@@ -107,29 +107,29 @@
 <tr>
 <td>&nbsp;&nbsp;&nbsp;&nbsp;- relatif aux op=C3=A9rations inscrites en g=
rilles 86 et 88 [84]  </td>
 <td>
-<?=3D$str_84;?>
+<?php echo $str_84;?>
 </td>
 </tr>
 <tr>
 <td>&nbsp;&nbsp;&nbsp;&nbsp;- relatif aux autres op=C3=A9rations du cadr=
e III [85]  </td>
 <td>
-<?=3D$str_85;?>
+<?php echo $str_85;?>
 </td>
 </tr>
 <tr>
 <td>C. Acquisitions intracommunautaires effectu=C3=A9es en Belgique et v=
entes ABC [86] </td>
 <td>
-<?=3D$str_86;?>
+<?php echo $str_86;?>
 </td>
 </tr>
 <tr>
 <td>
 D. Autres op=C3=A9rations =C3=A0 l'entr=C3=A9e pour lesquelles la T.V.A.=
 est due par le d=C3=A9clarant [87] </td>
-<td><?=3D$str_87?></td>
+<td><?php echo $str_87?></td>
 </tr><tr>
 <td> E. Services intracommunautaires avec report de perception [88]</td>
 <td>
-<?=3D$str_88?>
+<?php echo $str_88?>
 </td>
 </table>
=20
@@ -140,42 +140,42 @@
 <tr>
 <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;-grilles 01, 02 et 03 [54]</td>
 <td>
-<?=3D$str_54;?>
+<?php echo $str_54;?>
 </td>
 </tr>
 <td>&nbsp;&nbsp;&nbsp;&nbsp;- grilles 86 et 88 [55] </td>
 <td>
-<?=3D$str_55;?>
+<?php echo $str_55;?>
 </td>
 </tr>
 <tr>
 <tr>
 <td>&nbsp;&nbsp;&nbsp;&nbsp;- grille 87, =C3=A0 l'exception des importat=
ions avec report de perception [56] </td>
-<td><?=3D$str_56;?></td>
+<td><?php echo $str_56;?></td>
 </tr>
 <tr>
 <td>
 B. T.V.A. relative aux importations avec report de perception [57] </td>
-<td><?=3D$str_57;?></td>
+<td><?php echo $str_57;?></td>
 </tr>
 <tr>
 <td>
=20
 C. Diverses r=C3=A9gularisations T.V.A. en faveur de l'Etat [61]</td>
-<td><?=3D$str_61?></td>
+<td><?php echo $str_61?></td>
 </tr>
 <tr>
 <td>
 D. T.V.A. =C3=A0 reverser mentionn=C3=A9e sur les notes de cr=C3=A9dit r=
e=C3=A7ues [63]
 </td>
-<td><?=3D$str_63;?></td>
+<td><?php echo $str_63;?></td>
 </tr>
 <tr>
 <td>
 Total des grilles 54, 55, 56, 57, 61 et 63 [XX]
 </td>
 <td>
-<?=3D$str_xx;?>
+<?php echo $str_xx;?>
 </td>
 </tr>
 </table>
@@ -186,28 +186,28 @@
 A.T.V.A. d=C3=A9ductible  [59]
 </td>
 <td>
-<?=3D$str_59;?>
+<?php echo $str_59;?>
 </td>
 </tr>
 <tr>
 <td>B.Diverses r=C3=A9gularisations T.V.A. en faveur du d=C3=A9clarant  =
[62]
 </td>
 <td>
-<?=3D$str_62;?>
+<?php echo $str_62;?>
 </td>
 </tr>
 <tr>
 <td>C.T.V.A. =C3=A0 r=C3=A9cup=C3=A9rer mentionn=C3=A9e sur les notes de=
 cr=C3=A9dit d=C3=A9livr=C3=A9es [64]
 </td>
 <td>
-<?=3D$str_64;?>
+<?php echo $str_64;?>
 </td>
 </tr>
 <tr>
 <td>
 Total des grilles 59, 62 et 64[yy]
 </td>
-<td><?=3D$str_yy;?></td>
+<td><?php echo $str_yy;?></td>
 </tr>
 </table>
=20
@@ -215,11 +215,11 @@
 <table>
 <tr>
 <td>Taxe due =C3=A0 l'Etat : grille xx - grille yy [71]</td>
-<td><?=3D$str_71;?></td>
+<td><?php echo $str_71;?></td>
 </tr>
 <tr>
 <td>Sommes dues par l'Etat : grille yy - grille xx [72]</td>
-<td><?=3D$str_72;?></td>
+<td><?php echo $str_72;?></td>
 </tr>
 </table>
 <span class=3D"notice">*Une seule des grilles 71 ou 72 peut =C3=AAtre re=
mplie </span>
@@ -230,7 +230,7 @@
 <td>
 T.V.A. r=C3=A9ellement due pour la p=C3=A9riode du 1er au 20 d=C3=A9cemb=
re[91]
 </td>
-<td><?=3D$str_91;?></td>
+<td><?php echo $str_91;?></td>
 </tr>
 </table>
 <span class=3D"notice">*Concerne uniquement la d=C3=A9claration mensuell=
e de d=C3=A9cembre</span>

Modified: trunk/tva/form_decl_info.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/form_decl_info.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/tva/form_decl_info.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -2,29 +2,29 @@
=20
 <table>
 <tr>
-<td>Ann=C3=A9e</td><td> <?=3D$ianne?></td>
+<td>Ann=C3=A9e</td><td> <?php echo $ianne?></td>
 </tr>
-<?if (isset ($str_date)) :?>
+<?php if (isset ($str_date)) :?>
 <tr>
-<td>Date </td><td><?=3D$str_date?></td>
+<td>Date </td><td><?php echo $str_date?></td>
 </tr>
 <tr>
-<td>P=C3=A9riode d=C3=A9but </td><td><?=3D$str_start?></td>
+<td>P=C3=A9riode d=C3=A9but </td><td><?php echo $str_start?></td>
 </tr>
 <tr>
-<td>P=C3=A9riode fin </td><td><?=3D$str_end?></td>
+<td>P=C3=A9riode fin </td><td><?php echo $str_end?></td>
 </tr>
-<?
+<?php=20
 endif;
 ?>
 <td>N=C2=B0 de tva </td>
-<td><?=3D$str_tva?></td>
+<td><?php echo $str_tva?></td>
 </tr><tr>
-<td>Nom</td><td><?=3D$str_name?></td>
+<td>Nom</td><td><?php echo $str_name?></td>
 </tr><tr>
-<td>Adresse</td><td><?=3D$str_adress?></td>
+<td>Adresse</td><td><?php echo $str_adress?></td>
 </tr><tr>
-<td>Pays code postal et localite BE</td><td><?=3D$str_country?></td>
+<td>Pays code postal et localite BE</td><td><?php echo $str_country?></t=
d>
 </tr>
 </tr>
=20

Modified: trunk/tva/form_parameter.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/form_parameter.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/tva/form_parameter.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -47,7 +47,7 @@
 	echo HtmlInput::button("add_param","Ajout param=C3=A8tre","onclick=3D\"=
show_addparam('$p_code','$plugin_code','$dossier','$tab');\"");
 }
 ?>
-<?
+<?php=20
 	$tab_default=3D(isset ($_REQUEST['tab']))?$_REQUEST['tab']:'opout';
 ?>
 <a href=3D"javascript:void(0)" class=3D"line" onclick=3D"tva_show_param(=
'opout')">Op=C3=A9ration =C3=A0 la sortie</a>&nbsp;
@@ -58,69 +58,69 @@
 <a href=3D"javascript:void(0)" class=3D"line" onclick=3D"tva_show_param(=
'assujetti')">Listing Client assujetti.</a>&nbsp;
 <a href=3D"javascript:void(0)" class=3D"line" onclick=3D"tva_show_param(=
'divers')">Divers</a>
 <form method=3D"POST">
-	<?
+	<?php=20
 	echo HtmlInput::hidden('tab',$tab_default);
 	echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_code','=
sa'));
 	?>
 <div style=3D"display:none" id=3D"opout">
-<h1><?=3D_("Op=C3=A9ration =C3=A0 la sortie");?></h1>
-<? $tab=3D"opout";?>
-<?=3Dshow("GRIL00",_("Grille 00 : op=C3=A9rations soumises =C3=A0 un r=C3=
=A9gime particulier"))?>
-<?=3Dshow("GRIL01",_("Grille 01 : Op=C3=A9rations pour lesquelles la TVA=
 est due (6%)"))?>
-<?=3Dshow("GRIL02",_("Grille 02 : Op=C3=A9rations pour lesquelles la TVA=
 est due (12%)"))?>
-<?=3Dshow("GRIL03",_("Grille 03 : Op=C3=A9rations pour lesquelles la TVA=
 est due (21%)"))?>
-<?=3Dshow("GRIL44",_("Grille 44 : Op=C3=A9rations pour lesquelles la TVA=
 =C3=A9trang=C3=A8re est due par le cocontractant"))?>
-<?=3Dshow("GRIL45",_("Grille 45 : Op=C3=A9rations pour lesquelles la TVA=
 est due par le cocontractant"))?>
-<?=3Dshow("GRIL46",_("Grille 46 : Livraisons intracommunautaires exempt=C3=
=A9es effectu=C3=A9es en Belgique et ventes ABC"))?>
-<?=3Dshow("GRIL47",_("Grille 47 :Autres op=C3=A9rations exempt=C3=A9es e=
t autres op=C3=A9rations effectu=C3=A9es =C3=A0 l=E2=80=99=C3=A9tranger")=
)?>
-<?=3Dshow("GRIL48",_("Grille 48 : Op=C3=A9rations relatives aux notes de=
 cr=C3=A9dit des grilles 44 et 48"))?>
-<?=3Dshow("GRIL49",_("Grille 49 : Op=C3=A9rations relatives aux notes de=
 cr=C3=A9dit"))?>
+<h1><?php echo _("Op=C3=A9ration =C3=A0 la sortie");?></h1>
+<?php $tab=3D"opout";?>
+<?php echo show("GRIL00",_("Grille 00 : op=C3=A9rations soumises =C3=A0 =
un r=C3=A9gime particulier"))?>
+<?php echo show("GRIL01",_("Grille 01 : Op=C3=A9rations pour lesquelles =
la TVA est due (6%)"))?>
+<?php echo show("GRIL02",_("Grille 02 : Op=C3=A9rations pour lesquelles =
la TVA est due (12%)"))?>
+<?php echo show("GRIL03",_("Grille 03 : Op=C3=A9rations pour lesquelles =
la TVA est due (21%)"))?>
+<?php echo show("GRIL44",_("Grille 44 : Op=C3=A9rations pour lesquelles =
la TVA =C3=A9trang=C3=A8re est due par le cocontractant"))?>
+<?php echo show("GRIL45",_("Grille 45 : Op=C3=A9rations pour lesquelles =
la TVA est due par le cocontractant"))?>
+<?php echo show("GRIL46",_("Grille 46 : Livraisons intracommunautaires e=
xempt=C3=A9es effectu=C3=A9es en Belgique et ventes ABC"))?>
+<?php echo show("GRIL47",_("Grille 47 :Autres op=C3=A9rations exempt=C3=A9=
es et autres op=C3=A9rations effectu=C3=A9es =C3=A0 l=E2=80=99=C3=A9trang=
er"))?>
+<?php echo show("GRIL48",_("Grille 48 : Op=C3=A9rations relatives aux no=
tes de cr=C3=A9dit des grilles 44 et 48"))?>
+<?php echo show("GRIL49",_("Grille 49 : Op=C3=A9rations relatives aux no=
tes de cr=C3=A9dit"))?>
 </div>
 <div style=3D"display:none" id=3D"opin">
-	<? $tab=3D"opin";?>
-<h1><?=3D_("Op=C3=A9ration =C3=A0 l'entr=C3=A9e");?></h1>
-<?=3Dshow("GRIL81",_("Grille 81 : Op=C3=A9ration sur les marchandises, m=
ati=C3=A8res premi=C3=A8res..."))?>
-<?=3Dshow("GRIL82",_("Grille 82 : Op=C3=A9ration sur les services et bie=
ns divers"))?>
-<?=3Dshow("GRIL83",_("Grille 83 : Op=C3=A9ration sur les biens d'investi=
ssements"))?>
-<?=3Dshow("GRIL84",_("Grille 84 : Montant des notes de cr=C3=A9dit re=C3=
=A7ues et des corrections n=C3=A9gatives relatif aux op=C3=A9rations insc=
rites en grilles 86 et 88"))?>
-<?=3Dshow("GRIL85",_("Grille 85 : Montant des notes de cr=C3=A9dit re=C3=
=A7ues et des corrections n=C3=A9gatives relatif aux autres op=C3=A9ratio=
ns du cadre III  "))?>
-<?=3Dshow("GRIL86",_("Grille 86 : Acquisitions intracommunautaires effec=
tu=C3=A9es en Belgique et ventes ABC  "))?>
-<?=3Dshow("GRIL87",_(" Autres op=C3=A9rations =C3=A0 l'entr=C3=A9e pour =
lesquelles la T.V.A. est due par le d=C3=A9clarant "))?>
-<?=3Dshow("GRIL88",_("Services intracommunautaires avec report de percep=
tion"))?>
+	<?php $tab=3D"opin";?>
+<h1><?php echo _("Op=C3=A9ration =C3=A0 l'entr=C3=A9e");?></h1>
+<?php echo show("GRIL81",_("Grille 81 : Op=C3=A9ration sur les marchandi=
ses, mati=C3=A8res premi=C3=A8res..."))?>
+<?php echo show("GRIL82",_("Grille 82 : Op=C3=A9ration sur les services =
et biens divers"))?>
+<?php echo show("GRIL83",_("Grille 83 : Op=C3=A9ration sur les biens d'i=
nvestissements"))?>
+<?php echo show("GRIL84",_("Grille 84 : Montant des notes de cr=C3=A9dit=
 re=C3=A7ues et des corrections n=C3=A9gatives relatif aux op=C3=A9ration=
s inscrites en grilles 86 et 88"))?>
+<?php echo show("GRIL85",_("Grille 85 : Montant des notes de cr=C3=A9dit=
 re=C3=A7ues et des corrections n=C3=A9gatives relatif aux autres op=C3=A9=
rations du cadre III  "))?>
+<?php echo show("GRIL86",_("Grille 86 : Acquisitions intracommunautaires=
 effectu=C3=A9es en Belgique et ventes ABC  "))?>
+<?php echo show("GRIL87",_(" Autres op=C3=A9rations =C3=A0 l'entr=C3=A9e=
 pour lesquelles la T.V.A. est due par le d=C3=A9clarant "))?>
+<?php echo show("GRIL88",_("Services intracommunautaires avec report de =
perception"))?>
 </div>
 <div style=3D"display:none" id=3D"tvadue">
-<? $tab=3D"tvadue";?>
-<h1><?=3D_("TVA Due");?></h1>
-<?=3Dshow("GRIL54",_("Grille 54 : tva due sur op=C3=A9ration grille 01,0=
2 et 03"))?>
-<?=3Dshow("GRIL55",_("Grille 55 : tva due sur op=C3=A9ration grille 86 e=
t 88"))?>
-<?=3Dshow("GRIL56",_("Grille 56 : tva due sur op=C3=A9ration grille 87")=
)?>
-<?=3Dshow("GRIL57",_("Grille 57 :T.V.A. relative aux importations avec r=
eport de perception "))?>
-<?=3Dshow("GRIL61",_("Grille 61 :Diverses r=C3=A9gularisations T.V.A. en=
 faveur de l'Etat"))?>
-<?=3Dshow("GRIL63",_("Grille 63 :T.V.A. =C3=A0 reverser mentionn=C3=A9e =
sur les notes de cr=C3=A9dit re=C3=A7ues"))?>
+<?php $tab=3D"tvadue";?>
+<h1><?php echo _("TVA Due");?></h1>
+<?php echo show("GRIL54",_("Grille 54 : tva due sur op=C3=A9ration grill=
e 01,02 et 03"))?>
+<?php echo show("GRIL55",_("Grille 55 : tva due sur op=C3=A9ration grill=
e 86 et 88"))?>
+<?php echo show("GRIL56",_("Grille 56 : tva due sur op=C3=A9ration grill=
e 87"))?>
+<?php echo show("GRIL57",_("Grille 57 :T.V.A. relative aux importations =
avec report de perception "))?>
+<?php echo show("GRIL61",_("Grille 61 :Diverses r=C3=A9gularisations T.V=
.A. en faveur de l'Etat"))?>
+<?php echo show("GRIL63",_("Grille 63 :T.V.A. =C3=A0 reverser mentionn=C3=
=A9e sur les notes de cr=C3=A9dit re=C3=A7ues"))?>
 </div>
 <div style=3D"display:none" id=3D"tvaded">
-	<? $tab=3D"tvaded";?>
-<h1> <?=3D_("TVA D=C3=A9ductible");?></h1>
-<?=3Dshow("GRIL59",_("Grille 59 : taxe d=C3=A9ductible"))?>
-<?=3Dshow("GRIL62",_("Grille 62 : Diverses r=C3=A9gularisations T.V.A. e=
n faveur du d=C3=A9clarant"))?>
-<?=3Dshow("GRIL64",_("Grille 56 : T.V.A. =C3=A0 r=C3=A9cup=C3=A9rer ment=
ionn=C3=A9e sur les notes de cr=C3=A9dit d=C3=A9livr=C3=A9es "))?>
+	<?php $tab=3D"tvaded";?>
+<h1> <?php echo _("TVA D=C3=A9ductible");?></h1>
+<?php echo show("GRIL59",_("Grille 59 : taxe d=C3=A9ductible"))?>
+<?php echo show("GRIL62",_("Grille 62 : Diverses r=C3=A9gularisations T.=
V.A. en faveur du d=C3=A9clarant"))?>
+<?php echo show("GRIL64",_("Grille 56 : T.V.A. =C3=A0 r=C3=A9cup=C3=A9re=
r mentionn=C3=A9e sur les notes de cr=C3=A9dit d=C3=A9livr=C3=A9es "))?>
 </div>
 <div style=3D"display:none" id=3D"divers">
-	<? $tab=3D"divers";?>
+	<?php $tab=3D"divers";?>
 <fieldset>
-<legend><?=3D_('Divers')?></legend>
+<legend><?php echo _('Divers')?></legend>
=20
=20
 <TABLE class=3D"result">
 <TR>
-	<TH><?=3D_('Poste comptable')?></TH>
-	<TH><?=3D_('Description')?></TH>
+	<TH><?php echo _('Poste comptable')?></TH>
+	<TH><?php echo _('Description')?></TH>
 	<th></th>
 </TR>
 <TR>
=20
 	<TD>
-	<?
+	<?php=20
 	$atva=3D$cn->get_value("select pcm_val from tva_belge.parameter_chld wh=
ere pcode=3D'ATVA'");
 	$ip_tva=3Dnew IPoste('ATVA',$atva);
 	$ip_tva->set_attribute('gDossier',Dossier::id());
@@ -132,13 +132,13 @@
 	?>
 	</TD>
 	<TD>
-		<SPAN ID=3D"ATVA_label"><?=3Dh($lib)?></SPAN>
+		<SPAN ID=3D"ATVA_label"><?php echo h($lib)?></SPAN>
 	</td>
-	<?=3Dtd(_("Poste comptable utilis=C3=A9 pour les avances faites =C3=A0 =
la TVA"))?>
+	<?php echo td(_("Poste comptable utilis=C3=A9 pour les avances faites =C3=
=A0 la TVA"))?>
 </tr>
 <TR>
 	<TD>
-	<?
+	<?php=20
 	$crtva=3D$cn->get_value("select pcm_val from tva_belge.parameter_chld w=
here pcode=3D'CRTVA'");
 	$ip_tva=3Dnew IPoste('CRTVA',$crtva);
 	$ip_tva->set_attribute('gDossier',Dossier::id());
@@ -150,13 +150,13 @@
 	?>
 	</TD>
 	<TD>
-		<SPAN ID=3D"CRTVA_label"><?=3Dh($lib)?></SPAN>
+		<SPAN ID=3D"CRTVA_label"><?php echo h($lib)?></SPAN>
 	</td>
-<?=3Dtd(("Poste comptable utilis=C3=A9 pour les cr=C3=A9ances sur la  TV=
A"))?>
+<?php echo td(("Poste comptable utilis=C3=A9 pour les cr=C3=A9ances sur =
la  TVA"))?>
 </tr>
 <TR>
 <TD>
-	<?
+	<?php=20
 	$dttva=3D$cn->get_value("select pcm_val from tva_belge.parameter_chld w=
here pcode=3D'DTTVA'");
 	$ip_tva=3Dnew IPoste('DTTVA',$dttva);
 	$ip_tva->set_attribute('gDossier',Dossier::id());
@@ -168,28 +168,28 @@
 	?>
 	</TD>
 	<TD>
-		<SPAN ID=3D"DTTVA_label"><?=3Dh($lib)?></SPAN>
+		<SPAN ID=3D"DTTVA_label"><?php echo h($lib)?></SPAN>
 	</td>
-	<?=3Dtd(_("Poste comptable utilis=C3=A9 pour les dettes envers la TVA")=
)?>
+	<?php echo td(_("Poste comptable utilis=C3=A9 pour les dettes envers la=
 TVA"))?>
 </tr>
=20
 </TABLE>
-	<?=3DHtmlInput::submit("save_misc","Sauver")?>
+	<?php echo HtmlInput::submit("save_misc","Sauver")?>
 </fieldset>
 </div>
 <div style=3D"display:none" id=3D"lintra">
-	<? $tab=3D"lintra";?>
+	<?php $tab=3D"lintra";?>
 <fieldset><legend>Listing intracommunautaires</legend>
-<?=3Dshow("CLINTRA",_("Code TVA pour clients  Intracommunataire"))?>
+<?php echo show("CLINTRA",_("Code TVA pour clients  Intracommunataire"))=
?>
 </fieldset>
 </div>
 	<div style=3D"display:none" id=3D"assujetti">
-	<? $tab=3D"assujetti";?>
+	<?php $tab=3D"assujetti";?>
 <fieldset><legend>Listing Client nationaux</legend>
-<?=3Dshow("ASSUJETTI",_("Code TVA pour clients  nationaux"))?>
+<?php echo show("ASSUJETTI",_("Code TVA pour clients  nationaux"))?>
 </fieldset>
 </div>
 	</form>
 <script charset=3D"UTF-8" lang=3D"javascript">
-	tva_show_param('<?=3D$tab_default?>');
+	tva_show_param('<?php echo $tab_default?>');
 	</script>

Modified: trunk/tva/form_periode.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/form_periode.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/tva/form_periode.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -1,21 +1,21 @@
 <fieldset>
 <legend>
-   <?=3D_('Entrez la p=C3=A9riode de la d=C3=A9claration')?>
+   <?php echo _('Entrez la p=C3=A9riode de la d=C3=A9claration')?>
 </legend>
 <form class=3D"print" method=3D"GET">
-<?=3D_('Ann=C3=A9e')?> <?=3D$str_year?><br/>
-<?=3D$str_monthly?>   <?=3D_('Mois')?> : <?=3D$str_month?><br/>
-<?=3D$str_quaterly?>   <?=3D_('Trimestre')?> : <?=3D$str_quater?><br/>
-<?=3D$str_hidden?>
+<?php echo _('Ann=C3=A9e')?> <?php echo $str_year?><br/>
+<?php echo $str_monthly?>   <?php echo _('Mois')?> : <?php echo $str_mon=
th?><br/>
+<?php echo $str_quaterly?>   <?php echo _('Trimestre')?> : <?php echo $s=
tr_quater?><br/>
+<?php echo $str_hidden?>
 <?php
 if (isset ($by_year) && $by_year =3D=3D true ) :
 ?>
-<?=3D_('Par ann=C3=A9e')?> <?=3D$str_byyear?><br/>
+<?php echo _('Par ann=C3=A9e')?> <?php echo $str_byyear?><br/>
 <?php
 echo HtmlInput::request_to_hidden(array('ac'));
 endif;
 ?>
 <br>
-<?=3D$str_submit?>
+<?php echo $str_submit?>
 </form>
 </fieldset>
\ No newline at end of file

Modified: trunk/tva/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/index.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/tva/index.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -105,7 +105,7 @@
 echo ShowItem($array,'H',"mtitle","mtitle",$def,' style=3D"width:80%;mar=
gin-left:10%;border-spacing:5;" ');
 ?>
 <div class=3D"content" style=3D"margin-left: 30px">
-<?
+<?php=20
 // include the right file
 if ($def=3D=3D1) {
   require_once('decl_tva.inc.php');

Modified: trunk/tva/list_tva.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/list_tva.inc.php	2013-05-15 18:50:38 UTC (rev 502)
+++ trunk/tva/list_tva.inc.php	2013-05-16 22:42:11 UTC (rev 503)
@@ -123,12 +123,12 @@
 	<tr>
 		<th>Type de d=C3=A9claration</th>
 		<th>Periodicit=C3=A9</th>
-		<th> <?=3D$sort->get_header(1)?></th>
-		<th><?=3D$sort->get_header(0)?></th>
+		<th> <?php echo $sort->get_header(1)?></th>
+		<th><?php echo $sort->get_header(0)?></th>
=20
-		<? for ($i =3D 0; $i < count($res); $i++):?>
+		<?php for ($i =3D 0; $i < count($res); $i++):?>
 		<tr>
-			<?
+			<?php=20
 			$aref =3D sprintf('<a href=3D"javascript:void(0)" onclick=3D"show_dec=
laration(\'%s\',\'%s\')">', $res[$i]['type_decl'], $res[$i]['id']);
 			echo td($aref . $res[$i]['type_title'] . '</a>');
 			echo td($aref . $res[$i]['fmt_periodicity'] . '</a>');
@@ -136,7 +136,7 @@
 			echo td($aref.$res[$i]['date_fmt'].'</a>');
 			?>
 		</tr>
-	<? endfor;?>
+	<?php endfor;?>
 </table>
 </div>
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 18:45:10 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud6v8-00087s-Lw
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 18:45:10 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 17 May 2013 00:43:26 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348705.1368744309.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5277 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 22:45:09 -0000

Author: danydb
Date: 2013-05-17 00:43:26 +0200 (Fri, 17 May 2013)
New Revision: 5277

Modified:
   phpcompta/trunk/include/param_pcmn.inc.php
Log:
split est d?\195?\169pr?\195?\169ci?\195?\169, remplac?\195?\169 par expl=
ode

Modified: phpcompta/trunk/include/param_pcmn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_pcmn.inc.php	2013-05-16 22:32:49 UTC (r=
ev 5276)
+++ phpcompta/trunk/include/param_pcmn.inc.php	2013-05-16 22:43:26 UTC (r=
ev 5277)
@@ -309,7 +309,7 @@
 	echo $td;
 	if ( strlen($A['acode']) >0 ) {
 		if (strpos($A['acode'], ",") >0 ) {
-			$det_qcode=3D  split(",", $A['acode']);
+			$det_qcode=3D  explode(",", $A['acode']);
 			echo '<ul style=3D"paddding:0;margin:0;padding-left:0;list-style-type=
:none;padding-start-value:0">';
 			$max=3D(count($det_qcode)>MAX_QCODE)?MAX_QCODE:count($det_qcode);
 			for ($e=3D0;$e<$max;$e++) {



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 18:45:58 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud6vt-0008CW-RY
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 18:45:57 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 17 May 2013 00:44:15 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348706.1368744356.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r504 - trunk/import_account/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 22:45:56 -0000

Author: danydb
Date: 2013-05-17 00:44:15 +0200 (Fri, 17 May 2013)
New Revision: 504

Modified:
   trunk/import_account/include/template/input_file.php
   trunk/import_account/include/template/parameter.php
   trunk/import_account/include/template/parameter_tva_add.php
   trunk/import_account/include/template/test_file.php
   trunk/import_account/include/template/test_operation.php
   trunk/import_account/include/template/upload_operation.php
Log:
Task #0000839: R?\195?\169?\195?\169criture de la proc?\195?\169dure d'in=
stallation


Tous les tags <? ont ?\195?\169t?\195?\169 chang?\195?\169s en <?php pour=
 les servers mutualis?\195?\169s

Modified: trunk/import_account/include/template/input_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/template/input_file.php	2013-05-16 22:42=
:11 UTC (rev 503)
+++ trunk/import_account/include/template/input_file.php	2013-05-16 22:44=
:15 UTC (rev 504)
@@ -10,24 +10,24 @@
    Par d=C3=A9faut, correspond =C3=A0 un export CSV depuis Calc (OpenOff=
ice.org ou libreoffice);
 </p>
 <form method=3D"POST" enctype=3D"multipart/form-data">
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
-<td>D=C3=A9limiteur </td><TD> <? echo $delimiter->input()?></td>
+<td>D=C3=A9limiteur </td><TD> <?php echo $delimiter->input()?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><TD> <? echo $file->input()?></td>
+<td>Fichier =C3=A0 charger</td><TD> <?php echo $file->input()?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><TD> <? echo $fd->input();?></td>
+<td>Cat=C3=A9gorie de fiche</td><TD> <?php echo $fd->input();?></td>
 </tr>
 <tr>
-<td>Encodage unicode</td><TD> <? echo $encodage->input()?></td>
+<td>Encodage unicode</td><TD> <?php echo $encodage->input()?></td>
 </tr>
 <tr>
 <td>  Texte entour=C3=A9 du signe </td><TD><input type=3D"text" name=3D"=
rsurround" value=3D'"' size=3D"1"></td>
 </tr>
 </table>
-<? echo HtmlInput::submit('test_import','Valider');?>
+<?php echo HtmlInput::submit('test_import','Valider');?>
=20
 </form>

Modified: trunk/import_account/include/template/parameter.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/template/parameter.php	2013-05-16 22:42:=
11 UTC (rev 503)
+++ trunk/import_account/include/template/parameter.php	2013-05-16 22:44:=
15 UTC (rev 504)
@@ -1,5 +1,5 @@
=20
-<?
+<?php=20
 	$bt=3Dnew IButton("but_tva_add");
 	$bt->label=3D"Ajout d'une correspondance";
 	$bt->javascript=3D" $('dtvaadd').show()";
@@ -9,7 +9,7 @@
 <table class=3D"result" style=3D"width:60%;margin-left:20%">
 	<tr>
 		<th>Fiche TVA</th>
-		<th>Taux correspondant <?=3DHtmlInput::infobulle(50)?></th>
+		<th>Taux correspondant <?php echo HtmlInput::infobulle(50)?></th>
 	</tr>
 	<?php
 	for ($i =3D 0; $i < count($atva); $i++):

Modified: trunk/import_account/include/template/parameter_tva_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/template/parameter_tva_add.php	2013-05-1=
6 22:42:11 UTC (rev 503)
+++ trunk/import_account/include/template/parameter_tva_add.php	2013-05-1=
6 22:44:15 UTC (rev 504)
@@ -36,21 +36,21 @@
 					TVA
 				</td>
 				<td>
-					<? $tva_id =3D new ITva_Popup('tva_id');
+					<?php $tva_id =3D new ITva_Popup('tva_id');
 					echo $tva_id->input()?>
 				</td>
 			</tr>
 			<tr>
 				<td>
-					Taux dans le fichier <?=3D HtmlInput::infobulle(50)?>
+					Taux dans le fichier <?php echo  HtmlInput::infobulle(50)?>
 				</td>
 				<td>
-					<? $w =3D new INum('pt_rate');echo $w->input();?>
+					<?php $w =3D new INum('pt_rate');echo $w->input();?>
 				</td>
 			</tr>
 		</table>
-		<?=3D HtmlInput::submit("ftvaadd", "Ajout");?>
-		<?
+		<?php echo  HtmlInput::submit("ftvaadd", "Ajout");?>
+		<?php=20
 		$bt =3D new IButton("but_tva_close");
 		$bt->label =3D "Fermer";
 		$bt->javascript =3D " $('dtvaadd').hide()";

Modified: trunk/import_account/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/template/test_file.php	2013-05-16 22:42:=
11 UTC (rev 503)
+++ trunk/import_account/include/template/test_file.php	2013-05-16 22:44:=
15 UTC (rev 504)
@@ -9,26 +9,26 @@
 </p>
=20
 <form method=3D"POST" >
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
 <td>D=C3=A9limiteur </td>
-<td> <? echo $_POST['rdelimiter']?></td>
+<td> <?php echo $_POST['rdelimiter']?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><td> <? echo $_FILES['csv_file']['name']?=
></td>
+<td>Fichier =C3=A0 charger</td><td> <?php echo $_FILES['csv_file']['name=
']?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><td> <? echo $file_cat;?></td>
+<td>Cat=C3=A9gorie de fiche</td><td> <?php echo $file_cat;?></td>
 </tr>
 <tr>
-<td>Encodage </td><td> <? echo $encoding?></td>
+<td>Encodage </td><td> <?php echo $encoding?></td>
 </tr>
 <tr>
-<td>Texte entour=C3=A9 par</td><td> <? echo $_POST['rsurround'];?></td>
+<td>Texte entour=C3=A9 par</td><td> <?php echo $_POST['rsurround'];?></t=
d>
 </tr>
 </table>
-<?
+<?php=20
 foreach (array('rfichedef','rdelimiter','encodage') as $e)
 {
   if ( isset($_POST[$e])) echo HtmlInput::hidden($e,$_POST[$e]);
@@ -37,11 +37,11 @@
=20
  echo HtmlInput::submit('record_import','Valider');
 ?>
-<input type=3D"hidden" name=3D"rsurround" value=3D'<?=3D$_POST['rsurroun=
d']?>'>
+<input type=3D"hidden" name=3D"rsurround" value=3D'<?php echo $_POST['rs=
urround']?>'>
=20
=20
=20
-<?
+<?php=20
    global $cn;
    ob_start();
   /**

Modified: trunk/import_account/include/template/test_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/template/test_operation.php	2013-05-16 2=
2:42:11 UTC (rev 503)
+++ trunk/import_account/include/template/test_operation.php	2013-05-16 2=
2:44:15 UTC (rev 504)
@@ -9,26 +9,26 @@
 </p>
=20
 <form method=3D"POST" >
-<?=3D$hidden?>
+<?php echo $hidden?>
 <table>
 <tr>
 <td>D=C3=A9limiteur </td>
-<td> <? echo $_POST['rdelimiter']?></td>
+<td> <?php echo $_POST['rdelimiter']?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><td> <? echo $_FILES['csv_file']['name']?=
></td>
+<td>Fichier =C3=A0 charger</td><td> <?php echo $_FILES['csv_file']['name=
']?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><td> <? echo $file_cat;?></td>
+<td>Cat=C3=A9gorie de fiche</td><td> <?php echo $file_cat;?></td>
 </tr>
 <tr>
-<td>Encodage </td><td> <? echo $encoding?></td>
+<td>Encodage </td><td> <?php echo $encoding?></td>
 </tr>
 <tr>
-<td>Texte entour=C3=A9 par</td><td> <? echo $_POST['rsurround'];?></td>
+<td>Texte entour=C3=A9 par</td><td> <?php echo $_POST['rsurround'];?></t=
d>
 </tr>
 </table>
-<?
+<?php=20
 foreach (array('rfichedef','rdelimiter','encodage') as $e)
 {
   if ( isset($_POST[$e])) echo HtmlInput::hidden($e,$_POST[$e]);
@@ -37,11 +37,11 @@
=20
  echo HtmlInput::submit('record_import','Valider');
 ?>
-<input type=3D"hidden" name=3D"rsurround" value=3D'<?=3D$_POST['rsurroun=
d']?>'>
+<input type=3D"hidden" name=3D"rsurround" value=3D'<?php echo $_POST['rs=
urround']?>'>
=20
=20
=20
-<?
+<?php=20
    global $cn;
    ob_start();
   /**

Modified: trunk/import_account/include/template/upload_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/template/upload_operation.php	2013-05-16=
 22:42:11 UTC (rev 503)
+++ trunk/import_account/include/template/upload_operation.php	2013-05-16=
 22:44:15 UTC (rev 504)
@@ -37,9 +37,9 @@
 <table>
 <tr>
 <tr>
-	<td>Fichier =C3=A0 charger</td><TD> <? $file =3D new IFile('csv_operati=
on');echo $file->input()?></td>
+	<td>Fichier =C3=A0 charger</td><TD> <?php $file =3D new IFile('csv_oper=
ation');echo $file->input()?></td>
 </tr>
 </table>
-<? echo HtmlInput::submit('upload','Valider');?>
+<?php echo HtmlInput::submit('upload','Valider');?>
=20
 </form>
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 16 20:32:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ud8bE-0006vr-8s
	for mharc-phpcompta-dev@gnu.org; Thu, 16 May 2013 20:32:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 17 May 2013 02:29:32 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1348774.1368750763.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5278 - in phpcompta/trunk: contrib
	contrib/mono-dossier html html/admin include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 00:32:42 -0000

Author: danydb
Date: 2013-05-17 02:29:31 +0200 (Fri, 17 May 2013)
New Revision: 5278

Added:
   phpcompta/trunk/contrib/mono-dossier/
   phpcompta/trunk/contrib/mono-dossier/mono-belge.sql
   phpcompta/trunk/contrib/mono-dossier/mono-france.sql
   phpcompta/trunk/contrib/mono-dossier/mono.sql
Modified:
   phpcompta/trunk/html/admin/setup.js
   phpcompta/trunk/html/admin/setup.php
   phpcompta/trunk/html/admin/template_config_form.php
   phpcompta/trunk/html/login.php
   phpcompta/trunk/html/logout.php
   phpcompta/trunk/html/user_login.php
   phpcompta/trunk/include/class_database.php
   phpcompta/trunk/include/config_file.php
   phpcompta/trunk/include/constant.php
Log:
Task #0000843: Fonctionnement sur server mutualis?\195?\169

Ajout des fichiers + changement dans le setup.php

Added: phpcompta/trunk/contrib/mono-dossier/mono-belge.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/contrib/mono-dossier/mono-belge.sql	                 =
       (rev 0)
+++ phpcompta/trunk/contrib/mono-dossier/mono-belge.sql	2013-05-17 00:29:=
31 UTC (rev 5278)
@@ -0,0 +1,9344 @@
+--
+-- PostgreSQL database dump
+--
+
+SET statement_timeout =3D 0;
+SET client_encoding =3D 'UTF8';
+SET standard_conforming_strings =3D off;
+SET check_function_bodies =3D false;
+SET client_min_messages =3D warning;
+SET escape_string_warning =3D off;
+
+--
+-- Name: comptaproc; Type: SCHEMA; Schema: -; Owner: -
+--
+
+CREATE SCHEMA comptaproc;
+
+
+--
+-- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: -; Owner: -
+--
+
+CREATE PROCEDURAL LANGUAGE plpgsql;
+
+
+SET search_path =3D public, pg_catalog;
+
+--
+-- Name: account_type; Type: DOMAIN; Schema: public; Owner: -
+--
+
+CREATE DOMAIN account_type AS character varying(40);
+
+
+--
+-- Name: anc_table_account_type; Type: TYPE; Schema: public; Owner: -
+--
+
+CREATE TYPE anc_table_account_type AS (
+	po_id bigint,
+	pa_id bigint,
+	po_name text,
+	po_description text,
+	sum_amount numeric(25,4),
+	card_account text,
+	name text
+);
+
+
+--
+-- Name: anc_table_card_type; Type: TYPE; Schema: public; Owner: -
+--
+
+CREATE TYPE anc_table_card_type AS (
+	po_id bigint,
+	pa_id bigint,
+	po_name text,
+	po_description text,
+	sum_amount numeric(25,4),
+	f_id bigint,
+	card_account text,
+	name text
+);
+
+
+--
+-- Name: menu_tree; Type: TYPE; Schema: public; Owner: -
+--
+
+CREATE TYPE menu_tree AS (
+	code text,
+	description text
+);
+
+
+SET search_path =3D comptaproc, pg_catalog;
+
+--
+-- Name: account_add(public.account_type, character varying); Type: FUNC=
TION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION account_add(p_id public.account_type, p_name character v=
arying) RETURNS text
+    LANGUAGE plpgsql
+    AS $$
+declare
+	nParent tmp_pcmn.pcm_val_parent%type;
+	nCount integer;
+	sReturn text;
+begin
+	sReturn:=3D format_account(p_id);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3DsReturn;
+	if nCount =3D 0 then
+		nParent=3Daccount_parent(p_id);
+		insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent)
+			values (p_id, p_name,nParent) returning pcm_val into sReturn;
+	end if;
+return sReturn;
+end ;
+$$;
+
+
+--
+-- Name: account_alphanum(); Type: FUNCTION; Schema: comptaproc; Owner: =
-
+--
+
+CREATE FUNCTION account_alphanum() RETURNS boolean
+    LANGUAGE plpgsql
+    AS $$
+declare
+	l_auto bool;
+begin
+	l_auto :=3D true;
+	select pr_value into l_auto from parameter where pr_id=3D'MY_ALPHANUM';
+	if l_auto =3D 'N' or l_auto is null then
+		l_auto:=3Dfalse;
+	end if;
+	return l_auto;
+end;
+$$;
+
+
+--
+-- Name: account_auto(integer); Type: FUNCTION; Schema: comptaproc; Owne=
r: -
+--
+
+CREATE FUNCTION account_auto(p_fd_id integer) RETURNS boolean
+    LANGUAGE plpgsql
+    AS $$
+declare
+	l_auto bool;
+begin
+
+	select fd_create_account into l_auto from fiche_def where fd_id=3Dp_fd_=
id;
+	if l_auto is null then
+		l_auto:=3Dfalse;
+	end if;
+	return l_auto;
+end;
+$$;
+
+
+--
+-- Name: account_compute(integer); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION account_compute(p_f_id integer) RETURNS public.account_t=
ype
+    LANGUAGE plpgsql
+    AS $$
+declare
+	class_base fiche_def.fd_class_base%type;
+	maxcode numeric;
+	sResult account_type;
+	bAlphanum bool;
+	sName text;
+begin
+	select fd_class_base into class_base
+	from
+		fiche_def join fiche using (fd_id)
+	where
+		f_id=3Dp_f_id;
+	raise notice 'account_compute class base %',class_base;
+	bAlphanum :=3D account_alphanum();
+	if bAlphanum =3D false  then
+		select count (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent=
 =3D class_base;
+		if maxcode =3D 0	then
+			maxcode:=3Dclass_base::numeric;
+		else
+			select max (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent =
=3D class_base;
+			maxcode:=3Dmaxcode::numeric;
+		end if;
+		if maxcode::text =3D class_base then
+			maxcode:=3Dclass_base::numeric*1000;
+		end if;
+		maxcode:=3Dmaxcode+1;
+		raise notice 'account_compute Max code %',maxcode;
+		sResult:=3Dmaxcode::account_type;
+	else
+		-- if alphanum, use name
+		select ad_value into sName from fiche_detail where f_id=3Dp_f_id and a=
d_id=3D1;
+		if sName is null then
+			raise exception 'Cannot compute an accounting without the name of the=
 card for %',p_f_id;
+		end if;
+		sResult :=3D class_base||sName;
+	end if;
+	return sResult;
+end;
+$$;
+
+
+--
+-- Name: account_insert(integer, text); Type: FUNCTION; Schema: comptapr=
oc; Owner: -
+--
+
+CREATE FUNCTION account_insert(p_f_id integer, p_account text) RETURNS t=
ext
+    LANGUAGE plpgsql
+    AS $$
+declare
+	nParent tmp_pcmn.pcm_val_parent%type;
+	sName varchar;
+	sNew tmp_pcmn.pcm_val%type;
+	bAuto bool;
+	nFd_id integer;
+	sClass_Base fiche_def.fd_class_base%TYPE;
+	nCount integer;
+	first text;
+	second text;
+begin
+
+	if p_account is not null and length(trim(p_account)) !=3D 0 then
+	-- if there is coma in p_account, treat normally
+		if position (',' in p_account) =3D 0 then
+			raise info 'p_account is not empty';
+				select count(*)  into nCount from tmp_pcmn where pcm_val=3Dp_account=
::account_type;
+				raise notice 'found in tmp_pcm %',nCount;
+				if nCount !=3D0  then
+					raise info 'this account exists in tmp_pcmn ';
+					perform attribut_insert(p_f_id,5,p_account);
+				   else
+				       -- account doesn't exist, create it
+					select ad_value into sName from
+						fiche_detail
+					where
+					ad_id=3D1 and f_id=3Dp_f_id;
+
+					nParent:=3Daccount_parent(p_account::account_type);
+					insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_acco=
unt::account_type,sName,nParent);
+					perform attribut_insert(p_f_id,5,p_account);
+
+				end if;
+		else
+		raise info 'presence of a comma';
+		-- there is 2 accounts separated by a comma
+		first :=3D split_part(p_account,',',1);
+		second :=3D split_part(p_account,',',2);
+		-- check there is no other coma
+		raise info 'first value % second value %', first, second;
+
+		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
+			raise exception 'Too many comas, invalid account';
+		end if;
+		perform attribut_insert(p_f_id,5,p_account);
+		end if;
+	else
+	raise info 'p_account is  empty';
+		select fd_id into nFd_id from fiche where f_id=3Dp_f_id;
+		bAuto:=3D account_auto(nFd_id);
+
+		select fd_class_base into sClass_base from fiche_def where fd_id=3DnFd=
_id;
+raise info 'sClass_Base : %',sClass_base;
+		if bAuto =3D true and sClass_base similar to '[[:digit:]]*'  then
+			raise info 'account generated automatically';
+			sNew:=3Daccount_compute(p_f_id);
+			raise info 'sNew %', sNew;
+			select ad_value into sName from
+				fiche_detail
+			where
+				ad_id=3D1 and f_id=3Dp_f_id;
+			nParent:=3Daccount_parent(sNew);
+			sNew :=3D account_add  (sNew,sName);
+			perform attribut_insert(p_f_id,5,sNew);
+
+		else
+		-- if there is an account_base then it is the default
+		      select fd_class_base::account_type into sNew from fiche_def join=
 fiche using (fd_id) where f_id=3Dp_f_id;
+			if sNew is null or length(trim(sNew)) =3D 0 then
+				raise notice 'count is null';
+				 perform attribut_insert(p_f_id,5,null);
+			else
+				 perform attribut_insert(p_f_id,5,sNew);
+			end if;
+		end if;
+	end if;
+
+return 0;
+end;
+$$;
+
+
+--
+-- Name: account_parent(public.account_type); Type: FUNCTION; Schema: co=
mptaproc; Owner: -
+--
+
+CREATE FUNCTION account_parent(p_account public.account_type) RETURNS pu=
blic.account_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+	sSubParent tmp_pcmn.pcm_val_parent%type;
+	sResult tmp_pcmn.pcm_val_parent%type;
+	nCount integer;
+begin
+	if p_account is NULL then
+		return NULL;
+	end if;
+	sSubParent:=3Dp_account;
+	while true loop
+		select count(*) into nCount
+		from tmp_pcmn
+		where
+		pcm_val =3D sSubParent;
+		if nCount !=3D 0 then
+			sResult:=3D sSubParent;
+			exit;
+		end if;
+		sSubParent:=3D substr(sSubParent,1,length(sSubParent)-1);
+		if length(sSubParent) <=3D 0 then
+			raise exception 'Impossible de trouver le compte parent pour %',p_acc=
ount;
+		end if;
+		raise notice 'sSubParent % % ',sSubParent,length(sSubParent);
+	end loop;
+	raise notice 'account_parent : Parent is %',sSubParent;
+	return sSubParent;
+end;
+$$;
+
+
+--
+-- Name: account_update(integer, public.account_type); Type: FUNCTION; S=
chema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION account_update(p_f_id integer, p_account public.account_=
type) RETURNS integer
+    LANGUAGE plpgsql
+    AS $$
+declare
+	nMax fiche.f_id%type;
+	nCount integer;
+	nParent tmp_pcmn.pcm_val_parent%type;
+	sName varchar;
+	first text;
+	second text;
+begin
+
+	if length(trim(p_account)) !=3D 0 then
+		-- 2 accounts in card separated by comma
+		if position (',' in p_account) =3D 0 then
+			select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_account;
+			if nCount =3D 0 then
+			select ad_value into sName from
+				fiche_detail
+				where
+				ad_id=3D1 and f_id=3Dp_f_id;
+			nParent:=3Daccount_parent(p_account);
+			insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_accoun=
t,sName,nParent);
+		end if;
+		else
+		raise info 'presence of a comma';
+		-- there is 2 accounts separated by a comma
+		first :=3D split_part(p_account,',',1);
+		second :=3D split_part(p_account,',',2);
+		-- check there is no other coma
+		raise info 'first value % second value %', first, second;
+
+		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
+			raise exception 'Too many comas, invalid account';
+		end if;
+		-- check that both account are in PCMN
+
+		end if;
+	else
+		-- account is null
+		update fiche_detail set ad_value=3Dnull where f_id=3Dp_f_id and ad_id=3D=
5 ;
+	end if;
+
+	update fiche_detail set ad_value=3Dp_account where f_id=3Dp_f_id and ad=
_id=3D5 ;
+
+return 0;
+end;
+$$;
+
+
+--
+-- Name: action_gestion_ins_upd(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION action_gestion_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+begin
+NEW.ag_title :=3D substr(trim(NEW.ag_title),1,70);
+NEW.ag_hour :=3D substr(trim(NEW.ag_hour),1,5);
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: action_get_tree(bigint); Type: FUNCTION; Schema: comptaproc; Ow=
ner: -
+--
+
+CREATE FUNCTION action_get_tree(p_id bigint) RETURNS SETOF bigint
+    LANGUAGE plpgsql
+    AS $$
+
+declare
+   e bigint;
+   i bigint;
+begin
+   for e in select ag_id from action_gestion where ag_ref_ag_id=3Dp_id
+   loop
+        for i in select action_get_tree from  comptaproc.action_get_tree=
(e)
+        loop
+                raise notice ' =3D=3D i %', i;
+                return next i;
+        end loop;
+    raise notice ' =3D e %', e;
+    return next e;
+   end loop;
+   return;
+
+end;
+$$;
+
+
+--
+-- Name: attribut_insert(integer, integer, character varying); Type: FUN=
CTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION attribut_insert(p_f_id integer, p_ad_id integer, p_value=
 character varying) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+begin
+	insert into fiche_detail (f_id,ad_id, ad_value) values (p_f_id,p_ad_id,=
p_value);
+=09
+return;
+end;
+$$;
+
+
+--
+-- Name: attribute_correct_order(); Type: FUNCTION; Schema: comptaproc; =
Owner: -
+--
+
+CREATE FUNCTION attribute_correct_order() RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+    crs_correct cursor for select A.jnt_id,A.jnt_order from jnt_fic_attr=
 as A join jnt_fic_attr as B using (fd_id) where A.jnt_order=3DB.jnt_orde=
r and A.jnt_id > B.jnt_id;
+    rec record;
+begin
+	open crs_correct;
+	loop
+	fetch crs_correct into rec;
+	if NOT FOUND then
+		close crs_correct;
+		return;
+	end if;
+	update jnt_fic_attr set jnt_order=3Djnt_order + 1 where jnt_id =3D rec.=
jnt_id;
+	end loop;
+	close crs_correct;
+	perform attribute_correct_order ();
+end;
+$$;
+
+
+--
+-- Name: card_after_delete(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION card_after_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+
+begin
+
+	delete from action_gestion where f_id_dest =3D OLD.f_id;
+	return OLD;
+
+end;
+$$;
+
+
+--
+-- Name: card_class_base(integer); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION card_class_base(p_f_id integer) RETURNS text
+    LANGUAGE plpgsql
+    AS $$
+declare
+	n_poste fiche_def.fd_class_base%type;
+begin
+
+	select fd_class_base into n_poste from fiche_def join fiche using
+(fd_id)
+	where f_id=3Dp_f_id;
+	if not FOUND then
+		raise exception 'Invalid fiche card_class_base(%)',p_f_id;
+	end if;
+return n_poste;
+end;
+$$;
+
+
+--
+-- Name: check_balance(integer); Type: FUNCTION; Schema: comptaproc; Own=
er: -
+--
+
+CREATE FUNCTION check_balance(p_grpt integer) RETURNS numeric
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	amount_jrnx_debit numeric;
+	amount_jrnx_credit numeric;
+	amount_jrn numeric;
+begin
+	select sum (j_montant) into amount_jrnx_credit=20
+	from jrnx=20
+		where=20
+	j_grpt=3Dp_grpt
+	and j_debit=3Dfalse;
+
+	select sum (j_montant) into amount_jrnx_debit=20
+	from jrnx=20
+		where=20
+	j_grpt=3Dp_grpt
+	and j_debit=3Dtrue;
+
+	select jr_montant into amount_jrn=20
+	from jrn
+	where
+	jr_grpt_id=3Dp_grpt;
+
+	if ( amount_jrnx_debit !=3D amount_jrnx_credit )=20
+		then
+		return abs(amount_jrnx_debit-amount_jrnx_credit);
+		end if;
+	if ( amount_jrn !=3D amount_jrnx_credit)
+		then
+		return -1*abs(amount_jrn - amount_jrnx_credit);
+		end if;
+	return 0;
+end;
+$$;
+
+
+--
+-- Name: correct_sequence(text, text, text); Type: FUNCTION; Schema: com=
ptaproc; Owner: -
+--
+
+CREATE FUNCTION correct_sequence(p_sequence text, p_col text, p_table te=
xt) RETURNS integer
+    LANGUAGE plpgsql
+    AS $$
+declare
+last_sequence int8;
+max_sequence int8;
+n integer;
+begin
+	select count(*) into n from pg_class where relkind=3D'S' and relname=3D=
lower(p_sequence);
+	if n =3D 0 then
+		raise exception  ' Unknow sequence  % ',p_sequence;
+	end if;
+	select count(*) into n from pg_class where relkind=3D'r' and relname=3D=
lower(p_table);
+	if n =3D 0 then
+		raise exception ' Unknow table  % ',p_table;
+	end if;
+
+	execute 'select last_value   from '||p_sequence into last_sequence;
+	raise notice 'Last value of the sequence is %', last_sequence;
+
+	execute 'select max('||p_col||')  from '||p_table into max_sequence;
+	if  max_sequence is null then
+		max_sequence :=3D 0;
+	end if;
+	raise notice 'Max value of the sequence is %', max_sequence;
+	max_sequence:=3D max_sequence +1;=09
+	execute 'alter sequence '||p_sequence||' restart with '||max_sequence;
+return 0;
+
+end;
+$$;
+
+
+--
+-- Name: FUNCTION correct_sequence(p_sequence text, p_col text, p_table =
text); Type: COMMENT; Schema: comptaproc; Owner: -
+--
+
+COMMENT ON FUNCTION correct_sequence(p_sequence text, p_col text, p_tabl=
e text) IS ' Often the primary key is a sequence number and sometimes the=
 value of the sequence is not synchronized with the primary key ( p_seque=
nce : sequence name, p_col : col of the pk,p_table : concerned table';
+
+
+--
+-- Name: create_missing_sequence(); Type: FUNCTION; Schema: comptaproc; =
Owner: -
+--
+
+CREATE FUNCTION create_missing_sequence() RETURNS integer
+    LANGUAGE plpgsql
+    AS $$
+declare
+p_sequence text;
+nSeq integer;
+c1 cursor for select jrn_def_id from jrn_def;
+begin
+	open c1;
+	loop
+	   fetch c1 into nSeq;
+	   if not FOUND THEN
+	   	close c1;
+	   	return 0;
+	   end if;
+	   p_sequence:=3D's_jrn_pj'||nSeq::text;
+	execute 'create sequence '||p_sequence;
+	end loop;
+close c1;
+return 0;
+
+end;
+$$;
+
+
+--
+-- Name: drop_index(character varying); Type: FUNCTION; Schema: comptapr=
oc; Owner: -
+--
+
+CREATE FUNCTION drop_index(p_constraint character varying) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	nCount integer;
+begin
+	select count(*) into nCount from pg_indexes where indexname=3Dp_constra=
int;
+	if nCount =3D 1 then
+	execute 'drop index '||p_constraint ;
+	end if;
+end;
+$$;
+
+
+--
+-- Name: drop_it(character varying); Type: FUNCTION; Schema: comptaproc;=
 Owner: -
+--
+
+CREATE FUNCTION drop_it(p_constraint character varying) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	nCount integer;
+begin
+	select count(*) into nCount from pg_constraint where conname=3Dp_constr=
aint;
+	if nCount =3D 1 then
+	execute 'alter table parm_periode drop constraint '||p_constraint ;
+	end if;
+end;
+$$;
+
+
+--
+-- Name: extension_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION extension_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+ sCode text;
+ sFile text;
+begin
+sCode:=3Dtrim(upper(NEW.ex_code));
+sCode:=3Dreplace(sCode,' ','_');
+sCode:=3Dsubstr(sCode,1,15);
+sCode=3Dupper(sCode);
+NEW.ex_code:=3DsCode;
+sFile:=3DNEW.ex_file;
+sFile:=3Dreplace(sFile,';','_');
+sFile:=3Dreplace(sFile,'<','_');
+sFile:=3Dreplace(sFile,'>','_');
+sFile:=3Dreplace(sFile,'..','');
+sFile:=3Dreplace(sFile,'&','');
+sFile:=3Dreplace(sFile,'|','');
+
+
+
+return NEW;
+
+end;
+
+$$;
+
+
+--
+-- Name: fiche_account_parent(integer); Type: FUNCTION; Schema: comptapr=
oc; Owner: -
+--
+
+CREATE FUNCTION fiche_account_parent(p_f_id integer) RETURNS public.acco=
unt_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+ret tmp_pcmn.pcm_val%TYPE;
+begin
+	select fd_class_base into ret from fiche_def join fiche using (fd_id) w=
here f_id=3Dp_f_id;
+	if not FOUND then
+		raise exception '% N''existe pas',p_f_id;
+	end if;
+	return ret;
+end;
+$$;
+
+
+--
+-- Name: fiche_attribut_synchro(integer); Type: FUNCTION; Schema: compta=
proc; Owner: -
+--
+
+CREATE FUNCTION fiche_attribut_synchro(p_fd_id integer) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+	-- this sql gives the f_id and the missing attribute (ad_id)
+	list_missing cursor for select f_id,fd_id,ad_id,jnt_order from jnt_fic_=
attr join fiche as A using (fd_id) where fd_id=3Dp_fd_id and ad_id not in=
 (select ad_id from fiche join fiche_detail using (f_id) where fd_id=3Djn=
t_fic_attr.fd_id and A.f_id=3Df_id);
+	rec record;
+begin
+	open list_missing;
+	loop
+=09
+	fetch list_missing into rec;
+	IF NOT FOUND then
+		exit;
+	end if;
+=09
+	-- now we insert into attr_value
+	insert into fiche_detail (f_id,ad_id,ad_value) values (rec.f_id,rec.ad_=
id,null);
+	end loop;
+	close list_missing;
+end;=20
+$$;
+
+
+--
+-- Name: fiche_def_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION fiche_def_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+begin
+
+if position (',' in NEW.fd_class_base) !=3D 0 then
+   NEW.fd_create_account=3D'f';
+
+end if;
+return NEW;
+end;$$;
+
+
+--
+-- Name: fill_quant_fin(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION fill_quant_fin() RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+   sBank text;
+   sCassa text;
+   sCustomer text;
+   sSupplier text;
+   rec record;
+   recBank record;
+   recSupp_Cust record;
+   nCount integer;
+   nAmount numeric;
+   nBank integer;
+   nOther integer;
+   nSupp_Cust integer;
+begin
+	select p_value into sBank from parm_code where p_code=3D'BANQUE';
+	select p_value into sCassa from parm_code where p_code=3D'CAISSE';
+	select p_value into sSupplier from parm_code where p_code=3D'SUPPLIER';
+	select p_value into sCustomer from parm_code where p_code=3D'CUSTOMER';
+=09
+	for rec in select jr_id,jr_grpt_id from jrn=20
+	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN')
+		and jr_id not in (select jr_id from quant_fin)
+	loop
+		-- there are only 2 lines for bank operations
+		-- first debit
+		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
+		if nCount > 2 then=20
+			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
+			return;
+		end if;
+		nBank :=3D 0; nOther:=3D0;
+		for recBank in select  j_id, j_montant,j_debit,j_qcode,j_poste from jr=
nx where j_grpt=3Drec.jr_grpt_id
+		loop
+		if recBank.j_poste like sBank||'%' then
+			-- retrieve f_id for bank
+			select f_id into nBank from vw_poste_qcode where j_qcode=3DrecBank.j_=
qcode;
+			if recBank.j_debit =3D false then
+				nAmount=3DrecBank.j_montant*(-1);
+			else=20
+				nAmount=3DrecBank.j_montant;
+			end if;
+		else
+			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecBank.j=
_qcode;
+		end if;
+		end loop;
+		if nBank !=3D 0 and nOther !=3D 0 then
+			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nBank,nOther,nAmount);
+		end if;
+	end loop;
+	for rec in select jr_id,jr_grpt_id from jrn=20
+	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN') and jr_id not in (select jr_id from quant_fin)
+	loop
+		-- there are only 2 lines for bank operations
+		-- first debit
+		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
+		if nCount > 2 then=20
+			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
+			return;
+		end if;
+		nBank :=3D 0; nOther:=3D0;
+		for recBank in select  j_id, j_montant,j_debit,j_qcode,j_poste from jr=
nx where j_grpt=3Drec.jr_grpt_id
+		loop
+		if recBank.j_poste like sCassa||'%' then
+			-- retrieve f_id for bank
+			select f_id into nBank from vw_poste_qcode where j_qcode=3DrecBank.j_=
qcode;
+			if recBank.j_debit =3D false then
+				nAmount=3DrecBank.j_montant*(-1);
+			else=20
+				nAmount=3DrecBank.j_montant;
+			end if;
+		else
+			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecBank.j=
_qcode;
+		end if;
+		end loop;
+		if nBank !=3D 0 and nOther !=3D 0 then
+			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nBank,nOther,nAmount);
+		end if;
+	end loop;
+
+	for rec in select jr_id,jr_grpt_id from jrn=20
+	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN') and jr_id not in (select jr_id from quant_fin)
+	loop
+		-- there are only 2 lines for bank operations
+		-- first debit
+		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
+		if nCount > 2 then=20
+			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
+			return;
+		end if;
+		nSupp_Cust :=3D 0; nOther:=3D0;
+		for recSupp_Cust in select  j_id, j_montant,j_debit,j_qcode,j_poste fr=
om jrnx where j_grpt=3Drec.jr_grpt_id
+		loop
+		if recSupp_Cust.j_poste like sSupplier||'%'  then
+			-- retrieve f_id for bank
+			select f_id into nSupp_Cust from vw_poste_qcode where j_qcode=3DrecSu=
pp_Cust.j_qcode;
+			if recSupp_Cust.j_debit =3D true then
+				nAmount=3DrecSupp_Cust.j_montant*(-1);
+			else=20
+				nAmount=3DrecSupp_Cust.j_montant;
+			end if;
+		else if  recSupp_Cust.j_poste like sCustomer||'%' then
+			select f_id into nSupp_Cust from vw_poste_qcode where j_qcode=3DrecSu=
pp_Cust.j_qcode;
+			if recSupp_Cust.j_debit =3D false then
+				nAmount=3DrecSupp_Cust.j_montant*(-1);
+			else=20
+				nAmount=3DrecSupp_Cust.j_montant;
+			end if;
+			else
+			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecSupp_C=
ust.j_qcode;
+		=09
+			end if;
+		end if;
+		end loop;
+		if nSupp_Cust !=3D 0 and nOther !=3D 0 then
+			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nOther,nSupp_Cust,nAmount);
+		end if;
+	end loop;
+	for rec in select jr_id,jr_grpt_id from jrn=20
+	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN') and jr_id not in (select jr_id from quant_fin)
+	loop
+		-- there are only 2 lines for bank operations
+		-- first debit
+		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
+		if nCount > 2 then=20
+			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
+			return;
+		end if;
+		nSupp_Cust :=3D 0; nOther:=3D0;
+		for recSupp_Cust in select  j_id, j_montant,j_debit,j_qcode,j_poste fr=
om jrnx where j_grpt=3Drec.jr_grpt_id
+		loop
+		if recSupp_Cust.j_poste like '441%'  then
+			-- retrieve f_id for bank
+			select f_id into nSupp_Cust from vw_poste_qcode where j_qcode=3DrecSu=
pp_Cust.j_qcode;
+			if recSupp_Cust.j_debit =3D false then
+				nAmount=3DrecSupp_Cust.j_montant*(-1);
+			else=20
+				nAmount=3DrecSupp_Cust.j_montant;
+			end if;
+			else
+			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecSupp_C=
ust.j_qcode;
+		=09
+		=09
+		end if;
+		end loop;
+		if nSupp_Cust !=3D 0 and nOther !=3D 0 then
+			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nOther,nSupp_Cust,nAmount);
+		end if;
+	end loop;
+	return;
+end;
+$$;
+
+
+--
+-- Name: find_pcm_type(public.account_type); Type: FUNCTION; Schema: com=
ptaproc; Owner: -
+--
+
+CREATE FUNCTION find_pcm_type(pp_value public.account_type) RETURNS text
+    LANGUAGE plpgsql
+    AS $$
+declare
+	str_type parm_poste.p_type%TYPE;
+	str_value parm_poste.p_type%TYPE;
+	nLength integer;
+begin
+	str_value:=3Dpp_value;
+	nLength:=3Dlength(str_value::text);
+	while nLength > 0 loop
+		select p_type into str_type from parm_poste where p_value=3Dstr_value;
+		if FOUND then
+			return str_type;
+		end if;
+		nLength:=3DnLength-1;
+		str_value:=3Dsubstring(str_value::text from 1 for nLength)::account_ty=
pe;
+	end loop;
+return 'CON';
+end;
+$$;
+
+
+--
+-- Name: find_periode(text); Type: FUNCTION; Schema: comptaproc; Owner: =
-
+--
+
+CREATE FUNCTION find_periode(p_date text) RETURNS integer
+    LANGUAGE plpgsql
+    AS $$
+
+declare n_p_id int4;
+begin
+
+select p_id into n_p_id
+	from parm_periode
+	where
+		p_start <=3D to_date(p_date,'DD.MM.YYYY')
+		and
+		p_end >=3D to_date(p_date,'DD.MM.YYYY');
+
+if NOT FOUND then
+	return -1;
+end if;
+
+return n_p_id;
+
+end;$$;
+
+
+--
+-- Name: format_account(public.account_type); Type: FUNCTION; Schema: co=
mptaproc; Owner: -
+--
+
+CREATE FUNCTION format_account(p_account public.account_type) RETURNS pu=
blic.account_type
+    LANGUAGE plpgsql
+    AS $_$
+
+declare
+
+sResult account_type;
+
+begin
+sResult :=3D lower(p_account);
+
+sResult :=3D translate(sResult,'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+sResult :=3D translate(sResult,' $=E2=82=AC=C2=B5=C2=A3%.+-/\!(){}(),;_&=
|"#''^<>*','');
+
+return upper(sResult);
+
+end;
+$_$;
+
+
+--
+-- Name: FUNCTION format_account(p_account public.account_type); Type: C=
OMMENT; Schema: comptaproc; Owner: -
+--
+
+COMMENT ON FUNCTION format_account(p_account public.account_type) IS 'fo=
rmat the accounting :
+- upper case
+- remove space and special char.
+';
+
+
+--
+-- Name: get_letter_jnt(bigint); Type: FUNCTION; Schema: comptaproc; Own=
er: -
+--
+
+CREATE FUNCTION get_letter_jnt(a bigint) RETURNS bigint
+    LANGUAGE plpgsql
+    AS $$
+declare
+ nResult bigint;
+begin
+   select jl_id into nResult from jnt_letter join letter_deb using (jl_i=
d) where j_id =3D a;
+   if NOT FOUND then
+	select jl_id into nResult from jnt_letter join letter_cred using (jl_id=
) where j_id =3D a;
+	if NOT found then
+		return null;
+	end if;
+    end if;
+return nResult;
+end;
+$$;
+
+
+--
+-- Name: get_menu_tree(text, text); Type: FUNCTION; Schema: comptaproc; =
Owner: -
+--
+
+CREATE FUNCTION get_menu_tree(p_code text, login text) RETURNS SETOF pub=
lic.menu_tree
+    LANGUAGE plpgsql
+    AS $$
+declare
+	i menu_tree;
+	e menu_tree;
+	a text;
+	x v_all_menu%ROWTYPE;
+begin
+	for x in select *  from v_all_menu where me_code_dep=3Dp_code::text and=
 user_name=3Dlogin::text
+	loop
+		if x.me_code_dep is not null then
+			i.code :=3D x.me_code_dep||'/'||x.me_code;
+		else
+			i.code :=3D x.me_code;
+		end if;
+
+		i.description :=3D x.me_description;
+
+		return next i;
+
+	for e in select *  from get_menu_tree(x.me_code,login)
+		loop
+			e.code:=3Dx.me_code_dep||'/'||e.code;
+			return next e;
+		end loop;
+
+	end loop;
+	return;
+end;
+$$;
+
+
+--
+-- Name: get_pcm_tree(public.account_type); Type: FUNCTION; Schema: comp=
taproc; Owner: -
+--
+
+CREATE FUNCTION get_pcm_tree(source public.account_type) RETURNS SETOF p=
ublic.account_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+	i account_type;
+	e account_type;
+begin
+	for i in select pcm_val from tmp_pcmn where pcm_val_parent=3Dsource
+	loop
+		return next i;
+		for e in select get_pcm_tree from get_pcm_tree(i)
+		loop
+			return next e;
+		end loop;
+
+	end loop;
+	return;
+end;
+$$;
+
+
+--
+-- Name: get_profile_menu(text); Type: FUNCTION; Schema: comptaproc; Own=
er: -
+--
+
+CREATE FUNCTION get_profile_menu(login text) RETURNS SETOF public.menu_t=
ree
+    LANGUAGE plpgsql
+    AS $$
+declare
+	a menu_tree;
+	e menu_tree;
+begin
+for a in select me_code,me_description from v_all_menu where user_name=3D=
login
+	and me_code_dep is null and me_type <> 'PR' and me_type <>'SP'
+loop
+		return next a;
+
+		for e in select * from get_menu_tree(a.code,login)
+		loop
+			return next e;
+		end loop;
+
+	end loop;
+return;
+end;
+$$;
+
+
+--
+-- Name: group_analytic_ins_upd(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION group_analytic_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+name text;
+begin
+name:=3Dupper(NEW.ga_id);
+name:=3Dtrim(name);
+name:=3Dreplace(name,' ','');
+NEW.ga_id:=3Dname;
+return NEW;
+end;$$;
+
+
+--
+-- Name: group_analytique_del(); Type: FUNCTION; Schema: comptaproc; Own=
er: -
+--
+
+CREATE FUNCTION group_analytique_del() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+begin
+update poste_analytique set ga_id=3Dnull
+where ga_id=3DOLD.ga_id;
+return OLD;
+end;$$;
+
+
+--
+-- Name: html_quote(text); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION html_quote(p_string text) RETURNS text
+    LANGUAGE plpgsql
+    AS $$
+declare
+	r text;
+begin
+	r:=3Dp_string;
+	r:=3Dreplace(r,'<','&lt;');
+	r:=3Dreplace(r,'>','&gt;');
+	r:=3Dreplace(r,'''','&quot;');
+	return r;
+end;$$;
+
+
+--
+-- Name: FUNCTION html_quote(p_string text); Type: COMMENT; Schema: comp=
taproc; Owner: -
+--
+
+COMMENT ON FUNCTION html_quote(p_string text) IS 'remove harmfull HTML c=
har';
+
+
+--
+-- Name: info_def_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner: =
-
+--
+
+CREATE FUNCTION info_def_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	row_info_def info_def%ROWTYPE;
+	str_type text;
+begin
+row_info_def:=3DNEW;
+str_type:=3Dupper(trim(NEW.id_type));
+str_type:=3Dreplace(str_type,' ','');
+str_type:=3Dreplace(str_type,',','');
+str_type:=3Dreplace(str_type,';','');
+if  length(str_type) =3D0 then
+	raise exception 'id_type cannot be null';
+end if;
+row_info_def.id_type:=3Dstr_type;
+return row_info_def;
+end;
+$$;
+
+
+--
+-- Name: insert_jrnx(character varying, numeric, public.account_type, in=
teger, integer, boolean, text, integer, text, text); Type: FUNCTION; Sche=
ma: comptaproc; Owner: -
+--
+
+CREATE FUNCTION insert_jrnx(p_date character varying, p_montant numeric,=
 p_poste public.account_type, p_grpt integer, p_jrn_def integer, p_debit =
boolean, p_tech_user text, p_tech_per integer, p_qcode text, p_comment te=
xt) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+begin
+	insert into jrnx
+	(
+		j_date,
+		j_montant,
+		j_poste,
+		j_grpt,
+		j_jrn_def,
+		j_debit,
+		j_text,
+		j_tech_user,
+		j_tech_per,
+		j_qcode
+	) values
+	(
+		to_date(p_date,'DD.MM.YYYY'),
+		p_montant,
+		p_poste,
+		p_grpt,
+		p_jrn_def,
+		p_debit,
+		p_comment,
+		p_tech_user,
+		p_tech_per,
+		p_qcode
+	);
+
+return;
+end;
+$$;
+
+
+--
+-- Name: insert_quant_purchase(text, numeric, character varying, numeric=
, numeric, numeric, integer, numeric, numeric, numeric, numeric, characte=
r varying, numeric); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION insert_quant_purchase(p_internal text, p_j_id numeric, p=
_fiche character varying, p_quant numeric, p_price numeric, p_vat numeric=
, p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric, p_nd_tva_rec=
up numeric, p_dep_priv numeric, p_client character varying, p_tva_sided n=
umeric) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+        fid_client integer;
+        fid_good   integer;
+begin
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                 fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim=
(p_fiche));
+        insert into quant_purchase
+                (qp_internal,
+                j_id,
+                qp_fiche,
+                qp_quantite,
+                qp_price,
+                qp_vat,
+                qp_vat_code,
+                qp_nd_amount,
+                qp_nd_tva,
+                qp_nd_tva_recup,
+                qp_supplier,
+                qp_dep_priv,
+                qp_vat_sided)
+        values
+                (p_internal,
+                p_j_id,
+                fid_good,
+                p_quant,
+                p_price,
+                p_vat,
+                p_vat_code,
+                p_nd_amount,
+                p_nd_tva,
+                p_nd_tva_recup,
+                fid_client,
+                p_dep_priv,
+                p_tva_sided);
+        return;
+end;
+ $$;
+
+
+--
+-- Name: insert_quant_sold(text, numeric, character varying, numeric, nu=
meric, numeric, integer, character varying, numeric); Type: FUNCTION; Sch=
ema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION insert_quant_sold(p_internal text, p_jid numeric, p_fich=
e character varying, p_quant numeric, p_price numeric, p_vat numeric, p_v=
at_code integer, p_client character varying, p_tva_sided numeric) RETURNS=
 void
+    LANGUAGE plpgsql
+    AS $$
+declare
+        fid_client integer;
+        fid_good   integer;
+begin
+
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_fiche));
+        insert into quant_sold
+                (qs_internal,j_id,qs_fiche,qs_quantite,qs_price,qs_vat,q=
s_vat_code,qs_client,qs_valid,qs_vat_sided)
+        values
+                (p_internal,p_jid,fid_good,p_quant,p_price,p_vat,p_vat_c=
ode,fid_client,'Y',p_tva_sided);
+        return;
+end;
+ $$;
+
+
+--
+-- Name: insert_quick_code(integer, text); Type: FUNCTION; Schema: compt=
aproc; Owner: -
+--
+
+CREATE FUNCTION insert_quick_code(nf_id integer, tav_text text) RETURNS =
integer
+    LANGUAGE plpgsql
+    AS $$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	begin
+	tText :=3D upper(trim(tav_text));
+	tText :=3D replace(tText,' ','');
+=09
+	loop
+		-- take the next sequence
+		select nextval('s_jnt_fic_att_value') into ns;
+		if length (tText) =3D 0 or tText is null then
+			tText :=3D 'FID'||ns;
+		end if;
+		-- av_text already used ?
+		select count(*) into nExist=20
+			from fiche_detail
+		where=20
+			ad_id=3D23 and  ad_value=3Dupper(tText);
+
+		if nExist =3D 0 then
+			exit;
+		end if;
+		tText:=3D'FID'||ns;
+	end loop;
+
+
+	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,2=
3,upper(tText));
+	return ns;
+	end;
+$$;
+
+
+--
+-- Name: is_closed(integer, integer); Type: FUNCTION; Schema: comptaproc=
; Owner: -
+--
+
+CREATE FUNCTION is_closed(p_periode integer, p_jrn_def_id integer) RETUR=
NS boolean
+    LANGUAGE plpgsql
+    AS $$
+declare
+bClosed bool;
+str_status text;
+begin
+select p_closed into bClosed from parm_periode
+	where p_id=3Dp_periode;
+
+if bClosed =3D true then
+	return bClosed;
+end if;
+
+select status into str_status from jrn_periode
+       where p_id =3Dp_periode and jrn_def_id=3Dp_jrn_def_id;
+
+if str_status <> 'OP' then
+   return bClosed;
+end if;
+return false;
+end;
+$$;
+
+
+--
+-- Name: jnt_fic_attr_ins(); Type: FUNCTION; Schema: comptaproc; Owner: =
-
+--
+
+CREATE FUNCTION jnt_fic_attr_ins() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+   r_record jnt_fic_attr%ROWTYPE;
+   i_max integer;
+begin
+r_record=3DNEW;
+perform comptaproc.fiche_attribut_synchro(r_record.fd_id);
+select coalesce(max(jnt_order),0) into i_max from jnt_fic_attr where fd_=
id=3Dr_record.fd_id;
+i_max :=3D i_max + 10;
+NEW.jnt_order=3Di_max;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: jrn_add_note(bigint, text); Type: FUNCTION; Schema: comptaproc;=
 Owner: -
+--
+
+CREATE FUNCTION jrn_add_note(p_jrid bigint, p_note text) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+	tmp bigint;
+begin
+	if length(trim(p_note)) =3D 0 then
+	   delete from jrn_note where jr_id=3D p_jrid;
+	   return;
+	end if;
+=09
+	select n_id into tmp from jrn_note where jr_id =3D p_jrid;
+=09
+	if FOUND then
+	   update jrn_note set n_text=3Dtrim(p_note) where jr_id =3D p_jrid;
+	else=20
+	   insert into jrn_note (jr_id,n_text) values ( p_jrid, p_note);
+
+	end if;
+=09
+	return;
+end;
+$$;
+
+
+--
+-- Name: jrn_check_periode(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION jrn_check_periode() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+bClosed bool;
+str_status text;
+ljr_tech_per jrn.jr_tech_per%TYPE;
+ljr_def_id jrn.jr_def_id%TYPE;
+lreturn jrn%ROWTYPE;
+begin
+if TG_OP=3D'UPDATE' then
+	ljr_tech_per :=3DOLD.jr_tech_per ;
+	NEW.jr_tech_per :=3D comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM=
.YYYY'));
+	ljr_def_id   :=3DOLD.jr_def_id;
+	lreturn      :=3DNEW;
+	if NEW.jr_date =3D OLD.jr_date then
+		return NEW;
+	end if;
+	if comptaproc.is_closed(NEW.jr_tech_per,NEW.jr_def_id) =3D true then
+	      	raise exception 'Periode fermee';
+	end if;
+end if;
+
+if TG_OP=3D'INSERT' then
+	NEW.jr_tech_per :=3D comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM=
.YYYY'));
+	ljr_tech_per :=3DNEW.jr_tech_per ;
+	ljr_def_id   :=3DNEW.jr_def_id;
+	lreturn      :=3DNEW;
+end if;
+
+if TG_OP=3D'DELETE' then
+	ljr_tech_per :=3DOLD.jr_tech_per;
+	ljr_def_id   :=3DOLD.jr_def_id;
+	lreturn      :=3DOLD;
+end if;
+
+if comptaproc.is_closed (ljr_def_id,ljr_def_id) =3D true then
+   	raise exception 'Periode fermee';
+end if;
+
+return lreturn;
+end;$$;
+
+
+--
+-- Name: jrn_def_add(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrn_def_add() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$begin
+execute 'insert into jrn_periode(p_id,jrn_def_id,status) select p_id,'||=
NEW.jrn_def_id||',
+	case when p_central=3Dtrue then ''CE''
+	      when p_closed=3Dtrue then ''CL''
+	else ''OP''
+	end
+from
+parm_periode ';
+return NEW;
+end;$$;
+
+
+--
+-- Name: jrn_def_delete(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrn_def_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+nb numeric;
+begin
+select count(*) into nb from jrn where jr_def_id=3DOLD.jrn_def_id;
+
+if nb <> 0 then
+	raise exception 'EFFACEMENT INTERDIT: JOURNAL UTILISE';
+end if;
+return OLD;
+end;$$;
+
+
+--
+-- Name: jrn_del(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrn_del() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+row jrn%ROWTYPE;
+begin
+row:=3DOLD;
+insert into del_jrn ( jr_id,
+       jr_def_id,
+       jr_montant,
+       jr_comment,
+       jr_date,
+       jr_grpt_id,
+       jr_internal,
+       jr_tech_date,
+       jr_tech_per,
+       jrn_ech,
+       jr_ech,
+       jr_rapt,
+       jr_valid,
+       jr_opid,
+       jr_c_opid,
+       jr_pj,
+       jr_pj_name,
+       jr_pj_type,
+       jr_pj_number,
+       del_jrn_date)=20
+       select  jr_id,
+	      jr_def_id,
+	      jr_montant,
+	      jr_comment,
+	      jr_date,
+	      jr_grpt_id,
+	      jr_internal,
+	      jr_tech_date,
+	      jr_tech_per,
+	      jrn_ech,
+	      jr_ech,
+	      jr_rapt,
+	      jr_valid,
+	      jr_opid,
+	      jr_c_opid,
+	      jr_pj,
+	      jr_pj_name,
+	      jr_pj_type,
+	      jr_pj_number
+	      ,now() from jrn where jr_id=3Drow.jr_id;
+return row;
+end;
+$$;
+
+
+--
+-- Name: jrnx_del(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrnx_del() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+row jrnx%ROWTYPE;
+begin
+row:=3DOLD;
+
+
+insert into del_jrnx(
+            j_id, j_date, j_montant, j_poste, j_grpt, j_rapt, j_jrn_def,=
=20
+            j_debit, j_text, j_centralized, j_internal, j_tech_user, j_t=
ech_date,=20
+            j_tech_per, j_qcode, f_id)  SELECT j_id, j_date, j_montant, =
j_poste, j_grpt, j_rapt, j_jrn_def,=20
+       j_debit, j_text, j_centralized, j_internal, j_tech_user, j_tech_d=
ate,=20
+       j_tech_per, j_qcode, f_id from jrnx where j_id=3Drow.j_id;
+return row;
+end;
+$$;
+
+
+--
+-- Name: jrnx_ins(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrnx_ins() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+n_fid bigint;
+begin
+
+NEW.j_tech_per :=3D comptaproc.find_periode(to_char(NEW.j_date,'DD.MM.YY=
YY'));
+if NEW.j_tech_per =3D -1 then
+	raise exception 'P=C3=A9riode invalide';
+end if;
+
+if NEW.j_qcode is NULL then
+   return NEW;
+end if;
+
+NEW.j_qcode=3Dtrim(upper(NEW.j_qcode));
+
+if length (NEW.j_qcode) =3D 0 then
+    NEW.j_qcode=3DNULL;
+    else
+   select f_id into n_fid from fiche_detail  where ad_id=3D23 and ad_val=
ue=3DNEW.j_qcode;
+	if NOT FOUND then
+		raise exception 'La fiche dont le quick code est % n''existe pas',NEW.=
j_qcode;
+	end if;
+end if;
+NEW.f_id:=3Dn_fid;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: jrnx_letter_del(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrnx_letter_del() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+row jrnx%ROWTYPE;
+begin
+row:=3DOLD;
+delete from jnt_letter=20
+	where (jl_id in (select jl_id from letter_deb) and jl_id not in(select =
jl_id from letter_cred ))=20
+		or (jl_id not in (select jl_id from letter_deb  ) and jl_id  in(select=
 jl_id from letter_cred ));
+return row;
+end;
+$$;
+
+
+--
+-- Name: plan_analytic_ins_upd(); Type: FUNCTION; Schema: comptaproc; Ow=
ner: -
+--
+
+CREATE FUNCTION plan_analytic_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+   name text;
+begin
+   name:=3Dupper(NEW.pa_name);
+   name:=3Dtrim(name);
+   name:=3Dreplace(name,' ','');
+   NEW.pa_name:=3Dname;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: poste_analytique_ins_upd(); Type: FUNCTION; Schema: comptaproc;=
 Owner: -
+--
+
+CREATE FUNCTION poste_analytique_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$declare
+name text;
+rCount record;
+
+begin
+name:=3Dupper(NEW.po_name);
+name:=3Dtrim(name);
+name:=3Dreplace(name,' ','');	=09
+NEW.po_name:=3Dname;
+
+if NEW.ga_id is NULL then
+return NEW;
+end if;
+
+if length(trim(NEW.ga_id)) =3D 0 then
+  NEW.ga_id:=3DNULL;
+  return NEW;
+end if;
+perform 'select ga_id from groupe_analytique where ga_id=3D'||NEW.ga_id;
+if NOT FOUND then
+   raise exception' Inexistent Group Analytic %',NEW.ga_id;
+end if;
+return NEW;
+end;$$;
+
+
+--
+-- Name: proc_check_balance(); Type: FUNCTION; Schema: comptaproc; Owner=
: -
+--
+
+CREATE FUNCTION proc_check_balance() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	diff numeric;
+	tt integer;
+begin
+	if TG_OP =3D 'INSERT' or TG_OP=3D'UPDATE' then
+	tt=3DNEW.jr_grpt_id;
+	diff:=3Dcheck_balance(tt);
+	if diff !=3D 0 then
+		raise exception 'balance error %',diff ;
+	end if;
+	return NEW;
+	end if;
+end;
+$$;
+
+
+--
+-- Name: quant_purchase_ins_upd(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION quant_purchase_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+	begin
+		if NEW.qp_price < 0 OR NEW.qp_quantite <0 THEN
+			NEW.qp_price :=3D abs (NEW.qp_price)*(-1);
+			NEW.qp_quantite :=3D abs (NEW.qp_quantite)*(-1);
+		end if;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: quant_sold_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner=
: -
+--
+
+CREATE FUNCTION quant_sold_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+	begin
+		if NEW.qs_price < 0 OR NEW.qs_quantite <0 THEN
+			NEW.qs_price :=3D abs (NEW.qs_price)*(-1);
+			NEW.qs_quantite :=3D abs (NEW.qs_quantite)*(-1);
+		end if;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: t_document_modele_validate(); Type: FUNCTION; Schema: comptapro=
c; Owner: -
+--
+
+CREATE FUNCTION t_document_modele_validate() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+    lText text;
+    modified document_modele%ROWTYPE;
+begin
+    modified:=3DNEW;
+
+	modified.md_filename:=3Dreplace(NEW.md_filename,' ','_');
+	return modified;
+end;
+$$;
+
+
+--
+-- Name: t_document_type_insert(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION t_document_type_insert() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+nCounter integer;
+    BEGIN
+select count(*) into nCounter from pg_class where relname=3D'seq_doc_typ=
e_'||NEW.dt_id;
+if nCounter =3D 0 then
+        execute  'create sequence seq_doc_type_'||NEW.dt_id;
+end if;
+        RETURN NEW;
+    END;
+$$;
+
+
+--
+-- Name: t_document_validate(); Type: FUNCTION; Schema: comptaproc; Owne=
r: -
+--
+
+CREATE FUNCTION t_document_validate() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+  lText text;
+  modified document%ROWTYPE;
+begin
+    	modified:=3DNEW;
+	modified.d_filename:=3Dreplace(NEW.d_filename,' ','_');
+	return modified;
+end;
+$$;
+
+
+--
+-- Name: t_jrn_def_sequence(); Type: FUNCTION; Schema: comptaproc; Owner=
: -
+--
+
+CREATE FUNCTION t_jrn_def_sequence() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+nCounter integer;
+
+    BEGIN
+    select count(*) into nCounter=20
+       from pg_class where relname=3D's_jrn_'||NEW.jrn_def_id;
+       if nCounter =3D 0 then
+       	   execute  'create sequence s_jrn_'||NEW.jrn_def_id;
+	   raise notice 'Creating sequence s_jrn_%',NEW.jrn_def_id;
+	 end if;
+
+        RETURN NEW;
+    END;
+$$;
+
+
+--
+-- Name: table_analytic_account(text, text); Type: FUNCTION; Schema: com=
ptaproc; Owner: -
+--
+
+CREATE FUNCTION table_analytic_account(p_from text, p_to text) RETURNS S=
ETOF public.anc_table_account_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+	ret ANC_table_account_type%ROWTYPE;
+	sql_from text:=3D'';
+	sql_to text:=3D'';
+	sWhere text:=3D'';
+	sAnd text:=3D'';
+	sResult text:=3D'';
+begin
+if p_from <> '' and p_from is not null then
+	sql_from:=3D'oa_date >=3D to_date('''||p_from::text||''',''DD.MM.YYYY''=
)';
+	sWhere:=3D' where ';
+end if;
+
+if p_to <> '' and p_to is not null then
+	sql_to=3D' oa_date <=3D to_date('''||p_to::text||''',''DD.MM.YYYY'')';
+	sWhere :=3D ' where ';
+end if;
+
+if sql_to <> '' and sql_from <> '' then
+	sAnd:=3D' and ';
+end if;
+
+sResult :=3D sWhere || sql_from || sAnd || sql_to;
+
+for ret in EXECUTE 'SELECT po.po_id,
+			    po.pa_id, po.po_name,=20
+			    po.po_description,sum(
+        CASE
+            WHEN operation_analytique.oa_debit =3D true THEN operation_a=
nalytique.oa_amount * (-1)::numeric
+            ELSE operation_analytique.oa_amount
+        END) AS sum_amount, jrnx.j_poste, tmp_pcmn.pcm_lib AS name
+   FROM operation_analytique
+   JOIN poste_analytique po USING (po_id)
+   JOIN jrnx USING (j_id)
+   JOIN tmp_pcmn ON jrnx.j_poste::text =3D tmp_pcmn.pcm_val::text
+'|| sResult ||'
+  GROUP BY po.po_id, po.po_name, po.pa_id, jrnx.j_poste, tmp_pcmn.pcm_li=
b, po.po_description
+ HAVING sum(
+CASE
+    WHEN operation_analytique.oa_debit =3D true THEN operation_analytiqu=
e.oa_amount * (-1)::numeric
+    ELSE operation_analytique.oa_amount
+END) <> 0::numeric '
+	loop
+	return next ret;
+end loop;
+end;
+$$;
+
+
+--
+-- Name: table_analytic_card(text, text); Type: FUNCTION; Schema: compta=
proc; Owner: -
+--
+
+CREATE FUNCTION table_analytic_card(p_from text, p_to text) RETURNS SETO=
F public.anc_table_card_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+	ret ANC_table_card_type%ROWTYPE;
+	sql_from text:=3D'';
+	sql_to text:=3D'';
+	sWhere text:=3D'';
+	sAnd text:=3D'';
+	sResult text:=3D'';
+begin
+if p_from <> '' and p_from is not null then
+	sql_from:=3D'oa_date >=3D to_date('''||p_from::text||''',''DD.MM.YYYY''=
)';
+	sWhere:=3D' where ';
+end if;
+
+if p_to <> '' and p_to is not null then
+	sql_to=3D' oa_date <=3D to_date('''||p_to::text||''',''DD.MM.YYYY'')';
+	sWhere :=3D ' where ';
+end if;
+
+if sql_to <> '' and sql_from <> '' then
+	sAnd :=3D' and ';
+end if;
+
+sResult :=3D sWhere || sql_from || sAnd || sql_to;
+
+for ret in EXECUTE ' SELECT po.po_id, po.pa_id, po.po_name, po.po_descri=
ption,  sum(
+        CASE
+            WHEN operation_analytique.oa_debit =3D true THEN operation_a=
nalytique.oa_amount * (-1)::numeric
+            ELSE operation_analytique.oa_amount
+        END) AS sum_amount, jrnx.f_id, jrnx.j_qcode, ( SELECT fiche_deta=
il.ad_value
+           FROM fiche_detail
+          WHERE fiche_detail.ad_id =3D 1 AND fiche_detail.f_id =3D jrnx.=
f_id) AS name
+   FROM operation_analytique
+   JOIN poste_analytique po USING (po_id)
+   JOIN jrnx USING (j_id)'|| sResult ||'
+  GROUP BY po.po_id, po.po_name, po.pa_id, jrnx.f_id, jrnx.j_qcode, ( SE=
LECT fiche_detail.ad_value
+   FROM fiche_detail
+  WHERE fiche_detail.ad_id =3D 1 AND fiche_detail.f_id =3D jrnx.f_id), p=
o.po_description
+ HAVING sum(
+CASE
+    WHEN operation_analytique.oa_debit =3D true THEN operation_analytiqu=
e.oa_amount * (-1)::numeric
+    ELSE operation_analytique.oa_amount
+END) <> 0::numeric;'
+
+
+	loop
+	return next ret;
+end loop;
+end;
+$$;
+
+
+--
+-- Name: tmp_pcmn_alphanum_ins_upd(); Type: FUNCTION; Schema: comptaproc=
; Owner: -
+--
+
+CREATE FUNCTION tmp_pcmn_alphanum_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+   r_record tmp_pcmn%ROWTYPE;
+begin
+r_record :=3D NEW;
+r_record.pcm_val:=3Dformat_account(NEW.pcm_val);
+
+return r_record;
+end;
+$$;
+
+
+--
+-- Name: tmp_pcmn_ins(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION tmp_pcmn_ins() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+   r_record tmp_pcmn%ROWTYPE;
+begin
+r_record :=3D NEW;
+if  length(trim(r_record.pcm_type))=3D0 or r_record.pcm_type is NULL the=
n
+   r_record.pcm_type:=3Dfind_pcm_type(NEW.pcm_val);
+   return r_record;
+end if;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: trim_cvs_quote(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION trim_cvs_quote() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+        modified import_tmp%ROWTYPE;
+begin
+	modified:=3DNEW;
+	modified.devise=3Dreplace(new.devise,'"','');
+	modified.poste_comptable=3Dreplace(new.poste_comptable,'"','');
+        modified.compte_ordre=3Dreplace(NEW.COMPTE_ORDRE,'"','');
+        modified.detail=3Dreplace(NEW.DETAIL,'"','');
+        modified.num_compte=3Dreplace(NEW.NUM_COMPTE,'"','');
+        return modified;
+end;
+$$;
+
+
+--
+-- Name: trim_space_format_csv_banque(); Type: FUNCTION; Schema: comptap=
roc; Owner: -
+--
+
+CREATE FUNCTION trim_space_format_csv_banque() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+        modified format_csv_banque%ROWTYPE;
+begin
+        modified.name=3Dtrim(NEW.NAME);
+        modified.include_file=3Dtrim(new.include_file);
+		if ( length(modified.name) =3D 0 ) then
+			modified.name=3Dnull;
+		end if;
+		if ( length(modified.include_file) =3D 0 ) then
+			modified.include_file=3Dnull;
+		end if;
+
+        return modified;
+end;
+$$;
+
+
+--
+-- Name: tva_delete(integer); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION tva_delete(integer) RETURNS void
+    LANGUAGE plpgsql
+    AS $_$=20
+declare
+	p_tva_id alias for $1;
+	nCount integer;
+begin
+	nCount=3D0;
+	select count(*) into nCount from quant_sold where qs_vat_code=3Dp_tva_i=
d;
+	if nCount !=3D 0 then
+                 return;
+	=09
+	end if;
+	select count(*) into nCount from quant_purchase where qp_vat_code=3Dp_t=
va_id;
+	if nCount !=3D 0 then
+                 return;
+	=09
+	end if;
+
+delete from tva_rate where tva_id=3Dp_tva_id;
+	return;
+end;
+$_$;
+
+
+--
+-- Name: tva_insert(text, numeric, text, text, integer); Type: FUNCTION;=
 Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION tva_insert(text, numeric, text, text, integer) RETURNS i=
nteger
+    LANGUAGE plpgsql
+    AS $_$
+declare
+	l_tva_id integer;
+	p_tva_label alias for $1;
+	p_tva_rate alias for $2;
+	p_tva_comment alias for $3;
+	p_tva_poste alias for $4;
+	p_tva_both_side alias for $5;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+select into l_tva_id nextval('s_tva') ;
+insert into tva_rate(tva_id,tva_label,tva_rate,tva_comment,tva_poste,tva=
_both_side)
+	values (l_tva_id,p_tva_label,p_tva_rate,p_tva_comment,p_tva_poste,p_tva=
_both_side);
+return 0;
+end;
+$_$;
+
+
+--
+-- Name: tva_modify(integer, text, numeric, text, text, integer); Type: =
FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION tva_modify(integer, text, numeric, text, text, integer) =
RETURNS integer
+    LANGUAGE plpgsql
+    AS $_$
+declare
+	p_tva_id alias for $1;
+	p_tva_label alias for $2;
+	p_tva_rate alias for $3;
+	p_tva_comment alias for $4;
+	p_tva_poste alias for $5;
+	p_tva_both_side alias for $6;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+update tva_rate set tva_label=3Dp_tva_label,tva_rate=3Dp_tva_rate,tva_co=
mment=3Dp_tva_comment,tva_poste=3Dp_tva_poste,tva_both_side=3Dp_tva_both_=
side
+	where tva_id=3Dp_tva_id;
+return 0;
+end;
+$_$;
+
+
+--
+-- Name: update_quick_code(integer, text); Type: FUNCTION; Schema: compt=
aproc; Owner: -
+--
+
+CREATE FUNCTION update_quick_code(njft_id integer, tav_text text) RETURN=
S integer
+    LANGUAGE plpgsql
+    AS $$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	old_qcode varchar;
+	begin
+	-- get current value
+	select ad_value into old_qcode from fiche_detail where jft_id=3Dnjft_id=
;
+	-- av_text didn't change so no update
+	if tav_text =3D upper( trim(old_qcode)) then
+		return 0;
+	end if;
+=09
+	tText :=3D trim(upper(tav_text));
+	tText :=3D replace(tText,' ','');
+	if length ( tText) =3D 0 or tText is null then
+		return 0;
+	end if;
+	=09
+	ns :=3D njft_id;
+
+	loop
+		-- av_text already used ?
+		select count(*) into nExist=20
+			from fiche_detail
+		where=20
+			ad_id=3D23 and ad_value=3DtText;
+
+		if nExist =3D 0 then
+			exit;
+		end if;=09
+		if tText =3D 'FID'||ns then
+			-- take the next sequence
+			select nextval('s_jnt_fic_att_value') into ns;
+		end if;
+		tText  :=3D'FID'||ns;
+	=09
+	end loop;
+	update fiche_detail set ad_value =3D tText where jft_id=3Dnjft_id;
+
+	-- update also the contact
+	update fiche_detail set ad_value =3D tText=20
+		where jft_id in=20
+			( select jft_id=20
+				from fiche_detail=20
+			where ad_id=3D25 and ad_value=3Dold_qcode);
+
+
+	update jrnx set j_qcode=3DtText where j_qcode =3D old_qcode;
+	return ns;
+	end;
+$$;
+
+
+SET search_path =3D public, pg_catalog;
+
+--
+-- Name: bud_card_ins_upd(); Type: FUNCTION; Schema: public; Owner: -
+--
+
+CREATE FUNCTION bud_card_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$declare
+ sCode text;
+begin
+
+sCode:=3Dtrim(upper(NEW.bc_code));
+sCode:=3Dreplace(sCode,' ','_');
+sCode:=3Dsubstr(sCode,1,10);
+NEW.bc_code:=3DsCode;
+return NEW;
+end;$$;
+
+
+--
+-- Name: bud_detail_ins_upd(); Type: FUNCTION; Schema: public; Owner: -
+--
+
+CREATE FUNCTION bud_detail_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$declare
+mline bud_detail%ROWTYPE;
+begin
+mline:=3DNEW;
+if mline.po_id =3D -1 then
+   mline.po_id:=3DNULL;
+end if;
+return mline;
+end;$$;
+
+
+--
+-- Name: correct_quant_purchase(); Type: FUNCTION; Schema: public; Owner=
: -
+--
+
+CREATE FUNCTION correct_quant_purchase() RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+	r_invalid quant_purchase;
+	s_QuickCode text;
+	b_j_debit bool;
+	r_new record;
+	r_jrnx record;
+begin
+
+for r_invalid in select * from quant_purchase where qp_valid=3D'A'
+loop
+
+select j_qcode into s_QuickCode from vw_poste_qcode where f_id=3Dr_inval=
id.qp_fiche;
+raise notice 'qp_id % Quick code is %',r_invalid.qp_id,s_QuickCode;
+
+select j_debit,j_grpt,j_jrn_def,j_montant into r_jrnx from jrnx where j_=
id=3Dr_invalid.j_id;
+if NOT FOUND then
+	raise notice 'error not found jrnx %',r_invalid.j_id;
+	update quant_purchase set qp_valid=3D'Y' where qp_id=3Dr_invalid.qp_id;
+	continue;
+end if;
+raise notice 'j_debit % , j_grpt % ,j_jrn_def  % qp_price %',r_jrnx.j_de=
bit,r_jrnx.j_grpt,r_jrnx.j_jrn_def ,r_invalid.qp_price;
+
+select jr_internal,j_id,j_montant into r_new
+	from jrnx join jrn on (j_grpt=3Djr_grpt_id)
+	where=20
+	j_jrn_def=3Dr_jrnx.j_jrn_def
+	and j_id not in (select j_id from  quant_purchase)
+	and j_qcode=3Ds_QuickCode
+	and j_montant=3Dr_jrnx.j_montant
+	and j_debit !=3D r_jrnx.j_debit;
+
+if NOT FOUND then
+	raise notice 'error not found %', r_invalid.j_id;
+	update quant_purchase set qp_valid=3D'Y' where qp_id=3Dr_invalid.qp_id;
+	continue;    =20
+end if;
+raise notice 'j_id % found amount %',r_new.j_id,r_new.j_montant;
+
+insert into quant_purchase (qp_internal,j_id,qp_fiche,qp_quantite,qp_pri=
ce,qp_vat,qp_nd_amount,qp_nd_tva_recup,qp_valid,qp_dep_priv,qp_supplier,q=
p_vat_code)
+values (r_new.jr_internal,r_invalid.j_id,r_invalid.qp_fiche,(r_invalid.q=
p_quantite * (-1)),r_invalid.qp_price * (-1),r_invalid.qp_vat*(-1),r_inva=
lid.qp_nd_amount*(-1),r_invalid.qp_nd_tva_recup*(-1) ,'Y',r_invalid.qp_de=
p_priv*(-1),r_invalid.qp_supplier,r_invalid.qp_vat_code);
+
+update quant_purchase set qp_valid=3D'Y' where qp_id=3Dr_invalid.qp_id;
+end loop;
+return;
+end;
+$$;
+
+
+--
+-- Name: correct_quant_sale(); Type: FUNCTION; Schema: public; Owner: -
+--
+
+CREATE FUNCTION correct_quant_sale() RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+	r_invalid quant_sold;
+	s_QuickCode text;
+	b_j_debit bool;
+	r_new record;
+	r_jrnx record;
+begin
+
+for r_invalid in select * from quant_sold where qs_valid=3D'A'
+loop
+
+select j_qcode into s_QuickCode from vw_poste_qcode where f_id=3Dr_inval=
id.qs_fiche;
+raise notice 'qp_id % Quick code is %',r_invalid.qs_id,s_QuickCode;
+
+select j_debit,j_grpt,j_jrn_def,j_montant into r_jrnx from jrnx where j_=
id=3Dr_invalid.j_id;
+if NOT FOUND then
+	update quant_sold set qs_valid=3D'Y' where qs_id=3Dr_invalid.qs_id;
+	raise notice 'error not found jrnx %',r_invalid.j_id;
+	continue;
+end if;
+raise notice 'j_debit % , j_grpt % ,j_jrn_def  % qs_price %',r_jrnx.j_de=
bit,r_jrnx.j_grpt,r_jrnx.j_jrn_def ,r_invalid.qs_price;
+
+select jr_internal,j_id,j_montant into r_new
+	from jrnx join jrn on (j_grpt=3Djr_grpt_id)
+	where=20
+	j_jrn_def=3Dr_jrnx.j_jrn_def
+	and j_id not in (select j_id from  quant_sold)
+	and j_qcode=3Ds_QuickCode
+	and j_montant=3Dr_jrnx.j_montant
+	and j_debit !=3D r_jrnx.j_debit;
+
+if NOT FOUND then
+   update quant_sold set qs_valid=3D'Y' where qs_id=3Dr_invalid.qs_id;
+	raise notice 'error not found %', r_invalid.j_id;
+	continue;
+end if;
+raise notice 'j_id % found amount %',r_new.j_id,r_new.j_montant;
+
+
+ insert into quant_sold (qs_internal,j_id,qs_fiche,qs_quantite,qs_price,=
qs_vat,qs_valid,qs_client,qs_vat_code)
+ values (r_new.jr_internal,r_invalid.j_id,r_invalid.qs_fiche,(r_invalid.=
qs_quantite * (-1)),r_invalid.qs_price * (-1),r_invalid.qs_vat*(-1),'Y',r=
_invalid.qs_client,r_invalid.qs_vat_code);
+ update quant_sold set qs_valid=3D'Y' where qs_id=3Dr_invalid.qs_id;
+end loop;
+return;
+end;
+$$;
+
+
+SET default_tablespace =3D '';
+
+SET default_with_oids =3D true;
+
+--
+-- Name: action; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE action (
+    ac_id integer NOT NULL,
+    ac_description text NOT NULL,
+    ac_module text,
+    ac_code character varying(9)
+);
+
+
+--
+-- Name: TABLE action; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE action IS 'The different privileges';
+
+
+--
+-- Name: COLUMN action.ac_code; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN action.ac_code IS 'this code will be used in the code =
with the function User::check_action ';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: action_detail; Type: TABLE; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE TABLE action_detail (
+    ad_id integer NOT NULL,
+    f_id bigint,
+    ad_text text,
+    ad_pu numeric(20,4) DEFAULT 0,
+    ad_quant numeric(20,4) DEFAULT 0,
+    ad_tva_id integer DEFAULT 0,
+    ad_tva_amount numeric(20,4) DEFAULT 0,
+    ad_total_amount numeric(20,4) DEFAULT 0,
+    ag_id integer DEFAULT 0 NOT NULL
+);
+
+
+--
+-- Name: TABLE action_detail; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE action_detail IS 'Detail of action_gestion, see class A=
ction_Detail';
+
+
+--
+-- Name: COLUMN action_detail.f_id; Type: COMMENT; Schema: public; Owner=
: -
+--
+
+COMMENT ON COLUMN action_detail.f_id IS 'the concerned	card';
+
+
+--
+-- Name: COLUMN action_detail.ad_text; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_text IS ' Description ';
+
+
+--
+-- Name: COLUMN action_detail.ad_pu; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON COLUMN action_detail.ad_pu IS ' price per unit ';
+
+
+--
+-- Name: COLUMN action_detail.ad_quant; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_quant IS 'quantity ';
+
+
+--
+-- Name: COLUMN action_detail.ad_tva_id; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_tva_id IS ' tva_id ';
+
+
+--
+-- Name: COLUMN action_detail.ad_tva_amount; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_tva_amount IS ' tva_amount ';
+
+
+--
+-- Name: COLUMN action_detail.ad_total_amount; Type: COMMENT; Schema: pu=
blic; Owner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_total_amount IS ' total amount';
+
+
+--
+-- Name: action_detail_ad_id_seq; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE action_detail_ad_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: action_detail_ad_id_seq; Type: SEQUENCE OWNED BY; Schema: publi=
c; Owner: -
+--
+
+ALTER SEQUENCE action_detail_ad_id_seq OWNED BY action_detail.ad_id;
+
+
+--
+-- Name: action_detail_ad_id_seq; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('action_detail_ad_id_seq', 1, false);
+
+
+--
+-- Name: action_gestion_ag_id_seq; Type: SEQUENCE; Schema: public; Owner=
: -
+--
+
+CREATE SEQUENCE action_gestion_ag_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: action_gestion_ag_id_seq; Type: SEQUENCE SET; Schema: public; O=
wner: -
+--
+
+SELECT pg_catalog.setval('action_gestion_ag_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: action_gestion; Type: TABLE; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+CREATE TABLE action_gestion (
+    ag_id integer DEFAULT nextval('action_gestion_ag_id_seq'::regclass) =
NOT NULL,
+    ag_type integer,
+    f_id_dest integer NOT NULL,
+    ag_title character varying(70),
+    ag_timestamp timestamp without time zone DEFAULT now(),
+    ag_cal character(1) DEFAULT 'C'::bpchar,
+    ag_ref_ag_id integer,
+    ag_comment text,
+    ag_ref text,
+    ag_hour text,
+    ag_priority integer DEFAULT 2,
+    ag_dest text,
+    ag_owner text,
+    ag_contact bigint,
+    ag_state integer
+);
+
+
+--
+-- Name: TABLE action_gestion; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE action_gestion IS 'Contains the details for the follow-=
up of customer, supplier, administration';
+
+
+--
+-- Name: COLUMN action_gestion.ag_type; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_type IS ' type of action: see docume=
nt_type ';
+
+
+--
+-- Name: COLUMN action_gestion.f_id_dest; Type: COMMENT; Schema: public;=
 Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.f_id_dest IS ' third party ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_title; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_title IS ' title ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_timestamp; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_timestamp IS ' ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_cal; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_cal IS ' visible in the calendar if =
=3D C';
+
+
+--
+-- Name: COLUMN action_gestion.ag_ref_ag_id; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_ref_ag_id IS ' concerning the action=
 ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_comment; Type: COMMENT; Schema: public=
; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_comment IS ' comment of the action';
+
+
+--
+-- Name: COLUMN action_gestion.ag_ref; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_ref IS 'its reference ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_priority; Type: COMMENT; Schema: publi=
c; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_priority IS 'Low, medium, important =
';
+
+
+--
+-- Name: COLUMN action_gestion.ag_dest; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_dest IS ' is the person who has to t=
ake care of this action ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_owner; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_owner IS ' is the owner of this acti=
on ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_contact; Type: COMMENT; Schema: public=
; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_contact IS ' contact of the third pa=
rt ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_state; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_state IS 'state of the action same a=
s document_state ';
+
+
+--
+-- Name: attr_def; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE attr_def (
+    ad_id integer DEFAULT nextval(('s_attr_def'::text)::regclass) NOT NU=
LL,
+    ad_text text,
+    ad_type text,
+    ad_size text NOT NULL
+);
+
+
+--
+-- Name: TABLE attr_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE attr_def IS 'The available attributs for the cards';
+
+
+--
+-- Name: attr_min; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE attr_min (
+    frd_id integer NOT NULL,
+    ad_id integer NOT NULL
+);
+
+
+--
+-- Name: TABLE attr_min; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE attr_min IS 'The value of  attributs for the cards';
+
+
+--
+-- Name: bilan_b_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE bilan_b_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: bilan_b_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('bilan_b_id_seq', 4, true);
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: bilan; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE bilan (
+    b_id integer DEFAULT nextval('bilan_b_id_seq'::regclass) NOT NULL,
+    b_name text NOT NULL,
+    b_file_template text NOT NULL,
+    b_file_form text,
+    b_type text NOT NULL
+);
+
+
+--
+-- Name: TABLE bilan; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE bilan IS 'contains the template and the data for genera=
ting different documents  ';
+
+
+--
+-- Name: COLUMN bilan.b_id; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN bilan.b_id IS 'primary key';
+
+
+--
+-- Name: COLUMN bilan.b_name; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN bilan.b_name IS 'Name of the document';
+
+
+--
+-- Name: COLUMN bilan.b_file_template; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN bilan.b_file_template IS 'path of the template (docume=
nt/...)';
+
+
+--
+-- Name: COLUMN bilan.b_file_form; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN bilan.b_file_form IS 'path of the file with forms';
+
+
+--
+-- Name: COLUMN bilan.b_type; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN bilan.b_type IS 'type =3D ODS, RTF...';
+
+
+--
+-- Name: bud_card_bc_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE bud_card_bc_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: bud_card_bc_id_seq; Type: SEQUENCE SET; Schema: public; Owner: =
-
+--
+
+SELECT pg_catalog.setval('bud_card_bc_id_seq', 1, false);
+
+
+--
+-- Name: bud_detail_bd_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE bud_detail_bd_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: bud_detail_bd_id_seq; Type: SEQUENCE SET; Schema: public; Owner=
: -
+--
+
+SELECT pg_catalog.setval('bud_detail_bd_id_seq', 1, false);
+
+
+--
+-- Name: bud_detail_periode_bdp_id_seq; Type: SEQUENCE; Schema: public; =
Owner: -
+--
+
+CREATE SEQUENCE bud_detail_periode_bdp_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: bud_detail_periode_bdp_id_seq; Type: SEQUENCE SET; Schema: publ=
ic; Owner: -
+--
+
+SELECT pg_catalog.setval('bud_detail_periode_bdp_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: centralized; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE centralized (
+    c_id integer DEFAULT nextval(('s_centralized'::text)::regclass) NOT =
NULL,
+    c_j_id integer,
+    c_date date NOT NULL,
+    c_internal text NOT NULL,
+    c_montant numeric(20,4) NOT NULL,
+    c_debit boolean DEFAULT true,
+    c_jrn_def integer NOT NULL,
+    c_poste account_type,
+    c_description text,
+    c_grp integer NOT NULL,
+    c_comment text,
+    c_rapt text,
+    c_periode integer,
+    c_order integer
+);
+
+
+--
+-- Name: TABLE centralized; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE centralized IS 'The centralized journal';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: del_action; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE del_action (
+    del_id integer NOT NULL,
+    del_name text NOT NULL,
+    del_time timestamp without time zone
+);
+
+
+--
+-- Name: del_action_del_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE del_action_del_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: del_action_del_id_seq; Type: SEQUENCE OWNED BY; Schema: public;=
 Owner: -
+--
+
+ALTER SEQUENCE del_action_del_id_seq OWNED BY del_action.del_id;
+
+
+--
+-- Name: del_action_del_id_seq; Type: SEQUENCE SET; Schema: public; Owne=
r: -
+--
+
+SELECT pg_catalog.setval('del_action_del_id_seq', 1, false);
+
+
+--
+-- Name: del_jrn; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE del_jrn (
+    jr_id integer NOT NULL,
+    jr_def_id integer,
+    jr_montant numeric(20,4),
+    jr_comment text,
+    jr_date date,
+    jr_grpt_id integer,
+    jr_internal text,
+    jr_tech_date timestamp without time zone,
+    jr_tech_per integer,
+    jrn_ech date,
+    jr_ech date,
+    jr_rapt text,
+    jr_valid boolean,
+    jr_opid integer,
+    jr_c_opid integer,
+    jr_pj oid,
+    jr_pj_name text,
+    jr_pj_type text,
+    del_jrn_date timestamp without time zone,
+    jr_pj_number text,
+    dj_id integer NOT NULL
+);
+
+
+--
+-- Name: del_jrn_dj_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE del_jrn_dj_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: del_jrn_dj_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Own=
er: -
+--
+
+ALTER SEQUENCE del_jrn_dj_id_seq OWNED BY del_jrn.dj_id;
+
+
+--
+-- Name: del_jrn_dj_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('del_jrn_dj_id_seq', 1, false);
+
+
+--
+-- Name: del_jrnx; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE del_jrnx (
+    j_id integer NOT NULL,
+    j_date date,
+    j_montant numeric(20,4),
+    j_poste account_type,
+    j_grpt integer,
+    j_rapt text,
+    j_jrn_def integer,
+    j_debit boolean,
+    j_text text,
+    j_centralized boolean,
+    j_internal text,
+    j_tech_user text,
+    j_tech_date timestamp without time zone,
+    j_tech_per integer,
+    j_qcode text,
+    djx_id integer NOT NULL,
+    f_id bigint
+);
+
+
+--
+-- Name: del_jrnx_djx_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE del_jrnx_djx_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: del_jrnx_djx_id_seq; Type: SEQUENCE OWNED BY; Schema: public; O=
wner: -
+--
+
+ALTER SEQUENCE del_jrnx_djx_id_seq OWNED BY del_jrnx.djx_id;
+
+
+--
+-- Name: del_jrnx_djx_id_seq; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('del_jrnx_djx_id_seq', 1, false);
+
+
+--
+-- Name: document_d_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE document_d_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: document_d_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('document_d_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: document; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE document (
+    d_id integer DEFAULT nextval('document_d_id_seq'::regclass) NOT NULL=
,
+    ag_id integer NOT NULL,
+    d_lob oid,
+    d_number bigint NOT NULL,
+    d_filename text,
+    d_mimetype text
+);
+
+
+--
+-- Name: TABLE document; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE document IS 'This table contains all the documents : su=
mmary and lob files';
+
+
+--
+-- Name: document_modele_md_id_seq; Type: SEQUENCE; Schema: public; Owne=
r: -
+--
+
+CREATE SEQUENCE document_modele_md_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: document_modele_md_id_seq; Type: SEQUENCE SET; Schema: public; =
Owner: -
+--
+
+SELECT pg_catalog.setval('document_modele_md_id_seq', 1, false);
+
+
+--
+-- Name: document_modele; Type: TABLE; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+CREATE TABLE document_modele (
+    md_id integer DEFAULT nextval('document_modele_md_id_seq'::regclass)=
 NOT NULL,
+    md_name text NOT NULL,
+    md_lob oid,
+    md_type integer NOT NULL,
+    md_filename text,
+    md_mimetype text,
+    md_affect character varying(3) NOT NULL
+);
+
+
+--
+-- Name: TABLE document_modele; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE document_modele IS ' contains all the template for the =
 documents';
+
+
+--
+-- Name: document_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE document_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: SEQUENCE document_seq; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON SEQUENCE document_seq IS 'Sequence for the sequence bound to =
the document modele';
+
+
+--
+-- Name: document_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('document_seq', 1, false);
+
+
+--
+-- Name: document_state_s_id_seq; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE document_state_s_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: document_state_s_id_seq; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('document_state_s_id_seq', 3, true);
+
+
+--
+-- Name: document_state; Type: TABLE; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+CREATE TABLE document_state (
+    s_id integer DEFAULT nextval('document_state_s_id_seq'::regclass) NO=
T NULL,
+    s_value character varying(50) NOT NULL
+);
+
+
+--
+-- Name: TABLE document_state; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE document_state IS 'State of the document';
+
+
+--
+-- Name: document_type_dt_id_seq; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE document_type_dt_id_seq
+    START WITH 25
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: document_type_dt_id_seq; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('document_type_dt_id_seq', 25, false);
+
+
+--
+-- Name: document_type; Type: TABLE; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE TABLE document_type (
+    dt_id integer DEFAULT nextval('document_type_dt_id_seq'::regclass) N=
OT NULL,
+    dt_value character varying(80)
+);
+
+
+--
+-- Name: TABLE document_type; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE document_type IS 'Type of document : meeting, invoice,.=
..';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: extension; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE extension (
+    ex_id integer NOT NULL,
+    ex_name character varying(30) NOT NULL,
+    ex_code character varying(15) NOT NULL,
+    ex_desc character varying(250),
+    ex_file character varying NOT NULL,
+    ex_enable "char" DEFAULT 'Y'::"char" NOT NULL
+);
+
+
+--
+-- Name: TABLE extension; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE extension IS 'Content the needed information for the ex=
tension';
+
+
+--
+-- Name: COLUMN extension.ex_id; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN extension.ex_id IS 'Primary key';
+
+
+--
+-- Name: COLUMN extension.ex_name; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN extension.ex_name IS 'code of the extension ';
+
+
+--
+-- Name: COLUMN extension.ex_code; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN extension.ex_code IS 'code of the extension ';
+
+
+--
+-- Name: COLUMN extension.ex_desc; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN extension.ex_desc IS 'Description of the extension ';
+
+
+--
+-- Name: COLUMN extension.ex_file; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN extension.ex_file IS 'path to the extension to include=
';
+
+
+--
+-- Name: COLUMN extension.ex_enable; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON COLUMN extension.ex_enable IS 'Y : enabled N : disabled ';
+
+
+--
+-- Name: extension_ex_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE extension_ex_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: extension_ex_id_seq; Type: SEQUENCE OWNED BY; Schema: public; O=
wner: -
+--
+
+ALTER SEQUENCE extension_ex_id_seq OWNED BY extension.ex_id;
+
+
+--
+-- Name: extension_ex_id_seq; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('extension_ex_id_seq', 1, true);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: fiche; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE fiche (
+    f_id integer DEFAULT nextval(('s_fiche'::text)::regclass) NOT NULL,
+    fd_id integer
+);
+
+
+--
+-- Name: TABLE fiche; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE fiche IS 'Cards';
+
+
+--
+-- Name: fiche_def; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE fiche_def (
+    fd_id integer DEFAULT nextval(('s_fdef'::text)::regclass) NOT NULL,
+    fd_class_base text,
+    fd_label text NOT NULL,
+    fd_create_account boolean DEFAULT false,
+    frd_id integer NOT NULL
+);
+
+
+--
+-- Name: TABLE fiche_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE fiche_def IS 'Cards definition';
+
+
+--
+-- Name: fiche_def_ref; Type: TABLE; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE TABLE fiche_def_ref (
+    frd_id integer DEFAULT nextval(('s_fiche_def_ref'::text)::regclass) =
NOT NULL,
+    frd_text text,
+    frd_class_base account_type
+);
+
+
+--
+-- Name: TABLE fiche_def_ref; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE fiche_def_ref IS 'Family Cards definition';
+
+
+--
+-- Name: fiche_detail; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE fiche_detail (
+    jft_id integer DEFAULT nextval(('s_jnt_fic_att_value'::text)::regcla=
ss) NOT NULL,
+    f_id integer,
+    ad_id integer,
+    ad_value text
+);
+
+
+--
+-- Name: TABLE fiche_detail; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE fiche_detail IS 'join between the card and the attribut=
 definition';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: forecast; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE forecast (
+    f_id integer NOT NULL,
+    f_name text NOT NULL,
+    f_start_date bigint,
+    f_end_date bigint
+);
+
+
+--
+-- Name: TABLE forecast; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE forecast IS 'contains the name of the forecast';
+
+
+--
+-- Name: forecast_cat; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE forecast_cat (
+    fc_id integer NOT NULL,
+    fc_desc text NOT NULL,
+    f_id bigint,
+    fc_order integer DEFAULT 0 NOT NULL
+);
+
+
+--
+-- Name: COLUMN forecast_cat.fc_id; Type: COMMENT; Schema: public; Owner=
: -
+--
+
+COMMENT ON COLUMN forecast_cat.fc_id IS 'primary key';
+
+
+--
+-- Name: COLUMN forecast_cat.fc_desc; Type: COMMENT; Schema: public; Own=
er: -
+--
+
+COMMENT ON COLUMN forecast_cat.fc_desc IS 'text of the category';
+
+
+--
+-- Name: COLUMN forecast_cat.f_id; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN forecast_cat.f_id IS 'Foreign key, it is the parent fr=
om the table forecast';
+
+
+--
+-- Name: COLUMN forecast_cat.fc_order; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN forecast_cat.fc_order IS 'Order of the category, used =
when displaid';
+
+
+--
+-- Name: forecast_cat_fc_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
+--
+
+CREATE SEQUENCE forecast_cat_fc_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: forecast_cat_fc_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
+--
+
+ALTER SEQUENCE forecast_cat_fc_id_seq OWNED BY forecast_cat.fc_id;
+
+
+--
+-- Name: forecast_cat_fc_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
+--
+
+SELECT pg_catalog.setval('forecast_cat_fc_id_seq', 1, false);
+
+
+--
+-- Name: forecast_f_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE forecast_f_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: forecast_f_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Own=
er: -
+--
+
+ALTER SEQUENCE forecast_f_id_seq OWNED BY forecast.f_id;
+
+
+--
+-- Name: forecast_f_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('forecast_f_id_seq', 1, false);
+
+
+--
+-- Name: forecast_item; Type: TABLE; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE TABLE forecast_item (
+    fi_id integer NOT NULL,
+    fi_text text,
+    fi_account text,
+    fi_card integer,
+    fi_order integer,
+    fc_id integer,
+    fi_amount numeric(20,4) DEFAULT 0,
+    fi_debit "char" DEFAULT 'd'::"char" NOT NULL,
+    fi_pid integer
+);
+
+
+--
+-- Name: COLUMN forecast_item.fi_id; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_id IS 'Primary key';
+
+
+--
+-- Name: COLUMN forecast_item.fi_text; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_text IS 'Label of the i	tem';
+
+
+--
+-- Name: COLUMN forecast_item.fi_account; Type: COMMENT; Schema: public;=
 Owner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_account IS 'Accountancy entry';
+
+
+--
+-- Name: COLUMN forecast_item.fi_card; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_card IS 'Card (fiche.f_id)';
+
+
+--
+-- Name: COLUMN forecast_item.fi_order; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_order IS 'Order of showing (not used)=
';
+
+
+--
+-- Name: COLUMN forecast_item.fi_amount; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_amount IS 'Amount';
+
+
+--
+-- Name: COLUMN forecast_item.fi_debit; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_debit IS 'possible values are D or C'=
;
+
+
+--
+-- Name: COLUMN forecast_item.fi_pid; Type: COMMENT; Schema: public; Own=
er: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_pid IS '0 for every month, or the val=
ue parm_periode.p_id ';
+
+
+--
+-- Name: forecast_item_fi_id_seq; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE forecast_item_fi_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: forecast_item_fi_id_seq; Type: SEQUENCE OWNED BY; Schema: publi=
c; Owner: -
+--
+
+ALTER SEQUENCE forecast_item_fi_id_seq OWNED BY forecast_item.fi_id;
+
+
+--
+-- Name: forecast_item_fi_id_seq; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('forecast_item_fi_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: form; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE form (
+    fo_id integer DEFAULT nextval(('s_form'::text)::regclass) NOT NULL,
+    fo_fr_id integer,
+    fo_pos integer,
+    fo_label text,
+    fo_formula text
+);
+
+
+--
+-- Name: TABLE form; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE form IS 'Forms content';
+
+
+--
+-- Name: formdef; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE formdef (
+    fr_id integer DEFAULT nextval(('s_formdef'::text)::regclass) NOT NUL=
L,
+    fr_label text
+);
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: groupe_analytique; Type: TABLE; Schema: public; Owner: -; Table=
space:=20
+--
+
+CREATE TABLE groupe_analytique (
+    ga_id character varying(10) NOT NULL,
+    pa_id integer,
+    ga_description text
+);
+
+
+--
+-- Name: historique_analytique_ha_id_seq; Type: SEQUENCE; Schema: public=
; Owner: -
+--
+
+CREATE SEQUENCE historique_analytique_ha_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: historique_analytique_ha_id_seq; Type: SEQUENCE SET; Schema: pu=
blic; Owner: -
+--
+
+SELECT pg_catalog.setval('historique_analytique_ha_id_seq', 1, false);
+
+
+--
+-- Name: info_def; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE info_def (
+    id_type text NOT NULL,
+    id_description text
+);
+
+
+--
+-- Name: TABLE info_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE info_def IS 'Contains the types of additionnal info we =
can add to a operation';
+
+
+--
+-- Name: s_jnt_id; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jnt_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jnt_id; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jnt_id', 53, true);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: jnt_fic_attr; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE jnt_fic_attr (
+    fd_id integer,
+    ad_id integer,
+    jnt_id bigint DEFAULT nextval('s_jnt_id'::regclass) NOT NULL,
+    jnt_order integer NOT NULL
+);
+
+
+--
+-- Name: TABLE jnt_fic_attr; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jnt_fic_attr IS 'join between the family card and the a=
ttribut definition';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: jnt_letter; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jnt_letter (
+    jl_id integer NOT NULL,
+    jl_amount_deb numeric(20,4)
+);
+
+
+--
+-- Name: jnt_letter_jl_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE jnt_letter_jl_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: jnt_letter_jl_id_seq; Type: SEQUENCE OWNED BY; Schema: public; =
Owner: -
+--
+
+ALTER SEQUENCE jnt_letter_jl_id_seq OWNED BY jnt_letter.jl_id;
+
+
+--
+-- Name: jnt_letter_jl_id_seq; Type: SEQUENCE SET; Schema: public; Owner=
: -
+--
+
+SELECT pg_catalog.setval('jnt_letter_jl_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: jrn; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn (
+    jr_id integer DEFAULT nextval(('s_jrn'::text)::regclass) NOT NULL,
+    jr_def_id integer NOT NULL,
+    jr_montant numeric(20,4) NOT NULL,
+    jr_comment text,
+    jr_date date,
+    jr_grpt_id integer NOT NULL,
+    jr_internal text,
+    jr_tech_date timestamp without time zone DEFAULT now() NOT NULL,
+    jr_tech_per integer NOT NULL,
+    jrn_ech date,
+    jr_ech date,
+    jr_rapt text,
+    jr_valid boolean DEFAULT true,
+    jr_opid integer,
+    jr_c_opid integer,
+    jr_pj oid,
+    jr_pj_name text,
+    jr_pj_type text,
+    jr_pj_number text,
+    jr_mt text
+);
+
+
+--
+-- Name: TABLE jrn; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn IS 'Journal: content one line for a group of accoun=
tancy writing';
+
+
+--
+-- Name: jrn_action; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_action (
+    ja_id integer DEFAULT nextval(('s_jrnaction'::text)::regclass) NOT N=
ULL,
+    ja_name text NOT NULL,
+    ja_desc text,
+    ja_url text NOT NULL,
+    ja_action text NOT NULL,
+    ja_lang text DEFAULT 'FR'::text,
+    ja_jrn_type character(3)
+);
+
+
+--
+-- Name: TABLE jrn_action; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_action IS 'Possible action when we are in journal (=
menu)';
+
+
+--
+-- Name: jrn_def; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_def (
+    jrn_def_id integer DEFAULT nextval(('s_jrn_def'::text)::regclass) NO=
T NULL,
+    jrn_def_name text NOT NULL,
+    jrn_def_class_deb text,
+    jrn_def_class_cred text,
+    jrn_def_fiche_deb text,
+    jrn_def_fiche_cred text,
+    jrn_deb_max_line integer DEFAULT 1,
+    jrn_cred_max_line integer DEFAULT 1,
+    jrn_def_ech boolean DEFAULT false,
+    jrn_def_ech_lib text,
+    jrn_def_type character(3) NOT NULL,
+    jrn_def_code text NOT NULL,
+    jrn_def_pj_pref text,
+    jrn_def_bank bigint,
+    jrn_def_num_op integer
+);
+
+
+--
+-- Name: TABLE jrn_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_def IS 'Definition of a journal, his properties';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: jrn_info; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_info (
+    ji_id integer NOT NULL,
+    jr_id integer NOT NULL,
+    id_type text NOT NULL,
+    ji_value text
+);
+
+
+--
+-- Name: jrn_info_ji_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE jrn_info_ji_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: jrn_info_ji_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Ow=
ner: -
+--
+
+ALTER SEQUENCE jrn_info_ji_id_seq OWNED BY jrn_info.ji_id;
+
+
+--
+-- Name: jrn_info_ji_id_seq; Type: SEQUENCE SET; Schema: public; Owner: =
-
+--
+
+SELECT pg_catalog.setval('jrn_info_ji_id_seq', 1, false);
+
+
+--
+-- Name: jrn_note; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_note (
+    n_id integer NOT NULL,
+    n_text text,
+    jr_id bigint NOT NULL
+);
+
+
+--
+-- Name: TABLE jrn_note; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_note IS 'Note about operation';
+
+
+--
+-- Name: jrn_note_n_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE jrn_note_n_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: jrn_note_n_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Own=
er: -
+--
+
+ALTER SEQUENCE jrn_note_n_id_seq OWNED BY jrn_note.n_id;
+
+
+--
+-- Name: jrn_note_n_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('jrn_note_n_id_seq', 1, false);
+
+
+--
+-- Name: jrn_periode; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE jrn_periode (
+    jrn_def_id integer NOT NULL,
+    p_id integer NOT NULL,
+    status text
+);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: jrn_rapt; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_rapt (
+    jra_id integer DEFAULT nextval(('s_jrn_rapt'::text)::regclass) NOT N=
ULL,
+    jr_id integer NOT NULL,
+    jra_concerned integer NOT NULL
+);
+
+
+--
+-- Name: TABLE jrn_rapt; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_rapt IS 'Rapprochement between operation';
+
+
+--
+-- Name: jrn_type; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_type (
+    jrn_type_id character(3) NOT NULL,
+    jrn_desc text
+);
+
+
+--
+-- Name: TABLE jrn_type; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_type IS 'Type of journal (Sell, Buy, Financial...)'=
;
+
+
+--
+-- Name: jrnx; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrnx (
+    j_id integer DEFAULT nextval(('s_jrn_op'::text)::regclass) NOT NULL,
+    j_date date DEFAULT now(),
+    j_montant numeric(20,4) DEFAULT 0,
+    j_poste account_type NOT NULL,
+    j_grpt integer NOT NULL,
+    j_rapt text,
+    j_jrn_def integer NOT NULL,
+    j_debit boolean DEFAULT true,
+    j_text text,
+    j_centralized boolean DEFAULT false,
+    j_internal text,
+    j_tech_user text NOT NULL,
+    j_tech_date timestamp without time zone DEFAULT now() NOT NULL,
+    j_tech_per integer NOT NULL,
+    j_qcode text,
+    f_id bigint
+);
+
+
+--
+-- Name: TABLE jrnx; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrnx IS 'Journal: content one line for each accountancy=
 writing';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: letter_cred; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE letter_cred (
+    lc_id integer NOT NULL,
+    j_id bigint NOT NULL,
+    jl_id bigint NOT NULL
+);
+
+
+--
+-- Name: letter_cred_lc_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE letter_cred_lc_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: letter_cred_lc_id_seq; Type: SEQUENCE OWNED BY; Schema: public;=
 Owner: -
+--
+
+ALTER SEQUENCE letter_cred_lc_id_seq OWNED BY letter_cred.lc_id;
+
+
+--
+-- Name: letter_cred_lc_id_seq; Type: SEQUENCE SET; Schema: public; Owne=
r: -
+--
+
+SELECT pg_catalog.setval('letter_cred_lc_id_seq', 1, false);
+
+
+--
+-- Name: letter_deb; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE letter_deb (
+    ld_id integer NOT NULL,
+    j_id bigint NOT NULL,
+    jl_id bigint NOT NULL
+);
+
+
+--
+-- Name: letter_deb_ld_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE letter_deb_ld_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: letter_deb_ld_id_seq; Type: SEQUENCE OWNED BY; Schema: public; =
Owner: -
+--
+
+ALTER SEQUENCE letter_deb_ld_id_seq OWNED BY letter_deb.ld_id;
+
+
+--
+-- Name: letter_deb_ld_id_seq; Type: SEQUENCE SET; Schema: public; Owner=
: -
+--
+
+SELECT pg_catalog.setval('letter_deb_ld_id_seq', 1, false);
+
+
+--
+-- Name: menu_ref; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE menu_ref (
+    me_code text NOT NULL,
+    me_menu text,
+    me_file text,
+    me_url text,
+    me_description text,
+    me_parameter text,
+    me_javascript text,
+    me_type character varying(2)
+);
+
+
+--
+-- Name: COLUMN menu_ref.me_code; Type: COMMENT; Schema: public; Owner: =
-
+--
+
+COMMENT ON COLUMN menu_ref.me_code IS 'Menu Code ';
+
+
+--
+-- Name: COLUMN menu_ref.me_menu; Type: COMMENT; Schema: public; Owner: =
-
+--
+
+COMMENT ON COLUMN menu_ref.me_menu IS 'Label to display';
+
+
+--
+-- Name: COLUMN menu_ref.me_file; Type: COMMENT; Schema: public; Owner: =
-
+--
+
+COMMENT ON COLUMN menu_ref.me_file IS 'if not empty file to include';
+
+
+--
+-- Name: COLUMN menu_ref.me_url; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN menu_ref.me_url IS 'url ';
+
+
+--
+-- Name: COLUMN menu_ref.me_type; Type: COMMENT; Schema: public; Owner: =
-
+--
+
+COMMENT ON COLUMN menu_ref.me_type IS 'ME for menu
+PR for Printing
+SP for special meaning (ex: return to line)
+PL for plugin';
+
+
+--
+-- Name: mod_payment; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE mod_payment (
+    mp_id integer NOT NULL,
+    mp_lib text NOT NULL,
+    mp_jrn_def_id integer NOT NULL,
+    mp_fd_id bigint,
+    mp_qcode text,
+    jrn_def_id bigint
+);
+
+
+--
+-- Name: TABLE mod_payment; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE mod_payment IS 'Contains the different media of payment=
 and the corresponding ledger';
+
+
+--
+-- Name: COLUMN mod_payment.jrn_def_id; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN mod_payment.jrn_def_id IS 'Ledger using this payment m=
ethod';
+
+
+--
+-- Name: mod_payment_mp_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE mod_payment_mp_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: mod_payment_mp_id_seq; Type: SEQUENCE OWNED BY; Schema: public;=
 Owner: -
+--
+
+ALTER SEQUENCE mod_payment_mp_id_seq OWNED BY mod_payment.mp_id;
+
+
+--
+-- Name: mod_payment_mp_id_seq; Type: SEQUENCE SET; Schema: public; Owne=
r: -
+--
+
+SELECT pg_catalog.setval('mod_payment_mp_id_seq', 10, true);
+
+
+--
+-- Name: op_def_op_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE op_def_op_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: op_def_op_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('op_def_op_seq', 1, false);
+
+
+--
+-- Name: op_predef; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE op_predef (
+    od_id integer DEFAULT nextval('op_def_op_seq'::regclass) NOT NULL,
+    jrn_def_id integer NOT NULL,
+    od_name text NOT NULL,
+    od_item integer NOT NULL,
+    od_jrn_type text NOT NULL,
+    od_direct boolean NOT NULL
+);
+
+
+--
+-- Name: TABLE op_predef; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE op_predef IS 'predefined operation';
+
+
+--
+-- Name: COLUMN op_predef.jrn_def_id; Type: COMMENT; Schema: public; Own=
er: -
+--
+
+COMMENT ON COLUMN op_predef.jrn_def_id IS 'jrn_id';
+
+
+--
+-- Name: COLUMN op_predef.od_name; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN op_predef.od_name IS 'name of the operation';
+
+
+--
+-- Name: op_predef_detail_opd_id_seq; Type: SEQUENCE; Schema: public; Ow=
ner: -
+--
+
+CREATE SEQUENCE op_predef_detail_opd_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: op_predef_detail_opd_id_seq; Type: SEQUENCE SET; Schema: public=
; Owner: -
+--
+
+SELECT pg_catalog.setval('op_predef_detail_opd_id_seq', 1, false);
+
+
+--
+-- Name: op_predef_detail; Type: TABLE; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+CREATE TABLE op_predef_detail (
+    opd_id integer DEFAULT nextval('op_predef_detail_opd_id_seq'::regcla=
ss) NOT NULL,
+    od_id integer NOT NULL,
+    opd_poste text NOT NULL,
+    opd_amount numeric(20,4),
+    opd_tva_id integer,
+    opd_quantity numeric(20,4),
+    opd_debit boolean NOT NULL,
+    opd_tva_amount numeric(20,4),
+    opd_comment text,
+    opd_qc boolean
+);
+
+
+--
+-- Name: TABLE op_predef_detail; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE op_predef_detail IS 'contains the detail of predefined =
operations';
+
+
+--
+-- Name: s_oa_group; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_oa_group
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_oa_group; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_oa_group', 1, true);
+
+
+--
+-- Name: operation_analytique; Type: TABLE; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+CREATE TABLE operation_analytique (
+    oa_id integer DEFAULT nextval('historique_analytique_ha_id_seq'::reg=
class) NOT NULL,
+    po_id integer NOT NULL,
+    oa_amount numeric(20,4) NOT NULL,
+    oa_description text,
+    oa_debit boolean DEFAULT true NOT NULL,
+    j_id integer,
+    oa_group integer DEFAULT nextval('s_oa_group'::regclass) NOT NULL,
+    oa_date date NOT NULL,
+    oa_row integer,
+    CONSTRAINT operation_analytique_oa_amount_check CHECK ((oa_amount >=3D=
 (0)::numeric))
+);
+
+
+--
+-- Name: TABLE operation_analytique; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON TABLE operation_analytique IS 'History of the analytic accoun=
t';
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: parameter; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE parameter (
+    pr_id text NOT NULL,
+    pr_value text
+);
+
+
+--
+-- Name: TABLE parameter; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE parameter IS 'parameter of the company';
+
+
+--
+-- Name: parm_code; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE parm_code (
+    p_code text NOT NULL,
+    p_value text,
+    p_comment text
+);
+
+
+--
+-- Name: parm_money; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE parm_money (
+    pm_id integer DEFAULT nextval(('s_currency'::text)::regclass),
+    pm_code character(3) NOT NULL,
+    pm_rate numeric(20,4)
+);
+
+
+--
+-- Name: TABLE parm_money; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE parm_money IS 'Currency conversion';
+
+
+--
+-- Name: parm_periode; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE parm_periode (
+    p_id integer DEFAULT nextval(('s_periode'::text)::regclass) NOT NULL=
,
+    p_start date NOT NULL,
+    p_end date NOT NULL,
+    p_exercice text DEFAULT to_char(now(), 'YYYY'::text) NOT NULL,
+    p_closed boolean DEFAULT false,
+    p_central boolean DEFAULT false,
+    CONSTRAINT parm_periode_check CHECK ((p_end >=3D p_start))
+);
+
+
+--
+-- Name: TABLE parm_periode; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE parm_periode IS 'Periode definition';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: parm_poste; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE parm_poste (
+    p_value account_type NOT NULL,
+    p_type text NOT NULL
+);
+
+
+--
+-- Name: TABLE parm_poste; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE parm_poste IS 'Contains data for finding is the type of=
 the account (asset)';
+
+
+--
+-- Name: plan_analytique_pa_id_seq; Type: SEQUENCE; Schema: public; Owne=
r: -
+--
+
+CREATE SEQUENCE plan_analytique_pa_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: plan_analytique_pa_id_seq; Type: SEQUENCE SET; Schema: public; =
Owner: -
+--
+
+SELECT pg_catalog.setval('plan_analytique_pa_id_seq', 1, false);
+
+
+--
+-- Name: plan_analytique; Type: TABLE; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+CREATE TABLE plan_analytique (
+    pa_id integer DEFAULT nextval('plan_analytique_pa_id_seq'::regclass)=
 NOT NULL,
+    pa_name text DEFAULT 'Sans Nom'::text NOT NULL,
+    pa_description text
+);
+
+
+--
+-- Name: TABLE plan_analytique; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE plan_analytique IS 'Plan Analytique (max 5)';
+
+
+--
+-- Name: poste_analytique_po_id_seq; Type: SEQUENCE; Schema: public; Own=
er: -
+--
+
+CREATE SEQUENCE poste_analytique_po_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: poste_analytique_po_id_seq; Type: SEQUENCE SET; Schema: public;=
 Owner: -
+--
+
+SELECT pg_catalog.setval('poste_analytique_po_id_seq', 1, false);
+
+
+--
+-- Name: poste_analytique; Type: TABLE; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+CREATE TABLE poste_analytique (
+    po_id integer DEFAULT nextval('poste_analytique_po_id_seq'::regclass=
) NOT NULL,
+    po_name text NOT NULL,
+    pa_id integer NOT NULL,
+    po_amount numeric(20,4) DEFAULT 0.0 NOT NULL,
+    po_description text,
+    ga_id character varying(10)
+);
+
+
+--
+-- Name: TABLE poste_analytique; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE poste_analytique IS 'Poste Analytique';
+
+
+--
+-- Name: profile; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE profile (
+    p_name text NOT NULL,
+    p_id integer NOT NULL,
+    p_desc text,
+    with_calc boolean DEFAULT true,
+    with_direct_form boolean DEFAULT true
+);
+
+
+--
+-- Name: TABLE profile; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE profile IS 'Available profile ';
+
+
+--
+-- Name: COLUMN profile.p_name; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN profile.p_name IS 'Name of the profile';
+
+
+--
+-- Name: COLUMN profile.p_desc; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN profile.p_desc IS 'description of the profile';
+
+
+--
+-- Name: COLUMN profile.with_calc; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN profile.with_calc IS 'show the calculator';
+
+
+--
+-- Name: COLUMN profile.with_direct_form; Type: COMMENT; Schema: public;=
 Owner: -
+--
+
+COMMENT ON COLUMN profile.with_direct_form IS 'show the direct form';
+
+
+--
+-- Name: profile_menu; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE profile_menu (
+    pm_id integer NOT NULL,
+    me_code text,
+    me_code_dep text,
+    p_id integer,
+    p_order integer,
+    p_type_display text NOT NULL,
+    pm_default integer
+);
+
+
+--
+-- Name: TABLE profile_menu; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE profile_menu IS 'Join  between the profile and the menu=
 ';
+
+
+--
+-- Name: COLUMN profile_menu.me_code_dep; Type: COMMENT; Schema: public;=
 Owner: -
+--
+
+COMMENT ON COLUMN profile_menu.me_code_dep IS 'menu code dependency';
+
+
+--
+-- Name: COLUMN profile_menu.p_id; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN profile_menu.p_id IS 'link to profile';
+
+
+--
+-- Name: COLUMN profile_menu.p_order; Type: COMMENT; Schema: public; Own=
er: -
+--
+
+COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu';
+
+
+--
+-- Name: COLUMN profile_menu.p_type_display; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN profile_menu.p_type_display IS 'M is a module
+E is a menu
+S is a select (for plugin)';
+
+
+--
+-- Name: COLUMN profile_menu.pm_default; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN profile_menu.pm_default IS 'default menu';
+
+
+--
+-- Name: profile_menu_pm_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
+--
+
+CREATE SEQUENCE profile_menu_pm_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: profile_menu_pm_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
+--
+
+ALTER SEQUENCE profile_menu_pm_id_seq OWNED BY profile_menu.pm_id;
+
+
+--
+-- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
+--
+
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 779, true);
+
+
+--
+-- Name: profile_menu_type; Type: TABLE; Schema: public; Owner: -; Table=
space:=20
+--
+
+CREATE TABLE profile_menu_type (
+    pm_type text NOT NULL,
+    pm_desc text
+);
+
+
+--
+-- Name: profile_p_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE profile_p_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: profile_p_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owne=
r: -
+--
+
+ALTER SEQUENCE profile_p_id_seq OWNED BY profile.p_id;
+
+
+--
+-- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('profile_p_id_seq', 11, true);
+
+
+--
+-- Name: profile_user; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE profile_user (
+    user_name text NOT NULL,
+    pu_id integer NOT NULL,
+    p_id integer
+);
+
+
+--
+-- Name: TABLE profile_user; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE profile_user IS 'Contains the available profile for use=
rs';
+
+
+--
+-- Name: COLUMN profile_user.user_name; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN profile_user.user_name IS 'fk to available_user : logi=
n';
+
+
+--
+-- Name: COLUMN profile_user.p_id; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN profile_user.p_id IS 'fk to profile';
+
+
+--
+-- Name: profile_user_pu_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
+--
+
+CREATE SEQUENCE profile_user_pu_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: profile_user_pu_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
+--
+
+ALTER SEQUENCE profile_user_pu_id_seq OWNED BY profile_user.pu_id;
+
+
+--
+-- Name: profile_user_pu_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
+--
+
+SELECT pg_catalog.setval('profile_user_pu_id_seq', 6, true);
+
+
+--
+-- Name: quant_fin; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE quant_fin (
+    qf_id bigint NOT NULL,
+    qf_bank bigint,
+    jr_id bigint,
+    qf_other bigint,
+    qf_amount numeric(20,4) DEFAULT 0
+);
+
+
+--
+-- Name: TABLE quant_fin; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE quant_fin IS 'Simple operation for financial';
+
+
+--
+-- Name: quant_fin_qf_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE quant_fin_qf_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: quant_fin_qf_id_seq; Type: SEQUENCE OWNED BY; Schema: public; O=
wner: -
+--
+
+ALTER SEQUENCE quant_fin_qf_id_seq OWNED BY quant_fin.qf_id;
+
+
+--
+-- Name: quant_fin_qf_id_seq; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('quant_fin_qf_id_seq', 1, false);
+
+
+--
+-- Name: quant_purchase; Type: TABLE; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+CREATE TABLE quant_purchase (
+    qp_id integer DEFAULT nextval(('s_quantity'::text)::regclass) NOT NU=
LL,
+    qp_internal text,
+    j_id integer NOT NULL,
+    qp_fiche integer NOT NULL,
+    qp_quantite numeric(20,4) NOT NULL,
+    qp_price numeric(20,4),
+    qp_vat numeric(20,4) DEFAULT 0.0,
+    qp_vat_code integer,
+    qp_nd_amount numeric(20,4) DEFAULT 0.0,
+    qp_nd_tva numeric(20,4) DEFAULT 0.0,
+    qp_nd_tva_recup numeric(20,4) DEFAULT 0.0,
+    qp_supplier integer NOT NULL,
+    qp_valid character(1) DEFAULT 'Y'::bpchar NOT NULL,
+    qp_dep_priv numeric(20,4) DEFAULT 0.0,
+    qp_vat_sided numeric(20,4) DEFAULT 0.0
+);
+
+
+--
+-- Name: COLUMN quant_purchase.qp_vat_sided; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN quant_purchase.qp_vat_sided IS 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: quant_sold; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE quant_sold (
+    qs_id integer DEFAULT nextval(('s_quantity'::text)::regclass) NOT NU=
LL,
+    qs_internal text,
+    qs_fiche integer NOT NULL,
+    qs_quantite numeric(20,4) NOT NULL,
+    qs_price numeric(20,4),
+    qs_vat numeric(20,4),
+    qs_vat_code integer,
+    qs_client integer NOT NULL,
+    qs_valid character(1) DEFAULT 'Y'::bpchar NOT NULL,
+    j_id integer NOT NULL,
+    qs_vat_sided numeric(20,4) DEFAULT 0.0
+);
+
+
+--
+-- Name: TABLE quant_sold; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE quant_sold IS 'Contains about invoice for customer';
+
+
+--
+-- Name: s_attr_def; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_attr_def
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_attr_def; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_attr_def', 9001, false);
+
+
+--
+-- Name: s_cbc; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_cbc
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_cbc; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_cbc', 1, false);
+
+
+--
+-- Name: s_central; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_central
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_central; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_central', 1, false);
+
+
+--
+-- Name: s_central_order; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_central_order
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_central_order; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_central_order', 1, false);
+
+
+--
+-- Name: s_centralized; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_centralized
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_centralized; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_centralized', 1, false);
+
+
+--
+-- Name: s_currency; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_currency
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_currency; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_currency', 1, true);
+
+
+--
+-- Name: s_fdef; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_fdef
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_fdef; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_fdef', 6, true);
+
+
+--
+-- Name: s_fiche; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_fiche
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_fiche; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_fiche', 20, true);
+
+
+--
+-- Name: s_fiche_def_ref; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_fiche_def_ref
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_fiche_def_ref; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_fiche_def_ref', 16, true);
+
+
+--
+-- Name: s_form; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_form
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_form; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_form', 1, false);
+
+
+--
+-- Name: s_formdef; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_formdef
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_formdef; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_formdef', 1, false);
+
+
+--
+-- Name: s_grpt; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_grpt
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_grpt; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_grpt', 2, true);
+
+
+--
+-- Name: s_idef; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_idef
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_idef; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_idef', 1, false);
+
+
+--
+-- Name: s_internal; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_internal
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_internal; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_internal', 1, false);
+
+
+--
+-- Name: s_invoice; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_invoice
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_invoice; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_invoice', 1, false);
+
+
+--
+-- Name: s_isup; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_isup
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_isup; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_isup', 1, false);
+
+
+--
+-- Name: s_jnt_fic_att_value; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jnt_fic_att_value
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jnt_fic_att_value; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('s_jnt_fic_att_value', 371, true);
+
+
+--
+-- Name: s_jrn; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn', 1, false);
+
+
+--
+-- Name: s_jrn_1; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_1
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_1; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_1', 1, false);
+
+
+--
+-- Name: s_jrn_2; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_2
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_2; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_2', 1, false);
+
+
+--
+-- Name: s_jrn_3; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_3
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_3; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_3', 1, false);
+
+
+--
+-- Name: s_jrn_4; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_4
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_4; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_4', 1, false);
+
+
+--
+-- Name: s_jrn_def; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_def
+    START WITH 5
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_def; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_def', 5, false);
+
+
+--
+-- Name: s_jrn_op; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_op
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_op; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_op', 1, false);
+
+
+--
+-- Name: s_jrn_pj1; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_pj1
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_pj1; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_pj1', 1, false);
+
+
+--
+-- Name: s_jrn_pj2; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_pj2
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_pj2; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_pj2', 1, false);
+
+
+--
+-- Name: s_jrn_pj3; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_pj3
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_pj3; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_pj3', 1, false);
+
+
+--
+-- Name: s_jrn_pj4; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_pj4
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_pj4; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_pj4', 1, false);
+
+
+--
+-- Name: s_jrn_rapt; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_rapt
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_rapt; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_rapt', 1, false);
+
+
+--
+-- Name: s_jrnaction; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrnaction
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrnaction; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrnaction', 5, true);
+
+
+--
+-- Name: s_jrnx; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrnx
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrnx; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrnx', 1, false);
+
+
+--
+-- Name: s_periode; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_periode
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_periode; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_periode', 91, true);
+
+
+--
+-- Name: s_quantity; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_quantity
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_quantity; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_quantity', 7, true);
+
+
+--
+-- Name: s_stock_goods; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_stock_goods
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_stock_goods; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_stock_goods', 1, false);
+
+
+--
+-- Name: s_tva; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_tva
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_tva; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_tva', 1001, true);
+
+
+--
+-- Name: s_user_act; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_user_act
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_user_act; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_user_act', 1, false);
+
+
+--
+-- Name: s_user_jrn; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_user_jrn
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_user_jrn; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_user_jrn', 1, false);
+
+
+--
+-- Name: seq_bud_hypothese_bh_id; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE seq_bud_hypothese_bh_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_bud_hypothese_bh_id; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('seq_bud_hypothese_bh_id', 1, false);
+
+
+--
+-- Name: seq_doc_type_1; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_1
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_1; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_1', 1, false);
+
+
+--
+-- Name: seq_doc_type_10; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_10
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_10; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_10', 1, false);
+
+
+--
+-- Name: seq_doc_type_2; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_2
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_2; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_2', 1, false);
+
+
+--
+-- Name: seq_doc_type_20; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_20
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_20; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_20', 1, false);
+
+
+--
+-- Name: seq_doc_type_21; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_21
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_21; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_21', 1, false);
+
+
+--
+-- Name: seq_doc_type_22; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_22
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_22; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_22', 1, false);
+
+
+--
+-- Name: seq_doc_type_3; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_3
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_3; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_3', 1, false);
+
+
+--
+-- Name: seq_doc_type_4; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_4
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_4; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_4', 1, false);
+
+
+--
+-- Name: seq_doc_type_5; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_5
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_5; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_5', 1, false);
+
+
+--
+-- Name: seq_doc_type_6; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_6
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_6; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_6', 1, false);
+
+
+--
+-- Name: seq_doc_type_7; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_7
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_7; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_7', 1, false);
+
+
+--
+-- Name: seq_doc_type_8; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_8
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_8; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_8', 1, false);
+
+
+--
+-- Name: seq_doc_type_9; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_9
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_9; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_9', 1, false);
+
+
+--
+-- Name: stock_goods; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE stock_goods (
+    sg_id integer DEFAULT nextval(('s_stock_goods'::text)::regclass) NOT=
 NULL,
+    j_id integer,
+    f_id integer,
+    sg_code text,
+    sg_quantity numeric(8,4) DEFAULT 0,
+    sg_type character(1) DEFAULT 'c'::bpchar NOT NULL,
+    sg_date date,
+    sg_tech_date date DEFAULT now(),
+    sg_tech_user text,
+    sg_comment character varying(80),
+    sg_exercice character varying(4),
+    CONSTRAINT stock_goods_sg_type CHECK (((sg_type =3D 'c'::bpchar) OR =
(sg_type =3D 'd'::bpchar)))
+);
+
+
+--
+-- Name: TABLE stock_goods; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE stock_goods IS 'About the goods';
+
+
+--
+-- Name: tmp_pcmn; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE tmp_pcmn (
+    pcm_val account_type NOT NULL,
+    pcm_lib text,
+    pcm_val_parent account_type DEFAULT 0,
+    pcm_type text
+);
+
+
+--
+-- Name: TABLE tmp_pcmn; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE tmp_pcmn IS 'Plan comptable minimum normalis=C3=A9';
+
+
+--
+-- Name: todo_list_tl_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE todo_list_tl_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: todo_list_tl_id_seq; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('todo_list_tl_id_seq', 1, false);
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: todo_list; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE todo_list (
+    tl_id integer DEFAULT nextval('todo_list_tl_id_seq'::regclass) NOT N=
ULL,
+    tl_date date NOT NULL,
+    tl_title text NOT NULL,
+    tl_desc text,
+    use_login text NOT NULL
+);
+
+
+--
+-- Name: TABLE todo_list; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE todo_list IS 'Todo list';
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: tva_rate; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE tva_rate (
+    tva_id integer DEFAULT nextval('s_tva'::regclass) NOT NULL,
+    tva_label text NOT NULL,
+    tva_rate numeric(8,4) DEFAULT 0.0 NOT NULL,
+    tva_comment text,
+    tva_poste text,
+    tva_both_side integer DEFAULT 0
+);
+
+
+--
+-- Name: TABLE tva_rate; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE tva_rate IS 'Rate of vat';
+
+
+--
+-- Name: user_local_pref; Type: TABLE; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+CREATE TABLE user_local_pref (
+    user_id text NOT NULL,
+    parameter_type text NOT NULL,
+    parameter_value text
+);
+
+
+--
+-- Name: TABLE user_local_pref; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE user_local_pref IS 'The user''s local parameter ';
+
+
+--
+-- Name: COLUMN user_local_pref.user_id; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN user_local_pref.user_id IS 'user''s login ';
+
+
+--
+-- Name: COLUMN user_local_pref.parameter_type; Type: COMMENT; Schema: p=
ublic; Owner: -
+--
+
+COMMENT ON COLUMN user_local_pref.parameter_type IS 'the type of paramet=
er ';
+
+
+--
+-- Name: COLUMN user_local_pref.parameter_value; Type: COMMENT; Schema: =
public; Owner: -
+--
+
+COMMENT ON COLUMN user_local_pref.parameter_value IS 'the value of param=
eter ';
+
+
+--
+-- Name: user_sec_act; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE user_sec_act (
+    ua_id integer DEFAULT nextval(('s_user_act'::text)::regclass) NOT NU=
LL,
+    ua_login text,
+    ua_act_id integer
+);
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: user_sec_extension; Type: TABLE; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+CREATE TABLE user_sec_extension (
+    use_id integer NOT NULL,
+    ex_id integer NOT NULL,
+    use_login text NOT NULL,
+    use_access character(1) DEFAULT 0 NOT NULL
+);
+
+
+--
+-- Name: TABLE user_sec_extension; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON TABLE user_sec_extension IS 'Security for extension';
+
+
+--
+-- Name: user_sec_extension_use_id_seq; Type: SEQUENCE; Schema: public; =
Owner: -
+--
+
+CREATE SEQUENCE user_sec_extension_use_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: user_sec_extension_use_id_seq; Type: SEQUENCE OWNED BY; Schema:=
 public; Owner: -
+--
+
+ALTER SEQUENCE user_sec_extension_use_id_seq OWNED BY user_sec_extension=
.use_id;
+
+
+--
+-- Name: user_sec_extension_use_id_seq; Type: SEQUENCE SET; Schema: publ=
ic; Owner: -
+--
+
+SELECT pg_catalog.setval('user_sec_extension_use_id_seq', 1, true);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: user_sec_jrn; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE user_sec_jrn (
+    uj_id integer DEFAULT nextval(('s_user_jrn'::text)::regclass) NOT NU=
LL,
+    uj_login text,
+    uj_jrn_id integer,
+    uj_priv text
+);
+
+
+--
+-- Name: v_all_menu; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW v_all_menu AS
+    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript, mr.me_type, pm.p_id, mr.=
me_description FROM (((profile_menu pm JOIN profile_user pu ON ((pu.p_id =
=3D pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr=
 USING (me_code)) ORDER BY pm.p_order;
+
+
+--
+-- Name: version; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE version (
+    val integer
+);
+
+
+--
+-- Name: vw_client; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_client AS
+    SELECT fiche.f_id, a1.ad_value AS name, a.ad_value AS quick_code, b.=
ad_value AS tva_num, c.ad_value AS poste_comptable, d.ad_value AS rue, e.=
ad_value AS code_postal, f.ad_value AS pays, g.ad_value AS telephone, h.a=
d_value AS email FROM (((((((((((fiche JOIN fiche_def USING (fd_id)) JOIN=
 fiche_def_ref USING (frd_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fic=
he_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_deta=
il WHERE (fiche_detail.ad_id =3D 1)) a1 USING (f_id)) LEFT JOIN (SELECT f=
iche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.a=
d_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 13)) b USING (f_i=
d)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detai=
l.ad_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_i=
d =3D 23)) a USING (f_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_d=
etail.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_detail W=
HERE (fiche_detail.ad_id =3D 5)) c USING (f_id)) LEFT JOIN (SELECT fiche_=
detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_val=
ue FROM fiche_detail WHERE (fiche_detail.ad_id =3D 14)) d USING (f_id)) L=
EFT JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_=
id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D=
 15)) e USING (f_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_detail=
.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_detail WHERE =
(fiche_detail.ad_id =3D 16)) f USING (f_id)) LEFT JOIN (SELECT fiche_deta=
il.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_value F=
ROM fiche_detail WHERE (fiche_detail.ad_id =3D 17)) g USING (f_id)) LEFT =
JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, =
fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 18)=
) h USING (f_id)) WHERE (fiche_def_ref.frd_id =3D 9);
+
+
+--
+-- Name: vw_fiche_attr; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_fiche_attr AS
+    SELECT a.f_id, a.fd_id, a.ad_value AS vw_name, k.ad_value AS vw_firs=
t_name, b.ad_value AS vw_sell, c.ad_value AS vw_buy, d.ad_value AS tva_co=
de, tva_rate.tva_id, tva_rate.tva_rate, tva_rate.tva_label, e.ad_value AS=
 vw_addr, f.ad_value AS vw_cp, j.ad_value AS quick_code, h.ad_value AS vw=
_description, i.ad_value AS tva_num, fiche_def.frd_id FROM ((((((((((((SE=
LECT fiche.f_id, fiche.fd_id, fiche_detail.ad_value FROM (fiche LEFT JOIN=
 fiche_detail USING (f_id)) WHERE (fiche_detail.ad_id =3D 1)) a LEFT JOIN=
 (SELECT fiche_detail.f_id, fiche_detail.ad_value FROM fiche_detail WHERE=
 (fiche_detail.ad_id =3D 6)) b ON ((a.f_id =3D b.f_id))) LEFT JOIN (SELEC=
T fiche_detail.f_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche=
_detail.ad_id =3D 7)) c ON ((a.f_id =3D c.f_id))) LEFT JOIN (SELECT fiche=
_detail.f_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail=
.ad_id =3D 2)) d ON ((a.f_id =3D d.f_id))) LEFT JOIN (SELECT fiche_detail=
.f_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =
=3D 14)) e ON ((a.f_id =3D e.f_id))) LEFT JOIN (SELECT fiche_detail.f_id,=
 fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 15=
)) f ON ((a.f_id =3D f.f_id))) LEFT JOIN (SELECT fiche_detail.f_id, fiche=
_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 23)) j O=
N ((a.f_id =3D j.f_id))) LEFT JOIN (SELECT fiche_detail.f_id, fiche_detai=
l.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 9)) h ON ((a.f=
_id =3D h.f_id))) LEFT JOIN (SELECT fiche_detail.f_id, fiche_detail.ad_va=
lue FROM fiche_detail WHERE (fiche_detail.ad_id =3D 13)) i ON ((a.f_id =3D=
 i.f_id))) LEFT JOIN (SELECT fiche_detail.f_id, fiche_detail.ad_value FRO=
M fiche_detail WHERE (fiche_detail.ad_id =3D 32)) k ON ((a.f_id =3D k.f_i=
d))) LEFT JOIN tva_rate ON ((d.ad_value =3D (tva_rate.tva_id)::text))) JO=
IN fiche_def USING (fd_id));
+
+
+--
+-- Name: vw_fiche_def; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_fiche_def AS
+    SELECT jnt_fic_attr.fd_id, jnt_fic_attr.ad_id, attr_def.ad_text, fic=
he_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_create_account, fi=
che_def.frd_id FROM ((fiche_def JOIN jnt_fic_attr USING (fd_id)) JOIN att=
r_def ON ((attr_def.ad_id =3D jnt_fic_attr.ad_id)));
+
+
+--
+-- Name: VIEW vw_fiche_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON VIEW vw_fiche_def IS 'all the attributs for	card family';
+
+
+--
+-- Name: vw_fiche_min; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_fiche_min AS
+    SELECT attr_min.frd_id, attr_min.ad_id, attr_def.ad_text, fiche_def_=
ref.frd_text, fiche_def_ref.frd_class_base FROM ((attr_min JOIN attr_def =
USING (ad_id)) JOIN fiche_def_ref USING (frd_id));
+
+
+--
+-- Name: vw_fiche_name; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_fiche_name AS
+    SELECT fiche_detail.f_id, fiche_detail.ad_value AS name FROM fiche_d=
etail WHERE (fiche_detail.ad_id =3D 1);
+
+
+--
+-- Name: vw_poste_qcode; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_poste_qcode AS
+    SELECT c.f_id, a.ad_value AS j_poste, b.ad_value AS j_qcode FROM ((f=
iche c LEFT JOIN (SELECT fiche_detail.f_id, fiche_detail.ad_value FROM fi=
che_detail WHERE (fiche_detail.ad_id =3D 5)) a USING (f_id)) LEFT JOIN (S=
ELECT fiche_detail.f_id, fiche_detail.ad_value FROM fiche_detail WHERE (f=
iche_detail.ad_id =3D 23)) b USING (f_id));
+
+
+--
+-- Name: vw_supplier; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_supplier AS
+    SELECT fiche.f_id, a1.ad_value AS name, a.ad_value AS quick_code, b.=
ad_value AS tva_num, c.ad_value AS poste_comptable, d.ad_value AS rue, e.=
ad_value AS code_postal, f.ad_value AS pays, g.ad_value AS telephone, h.a=
d_value AS email FROM (((((((((((fiche JOIN fiche_def USING (fd_id)) JOIN=
 fiche_def_ref USING (frd_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fic=
he_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_deta=
il WHERE (fiche_detail.ad_id =3D 1)) a1 USING (f_id)) LEFT JOIN (SELECT f=
iche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.a=
d_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 13)) b USING (f_i=
d)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detai=
l.ad_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_i=
d =3D 23)) a USING (f_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_d=
etail.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_detail W=
HERE (fiche_detail.ad_id =3D 5)) c USING (f_id)) LEFT JOIN (SELECT fiche_=
detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_val=
ue FROM fiche_detail WHERE (fiche_detail.ad_id =3D 14)) d USING (f_id)) L=
EFT JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_=
id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D=
 15)) e USING (f_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_detail=
.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_detail WHERE =
(fiche_detail.ad_id =3D 16)) f USING (f_id)) LEFT JOIN (SELECT fiche_deta=
il.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_value F=
ROM fiche_detail WHERE (fiche_detail.ad_id =3D 17)) g USING (f_id)) LEFT =
JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, =
fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 18)=
) h USING (f_id)) WHERE (fiche_def_ref.frd_id =3D 8);
+
+
+--
+-- Name: ad_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY action_detail ALTER COLUMN ad_id SET DEFAULT nextval('a=
ction_detail_ad_id_seq'::regclass);
+
+
+--
+-- Name: del_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY del_action ALTER COLUMN del_id SET DEFAULT nextval('del=
_action_del_id_seq'::regclass);
+
+
+--
+-- Name: dj_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY del_jrn ALTER COLUMN dj_id SET DEFAULT nextval('del_jrn=
_dj_id_seq'::regclass);
+
+
+--
+-- Name: djx_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY del_jrnx ALTER COLUMN djx_id SET DEFAULT nextval('del_j=
rnx_djx_id_seq'::regclass);
+
+
+--
+-- Name: ex_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY extension ALTER COLUMN ex_id SET DEFAULT nextval('exten=
sion_ex_id_seq'::regclass);
+
+
+--
+-- Name: f_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast ALTER COLUMN f_id SET DEFAULT nextval('forecas=
t_f_id_seq'::regclass);
+
+
+--
+-- Name: fc_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_cat ALTER COLUMN fc_id SET DEFAULT nextval('fo=
recast_cat_fc_id_seq'::regclass);
+
+
+--
+-- Name: fi_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_item ALTER COLUMN fi_id SET DEFAULT nextval('f=
orecast_item_fi_id_seq'::regclass);
+
+
+--
+-- Name: jl_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jnt_letter ALTER COLUMN jl_id SET DEFAULT nextval('jnt_=
letter_jl_id_seq'::regclass);
+
+
+--
+-- Name: ji_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_info ALTER COLUMN ji_id SET DEFAULT nextval('jrn_in=
fo_ji_id_seq'::regclass);
+
+
+--
+-- Name: n_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_note ALTER COLUMN n_id SET DEFAULT nextval('jrn_not=
e_n_id_seq'::regclass);
+
+
+--
+-- Name: lc_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_cred ALTER COLUMN lc_id SET DEFAULT nextval('let=
ter_cred_lc_id_seq'::regclass);
+
+
+--
+-- Name: ld_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_deb ALTER COLUMN ld_id SET DEFAULT nextval('lett=
er_deb_ld_id_seq'::regclass);
+
+
+--
+-- Name: mp_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY mod_payment ALTER COLUMN mp_id SET DEFAULT nextval('mod=
_payment_mp_id_seq'::regclass);
+
+
+--
+-- Name: p_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY profile ALTER COLUMN p_id SET DEFAULT nextval('profile_=
p_id_seq'::regclass);
+
+
+--
+-- Name: pm_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY profile_menu ALTER COLUMN pm_id SET DEFAULT nextval('pr=
ofile_menu_pm_id_seq'::regclass);
+
+
+--
+-- Name: pu_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY profile_user ALTER COLUMN pu_id SET DEFAULT nextval('pr=
ofile_user_pu_id_seq'::regclass);
+
+
+--
+-- Name: qf_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_fin ALTER COLUMN qf_id SET DEFAULT nextval('quant=
_fin_qf_id_seq'::regclass);
+
+
+--
+-- Name: use_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY user_sec_extension ALTER COLUMN use_id SET DEFAULT next=
val('user_sec_extension_use_id_seq'::regclass);
+
+
+--
+-- Data for Name: action; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO action VALUES (800, 'Ajout de fiche', 'fiche', 'FICADD');
+INSERT INTO action VALUES (805, 'Cr=C3=A9ation, modification et effaceme=
nt de fiche', 'fiche', 'FIC');
+INSERT INTO action VALUES (910, 'cr=C3=A9ation, modification et effaceme=
nt de cat=C3=A9gorie de fiche', 'fiche', 'FICCAT');
+INSERT INTO action VALUES (1020, 'Effacer les documents du suivi', 'foll=
owup', 'RMDOC');
+INSERT INTO action VALUES (1010, 'Voir les documents du suivi', 'followu=
p', 'VIEWDOC');
+INSERT INTO action VALUES (1050, 'Modifier le type de document', 'follow=
up', 'PARCATDOC');
+
+
+--
+-- Data for Name: action_detail; Type: TABLE DATA; Schema: public; Owner=
: -
+--
+
+
+
+--
+-- Data for Name: action_gestion; Type: TABLE DATA; Schema: public; Owne=
r: -
+--
+
+
+
+--
+-- Data for Name: attr_def; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO attr_def VALUES (20, 'Partie fiscalement non d=C3=A9ductible=
', 'numeric', '22');
+INSERT INTO attr_def VALUES (10, 'Date d=C3=A9but', 'date', '8');
+INSERT INTO attr_def VALUES (6, 'Prix vente', 'numeric', '6');
+INSERT INTO attr_def VALUES (7, 'Prix achat', 'numeric', '6');
+INSERT INTO attr_def VALUES (8, 'Dur=C3=A9e Amortissement', 'numeric', '=
6');
+INSERT INTO attr_def VALUES (11, 'Montant initial', 'numeric', '6');
+INSERT INTO attr_def VALUES (21, 'TVA non d=C3=A9ductible', 'numeric', '=
6');
+INSERT INTO attr_def VALUES (22, 'TVA non d=C3=A9ductible r=C3=A9cup=C3=A9=
rable par l''imp=C3=B4t', 'numeric', '6');
+INSERT INTO attr_def VALUES (1, 'Nom', 'text', '22');
+INSERT INTO attr_def VALUES (2, 'Taux TVA', 'text', '22');
+INSERT INTO attr_def VALUES (3, 'Num=C3=A9ro de compte', 'text', '22');
+INSERT INTO attr_def VALUES (4, 'Nom de la banque', 'text', '22');
+INSERT INTO attr_def VALUES (5, 'Poste Comptable', 'text', '22');
+INSERT INTO attr_def VALUES (9, 'Description', 'text', '22');
+INSERT INTO attr_def VALUES (12, 'Personne de contact ', 'text', '22');
+INSERT INTO attr_def VALUES (13, 'num=C3=A9ro de tva ', 'text', '22');
+INSERT INTO attr_def VALUES (14, 'Adresse ', 'text', '22');
+INSERT INTO attr_def VALUES (16, 'pays ', 'text', '22');
+INSERT INTO attr_def VALUES (17, 't=C3=A9l=C3=A9phone ', 'text', '22');
+INSERT INTO attr_def VALUES (18, 'email ', 'text', '22');
+INSERT INTO attr_def VALUES (19, 'Gestion stock', 'text', '22');
+INSERT INTO attr_def VALUES (23, 'Quick Code', 'text', '22');
+INSERT INTO attr_def VALUES (24, 'Ville', 'text', '22');
+INSERT INTO attr_def VALUES (25, 'Soci=C3=A9t=C3=A9', 'text', '22');
+INSERT INTO attr_def VALUES (26, 'Fax', 'text', '22');
+INSERT INTO attr_def VALUES (27, 'GSM', 'text', '22');
+INSERT INTO attr_def VALUES (15, 'code postal', 'text', '22');
+INSERT INTO attr_def VALUES (30, 'Numero de client', 'text', '22');
+INSERT INTO attr_def VALUES (32, 'Pr=C3=A9nom', 'text', '22');
+INSERT INTO attr_def VALUES (31, 'D=C3=A9pense  charge du grant (partie =
priv=C3=A9) ', 'text', '22');
+INSERT INTO attr_def VALUES (50, 'Contrepartie pour TVA r=C3=A9cup par i=
mpot', 'poste', '22');
+INSERT INTO attr_def VALUES (51, 'Contrepartie pour TVA non Ded.', 'post=
e', '22');
+INSERT INTO attr_def VALUES (52, 'Contrepartie pour d=C3=A9pense =C3=A0 =
charge du g=C3=A9rant', 'poste', '22');
+INSERT INTO attr_def VALUES (53, 'Contrepartie pour d=C3=A9pense fiscal.=
 non d=C3=A9d.', 'poste', '22');
+
+
+--
+-- Data for Name: attr_min; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO attr_min VALUES (1, 1);
+INSERT INTO attr_min VALUES (1, 2);
+INSERT INTO attr_min VALUES (2, 1);
+INSERT INTO attr_min VALUES (2, 2);
+INSERT INTO attr_min VALUES (3, 1);
+INSERT INTO attr_min VALUES (3, 2);
+INSERT INTO attr_min VALUES (4, 1);
+INSERT INTO attr_min VALUES (4, 3);
+INSERT INTO attr_min VALUES (4, 4);
+INSERT INTO attr_min VALUES (4, 12);
+INSERT INTO attr_min VALUES (4, 13);
+INSERT INTO attr_min VALUES (4, 14);
+INSERT INTO attr_min VALUES (4, 15);
+INSERT INTO attr_min VALUES (4, 16);
+INSERT INTO attr_min VALUES (4, 17);
+INSERT INTO attr_min VALUES (4, 18);
+INSERT INTO attr_min VALUES (8, 1);
+INSERT INTO attr_min VALUES (8, 12);
+INSERT INTO attr_min VALUES (8, 13);
+INSERT INTO attr_min VALUES (8, 14);
+INSERT INTO attr_min VALUES (8, 15);
+INSERT INTO attr_min VALUES (8, 16);
+INSERT INTO attr_min VALUES (8, 17);
+INSERT INTO attr_min VALUES (8, 18);
+INSERT INTO attr_min VALUES (9, 1);
+INSERT INTO attr_min VALUES (9, 12);
+INSERT INTO attr_min VALUES (9, 13);
+INSERT INTO attr_min VALUES (9, 14);
+INSERT INTO attr_min VALUES (9, 16);
+INSERT INTO attr_min VALUES (9, 17);
+INSERT INTO attr_min VALUES (9, 18);
+INSERT INTO attr_min VALUES (1, 6);
+INSERT INTO attr_min VALUES (1, 7);
+INSERT INTO attr_min VALUES (2, 6);
+INSERT INTO attr_min VALUES (2, 7);
+INSERT INTO attr_min VALUES (3, 7);
+INSERT INTO attr_min VALUES (1, 19);
+INSERT INTO attr_min VALUES (2, 19);
+INSERT INTO attr_min VALUES (14, 1);
+INSERT INTO attr_min VALUES (5, 1);
+INSERT INTO attr_min VALUES (5, 4);
+INSERT INTO attr_min VALUES (5, 10);
+INSERT INTO attr_min VALUES (5, 12);
+INSERT INTO attr_min VALUES (6, 1);
+INSERT INTO attr_min VALUES (6, 4);
+INSERT INTO attr_min VALUES (6, 10);
+INSERT INTO attr_min VALUES (6, 12);
+INSERT INTO attr_min VALUES (10, 1);
+INSERT INTO attr_min VALUES (10, 12);
+INSERT INTO attr_min VALUES (11, 1);
+INSERT INTO attr_min VALUES (11, 12);
+INSERT INTO attr_min VALUES (12, 1);
+INSERT INTO attr_min VALUES (12, 12);
+INSERT INTO attr_min VALUES (13, 1);
+INSERT INTO attr_min VALUES (13, 9);
+INSERT INTO attr_min VALUES (7, 1);
+INSERT INTO attr_min VALUES (7, 8);
+INSERT INTO attr_min VALUES (7, 9);
+INSERT INTO attr_min VALUES (7, 10);
+INSERT INTO attr_min VALUES (5, 11);
+INSERT INTO attr_min VALUES (6, 11);
+INSERT INTO attr_min VALUES (1, 15);
+INSERT INTO attr_min VALUES (9, 15);
+INSERT INTO attr_min VALUES (15, 1);
+INSERT INTO attr_min VALUES (15, 9);
+INSERT INTO attr_min VALUES (1, 23);
+INSERT INTO attr_min VALUES (2, 23);
+INSERT INTO attr_min VALUES (3, 23);
+INSERT INTO attr_min VALUES (4, 23);
+INSERT INTO attr_min VALUES (5, 23);
+INSERT INTO attr_min VALUES (6, 23);
+INSERT INTO attr_min VALUES (8, 23);
+INSERT INTO attr_min VALUES (9, 23);
+INSERT INTO attr_min VALUES (10, 23);
+INSERT INTO attr_min VALUES (11, 23);
+INSERT INTO attr_min VALUES (12, 23);
+INSERT INTO attr_min VALUES (13, 23);
+INSERT INTO attr_min VALUES (14, 23);
+INSERT INTO attr_min VALUES (15, 23);
+INSERT INTO attr_min VALUES (7, 23);
+INSERT INTO attr_min VALUES (9, 24);
+INSERT INTO attr_min VALUES (8, 24);
+INSERT INTO attr_min VALUES (14, 24);
+INSERT INTO attr_min VALUES (16, 1);
+INSERT INTO attr_min VALUES (16, 17);
+INSERT INTO attr_min VALUES (16, 18);
+INSERT INTO attr_min VALUES (16, 25);
+INSERT INTO attr_min VALUES (16, 26);
+INSERT INTO attr_min VALUES (16, 27);
+INSERT INTO attr_min VALUES (16, 23);
+INSERT INTO attr_min VALUES (25, 1);
+INSERT INTO attr_min VALUES (25, 4);
+INSERT INTO attr_min VALUES (25, 3);
+INSERT INTO attr_min VALUES (25, 5);
+INSERT INTO attr_min VALUES (25, 15);
+INSERT INTO attr_min VALUES (25, 16);
+INSERT INTO attr_min VALUES (25, 24);
+INSERT INTO attr_min VALUES (25, 23);
+INSERT INTO attr_min VALUES (2, 30);
+
+
+--
+-- Data for Name: bilan; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO bilan VALUES (1, 'Bilan Belge complet', 'document/fr_be/bnb.=
rtf', 'document/fr_be/bnb.form', 'RTF');
+
+
+--
+-- Data for Name: centralized; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+
+
+--
+-- Data for Name: del_action; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: del_jrn; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: del_jrnx; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: document; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: document_modele; Type: TABLE DATA; Schema: public; Own=
er: -
+--
+
+
+
+--
+-- Data for Name: document_state; Type: TABLE DATA; Schema: public; Owne=
r: -
+--
+
+INSERT INTO document_state VALUES (1, 'Cl=C3=B4tur=C3=A9');
+INSERT INTO document_state VALUES (2, 'A suivre');
+INSERT INTO document_state VALUES (3, 'A faire');
+INSERT INTO document_state VALUES (4, 'Abandonn=C3=A9');
+
+
+--
+-- Data for Name: document_type; Type: TABLE DATA; Schema: public; Owner=
: -
+--
+
+INSERT INTO document_type VALUES (1, 'Document Interne');
+INSERT INTO document_type VALUES (2, 'Bons de commande client');
+INSERT INTO document_type VALUES (3, 'Bon de commande Fournisseur');
+INSERT INTO document_type VALUES (4, 'Facture');
+INSERT INTO document_type VALUES (5, 'Lettre de rappel');
+INSERT INTO document_type VALUES (6, 'Courrier');
+INSERT INTO document_type VALUES (7, 'Proposition');
+INSERT INTO document_type VALUES (8, 'Email');
+INSERT INTO document_type VALUES (9, 'Divers');
+INSERT INTO document_type VALUES (10, 'Note de frais');
+INSERT INTO document_type VALUES (20, 'R=C3=A9ception commande Fournisse=
ur');
+INSERT INTO document_type VALUES (21, 'R=C3=A9ception commande Client');
+INSERT INTO document_type VALUES (22, 'R=C3=A9ception magazine');
+
+
+--
+-- Data for Name: extension; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO extension VALUES (1, 'Module de TVA', 'TVA', 'Cette extensio=
n permet de faire les listings et declarations TVA', 'tva/index.php', 'Y'=
);
+
+
+--
+-- Data for Name: fiche; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: fiche_def; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO fiche_def VALUES (2, '400', 'Client', true, 9);
+INSERT INTO fiche_def VALUES (1, '604', 'Marchandises', true, 2);
+INSERT INTO fiche_def VALUES (3, '5500', 'Banque', true, 4);
+INSERT INTO fiche_def VALUES (4, '440', 'Fournisseur', true, 8);
+INSERT INTO fiche_def VALUES (5, '61', 'S & B D', true, 3);
+INSERT INTO fiche_def VALUES (6, '700', 'Vente', true, 1);
+
+
+--
+-- Data for Name: fiche_def_ref; Type: TABLE DATA; Schema: public; Owner=
: -
+--
+
+INSERT INTO fiche_def_ref VALUES (1, 'Vente Service', '700');
+INSERT INTO fiche_def_ref VALUES (2, 'Achat Marchandises', '604');
+INSERT INTO fiche_def_ref VALUES (3, 'Achat Service et biens divers', '6=
1');
+INSERT INTO fiche_def_ref VALUES (4, 'Banque', '5500');
+INSERT INTO fiche_def_ref VALUES (5, 'Pr=C3=AAt > a un an', '17');
+INSERT INTO fiche_def_ref VALUES (6, 'Pr=C3=AAt < a un an', '430');
+INSERT INTO fiche_def_ref VALUES (8, 'Fournisseurs', '440');
+INSERT INTO fiche_def_ref VALUES (9, 'Clients', '400');
+INSERT INTO fiche_def_ref VALUES (10, 'Salaire Administrateur', '6200');
+INSERT INTO fiche_def_ref VALUES (11, 'Salaire Ouvrier', '6203');
+INSERT INTO fiche_def_ref VALUES (12, 'Salaire Employ=C3=A9', '6202');
+INSERT INTO fiche_def_ref VALUES (13, 'D=C3=A9penses non admises', '674'=
);
+INSERT INTO fiche_def_ref VALUES (14, 'Administration des Finances', NUL=
L);
+INSERT INTO fiche_def_ref VALUES (15, 'Autres fiches', NULL);
+INSERT INTO fiche_def_ref VALUES (7, 'Mat=C3=A9riel =C3=A0 amortir', '24=
00');
+INSERT INTO fiche_def_ref VALUES (16, 'Contact', NULL);
+INSERT INTO fiche_def_ref VALUES (25, 'Compte Salari=C3=A9 / Administrat=
eur', NULL);
+
+
+--
+-- Data for Name: fiche_detail; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+
+
+--
+-- Data for Name: forecast; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: forecast_cat; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+
+
+--
+-- Data for Name: forecast_item; Type: TABLE DATA; Schema: public; Owner=
: -
+--
+
+
+
+--
+-- Data for Name: form; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO form VALUES (3000398, 3000000, 1, 'Prestation [ case 03 ]', =
'[700%]-[7000005]');
+INSERT INTO form VALUES (3000399, 3000000, 2, 'Prestation intra [ case 4=
7 ]', '[7000005]');
+INSERT INTO form VALUES (3000400, 3000000, 3, 'Tva due   [case 54]', '[4=
513]+[4512]+[4511] FROM=3D01.2005');
+INSERT INTO form VALUES (3000401, 3000000, 4, 'Marchandises, mati=C3=A8r=
e premi=C3=A8re et auxiliaire [case 81 ]', '[60%]');
+INSERT INTO form VALUES (3000402, 3000000, 7, 'Service et bien divers [c=
ase 82]', '[61%]');
+INSERT INTO form VALUES (3000403, 3000000, 8, 'bien d''invest [ case 83 =
]', '[2400%]');
+INSERT INTO form VALUES (3000404, 3000000, 9, 'TVA d=C3=A9ductible [ cas=
e 59 ]', 'abs([4117]-[411%])');
+INSERT INTO form VALUES (3000405, 3000000, 8, 'TVA non ded -> voiture', =
'[610022]*0.21/2');
+INSERT INTO form VALUES (3000406, 3000000, 9, 'Acompte TVA', '[4117]');
+
+
+--
+-- Data for Name: formdef; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO formdef VALUES (3000000, 'TVA d=C3=A9claration Belge');
+
+
+--
+-- Data for Name: groupe_analytique; Type: TABLE DATA; Schema: public; O=
wner: -
+--
+
+
+
+--
+-- Data for Name: info_def; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO info_def VALUES ('BON_COMMANDE', 'Numero de bon de commande'=
);
+INSERT INTO info_def VALUES ('OTHER', 'Info diverses');
+
+
+--
+-- Data for Name: jnt_fic_attr; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+INSERT INTO jnt_fic_attr VALUES (3, 1, 16, 0);
+INSERT INTO jnt_fic_attr VALUES (4, 1, 27, 0);
+INSERT INTO jnt_fic_attr VALUES (5, 1, 36, 0);
+INSERT INTO jnt_fic_attr VALUES (6, 1, 40, 0);
+INSERT INTO jnt_fic_attr VALUES (3, 4, 18, 2);
+INSERT INTO jnt_fic_attr VALUES (3, 12, 19, 3);
+INSERT INTO jnt_fic_attr VALUES (6, 19, 44, 2);
+INSERT INTO jnt_fic_attr VALUES (2, 13, 9, 31);
+INSERT INTO jnt_fic_attr VALUES (3, 13, 20, 31);
+INSERT INTO jnt_fic_attr VALUES (4, 13, 29, 31);
+INSERT INTO jnt_fic_attr VALUES (1, 2, 3, 1);
+INSERT INTO jnt_fic_attr VALUES (2, 12, 8, 1);
+INSERT INTO jnt_fic_attr VALUES (3, 3, 17, 1);
+INSERT INTO jnt_fic_attr VALUES (4, 12, 28, 1);
+INSERT INTO jnt_fic_attr VALUES (5, 2, 37, 1);
+INSERT INTO jnt_fic_attr VALUES (6, 2, 41, 1);
+INSERT INTO jnt_fic_attr VALUES (1, 6, 4, 120);
+INSERT INTO jnt_fic_attr VALUES (6, 6, 42, 120);
+INSERT INTO jnt_fic_attr VALUES (1, 7, 5, 130);
+INSERT INTO jnt_fic_attr VALUES (5, 7, 38, 130);
+INSERT INTO jnt_fic_attr VALUES (6, 7, 43, 130);
+INSERT INTO jnt_fic_attr VALUES (2, 14, 10, 40);
+INSERT INTO jnt_fic_attr VALUES (3, 14, 21, 40);
+INSERT INTO jnt_fic_attr VALUES (4, 14, 30, 40);
+INSERT INTO jnt_fic_attr VALUES (2, 16, 12, 70);
+INSERT INTO jnt_fic_attr VALUES (3, 16, 23, 70);
+INSERT INTO jnt_fic_attr VALUES (4, 16, 32, 70);
+INSERT INTO jnt_fic_attr VALUES (2, 17, 13, 80);
+INSERT INTO jnt_fic_attr VALUES (3, 17, 24, 80);
+INSERT INTO jnt_fic_attr VALUES (4, 17, 33, 80);
+INSERT INTO jnt_fic_attr VALUES (2, 18, 14, 90);
+INSERT INTO jnt_fic_attr VALUES (3, 18, 25, 90);
+INSERT INTO jnt_fic_attr VALUES (4, 18, 34, 90);
+INSERT INTO jnt_fic_attr VALUES (2, 23, 45, 400);
+INSERT INTO jnt_fic_attr VALUES (1, 23, 46, 400);
+INSERT INTO jnt_fic_attr VALUES (3, 23, 47, 400);
+INSERT INTO jnt_fic_attr VALUES (4, 23, 48, 400);
+INSERT INTO jnt_fic_attr VALUES (5, 23, 49, 400);
+INSERT INTO jnt_fic_attr VALUES (6, 23, 50, 400);
+INSERT INTO jnt_fic_attr VALUES (2, 24, 51, 60);
+INSERT INTO jnt_fic_attr VALUES (4, 24, 52, 60);
+INSERT INTO jnt_fic_attr VALUES (2, 15, 11, 50);
+INSERT INTO jnt_fic_attr VALUES (3, 15, 22, 50);
+INSERT INTO jnt_fic_attr VALUES (4, 15, 31, 50);
+INSERT INTO jnt_fic_attr VALUES (1, 5, 1, 30);
+INSERT INTO jnt_fic_attr VALUES (2, 5, 6, 30);
+INSERT INTO jnt_fic_attr VALUES (3, 5, 15, 30);
+INSERT INTO jnt_fic_attr VALUES (4, 5, 26, 30);
+INSERT INTO jnt_fic_attr VALUES (5, 5, 35, 30);
+INSERT INTO jnt_fic_attr VALUES (6, 5, 39, 30);
+INSERT INTO jnt_fic_attr VALUES (1, 1, 2, 0);
+INSERT INTO jnt_fic_attr VALUES (2, 1, 7, 0);
+
+
+--
+-- Data for Name: jnt_letter; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn_action; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO jrn_action VALUES (2, 'Voir', 'Voir toutes les factures', 'u=
ser_jrn.php', 'action=3Dvoir_jrn', 'FR', 'VEN');
+INSERT INTO jrn_action VALUES (4, 'Voir Impay=C3=A9s', 'Voir toutes les =
factures non pay=C3=A9es', 'user_jrn.php', 'action=3Dvoir_jrn_non_paye', =
'FR', 'VEN');
+INSERT INTO jrn_action VALUES (1, 'Nouvelle', 'Cr=C3=A9ation d''une fact=
ure', 'user_jrn.php', 'action=3Dinsert_vente&blank', 'FR', 'VEN');
+INSERT INTO jrn_action VALUES (10, 'Nouveau', 'Encode un nouvel achat (m=
at=C3=A9riel, marchandises, services et biens divers)', 'user_jrn.php', '=
action=3Dnew&blank', 'FR', 'ACH');
+INSERT INTO jrn_action VALUES (12, 'Voir', 'Voir toutes les factures', '=
user_jrn.php', 'action=3Dvoir_jrn', 'FR', 'ACH');
+INSERT INTO jrn_action VALUES (14, 'Voir Impay=C3=A9s', 'Voir toutes les=
 factures non pay=C3=A9es', 'user_jrn.php', 'action=3Dvoir_jrn_non_paye',=
 'FR', 'ACH');
+INSERT INTO jrn_action VALUES (20, 'Nouveau', 'Encode un nouvel achat (m=
at=C3=A9riel, marchandises, services et biens divers)', 'user_jrn.php', '=
action=3Dnew&blank', 'FR', 'FIN');
+INSERT INTO jrn_action VALUES (22, 'Voir', 'Voir toutes les factures', '=
user_jrn.php', 'action=3Dvoir_jrn', 'FR', 'FIN');
+INSERT INTO jrn_action VALUES (30, 'Nouveau', NULL, 'user_jrn.php', 'act=
ion=3Dnew&blank', 'FR', 'ODS');
+INSERT INTO jrn_action VALUES (32, 'Voir', 'Voir toutes les factures', '=
user_jrn.php', 'action=3Dvoir_jrn', 'FR', 'ODS');
+INSERT INTO jrn_action VALUES (40, 'Soldes', 'Voir les soldes des compte=
s en banques', 'user_jrn.php', 'action=3Dsolde', 'FR', 'FIN');
+
+
+--
+-- Data for Name: jrn_def; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO jrn_def VALUES (4, 'Op=C3=A9ration Diverses', NULL, NULL, NU=
LL, NULL, 5, 5, false, NULL, 'ODS', 'O01', 'ODS', NULL, NULL);
+INSERT INTO jrn_def VALUES (1, 'Financier', '5* ', '5*', '3,2,4', '3,2,4=
', 5, 5, false, NULL, 'FIN', 'F01', 'FIN', NULL, NULL);
+INSERT INTO jrn_def VALUES (3, 'Achat', '6*', '4*', '5', '4', 1, 3, true=
, '=C3=A9ch=C3=A9ance', 'ACH', 'A01', 'ACH', NULL, NULL);
+INSERT INTO jrn_def VALUES (2, 'Vente', '4*', '7*', '2', '6', 2, 1, true=
, '=C3=A9ch=C3=A9ance', 'VEN', 'V01', 'VEN', NULL, NULL);
+
+
+--
+-- Data for Name: jrn_info; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn_note; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn_periode; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+INSERT INTO jrn_periode VALUES (4, 79, 'OP');
+INSERT INTO jrn_periode VALUES (1, 79, 'OP');
+INSERT INTO jrn_periode VALUES (3, 79, 'OP');
+INSERT INTO jrn_periode VALUES (2, 79, 'OP');
+INSERT INTO jrn_periode VALUES (4, 80, 'OP');
+INSERT INTO jrn_periode VALUES (1, 80, 'OP');
+INSERT INTO jrn_periode VALUES (3, 80, 'OP');
+INSERT INTO jrn_periode VALUES (2, 80, 'OP');
+INSERT INTO jrn_periode VALUES (4, 81, 'OP');
+INSERT INTO jrn_periode VALUES (1, 81, 'OP');
+INSERT INTO jrn_periode VALUES (3, 81, 'OP');
+INSERT INTO jrn_periode VALUES (2, 81, 'OP');
+INSERT INTO jrn_periode VALUES (4, 82, 'OP');
+INSERT INTO jrn_periode VALUES (1, 82, 'OP');
+INSERT INTO jrn_periode VALUES (3, 82, 'OP');
+INSERT INTO jrn_periode VALUES (2, 82, 'OP');
+INSERT INTO jrn_periode VALUES (4, 83, 'OP');
+INSERT INTO jrn_periode VALUES (1, 83, 'OP');
+INSERT INTO jrn_periode VALUES (3, 83, 'OP');
+INSERT INTO jrn_periode VALUES (2, 83, 'OP');
+INSERT INTO jrn_periode VALUES (4, 84, 'OP');
+INSERT INTO jrn_periode VALUES (1, 84, 'OP');
+INSERT INTO jrn_periode VALUES (3, 84, 'OP');
+INSERT INTO jrn_periode VALUES (2, 84, 'OP');
+INSERT INTO jrn_periode VALUES (4, 85, 'OP');
+INSERT INTO jrn_periode VALUES (1, 85, 'OP');
+INSERT INTO jrn_periode VALUES (3, 85, 'OP');
+INSERT INTO jrn_periode VALUES (2, 85, 'OP');
+INSERT INTO jrn_periode VALUES (4, 86, 'OP');
+INSERT INTO jrn_periode VALUES (1, 86, 'OP');
+INSERT INTO jrn_periode VALUES (3, 86, 'OP');
+INSERT INTO jrn_periode VALUES (2, 86, 'OP');
+INSERT INTO jrn_periode VALUES (4, 87, 'OP');
+INSERT INTO jrn_periode VALUES (1, 87, 'OP');
+INSERT INTO jrn_periode VALUES (3, 87, 'OP');
+INSERT INTO jrn_periode VALUES (2, 87, 'OP');
+INSERT INTO jrn_periode VALUES (4, 88, 'OP');
+INSERT INTO jrn_periode VALUES (1, 88, 'OP');
+INSERT INTO jrn_periode VALUES (3, 88, 'OP');
+INSERT INTO jrn_periode VALUES (2, 88, 'OP');
+INSERT INTO jrn_periode VALUES (4, 89, 'OP');
+INSERT INTO jrn_periode VALUES (1, 89, 'OP');
+INSERT INTO jrn_periode VALUES (3, 89, 'OP');
+INSERT INTO jrn_periode VALUES (2, 89, 'OP');
+INSERT INTO jrn_periode VALUES (4, 90, 'OP');
+INSERT INTO jrn_periode VALUES (1, 90, 'OP');
+INSERT INTO jrn_periode VALUES (3, 90, 'OP');
+INSERT INTO jrn_periode VALUES (2, 90, 'OP');
+INSERT INTO jrn_periode VALUES (4, 91, 'OP');
+INSERT INTO jrn_periode VALUES (1, 91, 'OP');
+INSERT INTO jrn_periode VALUES (3, 91, 'OP');
+INSERT INTO jrn_periode VALUES (2, 91, 'OP');
+
+
+--
+-- Data for Name: jrn_rapt; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn_type; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO jrn_type VALUES ('FIN', 'Financier');
+INSERT INTO jrn_type VALUES ('VEN', 'Vente');
+INSERT INTO jrn_type VALUES ('ACH', 'Achat');
+INSERT INTO jrn_type VALUES ('ODS', 'Op=C3=A9rations Diverses');
+
+
+--
+-- Data for Name: jrnx; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: letter_cred; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+
+
+--
+-- Data for Name: letter_deb; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 'Nouvel achat ou d=C3=A9pense', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCHOP', 'Historique', 'anc_history.inc.ph=
p', NULL, 'Historique des imputations analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGL', 'Grand''Livre', 'anc_great_ledger.=
inc.php', NULL, 'Grand livre d''plan analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBS', 'Balance simple', 'anc_balance_sim=
ple.inc.php', NULL, 'Balance simple des imputations analytiques', NULL, N=
ULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBC2', 'Balance crois=C3=A9e double', 'a=
nc_balance_double.inc.php', NULL, 'Balance double crois=C3=A9es des imput=
ations analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCTAB', 'Tableau', 'anc_acc_table.inc.php=
', NULL, 'Tableau li=C3=A9 =C3=A0 la comptabilit=C3=A9', NULL, NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('ANCBCC', 'Balance Analytique/comptabilit=C3=
=A9', 'anc_acc_balance.inc.php', NULL, 'Lien entre comptabilit=C3=A9 et C=
omptabilit=C3=A9 analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGR', 'Groupe', 'anc_group_balance.inc.p=
hp', NULL, 'Balance par groupe', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CSV:AncGrandLivre', 'Impression Grand-Livr=
e', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, 'Recherc=
he', NULL, 'popup_recherche()', 'ME');
+INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, 'Param=C3=A8=
tres divers', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, 'Conf=
ig. de la tva', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, 'Fi=
che', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, 'S=
tock', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MOD', 'Menu et profile', NULL, NULL, 'Menu=
 ', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPRO', 'Profile', 'profile.inc.php', NUL=
L, 'Configuration profile', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPAY', 'Moyen de paiement', 'payment_mid=
dle.inc.php', NULL, 'Config. des m=C3=A9thodes de paiement', NULL, NULL, =
'ME');
+INSERT INTO menu_ref VALUES ('CFGACC', 'Poste', 'poste.inc.php', NULL, '=
Config. poste comptable de base', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 'Nouvelle vente ou recette', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, 'Configuration des menus et plugins', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PDF:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:sec', 'Export S=C3=A9curit=C3=A9', NUL=
L, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncList', 'Export Comptabilit=C3=A9 an=
alytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique balance simple', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:histo', 'Export Historique', NULL, NUL=
L, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, 'Suivi fournisseur', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LET', 'Lettrage', NULL, NULL, 'Lettrage', =
NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, 'OD analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, 'V=C3=A9rification de la comptabilit=C3=A9', NULL, NU=
LL, 'ME');
+INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, 'Cr=C3=A9ation de rapport', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, 'Ecriture d''ouverture', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, 'Historique achat', 'ledger_type=3DACH', NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, 'Suivi, courrier, devis', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, 'Pr=C3=A9vision', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('EXT', 'Extension', 'extension_choice.inc.p=
hp', NULL, 'Extensions (plugins)', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGDOC', 'Document', 'document_modele.inc.=
php', NULL, 'Config. mod=C3=A8le de document', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGLED', 'journaux', 'cfgledger.inc.php', =
NULL, 'Configuration des journaux', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, 'Gestion des op=C3=A9rations pr=C3=A9d=C3=A9finifies', =
NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, 'Menu ava=
nc=C3=A9', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, 'Mo=
dule comptabilit=C3=A9 analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGSEC', 'S=C3=A9curit=C3=A9', 'param_sec.=
inc.php', NULL, 'configuration de la s=C3=A9curit=C3=A9', NULL, NULL, 'ME=
');
+INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, 'Plan analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, 'Groupe analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, 'Historique op=C3=A9rations dive=
rses', 'ledger_type=3DODS', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, '=
Menu ventes et recettes', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, 'Pr=C3=A9f=C3=A9rence', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, 'Historique', 'ledger_type=3DALL', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, 'Menu F=
inancier', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FIMP', 'Historique financier', 'history_op=
eration.inc.php', NULL, 'Historique financier', 'ledger_type=3DFIN', NULL=
, 'ME');
+INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, 'Menu achat=
', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, 'Menu op=C3=A9rations diverses', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, 'Nouvelle op=C3=A9rations diverses', NULL, NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('FREC', 'Rapprochement', 'compta_fin_rec.in=
c.php', NULL, 'Rapprochement bancaire', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, 'Suivi administration, banque', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, 'Nouvel extrait bancaire', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGATCARD', 'Attribut de fiche', 'card_att=
r.inc.php', NULL, 'Gestion des mod=C3=A8les de fiches', NULL, NULL, 'ME')=
;
+INSERT INTO menu_ref VALUES ('FSALDO', 'Soldes', 'compta_fin_saldo.inc.p=
hp', NULL, 'Solde des comptes en banques, caisse...', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, 'Reche=
rche', NULL, 'search_reconcile()', 'ME');
+INSERT INTO menu_ref VALUES ('LETACC', 'Lettrage par Poste', 'lettering.=
account.inc.php', NULL, 'lettrage par poste comptable', NULL, NULL, 'ME')=
;
+INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, 'Balance par cat=C3=A9gorie de fiche', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, '=
Suivi client', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, 'Gestion cat=C3=A9gorie de fiche', NULL, NULL, '=
ME');
+INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, 'Config. cat=C3=A9gorie de documents', NUL=
L, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, 'Historique des ventes', 'ledger_type=3DVEN', NULL,=
 'ME');
+INSERT INTO menu_ref VALUES ('LETCARD', 'Lettrage par Fiche', 'lettering=
.card.inc.php', NULL, 'Lettrage par fiche', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, 'Config. du plan comptable', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', 'So=
rtie', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, 'Tableau de bord', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
'Module comptabilit=C3=A9', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, 'Module g=
estion', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, 'Mod=
ule param=C3=A8tre', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTJRN', 'Historique', 'impress_jrn.inc.=
php', NULL, 'Impression historique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREC', 'Rapprochement', 'impress_rec.i=
nc.php', NULL, 'Impression des rapprochements', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTPOSTE', 'Poste', 'impress_poste.inc.p=
hp', NULL, 'Impression du d=C3=A9tail d''un poste comptable', NULL, NULL,=
 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREPORT', 'Rapport', 'impress_rapport.=
inc.php', NULL, 'Impression de rapport', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBILAN', 'Bilan', 'impress_bilan.inc.p=
hp', NULL, 'Impression de bilan', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTGL', 'Grand Livre', 'impress_gl_compt=
es.inc.php', NULL, 'Impression du grand livre', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBAL', 'Balance', 'balance.inc.php', N=
ULL, 'Impression des balances comptables', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, 'Impression cat=C3=A9gorie de fiches', NULL,=
 NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, 'Menu im=
pression', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACCESS', 'Accueil', NULL, 'user_login.php'=
, 'Accueil', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', NULL, NULL, 'Impres=
sion compta. analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('new_line', 'saut de ligne', NULL, NULL, 'S=
aut de ligne', NULL, NULL, 'SP');
+INSERT INTO menu_ref VALUES ('TVA', 'Module de TVA', 'tva/index.php', NU=
LL, 'Cette extension permet de faire les listings et declarations TVA', '=
plugin_code=3DTVA', NULL, 'PL');
+
+
+--
+-- Data for Name: mod_payment; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+INSERT INTO mod_payment VALUES (2, 'Caisse', 1, NULL, NULL, 2);
+INSERT INTO mod_payment VALUES (1, 'Paiement =C3=A9lectronique', 1, NULL=
, NULL, 2);
+INSERT INTO mod_payment VALUES (4, 'Caisse', 1, NULL, NULL, 3);
+INSERT INTO mod_payment VALUES (3, 'Par g=C3=A9rant ou administrateur', =
2, NULL, NULL, 3);
+
+
+--
+-- Data for Name: op_predef; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: op_predef_detail; Type: TABLE DATA; Schema: public; Ow=
ner: -
+--
+
+
+
+--
+-- Data for Name: operation_analytique; Type: TABLE DATA; Schema: public=
; Owner: -
+--
+
+
+
+--
+-- Data for Name: parameter; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO parameter VALUES ('MY_NAME', NULL);
+INSERT INTO parameter VALUES ('MY_CP', NULL);
+INSERT INTO parameter VALUES ('MY_COMMUNE', NULL);
+INSERT INTO parameter VALUES ('MY_TVA', NULL);
+INSERT INTO parameter VALUES ('MY_STREET', NULL);
+INSERT INTO parameter VALUES ('MY_NUMBER', NULL);
+INSERT INTO parameter VALUES ('MY_TEL', NULL);
+INSERT INTO parameter VALUES ('MY_PAYS', NULL);
+INSERT INTO parameter VALUES ('MY_FAX', NULL);
+INSERT INTO parameter VALUES ('MY_ANALYTIC', 'nu');
+INSERT INTO parameter VALUES ('MY_COUNTRY', 'BE');
+INSERT INTO parameter VALUES ('MY_STRICT', 'Y');
+INSERT INTO parameter VALUES ('MY_TVA_USE', 'Y');
+INSERT INTO parameter VALUES ('MY_PJ_SUGGEST', 'Y');
+INSERT INTO parameter VALUES ('MY_DATE_SUGGEST', 'Y');
+INSERT INTO parameter VALUES ('MY_ALPHANUM', 'N');
+INSERT INTO parameter VALUES ('MY_CHECK_PERIODE', 'N');
+
+
+--
+-- Data for Name: parm_code; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO parm_code VALUES ('DNA', '6740', 'D=C3=A9pense non d=C3=A9du=
ctible');
+INSERT INTO parm_code VALUES ('CUSTOMER', '400', 'Poste comptable de bas=
e pour les clients');
+INSERT INTO parm_code VALUES ('COMPTE_TVA', '451', 'TVA =C3=A0 payer');
+INSERT INTO parm_code VALUES ('BANQUE', '550', 'Poste comptable de base =
pour les banques');
+INSERT INTO parm_code VALUES ('VIREMENT_INTERNE', '58', 'Poste Comptable=
 pour les virements internes');
+INSERT INTO parm_code VALUES ('COMPTE_COURANT', '56', 'Poste comptable p=
our le compte courant');
+INSERT INTO parm_code VALUES ('CAISSE', '57', 'Poste comptable pour la c=
aisse');
+INSERT INTO parm_code VALUES ('TVA_DNA', '6740', 'Tva non d=C3=A9ductibl=
e s');
+INSERT INTO parm_code VALUES ('TVA_DED_IMPOT', '619000', 'Tva d=C3=A9duc=
tible par l''imp=C3=B4t');
+INSERT INTO parm_code VALUES ('VENTE', '70', 'Poste comptable de base po=
ur les ventes');
+INSERT INTO parm_code VALUES ('DEP_PRIV', '4890', 'Depense a charge du g=
erant');
+INSERT INTO parm_code VALUES ('SUPPLIER', '440', 'Poste par d=C3=A9faut =
pour les fournisseurs');
+
+
+--
+-- Data for Name: parm_money; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO parm_money VALUES (1, 'EUR', 1.0000);
+
+
+--
+-- Data for Name: parm_periode; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+INSERT INTO parm_periode VALUES (79, '2010-01-01', '2010-01-31', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (80, '2010-02-01', '2010-02-28', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (81, '2010-03-01', '2010-03-31', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (82, '2010-04-01', '2010-04-30', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (83, '2010-05-01', '2010-05-31', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (84, '2010-06-01', '2010-06-30', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (85, '2010-07-01', '2010-07-31', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (86, '2010-08-01', '2010-08-31', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (87, '2010-09-01', '2010-09-30', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (88, '2010-10-01', '2010-10-31', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (89, '2010-11-01', '2010-11-30', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (90, '2010-12-01', '2010-12-30', '2010',=
 false, false);
+INSERT INTO parm_periode VALUES (91, '2010-12-31', '2010-12-31', '2010',=
 false, false);
+
+
+--
+-- Data for Name: parm_poste; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO parm_poste VALUES ('1', 'PAS');
+INSERT INTO parm_poste VALUES ('101', 'PASINV');
+INSERT INTO parm_poste VALUES ('141', 'PASINV');
+INSERT INTO parm_poste VALUES ('42', 'PAS');
+INSERT INTO parm_poste VALUES ('43', 'PAS');
+INSERT INTO parm_poste VALUES ('44', 'PAS');
+INSERT INTO parm_poste VALUES ('45', 'PAS');
+INSERT INTO parm_poste VALUES ('46', 'PAS');
+INSERT INTO parm_poste VALUES ('47', 'PAS');
+INSERT INTO parm_poste VALUES ('48', 'PAS');
+INSERT INTO parm_poste VALUES ('492', 'PAS');
+INSERT INTO parm_poste VALUES ('493', 'PAS');
+INSERT INTO parm_poste VALUES ('2', 'ACT');
+INSERT INTO parm_poste VALUES ('2409', 'ACTINV');
+INSERT INTO parm_poste VALUES ('3', 'ACT');
+INSERT INTO parm_poste VALUES ('5', 'ACT');
+INSERT INTO parm_poste VALUES ('491', 'ACT');
+INSERT INTO parm_poste VALUES ('490', 'ACT');
+INSERT INTO parm_poste VALUES ('6', 'CHA');
+INSERT INTO parm_poste VALUES ('7', 'PRO');
+INSERT INTO parm_poste VALUES ('4', 'ACT');
+INSERT INTO parm_poste VALUES ('40', 'ACT');
+INSERT INTO parm_poste VALUES ('5501', 'ACTINV');
+INSERT INTO parm_poste VALUES ('5511', 'ACTINV');
+INSERT INTO parm_poste VALUES ('5521', 'ACTINV');
+INSERT INTO parm_poste VALUES ('5531', 'ACTINV');
+INSERT INTO parm_poste VALUES ('5541', 'ACTINV');
+INSERT INTO parm_poste VALUES ('5551', 'ACTINV');
+INSERT INTO parm_poste VALUES ('5561', 'ACTINV');
+INSERT INTO parm_poste VALUES ('5571', 'ACTINV');
+INSERT INTO parm_poste VALUES ('5581', 'ACTINV');
+INSERT INTO parm_poste VALUES ('5591', 'ACTINV');
+INSERT INTO parm_poste VALUES ('6311', 'CHAINV');
+INSERT INTO parm_poste VALUES ('6321', 'CHAINV');
+INSERT INTO parm_poste VALUES ('6331', 'CHAINV');
+INSERT INTO parm_poste VALUES ('6341', 'CHAINV');
+INSERT INTO parm_poste VALUES ('6351', 'CHAINV');
+INSERT INTO parm_poste VALUES ('6361', 'CHAINV');
+INSERT INTO parm_poste VALUES ('6371', 'CHAINV');
+INSERT INTO parm_poste VALUES ('649', 'CHAINV');
+INSERT INTO parm_poste VALUES ('6511', 'CHAINV');
+INSERT INTO parm_poste VALUES ('6701', 'CHAINV');
+INSERT INTO parm_poste VALUES ('608', 'CHAINV');
+INSERT INTO parm_poste VALUES ('709', 'PROINV');
+
+
+--
+-- Data for Name: plan_analytique; Type: TABLE DATA; Schema: public; Own=
er: -
+--
+
+
+
+--
+-- Data for Name: poste_analytique; Type: TABLE DATA; Schema: public; Ow=
ner: -
+--
+
+
+
+--
+-- Data for Name: profile; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO profile VALUES ('Administrateur', 1, 'Profil par d=C3=A9faut=
 pour les adminstrateurs', true, true);
+INSERT INTO profile VALUES ('Utilisateur', 2, 'Profil par d=C3=A9faut po=
ur les utilisateurs', true, true);
+
+
+--
+-- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+INSERT INTO profile_menu VALUES (59, 'CFGPAY', 'DIVPARM', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (68, 'CFGATCARD', 'DIVPARM', 1, 9, 'E', =
0);
+INSERT INTO profile_menu VALUES (61, 'CFGACC', 'DIVPARM', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (651, 'ANCHOP', 'ANCIMP', 1, 10, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', 0);
+INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (652, 'ANCGL', 'ANCIMP', 1, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (653, 'ANCBS', 'ANCIMP', 1, 30, 'E', 0);
+INSERT INTO profile_menu VALUES (654, 'ANCBC2', 'ANCIMP', 1, 40, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (655, 'ANCTAB', 'ANCIMP', 1, 50, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (656, 'ANCBCC', 'ANCIMP', 1, 60, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (657, 'ANCGR', 'ANCIMP', 1, 70, 'E', 0);
+INSERT INTO profile_menu VALUES (658, 'CSV:AncGrandLivre', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (662, 'new_line', NULL, 1, 35, 'M', 0);
+INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
0);
+INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (526, 'PRINTGL', 'PRINT', 1, 20, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (23, 'LET', 'COMPTA', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (523, 'PRINTBAL', 'PRINT', 1, 50, 'E', 0=
);
+INSERT INTO profile_menu VALUES (529, 'PRINTREPORT', 'PRINT', 1, 85, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 0);
+INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', 0);
+INSERT INTO profile_menu VALUES (527, 'PRINTJRN', 'PRINT', 1, 10, 'E', 0=
);
+INSERT INTO profile_menu VALUES (530, 'PRINTREC', 'PRINT', 1, 100, 'E', =
0);
+INSERT INTO profile_menu VALUES (524, 'PRINTBILAN', 'PRINT', 1, 90, 'E',=
 0);
+INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', 0);
+INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E', 0=
);
+INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E', 0);
+INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E', 0);
+INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E', 0);
+INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 25, 'M', 0);
+INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', 0);
+INSERT INTO profile_menu VALUES (35, 'PRINT', 'GESTION', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (126, 'CSV:postedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 45, 'M', 0);
+INSERT INTO profile_menu VALUES (18, 'MENUODS', 'COMPTA', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (88, 'ODS', 'MENUODS', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (89, 'ODSIMP', 'MENUODS', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (73, 'CFGDOC', 'PARAM', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (74, 'CFGLED', 'PARAM', 1, 9, 'E', 0);
+INSERT INTO profile_menu VALUES (71, 'CFGSEC', 'PARAM', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (82, 'EXT', NULL, 1, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (95, 'FREC', 'MENUFIN', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (94, 'FSALDO', 'MENUFIN', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (27, 'LETACC', 'LET', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (24, 'LETCARD', 'LET', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (167, 'MOD', 'PARAM', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (93, 'FIMP', 'MENUFIN', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', 0);
+INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (129, 'PDF:fichedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (130, 'CSV:fiche_balance', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (131, 'PDF:fiche_balance', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (132, 'CSV:report', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (133, 'PDF:report', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (134, 'CSV:fiche', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (135, 'PDF:fiche', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (136, 'CSV:glcompte', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (137, 'PDF:glcompte', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (138, 'PDF:sec', NULL, 1, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (139, 'CSV:AncList', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (140, 'CSV:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (141, 'PDF:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (142, 'CSV:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (143, 'PDF:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (144, 'CSV:balance', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (145, 'PDF:balance', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (146, 'CSV:AncTable', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (147, 'CSV:AncAccList', NULL, 1, NULL, '=
P', 0);
+INSERT INTO profile_menu VALUES (148, 'CSV:AncBalGroup', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (528, 'PRINTPOSTE', 'PRINT', 1, 30, 'E',=
 0);
+INSERT INTO profile_menu VALUES (525, 'PRINTCARD', 'PRINT', 1, 40, 'E', =
0);
+INSERT INTO profile_menu VALUES (1, 'DASHBOARD', NULL, 1, 10, 'M', 1);
+INSERT INTO profile_menu VALUES (172, 'CFGPRO', 'MOD', 1, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MOD', 1, NULL, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (663, 'CFGPAY', 'DIVPARM', 2, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (664, 'CFGATCARD', 'DIVPARM', 2, 9, 'E',=
 0);
+INSERT INTO profile_menu VALUES (665, 'CFGACC', 'DIVPARM', 2, 6, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (668, 'ANCHOP', 'ANCIMP', 2, 10, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (669, 'COMPTA', NULL, 2, 40, 'M', 0);
+INSERT INTO profile_menu VALUES (672, 'ANCGL', 'ANCIMP', 2, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (673, 'CFGTVA', 'DIVPARM', 2, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (674, 'ANCBS', 'ANCIMP', 2, 30, 'E', 0);
+INSERT INTO profile_menu VALUES (675, 'ANCBC2', 'ANCIMP', 2, 40, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (676, 'ANCTAB', 'ANCIMP', 2, 50, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (677, 'ANCBCC', 'ANCIMP', 2, 60, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (678, 'ANCGR', 'ANCIMP', 2, 70, 'E', 0);
+INSERT INTO profile_menu VALUES (679, 'CSV:AncGrandLivre', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (680, 'new_line', NULL, 2, 35, 'M', 0);
+INSERT INTO profile_menu VALUES (681, 'CFGCATDOC', 'DIVPARM', 2, 8, 'E',=
 0);
+INSERT INTO profile_menu VALUES (683, 'PRINTGL', 'PRINT', 2, 20, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (684, 'LET', 'COMPTA', 2, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (685, 'PRINTBAL', 'PRINT', 2, 50, 'E', 0=
);
+INSERT INTO profile_menu VALUES (686, 'PRINTREPORT', 'PRINT', 2, 85, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (688, 'PLANANC', 'ANC', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (689, 'CFGCARDCAT', 'DIVPARM', 2, 7, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (690, 'ANCODS', 'ANC', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (717, 'CSV:ledger', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (718, 'PDF:ledger', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (719, 'PRINT', 'COMPTA', 2, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (720, 'CSV:postedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (721, 'MENUACH', 'COMPTA', 2, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (722, 'ACHIMP', 'MENUACH', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (723, 'GESTION', NULL, 2, 45, 'M', 0);
+INSERT INTO profile_menu VALUES (724, 'MENUODS', 'COMPTA', 2, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (725, 'ODS', 'MENUODS', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (726, 'ODSIMP', 'MENUODS', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (727, 'ANC', NULL, 2, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (728, 'VENMENU', 'COMPTA', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (729, 'VEN', 'VENMENU', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (730, 'VENIMP', 'VENMENU', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (731, 'FIN', 'MENUFIN', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (735, 'EXT', NULL, 2, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (736, 'FREC', 'MENUFIN', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (737, 'FSALDO', 'MENUFIN', 2, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (738, 'LETACC', 'LET', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (691, 'ANCGROUP', 'ANC', 2, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (692, 'ANCIMP', 'ANC', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (694, 'PRINTJRN', 'PRINT', 2, 10, 'E', 0=
);
+INSERT INTO profile_menu VALUES (695, 'PRINTREC', 'PRINT', 2, 100, 'E', =
0);
+INSERT INTO profile_menu VALUES (696, 'PRINTBILAN', 'PRINT', 2, 90, 'E',=
 0);
+INSERT INTO profile_menu VALUES (697, 'PREFERENCE', NULL, 2, 15, 'M', 0)=
;
+INSERT INTO profile_menu VALUES (698, 'CUST', 'GESTION', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (699, 'SUPPL', 'GESTION', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (700, 'ADM', 'GESTION', 2, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (701, 'CARD', 'GESTION', 2, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (702, 'STOCK', 'GESTION', 2, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (703, 'FORECAST', 'GESTION', 2, 7, 'E', =
0);
+INSERT INTO profile_menu VALUES (704, 'FOLLOW', 'GESTION', 2, 8, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (705, 'VERIFBIL', 'ADV', 2, 21, 'E', 0);
+INSERT INTO profile_menu VALUES (706, 'STOCK', 'ADV', 2, 22, 'E', 0);
+INSERT INTO profile_menu VALUES (707, 'PREDOP', 'ADV', 2, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (708, 'OPEN', 'ADV', 2, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (709, 'REPORT', 'ADV', 2, 25, 'E', 0);
+INSERT INTO profile_menu VALUES (710, 'CARD', 'COMPTA', 2, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (711, 'HIST', 'COMPTA', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (712, 'ADV', 'COMPTA', 2, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (713, 'ACCESS', NULL, 2, 25, 'M', 0);
+INSERT INTO profile_menu VALUES (714, 'CSV:histo', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (715, 'LOGOUT', NULL, 2, 30, 'M', 0);
+INSERT INTO profile_menu VALUES (716, 'PRINT', 'GESTION', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (739, 'LETCARD', 'LET', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (742, 'MENUFIN', 'COMPTA', 2, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (743, 'FIMP', 'MENUFIN', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (744, 'SEARCH', NULL, 2, 60, 'M', 0);
+INSERT INTO profile_menu VALUES (745, 'ACH', 'MENUACH', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (746, 'PDF:postedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (747, 'CSV:fichedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (748, 'PDF:fichedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (749, 'CSV:fiche_balance', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (750, 'PDF:fiche_balance', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (751, 'CSV:report', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (752, 'PDF:report', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (753, 'CSV:fiche', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (754, 'PDF:fiche', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (755, 'CSV:glcompte', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (756, 'PDF:glcompte', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (757, 'PDF:sec', NULL, 2, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (758, 'CSV:AncList', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (759, 'CSV:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (760, 'PDF:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (761, 'CSV:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (762, 'PDF:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (763, 'CSV:balance', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (764, 'PDF:balance', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (765, 'CSV:AncTable', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (766, 'CSV:AncAccList', NULL, 2, NULL, '=
P', 0);
+INSERT INTO profile_menu VALUES (767, 'CSV:AncBalGroup', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (768, 'OTH:Bilan', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (769, 'PRINTPOSTE', 'PRINT', 2, 30, 'E',=
 0);
+INSERT INTO profile_menu VALUES (770, 'PRINTCARD', 'PRINT', 2, 40, 'E', =
0);
+INSERT INTO profile_menu VALUES (777, 'CFGPRO', 'MOD', 2, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (778, 'CFGMENU', 'MOD', 2, NULL, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (772, 'DASHBOARD', NULL, 2, 10, 'M', 1);
+INSERT INTO profile_menu VALUES (779, 'TVA', 'EXT', 1, NULL, 'S', NULL);
+
+
+--
+-- Data for Name: profile_menu_type; Type: TABLE DATA; Schema: public; O=
wner: -
+--
+
+INSERT INTO profile_menu_type VALUES ('P', 'Impression');
+INSERT INTO profile_menu_type VALUES ('S', 'Extension');
+INSERT INTO profile_menu_type VALUES ('E', 'Menu');
+INSERT INTO profile_menu_type VALUES ('M', 'Module');
+
+
+--
+-- Data for Name: profile_user; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+INSERT INTO profile_user VALUES ('phpcompta', 1, 1);
+
+
+--
+-- Data for Name: quant_fin; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: quant_purchase; Type: TABLE DATA; Schema: public; Owne=
r: -
+--
+
+
+
+--
+-- Data for Name: quant_sold; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: stock_goods; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+
+
+--
+-- Data for Name: tmp_pcmn; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO tmp_pcmn VALUES ('794', 'Intervention d''associ=C3=A9s (ou d=
u propri=C3=A9taire) dans la perte', '79', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('1', 'Fonds propres, provisions pour risque=
s et charges =C3=A0 plus d''un an', '0', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('2', 'Frais d''=C3=A9tablissement, actifs i=
mmobilis=C3=A9s et cr=C3=A9ances =C3=A0 plus d''un an', '0', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('3', 'Stocks et commandes en cours d''=C3=A9=
x=C3=A9cution', '0', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4', 'Cr=C3=A9ances et dettes =C3=A0 un an =
au plus', '0', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5', 'Placements de tr=C3=A9sorerie et vale=
urs disponibles', '0', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('6', 'Charges', '0', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('7', 'Produits', '0', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('4000001', 'Client 1', '400', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4000002', 'Client 2', '400', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4000003', 'Client 3', '400', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('6040001', 'Electricit=C3=A9', '604', 'CHA'=
);
+INSERT INTO tmp_pcmn VALUES ('6040002', 'Loyer', '604', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('55000002', 'Banque 1', '5500', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('55000003', 'Banque 2', '5500', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4400001', 'Fournisseur 1', '440', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4400002', 'Fournisseur 2', '440', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4400003', 'Fournisseur 4', '440', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('610001', 'Electricit=C3=A9', '61', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('610002', 'Loyer', '61', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('610003', 'Assurance', '61', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('610004', 'Mat=C3=A9riel bureau', '61', 'CH=
A');
+INSERT INTO tmp_pcmn VALUES ('7000002', 'Marchandise A', '700', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('7000001', 'Prestation', '700', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('7000003', 'D=C3=A9placement', '700', 'PRO'=
);
+INSERT INTO tmp_pcmn VALUES ('101', 'Capital non appel=C3=A9', '10', 'PA=
SINV');
+INSERT INTO tmp_pcmn VALUES ('6190', 'TVA r=C3=A9cup=C3=A9rable par l''i=
mp=C3=B4t', '61', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6740', 'D=C3=A9pense non admise', '67', 'C=
HA');
+INSERT INTO tmp_pcmn VALUES ('9', 'Comptes hors Compta', '0', 'CON');
+INSERT INTO tmp_pcmn VALUES ('100', 'Capital souscrit', '10', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1311', 'Autres r=C3=A9serves indisponibles=
', '131', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('132', ' R=C3=A9serves immunis=C3=A9es', '1=
3', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('6711', 'Suppl=C3=A9ments d''imp=C3=B4ts es=
tim=C3=A9s', '671', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6712', 'Provisions fiscales constitu=C3=A9=
es', '671', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('672', 'Imp=C3=B4ts =C3=A9trangers sur le r=
=C3=A9sultat de l''exercice', '67', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('673', 'Imp=C3=B4ts =C3=A9trangers sur le r=
=C3=A9sultat d''exercice ant=C3=A9rieures', '67', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('68', 'Transferts aux r=C3=A9serves immunis=
=C3=A9es', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('69', 'Affectations et pr=C3=A9l=C3=A9vemen=
ts', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('690', 'Perte report=C3=A9e de l''exercice =
pr=C3=A9c=C3=A9dent', '69', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('691', 'Dotation =C3=A0 la r=C3=A9serve l=C3=
=A9gale', '69', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('692', 'Dotation aux autres r=C3=A9serves',=
 '69', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('693', 'B=C3=A9n=C3=A9fice =C3=A0 reporter'=
, '69', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('694', 'R=C3=A9mun=C3=A9ration du capital',=
 '69', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('695', 'Administrateurs ou g=C3=A9rants', '=
69', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('696', 'Autres allocataires', '69', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('70', 'Chiffre d''affaire', '7', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('700', 'Ventes et prestations de services',=
 '70', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('701', 'Ventes et prestations de services',=
 '70', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('702', 'Ventes et prestations de services',=
 '70', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('703', 'Ventes et prestations de services',=
 '70', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('704', 'Ventes et prestations de services',=
 '70', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('706', 'Ventes et prestations de services',=
 '70', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('707', 'Ventes et prestations de services',=
 '70', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('709', 'Remises, ristournes et rabais accor=
d=C3=A9s(-)', '70', 'PROINV');
+INSERT INTO tmp_pcmn VALUES ('71', 'Variations des stocks et commandes e=
n cours d''=C3=A9x=C3=A9cution', '7', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('712', 'des en-cours de fabrication', '71',=
 'PRO');
+INSERT INTO tmp_pcmn VALUES ('713', 'des produits finis', '71', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('715', 'des immeubles construits destin=C3=A9=
s =C3=A0 la vente', '71', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('717', ' des commandes  en cours d''=C3=A9x=
=C3=A9cution', '71', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('7170', 'Valeur d''acquisition', '717', 'PR=
O');
+INSERT INTO tmp_pcmn VALUES ('7171', 'B=C3=A9n=C3=A9fice pris en compte'=
, '717', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('72', 'Production immobilis=C3=A9e', '7', '=
PRO');
+INSERT INTO tmp_pcmn VALUES ('74', 'Autres produits d''exploitation', '7=
', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('740', 'Subsides d'' exploitation  et monta=
nts compensatoires', '74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('741', 'Plus-values sur r=C3=A9alisation co=
urantes d'' immobilisations corporelles', '74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('742', 'Plus-values sur r=C3=A9alisations d=
e cr=C3=A9ances commerciales', '74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('743', 'Produits d''exploitations divers', =
'74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('744', 'Produits d''exploitations divers', =
'74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('745', 'Produits d''exploitations divers', =
'74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('746', 'Produits d''exploitations divers', =
'74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('747', 'Produits d''exploitations divers', =
'74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('748', 'Produits d''exploitations divers', =
'74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('75', 'Produits financiers', '7', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('750', 'Produits sur immobilisations financ=
i=C3=A8res', '75', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('751', 'Produits des actifs circulants', '7=
5', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('752', 'Plus-value sur r=C3=A9alisations d'=
'actis circulants', '75', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('753', 'Subsides en capital et int=C3=A9r=C3=
=AAts', '75', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('754', 'Diff=C3=A9rences de change', '75', =
'PRO');
+INSERT INTO tmp_pcmn VALUES ('755', 'Ecarts de conversion des devises', =
'75', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('221', 'Construction', '22', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('756', 'Produits financiers divers', '75', =
'PRO');
+INSERT INTO tmp_pcmn VALUES ('757', 'Produits financiers divers', '75', =
'PRO');
+INSERT INTO tmp_pcmn VALUES ('758', 'Produits financiers divers', '75', =
'PRO');
+INSERT INTO tmp_pcmn VALUES ('759', 'Produits financiers divers', '75', =
'PRO');
+INSERT INTO tmp_pcmn VALUES ('76', 'Produits exceptionnels', '7', 'PRO')=
;
+INSERT INTO tmp_pcmn VALUES ('760', 'Reprise d''amortissements et de r=C3=
=A9ductions de valeur', '76', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('7601', 'sur immobilisations corporelles', =
'760', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('7602', 'sur immobilisations incorporelles'=
, '760', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('761', 'Reprises de r=C3=A9ductions de vale=
ur sur immobilisations financi=C3=A8res', '76', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('762', 'Reprises de provisions pour risques=
 et charges exceptionnels', '76', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('763', 'Plus-value sur r=C3=A9alisation d''=
actifs immobilis=C3=A9', '76', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('764', 'Autres produits exceptionnels', '76=
', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('765', 'Autres produits exceptionnels', '76=
', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('766', 'Autres produits exceptionnels', '76=
', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('767', 'Autres produits exceptionnels', '76=
', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('768', 'Autres produits exceptionnels', '76=
', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('769', 'Autres produits exceptionnels', '76=
', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('77', 'R=C3=A9gularisations d''imp=C3=B4ts =
et reprises de provisions fiscales', '7', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('771', 'imp=C3=B4ts belges sur le r=C3=A9su=
ltat', '77', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('7710', 'R=C3=A9gularisations d''imp=C3=B4t=
s dus ou vers=C3=A9', '771', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('7711', 'R=C3=A9gularisations d''imp=C3=B4t=
s estim=C3=A9s', '771', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('7712', 'Reprises de provisions fiscales', =
'771', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('773', 'Imp=C3=B4ts =C3=A9trangers sur le r=
=C3=A9sultats', '77', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('79', 'Affectations et pr=C3=A9l=C3=A9vemen=
ts', '7', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('790', 'B=C3=A9n=C3=A9fice report=C3=A9 de =
l''exercice pr=C3=A9c=C3=A9dent', '79', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('791', 'Pr=C3=A9l=C3=A9vement sur le capita=
l et les primes d''=C3=A9mission', '79', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('792', 'Pr=C3=A9l=C3=A9vement sur les r=C3=A9=
serves', '79', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('793', 'Perte =C3=A0 reporter', '79', 'PRO'=
);
+INSERT INTO tmp_pcmn VALUES ('6301', 'Dotations aux amortissements sur i=
mmobilisations incorporelles', '630', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6302', 'Dotations aux amortissements sur i=
mmobilisations corporelles', '630', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6308', 'Dotations aux r=C3=A9ductions de v=
aleur sur immobilisations incorporelles', '630', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6309', 'Dotations aux r=C3=A9ductions de v=
aleur sur immobilisations corporelles', '630', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('631', 'R=C3=A9ductions de valeur sur stock=
s', '63', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6310', 'Dotations', '631', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6311', 'Reprises(-)', '631', 'CHAINV');
+INSERT INTO tmp_pcmn VALUES ('632', 'R=C3=A9ductions de valeur sur comma=
nde en cours d''=C3=A9x=C3=A9cution', '63', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6320', 'Dotations', '632', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6321', 'Reprises(-)', '632', 'CHAINV');
+INSERT INTO tmp_pcmn VALUES ('633', 'R=C3=A9ductions de valeurs sur cr=C3=
=A9ances commerciales =C3=A0 plus d''un an', '63', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6330', 'Dotations', '633', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6331', 'Reprises(-)', '633', 'CHAINV');
+INSERT INTO tmp_pcmn VALUES ('634', 'R=C3=A9ductions de valeur sur cr=C3=
=A9ances commerciales =C3=A0 un an au plus', '63', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6340', 'Dotations', '634', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6341', 'Reprise', '634', 'CHAINV');
+INSERT INTO tmp_pcmn VALUES ('635', 'Provisions pour pensions et obligat=
ions similaires', '63', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6350', 'Dotations', '635', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6351', 'Utilisation et reprises', '635', '=
CHAINV');
+INSERT INTO tmp_pcmn VALUES ('636', 'Provisions pour grosses r=C3=A9para=
tions et gros entretien', '63', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6360', 'Dotations', '636', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6361', 'Reprises(-)', '636', 'CHAINV');
+INSERT INTO tmp_pcmn VALUES ('637', 'Provisions pour autres risques et c=
harges', '63', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6370', 'Dotations', '637', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6371', 'Reprises(-)', '637', 'CHAINV');
+INSERT INTO tmp_pcmn VALUES ('64', 'Autres charges d''exploitation', '6'=
, 'CHA');
+INSERT INTO tmp_pcmn VALUES ('640', 'Charges fiscales d''exploitation', =
'64', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('641', 'Moins-values sur r=C3=A9alisations =
courantes d''immobilisations corporelles', '64', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('642', 'Moins-value sur r=C3=A9alisation de=
 cr=C3=A9ances commerciales', '64', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('643', 'Charges d''exploitations', '64', 'C=
HA');
+INSERT INTO tmp_pcmn VALUES ('644', 'Charges d''exploitations', '64', 'C=
HA');
+INSERT INTO tmp_pcmn VALUES ('645', 'Charges d''exploitations', '64', 'C=
HA');
+INSERT INTO tmp_pcmn VALUES ('646', 'Charges d''exploitations', '64', 'C=
HA');
+INSERT INTO tmp_pcmn VALUES ('647', 'Charges d''exploitations', '64', 'C=
HA');
+INSERT INTO tmp_pcmn VALUES ('648', 'Charges d''exploitations', '64', 'C=
HA');
+INSERT INTO tmp_pcmn VALUES ('649', 'Charges d''exploitation port=C3=A9e=
s =C3=A0 l''actif au titre de frais de restructuration(-)', '64', 'CHAINV=
');
+INSERT INTO tmp_pcmn VALUES ('65', 'Charges financi=C3=A8res', '6', 'CHA=
');
+INSERT INTO tmp_pcmn VALUES ('650', 'Charges des dettes', '65', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6500', 'Int=C3=A9r=C3=AAts, commmissions e=
t frais aff=C3=A9rents aux dettes', '650', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6501', 'Amortissements des frais d''=C3=A9=
missions d''emrunts et des primes de remboursement', '650', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6502', 'Autres charges des dettes', '650',=
 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6503', 'Int=C3=A9r=C3=AAts intercalaires p=
ort=C3=A9s =C3=A0 l''actif(-)', '650', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('651', 'R=C3=A9ductions de valeur sur actif=
s circulants', '65', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6510', 'Dotations', '651', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6511', 'Reprises(-)', '651', 'CHAINV');
+INSERT INTO tmp_pcmn VALUES ('652', 'Moins-value sur r=C3=A9alisation d'=
'actifs circulants', '65', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('653', 'Charges d''escompte de cr=C3=A9ance=
s', '65', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('654', 'Diff=C3=A9rences de changes', '65',=
 'CHA');
+INSERT INTO tmp_pcmn VALUES ('655', 'Ecarts de conversion des devises', =
'65', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('656', 'Charges financi=C3=A8res diverses',=
 '65', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('657', 'Charges financi=C3=A8res diverses',=
 '65', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('658', 'Charges financi=C3=A8res diverses',=
 '65', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('659', 'Charges financi=C3=A8res diverses',=
 '65', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('66', 'Charges exceptionnelles', '6', 'CHA'=
);
+INSERT INTO tmp_pcmn VALUES ('660', 'Amortissements et r=C3=A9ductions d=
e valeur exceptionnels (dotations)', '66', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6600', 'sur frais d''=C3=A9tablissement', =
'660', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6601', 'sur immobilisations incorporelles'=
, '660', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6602', 'sur immobilisations corporelles', =
'660', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('661', 'R=C3=A9ductions de valeur sur immob=
ilisations financi=C3=A8res (dotations)', '66', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('662', 'Provisions pour risques et charges =
exceptionnels', '66', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('663', 'Moins-values sur r=C3=A9alisations =
d''actifs immobilis=C3=A9s', '66', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('664', 'Autres charges exceptionnelles', '6=
6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('665', 'Autres charges exceptionnelles', '6=
6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('666', 'Autres charges exceptionnelles', '6=
6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('667', 'Autres charges exceptionnelles', '6=
6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('668', 'Autres charges exceptionnelles', '6=
6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('669', ' Charges exceptionnelles port=C3=A9=
es =C3=A0 l''actif au titre de frais de restructuration', '66', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('67', 'imp=C3=B4ts sur le r=C3=A9sultat', '=
6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('670', 'Imp=C3=B4ts belge sur le r=C3=A9sul=
tat de l''exercice', '67', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6700', 'Imp=C3=B4ts et pr=C3=A9comptes dus=
 ou vers=C3=A9s', '670', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6701', 'Exc=C3=A9dents de versement d''imp=
=C3=B4ts et de pr=C3=A9comptes port=C3=A9s =C3=A0 l''actifs (-)', '670', =
'CHAINV');
+INSERT INTO tmp_pcmn VALUES ('6702', 'Charges fiscales estim=C3=A9es', '=
670', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('671', 'Imp=C3=B4ts belges sur le r=C3=A9su=
ltats d''exercices ant=C3=A9rieures', '67', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6710', 'Suppl=C3=A9ments d''imp=C3=B4t dus=
 ou vers=C3=A9s', '671', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('50', 'Actions propres', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('51', 'Actions et parts', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('510', 'Valeur d''acquisition', '51', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('511', 'Montant non appel=C3=A9s', '51', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('519', 'R=C3=A9ductions de valeur act=C3=A9=
es', '51', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('52', 'Titres =C3=A0 revenu fixe', '5', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('520', 'Valeur d''acquisition', '52', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('529', 'R=C3=A9ductions de valeur act=C3=A9=
es', '52', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('53', 'D=C3=A9p=C3=B4ts =C3=A0 terme', '5',=
 'ACT');
+INSERT INTO tmp_pcmn VALUES ('530', 'de plus d''un an', '53', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('531', 'de plus d''un mois et d''un an au p=
lus', '53', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('532', 'd''un mois au plus', '53', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('539', 'R=C3=A9ductions de valeur act=C3=A9=
es', '53', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('54', 'Valeurs =C3=A9chues =C3=A0 l''encais=
sement', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('55', 'Etablissement de cr=C3=A9dit', '5', =
'ACT');
+INSERT INTO tmp_pcmn VALUES ('550', 'Banque 1', '55', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5500', 'Comptes courants', '550', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5501', 'Ch=C3=A8ques =C3=A9mis (-)', '550'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5509', 'R=C3=A9duction de valeur act=C3=A9=
e', '550', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5510', 'Comptes courants', '551', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5511', 'Ch=C3=A8ques =C3=A9mis (-)', '551'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5519', 'R=C3=A9duction de valeur act=C3=A9=
e', '551', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5520', 'Comptes courants', '552', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5521', 'Ch=C3=A8ques =C3=A9mis (-)', '552'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5529', 'R=C3=A9duction de valeur act=C3=A9=
e', '552', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5530', 'Comptes courants', '553', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5531', 'Ch=C3=A8ques =C3=A9mis (-)', '553'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5539', 'R=C3=A9duction de valeur act=C3=A9=
e', '553', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5540', 'Comptes courants', '554', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5541', 'Ch=C3=A8ques =C3=A9mis (-)', '554'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5549', 'R=C3=A9duction de valeur act=C3=A9=
e', '554', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5550', 'Comptes courants', '555', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5551', 'Ch=C3=A8ques =C3=A9mis (-)', '555'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5559', 'R=C3=A9duction de valeur act=C3=A9=
e', '555', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5560', 'Comptes courants', '556', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5561', 'Ch=C3=A8ques =C3=A9mis (-)', '556'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5569', 'R=C3=A9duction de valeur act=C3=A9=
e', '556', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5570', 'Comptes courants', '557', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5571', 'Ch=C3=A8ques =C3=A9mis (-)', '557'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5579', 'R=C3=A9duction de valeur act=C3=A9=
e', '557', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5580', 'Comptes courants', '558', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5581', 'Ch=C3=A8ques =C3=A9mis (-)', '558'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5589', 'R=C3=A9duction de valeur act=C3=A9=
e', '558', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5590', 'Comptes courants', '559', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('5591', 'Ch=C3=A8ques =C3=A9mis (-)', '559'=
, 'ACTINV');
+INSERT INTO tmp_pcmn VALUES ('5599', 'R=C3=A9duction de valeur act=C3=A9=
e', '559', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('56', 'Office des ch=C3=A8ques postaux', '5=
', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('560', 'Compte courant', '56', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('561', 'Ch=C3=A8ques =C3=A9mis', '56', 'ACT=
');
+INSERT INTO tmp_pcmn VALUES ('578', 'Caisse timbre', '57', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('58', 'Virement interne', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('60', 'Approvisionnement et marchandises', =
'6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('600', 'Achats de mati=C3=A8res premi=C3=A8=
res', '60', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('601', 'Achats de fournitures', '60', 'CHA'=
);
+INSERT INTO tmp_pcmn VALUES ('602', 'Achats de services, travaux et =C3=A9=
tudes', '60', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('603', 'Sous-traitances g=C3=A9n=C3=A9rales=
', '60', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('604', 'Achats de marchandises', '60', 'CHA=
');
+INSERT INTO tmp_pcmn VALUES ('605', 'Achats d''immeubles destin=C3=A9s =C3=
=A0 la vente', '60', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('608', 'Remises, ristournes et rabais obten=
us(-)', '60', 'CHAINV');
+INSERT INTO tmp_pcmn VALUES ('609', 'Variation de stock', '60', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6090', 'de mati=C3=A8res premi=C3=A8res', =
'609', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6091', 'de fournitures', '609', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6094', 'de marchandises', '609', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6095', 'immeubles achet=C3=A9s destin=C3=A9=
s =C3=A0 la vente', '609', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('61', 'Services et biens divers', '6', 'CHA=
');
+INSERT INTO tmp_pcmn VALUES ('62', 'R=C3=A9mun=C3=A9rations, charges soc=
iales et pensions', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('620', 'R=C3=A9mun=C3=A9rations et avantage=
s sociaux directs', '62', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6200', 'Administrateurs ou g=C3=A9rants', =
'620', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6201', 'Personnel de directions', '620', '=
CHA');
+INSERT INTO tmp_pcmn VALUES ('6202', 'Employ=C3=A9s,620', '6202', 'CHA')=
;
+INSERT INTO tmp_pcmn VALUES ('6203', 'Ouvriers', '620', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6204', 'Autres membres du personnel', '620=
', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('621', 'Cotisations patronales d''assurance=
s sociales', '62', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('622', 'Primes partonales pour assurances e=
xtra-l=C3=A9gales', '62', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('623', 'Autres frais de personnel', '62', '=
CHA');
+INSERT INTO tmp_pcmn VALUES ('624', 'Pensions de retraite et de survie',=
 '62', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6240', 'Administrateurs ou g=C3=A9rants', =
'624', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6241', 'Personnel', '624', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('63', 'Amortissements, r=C3=A9ductions de v=
aleurs et provisions pour risques et charges', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('630', 'Dotations aux amortissements et r=C3=
=A9duction de valeurs sur immobilisations', '63', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('6300', ' Dotations aux amortissements sur =
frais d''=C3=A9tablissement', '630', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('705', 'Ventes et prestations de services',=
 '70', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('414', 'Produits =C3=A0 recevoir', '41', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('416', 'Cr=C3=A9ances diverses', '41', 'ACT=
');
+INSERT INTO tmp_pcmn VALUES ('4160', 'Comptes de l''exploitant', '416', =
'ACT');
+INSERT INTO tmp_pcmn VALUES ('417', 'Cr=C3=A9ances douteuses', '41', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('418', 'Cautionnements vers=C3=A9s en num=C3=
=A9raires', '41', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('419', 'R=C3=A9ductions de valeur act=C3=A9=
es', '41', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('42', 'Dettes =C3=A0 plus dun an =C3=A9ch=C3=
=A9ant dans l''ann=C3=A9e', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('420', 'Emprunts subordonn=C3=A9s', '42', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('4200', 'convertibles', '420', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4201', 'non convertibles', '420', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('421', 'Emprunts subordonn=C3=A9s', '42', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('4210', 'convertibles', '420', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4211', 'non convertibles', '420', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('422', ' Dettes de locations financement', =
'42', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('423', ' Etablissement de cr=C3=A9dit', '42=
', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4230', 'Dettes en comptes', '423', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4231', 'Promesses', '423', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4232', 'Cr=C3=A9dits d''acceptation', '423=
', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('424', 'Autres emprunts', '42', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('425', 'Dettes commerciales', '42', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4250', 'Fournisseurs', '425', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4251', 'Effets =C3=A0 payer', '425', 'PAS'=
);
+INSERT INTO tmp_pcmn VALUES ('426', 'Acomptes re=C3=A7us sur commandes',=
 '42', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('428', 'Cautionnement re=C3=A7us en num=C3=A9=
raires', '42', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('429', 'Dettes diverses', '42', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('43', 'Dettes financi=C3=A8res', '4', 'PAS'=
);
+INSERT INTO tmp_pcmn VALUES ('430', 'Etablissements de cr=C3=A9dit - Emp=
runts =C3=A0 compte =C3=A0 terme fixe', '43', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('431', 'Etablissements de cr=C3=A9dit - Pro=
messes', '43', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('432', ' Etablissements de cr=C3=A9dit - Cr=
=C3=A9dits d''acceptation', '43', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('433', 'Etablissements de cr=C3=A9dit -Dett=
es en comptes courant', '43', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('439', 'Autres emprunts', '43', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44', 'Dettes commerciales', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('440', 'Fournisseurs', '44', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('441', 'Effets =C3=A0 payer', '44', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('444', 'Factures =C3=A0 recevoir', '44', 'P=
AS');
+INSERT INTO tmp_pcmn VALUES ('45', 'Dettes fiscales, salariales et socia=
les', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('450', 'Dettes fiscales estim=C3=A9es', '45=
', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4500', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '450', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4501', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '450', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4502', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '450', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4503', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '450', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4504', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '450', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4505', 'Autres imp=C3=B4ts et taxes belges=
', '450', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4506', 'Autres imp=C3=B4ts et taxes belges=
', '450', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4507', 'Autres imp=C3=B4ts et taxes belges=
', '450', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4508', 'Imp=C3=B4ts et taxes =C3=A9tranger=
s', '450', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('451', 'TVA =C3=A0 payer', '45', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4511', 'TVA =C3=A0 payer 21%', '451', 'PAS=
');
+INSERT INTO tmp_pcmn VALUES ('4512', 'TVA =C3=A0 payer 12%', '451', 'PAS=
');
+INSERT INTO tmp_pcmn VALUES ('4513', 'TVA =C3=A0 payer 6%', '451', 'PAS'=
);
+INSERT INTO tmp_pcmn VALUES ('4514', 'TVA =C3=A0 payer 0%', '451', 'PAS'=
);
+INSERT INTO tmp_pcmn VALUES ('452', 'Imp=C3=B4ts et taxes =C3=A0 payer',=
 '45', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4520', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '452', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4521', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '452', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4522', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '452', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4523', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '452', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4524', 'Imp=C3=B4ts belges sur le r=C3=A9s=
ultat', '452', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4525', 'Autres imp=C3=B4ts et taxes belges=
', '452', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('55000001', 'Caisse', '5500', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4526', 'Autres imp=C3=B4ts et taxes belges=
', '452', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4527', 'Autres imp=C3=B4ts et taxes belges=
', '452', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4528', 'Imp=C3=B4ts et taxes =C3=A9tranger=
s', '452', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('453', 'Pr=C3=A9comptes retenus', '45', 'PA=
S');
+INSERT INTO tmp_pcmn VALUES ('454', 'Office National de la S=C3=A9curit=C3=
=A9 Sociales', '45', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('455', 'R=C3=A9mun=C3=A9rations', '45', 'PA=
S');
+INSERT INTO tmp_pcmn VALUES ('456', 'P=C3=A9cules de vacances', '45', 'P=
AS');
+INSERT INTO tmp_pcmn VALUES ('459', 'Autres dettes sociales', '45', 'PAS=
');
+INSERT INTO tmp_pcmn VALUES ('46', 'Acomptes re=C3=A7us sur commandes', =
'4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('47', 'Dettes d=C3=A9coulant de l''affectat=
ion du r=C3=A9sultat', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('470', 'Dividendes et tanti=C3=A8mes d''exe=
rcices ant=C3=A9rieurs', '47', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('471', 'Dividendes de l''exercice', '47', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('472', 'Tanti=C3=A8mes de l''exercice', '47=
', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('473', 'Autres allocataires', '47', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('48', 'Dettes diverses', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('480', 'Obligations et coupons =C3=A9chus',=
 '48', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('488', 'Cautionnements re=C3=A7us en num=C3=
=A9raires', '48', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('489', 'Autres dettes diverses', '48', 'PAS=
');
+INSERT INTO tmp_pcmn VALUES ('4890', 'Compte de l''exploitant', '489', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('49', 'Comptes de r=C3=A9gularisation', '4'=
, 'ACT');
+INSERT INTO tmp_pcmn VALUES ('490', 'Charges =C3=A0 reporter', '49', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('491', 'Produits acquis', '49', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('492', 'Charges =C3=A0 imputer', '49', 'PAS=
');
+INSERT INTO tmp_pcmn VALUES ('493', 'Produits =C3=A0 reporter', '49', 'P=
AS');
+INSERT INTO tmp_pcmn VALUES ('499', 'Comptes d''attentes', '49', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2821', 'Montants non-appel=C3=A9s(-)', '28=
2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2828', 'Plus-values act=C3=A9es', '282', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('2829', 'R=C3=A9ductions de valeurs act=C3=A9=
es', '282', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('283', 'Cr=C3=A9ances sur des entreprises a=
vec lesquelles existe un lien de participation', '28', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2830', 'Cr=C3=A9ance en compte', '283', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('2831', 'Effets =C3=A0 recevoir', '283', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('57', 'Caisse', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2832', 'Titre =C3=A0 revenu fixe', '283', =
'ACT');
+INSERT INTO tmp_pcmn VALUES ('2837', 'Cr=C3=A9ances douteuses', '283', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('2839', 'R=C3=A9duction de valeurs act=C3=A9=
es', '283', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('284', 'Autres actions et parts', '28', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('2840', 'Valeur d''acquisition', '284', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('2841', 'Montants non-appel=C3=A9s(-)', '28=
4', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2848', 'Plus-values act=C3=A9es', '284', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('2849', 'R=C3=A9ductions de valeurs act=C3=A9=
es', '284', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('285', 'Autres cr=C3=A9ances', '28', 'ACT')=
;
+INSERT INTO tmp_pcmn VALUES ('2850', 'Cr=C3=A9ance en compte', '285', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('2851', 'Effets =C3=A0 recevoir', '285', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('2852', 'Titre =C3=A0 revenu fixe', '285', =
'ACT');
+INSERT INTO tmp_pcmn VALUES ('2857', 'Cr=C3=A9ances douteuses', '285', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('2859', 'R=C3=A9ductions de valeurs act=C3=A9=
es', '285', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('288', 'Cautionnements vers=C3=A9s en num=C3=
=A9raires', '28', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('29', 'Cr=C3=A9ances =C3=A0 plus d''un an',=
 '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('290', 'Cr=C3=A9ances commerciales', '29', =
'ACT');
+INSERT INTO tmp_pcmn VALUES ('2900', 'Clients', '290', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2901', 'Effets =C3=A0 recevoir', '290', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('2906', 'Acomptes vers=C3=A9s', '290', 'ACT=
');
+INSERT INTO tmp_pcmn VALUES ('2907', 'Cr=C3=A9ances douteuses', '290', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('2909', 'R=C3=A9ductions de valeurs act=C3=A9=
es', '290', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('291', 'Autres cr=C3=A9ances', '29', 'ACT')=
;
+INSERT INTO tmp_pcmn VALUES ('2910', 'Cr=C3=A9ances en comptes', '291', =
'ACT');
+INSERT INTO tmp_pcmn VALUES ('2911', 'Effets =C3=A0 recevoir', '291', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('2917', 'Cr=C3=A9ances douteuses', '291', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('2919', 'R=C3=A9ductions de valeurs act=C3=A9=
es(-)', '291', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('30', 'Approvisionements - Mati=C3=A8res pr=
emi=C3=A8res', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('300', 'Valeur d''acquisition', '30', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('309', 'R=C3=A9ductions de valeur act=C3=A9=
es', '30', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('31', 'Approvisionnements - fournitures', '=
3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('310', 'Valeur d''acquisition', '31', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('319', 'R=C3=A9ductions de valeurs act=C3=A9=
es(-)', '31', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('32', 'En-cours de fabrication', '3', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('320', 'Valeurs d''acquisition', '32', 'ACT=
');
+INSERT INTO tmp_pcmn VALUES ('329', 'R=C3=A9ductions de valeur act=C3=A9=
es', '32', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('33', 'Produits finis', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('330', 'Valeur d''acquisition', '33', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('339', 'R=C3=A9ductions de valeur act=C3=A9=
es', '33', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('34', 'Marchandises', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('340', 'Valeur d''acquisition', '34', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('349', 'R=C3=A9ductions de valeur act=C3=A9=
es', '34', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('35', 'Immeubles destin=C3=A9s =C3=A0 la ve=
nte', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('350', 'Valeur d''acquisition', '35', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('359', 'R=C3=A9ductions de valeur act=C3=A9=
es', '35', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('36', 'Acomptes vers=C3=A9s sur achats pour=
 stocks', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('360', 'Valeur d''acquisition', '36', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('369', 'R=C3=A9ductions de valeur act=C3=A9=
es', '36', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('37', 'Commandes en cours =C3=A9x=C3=A9cuti=
on', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('370', 'Valeur d''acquisition', '37', 'ACT'=
);
+INSERT INTO tmp_pcmn VALUES ('371', 'B=C3=A9n=C3=A9fice pris en compte '=
, '37', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('379', 'R=C3=A9ductions de valeur act=C3=A9=
es', '37', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('40', 'Cr=C3=A9ances commerciales', '4', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('400', 'Clients', '40', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('401', 'Effets =C3=A0 recevoir', '40', 'ACT=
');
+INSERT INTO tmp_pcmn VALUES ('404', 'Produits =C3=A0 recevoir', '40', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('406', 'Acomptes vers=C3=A9s', '40', 'ACT')=
;
+INSERT INTO tmp_pcmn VALUES ('407', 'Cr=C3=A9ances douteuses', '40', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('409', 'R=C3=A9ductions de valeur act=C3=A9=
es', '40', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('41', 'Autres cr=C3=A9ances', '4', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('410', 'Capital appel=C3=A9 non vers=C3=A9'=
, '41', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('411', 'TVA =C3=A0 r=C3=A9cup=C3=A9rer', '4=
1', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4111', 'TVA =C3=A0 r=C3=A9cup=C3=A9rer 21%=
', '411', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4112', 'TVA =C3=A0 r=C3=A9cup=C3=A9rer 12%=
', '411', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4113', 'TVA =C3=A0 r=C3=A9cup=C3=A9rer 6% =
', '411', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4114', 'TVA =C3=A0 r=C3=A9cup=C3=A9rer 0%'=
, '411', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('412', 'Imp=C3=B4ts et pr=C3=A9comptes =C3=A0=
 r=C3=A9cup=C3=A9rer', '41', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4120', 'Imp=C3=B4t belge sur le r=C3=A9sul=
tat', '412', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4121', 'Imp=C3=B4t belge sur le r=C3=A9sul=
tat', '412', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4122', 'Imp=C3=B4t belge sur le r=C3=A9sul=
tat', '412', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4123', 'Imp=C3=B4t belge sur le r=C3=A9sul=
tat', '412', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4124', 'Imp=C3=B4t belge sur le r=C3=A9sul=
tat', '412', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4125', 'Autres imp=C3=B4ts et taxes belges=
', '412', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4126', 'Autres imp=C3=B4ts et taxes belges=
', '412', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4127', 'Autres imp=C3=B4ts et taxes belges=
', '412', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4128', 'Imp=C3=B4ts et taxes =C3=A9tranger=
s', '412', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('10', 'Capital ', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('6040003', 'Petit mat=C3=A9riel', '604', 'C=
HA');
+INSERT INTO tmp_pcmn VALUES ('11', 'Prime d''=C3=A9mission ', '1', 'PAS'=
);
+INSERT INTO tmp_pcmn VALUES ('12', 'Plus Value de r=C3=A9=C3=A9valuation=
 ', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('13', 'R=C3=A9serve ', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('130', 'R=C3=A9serve l=C3=A9gale', '13', 'P=
AS');
+INSERT INTO tmp_pcmn VALUES ('131', 'R=C3=A9serve indisponible', '13', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('1310', 'R=C3=A9serve pour actions propres'=
, '131', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('6040004', 'Assurance', '604', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('133', 'R=C3=A9serves disponibles', '13', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('14', 'B=C3=A9n=C3=A9fice ou perte report=C3=
=A9e', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('140', 'B=C3=A9n=C3=A9fice report=C3=A9', '=
14', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('141', 'Perte report=C3=A9e', '14', 'PASINV=
');
+INSERT INTO tmp_pcmn VALUES ('15', 'Subside en capital', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('16', 'Provisions pour risques et charges',=
 '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('160', 'Provisions pour pensions et obligat=
ions similaires', '16', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('161', 'Provisions pour charges fiscales', =
'16', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('749', 'Produits d''exploitations divers', =
'74', 'PRO');
+INSERT INTO tmp_pcmn VALUES ('162', 'Provisions pour grosses r=C3=A9para=
tion et gros entretien', '16', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('17', ' Dettes =C3=A0 plus d''un an', '1', =
'PAS');
+INSERT INTO tmp_pcmn VALUES ('170', 'Emprunts subordonn=C3=A9s', '17', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('1700', 'convertibles', '170', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1701', 'non convertibles', '170', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('171', 'Emprunts subordonn=C3=A9s', '17', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('1710', 'convertibles', '170', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1711', 'non convertibles', '170', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('172', ' Dettes de locations financement', =
'17', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('173', ' Etablissement de cr=C3=A9dit', '17=
', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1730', 'Dettes en comptes', '173', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1731', 'Promesses', '173', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1732', 'Cr=C3=A9dits d''acceptation', '173=
', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('174', 'Autres emprunts', '17', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('175', 'Dettes commerciales', '17', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1750', 'Fournisseurs', '175', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1751', 'Effets =C3=A0 payer', '175', 'PAS'=
);
+INSERT INTO tmp_pcmn VALUES ('176', 'Acomptes re=C3=A7us sur commandes',=
 '17', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('178', 'Cautionnement re=C3=A7us en num=C3=A9=
raires', '17', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('179', 'Dettes diverses', '17', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('20', 'Frais d''=C3=A9tablissement', '2', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('200', 'Frais de constitution et d''augment=
ation de capital', '20', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('201', ' Frais d''=C3=A9mission d''emprunts=
 et primes de remboursement', '20', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('202', 'Autres frais d''=C3=A9tablissement'=
, '20', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('204', 'Frais de restructuration', '20', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('21', 'Immobilisations incorporelles', '2',=
 'ACT');
+INSERT INTO tmp_pcmn VALUES ('210', 'Frais de recherche et de d=C3=A9vel=
oppement', '21', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('211', 'Concessions, brevet, licence savoir=
 faire, marque et droit similaires', '21', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('212', 'Goodwill', '21', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('213', 'Acomptes vers=C3=A9s', '21', 'ACT')=
;
+INSERT INTO tmp_pcmn VALUES ('22', 'Terrains et construction', '2', 'ACT=
');
+INSERT INTO tmp_pcmn VALUES ('220', 'Terrains', '22', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('222', 'Terrains b=C3=A2tis', '22', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('223', 'Autres droits r=C3=A9els sur des im=
meubles', '22', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('23', ' Installations, machines et outillag=
es', '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('24', 'Mobilier et Mat=C3=A9riel roulant', =
'2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('25', 'Immobilisations d=C3=A9tenus en loca=
tion-financement et droits similaires', '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('250', 'Terrains', '25', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('251', 'Construction', '25', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('252', 'Terrains b=C3=A2tis', '25', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('253', 'Mobilier et mat=C3=A9riels roulants=
', '25', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('26', 'Autres immobilisations corporelles',=
 '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('27', 'Immobilisations corporelles en cours=
 et acomptes vers=C3=A9s', '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('28', 'Immobilisations financi=C3=A8res', '=
2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('280', 'Participation dans des entreprises =
li=C3=A9es', '28', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2800', 'Valeur d''acquisition', '280', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('2801', 'Montants non-appel=C3=A9s(-)', '28=
0', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2808', 'Plus-values act=C3=A9es', '280', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('2809', 'R=C3=A9ductions de valeurs act=C3=A9=
es', '280', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('281', 'Cr=C3=A9ance sur  des entreprises l=
i=C3=A9es', '28', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2810', 'Cr=C3=A9ance en compte', '281', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('2811', 'Effets =C3=A0 recevoir', '281', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('2812', 'Titre =C3=A0 reveny fixe', '281', =
'ACT');
+INSERT INTO tmp_pcmn VALUES ('2817', 'Cr=C3=A9ances douteuses', '281', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('2819', 'R=C3=A9duction de valeurs act=C3=A9=
es', '281', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('282', 'Participations dans des entreprises=
 avec lesquelles il existe un lien de participation', '28', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('2820', 'Valeur d''acquisition', '282', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('4516', 'Tva Export 0%', '451', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4115', 'Tva Intracomm 0%', '411', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4116', 'Tva Export 0%', '411', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('41141', 'TVA pour l\\''export', '4114', 'A=
CT');
+INSERT INTO tmp_pcmn VALUES ('41142', 'TVA sur les op=C3=A9rations intra=
communautaires', '4114', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('45141', 'TVA pour l\\''export', '451', 'PA=
S');
+INSERT INTO tmp_pcmn VALUES ('45142', 'TVA sur les op=C3=A9rations intra=
communautaires', '4514', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('41143', 'TVA sur les op=C3=A9rations avec =
des assujettis art 44 Code TVA', '4114', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('45143', 'TVA sur les op=C3=A9rations avec =
des assujettis art 44 Code TVA', '4514', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('41144', 'TVA sur les op=C3=A9rations avec =
des cocontractants', '4114', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('45144', 'TVA sur les op=C3=A9rations avec =
des cocontractants', '4514', 'PAS');
+
+
+--
+-- Data for Name: todo_list; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: tva_rate; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO tva_rate VALUES (1, '21%', 0.2100, 'Tva applicable =C3=A0 to=
ut ce qui bien et service divers', '4111,4511', 0);
+INSERT INTO tva_rate VALUES (2, '12%', 0.1200, 'Tva ', '4112,4512', 0);
+INSERT INTO tva_rate VALUES (3, '6%', 0.0600, 'Tva applicable aux journa=
ux et livres', '4113,4513', 0);
+INSERT INTO tva_rate VALUES (4, '0%', 0.0000, 'Aucune tva n''est applica=
ble', '4114,4514', 0);
+INSERT INTO tva_rate VALUES (6, 'EXPORT', 0.0000, 'Tva pour les exportat=
ions', '41141,45144', 0);
+INSERT INTO tva_rate VALUES (5, 'INTRA', 0.0000, 'Tva pour les livraison=
s / acquisition intra communautaires', '41142,45142', 0);
+INSERT INTO tva_rate VALUES (7, 'COC', 0.0000, 'Op=C3=A9rations avec des=
 cocontractants', '41144,45144', 0);
+INSERT INTO tva_rate VALUES (8, 'ART44', 0.0000, 'Op=C3=A9rations pour l=
es op=C3=A9rations avec des assujettis =C3=A0 l\\''art 44 Code TVA', '411=
43,45143', 0);
+
+
+--
+-- Data for Name: user_local_pref; Type: TABLE DATA; Schema: public; Own=
er: -
+--
+
+INSERT INTO user_local_pref VALUES ('1', 'MINIREPORT', '0');
+INSERT INTO user_local_pref VALUES ('1', 'PERIODE', '79');
+
+
+--
+-- Data for Name: user_sec_act; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+
+
+--
+-- Data for Name: user_sec_extension; Type: TABLE DATA; Schema: public; =
Owner: -
+--
+
+INSERT INTO user_sec_extension VALUES (1, 1, 'phpcompta', 'Y');
+
+
+--
+-- Data for Name: user_sec_jrn; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+
+
+--
+-- Data for Name: version; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO version VALUES (99);
+
+
+--
+-- Name: action_detail_pkey; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY action_detail
+    ADD CONSTRAINT action_detail_pkey PRIMARY KEY (ad_id);
+
+
+--
+-- Name: action_gestion_pkey; Type: CONSTRAINT; Schema: public; Owner: -=
; Tablespace:=20
+--
+
+ALTER TABLE ONLY action_gestion
+    ADD CONSTRAINT action_gestion_pkey PRIMARY KEY (ag_id);
+
+
+--
+-- Name: action_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY action
+    ADD CONSTRAINT action_pkey PRIMARY KEY (ac_id);
+
+
+--
+-- Name: attr_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY attr_def
+    ADD CONSTRAINT attr_def_pkey PRIMARY KEY (ad_id);
+
+
+--
+-- Name: bilan_b_name_key; Type: CONSTRAINT; Schema: public; Owner: -; T=
ablespace:=20
+--
+
+ALTER TABLE ONLY bilan
+    ADD CONSTRAINT bilan_b_name_key UNIQUE (b_name);
+
+
+--
+-- Name: bilan_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+ALTER TABLE ONLY bilan
+    ADD CONSTRAINT bilan_pkey PRIMARY KEY (b_id);
+
+
+--
+-- Name: centralized_pkey; Type: CONSTRAINT; Schema: public; Owner: -; T=
ablespace:=20
+--
+
+ALTER TABLE ONLY centralized
+    ADD CONSTRAINT centralized_pkey PRIMARY KEY (c_id);
+
+
+--
+-- Name: del_action_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY del_action
+    ADD CONSTRAINT del_action_pkey PRIMARY KEY (del_id);
+
+
+--
+-- Name: dj_id; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY del_jrn
+    ADD CONSTRAINT dj_id PRIMARY KEY (dj_id);
+
+
+--
+-- Name: djx_id; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+ALTER TABLE ONLY del_jrnx
+    ADD CONSTRAINT djx_id PRIMARY KEY (djx_id);
+
+
+--
+-- Name: document_modele_pkey; Type: CONSTRAINT; Schema: public; Owner: =
-; Tablespace:=20
+--
+
+ALTER TABLE ONLY document_modele
+    ADD CONSTRAINT document_modele_pkey PRIMARY KEY (md_id);
+
+
+--
+-- Name: document_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY document
+    ADD CONSTRAINT document_pkey PRIMARY KEY (d_id);
+
+
+--
+-- Name: document_state_pkey; Type: CONSTRAINT; Schema: public; Owner: -=
; Tablespace:=20
+--
+
+ALTER TABLE ONLY document_state
+    ADD CONSTRAINT document_state_pkey PRIMARY KEY (s_id);
+
+
+--
+-- Name: document_type_pkey; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY document_type
+    ADD CONSTRAINT document_type_pkey PRIMARY KEY (dt_id);
+
+
+--
+-- Name: fiche_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY fiche_def
+    ADD CONSTRAINT fiche_def_pkey PRIMARY KEY (fd_id);
+
+
+--
+-- Name: fiche_def_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY fiche_def_ref
+    ADD CONSTRAINT fiche_def_ref_pkey PRIMARY KEY (frd_id);
+
+
+--
+-- Name: fiche_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+ALTER TABLE ONLY fiche
+    ADD CONSTRAINT fiche_pkey PRIMARY KEY (f_id);
+
+
+--
+-- Name: forecast_cat_pk; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY forecast_cat
+    ADD CONSTRAINT forecast_cat_pk PRIMARY KEY (fc_id);
+
+
+--
+-- Name: forecast_item_pkey; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY forecast_item
+    ADD CONSTRAINT forecast_item_pkey PRIMARY KEY (fi_id);
+
+
+--
+-- Name: forecast_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY forecast
+    ADD CONSTRAINT forecast_pk PRIMARY KEY (f_id);
+
+
+--
+-- Name: form_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+ALTER TABLE ONLY form
+    ADD CONSTRAINT form_pkey PRIMARY KEY (fo_id);
+
+
+--
+-- Name: formdef_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY formdef
+    ADD CONSTRAINT formdef_pkey PRIMARY KEY (fr_id);
+
+
+--
+-- Name: frd_ad_attr_min_pk; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY attr_min
+    ADD CONSTRAINT frd_ad_attr_min_pk PRIMARY KEY (frd_id, ad_id);
+
+
+--
+-- Name: historique_analytique_pkey; Type: CONSTRAINT; Schema: public; O=
wner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY operation_analytique
+    ADD CONSTRAINT historique_analytique_pkey PRIMARY KEY (oa_id);
+
+
+--
+-- Name: idx_ex_code; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY extension
+    ADD CONSTRAINT idx_ex_code UNIQUE (ex_code);
+
+
+--
+-- Name: info_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY info_def
+    ADD CONSTRAINT info_def_pkey PRIMARY KEY (id_type);
+
+
+--
+-- Name: jnt_fic_att_value_pkey; Type: CONSTRAINT; Schema: public; Owner=
: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY fiche_detail
+    ADD CONSTRAINT jnt_fic_att_value_pkey PRIMARY KEY (jft_id);
+
+
+--
+-- Name: jnt_letter_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY jnt_letter
+    ADD CONSTRAINT jnt_letter_pk PRIMARY KEY (jl_id);
+
+
+--
+-- Name: jrn_action_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY jrn_action
+    ADD CONSTRAINT jrn_action_pkey PRIMARY KEY (ja_id);
+
+
+--
+-- Name: jrn_def_jrn_def_name_key; Type: CONSTRAINT; Schema: public; Own=
er: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY jrn_def
+    ADD CONSTRAINT jrn_def_jrn_def_name_key UNIQUE (jrn_def_name);
+
+
+--
+-- Name: jrn_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY jrn_def
+    ADD CONSTRAINT jrn_def_pkey PRIMARY KEY (jrn_def_id);
+
+
+--
+-- Name: jrn_info_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY jrn_info
+    ADD CONSTRAINT jrn_info_pkey PRIMARY KEY (ji_id);
+
+
+--
+-- Name: jrn_periode_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY jrn_periode
+    ADD CONSTRAINT jrn_periode_pk PRIMARY KEY (jrn_def_id, p_id);
+
+
+--
+-- Name: jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+ALTER TABLE ONLY jrn
+    ADD CONSTRAINT jrn_pkey PRIMARY KEY (jr_id, jr_def_id);
+
+
+--
+-- Name: jrn_rapt_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY jrn_rapt
+    ADD CONSTRAINT jrn_rapt_pkey PRIMARY KEY (jra_id);
+
+
+--
+-- Name: jrn_type_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY jrn_type
+    ADD CONSTRAINT jrn_type_pkey PRIMARY KEY (jrn_type_id);
+
+
+--
+-- Name: jrnx_note_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY jrn_note
+    ADD CONSTRAINT jrnx_note_pkey PRIMARY KEY (n_id);
+
+
+--
+-- Name: jrnx_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+ALTER TABLE ONLY jrnx
+    ADD CONSTRAINT jrnx_pkey PRIMARY KEY (j_id);
+
+
+--
+-- Name: letter_cred_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY letter_cred
+    ADD CONSTRAINT letter_cred_pk PRIMARY KEY (lc_id);
+
+
+--
+-- Name: letter_deb_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY letter_deb
+    ADD CONSTRAINT letter_deb_pk PRIMARY KEY (ld_id);
+
+
+--
+-- Name: menu_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY menu_ref
+    ADD CONSTRAINT menu_ref_pkey PRIMARY KEY (me_code);
+
+
+--
+-- Name: mod_payment_pkey; Type: CONSTRAINT; Schema: public; Owner: -; T=
ablespace:=20
+--
+
+ALTER TABLE ONLY mod_payment
+    ADD CONSTRAINT mod_payment_pkey PRIMARY KEY (mp_id);
+
+
+--
+-- Name: op_def_op_name_key; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY op_predef
+    ADD CONSTRAINT op_def_op_name_key UNIQUE (od_name, jrn_def_id);
+
+
+--
+-- Name: op_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY op_predef
+    ADD CONSTRAINT op_def_pkey PRIMARY KEY (od_id);
+
+
+--
+-- Name: op_predef_detail_pkey; Type: CONSTRAINT; Schema: public; Owner:=
 -; Tablespace:=20
+--
+
+ALTER TABLE ONLY op_predef_detail
+    ADD CONSTRAINT op_predef_detail_pkey PRIMARY KEY (opd_id);
+
+
+--
+-- Name: parameter_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY parameter
+    ADD CONSTRAINT parameter_pkey PRIMARY KEY (pr_id);
+
+
+--
+-- Name: parm_code_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY parm_code
+    ADD CONSTRAINT parm_code_pkey PRIMARY KEY (p_code);
+
+
+--
+-- Name: parm_money_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY parm_money
+    ADD CONSTRAINT parm_money_pkey PRIMARY KEY (pm_code);
+
+
+--
+-- Name: parm_periode_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY parm_periode
+    ADD CONSTRAINT parm_periode_pkey PRIMARY KEY (p_id);
+
+
+--
+-- Name: parm_poste_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY parm_poste
+    ADD CONSTRAINT parm_poste_pkey PRIMARY KEY (p_value);
+
+
+--
+-- Name: pk_extension; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY extension
+    ADD CONSTRAINT pk_extension PRIMARY KEY (ex_id);
+
+
+--
+-- Name: pk_ga_id; Type: CONSTRAINT; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+ALTER TABLE ONLY groupe_analytique
+    ADD CONSTRAINT pk_ga_id PRIMARY KEY (ga_id);
+
+
+--
+-- Name: pk_jnt_fic_attr; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY jnt_fic_attr
+    ADD CONSTRAINT pk_jnt_fic_attr PRIMARY KEY (jnt_id);
+
+
+--
+-- Name: pk_user_local_pref; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY user_local_pref
+    ADD CONSTRAINT pk_user_local_pref PRIMARY KEY (user_id, parameter_ty=
pe);
+
+
+--
+-- Name: plan_analytique_pa_name_key; Type: CONSTRAINT; Schema: public; =
Owner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY plan_analytique
+    ADD CONSTRAINT plan_analytique_pa_name_key UNIQUE (pa_name);
+
+
+--
+-- Name: plan_analytique_pkey; Type: CONSTRAINT; Schema: public; Owner: =
-; Tablespace:=20
+--
+
+ALTER TABLE ONLY plan_analytique
+    ADD CONSTRAINT plan_analytique_pkey PRIMARY KEY (pa_id);
+
+
+--
+-- Name: poste_analytique_pkey; Type: CONSTRAINT; Schema: public; Owner:=
 -; Tablespace:=20
+--
+
+ALTER TABLE ONLY poste_analytique
+    ADD CONSTRAINT poste_analytique_pkey PRIMARY KEY (po_id);
+
+
+--
+-- Name: profile_menu_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY profile_menu
+    ADD CONSTRAINT profile_menu_pkey PRIMARY KEY (pm_id);
+
+
+--
+-- Name: profile_menu_type_pkey; Type: CONSTRAINT; Schema: public; Owner=
: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY profile_menu_type
+    ADD CONSTRAINT profile_menu_type_pkey PRIMARY KEY (pm_type);
+
+
+--
+-- Name: profile_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY profile
+    ADD CONSTRAINT profile_pkey PRIMARY KEY (p_id);
+
+
+--
+-- Name: profile_user_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY profile_user
+    ADD CONSTRAINT profile_user_pkey PRIMARY KEY (pu_id);
+
+
+--
+-- Name: profile_user_user_name_key; Type: CONSTRAINT; Schema: public; O=
wner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY profile_user
+    ADD CONSTRAINT profile_user_user_name_key UNIQUE (user_name, p_id);
+
+
+--
+-- Name: qp_id_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+ALTER TABLE ONLY quant_purchase
+    ADD CONSTRAINT qp_id_pk PRIMARY KEY (qp_id);
+
+
+--
+-- Name: qs_id_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+ALTER TABLE ONLY quant_sold
+    ADD CONSTRAINT qs_id_pk PRIMARY KEY (qs_id);
+
+
+--
+-- Name: quant_fin_pk; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY quant_fin
+    ADD CONSTRAINT quant_fin_pk PRIMARY KEY (qf_id);
+
+
+--
+-- Name: stock_goods_pkey; Type: CONSTRAINT; Schema: public; Owner: -; T=
ablespace:=20
+--
+
+ALTER TABLE ONLY stock_goods
+    ADD CONSTRAINT stock_goods_pkey PRIMARY KEY (sg_id);
+
+
+--
+-- Name: tmp_pcmn_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY tmp_pcmn
+    ADD CONSTRAINT tmp_pcmn_pkey PRIMARY KEY (pcm_val);
+
+
+--
+-- Name: todo_list_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY todo_list
+    ADD CONSTRAINT todo_list_pkey PRIMARY KEY (tl_id);
+
+
+--
+-- Name: tva_id_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+ALTER TABLE ONLY tva_rate
+    ADD CONSTRAINT tva_id_pk PRIMARY KEY (tva_id);
+
+
+--
+-- Name: user_sec_act_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY user_sec_act
+    ADD CONSTRAINT user_sec_act_pkey PRIMARY KEY (ua_id);
+
+
+--
+-- Name: user_sec_extension_ex_id_key; Type: CONSTRAINT; Schema: public;=
 Owner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY user_sec_extension
+    ADD CONSTRAINT user_sec_extension_ex_id_key UNIQUE (ex_id, use_login=
);
+
+
+--
+-- Name: user_sec_extension_pkey; Type: CONSTRAINT; Schema: public; Owne=
r: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY user_sec_extension
+    ADD CONSTRAINT user_sec_extension_pkey PRIMARY KEY (use_id);
+
+
+--
+-- Name: user_sec_jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY user_sec_jrn
+    ADD CONSTRAINT user_sec_jrn_pkey PRIMARY KEY (uj_id);
+
+
+--
+-- Name: ux_internal; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY jrn
+    ADD CONSTRAINT ux_internal UNIQUE (jr_internal);
+
+
+--
+-- Name: fd_id_ad_id_x; Type: INDEX; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE UNIQUE INDEX fd_id_ad_id_x ON jnt_fic_attr USING btree (fd_id, ad=
_id);
+
+
+--
+-- Name: fiche_detail_f_id_ad_id; Type: INDEX; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+CREATE UNIQUE INDEX fiche_detail_f_id_ad_id ON fiche_detail USING btree =
(f_id, ad_id);
+
+
+--
+-- Name: fk_stock_goods_f_id; Type: INDEX; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+CREATE INDEX fk_stock_goods_f_id ON stock_goods USING btree (f_id);
+
+
+--
+-- Name: fk_stock_goods_j_id; Type: INDEX; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+CREATE INDEX fk_stock_goods_j_id ON stock_goods USING btree (j_id);
+
+
+--
+-- Name: fki_f_end_date; Type: INDEX; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+CREATE INDEX fki_f_end_date ON forecast USING btree (f_end_date);
+
+
+--
+-- Name: fki_f_start_date; Type: INDEX; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+CREATE INDEX fki_f_start_date ON forecast USING btree (f_start_date);
+
+
+--
+-- Name: fki_jrnx_f_id; Type: INDEX; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE INDEX fki_jrnx_f_id ON jrnx USING btree (f_id);
+
+
+--
+-- Name: fki_profile_menu_me_code; Type: INDEX; Schema: public; Owner: -=
; Tablespace:=20
+--
+
+CREATE INDEX fki_profile_menu_me_code ON profile_menu USING btree (me_co=
de);
+
+
+--
+-- Name: fki_profile_menu_profile; Type: INDEX; Schema: public; Owner: -=
; Tablespace:=20
+--
+
+CREATE INDEX fki_profile_menu_profile ON profile_menu USING btree (p_id)=
;
+
+
+--
+-- Name: fki_profile_menu_type_fkey; Type: INDEX; Schema: public; Owner:=
 -; Tablespace:=20
+--
+
+CREATE INDEX fki_profile_menu_type_fkey ON profile_menu USING btree (p_t=
ype_display);
+
+
+--
+-- Name: idx_qs_internal; Type: INDEX; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+CREATE INDEX idx_qs_internal ON quant_sold USING btree (qs_internal);
+
+
+--
+-- Name: jnt_fic_att_value_fd_id_idx; Type: INDEX; Schema: public; Owner=
: -; Tablespace:=20
+--
+
+CREATE INDEX jnt_fic_att_value_fd_id_idx ON fiche_detail USING btree (f_=
id);
+
+
+--
+-- Name: jnt_fic_attr_fd_id_idx; Type: INDEX; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+CREATE INDEX jnt_fic_attr_fd_id_idx ON jnt_fic_attr USING btree (fd_id);
+
+
+--
+-- Name: k_ag_ref; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX k_ag_ref ON action_gestion USING btree (ag_ref);
+
+
+--
+-- Name: qcode_idx; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX qcode_idx ON fiche_detail USING btree (ad_value) WHE=
RE (ad_id =3D 23);
+
+
+--
+-- Name: qf_jr_id; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX qf_jr_id ON quant_fin USING btree (jr_id);
+
+
+--
+-- Name: qp_j_id; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX qp_j_id ON quant_purchase USING btree (j_id);
+
+
+--
+-- Name: qs_j_id; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX qs_j_id ON quant_sold USING btree (j_id);
+
+
+--
+-- Name: uj_login_uj_jrn_id; Type: INDEX; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+CREATE UNIQUE INDEX uj_login_uj_jrn_id ON user_sec_jrn USING btree (uj_l=
ogin, uj_jrn_id);
+
+
+--
+-- Name: ux_po_name; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX ux_po_name ON poste_analytique USING btree (po_name)=
;
+
+
+--
+-- Name: x_jrn_jr_id; Type: INDEX; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE UNIQUE INDEX x_jrn_jr_id ON jrn USING btree (jr_id);
+
+
+--
+-- Name: x_mt; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE INDEX x_mt ON jrn USING btree (jr_mt);
+
+
+--
+-- Name: x_periode; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX x_periode ON parm_periode USING btree (p_start, p_en=
d);
+
+
+--
+-- Name: x_poste; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE INDEX x_poste ON jrnx USING btree (j_poste);
+
+
+--
+-- Name: action_gestion_t_insert_update; Type: TRIGGER; Schema: public; =
Owner: -
+--
+
+CREATE TRIGGER action_gestion_t_insert_update
+    BEFORE INSERT OR UPDATE ON action_gestion
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.action_gestion_ins_upd();
+
+
+--
+-- Name: TRIGGER action_gestion_t_insert_update ON action_gestion; Type:=
 COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TRIGGER action_gestion_t_insert_update ON action_gestion IS '=
Truncate the column ag_title to 70 char';
+
+
+--
+-- Name: document_modele_validate; Type: TRIGGER; Schema: public; Owner:=
 -
+--
+
+CREATE TRIGGER document_modele_validate
+    BEFORE INSERT OR UPDATE ON document_modele
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.t_document_modele_validate();
+
+
+--
+-- Name: document_validate; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER document_validate
+    BEFORE INSERT OR UPDATE ON document
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.t_document_validate();
+
+
+--
+-- Name: fiche_def_ins_upd; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER fiche_def_ins_upd
+    BEFORE INSERT OR UPDATE ON fiche_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.fiche_def_ins_upd();
+
+
+--
+-- Name: info_def_ins_upd_t; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER info_def_ins_upd_t
+    BEFORE INSERT OR UPDATE ON info_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.info_def_ins_upd();
+
+
+--
+-- Name: quant_sold_ins_upd_tr; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER quant_sold_ins_upd_tr
+    AFTER INSERT OR UPDATE ON quant_purchase
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.quant_purchase_ins_upd();
+
+
+--
+-- Name: quant_sold_ins_upd_tr; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER quant_sold_ins_upd_tr
+    AFTER INSERT OR UPDATE ON quant_sold
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.quant_sold_ins_upd();
+
+
+--
+-- Name: remove_action_gestion; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER remove_action_gestion
+    AFTER DELETE ON fiche
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.card_after_delete();
+
+
+--
+-- Name: t_check_balance; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_check_balance
+    AFTER INSERT OR UPDATE ON jrn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.proc_check_balance();
+
+
+--
+-- Name: t_check_jrn; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_check_jrn
+    BEFORE INSERT OR DELETE OR UPDATE ON jrn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrn_check_periode();
+
+
+--
+-- Name: t_group_analytic_del; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_group_analytic_del
+    BEFORE DELETE ON groupe_analytique
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.group_analytique_del();
+
+
+--
+-- Name: t_group_analytic_ins_upd; Type: TRIGGER; Schema: public; Owner:=
 -
+--
+
+CREATE TRIGGER t_group_analytic_ins_upd
+    BEFORE INSERT OR UPDATE ON groupe_analytique
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.group_analytic_ins_upd();
+
+
+--
+-- Name: t_jnt_fic_attr_ins; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jnt_fic_attr_ins
+    AFTER INSERT ON jnt_fic_attr
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jnt_fic_attr_ins();
+
+
+--
+-- Name: t_jrn_def_add_periode; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrn_def_add_periode
+    AFTER INSERT ON jrn_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrn_def_add();
+
+
+--
+-- Name: t_jrn_def_delete; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrn_def_delete
+    BEFORE DELETE ON jrn_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrn_def_delete();
+
+
+--
+-- Name: t_jrn_del; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrn_del
+    BEFORE DELETE ON jrn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrn_del();
+
+
+--
+-- Name: t_jrnx_del; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrnx_del
+    BEFORE DELETE ON jrnx
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrnx_del();
+
+
+--
+-- Name: t_jrnx_ins; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrnx_ins
+    BEFORE INSERT ON jrnx
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrnx_ins();
+
+
+--
+-- Name: TRIGGER t_jrnx_ins ON jrnx; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON TRIGGER t_jrnx_ins ON jrnx IS 'check that the qcode used by t=
he card exists and format it : uppercase and trim the space';
+
+
+--
+-- Name: t_jrnx_upd; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrnx_upd
+    BEFORE UPDATE ON jrnx
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrnx_ins();
+
+
+--
+-- Name: t_letter_del; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_letter_del
+    AFTER DELETE ON jrnx
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrnx_letter_del();
+
+
+--
+-- Name: TRIGGER t_letter_del ON jrnx; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON TRIGGER t_letter_del ON jrnx IS 'Delete the lettering for thi=
s row';
+
+
+--
+-- Name: t_plan_analytique_ins_upd; Type: TRIGGER; Schema: public; Owner=
: -
+--
+
+CREATE TRIGGER t_plan_analytique_ins_upd
+    BEFORE INSERT OR UPDATE ON plan_analytique
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.plan_analytic_ins_upd();
+
+
+--
+-- Name: t_poste_analytique_ins_upd; Type: TRIGGER; Schema: public; Owne=
r: -
+--
+
+CREATE TRIGGER t_poste_analytique_ins_upd
+    BEFORE INSERT OR UPDATE ON poste_analytique
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.poste_analytique_ins_upd();
+
+
+--
+-- Name: t_tmp_pcm_alphanum_ins_upd; Type: TRIGGER; Schema: public; Owne=
r: -
+--
+
+CREATE TRIGGER t_tmp_pcm_alphanum_ins_upd
+    BEFORE INSERT OR UPDATE ON tmp_pcmn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.tmp_pcmn_alphanum_ins_upd();
+
+
+--
+-- Name: t_tmp_pcmn_ins; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_tmp_pcmn_ins
+    BEFORE INSERT ON tmp_pcmn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.tmp_pcmn_ins();
+
+
+--
+-- Name: trg_extension_ins_upd; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER trg_extension_ins_upd
+    BEFORE INSERT OR UPDATE ON extension
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.extension_ins_upd();
+
+
+--
+-- Name: trigger_document_type_i; Type: TRIGGER; Schema: public; Owner: =
-
+--
+
+CREATE TRIGGER trigger_document_type_i
+    AFTER INSERT ON document_type
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.t_document_type_insert();
+
+
+--
+-- Name: trigger_jrn_def_sequence_i; Type: TRIGGER; Schema: public; Owne=
r: -
+--
+
+CREATE TRIGGER trigger_jrn_def_sequence_i
+    AFTER INSERT ON jrn_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.t_jrn_def_sequence();
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY centralized
+    ADD CONSTRAINT "$1" FOREIGN KEY (c_jrn_def) REFERENCES jrn_def(jrn_d=
ef_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY user_sec_act
+    ADD CONSTRAINT "$1" FOREIGN KEY (ua_act_id) REFERENCES action(ac_id)=
;
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY fiche_def
+    ADD CONSTRAINT "$1" FOREIGN KEY (frd_id) REFERENCES fiche_def_ref(fr=
d_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY attr_min
+    ADD CONSTRAINT "$1" FOREIGN KEY (frd_id) REFERENCES fiche_def_ref(fr=
d_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY fiche
+    ADD CONSTRAINT "$1" FOREIGN KEY (fd_id) REFERENCES fiche_def(fd_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY fiche_detail
+    ADD CONSTRAINT "$1" FOREIGN KEY (f_id) REFERENCES fiche(f_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jnt_fic_attr
+    ADD CONSTRAINT "$1" FOREIGN KEY (fd_id) REFERENCES fiche_def(fd_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn
+    ADD CONSTRAINT "$1" FOREIGN KEY (jr_def_id) REFERENCES jrn_def(jrn_d=
ef_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_action
+    ADD CONSTRAINT "$1" FOREIGN KEY (ja_jrn_type) REFERENCES jrn_type(jr=
n_type_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_def
+    ADD CONSTRAINT "$1" FOREIGN KEY (jrn_def_type) REFERENCES jrn_type(j=
rn_type_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrnx
+    ADD CONSTRAINT "$2" FOREIGN KEY (j_jrn_def) REFERENCES jrn_def(jrn_d=
ef_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY attr_min
+    ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY fiche_detail
+    ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jnt_fic_attr
+    ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
+
+
+--
+-- Name: action_detail_ag_id_fkey; Type: FK CONSTRAINT; Schema: public; =
Owner: -
+--
+
+ALTER TABLE ONLY action_detail
+    ADD CONSTRAINT action_detail_ag_id_fkey FOREIGN KEY (ag_id) REFERENC=
ES action_gestion(ag_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: card; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_item
+    ADD CONSTRAINT card FOREIGN KEY (fi_card) REFERENCES fiche(f_id) ON =
UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_card; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_fin
+    ADD CONSTRAINT fk_card FOREIGN KEY (qf_bank) REFERENCES fiche(f_id) =
ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_card_other; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_fin
+    ADD CONSTRAINT fk_card_other FOREIGN KEY (qf_other) REFERENCES fiche=
(f_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_forecast; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_item
+    ADD CONSTRAINT fk_forecast FOREIGN KEY (fc_id) REFERENCES forecast_c=
at(fc_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_info_def; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_info
+    ADD CONSTRAINT fk_info_def FOREIGN KEY (id_type) REFERENCES info_def=
(id_type) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_jrn; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_info
+    ADD CONSTRAINT fk_jrn FOREIGN KEY (jr_id) REFERENCES jrn(jr_id) ON U=
PDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_jrn; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_fin
+    ADD CONSTRAINT fk_jrn FOREIGN KEY (jr_id) REFERENCES jrn(jr_id) ON U=
PDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_pa_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY groupe_analytique
+    ADD CONSTRAINT fk_pa_id FOREIGN KEY (pa_id) REFERENCES plan_analytiq=
ue(pa_id) ON DELETE CASCADE;
+
+
+--
+-- Name: fk_pcmn_val; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrnx
+    ADD CONSTRAINT fk_pcmn_val FOREIGN KEY (j_poste) REFERENCES tmp_pcmn=
(pcm_val);
+
+
+--
+-- Name: fk_pcmn_val; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY centralized
+    ADD CONSTRAINT fk_pcmn_val FOREIGN KEY (c_poste) REFERENCES tmp_pcmn=
(pcm_val);
+
+
+--
+-- Name: fk_stock_good_f_id; Type: FK CONSTRAINT; Schema: public; Owner:=
 -
+--
+
+ALTER TABLE ONLY stock_goods
+    ADD CONSTRAINT fk_stock_good_f_id FOREIGN KEY (f_id) REFERENCES fich=
e(f_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: forecast_child; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_cat
+    ADD CONSTRAINT forecast_child FOREIGN KEY (f_id) REFERENCES forecast=
(f_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: forecast_f_end_date_fkey; Type: FK CONSTRAINT; Schema: public; =
Owner: -
+--
+
+ALTER TABLE ONLY forecast
+    ADD CONSTRAINT forecast_f_end_date_fkey FOREIGN KEY (f_end_date) REF=
ERENCES parm_periode(p_id) ON UPDATE SET NULL ON DELETE SET NULL;
+
+
+--
+-- Name: forecast_f_start_date_fkey; Type: FK CONSTRAINT; Schema: public=
; Owner: -
+--
+
+ALTER TABLE ONLY forecast
+    ADD CONSTRAINT forecast_f_start_date_fkey FOREIGN KEY (f_start_date)=
 REFERENCES parm_periode(p_id) ON UPDATE SET NULL ON DELETE SET NULL;
+
+
+--
+-- Name: formdef_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY form
+    ADD CONSTRAINT formdef_fk FOREIGN KEY (fo_fr_id) REFERENCES formdef(=
fr_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jnt_cred_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_cred
+    ADD CONSTRAINT jnt_cred_fk FOREIGN KEY (jl_id) REFERENCES jnt_letter=
(jl_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jnt_deb_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_deb
+    ADD CONSTRAINT jnt_deb_fk FOREIGN KEY (jl_id) REFERENCES jnt_letter(=
jl_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_def_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY op_predef
+    ADD CONSTRAINT jrn_def_id_fk FOREIGN KEY (jrn_def_id) REFERENCES jrn=
_def(jrn_def_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_per_jrn_def_id; Type: FK CONSTRAINT; Schema: public; Owner:=
 -
+--
+
+ALTER TABLE ONLY jrn_periode
+    ADD CONSTRAINT jrn_per_jrn_def_id FOREIGN KEY (jrn_def_id) REFERENCE=
S jrn_def(jrn_def_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_periode_p_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_periode
+    ADD CONSTRAINT jrn_periode_p_id FOREIGN KEY (p_id) REFERENCES parm_p=
eriode(p_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_rapt_jr_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner=
: -
+--
+
+ALTER TABLE ONLY jrn_rapt
+    ADD CONSTRAINT jrn_rapt_jr_id_fkey FOREIGN KEY (jr_id) REFERENCES jr=
n(jr_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_rapt_jra_concerned_fkey; Type: FK CONSTRAINT; Schema: publi=
c; Owner: -
+--
+
+ALTER TABLE ONLY jrn_rapt
+    ADD CONSTRAINT jrn_rapt_jra_concerned_fkey FOREIGN KEY (jra_concerne=
d) REFERENCES jrn(jr_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrnx_f_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrnx
+    ADD CONSTRAINT jrnx_f_id_fkey FOREIGN KEY (f_id) REFERENCES fiche(f_=
id) ON UPDATE CASCADE;
+
+
+--
+-- Name: jrnx_note_j_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner=
: -
+--
+
+ALTER TABLE ONLY jrn_note
+    ADD CONSTRAINT jrnx_note_j_id_fkey FOREIGN KEY (jr_id) REFERENCES jr=
n(jr_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: letter_cred_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_cred
+    ADD CONSTRAINT letter_cred_fk FOREIGN KEY (j_id) REFERENCES jrnx(j_i=
d) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: letter_deb_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_deb
+    ADD CONSTRAINT letter_deb_fk FOREIGN KEY (j_id) REFERENCES jrnx(j_id=
) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: md_type; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY document_modele
+    ADD CONSTRAINT md_type FOREIGN KEY (md_type) REFERENCES document_typ=
e(dt_id);
+
+
+--
+-- Name: mod_payment_jrn_def_id_fk; Type: FK CONSTRAINT; Schema: public;=
 Owner: -
+--
+
+ALTER TABLE ONLY mod_payment
+    ADD CONSTRAINT mod_payment_jrn_def_id_fk FOREIGN KEY (jrn_def_id) RE=
FERENCES jrn_def(jrn_def_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: mod_payment_mp_fd_id_fkey; Type: FK CONSTRAINT; Schema: public;=
 Owner: -
+--
+
+ALTER TABLE ONLY mod_payment
+    ADD CONSTRAINT mod_payment_mp_fd_id_fkey FOREIGN KEY (mp_fd_id) REFE=
RENCES fiche_def(fd_id);
+
+
+--
+-- Name: mod_payment_mp_jrn_def_id_fkey; Type: FK CONSTRAINT; Schema: pu=
blic; Owner: -
+--
+
+ALTER TABLE ONLY mod_payment
+    ADD CONSTRAINT mod_payment_mp_jrn_def_id_fkey FOREIGN KEY (mp_jrn_de=
f_id) REFERENCES jrn_def(jrn_def_id);
+
+
+--
+-- Name: operation_analytique_j_id_fkey; Type: FK CONSTRAINT; Schema: pu=
blic; Owner: -
+--
+
+ALTER TABLE ONLY operation_analytique
+    ADD CONSTRAINT operation_analytique_j_id_fkey FOREIGN KEY (j_id) REF=
ERENCES jrnx(j_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: operation_analytique_po_id_fkey; Type: FK CONSTRAINT; Schema: p=
ublic; Owner: -
+--
+
+ALTER TABLE ONLY operation_analytique
+    ADD CONSTRAINT operation_analytique_po_id_fkey FOREIGN KEY (po_id) R=
EFERENCES poste_analytique(po_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: poste_analytique_pa_id_fkey; Type: FK CONSTRAINT; Schema: publi=
c; Owner: -
+--
+
+ALTER TABLE ONLY poste_analytique
+    ADD CONSTRAINT poste_analytique_pa_id_fkey FOREIGN KEY (pa_id) REFER=
ENCES plan_analytique(pa_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: profile_menu_me_code_fkey; Type: FK CONSTRAINT; Schema: public;=
 Owner: -
+--
+
+ALTER TABLE ONLY profile_menu
+    ADD CONSTRAINT profile_menu_me_code_fkey FOREIGN KEY (me_code) REFER=
ENCES menu_ref(me_code) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: profile_menu_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
+--
+
+ALTER TABLE ONLY profile_menu
+    ADD CONSTRAINT profile_menu_p_id_fkey FOREIGN KEY (p_id) REFERENCES =
profile(p_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: profile_menu_type_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
+--
+
+ALTER TABLE ONLY profile_menu
+    ADD CONSTRAINT profile_menu_type_fkey FOREIGN KEY (p_type_display) R=
EFERENCES profile_menu_type(pm_type);
+
+
+--
+-- Name: profile_user_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
+--
+
+ALTER TABLE ONLY profile_user
+    ADD CONSTRAINT profile_user_p_id_fkey FOREIGN KEY (p_id) REFERENCES =
profile(p_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: qp_vat_code_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_purchase
+    ADD CONSTRAINT qp_vat_code_fk FOREIGN KEY (qp_vat_code) REFERENCES t=
va_rate(tva_id);
+
+
+--
+-- Name: qs_vat_code_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_sold
+    ADD CONSTRAINT qs_vat_code_fk FOREIGN KEY (qs_vat_code) REFERENCES t=
va_rate(tva_id);
+
+
+--
+-- Name: quant_purchase_j_id_fkey; Type: FK CONSTRAINT; Schema: public; =
Owner: -
+--
+
+ALTER TABLE ONLY quant_purchase
+    ADD CONSTRAINT quant_purchase_j_id_fkey FOREIGN KEY (j_id) REFERENCE=
S jrnx(j_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: quant_purchase_qp_internal_fkey; Type: FK CONSTRAINT; Schema: p=
ublic; Owner: -
+--
+
+ALTER TABLE ONLY quant_purchase
+    ADD CONSTRAINT quant_purchase_qp_internal_fkey FOREIGN KEY (qp_inter=
nal) REFERENCES jrn(jr_internal) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: quant_sold_j_id_fkey; Type: FK CONSTRAINT; Schema: public; Owne=
r: -
+--
+
+ALTER TABLE ONLY quant_sold
+    ADD CONSTRAINT quant_sold_j_id_fkey FOREIGN KEY (j_id) REFERENCES jr=
nx(j_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: quant_sold_qs_internal_fkey; Type: FK CONSTRAINT; Schema: publi=
c; Owner: -
+--
+
+ALTER TABLE ONLY quant_sold
+    ADD CONSTRAINT quant_sold_qs_internal_fkey FOREIGN KEY (qs_internal)=
 REFERENCES jrn(jr_internal) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: stock_goods_j_id_fkey; Type: FK CONSTRAINT; Schema: public; Own=
er: -
+--
+
+ALTER TABLE ONLY stock_goods
+    ADD CONSTRAINT stock_goods_j_id_fkey FOREIGN KEY (j_id) REFERENCES j=
rnx(j_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: uj_priv_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY user_sec_jrn
+    ADD CONSTRAINT uj_priv_id_fkey FOREIGN KEY (uj_jrn_id) REFERENCES jr=
n_def(jrn_def_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- PostgreSQL database dump complete
+--
+

Added: phpcompta/trunk/contrib/mono-dossier/mono-france.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/contrib/mono-dossier/mono-france.sql	                =
        (rev 0)
+++ phpcompta/trunk/contrib/mono-dossier/mono-france.sql	2013-05-17 00:29=
:31 UTC (rev 5278)
@@ -0,0 +1,8976 @@
+--
+-- PostgreSQL database dump
+--
+
+SET statement_timeout =3D 0;
+SET client_encoding =3D 'UTF8';
+SET standard_conforming_strings =3D off;
+SET check_function_bodies =3D false;
+SET client_min_messages =3D warning;
+SET escape_string_warning =3D off;
+
+--
+-- Name: comptaproc; Type: SCHEMA; Schema: -; Owner: -
+--
+
+CREATE SCHEMA comptaproc;
+
+
+--
+-- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: -; Owner: -
+--
+
+CREATE PROCEDURAL LANGUAGE plpgsql;
+
+
+SET search_path =3D public, pg_catalog;
+
+--
+-- Name: account_type; Type: DOMAIN; Schema: public; Owner: -
+--
+
+CREATE DOMAIN account_type AS character varying(40);
+
+
+--
+-- Name: anc_table_account_type; Type: TYPE; Schema: public; Owner: -
+--
+
+CREATE TYPE anc_table_account_type AS (
+	po_id bigint,
+	pa_id bigint,
+	po_name text,
+	po_description text,
+	sum_amount numeric(25,4),
+	card_account text,
+	name text
+);
+
+
+--
+-- Name: anc_table_card_type; Type: TYPE; Schema: public; Owner: -
+--
+
+CREATE TYPE anc_table_card_type AS (
+	po_id bigint,
+	pa_id bigint,
+	po_name text,
+	po_description text,
+	sum_amount numeric(25,4),
+	f_id bigint,
+	card_account text,
+	name text
+);
+
+
+--
+-- Name: menu_tree; Type: TYPE; Schema: public; Owner: -
+--
+
+CREATE TYPE menu_tree AS (
+	code text,
+	description text
+);
+
+
+SET search_path =3D comptaproc, pg_catalog;
+
+--
+-- Name: account_add(public.account_type, character varying); Type: FUNC=
TION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION account_add(p_id public.account_type, p_name character v=
arying) RETURNS text
+    LANGUAGE plpgsql
+    AS $$
+declare
+	nParent tmp_pcmn.pcm_val_parent%type;
+	nCount integer;
+	sReturn text;
+begin
+	sReturn:=3D format_account(p_id);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3DsReturn;
+	if nCount =3D 0 then
+		nParent=3Daccount_parent(p_id);
+		insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent)
+			values (p_id, p_name,nParent) returning pcm_val into sReturn;
+	end if;
+return sReturn;
+end ;
+$$;
+
+
+--
+-- Name: account_alphanum(); Type: FUNCTION; Schema: comptaproc; Owner: =
-
+--
+
+CREATE FUNCTION account_alphanum() RETURNS boolean
+    LANGUAGE plpgsql
+    AS $$
+declare
+	l_auto bool;
+begin
+	l_auto :=3D true;
+	select pr_value into l_auto from parameter where pr_id=3D'MY_ALPHANUM';
+	if l_auto =3D 'N' or l_auto is null then
+		l_auto:=3Dfalse;
+	end if;
+	return l_auto;
+end;
+$$;
+
+
+--
+-- Name: account_auto(integer); Type: FUNCTION; Schema: comptaproc; Owne=
r: -
+--
+
+CREATE FUNCTION account_auto(p_fd_id integer) RETURNS boolean
+    LANGUAGE plpgsql
+    AS $$
+declare
+	l_auto bool;
+begin
+
+	select fd_create_account into l_auto from fiche_def where fd_id=3Dp_fd_=
id;
+	if l_auto is null then
+		l_auto:=3Dfalse;
+	end if;
+	return l_auto;
+end;
+$$;
+
+
+--
+-- Name: account_compute(integer); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION account_compute(p_f_id integer) RETURNS public.account_t=
ype
+    LANGUAGE plpgsql
+    AS $$
+declare
+	class_base fiche_def.fd_class_base%type;
+	maxcode numeric;
+	sResult account_type;
+	bAlphanum bool;
+	sName text;
+begin
+	select fd_class_base into class_base
+	from
+		fiche_def join fiche using (fd_id)
+	where
+		f_id=3Dp_f_id;
+	raise notice 'account_compute class base %',class_base;
+	bAlphanum :=3D account_alphanum();
+	if bAlphanum =3D false  then
+		select count (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent=
 =3D class_base;
+		if maxcode =3D 0	then
+			maxcode:=3Dclass_base::numeric;
+		else
+			select max (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent =
=3D class_base;
+			maxcode:=3Dmaxcode::numeric;
+		end if;
+		if maxcode::text =3D class_base then
+			maxcode:=3Dclass_base::numeric*1000;
+		end if;
+		maxcode:=3Dmaxcode+1;
+		raise notice 'account_compute Max code %',maxcode;
+		sResult:=3Dmaxcode::account_type;
+	else
+		-- if alphanum, use name
+		select ad_value into sName from fiche_detail where f_id=3Dp_f_id and a=
d_id=3D1;
+		if sName is null then
+			raise exception 'Cannot compute an accounting without the name of the=
 card for %',p_f_id;
+		end if;
+		sResult :=3D class_base||sName;
+	end if;
+	return sResult;
+end;
+$$;
+
+
+--
+-- Name: account_insert(integer, text); Type: FUNCTION; Schema: comptapr=
oc; Owner: -
+--
+
+CREATE FUNCTION account_insert(p_f_id integer, p_account text) RETURNS t=
ext
+    LANGUAGE plpgsql
+    AS $$
+declare
+	nParent tmp_pcmn.pcm_val_parent%type;
+	sName varchar;
+	sNew tmp_pcmn.pcm_val%type;
+	bAuto bool;
+	nFd_id integer;
+	sClass_Base fiche_def.fd_class_base%TYPE;
+	nCount integer;
+	first text;
+	second text;
+begin
+
+	if p_account is not null and length(trim(p_account)) !=3D 0 then
+	-- if there is coma in p_account, treat normally
+		if position (',' in p_account) =3D 0 then
+			raise info 'p_account is not empty';
+				select count(*)  into nCount from tmp_pcmn where pcm_val=3Dp_account=
::account_type;
+				raise notice 'found in tmp_pcm %',nCount;
+				if nCount !=3D0  then
+					raise info 'this account exists in tmp_pcmn ';
+					perform attribut_insert(p_f_id,5,p_account);
+				   else
+				       -- account doesn't exist, create it
+					select ad_value into sName from
+						fiche_detail
+					where
+					ad_id=3D1 and f_id=3Dp_f_id;
+
+					nParent:=3Daccount_parent(p_account::account_type);
+					insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_acco=
unt::account_type,sName,nParent);
+					perform attribut_insert(p_f_id,5,p_account);
+
+				end if;
+		else
+		raise info 'presence of a comma';
+		-- there is 2 accounts separated by a comma
+		first :=3D split_part(p_account,',',1);
+		second :=3D split_part(p_account,',',2);
+		-- check there is no other coma
+		raise info 'first value % second value %', first, second;
+
+		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
+			raise exception 'Too many comas, invalid account';
+		end if;
+		perform attribut_insert(p_f_id,5,p_account);
+		end if;
+	else
+	raise info 'p_account is  empty';
+		select fd_id into nFd_id from fiche where f_id=3Dp_f_id;
+		bAuto:=3D account_auto(nFd_id);
+
+		select fd_class_base into sClass_base from fiche_def where fd_id=3DnFd=
_id;
+raise info 'sClass_Base : %',sClass_base;
+		if bAuto =3D true and sClass_base similar to '[[:digit:]]*'  then
+			raise info 'account generated automatically';
+			sNew:=3Daccount_compute(p_f_id);
+			raise info 'sNew %', sNew;
+			select ad_value into sName from
+				fiche_detail
+			where
+				ad_id=3D1 and f_id=3Dp_f_id;
+			nParent:=3Daccount_parent(sNew);
+			sNew :=3D account_add  (sNew,sName);
+			perform attribut_insert(p_f_id,5,sNew);
+
+		else
+		-- if there is an account_base then it is the default
+		      select fd_class_base::account_type into sNew from fiche_def join=
 fiche using (fd_id) where f_id=3Dp_f_id;
+			if sNew is null or length(trim(sNew)) =3D 0 then
+				raise notice 'count is null';
+				 perform attribut_insert(p_f_id,5,null);
+			else
+				 perform attribut_insert(p_f_id,5,sNew);
+			end if;
+		end if;
+	end if;
+
+return 0;
+end;
+$$;
+
+
+--
+-- Name: account_parent(public.account_type); Type: FUNCTION; Schema: co=
mptaproc; Owner: -
+--
+
+CREATE FUNCTION account_parent(p_account public.account_type) RETURNS pu=
blic.account_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+	sSubParent tmp_pcmn.pcm_val_parent%type;
+	sResult tmp_pcmn.pcm_val_parent%type;
+	nCount integer;
+begin
+	if p_account is NULL then
+		return NULL;
+	end if;
+	sSubParent:=3Dp_account;
+	while true loop
+		select count(*) into nCount
+		from tmp_pcmn
+		where
+		pcm_val =3D sSubParent;
+		if nCount !=3D 0 then
+			sResult:=3D sSubParent;
+			exit;
+		end if;
+		sSubParent:=3D substr(sSubParent,1,length(sSubParent)-1);
+		if length(sSubParent) <=3D 0 then
+			raise exception 'Impossible de trouver le compte parent pour %',p_acc=
ount;
+		end if;
+		raise notice 'sSubParent % % ',sSubParent,length(sSubParent);
+	end loop;
+	raise notice 'account_parent : Parent is %',sSubParent;
+	return sSubParent;
+end;
+$$;
+
+
+--
+-- Name: account_update(integer, public.account_type); Type: FUNCTION; S=
chema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION account_update(p_f_id integer, p_account public.account_=
type) RETURNS integer
+    LANGUAGE plpgsql
+    AS $$
+declare
+	nMax fiche.f_id%type;
+	nCount integer;
+	nParent tmp_pcmn.pcm_val_parent%type;
+	sName varchar;
+	first text;
+	second text;
+begin
+
+	if length(trim(p_account)) !=3D 0 then
+		-- 2 accounts in card separated by comma
+		if position (',' in p_account) =3D 0 then
+			select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_account;
+			if nCount =3D 0 then
+			select ad_value into sName from
+				fiche_detail
+				where
+				ad_id=3D1 and f_id=3Dp_f_id;
+			nParent:=3Daccount_parent(p_account);
+			insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_accoun=
t,sName,nParent);
+		end if;
+		else
+		raise info 'presence of a comma';
+		-- there is 2 accounts separated by a comma
+		first :=3D split_part(p_account,',',1);
+		second :=3D split_part(p_account,',',2);
+		-- check there is no other coma
+		raise info 'first value % second value %', first, second;
+
+		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
+			raise exception 'Too many comas, invalid account';
+		end if;
+		-- check that both account are in PCMN
+
+		end if;
+	else
+		-- account is null
+		update fiche_detail set ad_value=3Dnull where f_id=3Dp_f_id and ad_id=3D=
5 ;
+	end if;
+
+	update fiche_detail set ad_value=3Dp_account where f_id=3Dp_f_id and ad=
_id=3D5 ;
+
+return 0;
+end;
+$$;
+
+
+--
+-- Name: action_gestion_ins_upd(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION action_gestion_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+begin
+NEW.ag_title :=3D substr(trim(NEW.ag_title),1,70);
+NEW.ag_hour :=3D substr(trim(NEW.ag_hour),1,5);
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: action_get_tree(bigint); Type: FUNCTION; Schema: comptaproc; Ow=
ner: -
+--
+
+CREATE FUNCTION action_get_tree(p_id bigint) RETURNS SETOF bigint
+    LANGUAGE plpgsql
+    AS $$
+
+declare
+   e bigint;
+   i bigint;
+begin
+   for e in select ag_id from action_gestion where ag_ref_ag_id=3Dp_id
+   loop
+        for i in select action_get_tree from  comptaproc.action_get_tree=
(e)
+        loop
+                raise notice ' =3D=3D i %', i;
+                return next i;
+        end loop;
+    raise notice ' =3D e %', e;
+    return next e;
+   end loop;
+   return;
+
+end;
+$$;
+
+
+--
+-- Name: attribut_insert(integer, integer, character varying); Type: FUN=
CTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION attribut_insert(p_f_id integer, p_ad_id integer, p_value=
 character varying) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+begin
+	insert into fiche_detail (f_id,ad_id, ad_value) values (p_f_id,p_ad_id,=
p_value);
+=09
+return;
+end;
+$$;
+
+
+--
+-- Name: attribute_correct_order(); Type: FUNCTION; Schema: comptaproc; =
Owner: -
+--
+
+CREATE FUNCTION attribute_correct_order() RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+    crs_correct cursor for select A.jnt_id,A.jnt_order from jnt_fic_attr=
 as A join jnt_fic_attr as B using (fd_id) where A.jnt_order=3DB.jnt_orde=
r and A.jnt_id > B.jnt_id;
+    rec record;
+begin
+	open crs_correct;
+	loop
+	fetch crs_correct into rec;
+	if NOT FOUND then
+		close crs_correct;
+		return;
+	end if;
+	update jnt_fic_attr set jnt_order=3Djnt_order + 1 where jnt_id =3D rec.=
jnt_id;
+	end loop;
+	close crs_correct;
+	perform attribute_correct_order ();
+end;
+$$;
+
+
+--
+-- Name: card_after_delete(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION card_after_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+
+begin
+
+	delete from action_gestion where f_id_dest =3D OLD.f_id;
+	return OLD;
+
+end;
+$$;
+
+
+--
+-- Name: card_class_base(integer); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION card_class_base(p_f_id integer) RETURNS text
+    LANGUAGE plpgsql
+    AS $$
+declare
+	n_poste fiche_def.fd_class_base%type;
+begin
+
+	select fd_class_base into n_poste from fiche_def join fiche using
+(fd_id)
+	where f_id=3Dp_f_id;
+	if not FOUND then
+		raise exception 'Invalid fiche card_class_base(%)',p_f_id;
+	end if;
+return n_poste;
+end;
+$$;
+
+
+--
+-- Name: check_balance(integer); Type: FUNCTION; Schema: comptaproc; Own=
er: -
+--
+
+CREATE FUNCTION check_balance(p_grpt integer) RETURNS numeric
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	amount_jrnx_debit numeric;
+	amount_jrnx_credit numeric;
+	amount_jrn numeric;
+begin
+	select sum (j_montant) into amount_jrnx_credit=20
+	from jrnx=20
+		where=20
+	j_grpt=3Dp_grpt
+	and j_debit=3Dfalse;
+
+	select sum (j_montant) into amount_jrnx_debit=20
+	from jrnx=20
+		where=20
+	j_grpt=3Dp_grpt
+	and j_debit=3Dtrue;
+
+	select jr_montant into amount_jrn=20
+	from jrn
+	where
+	jr_grpt_id=3Dp_grpt;
+
+	if ( amount_jrnx_debit !=3D amount_jrnx_credit )=20
+		then
+		return abs(amount_jrnx_debit-amount_jrnx_credit);
+		end if;
+	if ( amount_jrn !=3D amount_jrnx_credit)
+		then
+		return -1*abs(amount_jrn - amount_jrnx_credit);
+		end if;
+	return 0;
+end;
+$$;
+
+
+--
+-- Name: correct_sequence(text, text, text); Type: FUNCTION; Schema: com=
ptaproc; Owner: -
+--
+
+CREATE FUNCTION correct_sequence(p_sequence text, p_col text, p_table te=
xt) RETURNS integer
+    LANGUAGE plpgsql
+    AS $$
+declare
+last_sequence int8;
+max_sequence int8;
+n integer;
+begin
+	select count(*) into n from pg_class where relkind=3D'S' and relname=3D=
lower(p_sequence);
+	if n =3D 0 then
+		raise exception  ' Unknow sequence  % ',p_sequence;
+	end if;
+	select count(*) into n from pg_class where relkind=3D'r' and relname=3D=
lower(p_table);
+	if n =3D 0 then
+		raise exception ' Unknow table  % ',p_table;
+	end if;
+
+	execute 'select last_value   from '||p_sequence into last_sequence;
+	raise notice 'Last value of the sequence is %', last_sequence;
+
+	execute 'select max('||p_col||')  from '||p_table into max_sequence;
+	if  max_sequence is null then
+		max_sequence :=3D 0;
+	end if;
+	raise notice 'Max value of the sequence is %', max_sequence;
+	max_sequence:=3D max_sequence +1;=09
+	execute 'alter sequence '||p_sequence||' restart with '||max_sequence;
+return 0;
+
+end;
+$$;
+
+
+--
+-- Name: FUNCTION correct_sequence(p_sequence text, p_col text, p_table =
text); Type: COMMENT; Schema: comptaproc; Owner: -
+--
+
+COMMENT ON FUNCTION correct_sequence(p_sequence text, p_col text, p_tabl=
e text) IS ' Often the primary key is a sequence number and sometimes the=
 value of the sequence is not synchronized with the primary key ( p_seque=
nce : sequence name, p_col : col of the pk,p_table : concerned table';
+
+
+--
+-- Name: create_missing_sequence(); Type: FUNCTION; Schema: comptaproc; =
Owner: -
+--
+
+CREATE FUNCTION create_missing_sequence() RETURNS integer
+    LANGUAGE plpgsql
+    AS $$
+declare
+p_sequence text;
+nSeq integer;
+c1 cursor for select jrn_def_id from jrn_def;
+begin
+	open c1;
+	loop
+	   fetch c1 into nSeq;
+	   if not FOUND THEN
+	   	close c1;
+	   	return 0;
+	   end if;
+	   p_sequence:=3D's_jrn_pj'||nSeq::text;
+	execute 'create sequence '||p_sequence;
+	end loop;
+close c1;
+return 0;
+
+end;
+$$;
+
+
+--
+-- Name: drop_index(character varying); Type: FUNCTION; Schema: comptapr=
oc; Owner: -
+--
+
+CREATE FUNCTION drop_index(p_constraint character varying) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	nCount integer;
+begin
+	select count(*) into nCount from pg_indexes where indexname=3Dp_constra=
int;
+	if nCount =3D 1 then
+	execute 'drop index '||p_constraint ;
+	end if;
+end;
+$$;
+
+
+--
+-- Name: drop_it(character varying); Type: FUNCTION; Schema: comptaproc;=
 Owner: -
+--
+
+CREATE FUNCTION drop_it(p_constraint character varying) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	nCount integer;
+begin
+	select count(*) into nCount from pg_constraint where conname=3Dp_constr=
aint;
+	if nCount =3D 1 then
+	execute 'alter table parm_periode drop constraint '||p_constraint ;
+	end if;
+end;
+$$;
+
+
+--
+-- Name: extension_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION extension_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+ sCode text;
+ sFile text;
+begin
+sCode:=3Dtrim(upper(NEW.ex_code));
+sCode:=3Dreplace(sCode,' ','_');
+sCode:=3Dsubstr(sCode,1,15);
+sCode=3Dupper(sCode);
+NEW.ex_code:=3DsCode;
+sFile:=3DNEW.ex_file;
+sFile:=3Dreplace(sFile,';','_');
+sFile:=3Dreplace(sFile,'<','_');
+sFile:=3Dreplace(sFile,'>','_');
+sFile:=3Dreplace(sFile,'..','');
+sFile:=3Dreplace(sFile,'&','');
+sFile:=3Dreplace(sFile,'|','');
+
+
+
+return NEW;
+
+end;
+
+$$;
+
+
+--
+-- Name: fiche_account_parent(integer); Type: FUNCTION; Schema: comptapr=
oc; Owner: -
+--
+
+CREATE FUNCTION fiche_account_parent(p_f_id integer) RETURNS public.acco=
unt_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+ret tmp_pcmn.pcm_val%TYPE;
+begin
+	select fd_class_base into ret from fiche_def join fiche using (fd_id) w=
here f_id=3Dp_f_id;
+	if not FOUND then
+		raise exception '% N''existe pas',p_f_id;
+	end if;
+	return ret;
+end;
+$$;
+
+
+--
+-- Name: fiche_attribut_synchro(integer); Type: FUNCTION; Schema: compta=
proc; Owner: -
+--
+
+CREATE FUNCTION fiche_attribut_synchro(p_fd_id integer) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+	-- this sql gives the f_id and the missing attribute (ad_id)
+	list_missing cursor for select f_id,fd_id,ad_id,jnt_order from jnt_fic_=
attr join fiche as A using (fd_id) where fd_id=3Dp_fd_id and ad_id not in=
 (select ad_id from fiche join fiche_detail using (f_id) where fd_id=3Djn=
t_fic_attr.fd_id and A.f_id=3Df_id);
+	rec record;
+begin
+	open list_missing;
+	loop
+=09
+	fetch list_missing into rec;
+	IF NOT FOUND then
+		exit;
+	end if;
+=09
+	-- now we insert into attr_value
+	insert into fiche_detail (f_id,ad_id,ad_value) values (rec.f_id,rec.ad_=
id,null);
+	end loop;
+	close list_missing;
+end;=20
+$$;
+
+
+--
+-- Name: fiche_def_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION fiche_def_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+begin
+
+if position (',' in NEW.fd_class_base) !=3D 0 then
+   NEW.fd_create_account=3D'f';
+
+end if;
+return NEW;
+end;$$;
+
+
+--
+-- Name: fill_quant_fin(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION fill_quant_fin() RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+   sBank text;
+   sCassa text;
+   sCustomer text;
+   sSupplier text;
+   rec record;
+   recBank record;
+   recSupp_Cust record;
+   nCount integer;
+   nAmount numeric;
+   nBank integer;
+   nOther integer;
+   nSupp_Cust integer;
+begin
+	select p_value into sBank from parm_code where p_code=3D'BANQUE';
+	select p_value into sCassa from parm_code where p_code=3D'CAISSE';
+	select p_value into sSupplier from parm_code where p_code=3D'SUPPLIER';
+	select p_value into sCustomer from parm_code where p_code=3D'CUSTOMER';
+=09
+	for rec in select jr_id,jr_grpt_id from jrn=20
+	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN')
+		and jr_id not in (select jr_id from quant_fin)
+	loop
+		-- there are only 2 lines for bank operations
+		-- first debit
+		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
+		if nCount > 2 then=20
+			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
+			return;
+		end if;
+		nBank :=3D 0; nOther:=3D0;
+		for recBank in select  j_id, j_montant,j_debit,j_qcode,j_poste from jr=
nx where j_grpt=3Drec.jr_grpt_id
+		loop
+		if recBank.j_poste like sBank||'%' then
+			-- retrieve f_id for bank
+			select f_id into nBank from vw_poste_qcode where j_qcode=3DrecBank.j_=
qcode;
+			if recBank.j_debit =3D false then
+				nAmount=3DrecBank.j_montant*(-1);
+			else=20
+				nAmount=3DrecBank.j_montant;
+			end if;
+		else
+			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecBank.j=
_qcode;
+		end if;
+		end loop;
+		if nBank !=3D 0 and nOther !=3D 0 then
+			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nBank,nOther,nAmount);
+		end if;
+	end loop;
+	for rec in select jr_id,jr_grpt_id from jrn=20
+	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN') and jr_id not in (select jr_id from quant_fin)
+	loop
+		-- there are only 2 lines for bank operations
+		-- first debit
+		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
+		if nCount > 2 then=20
+			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
+			return;
+		end if;
+		nBank :=3D 0; nOther:=3D0;
+		for recBank in select  j_id, j_montant,j_debit,j_qcode,j_poste from jr=
nx where j_grpt=3Drec.jr_grpt_id
+		loop
+		if recBank.j_poste like sCassa||'%' then
+			-- retrieve f_id for bank
+			select f_id into nBank from vw_poste_qcode where j_qcode=3DrecBank.j_=
qcode;
+			if recBank.j_debit =3D false then
+				nAmount=3DrecBank.j_montant*(-1);
+			else=20
+				nAmount=3DrecBank.j_montant;
+			end if;
+		else
+			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecBank.j=
_qcode;
+		end if;
+		end loop;
+		if nBank !=3D 0 and nOther !=3D 0 then
+			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nBank,nOther,nAmount);
+		end if;
+	end loop;
+
+	for rec in select jr_id,jr_grpt_id from jrn=20
+	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN') and jr_id not in (select jr_id from quant_fin)
+	loop
+		-- there are only 2 lines for bank operations
+		-- first debit
+		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
+		if nCount > 2 then=20
+			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
+			return;
+		end if;
+		nSupp_Cust :=3D 0; nOther:=3D0;
+		for recSupp_Cust in select  j_id, j_montant,j_debit,j_qcode,j_poste fr=
om jrnx where j_grpt=3Drec.jr_grpt_id
+		loop
+		if recSupp_Cust.j_poste like sSupplier||'%'  then
+			-- retrieve f_id for bank
+			select f_id into nSupp_Cust from vw_poste_qcode where j_qcode=3DrecSu=
pp_Cust.j_qcode;
+			if recSupp_Cust.j_debit =3D true then
+				nAmount=3DrecSupp_Cust.j_montant*(-1);
+			else=20
+				nAmount=3DrecSupp_Cust.j_montant;
+			end if;
+		else if  recSupp_Cust.j_poste like sCustomer||'%' then
+			select f_id into nSupp_Cust from vw_poste_qcode where j_qcode=3DrecSu=
pp_Cust.j_qcode;
+			if recSupp_Cust.j_debit =3D false then
+				nAmount=3DrecSupp_Cust.j_montant*(-1);
+			else=20
+				nAmount=3DrecSupp_Cust.j_montant;
+			end if;
+			else
+			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecSupp_C=
ust.j_qcode;
+		=09
+			end if;
+		end if;
+		end loop;
+		if nSupp_Cust !=3D 0 and nOther !=3D 0 then
+			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nOther,nSupp_Cust,nAmount);
+		end if;
+	end loop;
+	for rec in select jr_id,jr_grpt_id from jrn=20
+	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN') and jr_id not in (select jr_id from quant_fin)
+	loop
+		-- there are only 2 lines for bank operations
+		-- first debit
+		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
+		if nCount > 2 then=20
+			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
+			return;
+		end if;
+		nSupp_Cust :=3D 0; nOther:=3D0;
+		for recSupp_Cust in select  j_id, j_montant,j_debit,j_qcode,j_poste fr=
om jrnx where j_grpt=3Drec.jr_grpt_id
+		loop
+		if recSupp_Cust.j_poste like '441%'  then
+			-- retrieve f_id for bank
+			select f_id into nSupp_Cust from vw_poste_qcode where j_qcode=3DrecSu=
pp_Cust.j_qcode;
+			if recSupp_Cust.j_debit =3D false then
+				nAmount=3DrecSupp_Cust.j_montant*(-1);
+			else=20
+				nAmount=3DrecSupp_Cust.j_montant;
+			end if;
+			else
+			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecSupp_C=
ust.j_qcode;
+		=09
+		=09
+		end if;
+		end loop;
+		if nSupp_Cust !=3D 0 and nOther !=3D 0 then
+			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nOther,nSupp_Cust,nAmount);
+		end if;
+	end loop;
+	return;
+end;
+$$;
+
+
+--
+-- Name: find_pcm_type(public.account_type); Type: FUNCTION; Schema: com=
ptaproc; Owner: -
+--
+
+CREATE FUNCTION find_pcm_type(pp_value public.account_type) RETURNS text
+    LANGUAGE plpgsql
+    AS $$
+declare
+	str_type parm_poste.p_type%TYPE;
+	str_value parm_poste.p_type%TYPE;
+	nLength integer;
+begin
+	str_value:=3Dpp_value;
+	nLength:=3Dlength(str_value::text);
+	while nLength > 0 loop
+		select p_type into str_type from parm_poste where p_value=3Dstr_value;
+		if FOUND then
+			return str_type;
+		end if;
+		nLength:=3DnLength-1;
+		str_value:=3Dsubstring(str_value::text from 1 for nLength)::account_ty=
pe;
+	end loop;
+return 'CON';
+end;
+$$;
+
+
+--
+-- Name: find_periode(text); Type: FUNCTION; Schema: comptaproc; Owner: =
-
+--
+
+CREATE FUNCTION find_periode(p_date text) RETURNS integer
+    LANGUAGE plpgsql
+    AS $$
+
+declare n_p_id int4;
+begin
+
+select p_id into n_p_id
+	from parm_periode
+	where
+		p_start <=3D to_date(p_date,'DD.MM.YYYY')
+		and
+		p_end >=3D to_date(p_date,'DD.MM.YYYY');
+
+if NOT FOUND then
+	return -1;
+end if;
+
+return n_p_id;
+
+end;$$;
+
+
+--
+-- Name: format_account(public.account_type); Type: FUNCTION; Schema: co=
mptaproc; Owner: -
+--
+
+CREATE FUNCTION format_account(p_account public.account_type) RETURNS pu=
blic.account_type
+    LANGUAGE plpgsql
+    AS $_$
+
+declare
+
+sResult account_type;
+
+begin
+sResult :=3D lower(p_account);
+
+sResult :=3D translate(sResult,'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+sResult :=3D translate(sResult,' $=E2=82=AC=C2=B5=C2=A3%.+-/\!(){}(),;_&=
|"#''^<>*','');
+
+return upper(sResult);
+
+end;
+$_$;
+
+
+--
+-- Name: FUNCTION format_account(p_account public.account_type); Type: C=
OMMENT; Schema: comptaproc; Owner: -
+--
+
+COMMENT ON FUNCTION format_account(p_account public.account_type) IS 'fo=
rmat the accounting :
+- upper case
+- remove space and special char.
+';
+
+
+--
+-- Name: get_letter_jnt(bigint); Type: FUNCTION; Schema: comptaproc; Own=
er: -
+--
+
+CREATE FUNCTION get_letter_jnt(a bigint) RETURNS bigint
+    LANGUAGE plpgsql
+    AS $$
+declare
+ nResult bigint;
+begin
+   select jl_id into nResult from jnt_letter join letter_deb using (jl_i=
d) where j_id =3D a;
+   if NOT FOUND then
+	select jl_id into nResult from jnt_letter join letter_cred using (jl_id=
) where j_id =3D a;
+	if NOT found then
+		return null;
+	end if;
+    end if;
+return nResult;
+end;
+$$;
+
+
+--
+-- Name: get_menu_tree(text, text); Type: FUNCTION; Schema: comptaproc; =
Owner: -
+--
+
+CREATE FUNCTION get_menu_tree(p_code text, login text) RETURNS SETOF pub=
lic.menu_tree
+    LANGUAGE plpgsql
+    AS $$
+declare
+	i menu_tree;
+	e menu_tree;
+	a text;
+	x v_all_menu%ROWTYPE;
+begin
+	for x in select *  from v_all_menu where me_code_dep=3Dp_code::text and=
 user_name=3Dlogin::text
+	loop
+		if x.me_code_dep is not null then
+			i.code :=3D x.me_code_dep||'/'||x.me_code;
+		else
+			i.code :=3D x.me_code;
+		end if;
+
+		i.description :=3D x.me_description;
+
+		return next i;
+
+	for e in select *  from get_menu_tree(x.me_code,login)
+		loop
+			e.code:=3Dx.me_code_dep||'/'||e.code;
+			return next e;
+		end loop;
+
+	end loop;
+	return;
+end;
+$$;
+
+
+--
+-- Name: get_pcm_tree(public.account_type); Type: FUNCTION; Schema: comp=
taproc; Owner: -
+--
+
+CREATE FUNCTION get_pcm_tree(source public.account_type) RETURNS SETOF p=
ublic.account_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+	i account_type;
+	e account_type;
+begin
+	for i in select pcm_val from tmp_pcmn where pcm_val_parent=3Dsource
+	loop
+		return next i;
+		for e in select get_pcm_tree from get_pcm_tree(i)
+		loop
+			return next e;
+		end loop;
+
+	end loop;
+	return;
+end;
+$$;
+
+
+--
+-- Name: get_profile_menu(text); Type: FUNCTION; Schema: comptaproc; Own=
er: -
+--
+
+CREATE FUNCTION get_profile_menu(login text) RETURNS SETOF public.menu_t=
ree
+    LANGUAGE plpgsql
+    AS $$
+declare
+	a menu_tree;
+	e menu_tree;
+begin
+for a in select me_code,me_description from v_all_menu where user_name=3D=
login
+	and me_code_dep is null and me_type <> 'PR' and me_type <>'SP'
+loop
+		return next a;
+
+		for e in select * from get_menu_tree(a.code,login)
+		loop
+			return next e;
+		end loop;
+
+	end loop;
+return;
+end;
+$$;
+
+
+--
+-- Name: group_analytic_ins_upd(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION group_analytic_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+name text;
+begin
+name:=3Dupper(NEW.ga_id);
+name:=3Dtrim(name);
+name:=3Dreplace(name,' ','');
+NEW.ga_id:=3Dname;
+return NEW;
+end;$$;
+
+
+--
+-- Name: group_analytique_del(); Type: FUNCTION; Schema: comptaproc; Own=
er: -
+--
+
+CREATE FUNCTION group_analytique_del() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+begin
+update poste_analytique set ga_id=3Dnull
+where ga_id=3DOLD.ga_id;
+return OLD;
+end;$$;
+
+
+--
+-- Name: html_quote(text); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION html_quote(p_string text) RETURNS text
+    LANGUAGE plpgsql
+    AS $$
+declare
+	r text;
+begin
+	r:=3Dp_string;
+	r:=3Dreplace(r,'<','&lt;');
+	r:=3Dreplace(r,'>','&gt;');
+	r:=3Dreplace(r,'''','&quot;');
+	return r;
+end;$$;
+
+
+--
+-- Name: FUNCTION html_quote(p_string text); Type: COMMENT; Schema: comp=
taproc; Owner: -
+--
+
+COMMENT ON FUNCTION html_quote(p_string text) IS 'remove harmfull HTML c=
har';
+
+
+--
+-- Name: info_def_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner: =
-
+--
+
+CREATE FUNCTION info_def_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	row_info_def info_def%ROWTYPE;
+	str_type text;
+begin
+row_info_def:=3DNEW;
+str_type:=3Dupper(trim(NEW.id_type));
+str_type:=3Dreplace(str_type,' ','');
+str_type:=3Dreplace(str_type,',','');
+str_type:=3Dreplace(str_type,';','');
+if  length(str_type) =3D0 then
+	raise exception 'id_type cannot be null';
+end if;
+row_info_def.id_type:=3Dstr_type;
+return row_info_def;
+end;
+$$;
+
+
+--
+-- Name: insert_jrnx(character varying, numeric, public.account_type, in=
teger, integer, boolean, text, integer, text, text); Type: FUNCTION; Sche=
ma: comptaproc; Owner: -
+--
+
+CREATE FUNCTION insert_jrnx(p_date character varying, p_montant numeric,=
 p_poste public.account_type, p_grpt integer, p_jrn_def integer, p_debit =
boolean, p_tech_user text, p_tech_per integer, p_qcode text, p_comment te=
xt) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+begin
+	insert into jrnx
+	(
+		j_date,
+		j_montant,
+		j_poste,
+		j_grpt,
+		j_jrn_def,
+		j_debit,
+		j_text,
+		j_tech_user,
+		j_tech_per,
+		j_qcode
+	) values
+	(
+		to_date(p_date,'DD.MM.YYYY'),
+		p_montant,
+		p_poste,
+		p_grpt,
+		p_jrn_def,
+		p_debit,
+		p_comment,
+		p_tech_user,
+		p_tech_per,
+		p_qcode
+	);
+
+return;
+end;
+$$;
+
+
+--
+-- Name: insert_quant_purchase(text, numeric, character varying, numeric=
, numeric, numeric, integer, numeric, numeric, numeric, numeric, characte=
r varying, numeric); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION insert_quant_purchase(p_internal text, p_j_id numeric, p=
_fiche character varying, p_quant numeric, p_price numeric, p_vat numeric=
, p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric, p_nd_tva_rec=
up numeric, p_dep_priv numeric, p_client character varying, p_tva_sided n=
umeric) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+        fid_client integer;
+        fid_good   integer;
+begin
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                 fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim=
(p_fiche));
+        insert into quant_purchase
+                (qp_internal,
+                j_id,
+                qp_fiche,
+                qp_quantite,
+                qp_price,
+                qp_vat,
+                qp_vat_code,
+                qp_nd_amount,
+                qp_nd_tva,
+                qp_nd_tva_recup,
+                qp_supplier,
+                qp_dep_priv,
+                qp_vat_sided)
+        values
+                (p_internal,
+                p_j_id,
+                fid_good,
+                p_quant,
+                p_price,
+                p_vat,
+                p_vat_code,
+                p_nd_amount,
+                p_nd_tva,
+                p_nd_tva_recup,
+                fid_client,
+                p_dep_priv,
+                p_tva_sided);
+        return;
+end;
+ $$;
+
+
+--
+-- Name: insert_quant_sold(text, numeric, character varying, numeric, nu=
meric, numeric, integer, character varying, numeric); Type: FUNCTION; Sch=
ema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION insert_quant_sold(p_internal text, p_jid numeric, p_fich=
e character varying, p_quant numeric, p_price numeric, p_vat numeric, p_v=
at_code integer, p_client character varying, p_tva_sided numeric) RETURNS=
 void
+    LANGUAGE plpgsql
+    AS $$
+declare
+        fid_client integer;
+        fid_good   integer;
+begin
+
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_fiche));
+        insert into quant_sold
+                (qs_internal,j_id,qs_fiche,qs_quantite,qs_price,qs_vat,q=
s_vat_code,qs_client,qs_valid,qs_vat_sided)
+        values
+                (p_internal,p_jid,fid_good,p_quant,p_price,p_vat,p_vat_c=
ode,fid_client,'Y',p_tva_sided);
+        return;
+end;
+ $$;
+
+
+--
+-- Name: insert_quick_code(integer, text); Type: FUNCTION; Schema: compt=
aproc; Owner: -
+--
+
+CREATE FUNCTION insert_quick_code(nf_id integer, tav_text text) RETURNS =
integer
+    LANGUAGE plpgsql
+    AS $$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	begin
+	tText :=3D upper(trim(tav_text));
+	tText :=3D replace(tText,' ','');
+=09
+	loop
+		-- take the next sequence
+		select nextval('s_jnt_fic_att_value') into ns;
+		if length (tText) =3D 0 or tText is null then
+			tText :=3D 'FID'||ns;
+		end if;
+		-- av_text already used ?
+		select count(*) into nExist=20
+			from fiche_detail
+		where=20
+			ad_id=3D23 and  ad_value=3Dupper(tText);
+
+		if nExist =3D 0 then
+			exit;
+		end if;
+		tText:=3D'FID'||ns;
+	end loop;
+
+
+	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,2=
3,upper(tText));
+	return ns;
+	end;
+$$;
+
+
+--
+-- Name: is_closed(integer, integer); Type: FUNCTION; Schema: comptaproc=
; Owner: -
+--
+
+CREATE FUNCTION is_closed(p_periode integer, p_jrn_def_id integer) RETUR=
NS boolean
+    LANGUAGE plpgsql
+    AS $$
+declare
+bClosed bool;
+str_status text;
+begin
+select p_closed into bClosed from parm_periode
+	where p_id=3Dp_periode;
+
+if bClosed =3D true then
+	return bClosed;
+end if;
+
+select status into str_status from jrn_periode
+       where p_id =3Dp_periode and jrn_def_id=3Dp_jrn_def_id;
+
+if str_status <> 'OP' then
+   return bClosed;
+end if;
+return false;
+end;
+$$;
+
+
+--
+-- Name: jnt_fic_attr_ins(); Type: FUNCTION; Schema: comptaproc; Owner: =
-
+--
+
+CREATE FUNCTION jnt_fic_attr_ins() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+   r_record jnt_fic_attr%ROWTYPE;
+   i_max integer;
+begin
+r_record=3DNEW;
+perform comptaproc.fiche_attribut_synchro(r_record.fd_id);
+select coalesce(max(jnt_order),0) into i_max from jnt_fic_attr where fd_=
id=3Dr_record.fd_id;
+i_max :=3D i_max + 10;
+NEW.jnt_order=3Di_max;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: jrn_add_note(bigint, text); Type: FUNCTION; Schema: comptaproc;=
 Owner: -
+--
+
+CREATE FUNCTION jrn_add_note(p_jrid bigint, p_note text) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+	tmp bigint;
+begin
+	if length(trim(p_note)) =3D 0 then
+	   delete from jrn_note where jr_id=3D p_jrid;
+	   return;
+	end if;
+=09
+	select n_id into tmp from jrn_note where jr_id =3D p_jrid;
+=09
+	if FOUND then
+	   update jrn_note set n_text=3Dtrim(p_note) where jr_id =3D p_jrid;
+	else=20
+	   insert into jrn_note (jr_id,n_text) values ( p_jrid, p_note);
+
+	end if;
+=09
+	return;
+end;
+$$;
+
+
+--
+-- Name: jrn_check_periode(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION jrn_check_periode() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+bClosed bool;
+str_status text;
+ljr_tech_per jrn.jr_tech_per%TYPE;
+ljr_def_id jrn.jr_def_id%TYPE;
+lreturn jrn%ROWTYPE;
+begin
+if TG_OP=3D'UPDATE' then
+	ljr_tech_per :=3DOLD.jr_tech_per ;
+	NEW.jr_tech_per :=3D comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM=
.YYYY'));
+	ljr_def_id   :=3DOLD.jr_def_id;
+	lreturn      :=3DNEW;
+	if NEW.jr_date =3D OLD.jr_date then
+		return NEW;
+	end if;
+	if comptaproc.is_closed(NEW.jr_tech_per,NEW.jr_def_id) =3D true then
+	      	raise exception 'Periode fermee';
+	end if;
+end if;
+
+if TG_OP=3D'INSERT' then
+	NEW.jr_tech_per :=3D comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM=
.YYYY'));
+	ljr_tech_per :=3DNEW.jr_tech_per ;
+	ljr_def_id   :=3DNEW.jr_def_id;
+	lreturn      :=3DNEW;
+end if;
+
+if TG_OP=3D'DELETE' then
+	ljr_tech_per :=3DOLD.jr_tech_per;
+	ljr_def_id   :=3DOLD.jr_def_id;
+	lreturn      :=3DOLD;
+end if;
+
+if comptaproc.is_closed (ljr_def_id,ljr_def_id) =3D true then
+   	raise exception 'Periode fermee';
+end if;
+
+return lreturn;
+end;$$;
+
+
+--
+-- Name: jrn_def_add(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrn_def_add() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$begin
+execute 'insert into jrn_periode(p_id,jrn_def_id,status) select p_id,'||=
NEW.jrn_def_id||',
+	case when p_central=3Dtrue then ''CE''
+	      when p_closed=3Dtrue then ''CL''
+	else ''OP''
+	end
+from
+parm_periode ';
+return NEW;
+end;$$;
+
+
+--
+-- Name: jrn_def_delete(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrn_def_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+nb numeric;
+begin
+select count(*) into nb from jrn where jr_def_id=3DOLD.jrn_def_id;
+
+if nb <> 0 then
+	raise exception 'EFFACEMENT INTERDIT: JOURNAL UTILISE';
+end if;
+return OLD;
+end;$$;
+
+
+--
+-- Name: jrn_del(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrn_del() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+row jrn%ROWTYPE;
+begin
+row:=3DOLD;
+insert into del_jrn ( jr_id,
+       jr_def_id,
+       jr_montant,
+       jr_comment,
+       jr_date,
+       jr_grpt_id,
+       jr_internal,
+       jr_tech_date,
+       jr_tech_per,
+       jrn_ech,
+       jr_ech,
+       jr_rapt,
+       jr_valid,
+       jr_opid,
+       jr_c_opid,
+       jr_pj,
+       jr_pj_name,
+       jr_pj_type,
+       jr_pj_number,
+       del_jrn_date)=20
+       select  jr_id,
+	      jr_def_id,
+	      jr_montant,
+	      jr_comment,
+	      jr_date,
+	      jr_grpt_id,
+	      jr_internal,
+	      jr_tech_date,
+	      jr_tech_per,
+	      jrn_ech,
+	      jr_ech,
+	      jr_rapt,
+	      jr_valid,
+	      jr_opid,
+	      jr_c_opid,
+	      jr_pj,
+	      jr_pj_name,
+	      jr_pj_type,
+	      jr_pj_number
+	      ,now() from jrn where jr_id=3Drow.jr_id;
+return row;
+end;
+$$;
+
+
+--
+-- Name: jrnx_del(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrnx_del() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+row jrnx%ROWTYPE;
+begin
+row:=3DOLD;
+
+
+insert into del_jrnx(
+            j_id, j_date, j_montant, j_poste, j_grpt, j_rapt, j_jrn_def,=
=20
+            j_debit, j_text, j_centralized, j_internal, j_tech_user, j_t=
ech_date,=20
+            j_tech_per, j_qcode, f_id)  SELECT j_id, j_date, j_montant, =
j_poste, j_grpt, j_rapt, j_jrn_def,=20
+       j_debit, j_text, j_centralized, j_internal, j_tech_user, j_tech_d=
ate,=20
+       j_tech_per, j_qcode, f_id from jrnx where j_id=3Drow.j_id;
+return row;
+end;
+$$;
+
+
+--
+-- Name: jrnx_ins(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrnx_ins() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+n_fid bigint;
+begin
+
+NEW.j_tech_per :=3D comptaproc.find_periode(to_char(NEW.j_date,'DD.MM.YY=
YY'));
+if NEW.j_tech_per =3D -1 then
+	raise exception 'P=C3=A9riode invalide';
+end if;
+
+if NEW.j_qcode is NULL then
+   return NEW;
+end if;
+
+NEW.j_qcode=3Dtrim(upper(NEW.j_qcode));
+
+if length (NEW.j_qcode) =3D 0 then
+    NEW.j_qcode=3DNULL;
+    else
+   select f_id into n_fid from fiche_detail  where ad_id=3D23 and ad_val=
ue=3DNEW.j_qcode;
+	if NOT FOUND then
+		raise exception 'La fiche dont le quick code est % n''existe pas',NEW.=
j_qcode;
+	end if;
+end if;
+NEW.f_id:=3Dn_fid;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: jrnx_letter_del(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION jrnx_letter_del() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+row jrnx%ROWTYPE;
+begin
+row:=3DOLD;
+delete from jnt_letter=20
+	where (jl_id in (select jl_id from letter_deb) and jl_id not in(select =
jl_id from letter_cred ))=20
+		or (jl_id not in (select jl_id from letter_deb  ) and jl_id  in(select=
 jl_id from letter_cred ));
+return row;
+end;
+$$;
+
+
+--
+-- Name: plan_analytic_ins_upd(); Type: FUNCTION; Schema: comptaproc; Ow=
ner: -
+--
+
+CREATE FUNCTION plan_analytic_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+   name text;
+begin
+   name:=3Dupper(NEW.pa_name);
+   name:=3Dtrim(name);
+   name:=3Dreplace(name,' ','');
+   NEW.pa_name:=3Dname;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: poste_analytique_ins_upd(); Type: FUNCTION; Schema: comptaproc;=
 Owner: -
+--
+
+CREATE FUNCTION poste_analytique_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$declare
+name text;
+rCount record;
+
+begin
+name:=3Dupper(NEW.po_name);
+name:=3Dtrim(name);
+name:=3Dreplace(name,' ','');	=09
+NEW.po_name:=3Dname;
+
+if NEW.ga_id is NULL then
+return NEW;
+end if;
+
+if length(trim(NEW.ga_id)) =3D 0 then
+  NEW.ga_id:=3DNULL;
+  return NEW;
+end if;
+perform 'select ga_id from groupe_analytique where ga_id=3D'||NEW.ga_id;
+if NOT FOUND then
+   raise exception' Inexistent Group Analytic %',NEW.ga_id;
+end if;
+return NEW;
+end;$$;
+
+
+--
+-- Name: proc_check_balance(); Type: FUNCTION; Schema: comptaproc; Owner=
: -
+--
+
+CREATE FUNCTION proc_check_balance() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+	diff numeric;
+	tt integer;
+begin
+	if TG_OP =3D 'INSERT' or TG_OP=3D'UPDATE' then
+	tt=3DNEW.jr_grpt_id;
+	diff:=3Dcheck_balance(tt);
+	if diff !=3D 0 then
+		raise exception 'balance error %',diff ;
+	end if;
+	return NEW;
+	end if;
+end;
+$$;
+
+
+--
+-- Name: quant_purchase_ins_upd(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION quant_purchase_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+	begin
+		if NEW.qp_price < 0 OR NEW.qp_quantite <0 THEN
+			NEW.qp_price :=3D abs (NEW.qp_price)*(-1);
+			NEW.qp_quantite :=3D abs (NEW.qp_quantite)*(-1);
+		end if;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: quant_sold_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner=
: -
+--
+
+CREATE FUNCTION quant_sold_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+	begin
+		if NEW.qs_price < 0 OR NEW.qs_quantite <0 THEN
+			NEW.qs_price :=3D abs (NEW.qs_price)*(-1);
+			NEW.qs_quantite :=3D abs (NEW.qs_quantite)*(-1);
+		end if;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: t_document_modele_validate(); Type: FUNCTION; Schema: comptapro=
c; Owner: -
+--
+
+CREATE FUNCTION t_document_modele_validate() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare=20
+    lText text;
+    modified document_modele%ROWTYPE;
+begin
+    modified:=3DNEW;
+
+	modified.md_filename:=3Dreplace(NEW.md_filename,' ','_');
+	return modified;
+end;
+$$;
+
+
+--
+-- Name: t_document_type_insert(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
+--
+
+CREATE FUNCTION t_document_type_insert() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+nCounter integer;
+    BEGIN
+select count(*) into nCounter from pg_class where relname=3D'seq_doc_typ=
e_'||NEW.dt_id;
+if nCounter =3D 0 then
+        execute  'create sequence seq_doc_type_'||NEW.dt_id;
+end if;
+        RETURN NEW;
+    END;
+$$;
+
+
+--
+-- Name: t_document_validate(); Type: FUNCTION; Schema: comptaproc; Owne=
r: -
+--
+
+CREATE FUNCTION t_document_validate() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+  lText text;
+  modified document%ROWTYPE;
+begin
+    	modified:=3DNEW;
+	modified.d_filename:=3Dreplace(NEW.d_filename,' ','_');
+	return modified;
+end;
+$$;
+
+
+--
+-- Name: t_jrn_def_sequence(); Type: FUNCTION; Schema: comptaproc; Owner=
: -
+--
+
+CREATE FUNCTION t_jrn_def_sequence() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+nCounter integer;
+
+    BEGIN
+    select count(*) into nCounter=20
+       from pg_class where relname=3D's_jrn_'||NEW.jrn_def_id;
+       if nCounter =3D 0 then
+       	   execute  'create sequence s_jrn_'||NEW.jrn_def_id;
+	   raise notice 'Creating sequence s_jrn_%',NEW.jrn_def_id;
+	 end if;
+
+        RETURN NEW;
+    END;
+$$;
+
+
+--
+-- Name: table_analytic_account(text, text); Type: FUNCTION; Schema: com=
ptaproc; Owner: -
+--
+
+CREATE FUNCTION table_analytic_account(p_from text, p_to text) RETURNS S=
ETOF public.anc_table_account_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+	ret ANC_table_account_type%ROWTYPE;
+	sql_from text:=3D'';
+	sql_to text:=3D'';
+	sWhere text:=3D'';
+	sAnd text:=3D'';
+	sResult text:=3D'';
+begin
+if p_from <> '' and p_from is not null then
+	sql_from:=3D'oa_date >=3D to_date('''||p_from::text||''',''DD.MM.YYYY''=
)';
+	sWhere:=3D' where ';
+end if;
+
+if p_to <> '' and p_to is not null then
+	sql_to=3D' oa_date <=3D to_date('''||p_to::text||''',''DD.MM.YYYY'')';
+	sWhere :=3D ' where ';
+end if;
+
+if sql_to <> '' and sql_from <> '' then
+	sAnd:=3D' and ';
+end if;
+
+sResult :=3D sWhere || sql_from || sAnd || sql_to;
+
+for ret in EXECUTE 'SELECT po.po_id,
+			    po.pa_id, po.po_name,=20
+			    po.po_description,sum(
+        CASE
+            WHEN operation_analytique.oa_debit =3D true THEN operation_a=
nalytique.oa_amount * (-1)::numeric
+            ELSE operation_analytique.oa_amount
+        END) AS sum_amount, jrnx.j_poste, tmp_pcmn.pcm_lib AS name
+   FROM operation_analytique
+   JOIN poste_analytique po USING (po_id)
+   JOIN jrnx USING (j_id)
+   JOIN tmp_pcmn ON jrnx.j_poste::text =3D tmp_pcmn.pcm_val::text
+'|| sResult ||'
+  GROUP BY po.po_id, po.po_name, po.pa_id, jrnx.j_poste, tmp_pcmn.pcm_li=
b, po.po_description
+ HAVING sum(
+CASE
+    WHEN operation_analytique.oa_debit =3D true THEN operation_analytiqu=
e.oa_amount * (-1)::numeric
+    ELSE operation_analytique.oa_amount
+END) <> 0::numeric '
+	loop
+	return next ret;
+end loop;
+end;
+$$;
+
+
+--
+-- Name: table_analytic_card(text, text); Type: FUNCTION; Schema: compta=
proc; Owner: -
+--
+
+CREATE FUNCTION table_analytic_card(p_from text, p_to text) RETURNS SETO=
F public.anc_table_card_type
+    LANGUAGE plpgsql
+    AS $$
+declare
+	ret ANC_table_card_type%ROWTYPE;
+	sql_from text:=3D'';
+	sql_to text:=3D'';
+	sWhere text:=3D'';
+	sAnd text:=3D'';
+	sResult text:=3D'';
+begin
+if p_from <> '' and p_from is not null then
+	sql_from:=3D'oa_date >=3D to_date('''||p_from::text||''',''DD.MM.YYYY''=
)';
+	sWhere:=3D' where ';
+end if;
+
+if p_to <> '' and p_to is not null then
+	sql_to=3D' oa_date <=3D to_date('''||p_to::text||''',''DD.MM.YYYY'')';
+	sWhere :=3D ' where ';
+end if;
+
+if sql_to <> '' and sql_from <> '' then
+	sAnd :=3D' and ';
+end if;
+
+sResult :=3D sWhere || sql_from || sAnd || sql_to;
+
+for ret in EXECUTE ' SELECT po.po_id, po.pa_id, po.po_name, po.po_descri=
ption,  sum(
+        CASE
+            WHEN operation_analytique.oa_debit =3D true THEN operation_a=
nalytique.oa_amount * (-1)::numeric
+            ELSE operation_analytique.oa_amount
+        END) AS sum_amount, jrnx.f_id, jrnx.j_qcode, ( SELECT fiche_deta=
il.ad_value
+           FROM fiche_detail
+          WHERE fiche_detail.ad_id =3D 1 AND fiche_detail.f_id =3D jrnx.=
f_id) AS name
+   FROM operation_analytique
+   JOIN poste_analytique po USING (po_id)
+   JOIN jrnx USING (j_id)'|| sResult ||'
+  GROUP BY po.po_id, po.po_name, po.pa_id, jrnx.f_id, jrnx.j_qcode, ( SE=
LECT fiche_detail.ad_value
+   FROM fiche_detail
+  WHERE fiche_detail.ad_id =3D 1 AND fiche_detail.f_id =3D jrnx.f_id), p=
o.po_description
+ HAVING sum(
+CASE
+    WHEN operation_analytique.oa_debit =3D true THEN operation_analytiqu=
e.oa_amount * (-1)::numeric
+    ELSE operation_analytique.oa_amount
+END) <> 0::numeric;'
+
+
+	loop
+	return next ret;
+end loop;
+end;
+$$;
+
+
+--
+-- Name: tmp_pcmn_alphanum_ins_upd(); Type: FUNCTION; Schema: comptaproc=
; Owner: -
+--
+
+CREATE FUNCTION tmp_pcmn_alphanum_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+   r_record tmp_pcmn%ROWTYPE;
+begin
+r_record :=3D NEW;
+r_record.pcm_val:=3Dformat_account(NEW.pcm_val);
+
+return r_record;
+end;
+$$;
+
+
+--
+-- Name: tmp_pcmn_ins(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION tmp_pcmn_ins() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+   r_record tmp_pcmn%ROWTYPE;
+begin
+r_record :=3D NEW;
+if  length(trim(r_record.pcm_type))=3D0 or r_record.pcm_type is NULL the=
n
+   r_record.pcm_type:=3Dfind_pcm_type(NEW.pcm_val);
+   return r_record;
+end if;
+return NEW;
+end;
+$$;
+
+
+--
+-- Name: trim_cvs_quote(); Type: FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION trim_cvs_quote() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+        modified import_tmp%ROWTYPE;
+begin
+	modified:=3DNEW;
+	modified.devise=3Dreplace(new.devise,'"','');
+	modified.poste_comptable=3Dreplace(new.poste_comptable,'"','');
+        modified.compte_ordre=3Dreplace(NEW.COMPTE_ORDRE,'"','');
+        modified.detail=3Dreplace(NEW.DETAIL,'"','');
+        modified.num_compte=3Dreplace(NEW.NUM_COMPTE,'"','');
+        return modified;
+end;
+$$;
+
+
+--
+-- Name: trim_space_format_csv_banque(); Type: FUNCTION; Schema: comptap=
roc; Owner: -
+--
+
+CREATE FUNCTION trim_space_format_csv_banque() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+declare
+        modified format_csv_banque%ROWTYPE;
+begin
+        modified.name=3Dtrim(NEW.NAME);
+        modified.include_file=3Dtrim(new.include_file);
+		if ( length(modified.name) =3D 0 ) then
+			modified.name=3Dnull;
+		end if;
+		if ( length(modified.include_file) =3D 0 ) then
+			modified.include_file=3Dnull;
+		end if;
+
+        return modified;
+end;
+$$;
+
+
+--
+-- Name: tva_delete(integer); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
+--
+
+CREATE FUNCTION tva_delete(integer) RETURNS void
+    LANGUAGE plpgsql
+    AS $_$=20
+declare
+	p_tva_id alias for $1;
+	nCount integer;
+begin
+	nCount=3D0;
+	select count(*) into nCount from quant_sold where qs_vat_code=3Dp_tva_i=
d;
+	if nCount !=3D 0 then
+                 return;
+	=09
+	end if;
+	select count(*) into nCount from quant_purchase where qp_vat_code=3Dp_t=
va_id;
+	if nCount !=3D 0 then
+                 return;
+	=09
+	end if;
+
+delete from tva_rate where tva_id=3Dp_tva_id;
+	return;
+end;
+$_$;
+
+
+--
+-- Name: tva_insert(text, numeric, text, text, integer); Type: FUNCTION;=
 Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION tva_insert(text, numeric, text, text, integer) RETURNS i=
nteger
+    LANGUAGE plpgsql
+    AS $_$
+declare
+	l_tva_id integer;
+	p_tva_label alias for $1;
+	p_tva_rate alias for $2;
+	p_tva_comment alias for $3;
+	p_tva_poste alias for $4;
+	p_tva_both_side alias for $5;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+select into l_tva_id nextval('s_tva') ;
+insert into tva_rate(tva_id,tva_label,tva_rate,tva_comment,tva_poste,tva=
_both_side)
+	values (l_tva_id,p_tva_label,p_tva_rate,p_tva_comment,p_tva_poste,p_tva=
_both_side);
+return 0;
+end;
+$_$;
+
+
+--
+-- Name: tva_modify(integer, text, numeric, text, text, integer); Type: =
FUNCTION; Schema: comptaproc; Owner: -
+--
+
+CREATE FUNCTION tva_modify(integer, text, numeric, text, text, integer) =
RETURNS integer
+    LANGUAGE plpgsql
+    AS $_$
+declare
+	p_tva_id alias for $1;
+	p_tva_label alias for $2;
+	p_tva_rate alias for $3;
+	p_tva_comment alias for $4;
+	p_tva_poste alias for $5;
+	p_tva_both_side alias for $6;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+update tva_rate set tva_label=3Dp_tva_label,tva_rate=3Dp_tva_rate,tva_co=
mment=3Dp_tva_comment,tva_poste=3Dp_tva_poste,tva_both_side=3Dp_tva_both_=
side
+	where tva_id=3Dp_tva_id;
+return 0;
+end;
+$_$;
+
+
+--
+-- Name: update_quick_code(integer, text); Type: FUNCTION; Schema: compt=
aproc; Owner: -
+--
+
+CREATE FUNCTION update_quick_code(njft_id integer, tav_text text) RETURN=
S integer
+    LANGUAGE plpgsql
+    AS $$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	old_qcode varchar;
+	begin
+	-- get current value
+	select ad_value into old_qcode from fiche_detail where jft_id=3Dnjft_id=
;
+	-- av_text didn't change so no update
+	if tav_text =3D upper( trim(old_qcode)) then
+		return 0;
+	end if;
+=09
+	tText :=3D trim(upper(tav_text));
+	tText :=3D replace(tText,' ','');
+	if length ( tText) =3D 0 or tText is null then
+		return 0;
+	end if;
+	=09
+	ns :=3D njft_id;
+
+	loop
+		-- av_text already used ?
+		select count(*) into nExist=20
+			from fiche_detail
+		where=20
+			ad_id=3D23 and ad_value=3DtText;
+
+		if nExist =3D 0 then
+			exit;
+		end if;=09
+		if tText =3D 'FID'||ns then
+			-- take the next sequence
+			select nextval('s_jnt_fic_att_value') into ns;
+		end if;
+		tText  :=3D'FID'||ns;
+	=09
+	end loop;
+	update fiche_detail set ad_value =3D tText where jft_id=3Dnjft_id;
+
+	-- update also the contact
+	update fiche_detail set ad_value =3D tText=20
+		where jft_id in=20
+			( select jft_id=20
+				from fiche_detail=20
+			where ad_id=3D25 and ad_value=3Dold_qcode);
+
+
+	update jrnx set j_qcode=3DtText where j_qcode =3D old_qcode;
+	return ns;
+	end;
+$$;
+
+
+SET search_path =3D public, pg_catalog;
+
+--
+-- Name: bud_card_ins_upd(); Type: FUNCTION; Schema: public; Owner: -
+--
+
+CREATE FUNCTION bud_card_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$declare
+ sCode text;
+begin
+
+sCode:=3Dtrim(upper(NEW.bc_code));
+sCode:=3Dreplace(sCode,' ','_');
+sCode:=3Dsubstr(sCode,1,10);
+NEW.bc_code:=3DsCode;
+return NEW;
+end;$$;
+
+
+--
+-- Name: bud_detail_ins_upd(); Type: FUNCTION; Schema: public; Owner: -
+--
+
+CREATE FUNCTION bud_detail_ins_upd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$declare
+mline bud_detail%ROWTYPE;
+begin
+mline:=3DNEW;
+if mline.po_id =3D -1 then
+   mline.po_id:=3DNULL;
+end if;
+return mline;
+end;$$;
+
+
+--
+-- Name: correct_quant_purchase(); Type: FUNCTION; Schema: public; Owner=
: -
+--
+
+CREATE FUNCTION correct_quant_purchase() RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+	r_invalid quant_purchase;
+	s_QuickCode text;
+	b_j_debit bool;
+	r_new record;
+	r_jrnx record;
+begin
+
+for r_invalid in select * from quant_purchase where qp_valid=3D'A'
+loop
+
+select j_qcode into s_QuickCode from vw_poste_qcode where f_id=3Dr_inval=
id.qp_fiche;
+raise notice 'qp_id % Quick code is %',r_invalid.qp_id,s_QuickCode;
+
+select j_debit,j_grpt,j_jrn_def,j_montant into r_jrnx from jrnx where j_=
id=3Dr_invalid.j_id;
+if NOT FOUND then
+	raise notice 'error not found jrnx %',r_invalid.j_id;
+	update quant_purchase set qp_valid=3D'Y' where qp_id=3Dr_invalid.qp_id;
+	continue;
+end if;
+raise notice 'j_debit % , j_grpt % ,j_jrn_def  % qp_price %',r_jrnx.j_de=
bit,r_jrnx.j_grpt,r_jrnx.j_jrn_def ,r_invalid.qp_price;
+
+select jr_internal,j_id,j_montant into r_new
+	from jrnx join jrn on (j_grpt=3Djr_grpt_id)
+	where=20
+	j_jrn_def=3Dr_jrnx.j_jrn_def
+	and j_id not in (select j_id from  quant_purchase)
+	and j_qcode=3Ds_QuickCode
+	and j_montant=3Dr_jrnx.j_montant
+	and j_debit !=3D r_jrnx.j_debit;
+
+if NOT FOUND then
+	raise notice 'error not found %', r_invalid.j_id;
+	update quant_purchase set qp_valid=3D'Y' where qp_id=3Dr_invalid.qp_id;
+	continue;    =20
+end if;
+raise notice 'j_id % found amount %',r_new.j_id,r_new.j_montant;
+
+insert into quant_purchase (qp_internal,j_id,qp_fiche,qp_quantite,qp_pri=
ce,qp_vat,qp_nd_amount,qp_nd_tva_recup,qp_valid,qp_dep_priv,qp_supplier,q=
p_vat_code)
+values (r_new.jr_internal,r_invalid.j_id,r_invalid.qp_fiche,(r_invalid.q=
p_quantite * (-1)),r_invalid.qp_price * (-1),r_invalid.qp_vat*(-1),r_inva=
lid.qp_nd_amount*(-1),r_invalid.qp_nd_tva_recup*(-1) ,'Y',r_invalid.qp_de=
p_priv*(-1),r_invalid.qp_supplier,r_invalid.qp_vat_code);
+
+update quant_purchase set qp_valid=3D'Y' where qp_id=3Dr_invalid.qp_id;
+end loop;
+return;
+end;
+$$;
+
+
+--
+-- Name: correct_quant_sale(); Type: FUNCTION; Schema: public; Owner: -
+--
+
+CREATE FUNCTION correct_quant_sale() RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+	r_invalid quant_sold;
+	s_QuickCode text;
+	b_j_debit bool;
+	r_new record;
+	r_jrnx record;
+begin
+
+for r_invalid in select * from quant_sold where qs_valid=3D'A'
+loop
+
+select j_qcode into s_QuickCode from vw_poste_qcode where f_id=3Dr_inval=
id.qs_fiche;
+raise notice 'qp_id % Quick code is %',r_invalid.qs_id,s_QuickCode;
+
+select j_debit,j_grpt,j_jrn_def,j_montant into r_jrnx from jrnx where j_=
id=3Dr_invalid.j_id;
+if NOT FOUND then
+	update quant_sold set qs_valid=3D'Y' where qs_id=3Dr_invalid.qs_id;
+	raise notice 'error not found jrnx %',r_invalid.j_id;
+	continue;
+end if;
+raise notice 'j_debit % , j_grpt % ,j_jrn_def  % qs_price %',r_jrnx.j_de=
bit,r_jrnx.j_grpt,r_jrnx.j_jrn_def ,r_invalid.qs_price;
+
+select jr_internal,j_id,j_montant into r_new
+	from jrnx join jrn on (j_grpt=3Djr_grpt_id)
+	where=20
+	j_jrn_def=3Dr_jrnx.j_jrn_def
+	and j_id not in (select j_id from  quant_sold)
+	and j_qcode=3Ds_QuickCode
+	and j_montant=3Dr_jrnx.j_montant
+	and j_debit !=3D r_jrnx.j_debit;
+
+if NOT FOUND then
+   update quant_sold set qs_valid=3D'Y' where qs_id=3Dr_invalid.qs_id;
+	raise notice 'error not found %', r_invalid.j_id;
+	continue;
+end if;
+raise notice 'j_id % found amount %',r_new.j_id,r_new.j_montant;
+
+
+ insert into quant_sold (qs_internal,j_id,qs_fiche,qs_quantite,qs_price,=
qs_vat,qs_valid,qs_client,qs_vat_code)
+ values (r_new.jr_internal,r_invalid.j_id,r_invalid.qs_fiche,(r_invalid.=
qs_quantite * (-1)),r_invalid.qs_price * (-1),r_invalid.qs_vat*(-1),'Y',r=
_invalid.qs_client,r_invalid.qs_vat_code);
+ update quant_sold set qs_valid=3D'Y' where qs_id=3Dr_invalid.qs_id;
+end loop;
+return;
+end;
+$$;
+
+
+SET default_tablespace =3D '';
+
+SET default_with_oids =3D true;
+
+--
+-- Name: action; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE action (
+    ac_id integer NOT NULL,
+    ac_description text NOT NULL,
+    ac_module text,
+    ac_code character varying(9)
+);
+
+
+--
+-- Name: TABLE action; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE action IS 'The different privileges';
+
+
+--
+-- Name: COLUMN action.ac_code; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN action.ac_code IS 'this code will be used in the code =
with the function User::check_action ';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: action_detail; Type: TABLE; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE TABLE action_detail (
+    ad_id integer NOT NULL,
+    f_id bigint,
+    ad_text text,
+    ad_pu numeric(20,4) DEFAULT 0,
+    ad_quant numeric(20,4) DEFAULT 0,
+    ad_tva_id integer DEFAULT 0,
+    ad_tva_amount numeric(20,4) DEFAULT 0,
+    ad_total_amount numeric(20,4) DEFAULT 0,
+    ag_id integer DEFAULT 0 NOT NULL
+);
+
+
+--
+-- Name: TABLE action_detail; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE action_detail IS 'Detail of action_gestion, see class A=
ction_Detail';
+
+
+--
+-- Name: COLUMN action_detail.f_id; Type: COMMENT; Schema: public; Owner=
: -
+--
+
+COMMENT ON COLUMN action_detail.f_id IS 'the concerned	card';
+
+
+--
+-- Name: COLUMN action_detail.ad_text; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_text IS ' Description ';
+
+
+--
+-- Name: COLUMN action_detail.ad_pu; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON COLUMN action_detail.ad_pu IS ' price per unit ';
+
+
+--
+-- Name: COLUMN action_detail.ad_quant; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_quant IS 'quantity ';
+
+
+--
+-- Name: COLUMN action_detail.ad_tva_id; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_tva_id IS ' tva_id ';
+
+
+--
+-- Name: COLUMN action_detail.ad_tva_amount; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_tva_amount IS ' tva_amount ';
+
+
+--
+-- Name: COLUMN action_detail.ad_total_amount; Type: COMMENT; Schema: pu=
blic; Owner: -
+--
+
+COMMENT ON COLUMN action_detail.ad_total_amount IS ' total amount';
+
+
+--
+-- Name: action_detail_ad_id_seq; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE action_detail_ad_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: action_detail_ad_id_seq; Type: SEQUENCE OWNED BY; Schema: publi=
c; Owner: -
+--
+
+ALTER SEQUENCE action_detail_ad_id_seq OWNED BY action_detail.ad_id;
+
+
+--
+-- Name: action_detail_ad_id_seq; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('action_detail_ad_id_seq', 1, false);
+
+
+--
+-- Name: action_gestion_ag_id_seq; Type: SEQUENCE; Schema: public; Owner=
: -
+--
+
+CREATE SEQUENCE action_gestion_ag_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: action_gestion_ag_id_seq; Type: SEQUENCE SET; Schema: public; O=
wner: -
+--
+
+SELECT pg_catalog.setval('action_gestion_ag_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: action_gestion; Type: TABLE; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+CREATE TABLE action_gestion (
+    ag_id integer DEFAULT nextval('action_gestion_ag_id_seq'::regclass) =
NOT NULL,
+    ag_type integer,
+    f_id_dest integer NOT NULL,
+    ag_title character varying(70),
+    ag_timestamp timestamp without time zone DEFAULT now(),
+    ag_cal character(1) DEFAULT 'C'::bpchar,
+    ag_ref_ag_id integer,
+    ag_comment text,
+    ag_ref text,
+    ag_hour text,
+    ag_priority integer DEFAULT 2,
+    ag_dest text,
+    ag_owner text,
+    ag_contact bigint,
+    ag_state integer
+);
+
+
+--
+-- Name: TABLE action_gestion; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE action_gestion IS 'Contains the details for the follow-=
up of customer, supplier, administration';
+
+
+--
+-- Name: COLUMN action_gestion.ag_type; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_type IS ' type of action: see docume=
nt_type ';
+
+
+--
+-- Name: COLUMN action_gestion.f_id_dest; Type: COMMENT; Schema: public;=
 Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.f_id_dest IS ' third party ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_title; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_title IS ' title ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_timestamp; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_timestamp IS ' ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_cal; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_cal IS ' visible in the calendar if =
=3D C';
+
+
+--
+-- Name: COLUMN action_gestion.ag_ref_ag_id; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_ref_ag_id IS ' concerning the action=
 ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_comment; Type: COMMENT; Schema: public=
; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_comment IS ' comment of the action';
+
+
+--
+-- Name: COLUMN action_gestion.ag_ref; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_ref IS 'its reference ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_priority; Type: COMMENT; Schema: publi=
c; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_priority IS 'Low, medium, important =
';
+
+
+--
+-- Name: COLUMN action_gestion.ag_dest; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_dest IS ' is the person who has to t=
ake care of this action ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_owner; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_owner IS ' is the owner of this acti=
on ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_contact; Type: COMMENT; Schema: public=
; Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_contact IS ' contact of the third pa=
rt ';
+
+
+--
+-- Name: COLUMN action_gestion.ag_state; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN action_gestion.ag_state IS 'state of the action same a=
s document_state ';
+
+
+--
+-- Name: attr_def; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE attr_def (
+    ad_id integer DEFAULT nextval(('s_attr_def'::text)::regclass) NOT NU=
LL,
+    ad_text text,
+    ad_type text,
+    ad_size text NOT NULL
+);
+
+
+--
+-- Name: TABLE attr_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE attr_def IS 'The available attributs for the cards';
+
+
+--
+-- Name: attr_min; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE attr_min (
+    frd_id integer NOT NULL,
+    ad_id integer NOT NULL
+);
+
+
+--
+-- Name: TABLE attr_min; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE attr_min IS 'The value of  attributs for the cards';
+
+
+--
+-- Name: bilan_b_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE bilan_b_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: bilan_b_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('bilan_b_id_seq', 4, true);
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: bilan; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE bilan (
+    b_id integer DEFAULT nextval('bilan_b_id_seq'::regclass) NOT NULL,
+    b_name text NOT NULL,
+    b_file_template text NOT NULL,
+    b_file_form text,
+    b_type text NOT NULL
+);
+
+
+--
+-- Name: TABLE bilan; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE bilan IS 'contains the template and the data for genera=
ting different documents  ';
+
+
+--
+-- Name: COLUMN bilan.b_id; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN bilan.b_id IS 'primary key';
+
+
+--
+-- Name: COLUMN bilan.b_name; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN bilan.b_name IS 'Name of the document';
+
+
+--
+-- Name: COLUMN bilan.b_file_template; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN bilan.b_file_template IS 'path of the template (docume=
nt/...)';
+
+
+--
+-- Name: COLUMN bilan.b_file_form; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN bilan.b_file_form IS 'path of the file with forms';
+
+
+--
+-- Name: COLUMN bilan.b_type; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN bilan.b_type IS 'type =3D ODS, RTF...';
+
+
+--
+-- Name: bud_card_bc_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE bud_card_bc_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: bud_card_bc_id_seq; Type: SEQUENCE SET; Schema: public; Owner: =
-
+--
+
+SELECT pg_catalog.setval('bud_card_bc_id_seq', 1, false);
+
+
+--
+-- Name: bud_detail_bd_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE bud_detail_bd_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: bud_detail_bd_id_seq; Type: SEQUENCE SET; Schema: public; Owner=
: -
+--
+
+SELECT pg_catalog.setval('bud_detail_bd_id_seq', 1, false);
+
+
+--
+-- Name: bud_detail_periode_bdp_id_seq; Type: SEQUENCE; Schema: public; =
Owner: -
+--
+
+CREATE SEQUENCE bud_detail_periode_bdp_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: bud_detail_periode_bdp_id_seq; Type: SEQUENCE SET; Schema: publ=
ic; Owner: -
+--
+
+SELECT pg_catalog.setval('bud_detail_periode_bdp_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: centralized; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE centralized (
+    c_id integer DEFAULT nextval(('s_centralized'::text)::regclass) NOT =
NULL,
+    c_j_id integer,
+    c_date date NOT NULL,
+    c_internal text NOT NULL,
+    c_montant numeric(20,4) NOT NULL,
+    c_debit boolean DEFAULT true,
+    c_jrn_def integer NOT NULL,
+    c_poste account_type,
+    c_description text,
+    c_grp integer NOT NULL,
+    c_comment text,
+    c_rapt text,
+    c_periode integer,
+    c_order integer
+);
+
+
+--
+-- Name: TABLE centralized; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE centralized IS 'The centralized journal';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: del_action; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE del_action (
+    del_id integer NOT NULL,
+    del_name text NOT NULL,
+    del_time timestamp without time zone
+);
+
+
+--
+-- Name: del_action_del_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE del_action_del_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: del_action_del_id_seq; Type: SEQUENCE OWNED BY; Schema: public;=
 Owner: -
+--
+
+ALTER SEQUENCE del_action_del_id_seq OWNED BY del_action.del_id;
+
+
+--
+-- Name: del_action_del_id_seq; Type: SEQUENCE SET; Schema: public; Owne=
r: -
+--
+
+SELECT pg_catalog.setval('del_action_del_id_seq', 1, true);
+
+
+--
+-- Name: del_jrn; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE del_jrn (
+    jr_id integer NOT NULL,
+    jr_def_id integer,
+    jr_montant numeric(20,4),
+    jr_comment text,
+    jr_date date,
+    jr_grpt_id integer,
+    jr_internal text,
+    jr_tech_date timestamp without time zone,
+    jr_tech_per integer,
+    jrn_ech date,
+    jr_ech date,
+    jr_rapt text,
+    jr_valid boolean,
+    jr_opid integer,
+    jr_c_opid integer,
+    jr_pj oid,
+    jr_pj_name text,
+    jr_pj_type text,
+    del_jrn_date timestamp without time zone,
+    jr_pj_number text,
+    dj_id integer NOT NULL
+);
+
+
+--
+-- Name: del_jrn_dj_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE del_jrn_dj_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: del_jrn_dj_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Own=
er: -
+--
+
+ALTER SEQUENCE del_jrn_dj_id_seq OWNED BY del_jrn.dj_id;
+
+
+--
+-- Name: del_jrn_dj_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('del_jrn_dj_id_seq', 1, false);
+
+
+--
+-- Name: del_jrnx; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE del_jrnx (
+    j_id integer NOT NULL,
+    j_date date,
+    j_montant numeric(20,4),
+    j_poste account_type,
+    j_grpt integer,
+    j_rapt text,
+    j_jrn_def integer,
+    j_debit boolean,
+    j_text text,
+    j_centralized boolean,
+    j_internal text,
+    j_tech_user text,
+    j_tech_date timestamp without time zone,
+    j_tech_per integer,
+    j_qcode text,
+    djx_id integer NOT NULL,
+    f_id bigint
+);
+
+
+--
+-- Name: del_jrnx_djx_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE del_jrnx_djx_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: del_jrnx_djx_id_seq; Type: SEQUENCE OWNED BY; Schema: public; O=
wner: -
+--
+
+ALTER SEQUENCE del_jrnx_djx_id_seq OWNED BY del_jrnx.djx_id;
+
+
+--
+-- Name: del_jrnx_djx_id_seq; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('del_jrnx_djx_id_seq', 1, false);
+
+
+--
+-- Name: document_d_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE document_d_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: document_d_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('document_d_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: document; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE document (
+    d_id integer DEFAULT nextval('document_d_id_seq'::regclass) NOT NULL=
,
+    ag_id integer NOT NULL,
+    d_lob oid,
+    d_number bigint NOT NULL,
+    d_filename text,
+    d_mimetype text
+);
+
+
+--
+-- Name: TABLE document; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE document IS 'This table contains all the documents : su=
mmary and lob files';
+
+
+--
+-- Name: document_modele_md_id_seq; Type: SEQUENCE; Schema: public; Owne=
r: -
+--
+
+CREATE SEQUENCE document_modele_md_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: document_modele_md_id_seq; Type: SEQUENCE SET; Schema: public; =
Owner: -
+--
+
+SELECT pg_catalog.setval('document_modele_md_id_seq', 1, false);
+
+
+--
+-- Name: document_modele; Type: TABLE; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+CREATE TABLE document_modele (
+    md_id integer DEFAULT nextval('document_modele_md_id_seq'::regclass)=
 NOT NULL,
+    md_name text NOT NULL,
+    md_lob oid,
+    md_type integer NOT NULL,
+    md_filename text,
+    md_mimetype text,
+    md_affect character varying(3) NOT NULL
+);
+
+
+--
+-- Name: TABLE document_modele; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE document_modele IS ' contains all the template for the =
 documents';
+
+
+--
+-- Name: document_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE document_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: SEQUENCE document_seq; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON SEQUENCE document_seq IS 'Sequence for the sequence bound to =
the document modele';
+
+
+--
+-- Name: document_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('document_seq', 1, false);
+
+
+--
+-- Name: document_state_s_id_seq; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE document_state_s_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: document_state_s_id_seq; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('document_state_s_id_seq', 3, true);
+
+
+--
+-- Name: document_state; Type: TABLE; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+CREATE TABLE document_state (
+    s_id integer DEFAULT nextval('document_state_s_id_seq'::regclass) NO=
T NULL,
+    s_value character varying(50) NOT NULL
+);
+
+
+--
+-- Name: TABLE document_state; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE document_state IS 'State of the document';
+
+
+--
+-- Name: document_type_dt_id_seq; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE document_type_dt_id_seq
+    START WITH 25
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: document_type_dt_id_seq; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('document_type_dt_id_seq', 25, false);
+
+
+--
+-- Name: document_type; Type: TABLE; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE TABLE document_type (
+    dt_id integer DEFAULT nextval('document_type_dt_id_seq'::regclass) N=
OT NULL,
+    dt_value character varying(80)
+);
+
+
+--
+-- Name: TABLE document_type; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE document_type IS 'Type of document : meeting, invoice,.=
..';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: extension; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE extension (
+    ex_id integer NOT NULL,
+    ex_name character varying(30) NOT NULL,
+    ex_code character varying(15) NOT NULL,
+    ex_desc character varying(250),
+    ex_file character varying NOT NULL,
+    ex_enable "char" DEFAULT 'Y'::"char" NOT NULL
+);
+
+
+--
+-- Name: TABLE extension; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE extension IS 'Content the needed information for the ex=
tension';
+
+
+--
+-- Name: COLUMN extension.ex_id; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN extension.ex_id IS 'Primary key';
+
+
+--
+-- Name: COLUMN extension.ex_name; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN extension.ex_name IS 'code of the extension ';
+
+
+--
+-- Name: COLUMN extension.ex_code; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN extension.ex_code IS 'code of the extension ';
+
+
+--
+-- Name: COLUMN extension.ex_desc; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN extension.ex_desc IS 'Description of the extension ';
+
+
+--
+-- Name: COLUMN extension.ex_file; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN extension.ex_file IS 'path to the extension to include=
';
+
+
+--
+-- Name: COLUMN extension.ex_enable; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON COLUMN extension.ex_enable IS 'Y : enabled N : disabled ';
+
+
+--
+-- Name: extension_ex_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE extension_ex_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: extension_ex_id_seq; Type: SEQUENCE OWNED BY; Schema: public; O=
wner: -
+--
+
+ALTER SEQUENCE extension_ex_id_seq OWNED BY extension.ex_id;
+
+
+--
+-- Name: extension_ex_id_seq; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('extension_ex_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: fiche; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE fiche (
+    f_id integer DEFAULT nextval(('s_fiche'::text)::regclass) NOT NULL,
+    fd_id integer
+);
+
+
+--
+-- Name: TABLE fiche; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE fiche IS 'Cards';
+
+
+--
+-- Name: fiche_def; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE fiche_def (
+    fd_id integer DEFAULT nextval(('s_fdef'::text)::regclass) NOT NULL,
+    fd_class_base text,
+    fd_label text NOT NULL,
+    fd_create_account boolean DEFAULT false,
+    frd_id integer NOT NULL
+);
+
+
+--
+-- Name: TABLE fiche_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE fiche_def IS 'Cards definition';
+
+
+--
+-- Name: fiche_def_ref; Type: TABLE; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE TABLE fiche_def_ref (
+    frd_id integer DEFAULT nextval(('s_fiche_def_ref'::text)::regclass) =
NOT NULL,
+    frd_text text,
+    frd_class_base account_type
+);
+
+
+--
+-- Name: TABLE fiche_def_ref; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE fiche_def_ref IS 'Family Cards definition';
+
+
+--
+-- Name: fiche_detail; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE fiche_detail (
+    jft_id integer DEFAULT nextval(('s_jnt_fic_att_value'::text)::regcla=
ss) NOT NULL,
+    f_id integer,
+    ad_id integer,
+    ad_value text
+);
+
+
+--
+-- Name: TABLE fiche_detail; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE fiche_detail IS 'join between the card and the attribut=
 definition';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: forecast; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE forecast (
+    f_id integer NOT NULL,
+    f_name text NOT NULL,
+    f_start_date bigint,
+    f_end_date bigint
+);
+
+
+--
+-- Name: TABLE forecast; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE forecast IS 'contains the name of the forecast';
+
+
+--
+-- Name: forecast_cat; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE forecast_cat (
+    fc_id integer NOT NULL,
+    fc_desc text NOT NULL,
+    f_id bigint,
+    fc_order integer DEFAULT 0 NOT NULL
+);
+
+
+--
+-- Name: COLUMN forecast_cat.fc_id; Type: COMMENT; Schema: public; Owner=
: -
+--
+
+COMMENT ON COLUMN forecast_cat.fc_id IS 'primary key';
+
+
+--
+-- Name: COLUMN forecast_cat.fc_desc; Type: COMMENT; Schema: public; Own=
er: -
+--
+
+COMMENT ON COLUMN forecast_cat.fc_desc IS 'text of the category';
+
+
+--
+-- Name: COLUMN forecast_cat.f_id; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN forecast_cat.f_id IS 'Foreign key, it is the parent fr=
om the table forecast';
+
+
+--
+-- Name: COLUMN forecast_cat.fc_order; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN forecast_cat.fc_order IS 'Order of the category, used =
when displaid';
+
+
+--
+-- Name: forecast_cat_fc_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
+--
+
+CREATE SEQUENCE forecast_cat_fc_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: forecast_cat_fc_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
+--
+
+ALTER SEQUENCE forecast_cat_fc_id_seq OWNED BY forecast_cat.fc_id;
+
+
+--
+-- Name: forecast_cat_fc_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
+--
+
+SELECT pg_catalog.setval('forecast_cat_fc_id_seq', 1, false);
+
+
+--
+-- Name: forecast_f_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE forecast_f_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: forecast_f_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Own=
er: -
+--
+
+ALTER SEQUENCE forecast_f_id_seq OWNED BY forecast.f_id;
+
+
+--
+-- Name: forecast_f_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('forecast_f_id_seq', 1, false);
+
+
+--
+-- Name: forecast_item; Type: TABLE; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE TABLE forecast_item (
+    fi_id integer NOT NULL,
+    fi_text text,
+    fi_account text,
+    fi_card integer,
+    fi_order integer,
+    fc_id integer,
+    fi_amount numeric(20,4) DEFAULT 0,
+    fi_debit "char" DEFAULT 'd'::"char" NOT NULL,
+    fi_pid integer
+);
+
+
+--
+-- Name: COLUMN forecast_item.fi_id; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_id IS 'Primary key';
+
+
+--
+-- Name: COLUMN forecast_item.fi_text; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_text IS 'Label of the i	tem';
+
+
+--
+-- Name: COLUMN forecast_item.fi_account; Type: COMMENT; Schema: public;=
 Owner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_account IS 'Accountancy entry';
+
+
+--
+-- Name: COLUMN forecast_item.fi_card; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_card IS 'Card (fiche.f_id)';
+
+
+--
+-- Name: COLUMN forecast_item.fi_order; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_order IS 'Order of showing (not used)=
';
+
+
+--
+-- Name: COLUMN forecast_item.fi_amount; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_amount IS 'Amount';
+
+
+--
+-- Name: COLUMN forecast_item.fi_debit; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_debit IS 'possible values are D or C'=
;
+
+
+--
+-- Name: COLUMN forecast_item.fi_pid; Type: COMMENT; Schema: public; Own=
er: -
+--
+
+COMMENT ON COLUMN forecast_item.fi_pid IS '0 for every month, or the val=
ue parm_periode.p_id ';
+
+
+--
+-- Name: forecast_item_fi_id_seq; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE forecast_item_fi_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: forecast_item_fi_id_seq; Type: SEQUENCE OWNED BY; Schema: publi=
c; Owner: -
+--
+
+ALTER SEQUENCE forecast_item_fi_id_seq OWNED BY forecast_item.fi_id;
+
+
+--
+-- Name: forecast_item_fi_id_seq; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('forecast_item_fi_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: form; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE form (
+    fo_id integer DEFAULT nextval(('s_form'::text)::regclass) NOT NULL,
+    fo_fr_id integer,
+    fo_pos integer,
+    fo_label text,
+    fo_formula text
+);
+
+
+--
+-- Name: TABLE form; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE form IS 'Forms content';
+
+
+--
+-- Name: formdef; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE formdef (
+    fr_id integer DEFAULT nextval(('s_formdef'::text)::regclass) NOT NUL=
L,
+    fr_label text
+);
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: groupe_analytique; Type: TABLE; Schema: public; Owner: -; Table=
space:=20
+--
+
+CREATE TABLE groupe_analytique (
+    ga_id character varying(10) NOT NULL,
+    pa_id integer,
+    ga_description text
+);
+
+
+--
+-- Name: historique_analytique_ha_id_seq; Type: SEQUENCE; Schema: public=
; Owner: -
+--
+
+CREATE SEQUENCE historique_analytique_ha_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: historique_analytique_ha_id_seq; Type: SEQUENCE SET; Schema: pu=
blic; Owner: -
+--
+
+SELECT pg_catalog.setval('historique_analytique_ha_id_seq', 1, false);
+
+
+--
+-- Name: info_def; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE info_def (
+    id_type text NOT NULL,
+    id_description text
+);
+
+
+--
+-- Name: TABLE info_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE info_def IS 'Contains the types of additionnal info we =
can add to a operation';
+
+
+--
+-- Name: s_jnt_id; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jnt_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jnt_id; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jnt_id', 53, true);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: jnt_fic_attr; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE jnt_fic_attr (
+    fd_id integer,
+    ad_id integer,
+    jnt_id bigint DEFAULT nextval('s_jnt_id'::regclass) NOT NULL,
+    jnt_order integer NOT NULL
+);
+
+
+--
+-- Name: TABLE jnt_fic_attr; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jnt_fic_attr IS 'join between the family card and the a=
ttribut definition';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: jnt_letter; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jnt_letter (
+    jl_id integer NOT NULL,
+    jl_amount_deb numeric(20,4)
+);
+
+
+--
+-- Name: jnt_letter_jl_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE jnt_letter_jl_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: jnt_letter_jl_id_seq; Type: SEQUENCE OWNED BY; Schema: public; =
Owner: -
+--
+
+ALTER SEQUENCE jnt_letter_jl_id_seq OWNED BY jnt_letter.jl_id;
+
+
+--
+-- Name: jnt_letter_jl_id_seq; Type: SEQUENCE SET; Schema: public; Owner=
: -
+--
+
+SELECT pg_catalog.setval('jnt_letter_jl_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: jrn; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn (
+    jr_id integer DEFAULT nextval(('s_jrn'::text)::regclass) NOT NULL,
+    jr_def_id integer NOT NULL,
+    jr_montant numeric(20,4) NOT NULL,
+    jr_comment text,
+    jr_date date,
+    jr_grpt_id integer NOT NULL,
+    jr_internal text,
+    jr_tech_date timestamp without time zone DEFAULT now() NOT NULL,
+    jr_tech_per integer NOT NULL,
+    jrn_ech date,
+    jr_ech date,
+    jr_rapt text,
+    jr_valid boolean DEFAULT true,
+    jr_opid integer,
+    jr_c_opid integer,
+    jr_pj oid,
+    jr_pj_name text,
+    jr_pj_type text,
+    jr_pj_number text,
+    jr_mt text
+);
+
+
+--
+-- Name: TABLE jrn; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn IS 'Journal: content one line for a group of accoun=
tancy writing';
+
+
+--
+-- Name: jrn_action; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_action (
+    ja_id integer DEFAULT nextval(('s_jrnaction'::text)::regclass) NOT N=
ULL,
+    ja_name text NOT NULL,
+    ja_desc text,
+    ja_url text NOT NULL,
+    ja_action text NOT NULL,
+    ja_lang text DEFAULT 'FR'::text,
+    ja_jrn_type character(3)
+);
+
+
+--
+-- Name: TABLE jrn_action; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_action IS 'Possible action when we are in journal (=
menu)';
+
+
+--
+-- Name: jrn_def; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_def (
+    jrn_def_id integer DEFAULT nextval(('s_jrn_def'::text)::regclass) NO=
T NULL,
+    jrn_def_name text NOT NULL,
+    jrn_def_class_deb text,
+    jrn_def_class_cred text,
+    jrn_def_fiche_deb text,
+    jrn_def_fiche_cred text,
+    jrn_deb_max_line integer DEFAULT 1,
+    jrn_cred_max_line integer DEFAULT 1,
+    jrn_def_ech boolean DEFAULT false,
+    jrn_def_ech_lib text,
+    jrn_def_type character(3) NOT NULL,
+    jrn_def_code text NOT NULL,
+    jrn_def_pj_pref text,
+    jrn_def_bank bigint,
+    jrn_def_num_op integer
+);
+
+
+--
+-- Name: TABLE jrn_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_def IS 'Definition of a journal, his properties';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: jrn_info; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_info (
+    ji_id integer NOT NULL,
+    jr_id integer NOT NULL,
+    id_type text NOT NULL,
+    ji_value text
+);
+
+
+--
+-- Name: jrn_info_ji_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE jrn_info_ji_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: jrn_info_ji_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Ow=
ner: -
+--
+
+ALTER SEQUENCE jrn_info_ji_id_seq OWNED BY jrn_info.ji_id;
+
+
+--
+-- Name: jrn_info_ji_id_seq; Type: SEQUENCE SET; Schema: public; Owner: =
-
+--
+
+SELECT pg_catalog.setval('jrn_info_ji_id_seq', 1, false);
+
+
+--
+-- Name: jrn_note; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_note (
+    n_id integer NOT NULL,
+    n_text text,
+    jr_id bigint NOT NULL
+);
+
+
+--
+-- Name: TABLE jrn_note; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_note IS 'Note about operation';
+
+
+--
+-- Name: jrn_note_n_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE jrn_note_n_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: jrn_note_n_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Own=
er: -
+--
+
+ALTER SEQUENCE jrn_note_n_id_seq OWNED BY jrn_note.n_id;
+
+
+--
+-- Name: jrn_note_n_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('jrn_note_n_id_seq', 1, false);
+
+
+--
+-- Name: jrn_periode; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE jrn_periode (
+    jrn_def_id integer NOT NULL,
+    p_id integer NOT NULL,
+    status text
+);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: jrn_rapt; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_rapt (
+    jra_id integer DEFAULT nextval(('s_jrn_rapt'::text)::regclass) NOT N=
ULL,
+    jr_id integer NOT NULL,
+    jra_concerned integer NOT NULL
+);
+
+
+--
+-- Name: TABLE jrn_rapt; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_rapt IS 'Rapprochement between operation';
+
+
+--
+-- Name: jrn_type; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrn_type (
+    jrn_type_id character(3) NOT NULL,
+    jrn_desc text
+);
+
+
+--
+-- Name: TABLE jrn_type; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrn_type IS 'Type of journal (Sell, Buy, Financial...)'=
;
+
+
+--
+-- Name: jrnx; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE jrnx (
+    j_id integer DEFAULT nextval(('s_jrn_op'::text)::regclass) NOT NULL,
+    j_date date DEFAULT now(),
+    j_montant numeric(20,4) DEFAULT 0,
+    j_poste account_type NOT NULL,
+    j_grpt integer NOT NULL,
+    j_rapt text,
+    j_jrn_def integer NOT NULL,
+    j_debit boolean DEFAULT true,
+    j_text text,
+    j_centralized boolean DEFAULT false,
+    j_internal text,
+    j_tech_user text NOT NULL,
+    j_tech_date timestamp without time zone DEFAULT now() NOT NULL,
+    j_tech_per integer NOT NULL,
+    j_qcode text,
+    f_id bigint
+);
+
+
+--
+-- Name: TABLE jrnx; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE jrnx IS 'Journal: content one line for each accountancy=
 writing';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: letter_cred; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE letter_cred (
+    lc_id integer NOT NULL,
+    j_id bigint NOT NULL,
+    jl_id bigint NOT NULL
+);
+
+
+--
+-- Name: letter_cred_lc_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE letter_cred_lc_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: letter_cred_lc_id_seq; Type: SEQUENCE OWNED BY; Schema: public;=
 Owner: -
+--
+
+ALTER SEQUENCE letter_cred_lc_id_seq OWNED BY letter_cred.lc_id;
+
+
+--
+-- Name: letter_cred_lc_id_seq; Type: SEQUENCE SET; Schema: public; Owne=
r: -
+--
+
+SELECT pg_catalog.setval('letter_cred_lc_id_seq', 1, false);
+
+
+--
+-- Name: letter_deb; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE letter_deb (
+    ld_id integer NOT NULL,
+    j_id bigint NOT NULL,
+    jl_id bigint NOT NULL
+);
+
+
+--
+-- Name: letter_deb_ld_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE letter_deb_ld_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: letter_deb_ld_id_seq; Type: SEQUENCE OWNED BY; Schema: public; =
Owner: -
+--
+
+ALTER SEQUENCE letter_deb_ld_id_seq OWNED BY letter_deb.ld_id;
+
+
+--
+-- Name: letter_deb_ld_id_seq; Type: SEQUENCE SET; Schema: public; Owner=
: -
+--
+
+SELECT pg_catalog.setval('letter_deb_ld_id_seq', 1, false);
+
+
+--
+-- Name: menu_ref; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE menu_ref (
+    me_code text NOT NULL,
+    me_menu text,
+    me_file text,
+    me_url text,
+    me_description text,
+    me_parameter text,
+    me_javascript text,
+    me_type character varying(2)
+);
+
+
+--
+-- Name: COLUMN menu_ref.me_code; Type: COMMENT; Schema: public; Owner: =
-
+--
+
+COMMENT ON COLUMN menu_ref.me_code IS 'Menu Code ';
+
+
+--
+-- Name: COLUMN menu_ref.me_menu; Type: COMMENT; Schema: public; Owner: =
-
+--
+
+COMMENT ON COLUMN menu_ref.me_menu IS 'Label to display';
+
+
+--
+-- Name: COLUMN menu_ref.me_file; Type: COMMENT; Schema: public; Owner: =
-
+--
+
+COMMENT ON COLUMN menu_ref.me_file IS 'if not empty file to include';
+
+
+--
+-- Name: COLUMN menu_ref.me_url; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN menu_ref.me_url IS 'url ';
+
+
+--
+-- Name: COLUMN menu_ref.me_type; Type: COMMENT; Schema: public; Owner: =
-
+--
+
+COMMENT ON COLUMN menu_ref.me_type IS 'ME for menu
+PR for Printing
+SP for special meaning (ex: return to line)
+PL for plugin';
+
+
+--
+-- Name: mod_payment; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE mod_payment (
+    mp_id integer NOT NULL,
+    mp_lib text NOT NULL,
+    mp_jrn_def_id integer NOT NULL,
+    mp_fd_id bigint,
+    mp_qcode text,
+    jrn_def_id bigint
+);
+
+
+--
+-- Name: TABLE mod_payment; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE mod_payment IS 'Contains the different media of payment=
 and the corresponding ledger';
+
+
+--
+-- Name: COLUMN mod_payment.jrn_def_id; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN mod_payment.jrn_def_id IS 'Ledger using this payment m=
ethod';
+
+
+--
+-- Name: mod_payment_mp_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE mod_payment_mp_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: mod_payment_mp_id_seq; Type: SEQUENCE OWNED BY; Schema: public;=
 Owner: -
+--
+
+ALTER SEQUENCE mod_payment_mp_id_seq OWNED BY mod_payment.mp_id;
+
+
+--
+-- Name: mod_payment_mp_id_seq; Type: SEQUENCE SET; Schema: public; Owne=
r: -
+--
+
+SELECT pg_catalog.setval('mod_payment_mp_id_seq', 10, true);
+
+
+--
+-- Name: op_def_op_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE op_def_op_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: op_def_op_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('op_def_op_seq', 1, false);
+
+
+--
+-- Name: op_predef; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE op_predef (
+    od_id integer DEFAULT nextval('op_def_op_seq'::regclass) NOT NULL,
+    jrn_def_id integer NOT NULL,
+    od_name text NOT NULL,
+    od_item integer NOT NULL,
+    od_jrn_type text NOT NULL,
+    od_direct boolean NOT NULL
+);
+
+
+--
+-- Name: TABLE op_predef; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE op_predef IS 'predefined operation';
+
+
+--
+-- Name: COLUMN op_predef.jrn_def_id; Type: COMMENT; Schema: public; Own=
er: -
+--
+
+COMMENT ON COLUMN op_predef.jrn_def_id IS 'jrn_id';
+
+
+--
+-- Name: COLUMN op_predef.od_name; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN op_predef.od_name IS 'name of the operation';
+
+
+--
+-- Name: op_predef_detail_opd_id_seq; Type: SEQUENCE; Schema: public; Ow=
ner: -
+--
+
+CREATE SEQUENCE op_predef_detail_opd_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: op_predef_detail_opd_id_seq; Type: SEQUENCE SET; Schema: public=
; Owner: -
+--
+
+SELECT pg_catalog.setval('op_predef_detail_opd_id_seq', 1, false);
+
+
+--
+-- Name: op_predef_detail; Type: TABLE; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+CREATE TABLE op_predef_detail (
+    opd_id integer DEFAULT nextval('op_predef_detail_opd_id_seq'::regcla=
ss) NOT NULL,
+    od_id integer NOT NULL,
+    opd_poste text NOT NULL,
+    opd_amount numeric(20,4),
+    opd_tva_id integer,
+    opd_quantity numeric(20,4),
+    opd_debit boolean NOT NULL,
+    opd_tva_amount numeric(20,4),
+    opd_comment text,
+    opd_qc boolean
+);
+
+
+--
+-- Name: TABLE op_predef_detail; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE op_predef_detail IS 'contains the detail of predefined =
operations';
+
+
+--
+-- Name: s_oa_group; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_oa_group
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_oa_group; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_oa_group', 7, true);
+
+
+--
+-- Name: operation_analytique; Type: TABLE; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+CREATE TABLE operation_analytique (
+    oa_id integer DEFAULT nextval('historique_analytique_ha_id_seq'::reg=
class) NOT NULL,
+    po_id integer NOT NULL,
+    oa_amount numeric(20,4) NOT NULL,
+    oa_description text,
+    oa_debit boolean DEFAULT true NOT NULL,
+    j_id integer,
+    oa_group integer DEFAULT nextval('s_oa_group'::regclass) NOT NULL,
+    oa_date date NOT NULL,
+    oa_row integer,
+    CONSTRAINT operation_analytique_oa_amount_check CHECK ((oa_amount >=3D=
 (0)::numeric))
+);
+
+
+--
+-- Name: TABLE operation_analytique; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON TABLE operation_analytique IS 'History of the analytic accoun=
t';
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: parameter; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE parameter (
+    pr_id text NOT NULL,
+    pr_value text
+);
+
+
+--
+-- Name: TABLE parameter; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE parameter IS 'parameter of the company';
+
+
+--
+-- Name: parm_code; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE parm_code (
+    p_code text NOT NULL,
+    p_value text,
+    p_comment text
+);
+
+
+--
+-- Name: parm_money; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE parm_money (
+    pm_id integer DEFAULT nextval(('s_currency'::text)::regclass),
+    pm_code character(3) NOT NULL,
+    pm_rate numeric(20,4)
+);
+
+
+--
+-- Name: TABLE parm_money; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE parm_money IS 'Currency conversion';
+
+
+--
+-- Name: parm_periode; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE parm_periode (
+    p_id integer DEFAULT nextval(('s_periode'::text)::regclass) NOT NULL=
,
+    p_start date NOT NULL,
+    p_end date NOT NULL,
+    p_exercice text DEFAULT to_char(now(), 'YYYY'::text) NOT NULL,
+    p_closed boolean DEFAULT false,
+    p_central boolean DEFAULT false,
+    CONSTRAINT parm_periode_check CHECK ((p_end >=3D p_start))
+);
+
+
+--
+-- Name: TABLE parm_periode; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE parm_periode IS 'Periode definition';
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: parm_poste; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE parm_poste (
+    p_value account_type NOT NULL,
+    p_type text NOT NULL
+);
+
+
+--
+-- Name: TABLE parm_poste; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE parm_poste IS 'Contains data for finding is the type of=
 the account (asset)';
+
+
+--
+-- Name: plan_analytique_pa_id_seq; Type: SEQUENCE; Schema: public; Owne=
r: -
+--
+
+CREATE SEQUENCE plan_analytique_pa_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: plan_analytique_pa_id_seq; Type: SEQUENCE SET; Schema: public; =
Owner: -
+--
+
+SELECT pg_catalog.setval('plan_analytique_pa_id_seq', 1, false);
+
+
+--
+-- Name: plan_analytique; Type: TABLE; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+CREATE TABLE plan_analytique (
+    pa_id integer DEFAULT nextval('plan_analytique_pa_id_seq'::regclass)=
 NOT NULL,
+    pa_name text DEFAULT 'Sans Nom'::text NOT NULL,
+    pa_description text
+);
+
+
+--
+-- Name: TABLE plan_analytique; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE plan_analytique IS 'Plan Analytique (max 5)';
+
+
+--
+-- Name: poste_analytique_po_id_seq; Type: SEQUENCE; Schema: public; Own=
er: -
+--
+
+CREATE SEQUENCE poste_analytique_po_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: poste_analytique_po_id_seq; Type: SEQUENCE SET; Schema: public;=
 Owner: -
+--
+
+SELECT pg_catalog.setval('poste_analytique_po_id_seq', 1, false);
+
+
+--
+-- Name: poste_analytique; Type: TABLE; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+CREATE TABLE poste_analytique (
+    po_id integer DEFAULT nextval('poste_analytique_po_id_seq'::regclass=
) NOT NULL,
+    po_name text NOT NULL,
+    pa_id integer NOT NULL,
+    po_amount numeric(20,4) DEFAULT 0.0 NOT NULL,
+    po_description text,
+    ga_id character varying(10)
+);
+
+
+--
+-- Name: TABLE poste_analytique; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE poste_analytique IS 'Poste Analytique';
+
+
+--
+-- Name: profile; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE profile (
+    p_name text NOT NULL,
+    p_id integer NOT NULL,
+    p_desc text,
+    with_calc boolean DEFAULT true,
+    with_direct_form boolean DEFAULT true
+);
+
+
+--
+-- Name: TABLE profile; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE profile IS 'Available profile ';
+
+
+--
+-- Name: COLUMN profile.p_name; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN profile.p_name IS 'Name of the profile';
+
+
+--
+-- Name: COLUMN profile.p_desc; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON COLUMN profile.p_desc IS 'description of the profile';
+
+
+--
+-- Name: COLUMN profile.with_calc; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN profile.with_calc IS 'show the calculator';
+
+
+--
+-- Name: COLUMN profile.with_direct_form; Type: COMMENT; Schema: public;=
 Owner: -
+--
+
+COMMENT ON COLUMN profile.with_direct_form IS 'show the direct form';
+
+
+--
+-- Name: profile_menu; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE profile_menu (
+    pm_id integer NOT NULL,
+    me_code text,
+    me_code_dep text,
+    p_id integer,
+    p_order integer,
+    p_type_display text NOT NULL,
+    pm_default integer
+);
+
+
+--
+-- Name: TABLE profile_menu; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE profile_menu IS 'Join  between the profile and the menu=
 ';
+
+
+--
+-- Name: COLUMN profile_menu.me_code_dep; Type: COMMENT; Schema: public;=
 Owner: -
+--
+
+COMMENT ON COLUMN profile_menu.me_code_dep IS 'menu code dependency';
+
+
+--
+-- Name: COLUMN profile_menu.p_id; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN profile_menu.p_id IS 'link to profile';
+
+
+--
+-- Name: COLUMN profile_menu.p_order; Type: COMMENT; Schema: public; Own=
er: -
+--
+
+COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu';
+
+
+--
+-- Name: COLUMN profile_menu.p_type_display; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN profile_menu.p_type_display IS 'M is a module
+E is a menu
+S is a select (for plugin)';
+
+
+--
+-- Name: COLUMN profile_menu.pm_default; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN profile_menu.pm_default IS 'default menu';
+
+
+--
+-- Name: profile_menu_pm_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
+--
+
+CREATE SEQUENCE profile_menu_pm_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: profile_menu_pm_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
+--
+
+ALTER SEQUENCE profile_menu_pm_id_seq OWNED BY profile_menu.pm_id;
+
+
+--
+-- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
+--
+
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 778, true);
+
+
+--
+-- Name: profile_menu_type; Type: TABLE; Schema: public; Owner: -; Table=
space:=20
+--
+
+CREATE TABLE profile_menu_type (
+    pm_type text NOT NULL,
+    pm_desc text
+);
+
+
+--
+-- Name: profile_p_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE profile_p_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: profile_p_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owne=
r: -
+--
+
+ALTER SEQUENCE profile_p_id_seq OWNED BY profile.p_id;
+
+
+--
+-- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('profile_p_id_seq', 11, true);
+
+
+--
+-- Name: profile_user; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE profile_user (
+    user_name text NOT NULL,
+    pu_id integer NOT NULL,
+    p_id integer
+);
+
+
+--
+-- Name: TABLE profile_user; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE profile_user IS 'Contains the available profile for use=
rs';
+
+
+--
+-- Name: COLUMN profile_user.user_name; Type: COMMENT; Schema: public; O=
wner: -
+--
+
+COMMENT ON COLUMN profile_user.user_name IS 'fk to available_user : logi=
n';
+
+
+--
+-- Name: COLUMN profile_user.p_id; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON COLUMN profile_user.p_id IS 'fk to profile';
+
+
+--
+-- Name: profile_user_pu_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
+--
+
+CREATE SEQUENCE profile_user_pu_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: profile_user_pu_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
+--
+
+ALTER SEQUENCE profile_user_pu_id_seq OWNED BY profile_user.pu_id;
+
+
+--
+-- Name: profile_user_pu_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
+--
+
+SELECT pg_catalog.setval('profile_user_pu_id_seq', 6, true);
+
+
+--
+-- Name: quant_fin; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE quant_fin (
+    qf_id bigint NOT NULL,
+    qf_bank bigint,
+    jr_id bigint,
+    qf_other bigint,
+    qf_amount numeric(20,4) DEFAULT 0
+);
+
+
+--
+-- Name: TABLE quant_fin; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE quant_fin IS 'Simple operation for financial';
+
+
+--
+-- Name: quant_fin_qf_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE quant_fin_qf_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: quant_fin_qf_id_seq; Type: SEQUENCE OWNED BY; Schema: public; O=
wner: -
+--
+
+ALTER SEQUENCE quant_fin_qf_id_seq OWNED BY quant_fin.qf_id;
+
+
+--
+-- Name: quant_fin_qf_id_seq; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('quant_fin_qf_id_seq', 1, false);
+
+
+--
+-- Name: quant_purchase; Type: TABLE; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+CREATE TABLE quant_purchase (
+    qp_id integer DEFAULT nextval(('s_quantity'::text)::regclass) NOT NU=
LL,
+    qp_internal text,
+    j_id integer NOT NULL,
+    qp_fiche integer NOT NULL,
+    qp_quantite numeric(20,4) NOT NULL,
+    qp_price numeric(20,4),
+    qp_vat numeric(20,4) DEFAULT 0.0,
+    qp_vat_code integer,
+    qp_nd_amount numeric(20,4) DEFAULT 0.0,
+    qp_nd_tva numeric(20,4) DEFAULT 0.0,
+    qp_nd_tva_recup numeric(20,4) DEFAULT 0.0,
+    qp_supplier integer NOT NULL,
+    qp_valid character(1) DEFAULT 'Y'::bpchar NOT NULL,
+    qp_dep_priv numeric(20,4) DEFAULT 0.0,
+    qp_vat_sided numeric(20,4) DEFAULT 0.0
+);
+
+
+--
+-- Name: COLUMN quant_purchase.qp_vat_sided; Type: COMMENT; Schema: publ=
ic; Owner: -
+--
+
+COMMENT ON COLUMN quant_purchase.qp_vat_sided IS 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: quant_sold; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE quant_sold (
+    qs_id integer DEFAULT nextval(('s_quantity'::text)::regclass) NOT NU=
LL,
+    qs_internal text,
+    qs_fiche integer NOT NULL,
+    qs_quantite numeric(20,4) NOT NULL,
+    qs_price numeric(20,4),
+    qs_vat numeric(20,4),
+    qs_vat_code integer,
+    qs_client integer NOT NULL,
+    qs_valid character(1) DEFAULT 'Y'::bpchar NOT NULL,
+    j_id integer NOT NULL,
+    qs_vat_sided numeric(20,4) DEFAULT 0.0
+);
+
+
+--
+-- Name: TABLE quant_sold; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE quant_sold IS 'Contains about invoice for customer';
+
+
+--
+-- Name: s_attr_def; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_attr_def
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_attr_def; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_attr_def', 9001, false);
+
+
+--
+-- Name: s_cbc; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_cbc
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_cbc; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_cbc', 1, false);
+
+
+--
+-- Name: s_central; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_central
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_central; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_central', 1, false);
+
+
+--
+-- Name: s_central_order; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_central_order
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_central_order; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_central_order', 1, false);
+
+
+--
+-- Name: s_centralized; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_centralized
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_centralized; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_centralized', 1, false);
+
+
+--
+-- Name: s_currency; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_currency
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_currency; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_currency', 1, true);
+
+
+--
+-- Name: s_fdef; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_fdef
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_fdef; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_fdef', 6, true);
+
+
+--
+-- Name: s_fiche; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_fiche
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_fiche; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_fiche', 79, true);
+
+
+--
+-- Name: s_fiche_def_ref; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_fiche_def_ref
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_fiche_def_ref; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_fiche_def_ref', 18, true);
+
+
+--
+-- Name: s_form; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_form
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_form; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_form', 1, false);
+
+
+--
+-- Name: s_formdef; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_formdef
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_formdef; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_formdef', 1, false);
+
+
+--
+-- Name: s_grpt; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_grpt
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_grpt; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_grpt', 102, true);
+
+
+--
+-- Name: s_idef; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_idef
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_idef; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_idef', 1, false);
+
+
+--
+-- Name: s_internal; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_internal
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_internal; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_internal', 1, false);
+
+
+--
+-- Name: s_invoice; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_invoice
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_invoice; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_invoice', 1, false);
+
+
+--
+-- Name: s_isup; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_isup
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_isup; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_isup', 1, false);
+
+
+--
+-- Name: s_jnt_fic_att_value; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jnt_fic_att_value
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jnt_fic_att_value; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('s_jnt_fic_att_value', 875, true);
+
+
+--
+-- Name: s_jrn; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn', 1, false);
+
+
+--
+-- Name: s_jrn_1; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_1
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_1; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_1', 1, false);
+
+
+--
+-- Name: s_jrn_2; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_2
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_2; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_2', 1, false);
+
+
+--
+-- Name: s_jrn_3; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_3
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_3; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_3', 1, false);
+
+
+--
+-- Name: s_jrn_4; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_4
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_4; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_4', 1, false);
+
+
+--
+-- Name: s_jrn_def; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_def
+    START WITH 5
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_def; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_def', 5, false);
+
+
+--
+-- Name: s_jrn_op; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_op
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_op; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_op', 1, false);
+
+
+--
+-- Name: s_jrn_pj1; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_pj1
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_pj1; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_pj1', 1, false);
+
+
+--
+-- Name: s_jrn_pj2; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_pj2
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_pj2; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_pj2', 1, false);
+
+
+--
+-- Name: s_jrn_pj3; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_pj3
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_pj3; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_pj3', 1, false);
+
+
+--
+-- Name: s_jrn_pj4; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_pj4
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_pj4; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_pj4', 1, false);
+
+
+--
+-- Name: s_jrn_rapt; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrn_rapt
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrn_rapt; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrn_rapt', 20, true);
+
+
+--
+-- Name: s_jrnaction; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrnaction
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrnaction; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrnaction', 5, true);
+
+
+--
+-- Name: s_jrnx; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_jrnx
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_jrnx; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_jrnx', 1, false);
+
+
+--
+-- Name: s_periode; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_periode
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_periode; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_periode', 117, true);
+
+
+--
+-- Name: s_quantity; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_quantity
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_quantity; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_quantity', 13, true);
+
+
+--
+-- Name: s_stock_goods; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_stock_goods
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_stock_goods; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_stock_goods', 1, false);
+
+
+--
+-- Name: s_tva; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_tva
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_tva; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_tva', 1000, false);
+
+
+--
+-- Name: s_user_act; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_user_act
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_user_act; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_user_act', 1, false);
+
+
+--
+-- Name: s_user_jrn; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_user_jrn
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_user_jrn; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_user_jrn', 8, true);
+
+
+--
+-- Name: seq_bud_hypothese_bh_id; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE seq_bud_hypothese_bh_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_bud_hypothese_bh_id; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('seq_bud_hypothese_bh_id', 1, false);
+
+
+--
+-- Name: seq_doc_type_1; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_1
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_1; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_1', 1, false);
+
+
+--
+-- Name: seq_doc_type_10; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_10
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_10; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_10', 1, false);
+
+
+--
+-- Name: seq_doc_type_2; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_2
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_2; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_2', 1, false);
+
+
+--
+-- Name: seq_doc_type_20; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_20
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_20; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_20', 1, false);
+
+
+--
+-- Name: seq_doc_type_21; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_21
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_21; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_21', 1, false);
+
+
+--
+-- Name: seq_doc_type_22; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_22
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_22; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_22', 1, false);
+
+
+--
+-- Name: seq_doc_type_3; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_3
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_3; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_3', 1, false);
+
+
+--
+-- Name: seq_doc_type_4; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_4
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_4; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_4', 1, false);
+
+
+--
+-- Name: seq_doc_type_5; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_5
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_5; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_5', 1, false);
+
+
+--
+-- Name: seq_doc_type_6; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_6
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_6; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_6', 1, false);
+
+
+--
+-- Name: seq_doc_type_7; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_7
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_7; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_7', 1, false);
+
+
+--
+-- Name: seq_doc_type_8; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_8
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_8; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_8', 1, false);
+
+
+--
+-- Name: seq_doc_type_9; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_doc_type_9
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_doc_type_9; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_doc_type_9', 1, false);
+
+
+--
+-- Name: stock_goods; Type: TABLE; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE TABLE stock_goods (
+    sg_id integer DEFAULT nextval(('s_stock_goods'::text)::regclass) NOT=
 NULL,
+    j_id integer,
+    f_id integer,
+    sg_code text,
+    sg_quantity numeric(8,4) DEFAULT 0,
+    sg_type character(1) DEFAULT 'c'::bpchar NOT NULL,
+    sg_date date,
+    sg_tech_date date DEFAULT now(),
+    sg_tech_user text,
+    sg_comment character varying(80),
+    sg_exercice character varying(4),
+    CONSTRAINT stock_goods_sg_type CHECK (((sg_type =3D 'c'::bpchar) OR =
(sg_type =3D 'd'::bpchar)))
+);
+
+
+--
+-- Name: TABLE stock_goods; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE stock_goods IS 'About the goods';
+
+
+--
+-- Name: tmp_pcmn; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE tmp_pcmn (
+    pcm_val account_type NOT NULL,
+    pcm_lib text,
+    pcm_val_parent account_type DEFAULT 0,
+    pcm_type text
+);
+
+
+--
+-- Name: TABLE tmp_pcmn; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE tmp_pcmn IS 'Plan comptable minimum normalis=C3=A9';
+
+
+--
+-- Name: todo_list_tl_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE todo_list_tl_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: todo_list_tl_id_seq; Type: SEQUENCE SET; Schema: public; Owner:=
 -
+--
+
+SELECT pg_catalog.setval('todo_list_tl_id_seq', 1, false);
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: todo_list; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE todo_list (
+    tl_id integer DEFAULT nextval('todo_list_tl_id_seq'::regclass) NOT N=
ULL,
+    tl_date date NOT NULL,
+    tl_title text NOT NULL,
+    tl_desc text,
+    use_login text NOT NULL
+);
+
+
+--
+-- Name: TABLE todo_list; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE todo_list IS 'Todo list';
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: tva_rate; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE tva_rate (
+    tva_id integer DEFAULT nextval('s_tva'::regclass) NOT NULL,
+    tva_label text NOT NULL,
+    tva_rate numeric(8,4) DEFAULT 0.0 NOT NULL,
+    tva_comment text,
+    tva_poste text,
+    tva_both_side integer DEFAULT 0
+);
+
+
+--
+-- Name: TABLE tva_rate; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE tva_rate IS 'Rate of vat';
+
+
+--
+-- Name: user_local_pref; Type: TABLE; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+CREATE TABLE user_local_pref (
+    user_id text NOT NULL,
+    parameter_type text NOT NULL,
+    parameter_value text
+);
+
+
+--
+-- Name: TABLE user_local_pref; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE user_local_pref IS 'The user''s local parameter ';
+
+
+--
+-- Name: COLUMN user_local_pref.user_id; Type: COMMENT; Schema: public; =
Owner: -
+--
+
+COMMENT ON COLUMN user_local_pref.user_id IS 'user''s login ';
+
+
+--
+-- Name: COLUMN user_local_pref.parameter_type; Type: COMMENT; Schema: p=
ublic; Owner: -
+--
+
+COMMENT ON COLUMN user_local_pref.parameter_type IS 'the type of paramet=
er ';
+
+
+--
+-- Name: COLUMN user_local_pref.parameter_value; Type: COMMENT; Schema: =
public; Owner: -
+--
+
+COMMENT ON COLUMN user_local_pref.parameter_value IS 'the value of param=
eter ';
+
+
+--
+-- Name: user_sec_act; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE user_sec_act (
+    ua_id integer DEFAULT nextval(('s_user_act'::text)::regclass) NOT NU=
LL,
+    ua_login text,
+    ua_act_id integer
+);
+
+
+SET default_with_oids =3D false;
+
+--
+-- Name: user_sec_extension; Type: TABLE; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+CREATE TABLE user_sec_extension (
+    use_id integer NOT NULL,
+    ex_id integer NOT NULL,
+    use_login text NOT NULL,
+    use_access character(1) DEFAULT 0 NOT NULL
+);
+
+
+--
+-- Name: TABLE user_sec_extension; Type: COMMENT; Schema: public; Owner:=
 -
+--
+
+COMMENT ON TABLE user_sec_extension IS 'Security for extension';
+
+
+--
+-- Name: user_sec_extension_use_id_seq; Type: SEQUENCE; Schema: public; =
Owner: -
+--
+
+CREATE SEQUENCE user_sec_extension_use_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: user_sec_extension_use_id_seq; Type: SEQUENCE OWNED BY; Schema:=
 public; Owner: -
+--
+
+ALTER SEQUENCE user_sec_extension_use_id_seq OWNED BY user_sec_extension=
.use_id;
+
+
+--
+-- Name: user_sec_extension_use_id_seq; Type: SEQUENCE SET; Schema: publ=
ic; Owner: -
+--
+
+SELECT pg_catalog.setval('user_sec_extension_use_id_seq', 1, false);
+
+
+SET default_with_oids =3D true;
+
+--
+-- Name: user_sec_jrn; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
+--
+
+CREATE TABLE user_sec_jrn (
+    uj_id integer DEFAULT nextval(('s_user_jrn'::text)::regclass) NOT NU=
LL,
+    uj_login text,
+    uj_jrn_id integer,
+    uj_priv text
+);
+
+
+--
+-- Name: v_all_menu; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW v_all_menu AS
+    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript, mr.me_type, pm.p_id, mr.=
me_description FROM (((profile_menu pm JOIN profile_user pu ON ((pu.p_id =
=3D pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr=
 USING (me_code)) ORDER BY pm.p_order;
+
+
+--
+-- Name: version; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE TABLE version (
+    val integer
+);
+
+
+--
+-- Name: vw_client; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_client AS
+    SELECT fiche.f_id, a1.ad_value AS name, a.ad_value AS quick_code, b.=
ad_value AS tva_num, c.ad_value AS poste_comptable, d.ad_value AS rue, e.=
ad_value AS code_postal, f.ad_value AS pays, g.ad_value AS telephone, h.a=
d_value AS email FROM (((((((((((fiche JOIN fiche_def USING (fd_id)) JOIN=
 fiche_def_ref USING (frd_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fic=
he_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_deta=
il WHERE (fiche_detail.ad_id =3D 1)) a1 USING (f_id)) LEFT JOIN (SELECT f=
iche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.a=
d_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 13)) b USING (f_i=
d)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detai=
l.ad_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_i=
d =3D 23)) a USING (f_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_d=
etail.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_detail W=
HERE (fiche_detail.ad_id =3D 5)) c USING (f_id)) LEFT JOIN (SELECT fiche_=
detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_val=
ue FROM fiche_detail WHERE (fiche_detail.ad_id =3D 14)) d USING (f_id)) L=
EFT JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_=
id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D=
 15)) e USING (f_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_detail=
.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_detail WHERE =
(fiche_detail.ad_id =3D 16)) f USING (f_id)) LEFT JOIN (SELECT fiche_deta=
il.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_value F=
ROM fiche_detail WHERE (fiche_detail.ad_id =3D 17)) g USING (f_id)) LEFT =
JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, =
fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 18)=
) h USING (f_id)) WHERE (fiche_def_ref.frd_id =3D 9);
+
+
+--
+-- Name: vw_fiche_attr; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_fiche_attr AS
+    SELECT a.f_id, a.fd_id, a.ad_value AS vw_name, k.ad_value AS vw_firs=
t_name, b.ad_value AS vw_sell, c.ad_value AS vw_buy, d.ad_value AS tva_co=
de, tva_rate.tva_id, tva_rate.tva_rate, tva_rate.tva_label, e.ad_value AS=
 vw_addr, f.ad_value AS vw_cp, j.ad_value AS quick_code, h.ad_value AS vw=
_description, i.ad_value AS tva_num, fiche_def.frd_id FROM ((((((((((((SE=
LECT fiche.f_id, fiche.fd_id, fiche_detail.ad_value FROM (fiche LEFT JOIN=
 fiche_detail USING (f_id)) WHERE (fiche_detail.ad_id =3D 1)) a LEFT JOIN=
 (SELECT fiche_detail.f_id, fiche_detail.ad_value FROM fiche_detail WHERE=
 (fiche_detail.ad_id =3D 6)) b ON ((a.f_id =3D b.f_id))) LEFT JOIN (SELEC=
T fiche_detail.f_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche=
_detail.ad_id =3D 7)) c ON ((a.f_id =3D c.f_id))) LEFT JOIN (SELECT fiche=
_detail.f_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail=
.ad_id =3D 2)) d ON ((a.f_id =3D d.f_id))) LEFT JOIN (SELECT fiche_detail=
.f_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =
=3D 14)) e ON ((a.f_id =3D e.f_id))) LEFT JOIN (SELECT fiche_detail.f_id,=
 fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 15=
)) f ON ((a.f_id =3D f.f_id))) LEFT JOIN (SELECT fiche_detail.f_id, fiche=
_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 23)) j O=
N ((a.f_id =3D j.f_id))) LEFT JOIN (SELECT fiche_detail.f_id, fiche_detai=
l.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 9)) h ON ((a.f=
_id =3D h.f_id))) LEFT JOIN (SELECT fiche_detail.f_id, fiche_detail.ad_va=
lue FROM fiche_detail WHERE (fiche_detail.ad_id =3D 13)) i ON ((a.f_id =3D=
 i.f_id))) LEFT JOIN (SELECT fiche_detail.f_id, fiche_detail.ad_value FRO=
M fiche_detail WHERE (fiche_detail.ad_id =3D 32)) k ON ((a.f_id =3D k.f_i=
d))) LEFT JOIN tva_rate ON ((d.ad_value =3D (tva_rate.tva_id)::text))) JO=
IN fiche_def USING (fd_id));
+
+
+--
+-- Name: vw_fiche_def; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_fiche_def AS
+    SELECT jnt_fic_attr.fd_id, jnt_fic_attr.ad_id, attr_def.ad_text, fic=
he_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_create_account, fi=
che_def.frd_id FROM ((fiche_def JOIN jnt_fic_attr USING (fd_id)) JOIN att=
r_def ON ((attr_def.ad_id =3D jnt_fic_attr.ad_id)));
+
+
+--
+-- Name: VIEW vw_fiche_def; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON VIEW vw_fiche_def IS 'all the attributs for	card family';
+
+
+--
+-- Name: vw_fiche_min; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_fiche_min AS
+    SELECT attr_min.frd_id, attr_min.ad_id, attr_def.ad_text, fiche_def_=
ref.frd_text, fiche_def_ref.frd_class_base FROM ((attr_min JOIN attr_def =
USING (ad_id)) JOIN fiche_def_ref USING (frd_id));
+
+
+--
+-- Name: vw_fiche_name; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_fiche_name AS
+    SELECT fiche_detail.f_id, fiche_detail.ad_value AS name FROM fiche_d=
etail WHERE (fiche_detail.ad_id =3D 1);
+
+
+--
+-- Name: vw_poste_qcode; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_poste_qcode AS
+    SELECT c.f_id, a.ad_value AS j_poste, b.ad_value AS j_qcode FROM ((f=
iche c LEFT JOIN (SELECT fiche_detail.f_id, fiche_detail.ad_value FROM fi=
che_detail WHERE (fiche_detail.ad_id =3D 5)) a USING (f_id)) LEFT JOIN (S=
ELECT fiche_detail.f_id, fiche_detail.ad_value FROM fiche_detail WHERE (f=
iche_detail.ad_id =3D 23)) b USING (f_id));
+
+
+--
+-- Name: vw_supplier; Type: VIEW; Schema: public; Owner: -
+--
+
+CREATE VIEW vw_supplier AS
+    SELECT fiche.f_id, a1.ad_value AS name, a.ad_value AS quick_code, b.=
ad_value AS tva_num, c.ad_value AS poste_comptable, d.ad_value AS rue, e.=
ad_value AS code_postal, f.ad_value AS pays, g.ad_value AS telephone, h.a=
d_value AS email FROM (((((((((((fiche JOIN fiche_def USING (fd_id)) JOIN=
 fiche_def_ref USING (frd_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fic=
he_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_deta=
il WHERE (fiche_detail.ad_id =3D 1)) a1 USING (f_id)) LEFT JOIN (SELECT f=
iche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.a=
d_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 13)) b USING (f_i=
d)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detai=
l.ad_id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_i=
d =3D 23)) a USING (f_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_d=
etail.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_detail W=
HERE (fiche_detail.ad_id =3D 5)) c USING (f_id)) LEFT JOIN (SELECT fiche_=
detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_val=
ue FROM fiche_detail WHERE (fiche_detail.ad_id =3D 14)) d USING (f_id)) L=
EFT JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_=
id, fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D=
 15)) e USING (f_id)) LEFT JOIN (SELECT fiche_detail.jft_id, fiche_detail=
.f_id, fiche_detail.ad_id, fiche_detail.ad_value FROM fiche_detail WHERE =
(fiche_detail.ad_id =3D 16)) f USING (f_id)) LEFT JOIN (SELECT fiche_deta=
il.jft_id, fiche_detail.f_id, fiche_detail.ad_id, fiche_detail.ad_value F=
ROM fiche_detail WHERE (fiche_detail.ad_id =3D 17)) g USING (f_id)) LEFT =
JOIN (SELECT fiche_detail.jft_id, fiche_detail.f_id, fiche_detail.ad_id, =
fiche_detail.ad_value FROM fiche_detail WHERE (fiche_detail.ad_id =3D 18)=
) h USING (f_id)) WHERE (fiche_def_ref.frd_id =3D 8);
+
+
+--
+-- Name: ad_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY action_detail ALTER COLUMN ad_id SET DEFAULT nextval('a=
ction_detail_ad_id_seq'::regclass);
+
+
+--
+-- Name: del_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY del_action ALTER COLUMN del_id SET DEFAULT nextval('del=
_action_del_id_seq'::regclass);
+
+
+--
+-- Name: dj_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY del_jrn ALTER COLUMN dj_id SET DEFAULT nextval('del_jrn=
_dj_id_seq'::regclass);
+
+
+--
+-- Name: djx_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY del_jrnx ALTER COLUMN djx_id SET DEFAULT nextval('del_j=
rnx_djx_id_seq'::regclass);
+
+
+--
+-- Name: ex_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY extension ALTER COLUMN ex_id SET DEFAULT nextval('exten=
sion_ex_id_seq'::regclass);
+
+
+--
+-- Name: f_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast ALTER COLUMN f_id SET DEFAULT nextval('forecas=
t_f_id_seq'::regclass);
+
+
+--
+-- Name: fc_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_cat ALTER COLUMN fc_id SET DEFAULT nextval('fo=
recast_cat_fc_id_seq'::regclass);
+
+
+--
+-- Name: fi_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_item ALTER COLUMN fi_id SET DEFAULT nextval('f=
orecast_item_fi_id_seq'::regclass);
+
+
+--
+-- Name: jl_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jnt_letter ALTER COLUMN jl_id SET DEFAULT nextval('jnt_=
letter_jl_id_seq'::regclass);
+
+
+--
+-- Name: ji_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_info ALTER COLUMN ji_id SET DEFAULT nextval('jrn_in=
fo_ji_id_seq'::regclass);
+
+
+--
+-- Name: n_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_note ALTER COLUMN n_id SET DEFAULT nextval('jrn_not=
e_n_id_seq'::regclass);
+
+
+--
+-- Name: lc_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_cred ALTER COLUMN lc_id SET DEFAULT nextval('let=
ter_cred_lc_id_seq'::regclass);
+
+
+--
+-- Name: ld_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_deb ALTER COLUMN ld_id SET DEFAULT nextval('lett=
er_deb_ld_id_seq'::regclass);
+
+
+--
+-- Name: mp_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY mod_payment ALTER COLUMN mp_id SET DEFAULT nextval('mod=
_payment_mp_id_seq'::regclass);
+
+
+--
+-- Name: p_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY profile ALTER COLUMN p_id SET DEFAULT nextval('profile_=
p_id_seq'::regclass);
+
+
+--
+-- Name: pm_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY profile_menu ALTER COLUMN pm_id SET DEFAULT nextval('pr=
ofile_menu_pm_id_seq'::regclass);
+
+
+--
+-- Name: pu_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY profile_user ALTER COLUMN pu_id SET DEFAULT nextval('pr=
ofile_user_pu_id_seq'::regclass);
+
+
+--
+-- Name: qf_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_fin ALTER COLUMN qf_id SET DEFAULT nextval('quant=
_fin_qf_id_seq'::regclass);
+
+
+--
+-- Name: use_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY user_sec_extension ALTER COLUMN use_id SET DEFAULT next=
val('user_sec_extension_use_id_seq'::regclass);
+
+
+--
+-- Data for Name: action; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO action VALUES (800, 'Ajout de fiche', 'fiche', 'FICADD');
+INSERT INTO action VALUES (805, 'Cr=C3=A9ation, modification et effaceme=
nt de fiche', 'fiche', 'FIC');
+INSERT INTO action VALUES (910, 'cr=C3=A9ation, modification et effaceme=
nt de cat=C3=A9gorie de fiche', 'fiche', 'FICCAT');
+INSERT INTO action VALUES (1020, 'Effacer les documents du suivi', 'foll=
owup', 'RMDOC');
+INSERT INTO action VALUES (1010, 'Voir les documents du suivi', 'followu=
p', 'VIEWDOC');
+INSERT INTO action VALUES (1050, 'Modifier le type de document', 'follow=
up', 'PARCATDOC');
+
+
+--
+-- Data for Name: action_detail; Type: TABLE DATA; Schema: public; Owner=
: -
+--
+
+
+
+--
+-- Data for Name: action_gestion; Type: TABLE DATA; Schema: public; Owne=
r: -
+--
+
+
+
+--
+-- Data for Name: attr_def; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO attr_def VALUES (20, 'Partie fiscalement non d=C3=A9ductible=
', 'numeric', '22');
+INSERT INTO attr_def VALUES (10, 'Date d=C3=A9but', 'date', '8');
+INSERT INTO attr_def VALUES (6, 'Prix vente', 'numeric', '6');
+INSERT INTO attr_def VALUES (7, 'Prix achat', 'numeric', '6');
+INSERT INTO attr_def VALUES (8, 'Dur=C3=A9e Amortissement', 'numeric', '=
6');
+INSERT INTO attr_def VALUES (11, 'Montant initial', 'numeric', '6');
+INSERT INTO attr_def VALUES (21, 'TVA non d=C3=A9ductible', 'numeric', '=
6');
+INSERT INTO attr_def VALUES (22, 'TVA non d=C3=A9ductible r=C3=A9cup=C3=A9=
rable par l''imp=C3=B4t', 'numeric', '6');
+INSERT INTO attr_def VALUES (1, 'Nom', 'text', '22');
+INSERT INTO attr_def VALUES (2, 'Taux TVA', 'text', '22');
+INSERT INTO attr_def VALUES (3, 'Num=C3=A9ro de compte', 'text', '22');
+INSERT INTO attr_def VALUES (4, 'Nom de la banque', 'text', '22');
+INSERT INTO attr_def VALUES (5, 'Poste Comptable', 'text', '22');
+INSERT INTO attr_def VALUES (9, 'Description', 'text', '22');
+INSERT INTO attr_def VALUES (12, 'Personne de contact ', 'text', '22');
+INSERT INTO attr_def VALUES (13, 'num=C3=A9ro de tva ', 'text', '22');
+INSERT INTO attr_def VALUES (14, 'Adresse ', 'text', '22');
+INSERT INTO attr_def VALUES (16, 'pays ', 'text', '22');
+INSERT INTO attr_def VALUES (17, 't=C3=A9l=C3=A9phone ', 'text', '22');
+INSERT INTO attr_def VALUES (18, 'email ', 'text', '22');
+INSERT INTO attr_def VALUES (19, 'Gestion stock', 'text', '22');
+INSERT INTO attr_def VALUES (23, 'Quick Code', 'text', '22');
+INSERT INTO attr_def VALUES (24, 'Ville', 'text', '22');
+INSERT INTO attr_def VALUES (25, 'Soci=C3=A9t=C3=A9', 'text', '22');
+INSERT INTO attr_def VALUES (26, 'Fax', 'text', '22');
+INSERT INTO attr_def VALUES (27, 'GSM', 'text', '22');
+INSERT INTO attr_def VALUES (15, 'code postal', 'text', '22');
+INSERT INTO attr_def VALUES (30, 'Numero de client', 'text', '22');
+INSERT INTO attr_def VALUES (32, 'Pr=C3=A9nom', 'text', '22');
+INSERT INTO attr_def VALUES (31, 'D=C3=A9pense  charge du grant (partie =
priv=C3=A9) ', 'text', '22');
+INSERT INTO attr_def VALUES (50, 'Contrepartie pour TVA r=C3=A9cup par i=
mpot', 'poste', '22');
+INSERT INTO attr_def VALUES (51, 'Contrepartie pour TVA non Ded.', 'post=
e', '22');
+INSERT INTO attr_def VALUES (52, 'Contrepartie pour d=C3=A9pense =C3=A0 =
charge du g=C3=A9rant', 'poste', '22');
+INSERT INTO attr_def VALUES (53, 'Contrepartie pour d=C3=A9pense fiscal.=
 non d=C3=A9d.', 'poste', '22');
+
+
+--
+-- Data for Name: attr_min; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO attr_min VALUES (1, 1);
+INSERT INTO attr_min VALUES (1, 2);
+INSERT INTO attr_min VALUES (2, 1);
+INSERT INTO attr_min VALUES (2, 2);
+INSERT INTO attr_min VALUES (3, 1);
+INSERT INTO attr_min VALUES (3, 2);
+INSERT INTO attr_min VALUES (4, 1);
+INSERT INTO attr_min VALUES (4, 3);
+INSERT INTO attr_min VALUES (4, 4);
+INSERT INTO attr_min VALUES (4, 12);
+INSERT INTO attr_min VALUES (4, 13);
+INSERT INTO attr_min VALUES (4, 14);
+INSERT INTO attr_min VALUES (4, 15);
+INSERT INTO attr_min VALUES (4, 16);
+INSERT INTO attr_min VALUES (4, 17);
+INSERT INTO attr_min VALUES (4, 18);
+INSERT INTO attr_min VALUES (8, 1);
+INSERT INTO attr_min VALUES (8, 12);
+INSERT INTO attr_min VALUES (8, 13);
+INSERT INTO attr_min VALUES (8, 14);
+INSERT INTO attr_min VALUES (8, 15);
+INSERT INTO attr_min VALUES (8, 16);
+INSERT INTO attr_min VALUES (8, 17);
+INSERT INTO attr_min VALUES (8, 18);
+INSERT INTO attr_min VALUES (9, 1);
+INSERT INTO attr_min VALUES (9, 12);
+INSERT INTO attr_min VALUES (9, 13);
+INSERT INTO attr_min VALUES (9, 14);
+INSERT INTO attr_min VALUES (9, 16);
+INSERT INTO attr_min VALUES (9, 17);
+INSERT INTO attr_min VALUES (9, 18);
+INSERT INTO attr_min VALUES (1, 6);
+INSERT INTO attr_min VALUES (1, 7);
+INSERT INTO attr_min VALUES (2, 6);
+INSERT INTO attr_min VALUES (2, 7);
+INSERT INTO attr_min VALUES (3, 7);
+INSERT INTO attr_min VALUES (1, 19);
+INSERT INTO attr_min VALUES (2, 19);
+INSERT INTO attr_min VALUES (14, 1);
+INSERT INTO attr_min VALUES (5, 1);
+INSERT INTO attr_min VALUES (5, 4);
+INSERT INTO attr_min VALUES (5, 10);
+INSERT INTO attr_min VALUES (5, 12);
+INSERT INTO attr_min VALUES (6, 1);
+INSERT INTO attr_min VALUES (6, 4);
+INSERT INTO attr_min VALUES (6, 10);
+INSERT INTO attr_min VALUES (6, 12);
+INSERT INTO attr_min VALUES (10, 1);
+INSERT INTO attr_min VALUES (10, 12);
+INSERT INTO attr_min VALUES (11, 1);
+INSERT INTO attr_min VALUES (11, 12);
+INSERT INTO attr_min VALUES (12, 1);
+INSERT INTO attr_min VALUES (12, 12);
+INSERT INTO attr_min VALUES (13, 1);
+INSERT INTO attr_min VALUES (13, 9);
+INSERT INTO attr_min VALUES (7, 1);
+INSERT INTO attr_min VALUES (7, 8);
+INSERT INTO attr_min VALUES (7, 9);
+INSERT INTO attr_min VALUES (7, 10);
+INSERT INTO attr_min VALUES (5, 11);
+INSERT INTO attr_min VALUES (6, 11);
+INSERT INTO attr_min VALUES (1, 15);
+INSERT INTO attr_min VALUES (9, 15);
+INSERT INTO attr_min VALUES (15, 1);
+INSERT INTO attr_min VALUES (15, 9);
+INSERT INTO attr_min VALUES (1, 23);
+INSERT INTO attr_min VALUES (2, 23);
+INSERT INTO attr_min VALUES (3, 23);
+INSERT INTO attr_min VALUES (4, 23);
+INSERT INTO attr_min VALUES (5, 23);
+INSERT INTO attr_min VALUES (6, 23);
+INSERT INTO attr_min VALUES (8, 23);
+INSERT INTO attr_min VALUES (9, 23);
+INSERT INTO attr_min VALUES (10, 23);
+INSERT INTO attr_min VALUES (11, 23);
+INSERT INTO attr_min VALUES (12, 23);
+INSERT INTO attr_min VALUES (13, 23);
+INSERT INTO attr_min VALUES (14, 23);
+INSERT INTO attr_min VALUES (15, 23);
+INSERT INTO attr_min VALUES (7, 23);
+INSERT INTO attr_min VALUES (9, 24);
+INSERT INTO attr_min VALUES (8, 24);
+INSERT INTO attr_min VALUES (14, 24);
+INSERT INTO attr_min VALUES (16, 1);
+INSERT INTO attr_min VALUES (16, 17);
+INSERT INTO attr_min VALUES (16, 18);
+INSERT INTO attr_min VALUES (16, 25);
+INSERT INTO attr_min VALUES (16, 26);
+INSERT INTO attr_min VALUES (16, 27);
+INSERT INTO attr_min VALUES (16, 23);
+INSERT INTO attr_min VALUES (17, 1);
+INSERT INTO attr_min VALUES (17, 9);
+INSERT INTO attr_min VALUES (18, 1);
+INSERT INTO attr_min VALUES (18, 9);
+INSERT INTO attr_min VALUES (25, 1);
+INSERT INTO attr_min VALUES (25, 4);
+INSERT INTO attr_min VALUES (25, 3);
+INSERT INTO attr_min VALUES (25, 5);
+INSERT INTO attr_min VALUES (25, 15);
+INSERT INTO attr_min VALUES (25, 16);
+INSERT INTO attr_min VALUES (25, 24);
+INSERT INTO attr_min VALUES (25, 23);
+INSERT INTO attr_min VALUES (2, 30);
+
+
+--
+-- Data for Name: bilan; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO bilan VALUES (5, 'Comptes de r=C3=A9sultat', 'document/fr_fr=
/fr_plan_abrege_perso_cr1000.rtf', 'document/fr_fr/fr_plan_abrege_perso_c=
r1000.form', 'rtf');
+INSERT INTO bilan VALUES (1, 'Bilan fran=C3=A7ais', 'document/fr_fr/fr_p=
lan_abrege_perso_bil10000.ods', 'document/fr_fr/fr_plan_abrege_perso_bil1=
0000.form', 'ods');
+
+
+--
+-- Data for Name: centralized; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+
+
+--
+-- Data for Name: del_action; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: del_jrn; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: del_jrnx; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: document; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: document_modele; Type: TABLE DATA; Schema: public; Own=
er: -
+--
+
+
+
+--
+-- Data for Name: document_state; Type: TABLE DATA; Schema: public; Owne=
r: -
+--
+
+INSERT INTO document_state VALUES (1, 'Cl=C3=B4tur=C3=A9');
+INSERT INTO document_state VALUES (2, 'A suivre');
+INSERT INTO document_state VALUES (3, 'A faire');
+INSERT INTO document_state VALUES (4, 'Abandonn=C3=A9');
+
+
+--
+-- Data for Name: document_type; Type: TABLE DATA; Schema: public; Owner=
: -
+--
+
+INSERT INTO document_type VALUES (1, 'Document Interne');
+INSERT INTO document_type VALUES (2, 'Bons de commande client');
+INSERT INTO document_type VALUES (3, 'Bon de commande Fournisseur');
+INSERT INTO document_type VALUES (4, 'Facture');
+INSERT INTO document_type VALUES (5, 'Lettre de rappel');
+INSERT INTO document_type VALUES (6, 'Courrier');
+INSERT INTO document_type VALUES (7, 'Proposition');
+INSERT INTO document_type VALUES (8, 'Email');
+INSERT INTO document_type VALUES (9, 'Divers');
+INSERT INTO document_type VALUES (10, 'Note de frais');
+INSERT INTO document_type VALUES (20, 'R=C3=A9ception commande Fournisse=
ur');
+INSERT INTO document_type VALUES (21, 'R=C3=A9ception commande Client');
+INSERT INTO document_type VALUES (22, 'R=C3=A9ception magazine');
+
+
+--
+-- Data for Name: extension; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: fiche; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: fiche_def; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO fiche_def VALUES (2, '400', 'Client', true, 9);
+INSERT INTO fiche_def VALUES (1, '604', 'Marchandises', true, 2);
+INSERT INTO fiche_def VALUES (3, '5500', 'Banque', true, 4);
+INSERT INTO fiche_def VALUES (4, '440', 'Fournisseur', true, 8);
+INSERT INTO fiche_def VALUES (5, '61', 'S & B D', true, 3);
+INSERT INTO fiche_def VALUES (6, '700', 'Vente', true, 1);
+
+
+--
+-- Data for Name: fiche_def_ref; Type: TABLE DATA; Schema: public; Owner=
: -
+--
+
+INSERT INTO fiche_def_ref VALUES (13, 'D=C3=A9penses non admises', '674'=
);
+INSERT INTO fiche_def_ref VALUES (14, 'Administration des Finances', NUL=
L);
+INSERT INTO fiche_def_ref VALUES (15, 'Autres fiches', NULL);
+INSERT INTO fiche_def_ref VALUES (4, 'Banque', '51');
+INSERT INTO fiche_def_ref VALUES (5, 'Pr=C3=AAt > a un an', '27');
+INSERT INTO fiche_def_ref VALUES (8, 'Fournisseurs', '400');
+INSERT INTO fiche_def_ref VALUES (6, 'Pr=C3=AAt < a un an', NULL);
+INSERT INTO fiche_def_ref VALUES (16, 'Contact', NULL);
+INSERT INTO fiche_def_ref VALUES (1, 'Vente Service', '706');
+INSERT INTO fiche_def_ref VALUES (2, 'Achat Marchandises', '603');
+INSERT INTO fiche_def_ref VALUES (9, 'Clients', '410');
+INSERT INTO fiche_def_ref VALUES (10, 'Salaire Administrateur', '644');
+INSERT INTO fiche_def_ref VALUES (11, 'Salaire Ouvrier', '641');
+INSERT INTO fiche_def_ref VALUES (12, 'Salaire Employ=C3=A9', '641');
+INSERT INTO fiche_def_ref VALUES (7, 'Mat=C3=A9riel =C3=A0 amortir, immo=
bilisation corporelle', '21');
+INSERT INTO fiche_def_ref VALUES (3, 'Achat Service et biens divers', '6=
1');
+INSERT INTO fiche_def_ref VALUES (17, 'Escomptes accord=C3=A9es', '66');
+INSERT INTO fiche_def_ref VALUES (18, 'Produits Financiers', '76');
+INSERT INTO fiche_def_ref VALUES (25, 'Compte Salari=C3=A9 / Administrat=
eur', NULL);
+
+
+--
+-- Data for Name: fiche_detail; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+
+
+--
+-- Data for Name: forecast; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: forecast_cat; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+
+
+--
+-- Data for Name: forecast_item; Type: TABLE DATA; Schema: public; Owner=
: -
+--
+
+
+
+--
+-- Data for Name: form; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO form VALUES (3000398, 3000000, 1, 'Prestation [ case 03 ]', =
'[700%]-[7000005]');
+INSERT INTO form VALUES (3000399, 3000000, 2, 'Prestation intra [ case 4=
7 ]', '[7000005]');
+INSERT INTO form VALUES (3000400, 3000000, 3, 'Tva due   [case 54]', '[4=
513]+[4512]+[4511] FROM=3D01.2005');
+INSERT INTO form VALUES (3000401, 3000000, 4, 'Marchandises, mati=C3=A8r=
e premi=C3=A8re et auxiliaire [case 81 ]', '[60%]');
+INSERT INTO form VALUES (3000402, 3000000, 7, 'Service et bien divers [c=
ase 82]', '[61%]');
+INSERT INTO form VALUES (3000403, 3000000, 8, 'bien d''invest [ case 83 =
]', '[2400%]');
+INSERT INTO form VALUES (3000404, 3000000, 9, 'TVA d=C3=A9ductible [ cas=
e 59 ]', 'abs([4117]-[411%])');
+INSERT INTO form VALUES (3000405, 3000000, 8, 'TVA non ded -> voiture', =
'[610022]*0.21/2');
+INSERT INTO form VALUES (3000406, 3000000, 9, 'Acompte TVA', '[4117]');
+
+
+--
+-- Data for Name: formdef; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO formdef VALUES (3000000, 'TVA d=C3=A9claration Belge');
+
+
+--
+-- Data for Name: groupe_analytique; Type: TABLE DATA; Schema: public; O=
wner: -
+--
+
+
+
+--
+-- Data for Name: info_def; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO info_def VALUES ('BON_COMMANDE', 'Numero de bon de commande'=
);
+INSERT INTO info_def VALUES ('OTHER', 'Info diverses');
+
+
+--
+-- Data for Name: jnt_fic_attr; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+INSERT INTO jnt_fic_attr VALUES (1, 2, 3, 1);
+INSERT INTO jnt_fic_attr VALUES (2, 12, 8, 1);
+INSERT INTO jnt_fic_attr VALUES (3, 3, 17, 1);
+INSERT INTO jnt_fic_attr VALUES (4, 12, 28, 1);
+INSERT INTO jnt_fic_attr VALUES (5, 2, 37, 1);
+INSERT INTO jnt_fic_attr VALUES (6, 2, 41, 1);
+INSERT INTO jnt_fic_attr VALUES (1, 6, 4, 120);
+INSERT INTO jnt_fic_attr VALUES (6, 6, 42, 120);
+INSERT INTO jnt_fic_attr VALUES (1, 7, 5, 130);
+INSERT INTO jnt_fic_attr VALUES (5, 7, 38, 130);
+INSERT INTO jnt_fic_attr VALUES (6, 7, 43, 130);
+INSERT INTO jnt_fic_attr VALUES (2, 14, 10, 40);
+INSERT INTO jnt_fic_attr VALUES (3, 14, 21, 40);
+INSERT INTO jnt_fic_attr VALUES (4, 14, 30, 40);
+INSERT INTO jnt_fic_attr VALUES (2, 16, 12, 70);
+INSERT INTO jnt_fic_attr VALUES (3, 16, 23, 70);
+INSERT INTO jnt_fic_attr VALUES (4, 16, 32, 70);
+INSERT INTO jnt_fic_attr VALUES (2, 17, 13, 80);
+INSERT INTO jnt_fic_attr VALUES (3, 17, 24, 80);
+INSERT INTO jnt_fic_attr VALUES (4, 17, 33, 80);
+INSERT INTO jnt_fic_attr VALUES (2, 18, 14, 90);
+INSERT INTO jnt_fic_attr VALUES (3, 18, 25, 90);
+INSERT INTO jnt_fic_attr VALUES (4, 18, 34, 90);
+INSERT INTO jnt_fic_attr VALUES (2, 23, 45, 400);
+INSERT INTO jnt_fic_attr VALUES (1, 23, 46, 400);
+INSERT INTO jnt_fic_attr VALUES (3, 23, 47, 400);
+INSERT INTO jnt_fic_attr VALUES (4, 23, 48, 400);
+INSERT INTO jnt_fic_attr VALUES (5, 23, 49, 400);
+INSERT INTO jnt_fic_attr VALUES (6, 23, 50, 400);
+INSERT INTO jnt_fic_attr VALUES (2, 24, 51, 60);
+INSERT INTO jnt_fic_attr VALUES (4, 24, 52, 60);
+INSERT INTO jnt_fic_attr VALUES (2, 15, 11, 50);
+INSERT INTO jnt_fic_attr VALUES (3, 15, 22, 50);
+INSERT INTO jnt_fic_attr VALUES (4, 15, 31, 50);
+INSERT INTO jnt_fic_attr VALUES (1, 5, 1, 30);
+INSERT INTO jnt_fic_attr VALUES (2, 5, 6, 30);
+INSERT INTO jnt_fic_attr VALUES (3, 5, 15, 30);
+INSERT INTO jnt_fic_attr VALUES (4, 5, 26, 30);
+INSERT INTO jnt_fic_attr VALUES (5, 5, 35, 30);
+INSERT INTO jnt_fic_attr VALUES (6, 5, 39, 30);
+INSERT INTO jnt_fic_attr VALUES (1, 1, 2, 0);
+INSERT INTO jnt_fic_attr VALUES (2, 1, 7, 0);
+INSERT INTO jnt_fic_attr VALUES (3, 1, 16, 0);
+INSERT INTO jnt_fic_attr VALUES (4, 1, 27, 0);
+INSERT INTO jnt_fic_attr VALUES (5, 1, 36, 0);
+INSERT INTO jnt_fic_attr VALUES (6, 1, 40, 0);
+INSERT INTO jnt_fic_attr VALUES (3, 4, 18, 2);
+INSERT INTO jnt_fic_attr VALUES (3, 12, 19, 3);
+INSERT INTO jnt_fic_attr VALUES (6, 19, 44, 2);
+INSERT INTO jnt_fic_attr VALUES (2, 13, 9, 31);
+INSERT INTO jnt_fic_attr VALUES (3, 13, 20, 31);
+INSERT INTO jnt_fic_attr VALUES (4, 13, 29, 31);
+
+
+--
+-- Data for Name: jnt_letter; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn_action; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO jrn_action VALUES (2, 'Voir', 'Voir toutes les factures', 'u=
ser_jrn.php', 'action=3Dvoir_jrn', 'FR', 'VEN');
+INSERT INTO jrn_action VALUES (4, 'Voir Impay=C3=A9s', 'Voir toutes les =
factures non pay=C3=A9es', 'user_jrn.php', 'action=3Dvoir_jrn_non_paye', =
'FR', 'VEN');
+INSERT INTO jrn_action VALUES (1, 'Nouvelle', 'Cr=C3=A9ation d''une fact=
ure', 'user_jrn.php', 'action=3Dinsert_vente&blank', 'FR', 'VEN');
+INSERT INTO jrn_action VALUES (10, 'Nouveau', 'Encode un nouvel achat (m=
at=C3=A9riel, marchandises, services et biens divers)', 'user_jrn.php', '=
action=3Dnew&blank', 'FR', 'ACH');
+INSERT INTO jrn_action VALUES (12, 'Voir', 'Voir toutes les factures', '=
user_jrn.php', 'action=3Dvoir_jrn', 'FR', 'ACH');
+INSERT INTO jrn_action VALUES (14, 'Voir Impay=C3=A9s', 'Voir toutes les=
 factures non pay=C3=A9es', 'user_jrn.php', 'action=3Dvoir_jrn_non_paye',=
 'FR', 'ACH');
+INSERT INTO jrn_action VALUES (20, 'Nouveau', 'Encode un nouvel achat (m=
at=C3=A9riel, marchandises, services et biens divers)', 'user_jrn.php', '=
action=3Dnew&blank', 'FR', 'FIN');
+INSERT INTO jrn_action VALUES (22, 'Voir', 'Voir toutes les factures', '=
user_jrn.php', 'action=3Dvoir_jrn', 'FR', 'FIN');
+INSERT INTO jrn_action VALUES (40, 'Soldes', 'Voir les soldes des compte=
s en banques', 'user_jrn.php', 'action=3Dsolde', 'FR', 'FIN');
+INSERT INTO jrn_action VALUES (30, 'Nouveau', NULL, 'user_jrn.php', 'act=
ion=3Dnew&blank', 'FR', 'ODS');
+INSERT INTO jrn_action VALUES (32, 'Voir', 'Voir toutes les factures', '=
user_jrn.php', 'action=3Dvoir_jrn', 'FR', 'ODS');
+
+
+--
+-- Data for Name: jrn_def; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO jrn_def VALUES (4, 'Op=C3=A9ration Diverses', NULL, NULL, NU=
LL, NULL, 5, 5, false, NULL, 'ODS', 'O01', 'ODS', NULL, NULL);
+INSERT INTO jrn_def VALUES (2, 'Vente', '', '', '2', '6', 10, 10, true, =
'''echeance''', 'VEN', 'V01', 'VEN', NULL, NULL);
+INSERT INTO jrn_def VALUES (3, 'Achat', '', '', '5', '4', 10, 10, true, =
'''echeance''', 'ACH', 'A01', 'ACH', NULL, NULL);
+INSERT INTO jrn_def VALUES (1, 'Financier', '', '', '3,2,4,5', '3,2,4,5'=
, 10, 10, true, '''echeance''', 'FIN', 'F01', 'FIN', NULL, NULL);
+
+
+--
+-- Data for Name: jrn_info; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn_note; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn_periode; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+INSERT INTO jrn_periode VALUES (4, 105, 'OP');
+INSERT INTO jrn_periode VALUES (2, 105, 'OP');
+INSERT INTO jrn_periode VALUES (3, 105, 'OP');
+INSERT INTO jrn_periode VALUES (1, 105, 'OP');
+INSERT INTO jrn_periode VALUES (4, 106, 'OP');
+INSERT INTO jrn_periode VALUES (2, 106, 'OP');
+INSERT INTO jrn_periode VALUES (3, 106, 'OP');
+INSERT INTO jrn_periode VALUES (1, 106, 'OP');
+INSERT INTO jrn_periode VALUES (4, 107, 'OP');
+INSERT INTO jrn_periode VALUES (2, 107, 'OP');
+INSERT INTO jrn_periode VALUES (3, 107, 'OP');
+INSERT INTO jrn_periode VALUES (1, 107, 'OP');
+INSERT INTO jrn_periode VALUES (4, 108, 'OP');
+INSERT INTO jrn_periode VALUES (2, 108, 'OP');
+INSERT INTO jrn_periode VALUES (3, 108, 'OP');
+INSERT INTO jrn_periode VALUES (1, 108, 'OP');
+INSERT INTO jrn_periode VALUES (4, 109, 'OP');
+INSERT INTO jrn_periode VALUES (2, 109, 'OP');
+INSERT INTO jrn_periode VALUES (3, 109, 'OP');
+INSERT INTO jrn_periode VALUES (1, 109, 'OP');
+INSERT INTO jrn_periode VALUES (4, 110, 'OP');
+INSERT INTO jrn_periode VALUES (2, 110, 'OP');
+INSERT INTO jrn_periode VALUES (3, 110, 'OP');
+INSERT INTO jrn_periode VALUES (1, 110, 'OP');
+INSERT INTO jrn_periode VALUES (4, 111, 'OP');
+INSERT INTO jrn_periode VALUES (2, 111, 'OP');
+INSERT INTO jrn_periode VALUES (3, 111, 'OP');
+INSERT INTO jrn_periode VALUES (1, 111, 'OP');
+INSERT INTO jrn_periode VALUES (4, 112, 'OP');
+INSERT INTO jrn_periode VALUES (2, 112, 'OP');
+INSERT INTO jrn_periode VALUES (3, 112, 'OP');
+INSERT INTO jrn_periode VALUES (1, 112, 'OP');
+INSERT INTO jrn_periode VALUES (4, 113, 'OP');
+INSERT INTO jrn_periode VALUES (2, 113, 'OP');
+INSERT INTO jrn_periode VALUES (3, 113, 'OP');
+INSERT INTO jrn_periode VALUES (1, 113, 'OP');
+INSERT INTO jrn_periode VALUES (4, 114, 'OP');
+INSERT INTO jrn_periode VALUES (2, 114, 'OP');
+INSERT INTO jrn_periode VALUES (3, 114, 'OP');
+INSERT INTO jrn_periode VALUES (1, 114, 'OP');
+INSERT INTO jrn_periode VALUES (4, 115, 'OP');
+INSERT INTO jrn_periode VALUES (2, 115, 'OP');
+INSERT INTO jrn_periode VALUES (3, 115, 'OP');
+INSERT INTO jrn_periode VALUES (1, 115, 'OP');
+INSERT INTO jrn_periode VALUES (4, 116, 'OP');
+INSERT INTO jrn_periode VALUES (2, 116, 'OP');
+INSERT INTO jrn_periode VALUES (3, 116, 'OP');
+INSERT INTO jrn_periode VALUES (1, 116, 'OP');
+INSERT INTO jrn_periode VALUES (4, 117, 'OP');
+INSERT INTO jrn_periode VALUES (2, 117, 'OP');
+INSERT INTO jrn_periode VALUES (3, 117, 'OP');
+INSERT INTO jrn_periode VALUES (1, 117, 'OP');
+
+
+--
+-- Data for Name: jrn_rapt; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: jrn_type; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO jrn_type VALUES ('VEN', 'Vente');
+INSERT INTO jrn_type VALUES ('ACH', 'Achat');
+INSERT INTO jrn_type VALUES ('ODS', 'Op=C3=A9rations Diverses');
+INSERT INTO jrn_type VALUES ('FIN', 'Banque');
+
+
+--
+-- Data for Name: jrnx; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: letter_cred; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+
+
+--
+-- Data for Name: letter_deb; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 'Nouvel achat ou d=C3=A9pense', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCHOP', 'Historique', 'anc_history.inc.ph=
p', NULL, 'Historique des imputations analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGL', 'Grand''Livre', 'anc_great_ledger.=
inc.php', NULL, 'Grand livre d''plan analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBS', 'Balance simple', 'anc_balance_sim=
ple.inc.php', NULL, 'Balance simple des imputations analytiques', NULL, N=
ULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBC2', 'Balance crois=C3=A9e double', 'a=
nc_balance_double.inc.php', NULL, 'Balance double crois=C3=A9es des imput=
ations analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCTAB', 'Tableau', 'anc_acc_table.inc.php=
', NULL, 'Tableau li=C3=A9 =C3=A0 la comptabilit=C3=A9', NULL, NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('ANCBCC', 'Balance Analytique/comptabilit=C3=
=A9', 'anc_acc_balance.inc.php', NULL, 'Lien entre comptabilit=C3=A9 et C=
omptabilit=C3=A9 analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGR', 'Groupe', 'anc_group_balance.inc.p=
hp', NULL, 'Balance par groupe', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CSV:AncGrandLivre', 'Impression Grand-Livr=
e', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, 'Recherc=
he', NULL, 'popup_recherche()', 'ME');
+INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, 'Param=C3=A8=
tres divers', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, 'Conf=
ig. de la tva', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, 'Fi=
che', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, 'S=
tock', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MOD', 'Menu et profile', NULL, NULL, 'Menu=
 ', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPRO', 'Profile', 'profile.inc.php', NUL=
L, 'Configuration profile', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPAY', 'Moyen de paiement', 'payment_mid=
dle.inc.php', NULL, 'Config. des m=C3=A9thodes de paiement', NULL, NULL, =
'ME');
+INSERT INTO menu_ref VALUES ('CFGACC', 'Poste', 'poste.inc.php', NULL, '=
Config. poste comptable de base', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 'Nouvelle vente ou recette', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, 'Configuration des menus et plugins', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PDF:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:sec', 'Export S=C3=A9curit=C3=A9', NUL=
L, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncList', 'Export Comptabilit=C3=A9 an=
alytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique balance simple', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:histo', 'Export Historique', NULL, NUL=
L, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, 'Suivi fournisseur', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LET', 'Lettrage', NULL, NULL, 'Lettrage', =
NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, 'OD analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, 'V=C3=A9rification de la comptabilit=C3=A9', NULL, NU=
LL, 'ME');
+INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, 'Cr=C3=A9ation de rapport', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, 'Ecriture d''ouverture', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, 'Historique achat', 'ledger_type=3DACH', NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, 'Suivi, courrier, devis', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, 'Pr=C3=A9vision', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('EXT', 'Extension', 'extension_choice.inc.p=
hp', NULL, 'Extensions (plugins)', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGDOC', 'Document', 'document_modele.inc.=
php', NULL, 'Config. mod=C3=A8le de document', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGLED', 'journaux', 'cfgledger.inc.php', =
NULL, 'Configuration des journaux', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, 'Gestion des op=C3=A9rations pr=C3=A9d=C3=A9finifies', =
NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, 'Menu ava=
nc=C3=A9', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, 'Mo=
dule comptabilit=C3=A9 analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGSEC', 'S=C3=A9curit=C3=A9', 'param_sec.=
inc.php', NULL, 'configuration de la s=C3=A9curit=C3=A9', NULL, NULL, 'ME=
');
+INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, 'Plan analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, 'Groupe analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, 'Historique op=C3=A9rations dive=
rses', 'ledger_type=3DODS', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, '=
Menu ventes et recettes', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, 'Pr=C3=A9f=C3=A9rence', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, 'Historique', 'ledger_type=3DALL', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, 'Menu F=
inancier', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FIMP', 'Historique financier', 'history_op=
eration.inc.php', NULL, 'Historique financier', 'ledger_type=3DFIN', NULL=
, 'ME');
+INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, 'Menu achat=
', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, 'Menu op=C3=A9rations diverses', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, 'Nouvelle op=C3=A9rations diverses', NULL, NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('FREC', 'Rapprochement', 'compta_fin_rec.in=
c.php', NULL, 'Rapprochement bancaire', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, 'Suivi administration, banque', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, 'Nouvel extrait bancaire', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGATCARD', 'Attribut de fiche', 'card_att=
r.inc.php', NULL, 'Gestion des mod=C3=A8les de fiches', NULL, NULL, 'ME')=
;
+INSERT INTO menu_ref VALUES ('FSALDO', 'Soldes', 'compta_fin_saldo.inc.p=
hp', NULL, 'Solde des comptes en banques, caisse...', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, 'Reche=
rche', NULL, 'search_reconcile()', 'ME');
+INSERT INTO menu_ref VALUES ('LETACC', 'Lettrage par Poste', 'lettering.=
account.inc.php', NULL, 'lettrage par poste comptable', NULL, NULL, 'ME')=
;
+INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, 'Balance par cat=C3=A9gorie de fiche', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, '=
Suivi client', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, 'Gestion cat=C3=A9gorie de fiche', NULL, NULL, '=
ME');
+INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, 'Config. cat=C3=A9gorie de documents', NUL=
L, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, 'Historique des ventes', 'ledger_type=3DVEN', NULL,=
 'ME');
+INSERT INTO menu_ref VALUES ('LETCARD', 'Lettrage par Fiche', 'lettering=
.card.inc.php', NULL, 'Lettrage par fiche', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, 'Config. du plan comptable', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', 'So=
rtie', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, 'Tableau de bord', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
'Module comptabilit=C3=A9', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, 'Module g=
estion', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, 'Mod=
ule param=C3=A8tre', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTJRN', 'Historique', 'impress_jrn.inc.=
php', NULL, 'Impression historique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREC', 'Rapprochement', 'impress_rec.i=
nc.php', NULL, 'Impression des rapprochements', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTPOSTE', 'Poste', 'impress_poste.inc.p=
hp', NULL, 'Impression du d=C3=A9tail d''un poste comptable', NULL, NULL,=
 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREPORT', 'Rapport', 'impress_rapport.=
inc.php', NULL, 'Impression de rapport', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBILAN', 'Bilan', 'impress_bilan.inc.p=
hp', NULL, 'Impression de bilan', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTGL', 'Grand Livre', 'impress_gl_compt=
es.inc.php', NULL, 'Impression du grand livre', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBAL', 'Balance', 'balance.inc.php', N=
ULL, 'Impression des balances comptables', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, 'Impression cat=C3=A9gorie de fiches', NULL,=
 NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, 'Menu im=
pression', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACCESS', 'Accueil', NULL, 'user_login.php'=
, 'Accueil', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', NULL, NULL, 'Impres=
sion compta. analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('new_line', 'saut de ligne', NULL, NULL, 'S=
aut de ligne', NULL, NULL, 'SP');
+
+
+--
+-- Data for Name: mod_payment; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+INSERT INTO mod_payment VALUES (2, 'Caisse', 1, NULL, NULL, 2);
+INSERT INTO mod_payment VALUES (1, 'Paiement =C3=A9lectronique', 1, NULL=
, NULL, 2);
+INSERT INTO mod_payment VALUES (4, 'Caisse', 1, NULL, NULL, 3);
+INSERT INTO mod_payment VALUES (3, 'Par g=C3=A9rant ou administrateur', =
2, NULL, NULL, 3);
+
+
+--
+-- Data for Name: op_predef; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: op_predef_detail; Type: TABLE DATA; Schema: public; Ow=
ner: -
+--
+
+
+
+--
+-- Data for Name: operation_analytique; Type: TABLE DATA; Schema: public=
; Owner: -
+--
+
+
+
+--
+-- Data for Name: parameter; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO parameter VALUES ('MY_NAME', 'LaMule');
+INSERT INTO parameter VALUES ('MY_TVA', 'FR33 123 456 789');
+INSERT INTO parameter VALUES ('MY_STREET', '');
+INSERT INTO parameter VALUES ('MY_NUMBER', '');
+INSERT INTO parameter VALUES ('MY_CP', '');
+INSERT INTO parameter VALUES ('MY_TEL', '');
+INSERT INTO parameter VALUES ('MY_PAYS', '');
+INSERT INTO parameter VALUES ('MY_COMMUNE', '');
+INSERT INTO parameter VALUES ('MY_FAX', '');
+INSERT INTO parameter VALUES ('MY_ANALYTIC', 'nu');
+INSERT INTO parameter VALUES ('MY_COUNTRY', 'FR');
+INSERT INTO parameter VALUES ('MY_STRICT', 'Y');
+INSERT INTO parameter VALUES ('MY_TVA_USE', 'Y');
+INSERT INTO parameter VALUES ('MY_PJ_SUGGEST', 'Y');
+INSERT INTO parameter VALUES ('MY_DATE_SUGGEST', 'Y');
+INSERT INTO parameter VALUES ('MY_ALPHANUM', 'N');
+INSERT INTO parameter VALUES ('MY_CHECK_PERIODE', 'N');
+
+
+--
+-- Data for Name: parm_code; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO parm_code VALUES ('BANQUE', '51', 'Poste comptable par d=C3=A9=
faut pour les banques');
+INSERT INTO parm_code VALUES ('CAISSE', '53', 'Poste comptable par d=C3=A9=
faut pour les caisses');
+INSERT INTO parm_code VALUES ('CUSTOMER', '410', 'Poste comptable par d=C3=
=A9faut pour les clients');
+INSERT INTO parm_code VALUES ('VENTE', '707', 'Poste comptable par d=C3=A9=
faut pour les ventes');
+INSERT INTO parm_code VALUES ('VIREMENT_INTERNE', '58', 'Poste comptable=
 par d=C3=A9faut pour les virements internes');
+INSERT INTO parm_code VALUES ('DEP_PRIV', '4890', 'Depense a charge du g=
erant');
+INSERT INTO parm_code VALUES ('SUPPLIER', '400', 'Poste par d=C3=A9faut =
pour les fournisseurs');
+
+
+--
+-- Data for Name: parm_money; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO parm_money VALUES (1, 'EUR', 1.0000);
+
+
+--
+-- Data for Name: parm_periode; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+INSERT INTO parm_periode VALUES (105, '2009-01-01', '2009-01-31', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (106, '2009-02-01', '2009-02-28', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (107, '2009-03-01', '2009-03-31', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (108, '2009-04-01', '2009-04-30', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (109, '2009-05-01', '2009-05-31', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (110, '2009-06-01', '2009-06-30', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (111, '2009-07-01', '2009-07-31', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (112, '2009-08-01', '2009-08-31', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (113, '2009-09-01', '2009-09-30', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (114, '2009-10-01', '2009-10-31', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (115, '2009-11-01', '2009-11-30', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (116, '2009-12-01', '2009-12-30', '2009'=
, false, false);
+INSERT INTO parm_periode VALUES (117, '2009-12-31', '2009-12-31', '2009'=
, false, false);
+
+
+--
+-- Data for Name: parm_poste; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO parm_poste VALUES ('1', 'PAS');
+INSERT INTO parm_poste VALUES ('12', 'CON');
+INSERT INTO parm_poste VALUES ('2', 'ACT');
+INSERT INTO parm_poste VALUES ('3', 'ACT');
+INSERT INTO parm_poste VALUES ('41', 'ACT');
+INSERT INTO parm_poste VALUES ('42', 'PAS');
+INSERT INTO parm_poste VALUES ('43', 'PAS');
+INSERT INTO parm_poste VALUES ('44', 'PAS');
+INSERT INTO parm_poste VALUES ('45', 'PAS');
+INSERT INTO parm_poste VALUES ('46', 'CON');
+INSERT INTO parm_poste VALUES ('47', 'CON');
+INSERT INTO parm_poste VALUES ('481', 'PAS');
+INSERT INTO parm_poste VALUES ('482', 'PAS');
+INSERT INTO parm_poste VALUES ('483', 'PAS');
+INSERT INTO parm_poste VALUES ('484', 'PAS');
+INSERT INTO parm_poste VALUES ('485', 'PAS');
+INSERT INTO parm_poste VALUES ('486', 'PAS');
+INSERT INTO parm_poste VALUES ('487', 'ACT');
+INSERT INTO parm_poste VALUES ('49', 'PAS');
+INSERT INTO parm_poste VALUES ('5', 'ACT');
+INSERT INTO parm_poste VALUES ('6', 'CHA');
+INSERT INTO parm_poste VALUES ('7', 'PAS');
+INSERT INTO parm_poste VALUES ('40', 'ACT');
+
+
+--
+-- Data for Name: plan_analytique; Type: TABLE DATA; Schema: public; Own=
er: -
+--
+
+
+
+--
+-- Data for Name: poste_analytique; Type: TABLE DATA; Schema: public; Ow=
ner: -
+--
+
+
+
+--
+-- Data for Name: profile; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO profile VALUES ('Administrateur', 1, 'Profil par d=C3=A9faut=
 pour les adminstrateurs', true, true);
+INSERT INTO profile VALUES ('Utilisateur', 2, 'Profil par d=C3=A9faut po=
ur les utilisateurs', true, true);
+
+
+--
+-- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+INSERT INTO profile_menu VALUES (59, 'CFGPAY', 'DIVPARM', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (68, 'CFGATCARD', 'DIVPARM', 1, 9, 'E', =
0);
+INSERT INTO profile_menu VALUES (61, 'CFGACC', 'DIVPARM', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (651, 'ANCHOP', 'ANCIMP', 1, 10, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', 0);
+INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (652, 'ANCGL', 'ANCIMP', 1, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (653, 'ANCBS', 'ANCIMP', 1, 30, 'E', 0);
+INSERT INTO profile_menu VALUES (654, 'ANCBC2', 'ANCIMP', 1, 40, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (655, 'ANCTAB', 'ANCIMP', 1, 50, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (656, 'ANCBCC', 'ANCIMP', 1, 60, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (657, 'ANCGR', 'ANCIMP', 1, 70, 'E', 0);
+INSERT INTO profile_menu VALUES (658, 'CSV:AncGrandLivre', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (662, 'new_line', NULL, 1, 35, 'M', 0);
+INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
0);
+INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (526, 'PRINTGL', 'PRINT', 1, 20, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (23, 'LET', 'COMPTA', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (523, 'PRINTBAL', 'PRINT', 1, 50, 'E', 0=
);
+INSERT INTO profile_menu VALUES (529, 'PRINTREPORT', 'PRINT', 1, 85, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 0);
+INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', 0);
+INSERT INTO profile_menu VALUES (527, 'PRINTJRN', 'PRINT', 1, 10, 'E', 0=
);
+INSERT INTO profile_menu VALUES (530, 'PRINTREC', 'PRINT', 1, 100, 'E', =
0);
+INSERT INTO profile_menu VALUES (524, 'PRINTBILAN', 'PRINT', 1, 90, 'E',=
 0);
+INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', 0);
+INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E', 0=
);
+INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E', 0);
+INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E', 0);
+INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E', 0);
+INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 25, 'M', 0);
+INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', 0);
+INSERT INTO profile_menu VALUES (35, 'PRINT', 'GESTION', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (126, 'CSV:postedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 45, 'M', 0);
+INSERT INTO profile_menu VALUES (18, 'MENUODS', 'COMPTA', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (88, 'ODS', 'MENUODS', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (89, 'ODSIMP', 'MENUODS', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (73, 'CFGDOC', 'PARAM', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (74, 'CFGLED', 'PARAM', 1, 9, 'E', 0);
+INSERT INTO profile_menu VALUES (71, 'CFGSEC', 'PARAM', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (82, 'EXT', NULL, 1, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (95, 'FREC', 'MENUFIN', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (94, 'FSALDO', 'MENUFIN', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (27, 'LETACC', 'LET', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (24, 'LETCARD', 'LET', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (167, 'MOD', 'PARAM', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (93, 'FIMP', 'MENUFIN', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', 0);
+INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (129, 'PDF:fichedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (130, 'CSV:fiche_balance', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (131, 'PDF:fiche_balance', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (132, 'CSV:report', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (133, 'PDF:report', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (134, 'CSV:fiche', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (135, 'PDF:fiche', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (136, 'CSV:glcompte', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (137, 'PDF:glcompte', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (138, 'PDF:sec', NULL, 1, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (139, 'CSV:AncList', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (140, 'CSV:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (141, 'PDF:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (142, 'CSV:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (143, 'PDF:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (144, 'CSV:balance', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (145, 'PDF:balance', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (146, 'CSV:AncTable', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (147, 'CSV:AncAccList', NULL, 1, NULL, '=
P', 0);
+INSERT INTO profile_menu VALUES (148, 'CSV:AncBalGroup', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (528, 'PRINTPOSTE', 'PRINT', 1, 30, 'E',=
 0);
+INSERT INTO profile_menu VALUES (525, 'PRINTCARD', 'PRINT', 1, 40, 'E', =
0);
+INSERT INTO profile_menu VALUES (1, 'DASHBOARD', NULL, 1, 10, 'M', 1);
+INSERT INTO profile_menu VALUES (172, 'CFGPRO', 'MOD', 1, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MOD', 1, NULL, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (663, 'CFGPAY', 'DIVPARM', 2, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (664, 'CFGATCARD', 'DIVPARM', 2, 9, 'E',=
 0);
+INSERT INTO profile_menu VALUES (665, 'CFGACC', 'DIVPARM', 2, 6, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (668, 'ANCHOP', 'ANCIMP', 2, 10, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (669, 'COMPTA', NULL, 2, 40, 'M', 0);
+INSERT INTO profile_menu VALUES (672, 'ANCGL', 'ANCIMP', 2, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (673, 'CFGTVA', 'DIVPARM', 2, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (674, 'ANCBS', 'ANCIMP', 2, 30, 'E', 0);
+INSERT INTO profile_menu VALUES (675, 'ANCBC2', 'ANCIMP', 2, 40, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (676, 'ANCTAB', 'ANCIMP', 2, 50, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (677, 'ANCBCC', 'ANCIMP', 2, 60, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (678, 'ANCGR', 'ANCIMP', 2, 70, 'E', 0);
+INSERT INTO profile_menu VALUES (679, 'CSV:AncGrandLivre', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (680, 'new_line', NULL, 2, 35, 'M', 0);
+INSERT INTO profile_menu VALUES (681, 'CFGCATDOC', 'DIVPARM', 2, 8, 'E',=
 0);
+INSERT INTO profile_menu VALUES (683, 'PRINTGL', 'PRINT', 2, 20, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (684, 'LET', 'COMPTA', 2, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (685, 'PRINTBAL', 'PRINT', 2, 50, 'E', 0=
);
+INSERT INTO profile_menu VALUES (686, 'PRINTREPORT', 'PRINT', 2, 85, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (688, 'PLANANC', 'ANC', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (689, 'CFGCARDCAT', 'DIVPARM', 2, 7, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (690, 'ANCODS', 'ANC', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (717, 'CSV:ledger', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (718, 'PDF:ledger', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (719, 'PRINT', 'COMPTA', 2, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (720, 'CSV:postedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (721, 'MENUACH', 'COMPTA', 2, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (722, 'ACHIMP', 'MENUACH', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (723, 'GESTION', NULL, 2, 45, 'M', 0);
+INSERT INTO profile_menu VALUES (724, 'MENUODS', 'COMPTA', 2, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (725, 'ODS', 'MENUODS', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (726, 'ODSIMP', 'MENUODS', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (727, 'ANC', NULL, 2, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (728, 'VENMENU', 'COMPTA', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (729, 'VEN', 'VENMENU', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (730, 'VENIMP', 'VENMENU', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (731, 'FIN', 'MENUFIN', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (735, 'EXT', NULL, 2, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (736, 'FREC', 'MENUFIN', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (737, 'FSALDO', 'MENUFIN', 2, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (738, 'LETACC', 'LET', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (691, 'ANCGROUP', 'ANC', 2, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (692, 'ANCIMP', 'ANC', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (694, 'PRINTJRN', 'PRINT', 2, 10, 'E', 0=
);
+INSERT INTO profile_menu VALUES (695, 'PRINTREC', 'PRINT', 2, 100, 'E', =
0);
+INSERT INTO profile_menu VALUES (696, 'PRINTBILAN', 'PRINT', 2, 90, 'E',=
 0);
+INSERT INTO profile_menu VALUES (697, 'PREFERENCE', NULL, 2, 15, 'M', 0)=
;
+INSERT INTO profile_menu VALUES (698, 'CUST', 'GESTION', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (699, 'SUPPL', 'GESTION', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (700, 'ADM', 'GESTION', 2, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (701, 'CARD', 'GESTION', 2, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (702, 'STOCK', 'GESTION', 2, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (703, 'FORECAST', 'GESTION', 2, 7, 'E', =
0);
+INSERT INTO profile_menu VALUES (704, 'FOLLOW', 'GESTION', 2, 8, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (705, 'VERIFBIL', 'ADV', 2, 21, 'E', 0);
+INSERT INTO profile_menu VALUES (706, 'STOCK', 'ADV', 2, 22, 'E', 0);
+INSERT INTO profile_menu VALUES (707, 'PREDOP', 'ADV', 2, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (708, 'OPEN', 'ADV', 2, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (709, 'REPORT', 'ADV', 2, 25, 'E', 0);
+INSERT INTO profile_menu VALUES (710, 'CARD', 'COMPTA', 2, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (711, 'HIST', 'COMPTA', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (712, 'ADV', 'COMPTA', 2, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (713, 'ACCESS', NULL, 2, 25, 'M', 0);
+INSERT INTO profile_menu VALUES (714, 'CSV:histo', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (715, 'LOGOUT', NULL, 2, 30, 'M', 0);
+INSERT INTO profile_menu VALUES (716, 'PRINT', 'GESTION', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (739, 'LETCARD', 'LET', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (742, 'MENUFIN', 'COMPTA', 2, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (743, 'FIMP', 'MENUFIN', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (744, 'SEARCH', NULL, 2, 60, 'M', 0);
+INSERT INTO profile_menu VALUES (745, 'ACH', 'MENUACH', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (746, 'PDF:postedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (747, 'CSV:fichedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (748, 'PDF:fichedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (749, 'CSV:fiche_balance', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (750, 'PDF:fiche_balance', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (751, 'CSV:report', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (752, 'PDF:report', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (753, 'CSV:fiche', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (754, 'PDF:fiche', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (755, 'CSV:glcompte', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (756, 'PDF:glcompte', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (757, 'PDF:sec', NULL, 2, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (758, 'CSV:AncList', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (759, 'CSV:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (760, 'PDF:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (761, 'CSV:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (762, 'PDF:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (763, 'CSV:balance', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (764, 'PDF:balance', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (765, 'CSV:AncTable', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (766, 'CSV:AncAccList', NULL, 2, NULL, '=
P', 0);
+INSERT INTO profile_menu VALUES (767, 'CSV:AncBalGroup', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (768, 'OTH:Bilan', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (769, 'PRINTPOSTE', 'PRINT', 2, 30, 'E',=
 0);
+INSERT INTO profile_menu VALUES (770, 'PRINTCARD', 'PRINT', 2, 40, 'E', =
0);
+INSERT INTO profile_menu VALUES (777, 'CFGPRO', 'MOD', 2, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (778, 'CFGMENU', 'MOD', 2, NULL, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (772, 'DASHBOARD', NULL, 2, 10, 'M', 1);
+
+
+--
+-- Data for Name: profile_menu_type; Type: TABLE DATA; Schema: public; O=
wner: -
+--
+
+INSERT INTO profile_menu_type VALUES ('P', 'Impression');
+INSERT INTO profile_menu_type VALUES ('S', 'Extension');
+INSERT INTO profile_menu_type VALUES ('E', 'Menu');
+INSERT INTO profile_menu_type VALUES ('M', 'Module');
+
+
+--
+-- Data for Name: profile_user; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+INSERT INTO profile_user VALUES ('phpcompta', 1, 1);
+
+
+--
+-- Data for Name: quant_fin; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: quant_purchase; Type: TABLE DATA; Schema: public; Owne=
r: -
+--
+
+
+
+--
+-- Data for Name: quant_sold; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: stock_goods; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+
+
+--
+-- Data for Name: tmp_pcmn; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO tmp_pcmn VALUES ('1', 'comptes de capitaux', '0', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('101', 'Capital', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('105', 'Ecarts de r=C3=A9=C3=A9valuation', =
'1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1061', 'R=C3=A9serve l=C3=A9gale', '1', 'P=
AS');
+INSERT INTO tmp_pcmn VALUES ('1063', 'R=C3=A9serves statutaires ou contr=
actuelles', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1064', 'R=C3=A9serves r=C3=A9glement=C3=A9=
es', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('1068', 'Autres r=C3=A9serves', '1', 'PAS')=
;
+INSERT INTO tmp_pcmn VALUES ('108', 'Compte de l''exploitant', '1', 'PAS=
');
+INSERT INTO tmp_pcmn VALUES ('12', 'r=C3=A9sultat de l''exercice (b=C3=A9=
n=C3=A9fice ou perte)', '1', 'CON');
+INSERT INTO tmp_pcmn VALUES ('145', 'Amortissements d=C3=A9rogatoires', =
'1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('146', 'Provision sp=C3=A9ciale de r=C3=A9=C3=
=A9valuation', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('147', 'Plus-values r=C3=A9investies', '1',=
 'PAS');
+INSERT INTO tmp_pcmn VALUES ('148', 'Autres provisions r=C3=A9glement=C3=
=A9es', '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('15', 'Provisions pour risques et charges',=
 '1', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('16', 'emprunts et dettes assimilees', '1',=
 'PAS');
+INSERT INTO tmp_pcmn VALUES ('2', 'comptes d''immobilisations', '0', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('20', 'immobilisations incorporelles', '2',=
 'ACT');
+INSERT INTO tmp_pcmn VALUES ('201', 'Frais d''=C3=A9tablissement', '20',=
 'ACT');
+INSERT INTO tmp_pcmn VALUES ('206', 'Droit au bail', '20', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('207', 'Fonds commercial', '20', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('208', 'Autres immobilisations incorporelle=
s', '20', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('21', 'immobilisations corporelles', '2', '=
ACT');
+INSERT INTO tmp_pcmn VALUES ('23', 'immobilisations en cours', '2', 'ACT=
');
+INSERT INTO tmp_pcmn VALUES ('27', 'autres immobilisations financieres',=
 '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('280', 'Amortissements des immobilisations =
incorporelles', '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('281', 'Amortissements des immobilisations =
corporelles', '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('290', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des immobilisations incorporelles', '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('291', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des immobilisations corporelles (m=C3=AAme ventilation que celle du c=
ompte 21)', '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('297', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des autres immobilisations financi=C3=A8res', '2', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('3', 'comptes de stocks et en cours', '0', =
'ACT');
+INSERT INTO tmp_pcmn VALUES ('31', 'matieres premi=C3=A8res (et fournitu=
res)', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('32', 'autres approvisionnements', '3', 'AC=
T');
+INSERT INTO tmp_pcmn VALUES ('33', 'en-cours de production de biens', '3=
', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('34', 'en-cours de production de services',=
 '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('35', 'stocks de produits', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('37', 'stocks de marchandises', '3', 'ACT')=
;
+INSERT INTO tmp_pcmn VALUES ('391', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des mati=C3=A8res premi=C3=A8res (et fournitures)', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('392', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des autres approvisionnements', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('393', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des en-cours de production de biens', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('394', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des en-cours de production de services', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('395', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des stocks de produits', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('397', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des stocks de marchandises', '3', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4', 'comptes de tiers', '0', 'CON');
+INSERT INTO tmp_pcmn VALUES ('400', 'Fournisseurs et Comptes rattach=C3=A9=
s', '4', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('409', 'Fournisseurs d=C3=A9biteurs', '4', =
'ACT');
+INSERT INTO tmp_pcmn VALUES ('410', 'Clients et Comptes rattach=C3=A9s',=
 '4', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('419', 'Clients cr=C3=A9diteurs', '4', 'ACT=
');
+INSERT INTO tmp_pcmn VALUES ('421', 'Personnel - R=C3=A9mun=C3=A9rations=
 dues', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('428', 'Personnel - Charges =C3=A0 payer et=
 produits =C3=A0 recevoir', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('43', 'S=C3=A9curit=C3=A9 sociale et autres=
 organismes sociaux', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('444', 'Etat - Imp=C3=B4ts sur les b=C3=A9n=
=C3=A9fices', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('445', 'Etat - Taxes sur le chiffre d''affa=
ires', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('447', 'Autres imp=C3=B4ts, taxes et versem=
ents assimil=C3=A9s', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('45', 'Groupe et associes', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('455', 'Associ=C3=A9s - Comptes courants', =
'45', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('46', 'D=C3=A9biteurs divers et cr=C3=A9dit=
eurs divers', '4', 'CON');
+INSERT INTO tmp_pcmn VALUES ('47', 'comptes transitoires ou d''attente',=
 '4', 'CON');
+INSERT INTO tmp_pcmn VALUES ('481', 'Charges =C3=A0 r=C3=A9partir sur pl=
usieurs exercices', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('486', 'Charges constat=C3=A9es d''avance',=
 '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('487', 'Produits constat=C3=A9s d''avance',=
 '4', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('491', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des comptes de clients', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('496', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des comptes de d=C3=A9biteurs divers', '4', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('5', 'comptes financiers', '0', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('50', 'valeurs mobili=C3=A8res de placement=
', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('51', 'banques, =C3=A9tablissements financi=
ers et assimil=C3=A9s', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('53', 'Caisse', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('54', 'r=C3=A9gies d''avance et accr=C3=A9d=
itifs', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('58', 'virements internes', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('590', 'Provisions pour d=C3=A9pr=C3=A9ciat=
ion des valeurs mobili=C3=A8res de placement', '5', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('6', 'comptes de charges', '0', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('60', 'Achats (sauf 603)', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('603', 'variations des stocks (approvisionn=
ements et marchandises)', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('61', 'autres charges externes - Services e=
xt=C3=A9rieurs', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('62', 'autres charges externes - Autres ser=
vices ext=C3=A9rieurs', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('63', 'Imp=C3=B4ts, taxes et versements ass=
imiles', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('641', 'R=C3=A9mun=C3=A9rations du personne=
l', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('644', 'R=C3=A9mun=C3=A9ration du travail d=
e l''exploitant', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('645', 'Charges de s=C3=A9curit=C3=A9 socia=
le et de pr=C3=A9voyance', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('646', 'Cotisations sociales personnelles d=
e l''exploitant', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('65', 'Autres charges de gestion courante',=
 '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('66', 'Charges financi=C3=A8res', '6', 'CHA=
');
+INSERT INTO tmp_pcmn VALUES ('67', 'Charges exceptionnelles', '6', 'CHA'=
);
+INSERT INTO tmp_pcmn VALUES ('681', 'Dotations aux amortissements et aux=
 provisions - Charges d''exploitation', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('686', 'Dotations aux amortissements et aux=
 provisions - Charges financi=C3=A8res', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('687', 'Dotations aux amortissements et aux=
 provisions - Charges exceptionnelles', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('691', 'Participation des salari=C3=A9s aux=
 r=C3=A9sultats', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('695', 'Imp=C3=B4ts sur les b=C3=A9n=C3=A9f=
ices', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('697', 'Imposition forfaitaire annuelle des=
 soci=C3=A9t=C3=A9s', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('699', 'Produits - Reports en arri=C3=A8re =
des d=C3=A9ficits', '6', 'CHA');
+INSERT INTO tmp_pcmn VALUES ('7', 'comptes de produits', '0', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('701', 'Ventes de produits finis', '7', 'PA=
S');
+INSERT INTO tmp_pcmn VALUES ('706', 'Prestations de services', '7', 'PAS=
');
+INSERT INTO tmp_pcmn VALUES ('707', 'Ventes de marchandises', '7', 'PAS'=
);
+INSERT INTO tmp_pcmn VALUES ('708', 'Produits des activit=C3=A9s annexes=
', '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('709', 'Rabais, remises et ristournes accor=
d=C3=A9s par l''entreprise', '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('713', 'Variation des stocks (en-cours de p=
roduction, produits)', '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('72', 'Production immobilis=C3=A9e', '7', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('73', 'Produits nets partiels sur op=C3=A9r=
ations =C3=A0 long terme', '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('74', 'Subventions d''exploitation', '7', '=
PAS');
+INSERT INTO tmp_pcmn VALUES ('75', 'Autres produits de gestion courante'=
, '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('753', 'Jetons de pr=C3=A9sence et r=C3=A9m=
un=C3=A9rations d''administrateurs, g=C3=A9rants,...', '75', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('754', 'Ristournes per=C3=A7ues des coop=C3=
=A9ratives (provenant des exc=C3=A9dents)', '75', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('755', 'Quotes-parts de r=C3=A9sultat sur o=
p=C3=A9rations faites en commun', '75', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('76', 'Produits financiers', '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('77', 'Produits exceptionnels', '7', 'PAS')=
;
+INSERT INTO tmp_pcmn VALUES ('781', 'Reprises sur amortissements et prov=
isions (=C3=A0 inscrire dans les produits d''exploitation)', '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('786', 'Reprises sur provisions pour risque=
s (=C3=A0 inscrire dans les produits financiers)', '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('787', 'Reprises sur provisions (=C3=A0 ins=
crire dans les produits exceptionnels)', '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('79', 'Transferts de charges', '7', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('8', 'Comptes sp=C3=A9ciaux', '0', 'CON');
+INSERT INTO tmp_pcmn VALUES ('9', 'Comptes analytiques', '0', 'CON');
+INSERT INTO tmp_pcmn VALUES ('4456601', 'TVA 19,6% - France m=C3=A9tropo=
litaine - Taux immobilisations D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('445701', 'TVA 19,6% - France m=C3=A9tropol=
itaine - Taux immobilisations Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4456602', 'TVA x% - France m=C3=A9tropolit=
aine - Taux anciens D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('445702', 'TVA x% - France m=C3=A9tropolita=
ine - Taux anciens Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4456603', 'TVA 8,5%  - DOM - Taux normal D=
=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('445703', 'TVA 8,5%  - DOM - Taux normal Co=
llect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4456604', 'TVA 8,5% - DOM - Taux normal NP=
R D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('445704', 'TVA 8,5% - DOM - Taux normal NPR=
 Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4456605', 'TVA 2,1% - DOM - Taux r=C3=A9du=
it D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('445705', 'TVA 2,1% - DOM - Taux r=C3=A9dui=
t Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4456606', 'TVA 1,75% - DOM - Taux I D=C3=A9=
ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('445706', 'TVA 1,75% - DOM - Taux I Collect=
=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4456607', 'TVA 1,05% - DOM - Taux publicat=
ions de presse D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('445707', 'TVA 1,05% - DOM - Taux publicati=
ons de presse Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4456608', 'TVA x% - DOM - Taux octroi de m=
er D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('445708', 'TVA x% - DOM - Taux octroi de me=
r Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('4456609', 'TVA x% - DOM - Taux immobilisat=
ions D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('445709', 'TVA x% - DOM - Taux immobilisati=
ons Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566010', 'TVA 13% - Corse - Taux I D=C3=A9=
ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457010', 'TVA 13% - Corse - Taux I Collec=
t=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566011', 'TVA 8% - Corse - Taux II D=C3=A9=
ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457011', 'TVA 8% - Corse - Taux II Collec=
t=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566012', 'TVA 2,1% - Corse - Taux III D=C3=
=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457012', 'TVA 2,1% - Corse - Taux III Col=
lect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566013', 'TVA 0,9% - Corse - Taux IV D=C3=
=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457013', 'TVA 0,9% - Corse - Taux IV Coll=
ect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566014', 'TVA x% - Corse - Taux immobili=
sations D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457014', 'TVA x% - Corse - Taux immobilis=
ations Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566015', 'TVA x% - Acquisitions intracom=
munautaires/Pays D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457015', 'TVA x% - Acquisitions intracomm=
unautaires/Pays Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566016', 'TVA x% - Acquisitions intracom=
munautaires immobilisations/Pays D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457016', 'TVA x% - Acquisitions intracomm=
unautaires immobilisations/Pays Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566017', 'TVA x% - Non imposable : Achat=
s en franchise D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457017', 'TVA x% - Non imposable : Achats=
 en franchise Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566018', 'TVA x% - Non imposable : Expor=
ts hors CE/Pays D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457018', 'TVA x% - Non imposable : Export=
s hors CE/Pays Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566019', 'TVA x% - Non imposable : Autre=
s op=C3=A9rations D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457019', 'TVA x% - Non imposable : Autres=
 op=C3=A9rations Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44566020', 'TVA x% - Non imposable : Livra=
isons intracommunautaires/Pays D=C3=A9ductible', '4456', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('4457020', 'TVA x% - Non imposable : Livrai=
sons intracommunautaires/Pays Collect=C3=A9e ', '4457', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('445661', 'TVA 19,6% - France m=C3=A9tropol=
itaine - Taux normal', '445', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('445662', 'TVA 5,5% - France m=C3=A9tropoli=
taine - Taux r=C3=A9duit', '445', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('445663', 'TVA 2,1% - France m=C3=A9tropoli=
taine - Taux super r=C3=A9duit', '445', 'PAS');
+INSERT INTO tmp_pcmn VALUES ('44571', 'TVA 19,6% - France m=C3=A9tropoli=
taine - Taux normal', '445', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('44572', 'TVA 5,5% - France m=C3=A9tropolit=
aine - Taux r=C3=A9duit', '445', 'ACT');
+INSERT INTO tmp_pcmn VALUES ('44573', 'TVA 2,1% - France m=C3=A9tropolit=
aine - Taux super r=C3=A9duit', '445', 'ACT');
+
+
+--
+-- Data for Name: todo_list; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+
+
+--
+-- Data for Name: tva_rate; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO tva_rate VALUES (101, 'FR_NOR', 0.1960, 'TVA 19,6% - France =
m=C3=A9tropolitaine - Taux normal', '445661,44571', 0);
+INSERT INTO tva_rate VALUES (102, 'FR_RED', 0.0550, 'TVA 5,5% - France m=
=C3=A9tropolitaine - Taux r=C3=A9duit', '445662,44572', 0);
+INSERT INTO tva_rate VALUES (103, 'FR_SRED', 0.0210, 'TVA 2,1% - France =
m=C3=A9tropolitaine - Taux super r=C3=A9duit', '445663,44573', 0);
+INSERT INTO tva_rate VALUES (104, 'FR_IMMO', 0.1960, 'TVA 19,6% - France=
 m=C3=A9tropolitaine - Taux immobilisations', '4456601,445701', 0);
+INSERT INTO tva_rate VALUES (105, 'FR_ANC', 0.0000, 'TVA x% - France m=C3=
=A9tropolitaine - Taux anciens', '4456602,445702', 0);
+INSERT INTO tva_rate VALUES (201, 'DOM', 0.0850, 'TVA 8,5%  - DOM - Taux=
 normal', '4456603,445703', 0);
+INSERT INTO tva_rate VALUES (202, 'DOM_NPR', 0.0850, 'TVA 8,5% - DOM - T=
aux normal NPR', '4456604,445704', 0);
+INSERT INTO tva_rate VALUES (203, 'DOM_REDUIT', 0.0210, 'TVA 2,1% - DOM =
- Taux r=C3=A9duit', '4456605,445705', 0);
+INSERT INTO tva_rate VALUES (204, 'DOM_I', 0.0175, 'TVA 1,75% - DOM - Ta=
ux I', '4456606,445706', 0);
+INSERT INTO tva_rate VALUES (205, 'DOM_PRESSE', 0.0105, 'TVA 1,05% - DOM=
 - Taux publications de presse', '4456607,445707', 0);
+INSERT INTO tva_rate VALUES (206, 'DOM_OCTROI', 0.0000, 'TVA x% - DOM - =
Taux octroi de mer', '4456608,445708', 0);
+INSERT INTO tva_rate VALUES (207, 'DOM_IMMO', 0.0000, 'TVA x% - DOM - Ta=
ux immobilisations', '4456609,445709', 0);
+INSERT INTO tva_rate VALUES (301, 'COR_I', 0.1300, 'TVA 13% - Corse - Ta=
ux I', '44566010,4457010', 0);
+INSERT INTO tva_rate VALUES (302, 'COR_II', 0.0800, 'TVA 8% - Corse - Ta=
ux II', '44566011,4457011', 0);
+INSERT INTO tva_rate VALUES (303, 'COR_III', 0.0210, 'TVA 2,1% - Corse -=
 Taux III', '44566012,4457012', 0);
+INSERT INTO tva_rate VALUES (304, 'COR_IV', 0.0090, 'TVA 0,9% - Corse - =
Taux IV', '44566013,4457013', 0);
+INSERT INTO tva_rate VALUES (305, 'COR_IMMO', 0.0000, 'TVA x% - Corse - =
Taux immobilisations', '44566014,4457014', 0);
+INSERT INTO tva_rate VALUES (401, 'INTRA', 0.0000, 'TVA x% - Acquisition=
s intracommunautaires/Pays', '44566015,4457015', 0);
+INSERT INTO tva_rate VALUES (402, 'INTRA_IMMMO', 0.0000, 'TVA x% - Acqui=
sitions intracommunautaires immobilisations/Pays', '44566016,4457016', 0)=
;
+INSERT INTO tva_rate VALUES (501, 'FRANCH', 0.0000, 'TVA x% - Non imposa=
ble : Achats en franchise', '44566017,4457017', 0);
+INSERT INTO tva_rate VALUES (502, 'EXPORT', 0.0000, 'TVA x% - Non imposa=
ble : Exports hors CE/Pays', '44566018,4457018', 0);
+INSERT INTO tva_rate VALUES (503, 'AUTRE', 0.0000, 'TVA x% - Non imposab=
le : Autres op=C3=A9rations', '44566019,4457019', 0);
+INSERT INTO tva_rate VALUES (504, 'INTRA_LIV', 0.0000, 'TVA x% - Non imp=
osable : Livraisons intracommunautaires/Pays', '44566020,4457020', 0);
+
+
+--
+-- Data for Name: user_local_pref; Type: TABLE DATA; Schema: public; Own=
er: -
+--
+
+INSERT INTO user_local_pref VALUES ('1', 'MINIREPORT', '0');
+INSERT INTO user_local_pref VALUES ('1', 'PERIODE', '105');
+
+
+--
+-- Data for Name: user_sec_act; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+
+
+--
+-- Data for Name: user_sec_extension; Type: TABLE DATA; Schema: public; =
Owner: -
+--
+
+
+
+--
+-- Data for Name: user_sec_jrn; Type: TABLE DATA; Schema: public; Owner:=
 -
+--
+
+
+
+--
+-- Data for Name: version; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+INSERT INTO version VALUES (99);
+
+
+--
+-- Name: action_detail_pkey; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY action_detail
+    ADD CONSTRAINT action_detail_pkey PRIMARY KEY (ad_id);
+
+
+--
+-- Name: action_gestion_pkey; Type: CONSTRAINT; Schema: public; Owner: -=
; Tablespace:=20
+--
+
+ALTER TABLE ONLY action_gestion
+    ADD CONSTRAINT action_gestion_pkey PRIMARY KEY (ag_id);
+
+
+--
+-- Name: action_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY action
+    ADD CONSTRAINT action_pkey PRIMARY KEY (ac_id);
+
+
+--
+-- Name: attr_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY attr_def
+    ADD CONSTRAINT attr_def_pkey PRIMARY KEY (ad_id);
+
+
+--
+-- Name: bilan_b_name_key; Type: CONSTRAINT; Schema: public; Owner: -; T=
ablespace:=20
+--
+
+ALTER TABLE ONLY bilan
+    ADD CONSTRAINT bilan_b_name_key UNIQUE (b_name);
+
+
+--
+-- Name: bilan_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+ALTER TABLE ONLY bilan
+    ADD CONSTRAINT bilan_pkey PRIMARY KEY (b_id);
+
+
+--
+-- Name: centralized_pkey; Type: CONSTRAINT; Schema: public; Owner: -; T=
ablespace:=20
+--
+
+ALTER TABLE ONLY centralized
+    ADD CONSTRAINT centralized_pkey PRIMARY KEY (c_id);
+
+
+--
+-- Name: del_action_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY del_action
+    ADD CONSTRAINT del_action_pkey PRIMARY KEY (del_id);
+
+
+--
+-- Name: dj_id; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY del_jrn
+    ADD CONSTRAINT dj_id PRIMARY KEY (dj_id);
+
+
+--
+-- Name: djx_id; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+ALTER TABLE ONLY del_jrnx
+    ADD CONSTRAINT djx_id PRIMARY KEY (djx_id);
+
+
+--
+-- Name: document_modele_pkey; Type: CONSTRAINT; Schema: public; Owner: =
-; Tablespace:=20
+--
+
+ALTER TABLE ONLY document_modele
+    ADD CONSTRAINT document_modele_pkey PRIMARY KEY (md_id);
+
+
+--
+-- Name: document_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY document
+    ADD CONSTRAINT document_pkey PRIMARY KEY (d_id);
+
+
+--
+-- Name: document_state_pkey; Type: CONSTRAINT; Schema: public; Owner: -=
; Tablespace:=20
+--
+
+ALTER TABLE ONLY document_state
+    ADD CONSTRAINT document_state_pkey PRIMARY KEY (s_id);
+
+
+--
+-- Name: document_type_pkey; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY document_type
+    ADD CONSTRAINT document_type_pkey PRIMARY KEY (dt_id);
+
+
+--
+-- Name: fiche_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY fiche_def
+    ADD CONSTRAINT fiche_def_pkey PRIMARY KEY (fd_id);
+
+
+--
+-- Name: fiche_def_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY fiche_def_ref
+    ADD CONSTRAINT fiche_def_ref_pkey PRIMARY KEY (frd_id);
+
+
+--
+-- Name: fiche_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+ALTER TABLE ONLY fiche
+    ADD CONSTRAINT fiche_pkey PRIMARY KEY (f_id);
+
+
+--
+-- Name: forecast_cat_pk; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY forecast_cat
+    ADD CONSTRAINT forecast_cat_pk PRIMARY KEY (fc_id);
+
+
+--
+-- Name: forecast_item_pkey; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY forecast_item
+    ADD CONSTRAINT forecast_item_pkey PRIMARY KEY (fi_id);
+
+
+--
+-- Name: forecast_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY forecast
+    ADD CONSTRAINT forecast_pk PRIMARY KEY (f_id);
+
+
+--
+-- Name: form_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+ALTER TABLE ONLY form
+    ADD CONSTRAINT form_pkey PRIMARY KEY (fo_id);
+
+
+--
+-- Name: formdef_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY formdef
+    ADD CONSTRAINT formdef_pkey PRIMARY KEY (fr_id);
+
+
+--
+-- Name: frd_ad_attr_min_pk; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY attr_min
+    ADD CONSTRAINT frd_ad_attr_min_pk PRIMARY KEY (frd_id, ad_id);
+
+
+--
+-- Name: historique_analytique_pkey; Type: CONSTRAINT; Schema: public; O=
wner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY operation_analytique
+    ADD CONSTRAINT historique_analytique_pkey PRIMARY KEY (oa_id);
+
+
+--
+-- Name: idx_ex_code; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY extension
+    ADD CONSTRAINT idx_ex_code UNIQUE (ex_code);
+
+
+--
+-- Name: info_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY info_def
+    ADD CONSTRAINT info_def_pkey PRIMARY KEY (id_type);
+
+
+--
+-- Name: jnt_fic_att_value_pkey; Type: CONSTRAINT; Schema: public; Owner=
: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY fiche_detail
+    ADD CONSTRAINT jnt_fic_att_value_pkey PRIMARY KEY (jft_id);
+
+
+--
+-- Name: jnt_letter_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY jnt_letter
+    ADD CONSTRAINT jnt_letter_pk PRIMARY KEY (jl_id);
+
+
+--
+-- Name: jrn_action_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY jrn_action
+    ADD CONSTRAINT jrn_action_pkey PRIMARY KEY (ja_id);
+
+
+--
+-- Name: jrn_def_jrn_def_name_key; Type: CONSTRAINT; Schema: public; Own=
er: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY jrn_def
+    ADD CONSTRAINT jrn_def_jrn_def_name_key UNIQUE (jrn_def_name);
+
+
+--
+-- Name: jrn_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY jrn_def
+    ADD CONSTRAINT jrn_def_pkey PRIMARY KEY (jrn_def_id);
+
+
+--
+-- Name: jrn_info_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY jrn_info
+    ADD CONSTRAINT jrn_info_pkey PRIMARY KEY (ji_id);
+
+
+--
+-- Name: jrn_periode_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY jrn_periode
+    ADD CONSTRAINT jrn_periode_pk PRIMARY KEY (jrn_def_id, p_id);
+
+
+--
+-- Name: jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+ALTER TABLE ONLY jrn
+    ADD CONSTRAINT jrn_pkey PRIMARY KEY (jr_id, jr_def_id);
+
+
+--
+-- Name: jrn_rapt_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY jrn_rapt
+    ADD CONSTRAINT jrn_rapt_pkey PRIMARY KEY (jra_id);
+
+
+--
+-- Name: jrn_type_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY jrn_type
+    ADD CONSTRAINT jrn_type_pkey PRIMARY KEY (jrn_type_id);
+
+
+--
+-- Name: jrnx_note_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY jrn_note
+    ADD CONSTRAINT jrnx_note_pkey PRIMARY KEY (n_id);
+
+
+--
+-- Name: jrnx_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+ALTER TABLE ONLY jrnx
+    ADD CONSTRAINT jrnx_pkey PRIMARY KEY (j_id);
+
+
+--
+-- Name: letter_cred_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY letter_cred
+    ADD CONSTRAINT letter_cred_pk PRIMARY KEY (lc_id);
+
+
+--
+-- Name: letter_deb_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY letter_deb
+    ADD CONSTRAINT letter_deb_pk PRIMARY KEY (ld_id);
+
+
+--
+-- Name: menu_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY menu_ref
+    ADD CONSTRAINT menu_ref_pkey PRIMARY KEY (me_code);
+
+
+--
+-- Name: mod_payment_pkey; Type: CONSTRAINT; Schema: public; Owner: -; T=
ablespace:=20
+--
+
+ALTER TABLE ONLY mod_payment
+    ADD CONSTRAINT mod_payment_pkey PRIMARY KEY (mp_id);
+
+
+--
+-- Name: op_def_op_name_key; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY op_predef
+    ADD CONSTRAINT op_def_op_name_key UNIQUE (od_name, jrn_def_id);
+
+
+--
+-- Name: op_def_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY op_predef
+    ADD CONSTRAINT op_def_pkey PRIMARY KEY (od_id);
+
+
+--
+-- Name: op_predef_detail_pkey; Type: CONSTRAINT; Schema: public; Owner:=
 -; Tablespace:=20
+--
+
+ALTER TABLE ONLY op_predef_detail
+    ADD CONSTRAINT op_predef_detail_pkey PRIMARY KEY (opd_id);
+
+
+--
+-- Name: parameter_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY parameter
+    ADD CONSTRAINT parameter_pkey PRIMARY KEY (pr_id);
+
+
+--
+-- Name: parm_code_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY parm_code
+    ADD CONSTRAINT parm_code_pkey PRIMARY KEY (p_code);
+
+
+--
+-- Name: parm_money_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY parm_money
+    ADD CONSTRAINT parm_money_pkey PRIMARY KEY (pm_code);
+
+
+--
+-- Name: parm_periode_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY parm_periode
+    ADD CONSTRAINT parm_periode_pkey PRIMARY KEY (p_id);
+
+
+--
+-- Name: parm_poste_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY parm_poste
+    ADD CONSTRAINT parm_poste_pkey PRIMARY KEY (p_value);
+
+
+--
+-- Name: pk_extension; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY extension
+    ADD CONSTRAINT pk_extension PRIMARY KEY (ex_id);
+
+
+--
+-- Name: pk_ga_id; Type: CONSTRAINT; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+ALTER TABLE ONLY groupe_analytique
+    ADD CONSTRAINT pk_ga_id PRIMARY KEY (ga_id);
+
+
+--
+-- Name: pk_jnt_fic_attr; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:=20
+--
+
+ALTER TABLE ONLY jnt_fic_attr
+    ADD CONSTRAINT pk_jnt_fic_attr PRIMARY KEY (jnt_id);
+
+
+--
+-- Name: pk_user_local_pref; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+ALTER TABLE ONLY user_local_pref
+    ADD CONSTRAINT pk_user_local_pref PRIMARY KEY (user_id, parameter_ty=
pe);
+
+
+--
+-- Name: plan_analytique_pa_name_key; Type: CONSTRAINT; Schema: public; =
Owner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY plan_analytique
+    ADD CONSTRAINT plan_analytique_pa_name_key UNIQUE (pa_name);
+
+
+--
+-- Name: plan_analytique_pkey; Type: CONSTRAINT; Schema: public; Owner: =
-; Tablespace:=20
+--
+
+ALTER TABLE ONLY plan_analytique
+    ADD CONSTRAINT plan_analytique_pkey PRIMARY KEY (pa_id);
+
+
+--
+-- Name: poste_analytique_pkey; Type: CONSTRAINT; Schema: public; Owner:=
 -; Tablespace:=20
+--
+
+ALTER TABLE ONLY poste_analytique
+    ADD CONSTRAINT poste_analytique_pkey PRIMARY KEY (po_id);
+
+
+--
+-- Name: profile_menu_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY profile_menu
+    ADD CONSTRAINT profile_menu_pkey PRIMARY KEY (pm_id);
+
+
+--
+-- Name: profile_menu_type_pkey; Type: CONSTRAINT; Schema: public; Owner=
: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY profile_menu_type
+    ADD CONSTRAINT profile_menu_type_pkey PRIMARY KEY (pm_type);
+
+
+--
+-- Name: profile_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY profile
+    ADD CONSTRAINT profile_pkey PRIMARY KEY (p_id);
+
+
+--
+-- Name: profile_user_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY profile_user
+    ADD CONSTRAINT profile_user_pkey PRIMARY KEY (pu_id);
+
+
+--
+-- Name: profile_user_user_name_key; Type: CONSTRAINT; Schema: public; O=
wner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY profile_user
+    ADD CONSTRAINT profile_user_user_name_key UNIQUE (user_name, p_id);
+
+
+--
+-- Name: qp_id_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+ALTER TABLE ONLY quant_purchase
+    ADD CONSTRAINT qp_id_pk PRIMARY KEY (qp_id);
+
+
+--
+-- Name: qs_id_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+ALTER TABLE ONLY quant_sold
+    ADD CONSTRAINT qs_id_pk PRIMARY KEY (qs_id);
+
+
+--
+-- Name: quant_fin_pk; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
+--
+
+ALTER TABLE ONLY quant_fin
+    ADD CONSTRAINT quant_fin_pk PRIMARY KEY (qf_id);
+
+
+--
+-- Name: stock_goods_pkey; Type: CONSTRAINT; Schema: public; Owner: -; T=
ablespace:=20
+--
+
+ALTER TABLE ONLY stock_goods
+    ADD CONSTRAINT stock_goods_pkey PRIMARY KEY (sg_id);
+
+
+--
+-- Name: tmp_pcmn_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+ALTER TABLE ONLY tmp_pcmn
+    ADD CONSTRAINT tmp_pcmn_pkey PRIMARY KEY (pcm_val);
+
+
+--
+-- Name: todo_list_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+ALTER TABLE ONLY todo_list
+    ADD CONSTRAINT todo_list_pkey PRIMARY KEY (tl_id);
+
+
+--
+-- Name: tva_id_pk; Type: CONSTRAINT; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+ALTER TABLE ONLY tva_rate
+    ADD CONSTRAINT tva_id_pk PRIMARY KEY (tva_id);
+
+
+--
+-- Name: user_sec_act_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY user_sec_act
+    ADD CONSTRAINT user_sec_act_pkey PRIMARY KEY (ua_id);
+
+
+--
+-- Name: user_sec_extension_ex_id_key; Type: CONSTRAINT; Schema: public;=
 Owner: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY user_sec_extension
+    ADD CONSTRAINT user_sec_extension_ex_id_key UNIQUE (ex_id, use_login=
);
+
+
+--
+-- Name: user_sec_extension_pkey; Type: CONSTRAINT; Schema: public; Owne=
r: -; Tablespace:=20
+--
+
+ALTER TABLE ONLY user_sec_extension
+    ADD CONSTRAINT user_sec_extension_pkey PRIMARY KEY (use_id);
+
+
+--
+-- Name: user_sec_jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+ALTER TABLE ONLY user_sec_jrn
+    ADD CONSTRAINT user_sec_jrn_pkey PRIMARY KEY (uj_id);
+
+
+--
+-- Name: ux_internal; Type: CONSTRAINT; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+ALTER TABLE ONLY jrn
+    ADD CONSTRAINT ux_internal UNIQUE (jr_internal);
+
+
+--
+-- Name: fd_id_ad_id_x; Type: INDEX; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE UNIQUE INDEX fd_id_ad_id_x ON jnt_fic_attr USING btree (fd_id, ad=
_id);
+
+
+--
+-- Name: fiche_detail_f_id_ad_id; Type: INDEX; Schema: public; Owner: -;=
 Tablespace:=20
+--
+
+CREATE UNIQUE INDEX fiche_detail_f_id_ad_id ON fiche_detail USING btree =
(f_id, ad_id);
+
+
+--
+-- Name: fk_stock_goods_f_id; Type: INDEX; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+CREATE INDEX fk_stock_goods_f_id ON stock_goods USING btree (f_id);
+
+
+--
+-- Name: fk_stock_goods_j_id; Type: INDEX; Schema: public; Owner: -; Tab=
lespace:=20
+--
+
+CREATE INDEX fk_stock_goods_j_id ON stock_goods USING btree (j_id);
+
+
+--
+-- Name: fki_f_end_date; Type: INDEX; Schema: public; Owner: -; Tablespa=
ce:=20
+--
+
+CREATE INDEX fki_f_end_date ON forecast USING btree (f_end_date);
+
+
+--
+-- Name: fki_f_start_date; Type: INDEX; Schema: public; Owner: -; Tables=
pace:=20
+--
+
+CREATE INDEX fki_f_start_date ON forecast USING btree (f_start_date);
+
+
+--
+-- Name: fki_jrnx_f_id; Type: INDEX; Schema: public; Owner: -; Tablespac=
e:=20
+--
+
+CREATE INDEX fki_jrnx_f_id ON jrnx USING btree (f_id);
+
+
+--
+-- Name: fki_profile_menu_me_code; Type: INDEX; Schema: public; Owner: -=
; Tablespace:=20
+--
+
+CREATE INDEX fki_profile_menu_me_code ON profile_menu USING btree (me_co=
de);
+
+
+--
+-- Name: fki_profile_menu_profile; Type: INDEX; Schema: public; Owner: -=
; Tablespace:=20
+--
+
+CREATE INDEX fki_profile_menu_profile ON profile_menu USING btree (p_id)=
;
+
+
+--
+-- Name: fki_profile_menu_type_fkey; Type: INDEX; Schema: public; Owner:=
 -; Tablespace:=20
+--
+
+CREATE INDEX fki_profile_menu_type_fkey ON profile_menu USING btree (p_t=
ype_display);
+
+
+--
+-- Name: idx_qs_internal; Type: INDEX; Schema: public; Owner: -; Tablesp=
ace:=20
+--
+
+CREATE INDEX idx_qs_internal ON quant_sold USING btree (qs_internal);
+
+
+--
+-- Name: jnt_fic_att_value_fd_id_idx; Type: INDEX; Schema: public; Owner=
: -; Tablespace:=20
+--
+
+CREATE INDEX jnt_fic_att_value_fd_id_idx ON fiche_detail USING btree (f_=
id);
+
+
+--
+-- Name: jnt_fic_attr_fd_id_idx; Type: INDEX; Schema: public; Owner: -; =
Tablespace:=20
+--
+
+CREATE INDEX jnt_fic_attr_fd_id_idx ON jnt_fic_attr USING btree (fd_id);
+
+
+--
+-- Name: k_ag_ref; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX k_ag_ref ON action_gestion USING btree (ag_ref);
+
+
+--
+-- Name: qcode_idx; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX qcode_idx ON fiche_detail USING btree (ad_value) WHE=
RE (ad_id =3D 23);
+
+
+--
+-- Name: qf_jr_id; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX qf_jr_id ON quant_fin USING btree (jr_id);
+
+
+--
+-- Name: qp_j_id; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX qp_j_id ON quant_purchase USING btree (j_id);
+
+
+--
+-- Name: qs_j_id; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX qs_j_id ON quant_sold USING btree (j_id);
+
+
+--
+-- Name: uj_login_uj_jrn_id; Type: INDEX; Schema: public; Owner: -; Tabl=
espace:=20
+--
+
+CREATE UNIQUE INDEX uj_login_uj_jrn_id ON user_sec_jrn USING btree (uj_l=
ogin, uj_jrn_id);
+
+
+--
+-- Name: ux_po_name; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX ux_po_name ON poste_analytique USING btree (po_name)=
;
+
+
+--
+-- Name: x_jrn_jr_id; Type: INDEX; Schema: public; Owner: -; Tablespace:=
=20
+--
+
+CREATE UNIQUE INDEX x_jrn_jr_id ON jrn USING btree (jr_id);
+
+
+--
+-- Name: x_mt; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE INDEX x_mt ON jrn USING btree (jr_mt);
+
+
+--
+-- Name: x_periode; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE UNIQUE INDEX x_periode ON parm_periode USING btree (p_start, p_en=
d);
+
+
+--
+-- Name: x_poste; Type: INDEX; Schema: public; Owner: -; Tablespace:=20
+--
+
+CREATE INDEX x_poste ON jrnx USING btree (j_poste);
+
+
+--
+-- Name: action_gestion_t_insert_update; Type: TRIGGER; Schema: public; =
Owner: -
+--
+
+CREATE TRIGGER action_gestion_t_insert_update
+    BEFORE INSERT OR UPDATE ON action_gestion
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.action_gestion_ins_upd();
+
+
+--
+-- Name: TRIGGER action_gestion_t_insert_update ON action_gestion; Type:=
 COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TRIGGER action_gestion_t_insert_update ON action_gestion IS '=
Truncate the column ag_title to 70 char';
+
+
+--
+-- Name: document_modele_validate; Type: TRIGGER; Schema: public; Owner:=
 -
+--
+
+CREATE TRIGGER document_modele_validate
+    BEFORE INSERT OR UPDATE ON document_modele
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.t_document_modele_validate();
+
+
+--
+-- Name: document_validate; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER document_validate
+    BEFORE INSERT OR UPDATE ON document
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.t_document_validate();
+
+
+--
+-- Name: fiche_def_ins_upd; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER fiche_def_ins_upd
+    BEFORE INSERT OR UPDATE ON fiche_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.fiche_def_ins_upd();
+
+
+--
+-- Name: info_def_ins_upd_t; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER info_def_ins_upd_t
+    BEFORE INSERT OR UPDATE ON info_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.info_def_ins_upd();
+
+
+--
+-- Name: quant_sold_ins_upd_tr; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER quant_sold_ins_upd_tr
+    AFTER INSERT OR UPDATE ON quant_purchase
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.quant_purchase_ins_upd();
+
+
+--
+-- Name: quant_sold_ins_upd_tr; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER quant_sold_ins_upd_tr
+    AFTER INSERT OR UPDATE ON quant_sold
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.quant_sold_ins_upd();
+
+
+--
+-- Name: remove_action_gestion; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER remove_action_gestion
+    AFTER DELETE ON fiche
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.card_after_delete();
+
+
+--
+-- Name: t_check_balance; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_check_balance
+    AFTER INSERT OR UPDATE ON jrn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.proc_check_balance();
+
+
+--
+-- Name: t_check_jrn; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_check_jrn
+    BEFORE INSERT OR DELETE OR UPDATE ON jrn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrn_check_periode();
+
+
+--
+-- Name: t_group_analytic_del; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_group_analytic_del
+    BEFORE DELETE ON groupe_analytique
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.group_analytique_del();
+
+
+--
+-- Name: t_group_analytic_ins_upd; Type: TRIGGER; Schema: public; Owner:=
 -
+--
+
+CREATE TRIGGER t_group_analytic_ins_upd
+    BEFORE INSERT OR UPDATE ON groupe_analytique
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.group_analytic_ins_upd();
+
+
+--
+-- Name: t_jnt_fic_attr_ins; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jnt_fic_attr_ins
+    AFTER INSERT ON jnt_fic_attr
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jnt_fic_attr_ins();
+
+
+--
+-- Name: t_jrn_def_add_periode; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrn_def_add_periode
+    AFTER INSERT ON jrn_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrn_def_add();
+
+
+--
+-- Name: t_jrn_def_delete; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrn_def_delete
+    BEFORE DELETE ON jrn_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrn_def_delete();
+
+
+--
+-- Name: t_jrn_del; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrn_del
+    BEFORE DELETE ON jrn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrn_del();
+
+
+--
+-- Name: t_jrnx_del; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrnx_del
+    BEFORE DELETE ON jrnx
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrnx_del();
+
+
+--
+-- Name: t_jrnx_ins; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrnx_ins
+    BEFORE INSERT ON jrnx
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrnx_ins();
+
+
+--
+-- Name: TRIGGER t_jrnx_ins ON jrnx; Type: COMMENT; Schema: public; Owne=
r: -
+--
+
+COMMENT ON TRIGGER t_jrnx_ins ON jrnx IS 'check that the qcode used by t=
he card exists and format it : uppercase and trim the space';
+
+
+--
+-- Name: t_jrnx_upd; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_jrnx_upd
+    BEFORE UPDATE ON jrnx
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrnx_ins();
+
+
+--
+-- Name: t_letter_del; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_letter_del
+    AFTER DELETE ON jrnx
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.jrnx_letter_del();
+
+
+--
+-- Name: TRIGGER t_letter_del ON jrnx; Type: COMMENT; Schema: public; Ow=
ner: -
+--
+
+COMMENT ON TRIGGER t_letter_del ON jrnx IS 'Delete the lettering for thi=
s row';
+
+
+--
+-- Name: t_plan_analytique_ins_upd; Type: TRIGGER; Schema: public; Owner=
: -
+--
+
+CREATE TRIGGER t_plan_analytique_ins_upd
+    BEFORE INSERT OR UPDATE ON plan_analytique
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.plan_analytic_ins_upd();
+
+
+--
+-- Name: t_poste_analytique_ins_upd; Type: TRIGGER; Schema: public; Owne=
r: -
+--
+
+CREATE TRIGGER t_poste_analytique_ins_upd
+    BEFORE INSERT OR UPDATE ON poste_analytique
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.poste_analytique_ins_upd();
+
+
+--
+-- Name: t_tmp_pcm_alphanum_ins_upd; Type: TRIGGER; Schema: public; Owne=
r: -
+--
+
+CREATE TRIGGER t_tmp_pcm_alphanum_ins_upd
+    BEFORE INSERT OR UPDATE ON tmp_pcmn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.tmp_pcmn_alphanum_ins_upd();
+
+
+--
+-- Name: t_tmp_pcmn_ins; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER t_tmp_pcmn_ins
+    BEFORE INSERT ON tmp_pcmn
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.tmp_pcmn_ins();
+
+
+--
+-- Name: trg_extension_ins_upd; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER trg_extension_ins_upd
+    BEFORE INSERT OR UPDATE ON extension
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.extension_ins_upd();
+
+
+--
+-- Name: trigger_document_type_i; Type: TRIGGER; Schema: public; Owner: =
-
+--
+
+CREATE TRIGGER trigger_document_type_i
+    AFTER INSERT ON document_type
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.t_document_type_insert();
+
+
+--
+-- Name: trigger_jrn_def_sequence_i; Type: TRIGGER; Schema: public; Owne=
r: -
+--
+
+CREATE TRIGGER trigger_jrn_def_sequence_i
+    AFTER INSERT ON jrn_def
+    FOR EACH ROW
+    EXECUTE PROCEDURE comptaproc.t_jrn_def_sequence();
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY centralized
+    ADD CONSTRAINT "$1" FOREIGN KEY (c_jrn_def) REFERENCES jrn_def(jrn_d=
ef_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY user_sec_act
+    ADD CONSTRAINT "$1" FOREIGN KEY (ua_act_id) REFERENCES action(ac_id)=
;
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY fiche_def
+    ADD CONSTRAINT "$1" FOREIGN KEY (frd_id) REFERENCES fiche_def_ref(fr=
d_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY attr_min
+    ADD CONSTRAINT "$1" FOREIGN KEY (frd_id) REFERENCES fiche_def_ref(fr=
d_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY fiche
+    ADD CONSTRAINT "$1" FOREIGN KEY (fd_id) REFERENCES fiche_def(fd_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY fiche_detail
+    ADD CONSTRAINT "$1" FOREIGN KEY (f_id) REFERENCES fiche(f_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jnt_fic_attr
+    ADD CONSTRAINT "$1" FOREIGN KEY (fd_id) REFERENCES fiche_def(fd_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn
+    ADD CONSTRAINT "$1" FOREIGN KEY (jr_def_id) REFERENCES jrn_def(jrn_d=
ef_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_action
+    ADD CONSTRAINT "$1" FOREIGN KEY (ja_jrn_type) REFERENCES jrn_type(jr=
n_type_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_def
+    ADD CONSTRAINT "$1" FOREIGN KEY (jrn_def_type) REFERENCES jrn_type(j=
rn_type_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrnx
+    ADD CONSTRAINT "$2" FOREIGN KEY (j_jrn_def) REFERENCES jrn_def(jrn_d=
ef_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY attr_min
+    ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY fiche_detail
+    ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jnt_fic_attr
+    ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
+
+
+--
+-- Name: action_detail_ag_id_fkey; Type: FK CONSTRAINT; Schema: public; =
Owner: -
+--
+
+ALTER TABLE ONLY action_detail
+    ADD CONSTRAINT action_detail_ag_id_fkey FOREIGN KEY (ag_id) REFERENC=
ES action_gestion(ag_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: card; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_item
+    ADD CONSTRAINT card FOREIGN KEY (fi_card) REFERENCES fiche(f_id) ON =
UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_card; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_fin
+    ADD CONSTRAINT fk_card FOREIGN KEY (qf_bank) REFERENCES fiche(f_id) =
ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_card_other; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_fin
+    ADD CONSTRAINT fk_card_other FOREIGN KEY (qf_other) REFERENCES fiche=
(f_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_forecast; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_item
+    ADD CONSTRAINT fk_forecast FOREIGN KEY (fc_id) REFERENCES forecast_c=
at(fc_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_info_def; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_info
+    ADD CONSTRAINT fk_info_def FOREIGN KEY (id_type) REFERENCES info_def=
(id_type) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_jrn; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_info
+    ADD CONSTRAINT fk_jrn FOREIGN KEY (jr_id) REFERENCES jrn(jr_id) ON U=
PDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_jrn; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_fin
+    ADD CONSTRAINT fk_jrn FOREIGN KEY (jr_id) REFERENCES jrn(jr_id) ON U=
PDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: fk_pa_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY groupe_analytique
+    ADD CONSTRAINT fk_pa_id FOREIGN KEY (pa_id) REFERENCES plan_analytiq=
ue(pa_id) ON DELETE CASCADE;
+
+
+--
+-- Name: fk_pcmn_val; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrnx
+    ADD CONSTRAINT fk_pcmn_val FOREIGN KEY (j_poste) REFERENCES tmp_pcmn=
(pcm_val);
+
+
+--
+-- Name: fk_pcmn_val; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY centralized
+    ADD CONSTRAINT fk_pcmn_val FOREIGN KEY (c_poste) REFERENCES tmp_pcmn=
(pcm_val);
+
+
+--
+-- Name: fk_stock_good_f_id; Type: FK CONSTRAINT; Schema: public; Owner:=
 -
+--
+
+ALTER TABLE ONLY stock_goods
+    ADD CONSTRAINT fk_stock_good_f_id FOREIGN KEY (f_id) REFERENCES fich=
e(f_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: forecast_child; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY forecast_cat
+    ADD CONSTRAINT forecast_child FOREIGN KEY (f_id) REFERENCES forecast=
(f_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: forecast_f_end_date_fkey; Type: FK CONSTRAINT; Schema: public; =
Owner: -
+--
+
+ALTER TABLE ONLY forecast
+    ADD CONSTRAINT forecast_f_end_date_fkey FOREIGN KEY (f_end_date) REF=
ERENCES parm_periode(p_id) ON UPDATE SET NULL ON DELETE SET NULL;
+
+
+--
+-- Name: forecast_f_start_date_fkey; Type: FK CONSTRAINT; Schema: public=
; Owner: -
+--
+
+ALTER TABLE ONLY forecast
+    ADD CONSTRAINT forecast_f_start_date_fkey FOREIGN KEY (f_start_date)=
 REFERENCES parm_periode(p_id) ON UPDATE SET NULL ON DELETE SET NULL;
+
+
+--
+-- Name: formdef_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY form
+    ADD CONSTRAINT formdef_fk FOREIGN KEY (fo_fr_id) REFERENCES formdef(=
fr_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jnt_cred_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_cred
+    ADD CONSTRAINT jnt_cred_fk FOREIGN KEY (jl_id) REFERENCES jnt_letter=
(jl_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jnt_deb_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_deb
+    ADD CONSTRAINT jnt_deb_fk FOREIGN KEY (jl_id) REFERENCES jnt_letter(=
jl_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_def_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY op_predef
+    ADD CONSTRAINT jrn_def_id_fk FOREIGN KEY (jrn_def_id) REFERENCES jrn=
_def(jrn_def_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_per_jrn_def_id; Type: FK CONSTRAINT; Schema: public; Owner:=
 -
+--
+
+ALTER TABLE ONLY jrn_periode
+    ADD CONSTRAINT jrn_per_jrn_def_id FOREIGN KEY (jrn_def_id) REFERENCE=
S jrn_def(jrn_def_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_periode_p_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrn_periode
+    ADD CONSTRAINT jrn_periode_p_id FOREIGN KEY (p_id) REFERENCES parm_p=
eriode(p_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_rapt_jr_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner=
: -
+--
+
+ALTER TABLE ONLY jrn_rapt
+    ADD CONSTRAINT jrn_rapt_jr_id_fkey FOREIGN KEY (jr_id) REFERENCES jr=
n(jr_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrn_rapt_jra_concerned_fkey; Type: FK CONSTRAINT; Schema: publi=
c; Owner: -
+--
+
+ALTER TABLE ONLY jrn_rapt
+    ADD CONSTRAINT jrn_rapt_jra_concerned_fkey FOREIGN KEY (jra_concerne=
d) REFERENCES jrn(jr_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jrnx_f_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jrnx
+    ADD CONSTRAINT jrnx_f_id_fkey FOREIGN KEY (f_id) REFERENCES fiche(f_=
id) ON UPDATE CASCADE;
+
+
+--
+-- Name: jrnx_note_j_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner=
: -
+--
+
+ALTER TABLE ONLY jrn_note
+    ADD CONSTRAINT jrnx_note_j_id_fkey FOREIGN KEY (jr_id) REFERENCES jr=
n(jr_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: letter_cred_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_cred
+    ADD CONSTRAINT letter_cred_fk FOREIGN KEY (j_id) REFERENCES jrnx(j_i=
d) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: letter_deb_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY letter_deb
+    ADD CONSTRAINT letter_deb_fk FOREIGN KEY (j_id) REFERENCES jrnx(j_id=
) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: md_type; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY document_modele
+    ADD CONSTRAINT md_type FOREIGN KEY (md_type) REFERENCES document_typ=
e(dt_id);
+
+
+--
+-- Name: mod_payment_jrn_def_id_fk; Type: FK CONSTRAINT; Schema: public;=
 Owner: -
+--
+
+ALTER TABLE ONLY mod_payment
+    ADD CONSTRAINT mod_payment_jrn_def_id_fk FOREIGN KEY (jrn_def_id) RE=
FERENCES jrn_def(jrn_def_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: mod_payment_mp_fd_id_fkey; Type: FK CONSTRAINT; Schema: public;=
 Owner: -
+--
+
+ALTER TABLE ONLY mod_payment
+    ADD CONSTRAINT mod_payment_mp_fd_id_fkey FOREIGN KEY (mp_fd_id) REFE=
RENCES fiche_def(fd_id);
+
+
+--
+-- Name: mod_payment_mp_jrn_def_id_fkey; Type: FK CONSTRAINT; Schema: pu=
blic; Owner: -
+--
+
+ALTER TABLE ONLY mod_payment
+    ADD CONSTRAINT mod_payment_mp_jrn_def_id_fkey FOREIGN KEY (mp_jrn_de=
f_id) REFERENCES jrn_def(jrn_def_id);
+
+
+--
+-- Name: operation_analytique_j_id_fkey; Type: FK CONSTRAINT; Schema: pu=
blic; Owner: -
+--
+
+ALTER TABLE ONLY operation_analytique
+    ADD CONSTRAINT operation_analytique_j_id_fkey FOREIGN KEY (j_id) REF=
ERENCES jrnx(j_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: operation_analytique_po_id_fkey; Type: FK CONSTRAINT; Schema: p=
ublic; Owner: -
+--
+
+ALTER TABLE ONLY operation_analytique
+    ADD CONSTRAINT operation_analytique_po_id_fkey FOREIGN KEY (po_id) R=
EFERENCES poste_analytique(po_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: poste_analytique_pa_id_fkey; Type: FK CONSTRAINT; Schema: publi=
c; Owner: -
+--
+
+ALTER TABLE ONLY poste_analytique
+    ADD CONSTRAINT poste_analytique_pa_id_fkey FOREIGN KEY (pa_id) REFER=
ENCES plan_analytique(pa_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: profile_menu_me_code_fkey; Type: FK CONSTRAINT; Schema: public;=
 Owner: -
+--
+
+ALTER TABLE ONLY profile_menu
+    ADD CONSTRAINT profile_menu_me_code_fkey FOREIGN KEY (me_code) REFER=
ENCES menu_ref(me_code) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: profile_menu_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
+--
+
+ALTER TABLE ONLY profile_menu
+    ADD CONSTRAINT profile_menu_p_id_fkey FOREIGN KEY (p_id) REFERENCES =
profile(p_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: profile_menu_type_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
+--
+
+ALTER TABLE ONLY profile_menu
+    ADD CONSTRAINT profile_menu_type_fkey FOREIGN KEY (p_type_display) R=
EFERENCES profile_menu_type(pm_type);
+
+
+--
+-- Name: profile_user_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
+--
+
+ALTER TABLE ONLY profile_user
+    ADD CONSTRAINT profile_user_p_id_fkey FOREIGN KEY (p_id) REFERENCES =
profile(p_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: qp_vat_code_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_purchase
+    ADD CONSTRAINT qp_vat_code_fk FOREIGN KEY (qp_vat_code) REFERENCES t=
va_rate(tva_id);
+
+
+--
+-- Name: qs_vat_code_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY quant_sold
+    ADD CONSTRAINT qs_vat_code_fk FOREIGN KEY (qs_vat_code) REFERENCES t=
va_rate(tva_id);
+
+
+--
+-- Name: quant_purchase_j_id_fkey; Type: FK CONSTRAINT; Schema: public; =
Owner: -
+--
+
+ALTER TABLE ONLY quant_purchase
+    ADD CONSTRAINT quant_purchase_j_id_fkey FOREIGN KEY (j_id) REFERENCE=
S jrnx(j_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: quant_purchase_qp_internal_fkey; Type: FK CONSTRAINT; Schema: p=
ublic; Owner: -
+--
+
+ALTER TABLE ONLY quant_purchase
+    ADD CONSTRAINT quant_purchase_qp_internal_fkey FOREIGN KEY (qp_inter=
nal) REFERENCES jrn(jr_internal) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: quant_sold_j_id_fkey; Type: FK CONSTRAINT; Schema: public; Owne=
r: -
+--
+
+ALTER TABLE ONLY quant_sold
+    ADD CONSTRAINT quant_sold_j_id_fkey FOREIGN KEY (j_id) REFERENCES jr=
nx(j_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: quant_sold_qs_internal_fkey; Type: FK CONSTRAINT; Schema: publi=
c; Owner: -
+--
+
+ALTER TABLE ONLY quant_sold
+    ADD CONSTRAINT quant_sold_qs_internal_fkey FOREIGN KEY (qs_internal)=
 REFERENCES jrn(jr_internal) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: stock_goods_j_id_fkey; Type: FK CONSTRAINT; Schema: public; Own=
er: -
+--
+
+ALTER TABLE ONLY stock_goods
+    ADD CONSTRAINT stock_goods_j_id_fkey FOREIGN KEY (j_id) REFERENCES j=
rnx(j_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: uj_priv_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY user_sec_jrn
+    ADD CONSTRAINT uj_priv_id_fkey FOREIGN KEY (uj_jrn_id) REFERENCES jr=
n_def(jrn_def_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- PostgreSQL database dump complete
+--
+

Added: phpcompta/trunk/contrib/mono-dossier/mono.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/contrib/mono-dossier/mono.sql	                       =
 (rev 0)
+++ phpcompta/trunk/contrib/mono-dossier/mono.sql	2013-05-17 00:29:31 UTC=
 (rev 5278)
@@ -0,0 +1,530 @@
+--
+-- PostgreSQL database dump
+--
+
+SET statement_timeout =3D 0;
+SET client_encoding =3D 'UTF8';
+SET standard_conforming_strings =3D off;
+SET check_function_bodies =3D false;
+SET client_min_messages =3D warning;
+SET escape_string_warning =3D off;
+
+--
+-- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: -; Owner: -
+--
+
+SET search_path =3D public, pg_catalog;
+
+--
+-- Name: limit_user(); Type: FUNCTION; Schema: public; Owner: -
+--
+
+CREATE FUNCTION limit_user() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+
+begin
+NEW.ac_user :=3D substring(NEW.ac_user from 1 for 80);
+return NEW;
+end; $$;
+
+
+SET default_tablespace =3D '';
+
+SET default_with_oids =3D false;
+
+--
+-- Name: ac_dossier; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE ac_dossier (
+    dos_id integer DEFAULT nextval(('dossier_id'::text)::regclass) NOT N=
ULL,
+    dos_name text NOT NULL,
+    dos_description text,
+    dos_jnt_user integer DEFAULT 0
+);
+
+
+--
+-- Name: ac_users; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE ac_users (
+    use_id integer DEFAULT nextval(('users_id'::text)::regclass) NOT NUL=
L,
+    use_first_name text,
+    use_name text,
+    use_login text NOT NULL,
+    use_active integer DEFAULT 0,
+    use_pass text,
+    use_admin integer DEFAULT 0,
+    CONSTRAINT ac_users_use_active_check CHECK (((use_active =3D 0) OR (=
use_active =3D 1)))
+);
+
+
+--
+-- Name: audit_connect; Type: TABLE; Schema: public; Owner: -; Tablespac=
e:
+--
+
+CREATE TABLE audit_connect (
+    ac_id integer NOT NULL,
+    ac_user text,
+    ac_date timestamp without time zone DEFAULT now(),
+    ac_ip text,
+    ac_state text,
+    ac_module text,
+    ac_url text,
+    CONSTRAINT valid_state CHECK ((((ac_state =3D 'FAIL'::text) OR (ac_s=
tate =3D 'SUCCESS'::text)) OR (ac_state =3D 'AUDIT'::text)))
+);
+
+
+--
+-- Name: audit_connect_ac_id_seq; Type: SEQUENCE; Schema: public; Owner:=
 -
+--
+
+CREATE SEQUENCE audit_connect_ac_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: audit_connect_ac_id_seq; Type: SEQUENCE OWNED BY; Schema: publi=
c; Owner: -
+--
+
+ALTER SEQUENCE audit_connect_ac_id_seq OWNED BY audit_connect.ac_id;
+
+
+--
+-- Name: audit_connect_ac_id_seq; Type: SEQUENCE SET; Schema: public; Ow=
ner: -
+--
+
+SELECT pg_catalog.setval('audit_connect_ac_id_seq', 287, true);
+
+
+--
+-- Name: dossier_id; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE dossier_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: dossier_id; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('dossier_id', 29, true);
+
+
+--
+-- Name: jnt_use_dos; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE jnt_use_dos (
+    jnt_id integer DEFAULT nextval(('seq_jnt_use_dos'::text)::regclass) =
NOT NULL,
+    use_id integer NOT NULL,
+    dos_id integer NOT NULL
+);
+
+
+--
+-- Name: modeledef; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE modeledef (
+    mod_id integer DEFAULT nextval(('s_modid'::text)::regclass) NOT NULL=
,
+    mod_name text NOT NULL,
+    mod_desc text
+);
+
+
+--
+-- Name: priv_user; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE priv_user (
+    priv_id integer DEFAULT nextval(('seq_priv_user'::text)::regclass) N=
OT NULL,
+    priv_jnt integer NOT NULL,
+    priv_priv text
+);
+
+
+--
+-- Name: s_modid; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE s_modid
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: s_modid; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('s_modid', 8, true);
+
+
+--
+-- Name: seq_jnt_use_dos; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_jnt_use_dos
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_jnt_use_dos; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_jnt_use_dos', 33, true);
+
+
+--
+-- Name: seq_priv_user; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE seq_priv_user
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_priv_user; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('seq_priv_user', 16, true);
+
+
+--
+-- Name: theme; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE theme (
+    the_name text NOT NULL,
+    the_filestyle text,
+    the_filebutton text
+);
+
+
+--
+-- Name: user_global_pref; Type: TABLE; Schema: public; Owner: -; Tables=
pace:
+--
+
+CREATE TABLE user_global_pref (
+    user_id text NOT NULL,
+    parameter_type text NOT NULL,
+    parameter_value text
+);
+
+
+--
+-- Name: TABLE user_global_pref; Type: COMMENT; Schema: public; Owner: -
+--
+
+COMMENT ON TABLE user_global_pref IS 'The user''s global parameter ';
+
+
+--
+-- Name: COLUMN user_global_pref.user_id; Type: COMMENT; Schema: public;=
 Owner: -
+--
+
+COMMENT ON COLUMN user_global_pref.user_id IS 'user''s login ';
+
+
+--
+-- Name: COLUMN user_global_pref.parameter_type; Type: COMMENT; Schema: =
public; Owner: -
+--
+
+COMMENT ON COLUMN user_global_pref.parameter_type IS 'the type of parame=
ter ';
+
+
+--
+-- Name: COLUMN user_global_pref.parameter_value; Type: COMMENT; Schema:=
 public; Owner: -
+--
+
+COMMENT ON COLUMN user_global_pref.parameter_value IS 'the value of para=
meter ';
+
+
+--
+-- Name: users_id; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE users_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- Name: users_id; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('users_id', 5, true);
+
+
+--
+-- Name: version; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE repo_version (
+    val integer NOT NULL
+);
+
+
+--
+-- Name: ac_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY audit_connect ALTER COLUMN ac_id SET DEFAULT nextval('a=
udit_connect_ac_id_seq'::regclass);
+
+
+--
+-- Data for Name: ac_dossier; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+COPY ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) FROM s=
tdin;
+25	Dossier	Dossier par d=C3=A9faut	0
+\.
+
+
+--
+-- Data for Name: ac_users; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+COPY ac_users (use_id, use_first_name, use_name, use_login, use_active, =
use_pass, use_admin) FROM stdin;
+1	\N	\N	phpcompta	1	b1cc88e1907cde80cb2595fa793b3da9	1
+\.
+
+
+--
+-- Data for Name: audit_connect; Type: TABLE DATA; Schema: public; Owner=
: -
+--
+
+
+
+--
+-- Data for Name: jnt_use_dos; Type: TABLE DATA; Schema: public; Owner: =
-
+--
+
+COPY jnt_use_dos (jnt_id, use_id, dos_id) FROM stdin;
+29	1	25
+\.
+
+
+--
+-- Data for Name: modeledef; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+COPY modeledef (mod_id, mod_name, mod_desc) FROM stdin;
+1	(BE) Basique	Comptabilit=C3=A9 Belge, =C3=A0 adapter
+2	(FR) Basique	Comptabilit=C3=A9 Fran=C3=A7aise, =C3=A0 adapter
+\.
+
+
+--
+-- Data for Name: priv_user; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+COPY priv_user (priv_id, priv_jnt, priv_priv) FROM stdin;
+\.
+
+
+--
+-- Data for Name: theme; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+COPY theme (the_name, the_filestyle, the_filebutton) FROM stdin;
+classic	style.css	\N
+Light	style-light.css	\N
+Colored	style-color.css	\N
+EPad	style-epad.css	\N
+\.
+
+
+--
+-- Data for Name: user_global_pref; Type: TABLE DATA; Schema: public; Ow=
ner: -
+--
+
+COPY user_global_pref (user_id, parameter_type, parameter_value) FROM st=
din;
+phpcompta	TOPMENU	TEXT
+phpcompta	PAGESIZE	50
+phpcompta	THEME	classic
+phpcompta	LANG	fr_FR.utf8
+\.
+
+
+--
+-- Data for Name: version; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+COPY repo_version (val) FROM stdin;
+14
+\.
+
+
+--
+-- Name: ac_dossier_dos_name_key; Type: CONSTRAINT; Schema: public; Owne=
r: -; Tablespace:
+--
+
+ALTER TABLE ONLY ac_dossier
+    ADD CONSTRAINT ac_dossier_dos_name_key UNIQUE (dos_name);
+
+
+--
+-- Name: ac_dossier_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Ta=
blespace:
+--
+
+ALTER TABLE ONLY ac_dossier
+    ADD CONSTRAINT ac_dossier_pkey PRIMARY KEY (dos_id);
+
+
+--
+-- Name: ac_users_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:
+--
+
+ALTER TABLE ONLY ac_users
+    ADD CONSTRAINT ac_users_pkey PRIMARY KEY (use_id);
+
+
+--
+-- Name: ac_users_use_login_key; Type: CONSTRAINT; Schema: public; Owner=
: -; Tablespace:
+--
+
+ALTER TABLE ONLY ac_users
+    ADD CONSTRAINT ac_users_use_login_key UNIQUE (use_login);
+
+
+--
+-- Name: audit_connect_pkey; Type: CONSTRAINT; Schema: public; Owner: -;=
 Tablespace:
+--
+
+ALTER TABLE ONLY audit_connect
+    ADD CONSTRAINT audit_connect_pkey PRIMARY KEY (ac_id);
+
+
+--
+-- Name: jnt_use_dos_pkey; Type: CONSTRAINT; Schema: public; Owner: -; T=
ablespace:
+--
+
+ALTER TABLE ONLY jnt_use_dos
+    ADD CONSTRAINT jnt_use_dos_pkey PRIMARY KEY (jnt_id);
+
+
+--
+-- Name: modeledef_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:
+--
+
+ALTER TABLE ONLY modeledef
+    ADD CONSTRAINT modeledef_pkey PRIMARY KEY (mod_id);
+
+
+--
+-- Name: pk_user_global_pref; Type: CONSTRAINT; Schema: public; Owner: -=
; Tablespace:
+--
+
+ALTER TABLE ONLY user_global_pref
+    ADD CONSTRAINT pk_user_global_pref PRIMARY KEY (user_id, parameter_t=
ype);
+
+
+--
+-- Name: priv_user_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tab=
lespace:
+--
+
+ALTER TABLE ONLY priv_user
+    ADD CONSTRAINT priv_user_pkey PRIMARY KEY (priv_id);
+
+
+--
+-- Name: version_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:
+--
+
+ALTER TABLE ONLY version
+    ADD CONSTRAINT version_pkey PRIMARY KEY (val);
+
+
+--
+-- Name: audit_connect_ac_user; Type: INDEX; Schema: public; Owner: -; T=
ablespace:
+--
+
+CREATE INDEX audit_connect_ac_user ON audit_connect USING btree (ac_user=
);
+
+
+--
+-- Name: fk_jnt_dos_id; Type: INDEX; Schema: public; Owner: -; Tablespac=
e:
+--
+
+CREATE INDEX fk_jnt_dos_id ON jnt_use_dos USING btree (dos_id);
+
+
+--
+-- Name: fk_jnt_use_dos; Type: INDEX; Schema: public; Owner: -; Tablespa=
ce:
+--
+
+CREATE INDEX fk_jnt_use_dos ON jnt_use_dos USING btree (use_id);
+
+
+--
+-- Name: limit_user_trg; Type: TRIGGER; Schema: public; Owner: -
+--
+
+CREATE TRIGGER limit_user_trg
+    BEFORE INSERT OR UPDATE ON audit_connect
+    FOR EACH ROW
+    EXECUTE PROCEDURE limit_user();
+
+
+--
+-- Name: fk_user_id; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY user_global_pref
+    ADD CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES ac_users(=
use_login) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jnt_use_dos_dos_id_fkey; Type: FK CONSTRAINT; Schema: public; O=
wner: -
+--
+
+ALTER TABLE ONLY jnt_use_dos
+    ADD CONSTRAINT jnt_use_dos_dos_id_fkey FOREIGN KEY (dos_id) REFERENC=
ES ac_dossier(dos_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: jnt_use_dos_use_id_fkey; Type: FK CONSTRAINT; Schema: public; O=
wner: -
+--
+
+ALTER TABLE ONLY jnt_use_dos
+    ADD CONSTRAINT jnt_use_dos_use_id_fkey FOREIGN KEY (use_id) REFERENC=
ES ac_users(use_id);
+
+
+--
+-- Name: priv_user_priv_jnt_fkey; Type: FK CONSTRAINT; Schema: public; O=
wner: -
+--
+
+ALTER TABLE ONLY priv_user
+    ADD CONSTRAINT priv_user_priv_jnt_fkey FOREIGN KEY (priv_jnt) REFERE=
NCES jnt_use_dos(jnt_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- PostgreSQL database dump complete
+--
+

Modified: phpcompta/trunk/html/admin/setup.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.js	2013-05-16 22:43:26 UTC (rev 5277=
)
+++ phpcompta/trunk/html/admin/setup.js	2013-05-17 00:29:31 UTC (rev 5278=
)
@@ -8,4 +8,20 @@
 content[202]=3D"Le chemin vers le repertoire contenant psql, pg_dump..."=
;
 content[203]=3D"Utilisateur de la base de donn=C3=A9e postgresql";
 content[204]=3D"Mot de passe de l'utilisateur ";
-content[205]=3D"Port de postgresql";
\ No newline at end of file
+content[205]=3D"Port de postgresql";
+content[206]=3D"En version mono dossier, le nom de la base de donn=C3=A9=
es doit =C3=AAtre mentionn=C3=A9e";
+
+
+function show_dbname(obj) {
+	try {
+		if (obj.value =3D=3D=3D '1')
+		{
+			this.document.getElementById('div_db').style.visibility=3D 'hidden';
+		}
+		else {
+			this.document.getElementById('div_db').style.visibility=3D 'visible';
+		}
+	} catch (e) {
+		alert(e.getMessage);
+	}
+}

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-16 22:43:26 UTC (rev 527=
7)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-17 00:29:31 UTC (rev 527=
8)
@@ -46,15 +46,17 @@
 		 <script type=3D"text/javascript" charset=3D"utf8" language=3D"javascr=
ipt" src=3D"setup.js"></script>
=20
 <?php
+
 $failed=3D"<span style=3D\"font-size:18px;color:red\">&#x2716;</span>";
 $succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</span>=
";
 $inc_path=3Dget_include_path();
+global $os;
 /**
  *@brief create correctly the htaccess file
  */
 function create_htaccess() {
 $inc_path=3Dget_include_path();
-
+global $os;
 if ( strpos($inc_path,";") !=3D 0 ) {
   $new_path=3D$inc_path.';..\..\include;addon';
   $os=3D0;			/* $os is 0 for windoz */
@@ -97,17 +99,10 @@
   foreach ($array as $value ) fwrite($hFile,$value."\n");
   fclose($hFile);
 }
-if ( strpos($inc_path,";") !=3D 0 ) {
-  $new_path=3D$inc_path.';..\..\include;addon';
-  $os=3D0;			/* $os is 0 for windoz */
-} else {
-  $new_path=3D$inc_path.':../../include:addon';
-  $os=3D1;			/* $os is 1 for unix */
-}
-set_include_path($new_path);
+
 /* The config file is created here */
 if (isset($_POST['save_config'])) {
-  require_once('config_file.php');
+  require_once('../../include/config_file.php');
   $url=3Dconfig_file_create($_POST,1,$os);
 echo '
 <form method=3D"post" >
@@ -125,7 +120,7 @@
 if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'in=
clude'.DIRECTORY_SEPARATOR.'config.inc.php')) {
   echo '<h1 class=3D"info">Entrez les informations n&eacute;cessaires &a=
grave; phpcompta</h1>';
   echo '<form method=3D"post">';
-  require_once('config_file.php');
+  require_once('../../include/config_file.php');
   echo config_file_form();
   echo '<div style=3D"position:float;float:left;"></div>';
   echo HtmlInput::submit('save_config','Sauver la configuration');
@@ -144,8 +139,8 @@
 // magic_quotes_runtime =3D Off
 // magic_quotes_sybase =3D Off
 // include_path
+require_once '../../include/constant.php';
 require_once('config_file.php');
-include_once('constant.php');
 require_once('class_database.php');
 echo "<h1>Configuration</h1>";
 ?>
@@ -237,19 +232,6 @@
 }
=20
 echo "<li>";
-if ( strpos($inc_path,"../include") =3D=3D 0 && strpos ($inc_path,'..\\i=
nclude') =3D=3D 0)
-{
-    echo 'variable include_path: '.$failed;
-  print ("<span class=3D\"warning\"> include_path incorrect  !!!".$inc_p=
ath."</span>");
-	$flag_php++;
-}
- else
-   if ( strpos($inc_path,"addon") =3D=3D 0) {
-       echo 'variable include_path: '.$failed;
-    print ("<span class=3D\"warning\">2 include_path incorrect  !!!".$in=
c_path."</span>");
-	$flag_php++;
- }else
-   echo 'variable include_path: '.$succeed;
 echo "</li>";
=20
  echo "</ul>";
@@ -260,8 +242,13 @@
 	exit -1;
 }
 /* check user */
-$cn=3Dnew Database(-1,'template');
-
+if ( defined("MULTI") && MULTI=3D=3D1)
+{
+	$cn=3Dnew Database(-1,'template');
+} else
+{
+	$cn=3Dnew Database();
+}
 ?>
 <h2>Base de donn=C3=A9es</h2>
 <?php
@@ -344,7 +331,10 @@
 if ( ! isset($_POST['go']) )
 	exit();
 // Check if account_repository exists
-$account=3D$cn->count_sql("select * from pg_database where datname=3Dlow=
er('".domaine."account_repository')");
+	if ( defined("MULTI") && MULTI=3D=3D 0)
+		$account =3D $cn->count_sql("select * from pg_database where datname=3D=
lower('" . domaine . "account_repository')");
+	else
+		$account=3D1;
=20
 // Create the account_repository
 if ($account =3D=3D 0 ) {
@@ -393,7 +383,27 @@
=20
 echo "<h1>Mise a jour du systeme</h1>";
 echo "<h2 > Mise &agrave; jour dossier</h2>";
+if (defined("MULTI") && MULTI =3D=3D 0)
+{
+	$db =3D new Database();
+	if ($db->exist_table("version") =3D=3D false)
+	{
+		echo '<p class=3D"warning">' . $failed . 'La base de donn=C3=A9e ' . d=
bname . ' est vide, veuillez y restaurer un mod=C3=A8le de base de donn=C3=
=A9es plus le script mono.sql
+				, ce script se trouve dans phpcompta/contrib/mono.sql</p>';
+		exit();
+	}
+	echo "<h3>Patching " . dbname . '</h3>';
+	$db->apply_patch(dbname);
+	echo "<p class=3D\"info\">Tout est install&eacute; $succeed";
+	?>
+		<A style=3D"" class=3D"button" HREF=3D"../index.php">Connectez-vous =C3=
=A0 PhpCompta</A>
+	<?php
+	exit();
+}
=20
+/*
+ * If multi folders
+ */
 $Resdossier=3D$cn->exec_sql("select dos_id, dos_name from ac_dossier");
 $MaxDossier=3D$cn->size($Resdossier);
=20

Modified: phpcompta/trunk/html/admin/template_config_form.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/template_config_form.php	2013-05-16 22:43:=
26 UTC (rev 5277)
+++ phpcompta/trunk/html/admin/template_config_form.php	2013-05-17 00:29:=
31 UTC (rev 5278)
@@ -55,6 +55,18 @@
 	<TD>Port de postgresql </TD>
 	<TD><?php echo $icport->input();echo HtmlInput::infobulle(205)?></TD>
 </TR>
+<tr>
+	<td>Mode Serveur mutualis=C3=A9 ou d=C3=A9di=C3=A9</td>
+	<td><?php echo $smulti->input() ?></td>
+</tr>
+<tr id=3D"div_db" style=3D"visibility:hidden">
+	<td>
+		Nom base de donn=C3=A9e
+	</td>
+	<td>
+		<?php echo $icdbname->input();echo HtmlInput::infobulle(206) ?>
+	</td>
+</tr>
 </table>
 </div>
 <div class=3D"notice">
@@ -66,4 +78,5 @@
 	<?php
 	}
 	?>
-</div>
\ No newline at end of file
+</div>
+

Modified: phpcompta/trunk/html/login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/login.php	2013-05-16 22:43:26 UTC (rev 5277)
+++ phpcompta/trunk/html/login.php	2013-05-17 00:29:31 UTC (rev 5278)
@@ -28,7 +28,14 @@
 /* $Revision$ */
=20
 require_once('class_database.php');
+// Verif if User and Pass match DB
+    // if no, then redirect to the login page
+$rep=3Dnew Database();
=20
+if (defined('MULTI') && MULTI =3D=3D 0)
+		$version =3D $rep->get_value('select val from repo_version');
+	else
+		$version =3D $rep->get_value('select val from version');
=20
 if (  isset ($_POST["p_user"] ) )
 {
@@ -37,20 +44,18 @@
     $_SESSION['g_user']=3D$g_user;
     $_SESSION['g_pass']=3D$g_pass;
=20
-    // Verif if User and Pass match DB
-    // if no, then redirect to the login page
-    $rep=3Dnew Database();
+
     /*
      * Check repository version
      */
-    if ( $rep->get_value('select val from version') !=3D DBVERSIONREPO)
-      {
-	echo alert('Version de base de donn=C3=A9es incorrectes, vous devez met=
tre =C3=A0 jour');
-	echo "<META HTTP-EQUIV=3D\"REFRESH\" content=3D\"0;url=3Dadmin/setup.ph=
p\">";
-	exit();
=20
-      }
-    include_once ("class_user.php");
+	if ($version !=3D DBVERSIONREPO)
+	{
+		echo alert('Version de base de donn=C3=A9es incorrectes, vous devez me=
ttre =C3=A0 jour');
+		echo "<META HTTP-EQUIV=3D\"REFRESH\" content=3D\"0;url=3Dadmin/setup.p=
hp\">";
+		exit();
+	}
+	include_once ("class_user.php");
     $User=3Dnew User($rep);
     $User->Check(false,'LOGIN');
     if ($g_captcha =3D=3D true)
@@ -76,7 +81,7 @@
      * Check repository version
      */
=20
-    if ( $rep->get_value('select val from version') !=3D DBVERSIONREPO)
+    if ( $version !=3D DBVERSIONREPO)
       {
 	echo alert('Version de base de donn=C3=A9es incorrectes, vous devez met=
tre =C3=A0 jour');
 	echo "<META HTTP-EQUIV=3D\"REFRESH\" content=3D\"1;url=3Dadmin/setup.ph=
p\">";

Modified: phpcompta/trunk/html/logout.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/logout.php	2013-05-16 22:43:26 UTC (rev 5277)
+++ phpcompta/trunk/html/logout.php	2013-05-17 00:29:31 UTC (rev 5278)
@@ -20,6 +20,7 @@
 /*! \file
  * \brief Logout
  */
+require_once '../include/constant.php';
 require_once ("ac_common.php");
 require_once('class_database.php');
=20

Modified: phpcompta/trunk/html/user_login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_login.php	2013-05-16 22:43:26 UTC (rev 5277=
)
+++ phpcompta/trunk/html/user_login.php	2013-05-17 00:29:31 UTC (rev 5278=
)
@@ -104,7 +104,7 @@
  * folder if he's an "plugin user"
  */
=20
-if ( $User->admin =3D=3D 0 )
+if ( $User->admin =3D=3D 0 || (defined("MULTI")&&MULTI=3D=3D0))
 {
     // how many folder ?
     $folder=3D$User->get_available_folder();

Modified: phpcompta/trunk/include/class_database.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_database.php	2013-05-16 22:43:26 UTC (r=
ev 5277)
+++ phpcompta/trunk/include/class_database.php	2013-05-17 00:29:31 UTC (r=
ev 5278)
@@ -47,27 +47,37 @@
         $password=3Dphpcompta_password;
         $port=3Dphpcompta_psql_port;
         $host=3D( ! defined ("phpcompta_psql_host"))?'127.0.0.1':phpcomp=
ta_psql_host;
+		if (defined ("MULTI") && MULTI=3D=3D"0") {
+			 $phpcompta_user =3D phpcompta_user;
+			$password =3D phpcompta_password;
+			$port =3D phpcompta_psql_port;
+			$host =3D (!defined("phpcompta_psql_host")) ? '127.0.0.1' : phpcompta=
_psql_host;
+			$l_dossier=3D dbname;
+		}
+		else
+		{
=20
-        if ( $p_database_id =3D=3D 0 )
-        { /* connect to the repository */
-            $l_dossier=3Dsprintf("%saccount_repository",strtolower(domai=
ne));
-        }
-        else if ( $p_type =3D=3D 'dos')
-        { /* connect to a folder (dossier) */
-            $l_dossier=3Dsprintf("%sdossier%d",strtolower(domaine),$p_da=
tabase_id);
-        }
-        else if ($p_type=3D=3D'mod')
-        {	  /* connect to a template (modele) */
-            $l_dossier=3Dsprintf("%smod%d",strtolower(domaine),$p_databa=
se_id);
-        }
-        else if ($p_type=3D=3D'template')
-        {
-            $l_dossier=3D'template1';
-        }
-        else
-        {
-            throw new Exception ('Connection invalide');
-        }
+			if ( $p_database_id =3D=3D 0 )
+			{ /* connect to the repository */
+				$l_dossier=3Dsprintf("%saccount_repository",strtolower(domaine));
+			}
+			else if ( $p_type =3D=3D 'dos')
+			{ /* connect to a folder (dossier) */
+				$l_dossier=3Dsprintf("%sdossier%d",strtolower(domaine),$p_database_i=
d);
+			}
+			else if ($p_type=3D=3D'mod')
+			{	  /* connect to a template (modele) */
+				$l_dossier=3Dsprintf("%smod%d",strtolower(domaine),$p_database_id);
+			}
+			else if ($p_type=3D=3D'template')
+			{
+				$l_dossier=3D'template1';
+			}
+			else
+			{
+				throw new Exception ('Connection invalide');
+			}
+		}
=20
         ob_start();
         $a=3Dpg_connect("dbname=3D$l_dossier host=3D'$host' user=3D'$php=
compta_user'
@@ -578,7 +588,7 @@
      */
     function exist_database($p_name)
     {
-        $database_exist=3D$this->get_value('select count(*)=20
+        $database_exist=3D$this->get_value('select count(*)
                 from pg_catalog.pg_database where datname =3D lower($1)'=
,array($p_name));
         return $database_exist;
     }

Modified: phpcompta/trunk/include/config_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config_file.php	2013-05-16 22:43:26 UTC (rev =
5277)
+++ phpcompta/trunk/include/config_file.php	2013-05-17 00:29:31 UTC (rev =
5278)
@@ -66,6 +66,9 @@
         $cport=3D5432;
         $cdomain=3D'';
         $clocale=3D1;
+		$multi=3D1;
+		$cdbname=3D"database_phpcompta";
+
     }
     else extract ($p_array);
=20
@@ -85,7 +88,19 @@
 	$icuser=3Dnew IText('cuser',$cuser);
 	$icpasswd=3Dnew IText('cpasswd',$cpasswd);
 	$icport=3Dnew IText("cport",$cport);
+	/*
+	 * For version MONO
+	 */
+	$smulti=3Dnew ISelect ('multi');
+	$smulti->value=3Darray(
+			array('value'=3D>1,'label'=3D>'Serveur d=C3=A9di=C3=A9 : plusieurs do=
ssiers'),
+			array('value'=3D>0,'label'=3D>'Serveur Mutualis=C3=A9: un seul dossie=
r')
+		);
+	$smulti->selected=3D1;
+	$smulti->javascript=3D' onchange=3D"show_dbname(this)"';
=20
+	$icdbname=3Dnew IText('cdbname');
+
 	require 'template_config_form.php';
 }
 /*!\brief create the config file
@@ -134,6 +149,12 @@
=20
     fputs($hFile, 'define ("domaine","");');
     fputs($hFile,"\r\n");
+
+	fputs($hFile, 'define ("MULTI","'.$multi.'");');
+	fputs($hFile,"\r\n");
+    fputs($hFile, 'define ("dbname","'.$cdbname.'");');
+    fputs($hFile,"\r\n");
+
     fputs($hFile,'?>');
     fclose($hFile);
 }

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-16 22:43:26 UTC (rev 527=
7)
+++ phpcompta/trunk/include/constant.php	2013-05-17 00:29:31 UTC (rev 527=
8)
@@ -41,7 +41,17 @@
   $os=3D1;			/* $os is 1 for unix */
 }
 set_include_path($new_path);
-session_start();
+if ( defined("MULTI") && MULTI=3D=3D0 ) {
+	ini_set ('session.use_cookies',1);
+	ini_set ('session.use_only_cookies','on');
+	ini_set ('session.use_trans_sid','on');
+	ini_set ('magic_quotes_gpc','off');
+	ini_set ('max_execution_time',240);
+	ini_set ('memory_limit','20M');
+	ini_set ('post_max_size','20M');
+	ini_set ('upload_max_filesize','20M');
+	@session_start();
+}
 /*
  * Ini session
  */



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 17 17:13:43 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UdRyB-0001nn-O9
	for mharc-phpcompta-dev@gnu.org; Fri, 17 May 2013 17:13:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 17 May 2013 23:11:55 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.92.1368825223.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5279 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 21:13:42 -0000

Author: danydb
Date: 2013-05-17 23:11:55 +0200 (Fri, 17 May 2013)
New Revision: 5279

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
si htaccess existe ne pas l'?\195?\169craser

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-17 00:29:31 UTC (rev 527=
8)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-17 21:11:55 UTC (rev 527=
9)
@@ -54,50 +54,59 @@
 /**
  *@brief create correctly the htaccess file
  */
-function create_htaccess() {
-$inc_path=3Dget_include_path();
-global $os;
-if ( strpos($inc_path,";") !=3D 0 ) {
-  $new_path=3D$inc_path.';..\..\include;addon';
-  $os=3D0;			/* $os is 0 for windoz */
-} else {
-  $new_path=3D$inc_path.':../../include:addon';
-  $os=3D1;			/* $os is 1 for unix */
-}
+function create_htaccess()
+{
=20
-/* If htaccess file doesn't exists we create them here
- * if os =3D=3D 1 then windows, 0 means Unix
- */
-$file=3D'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DIRE=
CTORY_SEPARATOR.'.htaccess';
-$hFile=3D@fopen($file,'w+');
-if ( ! $hFile )     exit('Impossible d\'&eacute;crire dans le r&eacute;p=
ertoire include');
-fwrite($hFile,'order deny,allow'."\n");
-fwrite($hFile,'deny from all'."\n");
-fclose($hFile);
+	$inc_path=3Dget_include_path();
+	global $os;
+	if ( strpos($inc_path,";") !=3D 0 ) {
+	  $new_path=3D$inc_path.';..\..\include;addon';
+	  $os=3D0;			/* $os is 0 for windoz */
+	} else {
+	  $new_path=3D$inc_path.':../../include:addon';
+	  $os=3D1;			/* $os is 1 for unix */
+	}
=20
-$file=3D'..'.DIRECTORY_SEPARATOR.'.htaccess';
-  $hFile=3D@fopen($file,'w+');
-  if ( ! $hFile )     exit('Impossible d\'&eacute;crire dans le r&eacute=
;pertoire html');
-  $array=3Darray("php_flag  magic_quotes_gpc off",
-	       "php_flag session.auto_start on",
-	       "php_value max_execution_time 240",
-	       "php_value memory_limit 20M",
-	       "AddDefaultCharset utf-8",
-		   "php_flag  register_globals off",
-	       "php_value error_reporting 10239",
-	       "php_value post_max_size 20M",
-	       "php_flag short_open_tag on",
-	       "php_value upload_max_filesize 20M",
-	       "php_value session.use_trans_sid 1",
-	       "php_value session.use_cookies 1",
-	       "php_flag session.use_only_cookies on");
+	/* If htaccess file doesn't exists we create them here
+	 * if os =3D=3D 1 then windows, 0 means Unix
+	 */
+	$file=3D'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DIR=
ECTORY_SEPARATOR.'.htaccess';
+	if (! file_exists($file))
+	{
+		$hFile=3D@fopen($file,'w+');
+		if ( ! $hFile )     exit('Impossible d\'&eacute;crire dans le r&eacute=
;pertoire include');
+		fwrite($hFile,'order deny,allow'."\n");
+		fwrite($hFile,'deny from all'."\n");
+		fclose($hFile);
+	}
+	$file=3D'..'.DIRECTORY_SEPARATOR.'.htaccess';
+	if (! file_exists($file))
+	{
=20
-  if ( $os =3D=3D 0 )
-    fwrite($hFile,'php_value include_path .;..\..\include;..\include;add=
on'."\n");
-  else
-    fwrite($hFile,'php_value include_path .:../../include:../include:add=
on'."\n");
-  foreach ($array as $value ) fwrite($hFile,$value."\n");
-  fclose($hFile);
+		$hFile=3D@fopen($file,'w+');
+		if ( ! $hFile )     exit('Impossible d\'&eacute;crire dans le r&eacute=
;pertoire html');
+		$array=3Darray("php_flag  magic_quotes_gpc off",
+				 "php_flag session.auto_start on",
+				 "php_value max_execution_time 240",
+				 "php_value memory_limit 20M",
+				 "AddDefaultCharset utf-8",
+				 "php_flag  register_globals off",
+				 "php_value error_reporting 10239",
+				 "php_value post_max_size 20M",
+				 "php_flag short_open_tag on",
+				 "php_value upload_max_filesize 20M",
+				 "php_value session.use_trans_sid 1",
+				 "php_value session.use_cookies 1",
+				 "php_flag session.use_only_cookies on");
+
+		if ( $os =3D=3D 0 )
+		  fwrite($hFile,'php_value include_path .;..\..\include;..\include;add=
on'."\n");
+		else
+		  fwrite($hFile,'php_value include_path .:../../include:../include:add=
on'."\n");
+		foreach ($array as $value ) fwrite($hFile,$value."\n");
+		fclose($hFile);
+	}
+
 }
=20
 /* The config file is created here */



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 17 17:15:26 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UdRzq-0002Gc-2X
	for mharc-phpcompta-dev@gnu.org; Fri, 17 May 2013 17:15:26 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 17 May 2013 23:13:39 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.93.1368825325.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5280 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 21:15:24 -0000

Author: danydb
Date: 2013-05-17 23:13:39 +0200 (Fri, 17 May 2013)
New Revision: 5280

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
Bug : ne fait la maj si MULTI n'est pas defini

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-17 21:11:55 UTC (rev 527=
9)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-17 21:13:39 UTC (rev 528=
0)
@@ -251,7 +251,7 @@
 	exit -1;
 }
 /* check user */
-if ( defined("MULTI") && MULTI=3D=3D1)
+if ( (defined("MULTI") && MULTI=3D=3D1)|| !defined("MULTI"))
 {
 	$cn=3Dnew Database(-1,'template');
 } else



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 17 18:26:51 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UdT6x-0005Eg-Gs
	for mharc-phpcompta-dev@gnu.org; Fri, 17 May 2013 18:26:51 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 18 May 2013 00:25:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.132.1368829610.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5281 - in phpcompta/trunk: html html/admin
	html/admin/sql/patch include sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 22:26:50 -0000

Author: danydb
Date: 2013-05-18 00:25:03 +0200 (Sat, 18 May 2013)
New Revision: 5281

Added:
   phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
Modified:
   phpcompta/trunk/html/admin/setup.php
   phpcompta/trunk/html/user_login.php
   phpcompta/trunk/include/config_file.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/user_menu.php
   phpcompta/trunk/sql/upgrade.sql
Log:
Last bugs

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-17 21:13:39 UTC (rev 528=
0)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-17 22:25:03 UTC (rev 528=
1)
@@ -51,22 +51,23 @@
 $succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</span>=
";
 $inc_path=3Dget_include_path();
 global $os;
-/**
- *@brief create correctly the htaccess file
- */
-function create_htaccess()
-{
-
-	$inc_path=3Dget_include_path();
+$inc_path=3Dget_include_path();
 	global $os;
 	if ( strpos($inc_path,";") !=3D 0 ) {
-	  $new_path=3D$inc_path.';..\..\include;addon';
+	  $new_path=3D$inc_path.';../../include;addon';
 	  $os=3D0;			/* $os is 0 for windoz */
 	} else {
 	  $new_path=3D$inc_path.':../../include:addon';
 	  $os=3D1;			/* $os is 1 for unix */
 	}
+/**
+ *@brief create correctly the htaccess file
+ */
+function create_htaccess()
+{
+	global $os;
=20
+
 	/* If htaccess file doesn't exists we create them here
 	 * if os =3D=3D 1 then windows, 0 means Unix
 	 */
@@ -100,7 +101,7 @@
 				 "php_flag session.use_only_cookies on");
=20
 		if ( $os =3D=3D 0 )
-		  fwrite($hFile,'php_value include_path .;..\..\include;..\include;add=
on'."\n");
+		  fwrite($hFile,'php_value include_path .;../../include;../include;add=
on'."\n");
 		else
 		  fwrite($hFile,'php_value include_path .:../../include:../include:add=
on'."\n");
 		foreach ($array as $value ) fwrite($hFile,$value."\n");
@@ -340,7 +341,7 @@
 if ( ! isset($_POST['go']) )
 	exit();
 // Check if account_repository exists
-	if ( defined("MULTI") && MULTI=3D=3D 0)
+	if (!defined("MULTI") || (defined("MULTI") && MULTI =3D=3D 1))
 		$account =3D $cn->count_sql("select * from pg_database where datname=3D=
lower('" . domaine . "account_repository')");
 	else
 		$account=3D1;
@@ -392,7 +393,7 @@
=20
 echo "<h1>Mise a jour du systeme</h1>";
 echo "<h2 > Mise &agrave; jour dossier</h2>";
-if (defined("MULTI") && MULTI =3D=3D 0)
+if  (defined("MULTI") && MULTI =3D=3D 0)
 {
 	$db =3D new Database();
 	if ($db->exist_table("version") =3D=3D false)

Added: phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	                 =
       (rev 0)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-17 22:25:=
03 UTC (rev 5281)
@@ -0,0 +1,11 @@
+begin;
+update attr_def set ad_text=3D'Compte bancaire' where ad_id=3D3;
+ALTER TABLE mod_payment  DROP CONSTRAINT mod_payment_mp_fd_id_fkey ;
+ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_fd_id_fkey FOREIG=
N KEY (mp_fd_id)      REFERENCES fiche_def (fd_id) MATCH SIMPLE      ON U=
PDATE cascade ON DELETE cascade;
+ALTER TABLE mod_payment  DROP CONSTRAINT mod_payment_mp_jrn_def_id_fkey =
;
+ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_jrn_def_id_fkey F=
OREIGN KEY (mp_jrn_def_id)      REFERENCES jrn_def (jrn_def_id) MATCH SIM=
PLE ON UPDATE 	CASCADE ON DELETE CASCADE;
+
+update version set val=3D107;
+
+commit;
+

Modified: phpcompta/trunk/html/user_login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_login.php	2013-05-17 21:13:39 UTC (rev 5280=
)
+++ phpcompta/trunk/html/user_login.php	2013-05-17 22:25:03 UTC (rev 5281=
)
@@ -104,7 +104,7 @@
  * folder if he's an "plugin user"
  */
=20
-if ( $User->admin =3D=3D 0 || (defined("MULTI")&&MULTI=3D=3D0))
+if ( $User->admin =3D=3D 0 )
 {
     // how many folder ?
     $folder=3D$User->get_available_folder();

Modified: phpcompta/trunk/include/config_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config_file.php	2013-05-17 21:13:39 UTC (rev =
5280)
+++ phpcompta/trunk/include/config_file.php	2013-05-17 22:25:03 UTC (rev =
5281)
@@ -105,7 +105,7 @@
 }
 /*!\brief create the config file
  */
-function config_file_create($p_array,$from_setup=3D1,$os=3D1)
+function config_file_create($p_array,$from_setup=3D1,$p_os=3D1)
 {
     extract ($p_array);
     $add=3D($from_setup=3D=3D1)?'..'.DIRECTORY_SEPARATOR:'';
@@ -118,7 +118,7 @@
     fputs($hFile,"\r\n");
     fputs($hFile, 'define("PG_PATH","'.$cpath.'");');
     fputs($hFile,"\r\n");
-    if ( $os =3D=3D 1 )
+    if ( $p_os =3D=3D 1 )
     {
         fputs($hFile, 'define("PG_RESTORE","'.$cpath.DIRECTORY_SEPARATOR=
.'pg_restore ");');
         fputs($hFile,"\r\n");

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-17 21:13:39 UTC (rev 528=
0)
+++ phpcompta/trunk/include/constant.php	2013-05-17 22:25:03 UTC (rev 528=
1)
@@ -41,17 +41,15 @@
   $os=3D1;			/* $os is 1 for unix */
 }
 set_include_path($new_path);
-if ( defined("MULTI") && MULTI=3D=3D0 ) {
-	ini_set ('session.use_cookies',1);
-	ini_set ('session.use_only_cookies','on');
-	ini_set ('session.use_trans_sid','on');
-	ini_set ('magic_quotes_gpc','off');
-	ini_set ('max_execution_time',240);
-	ini_set ('memory_limit','20M');
-	ini_set ('post_max_size','20M');
-	ini_set ('upload_max_filesize','20M');
+ini_set ('session.use_cookies',1);
+ini_set ('session.use_only_cookies','on');
+ini_set ('magic_quotes_gpc','off');
+ini_set ('max_execution_time',240);
+ini_set ('memory_limit','20M');
+ini_set ('default_charset',"UTF-8");
+@ini_set ('session.use_trans_sid','on');
 	@session_start();
-}
+
 /*
  * Ini session
  */
@@ -64,9 +62,9 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
-define ('SVNINFO',5900);
+//define ('SVNINFO',5900);
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",true);
+define ("DEBUG",false);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);
@@ -77,7 +75,7 @@
 define ("SITE_UPDATE_PLUGIN",'http://www.phpcompta.eu/plugin_last_versio=
n.txt');
=20
=20
-define ("DBVERSION",106);
+define ("DBVERSION",107);
=20
 define ("DBVERSIONREPO",14);
 define ('NOTFOUND','--not found--');

Modified: phpcompta/trunk/include/user_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user_menu.php	2013-05-17 21:13:39 UTC (rev 52=
80)
+++ phpcompta/trunk/include/user_menu.php	2013-05-17 22:25:03 UTC (rev 52=
81)
@@ -106,14 +106,24 @@
             break;
         }
     }
-    $item=3Darray (array("admin_repo.php?action=3Duser_mgt",_("Utilisate=
urs"),_('Gestion des utilisateurs'),0),
+	if (!defined("MULTI")||(defined("MULTI")&&MULTI=3D=3D1))
+	{
+		$item=3Darray (array("admin_repo.php?action=3Duser_mgt",_("Utilisateur=
s"),_('Gestion des utilisateurs'),0),
                  array("admin_repo.php?action=3Ddossier_mgt",_("Dossiers=
"),_('Gestion des dossiers'),1),
                  array("admin_repo.php?action=3Dmodele_mgt",_("Mod=C3=A8=
les"),_('Gestion des mod=C3=A8les'),2),
                  array("admin_repo.php?action=3Drestore",_("Restaure"),_=
("Restaure une base de donn=C3=A9es"),3),
                  array("admin_repo.php?action=3Daudit_log",_("Audit"),_(=
"Utilisateurs qui se sont connect=C3=A9s"),4),
                  array("login.php",_("Accueil"))
                 );
+	}
+	else
+	{
+		$item=3Darray (array("admin_repo.php?action=3Duser_mgt",_("Utilisateur=
s"),_('Gestion des utilisateurs'),0),
+                 array("admin_repo.php?action=3Daudit_log",_("Audit"),_(=
"Utilisateurs qui se sont connect=C3=A9s"),4),
+                 array("login.php",_("Accueil"))
+                );
=20
+	}
     $menu=3DShowItem($item,'H',"mtitle","mtitle",$def,' style=3D"width:8=
0%;margin-left:10%" ');
     return $menu;
 }

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-05-17 21:13:39 UTC (rev 5280)
+++ phpcompta/trunk/sql/upgrade.sql	2013-05-17 22:25:03 UTC (rev 5281)
@@ -1,5 +0,0 @@
-update attr_def set ad_text=3D'Compte bancaire' where ad_id=3D3;
-ALTER TABLE mod_payment  DROP CONSTRAINT mod_payment_mp_fd_id_fkey ;
-ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_fd_id_fkey FOREIG=
N KEY (mp_fd_id)      REFERENCES fiche_def (fd_id) MATCH SIMPLE      ON U=
PDATE cascade ON DELETE cascade;
-ALTER TABLE mod_payment  DROP CONSTRAINT mod_payment_mp_jrn_def_id_fkey =
;
-ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_jrn_def_id_fkey F=
OREIGN KEY (mp_jrn_def_id)      REFERENCES jrn_def (jrn_def_id) MATCH SIM=
PLE ON UPDATE 	CASCADE ON DELETE CASCADE;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 17 18:40:42 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UdTKM-00068z-NY
	for mharc-phpcompta-dev@gnu.org; Fri, 17 May 2013 18:40:42 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 18 May 2013 00:38:57 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.135.1368830442.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5282 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 22:40:41 -0000

Author: danydb
Date: 2013-05-18 00:38:56 +0200 (Sat, 18 May 2013)
New Revision: 5282

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
enleve tag inutile


Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-17 22:25:03 UTC (rev 528=
1)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-17 22:38:56 UTC (rev 528=
2)
@@ -241,7 +241,6 @@
         echo "</li>";
 }
=20
-echo "<li>";
 echo "</li>";
=20
  echo "</ul>";



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 17 18:50:50 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UdTU9-0006p4-T8
	for mharc-phpcompta-dev@gnu.org; Fri, 17 May 2013 18:50:49 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 18 May 2013 00:48:59 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.142.1368831049.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5283 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 22:50:49 -0000

Author: danydb
Date: 2013-05-18 00:48:59 +0200 (Sat, 18 May 2013)
New Revision: 5283

Modified:
   phpcompta/trunk/html/style-epad.css
Log:
Agrandi police=20

Modified: phpcompta/trunk/html/style-epad.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-epad.css	2013-05-17 22:38:56 UTC (rev 5282=
)
+++ phpcompta/trunk/html/style-epad.css	2013-05-17 22:48:59 UTC (rev 5283=
)
@@ -1,99 +1,94 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-	background-color:#EDF3FF;
-	font-size:14px;
-	font-family:verdana,helvetica,sans-serif;
-	padding: 0px 10px 0px 10px ;
-	margin:0;
-	color:blue;
+  background-color:#EDF3FF;
+ font-size:14px;
+  font-family:verdana,helvetica,sans-serif;
+  padding: 0px 0px 0px 0px ;
+  margin:0;
+  color:blue;
 }
 .notice {
-	color:red;
-	font-style: italic;
-}
+		color:red;
+        font-style: italic;
+        }
=20
-table.table_large, table.result  ,table.resultfooter,table.sortable  {
-	color:blue;
-	/* border:blue solid 1px; */
-	width:100%;
-	border-spacing:  0px;
-	border-collapse:collapse;
+table.sortable, table.table_large, table.result  ,table.resultfooter {
+  color:blue;
+  /* border:blue solid 1px; */
+  width:100%;
+   border-spacing:  0px;
+   border-collapse:collapse;
=20
 }
 table.resultfooter tfoot {
-	font-size:14px;
+	font-size:110%;
 	font-weight: bold;
=20
=20
 }
-table.table_large th,table.result th,table.sortable th {
-	font-weight:bold;
-	font-family:verdana,helvetica,sans-serif;
-	border-bottom:1px solid blue;
-	border-top:0;
+table.sortable th,  table.table_large th,table.result th {
+  font-weight:bold;
+  font-family:verdana,helvetica,sans-serif;
+ border-bottom:1px solid blue;
+ border-top:0;
=20
-	color:#25238F;
-	text-align: left;
-	font-style: italic;
+  color:#25238F;
+  text-align: left;
+  font-style: italic;
=20
 }
=20
 h2 {
-	font-family:verdana,helvetica,sans-serif;
-	font-size:16px;
-	color:grey;
+  font-family:verdana,helvetica,sans-serif;
+  font-size:18px;
+  color:grey;
 }
 div.info {
 	background:#879ed4;
 	color:white;
-	font-size:16px;
-	text-align:center;
+	font-size:120%;
+  text-align:center;
 }
=20
 content h2.info {
 	background:#879ed4;
-	color:black;
-	font-size:16px;
-	text-align:center;
-	padding:0px;
-	margin:0px;
+  color:black;
+  font-size:18px;
+  text-align:center;
+  padding:0px;
+  margin:0px;
 }
 redcontent h2.info {
-	background:#879ed4;
-	color:white;
-	font-size:16px;
-	text-align:center;
-	padding:0px;
-	margin:0px;
+  background:#879ed4;
+  color:white;
+  font-size:18px;
+  text-align:center;
+  padding:0px;
+  margin:0px;
 }
 h2.info {
-	background-color:#8989E5;
+  background-color:#879ed4;
 	color:white;
-	font-size:16px;
-	text-align:center;
-	padding:0px;
-	margin:0px;
-	border:1px solid grey;
+	font-size:18px;
+  text-align:center;
+  padding:0px;
+  margin:0px;
+  border:1px solid grey;
=20
 }
-table h2.info
-{
-	font-variant: small-caps;
-	background-color: inherit;
-	color:darkblue;
-}
+
 h3.info {
-	background:#879ed4;
-	color:white;
-	font-size:16px;
-	text-align:center;
+  background:#879ed4;
+  color:white;
+  font-size:16px;
+  text-align:center;
 }
=20
 h2.info2 {
-	color:blue;
-	font-size:16px;
-	text-align:center;
+  color:blue;
+  font-size:18px;
+  text-align:center;
=20
 }
=20
@@ -101,40 +96,40 @@
 h2.error {
 	background:red;
 	color:white;
-	font-size:16px;
+	font-size:18px;
 }
=20
+
 div.u_tmenu {
-	margin-top:0px;
-	width:100%;
-	/* background-color:#879ED4; */
+  margin-top:0px;
+  width:100%;
+ /* background-color:#879ED4; */
=20
=20
 }
 div.u_subtmenu {
-	background-color:white	;
-	float:left;
-	clear:both;
-	left:10px;
+  background-color:white	;
+  float:left;
+  clear:both;
+  left:10px;
=20
 }
 div.u_tmenu div.u_tool {
-	float:left;
+	   float:left;
=20
 }
 div.u_tool {
 	float:left;
 	width:  100%;
-}
+	padding-bottom: 20px;
+	}
 div.u_tool div.name {
-	float:left;
-	margin-left:10px;
+       float:left;
+       margin-left:10px;
 }
 div.u_tool {
 	float:right;
 	margin-right:10px;
-	text-align:right;
-
 }
 div.module {
 	position:absolute;
@@ -145,63 +140,64 @@
 	margin: 0px;
 }
 div.u_subt2menu {
-	background-color:lightgrey;
-	left:1%;
+background-color:lightgrey;
+  left:1%;
=20
 }
 div.lmenu {
-	float:left;
-	clear:left;
-	font-size:12px;
+	 float:left;
+	 clear:left;
+	font-size:13px;
=20
 }
 div.lextmenu {
=20
 	float:left;
 	font-family:verdana,helvetica,sans-serif;
-	font-size:12px;
+	font-size:13px;
=20
 }
 div.searchmenu {
-	left:30px;
-	width:95px;
-	top:100px;
-	position:absolute;
+  left:30px;
+  width:95px;
+  top:100px;
+  position:absolute;
=20
 }
=20
 div.recherche_form{
 	width:700px;
-	font-size:14px;
+	font-size:13px;
 	font-family:verdana,helvetica,sans-serif;
-	border-style:outset;
-	border-width:1px;
+  border-style:outset;
+  border-width:1px;
=20
 }
 div.redcontent{
=20
-	float:left;
-	padding-top:7px;
-	padding-left:8px;
-	font-size:14px;
-	font-family:verdana,helvetica,sans-serif;
-	width:75%;
+         float:left;
+	 padding-top:7px;
+	 padding-left:8px;
+         font-size:13px;
+         font-family:verdana,helvetica,sans-serif;
+	 width:75%;
=20
 }
 div.content{
-	padding-top:7px;
-	width:100%;
-	font-family:verdana,helvetica,sans-serif;
-	clear:both;
=20
+		padding-top:2px;
+		margin-top:2px;
+         width:100%;
+         font-family:verdana,helvetica,sans-serif;
=20
+
 }
 div.content30{
=20
-	float:left;
-	padding-top:7px;
-	width:35%;
-	font-family:verdana,helvetica,sans-serif;
+         float:left;
+	 padding-top:7px;
+         width:35%;
+         font-family:verdana,helvetica,sans-serif;
=20
 }
 div.no span{
@@ -213,31 +209,31 @@
 }
=20
 table.document {
-	color:blue;
-	width:100%;
-	border-spacing:  0px;
-	border-collapse:collapse;
+   color:blue;
+   width:100%;
+   border-spacing:  0px;
+   border-collapse:collapse;
=20
 }
 table.document th{
-	font-weight:bold;
-	font-family:verdana,helvetica,sans-serif;
-	border-bottom:2px solid blue;
-	border-top:0;
-	color:#25238F;
-	text-align: left;
-	background-color:#EDF3FF;
-	font-style: italic;
+  font-weight:bold;
+  font-family:verdana,helvetica,sans-serif;
+  border-bottom:2px solid blue;
+  border-top:0;
+  color:#25238F;
+  text-align: left;
+  background-color:#EDF3FF;
+  font-style: italic;
 }
 .error {
-	width:60%;
-	margin-left:20%;
-	text-align: center;
+width:60%;
+margin-left:20%;
+text-align: center;
=20
-	color:white;
-	background-color:red;
-	font-weight: bolder;
-	font-size:120%;
+color:white;
+background-color:red;
+font-weight: bolder;
+font-size:120%;
 }
=20
 table.mtitle {
@@ -245,17 +241,17 @@
 	text-align:center
 }
 td.mshort {
-	height:15px;
-	width:60px;
-	text-align:center;
-	border:  1px solid;
-	color:#5D90CD ;
-	background-color:#DDE6FF;
+  height:15px;
+  width:60px;
+  text-align:center;
+  border:  1px solid;
+  color:#5D90CD ;
+  background-color:#DDE6FF;
 }
 td.mtitle {
 	text-align:center;
 	width:95px;
-	height :30px;
+        height :30px;
 	font-size:12px;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
@@ -273,13 +269,13 @@
 	border-style:groove
 }
 span.odd {
-	background-color:#ECF3FF;
-	display:block;
-}
+  background-color:#ECF3FF;
+  display:block;
+ }
 span.even {
-	background-color:#DDE6FF;
-	display:block;
-}
+  background-color:#DDE6FF;
+  display:block;
+ }
=20
 tr.odd {
 	background-color:#DDE6FF;
@@ -297,85 +293,85 @@
 	font-size:12px;
 }
 td.cell{
-	height:32px;
-	padding: 1px;
+	    height:32px;
+	     padding: 1px;
 }
 td.selectedcell{
 	border-style:inset;
-	border-color:blue;
+        border-color:blue;
 	border-width:1pt ;
 	font-size:12px;
-	background:#5D90CD ;
-	color:white;
-	text-align:center;
-	width:120px;
+        background:#5D90CD ;
+        color:white;
+        text-align:center;
+	     width:120px;
 }
 a.mtitle {
-	font-size:12px;
-	text-decoration:none;
-	display:inline;
-	color: blue;
+  font-size:12px;
+  text-decoration:none;
+  display:inline;
+ color: blue;
=20
 }
 a.mtitle:hover {
-	font-size:12px;
-	text-decoration:none;
-	display:inline;
+  font-size:12px;
+  text-decoration:none;
+  display:inline;
=20
-	color: darkblue;
-	background-color:#5D90CD;
+ color: darkblue;
+background-color:#5D90CD;
=20
 }
-td.selectedcell a.mtitle {
-	font-size:1em;
-	text-decoration:none;
-	display:block;
-	color:white;
+td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
+ font-size:1.2em;
+ text-decoration:none;
+ display:block;
+ color:white;
 }
 a.dossier {
-	font-size:12px;
-	text-decoration:none;
-	display:block;
-	color: #202267;
+  font-size:12px;
+  text-decoration:none;
+  display:block;
+   color: #202267;
=20
 }
 tr.odd:hover td
 {
-	text-decoration:none;
-	background-color: #a9d6e4;
-	color:white;
+  text-decoration:none;
+  background-color: #a9d6e4;
+  color:white;
 }
 tr.even:hover td
 {
-	text-decoration:none;
-	background-color: #a9d6e4;
-	color:white;
+  text-decoration:none;
+  background-color: #a9d6e4;
+  color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-	background-color:#a9d6e4;
-	color:white;
+  background-color:#a9d6e4;
+  color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-	background-color:#a9d6e4;
-	color:white;
+  background-color:#a9d6e4;
+  color:white;
 }
 a.cell {
-	text-decoration:none;
-	display:block;
-	color:blue;
-	background-color:white;
-	font-size:9px;
+  text-decoration:none;
+  display:block;
+  color:blue;
+  background-color:white;
+  font-size:12px;
 }
=20
 a.cell:hover {
-	font-size:9px;
-	color:white;
-	background-color:#5D90CD;
-	text-decoration:none;
-	display:block;
-}
+  font-size:12px;
+  color:white;
+  background-color:#5D90CD;
+  text-decoration:none;
+  display:block;
+	}
=20
=20
 a.one:link {
@@ -385,23 +381,23 @@
 a.one:visited {
 	text-decoration:none;
 	color:#3010FF
-}
+	}
=20
 a.one:active {
 	background: #0000FF;
-}
+	}
=20
 a.one:hover {
-	text-decoration:underline;
+	    text-decoration:underline;
 	background:#3010FF;
 	color:#FFFFFF;
-}
+	}
=20
=20
 a.detail
 {
-	font-size:12px;
-	font-family:verdana,helvetica,sans-serif;
+  font-size:12px;
+  font-family:verdana,helvetica,sans-serif;
     text-decoration: none;
     display: block;
     color: blue;
@@ -409,8 +405,8 @@
=20
 a.detail:hover
 {
-	font-size:12px;
-	font-family:verdana,helvetica,sans-serif;
+  font-size:12px;
+  font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -418,19 +414,19 @@
 }
=20
 li.menuv,ol.menuv {
-	display:inline;
-	padding:1em 1em;
+	 display:inline;
+	 padding:1em 1em;
 }
 div.redcontent a {
-	font-family:verdana,helvetica,sans-serif;
-	text-decoration: none;
-	display: block;
-	color: blue;
+  font-family:verdana,helvetica,sans-serif;
+  text-decoration: none;
+  display: block;
+  color: blue;
=20
 }
=20
 div.redcontent a:hover {
-	font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -438,17 +434,17 @@
=20
 }
 div.content a {
-	font-family:verdana,helvetica,sans-serif;
-	text-decoration: none;
-	display: block;
-	color: blue;
-	padding: 0;
+  font-family:verdana,helvetica,sans-serif;
+  text-decoration: none;
+  display: block;
+  color: blue;
+padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-	font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -457,92 +453,93 @@
 }
=20
 div.redcontent a.mtitle {
-	text-decoration:none;
-	display:inline;
+  text-decoration:none;
+  display:inline;
=20
=20
-	color:black;
+  color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-	text-decoration:none;
-	display:inline;
-	color:white;
-	background-color:darkblue;
+  text-decoration:none;
+  display:inline;
+  color:white;
+  background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-	font-size:12px;
-	text-decoration:none;
-	display:inline;
-	color:blue;
+  font-size:12px;
+  text-decoration:none;
+  display:inline;
+  color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-	text-decoration:none;
-	display:inline;
-	background-color:darkblue;
-	color:white;
+  text-decoration:none;
+  display:inline;
+  background-color:darkblue;
+  color:white;
=20
=20
 }
 div.redcontent input.text {
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:normal;
-	border-color:336699;
-	border-style:solid;
-	background-color:orange;
-	border-width:1px;
-	color:blue;
+   font-family:verdana,helvetica,sans-serif;
+  font-weight:normal;
+  border-color:336699;
+  border-style:solid;
+  background-color:orange;
+  border-width:1px;
+  color:blue;
 }
 div.content input.text {
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:normal;
-	border-color:336699;
-	border-style:solid;
-	border-width:1px;
-	background-color:orange;
-	color:blue;
+   font-family:verdana,helvetica,sans-serif;
+  font-weight:normal;
+  border-color:336699;
+  border-style:solid;
+  border-width:1px;
+  background-color:orange;
+  color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-	background-color:orange;
+  background-color:orange;
 }
 div.content input:focus {
-	background-color:orange;
+  background-color:orange;
 }
 div.redcontent textarea:focus {
-	background-color: orange;
+background-color: orange;
 }
 .document {
-	color: #1a207d;
-	border-collapse:collapse;
+color: #1a207d;
+border-collapse:collapse;
 }
 a.document{
-	font-size:14px;
-	text-decoration:none;
-	display:block;
+  font-size:14px;
+  text-decoration:none;
+  display:block;
 }
 a.document:hover {
-	text-decoration:none;
-	display:block;
+  text-decoration:none;
+  display:block;
=20
=20
 }
 .input_text_ro {
 	   border:solid 1px blue;
 	   background:#EDEDED;
+	   color:blue;
 	margin:1px;
 }
 .input_text {
-	border:groove 1px blue;
+	   border:groove 1px blue;
 	margin:1px;
 }
 .input_text:hover {
@@ -550,39 +547,38 @@
 	margin:1px;
 	background-color: orange;
 }
-h1.legend,legend {
-	font-weight: bold;
-	font-style: italic;
-	font-size: 120% ;
+h1.legend, legend {
+font-weight: bold;
+font-style: italic;
+font-size: 110% ;
=20
 }
 fieldset fieldset legend {
-	font-size:110%;
-	color:grey;
-}
+	 font-size:110%;
+	 color:grey;
+	 }
 select {
-	border: 1px solid blue;
-	margin:2px;
-	background-color:white;
+border: 1px solid blue;
+margin:2px;
+background-color:white;
=20
-
 }
=20
=20
=20
 .infobulle {
-	position:absolute;
-	border:1px solid black;
-	background-color:yellow;
-	padding-bottom: 10;
-	padding-top: 10;
-	padding-left: 10;
-	padding-right: 10;
-	color:black;
-	top:0;left:0;
-	visibility:hidden;
-	width:25em;
-	z-index:20;
+	   position:absolute;
+	   border:1px solid black;
+	   background-color:yellow;
+	   padding-bottom: 10;
+	   padding-top: 10;
+	   padding-left: 10;
+	   padding-right: 10;
+	   color:black;
+	   top:0;left:0;
+	   visibility:hidden;
+	   width:25em;
+		z-index:20;
 }
=20
 span.action {
@@ -593,25 +589,25 @@
 	text-align:right;
 }
 tr.priority1 {
-	background-color:red;
-}
+	background-color: coral;
+	}
 span.action a.action {
-	border:2px outset ;
-	padding-left: 3px;
-	padding-right:3px;
-	text-decoration:none;
-	font-size:14px;
+  border:2px outset ;
+  padding-left: 3px;
+  padding-right:3px;
+  text-decoration:none;
+  font-size:17px;
=20
-	display:inline;
-	color:black;
-	background-color:lightgrey;
+  display:inline;
+  color:black;
+  background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-	text-decoration:none;
-	display:inline;
-	background-color:lightblue;
-	color:black;
+  text-decoration:none;
+  display:inline;
+  background-color:lightblue;
+  color:black;
 }
 div.popup_back{
 	position:absolute;
@@ -648,7 +644,7 @@
 	/*opacity:1;
 	filter:alpha(opacity=3D100);*/
=20
-}
+	}
 div.popup_border_notitle {
 	position:absolute;
 	top:20%;
@@ -669,7 +665,7 @@
 	/*opacity:0.7;
 	filter:alpha(opacity=3D70);
 	*/
-}
+	}
=20
 div.popup_content {
 	position:absolute;
@@ -693,13 +689,13 @@
 	filter:alpha(opacity=3D100);*/
 }
 div.autocomplete {
-	position:relative;
-	background-color:white;
-	border:1px solid #888;
-	margin:0;
-	padding:0;
-	text-align:left;
-	font-size:12px;
+  position:relative;
+  background-color:white;
+  border:1px solid #888;
+  margin:0;
+  padding:0;
+  text-align:left;
+  font-size:14px;
=20
 }
 div.autocomplete em {
@@ -707,45 +703,45 @@
 	font-weight:bold;
 }
 div.autocomplete ul {
-	list-style-type:none;
-	background-color:white;
-	border:1px solid #888;
-	width:375px;
-	margin:0;
-	padding:0;
+  list-style-type:none;
+  background-color:white;
+  border:1px solid #888;
+  width:375px;
+  margin:0;
+  padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
-	list-style-type:none;
-	display:block;
-	margin:0;
-	padding:0px;
-	/*height:32px;*/
-	cursor:pointer;
+  list-style-type:none;
+  display:block;
+  margin:0;
+  padding:0px;
+  /*height:32px;*/
+  cursor:pointer;
 }
 span.informal{ font-size:95%; color:black;}
=20
 ul.select_table  {
 	/*padding:5px;*/
 	overflow:hidden;
-}
+	}
 ul.select_table a{
 	width:100%;
 	display:block;
 	background-color:inherit;
 	color: black;
 	text-decoration:none;
-}
+	}
 ul.select_table a:hover{
 	background-color:white;
 	color:black;
 	/*text-decoration:underline;*/
-}
+	}
 ul.select_table li {
 	display:table-row;
 	list-style-type: none;
-}
+	}
 ul.select_table li span {
 	display:table-cell;
 	width:25em;
@@ -755,9 +751,9 @@
=20
 div.pc_calendar{
=20
-	float:left;
+		float:left;
=20
-}
+		}
 div.pc_calendar table {
 	text-align:center;
=20
@@ -796,134 +792,138 @@
=20
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
-	-moz-user-focus:ignore;
-	-moz-user-input:disabled;
-	background-color:lightgrey;
-	color:black;
-	cursor:inherit;
+-moz-user-focus:ignore;
+-moz-user-input:disabled;
+background-color:lightgrey;
+color:black;
+cursor:inherit;
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:16px;
+	font-size:12;
 	color:white;
 	font-weight: bold;
-	background-image: url("image/bg-submit4.png");
+
+	text-decoration:none;
+	font-family: verdana,helvetica,sans-serif;
+	background-image: url("image/bg-submit2.gif");
 	background-repeat: repeat-x;
 	background-position: left;
-	text-decoration:none;
-	font-family: arial,helvetica,sans-serif;
-	background-color: #DEE3E5;
+
+	border-style:  outset ;
+	border-color:  blue ;
+	border-width:0;
+	padding-bottom: 4;
+	padding-top: 4;
+	padding-right: 6;
+	padding-left:  6;
 	margin-top:3px;
-	margin-bottom:3px;
-	margin-right:3px;
-	margin-left:3px;
-	padding:5;
 	cursor:pointer;
-	-moz-border-radius:4 4;
-	border-radius:4 4;
-	border-style: outset;
+	margin:1 2 1 2;
+        border-radius: 4px;
+	-moz-border-radius:4px;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
 	cursor:pointer;
+	background-color:white;
+	border-style:  inset ;
 	color:red;
-	margin-top:3px;
-	margin-bottom:3px;
-	margin-right:3px;
-	margin-left:3px;
-}
-td.tool {
+	margin:1 2 1 2;
+
+	}
+	td.tool {
 	border: solid 1px gray;
+	background-color: white;
=20
-}
+	}
 div.topmenu {
-	width:100%;
-
+	margin-top:2px;
 }
=20
 h2.dossier {
 	color:darkblue;
 	font-style: italic;
 	display:inline;
-
-	font-size:14px;
-	margin:0;
-	padding:0;
-	text-align:center;
+	font-size:16px;
+	margin:0px;
+	padding:0px;
+	font-variant:small-caps;
 }
 /* </style> */
 div.add_todo_list {
-	border:1px solid blue;
-	display:none;
-	background-color:#BFD0FF;
-	padding:3;
-	position:absolute;
-	text-align:left;
-	line-height:3em;
-	z-index:1;
-        width:345px;
-}
+                    border:1px solid blue;
+                    display:none;
+                    background-color:#BFD0FF;
+                    padding:3;
+                    position:absolute;
+                    text-align:left;
+                    line-height:3em;
+                    z-index:1;
+                    width:345px;
+                }
 div.welcome {
=20
 }
 div.gest_name {
-	float:right;
-	margin-right:150;
+	float:left;
+	margin-left:150;
 	margin-top:15
 }
 h2.gest_name {
 	border-left: 5px solid  #403a8d;
 	border-bottom:1px solid  #b4bbc2;
-	border-top:1px solid  #b4bbc2;
-	border-right:1px solid  #b4bbc2;
+		border-top:1px solid  #b4bbc2;
+		border-right:1px solid  #b4bbc2;
 	padding: 5px;
+	width: 40%;
 }
-body.op_detail_frame  ,div.op_detail_frame  {
-	background-color:#e4e7ed;
-	height:100%; width:100%;
+body.op_detail_frame,div.op_detail_frame  {
+  background-color:#e4e7ed;
+  height:100%; width:100%;
=20
=20
 }
 div.inner_box  {
-	background-color:#e4e7ed;
-	font-size:12px;
-	font-family:verdana,helvetica,sans-serif;
-	padding:0;
-	margin:0;
-	overflow:hidden;
-	z-index:3;
+  background-color:#e4e7ed;
+ font-size:12;
+  font-family:verdana,helvetica,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:3;
=20
-	position:absolute;
-	left:10%;
+position:absolute;
+left:10%;
=20
=20
-	border:1px solid darkblue;
+border:1px solid darkblue;
=20
 }
 div.op_detail_title {
 	background-color:grey;
-	/*	width:500;*/
+/*	width:500;*/
=20
=20
 }
 div#div_jrn{
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	visibility:hidden;
-	z-index:2;
-	width:50em;
-	background-color:#EDF3FF;
+              position:absolute;
+              border:1px solid black;
+               top:15%;left:100;
+              visibility:hidden;
+              z-index:2;
+              width:50em;
+		      background-color:#EDF3FF;
=20
 }
-div#div_cat{
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	visibility:hidden;
-	z-index:2;
-	width:50em;
-	background-color:#EDF3FF;
+ div#div_cat{
+              position:absolute;
+              border:1px solid black;
+               top:15%;left:100;
+              visibility:hidden;
+              z-index:2;
+              width:50em;
+             background-color:#EDF3FF;
=20
 }
=20
@@ -932,39 +932,41 @@
=20
 div#search_form
 {
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	margin-left:25%
-		z-index:2;
-	width:50%;
-	display:none;
-	background-color:#e4e7ed;
+              position:absolute;
+              border:1px solid black;
+              top:15%;left:100px;
+              margin-left:25%;
+              z-index:2;
+              width:50%;
+              display:none;
+	      background-color:#e4e7ed;
 }
=20
-table.table_large td, table.result td,table.sortable td
+table.sortable td, table.table_large td, table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
 }
 table.info_op
 {
-	font-size:18px;
+	font-size:22;
 	width:100%;
 }
 table.info_op tr
 {
-	font-size:14px;
-	background:white;
+font-size:16;
+background:white;
 }
 h2#jrn_name
 {
+	color:blue;
+	font-size:28;
 	margin-right:30%;
 	float: right;
=20
 }
 tr.footer{
-	font-size:14px;
+	font-size:16;
 	font-style: italic;
 	font-weight: bold;
=20
@@ -972,7 +974,7 @@
 span.remain {
 	font-weight: bold;
 	color:black;
-}
+	}
=20
 div#jrn_name_div
 {
@@ -998,35 +1000,35 @@
 }
 div#wait_box
 {
-	background-color:#F1E6E6;
-	font-size:12px;
-	font-family: verdana,helvetica,arial,sans-serif;
-	padding:0;
-	margin:0;
-	overflow:hidden;
-	z-index:10;
+  background-color:#F1E6E6;
+ font-size:12;
+  font-family: verdana,helvetica,arial,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:10;
=20
-	position:absolute;
-	left:30%;
-	top:30%;
+position:absolute;
+left:30%;
+top:30%;
=20
=20
-	border:1px solid darkblue;
+border:1px solid darkblue;
=20
 }
 #wait_box h2
 {
-	color:black;
-	text-align:center;
+color:black;
+text-align:center;
 }
 div#div_jrnsearch_op{
=20
-	border:1px solid black;
-	display:none;
-	width:50em;
-	background-color:#EDF3FF;
-	position:absolute;
-	z-index: 5;
+              border:1px solid black;
+              display:none;
+              width:50em;
+		      background-color:#EDF3FF;
+			  position:absolute;
+			  z-index: 5;
=20
 }
 ul {
@@ -1034,31 +1036,34 @@
 }
 a.line,div.content a.line
 {
-	font-size:110%;
-	text-decoration:underline;
-	display:inline;
-	color: #0000ff;
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+ color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-	font-size:110%;
-	text-decoration:underline;
-	display:inline;
-	color: #0000ff;
-	background-color: rgb(93, 144, 205);
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+  color: #0000ff;
+     background-color: rgb(93, 144, 205);
 }
 #close_div
 {
-	background-color:white;
-	color:red;
-	font-family: arial;
-	text-decoration:none;
-	border:1px solid red;
-	margin-left: 2px;
-	margin-right:2px;
-	margin-top:0px;
-	font-size:12px;
+ background-color:white;
+ color:blue;
+ text-decoration:none;
+ border:1px solid blue;
+ margin-left: 2px;
+ margin-right:2px;
+ margin-top:0px;
+ font-size:12px;
 }
+#close_div:hover
+{
+	background-color: orange;
+}
 table.table_large tr.odd ,table.table_large tr.even {
=20
 	height:32px;
@@ -1072,7 +1077,7 @@
 	width:300px;
 	border:1px solid black;
 	background-color:#aec3e8;
-	font-size:16px;
+	font-size:18px;
 	padding: 20px 20px;
 }
 span.invoice
@@ -1086,33 +1091,39 @@
 a.nav,div.content a.nav,div.redcontent a.nav {
 	display:inline;
 	text-decoration:none;
-	font-size:1em;
+	font-size:1.2em;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
 	display:inline;
 	text-decoration:none;
 	background-color:darkblue;
 	color:white;
-	font-size:1em;
+	font-size:1.2em;
 }
 #dossier {
 	display:inline;
 	float:left;
+	width:40em;
 	top:0px;
 }
+div.foldercontent {
+	padding:20px 30px 0px 40px;
+	}
+
 h1.title {
-	color: #046fff;
-	font-size:30px;
+	color: blue;
+	font-size:22px;
 	font-style: italic;
 }
 h2.title {
-	color: #046fff;
-	font-size:24px;
+	color: blue;
+	font-size:16px;
+	font-weight:bold;
 	font-style: italic;
 	margin-left: 15px;
 }
 h3.title {
-	color: #046fff;
+	color: blue;
 	font-size:16px;
 	margin-left: 30px;
 }
@@ -1124,7 +1135,7 @@
 }
 h5.title {
 	color: blue;
-	font-size:12px;
+	font-size:14px;
 	margin-left: 45px;
 	text-decoration: none;
 	font-style: italic;
@@ -1135,4 +1146,4 @@
 	margin-left:5px;
 	margin-right: 5px;
 	border:lightgrey 2px groove;
-}
\ No newline at end of file
+}



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 17 18:51:13 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UdTUX-0006qq-3g
	for mharc-phpcompta-dev@gnu.org; Fri, 17 May 2013 18:51:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 18 May 2013 00:49:21 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.145.1368831072.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5284 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 22:51:11 -0000

Author: danydb
Date: 2013-05-18 00:49:21 +0200 (Sat, 18 May 2013)
New Revision: 5284

Modified:
   phpcompta/trunk/html/style-color.css
Log:
Style remis comme defaut


Modified: phpcompta/trunk/html/style-color.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-color.css	2013-05-17 22:48:59 UTC (rev 528=
3)
+++ phpcompta/trunk/html/style-color.css	2013-05-17 22:49:21 UTC (rev 528=
4)
@@ -1,24 +1,24 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-	background-color:#EDF3FF;
-	font-size:12px;
-	font-family:verdana,helvetica,sans-serif;
-	padding: 0px 0px 0px 0px ;
-	margin:0;
-	color:blue;
+  background-color:#EDF3FF;
+ font-size:12px;
+  font-family:verdana,helvetica,sans-serif;
+  padding: 0px 0px 0px 0px ;
+  margin:0;
+  color:blue;
 }
 .notice {
-	color:red;
-	font-style: italic;
-}
+		color:red;
+        font-style: italic;
+        }
=20
 table.sortable, table.table_large, table.result  ,table.resultfooter {
-	color:blue;
-	/* border:blue solid 1px; */
-	width:100%;
-	border-spacing:  0px;
-	border-collapse:collapse;
+  color:blue;
+  /* border:blue solid 1px; */
+  width:100%;
+   border-spacing:  0px;
+   border-collapse:collapse;
=20
 }
 table.resultfooter tfoot {
@@ -27,73 +27,68 @@
=20
=20
 }
-table.sortable th, table.table_large th,table.result th {
-	font-weight:bold;
-	font-family:verdana,helvetica,sans-serif;
-	border-bottom:1px solid blue;
-	border-top:0;
+table.sortable th,  table.table_large th,table.result th {
+  font-weight:bold;
+  font-family:verdana,helvetica,sans-serif;
+ border-bottom:1px solid blue;
+ border-top:0;
=20
-	color:#25238F;
-	text-align: left;
-	font-style: italic;
+  color:#25238F;
+  text-align: left;
+  font-style: italic;
=20
 }
=20
 h2 {
-	font-family:verdana,helvetica,sans-serif;
-	font-size:14px;
-	color:grey;
+  font-family:verdana,helvetica,sans-serif;
+  font-size:14px;
+  color:grey;
 }
 div.info {
 	background:#879ed4;
 	color:white;
 	font-size:120%;
-	text-align:center;
+  text-align:center;
 }
=20
 content h2.info {
 	background:#879ed4;
-	color:black;
-	font-size:14pt;
-	text-align:center;
-	padding:0px;
-	margin:0px;
+  color:black;
+  font-size:14pt;
+  text-align:center;
+  padding:0px;
+  margin:0px;
 }
 redcontent h2.info {
-	background:#879ed4;
-	color:white;
-	font-size:14pt;
-	text-align:center;
-	padding:0px;
-	margin:0px;
+  background:#879ed4;
+  color:white;
+  font-size:14pt;
+  text-align:center;
+  padding:0px;
+  margin:0px;
 }
 h2.info {
-	background-color:#8989E5;
+  background-color:#879ed4;
 	color:white;
 	font-size:14px;
-	text-align:center;
-	padding:0px;
-	margin:0px;
-	border:1px solid grey;
+  text-align:center;
+  padding:0px;
+  margin:0px;
+  border:1px solid grey;
=20
 }
-table h2.info
-{
-	font-variant: small-caps;
-	background-color: inherit;
-	color:darkblue;
-}
+
 h3.info {
-	background:#879ed4;
-	color:white;
-	font-size:14px;
-	text-align:center;
+  background:#879ed4;
+  color:white;
+  font-size:14px;
+  text-align:center;
 }
=20
 h2.info2 {
-	color:blue;
-	font-size:14px;
-	text-align:center;
+  color:blue;
+  font-size:14px;
+  text-align:center;
=20
 }
=20
@@ -104,36 +99,37 @@
 	font-size:14px;
 }
=20
+
 div.u_tmenu {
-	margin-top:0px;
-	width:100%;
-	/* background-color:#879ED4; */
+  margin-top:0px;
+  width:100%;
+ /* background-color:#879ED4; */
=20
=20
 }
 div.u_subtmenu {
-	background-color:white	;
-	float:left;
-	clear:both;
-	left:10px;
+  background-color:white	;
+  float:left;
+  clear:both;
+  left:10px;
=20
 }
 div.u_tmenu div.u_tool {
-	float:left;
+	   float:left;
=20
 }
 div.u_tool {
 	float:left;
 	width:  100%;
-}
+	padding-bottom: 20px;
+	}
 div.u_tool div.name {
-	float:left;
-	margin-left:10px;
+       float:left;
+       margin-left:10px;
 }
 div.u_tool {
 	float:right;
 	margin-right:10px;
-
 }
 div.module {
 	position:absolute;
@@ -144,13 +140,13 @@
 	margin: 0px;
 }
 div.u_subt2menu {
-	background-color:lightgrey;
-	left:1%;
+background-color:lightgrey;
+  left:1%;
=20
 }
 div.lmenu {
-	float:left;
-	clear:left;
+	 float:left;
+	 clear:left;
 	font-size:9px;
=20
 }
@@ -162,10 +158,10 @@
=20
 }
 div.searchmenu {
-	left:30px;
-	width:95px;
-	top:100px;
-	position:absolute;
+  left:30px;
+  width:95px;
+  top:100px;
+  position:absolute;
=20
 }
=20
@@ -173,35 +169,35 @@
 	width:700px;
 	font-size:9px;
 	font-family:verdana,helvetica,sans-serif;
-	border-style:outset;
-	border-width:1px;
+  border-style:outset;
+  border-width:1px;
=20
 }
 div.redcontent{
=20
-	float:left;
-	padding-top:7px;
-	padding-left:8px;
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
-	width:75%;
+         float:left;
+	 padding-top:7px;
+	 padding-left:8px;
+         font-size:9px;
+         font-family:verdana,helvetica,sans-serif;
+	 width:75%;
=20
 }
 div.content{
-	padding-top:7px;
-	margin-top:7px;
-	width:100%;
-	font-family:verdana,helvetica,sans-serif;
-	clear:both;
=20
+		padding-top:2px;
+		margin-top:2px;
+         width:100%;
+         font-family:verdana,helvetica,sans-serif;
=20
+
 }
 div.content30{
=20
-	float:left;
-	padding-top:7px;
-	width:35%;
-	font-family:verdana,helvetica,sans-serif;
+         float:left;
+	 padding-top:7px;
+         width:35%;
+         font-family:verdana,helvetica,sans-serif;
=20
 }
 div.no span{
@@ -213,31 +209,31 @@
 }
=20
 table.document {
-	color:blue;
-	width:100%;
-	border-spacing:  0px;
-	border-collapse:collapse;
+   color:blue;
+   width:100%;
+   border-spacing:  0px;
+   border-collapse:collapse;
=20
 }
 table.document th{
-	font-weight:bold;
-	font-family:verdana,helvetica,sans-serif;
-	border-bottom:2px solid blue;
-	border-top:0;
-	color:#25238F;
-	text-align: left;
-	background-color:#EDF3FF;
-	font-style: italic;
+  font-weight:bold;
+  font-family:verdana,helvetica,sans-serif;
+  border-bottom:2px solid blue;
+  border-top:0;
+  color:#25238F;
+  text-align: left;
+  background-color:#EDF3FF;
+  font-style: italic;
 }
 .error {
-	width:60%;
-	margin-left:20%;
-	text-align: center;
+width:60%;
+margin-left:20%;
+text-align: center;
=20
-	color:white;
-	background-color:red;
-	font-weight: bolder;
-	font-size:120%;
+color:white;
+background-color:red;
+font-weight: bolder;
+font-size:120%;
 }
=20
 table.mtitle {
@@ -245,17 +241,17 @@
 	text-align:center
 }
 td.mshort {
-	height:15px;
-	width:60px;
-	text-align:center;
-	border:  1px solid;
-	color:#5D90CD ;
-	background-color:#DDE6FF;
+  height:15px;
+  width:60px;
+  text-align:center;
+  border:  1px solid;
+  color:#5D90CD ;
+  background-color:#DDE6FF;
 }
 td.mtitle {
 	text-align:center;
 	width:95px;
-	height :30px;
+        height :30px;
 	font-size:10px;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
@@ -273,13 +269,13 @@
 	border-style:groove
 }
 span.odd {
-	background-color:#ECF3FF;
-	display:block;
-}
+  background-color:#ECF3FF;
+  display:block;
+ }
 span.even {
-	background-color:#DDE6FF;
-	display:block;
-}
+  background-color:#DDE6FF;
+  display:block;
+ }
=20
 tr.odd {
 	background-color:#DDE6FF;
@@ -297,85 +293,85 @@
 	font-size:10px;
 }
 td.cell{
-	height:32px;
-	padding: 1px;
+	    height:32px;
+	     padding: 1px;
 }
 td.selectedcell{
 	border-style:inset;
-	border-color:blue;
+        border-color:blue;
 	border-width:1pt ;
 	font-size:10px;
-	background:#5D90CD ;
-	color:white;
-	text-align:center;
-	width:120px;
+        background:#5D90CD ;
+        color:white;
+        text-align:center;
+	     width:120px;
 }
 a.mtitle {
-	font-size:10px;
-	text-decoration:none;
-	display:inline;
-	color: blue;
+  font-size:10px;
+  text-decoration:none;
+  display:inline;
+ color: blue;
=20
 }
 a.mtitle:hover {
-	font-size:10px;
-	text-decoration:none;
-	display:inline;
+  font-size:10px;
+  text-decoration:none;
+  display:inline;
=20
-	color: darkblue;
-	background-color:#5D90CD;
+ color: darkblue;
+background-color:#5D90CD;
=20
 }
-td.selectedcell a.mtitle {
-	font-size:1em;
-	text-decoration:none;
-	display:block;
-	color:white;
+td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
+ font-size:1em;
+ text-decoration:none;
+ display:block;
+ color:white;
 }
 a.dossier {
-	font-size:10px;
-	text-decoration:none;
-	display:block;
-	color: #202267;
+  font-size:10px;
+  text-decoration:none;
+  display:block;
+   color: #202267;
=20
 }
 tr.odd:hover td
 {
-	text-decoration:none;
-	background-color: #a9d6e4;
-	color:white;
+  text-decoration:none;
+  background-color: #a9d6e4;
+  color:white;
 }
 tr.even:hover td
 {
-	text-decoration:none;
-	background-color: #a9d6e4;
-	color:white;
+  text-decoration:none;
+  background-color: #a9d6e4;
+  color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-	background-color:#a9d6e4;
-	color:white;
+  background-color:#a9d6e4;
+  color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-	background-color:#a9d6e4;
-	color:white;
+  background-color:#a9d6e4;
+  color:white;
 }
 a.cell {
-	text-decoration:none;
-	display:block;
-	color:blue;
-	background-color:white;
-	font-size:9px;
+  text-decoration:none;
+  display:block;
+  color:blue;
+  background-color:white;
+  font-size:9px;
 }
=20
 a.cell:hover {
-	font-size:9px;
-	color:white;
-	background-color:#5D90CD;
-	text-decoration:none;
-	display:block;
-}
+  font-size:9px;
+  color:white;
+  background-color:#5D90CD;
+  text-decoration:none;
+  display:block;
+	}
=20
=20
 a.one:link {
@@ -385,23 +381,23 @@
 a.one:visited {
 	text-decoration:none;
 	color:#3010FF
-}
+	}
=20
 a.one:active {
 	background: #0000FF;
-}
+	}
=20
 a.one:hover {
-	text-decoration:underline;
+	    text-decoration:underline;
 	background:#3010FF;
 	color:#FFFFFF;
-}
+	}
=20
=20
 a.detail
 {
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
+  font-size:9px;
+  font-family:verdana,helvetica,sans-serif;
     text-decoration: none;
     display: block;
     color: blue;
@@ -409,8 +405,8 @@
=20
 a.detail:hover
 {
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
+  font-size:9px;
+  font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -418,19 +414,19 @@
 }
=20
 li.menuv,ol.menuv {
-	display:inline;
-	padding:1em 1em;
+	 display:inline;
+	 padding:1em 1em;
 }
 div.redcontent a {
-	font-family:verdana,helvetica,sans-serif;
-	text-decoration: none;
-	display: block;
-	color: blue;
+  font-family:verdana,helvetica,sans-serif;
+  text-decoration: none;
+  display: block;
+  color: blue;
=20
 }
=20
 div.redcontent a:hover {
-	font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -438,17 +434,17 @@
=20
 }
 div.content a {
-	font-family:verdana,helvetica,sans-serif;
-	text-decoration: none;
-	display: block;
-	color: blue;
-	padding: 0;
+  font-family:verdana,helvetica,sans-serif;
+  text-decoration: none;
+  display: block;
+  color: blue;
+padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-	font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -457,92 +453,93 @@
 }
=20
 div.redcontent a.mtitle {
-	text-decoration:none;
-	display:inline;
+  text-decoration:none;
+  display:inline;
=20
=20
-	color:black;
+  color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-	text-decoration:none;
-	display:inline;
-	color:white;
-	background-color:darkblue;
+  text-decoration:none;
+  display:inline;
+  color:white;
+  background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-	font-size:10px;
-	text-decoration:none;
-	display:inline;
-	color:blue;
+  font-size:10px;
+  text-decoration:none;
+  display:inline;
+  color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-	text-decoration:none;
-	display:inline;
-	background-color:darkblue;
-	color:white;
+  text-decoration:none;
+  display:inline;
+  background-color:darkblue;
+  color:white;
=20
=20
 }
 div.redcontent input.text {
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:normal;
-	border-color:336699;
-	border-style:solid;
-	background-color:orange;
-	border-width:1px;
-	color:blue;
+   font-family:verdana,helvetica,sans-serif;
+  font-weight:normal;
+  border-color:336699;
+  border-style:solid;
+  background-color:orange;
+  border-width:1px;
+  color:blue;
 }
 div.content input.text {
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:normal;
-	border-color:336699;
-	border-style:solid;
-	border-width:1px;
-	background-color:orange;
-	color:blue;
+   font-family:verdana,helvetica,sans-serif;
+  font-weight:normal;
+  border-color:336699;
+  border-style:solid;
+  border-width:1px;
+  background-color:orange;
+  color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-	background-color:orange;
+  background-color:orange;
 }
 div.content input:focus {
-	background-color:orange;
+  background-color:orange;
 }
 div.redcontent textarea:focus {
-	background-color: orange;
+background-color: orange;
 }
 .document {
-	color: #1a207d;
-	border-collapse:collapse;
+color: #1a207d;
+border-collapse:collapse;
 }
 a.document{
-	font-size:12px;
-	text-decoration:none;
-	display:block;
+  font-size:12px;
+  text-decoration:none;
+  display:block;
 }
 a.document:hover {
-	text-decoration:none;
-	display:block;
+  text-decoration:none;
+  display:block;
=20
=20
 }
 .input_text_ro {
 	   border:solid 1px blue;
-	   background:lightgrey;
+	   background:#EDEDED;
+	   color:blue;
 	margin:1px;
 }
 .input_text {
-	border:groove 1px blue;
+	   border:groove 1px blue;
 	margin:1px;
 }
 .input_text:hover {
@@ -551,38 +548,37 @@
 	background-color: orange;
 }
 h1.legend, legend {
-	font-weight: bold;
-	font-style: italic;
-	font-size: 120% ;
+font-weight: bold;
+font-style: italic;
+font-size: 110% ;
=20
 }
 fieldset fieldset legend {
-	font-size:110%;
-	color:grey;
-}
+	 font-size:110%;
+	 color:grey;
+	 }
 select {
-	border: 1px solid blue;
-	margin:2px;
-	background-color:white;
+border: 1px solid blue;
+margin:2px;
+background-color:white;
=20
-
 }
=20
=20
=20
 .infobulle {
-	position:absolute;
-	border:1px solid black;
-	background-color:yellow;
-	padding-bottom: 10;
-	padding-top: 10;
-	padding-left: 10;
-	padding-right: 10;
-	color:black;
-	top:0;left:0;
-	visibility:hidden;
-	width:25em;
-	z-index:20;
+	   position:absolute;
+	   border:1px solid black;
+	   background-color:yellow;
+	   padding-bottom: 10;
+	   padding-top: 10;
+	   padding-left: 10;
+	   padding-right: 10;
+	   color:black;
+	   top:0;left:0;
+	   visibility:hidden;
+	   width:25em;
+		z-index:20;
 }
=20
 span.action {
@@ -593,25 +589,25 @@
 	text-align:right;
 }
 tr.priority1 {
-	background-color:red;
-}
+	background-color: coral;
+	}
 span.action a.action {
-	border:2px outset ;
-	padding-left: 3px;
-	padding-right:3px;
-	text-decoration:none;
-	font-size:14px;
+  border:2px outset ;
+  padding-left: 3px;
+  padding-right:3px;
+  text-decoration:none;
+  font-size:14px;
=20
-	display:inline;
-	color:black;
-	background-color:lightgrey;
+  display:inline;
+  color:black;
+  background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-	text-decoration:none;
-	display:inline;
-	background-color:lightblue;
-	color:black;
+  text-decoration:none;
+  display:inline;
+  background-color:lightblue;
+  color:black;
 }
 div.popup_back{
 	position:absolute;
@@ -648,7 +644,7 @@
 	/*opacity:1;
 	filter:alpha(opacity=3D100);*/
=20
-}
+	}
 div.popup_border_notitle {
 	position:absolute;
 	top:20%;
@@ -669,7 +665,7 @@
 	/*opacity:0.7;
 	filter:alpha(opacity=3D70);
 	*/
-}
+	}
=20
 div.popup_content {
 	position:absolute;
@@ -693,13 +689,13 @@
 	filter:alpha(opacity=3D100);*/
 }
 div.autocomplete {
-	position:relative;
-	background-color:white;
-	border:1px solid #888;
-	margin:0;
-	padding:0;
-	text-align:left;
-	font-size:12px;
+  position:relative;
+  background-color:white;
+  border:1px solid #888;
+  margin:0;
+  padding:0;
+  text-align:left;
+  font-size:12px;
=20
 }
 div.autocomplete em {
@@ -707,45 +703,45 @@
 	font-weight:bold;
 }
 div.autocomplete ul {
-	list-style-type:none;
-	background-color:white;
-	border:1px solid #888;
-	width:375px;
-	margin:0;
-	padding:0;
+  list-style-type:none;
+  background-color:white;
+  border:1px solid #888;
+  width:375px;
+  margin:0;
+  padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
-	list-style-type:none;
-	display:block;
-	margin:0;
-	padding:0px;
-	/*height:32px;*/
-	cursor:pointer;
+  list-style-type:none;
+  display:block;
+  margin:0;
+  padding:0px;
+  /*height:32px;*/
+  cursor:pointer;
 }
 span.informal{ font-size:95%; color:black;}
=20
 ul.select_table  {
 	/*padding:5px;*/
 	overflow:hidden;
-}
+	}
 ul.select_table a{
 	width:100%;
 	display:block;
 	background-color:inherit;
 	color: black;
 	text-decoration:none;
-}
+	}
 ul.select_table a:hover{
 	background-color:white;
 	color:black;
 	/*text-decoration:underline;*/
-}
+	}
 ul.select_table li {
 	display:table-row;
 	list-style-type: none;
-}
+	}
 ul.select_table li span {
 	display:table-cell;
 	width:25em;
@@ -755,9 +751,9 @@
=20
 div.pc_calendar{
=20
-	float:left;
+		float:left;
=20
-}
+		}
 div.pc_calendar table {
 	text-align:center;
=20
@@ -796,139 +792,138 @@
=20
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
-	-moz-user-focus:ignore;
-	-moz-user-input:disabled;
-	background-color:lightgrey;
-	color:black;
-	cursor:inherit;
+-moz-user-focus:ignore;
+-moz-user-input:disabled;
+background-color:lightgrey;
+color:black;
+cursor:inherit;
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
 	font-size:10;
 	color:white;
 	font-weight: bold;
-        background-image: url("image/bg-submit2.gif");
+
 	text-decoration:none;
-	font-family: arial,helvetica,sans-serif;
-	background-color: #DEE3E5;
-	border-style:  solid ;
+	font-family: verdana,helvetica,sans-serif;
+	background-image: url("image/bg-submit2.gif");
+	background-repeat: repeat-x;
+	background-position: left;
+
+	border-style:  outset ;
 	border-color:  blue ;
-	border-width:1;
+	border-width:0;
 	padding-bottom: 4;
 	padding-top: 4;
 	padding-right: 6;
 	padding-left:  6;
 	margin-top:3px;
-	margin-bottom:3px;
-	margin-right:3px;
-	margin-left:3px;
 	cursor:pointer;
-	-moz-border-radius:5 5;
-	border-radius:5 5;
+	margin:1 2 1 2;
+        border-radius: 4px;
+	-moz-border-radius:4px;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
 	cursor:pointer;
-	background-color:darkblue;
-	color:#DEE3E5;
-	margin-top:3px;
-	margin-bottom:3px;
-	margin-right:3px;
-	margin-left:3px;
-}
-td.tool {
-	border: solid 1px gray;
 	background-color:white;
+	border-style:  inset ;
+	color:red;
+	margin:1 2 1 2;
=20
-}
-div.topmenu {
-	width:100%;
+	}
+	td.tool {
+	border: solid 1px gray;
+	background-color: white;
=20
+	}
+div.topmenu {
+	margin-top:2px;
 }
=20
 h2.dossier {
 	color:darkblue;
 	font-style: italic;
 	display:inline;
-
 	font-size:14px;
-	margin:0;
-	padding:0;
-	text-align:center;
+	margin:0px;
+	padding:0px;
+	font-variant:small-caps;
 }
 /* </style> */
 div.add_todo_list {
-	border:1px solid blue;
-	display:none;
-	background-color:#BFD0FF;
-	padding:3;
-	position:absolute;
-	text-align:left;
-	line-height:3em;
-	z-index:1;
-        width:345px;
-}
+                    border:1px solid blue;
+                    display:none;
+                    background-color:#BFD0FF;
+                    padding:3;
+                    position:absolute;
+                    text-align:left;
+                    line-height:3em;
+                    z-index:1;
+                    width:345px;
+                }
 div.welcome {
=20
 }
 div.gest_name {
-	float:right;
-	margin-right:150;
+	float:left;
+	margin-left:150;
 	margin-top:15
 }
 h2.gest_name {
 	border-left: 5px solid  #403a8d;
 	border-bottom:1px solid  #b4bbc2;
-	border-top:1px solid  #b4bbc2;
-	border-right:1px solid  #b4bbc2;
+		border-top:1px solid  #b4bbc2;
+		border-right:1px solid  #b4bbc2;
 	padding: 5px;
+	width: 40%;
 }
-body.op_detail_frame  ,div.op_detail_frame  {
-	background-color:#e4e7ed;
-	height:100%; width:100%;
+body.op_detail_frame,div.op_detail_frame  {
+  background-color:#e4e7ed;
+  height:100%; width:100%;
=20
=20
 }
 div.inner_box  {
-	background-color:#e4e7ed;
-	font-size:10;
-	font-family:verdana,helvetica,sans-serif;
-	padding:0;
-	margin:0;
-	overflow:hidden;
-	z-index:3;
+  background-color:#e4e7ed;
+ font-size:10;
+  font-family:verdana,helvetica,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:3;
=20
-	position:absolute;
-	left:10%;
+position:absolute;
+left:10%;
=20
=20
-	border:1px solid darkblue;
+border:1px solid darkblue;
=20
 }
 div.op_detail_title {
 	background-color:grey;
-	/*	width:500;*/
+/*	width:500;*/
=20
=20
 }
 div#div_jrn{
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	visibility:hidden;
-	z-index:2;
-	width:50em;
-	background-color:#EDF3FF;
+              position:absolute;
+              border:1px solid black;
+               top:15%;left:100;
+              visibility:hidden;
+              z-index:2;
+              width:50em;
+		      background-color:#EDF3FF;
=20
 }
-div#div_cat{
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	visibility:hidden;
-	z-index:2;
-	width:50em;
-	background-color:#EDF3FF;
+ div#div_cat{
+              position:absolute;
+              border:1px solid black;
+               top:15%;left:100;
+              visibility:hidden;
+              z-index:2;
+              width:50em;
+             background-color:#EDF3FF;
=20
 }
=20
@@ -937,17 +932,17 @@
=20
 div#search_form
 {
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	margin-left:25%;
-	z-index:2;
-	width:50%;
-	display:none;
-	background-color:#e4e7ed;
+              position:absolute;
+              border:1px solid black;
+              top:15%;left:100px;
+              margin-left:25%;
+              z-index:2;
+              width:50%;
+              display:none;
+	      background-color:#e4e7ed;
 }
=20
-table.sortable td,table.table_large td, table.result td
+table.sortable td, table.table_large td, table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -959,11 +954,13 @@
 }
 table.info_op tr
 {
-	font-size:14;
-	background:white;
+font-size:14;
+background:white;
 }
 h2#jrn_name
 {
+	color:blue;
+	font-size:22;
 	margin-right:30%;
 	float: right;
=20
@@ -977,7 +974,7 @@
 span.remain {
 	font-weight: bold;
 	color:black;
-}
+	}
=20
 div#jrn_name_div
 {
@@ -995,7 +992,6 @@
 {
 	display:inline;
 	float:left;
-
 }
 #calc
 {
@@ -1004,35 +1000,35 @@
 }
 div#wait_box
 {
-	background-color:#F1E6E6;
-	font-size:10;
-	font-family: verdana,helvetica,arial,sans-serif;
-	padding:0;
-	margin:0;
-	overflow:hidden;
-	z-index:10;
+  background-color:#F1E6E6;
+ font-size:10;
+  font-family: verdana,helvetica,arial,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:10;
=20
-	position:absolute;
-	left:30%;
-	top:30%;
+position:absolute;
+left:30%;
+top:30%;
=20
=20
-	border:1px solid darkblue;
+border:1px solid darkblue;
=20
 }
 #wait_box h2
 {
-	color:black;
-	text-align:center;
+color:black;
+text-align:center;
 }
 div#div_jrnsearch_op{
=20
-	border:1px solid black;
-	display:none;
-	width:50em;
-	background-color:#EDF3FF;
-	position:absolute;
-	z-index: 5;
+              border:1px solid black;
+              display:none;
+              width:50em;
+		      background-color:#EDF3FF;
+			  position:absolute;
+			  z-index: 5;
=20
 }
 ul {
@@ -1040,31 +1036,34 @@
 }
 a.line,div.content a.line
 {
-	font-size:110%;
-	text-decoration:underline;
-	display:inline;
-	color: #0000ff;
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+ color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-	font-size:110%;
-	text-decoration:underline;
-	display:inline;
-	color: #0000ff;
-	background-color: rgb(93, 144, 205);
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+  color: #0000ff;
+     background-color: rgb(93, 144, 205);
 }
 #close_div
 {
-	background-color:white;
-	color:red;
-	font-family: arial;
-	text-decoration:none;
-	border:1px solid red;
-	margin-left: 2px;
-	margin-right:2px;
-	margin-top:0px;
-	font-size:10px;
+ background-color:white;
+ color:blue;
+ text-decoration:none;
+ border:1px solid blue;
+ margin-left: 2px;
+ margin-right:2px;
+ margin-top:0px;
+ font-size:10px;
 }
+#close_div:hover
+{
+	background-color: orange;
+}
 table.table_large tr.odd ,table.table_large tr.even {
=20
 	height:32px;
@@ -1106,37 +1105,36 @@
 	float:left;
 	width:40em;
 	top:0px;
-
 }
-
 div.foldercontent {
-	width:80%;
-	margin-left:10%;
+	padding:20px 30px 0px 40px;
 	}
+
 h1.title {
-	color: #046fff;
-	font-size:24px;
+	color: blue;
+	font-size:18px;
 	font-style: italic;
 }
 h2.title {
-	color: #046fff;
-	font-size:16px;
+	color: blue;
+	font-size:14px;
+	font-weight:bold;
 	font-style: italic;
 	margin-left: 15px;
 }
 h3.title {
-	color: #046fff;
+	color: blue;
 	font-size:14px;
 	margin-left: 30px;
 }
 h4.title {
-	color: #046fff;
+	color: blue;
 	font-size:12px;
 	margin-left: 45px;
 	text-decoration: underline;
 }
 h5.title {
-	color: #046fff;
+	color: blue;
 	font-size:12px;
 	margin-left: 45px;
 	text-decoration: none;
@@ -1148,4 +1146,4 @@
 	margin-left:5px;
 	margin-right: 5px;
 	border:lightgrey 2px groove;
-}
\ No newline at end of file
+}



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 18 16:08:21 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UdnQT-00028U-MW
	for mharc-phpcompta-dev@gnu.org; Sat, 18 May 2013 16:08:21 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 18 May 2013 22:06:44 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.789.1368907701.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5285 - in phpcompta/trunk: html
	html/admin/sql/patch html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 May 2013 20:08:20 -0000

Author: danydb
Date: 2013-05-18 22:06:43 +0200 (Sat, 18 May 2013)
New Revision: 5285

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/style-epad.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style-print.css
   phpcompta/trunk/html/style-test.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
Log:
task #845: Ajout d'un div d'information

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-17 22:49:=
21 UTC (rev 5284)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-18 20:06:=
43 UTC (rev 5285)
@@ -4,7 +4,13 @@
 ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_fd_id_fkey FOREIG=
N KEY (mp_fd_id)      REFERENCES fiche_def (fd_id) MATCH SIMPLE      ON U=
PDATE cascade ON DELETE cascade;
 ALTER TABLE mod_payment  DROP CONSTRAINT mod_payment_mp_jrn_def_id_fkey =
;
 ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_jrn_def_id_fkey F=
OREIGN KEY (mp_jrn_def_id)      REFERENCES jrn_def (jrn_def_id) MATCH SIM=
PLE ON UPDATE 	CASCADE ON DELETE CASCADE;
-
+ALTER TABLE fiche_def ADD COLUMN fd_description text;
+update fiche_def set fd_description=3D'Achats de marchandises' where fd_=
id=3D1;
+update fiche_def set fd_description=3D'Liste des clients' where fd_id=3D=
2;
+update fiche_def set fd_description=3D'Liste des comptes financiers: ban=
que, caisse,...' where fd_id=3D3;
+update fiche_def set fd_description=3D'Liste des fournisseurs' where fd_=
id=3D4;
+update fiche_def set fd_label=3D'Services & Biens Divers',fd_description=
=3D'Pour les charges diverses' where fd_id=3D5;
+update fiche_def set fd_description=3D'Vente de prestations, marchandise=
s ' where fd_id=3D6;
 update version set val=3D107;
=20
 commit;

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-05-17 22:49:21 UTC (rev 5284)
+++ phpcompta/trunk/html/js/scripts.js	2013-05-18 20:06:43 UTC (rev 5285)
@@ -678,6 +678,8 @@
 		removeDiv('wait_box');
 		}
 	add_div(obj);
+	$('info_div').innerHTML=3D"Un instant";
+	$('info_div').style.display=3D"block";
=20
 }
 /**
@@ -1181,6 +1183,8 @@
 function remove_waiting_box()
 {
 			removeDiv('wait_box');
+			$('info_div').innerHTML=3D"";
+			$('info_div').style.display=3D"none";
 }
 function get_profile_detail(gDossier,profile_id)
 {
@@ -1723,8 +1727,11 @@
  * @see HtmlInput::filter_table
  */
 function filter_table(phrase, _id, colnr,start_row) {
+	$('info_div').innerHTML=3D"Un instant";
+	$('info_div').style.display=3D"block";
 	var words =3D $(phrase).value.toLowerCase();
 	var table =3D document.getElementById(_id);
+
 	// if colnr contains a comma then check several columns
 	var aCol =3D new Array();
 	if (colnr.indexOf(',') >=3D 0) {
@@ -1733,6 +1740,7 @@
 		aCol[0] =3D colnr;
 	}
 	var ele;
+
 	for (var r =3D start_row; r < table.rows.length; r++) {
 		var found=3D0;
 		for (var col =3D0;col < aCol.length;col++)
@@ -1752,6 +1760,8 @@
 		} else {
 			table.rows[r].style.display =3D 'none';
 		}
+		$('info_div').style.display=3D"none";
+		$('info_div').innerHTML=3D"";
 	}
 }
 function display_task(p_id)

Modified: phpcompta/trunk/html/style-epad.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-epad.css	2013-05-17 22:49:21 UTC (rev 5284=
)
+++ phpcompta/trunk/html/style-epad.css	2013-05-18 20:06:43 UTC (rev 5285=
)
@@ -1147,3 +1147,12 @@
 	margin-right: 5px;
 	border:lightgrey 2px groove;
 }
+#info_div {
+	display:none;
+	background-color: yellow;
+	color:red;
+	z-index: 15;
+	position: absolute;
+	top:0;
+	left:0;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2013-05-17 22:49:21 UTC (rev 528=
4)
+++ phpcompta/trunk/html/style-light.css	2013-05-18 20:06:43 UTC (rev 528=
5)
@@ -1140,4 +1140,13 @@
 	margin-left:5px;
 	margin-right: 5px;
 	border:lightgrey 2px groove;
+}
+#info_div {
+	display:none;
+	background-color: yellow;
+	color:red;
+	z-index: 15;
+	position: absolute;
+	top:0;
+	left:0;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-print.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-print.css	2013-05-17 22:49:21 UTC (rev 528=
4)
+++ phpcompta/trunk/html/style-print.css	2013-05-18 20:06:43 UTC (rev 528=
5)
@@ -286,4 +286,7 @@
 	margin-left:5px;
 	margin-right: 5px;
 	border:lightgrey 2px groove;
+}
+#info_div {
+	display:none;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-test.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-test.css	2013-05-17 22:49:21 UTC (rev 5284=
)
+++ phpcompta/trunk/html/style-test.css	2013-05-18 20:06:43 UTC (rev 5285=
)
@@ -52,7 +52,6 @@
 	    margin-left:10%;
             margin-right:10%;
             padding:2%;
-//	    background-color:white;
 }
 H2 {
    font-size:16pt;
@@ -64,3 +63,12 @@
 	padding-left:5px;
 	padding-right:5px;
 }
+#info_div {
+	display:none;
+	background-color: yellow;
+	color:red;
+	z-index: 15;
+	position: absolute;
+	top:0;
+	left:0;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-05-17 22:49:21 UTC (rev 5284)
+++ phpcompta/trunk/html/style.css	2013-05-18 20:06:43 UTC (rev 5285)
@@ -1147,3 +1147,12 @@
 	margin-right: 5px;
 	border:lightgrey 2px groove;
 }
+#info_div {
+	display:none;
+	background-color: yellow;
+	color:red;
+	z-index: 15;
+	position: absolute;
+	top:0;
+	left:0;
+}
\ No newline at end of file

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2013-05-17 22:49:21 UTC (rev 52=
84)
+++ phpcompta/trunk/include/ac_common.php	2013-05-18 20:06:43 UTC (rev 52=
85)
@@ -310,6 +310,7 @@
     ';
=20
     echo "<BODY $p_script>";
+	echo '<div id=3D"info_div"></div>';
 // language
     if (isset($_SESSION['g_lang']))
     {



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 18 16:09:02 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UdnR8-00029g-RG
	for mharc-phpcompta-dev@gnu.org; Sat, 18 May 2013 16:09:02 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 18 May 2013 22:07:13 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.790.1368907742.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5286 - in phpcompta/trunk/include: . template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 May 2013 20:09:01 -0000

Author: danydb
Date: 2013-05-18 22:07:12 +0200 (Sat, 18 May 2013)
New Revision: 5286

Modified:
   phpcompta/trunk/include/cfgfiche.inc.php
   phpcompta/trunk/include/class_fiche_def.php
   phpcompta/trunk/include/template/fiche_def_input.php
   phpcompta/trunk/include/template/fiche_def_list.php
Log:
task #0000844: Ajout d'une description pour les cat?\195?\169gories de fi=
ches

Modified: phpcompta/trunk/include/cfgfiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/cfgfiche.inc.php	2013-05-18 20:06:43 UTC (rev=
 5285)
+++ phpcompta/trunk/include/cfgfiche.inc.php	2013-05-18 20:07:12 UTC (rev=
 5286)
@@ -87,6 +87,7 @@
             $fiche_def->set_autocreate(false);
         }
         $fiche_def->save_class_base($_REQUEST['class_base']);
+		$fiche_def->save_description($_REQUEST['fd_description']);
=20
     }
 	echo $fiche_def->input_detail();

Modified: phpcompta/trunk/include/class_fiche_def.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche_def.php	2013-05-18 20:06:43 UTC (=
rev 5285)
+++ phpcompta/trunk/include/class_fiche_def.php	2013-05-18 20:07:12 UTC (=
rev 5286)
@@ -60,6 +60,10 @@
         $class_base->set_attribute('account','class_base');
         $class_base->set_attribute('label','acc_label');
         $f_class_base=3D$class_base->input();
+		$fd_description=3Dnew ITextarea('fd_description');
+		$fd_description->width=3D80;
+		$fd_description->heigh=3D4;
+		$fd_description->style=3D'style=3D"vertical-align:text-top"';
         require_once ('template/fiche_def_input.php');
         return;
     }
@@ -115,6 +119,7 @@
         $this->class_base=3D$row['fd_class_base'];
         $this->fiche_def=3D$row['frd_id'];
         $this->create_account=3D$row['fd_create_account'];
+        $this->fd_description=3D$row['fd_description'];
     }
     /*!
      **************************************************
@@ -174,7 +179,7 @@
=20
=20
 		$res =3D $this->cn->exec_sql("SELECT fd_id, fd_class_base, fd_label, f=
d_create_account, fiche_def_ref.frd_id,
-frd_text  FROM fiche_def join fiche_def_ref on (fiche_def.frd_id=3Dfiche=
_def_ref.frd_id)
+frd_text , fd_description FROM fiche_def join fiche_def_ref on (fiche_de=
f.frd_id=3Dfiche_def_ref.frd_id)
 $order
 ");
=20
@@ -243,10 +248,10 @@
         if ( sql_string($p_class_base) !=3D null || strpos(',',$p_class_=
base) !=3D 0 )
         {
             // p_class is a valid number
-            $sql=3D"insert into fiche_def(fd_label,fd_class_base,frd_id,=
fd_create_account)
-                 values ($1,$2,$3,$4) returning fd_id";
+            $sql=3D"insert into fiche_def(fd_label,fd_class_base,frd_id,=
fd_create_account,fd_description)
+                 values ($1,$2,$3,$4,$5) returning fd_id";
=20
-            $fd_id=3D$this->cn->get_value($sql,array($p_nom_mod,$p_class=
_base,$p_FICHE_REF,$p_create));
+            $fd_id=3D$this->cn->get_value($sql,array($p_nom_mod,$p_class=
_base,$p_FICHE_REF,$p_create,$p_fd_description));
=20
             // p_class must be added to tmp_pcmn if it is a single accou=
nting
             if ( strpos(',',$p_class_base) =3D=3D0)
@@ -265,11 +270,11 @@
         else
         {
             //There is no class base not even as default
-            $sql=3Dsprintf("insert into fiche_def(fd_label,frd_id,fd_cre=
ate_account) values ('%s',%d,'%s') returning fd_id",
-                         $p_nom_mod,$p_FICHE_REF,$p_create);
+            $sql=3D"insert into fiche_def(fd_label,frd_id,fd_create_acco=
unt,fd_description) values ($1,$2,$3,$4) returning fd_id";
=20
-            $this->id=3D$this->cn->get_value($sql);
=20
+            $this->id=3D$this->cn->get_value($sql,array($p_nom_mod,$p_FI=
CHE_REF,$p_create,$p_fd_description));
+
             // Get the fd_id
             $fd_id=3D$this->cn->get_current_seq('s_fdef');
=20
@@ -455,10 +460,17 @@
         $class_base->set_attribute('ipopup','ipop_account');
         $class_base->set_attribute('account','class_base');
         $class_base->set_attribute('label','acc_label');
+		$fd_description=3Dnew ITextarea('fd_description',$this->fd_description=
);
+		$fd_description->width=3D80;
+		$fd_description->heigh=3D4;
+		$fd_description->style=3D'style=3D"vertical-align:text-top"';
         $r.=3D_('Poste Comptable de base').' : ';
         $r.=3D$class_base->input();
         $r.=3D'<span id=3D"acc_label"></span><br>';
+		$r.=3D'<br/>';
+		$r.=3D" Description ".$fd_description->input();
         /* auto Create */
+		$r.=3D'<br/>';
         $ck=3Dnew ICheckBox('create');
         $ck->selected=3D($this->create_account=3D=3D'f')?false:true;
         $r.=3D_('Chaque fiche aura automatiquement son propre poste comp=
table : ');
@@ -594,6 +606,11 @@
=20
         $Res=3D$this->cn->exec_sql($sql,array($p_label,$this->id));
     }
+	function save_description($p_description)
+	{
+		if ( $this->id =3D=3D 0)			return;
+		$this->cn->exec_sql("update fiche_def set fd_description=3D$1 where fd=
_id=3D$2",array($p_description,$this->id));
+	}
=20
=20
     /*!\brief insert a new attribut for this fiche_def

Modified: phpcompta/trunk/include/template/fiche_def_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/fiche_def_input.php	2013-05-18 20:06=
:43 UTC (rev 5285)
+++ phpcompta/trunk/include/template/fiche_def_input.php	2013-05-18 20:07=
:12 UTC (rev 5286)
@@ -3,6 +3,14 @@
 <TD><?php echo ('Cat=C3=A9gorie de fiche')?> </TD>
 <TD><INPUT TYPE=3D"INPUT" NAME=3D"nom_mod"></TD>
 </TR>
+<tr>
+	<td style=3D"vertical-align: text-top">
+		Description
+	</td>
+	<td>
+		<?php echo $fd_description->input(); ?>
+	</td>
+</tr>
 <TR>
    <TD> <?php echo _('Classe de base')?> </TD>
 <TD><?php echo $f_class_base?> </TD>
@@ -14,7 +22,7 @@
 <?php
   if ( sizeof($ref)  ) {
     foreach ($ref as $i=3D>$v) { ?>
-<TR><TD COLSPAN=3D"2">
+<TR><TD style=3D"width:auto" COLSPAN=3D"2">
 <?php echo $iradio->input("FICHE_REF",$v['frd_id']);
    echo $v['frd_text'];
    if ( sizeof ($v['frd_class_base']) !=3D 0 )

Modified: phpcompta/trunk/include/template/fiche_def_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/fiche_def_list.php	2013-05-18 20:06:=
43 UTC (rev 5285)
+++ phpcompta/trunk/include/template/fiche_def_list.php	2013-05-18 20:07:=
12 UTC (rev 5286)
@@ -29,7 +29,8 @@
 $max=3DDatabase::num_row($res);
 ?>
 <div id=3D"list_cat_div" class=3D"content">
-<table class=3D"result">
+	<?php echo "Filtre"; echo HtmlInput::filter_table("fiche_def_tb", "0,1,=
2,3,4", "1"); ?>
+<table id=3D"fiche_def_tb" class=3D"result">
 	<tR>
 		<th>
 			<?php echo $tab->get_header(0)?>
@@ -43,8 +44,11 @@
 		<th>
 			<?php echo $tab->get_header(3)?>
 		</th>
+		<th>
+			Description
+		</th>
 	</tR>
-<?php=20
+<?php
 $dossier=3DDossier::id();
 for ($i=3D0;$i<$max;$i++):
 	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
@@ -58,7 +62,7 @@
 			<?php echo h($row['fd_class_base'])?>
 		</td>
 		<td>
-			<?php=20
+			<?php
 			 $v=3D($row['fd_create_account']=3D=3D't')?"Automatique":"Manuel";
 			 echo $v;
 			?>
@@ -66,14 +70,17 @@
 		<td>
 			<?php echo $row['frd_text']?>
 		</td>
+		<td>
+			<?php echo h($row['fd_description']) ?>
+		</td>
 	</tr>
=20
=20
-<?php=20
+<?php
 endfor;
 ?>
 </table>
-<?php=20
+<?php
 echo HtmlInput::button("cat_fiche_def_add","Ajout d'une nouvelle cat=C3=A9=
gorie", "onclick=3D\"detail_category_show('detail_category_div','".$dossi=
er."','-1')\"");
 ?>
 </div>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 18 16:20:11 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Udnbv-0005oC-Aw
	for mharc-phpcompta-dev@gnu.org; Sat, 18 May 2013 16:20:11 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 18 May 2013 22:18:27 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.791.1368908410.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5287 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 May 2013 20:20:10 -0000

Author: danydb
Date: 2013-05-18 22:18:27 +0200 (Sat, 18 May 2013)
New Revision: 5287

Modified:
   phpcompta/trunk/include/fiche.inc.php
Log:
task #0000844: Ajout d'une description pour les cat?\195?\169gories de fi=
ches

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-05-18 20:07:12 UTC (rev 52=
86)
+++ phpcompta/trunk/include/fiche.inc.php	2013-05-18 20:18:27 UTC (rev 52=
87)
@@ -90,7 +90,7 @@
 		<?php echo _('Recherche de fiche')?> <?php echo HtmlInput::infobulle(1=
8)?> :<?php echo $search_card->input()?>
 		<?php echo HtmlInput::button_anchor("Chercher","javascript:void(0)",""=
,$search_card_js)?>
 </div>
-<?php=20
+<?php
 echo '</div>';
 $str =3D "if (g('histo').value=3D=3D3 || g('histo').value=3D=3D -1 ) {
      g('trstart').style.display=3D'none';g('trend').style.display=3D'non=
e';g('allcard').style.display=3D'none';}
@@ -105,6 +105,7 @@
 	exit();
=20
 $fd_id =3D $_GET['cat'];
+
 $array =3D Fiche::get_fiche_def($cn, $_GET['cat'], 'name_asc');
=20
 $h_add_card_b =3D new IButton('add_card');
@@ -123,6 +124,12 @@
 }
=20
 $allcard =3D (isset($_GET['allcard'])) ? 1 : 0;
+if ( $allcard =3D=3D 0 ){
+	$fiche_def=3Dnew Fiche_Def($cn,$_GET['cat']);
+	$fiche_def->Get();
+	echo h1($fiche_def->label,"");
+	echo h2($fiche_def->fd_description,"");
+}
 /* * *******************************************************************=
**************************************************************
  * Liste
  *
@@ -203,6 +210,7 @@
 	");
 	$nb_line =3D Database::num_row($res);
 	if ($write !=3D 1 || $allcard !=3D 0 )  $str_add_card=3D"";
+
 	require_once 'template/fiche_list.php';
 	echo '<hr>'.$bar;
 	exit();



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sat May 18 16:22:33 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UdneD-0005vS-KG
	for mharc-phpcompta-dev@gnu.org; Sat, 18 May 2013 16:22:33 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 18 May 2013 22:20:48 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.792.1368908553.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5288 - phpcompta/trunk/html/admin/sql/patch
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 May 2013 20:22:33 -0000

Author: danydb
Date: 2013-05-18 22:20:48 +0200 (Sat, 18 May 2013)
New Revision: 5288

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
Log:
task #0000844: Ajout d'une description pour les cat?\195?\169gories de fi=
ches

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-18 20:18:=
27 UTC (rev 5287)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-18 20:20:=
48 UTC (rev 5288)
@@ -6,11 +6,11 @@
 ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_jrn_def_id_fkey F=
OREIGN KEY (mp_jrn_def_id)      REFERENCES jrn_def (jrn_def_id) MATCH SIM=
PLE ON UPDATE 	CASCADE ON DELETE CASCADE;
 ALTER TABLE fiche_def ADD COLUMN fd_description text;
 update fiche_def set fd_description=3D'Achats de marchandises' where fd_=
id=3D1;
-update fiche_def set fd_description=3D'Liste des clients' where fd_id=3D=
2;
-update fiche_def set fd_description=3D'Liste des comptes financiers: ban=
que, caisse,...' where fd_id=3D3;
-update fiche_def set fd_description=3D'Liste des fournisseurs' where fd_=
id=3D4;
-update fiche_def set fd_label=3D'Services & Biens Divers',fd_description=
=3D'Pour les charges diverses' where fd_id=3D5;
-update fiche_def set fd_description=3D'Vente de prestations, marchandise=
s ' where fd_id=3D6;
+update fiche_def set fd_description=3D'Cat=C3=A9gorie qui contient la li=
ste des clients' where fd_id=3D2;
+update fiche_def set fd_description=3D'Cat=C3=A9gorie qui contient la li=
ste des comptes financiers: banque, caisse,...' where fd_id=3D3;
+update fiche_def set fd_description=3D'Cat=C3=A9gorie qui contient la li=
ste des fournisseurs' where fd_id=3D4;
+update fiche_def set fd_label=3D'Services & Biens Divers',fd_description=
=3D'Cat=C3=A9gorie qui contient la liste des charges diverses' where fd_i=
d=3D5;
+update fiche_def set fd_description=3D'Cat=C3=A9gorie qui contient la li=
ste des prestations, marchandises... que l''on vend ' where fd_id=3D6;
 update version set val=3D107;
=20
 commit;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 19 15:01:07 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ue8qx-0007rE-3B
	for mharc-phpcompta-dev@gnu.org; Sun, 19 May 2013 15:01:07 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 19 May 2013 20:59:29 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1366.1368990066.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5289 - in phpcompta/trunk/include: . template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 May 2013 19:01:05 -0000

Author: danydb
Date: 2013-05-19 20:59:29 +0200 (Sun, 19 May 2013)
New Revision: 5289

Modified:
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/dashboard.inc.php
   phpcompta/trunk/include/template/dashboard.php
Log:
task #0000846: Voir les factures ?\195?\160 encaisser ou ?\195?\160 payer=
 en retard dans le tableau de bord

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2013-05-18 20:20:48 UTC (rev 52=
88)
+++ phpcompta/trunk/include/ac_common.php	2013-05-19 18:59:29 UTC (rev 52=
89)
@@ -1031,5 +1031,51 @@
 </data>
 EOF;
 }
+function display_dashboard_operation($p_array,$p_title,$p_div)
+{
+	?>
+<div id=3D"<?php echo $p_div;?>" class=3D"inner_box" style=3D"display:no=
ne;top:250;left:25%;width: 50%">
+	<?php
+	echo HtmlInput::title_box($p_title, $p_div, "hide");
+	?>
+	<?php if (count($p_array)>0) :?>
+	<table class=3D"result">
+		<tr>
+			<th>Date</th>
+			<th>Code Interne</th>
+			<th>Description</th>
+			<th>
+				Montant
+			</th>
=20
+		</tr>
+		<?php
+			for ($i=3D0;$i<count($p_array);$i++):
+		?>
+		<tr class=3D"<?php echo (($i%2)=3D=3D0)?'odd':'even';?>">
+			<td>
+				<?php echo smaller_date($p_array[$i]['jr_date']) ?>
+			</td>
+			<td>
+				<?php echo HtmlInput::detail_op($p_array[$i]['jr_id'], $p_array[$i][=
'jr_internal']) ?>
+			</td>
+			<td>
+				<?php echo h($p_array[$i]['jr_comment']) ?>
+			</td>
+			<td>
+				<?php echo nbm($p_array[$i]['jr_montant']) ?>
+			</td>
+		</tr>
+		<?php
+		endfor;
+		?>
+	</table>
+	<?php else: ?>
+	<h2 class=3D"notice">Aucune donn=C3=A9e</h2>
+	<?php
+	endif;
+	?>
+</div>
+<?php
+}
 ?>

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-05-18 20:20:48 UTC =
(rev 5288)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-05-19 18:59:29 UTC =
(rev 5289)
@@ -3522,4 +3522,65 @@
 		}
 	}
=20
+	function get_operation_date($p_date,$p_ledger_type,$sql_op)
+	{
+		global $g_user;
+		switch ($p_ledger_type)
+		{
+			case 'ACH':
+				$filter=3D$g_user->get_ledger_sql('ACH',3);
+				break;
+			case 'VEN':
+				$filter=3D$g_user->get_ledger_sql('VEN',3);
+				break;
+			default:
+				throw new Exception ('Ledger_type invalid : '.$p_ledger_type);
+		}
+
+
+		$sql =3D "select jr_id, jr_internal, jr_date, jr_comment,jr_comment,jr=
_montant
+				from jrn
+				join jrn_def on (jrn_def_id=3Djr_def_id)
+				where
+				jr_ech is not null
+				and jr_ech $sql_op to_date($1,'DD.MM.YYYY')
+				and coalesce (jr_rapt,'xx') <> 'paid'
+				and $filter
+				";
+		$array=3D$this->db->get_array($sql,array($p_date));
+		return $array;
+	}
+	/**
+	 * @brief get info from supplier to pay today
+	 */
+	function get_supplier_now()
+	{
+		$array=3D$this->get_operation_date(Date('d.m.Y'), 'ACH', '=3D');
+		return $array;
+	}
+	/**
+	 * @brief get info from supplier not yet paid
+	 */
+	function get_supplier_late()
+	{
+		$array=3D$this->get_operation_date(Date('d.m.Y'), 'ACH', '<');
+		return $array;
+	}
+	/**
+	 * @brief get info from customer to pay today
+	 */
+	function get_customer_now()
+	{
+		$array=3D$this->get_operation_date(Date('d.m.Y'), 'VEN', '=3D');
+		return $array;
+	}
+	/**
+	 * @brief get info from customer not yet paid
+	 */
+	function get_customer_late()
+	{
+		$array=3D$this->get_operation_date(Date('d.m.Y'), 'VEN', '<');
+		return $array;
+	}
+
 }

Modified: phpcompta/trunk/include/dashboard.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/dashboard.inc.php	2013-05-18 20:20:48 UTC (re=
v 5288)
+++ phpcompta/trunk/include/dashboard.inc.php	2013-05-19 18:59:29 UTC (re=
v 5289)
@@ -22,10 +22,19 @@
 $Operation=3Dnew Follow_Up($cn);
 $last_operation=3D$Operation->get_today();
 $late_operation=3D$Operation->get_late();
+
 $Ledger=3Dnew Acc_Ledger($cn,0);
 $last_ledger=3Darray();
 $last_ledger=3D$Ledger->get_last(20);
=20
+// Supplier late and now
+$supplier_now=3D$Ledger->get_supplier_now();
+$supplier_late=3D$Ledger->get_supplier_late();
+
+// Customer late and now
+$customer_now=3D$Ledger->get_customer_now();
+$customer_late=3D$Ledger->get_customer_late();
+
 ob_start();
 require_once('template/dashboard.php');
 $ret=3Dob_get_contents();

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-05-18 20:20:48 UT=
C (rev 5288)
+++ phpcompta/trunk/include/template/dashboard.php	2013-05-19 18:59:29 UT=
C (rev 5289)
@@ -59,62 +59,165 @@
 </div>
 <div style=3D"float:left;clear:both"></div>
 <div style=3D"float:right;width: 49%">
-<?php if (count($last_operation)> 0) : ?>
-	<fieldset>
-	<legend><?php echo _('Action pour aujourd\'hui')?>
-	</legend>
-	<ol>
+	<table class=3D'result'>
+		<tr>
+			<th>
+
+			</th>
+			<th>
+				Pour aujourd'hui
+			</th>
+			<th>
+				En retard
+			</th>
+		</tr>
+		<tr>
+			<td>
+				Action
+			</td>
+			<td>
+				<?php if (count($last_operation)>0): ?>
+				<A class=3D"mtitle" style=3D"text-decoration:underline"onclick=3D"di=
splay_detail('action_now_div')">
+					<span class=3D"notice">
+					<?php echo count($last_operation) ?>
+					</span>
+					&nbsp;d=C3=A9tail
+				</A>
+			<?php else: ?>
+				 0
+			<?php endif; ?>
+			</td>
+
+			<td >
+			<?php if (count($late_operation)>0): ?>
+				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('action_late_div')">
+				<span class=3D"notice"><?php echo count($late_operation) ?></span>
+					&nbsp;d=C3=A9tail
+				</A>
+			<?php else: ?>
+				 0
+			<?php endif; ?>
+			</td>
+
+		</tr>
+		<tr>
+			<td>
+				Paiement fournisseur
+			</td>
+			<td >
+			<?php if (count($supplier_now)>0): ?>
+				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('supplier_now_div')">
+				<span class=3D"notice"><?php echo count($supplier_now) ?></span>
+					&nbsp;d=C3=A9tail
+				</A>
+			<?php else: ?>
+				 0
+			<?php endif; ?>
+			</td>
+			<td >
+			<?php if (count($supplier_late)>0): ?>
+				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('supplier_late_div')">
+				<span class=3D"notice"><?php echo count($supplier_late) ?></span>
+					&nbsp;d=C3=A9tail
+				</A>
+			<?php else: ?>
+				 0
+			<?php endif; ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				Paiement client
+			</td>
+			<td>
+				<?php if (count($customer_now)>0): ?>
+				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('customer_now_div')">
+				<span class=3D"notice"><?php echo count($customer_now) ?></span>
+					&nbsp;d=C3=A9tail
+				</A>
+			<?php else: ?>
+				 0
+			<?php endif; ?>
+			</td>
+			<td>
+				<?php if (count($customer_late)>0): ?>
+				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('customer_late_div')">
+				<span class=3D"notice"><?php echo count($customer_late) ?></span>
+					&nbsp;d=C3=A9tail
+				</A>
+			<?php else: ?>
+				 0
+			<?php endif; ?>
+			</td>
+		</tr>
+	</table>
+<div id=3D"action_late_div"  class=3D"inner_box" style=3D"display:none;m=
argin-left:25%;width: 50%">
 	<?php
-	for($i=3D0;$i<count($last_operation);$i++):
+		echo HtmlInput::title_box("Action en retard", "action_late_div","hide"=
)
 	?>
+	<ol>
+	<?php if (count($late_operation)> 0) :
+
+	for($i=3D0;$i<count($late_operation);$i++):
+	?>
 	<li>
-		<?php echo HtmlInput::detail_action($last_operation[$i]['ag_id'],h($la=
st_operation[$i]['ag_ref']))?>
+		<?php echo HtmlInput::detail_action($late_operation[$i]['ag_id'],h($la=
te_operation[$i]['ag_ref']))?>
 	<span>
-	<?php echo smaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
+	<?php echo smaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
 	</span>
 		<span  style=3D"font-weight: bolder ">
-			<?php echo h($last_operation[$i]['vw_name'])?>
+			<?php echo h($late_operation[$i]['vw_name'])?>
 		</span>
 	<span>
-	<?php echo h(mb_substr($last_operation[$i]['ag_title'],0,50,'UTF-8'))?>
+	<?php echo h(mb_substr($late_operation[$i]['ag_title'],0,50,'UTF-8'))?>
 	</span>
 	<span style=3D"font-style: italic">
-	<?php echo $last_operation[$i]['dt_value']?>
+	<?php echo $late_operation[$i]['dt_value']?>
 	</span>
 	</li>
 	<?php endfor;?>
 	</ol>
-	</fieldset>
-<?php endif; ?>
+	<?php else : ?>
+	<h2 class=3D'notice'>Aucune action en retard</h2>
+	<?php endif; ?>
+	</div>
=20
-<?php if (count($late_operation)> 0) : ?>
-		<fieldset>
-	<legend><?php echo _('Action en retard ')?>
-	</legend>
+	<div id=3D"action_now_div" class=3D"inner_box" style=3D"display:none;ma=
rgin-left:25%;width: 50%">
+	<?php
+		echo HtmlInput::title_box("Action pour aujourd'hui", "action_now_div",=
"hide")
+	?>
 	<ol>
 	<?php
-	for($i=3D0;$i<count($late_operation);$i++):
+	if (count($last_operation)> 0) :
+	for($i=3D0;$i<count($last_operation);$i++):
 	?>
 	<li>
-		<?php echo HtmlInput::detail_action($late_operation[$i]['ag_id'],h($la=
te_operation[$i]['ag_ref']))?>
+		<?php echo HtmlInput::detail_action($last_operation[$i]['ag_id'],h($la=
st_operation[$i]['ag_ref']))?>
 	<span>
-	<?php echo smaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
+	<?php echo smaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
 	</span>
 		<span  style=3D"font-weight: bolder ">
-			<?php echo h($late_operation[$i]['vw_name'])?>
+			<?php echo h($last_operation[$i]['vw_name'])?>
 		</span>
 	<span>
-	<?php echo h(mb_substr($late_operation[$i]['ag_title'],0,50,'UTF-8'))?>
+	<?php echo h(mb_substr($last_operation[$i]['ag_title'],0,50,'UTF-8'))?>
 	</span>
 	<span style=3D"font-style: italic">
-	<?php echo $late_operation[$i]['dt_value']?>
+	<?php echo $last_operation[$i]['dt_value']?>
 	</span>
 	</li>
 	<?php endfor;?>
 	</ol>
-	</fieldset>
+	<?php else : ?>
+		<h2 class=3D'notice'>Aucune action pour aujourd'hui</h2>
 <?php endif; ?>
+	</div>
+	<?php display_dashboard_operation($supplier_now,"Fournisseurs =C3=A0 pa=
yer aujourd'hui",'supplier_now_div'); ?>
+	<?php display_dashboard_operation($supplier_late,"Fournisseurs en retad=
",'supplier_late_div'); ?>
+	<?php display_dashboard_operation($customer_now,"Encaissement clients a=
ujourd'hui",'customer_now_div'); ?>
+	<?php display_dashboard_operation($customer_late,"Clients en retard",'c=
ustomer_late_div'); ?>
 </div>
+<!-- Mini rapport -->
 	<div style=3D"float:left;width: 49%">
 <?php
 /*
@@ -222,3 +325,20 @@
 ?>
 </form>
 </div>
+<script type=3D"text/javascript" language=3D"javascript" charset=3D"utf-=
8">
+function display_detail(div) {
+	$(div).style.display=3D"block";
+	//Effect.Grow(div,{});
+}
+try {
+var array=3DArray('customer_now_div','customer_late_div','supplier_now_d=
iv','supplier_late_div','action_now_div','action_late_div');
+var i=3D0;
+for  (i=3D0;i < array.length;i++) {
+
+	if ( ! document.getElementById(array[i])) {
+		console.log('ATTENTION'+array[i]);
+	}
+	new Draggable(array[i],{});
+}
+} catch (e) { alert(e.getMessage);}
+</script>
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 19 16:49:59 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UeAYJ-0007F6-1X
	for mharc-phpcompta-dev@gnu.org; Sun, 19 May 2013 16:49:59 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 19 May 2013 22:48:18 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1425.1368996597.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5290 - in phpcompta/trunk: html
	html/admin/sql/patch html/js include include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 May 2013 20:49:56 -0000

Author: danydb
Date: 2013-05-19 22:48:17 +0200 (Sun, 19 May 2013)
New Revision: 5290

Added:
   phpcompta/trunk/include/ajax_min_row.php
Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/template/param_jrn.php
Log:
task #0000804: Nombre de ligne par d?\195?\169faut

Nombre de ligne MAX_ARTICLE est ?\195?\160 5 : impacte les actions

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-19 18:59:=
29 UTC (rev 5289)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-19 20:48:=
17 UTC (rev 5290)
@@ -11,6 +11,8 @@
 update fiche_def set fd_description=3D'Cat=C3=A9gorie qui contient la li=
ste des fournisseurs' where fd_id=3D4;
 update fiche_def set fd_label=3D'Services & Biens Divers',fd_description=
=3D'Cat=C3=A9gorie qui contient la liste des charges diverses' where fd_i=
d=3D5;
 update fiche_def set fd_description=3D'Cat=C3=A9gorie qui contient la li=
ste des prestations, marchandises... que l''on vend ' where fd_id=3D6;
+
+update jrn_def set jrn_deb_max_line=3D5 where jrn_deb_max_line is null;
 update version set val=3D107;
=20
 commit;

Modified: phpcompta/trunk/html/ajax_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_misc.php	2013-05-19 18:59:29 UTC (rev 5289)
+++ phpcompta/trunk/html/ajax_misc.php	2013-05-19 20:48:17 UTC (rev 5290)
@@ -569,6 +569,9 @@
 	case 'vw_action':
 		require_once 'ajax_view_action.php';
 		break;
+	case 'minrow':
+		require_once 'ajax_min_row.php';
+		break;
 	default:
 		var_dump($_GET);
 }

Modified: phpcompta/trunk/html/js/acc_ledger.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/acc_ledger.js	2013-05-19 18:59:29 UTC (rev 52=
89)
+++ phpcompta/trunk/html/js/acc_ledger.js	2013-05-19 20:48:17 UTC (rev 52=
90)
@@ -141,6 +141,66 @@
=20
 }
 /**
+ *ask the name, quick_code of the bank for the ledger
+ */
+function update_row(ctl)
+{
+	try
+	{
+    var jrn=3Dg('p_jrn').value;
+    var dossier=3Dg('gDossier').value;
+    var qs=3D'gDossier=3D'+dossier+'&op=3Dminrow&j=3D'+jrn+'&ctl=3D'+ctl=
;
+	console.log(qs);
+    var action=3Dnew Ajax.Request(
+                   "ajax_misc.php",
+                   {
+                   method:'get',
+                   parameters:qs,
+                   onFailure:null,
+                   onSuccess:function(request,json)
+						{
+							try {
+								var answer=3Drequest.responseText.evalJSON(true);
+								var row=3DparseFloat(answer.row);
+								var current_row=3DparseFloat($('nb_item').value);
+								info_message("avant "+$('nb_item').value+"Maintenant "+row);
+								if ( current_row > row ) {
+									// Too many row
+									var delta=3D$('nb_item').value-row;
+									var idx=3D$('nb_item').value;
+									console.log("delta "+delta);
+									console.log("idx"+idx);
+									for (var i=3D0;i<delta;i++){
+										$(ctl).deleteRow(-1);
+										console.log("remove "+idx)
+										idx--;
+									}
+									$('nb_item').value=3Drow;
+								}
+								if (current_row < row) {
+									// We need to add rows
+										var delta=3Drow-current_row;
+										for (var i =3D0;i<delta;i++) {
+											if ( ctl=3D=3D'fin_item') {
+												ledger_fin_add_row();
+											}
+											if ( ctl=3D=3D'sold_item'){
+												ledger_add_row();
+											}
+											if (ctl=3D=3D'quick_item'){
+												quick_writing_add_row();
+											}
+										}
+									}
+							}catch (e) { alert(e.getMessage);}
+						}
+					}
+               );
+	} catch (e) {
+		alert(e.getMessage);
+	}
+}
+/**
  * Put into the span, the name of the bank, the bank account
  * and the quick_code
  */
@@ -271,6 +331,7 @@
 	}
 	nb.value++;
 }
+
 /**
  * @brief add a line in the form for the purchase ledger
  */

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-05-19 18:59:29 UTC (rev 5289)
+++ phpcompta/trunk/html/js/scripts.js	2013-05-19 20:48:17 UTC (rev 5290)
@@ -1764,6 +1764,10 @@
 		$('info_div').innerHTML=3D"";
 	}
 }
+/**
+ * @brief
+ * Display the task late or for today in dashboard
+ */
 function display_task(p_id)
 {
 	new Draggable(p_id,{starteffect:function()
@@ -1775,4 +1779,20 @@
     $(p_id).style.left=3DposX;
 	$(p_id).style.display=3D'block';
=20
+}
+/**
+ * @brief
+ * Set a message in the info
+ */
+function info_message (p_message)
+{
+		$('info_div').innerHTML=3Dp_message;
+		$('info_div').style.display=3D"block";
+}
+/**
+ * @brief hide the info box
+ */
+function info_hide()
+{
+		$('info_div').style.display=3D"none";
 }
\ No newline at end of file

Added: phpcompta/trunk/include/ajax_min_row.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_min_row.php	                        (rev=
 0)
+++ phpcompta/trunk/include/ajax_min_row.php	2013-05-19 20:48:17 UTC (rev=
 5290)
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief
+ *
+ */
+require_once('class_user.php');
+require_once('class_dossier.php');
+extract($_GET);
+/* check the parameters */
+foreach ( array('j','ctl') as $a )
+{
+    if ( ! isset(${$a}) )
+    {
+        echo "missing $a";
+        return;
+    }
+}
+
+if ( $g_user->check_jrn($_GET['j'])=3D=3D'X' ) { echo  '{"row":"0"}';exi=
t();}
+
+$row=3D$cn->get_value('select jrn_deb_max_line from jrn_def where jrn_de=
f_id=3D$1',array($_GET['j']));
+
+echo '{"row":"'.$row.'"}';
+
+?>

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-05-19 18:59:29 UTC =
(rev 5289)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-05-19 20:48:17 UTC =
(rev 5290)
@@ -1527,7 +1527,11 @@
 			$ret.=3D'<input type=3D"button" class=3D"button" value=3D"' . _('veri=
fie Imputation Analytique') . '" onClick=3D"verify_ca(\'\');">';
 		return $ret;
 	}
-
+	function get_min_row()
+	{
+		$row=3D$this->db->get_value("select jrn_deb_max_line from jrn_def wher=
e jrn_def_id=3D$1",array($this->id));
+		return $row;
+	}
 	/**
 	 * @brief Show the form to encode your operation
 	 * @param$p_array if you correct or use a predef operation (default =3D=
 null)
@@ -1539,7 +1543,7 @@
 	function input($p_array =3D null, $p_readonly =3D 0)
 	{
 		global $g_parameter, $g_user;
-
+		$this->nb=3D$this->get_min_row();
 		if ($p_readonly =3D=3D 1)
 			return $this->confirm($p_array);
=20
@@ -1554,6 +1558,7 @@
 		{
 			$add_js.=3D'get_last_date();';
 		}
+		$add_js.=3D'update_row("quick_item");';
 		$ret =3D "";
 		if ($g_user->check_action(FICADD) =3D=3D 1)
 		{
@@ -3271,6 +3276,9 @@
 		$hidden.=3DHtmlInput::hidden('p_ech_lib', 'echeance');
 		$hidden.=3DHtmlInput::hidden('p_jrn_type', $type);
=20
+		$min_row =3D new INum("min_row",$this->jrn_deb_max_line);
+		$min_row->prec=3D0;
+
 		/* Load the card */
 		$card =3D $this->get_fiche_def();
 		$rdeb =3D explode(',', $card['deb']);
@@ -3365,6 +3373,7 @@
 		$this->jrn_def_type =3D $p_jrn_type;
 		$this->jrn_def_pj_pref =3D $jrn_def_pj_pref;
 		$this->jrn_def_fiche_deb =3D (isset($FICHEDEB)) ? join($FICHEDEB, ',')=
 : "";
+		$this->jrn_deb_max_line=3D$min_row;
 		switch ($this->jrn_def_type)
 		{
 			case 'ACH':
@@ -3458,7 +3467,8 @@
 		echo HtmlInput::hidden('sa', 'add');
=20
 		$cn =3D $this->db;
-
+		$min_row =3D new INum("min_row",MAX_ARTICLE);
+		$min_row->prec=3D0;
 		require_once('template/param_jrn.php');
 	}
=20
@@ -3478,6 +3488,7 @@
 		$this->jrn_def_type =3D $p_jrn_type;
 		$this->jrn_def_pj_pref =3D $jrn_def_pj_pref;
 		$this->jrn_def_fiche_deb =3D (isset($FICHEDEB)) ? join($FICHEDEB, ',')=
 : "";
+		$this->jrn_deb_max_line=3D$min_row;
 		$this->jrn_def_code =3D sprintf("%s%02d", trim(substr($this->jrn_def_t=
ype, 0, 1)), Acc_Ledger::next_number($this->db, $this->jrn_def_type));
=20
 		switch ($this->jrn_def_type)

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2013-05-19 18:59:29 =
UTC (rev 5289)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2013-05-19 20:48:17 =
UTC (rev 5290)
@@ -237,6 +237,8 @@
=20
 		$pview_only =3D false;
=20
+		$min_article=3D$this->get_min_row();
+
 		$f_add_button =3D new IButton('add_card');
 		$f_add_button->label =3D _('Cr=C3=A9er une nouvelle fiche');
 		$f_add_button->set_attribute('ipopup', 'ipop_newcard');
@@ -291,7 +293,7 @@
=20
 		// Ledger (p_jrn)
 		//--
-		$onchange=3D"update_bank();ajax_saldo('first_sold');update_name();";
+		$onchange=3D"update_bank();ajax_saldo('first_sold');update_name();upda=
te_row('fin_item');";
=20
 		if ($g_parameter->MY_DATE_SUGGEST =3D=3D 'Y')
 			$onchange .=3D 'get_last_date();';
@@ -344,7 +346,7 @@
 		$wLast =3D new INum('last_sold', $last_sold);
=20
=20
-		$max =3D (isset($nb_item)) ? $nb_item : MAX_ARTICLE;
+		$max =3D (isset($nb_item)) ? $nb_item : $min_article;
=20
 		$r.=3D HtmlInput::hidden('nb_item', $max);
 		//--------------------------------------------------

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-19 18:5=
9:29 UTC (rev 5289)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-19 20:4=
8:17 UTC (rev 5290)
@@ -982,7 +982,8 @@
 			$add_js.=3D'get_last_date();';
 		}
 		$add_js.=3D'update_name();';
-		$add_js.=3D'update_pay_method()';
+		$add_js.=3D'update_pay_method();';
+		$add_js.=3D'update_row("sold_item");';
=20
 		$wLedger=3D$this->select_ledger('ACH',2);
         if ($wLedger =3D=3D null) exit (_('Pas de journal disponible'));

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-19 18:59:29=
 UTC (rev 5289)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-19 20:48:17=
 UTC (rev 5290)
@@ -1119,7 +1119,8 @@
 			$add_js.=3D'get_last_date();';
 		}
 		$add_js.=3D'update_name();';
-		$add_js.=3D'update_pay_method()';
+		$add_js.=3D'update_pay_method();';
+		$add_js.=3D'update_row("sold_item");';
=20
         $wLedger=3D$this->select_ledger('VEN',2);
         if ( $wLedger =3D=3D null )

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-19 18:59:29 UTC (rev 528=
9)
+++ phpcompta/trunk/include/constant.php	2013-05-19 20:48:17 UTC (rev 529=
0)
@@ -62,9 +62,9 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
-//define ('SVNINFO',5900);
+define ('SVNINFO',5900);
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",false);
+define ("DEBUG",true);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);
@@ -81,7 +81,7 @@
 define ('NOTFOUND','--not found--');
=20
 define ("MAX_COMPTE",4);
-define ('MAX_ARTICLE',12);
+define ('MAX_ARTICLE',5);
 define ('MAX_CAT',15);
 define ('MAX_CARD_SEARCH',550);
 define ('MAX_FORECAST_ITEM',10);

Modified: phpcompta/trunk/include/template/param_jrn.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/param_jrn.php	2013-05-19 18:59:29 UT=
C (rev 5289)
+++ phpcompta/trunk/include/template/param_jrn.php	2013-05-19 20:48:17 UT=
C (rev 5290)
@@ -4,7 +4,7 @@
 		<TD><?php echo _('Nom journal')?> </TD>
 		<TD> <INPUT TYPE=3D"text" class=3D"input_text" NAME=3D"p_jrn_name" VAL=
UE=3D"<?php	echo $name;	?>"></TD>
 </TR>
-<?php=20
+<?php
 if ($new || $type=3D=3D'ODS' ):
 ?>
 <TR>
@@ -18,10 +18,10 @@
 	utiliser le * pour indiquer 'tous les postes qui en d=C3=A9pendent' exe=
mple: 4*")?>
 </TD>
 </TR>
-<?php=20
+<?php
 endif;
 ?>
-<?php=20
+<?php
 if ( $new || $type=3D=3D'FIN') {
 ?>
 <tr>
@@ -37,7 +37,7 @@
 <?php echo _('Compte en banque')?>
 </td>
 <TD>
-<?php=20
+<?php
 $card=3Dnew ICard();
 $card->name=3D'bank';
 $card->extra=3D$cn->make_list('select fd_id from fiche_def where frd_id=3D=
4');
@@ -55,12 +55,13 @@
 <td class=3D"notice">
 <?php echo _("Obligatoire pour les journaux FIN : donner ici la fiche de=
 la banque utilis=C3=A9e")?>
 </td>
-<?php=20
+<?php
 }
 ?>
 </TR>
 <tr>
-<td><INPUT TYPE=3D"hidden" id=3D"p_jrn_deb_max_line" NAME=3D"p_jrn_deb_m=
ax_line" VALUE=3D"10"></td>
+	<td>Minimum de lignes =C3=A0 afficher</td>
+<td><?php echo $min_row->input()?></td>
 </tr>
 <tr>
 <td><INPUT TYPE=3D"hidden" id=3D"p_jrn_deb_max_line" NAME=3D"p_jrn_deb_m=
ax_line" VALUE=3D"10"></td>
@@ -116,12 +117,12 @@
 <H2 class=3D"info"> Fiches </H2>
 <TABLE width=3D"100%">
 <TR>
-<?php=20
+<?php
 if ( $new || ($type !=3D 'ODS' && $type !=3D 'FIN')) {
 ?>
 <th style=3D"text-align:left"><?php echo _('Fiches D=C3=A9bit')?></TH>
 <th style=3D"text-align:left"><?php echo _('Fiches Cr=C3=A9dit')?></TH>
-<?php=20
+<?php
 }
 ?>
 </TR>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 20 12:13:22 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UeSiA-0001Uy-NS
	for mharc-phpcompta-dev@gnu.org; Mon, 20 May 2013 12:13:22 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 20 May 2013 18:08:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.2517.1369066402.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5292 - phpcompta/trunk/html/js
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 May 2013 16:13:22 -0000

Author: danydb
Date: 2013-05-20 18:08:03 +0200 (Mon, 20 May 2013)
New Revision: 5292

Modified:
   phpcompta/trunk/html/js/acc_ledger.js
Log:
Task #0000804: Enlever info deboggage

Modified: phpcompta/trunk/html/js/acc_ledger.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/acc_ledger.js	2013-05-20 16:04:59 UTC (rev 52=
91)
+++ phpcompta/trunk/html/js/acc_ledger.js	2013-05-20 16:08:03 UTC (rev 52=
92)
@@ -150,7 +150,6 @@
     var jrn=3Dg('p_jrn').value;
     var dossier=3Dg('gDossier').value;
     var qs=3D'gDossier=3D'+dossier+'&op=3Dminrow&j=3D'+jrn+'&ctl=3D'+ctl=
;
-	console.log(qs);
     var action=3Dnew Ajax.Request(
                    "ajax_misc.php",
                    {
@@ -163,16 +162,12 @@
 								var answer=3Drequest.responseText.evalJSON(true);
 								var row=3DparseFloat(answer.row);
 								var current_row=3DparseFloat($('nb_item').value);
-								info_message("avant "+$('nb_item').value+"Maintenant "+row);
 								if ( current_row > row ) {
 									// Too many row
 									var delta=3D$('nb_item').value-row;
 									var idx=3D$('nb_item').value;
-									console.log("delta "+delta);
-									console.log("idx"+idx);
 									for (var i=3D0;i<delta;i++){
 										$(ctl).deleteRow(-1);
-										console.log("remove "+idx)
 										idx--;
 									}
 									$('nb_item').value=3Drow;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 20 12:16:59 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UeSlf-0003Oz-1X
	for mharc-phpcompta-dev@gnu.org; Mon, 20 May 2013 12:16:59 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 20 May 2013 18:15:15 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.2520.1369066618.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5293 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 May 2013 16:16:58 -0000

Author: danydb
Date: 2013-05-20 18:15:14 +0200 (Mon, 20 May 2013)
New Revision: 5293

Modified:
   phpcompta/trunk/html/index.php
Log:
Changement de version

Modified: phpcompta/trunk/html/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/index.php	2013-05-20 16:08:03 UTC (rev 5292)
+++ phpcompta/trunk/html/index.php	2013-05-20 16:15:14 UTC (rev 5293)
@@ -189,7 +189,7 @@
=20
 echo '
 <span style=3D"background-color:#879ed4;color:white;padding-left:4px;pad=
ding-right:4px;">
-version  6.5.SVNINFO - '.$my_domain.'
+version  6.6.SVNINFO - '.$my_domain.'
 </span>
 <BR>
 <BR>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 20 13:06:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UeTXT-0000hw-Aw
	for mharc-phpcompta-dev@gnu.org; Mon, 20 May 2013 13:06:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 20 May 2013 18:05:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.2568.1369069581.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5291 - in phpcompta/trunk: html include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 May 2013 17:06:21 -0000

Author: danydb
Date: 2013-05-20 18:04:59 +0200 (Mon, 20 May 2013)
New Revision: 5291

Modified:
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/template/dashboard.php
Log:
Task #0000846: Am?\195?\169lioration esth?\195?\169tique


Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-05-19 20:48:17 UTC (rev 5290)
+++ phpcompta/trunk/html/style.css	2013-05-20 16:04:59 UTC (rev 5291)
@@ -800,7 +800,7 @@
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:10;
+	font-size:10px;
 	color:white;
 	font-weight: bold;
=20
@@ -821,7 +821,7 @@
 	cursor:pointer;
 	margin:1 2 1 2;
         border-radius: 4px;
-	-moz-border-radius:4px;
+	moz-border-radius:4px;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2013-05-19 20:48:17 UTC (rev 52=
90)
+++ phpcompta/trunk/include/ac_common.php	2013-05-20 16:04:59 UTC (rev 52=
91)
@@ -1034,7 +1034,7 @@
 function display_dashboard_operation($p_array,$p_title,$p_div)
 {
 	?>
-<div id=3D"<?php echo $p_div;?>" class=3D"inner_box" style=3D"display:no=
ne;top:250;left:25%;width: 50%">
+<div id=3D"<?php echo $p_div;?>" class=3D"inner_box" style=3D"display:no=
ne;top:250;left:25%;width: 50%;height: 30%;overflow:auto;">
 	<?php
 	echo HtmlInput::title_box($p_title, $p_div, "hide");
 	?>

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-05-19 20:48:17 UT=
C (rev 5290)
+++ phpcompta/trunk/include/template/dashboard.php	2013-05-20 16:04:59 UT=
C (rev 5291)
@@ -77,7 +77,7 @@
 			</td>
 			<td>
 				<?php if (count($last_operation)>0): ?>
-				<A class=3D"mtitle" style=3D"text-decoration:underline"onclick=3D"di=
splay_detail('action_now_div')">
+				<A class=3D"mtitle" style=3D"text-decoration:underline;font-weight: =
bolder"onclick=3D"display_detail('action_now_div')">
 					<span class=3D"notice">
 					<?php echo count($last_operation) ?>
 					</span>
@@ -90,7 +90,7 @@
=20
 			<td >
 			<?php if (count($late_operation)>0): ?>
-				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('action_late_div')">
+				<A class=3D"mtitle"  style=3D"text-decoration:underline;;font-weight=
: bolder" onclick=3D"display_detail('action_late_div')">
 				<span class=3D"notice"><?php echo count($late_operation) ?></span>
 					&nbsp;d=C3=A9tail
 				</A>
@@ -106,7 +106,7 @@
 			</td>
 			<td >
 			<?php if (count($supplier_now)>0): ?>
-				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('supplier_now_div')">
+				<A class=3D"mtitle"  style=3D"text-decoration:underline;font-weight:=
 bolder" onclick=3D"display_detail('supplier_now_div')">
 				<span class=3D"notice"><?php echo count($supplier_now) ?></span>
 					&nbsp;d=C3=A9tail
 				</A>
@@ -116,7 +116,7 @@
 			</td>
 			<td >
 			<?php if (count($supplier_late)>0): ?>
-				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('supplier_late_div')">
+				<A class=3D"mtitle"  style=3D"text-decoration:underline;font-weight:=
 bolder" onclick=3D"display_detail('supplier_late_div')">
 				<span class=3D"notice"><?php echo count($supplier_late) ?></span>
 					&nbsp;d=C3=A9tail
 				</A>
@@ -131,7 +131,7 @@
 			</td>
 			<td>
 				<?php if (count($customer_now)>0): ?>
-				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('customer_now_div')">
+				<A class=3D"mtitle"  style=3D"text-decoration:underline;font-weight:=
 bolder" onclick=3D"display_detail('customer_now_div')">
 				<span class=3D"notice"><?php echo count($customer_now) ?></span>
 					&nbsp;d=C3=A9tail
 				</A>
@@ -141,7 +141,7 @@
 			</td>
 			<td>
 				<?php if (count($customer_late)>0): ?>
-				<A class=3D"mtitle"  style=3D"text-decoration:underline" onclick=3D"=
display_detail('customer_late_div')">
+				<A class=3D"mtitle"  style=3D"text-decoration:underline;font-weight:=
 bolder" onclick=3D"display_detail('customer_late_div')">
 				<span class=3D"notice"><?php echo count($customer_late) ?></span>
 					&nbsp;d=C3=A9tail
 				</A>
@@ -151,7 +151,7 @@
 			</td>
 		</tr>
 	</table>
-<div id=3D"action_late_div"  class=3D"inner_box" style=3D"display:none;m=
argin-left:25%;width: 50%">
+<div id=3D"action_late_div"  class=3D"inner_box" style=3D"display:none;m=
argin-left:25%;top:25%;width: 50%;height:50%;overflow: auto;">
 	<?php
 		echo HtmlInput::title_box("Action en retard", "action_late_div","hide"=
)
 	?>
@@ -182,7 +182,7 @@
 	<?php endif; ?>
 	</div>
=20
-	<div id=3D"action_now_div" class=3D"inner_box" style=3D"display:none;ma=
rgin-left:25%;width: 50%">
+	<div id=3D"action_now_div" class=3D"inner_box" style=3D"display:none;ma=
rgin-left:25%;width: 50%;top:25%;height:50%;overflow: auto;">
 	<?php
 		echo HtmlInput::title_box("Action pour aujourd'hui", "action_now_div",=
"hide")
 	?>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 20 16:25:12 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UeWds-0005CY-Qm
	for mharc-phpcompta-dev@gnu.org; Mon, 20 May 2013 16:25:12 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 20 May 2013 22:23:27 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.2693.1369081512.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5294 - in phpcompta/trunk: html include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 May 2013 20:25:11 -0000

Author: danydb
Date: 2013-05-20 22:23:26 +0200 (Mon, 20 May 2013)
New Revision: 5294

Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/include/ajax_mod_predf_op.php
   phpcompta/trunk/include/ajax_save_predf_op.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_pre_op_ach.php
   phpcompta/trunk/include/class_pre_op_ods.php
   phpcompta/trunk/include/class_pre_op_ven.php
   phpcompta/trunk/include/class_pre_operation.php
Log:
task #0000847: Correction des actions pr?\195?\169d?\195?\169finies

Modified: phpcompta/trunk/html/ajax_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_misc.php	2013-05-20 16:15:14 UTC (rev 5293)
+++ phpcompta/trunk/html/ajax_misc.php	2013-05-20 20:23:26 UTC (rev 5294)
@@ -64,6 +64,7 @@
 $g_user =3D new User($cn);
 $g_user->check(true);
 $g_user->check_dossier($gDossier, true);
+$g_parameter=3Dnew Own($cn);
 $html =3D var_export($_REQUEST, true);
=20
 switch ($op)

Modified: phpcompta/trunk/include/ajax_mod_predf_op.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_mod_predf_op.php	2013-05-20 16:15:14 UTC=
 (rev 5293)
+++ phpcompta/trunk/include/ajax_mod_predf_op.php	2013-05-20 20:23:26 UTC=
 (rev 5294)
@@ -25,16 +25,26 @@
  * \brief display a form to change the name of a predefined operation
  */
 ob_start();
+require_once 'class_pre_operation.php';
+$op=3Dnew Pre_Operation($cn,$_GET['id']);
+$array=3D$op->load();
 echo HtmlInput::anchor_close('mod_predf_op');
 echo h2info('Modification du nom');
+
 echo '
     <form method=3D"get" onsubmit=3D"save_predf_op(this);return false;">=
';
 $name =3D new IText('predf_name');
-$name->value =3D $cn->get_value('select od_name from op_predef where od_=
id=3D$1', array($_GET['id']));
+$name->value =3D $op->od_name;
 $name->size =3D 60;
 echo "Nom =3D" . $name->input();
 echo dossier::hidden() . HtmlInput::hidden('od_id', $_GET['id']);
 echo "<hr>";
+////////////////////////////////////////////////////////////////////////=
//////
+// Detail operation=20
+////////////////////////////////////////////////////////////////////////=
//////
+echo $op->display();
+
+
 echo HtmlInput::submit('save', 'Sauve');
 echo HtmlInput::button('close', 'Annuler', 'onclick=3D"removeDiv(\'mod_p=
redf_op\')"');
 echo '</form>';
@@ -43,7 +53,7 @@
 $html =3D ob_get_contents();
 ob_end_clean();
 $html =3D escape_xml($html);
-
+//echo $html;exit();
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>

Modified: phpcompta/trunk/include/ajax_save_predf_op.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_save_predf_op.php	2013-05-20 16:15:14 UT=
C (rev 5293)
+++ phpcompta/trunk/include/ajax_save_predf_op.php	2013-05-20 20:23:26 UT=
C (rev 5294)
@@ -31,3 +31,4 @@
 		  array($_GET['predf_name'],$_GET['od_id']));
     $cn->commit();
   }
+?>
\ No newline at end of file

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-05-20 16:15:14 UTC =
(rev 5293)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-05-20 20:23:26 UTC =
(rev 5294)
@@ -75,7 +75,7 @@
 		$this->jrn_def_id =3D &$this->id;
 		$this->db =3D $p_cn;
 		$this->row =3D null;
-		$this->nb =3D 10;
+		$this->nb =3D MAX_ARTICLE;
 	}
=20
 	function get_last_pj()
@@ -3595,3 +3595,4 @@
 	}
=20
 }
+?>
\ No newline at end of file

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-20 16:1=
5:14 UTC (rev 5293)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-20 20:2=
3:26 UTC (rev 5294)
@@ -40,7 +40,7 @@
 require_once('ac_common.php');
 require_once('class_itva_popup.php');
 require_once('class_acc_ledger_info.php');
-require_once('class_acc_ledger_fin.php');
+//require_once('class_acc_ledger_fin.php');
 require_once 'class_stock_goods.php';
=20
 /*!\brief Handle the ledger of purchase,

Modified: phpcompta/trunk/include/class_pre_op_ach.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ach.php	2013-05-20 16:15:14 UTC =
(rev 5293)
+++ phpcompta/trunk/include/class_pre_op_ach.php	2013-05-20 20:23:26 UTC =
(rev 5294)
@@ -24,16 +24,16 @@
  * \brief definition of the class pre_op_ach
  */
 require_once ('class_pre_operation.php');
-
+//require_once 'class_acc_ledger_purchase.php';
 /*----------------------------------------------------------------------=
 */
 /*!\brief concerns the predefined operation for ACH ledger
  */
 class Pre_op_ach extends Pre_operation_detail
 {
     var $op;
-    function __construct($cn)
+    function __construct($cn,$p_id=3D0)
     {
-        parent::__construct($cn);
+        parent::__construct($cn,$p_id);
=20
         $this->operation->od_direct=3D'f';
     }
@@ -143,4 +143,359 @@
     {
         $this->operation->od_id=3D$p_id;
     }
-}
+   function display($p_array)
+   {
+       global $g_parameter,$g_user;
+       extract($p_array);
+       $ledger=3Dnew Acc_Ledger_Purchase($this->db,$this->jrn_def_id);
+        if ( $p_array !=3D null ) extract($p_array);
+
+        $flag_tva=3D$g_parameter->MY_TVA_USE;
+        /* Add button */
+        $f_add_button=3Dnew IButton('add_card');
+        $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche');
+		$f_add_button->tabindex=3D-1;
+        $f_add_button->set_attribute('ipopup','ipop_newcard');
+        $f_add_button->set_attribute('jrn',$this->jrn_def_id);
+        $f_add_button->javascript=3D" this.jrn=3D\$('p_jrn').value;selec=
t_card_type(this);";
+
+        $f_add_button2=3Dnew IButton('add_card2');
+		$f_add_button2->tabindex=3D-1;
+        $f_add_button2->label=3D_('Cr=C3=A9er une nouvelle fiche');
+        $f_add_button2->set_attribute('ipopup','ipop_newcard');
+        $f_add_button2->set_attribute('filter',$ledger->get_all_fiche_de=
f ());
+        //    $f_add_button2->set_attribute('jrn',$ledger->id);
+        $f_add_button2->javascript=3D"  this.jrn=3D\$('p_jrn').value;sel=
ect_card_type(this);";
+		$str_add_button=3D"";
+		$str_add_button2=3D"";
+		if ($g_user->check_action(FICADD)=3D=3D1)
+		{
+			$str_add_button=3D$f_add_button->input();
+			$str_add_button2=3D$f_add_button2->input();
+		}
+        // The first day of the periode
+        $oPeriode=3Dnew Periode($this->db);
+        list ($l_date_start,$l_date_end)=3D$oPeriode->get_date_limit($g_=
user->get_periode());
+        if (  $g_parameter->MY_DATE_SUGGEST=3D=3D'Y' )
+            $op_date=3D( ! isset($e_date) ) ?$l_date_start:$e_date;
+        else
+            $op_date=3D( ! isset($e_date) ) ?'':$e_date;
+
+        $e_ech=3D(isset($e_ech))?$e_ech:"";
+        $e_comm=3D(isset($e_comm))?$e_comm:"";
+
+        $r=3D"";
+        $r.=3Ddossier::hidden();
+        $f_legend=3D_("En-t=C3=AAte facture fournisseur");
+        $f_legend_detail=3D_("D=C3=A9tail articles achet=C3=A9");
+
+        //  Date
+        //--
+        $Date=3Dnew IDate();
+        $Date->setReadOnly(false);
+        $Date->table=3D1;
+        $Date->tabindex=3D1;
+        $f_date=3D$Date->input("e_date",$op_date);
+        // Payment limit
+        //--
+        $Echeance=3Dnew IDate();
+        $Echeance->setReadOnly(false);
+        $Echeance->tabindex=3D2;
+        $label=3DHtmlInput::infobulle(4);
+        $f_echeance=3D$Echeance->input('e_ech',$e_ech,'Ech=C3=A9ance'.$l=
abel);
+        $f_periode=3D"";
+        if ($this->check_periode() =3D=3D true)
+        {
+            // Periode
+            //--
+            $l_user_per=3D$g_user->get_periode();
+            $def=3D(isset($periode))?$periode:$l_user_per;
+
+            $period=3Dnew IPeriod("period");
+            $period->user=3D$g_user;
+            $period->cn=3D$ledger->db;
+            $period->value=3D$def;
+            $period->type=3DOPEN;
+            try
+            {
+                $l_form_per=3D$period->input();
+            }
+            catch (Exception $e)
+            {
+                if ($e->getCode() =3D=3D 1 )
+                {
+                    echo _("Aucune p=C3=A9riode ouverte");
+                    exit();
+                }
+            }
+
+            $r.=3D"<td>";
+            $label=3DHtmlInput::infobulle(3);
+            $f_periode=3D_("P=C3=A9riode comptable")." $label ".$l_form_=
per;
+        }
+        // Ledger (p_jrn)
+        //--
+        /* if we suggest the next pj, then we need a javascript */
+        $add_js=3D"";
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
+        {
+            $add_js=3D"update_pj();";
+        }
+		if ($g_parameter->MY_DATE_SUGGEST =3D=3D 'Y')
+		{
+			$add_js.=3D'get_last_date();';
+		}
+		$add_js.=3D'update_name();';
+		$add_js.=3D'update_pay_method();';
+		$add_js.=3D'update_row("sold_item");';
+
+		$wLedger=3D$ledger->select_ledger('ACH',2);
+        if ($wLedger =3D=3D null) exit (_('Pas de journal disponible'));
+        $wLedger->javascript=3D"onChange=3D'update_predef(\"ach\",\"f\")=
;$add_js'";
+        $label=3D" Journal ".HtmlInput::infobulle(2) ;
+
+        $f_jrn=3D$wLedger->input();
+
+        // Comment
+        //--
+        $Commentaire=3Dnew IText();
+        $Commentaire->table=3D0;
+        $Commentaire->setReadOnly(false);
+        $Commentaire->size=3D60;
+        $Commentaire->tabindex=3D3;
+        $label=3DHtmlInput::infobulle(1) ;
+        $f_desc=3D$label.$Commentaire->input("e_comm",h($e_comm));
+
+        // PJ
+        //--
+        /* suggest PJ ? */
+        $default_pj=3D'';
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
+        {
+            $default_pj=3D$ledger->guess_pj();
+        }
+
+        $pj=3Dnew IText();
+        $pj->value=3D(isset($e_pj))?$e_pj:$default_pj;
+
+
+        $pj->table=3D0;
+        $pj->name=3D"e_pj";
+        $pj->size=3D10;
+        $pj->readonly=3Dfalse;
+
+        $f_pj=3D$pj->input().HtmlInput::hidden('e_pj_suggest',$default_p=
j);
+
+        // Display the customer
+        //--
+        $fiche=3D'cred';
+
+        // Save old value and set a new one
+        //--
+        $e_client=3D( isset ($e_client) )?$e_client:"";
+        $e_client_label=3D"&nbsp;";//str_pad("",100,".");
+
+
+        // retrieve e_client_label
+        //--
+
+        if ( strlen(trim($e_client)) !=3D  0)
+        {
+            $fClient=3Dnew Fiche($ledger->db);
+            $fClient->get_by_qcode($e_client);
+            $e_client_label=3D$fClient->strAttribut(ATTR_DEF_NAME).' '.
+                            ' Adresse : '.$fClient->strAttribut(ATTR_DEF=
_ADRESS).' '.
+                            $fClient->strAttribut(ATTR_DEF_CP).' '.
+                            $fClient->strAttribut(ATTR_DEF_CITY).' ';
+
+
+        }
+
+        $W1=3Dnew ICard();
+        $W1->label=3D_("Fournisseur ").HtmlInput::infobulle(0) ;
+        $W1->name=3D"e_client";
+        $W1->tabindex=3D3;
+        $W1->value=3D$e_client;
+        $W1->table=3D0;
+        $W1->set_dblclick("fill_ipopcard(this);");
+        $W1->set_attribute('ipopup','ipopcard');
+
+        // name of the field to update with the name of the card
+        $W1->set_attribute('label','e_client_label');
+        // name of the field to update with the name of the card
+        $W1->set_attribute('typecard','cred');
+
+        // Add the callback function to filter the card on the jrn
+        $W1->set_callback('filter_card');
+        $W1->set_function('fill_data');
+        $W1->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\=
');" ',
+                                $W1->name);
+        $f_client_qcode=3D$W1->input();
+        $client_label=3Dnew ISpan();
+        $client_label->table=3D0;
+        $f_client=3D$client_label->input("e_client_label",$e_client_labe=
l);
+        $f_client_bt=3D$W1->search();
+
+
+        // Record the current number of article
+        $Hid=3Dnew IHidden();
+        $p_article=3D ( isset ($nb_item))?$nb_item:MAX_ARTICLE;
+        $r.=3D$Hid->input("nb_item",$p_article);
+        $e_comment=3D(isset($e_comment))?$e_comment:"";
+        $max=3D($p_article < MAX_ARTICLE)?MAX_ARTICLE:$p_article;
+
+        // For each article
+        //--
+        for ($i=3D0;$i< $max ;$i++)
+        {
+            // Code id, price & vat code
+            //--
+            $march=3D(isset(${"e_march$i"}))?${"e_march$i"}:""          =
         ;
+            $march_price=3D(isset(${"e_march".$i."_price"}))?${"e_march"=
.$i."_price"}:""
+                         ;
+            /* use vat */
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
+            {
+                $march_tva_id=3D(isset(${"e_march$i"."_tva_id"}))?${"e_m=
arch$i"."_tva_id"}:"";
+                $march_tva_amount=3D(isset(${"e_march$i"."_tva_amount"})=
)?${"e_march$i"."_tva_amount"}:"";
+            }
+
+
+
+            $march_label=3D(isset(${"e_march".$i."_label"}))?${"e_march"=
.$i."_label"}:"";
+            // retrieve the tva label and name
+            //--
+            if ( strlen(trim($march))!=3D0  && strlen(trim($march_label)=
)=3D=3D0 )
+            {
+                $fMarch=3Dnew Fiche($ledger->db);
+                $fMarch->get_by_qcode($march);
+                $march_label=3D$fMarch->strAttribut(ATTR_DEF_NAME);
+                /* vat use */
+                if ( ! isset($march_tva_id) && $g_parameter->MY_TVA_USE=3D=
=3D'Y' )
+                    $march_tva_id=3D$fMarch->strAttribut(ATTR_DEF_TVA);
+            }
+            // Show input
+            //--
+            $W1=3Dnew ICard();
+            $W1->label=3D"";
+            $W1->name=3D"e_march".$i;
+            $W1->value=3D$march;
+            $W1->table=3D1;
+            $W1->set_dblclick("fill_ipopcard(this);");
+            $W1->set_attribute('ipopup','ipopcard');
+
+            $W1->set_attribute('typecard','deb');
+
+            // name of the field to update with the name of the card
+            $W1->set_attribute('label','e_march'.$i.'_label');
+            // name of the field with the price
+            $W1->set_attribute('purchase','e_march'.$i.'_price'); /* aut=
ocomplete */
+            $W1->set_attribute('price','e_march'.$i.'_price');    /* via=
 search */
+
+            // name of the field with the TVA_ID
+            $W1->set_attribute('tvaid','e_march'.$i.'_tva_id');
+            // Add the callback function to filter the card on the jrn
+            $W1->set_callback('filter_card');
+            $W1->set_function('fill_data');
+            $W1->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\=
'%s\');" ',
+                                    $W1->name);
+            $W1->readonly=3Dfalse;
+            $array[$i]['quick_code']=3D$W1->input();
+            $array[$i]['bt']=3D$W1->search();
+
+            $array[$i]['hidden']=3D'';
+            // For computing we need some hidden field for holding the v=
alue
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
+            {
+                $array[$i]['hidden'].=3DHtmlInput::hidden('tva_march'.$i=
,0);
+            }
+
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
+                $tvac=3Dnew INum('tvac_march'.$i);
+            else
+                $tvac=3Dnew IHidden('tvac_march'.$i);
+
+            $tvac->readOnly=3D1;
+            $tvac->value=3D0;
+            $array[$i]['tvac']=3D$tvac->input();
+
+            $htva=3Dnew INum('htva_march'.$i);
+            $htva->readOnly=3D1;
+
+            $htva->value=3D0;
+            $array[$i]['htva']=3D$htva->input();
+
+            if ( $g_parameter->MY_UPDLAB =3D=3D 'Y')
+            {
+                $Span=3Dnew IText("e_march".$i."_label");
+                $Span->css_size=3D"100%";
+            } else
+            {
+                $Span=3Dnew ISpan("e_march".$i."_label");
+            }
+            $Span->value=3D$march_label;
+            $Span->setReadOnly(false);
+            // card's name, price
+            //--
+            $array[$i]['denom']=3D$Span->input("e_march".$i."_label",$ma=
rch_label);
+            // price
+            $Price=3Dnew INum();
+            $Price->setReadOnly(false);
+            $Price->size=3D9;
+            $Price->javascript=3D"onBlur=3D'format_number(this);clean_tv=
a($i);compute_ledger($i)'";
+            $array[$i]['pu']=3D$Price->input("e_march".$i."_price",$marc=
h_price);
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
+            {
+
+                // vat label
+                //--
+                $Tva=3Dnew ITva_Popup($ledger->db);
+                $Tva->js=3D"onblur=3D\"format_number(this);onChange=3Dcl=
ean_tva($i);compute_ledger($i)\"";
+                $Tva->in_table=3Dtrue;
+                $Tva->set_attribute('compute',$i);
+                $Tva->value=3D$march_tva_id;
+                $array[$i]['tva']=3D$Tva->input("e_march$i"."_tva_id");
+
+                // Tva_amount
+
+                // price
+                $Tva_amount=3Dnew INum();
+                $Tva_amount->setReadOnly(false);
+                $Tva_amount->size=3D9;
+                $Tva_amount->javascript=3D"onBlur=3D'format_number(this)=
;compute_ledger($i)'";
+                $array[$i]['amount_tva']=3D$Tva_amount->input("e_march".=
$i."_tva_amount",$march_tva_amount);
+            }
+            // quantity
+            //--
+            $quant=3D(isset(${"e_quant$i"}))?${"e_quant$i"}:"1"
+                   ;
+            $Quantity=3Dnew INum();
+            $Quantity->setReadOnly(false);
+            $Quantity->size=3D9;
+            $Quantity->javascript=3D"onChange=3Dformat_number(this);clea=
n_tva($i);compute_ledger($i)";
+            $array[$i]['quantity']=3D$Quantity->input("e_quant".$i,$quan=
t);
+
+        }
+        $f_type=3D_('Fournisseur');
+
+        ob_start();
+        require_once('template/form_ledger_detail.php');
+        $r.=3Dob_get_contents();
+        ob_end_clean();
+
+        // Set correctly the REQUEST param for jrn_type
+        $r.=3D HtmlInput::hidden('jrn_type','ACH');
+        $r.=3D HtmlInput::button('add_item',_('Ajout article'),      ' o=
nClick=3D"ledger_add_row()"');
+
+
+
+        /* if we suggest the pj n# the run the script */
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
+        {
+            $r.=3D'<script> update_pj();</script>';
+        }
+		// set focus on date
+		$r.=3D create_script("$('".$Date->id."').focus()");
+        return $r;
+   }
+}
\ No newline at end of file

Modified: phpcompta/trunk/include/class_pre_op_ods.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ods.php	2013-05-20 16:15:14 UTC =
(rev 5293)
+++ phpcompta/trunk/include/class_pre_op_ods.php	2013-05-20 20:23:26 UTC =
(rev 5294)
@@ -31,9 +31,9 @@
 class Pre_op_ods extends Pre_operation_detail
 {
     var $op;
-    function __construct($cn)
+    function __construct($cn,$p_id=3D0)
     {
-        parent::__construct($cn);
+        parent::__construct($cn,$p_id);
         $this->operation->od_direct=3D'f';
     }
=20

Modified: phpcompta/trunk/include/class_pre_op_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ven.php	2013-05-20 16:15:14 UTC =
(rev 5293)
+++ phpcompta/trunk/include/class_pre_op_ven.php	2013-05-20 20:23:26 UTC =
(rev 5294)
@@ -31,9 +31,9 @@
 class Pre_op_ven extends Pre_operation_detail
 {
     var $op;
-    function __construct($cn)
+    function __construct($cn,$p_id=3D0)
     {
-        parent::__construct($cn);
+        parent::__construct($cn,$p_id);
         $this->operation->od_direct=3D'f';
     }
=20

Modified: phpcompta/trunk/include/class_pre_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_operation.php	2013-05-20 16:15:14 U=
TC (rev 5293)
+++ phpcompta/trunk/include/class_pre_operation.php	2013-05-20 20:23:26 U=
TC (rev 5294)
@@ -30,6 +30,9 @@
  */
 require_once("class_iselect.php");
 require_once("class_ihidden.php");
+require_once 'class_pre_op_ach.php';
+require_once 'class_pre_op_ven.php';
+require_once 'class_pre_op_ods.php';
 class Pre_operation
 {
     var $db;						/*!< $db database connection */
@@ -38,10 +41,11 @@
     var $jrn_type;					/*!< $jrn_type */
     var $name;						/*!< $name name of the predef. operation */
=20
-    function Pre_operation($cn)
+    function Pre_operation($cn,$p_id=3D0)
     {
         $this->db=3D$cn;
         $this->od_direct=3D'false';
+        $this->od_id=3D$p_id;
     }
     /*!\brief fill the object with the $_POST variable */
     function get_post()
@@ -108,7 +112,24 @@
              " order by od_name";
         $res=3D$this->db->exec_sql($sql);
         $array=3DDatabase::fetch_all($res);
-
+        foreach (array('jrn_def_id','od_name','od_item','od_jrn_type') a=
s $field) {
+            $this->$field=3D$array[0][$field];
+        }
+        switch ($this->od_jrn_type) {
+            case 'ACH':
+                $this->detail=3Dnew Pre_op_ach($this->db);
+                break;
+            case 'VEN':
+                $this->detail=3Dnew Pre_Op_ven($this->db);
+                break;
+            case 'ODS':
+                $this->detail=3Dnew Pre_op_ods($this->db);
+            default:
+                throw new Exception('Load PreOperatoin failed');
+          }
+        $this->detail->set_od_id($this->od_id);
+        $this->adetail=3D$this->detail->load();
+       =20
         return $array;
     }
     function compute_array()
@@ -169,6 +190,17 @@
     {
         $this->p_jrn=3D$p_jrn;
     }
+  =20
+    /**
+     *=20
+     * @brief display the detail of predefined operation, normally every=
thing=20
+     * is loaded
+     */
+    function display()=20
+    {
+        $array=3D$this->detail->compute_array();
+        $this->detail->display($array);
+    }
 }
=20
 /*!\brief mother of the pre_op_XXX, it contains only one data : an
@@ -178,7 +210,7 @@
 class Pre_operation_detail
 {
     var $operation;
-    function __construct($p_cn)
+    function __construct($p_cn,$p_id=3D0)
     {
         $this->db=3D$p_cn;
         $this->operation=3Dnew Pre_operation($this->db);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Mon May 20 18:38:12 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UeYia-0000g1-2m
	for mharc-phpcompta-dev@gnu.org; Mon, 20 May 2013 18:38:12 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 21 May 2013 00:36:25 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.2770.1369089491.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5295 - in phpcompta/trunk: html/js include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 May 2013 22:38:10 -0000

Author: danydb
Date: 2013-05-21 00:36:25 +0200 (Tue, 21 May 2013)
New Revision: 5295

Added:
   phpcompta/trunk/include/template/predf_ledger_detail.php
Modified:
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/ajax_mod_predf_op.php
   phpcompta/trunk/include/ajax_save_predf_op.php
   phpcompta/trunk/include/class_pre_op_ach.php
   phpcompta/trunk/include/class_pre_op_advanced.php
   phpcompta/trunk/include/class_pre_op_ven.php
   phpcompta/trunk/include/class_pre_operation.php
   phpcompta/trunk/include/preod.inc.php
Log:
task #0000847: Correction des actions pr?\195?\169d?\195?\169finies

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-05-20 20:23:26 UTC (rev 5294)
+++ phpcompta/trunk/html/js/scripts.js	2013-05-20 22:36:25 UTC (rev 5295)
@@ -1038,8 +1038,8 @@
 {
     var target=3D"mod_predf_op";
 	removeDiv(target);
-    var sx=3DposY;
-    var sy=3DposX;
+    var sx=3D'20%';
+    var sy=3D'20%';
     var str_style=3D"top:"+sx+";left:"+sy;
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
@@ -1061,14 +1061,15 @@
=20
 function save_predf_op(obj)
 {
+    waiting_box();
     var querystring=3D$(obj).serialize()+'&op=3Dsave_predf';
     // Create a ajax request to get all the person
     var action =3D new Ajax.Request ('ajax_misc.php',
 				   {
-				       method:			 'get',
+				       method:			 'post',
 				       parameters:			 querystring,
 				       onFailure:			 null,
-				       onSuccess:			 refresh_window
+				       onSuccess:			refresh_window
 				   }
                                   );
=20

Modified: phpcompta/trunk/include/ajax_mod_predf_op.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_mod_predf_op.php	2013-05-20 20:23:26 UTC=
 (rev 5294)
+++ phpcompta/trunk/include/ajax_mod_predf_op.php	2013-05-20 22:36:25 UTC=
 (rev 5295)
@@ -32,8 +32,8 @@
 echo h2info('Modification du nom');
=20
 echo '
-    <form method=3D"get" onsubmit=3D"save_predf_op(this);return false;">=
';
-$name =3D new IText('predf_name');
+    <form method=3D"POST" onsubmit=3D"save_predf_op(this);return false;"=
>';
+$name =3D new IText('opd_name');
 $name->value =3D $op->od_name;
 $name->size =3D 60;
 echo "Nom =3D" . $name->input();

Modified: phpcompta/trunk/include/ajax_save_predf_op.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_save_predf_op.php	2013-05-20 20:23:26 UT=
C (rev 5294)
+++ phpcompta/trunk/include/ajax_save_predf_op.php	2013-05-20 22:36:25 UT=
C (rev 5295)
@@ -24,11 +24,27 @@
  * \brief save the new predefined operation=20
  * included from ajax_misc
  */
-
-if ( trim($_GET['predf_name']) !=3D '')
+if ($g_user->check_module('PREDOP') =3D=3D 0) exit();
+if ( trim($_POST['opd_name']) !=3D '')
   {
-    $cn->exec_sql('update op_predef set od_name =3D$1 where od_id=3D$2',
-		  array($_GET['predf_name'],$_GET['od_id']));
+    $cn->exec_sql('delete from op_predef where od_id=3D$1',
+		  array($_POST['od_id']));
+   =20
+    var_dump($_POST);
+    $cn->exec_sql("delete from op_predef_detail where od_id=3D$1",array(=
$_POST['od_id']));
+    switch ($_POST['jrn_type']) {
+        case 'ACH':
+        $operation=3Dnew Pre_op_ach($cn);
+        break;
+        case 'VEN':
+        $operation=3Dnew Pre_op_ven($cn);
+        break;
+        case 'ODS':
+        $operation=3Dnew Pre_Op_Advanced($cn);
+        break;
+    }
+    $operation->get_post();
+    $operation->save();
     $cn->commit();
   }
 ?>
\ No newline at end of file

Modified: phpcompta/trunk/include/class_pre_op_ach.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ach.php	2013-05-20 20:23:26 UTC =
(rev 5294)
+++ phpcompta/trunk/include/class_pre_op_ach.php	2013-05-20 22:36:25 UTC =
(rev 5295)
@@ -54,6 +54,7 @@
=20
         }
     }
+   =20
     /*!
      * \brief save the detail and op in the database
      *
@@ -145,6 +146,7 @@
     }
    function display($p_array)
    {
+       require_once 'class_acc_ledger_purchase.php';
        global $g_parameter,$g_user;
        extract($p_array);
        $ledger=3Dnew Acc_Ledger_Purchase($this->db,$this->jrn_def_id);
@@ -166,126 +168,23 @@
         $f_add_button2->set_attribute('filter',$ledger->get_all_fiche_de=
f ());
         //    $f_add_button2->set_attribute('jrn',$ledger->id);
         $f_add_button2->javascript=3D"  this.jrn=3D\$('p_jrn').value;sel=
ect_card_type(this);";
-		$str_add_button=3D"";
-		$str_add_button2=3D"";
-		if ($g_user->check_action(FICADD)=3D=3D1)
-		{
-			$str_add_button=3D$f_add_button->input();
-			$str_add_button2=3D$f_add_button2->input();
-		}
-        // The first day of the periode
-        $oPeriode=3Dnew Periode($this->db);
-        list ($l_date_start,$l_date_end)=3D$oPeriode->get_date_limit($g_=
user->get_periode());
-        if (  $g_parameter->MY_DATE_SUGGEST=3D=3D'Y' )
-            $op_date=3D( ! isset($e_date) ) ?$l_date_start:$e_date;
-        else
-            $op_date=3D( ! isset($e_date) ) ?'':$e_date;
+        $str_add_button=3D"";
+        $str_add_button2=3D"";
+        if ($g_user->check_action(FICADD)=3D=3D1)
+        {
+                $str_add_button=3D$f_add_button->input();
+                $str_add_button2=3D$f_add_button2->input();
+        }
=20
-        $e_ech=3D(isset($e_ech))?$e_ech:"";
-        $e_comm=3D(isset($e_comm))?$e_comm:"";
-
         $r=3D"";
         $r.=3Ddossier::hidden();
         $f_legend=3D_("En-t=C3=AAte facture fournisseur");
         $f_legend_detail=3D_("D=C3=A9tail articles achet=C3=A9");
-
-        //  Date
-        //--
-        $Date=3Dnew IDate();
-        $Date->setReadOnly(false);
-        $Date->table=3D1;
-        $Date->tabindex=3D1;
-        $f_date=3D$Date->input("e_date",$op_date);
-        // Payment limit
-        //--
-        $Echeance=3Dnew IDate();
-        $Echeance->setReadOnly(false);
-        $Echeance->tabindex=3D2;
-        $label=3DHtmlInput::infobulle(4);
-        $f_echeance=3D$Echeance->input('e_ech',$e_ech,'Ech=C3=A9ance'.$l=
abel);
-        $f_periode=3D"";
-        if ($this->check_periode() =3D=3D true)
-        {
-            // Periode
-            //--
-            $l_user_per=3D$g_user->get_periode();
-            $def=3D(isset($periode))?$periode:$l_user_per;
-
-            $period=3Dnew IPeriod("period");
-            $period->user=3D$g_user;
-            $period->cn=3D$ledger->db;
-            $period->value=3D$def;
-            $period->type=3DOPEN;
-            try
-            {
-                $l_form_per=3D$period->input();
-            }
-            catch (Exception $e)
-            {
-                if ($e->getCode() =3D=3D 1 )
-                {
-                    echo _("Aucune p=C3=A9riode ouverte");
-                    exit();
-                }
-            }
-
-            $r.=3D"<td>";
-            $label=3DHtmlInput::infobulle(3);
-            $f_periode=3D_("P=C3=A9riode comptable")." $label ".$l_form_=
per;
-        }
         // Ledger (p_jrn)
         //--
         /* if we suggest the next pj, then we need a javascript */
         $add_js=3D"";
-        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
-        {
-            $add_js=3D"update_pj();";
-        }
-		if ($g_parameter->MY_DATE_SUGGEST =3D=3D 'Y')
-		{
-			$add_js.=3D'get_last_date();';
-		}
-		$add_js.=3D'update_name();';
-		$add_js.=3D'update_pay_method();';
-		$add_js.=3D'update_row("sold_item");';
=20
-		$wLedger=3D$ledger->select_ledger('ACH',2);
-        if ($wLedger =3D=3D null) exit (_('Pas de journal disponible'));
-        $wLedger->javascript=3D"onChange=3D'update_predef(\"ach\",\"f\")=
;$add_js'";
-        $label=3D" Journal ".HtmlInput::infobulle(2) ;
-
-        $f_jrn=3D$wLedger->input();
-
-        // Comment
-        //--
-        $Commentaire=3Dnew IText();
-        $Commentaire->table=3D0;
-        $Commentaire->setReadOnly(false);
-        $Commentaire->size=3D60;
-        $Commentaire->tabindex=3D3;
-        $label=3DHtmlInput::infobulle(1) ;
-        $f_desc=3D$label.$Commentaire->input("e_comm",h($e_comm));
-
-        // PJ
-        //--
-        /* suggest PJ ? */
-        $default_pj=3D'';
-        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
-        {
-            $default_pj=3D$ledger->guess_pj();
-        }
-
-        $pj=3Dnew IText();
-        $pj->value=3D(isset($e_pj))?$e_pj:$default_pj;
-
-
-        $pj->table=3D0;
-        $pj->name=3D"e_pj";
-        $pj->size=3D10;
-        $pj->readonly=3Dfalse;
-
-        $f_pj=3D$pj->input().HtmlInput::hidden('e_pj_suggest',$default_p=
j);
-
         // Display the customer
         //--
         $fiche=3D'cred';
@@ -479,7 +378,7 @@
         $f_type=3D_('Fournisseur');
=20
         ob_start();
-        require_once('template/form_ledger_detail.php');
+        require_once('template/predf_ledger_detail.php');
         $r.=3Dob_get_contents();
         ob_end_clean();
=20
@@ -487,15 +386,6 @@
         $r.=3D HtmlInput::hidden('jrn_type','ACH');
         $r.=3D HtmlInput::button('add_item',_('Ajout article'),      ' o=
nClick=3D"ledger_add_row()"');
=20
-
-
-        /* if we suggest the pj n# the run the script */
-        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
-        {
-            $r.=3D'<script> update_pj();</script>';
-        }
-		// set focus on date
-		$r.=3D create_script("$('".$Date->id."').focus()");
         return $r;
    }
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/class_pre_op_advanced.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_advanced.php	2013-05-20 20:23:26=
 UTC (rev 5294)
+++ phpcompta/trunk/include/class_pre_op_advanced.php	2013-05-20 22:36:25=
 UTC (rev 5295)
@@ -142,4 +142,136 @@
     {
         $this->operation->od_id=3D$p_id;
     }
+       function display($p_array)
+    {
+        global $g_parameter, $g_user;
+        require_once 'class_acc_ledger.php';
+        $legder=3Dnew Acc_Ledger($this->db,$this->jrn_def_id);
+        $legder->nb=3D$legder->get_min_row();
+
+        if ($p_array !=3D null)
+                extract($p_array);
+        $add_js =3D "";
+      =20
+        $ret =3D "";
+        if ($g_user->check_action(FICADD) =3D=3D 1)
+        {
+                /* Add button */
+                $f_add_button =3D new IButton('add_card');
+                $f_add_button->label =3D _('Cr=C3=A9er une nouvelle fich=
e');
+                $f_add_button->set_attribute('ipopup', 'ipop_newcard');
+                $f_add_button->set_attribute('jrn', $legder->id);
+                $f_add_button->javascript =3D " this.jrn=3D\$('p_jrn').v=
alue;select_card_type(this);";
+                $f_add_button->input();
+        }
+      =20
+        $nb_row =3D (isset($nb_item) ) ? $nb_item : $legder->nb;
+
+        $ret.=3DHtmlInput::hidden('nb_item', $nb_row);
+        $ret.=3DHtmlInput::hidden('p_jrn', $this->jrn_def_id);
+        $ret.=3Ddossier::hidden();
+       =20
+        $ret.=3Ddossier::hidden();
+
+        $ret.=3DHtmlInput::hidden('jrn_type', $legder->get_type());
+        $info =3D HtmlInput::infobulle(0);
+        $info_poste =3D HtmlInput::infobulle(9);
+        if ($g_user->check_action(FICADD) =3D=3D 1)
+                $ret.=3D$f_add_button->input();
+        $ret.=3D'<table id=3D"quick_item" style=3D"width:100%">';
+        $ret.=3D'<tr>' .
+                        '<th style=3D"text-align:left">Quickcode' . $inf=
o . '</th>' .
+                        '<th style=3D"text-align:left">' . _('Poste') . =
$info_poste . '</th>' .
+                        '<th style=3D"text-align:left">' . _('Libell=C3=A9=
') . '</th>' .
+                        '<th style=3D"text-align:left">' . _('Montant') =
. '</th>' .
+                        '<th style=3D"text-align:left">' . _('D=C3=A9bit=
') . '</th>' .
+                        '</tr>';
+
+
+        for ($i =3D 0; $i < $nb_row; $i++)
+        {
+                // Quick Code
+                $quick_code =3D new ICard('qc_' . $i);
+                $quick_code->set_dblclick("fill_ipopcard(this);");
+                $quick_code->set_attribute('ipopup', 'ipopcard');
+
+                // name of the field to update with the name of the card
+                $quick_code->set_attribute('label', "ld" . $i);
+                $quick_code->set_attribute('jrn', $legder->id);
+
+                // name of the field to update with the name of the card
+                $quick_code->set_attribute('typecard', 'filter');
+
+                // Add the callback function to filter the card on the j=
rn
+                $quick_code->set_callback('filter_card');
+                $quick_code->set_function('fill_data');
+                $quick_code->javascript =3D sprintf(' onchange=3D"fill_d=
ata_onchange(\'%s\');" ', $quick_code->name);
+
+                $quick_code->jrn =3D $legder->id;
+                $quick_code->value =3D (isset(${'qc_' . $i})) ? ${'qc_' =
. $i} : "";
+
+                $label =3D '';
+                if ($quick_code->value !=3D '')
+                {
+                        $Fiche =3D new Fiche($legder->db);
+                        $Fiche->get_by_qcode($quick_code->value);
+                        $label =3D $Fiche->strAttribut(ATTR_DEF_NAME);
+                }
+
+
+                // Account
+                $poste =3D new IPoste();
+                $poste->name =3D 'poste' . $i;
+                $poste->set_attribute('jrn', $legder->id);
+                $poste->set_attribute('ipopup', 'ipop_account');
+                $poste->set_attribute('label', 'ld' . $i);
+                $poste->set_attribute('account', 'poste' . $i);
+                $poste->set_attribute('dossier', Dossier::id());
+
+                $poste->value =3D (isset(${'poste' . $i})) ? ${"poste" .=
 $i} : ''
+                ;
+                $poste->dbl_click_history();
+
+
+                if ($poste->value !=3D '')
+                {
+                        $Poste =3D new Acc_Account($legder->db);
+                        $Poste->set_parameter('value', $poste->value);
+                        $label =3D $Poste->get_lib();
+                }
+
+                // Description of the line
+                $line_desc =3D new IText();
+                $line_desc->name =3D 'ld' . $i;
+                $line_desc->size =3D 30;
+                $line_desc->value =3D (isset(${"ld" . $i})) ? ${"ld" . $=
i} :
+                                $label;
+
+                // Amount
+                $amount =3D new INum();
+                $amount->size =3D 10;
+                $amount->name =3D 'amount' . $i;
+                $amount->value =3D (isset(${'amount' . $i})) ? ${"amount=
" . $i} : ''
+                ;
+                $amount->javascript =3D ' onChange=3D"format_number(this=
);checkTotalDirect()"';
+                // D/C
+                $deb =3D new ICheckBox();
+                $deb->name =3D 'ck' . $i;
+                $deb->selected =3D (isset(${'ck' . $i})) ? true : false;
+                $deb->javascript =3D ' onChange=3D"checkTotalDirect()"';
+
+                $ret.=3D'<tr>';
+                $ret.=3D'<td>' . $quick_code->input() . $quick_code->sea=
rch() . '</td>';
+                $ret.=3D'<td>' . $poste->input() .
+                                '<script> document.getElementById(\'post=
e' . $i . '\').onblur=3Dfunction(){ if (trim(this.value) !=3D\'\') {docum=
ent.getElementById(\'qc_' . $i . '\').value=3D"";}}</script>' .
+                                '</td>';
+                $ret.=3D'<td>' . $line_desc->input() . '</td>';
+                $ret.=3D'<td>' . $amount->input() . '</td>';
+                $ret.=3D'<td>' . $deb->input() . '</td>';
+                $ret.=3D'</tr>';
+                // If readonly =3D=3D 1 then show CA
+        }
+        $ret.=3D'</table>';
+        return $ret;
+    }
 }

Modified: phpcompta/trunk/include/class_pre_op_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ven.php	2013-05-20 20:23:26 UTC =
(rev 5294)
+++ phpcompta/trunk/include/class_pre_op_ven.php	2013-05-20 22:36:25 UTC =
(rev 5295)
@@ -140,4 +140,247 @@
     {
         $this->operation->od_id=3D$p_id;
     }
+    function display($p_array)
+    {
+        global $g_parameter,$g_user;
+        if ( $p_array !=3D null ) extract($p_array);
+        require_once 'class_acc_ledger_sold.php';
+        $ledger=3Dnew Acc_Ledger_Sold($this->db,$this->jrn_def_id);
+        =20
+        $flag_tva=3D$g_parameter->MY_TVA_USE;
+        /* Add button */
+        $f_add_button=3Dnew IButton('add_card');
+		$f_add_button->tabindex=3D-1;
+        $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche');
+        $f_add_button->set_attribute('ipopup','ipop_newcard');
+        $f_add_button->set_attribute('jrn',$ledger->id);
+        $f_add_button->javascript=3D"this.jrn=3D\$('p_jrn').value; selec=
t_card_type(this);";
+
+        $f_add_button2=3Dnew IButton('add_card2');
+		$f_add_button2->tabindex=3D-1;
+        $f_add_button2->label=3D_('Cr=C3=A9er une nouvelle fiche');
+        $f_add_button2->set_attribute('ipopup','ipop_newcard');
+        $f_add_button2->set_attribute('filter',$ledger->get_all_fiche_de=
f ());
+        //    $f_add_button2->set_attribute('jrn',$ledger->id);
+        $f_add_button2->javascript=3D" this.jrn=3D\$('p_jrn').value;sele=
ct_card_type(this);";
+
+        $str_add_button=3D"";
+        $str_add_button2=3D"";
+        if ($g_user->check_action(FICADD)=3D=3D1)
+        {
+                $str_add_button=3D$f_add_button->input();
+                $str_add_button2=3D$f_add_button2->input();
+        }
+      =20
+        $r=3D'';
+        $r.=3Ddossier::hidden();
+        $f_legend=3D_('En-t=C3=AAte facture client');
+
+       =20
+        /* if we suggest the next pj, then we need a javascript */
+      =20
+        // Display the customer
+        //--
+        $fiche=3D'deb';
+
+        // Save old value and set a new one
+        //--
+        $e_client=3D( isset ($e_client) )?$e_client:"";
+        $e_client_label=3D"&nbsp;";//str_pad("",100,".");
+
+
+        // retrieve e_client_label
+        //--
+
+        if ( strlen(trim($e_client)) !=3D  0)
+        {
+            $fClient=3Dnew Fiche($ledger->db);
+            $fClient->get_by_qcode($e_client);
+            $e_client_label=3D$fClient->strAttribut(ATTR_DEF_NAME).' '.
+                            ' Adresse : '.$fClient->strAttribut(ATTR_DEF=
_ADRESS).' '.
+                            $fClient->strAttribut(ATTR_DEF_CP).' '.
+                            $fClient->strAttribut(ATTR_DEF_CITY).' ';
+
+
+        }
+
+        $W1=3Dnew ICard();
+        $W1->label=3D"Client ".HtmlInput::infobulle(0) ;
+        $W1->name=3D"e_client";
+        $W1->tabindex=3D3;
+        $W1->value=3D$e_client;
+        $W1->table=3D0;
+        $W1->set_dblclick("fill_ipopcard(this);");
+        $W1->set_attribute('ipopup','ipopcard');
+
+        // name of the field to update with the name of the card
+        $W1->set_attribute('label','e_client_label');
+        // name of the field to update with the name of the card
+        $W1->set_attribute('typecard','deb');
+
+        // Add the callback function to filter the card on the jrn
+        $W1->set_callback('filter_card');
+        $W1->set_function('fill_data');
+        $W1->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\=
');" ',
+                                $W1->name);
+        $f_client_qcode=3D$W1->input();
+        $client_label=3Dnew ISpan();
+        $client_label->table=3D0;
+        $f_client=3D$client_label->input("e_client_label",$e_client_labe=
l);
+        $f_client_bt=3D$W1->search();
+
+
+        // Record the current number of article
+        $Hid=3Dnew IHidden();
+        $p_article=3D ( isset ($nb_item))?$nb_item:MAX_ARTICLE;
+        $r.=3D$Hid->input("nb_item",$p_article);
+        $max=3D($p_article < MAX_ARTICLE)?MAX_ARTICLE:$p_article;
+
+
+        $f_legend_detail=3D_("D=C3=A9tail articles vendus");
+
+        // For each article
+        //--
+        for ($i=3D0;$i< $max;$i++)
+        {
+            // Code id, price & vat code
+            //--
+            $march=3D(isset(${"e_march$i"}))?${"e_march$i"}:""
+                   ;
+            $march_price=3D(isset(${"e_march".$i."_price"}))?${"e_march"=
.$i."_price"}:""
+                         ;
+            if ( $flag_tva=3D=3D'Y')
+            {
+                $march_tva_id=3D(isset(${"e_march$i"."_tva_id"}))?${"e_m=
arch$i"."_tva_id"}:"";
+                $march_tva_amount=3D(isset(${"e_march$i"."_tva_amount"})=
)?${"e_march$i"."_tva_amount"}:"";
+            }
+            $march_label=3D(isset(${"e_march".$i."_label"}))?${"e_march"=
.$i."_label"}:"";
+
+            // retrieve the tva label and name
+            //--
+            if ( strlen(trim($march))!=3D0 && strlen(trim($march_label))=
=3D=3D0)
+            {
+                $fMarch=3Dnew Fiche($ledger->db);
+                $fMarch->get_by_qcode($march);
+                $march_label=3D$fMarch->strAttribut(ATTR_DEF_NAME);
+                if ( $flag_tva=3D=3D'Y')
+                {
+                    if ( ! (isset(${"e_march$i"."_tva_id"})))
+                        $march_tva_id=3D$fMarch->strAttribut(ATTR_DEF_TV=
A);
+                }
+            }
+            // Show input
+            //--
+            $W1=3Dnew ICard();
+            $W1->label=3D"";
+            $W1->name=3D"e_march".$i;
+            $W1->value=3D$march;
+            $W1->table=3D1;
+            $W1->set_attribute('typecard','cred');
+            $W1->set_dblclick("fill_ipopcard(this);");
+            $W1->set_attribute('ipopup','ipopcard');
+
+            // name of the field to update with the name of the card
+            $W1->set_attribute('label','e_march'.$i.'_label');
+            // name of the field with the price
+            $W1->set_attribute('price','e_march'.$i.'_price');
+            // name of the field with the TVA_ID
+            $W1->set_attribute('tvaid','e_march'.$i.'_tva_id');
+            // Add the callback function to filter the card on the jrn
+            $W1->set_callback('filter_card');
+            $W1->set_function('fill_data');
+            $W1->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\=
'%s\');" ',
+                                    $W1->name);
+
+            $W1->readonly=3Dfalse;
+
+            $array[$i]['quick_code']=3D$W1->input();
+            $array[$i]['bt']=3D$W1->search();
+            // For computing we need some hidden field for holding the v=
alue
+            $array[$i]['hidden']=3D'';
+            if ( $flag_tva=3D=3D'Y') $array[$i]['hidden'].=3DHtmlInput::=
hidden('tva_march'.$i,0);
+
+            $htva=3Dnew INum('htva_march'.$i);
+            $htva->readOnly=3D1;
+            $htva->value=3D0;
+            $array[$i]['htva']=3D$htva->input();
+
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
+                $tvac=3Dnew INum('tvac_march'.$i);
+            else
+                $tvac=3Dnew IHidden('tvac_march'.$i);
+
+            $tvac->readOnly=3D1;
+            $tvac->value=3D0;
+            $array[$i]['tvac']=3D$tvac->input();
+
+            if ( $g_parameter->MY_UPDLAB =3D=3D 'Y')
+            {
+                $Span=3Dnew IText("e_march".$i."_label");
+
+                $Span->css_size=3D"100%";
+            } else
+            {
+                $Span=3Dnew ISpan("e_march".$i."_label");
+            }
+            $Span->value=3D$march_label;
+            $Span->setReadOnly(false);
+            // card's name, price
+            //--
+            $array[$i]['denom']=3D$Span->input("e_march".$i."_label",$ma=
rch_label);
+            // price
+            $Price=3Dnew INum();
+            $Price->setReadOnly(false);
+            $Price->size=3D9;
+            $Price->javascript=3D"onBlur=3D'format_number(this);clean_tv=
a($i);compute_ledger($i)'";
+            $array[$i]['pu']=3D$Price->input("e_march".$i."_price",$marc=
h_price);
+            $array[$i]['tva']=3D'';
+            $array[$i]['amount_tva']=3D'';
+            // if tva is not needed then no tva field
+            if ( $flag_tva =3D=3D 'Y' )
+            {
+                // vat label
+                //--
+                $Tva=3Dnew ITva_Popup($ledger->db);
+                $Tva->in_table=3Dtrue;
+                $Tva->set_attribute('compute',$i);
+
+                $Tva->js=3D'onblur=3D"format_number(this);clean_tva('.$i=
.');compute_ledger('.$i.')"';
+                $Tva->value=3D$march_tva_id;
+                $array[$i]['tva']=3D$Tva->input("e_march$i"."_tva_id");
+                // vat amount
+                //--
+                $wTva_amount=3Dnew INum();
+                $wTva_amount->readOnly=3Dfalse;
+                $wTva_amount->size=3D6;
+                $wTva_amount->javascript=3D"onBlur=3D'format_number(this=
);compute_ledger($i)'";
+                $array[$i]['amount_tva']=3D$wTva_amount->input("e_march"=
.$i."_tva_amount",$march_tva_amount);
+            }
+            // quantity
+            //--
+            $quant=3D(isset(${"e_quant$i"}))?${"e_quant$i"}:"1"
+                   ;
+            $Quantity=3Dnew INum();
+            $Quantity->setReadOnly(false);
+            $Quantity->size=3D8;
+            $Quantity->javascript=3D"onChange=3D'format_number(this);cle=
an_tva($i);compute_ledger($i)'";
+            $array[$i]['quantity']=3D$Quantity->input("e_quant".$i,$quan=
t);
+
+        }// foreach article
+        $f_type=3D_('Client');
+
+
+        ob_start();
+        require_once('template/predf_ledger_detail.php');
+        $r.=3Dob_get_contents();
+        ob_end_clean();
+
+
+
+        // Set correctly the REQUEST param for jrn_type
+        $r.=3DHtmlInput::hidden('jrn_type','VEN');
+
+        $r.=3DHtmlInput::button('add_item',_('Ajout article'),      ' on=
Click=3D"ledger_add_row()"');
+        return $r;
+    }
 }

Modified: phpcompta/trunk/include/class_pre_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_operation.php	2013-05-20 20:23:26 U=
TC (rev 5294)
+++ phpcompta/trunk/include/class_pre_operation.php	2013-05-20 22:36:25 U=
TC (rev 5295)
@@ -32,7 +32,7 @@
 require_once("class_ihidden.php");
 require_once 'class_pre_op_ach.php';
 require_once 'class_pre_op_ven.php';
-require_once 'class_pre_op_ods.php';
+require_once 'class_pre_op_advanced.php';
 class Pre_operation
 {
     var $db;						/*!< $db database connection */
@@ -108,7 +108,6 @@
     {
         $sql=3D"select od_id,jrn_def_id,od_name,od_item,od_jrn_type".
              " from op_predef where od_id=3D".$this->od_id.
-             " and od_direct=3D'".$this->od_direct."'".
              " order by od_name";
         $res=3D$this->db->exec_sql($sql);
         $array=3DDatabase::fetch_all($res);
@@ -123,12 +122,13 @@
                 $this->detail=3Dnew Pre_Op_ven($this->db);
                 break;
             case 'ODS':
-                $this->detail=3Dnew Pre_op_ods($this->db);
+                $this->detail=3Dnew Pre_op_advanced($this->db);
+                break;
             default:
-                throw new Exception('Load PreOperatoin failed');
+                throw new Exception('Load PreOperatoin failed'.$this->od=
_jrn_type);
           }
         $this->detail->set_od_id($this->od_id);
-        $this->adetail=3D$this->detail->load();
+        $this->detail->jrn_def_id=3D$this->jrn_def_id;
        =20
         return $array;
     }
@@ -199,7 +199,7 @@
     function display()=20
     {
         $array=3D$this->detail->compute_array();
-        $this->detail->display($array);
+        echo $this->detail->display($array);
     }
 }
=20

Modified: phpcompta/trunk/include/preod.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/preod.inc.php	2013-05-20 20:23:26 UTC (rev 52=
94)
+++ phpcompta/trunk/include/preod.inc.php	2013-05-20 22:36:25 UTC (rev 52=
95)
@@ -34,7 +34,7 @@
 $sel=3Dnew ISelect();
 $sel->name=3D"jrn";
 $sel->value=3D$cn->make_array("select jrn_def_id,jrn_def_name from ".
-                            " jrn_def order by jrn_def_name");
+                            " jrn_def where jrn_def_type in ('VEN','ACH'=
,'ODS') order by jrn_def_name");
 // Show a list of ledger
 $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
 $sel->selected=3D(isset($_REQUEST['jrn']))?$_REQUEST['jrn']:-1;

Added: phpcompta/trunk/include/template/predf_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/predf_ledger_detail.php	            =
            (rev 0)
+++ phpcompta/trunk/include/template/predf_ledger_detail.php	2013-05-20 2=
2:36:25 UTC (rev 5295)
@@ -0,0 +1,81 @@
+<fieldset>
+<legend><?php echo $f_legend ?>
+</legend>
+<?php echo $f_type?><?php echo $f_client_qcode?><?php echo $f_client_bt?=
> <?php echo $f_client?><br>
+<input type=3D"hidden" id=3D"p_jrn" name=3D"p_jrn" value=3D"<?php echo $=
this->jrn_def_id; ?>">   =20
+<?php echo $str_add_button?>
+</fieldset>
+
+<fieldset>
+<legend><?php echo $f_legend_detail?></legend>
+<table id=3D"sold_item" width=3D"100%" border=3D"0">
+<tr>
+<th style=3D"width:auto"colspan=3D"2">Code <?php echo HtmlInput::infobul=
le(0)?></th>
+      <th><?php echo _('D=C3=A9nomination')?></th>
+<?php if ($flag_tva =3D=3D'Y') : ?>
+      <th><?php echo _('prix/unit=C3=A9 htva')?><?php echo HtmlInput::in=
fobulle(6)?></th>
+      <th><?php echo _('quantit=C3=A9')?></th>
+      <th><?php echo _('Total HTVA')?></th>
+	  <th><?php echo _('tva')?></th>
+      <th><?php echo _('tot.tva')?></th>
+      <th><?php echo _('tvac')?></th>
+<?php else: ?>
+	  <th><?php echo _('prix/unit=C3=A9 ')?><?php echo HtmlInput::infobulle=
(6)?></th>
+      <th><?php echo _('quantit=C3=A9')?></th>
+      <th><?php echo _('Total ')?></th>
+<?php endif;?>
+
+
+
+</tr>
+<?php foreach ($array as $item) {
+echo '<tr>';
+echo $item['quick_code'];
+echo '<td>'.$item['bt'].'</td>';
+?>
+<td style=3D"border-bottom: 1px dotted grey; width: 75%;"><?php echo $it=
em['denom'] ?></td>
+<?php=20
+echo td($item['pu']);
+echo td($item['quantity' ]);
+echo td($item['htva']);
+if ($flag_tva=3D=3D'Y')  {
+	echo td($item['tva']);
+	echo td($item['amount_tva'].$item['hidden']);
+
+}
+echo td($item['tvac']);
+echo '</tr>';
+}
+
+?>
+</table>
+
+<div style=3D"position:float;float:right;text-align:right;padding-right:=
5px;font-size:1.2em;font-weight:bold;color:blue">
+      <?php echo HtmlInput::button('act',_('Actualiser'),'onClick=3D"com=
pute_all_ledger();"'); ?>
+ </div>
+
+    <div style=3D"position:float;float:right;text-align:left;font-size:1=
.2em;font-weight:bold;color:blue" id=3D"sum">
+    <br><span id=3D"htva">0.0</span>
+<?php
+    if ( $flag_tva=3D=3D'Y' )  : ?>
+     <br><span id=3D"tva">0.0</span>
+    <br><span id=3D"tvac">0.0</span>
+<?php    endif;     ?>
+
+ </div>
+
+<div style=3D"position:float;float:right;text-align:right;padding-right:=
5px;font-size:1.2em;font-weight:bold;color:blue">
+<?php
+	if ( $flag_tva =3D=3D'Y') :
+	?>
+  <br><?php echo _('Total HTVA')?>
+  <br><?php echo _('Total TVA')?>
+  <br><?php echo _('Total TVAC')?>
+ <?php else:  ?>
+     <br><?php echo _('Total')?>
+<?php endif; ?>
+</div>
+
+</fieldset>
+
+



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 21 14:16:07 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uer6V-0003U0-37
	for mharc-phpcompta-dev@gnu.org; Tue, 21 May 2013 14:16:07 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 21 May 2013 20:14:37 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.4118.1369160165.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5296 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 May 2013 18:16:05 -0000

Author: danydb
Date: 2013-05-21 20:14:36 +0200 (Tue, 21 May 2013)
New Revision: 5296

Modified:
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/class_pre_op_ach.php
   phpcompta/trunk/include/constant.php
Log:
remove debug info

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-05-20 22:36:25 UTC (rev 5295)
+++ phpcompta/trunk/html/js/scripts.js	2013-05-21 18:14:36 UTC (rev 5296)
@@ -1747,7 +1747,6 @@
 		for (var col =3D0;col < aCol.length;col++)
 		{
 			var idx=3DaCol[col];
-			console.log(r);
 			if (table.rows[r].cells[idx])
 				 {
 					ele =3D table.rows[r].cells[idx].innerHTML.replace(/<[^>]+>/g, "");

Modified: phpcompta/trunk/include/class_pre_op_ach.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ach.php	2013-05-20 22:36:25 UTC =
(rev 5295)
+++ phpcompta/trunk/include/class_pre_op_ach.php	2013-05-21 18:14:36 UTC =
(rev 5296)
@@ -24,7 +24,7 @@
  * \brief definition of the class pre_op_ach
  */
 require_once ('class_pre_operation.php');
-//require_once 'class_acc_ledger_purchase.php';
+
 /*----------------------------------------------------------------------=
 */
 /*!\brief concerns the predefined operation for ACH ledger
  */
@@ -54,7 +54,7 @@
=20
         }
     }
-   =20
+
     /*!
      * \brief save the detail and op in the database
      *
@@ -146,7 +146,7 @@
     }
    function display($p_array)
    {
-       require_once 'class_acc_ledger_purchase.php';
+	   require_once('class_acc_ledger_purchase.php');
        global $g_parameter,$g_user;
        extract($p_array);
        $ledger=3Dnew Acc_Ledger_Purchase($this->db,$this->jrn_def_id);
@@ -180,6 +180,7 @@
         $r.=3Ddossier::hidden();
         $f_legend=3D_("En-t=C3=AAte facture fournisseur");
         $f_legend_detail=3D_("D=C3=A9tail articles achet=C3=A9");
+
         // Ledger (p_jrn)
         //--
         /* if we suggest the next pj, then we need a javascript */

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-20 22:36:25 UTC (rev 529=
5)
+++ phpcompta/trunk/include/constant.php	2013-05-21 18:14:36 UTC (rev 529=
6)
@@ -1,5 +1,4 @@
 <?php
-ini_set("session.auto_start","1");
 /*
  *   This file is part of PhpCompta.
  *
@@ -62,9 +61,9 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
-define ('SVNINFO',5900);
+// define ('SVNINFO',5900);
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",true);
+define ("DEBUG",false);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 21 14:41:27 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UerV1-0001mE-36
	for mharc-phpcompta-dev@gnu.org; Tue, 21 May 2013 14:41:27 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 21 May 2013 20:39:51 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.4156.1369161686.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5297 - in phpcompta/trunk: html/admin include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 May 2013 18:41:25 -0000

Author: danydb
Date: 2013-05-21 20:39:51 +0200 (Tue, 21 May 2013)
New Revision: 5297

Modified:
   phpcompta/trunk/html/admin/setup.php
   phpcompta/trunk/include/config_file.php
Log:
last bugs

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-21 18:14:36 UTC (rev 529=
6)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-21 18:39:51 UTC (rev 529=
7)
@@ -248,7 +248,6 @@
 	echo '<p class=3D"info"> php.ini est bien configur&eacute; '.$succeed.'=
</p>';
 } else {
 	echo '<p class=3D"warning"> php mal configur&eacute; '.$failed.'</p>';
-	exit -1;
 }
 /* check user */
 if ( (defined("MULTI") && MULTI=3D=3D1)|| !defined("MULTI"))

Modified: phpcompta/trunk/include/config_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config_file.php	2013-05-21 18:14:36 UTC (rev =
5296)
+++ phpcompta/trunk/include/config_file.php	2013-05-21 18:39:51 UTC (rev =
5297)
@@ -97,7 +97,7 @@
 			array('value'=3D>0,'label'=3D>'Serveur Mutualis=C3=A9: un seul dossie=
r')
 		);
 	$smulti->selected=3D1;
-	$smulti->javascript=3D' onchange=3D"show_dbname(this)"';
+	$smulti->javascript=3D' onchange=3D"show_dbname(this)" onkeypress=3D"sh=
ow_dbname(this)"';
=20
 	$icdbname=3Dnew IText('cdbname');
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 21 17:38:59 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UeuGp-0002cR-D7
	for mharc-phpcompta-dev@gnu.org; Tue, 21 May 2013 17:38:59 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 21 May 2013 23:37:23 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.4300.1369172339.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5298 - phpcompta/trunk/html/admin/sql/patch
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 May 2013 21:38:58 -0000

Author: danydb
Date: 2013-05-21 23:37:22 +0200 (Tue, 21 May 2013)
New Revision: 5298

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
Log:
task #0000848: Creation d un trigger pour empecher periode qui se chevauc=
hent

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-21 18:39:=
51 UTC (rev 5297)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-21 21:37:=
22 UTC (rev 5298)
@@ -13,6 +13,27 @@
 update fiche_def set fd_description=3D'Cat=C3=A9gorie qui contient la li=
ste des prestations, marchandises... que l''on vend ' where fd_id=3D6;
=20
 update jrn_def set jrn_deb_max_line=3D5 where jrn_deb_max_line is null;
+
+create or replace function comptaproc.check_periode () returns trigger
+as
+$$
+begin
+if find_periode(to_char(NEW.p_start,'DD.MM.YYYY')) <> -1 then
+        raise info 'Overlap periode start % ',NEW.p_start;
+	return null;
+end if;
+
+if find_periode(to_char(NEW.p_end,'DD.MM.YYYY')) <> -1 then
+        raise info 'Overlap periode end % ',NEW.p_end;
+	return null;
+end if;
+return NEW;
+end;
+$$ language plpgsql
+;
+
+
+create trigger parm_periode_check_periode_trg before update or insert on=
 parm_periode for each row execute procedure check_periode();
 update version set val=3D107;
=20
 commit;



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 21 18:01:24 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UeucW-0000KJ-SI
	for mharc-phpcompta-dev@gnu.org; Tue, 21 May 2013 18:01:24 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 21 May 2013 23:59:49 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.4360.1369173684.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5299 - in phpcompta/trunk: html/admin/sql/patch
	include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 May 2013 22:01:23 -0000

Author: danydb
Date: 2013-05-21 23:59:49 +0200 (Tue, 21 May 2013)
New Revision: 5299

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
   phpcompta/trunk/include/constant.php
Log:
task #0000848: Creation d un trigger pour empecher periode qui se chevauc=
hent

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-21 21:37:=
22 UTC (rev 5298)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-21 21:59:=
49 UTC (rev 5299)
@@ -14,17 +14,46 @@
=20
 update jrn_def set jrn_deb_max_line=3D5 where jrn_deb_max_line is null;
=20
+CREATE OR REPLACE FUNCTION comptaproc.periode_exist(p_date text,p_period=
e_id bigint)
+ RETURNS integer
+AS $function$
+
+declare n_p_id int4;
+begin
+
+select p_id into n_p_id
+        from parm_periode
+        where
+                p_start <=3D to_date(p_date,'DD.MM.YYYY')
+                and
+                p_end >=3D to_date(p_date,'DD.MM.YYYY')
+                and
+                p_id <> p_periode_id;
+
+if NOT FOUND then
+        return -1;
+end if;
+
+return n_p_id;
+
+end;$function$
+ LANGUAGE plpgsql;
+
 create or replace function comptaproc.check_periode () returns trigger
 as
 $$
+declare=20
+  nPeriode int;
 begin
-if find_periode(to_char(NEW.p_start,'DD.MM.YYYY')) <> -1 then
-        raise info 'Overlap periode start % ',NEW.p_start;
+if periode_exist(to_char(NEW.p_start,'DD.MM.YYYY'),NEW.p_id) <> -1 then
+       nPeriode:=3Dperiode_exist(to_char(NEW.p_start,'DD.MM.YYYY'),NEW.p=
_id) ;
+        raise info 'Overlap periode start % periode %',NEW.p_start,a;
 	return null;
 end if;
=20
-if find_periode(to_char(NEW.p_end,'DD.MM.YYYY')) <> -1 then
-        raise info 'Overlap periode end % ',NEW.p_end;
+if periode_exist(to_char(NEW.p_end,'DD.MM.YYYY'),NEW.p_id) <> -1 then
+	nPeriode:=3Dperiode_exist(to_char(NEW.p_start,'DD.MM.YYYY'),NEW.p_id) ;
+        raise info 'Overlap periode end % periode %',NEW.p_end,nPeriode;
 	return null;
 end if;
 return NEW;

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-21 21:37:22 UTC (rev 529=
8)
+++ phpcompta/trunk/include/constant.php	2013-05-21 21:59:49 UTC (rev 529=
9)
@@ -61,9 +61,9 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
-// define ('SVNINFO',5900);
+define ('SVNINFO',5900);
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",false);
+define ("DEBUG",true);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 21 18:08:59 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ueujr-0002fg-8r
	for mharc-phpcompta-dev@gnu.org; Tue, 21 May 2013 18:08:59 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 22 May 2013 00:07:29 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.4391.1369174139.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5300 - phpcompta/trunk/html/admin/sql/patch
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 May 2013 22:08:58 -0000

Author: danydb
Date: 2013-05-22 00:07:29 +0200 (Wed, 22 May 2013)
New Revision: 5300

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
Log:
task #0000848: Creation d un trigger pour empecher periode qui se chevauc=
hent

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-21 21:59:=
49 UTC (rev 5299)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade106.sql	2013-05-21 22:07:=
29 UTC (rev 5300)
@@ -47,7 +47,7 @@
 begin
 if periode_exist(to_char(NEW.p_start,'DD.MM.YYYY'),NEW.p_id) <> -1 then
        nPeriode:=3Dperiode_exist(to_char(NEW.p_start,'DD.MM.YYYY'),NEW.p=
_id) ;
-        raise info 'Overlap periode start % periode %',NEW.p_start,a;
+        raise info 'Overlap periode start % periode %',NEW.p_start,nPeri=
ode;
 	return null;
 end if;
=20



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 22 11:16:54 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfAmc-00053H-Gs
	for mharc-phpcompta-dev@gnu.org; Wed, 22 May 2013 11:16:54 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 22 May 2013 17:15:21 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.5475.1369235814.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5301 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 15:16:53 -0000

Author: danydb
Date: 2013-05-22 17:15:20 +0200 (Wed, 22 May 2013)
New Revision: 5301

Modified:
   phpcompta/trunk/include/constant.php
Log:
correct constant.php

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-21 22:07:29 UTC (rev 530=
0)
+++ phpcompta/trunk/include/constant.php	2013-05-22 15:15:20 UTC (rev 530=
1)
@@ -47,7 +47,7 @@
 ini_set ('memory_limit','20M');
 ini_set ('default_charset',"UTF-8");
 @ini_set ('session.use_trans_sid','on');
-	@session_start();
+@session_start();
=20
 /*
  * Ini session
@@ -61,9 +61,9 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
-define ('SVNINFO',5900);
+// define ('SVNINFO',5900);
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",true);
+define ("DEBUG",false);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 22 11:17:43 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfAnP-0005dI-10
	for mharc-phpcompta-dev@gnu.org; Wed, 22 May 2013 11:17:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 22 May 2013 17:16:06 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.5478.1369235862.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5302 - in phpcompta/trunk: html/admin include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 15:17:41 -0000

Author: danydb
Date: 2013-05-22 17:16:06 +0200 (Wed, 22 May 2013)
New Revision: 5302

Modified:
   phpcompta/trunk/html/admin/setup.js
   phpcompta/trunk/html/admin/setup.php
   phpcompta/trunk/html/admin/template_config_form.php
   phpcompta/trunk/include/config_file.php
Log:
Fix some bugs for install on common server

Modified: phpcompta/trunk/html/admin/setup.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.js	2013-05-22 15:15:20 UTC (rev 5301=
)
+++ phpcompta/trunk/html/admin/setup.js	2013-05-22 15:16:06 UTC (rev 5302=
)
@@ -10,16 +10,17 @@
 content[204]=3D"Mot de passe de l'utilisateur ";
 content[205]=3D"Port de postgresql";
 content[206]=3D"En version mono dossier, le nom de la base de donn=C3=A9=
es doit =C3=AAtre mentionn=C3=A9e";
+content[207]=3D"Vous devez choisir si phpcompta est install=C3=A9 sur l'=
un de vos servers ou sur un server mutualis=C3=A9 qui ne donne qu'une seu=
le base de donn=C3=A9es";
=20
=20
 function show_dbname(obj) {
 	try {
-		if (obj.value =3D=3D=3D '1')
+		if (obj.checked =3D=3D=3D true)
 		{
-			this.document.getElementById('div_db').style.visibility=3D 'hidden';
+			this.document.getElementById('div_db').style.visibility=3D 'visible';
 		}
 		else {
-			this.document.getElementById('div_db').style.visibility=3D 'visible';
+                        this.document.getElementById('div_db').style.vis=
ibility=3D 'hidden';
 		}
 	} catch (e) {
 		alert(e.getMessage);

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-22 15:15:20 UTC (rev 530=
1)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-22 15:16:06 UTC (rev 530=
2)
@@ -125,8 +125,8 @@
     echo '<h2 class=3D"notice"> Ecriture non possible </h2><p class=3D"w=
arning"> On ne peut pas &eacute;crire dans le r&eacute;pertoire de phpcom=
pta, changez-en les droits </p>';
     exit();
   }
-create_htaccess();
=20
+
 if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'in=
clude'.DIRECTORY_SEPARATOR.'config.inc.php')) {
   echo '<h1 class=3D"info">Entrez les informations n&eacute;cessaires &a=
grave; phpcompta</h1>';
   echo '<form method=3D"post">';
@@ -152,6 +152,8 @@
 require_once '../../include/constant.php';
 require_once('config_file.php');
 require_once('class_database.php');
+if ( defined ("MULTI") && MULTI=3D=3D1) { create_htaccess();}
+
 echo "<h1>Configuration</h1>";
 ?>
 <h2>Info</h2>
@@ -252,11 +254,13 @@
 /* check user */
 if ( (defined("MULTI") && MULTI=3D=3D1)|| !defined("MULTI"))
 {
+  =20
 	$cn=3Dnew Database(-1,'template');
 } else
 {
 	$cn=3Dnew Database();
 }
+
 ?>
 <h2>Base de donn=C3=A9es</h2>
 <?php

Modified: phpcompta/trunk/html/admin/template_config_form.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/template_config_form.php	2013-05-22 15:15:=
20 UTC (rev 5301)
+++ phpcompta/trunk/html/admin/template_config_form.php	2013-05-22 15:16:=
06 UTC (rev 5302)
@@ -56,7 +56,7 @@
 	<TD><?php echo $icport->input();echo HtmlInput::infobulle(205)?></TD>
 </TR>
 <tr>
-	<td>Mode Serveur mutualis=C3=A9 ou d=C3=A9di=C3=A9</td>
+	<td>Mode Serveur mutualis=C3=A9 <?php echo HtmlInput::infobulle(207) ?>=
</td>
 	<td><?php echo $smulti->input() ?></td>
 </tr>
 <tr id=3D"div_db" style=3D"visibility:hidden">

Modified: phpcompta/trunk/include/config_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config_file.php	2013-05-22 15:15:20 UTC (rev =
5301)
+++ phpcompta/trunk/include/config_file.php	2013-05-22 15:16:06 UTC (rev =
5302)
@@ -26,6 +26,7 @@
=20
 require_once("class_itext.php");
 require_once '../../include/class_iselect.php';
+require_once '../../include/class_icheckbox.php';
=20
 function is_unix()
 {
@@ -91,13 +92,8 @@
 	/*
 	 * For version MONO
 	 */
-	$smulti=3Dnew ISelect ('multi');
-	$smulti->value=3Darray(
-			array('value'=3D>1,'label'=3D>'Serveur d=C3=A9di=C3=A9 : plusieurs do=
ssiers'),
-			array('value'=3D>0,'label'=3D>'Serveur Mutualis=C3=A9: un seul dossie=
r')
-		);
-	$smulti->selected=3D1;
-	$smulti->javascript=3D' onchange=3D"show_dbname(this)" onkeypress=3D"sh=
ow_dbname(this)"';
+	$smulti=3Dnew ICheckBox('multi');
+	$smulti->javascript=3D' onchange=3D"show_dbname(this)" ';
=20
 	$icdbname=3Dnew IText('cdbname');
=20
@@ -149,8 +145,8 @@
=20
     fputs($hFile, 'define ("domaine","");');
     fputs($hFile,"\r\n");
-
-	fputs($hFile, 'define ("MULTI","'.$multi.'");');
+    if (isset ($multi))	fputs($hFile, 'define ("MULTI",0);');
+    if (! isset ($multi))	fputs($hFile, 'define ("MULTI",1);');
 	fputs($hFile,"\r\n");
     fputs($hFile, 'define ("dbname","'.$cdbname.'");');
     fputs($hFile,"\r\n");



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 22 11:18:34 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfAoE-0006Gl-9i
	for mharc-phpcompta-dev@gnu.org; Wed, 22 May 2013 11:18:34 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 22 May 2013 17:17:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.5479.1369235912.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5303 - in phpcompta/trunk: html html/js include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 15:18:32 -0000

Author: danydb
Date: 2013-05-22 17:17:00 +0200 (Wed, 22 May 2013)
New Revision: 5303

Modified:
   phpcompta/trunk/html/ajax_ledger.php
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_operation.php
   phpcompta/trunk/include/template/ledger_detail_bottom.php
Log:
Possibilite de corriger les autres info + recherche mais doublon en cas d=
e mise a jour: a corriger

Modified: phpcompta/trunk/html/ajax_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_ledger.php	2013-05-22 15:16:06 UTC (rev 530=
2)
+++ phpcompta/trunk/html/ajax_ledger.php	2013-05-22 15:17:00 UTC (rev 530=
3)
@@ -470,6 +470,12 @@
                 $op=3Dnew Anc_Operation($cn);
                 $op->save_update_form($_POST);
             }
+            ////////////////////////////////////////////////////////////=
//////
+            //Save other info
+            ////////////////////////////////////////////////////////////=
//////
+            $op->save_info($_POST['OTHER'],'OTHER');
+            $op->save_info($_POST['BON_COMMANDE'],'BON_COMMANDE');
+           =20
         }
         echo _('Op=C3=A9ration sauv=C3=A9e');
         $cn->commit();

Modified: phpcompta/trunk/html/js/acc_ledger.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/acc_ledger.js	2013-05-22 15:16:06 UTC (rev 53=
02)
+++ phpcompta/trunk/html/js/acc_ledger.js	2013-05-22 15:17:00 UTC (rev 53=
03)
@@ -141,7 +141,7 @@
=20
 }
 /**
- *ask the name, quick_code of the bank for the ledger
+ * Update the number of rows when changing of ledger
  */
 function update_row(ctl)
 {

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-05-22 15:16:06 UTC (rev 530=
2)
+++ phpcompta/trunk/html/js/infobulle.js	2013-05-22 15:17:00 UTC (rev 530=
3)
@@ -57,6 +57,9 @@
 content[27]=3D"Attention, <b>SI</b> la fiche a chang=C3=A9 de poste comp=
table, c'est seulement le dernier qui est affich=C3=A9";
 content[28]=3D"Attention Diff=C3=A9rence entre TVA calcul=C3=A9e et donn=
=C3=A9e";
 content[29]=3D"Si vous ne donnez pas de nom, ce sera le nom du fichier q=
ui sera utilis=C3=A9";
+content[30]=3D"Peut contenir une information telle que le message struct=
ur=C3=A9 sur le virement";
+content[31]=3D"Peut contenir un num=C3=A9ro de bon de commande";
+
 function showBulle(p_ctl)
 {
     d=3Ddocument.getElementById('bulle');

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-05-22 15:16:06 UTC (rev 5302)
+++ phpcompta/trunk/html/js/scripts.js	2013-05-22 15:17:00 UTC (rev 5303)
@@ -1040,7 +1040,7 @@
 	removeDiv(target);
     var sx=3D'20%';
     var sy=3D'20%';
-    var str_style=3D"top:"+sx+";left:"+sy;
+    var str_style=3D"top:"+sx+";left:"+sy+'width:60%;';
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-05-22 15:16:06 UTC =
(rev 5302)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-05-22 15:17:00 UTC =
(rev 5303)
@@ -2713,7 +2713,9 @@
 			$desc =3D sql_string($desc);
 			$fil_desc =3D $and . " ( upper(jr_comment) like upper('%" . $desc . "=
%') or upper(jr_pj_number) like upper('%" . $desc . "%') " .
 					" or upper(jr_internal)  like upper('%" . $desc . "%')
-                          or jr_grpt_id in (select j_grpt from jrnx wher=
e j_text ~* '" . $desc . "'))";
+                          or jr_grpt_id in (select j_grpt from jrnx wher=
e j_text ~* '" . $desc . "')
+                          or jr_id in (select jr_id from jrn_info where =
ji_value is not null and ji_value ~* '$desc')
+                          )";
 			$and =3D " and ";
 		}
 		//    Poste

Modified: phpcompta/trunk/include/class_acc_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_operation.php	2013-05-22 15:16:06 U=
TC (rev 5302)
+++ phpcompta/trunk/include/class_acc_operation.php	2013-05-22 15:17:00 U=
TC (rev 5303)
@@ -492,7 +492,10 @@
         $ledger_id=3D$this->get_ledger();
         if ( $ledger_id=3D=3D'') throw new Exception('Journal non trouv=C3=
=A9');
         $oledger=3Dnew Acc_Ledger($this->db,$ledger_id);
-
+       =20
+        // retrieve info from jrn_info
+    =20
+       =20
         switch($oledger->get_type())
         {
         case 'VEN':
@@ -513,8 +516,51 @@
             $ret=3Dnew Acc_Misc($this->db,$this->jr_id);
             $ret->get();
         }
+        $ret->get_info();
         return $ret;
     }
+    /**
+     * @brief retrieve info from the jrn_info, create 2 new arrays
+     * obj->info->command and obj->info->other
+     * the columns are the idx
+     */
+    function get_info()
+    {
+        $this->info=3Dnew stdClass();
+        // other info
+        $array=3D$this->db->get_value("select ji_value from jrn_info whe=
re
+            jr_id=3D$1 and id_type=3D$2",array($this->jr_id,'OTHER'));
+        $this->info->other=3D  $array['ji_value'];
+       =20
+        // Bon de commande
+        $array=3D$this->db->get_value("select * from jrn_info where
+            jr_id=3D$1 and id_type=3D$2",array($this->jr_id,'BON_COMMAND=
E'));
+        $this->info->command=3D  $array['ji_value'];
+
+    }
+    /**
+     * Save into jrn_info=20
+     * @param $p_info msg to save
+     * @param $p_type is OTHER or BON_COMMAND
+     */
+    function save_info($p_info,$p_type)
+    {
+        if ( ! in_array($p_type,array('OTHER','BON_COMMANDE'))) return;
+        if (trim($p_info)=3D=3D"") {
+            $this->db->exec_sql('delete from jrn_info where jr_id=3D$1 a=
nd id_type=3D$2',array($this->jr_id,$p_TYPE));
+            return;
+        }
+        $exist=3D$this->db->get_value('select count(ji_id) from jrn_info=
 where jr_id=3D$1 and id_type=3D$2',array($this->jr_id,$p_TYPE));
+        if ( $exist =3D=3D "0" ) {
+            //insert into jrn_info
+            $this->db->exec_sql('insert into jrn_info(jr_id,id_type,ji_v=
alue) values ($1,$2,$3)',
+                    array($this->jr_id,$p_type,$p_info));
+        } elseif ( $exist =3D=3D 1) {
+            //update
+            $this->db->exec_sql('update jrn_info set id_type=3D$2,ji_val=
ue=3D$3 where jr_id=3D$1',
+                    array($this->jr_id,$p_type,$p_info));
+        }
+    }
     static function test_me()
     {
         $_SESSION['g_user']=3D'phpcompta';

Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_bottom.php	2013-05-22 =
15:16:06 UTC (rev 5302)
+++ phpcompta/trunk/include/template/ledger_detail_bottom.php	2013-05-22 =
15:17:00 UTC (rev 5303)
@@ -1,5 +1,19 @@
+<?php
+    $cmd=3Dnew IText('BON_COMMANDE',$obj->info->command);
+    $other=3Dnew IText('OTHER',$obj->info->other);
+?>
 <div class=3D"myfieldset">
-
+    <h1 class=3D"legend">Informations</h1>
+    <table>
+        <tr>
+            <td> Bon de commande   :</td><td> <?php echo HtmlInput::info=
bulle(31)." ".$cmd->input();  ?></td>
+        </tr>
+        <tr>
+            <td> Autre information : </td><td><?php echo HtmlInput::info=
bulle(30)." ".$other->input();?></td>
+        </tr>
+    </table>
+</div>
+<div class=3D"myfieldset">
 <h1 class=3D"legend">
 <?php echo _('Rapprochement');?>
 </h1>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 22 13:31:26 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfCsn-0000am-VL
	for mharc-phpcompta-dev@gnu.org; Wed, 22 May 2013 13:31:25 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 22 May 2013 19:29:57 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.5902.1369243885.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5304 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 17:31:25 -0000

Author: danydb
Date: 2013-05-22 19:29:57 +0200 (Wed, 22 May 2013)
New Revision: 5304

Modified:
   phpcompta/trunk/include/class_acc_operation.php
Log:
remove last bug

Modified: phpcompta/trunk/include/class_acc_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_operation.php	2013-05-22 15:17:00 U=
TC (rev 5303)
+++ phpcompta/trunk/include/class_acc_operation.php	2013-05-22 17:29:57 U=
TC (rev 5304)
@@ -492,10 +492,10 @@
         $ledger_id=3D$this->get_ledger();
         if ( $ledger_id=3D=3D'') throw new Exception('Journal non trouv=C3=
=A9');
         $oledger=3Dnew Acc_Ledger($this->db,$ledger_id);
-       =20
+
         // retrieve info from jrn_info
-    =20
-       =20
+
+
         switch($oledger->get_type())
         {
         case 'VEN':
@@ -508,7 +508,8 @@
             $ret=3Dnew Acc_Fin($this->db,$this->jr_id);
             break;
         default:
-            return $this->get();
+			$ret=3Dnew Acc_Misc($this->db,$this->jr_id);
+			break;
         }
         $ret->get();
         if ( empty($ret->det->array))
@@ -530,16 +531,16 @@
         // other info
         $array=3D$this->db->get_value("select ji_value from jrn_info whe=
re
             jr_id=3D$1 and id_type=3D$2",array($this->jr_id,'OTHER'));
-        $this->info->other=3D  $array['ji_value'];
-       =20
+        $this->info->other=3D $array;
+
         // Bon de commande
-        $array=3D$this->db->get_value("select * from jrn_info where
+        $array=3D$this->db->get_value("select ji_value from jrn_info whe=
re
             jr_id=3D$1 and id_type=3D$2",array($this->jr_id,'BON_COMMAND=
E'));
-        $this->info->command=3D  $array['ji_value'];
+        $this->info->command=3D  $array;
=20
     }
     /**
-     * Save into jrn_info=20
+     * Save into jrn_info
      * @param $p_info msg to save
      * @param $p_type is OTHER or BON_COMMAND
      */
@@ -547,17 +548,17 @@
     {
         if ( ! in_array($p_type,array('OTHER','BON_COMMANDE'))) return;
         if (trim($p_info)=3D=3D"") {
-            $this->db->exec_sql('delete from jrn_info where jr_id=3D$1 a=
nd id_type=3D$2',array($this->jr_id,$p_TYPE));
+            $this->db->exec_sql('delete from jrn_info where jr_id=3D$1 a=
nd id_type=3D$2',array($this->jr_id,$p_type));
             return;
         }
-        $exist=3D$this->db->get_value('select count(ji_id) from jrn_info=
 where jr_id=3D$1 and id_type=3D$2',array($this->jr_id,$p_TYPE));
+        $exist=3D$this->db->get_value('select count(ji_id) from jrn_info=
 where jr_id=3D$1 and id_type=3D$2',array($this->jr_id,$p_type));
         if ( $exist =3D=3D "0" ) {
             //insert into jrn_info
             $this->db->exec_sql('insert into jrn_info(jr_id,id_type,ji_v=
alue) values ($1,$2,$3)',
                     array($this->jr_id,$p_type,$p_info));
         } elseif ( $exist =3D=3D 1) {
             //update
-            $this->db->exec_sql('update jrn_info set id_type=3D$2,ji_val=
ue=3D$3 where jr_id=3D$1',
+            $this->db->exec_sql('update jrn_info set ji_value=3D$3 where=
 jr_id=3D$1 and id_type=3D$2',
                     array($this->jr_id,$p_type,$p_info));
         }
     }



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 22 13:31:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfCsx-0000cS-1z
	for mharc-phpcompta-dev@gnu.org; Wed, 22 May 2013 13:31:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 22 May 2013 19:30:10 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.5903.1369243894.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5305 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 17:31:34 -0000

Author: danydb
Date: 2013-05-22 19:30:10 +0200 (Wed, 22 May 2013)
New Revision: 5305

Modified:
   phpcompta/trunk/include/constant.php
Log:
set properly constant.php

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-22 17:29:57 UTC (rev 530=
4)
+++ phpcompta/trunk/include/constant.php	2013-05-22 17:30:10 UTC (rev 530=
5)
@@ -59,9 +59,12 @@
 $g_captcha=3Dfalse;
 $g_failed=3D"<span style=3D\"font-size:18px;color:red\">&#x2716;</span>"=
;
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
-/*set to none for production */
-/* uncomment for production */
-// define ('SVNINFO',5900);
+/* uncomment for development */
+/*
+define ('SVNINFO',5900);
+define ("DEBUG",true);
+*/
+
 $version_phpcompta=3DSVNINFO;
 define ("DEBUG",false);
 /* define ('SVNINFO',5015);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 22 15:41:05 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfEuH-0007Kd-Am
	for mharc-phpcompta-dev@gnu.org; Wed, 22 May 2013 15:41:05 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 22 May 2013 21:39:32 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.6127.1369251664.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5306 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 19:41:03 -0000

Author: danydb
Date: 2013-05-22 21:39:32 +0200 (Wed, 22 May 2013)
New Revision: 5306

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
enlevement de session.auto_start

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2013-05-22 17:30:10 UTC (rev 530=
5)
+++ phpcompta/trunk/html/admin/setup.php	2013-05-22 19:39:32 UTC (rev 530=
6)
@@ -87,7 +87,6 @@
 		$hFile=3D@fopen($file,'w+');
 		if ( ! $hFile )     exit('Impossible d\'&eacute;crire dans le r&eacute=
;pertoire html');
 		$array=3Darray("php_flag  magic_quotes_gpc off",
-				 "php_flag session.auto_start on",
 				 "php_value max_execution_time 240",
 				 "php_value memory_limit 20M",
 				 "AddDefaultCharset utf-8",
@@ -221,13 +220,6 @@
         echo "</li>";
 }
=20
-if ( ini_get("session.auto_start") =3D=3D false )  {
-        echo "<li>";
-        echo 'Avertissement : '.$failed;
-	print '<span class=3D"warning"> session.auto_start doit =C3=AAtre mis =C3=
=A0 vrai</span>';
-        echo "</li>";
-	$flag_php++;
-}
 if ( ini_get("register_globals") =3D=3D true)  {
         echo "<li>";
         echo 'Avertissement : '.$failed;
@@ -254,7 +246,7 @@
 /* check user */
 if ( (defined("MULTI") && MULTI=3D=3D1)|| !defined("MULTI"))
 {
-  =20
+
 	$cn=3Dnew Database(-1,'template');
 } else
 {



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Wed May 22 17:50:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfGvH-0003gq-2y
	for mharc-phpcompta-dev@gnu.org; Wed, 22 May 2013 17:50:15 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 22 May 2013 23:48:42 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.6232.1369259414.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5307 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 21:50:13 -0000

Author: danydb
Date: 2013-05-22 23:48:41 +0200 (Wed, 22 May 2013)
New Revision: 5307

Modified:
   phpcompta/trunk/include/class_fiche.php
Log:
Esth?\195?\169tique : mise en ?\195?\169vidence de la ligne survol?\195?\=
169e dans GESTION/CUST , SUPPLIER, BK, ADM

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-05-22 19:39:32 UTC (rev =
5306)
+++ phpcompta/trunk/include/class_fiche.php	2013-05-22 21:48:41 UTC (rev =
5307)
@@ -1572,7 +1572,7 @@
         {
             $i++;
             $odd=3D"";
-            if ($i % 2 =3D=3D 0 ) $odd=3D'class=3D"odd"';
+             $odd  =3D ($i % 2 =3D=3D 0 ) ? 'class=3D"odd"': ' class=3D"=
even" ';
             /* Filter on the default year */
=20
             $amount=3D$tiers->get_solde_detail($filter_year);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 23 14:50:24 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ufaam-0001Zq-Pj
	for mharc-phpcompta-dev@gnu.org; Thu, 23 May 2013 14:50:24 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 23 May 2013 20:43:23 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.8174.1369335024.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5308 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 May 2013 18:50:23 -0000

Author: danydb
Date: 2013-05-23 20:43:22 +0200 (Thu, 23 May 2013)
New Revision: 5308

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_pre_op_ach.php
   phpcompta/trunk/include/class_pre_op_ven.php
Log:
task #0000804: Nombre de ligne par d?\195?\169faut

Correction pour ACH et VEN le journal par d?\195?\169faut n'avait pas le =
bon nombre de lignes

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-05-22 21:48:41 UTC =
(rev 5307)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-05-23 18:43:22 UTC =
(rev 5308)
@@ -3371,11 +3371,11 @@
 		$this->jrn_def_id =3D $p_jrn;
 		$this->jrn_def_name =3D $p_jrn_name;
 		$this->jrn_def_ech_lib =3D $p_ech_lib;
-		$this->jrn_def_max_line_deb =3D $p_jrn_deb_max_line;
+		$this->jrn_def_max_line_deb =3D ($p_jrn_deb_max_line<1)?1:$p_jrn_deb_m=
ax_line;
 		$this->jrn_def_type =3D $p_jrn_type;
 		$this->jrn_def_pj_pref =3D $jrn_def_pj_pref;
 		$this->jrn_def_fiche_deb =3D (isset($FICHEDEB)) ? join($FICHEDEB, ',')=
 : "";
-		$this->jrn_deb_max_line=3D$min_row;
+		$this->jrn_deb_max_line=3D($min_row<1)?1:$min_row;
 		switch ($this->jrn_def_type)
 		{
 			case 'ACH':

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-22 21:4=
8:41 UTC (rev 5307)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-05-23 18:4=
3:22 UTC (rev 5308)
@@ -1074,12 +1074,14 @@
=20
=20
         // Record the current number of article
-        $Hid=3Dnew IHidden();
-        $p_article=3D ( isset ($nb_item))?$nb_item:MAX_ARTICLE;
-        $r.=3D$Hid->input("nb_item",$p_article);
+
         $e_comment=3D(isset($e_comment))?$e_comment:"";
-        $max=3D($p_article < MAX_ARTICLE)?MAX_ARTICLE:$p_article;
+		$p_article=3D ( isset ($nb_item))?$nb_item:$this->get_min_row();
+        $max=3D($p_article < $this->get_min_row())?$this->get_min_row():=
$p_article;
=20
+        $Hid=3Dnew IHidden();
+		$r.=3D$Hid->input("nb_item",$p_article);
+
         // For each article
         //--
         for ($i=3D0;$i< $max ;$i++)

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-22 21:48:41=
 UTC (rev 5307)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-05-23 18:43:22=
 UTC (rev 5308)
@@ -1209,9 +1209,9 @@
=20
         // Record the current number of article
         $Hid=3Dnew IHidden();
-        $p_article=3D ( isset ($nb_item))?$nb_item:MAX_ARTICLE;
+        $p_article=3D ( isset ($nb_item))?$nb_item:$this->get_min_row();
         $r.=3D$Hid->input("nb_item",$p_article);
-        $max=3D($p_article < MAX_ARTICLE)?MAX_ARTICLE:$p_article;
+        $max=3D($p_article < $this->get_min_row())?$this->get_min_row():=
$p_article;
=20
=20
         $f_legend_detail=3D_("D=C3=A9tail articles vendus");

Modified: phpcompta/trunk/include/class_pre_op_ach.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ach.php	2013-05-22 21:48:41 UTC =
(rev 5307)
+++ phpcompta/trunk/include/class_pre_op_ach.php	2013-05-23 18:43:22 UTC =
(rev 5308)
@@ -238,12 +238,13 @@
=20
=20
         // Record the current number of article
+		$min=3D$ledger->get_min_row();
+        $p_article=3D ( isset ($nb_item))?$nb_item:$min;
+        $max=3D($p_article < $min)?$min:$p_article;
+
+        $e_comment=3D(isset($e_comment))?$e_comment:"";
         $Hid=3Dnew IHidden();
-        $p_article=3D ( isset ($nb_item))?$nb_item:MAX_ARTICLE;
         $r.=3D$Hid->input("nb_item",$p_article);
-        $e_comment=3D(isset($e_comment))?$e_comment:"";
-        $max=3D($p_article < MAX_ARTICLE)?MAX_ARTICLE:$p_article;
-
         // For each article
         //--
         for ($i=3D0;$i< $max ;$i++)

Modified: phpcompta/trunk/include/class_pre_op_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ven.php	2013-05-22 21:48:41 UTC =
(rev 5307)
+++ phpcompta/trunk/include/class_pre_op_ven.php	2013-05-23 18:43:22 UTC =
(rev 5308)
@@ -146,7 +146,7 @@
         if ( $p_array !=3D null ) extract($p_array);
         require_once 'class_acc_ledger_sold.php';
         $ledger=3Dnew Acc_Ledger_Sold($this->db,$this->jrn_def_id);
-        =20
+
         $flag_tva=3D$g_parameter->MY_TVA_USE;
         /* Add button */
         $f_add_button=3Dnew IButton('add_card');
@@ -171,14 +171,14 @@
                 $str_add_button=3D$f_add_button->input();
                 $str_add_button2=3D$f_add_button2->input();
         }
-      =20
+
         $r=3D'';
         $r.=3Ddossier::hidden();
         $f_legend=3D_('En-t=C3=AAte facture client');
=20
-       =20
+
         /* if we suggest the next pj, then we need a javascript */
-      =20
+
         // Display the customer
         //--
         $fiche=3D'deb';
@@ -231,12 +231,14 @@
=20
=20
         // Record the current number of article
+		$min=3D$ledger->get_min_row();
+        $p_article=3D ( isset ($nb_item))?$nb_item:$min;
+        $max=3D($p_article < $min)?$min:$p_article;
+
+        $e_comment=3D(isset($e_comment))?$e_comment:"";
         $Hid=3Dnew IHidden();
-        $p_article=3D ( isset ($nb_item))?$nb_item:MAX_ARTICLE;
         $r.=3D$Hid->input("nb_item",$p_article);
-        $max=3D($p_article < MAX_ARTICLE)?MAX_ARTICLE:$p_article;
=20
-
         $f_legend_detail=3D_("D=C3=A9tail articles vendus");
=20
         // For each article



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Thu May 23 14:55:52 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ufag4-0002nb-NS
	for mharc-phpcompta-dev@gnu.org; Thu, 23 May 2013 14:55:52 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 23 May 2013 20:48:57 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.8189.1369335352.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5309 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 May 2013 18:55:52 -0000

Author: danydb
Date: 2013-05-23 20:48:57 +0200 (Thu, 23 May 2013)
New Revision: 5309

Modified:
   phpcompta/trunk/include/constant.php
Log:
change debug info

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-05-23 18:43:22 UTC (rev 530=
8)
+++ phpcompta/trunk/include/constant.php	2013-05-23 18:48:57 UTC (rev 530=
9)
@@ -94,7 +94,17 @@
 define ('MAX_RECONCILE',25);
 define ('MAX_QCODE',4);
=20
-if ( DEBUG ) error_reporting(2147483647);  else error_reporting(0);
+if ( DEBUG ) {
+	error_reporting(2147483647);
+	ini_set("display_errors",1);
+	ini_set("html_errors",1);
+}
+	else {
+	error_reporting(0);
+	ini_set("display_errors",1);
+	ini_set("html_errors",1);
+
+}
 // Erreur
 define ("NOERROR",0);
 define ("BADPARM",1);



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 24 14:08:28 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfwPk-0004Xu-Ol
	for mharc-phpcompta-dev@gnu.org; Fri, 24 May 2013 14:08:28 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 24 May 2013 20:01:22 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.9674.1369418907.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r505 - trunk/tva
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 May 2013 18:08:27 -0000

Author: danydb
Date: 2013-05-24 20:01:21 +0200 (Fri, 24 May 2013)
New Revision: 505

Modified:
   trunk/tva/index.php
Log:
Avertissement pour TVA 2013

Modified: trunk/tva/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/index.php	2013-05-16 22:44:15 UTC (rev 504)
+++ trunk/tva/index.php	2013-05-24 18:01:21 UTC (rev 505)
@@ -102,10 +102,15 @@
 '<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 // show menu
+?>
+<h2 class=3D"notice">Attention, ce plugin ne permet que le calcul TVA po=
ur 2012 et r=C3=A9gime transitoire en 2013, employez
+		plut=C3=B4t l'extension "rapport avanc=C3=A9"
+	</h2>
+<?php
 echo ShowItem($array,'H',"mtitle","mtitle",$def,' style=3D"width:80%;mar=
gin-left:10%;border-spacing:5;" ');
 ?>
 <div class=3D"content" style=3D"margin-left: 30px">
-<?php=20
+<?php
 // include the right file
 if ($def=3D=3D1) {
   require_once('decl_tva.inc.php');



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 24 14:09:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfwQd-0004uK-1H
	for mharc-phpcompta-dev@gnu.org; Fri, 24 May 2013 14:09:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 24 May 2013 20:02:24 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.9675.1369418962.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r506 - in trunk/amortis: . include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 May 2013 18:09:21 -0000

Author: danydb
Date: 2013-05-24 20:02:23 +0200 (Fri, 24 May 2013)
New Revision: 506

Modified:
   trunk/amortis/include/template/listing_histo.php
   trunk/amortis/index.php
Log:
Ajout des filtres dynamiques

Modified: trunk/amortis/include/template/listing_histo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/listing_histo.php	2013-05-24 18:01:21 =
UTC (rev 505)
+++ trunk/amortis/include/template/listing_histo.php	2013-05-24 18:02:23 =
UTC (rev 506)
@@ -1,14 +1,15 @@
 <div class=3D"content" style=3D"width:80%;margin-left:10%">
 <!-- <h2 class=3D"info">Historique</h2> -->
 <form method=3D"POST">
-<?php=20
+<?php
 echo HtmlInput::hidden('sa',$_REQUEST['sa']);
 echo HtmlInput::hidden('sb',$_REQUEST['sb']);
 echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
 echo dossier::hidden();
+echo 'Filtre : '.HtmlInput::filter_table('amortissement_tb','1,2,3,5,6',=
1);
 ?>
-<table class=3D"result">
+<table id=3D"amortissement_tb" class=3D"result">
 <tr>
 <th><?php echo $header->get_header(0)?></th>
 <th><?php echo $header->get_header(1)?></th>
@@ -18,7 +19,7 @@
 <th><?php echo $header->get_header(5)?></th>
=20
 </tr>
-<?php=20
+<?php
=20
 for ($i=3D0;$i<count($array);$i++) :
 	echo '<tr>';

Modified: trunk/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/index.php	2013-05-24 18:01:21 UTC (rev 505)
+++ trunk/amortis/index.php	2013-05-24 18:02:23 UTC (rev 506)
@@ -21,7 +21,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 global $version_plugin;
 $version_plugin=3DSVNINFO;
-Extension::check_version(5255);
+Extension::check_version(5300);
 /*!\file
  * \brief main entry
  */



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 24 14:29:13 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ufwjp-0000MA-Lu
	for mharc-phpcompta-dev@gnu.org; Fri, 24 May 2013 14:29:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 24 May 2013 20:22:22 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.9750.1369420153.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r507 - trunk/rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 May 2013 18:29:12 -0000

Author: danydb
Date: 2013-05-24 20:22:21 +0200 (Fri, 24 May 2013)
New Revision: 507

Modified:
   trunk/rapport_avance/include/class_rapav_formulaire.php
Log:
remove space from code

Modified: trunk/rapport_avance/include/class_rapav_formulaire.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_formulaire.php	2013-05-24 18=
:02:23 UTC (rev 506)
+++ trunk/rapport_avance/include/class_rapav_formulaire.php	2013-05-24 18=
:22:21 UTC (rev 507)
@@ -132,6 +132,9 @@
 		{
 			$form_param =3D new formulaire_param_sql($p_array['p_id'][$i]);
 			$form_param->p_code =3D (trim($p_array['p_code'][$i])!=3D"")?$p_array=
['p_code'][$i]:'C'.$i.microtime();
+			// remove space from p_code
+			$form_param->p_code=3Dstr_replace(' ', "",$form_param->p_code);
+
 			$form_param->p_libelle =3D $p_array['p_libelle'][$i];
 			$form_param->p_type =3D $p_array['p_type'][$i];
 			$form_param->p_order =3D (isNumber($p_array['p_order'][$i]) =3D=3D 0)=
 ?  ($i+1) * 10 : $p_array['p_order'][$i];



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Fri May 24 15:00:18 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfxDu-0008IH-4d
	for mharc-phpcompta-dev@gnu.org; Fri, 24 May 2013 15:00:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 24 May 2013 20:53:20 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.9775.1369422017.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r508 - trunk/rapport_avance/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 May 2013 19:00:16 -0000

Author: danydb
Date: 2013-05-24 20:53:19 +0200 (Fri, 24 May 2013)
New Revision: 508

Modified:
   trunk/rapport_avance/sql/upgrade3.sql
Log:
Bug when restore

Modified: trunk/rapport_avance/sql/upgrade3.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/sql/upgrade3.sql	2013-05-24 18:22:21 UTC (rev 50=
7)
+++ trunk/rapport_avance/sql/upgrade3.sql	2013-05-24 18:53:19 UTC (rev 50=
8)
@@ -42,4 +42,10 @@
=20
 insert into rapport_advanced.version  (version_id,version_note)values(3,=
'G=C3=A9n=C3=A9ration de document');
=20
+ALTER TABLE rapport_advanced.restore_formulaire_param_detail drop CONSTR=
AINT formulaire_param_detail_p_id_fkey;
+ALTER TABLE rapport_advanced.restore_formulaire_param_detail  ADD CONSTR=
AINT formulaire_param_fkey FOREIGN KEY (p_id)
+      REFERENCES rapport_advanced.restore_formulaire_param (p_id) MATCH =
SIMPLE
+      ON UPDATE CASCADE ON DELETE CASCADE;
+
+
 commit;
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 15:36:56 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UggkS-0001Fr-HX
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 15:36:56 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 21:29:50 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12053.1369597015.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5310 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 19:36:54 -0000

Author: danydb
Date: 2013-05-26 21:29:49 +0200 (Sun, 26 May 2013)
New Revision: 5310

Modified:
   phpcompta/trunk/include/company.inc.php
Log:
D?\195?\169tail : changement de libell?\195?\169 pour tous les journaux

Modified: phpcompta/trunk/include/company.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/company.inc.php	2013-05-23 18:48:57 UTC (rev =
5309)
+++ phpcompta/trunk/include/company.inc.php	2013-05-26 19:29:49 UTC (rev =
5310)
@@ -120,7 +120,7 @@
 echo "<tr>" . td(_("Sugg=C3=A9rer la date"), 'style=3D"text-align:right"=
') . $date_suggest->input("p_date_suggest", $strict_array) . "</tr>";
 echo '<tr>' . td(_('Afficher la p=C3=A9riode comptable pour =C3=A9viter =
les erreurs de date'), 'style=3D"text-align:right"') . $check_periode->in=
put('p_check_periode', $strict_array) . '</tr>';
 echo '<tr>' . td(_('Utilisez des postes comptables alphanum=C3=A9rique')=
, 'style=3D"text-align:right"') . $alpha_num->input('p_alphanum') . '</tr=
>';
-echo '<tr>' . td(_('Changer le libell=C3=A9 des d=C3=A9tails en VEN ou A=
CH'), 'style=3D"text-align:right"') . $updlab->input('p_updlab') . '</tr>=
';
+echo '<tr>' . td(_('Changer le libell=C3=A9 des d=C3=A9tails'), 'style=3D=
"text-align:right"') . $updlab->input('p_updlab') . '</tr>';
=20
 echo "</table>";
 echo HtmlInput::submit("record_company", _("Sauve"));



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 16:08:39 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UghF9-00080W-UO
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 16:08:39 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 22:01:32 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12088.1369598918.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r509 - in trunk/doc: . rapport_avance
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 20:08:38 -0000

Author: danydb
Date: 2013-05-26 22:01:32 +0200 (Sun, 26 May 2013)
New Revision: 509

Added:
   trunk/doc/rapport_avance/
   trunk/doc/rapport_avance/Doxyfile
Log:
update Doxyfile

Added: trunk/doc/rapport_avance/Doxyfile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/doc/rapport_avance/Doxyfile	                        (rev 0)
+++ trunk/doc/rapport_avance/Doxyfile	2013-05-26 20:01:32 UTC (rev 509)
@@ -0,0 +1,1606 @@
+# Doxyfile 1.6.3
+
+# This file describes the settings to be used by the documentation syste=
m
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG =3D value [value, ...]
+# For lists items can also be appended using:
+#       TAG +=3D value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#-----------------------------------------------------------------------=
----
+# Project related configuration options
+#-----------------------------------------------------------------------=
----
+
+# This tag specifies the encoding used for all characters in the config =
file
+# that follow. The default is UTF-8 which is also the encoding used for =
all
+# text before the first occurrence of this tag. Doxygen uses libiconv (o=
r the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encoding=
s.
+
+DOXYFILE_ENCODING      =3D UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surround=
ed
+# by quotes) that should identify the project.
+
+PROJECT_NAME           =3D phpcompta_rapport_avance
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision numb=
er.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         =3D Version1
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be=
 used.
+
+OUTPUT_DIRECTORY       =3D .
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each =
output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount =
of
+# source files, where putting all generated files in the same directory =
would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         =3D NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, Ger=
man,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with Englis=
h
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persi=
an,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slova=
k,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        =3D English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      =3D YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepe=
nd
+# the brief description of a member or function before the detailed desc=
ription.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, =
the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           =3D YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, w=
ill be
+# stripped from the text and the result after processing the whole list,=
 is
+# used as the annotated text. Otherwise, the brief description is used a=
s-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name wi=
dget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =3D "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES t=
hen
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    =3D NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if =
those
+# members were ordinary class members. Constructors, destructors and ass=
ignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  =3D YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the=
 full
+# path before files name in the file list and in the header files. If se=
t
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        =3D NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part o=
f
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =3D
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part o=
f
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths tha=
t
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =3D
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much short=
er
+# (but less readable) file names. This can be useful is your file system=
s
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            =3D NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      =3D YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           =3D NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or /=
//
+# comments) as a brief description. This used to be the default behaviou=
r.
+# The new default is to treat a multi-line C++ comment block as a detail=
ed
+# description. Set this tag to YES if you prefer the old behaviour inste=
ad.
+
+MULTILINE_CPP_IS_BRIEF =3D NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocument=
ed
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           =3D YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will prod=
uce
+# a new page for each member. If set to NO, the documentation of a membe=
r will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  =3D NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               =3D 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=3Dvalue"=
.
+# For example adding "sideeffect=3D\par Side Effects:\n" will allow you =
to
+# put the command \sideeffect (or @sideeffect) in the documentation, whi=
ch
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =3D
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored =
for C.
+# For instance, some of the names that are used will be different. The l=
ist
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  =3D YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Ja=
va
+# sources only. Doxygen will then generate output that is more tailored =
for
+# Java. For instance, namespaces will be presented as packages, qualifie=
d
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   =3D NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fo=
rtran
+# sources only. Doxygen will then generate output that is more tailored =
for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   =3D NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VH=
DL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   =3D NO
+
+# Doxygen selects the parser to use depending on the extension of the fi=
les it parses.
+# With this tag you can assign which parser to use for a given extension=
.
+# Doxygen has a built-in mapping, but you can override or extend it usin=
g this tag.
+# The format is ext=3Dlanguage, where ext is a file extension, and langu=
age is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D=
, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxyg=
en treat
+# .inc files as Fortran files (default is PHP), and .f files as C (defau=
lt is Fortran),
+# use: inc=3DFortran f=3DC. Note that for custom extensions you also nee=
d to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      =3D
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do no=
t want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declaratio=
ns and
+# definitions whose arguments contain STL classes (e.g. func(std::string=
); v.s.
+# func(std::string) {}). This also make the inheritance and collaboratio=
n
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    =3D NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to=
 YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        =3D NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources=
 only.
+# Doxygen will parse them like normal C++ but will assume all classes us=
e public
+# instead of private inheritance when no explicit protection keyword is =
present.
+
+SIP_SUPPORT            =3D NO
+
+# For Microsoft's IDL there are propget and propput attributes to indica=
te getter
+# and setter methods for a property. Setting this option to YES (the def=
ault)
+# will make doxygen to replace the get and set methods by a property in =
the
+# documentation. This will only work if the methods are indeed getting o=
r
+# setting a simple type. If this is not the case, or you want to show th=
e
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   =3D YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GRO=
UP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the fi=
rst
+# member in the group (if any) for the other members of the group. By de=
fault
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   =3D YES
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member gro=
ups of
+# the same type (for instance a group of public functions) to be put as =
a
+# subgroup of that type (e.g. under the Public Functions section). Set i=
t to
+# NO to prevent subgrouping. Alternatively, this can be done per class u=
sing
+# the \nosubgrouping command.
+
+SUBGROUPING            =3D YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or=
 enum
+# is documented as struct, union, or enum with the name of the typedef. =
So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a s=
truct
+# with name TypeT. When disabled the typedef will appear as a member of =
a file,
+# namespace, or class. And the struct will be named TypeS. This can typi=
cally
+# be useful for C code in case the coding convention dictates that all c=
ompound
+# types are typedef'ed and only the typedef is referenced, never the tag=
 name.
+
+TYPEDEF_HIDES_STRUCT   =3D NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to dis=
k.
+# For small to medium size projects (<1000 input files) the default valu=
e is
+# probably good enough. For larger projects a too small cache size can c=
ause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will imp=
rove the
+# performance by keeping more symbols in memory. Note that the value wor=
ks on
+# a logarithmic scale so increasing the size by one will rougly double t=
he
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 =3D 65536 symbols
+
+SYMBOL_CACHE_SIZE      =3D 0
+
+#-----------------------------------------------------------------------=
----
+# Build related configuration options
+#-----------------------------------------------------------------------=
----
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities =
in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            =3D YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a clas=
s
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        =3D YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         =3D YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  =3D YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  =3D YES
+
+# If this flag is set to YES, the members of anonymous namespaces will b=
e
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   =3D NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     =3D NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the vario=
us
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     =3D NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  =3D NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      =3D NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          =3D NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only genera=
te
+# file names in lower-case letters. If set to YES upper-case letters are=
 also
+# allowed. This is useful if you have classes or files whose names only =
differ
+# in case and if your file system supports case sensitive file names. Wi=
ndows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       =3D YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       =3D NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the docume=
ntation
+# of that file.
+
+SHOW_INCLUDE_FILES     =3D YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   =3D NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            =3D YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       =3D YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabeticall=
y
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        =3D YES
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort=
 the (brief and detailed) documentation of class members so that construc=
tors and destructors are listed first. If set to NO (the default) the con=
structors will appear in the respective orders defined by SORT_MEMBER_DOC=
S and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BR=
IEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS i=
s set to NO.
+
+SORT_MEMBERS_CTORS_1ST =3D NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the de=
fault)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       =3D NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES=
.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     =3D YES
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      =3D YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      =3D YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       =3D YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST=3D YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =3D
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear=
 in
+# the documentation. If the initializer consists of more lines than spec=
ified
+# here it will be hidden. Use a value of 0 to hide initializers complete=
ly.
+# The appearance of the initializer of individual variables and defines =
in the
+# documentation can be controlled using \showinitializer or \hideinitial=
izer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  =3D 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generat=
ed
+# at the bottom of the documentation of classes and structs. If set to Y=
ES the
+# list will mention the files that were used to generate the documentati=
on.
+
+SHOW_USED_FILES        =3D YES
+
+# If the sources in your project are distributed over multiple directori=
es
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory h=
ierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       =3D YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files pa=
ge.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             =3D YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        =3D YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script=
 that
+# doxygen should invoke to get the current version for each file (typica=
lly from
+# the version control system). Doxygen will invoke the program by execut=
ing (via
+# popen()) the command <command> <input-file>, where <command> is the va=
lue of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input =
file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =3D
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be=
 parsed by
+# doxygen. The layout file controls the global structure of the generate=
d output files
+# in an output format independent way. The create the layout file that r=
epresents
+# doxygen's defaults, run doxygen with the -l option. You can optionally=
 specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used =
as the name
+# of the layout file.
+
+LAYOUT_FILE            =3D
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to warning and progress messages
+#-----------------------------------------------------------------------=
----
+
+# The QUIET tag can be used to turn on/off the messages that are generat=
ed
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  =3D NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that =
are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               =3D YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warn=
ings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag =
will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   =3D YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      =3D YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their par=
ameters
+# or return value. If set to NO (the default) doxygen will only warn abo=
ut
+# wrong or incomplete parameter documentation, but not about the absence=
 of
+# documentation.
+
+WARN_NO_PARAMDOC       =3D NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $=
text
+# tags, which will be replaced by the file and line number from which th=
e
+# warning originated and the warning text. Optionally the format may con=
tain
+# $version, which will be replaced by the version of the file (if it cou=
ld
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            =3D "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is writ=
ten
+# to stderr.
+
+WARN_LOGFILE           =3D doxygen-warn.log
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to the input files
+#-----------------------------------------------------------------------=
----
+
+# The INPUT tag can be used to specify the files and/or directories that=
 contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directori=
es
+# with spaces.
+
+INPUT                  =3D ../../rapport_avance
+
+# This tag can be used to specify the character encoding of the source f=
iles
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which=
 is
+# also the default input encoding. Doxygen uses libiconv (or the iconv b=
uilt
+# into libc) for the transcoding. See http://www.gnu.org/software/libico=
nv for
+# the list of possible encodings.
+
+INPUT_ENCODING         =3D UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.h=
h *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          =3D *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox \
+                         *.C \
+                         *.CC \
+                         *.C++ \
+                         *.II \
+                         *.I++ \
+                         *.H \
+                         *.HH \
+                         *.H++ \
+                         *.CS \
+                         *.PHP \
+                         *.PHP3 \
+                         *.M \
+                         *.MM \
+                         *.js \
+                         *.inc.php
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirect=
ories
+# should be searched for input files as well. Possible values are YES an=
d NO.
+# If left blank NO is used.
+
+RECURSIVE              =3D YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that s=
hould
+# excluded from the INPUT source files. This way you can easily exclude =
a
+# subdirectory from a directory tree whose root is specified with the IN=
PUT tag.
+
+EXCLUDE                =3D .
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are ex=
cluded
+# from the input.
+
+EXCLUDE_SYMLINKS       =3D NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclu=
de
+# certain files from those directories. Note that the wildcards are matc=
hed
+# against the file with absolute path, so to exclude all test directorie=
s
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =3D a?.php \
+                         b?.php \
+                         ?.php \
+                         test*.php \
+                         calendar-*.js \
+                         richtext.js
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol name=
s
+# (namespaces, classes, functions, etc.) that should be excluded from th=
e
+# output. The symbol name can be a fully qualified name, a word, or if t=
he
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =3D
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =3D
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use=
 the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.c=
pp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =3D *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      =3D NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation =
(see
+# the \image command).
+
+IMAGE_PATH             =3D
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen sho=
uld
+# invoke to filter for each input file. Doxygen will invoke the filter p=
rogram
+# by executing (via popen()) the command <filter> <input-file>, where <f=
ilter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of =
an
+# input file. Doxygen will then use the output that the filter program w=
rites
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =3D
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file p=
attern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=3Dfilter (like *.cpp=3Dmy_cpp_filter). See INPUT_FILTER for fu=
rther
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTE=
R
+# is applied to all files.
+
+FILTER_PATTERNS        =3D
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set=
 using
+# INPUT_FILTER) will be used to filter the input files when producing so=
urce
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    =3D NO
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to source browsing
+#-----------------------------------------------------------------------=
----
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files wi=
ll
+# be generated. Documented entities will be cross-referenced with these =
sources.
+# Note: To get rid of all source code in the generated output, make sure=
 also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         =3D YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         =3D YES
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    =3D NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION =3D YES
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    =3D YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE =3D YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxyg=
en
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). Y=
ou
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              =3D NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       =3D YES
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to the alphabetical class index
+#-----------------------------------------------------------------------=
----
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     =3D YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of colum=
ns
+# in which this list will be split (can be a number in the range [1..20]=
)
+
+COLS_IN_ALPHA_INDEX    =3D 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =3D
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to the HTML output
+#-----------------------------------------------------------------------=
----
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          =3D YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put=
.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default p=
ath.
+
+HTML_OUTPUT            =3D html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension =
for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left =
blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    =3D .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER            =3D
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =3D=20
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascadin=
g
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxyge=
n
+# will generate a default style sheet. Note that doxygen will try to cop=
y
+# the style sheet file to the HTML output directory, so don't put your o=
wn
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =3D
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each genera=
ted HTML
+# page will contain the date and time when the page was generated. Setti=
ng
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         =3D YES
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     =3D YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after=
 the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  =3D NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard)=
.
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will fi=
nd
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html f=
or more information.
+
+GENERATE_DOCSET        =3D NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name o=
f the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or produc=
t suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        =3D "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string th=
at
+# should uniquely identify the documentation set bundle. This should be =
a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       =3D org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.c=
hm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      =3D NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =3D
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =3D
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           =3D NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =3D
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             =3D NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group mem=
bers
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             =3D YES
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_V=
IRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used a=
s input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the gen=
erated
+# HTML documentation.
+
+GENERATE_QHP           =3D NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =3D
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          =3D org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generat=
ing
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     =3D doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filt=
er to add.
+# For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =3D
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of th=
e custom filter to add.For more information please see
+# <a href=3D"http://doc.trolltech.com/qthelpproject.html#custom-filters"=
>Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =3D
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes thi=
s project's
+# filter section matches.
+# <a href=3D"http://doc.trolltech.com/qthelpproject.html#filter-attribut=
es">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =3D
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =3D
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclips=
e help
+#  plugin. To install this plugin and make it available under the help c=
ontents
+# menu in Eclipse, the contents of the directory containing the HTML and=
 XML
+# files needs to be copied into the plugins directory of eclipse. The na=
me of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted =
before the help appears.
+
+GENERATE_ECLIPSEHELP   =3D NO
+
+# A unique identifier for the eclipse help plugin. When installing the p=
lugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         =3D org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index a=
t
+# top of each HTML page. The value NO (the default) enables the index an=
d
+# the value YES disables it.
+
+DISABLE_INDEX          =3D NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentatio=
n.
+
+ENUM_VALUES_PER_LINE   =3D 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser=
).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      =3D NO
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Direct=
ories,
+# and Class Hierarchy pages using a tree view instead of an ordered list=
.
+
+USE_INLINE_TREES       =3D NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can b=
e
+# used to set the initial width (in pixels) of the frame in which the tr=
ee
+# is shown.
+
+TREEVIEW_WIDTH         =3D 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output director=
y
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       =3D 10
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search bo=
x for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using =
HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERA=
TE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search =
engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better so=
lution.
+
+SEARCHENGINE           =3D YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be =
implemented using a PHP enabled web server instead of at the web client u=
sing Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server based appro=
ach is that it scales better to large projects and allows full text searc=
h. The disadvances is that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    =3D NO
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to the LaTeX output
+#-----------------------------------------------------------------------=
----
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         =3D NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be p=
ut.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default =
path.
+
+LATEX_OUTPUT           =3D latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name t=
o be
+# invoked. If left blank `latex' will be used as the default command nam=
e.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         =3D latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as th=
e
+# default command name.
+
+MAKEINDEX_CMD_NAME     =3D makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          =3D NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             =3D a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =3D
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header fo=
r
+# the generated latex document. The header should contain everything unt=
il
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are do=
ing!
+
+LATEX_HEADER           =3D
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         =3D YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead o=
f
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           =3D YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batch=
mode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        =3D YES
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     =3D NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include source co=
de with syntax highlighting in the LaTeX output. Note that which sources =
are shown also depends on other settings such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      =3D NO
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to the RTF output
+#-----------------------------------------------------------------------=
----
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty w=
ith
+# other RTF readers or editors.
+
+GENERATE_RTF           =3D NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default pa=
th.
+
+RTF_OUTPUT             =3D rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            =3D NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         =3D NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =3D
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =3D
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to the man page output
+#-----------------------------------------------------------------------=
----
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           =3D NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default pa=
th.
+
+MAN_OUTPUT             =3D man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          =3D .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              =3D NO
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to the XML output
+#-----------------------------------------------------------------------=
----
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           =3D NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default pa=
th.
+
+XML_OUTPUT             =3D xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =3D
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =3D
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     =3D YES
+
+#-----------------------------------------------------------------------=
----
+# configuration options for the AutoGen Definitions output
+#-----------------------------------------------------------------------=
----
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   =3D NO
+
+#-----------------------------------------------------------------------=
----
+# configuration options related to the Perl module output
+#-----------------------------------------------------------------------=
----
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       =3D NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          =3D NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much small=
er
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         =3D YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =3D
+
+#-----------------------------------------------------------------------=
----
+# Configuration options related to the preprocessor
+#-----------------------------------------------------------------------=
----
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen wi=
ll
+# evaluate all C-preprocessor directives found in the sources and includ=
e
+# files.
+
+ENABLE_PREPROCESSING   =3D YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a contro=
lled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        =3D NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     =3D NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes fi=
les
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        =3D YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories th=
at
+# contain include files that are not input files but should be processed=
 by
+# the preprocessor.
+
+INCLUDE_PATH           =3D=20
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildc=
ard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS =
will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =3D *.php=20
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D opti=
on of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=3Ddefinition (no spaces). If the definition and the =3D are
+# omitted =3D1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the :=3D operator
+# instead of the =3D operator.
+
+PREDEFINED             =3D
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be e=
xpanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition=
.
+
+EXPAND_AS_DEFINED      =3D
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are a=
lone
+# on a line, have an all uppercase name, and do not end with a semicolon=
. Such
+# function macros are typically used for boiler-plate code, and will con=
fuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   =3D YES
+
+#-----------------------------------------------------------------------=
----
+# Configuration::additions related to external references
+#-----------------------------------------------------------------------=
----
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES =3D file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES =3D file1=3Dloc1 "file2 =3D loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =3D
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will cre=
ate
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =3D
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be lis=
ted
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           =3D NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be l=
isted
+# in the modules index. If set to NO, only the current project's groups =
will
+# be listed.
+
+EXTERNAL_GROUPS        =3D YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              =3D /usr/bin/perl
+
+#-----------------------------------------------------------------------=
----
+# Configuration options related to the dot tool
+#-----------------------------------------------------------------------=
----
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes wi=
th base
+# or super classes. Setting the tag to NO turns the diagrams off. Note t=
hat
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields mo=
re
+# powerful graphs.
+
+CLASS_DIAGRAMS         =3D YES
+
+# You can define message sequence charts within doxygen comments using t=
he \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it =
in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory=
 where
+# the mscgen tool resides. If left empty the tool is assumed to be found=
 in the
+# default search path.
+
+MSCGEN_PATH            =3D
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   =3D NO
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot to=
ol is
+# available from the path. This tool is part of Graphviz, a graph visual=
ization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this sect=
ion
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               =3D NO
+
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. Th=
is
+# font does not include all possible unicode characters however, so when=
 you need
+# these (or just want a differently looking font) you can specify the fo=
nt name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the=
 font,
+# which can be done by putting it in a standard location or by setting t=
he
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the dir=
ectory
+# containing the font.
+
+DOT_FONTNAME           =3D FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot gr=
aphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           =3D 10
+
+# By default doxygen will tell dot to use the output directory to look f=
or the
+# FreeSans.ttf font (which doxygen will put there itself). If you specif=
y a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH           =3D
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            =3D YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxyg=
en
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes=
.
+
+COLLABORATION_GRAPH    =3D YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependenci=
es
+
+GROUP_GRAPHS           =3D YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance an=
d
+# collaboration diagrams in a style similar to the OMG's Unified Modelin=
g
+# Language.
+
+UML_LOOK               =3D YES
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     =3D NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_=
DOT
+# tags are set to YES then doxygen will generate a graph for each docume=
nted
+# file showing the direct and indirect include dependencies of the file =
with
+# other documented files.
+
+INCLUDE_GRAPH          =3D YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for ea=
ch
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      =3D YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global functio=
n
+# or class method. Note that enabling this option will significantly inc=
rease
+# the time of a run. So in most cases it will be better to enable call g=
raphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             =3D NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global funct=
ion
+# or class method. Note that enabling this option will significantly inc=
rease
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           =3D NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxyg=
en
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    =3D YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to =
YES
+# then doxygen will show the dependencies a directory has on other direc=
tories
+# in a graphical way. The dependency relations are determined by the #in=
clude
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        =3D YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the im=
ages
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       =3D png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool ca=
n be
+# found. If left blank, it is assumed the dot tool can be found in the p=
ath.
+
+DOT_PATH               =3D
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories th=
at
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =3D
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a gra=
ph
+# becomes larger than this value, doxygen will truncate the graph, which=
 is
+# visualized by representing a node as a red box. Note that doxygen if t=
he
+# number of direct children of the root node in a graph is already large=
r than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DE=
PTH.
+
+DOT_GRAPH_MAX_NODES    =3D 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of th=
e
+# graphs generated by dot. A depth value of 3 means that only nodes reac=
hable
+# from the root by following a path via at most 3 edges will be shown. N=
odes
+# that lay further from the root node will be omitted. Note that setting=
 this
+# option to 1 or 2 may greatly reduce the computation time needed for la=
rge
+# code bases. Also note that the size of a graph can be further restrict=
ed by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    =3D 1000
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transpare=
nt
+# background. This is disabled by default, because dot on Windows does n=
ot
+# seem to support this out of the box. Warning: Depending on the platfor=
m used,
+# enabling this option may lead to badly anti-aliased labels on the edge=
s of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        =3D NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple ou=
tput
+# files in one run (i.e. multiple -o and -T options on the command line)=
. This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      =3D NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        =3D YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            =3D YES



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 16:09:02 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UghFW-00080w-1g
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 16:09:02 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 22:02:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12091.1369598941.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5311 - phpcompta/trunk/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 20:09:01 -0000

Author: danydb
Date: 2013-05-26 22:02:00 +0200 (Sun, 26 May 2013)
New Revision: 5311

Modified:
   phpcompta/trunk/doc/
   phpcompta/trunk/doc/manuel-fr.odt
   phpcompta/trunk/doc/manuel-fr.pdf
Log:
update documentation


Property changes on: phpcompta/trunk/doc
___________________________________________________________________
Name: svn:ignore
   - *.html
*.pdf
*.txt
.~lock.manuel-fr.odt#
.a.swp

   + *.html
*.pdf
*.txt
.~lock.manuel-fr.odt#
.a.swp
.~lock.manuel-fr.pdf#


Modified: phpcompta/trunk/doc/manuel-fr.odt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: phpcompta/trunk/doc/manuel-fr.pdf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 16:10:25 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UghGr-0008AC-CO
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 16:10:25 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 22:03:26 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12092.1369599025.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5312 - phpcompta/tags
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 20:10:24 -0000

Author: danydb
Date: 2013-05-26 22:03:25 +0200 (Sun, 26 May 2013)
New Revision: 5312

Added:
   phpcompta/tags/rel660/
Log:
Nouvelle version


Copied: phpcompta/tags/rel660 (from rev 5311, phpcompta/trunk)



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 16:17:12 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UghNQ-0002HY-75
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 16:17:12 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 22:10:01 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12093.1369599431.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5313 - phpcompta/trunk
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 20:17:10 -0000

Author: danydb
Date: 2013-05-26 22:10:01 +0200 (Sun, 26 May 2013)
New Revision: 5313

Modified:
   phpcompta/trunk/
Log:
Removed merge tracking for "svnmerge" for=20
svn+ssh://danydb@svn/svn/phpcompta/tags/rel650



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel650:1-5215



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 16:17:37 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UghNp-0002SF-DV
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 16:17:37 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 22:10:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12096.1369599456.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5314 - phpcompta/trunk
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 20:17:35 -0000

Author: danydb
Date: 2013-05-26 22:10:31 +0200 (Sun, 26 May 2013)
New Revision: 5314

Modified:
   phpcompta/trunk/
Log:
Initialized merge tracking via "svnmerge" with revisions "1-5312" from=20
svn+ssh://danydb@svn/svn/phpcompta/tags/rel660



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   + /phpcompta/tags/rel660:1-5312



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 16:19:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UghPP-0002WF-Kp
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 16:19:15 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 22:12:08 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12097.1369599554.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r510 - trunk/rapport_avance/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 20:19:13 -0000

Author: danydb
Date: 2013-05-26 22:12:08 +0200 (Sun, 26 May 2013)
New Revision: 510

Modified:
   trunk/rapport_avance/doc/rapav.odt
Log:
update doc

Modified: trunk/rapport_avance/doc/rapav.odt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 16:19:30 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UghPe-0002Xm-OS
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 16:19:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 22:12:22 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12098.1369599569.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r511 - trunk
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 20:19:29 -0000

Author: danydb
Date: 2013-05-26 22:12:22 +0200 (Sun, 26 May 2013)
New Revision: 511

Modified:
   trunk/
Log:
Removed merge tracking for "svnmerge" for=20
svn+ssh://danydb@svn/svn_extension/tag/rel652



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel652:1-478



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 16:19:59 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UghQ7-0002YW-S9
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 16:19:59 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 22:12:53 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12099.1369599598.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r512 - tag
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 20:19:58 -0000

Author: danydb
Date: 2013-05-26 22:12:53 +0200 (Sun, 26 May 2013)
New Revision: 512

Added:
   tag/rel660/
Log:
New release


Copied: tag/rel660 (from rev 511, trunk)



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Sun May 26 16:20:46 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UghQs-0002fM-0t
	for mharc-phpcompta-dev@gnu.org; Sun, 26 May 2013 16:20:46 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 26 May 2013 22:13:35 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12100.1369599645.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r513 - trunk
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2013 20:20:45 -0000

Author: danydb
Date: 2013-05-26 22:13:35 +0200 (Sun, 26 May 2013)
New Revision: 513

Modified:
   trunk/
Log:
Initialized merge tracking via "svnmerge" with revisions "1-512" from=20
svn+ssh://danydb@svn/svn_extension/tag/rel660



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   + /tag/rel660:1-512



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


From MAILER-DAEMON Tue May 28 15:32:00 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UhPcm-0002TQ-0G
	for mharc-phpcompta-dev@gnu.org; Tue, 28 May 2013 15:32:00 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 28 May 2013 21:25:02 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.15433.1369769519.22519.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r514 - tag/rel660/rapport_avance
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 May 2013 19:31:58 -0000

Author: danydb
Date: 2013-05-28 21:25:01 +0200 (Tue, 28 May 2013)
New Revision: 514

Modified:
   tag/rel660/rapport_avance/ajax.php
Log:
bug version

Modified: tag/rel660/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel660/rapport_avance/ajax.php	2013-05-26 20:13:35 UTC (rev 513)
+++ tag/rel660/rapport_avance/ajax.php	2013-05-28 19:25:01 UTC (rev 514)
@@ -120,7 +120,6 @@
 		require_once 'include/class_rapav_formulaire.php';
 		$rapav=3Dnew Rapav_Formulaire($_GET['f_id']);
 		$rapav->remove_doc_template();
-		defaut:
 		break;
 }
 ?>



---
PhpCompta est un logiciel de comptabilit=C3=A9 libre en ligne (full web)
Projet opensource http://www.phpcompta.eu


