From MAILER-DAEMON Tue Sep 04 12:58:01 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T8wRt-0001BL-6N
	for mharc-phpcompta-dev@gnu.org; Tue, 04 Sep 2012 12:58:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  4 Sep 2012 18:45:37 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.510044.1346777879.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r402 - in 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: Tue, 04 Sep 2012 16:57:59 -0000

Author: danydb
Date: 2012-09-04 18:45:36 +0200 (Tue, 04 Sep 2012)
New Revision: 402

Modified:
   trunk/
   trunk/tva/list_tva.inc.php
Log:
Merged revisions 401 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel650

........
  r401 | danydb | 2012-08-31 20:00:30 +0200 (Fri, 31 Aug 2012) | 1 line
 =20
  bug dans tri par d?\195?\169claration
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel650:1-399
   + /tag/rel650:1-401

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	2012-08-31 18:00:30 UTC (rev 401)
+++ trunk/tva/list_tva.inc.php	2012-09-04 16:45:36 UTC (rev 402)
@@ -93,7 +93,7 @@
 when periodicity =3D '2' then 'Trimestriel'
 end as fmt_periodicity,
 periode_dec,exercice
-from tva_belge.declaration_amount order by date_decl desc
+from tva_belge.declaration_amount=20
 ";
 		break;
 	case 2:



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


From MAILER-DAEMON Tue Sep 04 14:08:19 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T8xXv-0003OC-EJ
	for mharc-phpcompta-dev@gnu.org; Tue, 04 Sep 2012 14:08:19 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  4 Sep 2012 19:55:57 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.510402.1346782099.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5098 - in phpcompta/tags/rel650/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, 04 Sep 2012 18:08:18 -0000

Author: danydb
Date: 2012-09-04 19:55:56 +0200 (Tue, 04 Sep 2012)
New Revision: 5098

Modified:
   phpcompta/tags/rel650/include/class_follow_up.php
   phpcompta/tags/rel650/include/template/dashboard.php
Log:
ajout ag_ref dans action aujourd'hui et action en retard

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_follow_up.php	2012-08-24 20:27:20=
 UTC (rev 5097)
+++ phpcompta/tags/rel650/include/class_follow_up.php	2012-09-04 17:55:56=
 UTC (rev 5098)
@@ -1035,7 +1035,7 @@
          */
 	function get_today()
 	{
-		$sql =3D "select coalesce(vw_name,'Interne') as vw_name,ag_id,ag_title=
,ag_ref, dt_value,to_char(ag_remind_date,'DD.MM.YYYY') as ag_timestamp_fm=
t,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') =
";
@@ -1048,7 +1048,7 @@
          */
 	function get_late()
 	{
-		$sql =3D "select coalesce(vw_name,'Interne') as vw_name,ag_id,ag_title=
,ag_ref, dt_value,to_char(ag_remind_date,'DD.MM.YYYY') as ag_timestamp_fm=
t,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 < now() ";

Modified: phpcompta/tags/rel650/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/tags/rel650/include/template/dashboard.php	2012-08-24 20:27=
:20 UTC (rev 5097)
+++ phpcompta/tags/rel650/include/template/dashboard.php	2012-09-04 17:55=
:56 UTC (rev 5098)
@@ -68,6 +68,9 @@
 	for($i=3D0;$i<count($last_operation);$i++):
 	?>
 	<li>
+		<span>
+			<?=3Dh($last_operation[$i]['ag_ref'])?>
+		</span>
 	<span>
 	<?=3Dsmaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
 	</span>
@@ -75,7 +78,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 +98,9 @@
 	for($i=3D0;$i<count($late_operation);$i++):
 	?>
 	<li>
+		<span>
+			<?=3Dh($late_operation[$i]['ag_ref'])?>
+		</span>
 	<span>
 	<?=3Dsmaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
 	</span>
@@ -102,7 +108,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']?>



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


From MAILER-DAEMON Thu Sep 06 12:59:46 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T9fQg-0000BF-U0
	for mharc-phpcompta-dev@gnu.org; Thu, 06 Sep 2012 12:59:46 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  6 Sep 2012 18:47:29 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.518770.1346950785.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5099 - in phpcompta/tags/rel650:
	contrib/document_test doc 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, 06 Sep 2012 16:59:45 -0000

Author: danydb
Date: 2012-09-06 18:47:29 +0200 (Thu, 06 Sep 2012)
New Revision: 5099

Modified:
   phpcompta/tags/rel650/contrib/document_test/all_tags.odt
   phpcompta/tags/rel650/doc/manuel-fr.odt
   phpcompta/tags/rel650/doc/manuel-fr.pdf
   phpcompta/tags/rel650/include/class_document.php
Log:
0000721: Nouveaux tag pour les stocks dans g?\195?\169n?\195?\169ration d=
e documents

Modified: phpcompta/tags/rel650/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/tags/rel650/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/tags/rel650/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/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	2012-09-04 17:55:56 =
UTC (rev 5098)
+++ phpcompta/tags/rel650/include/class_document.php	2012-09-06 16:47:29 =
UTC (rev 5099)
@@ -1080,7 +1080,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
          */



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


From MAILER-DAEMON Wed Sep 12 17:16:52 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TBuIm-0000XB-MS
	for mharc-phpcompta-dev@gnu.org; Wed, 12 Sep 2012 17:16:52 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 12 Sep 2012 23:05:13 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.542793.1347484612.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5100 - 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: Wed, 12 Sep 2012 21:16:51 -0000

Author: danydb
Date: 2012-09-12 23:05:12 +0200 (Wed, 12 Sep 2012)
New Revision: 5100

Modified:
   phpcompta/tags/rel650/include/class_phpcompta_sql.php
Log:
fix bug : when a value is empty then value is n ull

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_phpcompta_sql.php	2012-09-06 16:4=
7:29 UTC (rev 5099)
+++ phpcompta/tags/rel650/include/class_phpcompta_sql.php	2012-09-12 21:0=
5:12 UTC (rev 5100)
@@ -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;
 	}



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


From MAILER-DAEMON Fri Sep 14 18:41:31 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TCeZn-0003ss-Fx
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Sep 2012 18:41:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 15 Sep 2012 00:30:02 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.552365.1347662490.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5101 - phpcompta/tags/rel650/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, 14 Sep 2012 22:41:30 -0000

Author: danydb
Date: 2012-09-15 00:30:02 +0200 (Sat, 15 Sep 2012)
New Revision: 5101

Modified:
   phpcompta/tags/rel650/include/template/module.php
Log:
fix : missing closing tag </a>

Modified: phpcompta/tags/rel650/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/tags/rel650/include/template/module.php	2012-09-12 21:05:12=
 UTC (rev 5100)
+++ phpcompta/tags/rel650/include/template/module.php	2012-09-14 22:30:02=
 UTC (rev 5101)
@@ -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;
 		?>



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


From MAILER-DAEMON Sat Sep 15 09:33:36 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TCsV6-0004vr-SR
	for mharc-phpcompta-dev@gnu.org; Sat, 15 Sep 2012 09:33:36 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 15 Sep 2012 15:22:10 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.553644.1347716015.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5102 - 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: Sat, 15 Sep 2012 13:33:35 -0000

Author: danydb
Date: 2012-09-15 15:22:08 +0200 (Sat, 15 Sep 2012)
New Revision: 5102

Modified:
   phpcompta/tags/rel650/include/ajax_add_menu.php
Log:
Show type of menu

Modified: phpcompta/tags/rel650/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/tags/rel650/include/ajax_add_menu.php	2012-09-14 22:30:02 U=
TC (rev 5101)
+++ phpcompta/tags/rel650/include/ajax_add_menu.php	2012-09-15 13:22:08 U=
TC (rev 5102)
@@ -38,7 +38,16 @@
 	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
 	");



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


From MAILER-DAEMON Sat Sep 15 11:51:21 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TCueP-0001rm-1S
	for mharc-phpcompta-dev@gnu.org; Sat, 15 Sep 2012 11:51:21 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 15 Sep 2012 17:39:56 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.553791.1347724280.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5103 - 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: Sat, 15 Sep 2012 15:51:20 -0000

Author: danydb
Date: 2012-09-15 17:39:55 +0200 (Sat, 15 Sep 2012)
New Revision: 5103

Modified:
   phpcompta/tags/rel650/include/ajax_add_menu.php
Log:
Improve add menu printing

Modified: phpcompta/tags/rel650/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/tags/rel650/include/ajax_add_menu.php	2012-09-15 13:22:08 U=
TC (rev 5102)
+++ phpcompta/tags/rel650/include/ajax_add_menu.php	2012-09-15 15:39:55 U=
TC (rev 5103)
@@ -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
@@ -51,6 +54,7 @@
 	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
@@ -76,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
@@ -96,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>';
+}
+
+?>



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


From MAILER-DAEMON Sat Sep 15 12:00:28 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TCunD-0004C0-WB
	for mharc-phpcompta-dev@gnu.org; Sat, 15 Sep 2012 12:00:27 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 15 Sep 2012 17:48:42 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.553797.1347724826.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5104 - in phpcompta/tags/rel650: 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, 15 Sep 2012 16:00:26 -0000

Author: danydb
Date: 2012-09-15 17:48:42 +0200 (Sat, 15 Sep 2012)
New Revision: 5104

Modified:
   phpcompta/tags/rel650/html/js/infobulle.js
   phpcompta/tags/rel650/html/js/scripts.js
   phpcompta/tags/rel650/include/ajax_get_menu_detail.php
   phpcompta/tags/rel650/include/ajax_get_profile.php
   phpcompta/tags/rel650/include/profile.inc.php
Log:
Improve the profile configuration

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/infobulle.js	2012-09-15 15:39:55 UTC (r=
ev 5103)
+++ phpcompta/tags/rel650/html/js/infobulle.js	2012-09-15 15:48:42 UTC (r=
ev 5104)
@@ -47,7 +47,7 @@
 content[17]=3D"Cliquez sur le titre d'une colonne pour trier";
 content[18]=3D"Donner 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"Donner 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";
 function showBulle(p_ctl)
 {
     d=3Ddocument.getElementById('bulle');

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/scripts.js	2012-09-15 15:39:55 UTC (rev=
 5103)
+++ phpcompta/tags/rel650/html/js/scripts.js	2012-09-15 15:48:42 UTC (rev=
 5104)
@@ -1258,11 +1258,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',
 				  {

Modified: phpcompta/tags/rel650/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/tags/rel650/include/ajax_get_menu_detail.php	2012-09-15 15:=
39:55 UTC (rev 5103)
+++ phpcompta/tags/rel650/include/ajax_get_menu_detail.php	2012-09-15 15:=
48:42 UTC (rev 5104)
@@ -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/tags/rel650/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/tags/rel650/include/ajax_get_profile.php	2012-09-15 15:39:5=
5 UTC (rev 5103)
+++ phpcompta/tags/rel650/include/ajax_get_profile.php	2012-09-15 15:48:4=
2 UTC (rev 5104)
@@ -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,14 +90,14 @@
         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 "<h2>Action gestion accessible</h2>";

Modified: phpcompta/tags/rel650/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/tags/rel650/include/profile.inc.php	2012-09-15 15:39:55 UTC=
 (rev 5103)
+++ phpcompta/tags/rel650/include/profile.inc.php	2012-09-15 15:48:42 UTC=
 (rev 5104)
@@ -244,7 +244,7 @@
 //****************************************************
 // Add a menu, module, submenu,plugin...
 //****************************************************
-if (isset($_POST['add_menu']))
+if (isset($_POST['add_menu']) || isset($_POST['add_impress']))
 {
 	extract($_POST);
 	try



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


From MAILER-DAEMON Sat Sep 15 21:13:10 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TD3Q6-0000XP-TG
	for mharc-phpcompta-dev@gnu.org; Sat, 15 Sep 2012 21:13:10 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 16 Sep 2012 03:01:46 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.554442.1347757990.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5105 - phpcompta/tags/rel650/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: Sun, 16 Sep 2012 01:13:09 -0000

Author: danydb
Date: 2012-09-16 03:01:44 +0200 (Sun, 16 Sep 2012)
New Revision: 5105

Modified:
   phpcompta/tags/rel650/html/style-color.css
   phpcompta/tags/rel650/html/style-epad.css
   phpcompta/tags/rel650/html/style-light.css
   phpcompta/tags/rel650/html/style-print.css
   phpcompta/tags/rel650/html/style.css
Log:
Improve the style sheet with hx.title

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style-color.css	2012-09-15 15:48:42 UTC (r=
ev 5104)
+++ phpcompta/tags/rel650/html/style-color.css	2012-09-16 01:01:44 UTC (r=
ev 5105)
@@ -104,11 +104,6 @@
 	font-size:14px;
 }
=20
-h1.title {
-	color: blue;
-	font-size:25px;
-}
-
 div.u_tmenu {
 	margin-top:0px;
 	width:100%;
@@ -1117,4 +1112,26 @@
 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;
+}
\ No newline at end of file

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style-epad.css	2012-09-15 15:48:42 UTC (re=
v 5104)
+++ phpcompta/tags/rel650/html/style-epad.css	2012-09-16 01:01:44 UTC (re=
v 5105)
@@ -104,11 +104,6 @@
 	font-size:16px;
 }
=20
-h1.title {
-	color: blue;
-	font-size:27px;
-}
-
 div.u_tmenu {
 	margin-top:0px;
 	width:100%;
@@ -1104,4 +1099,26 @@
 	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;
 }
\ No newline at end of file

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style-light.css	2012-09-15 15:48:42 UTC (r=
ev 5104)
+++ phpcompta/tags/rel650/html/style-light.css	2012-09-16 01:01:44 UTC (r=
ev 5105)
@@ -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%;
@@ -1108,4 +1103,27 @@
 }
 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;
+}
\ No newline at end of file

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style-print.css	2012-09-15 15:48:42 UTC (r=
ev 5104)
+++ phpcompta/tags/rel650/html/style-print.css	2012-09-16 01:01:44 UTC (r=
ev 5105)
@@ -253,5 +253,23 @@
 	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;
+}
 /* </style> */

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style.css	2012-09-15 15:48:42 UTC (rev 510=
4)
+++ phpcompta/tags/rel650/html/style.css	2012-09-16 01:01:44 UTC (rev 510=
5)
@@ -99,10 +99,6 @@
 	font-size:14px;
 }
=20
-h1.title {
-	color: blue;
-	font-size:25px;
-}
=20
 div.u_tmenu {
   margin-top:0px;
@@ -1107,3 +1103,26 @@
 div.foldercontent {
 	padding:20px 30px 0px 40px;
 	}
+
+h1.title {
+	color: blue;
+	font-size:24px;
+	font-style: italic;
+}
+h2.title {
+	color: blue;
+	font-size:16px;
+	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;
+}
\ 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 Sep 16 12:52:19 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TDI4x-0004Rh-Q5
	for mharc-phpcompta-dev@gnu.org; Sun, 16 Sep 2012 12:52:19 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 16 Sep 2012 18:41:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.555471.1347814339.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5106 - 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: Sun, 16 Sep 2012 16:52:18 -0000

Author: danydb
Date: 2012-09-16 18:40:59 +0200 (Sun, 16 Sep 2012)
New Revision: 5106

Modified:
   phpcompta/tags/rel650/include/class_acc_account_ledger.php
Log:
bug : Impossible d'avoir impression GRAND LIVRE Pour compte non sold?\195=
?\169

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_acc_account_ledger.php	2012-09-16=
 01:01:44 UTC (rev 5105)
+++ phpcompta/tags/rel650/include/class_acc_account_ledger.php	2012-09-16=
 16:40:59 UTC (rev 5106)
@@ -127,8 +127,7 @@
 	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,
-				 coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
+	    $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



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


From MAILER-DAEMON Sun Sep 16 13:05:19 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TDIHX-0000Mq-4i
	for mharc-phpcompta-dev@gnu.org; Sun, 16 Sep 2012 13:05:19 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 16 Sep 2012 18:53:59 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.555480.1347815118.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5107 - 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: Sun, 16 Sep 2012 17:05:17 -0000

Author: danydb
Date: 2012-09-16 18:53:59 +0200 (Sun, 16 Sep 2012)
New Revision: 5107

Modified:
   phpcompta/tags/rel650/html/js/scripts.js
Log:
Am?\195?\169liore apparence calculatrice

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/scripts.js	2012-09-16 16:40:59 UTC (rev=
 5106)
+++ phpcompta/tags/rel650/html/js/scripts.js	2012-09-16 16:53:59 UTC (rev=
 5107)
@@ -902,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



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


From MAILER-DAEMON Mon Sep 17 14:39:19 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TDgE3-0005tw-QF
	for mharc-phpcompta-dev@gnu.org; Mon, 17 Sep 2012 14:39:19 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 17 Sep 2012 20:28:05 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.559188.1347907159.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5108 - 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: Mon, 17 Sep 2012 18:39:18 -0000

Author: danydb
Date: 2012-09-17 20:28:04 +0200 (Mon, 17 Sep 2012)
New Revision: 5108

Modified:
   phpcompta/tags/rel650/include/profile.inc.php
Log:
When adding a menu it cannot depend on itself

Modified: phpcompta/tags/rel650/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/tags/rel650/include/profile.inc.php	2012-09-16 16:53:59 UTC=
 (rev 5107)
+++ phpcompta/tags/rel650/include/profile.inc.php	2012-09-17 18:28:04 UTC=
 (rev 5108)
@@ -276,6 +276,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;



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


From MAILER-DAEMON Mon Sep 17 14:40:38 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TDgFK-0006fL-2E
	for mharc-phpcompta-dev@gnu.org; Mon, 17 Sep 2012 14:40:38 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 17 Sep 2012 20:29:24 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.559191.1347907237.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5109 - 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: Mon, 17 Sep 2012 18:40:36 -0000

Author: danydb
Date: 2012-09-17 20:29:23 +0200 (Mon, 17 Sep 2012)
New Revision: 5109

Modified:
   phpcompta/tags/rel650/include/profile.inc.php
Log:
When adding a menu it cannot depend on itself (update)

Modified: phpcompta/tags/rel650/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/tags/rel650/include/profile.inc.php	2012-09-17 18:28:04 UTC=
 (rev 5108)
+++ phpcompta/tags/rel650/include/profile.inc.php	2012-09-17 18:29:23 UTC=
 (rev 5109)
@@ -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;



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


From MAILER-DAEMON Mon Sep 17 14:57:31 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TDgVf-00049e-Rp
	for mharc-phpcompta-dev@gnu.org; Mon, 17 Sep 2012 14:57:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 17 Sep 2012 20:46:17 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.559239.1347908250.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5110 - 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: Mon, 17 Sep 2012 18:57:30 -0000

Author: danydb
Date: 2012-09-17 20:46:17 +0200 (Mon, 17 Sep 2012)
New Revision: 5110

Modified:
   phpcompta/tags/rel650/include/class_profile_menu.php
Log:
Show default menu

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_profile_menu.php	2012-09-17 18:29=
:23 UTC (rev 5109)
+++ phpcompta/tags/rel650/include/class_profile_menu.php	2012-09-17 18:46=
:17 UTC (rev 5110)
@@ -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);



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


From MAILER-DAEMON Mon Sep 17 15:06:31 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TDgeN-0006i1-Tq
	for mharc-phpcompta-dev@gnu.org; Mon, 17 Sep 2012 15:06:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 17 Sep 2012 20:55:14 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.559265.1347908789.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5111 - 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: Mon, 17 Sep 2012 19:06:29 -0000

Author: danydb
Date: 2012-09-17 20:55:13 +0200 (Mon, 17 Sep 2012)
New Revision: 5111

Modified:
   phpcompta/tags/rel650/include/ac_common.php
Log:
bug : show default module

Modified: phpcompta/tags/rel650/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/tags/rel650/include/ac_common.php	2012-09-17 18:46:17 UTC (=
rev 5110)
+++ phpcompta/tags/rel650/include/ac_common.php	2012-09-17 18:55:13 UTC (=
rev 5111)
@@ -858,8 +858,8 @@
 		$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)=
);
+			p_type_display=3D'M' and   user_name=3D$1 and p_order=3D(select min(p=
_order) from profile_menu join profile_user using (p_id)
+			where p_type_display=3D'M' and  user_name=3D$2) limit 1", array($g_us=
er->login, $g_user->login));
 		/*
 		 * if nothing found, there is no profile for this user =3D> exit
 		 */



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


From MAILER-DAEMON Mon Sep 17 15:08:21 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TDgg9-0006sq-8Y
	for mharc-phpcompta-dev@gnu.org; Mon, 17 Sep 2012 15:08:21 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 17 Sep 2012 20:57:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.559272.1347908900.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5112 - 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: Mon, 17 Sep 2012 19:08:19 -0000

Author: danydb
Date: 2012-09-17 20:57:00 +0200 (Mon, 17 Sep 2012)
New Revision: 5112

Modified:
   phpcompta/tags/rel650/include/ac_common.php
Log:
bug : show default module, otherwise menu

Modified: phpcompta/tags/rel650/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/tags/rel650/include/ac_common.php	2012-09-17 18:55:13 UTC (=
rev 5111)
+++ phpcompta/tags/rel650/include/ac_common.php	2012-09-17 18:57:00 UTC (=
rev 5112)
@@ -865,8 +865,16 @@
 		 */
 		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
+			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 (empty ($default_module))
+			{
+				echo_warning(_("Utilisateur n'a pas de profile"));
+				exit();
+			}
 		}
 		return $default_module[0]['me_code'];
     }



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


From MAILER-DAEMON Mon Sep 17 15:18:39 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TDgq7-0003Ou-Ru
	for mharc-phpcompta-dev@gnu.org; Mon, 17 Sep 2012 15:18:39 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 17 Sep 2012 21:07:26 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.559302.1347909519.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5113 - 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: Mon, 17 Sep 2012 19:18:39 -0000

Author: danydb
Date: 2012-09-17 21:07:25 +0200 (Mon, 17 Sep 2012)
New Revision: 5113

Modified:
   phpcompta/tags/rel650/include/ac_common.php
Log:
Default module otherwise try to find default menu if several results then=
 returns the first one

Modified: phpcompta/tags/rel650/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/tags/rel650/include/ac_common.php	2012-09-17 18:57:00 UTC (=
rev 5112)
+++ phpcompta/tags/rel650/include/ac_common.php	2012-09-17 19:07:25 UTC (=
rev 5113)
@@ -853,25 +853,42 @@
 	    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
-			p_type_display=3D'M' and   user_name=3D$1 and p_order=3D(select min(p=
_order) from profile_menu join profile_user using (p_id)
-			where p_type_display=3D'M' and  user_name=3D$2) limit 1", array($g_us=
er->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))
 		{
 			$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)=
);
+			 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();
 			}
@@ -881,7 +898,8 @@
=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)
     {



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


From MAILER-DAEMON Mon Sep 17 15:24:56 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TDgwC-0005c9-AV
	for mharc-phpcompta-dev@gnu.org; Mon, 17 Sep 2012 15:24:56 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 17 Sep 2012 21:13:43 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.559315.1347909895.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5114 - 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: Mon, 17 Sep 2012 19:24:55 -0000

Author: danydb
Date: 2012-09-17 21:13:43 +0200 (Mon, 17 Sep 2012)
New Revision: 5114

Modified:
   phpcompta/tags/rel650/html/js/accounting_item.js
Log:
Fix bug when clicking several times on search_poste

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/accounting_item.js	2012-09-17 19:07:25 =
UTC (rev 5113)
+++ phpcompta/tags/rel650/html/js/accounting_item.js	2012-09-17 19:13:43 =
UTC (rev 5114)
@@ -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;



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


From MAILER-DAEMON Tue Sep 18 17:48:18 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TE5eU-0007T3-EQ
	for mharc-phpcompta-dev@gnu.org; Tue, 18 Sep 2012 17:48:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 18 Sep 2012 23:37:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.562855.1348004897.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5115 - phpcompta/tags/rel650/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: Tue, 18 Sep 2012 21:48:17 -0000

Author: danydb
Date: 2012-09-18 23:37:02 +0200 (Tue, 18 Sep 2012)
New Revision: 5115

Modified:
   phpcompta/tags/rel650/html/ajax_poste.php
Log:
probl?\195?\168me quand utilisateur est administrateur global, impossible=
 de voir les postes comptables

Modified: phpcompta/tags/rel650/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/tags/rel650/html/ajax_poste.php	2012-09-17 19:13:43 UTC (re=
v 5114)
+++ phpcompta/tags/rel650/html/ajax_poste.php	2012-09-18 21:37:02 UTC (re=
v 5115)
@@ -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)



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


From MAILER-DAEMON Tue Sep 18 17:57:45 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TE5nd-0001UW-Sz
	for mharc-phpcompta-dev@gnu.org; Tue, 18 Sep 2012 17:57:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 18 Sep 2012 23:46:38 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.562881.1348005465.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5116 - phpcompta/tags/rel650/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: Tue, 18 Sep 2012 21:57:44 -0000

Author: danydb
Date: 2012-09-18 23:46:37 +0200 (Tue, 18 Sep 2012)
New Revision: 5116

Modified:
   phpcompta/tags/rel650/html/style-color.css
   phpcompta/tags/rel650/html/style-epad.css
   phpcompta/tags/rel650/html/style-light.css
   phpcompta/tags/rel650/html/style-print.css
   phpcompta/tags/rel650/html/style.css
Log:
Improve the style sheet with hx.title

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style-color.css	2012-09-18 21:37:02 UTC (r=
ev 5115)
+++ phpcompta/tags/rel650/html/style-color.css	2012-09-18 21:46:37 UTC (r=
ev 5116)
@@ -1134,4 +1134,11 @@
 	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;
 }
\ No newline at end of file

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style-epad.css	2012-09-18 21:37:02 UTC (re=
v 5115)
+++ phpcompta/tags/rel650/html/style-epad.css	2012-09-18 21:46:37 UTC (re=
v 5116)
@@ -1121,4 +1121,11 @@
 	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;
 }
\ No newline at end of file

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style-light.css	2012-09-18 21:37:02 UTC (r=
ev 5115)
+++ phpcompta/tags/rel650/html/style-light.css	2012-09-18 21:46:37 UTC (r=
ev 5116)
@@ -1126,4 +1126,11 @@
 	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;
 }
\ No newline at end of file

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style-print.css	2012-09-18 21:37:02 UTC (r=
ev 5115)
+++ phpcompta/tags/rel650/html/style-print.css	2012-09-18 21:46:37 UTC (r=
ev 5116)
@@ -272,4 +272,11 @@
 	margin-left: 45px;
 	text-decoration: underline;
 }
+h5.title {
+	color: blue;
+	font-size:12px;
+	margin-left: 45px;
+	text-decoration: none;
+	font-style: italic;
+}
 /* </style> */

Modified: phpcompta/tags/rel650/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/tags/rel650/html/style.css	2012-09-18 21:37:02 UTC (rev 511=
5)
+++ phpcompta/tags/rel650/html/style.css	2012-09-18 21:46:37 UTC (rev 511=
6)
@@ -1125,4 +1125,11 @@
 	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;
 }
\ 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 Tue Sep 18 17:58:38 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TE5oU-0001fF-2U
	for mharc-phpcompta-dev@gnu.org; Tue, 18 Sep 2012 17:58:38 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 18 Sep 2012 23:47:27 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.562884.1348005517.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5117 - 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: Tue, 18 Sep 2012 21:58:37 -0000

Author: danydb
Date: 2012-09-18 23:47:27 +0200 (Tue, 18 Sep 2012)
New Revision: 5117

Modified:
   phpcompta/tags/rel650/include/class_html_input.php
   phpcompta/tags/rel650/include/class_iaction.php
   phpcompta/tags/rel650/include/class_ianccard.php
   phpcompta/tags/rel650/include/class_ibutton.php
   phpcompta/tags/rel650/include/class_icard.php
   phpcompta/tags/rel650/include/class_icheckbox.php
   phpcompta/tags/rel650/include/class_iconcerned.php
   phpcompta/tags/rel650/include/class_idate.php
   phpcompta/tags/rel650/include/class_ihidden.php
   phpcompta/tags/rel650/include/class_inum.php
   phpcompta/tags/rel650/include/class_iperiod.php
   phpcompta/tags/rel650/include/class_iposte.php
   phpcompta/tags/rel650/include/class_irelated_action.php
   phpcompta/tags/rel650/include/class_iselect.php
   phpcompta/tags/rel650/include/class_itext.php
   phpcompta/tags/rel650/include/class_itextarea.php
   phpcompta/tags/rel650/include/class_itva_popup.php
Log:
improve html widget with un ID

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_html_input.php	2012-09-18 21:46:3=
7 UTC (rev 5116)
+++ phpcompta/tags/rel650/include/class_html_input.php	2012-09-18 21:47:2=
7 UTC (rev 5117)
@@ -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)

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_iaction.php	2012-09-18 21:46:37 U=
TC (rev 5116)
+++ phpcompta/tags/rel650/include/class_iaction.php	2012-09-18 21:47:27 U=
TC (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_ianccard.php	2012-09-18 21:46:37 =
UTC (rev 5116)
+++ phpcompta/tags/rel650/include/class_ianccard.php	2012-09-18 21:47:27 =
UTC (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_ibutton.php	2012-09-18 21:46:37 U=
TC (rev 5116)
+++ phpcompta/tags/rel650/include/class_ibutton.php	2012-09-18 21:47:27 U=
TC (rev 5117)
@@ -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
@@ -34,10 +34,10 @@
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_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/tags/rel650/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/tags/rel650/include/class_icard.php	2012-09-18 21:46:37 UTC=
 (rev 5116)
+++ phpcompta/tags/rel650/include/class_icard.php	2012-09-18 21:47:27 UTC=
 (rev 5117)
@@ -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;
     }
     /*!\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

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_icheckbox.php	2012-09-18 21:46:37=
 UTC (rev 5116)
+++ phpcompta/tags/rel650/include/class_icheckbox.php	2012-09-18 21:47:27=
 UTC (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_iconcerned.php	2012-09-18 21:46:3=
7 UTC (rev 5116)
+++ phpcompta/tags/rel650/include/class_iconcerned.php	2012-09-18 21:47:2=
7 UTC (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_idate.php	2012-09-18 21:46:37 UTC=
 (rev 5116)
+++ phpcompta/tags/rel650/include/class_idate.php	2012-09-18 21:47:27 UTC=
 (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_ihidden.php	2012-09-18 21:46:37 U=
TC (rev 5116)
+++ phpcompta/tags/rel650/include/class_ihidden.php	2012-09-18 21:47:27 U=
TC (rev 5117)
@@ -31,7 +31,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(! isset($this->id))?$this->name:$this->id;
+		$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/tags/rel650/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/tags/rel650/include/class_inum.php	2012-09-18 21:46:37 UTC =
(rev 5116)
+++ phpcompta/tags/rel650/include/class_inum.php	2012-09-18 21:47:27 UTC =
(rev 5117)
@@ -53,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
@@ -74,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.'"   ':' =
';
@@ -84,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/tags/rel650/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/tags/rel650/include/class_iperiod.php	2012-09-18 21:46:37 U=
TC (rev 5116)
+++ phpcompta/tags/rel650/include/class_iperiod.php	2012-09-18 21:47:27 U=
TC (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_iposte.php	2012-09-18 21:46:37 UT=
C (rev 5116)
+++ phpcompta/tags/rel650/include/class_iposte.php	2012-09-18 21:47:27 UT=
C (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_irelated_action.php	2012-09-18 21=
:46:37 UTC (rev 5116)
+++ phpcompta/tags/rel650/include/class_irelated_action.php	2012-09-18 21=
:47:27 UTC (rev 5117)
@@ -41,6 +41,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 +50,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/tags/rel650/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/tags/rel650/include/class_iselect.php	2012-09-18 21:46:37 U=
TC (rev 5116)
+++ phpcompta/tags/rel650/include/class_iselect.php	2012-09-18 21:47:27 U=
TC (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_itext.php	2012-09-18 21:46:37 UTC=
 (rev 5116)
+++ phpcompta/tags/rel650/include/class_itext.php	2012-09-18 21:47:27 UTC=
 (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_itextarea.php	2012-09-18 21:46:37=
 UTC (rev 5116)
+++ phpcompta/tags/rel650/include/class_itextarea.php	2012-09-18 21:47:27=
 UTC (rev 5117)
@@ -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/tags/rel650/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/tags/rel650/include/class_itva_popup.php	2012-09-18 21:46:3=
7 UTC (rev 5116)
+++ phpcompta/tags/rel650/include/class_itva_popup.php	2012-09-18 21:47:2=
7 UTC (rev 5117)
@@ -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);



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


From MAILER-DAEMON Wed Sep 19 17:07:02 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TERU6-0000u1-7r
	for mharc-phpcompta-dev@gnu.org; Wed, 19 Sep 2012 17:07:02 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 19 Sep 2012 22:55:44 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.566066.1348088822.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5118 - 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: Wed, 19 Sep 2012 21:07:01 -0000

Author: danydb
Date: 2012-09-19 22:55:43 +0200 (Wed, 19 Sep 2012)
New Revision: 5118

Modified:
   phpcompta/tags/rel650/include/config_file.php
Log:
Bug locale must be in uppercase=20

Modified: phpcompta/tags/rel650/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/tags/rel650/include/config_file.php	2012-09-18 21:47:27 UTC=
 (rev 5117)
+++ phpcompta/tags/rel650/include/config_file.php	2012-09-19 20:55:43 UTC=
 (rev 5118)
@@ -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","");');



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


From MAILER-DAEMON Thu Sep 20 14:59:30 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TElyE-0004Js-81
	for mharc-phpcompta-dev@gnu.org; Thu, 20 Sep 2012 14:59:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 20 Sep 2012 20:48:16 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.569588.1348167569.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r403 - 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: Thu, 20 Sep 2012 18:59:28 -0000

Author: danydb
Date: 2012-09-20 20:48:15 +0200 (Thu, 20 Sep 2012)
New Revision: 403

Added:
   trunk/doc/Doxyfile
Log:
Documentation for all plugins

Added: trunk/doc/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/Doxyfile	                        (rev 0)
+++ trunk/doc/Doxyfile	2012-09-20 18:48:15 UTC (rev 403)
@@ -0,0 +1,1840 @@
+# Doxyfile 1.8.2
+
+# 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 sequence of words) that shou=
ld
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME           =3D "Plugins "
+
+# 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 6.5
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line descr=
iption
+# for a project that appears at the top of each page and should give vie=
wer
+# a quick idea about the purpose of the project. Keep the description sh=
ort.
+
+PROJECT_BRIEF          =3D
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should n=
ot
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =3D
+
+# 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 html
+
+# 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 YES
+
+# 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-Cyrillic, Slov=
ak,
+# 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
+
+# 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 NO
+
+# 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 YES
+
+# 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. Note that you specify absolute paths here, but also
+# relative paths, which will be relative from the directory where doxyge=
n is
+# started.
+
+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 if your file system
+# 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 4
+
+# 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
+
+# This tag can be used to specify a number of word-keyword mappings (TCL=
 only).
+# A mapping has the form "name=3Dvalue". For example adding
+# "class=3Ditcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST              =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 ext=
end it
+# using this tag. The format is ext=3Dlanguage, where ext is a file exte=
nsion,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL=
, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (d=
efault
+# is PHP), and .f files as C (default is Fortran), use: inc=3DFortran f=3D=
C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwis=
e the
+# files are not read by doxygen.
+
+EXTENSION_MAPPING      =3D
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processe=
s all
+# comments according to the Markdown format, which allows for more reada=
ble
+# documentation. See http://daringfireball.net/projects/markdown/ for de=
tails.
+# The output of markdown processing is further processed by doxygen, so =
you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       =3D YES
+
+# When enabled doxygen tries to link words that correspond to documented=
 classes,
+# or namespaces to their corresponding documentation. Such a link can be
+# prevented in individual cases by by putting a % sign in front of the w=
ord or
+# globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT       =3D YES
+
+# 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 makes the inheritance and collaborati=
on
+# 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 default) will make doxygen replace the get and set methods by a prope=
rty in the documentation. This will only work if the methods are indeed g=
etting or setting a simple type. If this is not the case, or you want to =
show the 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 NO
+
+# 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 the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs an=
d
+# unions are shown inside the group in which they are included (e.g. usi=
ng
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES =3D NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, an=
d
+# unions with only public data fields will be shown inline in the docume=
ntation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the d=
efault),
+# structs, classes, and unions are shown on a separate page (for HTML an=
d Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS  =3D NO
+
+# 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 penalty.
+# 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 roughly double =
the
+# 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
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache c=
an be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols giv=
en
+# their name and scope. Since this can be an expensive process and often=
 the
+# same symbol appear multiple times in the code, doxygen keeps a cache o=
f
+# pre-resolved symbols. If the cache is too small doxygen will become sl=
ower.
+# If the cache is too large, memory is wasted. The cache size is given b=
y this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the defaul=
t is 0,
+# corresponding to a cache size of 2^16 =3D 65536 symbols.
+
+LOOKUP_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_PACKAGE tag is set to YES all members with package or i=
nternal
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE        =3D NO
+
+# 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 namespaces 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 NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so t=
hat
+# constructors and destructors are listed first. If set to NO (the defau=
lt)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to N=
O
+# and ignored for detailed docs if SORT_MEMBER_DOCS is 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 NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reje=
ct a
+# match between the prototype and the implementation of a member functio=
n even
+# if there is only one candidate or it is obvious which candidate to cho=
ose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING dox=
ygen
+# will still accept a match between prototype and implementation in such=
 cases.
+
+STRICT_PROTO_MATCHING  =3D NO
+
+# 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 macro 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 macros i=
n 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
+
+# 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 gener=
ated
+# output files in an output format independent way. To create the layout=
 file
+# that represents 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
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this comman=
d
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use th=
is
+# feature you need bibtex and perl available in the search path.
+
+CITE_BIB_FILES         =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
+
+# The WARN_NO_PARAMDOC option can be enabled 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
+
+#-----------------------------------------------------------------------=
----
+# 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 ../amortis \
+                        ../backup_noadmin \
+                        ../barcode \
+                        ../coprop \
+                        ../dbtools \
+                        ../doc \
+                        ../importbank \
+                        ../import_card \
+                        ../import_doli \
+                        ../modop \
+                        ../nbproject \
+                        ../rapport_avance \
+                        ../skel \
+                        ../tool_pcmn \
+                        ../tools \
+                        ../tva
+
+
+# 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++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h=
 *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *=
.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS          =3D
+
+# 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 NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that s=
hould be
+# 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.
+# Note that relative paths are relative to the directory from which doxy=
gen is
+# run.
+
+EXCLUDE                =3D
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are e=
xcluded
+# 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
+
+# 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 or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+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
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters p=
er file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if an=
y)
+# and it is also possible to disable source filtering for a specific pat=
tern
+# using *.ext=3D (so without naming a filter). This option only has effe=
ct when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =3D
+
+#-----------------------------------------------------------------------=
----
+# 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 NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         =3D NO
+
+# 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, C++ and Fortran comments will always remain visib=
le.
+
+STRIP_CODE_COMMENTS    =3D YES
+
+# 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 NO
+
+# 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 NO
+
+# 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. Note that when using a custom header you are responsi=
ble
+#  for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typicall=
y
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW=
!
+
+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
+
+# 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 left blank doxygen will
+# generate a default style sheet. Note that it is recommended to use
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and th=
is
+# tag will in the future become obsolete.
+
+HTML_STYLESHEET        =3D
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
+# user-defined cascading style sheet that is included after the standard
+# style sheets created by doxygen. Using this option one can overrule
+# certain style aspects. This is preferred over using HTML_STYLESHEET
+# since it does not replace the standard style sheet and is therefor mor=
e
+# robust against future updates. Doxygen will copy the style sheet file =
to
+# the output directory.
+
+HTML_EXTRA_STYLESHEET  =3D
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra imag=
es or
+# other source files which should be copied to the HTML output directory=
. Note
+# that these files will be copied to the base HTML output directory. Use=
 the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load t=
hese
+# files. In the HTML_STYLESHEET file, use the file name only. Also note =
that
+# the files will be copied as-is; there are no commands or markers avail=
able.
+
+HTML_EXTRA_FILES       =3D
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background image=
s
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    =3D 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    =3D 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applie=
d,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2=
.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  =3D 80
+
+# 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_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.
+
+HTML_DYNAMIC_SECTIONS  =3D NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the us=
er
+# can expand and collapse entries dynamically later on. Doxygen will exp=
and
+# the tree to such a level that at most the specified number of entries =
are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree =
by
+# default. 0 is a special value representing an infinite number of entri=
es
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES =3D 100
+
+# 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
+# for 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
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
+# identify the documentation publisher. This should be a reverse domain-=
name
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    =3D org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher=
.
+
+DOCSET_PUBLISHER_NAME  =3D Publisher
+
+# 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 NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated 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 co=
ntents
+# 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 (=
tabs)
+# at top of each HTML page. The value NO (the default) enables the index=
 and
+# the value YES disables it. Since the tabs have the same information as=
 the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX          =3D NO
+
+# 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.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
+
+GENERATE_TREEVIEW      =3D NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum val=
ues
+# (range [0,1..20]) that doxygen will group on one line in the generated=
 HTML
+# documentation. Note that a value of 0 will completely suppress the enu=
m
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   =3D 4
+
+# 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
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    =3D NO
+
+# 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
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern bro=
wsers.
+# Note that when changing this option you need to delete any form_*.png =
files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    =3D YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the H=
TML
+# output. When enabled you may also need to install MathJax separately a=
nd
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            =3D NO
+
+# When MathJax is enabled you need to specify the location relative to t=
he
+# HTML output directory using the MATHJAX_RELPATH option. The destinatio=
n
+# directory should contain the MathJax.js script. For instance, if the m=
athjax
+# directory is located at the same level as the HTML output directory, t=
hen
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result=
 without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH        =3D http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax exten=
sion
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     =3D
+
+# 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
+# (GENERATE_DOCSET) there is already a search function so this one shoul=
d
+# 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 clien=
t
+# using Javascript. Doxygen will generate the search PHP script and inde=
x
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to s=
etup
+# 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 YES
+
+# 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, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             =3D a4
+
+# 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
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer fo=
r
+# the generated latex document. The footer should contain everything aft=
er
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are do=
ing!
+
+LATEX_FOOTER           =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 NO
+
+# 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 code 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
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for th=
e
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". =
See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE        =3D plain
+
+#-----------------------------------------------------------------------=
----
+# 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 style sheet 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
+# pointed to by INCLUDE_PATH will be searched when 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 ../amortis \
+			../backup_noadmin \
+			../barcode \
+			../coprop \
+			../dbtools \
+			../doc \
+			../importbank \
+			../import_card \
+			../import_doli \
+			../modop \
+			../nbproject \
+			../rapport_avance \
+			../skel \
+			../tool_pcmn \
+			../tools \
+			../tva=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
+
+# 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=
 that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED      =3D
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like mac=
ros
+# that are alone on a line, have an all uppercase name, and do not end w=
ith a
+# semicolon, because these will confuse 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. For e=
ach
+# tag file the location of the external documentation should be added. T=
he
+# 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. Note that each tag file must have a unique name (where the na=
me does
+# NOT include the path). If a tag file is not located in the directory i=
n 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 also works with HAVE_DOT disabled, but it is recommended t=
o
+# install and use dot, since it yields more 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 YES
+
+# 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
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can=
 set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        =3D 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can sp=
ecify
+# the font name using DOT_FONTNAME. You 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
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME           =3D Helvetica
+
+# 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 Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FON=
TPATH to
+# set the path where dot can find it.
+
+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
+# 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 NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown insid=
e
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size mo=
re
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   =3D 10
+
+# 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 generate a graphical hierarchy of all classes instead of a textua=
l one.
+
+GRAPHICAL_HIERARCHY    =3D YES
+
+# If the DIRECTORY_GRAPH 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 svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
+
+DOT_IMAGE_FORMAT       =3D png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES =
to
+# enable generation of interactive SVG images that allow zooming and pan=
ning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ y=
ou
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG file=
s
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG        =3D NO
+
+# 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 MSCFILE_DIRS tag can be used to specify one or more directories th=
at
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_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 0
+
+# 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 Fri Sep 21 20:40:07 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TFDlP-0001FS-O7
	for mharc-phpcompta-dev@gnu.org; Fri, 21 Sep 2012 20:40:07 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 22 Sep 2012 02:29:12 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.574103.1348274407.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r404 - in trunk: coprop coprop/include
	coprop/include/template 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: Sat, 22 Sep 2012 00:40:07 -0000

Author: danydb
Date: 2012-09-22 02:29:10 +0200 (Sat, 22 Sep 2012)
New Revision: 404

Modified:
   trunk/coprop/coprop-javascript.js
   trunk/coprop/include/key.inc.php
   trunk/coprop/include/template/key_detail.php
   trunk/doc/Doxyfile
Log:
Rapport avance : formulaire - detail impl?\195?\169ment?\195?\169

Modified: trunk/coprop/coprop-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/coprop/coprop-javascript.js	2012-09-20 18:48:15 UTC (rev 403)
+++ trunk/coprop/coprop-javascript.js	2012-09-22 00:29:10 UTC (rev 404)
@@ -125,6 +125,7 @@
 				{
 					remove_waiting_box();
 					$('keydetail_div').innerHTML=3Dresponse.responseText;
+					$('keydetail_div').show();
 					response.responseText.evalScripts();
 				}
 				catch(e)
@@ -161,6 +162,7 @@
 				{
 					remove_waiting_box();
 					$('keydetail_div').innerHTML=3Dresponse.responseText;
+					$('keydetail_div').show();
 					response.responseText.evalScripts();
=20
 				}
@@ -387,7 +389,7 @@
=20
 function appel_fond_show()
 {
-    try=20
+    try
     {
         var aft=3D$('aft');
         var choice=3Daft.options[aft.selectedIndex].value;
@@ -413,5 +415,5 @@
     {
         alert(e.message);
     }
-   =20
+
 }
\ 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	2012-09-20 18:48:15 UTC (rev 403)
+++ trunk/coprop/include/key.inc.php	2012-09-22 00:29:10 UTC (rev 404)
@@ -52,7 +52,7 @@
     coalesce(  (select sum(crd_amount) from
 		coprop.clef_repartition_detail as crd
 		where crd.cr_id=3Dcr.cr_id) ,0) as delta
-    from=20
+    from
     coprop.clef_repartition as cr
     order by cr_name";
=20
@@ -74,7 +74,7 @@
                     Diff=C3=A9rence
                 </th>
                 <th>
-                   =20
+
                 </th>
 	</tr>
 <?
@@ -84,7 +84,7 @@
 ?>
 	<tr id=3D"row<?=3D$a_key[$i]['cr_id']?>">
 		<td>
-			<?=3Dh($mod_key)?>
+			<?=3D$mod_key?>
 		</td>
 		<td>
 			<?=3Dh($a_key[$i]['cr_note'])?>

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	2012-09-20 18:48:15 UTC =
(rev 403)
+++ trunk/coprop/include/template/key_detail.php	2012-09-22 00:29:10 UTC =
(rev 404)
@@ -29,7 +29,7 @@
 ?>
 <div class=3D"content" style=3D"margin-left: 20px">
 <h1><?=3D$str_message?></h1>
-<?=3DHtmlInput::button('rlist','Retour list',' onclick=3D"$(\'key_list\'=
).show()"')?>
+<?=3DHtmlInput::button('rlist','Retour liste',' onclick=3D"$(\'key_list\=
').show();$(\'keydetail_div\').hide()"')?>
=20
 <h2> Caract=C3=A9ristique</h2>
 <table>

Modified: trunk/doc/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/Doxyfile	2012-09-20 18:48:15 UTC (rev 403)
+++ trunk/doc/Doxyfile	2012-09-22 00:29:10 UTC (rev 404)
@@ -676,9 +676,20 @@
                         ../skel \
                         ../tool_pcmn \
                         ../tools \
-                        ../tva
+                        ../tva \
+			../importbank/include \
+			../tool_pcmn/include \
+			../import_card/include \
+			../import_doli/include \
+			../coprop/include \
+			../amortis/include \
+			../rapport_avance/include \
+			../skel/include \
+			../tools/include \
+			../backup_noadmin/include
=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
@@ -809,25 +820,25 @@
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
=20
-INLINE_SOURCES         =3D NO
+INLINE_SOURCES         =3D YES
=20
 # 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, C++ and Fortran comments will always remain visib=
le.
=20
-STRIP_CODE_COMMENTS    =3D YES
+STRIP_CODE_COMMENTS    =3D NO
=20
 # If the REFERENCED_BY_RELATION tag is set to YES
 # then for each documented function all documented
 # functions referencing it will be listed.
=20
-REFERENCED_BY_RELATION =3D NO
+REFERENCED_BY_RELATION =3D YES
=20
 # 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.
=20
-REFERENCES_RELATION    =3D NO
+REFERENCES_RELATION    =3D YES
=20
 # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
 # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from



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


From MAILER-DAEMON Fri Sep 21 21:02:58 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TFE7W-0004xN-QY
	for mharc-phpcompta-dev@gnu.org; Fri, 21 Sep 2012 21:02:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 22 Sep 2012 02:51:53 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.574119.1348275778.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r408 - in trunk: . rapport_avance
	rapport_avance/doc rapport_avance/include
	rapport_avance/include/template 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: Sat, 22 Sep 2012 01:02:57 -0000

Author: danydb
Date: 2012-09-22 02:51:52 +0200 (Sat, 22 Sep 2012)
New Revision: 408

Added:
   trunk/rapport_avance/
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/ajax_add_param_detail.php
   trunk/rapport_avance/ajax_save_param_detail.php
   trunk/rapport_avance/ajax_search_code.php
   trunk/rapport_avance/include/
   trunk/rapport_avance/include/class_formulaire_param.php
   trunk/rapport_avance/include/class_formulaire_param_detail.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/template/
   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/index.php
   trunk/rapport_avance/rapav_constant.php
   trunk/rapport_avance/rapav_javascript.js
   trunk/rapport_avance/raw.php
   trunk/rapport_avance/sql/create.sql
Removed:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/doc/625-notice.pdf
   trunk/rapport_avance/doc/extension_tva.odt
   trunk/rapport_avance/doc/extension_tva.pdf
   trunk/rapport_avance/index.php
   trunk/rapport_avance/sql/patch2.sql
Log:
definition + param

Copied: trunk/rapport_avance (from rev 402, trunk/tva)

Deleted: 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/tva/ajax.php	2012-09-04 16:45:36 UTC (rev 402)
+++ trunk/rapport_avance/ajax.php	2012-09-22 00:51:52 UTC (rev 408)
@@ -1,232 +0,0 @@
-<?php
-require_once('class_database.php');
-require_once('class_ext_tva.php');
-require_once('class_ibutton.php');
-require_once ('class_ext_list_intra.php');
-require_once ('class_ext_list_assujetti.php');
-require_once('class_acc_ledger.php');
-
-extract($_GET);
-global $g_parameter,$cn;
-
-$html=3D'';$extra=3D'';$ctl=3D'';
-switch($act) {
-case 'dsp_decl':
-  /* the hide button */
-  $button=3Dnew IButton('hide');
-  $button->label=3D_('Retour');
-  $button->javascript=3D"$('detail').hide();$('main').show();";
-  if ( $type =3D=3D 1) {
-    /* display the declaration of amount */
-    $decl=3Dnew Ext_Tva($cn);
-    $decl->set_parameter('id',$id);
-    $decl->load();
-    $r=3D$button->input();
-    $r.=3D$decl->display();
-    $r.=3D$button->input();
-  }
-  if ( $type =3D=3D 3) {
-    /* display the declaration for INTRACOM */
-    $decl=3Dnew Ext_List_Intra($cn);
-    $decl->set_parameter('id',$id);
-    $decl->load();
-    $r=3D$button->input();
-    $r.=3D$decl->display();
-    $r.=3D$button->input();
-  }
-  if ( $type =3D=3D 2) {
-    /* display the declaration of customer */
-    $decl=3Dnew Ext_List_Assujetti($cn);
-    $decl->set_parameter('id',$id);
-    $decl->load();
-    $r=3D$button->input();
-    $r.=3D$decl->display();
-    $r.=3D$button->input();
-  }
-
-  break;
-  /**
-   * generate writing
-   */
-case 'rw':
-  require_once('class_acc_ledger.php');
-  $count=3D$cn->get_value('select count(*) from tva_belge.declaration_am=
ount where da_id=3D$1',array($_REQUEST['p_id']));
-  if ( $count =3D=3D 1 )
-    {
-      $ctl=3D'record_write';
-      $ledger=3Dnew Acc_ledger($cn,0);
-      $sel_ledger=3D$ledger->select_ledger('ODS',1);
-      $r=3DHtmlInput::title_box('G=C3=A9n=C3=A9ration =C3=A9criture','re=
cord_write');
-	  if ($sel_ledger !=3D null)
-	  {
-		  $r.=3D'<form onsubmit=3D"save_write(this);return false;">';
-		  $decl=3Dnew Ext_Tva($cn);
-		  $decl->set_parameter('id',$_GET['p_id']);
-		  $decl->load();
-		  $date=3Dnew IDate('pdate');
-		  $r.=3D"Date :".$date->input().'<br>';
-		  $r.=3D"Choix du journal : ".$sel_ledger->input();
-		  $r.=3D$decl->propose_form();
-		  $r.=3DHtmlInput::hidden('mt',microtime(true));
-		  $r.=3DHtmlInput::extension();
-		  $r.=3Ddossier::hidden();
-		  $r.=3DHtmlInput::submit('save','Sauver','onclick=3D"return confirm(\=
'Vous confirmez ? \')"');
-		  $r.=3D'</form>';
-		} else {
-			$r.=3D'<h2 class=3D"error"> Aucun journal accessible</h2>';
-		}
-	}
-	else
-    {
-      $ctl=3D'record_write';
-      $r=3DHtmlInput::anchor_close($ctl);
-      $r.=3D"<h2 class=3D\"info\">D=C3=A9sol=C3=A9 cette op=C3=A9ration =
n'existe pas </h2>";
-      $r.=3D'<span class=3D"notice">Il se peut que l\'information aie =C3=
=A9t=C3=A9 effac=C3=A9e</span>';
-      $r.=3DHtmlInput::button_close($ctl);
-    }
-  break;
-
-case 'sw':
-  $ctl=3D'record_write';
-  ob_start();
-  echo   '<div style=3D"float:right"><a class=3D"mtitle" href=3D"javascr=
ipt:void(0)" onclick=3D"removeDiv(\'record_write\')">fermer</a></div>';
-  extract($_GET);
-  try {
-    $array=3Darray();
-    $array['e_date']=3D$pdate;
-    /* give automatically the periode */
-    $periode=3Dnew Periode($cn);
-    $periode->find_periode($pdate);
-    $array['period']=3D$periode->p_id;
-    $nb_item=3Dcount($account);
-    for ($i=3D0;$i<count($account);$i++) {
-      $array['amount'.$i]=3D$amount[$i];
-      $array['poste'.$i]=3D$account[$i];
-      $array['ld'.$i]=3D'';
-      if ( isset($deb[$i])) $array['ck'.$i]=3D1;
-    }
-    /* ATVA */
-    if ( isset($atva)) {
-      $array['poste'.$i]=3D$atva;
-      $array['amount'.$i]=3D$atva_amount;
-      $array['ld'.$i]=3D'';
-      if ( isset($atva_ic)) $array['ck'.$i]=3D1;
-      $i++;
-      $nb_item++;
-    }
-    /* CRED */
-   if ( isset($crtva)) {
-      $array['poste'.$i]=3D$crtva;
-      $array['amount'.$i]=3D$crtva_amount;
-      $array['ld'.$i]=3D'';
-      if ( isset($crtva_ic)) $array['ck'.$i]=3D1;
-      $i++;
-      $nb_item++;
-    }
-    /* DET */
-   if ( isset($dttva)) {
-      $array['poste'.$i]=3D$dttva;
-      $array['amount'.$i]=3D$dttva_amount;
-      $array['ld'.$i]=3D'';
-      if ( isset($dttva_ic)) $array['ck'.$i]=3D1;
-      $i++;
-      $nb_item++;
-    }
-    /* solde */
-   if ( isset($solde)) {
-      $array['poste'.$i]=3D$solde;
-      $array['amount'.$i]=3D$solde_amount;
-      $array['ld'.$i]=3D'';
-      if ( isset($solde_ic)) $array['ck'.$i]=3D1;
-      $i++;
-      $nb_item++;
-    }
-   $array['nb_item']=3D$nb_item;
-   $array['e_pj']=3D'';
-   $array['e_pj_suggest']=3D'NONE';
-
-   $array['p_jrn']=3D$p_jrn;
-   $array['mt']=3D$mt;
-
-   $array['desc']=3D'Extension TVA : =C3=A9criture g=C3=A9n=C3=A9r=C3=A9=
e';
-   $ods=3Dnew Acc_Ledger($cn,$p_jrn);
-   $ods->save($array);
-   echo h2info("Sauv=C3=A9e : ajoutez le num=C3=A9ro de pi=C3=A8ce");
-   echo   HtmlInput::detail_op($ods->jr_id,'d=C3=A9tail op=C3=A9ration :=
 '.$ods->internal);
-   $ods->with_concerned=3Dfalse;
-   echo $ods->confirm($array,true);
-  } catch(Exception $e) {
-    echo alert($e->getMessage());
-  }
-  $r=3Dob_get_contents();
-  ob_end_clean();
-   break;
-case 'rm_form':
-  switch($type)
-    {
-    case 'da':
-      $sql=3D"delete from tva_belge.declaration_amount where da_id=3D$1"=
;
-      break;
-    case 'li':
-      $sql=3D"delete from tva_belge.intracomm where i_id=3D$1";
-      break;
-    case 'lc':
-      $sql=3D"delete from tva_belge.assujetti where a_id=3D$1";
-      break;
-    }
-  $ctl=3D'remove_form';
-  $cn->exec_sql($sql,array($_REQUEST['p_id']));
-  $r=3DHtmlInput::anchor_close($ctl);
-  $r.=3D'<h2 class=3D"info"> Information </h2>';
-  $r.=3D'<h2 class=3D"notice">Op=C3=A9ration effac=C3=A9e</h2>';
-  $r.=3DHtmlInput::button_close($ctl);
-  $html=3Descape_xml($r);
-  break;
-case 'add_param':
-	$ctl=3D"paramadd_id";
-	$r=3DHtmlInput::title_box("Ajout param=C3=A8tre",$ctl);
-	$r.=3D'<h3>'._('Pour la grille ').$pcode.'</h3>';
-	// TVA input
-	$text =3D new ITva_Popup('tva_id');
-	$text->add_label('tva_label');
-	$text->js =3D 'onchange=3D"set_tva_label(this);"';
-	$text->with_button(true);
-
-	// Accounting
-	$iposte=3Dnew IPoste('paccount');
-	$iposte->set_attribute('gDossier',Dossier::id());
-	$iposte->set_attribute('jrn',0);
-	$iposte->set_attribute('account','paccount');
-	$iposte->set_attribute('label','paccount_label');
-
-
-	$r.=3D'<form method=3D"POST" id=3D"faddparm"onsubmit=3D"return confirm(=
\'Vous confirmez ?\');" style=3D"margin-left:15px">';
-	$r.=3DHtmlInput::request_to_hidden(array("tab","gDossier","plugin_code"=
,"ac","pcode"));
-	$r.=3D_(" Code TVA ");
-	$r.=3D$text->input();
-	$r.=3D'<span id=3D"tva_label" style=3D"display:block"></span>';
-	$r.=3D" Poste comptable (utilisez le % pour inclure les postes qui en d=
=C3=A9pendent)";
-	$r.=3D$iposte->input();
-
-	$r.=3D'<span id=3D"paccount_label" style=3D"display:inline"></span>';
-	$r.=3D'<span style=3D"display:block"></span>';
-	$r.=3DHtmlInput::submit("save_addparam","Sauver");
-	$r.=3DHtmlInput::button_close($ctl);
-	$r.=3D'</form>';
-	break;
-default:
-  $r=3Dvar_export($_REQUEST,true);
-}
-
-$html=3Descape_xml($r);
-
-header('Content-type: text/xml; charset=3DUTF-8');
-echo <<<EOF
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<data>
-<ctl>$ctl</ctl>
-<code>$html</code>
-<extra>$extra</extra>
-</data>
-EOF;
-?>
\ No newline at end of file

Copied: trunk/rapport_avance/ajax.php (from rev 402, trunk/tools/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	                        (rev 0)
+++ trunk/rapport_avance/ajax.php	2012-09-22 00:51:52 UTC (rev 408)
@@ -0,0 +1,122 @@
+<?php
+extract($_GET);
+global $cn;
+switch ($act)
+{
+	/*	 * *****************************************************************=
************************************** */
+	// Modifie une definition de formulaire
+	/*	 * *****************************************************************=
************************************** */
+
+	case 'mod_form':
+		require_once 'include/class_rapav_formulaire.php';
+		if (!isset($_GET['f_id']) && isNum($_GET['f_id']) =3D=3D 0)
+			exit();
+		echo '<h1>D=C3=A9finition </h1>';
+		$form =3D new RAPAV_formulaire($_REQUEST['f_id']);
+		$form->load_definition();
+		echo '<form method=3D"POST" class=3D"print">';
+		$form->input_formulaire();
+		$form->input_definition();
+		echo HtmlInput::submit('form_def_sub', 'Sauve');
+		echo '</form>';
+		break;
+	/*	 * *****************************************************************=
*********************************************
+	 * Ajoute une ligne dans la definition
+	 * ********************************************************************=
******************************************* */
+	case 'add_row_definition':
+		$type_row =3D $cn->make_array("select p_type,p_description from rappor=
t_advanced.type_row order by p_description");
+		$type_periode =3D $cn->make_array("select t_id,t_description from rapp=
ort_advanced.periode_type order by t_description");
+		?>
+		<td>
+			<?=3D HtmlInput::hidden('p_id[]', -1)?>
+			<?
+			$p_code =3D new IText('p_code[]');
+			$p_code->size =3D "10";
+			echo $p_code->input();
+			?>
+		</td>
+		<td>
+			<?
+			$p_libelle =3D new IText('p_libelle[]');
+			$p_libelle->css_size =3D "100%";
+			echo $p_libelle->input();
+			?>
+		</td>
+		<td>
+			<?
+			$p_type =3D new ISelect('p_type[]');
+			$p_type->value =3D $type_row;
+			echo $p_type->input();
+			?>
+		</td>
+		<td>
+			<?
+			$p_type_periode =3D new ISelect('t_id[]');
+			$p_type_periode->value =3D $type_periode;
+			echo $p_type_periode->input();
+			?>
+		</td>
+		<td>
+			<?
+			$p_order =3D new INum('p_order[]');
+			$p_order->prec =3D 0;
+			$p_order->size =3D 4;
+			echo $p_order->input();
+			?>
+		</td>
+		<td>
+			<?
+			$p_info =3D new IText('p_info[]');
+			$p_info->css_size =3D "100%";
+			echo $p_info->input();
+			?>
+		</td>'
+		<?
+		break;
+	/*	 * *****************************************************************=
*********************************************
+	 * Montre le r=C3=A9sultat et permet de changer les param=C3=A8trages d=
'un formulaire
+	 * uniquement pour ceux ayant un champs de calcul (formule, code tva+po=
ste comptable + totaux interm=C3=A9diare
+	 * ********************************************************************=
******************************************* */
+	case 'mod_param':
+		require_once 'include/class_rapav_formulaire.php';
+		if (!isset($_GET['f_id']) && isNum($_GET['f_id']) =3D=3D 0)
+			exit();
+		echo '<h1>Param=C3=A8tre </h1>';
+		$form =3D new RAPAV_formulaire($_REQUEST['f_id']);
+		$form->load_definition();
+		echo '<form method=3D"POST" class=3D"print">';
+		echo HtmlInput::hidden('f_id', $_REQUEST['f_id']);
+		$form->echo_formulaire();
+		$form->input_parameter();
+		echo HtmlInput::submit('form_param_sub', 'Sauve');
+		echo '</form>';
+		break;
+
+	/**********************************************************************=
********************************************
+	 * Montre un =C3=A9cran pour ajouter une ligne de formulaire dans les p=
aram=C3=A8tre de formulaires
+	 */
+	case 'add_param_detail':
+		include 'ajax_add_param_detail.php';
+		break;
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	//rapav_search_code cherche les codes du formulaires courants
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	case 'rapav_search_code':
+		include 'ajax_search_code.php';
+		break;
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	// Sauve r=C3=A9sultat et renvoie un xml
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	case 'save_param_detail':
+		include 'ajax_save_param_detail.php';
+		break;
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	// Delete un formulaire_param_detail
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	case 'delete_param_detail':
+		$cn->exec_sql("delete from rapport_advanced.formulaire_param_detail wh=
ere fp_id=3D$1",array($fp_id));
+	default:
+		break;
+
+}
+?>

Added: trunk/rapport_avance/ajax_add_param_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/rapport_avance/ajax_add_param_detail.php	                      =
  (rev 0)
+++ trunk/rapport_avance/ajax_add_param_detail.php	2012-09-22 00:51:52 UT=
C (rev 408)
@@ -0,0 +1,37 @@
+<?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 Montre un form pour ajouter une formule
+ * retour en XML
+ */
+require_once 'include/class_formulaire_param.php';
+require_once 'include/class_formulaire_param_detail.php';
+
+global $cn;
+
+$obj=3Dnew Formulaire_Param_Detail();
+
+$obj->input_new($p_id);
+?>

Added: trunk/rapport_avance/ajax_save_param_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/rapport_avance/ajax_save_param_detail.php	                     =
   (rev 0)
+++ trunk/rapport_avance/ajax_save_param_detail.php	2012-09-22 00:51:52 U=
TC (rev 408)
@@ -0,0 +1,136 @@
+<?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 sauve la nouvelle ligne de d=C3=A9tail (param=C3=A8tre) et ren=
voie un xml
+ * avec code =3D ok ou nok, p_id pk de formulaire_param et html le code =
html =C3=A0 afficher : soit une ligne =C3=A0 ajouter =C3=A0 la table
+ * soit le message d'erreur =C3=A0 ajouter dans le div
+ *
+ *
+ */
+require_once 'class_impress.php';
+require_once 'include/class_formulaire_param_detail.php';
+$fp_id=3D0;
+switch($tab)
+{
+	case 'account_tva':
+		$acc_tva=3Dnew RAPAV_Account_Tva();
+		$acc_tva->tva_id=3D$code_tva;
+		$acc_tva->tmp_val=3D$formtva;
+		$acc_tva->jrn_def_type=3D$code_jrn;
+		$acc_tva->p_id=3D$p_id;
+		$acc_tva->type_detail=3D2;
+		if ($acc_tva->verify() =3D=3D 1)
+		{
+			$code=3D'nok';
+			$html=3D"Erreur dans la formule ".$acc_tva->errcode;
+		}
+		else
+		{
+			$acc_tva->insert();
+			$code=3D'ok';
+			$fp_id=3D$acc_tva->fp_id;
+			$html=3D'<td>';
+			ob_start();
+			$acc_tva->display_row();
+			$html.=3Dob_get_contents();
+			ob_end_clean();
+			$html.=3D '</td>';
+			$html.=3D'<td id=3D"del_'.$acc_tva->fp_id.'">';
+			$html.=3DHtmlInput::anchor("Effacer","",sprintf("onclick=3D\"delete_p=
aram_detail('%s','%s','%s','%s')\""
+					, $_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossier'],=
 $acc_tva->fp_id));
+			$html.=3D '</td>';
+		}
+		break;
+	case 'formula':
+		$acc_formula=3Dnew RAPAV_Formula();
+		$acc_formula->fp_formula=3D$formula_new;
+		$acc_formula->p_id=3D$p_id;
+		$acc_formula->type_detail=3D1;
+		if ($acc_formula->verify() =3D=3D 1)
+		{
+			$code=3D'nok';
+			$html=3D$acc_formula->errcode;
+		}
+		else
+		{
+			$acc_formula->insert();
+			$fp_id=3D$acc_formula->fp_id;
+			$code=3D'ok';
+			$html=3D'<td>';
+			ob_start();
+			$acc_formula->display_row();
+			$html.=3Dob_get_contents();
+			ob_end_clean();
+			$html.=3D '</td>';
+			$html.=3D'<td id=3D"del_'.$acc_formula->fp_id.'">';
+			$html.=3DHtmlInput::anchor("Effacer","",sprintf("onclick=3D\"delete_p=
aram_detail('%s','%s','%s','%s')\""
+				, $_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossier'], =
$acc_formula->fp_id));
+			$html.=3D'</td>';
+
+		}
+		break;
+	case 'compute_id':
+		$acc_compute=3Dnew RAPAV_Compute();
+		$acc_compute->fp_formula=3D$form_compute;
+		$acc_compute->p_id=3D$p_id;
+		$acc_compute->type_detail=3D3;
+		if ($acc_compute->verify() =3D=3D 1)
+		{
+			$code=3D'nok';
+			$html=3D$acc_compute->errcode;
+		}
+		else
+		{
+			$acc_compute->insert();
+			$fp_id=3D$acc_compute->fp_id;
+			$code=3D'ok';
+			$html=3D'<td>';
+			ob_start();
+			$acc_compute->display_row();
+			$html.=3Dob_get_contents();
+			ob_end_clean();
+			$html.=3D '</td>';
+			$html.=3D'<td id=3D"del_'.$acc_compute->fp_id.'">';
+			$html.=3DHtmlInput::anchor("Effacer","",sprintf("onclick=3D\"delete_p=
aram_detail('%s','%s','%s','%s')\""
+					, $_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossier'],=
 $acc_compute->fp_id));
+			$html.=3D'</td>';
+
+		}
+		break;
+}
+//echo $html;exit();
+$html=3Descape_xml($html);
+
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<code>$code</code>
+<html>$html</html>
+<p_id>$p_id</p_id>
+<fp_id>$fp_id</fp_id>
+</data>
+EOF;
+?>

Added: 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	                        (re=
v 0)
+++ trunk/rapport_avance/ajax_search_code.php	2012-09-22 00:51:52 UTC (re=
v 408)
@@ -0,0 +1,52 @@
+<?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 list of code of the form
+ *
+ */
+global $cn;
+$array=3D$cn->get_array("select p_id,p_code,p_libelle from rapport_advan=
ced.formulaire_param where p_type=3D3 order by 2");
+echo HtmlInput::title_box('Code Formulaire','search_code_div');
+?>
+<table>
+	<tr>
+		<th>
+			Code
+		</th>
+		<th>
+			Libell=C3=A9
+		</th>
+	</tr>
+	<? 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\');"')?>
+		</td>
+		<td>
+			<?=3Dh($array[$i]['p_libelle'])?>
+		</td>
+	</tr>
+	<?endfor;?>
+</table>
\ No newline at end of file

Deleted: trunk/rapport_avance/doc/625-notice.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)

Deleted: trunk/rapport_avance/doc/extension_tva.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)

Deleted: trunk/rapport_avance/doc/extension_tva.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)

Added: trunk/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_formulaire_param.php	             =
           (rev 0)
+++ trunk/rapport_avance/include/class_formulaire_param.php	2012-09-22 00=
:51:52 UTC (rev 408)
@@ -0,0 +1,219 @@
+<?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 factory
+ *
+ */
+require_once 'class_rapport_avance_sql.php';
+require_once 'class_formulaire_param_detail.php';
+
+class Formulaire_Param extends Formulaire_Param_Sql
+{
+
+	static function factory(Formulaire_Param_Sql $form)
+	{
+		switch ($form->p_type)
+		{
+			case 1:
+				return new Formulaire_Title1($form);
+			case 2:
+				return new Formulaire_Title2($form);
+			case 6:
+				return new Formulaire_Title3($form);
+			case 3:
+				return new Formulaire_Formula($form);
+		}
+	}
+
+}
+
+class Formulaire_Row
+{
+
+	function __construct(formulaire_param_sql $e)
+	{
+		$this->obj =3D $e;
+	}
+
+	function display()
+	{
+
+	}
+
+	function input()
+	{
+
+	}
+
+	function compute()
+	{
+
+	}
+
+	/**
+	 * @brief load all the row from formulaire_param_detail, children of fo=
rmulaire_param
+	 *  return an array of objects Formulaire_Param_Detail
+	 * @param type $p_id
+	 */
+	static function load_all($p_id)
+	{
+		global $cn;
+		$a_value =3D $cn->get_array("select fp_id,type_detail from rapport_adv=
anced.formulaire_param_detail where p_id=3D$1",
+				array($p_id));
+		return $a_value;
+	}
+
+}
+
+class formulaire_title1 extends Formulaire_Row
+{
+
+	function display()
+	{
+		echo h1($this->obj->p_libelle, "");
+	}
+
+	function compute()
+	{
+
+	}
+
+	function input()
+	{
+		echo h1($this->obj->p_libelle, ' class=3D"title"');
+	}
+
+}
+
+class formulaire_title2 extends Formulaire_Row
+{
+
+	function display()
+	{
+		echo h2($this->obj->p_libelle, 'class=3D"title"');
+	}
+
+	function compute()
+	{
+
+	}
+
+	function input()
+	{
+		echo h2($this->obj->p_libelle, 'class=3D"title"');
+	}
+
+}
+
+class formulaire_title3 extends Formulaire_Row
+{
+
+	function display()
+	{
+		echo "<h3>" . $this->obj->p_libelle . "</h3>";
+	}
+
+	function compute()
+	{
+
+	}
+
+	function input()
+	{
+		echo "<h3 class=3D\"title\">" . $this->obj->p_libelle . "</h3>";
+	}
+
+}
+
+class Formulaire_Formula extends Formulaire_Row
+{
+
+	function __construct(formulaire_param_sql $e)
+	{
+		$this->obj =3D $e;
+		$this->id =3D $e->p_id;
+		$this->parametre =3D Formulaire_Row::load_all($this->id);
+	}
+
+	function display()
+	{
+		echo $this->obj->p_libelle;
+	}
+
+	function make_object($p_index)
+	{
+		$elt=3D$this->parametre[$p_index]['type_detail'];
+		switch ($elt)
+		{
+			case '1':
+				return new RAPAV_Formula($this->parametre[$p_index]['fp_id']);
+				break;
+			case '2':
+				return new RAPAV_Account_Tva($this->parametre[$p_index]['fp_id']);
+				break;
+			case '3':
+				return new RAPAV_Compute($this->parametre[$p_index]['fp_id']);
+				break;
+		}
+	}
+
+	function input()
+	{
+		echo '<h4 class=3D"title">' . $this->obj->p_libelle . "(" . $this->obj=
->p_code . ")" . '</h4>';
+		echo HtmlInput::hidden('p_id[]', $this->obj->p_id);
+		$max =3D count($this->parametre);
+		echo HtmlInput::hidden("count_" . $this->id, $max);
+		echo '<h5 class=3D"title">' . 'code ' . $this->obj->p_code . '</h5>';
+		echo '<p>';
+		echo '<table id=3D"table_' . $this->id . '">';
+		for ($i =3D 0; $i < $max; $i++)
+		{
+			$formula=3D$this->make_object($i);
+
+			echo '<tr id=3D"tr_'.$formula->fp_id.'">';
+			echo '<td>';
+			echo $formula->display_row();
+			echo '</td>';
+			echo "<td id=3D\"del_".$formula->fp_id."\">";
+			echo HtmlInput::anchor("Effacer","",sprintf("onclick=3D\"delete_param=
_detail('%s','%s','%s','%s')\""
+					, $_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossier'],=
 $formula->fp_id));
+			echo '</td>';
+			echo '</tr>';
+		}
+		if ($max=3D=3D0) echo '<tr></tr>';
+		echo "</table>";
+		echo '</p>';
+		echo HtmlInput::button_anchor(
+				"Ajout d'une ligne", "javascript:void(0)", "add_row" . $this->id, sp=
rintf("onclick=3D\"add_param_detail('%s','%s','%s','%s');\"",
+						$_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossier'], =
$this->id)
+		);
+	}
+
+}
+
+
+
+
+?>

Added: trunk/rapport_avance/include/class_formulaire_param_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/rapport_avance/include/class_formulaire_param_detail.php	      =
                  (rev 0)
+++ trunk/rapport_avance/include/class_formulaire_param_detail.php	2012-0=
9-22 00:51:52 UTC (rev 408)
@@ -0,0 +1,174 @@
+<?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_rapport_avance_sql.php';
+require_once 'class_rapav_formulaire.php';
+
+class Formulaire_Param_Detail extends Formulaire_Param_Detail_SQL
+{
+
+	function input_new($p_id)
+	{
+		$parent =3D new Formulaire_Param($p_id);
+		echo HtmlInput::title_box($parent->p_code . " " . $parent->p_libelle, =
'param_detail_div');
+		require_once 'template/param_detail_new.php';
+	}
+
+}
+
+class RAPAV_Formula extends Formulaire_Param_Detail
+{
+
+	function display_row()
+	{
+		printf("R=C3=A9sultat de la formule %s", $this->fp_formula);
+	}
+
+	static function new_row()
+	{
+		$account =3D new IPoste("formula_new", "", "form_id");
+		$account->size =3D 50;
+		$account->label =3D _("Recherche poste");
+		$account->set_attribute('gDossier', dossier::id());
+		$account->set_attribute('bracket', 1);
+		$account->set_attribute('no_overwrite', 1);
+		$account->set_attribute('noquery', 1);
+		$account->set_attribute('account', $account->id);
+		echo $account->input();
+	}
+
+	function verify()
+	{
+		if (Impress::check_formula($this->fp_formula)=3D=3Dfalse)
+		{
+			$this->errcode=3D"Erreur dans votre formule";
+			return 1;
+		}
+		if ( trim($this->fp_formula)=3D=3D"")
+		{
+			$this->errcode=3D" Aucune formule trouv=C3=A9e";
+			return 1;
+		}
+		return 0;
+	}
+}
+
+class RAPAV_Account_Tva extends Formulaire_Param_Detail
+{
+
+	function display_row()
+	{
+		printf("Poste comptable %s avec le code tva %s (%s) dans le journal %s=
", $this->tmp_val, $this->tva_id, $this->tva_id, $this->jrn_def_type);
+	}
+
+	static function new_row()
+	{
+		global $cn;
+		$account =3D new IPoste("formtva", "", "formtva_id");
+		$account->size =3D 20;
+		$account->label =3D _("Recherche poste");
+		$account->set_attribute('gDossier', dossier::id());
+		$account->set_attribute('noquery', 1);
+		$account->set_attribute('account', $account->id);
+
+		$tva =3D new ITva_Popup("code_tva");
+		$tva->id =3D HtmlInput::generate_id("code_tva");
+		$tva->set_attribute('gDossier', dossier::id());
+
+		// Jrn type
+		$select =3D new ISelect('code_jrn');
+		$select->value =3D array(
+			array('value' =3D> 'VEN', 'label' =3D> 'journaux Vente'),
+			array('value' =3D> 'ACH', 'label' =3D> 'journaux Achat')
+		);
+		echo '<table>';
+		echo '<tr><td>Poste comptable</td>';
+		echo td($account->input());
+		echo '</tr>';
+		echo td('TVA') . td($tva->input());
+		echo '</tr>';
+		echo td(_('Choix du type de journal ')) . td($select->input());
+		// Base or VAT
+		echo '</tr>';
+		$code_base =3D new ISelect('code_base');
+		$code_base->value =3D $cn->make_array("select tt_id,tt_label from rapp=
ort_advanced.total_type order by 2");
+		echo td("Type de total");
+		echo td($code_base->input());
+		echo '</tr>';
+		echo '</table>';
+	}
+
+	function verify()
+	{
+		global $cn;
+		if (trim($this->tmp_val) =3D=3D "")
+		{
+			$this->errcode =3D 'Poste comptable est vide';
+			return 1;
+		}
+		$count =3D $cn->get_value("select count(*) from tva_rate where tva_id=3D=
$1", array($this->tva_id));
+		if ($count =3D=3D 0)
+		{
+			$this->errcode =3D 'Code TVA inexistant';
+			return 1;
+		}
+	}
+
+}
+
+class RAPAV_Compute extends Formulaire_Param_Detail
+{
+
+	function display_row()
+	{
+		printf("Total des codes du formulaire %s", $this->fp_formula);
+	}
+
+	static function new_row($p_id)
+	{
+		global $cn;
+		$f_id =3D $cn->get_value("select f_id from rapport_advanced.formulaire=
_param where p_id=3D$1", array($p_id));
+		$account =3D new IText("form_compute");
+		$account->size =3D 50;
+		echo $account->input();
+		echo HtmlInput::button('rapav_search_code_bt', 'Cherche codes', sprint=
f(" onclick=3D\"rapav_search_code('%s','%s','%s','%s')\"", $_REQUEST['ac'=
], $_REQUEST['plugin_code'], $_REQUEST['gDossier'], $f_id));
+	}
+	function verify()
+	{
+
+		if ( trim($this->fp_formula)=3D=3D"")
+		{
+			$this->errcode=3D" Aucune formule trouv=C3=A9e";
+			return 1;
+		}
+		return 0;
+	}
+
+}
+
+?>

Added: 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	             =
           (rev 0)
+++ trunk/rapport_avance/include/class_rapav_formulaire.php	2012-09-22 00=
:51:52 UTC (rev 408)
@@ -0,0 +1,234 @@
+<?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 Manage les formulaires
+ *
+ */
+require_once 'class_rapport_avance_sql.php';
+require_once 'class_formulaire_param.php';
+
+class RAPAV_Formulaire extends Formulaire_Sql
+{
+
+	function __construct($f_id =3D -1)
+	{
+		$this->f_id =3D $f_id;
+		$this->definition =3D array();
+		parent::__construct($f_id);
+	}
+
+	/**
+	 *  show a list of all existing declaration
+	 * @global type $cn database connection
+	 */
+	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");
+		require 'template/formulaire_listing.php';
+	}
+
+	/**
+	 * Get data from database, from the table rapport_advanced.formulaire_p=
aram
+	 */
+	function load_definition()
+	{
+		$f =3D new Formulaire_Param_Sql();
+		$ret =3D $f->seek(" order by p_order ");
+		$max =3D Database::num_row($ret);
+
+		for ($i =3D 0; $i < $max; $i++)
+		{
+			$o =3D new Formulaire_Param_Sql();
+			$o =3D $f->next($ret, $i);
+			$this->definition[] =3D clone $o;
+		}
+	}
+
+	function input_formulaire()
+	{
+		$this->load();
+		require_once 'template/formulaire_titre.php';
+	}
+
+	/**
+	 * input the definition
+	 */
+	function input_definition()
+	{
+		$max =3D count($this->definition);
+		global $cn;
+
+		require 'template/formulaire_definition.php';
+	}
+
+	/**
+	 * save the definition
+	 * $p_array contains
+	 *   - f_id id of the formulaire
+	 *   - f_title title of the formulaire
+	 *   - f_description description of the formulaire
+	 *   - p_id array of the row in formulaire_param
+	 *   - p_code array of the row in formulaire_param
+	 *   - p_libelle array of the row in formulaire_param
+	 *   - p_type array of the row in formulaire_param
+	 *   - t_id array of the row in formulaire_param
+	 *   - p_order array of the row in formulaire_param
+	 *
+	 */
+	static function save_definition($p_array)
+	{
+		if ($p_array['f_id'] =3D=3D -1)
+		{
+			self::insert_definition($p_array);
+			return;
+		}
+		else
+		{
+			self::update_definition($p_array);
+			return;
+		}
+	}
+
+	/**
+	 * insert into formulaire and formulaire_param
+	 * @see save_definition
+	 * @param type $p_array
+	 */
+	static function insert_definition($p_array)
+	{
+
+	}
+
+	/**
+	 *
+	 * @see save_definition
+	 * @param type $p_array
+	 */
+	static function update_definition($p_array)
+	{
+		$rapav =3D new RAPAV_Formulaire($p_array['f_id']);
+		// save into table formulaire
+		$rapav->f_title =3D $p_array['f_title'];
+		$rapav->f_description =3D $p_array['f_description'];
+		$rapav->update();
+
+		for ($i =3D 0; $i < count($p_array['p_id']); $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_libelle =3D $p_array['p_libelle'][$i];
+			$form_param->p_type =3D $p_array['p_type'][$i];
+			$form_param->p_order =3D $p_array['p_order'][$i];
+			$form_param->t_id =3D $p_array['t_id'][$i];
+			// update or insert the row
+			if ($p_array['p_id'][$i] =3D=3D -1)
+				$form_param->insert();
+			else
+				$form_param->update();
+		}
+	}
+
+	function echo_formulaire()
+	{
+		echo '<h2>' . h($this->f_title) . '</h2>';
+		echo '<p>' . h($this->f_description) . '<p>';
+	}
+
+	function input_parameter()
+	{
+		$max =3D count($this->definition);
+		for ($i =3D 0; $i < $max; $i++)
+		{
+			$obj =3D Formulaire_Param::factory($this->definition[$i]);
+
+			$obj->input();
+		}
+	}
+
+	static function save_parameter($p_array)
+	{
+		$param =3D new RAPAV_Formulaire($p_array['f_id']);
+		$param->load_definition();
+		// save everything
+		$max =3D count($p_array['fp_id']);
+
+		// update
+		for ($i =3D 0; $i < $max; $i++)
+		{
+			// update
+			if (isset($p_array['fp_id'][$i]))
+			{
+				$fp_id =3D $p_array['fp_id'][$i];
+				$old_frm =3D new Formulaire_Param_Detail($p_array['fp_id'][$i]);
+				$new_frm =3D new Formulaire_Param_Detail();
+				$new_frm->p_id =3D $old_frm->p_id;
+				$new_frm->fp_id =3D $p_array['fp_id'][$i];
+				// update formula
+				$new_frm->fp_formula =3D $p_array['frm' . $fp_id];
+				$new_frm->tmp_val =3D (isset($p_array['code_frm' . $fp_id])) ? $p_ar=
ray['code_frm' . $fp_id] : null;
+				$new_frm->tva_id =3D (isset($p_array['code_tva' . $fp_id])) ? $p_arr=
ay['code_tva' . $fp_id] : null;
+				$new_frm->jrn_def_type =3D (isset($p_array['code_jrn' . $fp_id])) ? =
$p_array['code_jrn' . $fp_id] : null;
+				$new_frm->tt_id =3D (isset($p_array['code_base' . $fp_id])) ? $p_arr=
ay['code_base' . $fp_id] : null;
+				$new_frm->update();
+			}
+		}
+		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////
+		// insert fp_id
+		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////
+		if (isset($p_array['new']))
+		{
+			$max_new =3D count($p_array['new']);
+			for ($i =3D 0; $i < $max_new; $i++)
+			{
+				$new_frm =3D new Formulaire_Param_Detail();
+				$new_frm->p_id =3D $p_array['new'][$i];
+				// if it is a formula
+				$new_frm->fp_formula =3D (isset($p_array['new_frm'][$i])) ? $p_array=
['new_frm'][$i] : null;
+				$new_frm->tmp_val =3D (isset($p_array['new_code_frm'][$i])) ? $p_arr=
ay['new_code_frm'][$i] : null;
+				$new_frm->tva_id =3D (isset($p_array['new_code_tva'][$i])) ? $p_arra=
y['new_code_tva'][$i] : null;
+				$new_frm->jrn_def_type =3D (isset($p_array['new_code_jrn'][$i])) ? $=
p_array['new_code_jrn'][$i] : null;
+				$new_frm->tt_id =3D (isset($p_array['new_code_base'][$i])) ? $p_arra=
y['new_code_base'][$i] : null;
+				$new_frm->insert();
+			}
+		}
+		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////
+		// Delete fp_id
+		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////
+		if (isset($p_array['delete']))
+		{
+			//delete
+			$max_del =3D count($p_array['delete']);
+			for ($i =3D 0; $i < $max_del; $i++)
+			{
+				$frm =3D new Formulaire_Param_Detail($p_array['delete'][$i]);
+				$frm->delete();
+			}
+		}
+	}
+
+}
+
+?>

Added: 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	           =
             (rev 0)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2012-09-22 =
00:51:52 UTC (rev 408)
@@ -0,0 +1,145 @@
+<?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 handle the data: database level
+ *
+ */
+require_once 'class_phpcompta_sql.php';
+class formulaire_param_sql extends phpcompta_sql
+{
+
+	function __construct($p_id=3D-1)
+	{
+
+
+		$this->table =3D "rapport_advanced.formulaire_param";
+		$this->primary_key =3D "p_id";
+
+		$this->name =3D array(
+			"p_id" =3D> "p_id",
+			"p_code" =3D> "p_code",
+			"p_libelle" =3D> "p_libelle",
+			"p_type" =3D> "p_type",
+			"p_order" =3D> "p_order",
+			"f_id" =3D> "f_id",
+			"p_info" =3D> "p_info",
+			"t_id" =3D> "t_id"
+		);
+
+		$this->type =3D array(
+			"p_id" =3D> "numeric",
+			"p_code" =3D> "text",
+			"p_libelle" =3D> "text",
+			"p_type" =3D> "numeric",
+			"p_order" =3D> "numeric",
+			"f_id" =3D> "numeric",
+			"p_info" =3D> "text",
+			"t_id" =3D> "numeric"
+		);
+
+		$this->default =3D array(
+			"p_id" =3D> "auto"
+		);
+		global $cn;
+
+		parent::__construct($cn, $p_id);
+	}
+
+}
+class formulaire_sql extends phpcompta_sql
+{
+
+	function __construct($p_id=3D-1)
+	{
+
+
+		$this->table =3D "rapport_advanced.formulaire";
+		$this->primary_key =3D "f_id";
+
+		$this->name =3D array(
+			"f_id" =3D> "f_id",
+			"f_title" =3D> "f_title",
+			"f_description" =3D> "f_description"
+		);
+
+		$this->type =3D array(
+			"f_id" =3D> "numeric",
+			"f_title" =3D> "text",
+			"f_description" =3D> "text"
+		);
+
+		$this->default =3D array(
+			"f_id" =3D> "auto"
+		);
+		global $cn;
+
+		parent::__construct($cn, $p_id);
+	}
+
+}
+class Formulaire_Param_Detail_SQL extends phpcompta_sql
+{
+
+	function __construct($p_id=3D-1)
+	{
+
+
+		$this->table =3D "rapport_advanced.formulaire_param_detail";
+		$this->primary_key =3D "fp_id";
+
+		$this->name =3D array(
+			"fp_id" =3D> "fp_id",
+			"p_id" =3D> "p_id",
+			"tmp_val" =3D> "tmp_val",
+			"tva_id"=3D>"tva_id",
+			"fp_formula"=3D>"fp_formula",
+			"fp_signed"=3D>"fp_signed",
+			"jrn_def_type"=3D>"jrn_def_type",
+			"tt_id"=3D>"tt_id",
+			"type_detail"=3D>"type_detail"
+		);
+
+		$this->type =3D array(
+			"fp_id" =3D> "numeric",
+			"p_id" =3D> "numeric",
+			"tmp_val" =3D> "text",
+			"tva_id"=3D>"numeric",
+			"fp_formula"=3D>"text",
+			"fp_signed"=3D>"numeric",
+			"jrn_def_type"=3D>"text",
+			"tt_id"=3D>"numeric",
+			"type_detail"=3D>"numeric"
+		);
+
+		$this->default =3D array(
+			"fp_id" =3D> "auto"
+		);
+		global $cn;
+
+		parent::__construct($cn, $p_id);
+	}
+
+}
+?>

Added: 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	                    =
    (rev 0)
+++ trunk/rapport_avance/include/declaration.inc.php	2012-09-22 00:51:52 =
UTC (rev 408)
@@ -0,0 +1,29 @@
+<?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 D=C3=A9claration
+ *
+ */
+?>

Added: 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	                     =
   (rev 0)
+++ trunk/rapport_avance/include/formulaire.inc.php	2012-09-22 00:51:52 U=
TC (rev 408)
@@ -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 liste des d=C3=A9clarations + modification, cr=C3=A9ation...
+ *
+ */
+require_once 'class_rapav_formulaire.php';
+if ( isset($_POST['form_def_sub']))
+{
+	RAPAV_formulaire::save_definition($_POST);
+	exit();
+}
+if (isset ($_POST['form_param_sub']))
+{
+	RAPAV_Formulaire::save_parameter($_POST);
+}
+RAPAV_formulaire::listing();
+var_dump($_POST);
+?>

Added: 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	     =
                   (rev 0)
+++ trunk/rapport_avance/include/template/formulaire_definition.php	2012-=
09-22 00:51:52 UTC (rev 408)
@@ -0,0 +1,110 @@
+<?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 definition
+ *
+ */
+$type_row=3D$cn->make_array("select p_type,p_description from rapport_ad=
vanced.type_row order by p_description");
+$type_periode=3D$cn->make_array("select t_id,t_description from rapport_=
advanced.periode_type order by t_description");
+?>
+<table id=3D"table_formulaire_definition_id" class=3D"result" style=3D"t=
able-layout: auto">
+	<thead>
+	<tr>
+	<th style=3D"width:92px">
+		Code <?=3DHtmlInput::infobulle(200)?>
+	</th>
+	<th>
+		Libell=C3=A9
+	</th>
+	<th style=3D"width:192px">
+		Type de ligne
+	</th>
+	<th>
+		P=C3=A9riode
+	</th>
+	<th style=3D"width:92px">
+		Ordre d'apparition
+	</th>
+	<th>
+		Message d'aide
+	</th>
+	</tr>
+	</thead>
+	<tbody id=3D"table_body_id">
+	<? for ($i=3D0;$i<$max;$i++):?>
+	<tr id=3D"row_<?=3D$i?>">
+
+		<td>
+			<?=3DHtmlInput::hidden('p_id[]',$this->definition[$i]->p_id) ?>
+			<?
+				$p_code=3Dnew IText('p_code[]',$this->definition[$i]->p_code);
+				$p_code->size=3D"10";
+				echo $p_code->input();
+			?>
+		</td>
+		<td>
+			<?
+				$p_libelle=3Dnew IText('p_libelle[]',$this->definition[$i]->p_libell=
e);
+				$p_libelle->css_size=3D"100%";
+				echo $p_libelle->input();
+			?>
+		</td>
+		<td>
+			<?
+				$p_type=3Dnew ISelect('p_type[]');
+				$p_type->value=3D$type_row;
+				$p_type->selected=3D$this->definition[$i]->p_type;
+				echo $p_type->input();
+			?>
+		</td>
+		<td>
+			<?
+				$p_type_periode=3Dnew ISelect('t_id[]');
+				$p_type_periode->value=3D$type_periode;
+				$p_type_periode->selected=3D$this->definition[$i]->t_id;
+				echo $p_type_periode->input();
+			?>
+		</td>
+		<td>
+			<?
+				$p_order=3Dnew INum('p_order[]',$this->definition[$i]->p_order);
+				$p_order->prec=3D0;
+				$p_order->size=3D4;
+				echo $p_order->input();
+			?>
+		</td>
+		<td>
+			<?
+				$p_info=3Dnew IText('p_info[]',$this->definition[$i]->p_info);
+				$p_info->css_size=3D"100%";
+				echo $p_info->input();
+			?>
+		</td>
+	</tr>
+	<?endfor;?>
+	</tbody>
+</table>
+<?=3DHtmlInput::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']))?>

Added: 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	        =
                (rev 0)
+++ trunk/rapport_avance/include/template/formulaire_listing.php	2012-09-=
22 00:51:52 UTC (rev 408)
@@ -0,0 +1,61 @@
+<?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 display list of formulaire + button
+ *
+ */
+?>
+<div id=3D"form_list_div">
+<table class=3D"result">
+	<tr>
+		<th>Nom du formulaire</th>
+		<th>Description</th>
+		<th></th>
+		<th></th>
+	</tr>
+<?
+	for ($i=3D0;$i<count($alist);$i++):
+?>
+	<tr>
+		<td>
+			<?=3Dh($alist[$i]['f_title'])?>
+		</td>
+		<td>
+			<?=3Dh($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']))?>
+		</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']))?>
+		</td>
+	</tr>
+
+<?	endfor; ?>
+</table>
+</div>
+<div id=3D"form_mod_div">
+
+</div>
\ No newline at end of file

Added: 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	          =
              (rev 0)
+++ trunk/rapport_avance/include/template/formulaire_titre.php	2012-09-22=
 00:51:52 UTC (rev 408)
@@ -0,0 +1,56 @@
+<?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 input for title, description
+ *
+ */
+?>
+<?=3DHtmlInput::hidden('f_id',$this->f_id)?>
+<table>
+	<tr>
+		<td>
+			Nom
+		</td>
+		<td>
+			<?
+			$title=3Dnew IText("f_title",$this->f_title);
+			$title->size=3D50;
+			echo $title->input();
+			?>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Description
+		</td>
+		<td>
+			<?
+			$description=3Dnew IText("f_description",$this->f_description);
+			$description->size=3D100;
+			echo $description->input();
+			?>
+		</td>
+	</tr>
+</table>

Added: 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	          =
              (rev 0)
+++ trunk/rapport_avance/include/template/param_detail_new.php	2012-09-22=
 00:51:52 UTC (rev 408)
@@ -0,0 +1,98 @@
+<?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
+ *
+ */
+
+?>
+
+<table style=3D"width:90%;margin-left:5%" >
+	<tr>
+	<td id=3D"new_formula_id_bt" class=3D"tool" style=3D"background:red">
+		<a class=3D"mtitle"  href=3D"javascript:void(0)"  onclick=3D"show_type=
_formula('new_formula_id')">
+			Formule
+		</a>
+	</td>
+	<td id=3D"new_compute_id_bt"  class=3D"tool" style=3D"background:inheri=
t">
+		<a class=3D"mtitle" href=3D"javascript:void(0)"
+		   onclick=3D"show_type_formula('new_compute_id')">
+			Compute
+		</a>
+	</td>
+	<td id=3D"new_account_tva_id_bt"  class=3D"tool" style=3D"background:in=
herit">
+		<a class=3D"mtitle" href=3D"javascript:void(0)"   onclick=3D"show_type=
_formula('new_account_tva_id')">
+			Poste comptable et code TVA
+		</a>
+	</td>
+</tr>
+</table>
+<div style=3D"width:100%;height:290px;margin:1px">
+	<span class=3D"error" id=3D"param_detail_info_div"></span>
+<div id=3D"new_formula_id" style=3D"display: block">
+	<p>
+	Entrer une formule avec des postes comptables, la syntaxe est la m=C3=AA=
me que celle des "rapports"
+	</p>
+		<p>
+	Exemple : [70%]*0.25+[71%]
+	</p>
+
+<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'))?>
+	<p>
+	<?=3DHtmlInput::hidden('tab','formula')?>
+		<?=3DRAPAV_Formula::new_row()?>
+	</p>
+<?=3DHtmlInput::submit('save','Sauve')?>
+
+</form>
+</div>
+<div id=3D"new_account_tva_id" style=3D"display: none">
+	<p>
+	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'))?>
+
+	<?=3DHtmlInput::hidden('tab','account_tva')?>
+		<?=3DRAPAV_Account_Tva::new_row()?>
+<?=3DHtmlInput::submit('save','Sauve')?>
+
+</form>
+</div>
+<div id=3D"new_compute_id" style=3D"display: none">
+	<p>
+	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'))?>
+
+	<?=3DHtmlInput::hidden('tab','compute_id')?>
+		<?=3DRAPAV_Compute::new_row($p_id)?>
+<?=3DHtmlInput::submit('save','Sauve')?>
+
+</form>
+</div>
+</div>
\ No newline at end of file

Deleted: 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/tva/index.php	2012-09-04 16:45:36 UTC (rev 402)
+++ trunk/rapport_avance/index.php	2012-09-22 00:51:52 UTC (rev 408)
@@ -1,137 +0,0 @@
-<?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 main file for tva
- */
-global $version_plugin;
-$version_plugin=3DSVNINFO;
-Extension::check_version(4900);
-
-$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];
-$array=3Darray (
-	array($url.'&sa=3Ddec',_('D=C3=A9claration TVA'),_('D=C3=A9claration Tr=
imestriel ou annuel de TVA'),1),
-	array($url.'&sa=3Dli',_('Listing intracommunautaire'),_('Listing intrac=
ommunautaire trimestriel'),2),
-	array($url.'&sa=3Dlc',_('Listing Assujetti'),_('Listing des clients ass=
ujettis'),3),
-	array($url.'&sa=3Dltva',_('Liste des d=C3=A9clarations TVA'),_('Histori=
que des d=C3=A9clarations TVA'),4),
-	array($url.'&sa=3Dparam',_('Param=C3=A8trage '),_('Param=C3=A8tre pour =
la TVA'),5)
-	);
-echo '<script language=3D"javascript">';
-require_once('js_scripts.js');
-echo '</script>';
-
-$sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:0;
-$def=3D0;
-switch($sa) {
-case 'dec':
-  $def=3D1;
-  break;
-case 'li':
-  $def=3D2;
-  break;
-case 'lc':
-  $def=3D3;
-  break;
-case 'ltva':
-  $def=3D4;
-  break;
-case 'param':
-  $def=3D5;
-  break;
-
-}
-$install=3D0;
-$cn=3Dnew Database(dossier::id());
-if ( $cn->exist_schema('tva_belge') =3D=3D false) {
-  require_once('class_install_plugin.php');
-  $install=3D1;
-  $iplugn=3Dnew Install_Plugin($cn);
-  $iplugn->install();
-  echo_warning(_("L'extension est install=C3=A9e, pourriez-vous en v=C3=A9=
rifier le param=C3=A8trage ?"));
-  $def=3D5;
-}
-
-// check schema
-$a=3D$cn->exist_column('assujetti_chld','ac_periode','tva_belge');
-if ( $a =3D=3D false)
-  $cn->exec_sql("alter table tva_belge.assujetti_chld add ac_periode tex=
t");
-
-$a=3D$cn->exist_column('assujetti_chld','exercice','tva_belge');
-if ( $a =3D=3D false)
-  $cn->exec_sql("alter table tva_belge.assujetti_chld add exercice text"=
);
-
-$a=3D$cn->exist_column('declaration_amount','exercice','tva_belge');
-if ( $a =3D=3D false)
-  $cn->exec_sql("alter table tva_belge.declaration_amount add exercice t=
ext");
-
-$a=3D$cn->exist_column('intracomm','exercice','tva_belge');
-if ( $a =3D=3D false)
-  $cn->exec_sql("alter table tva_belge.intracomm add exercice text");
-
-$a=3D$cn->exist_column('assujetti','exercice','tva_belge');
-if ( $a =3D=3D false)
-  $cn->exec_sql("alter table tva_belge.assujetti add exercice text");
-if ( $cn->exist_table("version","tva_belge")=3D=3Dfalse)
-{
-
-  $file=3Ddirname(__FILE__)."/sql/patch2.sql";
-		$cn->execute_script($file);
-		if ( $install =3D=3D 0 ) echo_warning(_("Mise =C3=A0 jour du plugin, p=
ourriez-vous en v=C3=A9rifier le param=C3=A8trage ?"));
-		$def=3D5;
-}
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dtva" target=3D"_blan=
k">Aide</a>'.
-'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
-'</div>';
-// show menu
-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">
-<?
-// include the right file
-if ($def=3D=3D1) {
-  require_once('decl_tva.inc.php');
-  exit();
-}
-
-/* Listing of all */
-if ($def=3D=3D4) {
-  require_once('list_tva.inc.php');
-  exit();
-}
-/* listing intracomm */
-if ($def=3D=3D2) {
-  require_once('list_intra.inc.php');
-  exit();
-}
-/* listing assujetti */
-if ($def=3D=3D3) {
-  require_once('list_assujetti.inc.php');
-  exit();
-}
-
-/* setting */
-if ( $def=3D=3D5) {
-  require_once('tva_param.inc.php');
-  exit();
-}
-?>
-</div>

Copied: trunk/rapport_avance/index.php (from rev 402, trunk/tools/index.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
--- trunk/rapport_avance/index.php	                        (rev 0)
+++ trunk/rapport_avance/index.php	2012-09-22 00:51:52 UTC (rev 408)
@@ -0,0 +1,90 @@
+<?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 main file for tools
+ */
+
+global $version_plugin;
+$version_plugin=3DSVNINFO;
+Extension::check_version(5082);
+require_once 'class_phpcompta_sql.php';
+require_once 'rapav_constant.php';
+/*
+ * load javascript
+ */
+ob_start();
+require_once('rapav_javascript.js');
+$j=3Dob_get_contents();
+ob_end_clean();
+echo create_script($j);
+
+$url=3D'?'.dossier::get()."&plugin_code=3D".$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];
+$array=3Darray (
+         array($url.'&sa=3Dfo',_('Formulaire'),_('Cr=C3=A9ation, modific=
ation, Param=C3=A8tre'),1),
+         array($url.'&sa=3Dde',_('D=C3=A9claration'),_('D=C3=A9claration=
 TVA calcul=C3=A9e'),2),
+         array($url.'&sa=3Dhi',_('Historique'),_('Historique des d=C3=A9=
clarations faites'),3)
+       );
+
+$sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
+$def=3D0;
+switch($sa)
+  {
+  case 'fo':
+    $def=3D1;
+    break;
+  case 'de':
+    $def=3D2;
+    break;
+  case 'hi':
+	  $def=3D3;
+	  break;
+  }
+
+$cn=3Dnew Database(dossier::id());
+// show menu
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Drapport_avances" tar=
get=3D"_blank">Aide</a>'.
+'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
+'</div>';
+
+echo ShowItem($array,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;m=
argin-left:10%;border-collapse: separate;border-spacing:  5px;"');
+echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
+// include the right file
+if ($def=3D=3D1)
+  {
+    require_once('include/formulaire.inc.php');
+    exit();
+  }
+
+/* D=C3=A9claration*/
+if ($def=3D=3D2)
+  {
+    require_once('include/declaration.inc.php');
+    exit();
+  }
+/* Historique */
+  if ($def =3D=3D 3 )
+  {
+	  require_once 'include/historique.inc.php';
+	  exit();
+  }
+?>

Copied: trunk/rapport_avance/rapav_constant.php (from rev 402, trunk/tool=
s/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/rapport_avance/rapav_constant.php	                        (rev =
0)
+++ trunk/rapport_avance/rapav_constant.php	2012-09-22 00:51:52 UTC (rev =
408)
@@ -0,0 +1,14 @@
+<?
+/**
+ *@file
+ *Contains all the needed variable for the plugin
+ *is name is plugin_name_constant.php
+ * You can use some globale variable, especially for the database
+ *  connection
+ */
+
+require_once ('class_database.php');
+
+global $cn;
+$cn=3Dnew Database (dossier::id());
+?>
\ No newline at end of file

Copied: trunk/rapport_avance/rapav_javascript.js (from rev 402, trunk/too=
ls/tools_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	                        (rev=
 0)
+++ trunk/rapport_avance/rapav_javascript.js	2012-09-22 00:51:52 UTC (rev=
 408)
@@ -0,0 +1,394 @@
+
+
+content[200]=3D"Le code doit =C3=AAtre unique pour ce formulaire";
+content[201]=3D"Formula TODO";
+
+
+function rapav_form_def(plugin_code,ac,dossier,f_id)
+{
+	try
+	{
+		$('form_list_div').hide();
+		$('form_mod_div').innerHTML=3D"";
+		$('form_mod_div').show();
+		waiting_box();
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Dmod_form'+"&f_id=3D"+f_id;
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					var answer=3Dreq.responseText;
+					$('form_mod_div').innerHTML=3Danswer;
+					answer.evalScripts()
+				}
+			}
+			);
+	}
+	catch(e)
+	{
+		alert(e.message);
+	}
+}
+/**
+ * @brief Add a row to the table in formulaire_definition
+ * table id =3D table_formulaire_definition_id
+ */
+function add_row_definition(plugin_code,ac,dossier)
+{
+	try
+	{
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Dadd_row_definition';
+		waiting_box();
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					var answer=3Dreq.responseText;
+					var mytable=3Dg("table_formulaire_definition_id").tBodies[0];
+					var nNumberRow=3Dmytable.rows.length;
+					var oRow=3Dmytable.insertRow(nNumberRow);
+					oRow.innerHTML=3Danswer;
+				}
+			}
+			);
+
+	}catch (e)
+	{
+		alert(e.message);
+	}
+}
+
+/**
+ * @brief Add a row to the table in formulaire_parametre
+ * table id =3D table p_id
+ */
+function add_param_detail(plugin_code,ac,dossier,p_id)
+{
+	try
+	{
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Dadd_param_detail'+"&p_id=3D"+p_id;
+		waiting_box();
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					removeDiv('param_detail_div');
+					var nTop=3Dcalcy(100);
+					var nLeft=3D"200px";
+					var str_style=3D"top:"+nTop+"px;left:"+nLeft+";width:50em;height:au=
to";
+					add_div({
+						id:'param_detail_div',
+						style:str_style,
+						cssclass:'inner_box',
+						drag:1
+					});
+					$('param_detail_div').innerHTML=3Dreq.responseText;
+					req.responseText.evalScripts();
+				}
+			}
+			);
+
+	}catch (e)
+	{
+		alert("add_param_detail"+e.message);
+	}
+}
+function rapav_search_code(ac,plugin_code,dossier,f_id)
+{
+	try
+	{
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Drapav_search_code'+"&f_id=3D"+f_id;
+		waiting_box();
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					removeDiv('search_code_div');
+					var nTop=3Dcalcy(80);
+					var nLeft=3D"400px";
+					var str_style=3D"top:"+nTop+"px;left:"+nLeft+";width:50em;height:au=
to;z-index:4";
+					add_div({
+						id:'search_code_div',
+						style:str_style,
+						cssclass:'inner_box',
+						drag:1
+					});
+					$('search_code_div').innerHTML=3Dreq.responseText;
+				//req.responseText.evalScripts();
+				}
+			}
+			);
+
+	}catch (e)
+	{
+		alert("add_param_detail"+e.message);
+	}
+}
+function delete_param_detail(plugin_code,ac,dossier,fp_id)
+{
+	try
+	{
+		if ( ! confirm("Confirmez-vous l'effacement ?")) { return false;}
+		waiting_box();
+
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Ddelete_param_detail'+"&fp_id=3D"+fp_id;
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					$('tr_'+fp_id).style.textDecoration=3D"line-through";
+					$('tr_'+fp_id).style.color=3D"red";
+					$('del_'+fp_id).innerHTML=3D"";
+				}
+			}
+			);
+	}catch (e)
+	{
+		alert(e);
+	}
+}
+/**
+ *@brief Sauve les donn=C3=A9es
+ */
+/*function  show_poste(answer) {
+	try{
+		var answer=3Dreq.responseXML;
+		var a=3Danswer.getElementsByTagName('ctl');
+		var html=3Danswer.getElementsByTagName('code');
+		if ( a.length =3D=3D 0 ) {
+			var rec=3Dreq.responseText;
+			alert ('erreur :'+rec);
+		}
+		var name_ctl=3Da[0].firstChild.nodeValue;
+		var code_html=3Dhtml[0].firstChild.nodeValue;
+		// ou mieux
+		var code_html=3DgetNodeText(html[0]); // Firefox ne prend que les 4096=
 car.
+		code_html=3Dunescape_xml(code_html);
+		$(name_ctl).innerHTML=3Dcode_html;
+	}
+	catch (e) {
+		alert(e.message);
+	}
+	try{
+		code_html.evalScripts();
+	}
+	catch(e){
+		alert("Impossible executer script de la reponse\n"+e.message);
+	}
+
+}*/
+/**
+ * @brief Add a row to the table in formulaire_parametre
+ * table id =3D table p_id
+ */
+/*function row_add_code_tva(plugin_code,ac,dossier,p_id)
+{
+try
+	{
+		var max=3DparseFloat($('count_'+p_id).value);
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Drow_add_code_tva'+"&p_id=3D"+p_id+"&max=3D"+max;
+		waiting_box();
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					var answer=3Dreq.responseText;
+					var mytable=3Dg("table_"+p_id).tBodies[0];
+					var nNumberRow=3Dmytable.rows.length;
+					var oRow=3Dmytable.insertRow(nNumberRow);
+					oRow.innerHTML=3Danswer;
+					var max2=3DparseFloat($('count_'+p_id).value)+1;
+					$('count_'+p_id).value=3Dmax2;
+					answer.evalScripts();
+				}
+			}
+			);
+
+	}catch (e)
+	{
+		alert(e.message);
+	}
+}*/
+/**
+ * @brief Add a row to the table in formulaire_parametre, with total
+ * table id =3D table p_id
+ */
+/*function row_add_compute(plugin_code,ac,dossier,p_id)
+{
+try
+	{
+		var max=3DparseFloat($('count_'+p_id).value);
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Drow_add_compute'+"&p_id=3D"+p_id+"&max=3D"+max;
+		waiting_box();
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					var answer=3Dreq.responseText;
+					var mytable=3Dg("table_"+p_id).tBodies[0];
+					var nNumberRow=3Dmytable.rows.length;
+					var oRow=3Dmytable.insertRow(nNumberRow);
+					oRow.innerHTML=3Danswer;
+					var max2=3DparseFloat($('count_'+p_id).value)+1;
+					$('count_'+p_id).value=3Dmax2;
+					answer.evalScripts();
+				}
+			}
+			);
+
+	}catch (e)
+	{
+		alert(e.message);
+	}
+}*/
+/**
+ * @brief  montre les d=C3=A9tails d'un formulaire
+ */
+function rapav_form_param(plugin_code,ac,dossier,f_id)
+{
+	try
+	{
+		$('form_list_div').hide();
+		$('form_mod_div').innerHTML=3D"";
+		$('form_mod_div').show();
+		waiting_box();
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Dmod_param'+"&f_id=3D"+f_id;
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					var answer=3Dreq.responseText;
+					$('form_mod_div').innerHTML=3Danswer;
+					answer.evalScripts()
+				}
+			}
+			);
+	}
+	catch(e)
+	{
+		alert(e.message);
+	}
+}
+/**
+ * @brief montre le div contenant le type de formule
+ */
+function show_type_formula(p_toshow)
+{
+	try
+	{
+		var div=3D['new_account_tva_id','new_formula_id','new_compute_id'];
+		for (var r =3D0;r<div.length;r++ ) {
+			$(div[r]).hide();
+			$(div[r]+'_bt').style.backgroundColor=3D"inherit";
+
+		}
+		$(p_toshow).show();
+		$(p_toshow+'_bt').style.backgroundColor=3D"red";
+	} catch (e)
+{
+		alert (e.message);
+	}
+
+}
+/**
+ * @brief sauve les donn=C3=A9es pour nouvelle formule, code,...
+ */
+function save_param_detail(p_form_id)
+{
+	try
+	{
+		var qs=3D$(p_form_id).serialize()+'&act=3Dsave_param_detail';
+		waiting_box();
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:qs,
+				onFailure:error_get_predef,
+				onSuccess:function infodiv(req,json) {
+					try{
+						remove_waiting_box();
+						var answer=3Dreq.responseXML;
+						var acode=3Danswer.getElementsByTagName('code');
+						var ap_id=3Danswer.getElementsByTagName('p_id');
+						var html=3Danswer.getElementsByTagName('html');
+
+						if ( acode.length =3D=3D 0 ) {
+							var rec=3Dreq.responseText;
+							alert ('erreur :'+rec);
+						}
+						var code=3Dacode[0].firstChild.nodeValue;
+						var code_xml=3DgetNodeText(html[0]);
+						var code_html=3Dunescape_xml(code_xml);
+						if ( code =3D=3D 'ok')
+							{
+								var afpid=3Danswer.getElementsByTagName('fp_id');
+								var fp_id=3Dafpid[0].firstChild.nodeValue;
+								var p_id=3Dap_id[0].firstChild.nodeValue;
+								// Ajoute une ligne avec r=C3=A9sultat
+								var mytable=3Dg("table_"+p_id).tBodies[0];
+								var nNumberRow=3Dmytable.rows.length;
+								var oRow=3Dmytable.insertRow(nNumberRow);
+								oRow.id=3D"tr_"+fp_id;
+								oRow.innerHTML=3Dcode_html;
+
+							}
+						if (code =3D=3D 'nok')
+							{
+								// montre erreur
+								$('param_detail_info_div').innerHTML=3Dcode_html;
+							}
+					}
+					catch (e) {
+						alert("save_param_detail "+e.message);
+					}
+					try{
+						code_html.evalScripts();
+					}
+					catch(e){
+						alert("save_param_detail Impossible executer script de la reponse\=
n"+e.message);
+					}
+
+				}
+			}
+			);
+	}
+	catch(e)
+	{
+		alert(e.message);
+	}
+
+	return false;
+}
\ No newline at end of file

Copied: trunk/rapport_avance/raw.php (from rev 402, trunk/tools/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	                        (rev 0)
+++ trunk/rapport_avance/raw.php	2012-09-22 00:51:52 UTC (rev 408)
@@ -0,0 +1,29 @@
+<?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 raw file for PDF ewa
+ */
+
+extract ($_REQUEST);
+
+?>

Added: trunk/rapport_avance/sql/create.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/create.sql	                        (rev 0)
+++ trunk/rapport_avance/sql/create.sql	2012-09-22 00:51:52 UTC (rev 408)
@@ -0,0 +1,69 @@
+create schema rapport_advanced;
+
+create table rapport_advanced.formulaire
+(f_id serial primary key,
+f_title text,
+f_description text);
+insert into rapport_advanced.formulaire values (1,'cerfa3310-ca3');
+
+create 	table rapport_advanced.type_row(
+p_type integer primary key,
+p_description text);
+
+insert into rapport_advanced.type_row values (1,'Titre'), (2,'Sous-titre=
'),(3,'Formule');
+
+create table rapport_advanced.periode_type
+(
+t_id integer primary key,
+t_description text);
+
+insert into rapport_advanced.periode_type values (1,'D''apr=C3=A8s date'=
),(2,'N'),(3,'N-1'),(4,'N-2'),(5,'N-3');
+
+create table rapport_advanced.type_row_detail
+(tr_id integer primary key,
+ tr_description text);
+
+ insert into rapport_advanced.type_row_detail(tr_id,tr_description) valu=
es (1,'Formule'),(2,'Poste comptable et code'),(3,'Calcul sur formulaire'=
);
+
+
+create table  rapport_advanced.formulaire_param
+(
+	p_id serial primary key,
+	p_code	text,
+	p_libelle	text,
+	p_type integer references rapport_advanced.type_row(p_type) ,
+	p_order integer not null,
+	f_id integer references rapport_advanced.formulaire(f_id) on update cas=
cade,
+	t_id integer references rapport_advanced.periode_type(t_id)
+);
+create table rapport_advanced.total_type(
+	tt_id serial primary key,
+	tt_label text);
+
+insert into rapport_advanced.total_type values (0,'Total code TVA+Poste =
comptable'),(1,'Total code tva'),(2,'Total poste comptable');
+
+create table rapport_advanced.formulaire_param_detail
+(
+	fp_id serial primary key,
+	p_id integer references rapport_advanced.formulaire_param(p_id) on upda=
te cascade on delete cascade,
+	tmp_val account_type,
+	tva_id integer references public.tva_rate(tva_id),
+	fp_formula text,
+	fp_signed integer,
+	type_detail integer,
+	jrn_def_type char(3),
+	tt_id integer references rapport_advanced.total_type(tt_id)
+);
+ALTER TABLE rapport_advanced.formulaire_param ADD UNIQUE (f_id, p_code);
+
+ALTER TABLE rapport_advanced.formulaire_param
+   ADD COLUMN p_info text;
+COMMENT ON COLUMN rapport_advanced.formulaire_param.p_info IS 'si non vi=
de affiche infobulle';
+
+ALTER TABLE rapport_advanced.formulaire_param_detail
+  ADD CONSTRAINT fk_formulaire_param_detail_type_row_detail FOREIGN KEY =
(type_detail)
+      REFERENCES rapport_advanced.type_row_detail (tr_id) MATCH SIMPLE
+      ON UPDATE SET NULL ON DELETE SET NULL;
+
+
+

Deleted: trunk/rapport_avance/sql/patch2.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/tva/sql/patch2.sql	2012-09-04 16:45:36 UTC (rev 402)
+++ trunk/rapport_avance/sql/patch2.sql	2012-09-22 00:51:52 UTC (rev 408)
@@ -1,134 +0,0 @@
-begin;
-create table tva_belge.version (
-	id serial primary key,
-	vdate timestamp default now(),
-	vdesc text
-);
-
-CREATE TABLE tva_belge.parameter_chld
-(
-  pi_id bigserial NOT NULL, -- PK
-  pcode text, -- FK to parameter
-  tva_id bigint, -- FK to public.tva_rate
-  pcm_val account_type, -- FK to tmp_pcmn
-  CONSTRAINT parameter_chld_pkey PRIMARY KEY (pi_id ),
-  CONSTRAINT parameter_chld_tva_id_fkey FOREIGN KEY (tva_id)
-      REFERENCES tva_rate (tva_id) MATCH SIMPLE
-      ON UPDATE CASCADE ON DELETE CASCADE
-);
-
-COMMENT ON TABLE tva_belge.parameter_chld  IS 'Child table for parameter=
s (TVA Plugin)';
-COMMENT ON COLUMN tva_belge.parameter_chld.pi_id IS 'PK';
-COMMENT ON COLUMN tva_belge.parameter_chld.pcode IS 'FK to parameter';
-COMMENT ON COLUMN tva_belge.parameter_chld.tva_id IS 'FK to public.tva_r=
ate';
-COMMENT ON COLUMN tva_belge.parameter_chld.pcm_val IS 'FK to tmp_pcmn';
-
-
-CREATE OR REPLACE FUNCTION tva_belge.fill_parameter_chld()
-  RETURNS void AS
-$BODY$
-
-declare
-   a_account text[];
-   a_tva_id text[];
-   i record;
-   e record;
-   f record;
-   n_size_tva int;
-   n_size_account int;
-   n_exist_tva int;
-begin
-
-for i in select pcode,pvalue,paccount from tva_belge.parameter
-loop
-	if length(trim(i.pvalue)) =3D 0 or length(trim(i.paccount)) =3D 0 then
-		continue;
-	end if;
-
-	a_account :=3D string_to_array(i.paccount, ',');
-	a_tva_id  :=3D string_to_array(i.pvalue,',');
-
-	n_size_tva :=3D array_upper(a_tva_id,1);
-	n_size_account :=3D array_upper(a_account,1);
-
-
-	while n_size_tva <> 0 loop
-
-		while n_size_account <> 0 loop
-
-			select count(*) into n_exist_tva from tva_rate where tva_id=3Da_tva_i=
d[n_size_tva]::numeric;
-
-			if n_exist_tva !=3D 0 then
-			=09
-					insert into tva_belge.parameter_chld (pcode,tva_id,pcm_val)
-						values (i.pcode,a_tva_id[n_size_tva]::numeric,a_account[n_size_acc=
ount]::account_type);
-			end if;
-			n_size_account :=3D n_size_account -1;
-		end loop;
-		n_size_account :=3D array_upper(a_account,1);
-		n_size_tva :=3D n_size_tva -1;
-	end loop;
-
-end loop;
-
-return;
-
-end;
-
-$BODY$
-LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION tva_belge.fill_parameter_chld_assujetti()
-  RETURNS void AS
-$BODY$
-
-declare
-   a_account text[];
-   a_tva_id text[];
-   i record;
-   e record;
-   f record;
-   n_size_tva int;
-   n_size_account int;
-   n_exist_tva int;
-begin
-
-for i in select distinct pvalue from tva_belge.parameter WHERE pcode in =
('GRIL00','GRIL01','GRIL02','GRIL03')
-loop
-	if length(trim(i.pvalue)) =3D 0  then
-		continue;
-	end if;
-
-	a_tva_id  :=3D string_to_array(i.pvalue,',');
-
-	n_size_tva :=3D array_upper(a_tva_id,1);
-
-
-	while n_size_tva <> 0 loop
-		select count(*) into n_exist_tva from tva_rate where tva_id=3Da_tva_id=
[n_size_tva]::numeric;
-
-		if n_exist_tva !=3D 0 then
-			insert into tva_belge.parameter_chld (pcode,tva_id)
-				values ('ASSUJETTI',a_tva_id[n_size_tva]::numeric);
-		end if;
-		n_size_tva :=3D n_size_tva -1;
-	end loop;
-
-end loop;
-
-return;
-
-end;
-
-$BODY$
-LANGUAGE plpgsql;
-
-select tva_belge.fill_parameter_chld();
-select tva_belge.fill_parameter_chld_assujetti();
-insert into tva_belge.parameter_chld (pcode,pcm_val) select pcode,paccou=
nt from tva_belge.parameter where pcode in ('ATVA','CRTVA','DTTVA');
-drop function tva_belge.fill_parameter_chld();
-drop function tva_belge.fill_parameter_chld_assujetti();
- alter table tva_belge.parameter drop column paccount;
- alter table tva_belge.parameter drop column pvalue;
-insert into tva_belge.version(vdesc) values ('Version 2 : am=C3=A9liorat=
ion plugin');
-commit;



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


From MAILER-DAEMON Fri Sep 21 21:43:10 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TFEkQ-0008V2-8p
	for mharc-phpcompta-dev@gnu.org; Fri, 21 Sep 2012 21:43:10 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 22 Sep 2012 03:32:18 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.574171.1348278189.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r409 - 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: Sat, 22 Sep 2012 01:43:08 -0000

Author: danydb
Date: 2012-09-22 03:32:17 +0200 (Sat, 22 Sep 2012)
New Revision: 409

Modified:
   trunk/rapport_avance/include/class_rapav_formulaire.php
   trunk/rapport_avance/include/formulaire.inc.php
   trunk/rapport_avance/include/template/formulaire_listing.php
Log:
Add new form : definition + 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	2012-09-22 00=
:51:52 UTC (rev 408)
+++ trunk/rapport_avance/include/class_rapav_formulaire.php	2012-09-22 01=
:32:17 UTC (rev 409)
@@ -56,7 +56,7 @@
 	function load_definition()
 	{
 		$f =3D new Formulaire_Param_Sql();
-		$ret =3D $f->seek(" order by p_order ");
+		$ret =3D $f->seek(" where f_id=3D".sql_string($this->f_id) ." order by=
 p_order ");
 		$max =3D Database::num_row($ret);
=20
 		for ($i =3D 0; $i < $max; $i++)
@@ -143,6 +143,7 @@
 			$form_param->p_type =3D $p_array['p_type'][$i];
 			$form_param->p_order =3D $p_array['p_order'][$i];
 			$form_param->t_id =3D $p_array['t_id'][$i];
+			$form_param->f_id =3D $p_array['f_id'];
 			// update or insert the row
 			if ($p_array['p_id'][$i] =3D=3D -1)
 				$form_param->insert();

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	2012-09-22 00:51:52 U=
TC (rev 408)
+++ trunk/rapport_avance/include/formulaire.inc.php	2012-09-22 01:32:17 U=
TC (rev 409)
@@ -36,6 +36,13 @@
 {
 	RAPAV_Formulaire::save_parameter($_POST);
 }
+if (isset ($_POST['add_form']))
+{
+	$form=3D new RAPAV_Formulaire();
+	$form->f_title=3Dtrim($_POST['titre']);
+	$form->f_description=3Dtrim($_POST['description']);
+	$form->insert();
+}
 RAPAV_formulaire::listing();
-var_dump($_POST);
+
 ?>

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	2012-09-=
22 00:51:52 UTC (rev 408)
+++ trunk/rapport_avance/include/template/formulaire_listing.php	2012-09-=
22 01:32:17 UTC (rev 409)
@@ -55,7 +55,21 @@
=20
 <?	endfor; ?>
 </table>
+	<?
+	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">';
+$name=3Dnew IText("titre");
+$description=3Dnew IText("description");
+echo '<table>';
+echo tr(td("Titre : ").td($name->input()));
+echo tr(td('Description').td($description->input()));
+echo '</table>';
+echo HtmlInput::submit ("add_form","Sauver");
+echo '</form>';
+?>
 </div>
+</div>
 <div id=3D"form_mod_div">
=20
 </div>
\ 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 Sep 22 14:00:07 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TFTzr-0006Bl-UF
	for mharc-phpcompta-dev@gnu.org; Sat, 22 Sep 2012 14:00:07 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 22 Sep 2012 19:49:14 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.575627.1348336807.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r410 - 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: Sat, 22 Sep 2012 18:00:07 -0000

Author: danydb
Date: 2012-09-22 19:49:12 +0200 (Sat, 22 Sep 2012)
New Revision: 410

Modified:
   trunk/rapport_avance/ajax_search_code.php
Log:
limite recherche code au formulaire courant

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	2012-09-22 01:32:17 UTC (re=
v 409)
+++ trunk/rapport_avance/ajax_search_code.php	2012-09-22 17:49:12 UTC (re=
v 410)
@@ -27,7 +27,7 @@
  *
  */
 global $cn;
-$array=3D$cn->get_array("select p_id,p_code,p_libelle from rapport_advan=
ced.formulaire_param where p_type=3D3 order by 2");
+$array=3D$cn->get_array("select p_id,p_code,p_libelle from rapport_advan=
ced.formulaire_param where p_type=3D3 and f_id=3D$1 order by 2",array($f_=
id));
 echo HtmlInput::title_box('Code Formulaire','search_code_div');
 ?>
 <table>



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


From MAILER-DAEMON Mon Sep 24 16:17:43 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TGF67-0007mn-EJ
	for mharc-phpcompta-dev@gnu.org; Mon, 24 Sep 2012 16:17:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 24 Sep 2012 22:07:05 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.582039.1348517863.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r411 - 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, 24 Sep 2012 20:17:42 -0000

Author: danydb
Date: 2012-09-24 22:07:04 +0200 (Mon, 24 Sep 2012)
New Revision: 411

Modified:
   trunk/rapport_avance/include/class_formulaire_param_detail.php
Log:
sauve type de total

Modified: trunk/rapport_avance/include/class_formulaire_param_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/rapport_avance/include/class_formulaire_param_detail.php	2012-0=
9-22 17:49:12 UTC (rev 410)
+++ trunk/rapport_avance/include/class_formulaire_param_detail.php	2012-0=
9-24 20:07:04 UTC (rev 411)
@@ -83,7 +83,10 @@
=20
 	function display_row()
 	{
-		printf("Poste comptable %s avec le code tva %s (%s) dans le journal %s=
", $this->tmp_val, $this->tva_id, $this->tva_id, $this->jrn_def_type);
+		global $cn;
+		$type_total=3D$cn->get_value("select tt_label from rapport_advanced.to=
tal_type where tt_id=3D$1",array($this->tt_id));
+		printf("Poste comptable %s avec le code tva %s (%s) dans le journal %s=
 [ %s ]",
+				$this->tmp_val, $this->tva_id, $this->tva_id, $this->jrn_def_type,$t=
ype_total);
 	}
=20
 	static function new_row()



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


From MAILER-DAEMON Mon Sep 24 16:57:51 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TGFix-0000cP-FG
	for mharc-phpcompta-dev@gnu.org; Mon, 24 Sep 2012 16:57:51 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 24 Sep 2012 22:47:13 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.582148.1348520271.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r412 - 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, 24 Sep 2012 20:57:50 -0000

Author: danydb
Date: 2012-09-24 22:47:12 +0200 (Mon, 24 Sep 2012)
New Revision: 412

Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/ajax_save_param_detail.php
   trunk/rapport_avance/include/class_formulaire_param.php
   trunk/rapport_avance/include/class_rapav_formulaire.php
   trunk/rapport_avance/include/formulaire.inc.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Correct the code, remove the add_param_detail popup if success

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	2012-09-24 20:07:04 UTC (rev 411)
+++ trunk/rapport_avance/ajax.php	2012-09-24 20:47:12 UTC (rev 412)
@@ -84,12 +84,8 @@
 		echo '<h1>Param=C3=A8tre </h1>';
 		$form =3D new RAPAV_formulaire($_REQUEST['f_id']);
 		$form->load_definition();
-		echo '<form method=3D"POST" class=3D"print">';
-		echo HtmlInput::hidden('f_id', $_REQUEST['f_id']);
 		$form->echo_formulaire();
 		$form->input_parameter();
-		echo HtmlInput::submit('form_param_sub', 'Sauve');
-		echo '</form>';
 		break;
=20
 	/**********************************************************************=
********************************************

Modified: trunk/rapport_avance/ajax_save_param_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/rapport_avance/ajax_save_param_detail.php	2012-09-24 20:07:04 U=
TC (rev 411)
+++ trunk/rapport_avance/ajax_save_param_detail.php	2012-09-24 20:47:12 U=
TC (rev 412)
@@ -41,6 +41,7 @@
 		$acc_tva->jrn_def_type=3D$code_jrn;
 		$acc_tva->p_id=3D$p_id;
 		$acc_tva->type_detail=3D2;
+		$acc_tva->tt_id=3D$code_base;
 		if ($acc_tva->verify() =3D=3D 1)
 		{
 			$code=3D'nok';

Modified: trunk/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_formulaire_param.php	2012-09-24 20=
:07:04 UTC (rev 411)
+++ trunk/rapport_avance/include/class_formulaire_param.php	2012-09-24 20=
:47:12 UTC (rev 412)
@@ -67,11 +67,6 @@
=20
 	}
=20
-	function compute()
-	{
-
-	}
-
 	/**
 	 * @brief load all the row from formulaire_param_detail, children of fo=
rmulaire_param
 	 *  return an array of objects Formulaire_Param_Detail
@@ -95,11 +90,7 @@
 		echo h1($this->obj->p_libelle, "");
 	}
=20
-	function compute()
-	{
=20
-	}
-
 	function input()
 	{
 		echo h1($this->obj->p_libelle, ' class=3D"title"');
@@ -115,11 +106,7 @@
 		echo h2($this->obj->p_libelle, 'class=3D"title"');
 	}
=20
-	function compute()
-	{
=20
-	}
-
 	function input()
 	{
 		echo h2($this->obj->p_libelle, 'class=3D"title"');
@@ -135,11 +122,7 @@
 		echo "<h3>" . $this->obj->p_libelle . "</h3>";
 	}
=20
-	function compute()
-	{
=20
-	}
-
 	function input()
 	{
 		echo "<h3 class=3D\"title\">" . $this->obj->p_libelle . "</h3>";

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	2012-09-24 20=
:07:04 UTC (rev 411)
+++ trunk/rapport_avance/include/class_rapav_formulaire.php	2012-09-24 20=
:47:12 UTC (rev 412)
@@ -113,16 +113,6 @@
 	}
=20
 	/**
-	 * insert into formulaire and formulaire_param
-	 * @see save_definition
-	 * @param type $p_array
-	 */
-	static function insert_definition($p_array)
-	{
-
-	}
-
-	/**
 	 *
 	 * @see save_definition
 	 * @param type $p_array
@@ -169,67 +159,7 @@
 		}
 	}
=20
-	static function save_parameter($p_array)
-	{
-		$param =3D new RAPAV_Formulaire($p_array['f_id']);
-		$param->load_definition();
-		// save everything
-		$max =3D count($p_array['fp_id']);
=20
-		// update
-		for ($i =3D 0; $i < $max; $i++)
-		{
-			// update
-			if (isset($p_array['fp_id'][$i]))
-			{
-				$fp_id =3D $p_array['fp_id'][$i];
-				$old_frm =3D new Formulaire_Param_Detail($p_array['fp_id'][$i]);
-				$new_frm =3D new Formulaire_Param_Detail();
-				$new_frm->p_id =3D $old_frm->p_id;
-				$new_frm->fp_id =3D $p_array['fp_id'][$i];
-				// update formula
-				$new_frm->fp_formula =3D $p_array['frm' . $fp_id];
-				$new_frm->tmp_val =3D (isset($p_array['code_frm' . $fp_id])) ? $p_ar=
ray['code_frm' . $fp_id] : null;
-				$new_frm->tva_id =3D (isset($p_array['code_tva' . $fp_id])) ? $p_arr=
ay['code_tva' . $fp_id] : null;
-				$new_frm->jrn_def_type =3D (isset($p_array['code_jrn' . $fp_id])) ? =
$p_array['code_jrn' . $fp_id] : null;
-				$new_frm->tt_id =3D (isset($p_array['code_base' . $fp_id])) ? $p_arr=
ay['code_base' . $fp_id] : null;
-				$new_frm->update();
-			}
-		}
-		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////
-		// insert fp_id
-		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////
-		if (isset($p_array['new']))
-		{
-			$max_new =3D count($p_array['new']);
-			for ($i =3D 0; $i < $max_new; $i++)
-			{
-				$new_frm =3D new Formulaire_Param_Detail();
-				$new_frm->p_id =3D $p_array['new'][$i];
-				// if it is a formula
-				$new_frm->fp_formula =3D (isset($p_array['new_frm'][$i])) ? $p_array=
['new_frm'][$i] : null;
-				$new_frm->tmp_val =3D (isset($p_array['new_code_frm'][$i])) ? $p_arr=
ay['new_code_frm'][$i] : null;
-				$new_frm->tva_id =3D (isset($p_array['new_code_tva'][$i])) ? $p_arra=
y['new_code_tva'][$i] : null;
-				$new_frm->jrn_def_type =3D (isset($p_array['new_code_jrn'][$i])) ? $=
p_array['new_code_jrn'][$i] : null;
-				$new_frm->tt_id =3D (isset($p_array['new_code_base'][$i])) ? $p_arra=
y['new_code_base'][$i] : null;
-				$new_frm->insert();
-			}
-		}
-		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////
-		// Delete fp_id
-		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////
-		if (isset($p_array['delete']))
-		{
-			//delete
-			$max_del =3D count($p_array['delete']);
-			for ($i =3D 0; $i < $max_del; $i++)
-			{
-				$frm =3D new Formulaire_Param_Detail($p_array['delete'][$i]);
-				$frm->delete();
-			}
-		}
-	}
-
 }
=20
 ?>

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	2012-09-24 20:07:04 U=
TC (rev 411)
+++ trunk/rapport_avance/include/formulaire.inc.php	2012-09-24 20:47:12 U=
TC (rev 412)
@@ -30,12 +30,7 @@
 if ( isset($_POST['form_def_sub']))
 {
 	RAPAV_formulaire::save_definition($_POST);
-	exit();
 }
-if (isset ($_POST['form_param_sub']))
-{
-	RAPAV_Formulaire::save_parameter($_POST);
-}
 if (isset ($_POST['add_form']))
 {
 	$form=3D new RAPAV_Formulaire();

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	2012-09-24 20:07:04 UTC (rev=
 411)
+++ trunk/rapport_avance/rapav_javascript.js	2012-09-24 20:47:12 UTC (rev=
 412)
@@ -3,7 +3,9 @@
 content[200]=3D"Le code doit =C3=AAtre unique pour ce formulaire";
 content[201]=3D"Formula TODO";
=20
-
+/**
+ *@brief show the definition of a form and let it modify it
+ */
 function rapav_form_def(plugin_code,ac,dossier,f_id)
 {
 	try
@@ -105,6 +107,9 @@
 		alert("add_param_detail"+e.message);
 	}
 }
+/**
+ *@brief display a popup and let you select an existing code
+ */
 function rapav_search_code(ac,plugin_code,dossier,f_id)
 {
 	try
@@ -140,6 +145,9 @@
 		alert("add_param_detail"+e.message);
 	}
 }
+/**
+ *@brief delete a parameter detail
+ */
 function delete_param_detail(plugin_code,ac,dossier,fp_id)
 {
 	try
@@ -168,108 +176,6 @@
 	}
 }
 /**
- *@brief Sauve les donn=C3=A9es
- */
-/*function  show_poste(answer) {
-	try{
-		var answer=3Dreq.responseXML;
-		var a=3Danswer.getElementsByTagName('ctl');
-		var html=3Danswer.getElementsByTagName('code');
-		if ( a.length =3D=3D 0 ) {
-			var rec=3Dreq.responseText;
-			alert ('erreur :'+rec);
-		}
-		var name_ctl=3Da[0].firstChild.nodeValue;
-		var code_html=3Dhtml[0].firstChild.nodeValue;
-		// ou mieux
-		var code_html=3DgetNodeText(html[0]); // Firefox ne prend que les 4096=
 car.
-		code_html=3Dunescape_xml(code_html);
-		$(name_ctl).innerHTML=3Dcode_html;
-	}
-	catch (e) {
-		alert(e.message);
-	}
-	try{
-		code_html.evalScripts();
-	}
-	catch(e){
-		alert("Impossible executer script de la reponse\n"+e.message);
-	}
-
-}*/
-/**
- * @brief Add a row to the table in formulaire_parametre
- * table id =3D table p_id
- */
-/*function row_add_code_tva(plugin_code,ac,dossier,p_id)
-{
-try
-	{
-		var max=3DparseFloat($('count_'+p_id).value);
-		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Drow_add_code_tva'+"&p_id=3D"+p_id+"&max=3D"+max;
-		waiting_box();
-		var action=3Dnew Ajax.Request(
-			"ajax.php",
-			{
-				method:'get',
-				parameters:querystring,
-				onFailure:error_get_predef,
-				onSuccess:function(req){
-					remove_waiting_box();
-					var answer=3Dreq.responseText;
-					var mytable=3Dg("table_"+p_id).tBodies[0];
-					var nNumberRow=3Dmytable.rows.length;
-					var oRow=3Dmytable.insertRow(nNumberRow);
-					oRow.innerHTML=3Danswer;
-					var max2=3DparseFloat($('count_'+p_id).value)+1;
-					$('count_'+p_id).value=3Dmax2;
-					answer.evalScripts();
-				}
-			}
-			);
-
-	}catch (e)
-	{
-		alert(e.message);
-	}
-}*/
-/**
- * @brief Add a row to the table in formulaire_parametre, with total
- * table id =3D table p_id
- */
-/*function row_add_compute(plugin_code,ac,dossier,p_id)
-{
-try
-	{
-		var max=3DparseFloat($('count_'+p_id).value);
-		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Drow_add_compute'+"&p_id=3D"+p_id+"&max=3D"+max;
-		waiting_box();
-		var action=3Dnew Ajax.Request(
-			"ajax.php",
-			{
-				method:'get',
-				parameters:querystring,
-				onFailure:error_get_predef,
-				onSuccess:function(req){
-					remove_waiting_box();
-					var answer=3Dreq.responseText;
-					var mytable=3Dg("table_"+p_id).tBodies[0];
-					var nNumberRow=3Dmytable.rows.length;
-					var oRow=3Dmytable.insertRow(nNumberRow);
-					oRow.innerHTML=3Danswer;
-					var max2=3DparseFloat($('count_'+p_id).value)+1;
-					$('count_'+p_id).value=3Dmax2;
-					answer.evalScripts();
-				}
-			}
-			);
-
-	}catch (e)
-	{
-		alert(e.message);
-	}
-}*/
-/**
  * @brief  montre les d=C3=A9tails d'un formulaire
  */
 function rapav_form_param(plugin_code,ac,dossier,f_id)
@@ -363,6 +269,7 @@
 								var oRow=3Dmytable.insertRow(nNumberRow);
 								oRow.id=3D"tr_"+fp_id;
 								oRow.innerHTML=3Dcode_html;
+								removeDiv('param_detail_div');
=20
 							}
 						if (code =3D=3D 'nok')



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


From MAILER-DAEMON Thu Sep 27 18:23:30 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1THMUU-00074l-KZ
	for mharc-phpcompta-dev@gnu.org; Thu, 27 Sep 2012 18:23:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 28 Sep 2012 00:13:05 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.595642.1348784610.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r413 - 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: Thu, 27 Sep 2012 22:23:29 -0000

Author: danydb
Date: 2012-09-28 00:13:03 +0200 (Fri, 28 Sep 2012)
New Revision: 413

Added:
   trunk/rapport_avance/include/class_rapav_declaration.php
Modified:
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/declaration.inc.php
   trunk/rapport_avance/index.php
   trunk/rapport_avance/sql/create.sql
Log:
Rapport avance : calcul de la d?\195?\169claration

Added: 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	            =
            (rev 0)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2012-09-27 2=
2:13:03 UTC (rev 413)
@@ -0,0 +1,442 @@
+<?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 compute all the formulaire_row and save them into rappport_adv=
anced.declaration
+ *
+ */
+require_once 'class_rapav_formulaire.php';
+require_once 'class_formulaire_param_detail.php';
+require_once 'class_rapport_avance_sql.php';
+/**
+ * @brief compute, save and display a declaration
+ */
+class Rapav_Declaration extends RAPAV_Declaration_SQL
+{
+
+	function __construct()
+	{
+		$this->form=3Dnew RAPAV_Formulaire();
+		parent::__construct();
+	}
+	function compute($p_id,$p_start, $p_end)
+	{
+		global $cn;
+		$cn->start();
+		// Load the parameter from formulaire_param_detail
+		// create object_rapav_declaration
+		//   compute
+		// save the parameter
+		$this->form->f_id=3D$p_id;
+		$this->form->load();
+		$this->d_title=3D$this->form->f_title;
+		$this->d_start=3D$p_start;
+		$this->d_end=3D$p_end;
+		$this->to_keep=3D'N';
+		$this->insert();
+		/*
+		 * First we compute the formula and tva_code
+		 */
+		$array =3D $cn->get_array("select fp.p_id,p_code,p_libelle,p_type,p_or=
der,f_id,p_info,t_id
+			from rapport_advanced.formulaire_param as fp
+			 join rapport_advanced.formulaire_param_detail as fpd on (fp.p_id=3Df=
pd.p_id)
+			where
+			f_id=3D$1
+			and type_detail in (1,2)",
+				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_s=
eq');
+			$row->from_array($array[$i]);
+			$row->compute($p_start, $p_end);
+			$row->insert();
+		}
+		/*
+		 * Secundo we compute the compute code
+		 */
+		$array =3D $cn->get_array("select fp.p_id,p_code,p_libelle,p_type,p_or=
der,f_id,p_info,t_id
+			from rapport_advanced.formulaire_param as fp
+			 join rapport_advanced.formulaire_param_detail as fpd on (fp.p_id=3Df=
pd.p_id)
+			where
+			f_id=3D$1
+			and type_detail =3D3
+			order by p_order",
+				array($p_id));
+		/**
+		 * @note order is important !!!
+		 *
+		 */
+		for ($e =3D 0; $e < count($array); $e++)
+		{
+			$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_s=
eq');
+			$row->from_array($array[$e]);
+			$row->compute($p_start, $p_end);
+			$row->insert();
+		}
+		/**
+		 * Add the lines without definition
+		 */
+		$array =3D $cn->get_array("select fp.p_id,p_code,p_libelle,p_type,p_or=
der,f_id,p_info,t_id
+			from rapport_advanced.formulaire_param as fp
+			left join rapport_advanced.formulaire_param_detail as fpd on (fp.p_id=
=3Dfpd.p_id)
+			where
+			f_id=3D$1
+			and type_detail is null",
+				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_s=
eq');
+			$row->from_array($array[$i]);
+			$row->amount=3D0;
+			$row->insert();
+		}
+
+		$cn->commit();
+	}
+
+}
+
+class Rapav_Declaration_Param
+{
+	function insert()
+	{
+		$data=3Dnew RAPAV_Declaration_Row_SQL();
+		$data->dr_code=3D$this->param->p_code;
+		$data->dr_libelle=3D$this->param->p_libelle;
+		$data->dr_order=3D$this->param->p_order;
+		$data->dr_amount=3D$this->amount;
+		$data->d_id=3D$this->d_id;
+		$data->dr_id=3D$this->dr_id;
+		$data->insert();
+	}
+	function from_array($p_array)
+	{
+		$this->param =3D new Formulaire_Param();
+		foreach (array('p_id', 'p_code', 'p_libelle', 'p_type', 'p_order', 'f_=
id', 'p_info', 't_id') as $e)
+		{
+			$this->param->$e =3D $p_array[$e];
+		}
+		$this->param->load();
+	}
+
+	/**
+	 * @brief compute the date following the attribute t_id (match rapport_=
advanced.periode_type and
+	 * store the result into $this->start and $this-> end
+	 *   - 1 date from the FORM
+	 *   - 2 N
+	 *   - 3 N-1
+	 *   - 4 N-2
+	 *   - 5 N-3
+	 */
+	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;
+				return;
+				break;
+			case 2:
+				list($this->start, $this->end) =3D $g_user->get_limit_current_exerci=
ce();
+				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;
+			default:
+				throw new Exception('compute_date : t_id est incorrect');
+		}
+		global $cn;
+
+		// If exercice does not exist then
+		// set the date end and start to 01.01.1900
+
+		$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';
+			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();
+	}
+
+	function compute($p_start, $p_end)
+	{
+		global $cn;
+		bcscale(2);
+		$this->amount=3D0;
+		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////
+		// Compute first the formula and the account_tva
+		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////
+		$array =3D $cn->get_array("select fp_id,p_id,tmp_val,tva_id,fp_formula=
,fp_signed,jrn_def_type,tt_id,type_detail
+			from rapport_advanced.formulaire_param_detail where p_id=3D$1", array=
($this->param->p_id));
+		$this->compute_date($p_start, $p_end);
+		for ($e =3D 0; $e < count($array); $e++)
+		{
+			$row_detail =3D Rapav_Declaration_Detail::factory($array[$e]);
+			$row_detail->dr_id=3D$this->dr_id;
+			$tmp_amount=3D$row_detail->compute($this->start, $this->end);
+			$this->amount=3Dbcadd($tmp_amount,$this->amount);
+			$row_detail->insert();
+		}
+
+	}
+
+}
+////////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////////////
+// Compute the detail for each row
+////////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////////////
+class Rapav_Declaration_Detail extends RAPAV_Declaration_Row_Detail_SQL
+{
+	/**
+	 * @brief create an object RAPAV_dd_Formula, RAPAV_dd_Account_Tva or Ra=
pav_dd_compute following the idx type_detail
+	 * @param type $p_array
+	 * @return object RAPAV_dd_Formula, RAPAV_dd_Account_Tva or Rapav_dd_co=
mpute
+	 * @throws if the type is not known
+	 */
+	static function factory($p_array)
+	{
+		switch ($p_array['type_detail'])
+		{
+			case '1':
+				$ret =3D new Rapav_dd_Formula();
+				break;
+			case '2':
+				$ret =3D new Rapav_dd_Account_Tva();
+				break;
+			case '3':
+				$ret =3D new Rapav_dd_Compute();
+				break;
+			default:
+				throw new Exception("Type inconnu");
+		}
+
+		$ret->from_array($p_array);
+		$ret->ddr_amount=3D0;
+		return $ret;
+	}
+	/**
+	 * @brief the p_array contains a row from formulaire_param_detail
+	 * it will be copied into this->form.
+	 * @param type $p_array match formulaire_param_detail table structure
+	 */
+	function from_array($p_array)
+	{
+		$this->form =3D new Formulaire_Param_Detail();
+		$attribute =3D explode(',', 'fp_id,p_id,tmp_val,tva_id,fp_formula,fp_s=
igned,jrn_def_type,tt_id,type_detail');
+		foreach ($attribute as $e)
+		{
+			$this->form->$e =3D $p_array[$e];
+		}
+	}
+
+}
+
+/**
+ * @brief compute a formula
+ * @see Impress::parse_formula RAPAV_Formula
+ */
+class Rapav_dd_Formula extends Rapav_Declaration_Detail
+{
+
+	function compute($p_start, $p_end)
+	{
+		global $cn;
+		$amount =3D Impress::parse_formula($cn, "", $this->form->fp_formula, $=
p_start, $p_end, false, 1);
+		return $amount;
+	}
+
+}
+/**
+ * @brief handle the param_detail type Compute
+ * @see RAPAV_Compute
+ */
+class Rapav_dd_Compute extends Rapav_Declaration_Detail
+{
+
+	function compute($p_start, $p_end)
+	{
+		return 0;
+
+	}
+
+}
+
+/**
+ * @brief handle the param_detail type Account_Tva
+ * The t_id gives the type of total
+ *   - 0 TVA + Account
+ *   - 1 TVA
+ *   - 2 Account
+ * the jrn_def_type is either ACH or VEN
+ *
+ * @see RAPAV_Account_Tva
+ */
+class Rapav_dd_Account_Tva extends Rapav_Declaration_Detail
+{
+
+	/**
+	 * compute the amount of tva using the given account in either the ledg=
er ACH or VEN
+	 * following the $this->form->jrn_def_type.
+	 * set the $this->errcode if something wrong has happened
+	 * @param  $p_start start date
+	 * @param $p_end end date
+	 * @return amount
+	 */
+	private  function compute_tva($p_start, $p_end)
+	{
+		if ($this->form->jrn_def_type =3D=3D 'ACH')
+		{
+			$sql =3D "select coalesce(sum(qs_vat),0) as amount
+						from quant_sold join jrnx using (j_id)
+						where qs_vat_code=3D$1 and
+						(j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date($3,'=
DD.MM.YYYY'))
+						and j_poste::text like ($4)";
+			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
+														$p_start,
+														$p_end,
+														$this->form->tmp_val));
+			return $amount;
+		}
+		if ($this->form->jrn_def_type =3D=3D 'VEN')
+		{
+			$sql =3D "select coalesce(sum(qs_vat),0) as amount
+						from quant_sold join jrnx using (j_id)
+						where qs_vat_code=3D$1
+						and (j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date(=
$3,'DD.MM.YYYY'))
+						and j_poste::text like ($4)";
+				$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
+														$p_start,
+														$p_end,
+														$this->form->tmp_val));
+				return $amount;
+		}
+		$this->errcode =3D 'Erreur dans le journal';
+		return 0;
+	}
+	/**
+	 * compute the amount of account using the given tva_id in either the l=
edger ACH or VEN
+	 * following the $this->form->jrn_def_type.
+	 * Set the $this->errcode if something wrong has happened
+	 * @param  $p_start start date
+	 * @param $p_end end date
+	 * @return amount
+	 * @param type $p_start
+	 * @param type $p_end
+	 * @return \amount|int
+	 */
+	private function compute_amount($p_start, $p_end)
+	{
+		if ($this->form->jrn_def_type =3D=3D 'ACH')
+		{
+			$sql =3D "select coalesce(sum(qs_price),0) as amount from quant_sold
+					join jrnx using (j_id)
+					where qs_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
+					and j_poste::text like ($4)";
+			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
+														$p_start,
+														$p_end,
+														$this->form->tmp_val));
+			return $amount;
+		}
+		if ($this->form->jrn_def_type =3D=3D 'VEN')
+		{
+			$sql =3D "select coalesce(sum(qp_price),0) as amount from quant_purch=
ase join jrnx using (j_id)
+					where qp_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
+					and j_poste::text like ($4)";
+			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
+				$p_start,
+				$p_end,
+				$this->form->tmp_val));
+			return $amount;
+		}
+		$this->errcode =3D 'Erreur dans le journal';
+		return 0;
+	}
+	/**
+	 * Compute the amount of TVA or Account, call internally private functi=
ons
+	 * @see Rapav_dd_Account_Tva::computa_amount Rapav_dd_Account_Tva::comp=
ute_tva
+	 * @param $p_start start date
+	 * @param $p_end end date
+	 * @return amount computed
+	 * @throws Exception
+	 */
+	function compute($p_start, $p_end)
+	{
+		bcscale(2);
+		// Retrieve the account for the tva_id, we need the DEB for VEN and CR=
ED for ACH
+		//
+		// tt_id gives the type of total
+		//  - 0 TVA + Account
+		//  - 1 TVA
+		//  - 2 Account
+		switch ($this->form->tt_id)
+		{
+			case 0:
+				$t1_amount =3D $this->compute_amount($p_start, $p_end);
+				$t2_amount =3D $this->compute_tva($p_start, $p_end);
+				$amount =3D bcadd($t1_amount, $t2_amount);
+				break;
+			case 1:
+				$amount =3D $this->compute_tva($p_start, $p_end);
+				$amount =3D bcadd($amount, 0);
+				break;
+
+			case 2:
+				$amount =3D $this->compute_amount($p_start, $p_end);
+				$amount =3D bcadd($amount, 0);
+				break;
+
+			default:
+				throw new Exception('Type de total invalide');
+				break;
+		}
+		return $amount;
+	}
+
+}
+?>

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	2012-09-24 =
20:47:12 UTC (rev 412)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2012-09-27 =
22:13:03 UTC (rev 413)
@@ -142,4 +142,106 @@
 	}
=20
 }
+class RAPAV_Declaration_SQL extends phpcompta_sql
+{
+	function __construct($p_id=3D-1)
+	{
+
+
+		$this->table =3D "rapport_advanced.declaration";
+		$this->primary_key =3D "d_id";
+
+		$this->name =3D array(
+			"d_id"=3D>"d_id",
+			"d_title"=3D>"d_title",
+			"d_start"=3D>"d_start",
+			"d_end"=3D>"d_end",
+			"to_keep"=3D>"to_keep",
+			"d_generated"=3D>"d_generated"
+		);
+
+		$this->type =3D array(
+				"d_id"=3D>"numeric",
+			"d_title"=3D>"text",
+			"d_start"=3D>"date",
+			"d_end"=3D>"date",
+			"to_keep"=3D>"text",
+			"d_generated"=3D>"date"
+		);
+
+		$this->default =3D array(
+			"d_id" =3D> "auto",
+			"d_generated"=3D>"auto"
+		);
+		global $cn;
+
+		$this->date_format =3D "DD.MM.YYYY";
+		parent::__construct($cn, $p_id);
+	}
+
+}
+class RAPAV_Declaration_Row_SQL extends phpcompta_sql
+{
+function __construct($p_id=3D-1)
+	{
+
+
+		$this->table =3D "rapport_advanced.declaration_row";
+		$this->primary_key =3D "dr_id";
+
+		$this->name =3D array(
+			"dr_id"=3D>"dr_id",
+			"d_id"=3D>"d_id",
+			"dr_libelle"=3D>"dr_libelle",
+			"dr_order"=3D>"dr_order",
+			"dr_code"=3D>"dr_code",
+			"dr_amount"=3D>"dr_amount"
+		);
+
+		$this->type =3D array(
+			"dr_id"=3D>"numeric",
+			"d_id"=3D>"numeric",
+			"dr_libelle"=3D>"text",
+			"dr_order"=3D>"text",
+			"dr_code"=3D>"numeric",
+			"dr_amount"=3D>"numeric"
+
+		);
+
+		$this->default =3D array(
+		);
+		global $cn;
+
+		parent::__construct($cn, $p_id);
+	}
+}
+class RAPAV_Declaration_Row_Detail_SQL extends phpcompta_sql
+{
+	function __construct($p_id=3D-1)
+	{
+
+
+		$this->table =3D "rapport_advanced.declaration_row_detail";
+		$this->primary_key =3D "ddr_id";
+
+		$this->name =3D array(
+			"ddr_id"=3D>"ddr_id",
+			"ddr_amount"=3D>"ddr_amount",
+			"dr_id"=3D>"dr_id"
+		);
+
+		$this->type =3D array(
+			"ddr_id"=3D>"numeric",
+			"ddr_amount"=3D>"numeric",
+			"dr_id"=3D>"numeric"
+		);
+
+		$this->default =3D array(
+			"ddr_id" =3D> "auto"
+		);
+		global $cn;
+
+		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	2012-09-24 20:47:12 =
UTC (rev 412)
+++ trunk/rapport_avance/include/declaration.inc.php	2012-09-27 22:13:03 =
UTC (rev 413)
@@ -26,4 +26,48 @@
  * @brief D=C3=A9claration
  *
  */
+require_once 'class_rapav_declaration.php';
+global $cn;
+if (isset($_GET['compute']))
+{
+	$decl=3Dnew Rapav_Declaration();
+	/**
+	 * @todo verifier date
+	 */
+	$decl->compute($_GET['p_form'],$_GET['p_start'],$_GET['p_end']);
+}
+$date_start=3Dnew IDate('p_start');
+$date_end=3Dnew IDate('p_end');
+$hidden=3DHtmlInput::array_to_hidden(array('gDossier','ac','plugin_code'=
,'sa'),$_GET);
+$select=3Dnew ISelect('p_form');
+$select->value=3D$cn->make_array('select f_id,f_title from rapport_advan=
ced.formulaire order by 2');
 ?>
+<form method=3D"GET">
+	<?=3D$hidden?>
+	<table>
+		<tr>
+			<td>
+				D=C3=A9claration
+			</td>
+			<td>
+				<?=3D$select->input()?>
+			</td>
+		<tr>
+			<td>
+				Date de d=C3=A9but
+			</td>
+			<td>
+				<?=3D$date_start->input()?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			Date de fin
+			</td>
+			<td>
+				<?=3D$date_end->input()?>
+			</td>
+		</tr>
+	</table>
+	<?=3DHtmlInput::submit('compute','G=C3=A9n=C3=A9rer')?>
+</form>
\ No newline at end of file

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	2012-09-24 20:47:12 UTC (rev 412)
+++ trunk/rapport_avance/index.php	2012-09-27 22:13:03 UTC (rev 413)
@@ -29,6 +29,7 @@
 Extension::check_version(5082);
 require_once 'class_phpcompta_sql.php';
 require_once 'rapav_constant.php';
+require_once 'class_impress.php';
 /*
  * load javascript
  */

Modified: trunk/rapport_avance/sql/create.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/create.sql	2012-09-24 20:47:12 UTC (rev 412)
+++ trunk/rapport_avance/sql/create.sql	2012-09-27 22:13:03 UTC (rev 413)
@@ -65,5 +65,44 @@
       REFERENCES rapport_advanced.type_row_detail (tr_id) MATCH SIMPLE
       ON UPDATE SET NULL ON DELETE SET NULL;
=20
+CREATE SEQUENCE rapport_advanced.declaration_param_seq;
=20
+CREATE TABLE rapport_advanced.declaration
+(
+  d_id bigserial NOT NULL,
+  d_title text,
+  d_start date,
+  d_end date,
+  to_keep character(1),
+  d_generated timestamp with time zone NOT NULL DEFAULT now(),
+  f_id bigint,
+  CONSTRAINT declaration_pkey PRIMARY KEY (d_id ),
+  CONSTRAINT declaration_f_id_fkey FOREIGN KEY (f_id)
+      REFERENCES rapport_advanced.formulaire (f_id) MATCH SIMPLE
+      ON UPDATE SET NULL ON DELETE SET NULL
+);
=20
+CREATE TABLE rapport_advanced.declaration_row
+(
+  dr_id bigint NOT NULL DEFAULT 0,
+  d_id bigint,
+  dr_libelle text,
+  dr_order bigint,
+  dr_code text,
+  dr_amount numeric(25,4) NOT NULL,
+  CONSTRAINT declaration_row_pkey PRIMARY KEY (dr_id ),
+  CONSTRAINT declaration_row_d_id_fkey FOREIGN KEY (d_id)
+      REFERENCES rapport_advanced.declaration (d_id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE CASCADE
+);
+CREATE TABLE rapport_advanced.declaration_row_detail
+(
+  ddr_id bigserial NOT NULL,
+  ddr_amount numeric(25,4) NOT NULL DEFAULT 0,
+  dr_id bigint,
+  CONSTRAINT declaration_row_detail_pkey PRIMARY KEY (ddr_id ),
+  CONSTRAINT declaration_row_detail_dr_id_fkey FOREIGN KEY (dr_id)
+      REFERENCES rapport_advanced.declaration_row (dr_id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
+);
+



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


From MAILER-DAEMON Fri Sep 28 17:57:38 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1THiZ0-0003Wu-QD
	for mharc-phpcompta-dev@gnu.org; Fri, 28 Sep 2012 17:57:38 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 28 Sep 2012 23:47:18 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.599900.1348869458.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r414 - 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: Fri, 28 Sep 2012 21:57:37 -0000

Author: danydb
Date: 2012-09-28 23:47:16 +0200 (Fri, 28 Sep 2012)
New Revision: 414

Added:
   trunk/rapport_avance/include/template/declaration_display.php
Modified:
   trunk/rapport_avance/include/class_formulaire_param.php
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/declaration.inc.php
   trunk/rapport_avance/sql/create.sql
Log:
Rapport avance : calcul de la d?\195?\169claration, modification et sauve=
garde

Modified: trunk/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_formulaire_param.php	2012-09-27 22=
:13:03 UTC (rev 413)
+++ trunk/rapport_avance/include/class_formulaire_param.php	2012-09-28 21=
:47:16 UTC (rev 414)
@@ -23,15 +23,22 @@
=20
 /**
  * @file
- * @brief factory
+ * @brief factory display the definition and parameters of a form
  *
  */
 require_once 'class_rapport_avance_sql.php';
 require_once 'class_formulaire_param_detail.php';
=20
+/**
+ * @brief manage the table rapport_avance.formulaire_param
+ */
 class Formulaire_Param extends Formulaire_Param_Sql
 {
-
+	/**
+	 * Factory, create an object following the $form->p_type,
+	 * @param Formulaire_Param_Sql $form
+	 * @return \Formulaire_Title1|\Formulaire_Title2|\Formulaire_Title3|\Fo=
rmulaire_Formula
+	 */
 	static function factory(Formulaire_Param_Sql $form)
 	{
 		switch ($form->p_type)
@@ -48,7 +55,9 @@
 	}
=20
 }
-
+/**
+ * @brief mother class of \Formulaire_Title1|\Formulaire_Title2|\Formula=
ire_Title3|\Formulaire_Formula
+ */
 class Formulaire_Row
 {
=20
@@ -81,7 +90,9 @@
 	}
=20
 }
-
+/**
+ * @brief display title level 1
+ */
 class formulaire_title1 extends Formulaire_Row
 {
=20
@@ -97,6 +108,9 @@
 	}
=20
 }
+/**
+ * @brief display title level 2
+ */
=20
 class formulaire_title2 extends Formulaire_Row
 {
@@ -113,6 +127,9 @@
 	}
=20
 }
+/**
+ * @brief display title level 3
+ */
=20
 class formulaire_title3 extends Formulaire_Row
 {
@@ -129,6 +146,10 @@
 	}
=20
 }
+/**
+ * @brief display the formula : depending of the type of formula, a fact=
ory is used and an object RAPAV_Formula, RAPAV_Account_TVA
+ * or RAPAV_compute will be used for the display of the details
+ */
=20
 class Formulaire_Formula extends Formulaire_Row
 {
@@ -144,7 +165,12 @@
 	{
 		echo $this->obj->p_libelle;
 	}
-
+	/**
+	 * @brief return an object following the key type_detail of the array p=
assed in parameter
+	 *
+	 * @param type $p_index
+	 * @return \RAPAV_Formula|\RAPAV_Account_Tva|\RAPAV_Compute
+	 */
 	function make_object($p_index)
 	{
 		$elt=3D$this->parametre[$p_index]['type_detail'];
@@ -161,7 +187,9 @@
 				break;
 		}
 	}
-
+	/**
+	 * @brief input value
+	 */
 	function input()
 	{
 		echo '<h4 class=3D"title">' . $this->obj->p_libelle . "(" . $this->obj=
->p_code . ")" . '</h4>';

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	2012-09-27 2=
2:13:03 UTC (rev 413)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2012-09-28 2=
1:47:16 UTC (rev 414)
@@ -30,6 +30,7 @@
 require_once 'class_rapav_formulaire.php';
 require_once 'class_formulaire_param_detail.php';
 require_once 'class_rapport_avance_sql.php';
+
 /**
  * @brief compute, save and display a declaration
  */
@@ -38,10 +39,11 @@
=20
 	function __construct()
 	{
-		$this->form=3Dnew RAPAV_Formulaire();
+		$this->form =3D new RAPAV_Formulaire();
 		parent::__construct();
 	}
-	function compute($p_id,$p_start, $p_end)
+
+	function compute($p_id, $p_start, $p_end)
 	{
 		global $cn;
 		$cn->start();
@@ -49,94 +51,120 @@
 		// create object_rapav_declaration
 		//   compute
 		// save the parameter
-		$this->form->f_id=3D$p_id;
+		$this->form->f_id =3D $p_id;
 		$this->form->load();
-		$this->d_title=3D$this->form->f_title;
-		$this->d_start=3D$p_start;
-		$this->d_end=3D$p_end;
-		$this->to_keep=3D'N';
+		$this->d_title =3D $this->form->f_title;
+		$this->d_start =3D $p_start;
+		$this->d_end =3D $p_end;
+		$this->to_keep =3D 'N';
 		$this->insert();
 		/*
-		 * First we compute the formula and tva_code
+		 * First we compute the formula and tva_code for each detail
 		 */
-		$array =3D $cn->get_array("select fp.p_id,p_code,p_libelle,p_type,p_or=
der,f_id,p_info,t_id
-			from rapport_advanced.formulaire_param as fp
-			 join rapport_advanced.formulaire_param_detail as fpd on (fp.p_id=3Df=
pd.p_id)
+		$array =3D $cn->get_array("select p_id,p_code,p_libelle,p_type,p_order=
,f_id,p_info,t_id
+			from rapport_advanced.formulaire_param
 			where
 			f_id=3D$1
-			and type_detail in (1,2)",
-				array($p_id));
+			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_s=
eq');
+			$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();
 		}
-		/*
-		 * Secundo we compute the compute code
-		 */
-		$array =3D $cn->get_array("select fp.p_id,p_code,p_libelle,p_type,p_or=
der,f_id,p_info,t_id
-			from rapport_advanced.formulaire_param as fp
-			 join rapport_advanced.formulaire_param_detail as fpd on (fp.p_id=3Df=
pd.p_id)
-			where
-			f_id=3D$1
-			and type_detail =3D3
-			order by p_order",
-				array($p_id));
+
 		/**
-		 * @note order is important !!!
-		 *
+		 * Add the lines missing lines
 		 */
-		for ($e =3D 0; $e < count($array); $e++)
-		{
-			$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_s=
eq');
-			$row->from_array($array[$e]);
-			$row->compute($p_start, $p_end);
-			$row->insert();
-		}
-		/**
-		 * Add the lines without definition
-		 */
 		$array =3D $cn->get_array("select fp.p_id,p_code,p_libelle,p_type,p_or=
der,f_id,p_info,t_id
 			from rapport_advanced.formulaire_param as fp
-			left join rapport_advanced.formulaire_param_detail as fpd on (fp.p_id=
=3Dfpd.p_id)
 			where
 			f_id=3D$1
-			and type_detail is null",
-				array($p_id));
+			and p_type in (1,2,6)", 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_s=
eq');
+			$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=3D0;
+			$row->amount =3D 0;
 			$row->insert();
 		}
=20
 		$cn->commit();
 	}
=20
+	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));
+		require_once 'template/declaration_display.php';
+	}
+
+	function save()
+	{
+		global $cn;
+		try
+		{
+			$cn->start();
+			$this->to_keep =3D 'Y';
+			$this->update();
+			$code =3D $_POST['code'];
+			$amount =3D $_POST['amount'];
+			for ($i =3D 0; $i < count($code); $i++)
+			{
+				$cn->exec_sql('update rapport_advanced.declaration_row set dr_amount=
=3D$2 where dr_id=3D$1',array($code[$i],$amount[$i]));
+			}
+		}
+		catch(Exception $e)
+		{
+			alert($e->getTraceAsString());
+		}
+	}
+
 }
=20
+/**
+ * @brief Match each row of a form, this row can have several details
+ *
+ */
 class Rapav_Declaration_Param
 {
+
+	/**
+	 * @brief insert into rapport_advanced.formulaire_param
+	 */
 	function insert()
 	{
-		$data=3Dnew RAPAV_Declaration_Row_SQL();
-		$data->dr_code=3D$this->param->p_code;
-		$data->dr_libelle=3D$this->param->p_libelle;
-		$data->dr_order=3D$this->param->p_order;
-		$data->dr_amount=3D$this->amount;
-		$data->d_id=3D$this->d_id;
-		$data->dr_id=3D$this->dr_id;
+		$data =3D new RAPAV_Declaration_Row_SQL();
+		$data->dr_info=3D$this->param->p_info;
+		$data->dr_code =3D $this->param->p_code;
+		$data->dr_libelle =3D $this->param->p_libelle;
+		$data->dr_order =3D $this->param->p_order;
+		$data->dr_amount =3D $this->amount;
+		$data->d_id =3D $this->d_id;
+		$data->dr_id =3D $this->dr_id;
+		$data->dr_type =3D $this->param->p_type;
 		$data->insert();
 	}
+
+	/**
+	 * @brief set the attribute param with the content of the array.
+	 * keys :
+	 *    - 'p_id',
+	 *    - 'p_code',
+	 *    - 'p_libelle',
+	 *    - 'p_type',
+	 *    - 'p_order',
+	 *    - 'f_id',
+	 *    - 'p_info',
+	 *    - 't_id'
+	 * @param type $p_array
+	 */
 	function from_array($p_array)
 	{
 		$this->param =3D new Formulaire_Param();
@@ -155,6 +183,8 @@
 	 *   - 3 N-1
 	 *   - 4 N-2
 	 *   - 5 N-3
+	 * @param $p_start requested date
+	 * @param $p_end requested date
 	 */
 	function compute_date($p_start, $p_end)
 	{
@@ -204,34 +234,42 @@
 		$this->end =3D $per_end->last_day();
 	}
=20
+	/*	 * *
+	 * @brief compute amount of all the detail of apport_advanced.formulair=
e_param
+	 * @param $p_start requested start date
+	 * @param $p_start requested end date
+	 *
+	 *
+	 */
+
 	function compute($p_start, $p_end)
 	{
 		global $cn;
 		bcscale(2);
-		$this->amount=3D0;
-		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////
-		// Compute first the formula and the account_tva
-		//////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////
+		$this->amount =3D 0;
+
 		$array =3D $cn->get_array("select fp_id,p_id,tmp_val,tva_id,fp_formula=
,fp_signed,jrn_def_type,tt_id,type_detail
 			from rapport_advanced.formulaire_param_detail where p_id=3D$1", array=
($this->param->p_id));
 		$this->compute_date($p_start, $p_end);
 		for ($e =3D 0; $e < count($array); $e++)
 		{
 			$row_detail =3D Rapav_Declaration_Detail::factory($array[$e]);
-			$row_detail->dr_id=3D$this->dr_id;
-			$tmp_amount=3D$row_detail->compute($this->start, $this->end);
-			$this->amount=3Dbcadd($tmp_amount,$this->amount);
+			$row_detail->dr_id =3D $this->dr_id;
+			$row_detail->d_id =3D $this->d_id;
+			$tmp_amount =3D $row_detail->compute($this->start, $this->end);
+			$this->amount =3D bcadd($tmp_amount, $this->amount);
 			$row_detail->insert();
 		}
-
 	}
=20
 }
+
 ////////////////////////////////////////////////////////////////////////=
/////////////////////////////////////////////////////
 // Compute the detail for each row
 ////////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////////////
 class Rapav_Declaration_Detail extends RAPAV_Declaration_Row_Detail_SQL
 {
+
 	/**
 	 * @brief create an object RAPAV_dd_Formula, RAPAV_dd_Account_Tva or Ra=
pav_dd_compute following the idx type_detail
 	 * @param type $p_array
@@ -256,9 +294,10 @@
 		}
=20
 		$ret->from_array($p_array);
-		$ret->ddr_amount=3D0;
+		$ret->ddr_amount =3D 0; // cannot be null
 		return $ret;
 	}
+
 	/**
 	 * @brief the p_array contains a row from formulaire_param_detail
 	 * it will be copied into this->form.
@@ -283,6 +322,14 @@
 class Rapav_dd_Formula extends Rapav_Declaration_Detail
 {
=20
+	/**
+	 * compute the amount for one detail of type formula
+	 *  rapport_advanced.formulaire_param_detail
+	 * @global type $cn database connexion
+	 * @param $p_start (date) : computed start date
+	 * @param $p_end (date) computed start date
+	 * @return numeric amount computed
+	 */
 	function compute($p_start, $p_end)
 	{
 		global $cn;
@@ -291,6 +338,7 @@
 	}
=20
 }
+
 /**
  * @brief handle the param_detail type Compute
  * @see RAPAV_Compute
@@ -298,10 +346,40 @@
 class Rapav_dd_Compute extends Rapav_Declaration_Detail
 {
=20
+	/**
+	 * compute the amount for one detail
+	 *  rapport_advanced.formulaire_param_detail
+	 * the attribute d_id and dr_id must be set before the call
+	 * @global type $cn database connexion
+	 * @param $p_start (date) : computed start date not used
+	 * @param $p_end (date) computed start date not used
+	 * @return numeric amount computed
+	 */
 	function compute($p_start, $p_end)
 	{
-		return 0;
+		global $cn;
+		$amount =3D 0;
+		bcscale(2);
=20
+		// copy $this->form->fp_formula to a variable
+		$formula =3D $this->form->fp_formula;
+
+		// split the string from  into smaller piece
+		preg_match_all("/\[([A-Z]*[0-9]*)*([0-9]*[A-Z]*)\]/i", $formula, $e);
+		$tmp =3D $e[0];
+
+		foreach ($tmp as $piece)
+		{
+			// Find the code in the database
+			$search =3D str_replace('[', '', $piece);
+			$search =3D str_replace(']', '', $search);
+			$value =3D $cn->get_value('select coalesce(sum(dr_amount),0) as value
+				from rapport_advanced.declaration_row where d_id=3D$1 and dr_code=3D=
$2', array($this->d_id, $search));
+			$formula =3D str_replace($piece, $value, $formula);
+		}
+		eval('$amount =3D ' . $formula . ';');
+		//
+		return $amount;
 	}
=20
 }
@@ -327,7 +405,7 @@
 	 * @param $p_end end date
 	 * @return amount
 	 */
-	private  function compute_tva($p_start, $p_end)
+	private function compute_tva($p_start, $p_end)
 	{
 		if ($this->form->jrn_def_type =3D=3D 'ACH')
 		{
@@ -337,9 +415,9 @@
 						(j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date($3,'=
DD.MM.YYYY'))
 						and j_poste::text like ($4)";
 			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
-														$p_start,
-														$p_end,
-														$this->form->tmp_val));
+				$p_start,
+				$p_end,
+				$this->form->tmp_val));
 			return $amount;
 		}
 		if ($this->form->jrn_def_type =3D=3D 'VEN')
@@ -349,15 +427,16 @@
 						where qs_vat_code=3D$1
 						and (j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date(=
$3,'DD.MM.YYYY'))
 						and j_poste::text like ($4)";
-				$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
-														$p_start,
-														$p_end,
-														$this->form->tmp_val));
-				return $amount;
+			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
+				$p_start,
+				$p_end,
+				$this->form->tmp_val));
+			return $amount;
 		}
 		$this->errcode =3D 'Erreur dans le journal';
 		return 0;
 	}
+
 	/**
 	 * compute the amount of account using the given tva_id in either the l=
edger ACH or VEN
 	 * following the $this->form->jrn_def_type.
@@ -378,9 +457,9 @@
 					where qs_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
 					and j_poste::text like ($4)";
 			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
-														$p_start,
-														$p_end,
-														$this->form->tmp_val));
+				$p_start,
+				$p_end,
+				$this->form->tmp_val));
 			return $amount;
 		}
 		if ($this->form->jrn_def_type =3D=3D 'VEN')
@@ -397,6 +476,7 @@
 		$this->errcode =3D 'Erreur dans le journal';
 		return 0;
 	}
+
 	/**
 	 * Compute the amount of TVA or Account, call internally private functi=
ons
 	 * @see Rapav_dd_Account_Tva::computa_amount Rapav_dd_Account_Tva::comp=
ute_tva
@@ -439,4 +519,5 @@
 	}
=20
 }
+
 ?>

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	2012-09-27 =
22:13:03 UTC (rev 413)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2012-09-28 =
21:47:16 UTC (rev 414)
@@ -195,7 +195,9 @@
 			"dr_libelle"=3D>"dr_libelle",
 			"dr_order"=3D>"dr_order",
 			"dr_code"=3D>"dr_code",
-			"dr_amount"=3D>"dr_amount"
+			"dr_amount"=3D>"dr_amount",
+			"dr_type"=3D>"dr_type",
+			"dr_info"=3D>"dr_info"
 		);
=20
 		$this->type =3D array(
@@ -204,7 +206,9 @@
 			"dr_libelle"=3D>"text",
 			"dr_order"=3D>"text",
 			"dr_code"=3D>"numeric",
-			"dr_amount"=3D>"numeric"
+			"dr_amount"=3D>"numeric",
+			"dr_type"=3D>"numeric",
+			"dr_info"=3D>'text'
=20
 		);
=20

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	2012-09-27 22:13:03 =
UTC (rev 413)
+++ trunk/rapport_avance/include/declaration.inc.php	2012-09-28 21:47:16 =
UTC (rev 414)
@@ -28,6 +28,22 @@
  */
 require_once 'class_rapav_declaration.php';
 global $cn;
+
+/*
+ * Save the date (update them)
+ */
+if ( isset($_POST['save']))
+{
+	$decl=3Dnew Rapav_Declaration();
+	$decl->d_id=3D$_POST['d_id'];
+	$decl->load();
+	$decl->save();
+	$decl->display();
+	exit();
+}
+/*
+ * compute and propose to modify and save
+ */
 if (isset($_GET['compute']))
 {
 	$decl=3Dnew Rapav_Declaration();
@@ -35,6 +51,11 @@
 	 * @todo verifier date
 	 */
 	$decl->compute($_GET['p_form'],$_GET['p_start'],$_GET['p_end']);
+	echo '<form class=3D"print" method=3D"POST">';
+	$decl->display();
+	echo HtmlInput::submit('save','Sauver');
+	echo '</form>';
+	exit();
 }
 $date_start=3Dnew IDate('p_start');
 $date_end=3Dnew IDate('p_end');

Added: 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	       =
                 (rev 0)
+++ trunk/rapport_avance/include/template/declaration_display.php	2012-09=
-28 21:47:16 UTC (rev 414)
@@ -0,0 +1,60 @@
+<?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 display content of a declaration
+ *
+ */
+?>
+<h1><?=3D$this->d_title?></h1>
+Du <?=3D$this->d_start?> au <?=3D$this->d_end?>
+<?
+	if ( empty($array) ) { echo 'Aucune donn=C3=A9e'; exit();}
+
+	// Create infobulle
+	echo HtmlInput::hidden('d_id',$this->d_id);
+for ($i=3D0;$i<count($array);$i++):
+	$row=3D$array[$i];
+switch($row['dr_type'])
+{
+	case 1:
+		echo '<h1  class=3D"title">'.$row['dr_libelle'].'</h1>';
+		echo '<span class=3D"notice">'.$row['dr_info'].'</span>';
+		break;
+	case 2:
+		echo '<h2  class=3D"title">'.$row['dr_libelle'].'</h2>';
+		echo '<span class=3D"notice">'.$row['dr_info'].'</span>';
+		break;
+	case 6:
+		echo '<h3  class=3D"title">'.$row['dr_libelle'].'</h3>';
+		echo '<span class=3D"notice">'.$row['dr_info'].'</span>';
+		break;
+	case 3:
+		$input=3Dnew INum('amount[]',$row['dr_amount']);
+		echo HtmlInput::hidden('code[]',$row['dr_id']);
+		echo '<p>'.$row['dr_code']." ".$row['dr_libelle']." =3D ".$input->inpu=
t(). '<span class=3D"notice">'.$row['dr_info'].'</span>'.'</p>';
+
+}
+endfor;
+?>
\ No newline at end of file

Modified: trunk/rapport_avance/sql/create.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/create.sql	2012-09-27 22:13:03 UTC (rev 413)
+++ trunk/rapport_avance/sql/create.sql	2012-09-28 21:47:16 UTC (rev 414)
@@ -105,4 +105,6 @@
       REFERENCES rapport_advanced.declaration_row (dr_id) MATCH SIMPLE
       ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
 );
+ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_type integer;
+ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_info text;
=20



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


From MAILER-DAEMON Sat Sep 29 17:38:58 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI4kU-0006wx-Hx
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 17:38:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 29 Sep 2012 23:28:47 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602079.1348954738.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5119 - 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: Sat, 29 Sep 2012 21:38:57 -0000

Author: danydb
Date: 2012-09-29 23:28:46 +0200 (Sat, 29 Sep 2012)
New Revision: 5119

Modified:
   phpcompta/tags/rel650/html/js/scripts.js
Log:
add the javascript function check_date and check_date_id

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/scripts.js	2012-09-19 20:55:43 UTC (rev=
 5118)
+++ phpcompta/tags/rel650/html/js/scripts.js	2012-09-29 21:28:46 UTC (rev=
 5119)
@@ -1639,4 +1639,39 @@
 				      }
 				  }
 				  );
+}
+/**
+ * @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$('check_date_id').value;
+	return check_date(str_date);
 }
\ 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 Sep 29 18:14:27 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI5Ip-0001p9-Qm
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 18:14:27 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 00:04:18 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602106.1348956867.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5120 - 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: Sat, 29 Sep 2012 22:14:27 -0000

Author: danydb
Date: 2012-09-30 00:04:17 +0200 (Sun, 30 Sep 2012)
New Revision: 5120

Modified:
   phpcompta/tags/rel650/html/js/scripts.js
Log:
correct javascript function check_date_id

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/scripts.js	2012-09-29 21:28:46 UTC (rev=
 5119)
+++ phpcompta/tags/rel650/html/js/scripts.js	2012-09-29 22:04:17 UTC (rev=
 5120)
@@ -1672,6 +1672,6 @@
  */
 function check_date_id(p_id_date)
 {
-	var str_date=3D$('check_date_id').value;
+	var str_date=3D$(p_id_date).value;
 	return check_date(str_date);
 }
\ 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 Sep 29 18:20:30 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI5Og-0002MG-HI
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 18:20:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 00:10:21 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602121.1348957229.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r415 - 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: Sat, 29 Sep 2012 22:20:29 -0000

Author: danydb
Date: 2012-09-30 00:10:20 +0200 (Sun, 30 Sep 2012)
New Revision: 415

Modified:
   trunk/rapport_avance/include/class_formulaire_param_detail.php
Log:
verify that compute is valid

Modified: trunk/rapport_avance/include/class_formulaire_param_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/rapport_avance/include/class_formulaire_param_detail.php	2012-0=
9-28 21:47:16 UTC (rev 414)
+++ trunk/rapport_avance/include/class_formulaire_param_detail.php	2012-0=
9-29 22:10:20 UTC (rev 415)
@@ -169,6 +169,23 @@
 			$this->errcode=3D" Aucune formule trouv=C3=A9e";
 			return 1;
 		}
+
+		// copy $this->form->fp_formula to a variable
+		$formula =3D $this->fp_formula;
+
+		// remove the valid
+		preg_match_all("/\[([A-Z]*[0-9]*)*([0-9]*[A-Z]*)\]/i", $formula, $e);
+		$formula=3Dpreg_replace("/\[([A-Z]*[0-9]*)*([0-9]*[A-Z]*)\]/i", '',$fo=
rmula);
+		$formula=3Dpreg_replace('/([0-9]+.{0,1}[0.9]*)*(\+|-|\*|\/)*/','',$for=
mula);
+		$formula=3Dpreg_replace('/(\(|\))/','',$formula);
+		$formula=3Dpreg_replace('/\s/','',$formula);
+
+		// if something remains it should be a mistake
+		if ($formula !=3D '')
+		{
+			$this->errcode=3D" Erreur dans la formule ".$formula;
+			return 1;
+		}
 		return 0;
 	}
=20



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


From MAILER-DAEMON Sat Sep 29 18:20:52 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI5P2-0002Ns-LY
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 18:20:52 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 00:10:42 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602122.1348957251.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r416 - 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: Sat, 29 Sep 2012 22:20:51 -0000

Author: danydb
Date: 2012-09-30 00:10:42 +0200 (Sun, 30 Sep 2012)
New Revision: 416

Modified:
   trunk/rapport_avance/include/declaration.inc.php
Log:
verify that date is valid

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	2012-09-29 22:10:20 =
UTC (rev 415)
+++ trunk/rapport_avance/include/declaration.inc.php	2012-09-29 22:10:42 =
UTC (rev 416)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  *   This file is part of PhpCompta.
  *
@@ -32,10 +31,10 @@
 /*
  * Save the date (update them)
  */
-if ( isset($_POST['save']))
+if (isset($_POST['save']))
 {
-	$decl=3Dnew Rapav_Declaration();
-	$decl->d_id=3D$_POST['d_id'];
+	$decl =3D new Rapav_Declaration();
+	$decl->d_id =3D $_POST['d_id'];
 	$decl->load();
 	$decl->save();
 	$decl->display();
@@ -46,49 +45,59 @@
  */
 if (isset($_GET['compute']))
 {
-	$decl=3Dnew Rapav_Declaration();
-	/**
-	 * @todo verifier date
-	 */
-	$decl->compute($_GET['p_form'],$_GET['p_start'],$_GET['p_end']);
-	echo '<form class=3D"print" method=3D"POST">';
-	$decl->display();
-	echo HtmlInput::submit('save','Sauver');
-	echo '</form>';
-	exit();
+	$decl =3D new Rapav_Declaration();
+	if (isDate($_GET['p_start']) =3D=3D 0 || isDate($_GET['p_end']) =3D=3D =
0)
+	{
+		alert('Date invalide');
+	}
+	else
+	{
+		$decl->compute($_GET['p_form'], $_GET['p_start'], $_GET['p_end']);
+		echo '<form class=3D"print" method=3D"POST">';
+		$decl->display();
+		echo HtmlInput::submit('save', 'Sauver');
+		echo '</form>';
+		exit();
+	}
 }
-$date_start=3Dnew IDate('p_start');
-$date_end=3Dnew IDate('p_end');
-$hidden=3DHtmlInput::array_to_hidden(array('gDossier','ac','plugin_code'=
,'sa'),$_GET);
-$select=3Dnew ISelect('p_form');
-$select->value=3D$cn->make_array('select f_id,f_title from rapport_advan=
ced.formulaire order by 2');
+$date_start =3D new IDate('p_start');
+$date_end =3D new IDate('p_end');
+$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');
 ?>
-<form method=3D"GET">
-	<?=3D$hidden?>
+<form id=3D"declaration_form_id" method=3D"GET" onsubmit=3D"return valid=
ate()">
+	<?=3D $hidden?>
 	<table>
 		<tr>
 			<td>
 				D=C3=A9claration
 			</td>
 			<td>
-				<?=3D$select->input()?>
+				<?=3D $select->input()?>
 			</td>
 		<tr>
 			<td>
 				Date de d=C3=A9but
 			</td>
 			<td>
-				<?=3D$date_start->input()?>
+				<?=3D $date_start->input()?>
 			</td>
 		</tr>
 		<tr>
 			<td>
-			Date de fin
+				Date de fin
 			</td>
 			<td>
-				<?=3D$date_end->input()?>
+				<?=3D $date_end->input()?>
 			</td>
 		</tr>
 	</table>
-	<?=3DHtmlInput::submit('compute','G=C3=A9n=C3=A9rer')?>
-</form>
\ No newline at end of file
+	<?=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('Da=
te de d=C3=A9but incorrecte');return false;}
+		if ( check_date_id('<?=3D$date_end->id?>') =3D=3D false ) {alert('Date=
 de fin incorrecte');return false;}
+	}
+</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 Sat Sep 29 18:22:25 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI5QX-0002RX-Rh
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 18:22:25 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 00:12:16 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602125.1348957345.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r417 - 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: Sat, 29 Sep 2012 22:22:24 -0000

Author: danydb
Date: 2012-09-30 00:12:15 +0200 (Sun, 30 Sep 2012)
New Revision: 417

Modified:
   trunk/rapport_avance/include/class_rapav_formulaire.php
   trunk/rapport_avance/include/template/formulaire_definition.php
Log:
Check that order is not empty : default value proposed

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	2012-09-29 22=
:10:42 UTC (rev 416)
+++ trunk/rapport_avance/include/class_rapav_formulaire.php	2012-09-29 22=
:12:15 UTC (rev 417)
@@ -131,7 +131,7 @@
 			$form_param->p_code =3D $p_array['p_code'][$i];
 			$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 $p_array['p_order'][$i];
+			$form_param->p_order =3D (isNumber($p_array['p_order'][$i])=3D=3D0)?$=
i*10:$p_array['p_order'][$i];
 			$form_param->t_id =3D $p_array['t_id'][$i];
 			$form_param->f_id =3D $p_array['f_id'];
 			// update or insert the row

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	2012-=
09-29 22:10:42 UTC (rev 416)
+++ trunk/rapport_avance/include/template/formulaire_definition.php	2012-=
09-29 22:12:15 UTC (rev 417)
@@ -89,7 +89,11 @@
 		</td>
 		<td>
 			<?
-				$p_order=3Dnew INum('p_order[]',$this->definition[$i]->p_order);
+				if ($this->definition[$i]->p_order=3D=3D'')
+					$value=3D$i*10;
+				else
+					$value=3D$this->definition[$i]->p_order;
+				$p_order=3Dnew INum('p_order[]',$value);
 				$p_order->prec=3D0;
 				$p_order->size=3D4;
 				echo $p_order->input();



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


From MAILER-DAEMON Sat Sep 29 19:23:19 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI6NT-0000c2-R3
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 19:23:19 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 01:13:08 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602217.1348960999.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r418 - 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: Sat, 29 Sep 2012 23:23:18 -0000

Author: danydb
Date: 2012-09-30 01:13:07 +0200 (Sun, 30 Sep 2012)
New Revision: 418

Added:
   trunk/rapport_avance/ajax_declaration_display.php
   trunk/rapport_avance/include/historique.inc.php
Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/include/declaration.inc.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Add the history + display + remove

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	2012-09-29 22:12:15 UTC (rev 417)
+++ trunk/rapport_avance/ajax.php	2012-09-29 23:13:07 UTC (rev 418)
@@ -111,6 +111,19 @@
 	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
 	case 'delete_param_detail':
 		$cn->exec_sql("delete from rapport_advanced.formulaire_param_detail wh=
ere fp_id=3D$1",array($fp_id));
+		break;
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	// Display a saved declaration from history
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	case 'rapav_declaration_display':
+		include 'ajax_declaration_display.php';
+		break;
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	// Delete a saved declaration (from history)
+	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
+	case 'rapav_declaration_delete':
+		$cn->exec_sql("delete from rapport_advanced.declaration where d_id=3D$=
1",array($_GET['d_id']));
+		break;
 	default:
 		break;
=20

Added: 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	                   =
     (rev 0)
+++ trunk/rapport_avance/ajax_declaration_display.php	2012-09-29 23:13:07=
 UTC (rev 418)
@@ -0,0 +1,36 @@
+<?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 display a declaration but you can't modify it
+ */
+require_once 'include/class_rapav_declaration.php';
+global $cn;
+echo HtmlInput::button_action("Retour","$('declaration_list_div').show()=
; $('declaration_display_div').hide();");
+$decl =3D new Rapav_Declaration();
+$decl->d_id =3D $_GET['d_id'];
+$decl->load();
+$decl->display();
+echo HtmlInput::button_action("Retour","$('declaration_list_div').show()=
; $('declaration_display_div').hide();");
+?>

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	2012-09-29 2=
2:12:15 UTC (rev 417)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2012-09-29 2=
3:13:07 UTC (rev 418)
@@ -119,6 +119,7 @@
 			{
 				$cn->exec_sql('update rapport_advanced.declaration_row set dr_amount=
=3D$2 where dr_id=3D$1',array($code[$i],$amount[$i]));
 			}
+			$cn->commit();
 		}
 		catch(Exception $e)
 		{

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	2012-09-29 22:12:15 =
UTC (rev 417)
+++ trunk/rapport_avance/include/declaration.inc.php	2012-09-29 23:13:07 =
UTC (rev 418)
@@ -36,8 +36,10 @@
 	$decl =3D new Rapav_Declaration();
 	$decl->d_id =3D $_POST['d_id'];
 	$decl->load();
+	$decl->to_keep=3D'Y';
 	$decl->save();
 	$decl->display();
+	echo '<h2 class=3D"notice"> Sauv=C3=A9</h2>';
 	exit();
 }
 /*

Added: 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	                     =
   (rev 0)
+++ trunk/rapport_avance/include/historique.inc.php	2012-09-29 23:13:07 U=
TC (rev 418)
@@ -0,0 +1,78 @@
+<?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 history of the saved declaration
+ * take data from rapport_avance.declaration and display via ajax
+ */
+global $cn;
+$data=3D$cn->get_array("select d_id,d_title,
+		d_start,d_end
+		from rapport_advanced.declaration
+		where to_keep=3D'Y'
+		order by d_start,d_title");
+?>
+<div id=3D"declaration_list_div">
+<table class=3D"sortable">
+	<tr>
+		<th>
+			Date d=C3=A9but
+		</th>
+		<th>
+			Date Fin
+		</th>
+		<th>
+			D=C3=A9claration
+		</th>
+		<th>
+
+		</th>
+		<th>
+		=09
+		</th>
+	</tr>
+	<? for ($i=3D0;$i<count($data);$i++) :?>
+	<tr id=3D"tr_<?=3D$data[$i]['d_id']?>">
+		<td>
+			<?=3Dformat_date($data[$i]['d_start'])?>
+		</td>
+		<td>
+			<?=3Dformat_date($data[$i]['d_end'])?>
+		</td>
+		<td>
+			<?=3Dh($data[$i]['d_title'])?>
+		</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']?>">
+			<?=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>
+	<? endfor; ?>
+</table>
+</div>
+<div id=3D"declaration_display_div">
+
+</div>
\ No newline at end of file

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	2012-09-29 22:12:15 UTC (rev=
 417)
+++ trunk/rapport_avance/rapav_javascript.js	2012-09-29 23:13:07 UTC (rev=
 418)
@@ -298,4 +298,61 @@
 	}
=20
 	return false;
+}
+function rapav_declaration_display(plugin_code,ac,dossier,d_id)
+{
+	try
+	{
+		$('declaration_list_div').hide();
+		$('declaration_display_div').innerHTML=3D"";
+		$('declaration_display_div').show();
+		waiting_box();
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Drapav_declaration_display'+"&d_id=3D"+d_id;
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					var answer=3Dreq.responseText;
+					$('declaration_display_div').innerHTML=3Danswer;
+					answer.evalScripts()
+				}
+			}
+			);
+	}
+	catch(e)
+	{
+		alert(e.message);
+	}
+}
+function rapav_declaration_delete(plugin_code,ac,dossier,d_id)
+{
+	try
+	{
+		if ( confirm('Confirmez-vous l\'effacement ?') =3D=3D false) { return;=
}
+		waiting_box();
+		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Drapav_declaration_delete'+"&d_id=3D"+d_id;
+		var action=3Dnew Ajax.Request(
+			"ajax.php",
+			{
+				method:'get',
+				parameters:querystring,
+				onFailure:error_get_predef,
+				onSuccess:function(req){
+					remove_waiting_box();
+					$('tr_'+d_id).style.textDecoration=3D"line-through";
+					$('tr_'+d_id).style.color=3D"red";
+					$('del_'+d_id).innerHTML=3D"";
+					$('mod_'+d_id).innerHTML=3D"";
+				}
+			}
+			);
+	}
+	catch(e)
+	{
+		alert(e.message);
+	}
 }
\ 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 Sep 29 19:37:58 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI6be-0001a7-BT
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 19:37:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 01:27:47 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602227.1348961877.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r419 - 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: Sat, 29 Sep 2012 23:37:57 -0000

Author: danydb
Date: 2012-09-30 01:27:47 +0200 (Sun, 30 Sep 2012)
New Revision: 419

Added:
   trunk/rapport_avance/sql/install.sql
Removed:
   trunk/rapport_avance/sql/create.sql
Log:
rename file

Deleted: trunk/rapport_avance/sql/create.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/create.sql	2012-09-29 23:13:07 UTC (rev 418)
+++ trunk/rapport_avance/sql/create.sql	2012-09-29 23:27:47 UTC (rev 419)
@@ -1,110 +0,0 @@
-create schema rapport_advanced;
-
-create table rapport_advanced.formulaire
-(f_id serial primary key,
-f_title text,
-f_description text);
-insert into rapport_advanced.formulaire values (1,'cerfa3310-ca3');
-
-create 	table rapport_advanced.type_row(
-p_type integer primary key,
-p_description text);
-
-insert into rapport_advanced.type_row values (1,'Titre'), (2,'Sous-titre=
'),(3,'Formule');
-
-create table rapport_advanced.periode_type
-(
-t_id integer primary key,
-t_description text);
-
-insert into rapport_advanced.periode_type values (1,'D''apr=C3=A8s date'=
),(2,'N'),(3,'N-1'),(4,'N-2'),(5,'N-3');
-
-create table rapport_advanced.type_row_detail
-(tr_id integer primary key,
- tr_description text);
-
- insert into rapport_advanced.type_row_detail(tr_id,tr_description) valu=
es (1,'Formule'),(2,'Poste comptable et code'),(3,'Calcul sur formulaire'=
);
-
-
-create table  rapport_advanced.formulaire_param
-(
-	p_id serial primary key,
-	p_code	text,
-	p_libelle	text,
-	p_type integer references rapport_advanced.type_row(p_type) ,
-	p_order integer not null,
-	f_id integer references rapport_advanced.formulaire(f_id) on update cas=
cade,
-	t_id integer references rapport_advanced.periode_type(t_id)
-);
-create table rapport_advanced.total_type(
-	tt_id serial primary key,
-	tt_label text);
-
-insert into rapport_advanced.total_type values (0,'Total code TVA+Poste =
comptable'),(1,'Total code tva'),(2,'Total poste comptable');
-
-create table rapport_advanced.formulaire_param_detail
-(
-	fp_id serial primary key,
-	p_id integer references rapport_advanced.formulaire_param(p_id) on upda=
te cascade on delete cascade,
-	tmp_val account_type,
-	tva_id integer references public.tva_rate(tva_id),
-	fp_formula text,
-	fp_signed integer,
-	type_detail integer,
-	jrn_def_type char(3),
-	tt_id integer references rapport_advanced.total_type(tt_id)
-);
-ALTER TABLE rapport_advanced.formulaire_param ADD UNIQUE (f_id, p_code);
-
-ALTER TABLE rapport_advanced.formulaire_param
-   ADD COLUMN p_info text;
-COMMENT ON COLUMN rapport_advanced.formulaire_param.p_info IS 'si non vi=
de affiche infobulle';
-
-ALTER TABLE rapport_advanced.formulaire_param_detail
-  ADD CONSTRAINT fk_formulaire_param_detail_type_row_detail FOREIGN KEY =
(type_detail)
-      REFERENCES rapport_advanced.type_row_detail (tr_id) MATCH SIMPLE
-      ON UPDATE SET NULL ON DELETE SET NULL;
-
-CREATE SEQUENCE rapport_advanced.declaration_param_seq;
-
-CREATE TABLE rapport_advanced.declaration
-(
-  d_id bigserial NOT NULL,
-  d_title text,
-  d_start date,
-  d_end date,
-  to_keep character(1),
-  d_generated timestamp with time zone NOT NULL DEFAULT now(),
-  f_id bigint,
-  CONSTRAINT declaration_pkey PRIMARY KEY (d_id ),
-  CONSTRAINT declaration_f_id_fkey FOREIGN KEY (f_id)
-      REFERENCES rapport_advanced.formulaire (f_id) MATCH SIMPLE
-      ON UPDATE SET NULL ON DELETE SET NULL
-);
-
-CREATE TABLE rapport_advanced.declaration_row
-(
-  dr_id bigint NOT NULL DEFAULT 0,
-  d_id bigint,
-  dr_libelle text,
-  dr_order bigint,
-  dr_code text,
-  dr_amount numeric(25,4) NOT NULL,
-  CONSTRAINT declaration_row_pkey PRIMARY KEY (dr_id ),
-  CONSTRAINT declaration_row_d_id_fkey FOREIGN KEY (d_id)
-      REFERENCES rapport_advanced.declaration (d_id) MATCH SIMPLE
-      ON UPDATE CASCADE ON DELETE CASCADE
-);
-CREATE TABLE rapport_advanced.declaration_row_detail
-(
-  ddr_id bigserial NOT NULL,
-  ddr_amount numeric(25,4) NOT NULL DEFAULT 0,
-  dr_id bigint,
-  CONSTRAINT declaration_row_detail_pkey PRIMARY KEY (ddr_id ),
-  CONSTRAINT declaration_row_detail_dr_id_fkey FOREIGN KEY (dr_id)
-      REFERENCES rapport_advanced.declaration_row (dr_id) MATCH SIMPLE
-      ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
-);
-ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_type integer;
-ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_info text;
-

Copied: trunk/rapport_avance/sql/install.sql (from rev 417, trunk/rapport=
_avance/sql/create.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/install.sql	                        (rev 0)
+++ trunk/rapport_avance/sql/install.sql	2012-09-29 23:27:47 UTC (rev 419=
)
@@ -0,0 +1,110 @@
+create schema rapport_advanced;
+
+create table rapport_advanced.formulaire
+(f_id serial primary key,
+f_title text,
+f_description text);
+insert into rapport_advanced.formulaire values (1,'cerfa3310-ca3');
+
+create 	table rapport_advanced.type_row(
+p_type integer primary key,
+p_description text);
+
+insert into rapport_advanced.type_row values (1,'Titre'), (2,'Sous-titre=
'),(3,'Formule');
+
+create table rapport_advanced.periode_type
+(
+t_id integer primary key,
+t_description text);
+
+insert into rapport_advanced.periode_type values (1,'D''apr=C3=A8s date'=
),(2,'N'),(3,'N-1'),(4,'N-2'),(5,'N-3');
+
+create table rapport_advanced.type_row_detail
+(tr_id integer primary key,
+ tr_description text);
+
+ insert into rapport_advanced.type_row_detail(tr_id,tr_description) valu=
es (1,'Formule'),(2,'Poste comptable et code'),(3,'Calcul sur formulaire'=
);
+
+
+create table  rapport_advanced.formulaire_param
+(
+	p_id serial primary key,
+	p_code	text,
+	p_libelle	text,
+	p_type integer references rapport_advanced.type_row(p_type) ,
+	p_order integer not null,
+	f_id integer references rapport_advanced.formulaire(f_id) on update cas=
cade,
+	t_id integer references rapport_advanced.periode_type(t_id)
+);
+create table rapport_advanced.total_type(
+	tt_id serial primary key,
+	tt_label text);
+
+insert into rapport_advanced.total_type values (0,'Total code TVA+Poste =
comptable'),(1,'Total code tva'),(2,'Total poste comptable');
+
+create table rapport_advanced.formulaire_param_detail
+(
+	fp_id serial primary key,
+	p_id integer references rapport_advanced.formulaire_param(p_id) on upda=
te cascade on delete cascade,
+	tmp_val account_type,
+	tva_id integer references public.tva_rate(tva_id),
+	fp_formula text,
+	fp_signed integer,
+	type_detail integer,
+	jrn_def_type char(3),
+	tt_id integer references rapport_advanced.total_type(tt_id)
+);
+ALTER TABLE rapport_advanced.formulaire_param ADD UNIQUE (f_id, p_code);
+
+ALTER TABLE rapport_advanced.formulaire_param
+   ADD COLUMN p_info text;
+COMMENT ON COLUMN rapport_advanced.formulaire_param.p_info IS 'si non vi=
de affiche infobulle';
+
+ALTER TABLE rapport_advanced.formulaire_param_detail
+  ADD CONSTRAINT fk_formulaire_param_detail_type_row_detail FOREIGN KEY =
(type_detail)
+      REFERENCES rapport_advanced.type_row_detail (tr_id) MATCH SIMPLE
+      ON UPDATE SET NULL ON DELETE SET NULL;
+
+CREATE SEQUENCE rapport_advanced.declaration_param_seq;
+
+CREATE TABLE rapport_advanced.declaration
+(
+  d_id bigserial NOT NULL,
+  d_title text,
+  d_start date,
+  d_end date,
+  to_keep character(1),
+  d_generated timestamp with time zone NOT NULL DEFAULT now(),
+  f_id bigint,
+  CONSTRAINT declaration_pkey PRIMARY KEY (d_id ),
+  CONSTRAINT declaration_f_id_fkey FOREIGN KEY (f_id)
+      REFERENCES rapport_advanced.formulaire (f_id) MATCH SIMPLE
+      ON UPDATE SET NULL ON DELETE SET NULL
+);
+
+CREATE TABLE rapport_advanced.declaration_row
+(
+  dr_id bigint NOT NULL DEFAULT 0,
+  d_id bigint,
+  dr_libelle text,
+  dr_order bigint,
+  dr_code text,
+  dr_amount numeric(25,4) NOT NULL,
+  CONSTRAINT declaration_row_pkey PRIMARY KEY (dr_id ),
+  CONSTRAINT declaration_row_d_id_fkey FOREIGN KEY (d_id)
+      REFERENCES rapport_advanced.declaration (d_id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE CASCADE
+);
+CREATE TABLE rapport_advanced.declaration_row_detail
+(
+  ddr_id bigserial NOT NULL,
+  ddr_amount numeric(25,4) NOT NULL DEFAULT 0,
+  dr_id bigint,
+  CONSTRAINT declaration_row_detail_pkey PRIMARY KEY (ddr_id ),
+  CONSTRAINT declaration_row_detail_dr_id_fkey FOREIGN KEY (dr_id)
+      REFERENCES rapport_advanced.declaration_row (dr_id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
+);
+ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_type integer;
+ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_info text;
+



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


From MAILER-DAEMON Sat Sep 29 20:56:33 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI7ph-0006oj-Ua
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 20:56:33 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 02:46:23 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602268.1348966592.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r420 - 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: Sun, 30 Sep 2012 00:56:32 -0000

Author: danydb
Date: 2012-09-30 02:46:22 +0200 (Sun, 30 Sep 2012)
New Revision: 420

Modified:
   trunk/rapport_avance/include/template/formulaire_definition.php
Log:
remove form + cosmetic

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	2012-=
09-29 23:27:47 UTC (rev 419)
+++ trunk/rapport_avance/include/template/formulaire_definition.php	2012-=
09-30 00:46:22 UTC (rev 420)
@@ -110,5 +110,7 @@
 	<?endfor;?>
 	</tbody>
 </table>
+<p>
 <?=3DHtmlInput::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>
\ 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 Sep 29 21:51:11 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI8gZ-0004F8-Ee
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 21:51:11 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 03:40:57 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602327.1348969871.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r421 - 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: Sun, 30 Sep 2012 01:51:10 -0000

Author: danydb
Date: 2012-09-30 03:40:56 +0200 (Sun, 30 Sep 2012)
New Revision: 421

Added:
   trunk/rapport_avance/include/class_rapav_install.php
Modified:
   trunk/rapport_avance/include/template/declaration_display.php
   trunk/rapport_avance/index.php
   trunk/rapport_avance/sql/install.sql
Log:
Install script

Added: trunk/rapport_avance/include/class_rapav_install.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_install.php	                =
        (rev 0)
+++ trunk/rapport_avance/include/class_rapav_install.php	2012-09-30 01:40=
:56 UTC (rev 421)
@@ -0,0 +1,42 @@
+<?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 install the rapport_advanced (RAPAV plugin)
+ *
+ */
+class RAPAV_Install
+{
+	function __construct($cn)
+	{
+		$this->db=3D$cn;
+	}
+	function install()
+	{
+		$file=3Ddirname(__FILE__);
+		$this->db->execute_script($file.'/../sql/install.sql');
+	}
+}
+
+?>

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	2012-09=
-30 00:46:22 UTC (rev 420)
+++ trunk/rapport_avance/include/template/declaration_display.php	2012-09=
-30 01:40:56 UTC (rev 421)
@@ -52,6 +52,7 @@
 		break;
 	case 3:
 		$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(). '<span class=3D"notice">'.$row['dr_info'].'</span>'.'</p>';
=20

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	2012-09-30 00:46:22 UTC (rev 420)
+++ trunk/rapport_avance/index.php	2012-09-30 01:40:56 UTC (rev 421)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,77 +16,84 @@
  *   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$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/*!\file
+/* !\file
  * \brief main file for tools
  */
=20
 global $version_plugin;
-$version_plugin=3DSVNINFO;
+$version_plugin =3D SVNINFO;
 Extension::check_version(5082);
 require_once 'class_phpcompta_sql.php';
 require_once 'rapav_constant.php';
 require_once 'class_impress.php';
+if ($cn->exist_schema('rapport_advanced') =3D=3D false )
+{
+	require_once('include/class_rapav_install.php');
+	$iplugn =3D new Rapav_Install($cn);
+	$iplugn->install();
+	echo_warning(_("L'extension est install=C3=A9e, pourriez-vous en v=C3=A9=
rifier le param=C3=A8trage ?"));
+}
 /*
  * load javascript
  */
 ob_start();
 require_once('rapav_javascript.js');
-$j=3Dob_get_contents();
+$j =3D ob_get_contents();
 ob_end_clean();
 echo create_script($j);
=20
-$url=3D'?'.dossier::get()."&plugin_code=3D".$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];
-$array=3Darray (
-         array($url.'&sa=3Dfo',_('Formulaire'),_('Cr=C3=A9ation, modific=
ation, Param=C3=A8tre'),1),
-         array($url.'&sa=3Dde',_('D=C3=A9claration'),_('D=C3=A9claration=
 TVA calcul=C3=A9e'),2),
-         array($url.'&sa=3Dhi',_('Historique'),_('Historique des d=C3=A9=
clarations faites'),3)
-       );
+$url =3D '?' . dossier::get() . "&plugin_code=3D" . $_REQUEST['plugin_co=
de'] . "&ac=3D" . $_REQUEST['ac'];
+$array =3D array(
+	array($url . '&sa=3Dfo', _('Formulaire'), _('Cr=C3=A9ation, modificatio=
n, Param=C3=A8tre'), 1),
+	array($url . '&sa=3Dde', _('D=C3=A9claration'), _('D=C3=A9claration TVA=
 calcul=C3=A9e'), 2),
+	array($url . '&sa=3Dhi', _('Historique'), _('Historique des d=C3=A9clar=
ations faites'), 3)
+);
=20
-$sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
-$def=3D0;
-switch($sa)
-  {
-  case 'fo':
-    $def=3D1;
-    break;
-  case 'de':
-    $def=3D2;
-    break;
-  case 'hi':
-	  $def=3D3;
-	  break;
-  }
+$sa =3D (isset($_REQUEST['sa'])) ? $_REQUEST['sa'] : "";
+$def =3D 0;
+switch ($sa)
+{
+	case 'fo':
+		$def =3D 1;
+		break;
+	case 'de':
+		$def =3D 2;
+		break;
+	case 'hi':
+		$def =3D 3;
+		break;
+}
=20
-$cn=3Dnew Database(dossier::id());
+$cn =3D new Database(dossier::id());
 // show menu
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Drapport_avances" tar=
get=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
-'</div>';
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Drapport_avances" tar=
get=3D"_blank">Aide</a>' .
+ '<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO<=
/span>' .
+ '</div>';
=20
-echo ShowItem($array,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;m=
argin-left:10%;border-collapse: separate;border-spacing:  5px;"');
+echo ShowItem($array, 'H', 'mtitle ', 'mtitle ', $def, ' style=3D"width:=
80%;margin-left:10%;border-collapse: separate;border-spacing:  5px;"');
 echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
 // include the right file
-if ($def=3D=3D1)
-  {
-    require_once('include/formulaire.inc.php');
-    exit();
-  }
+if ($def =3D=3D 1)
+{
+	require_once('include/formulaire.inc.php');
+	exit();
+}
=20
-/* D=C3=A9claration*/
-if ($def=3D=3D2)
-  {
-    require_once('include/declaration.inc.php');
-    exit();
-  }
+/* D=C3=A9claration */
+if ($def =3D=3D 2)
+{
+	require_once('include/declaration.inc.php');
+	exit();
+}
 /* Historique */
-  if ($def =3D=3D 3 )
-  {
-	  require_once 'include/historique.inc.php';
-	  exit();
-  }
+if ($def =3D=3D 3)
+{
+	require_once 'include/historique.inc.php';
+	exit();
+}
 ?>

Modified: trunk/rapport_avance/sql/install.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/install.sql	2012-09-30 00:46:22 UTC (rev 420=
)
+++ trunk/rapport_avance/sql/install.sql	2012-09-30 01:40:56 UTC (rev 421=
)
@@ -1,16 +1,23 @@
+begin;
+
+
 create schema rapport_advanced;
=20
+create table rapport_advanced.version(version_id integer primary key,ver=
sion_date timestamp default now(),version_note text);
+
+insert into rapport_advanced.version(version_id,version_note) values  (1=
,'Installation du plugin');
+
 create table rapport_advanced.formulaire
 (f_id serial primary key,
 f_title text,
 f_description text);
-insert into rapport_advanced.formulaire values (1,'cerfa3310-ca3');
=20
+
 create 	table rapport_advanced.type_row(
 p_type integer primary key,
 p_description text);
=20
-insert into rapport_advanced.type_row values (1,'Titre'), (2,'Sous-titre=
'),(3,'Formule');
+insert into rapport_advanced.type_row values (1,'Titre'), (2,'Titre 2i=C3=
=A8me Niveau'),(3,'Formule'),(6,'Titre 3i=C3=A8me Niveau');
=20
 create table rapport_advanced.periode_type
 (
@@ -26,15 +33,27 @@
  insert into rapport_advanced.type_row_detail(tr_id,tr_description) valu=
es (1,'Formule'),(2,'Poste comptable et code'),(3,'Calcul sur formulaire'=
);
=20
=20
-create table  rapport_advanced.formulaire_param
+CREATE TABLE rapport_advanced.formulaire_param
 (
-	p_id serial primary key,
-	p_code	text,
-	p_libelle	text,
-	p_type integer references rapport_advanced.type_row(p_type) ,
-	p_order integer not null,
-	f_id integer references rapport_advanced.formulaire(f_id) on update cas=
cade,
-	t_id integer references rapport_advanced.periode_type(t_id)
+  p_id serial NOT NULL,
+  p_code text,
+  p_libelle text,
+  p_type integer,
+  p_order integer NOT NULL,
+  f_id integer,
+  p_info text, -- si non vide affiche infobulle
+  t_id integer,
+  CONSTRAINT formulaire_param_pkey PRIMARY KEY (p_id ),
+  CONSTRAINT formulaire_param_f_id_fkey FOREIGN KEY (f_id)
+      REFERENCES rapport_advanced.formulaire (f_id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE cascade,
+  CONSTRAINT formulaire_param_p_type_fkey FOREIGN KEY (p_type)
+      REFERENCES rapport_advanced.type_row (p_type) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION,
+  CONSTRAINT formulaire_param_t_id_fkey FOREIGN KEY (t_id)
+      REFERENCES rapport_advanced.periode_type (t_id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION,
+  CONSTRAINT formulaire_param_f_id_p_code_key UNIQUE (f_id , p_code )
 );
 create table rapport_advanced.total_type(
 	tt_id serial primary key,
@@ -42,28 +61,38 @@
=20
 insert into rapport_advanced.total_type values (0,'Total code TVA+Poste =
comptable'),(1,'Total code tva'),(2,'Total poste comptable');
=20
-create table rapport_advanced.formulaire_param_detail
+CREATE TABLE rapport_advanced.formulaire_param_detail
 (
-	fp_id serial primary key,
-	p_id integer references rapport_advanced.formulaire_param(p_id) on upda=
te cascade on delete cascade,
-	tmp_val account_type,
-	tva_id integer references public.tva_rate(tva_id),
-	fp_formula text,
-	fp_signed integer,
-	type_detail integer,
-	jrn_def_type char(3),
-	tt_id integer references rapport_advanced.total_type(tt_id)
+  fp_id serial NOT NULL,
+  p_id integer,
+  tmp_val account_type,
+  tva_id integer,
+  fp_formula text,
+  fp_signed integer,
+  jrn_def_type character(3),
+  tt_id integer,
+  type_detail integer,
+  CONSTRAINT formulaire_param_detail_pkey PRIMARY KEY (fp_id ),
+  CONSTRAINT fk_formulaire_param_detail_type_row_detail FOREIGN KEY (typ=
e_detail)
+      REFERENCES rapport_advanced.type_row_detail (tr_id) MATCH SIMPLE
+      ON UPDATE SET NULL ON DELETE SET NULL,
+  CONSTRAINT formulaire_param_detail_p_id_fkey FOREIGN KEY (p_id)
+      REFERENCES rapport_advanced.formulaire_param (p_id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE CASCADE,
+  CONSTRAINT formulaire_param_detail_tt_id_fkey FOREIGN KEY (tt_id)
+      REFERENCES rapport_advanced.total_type (tt_id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION,
+  CONSTRAINT formulaire_param_detail_tva_id_fkey FOREIGN KEY (tva_id)
+      REFERENCES tva_rate (tva_id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION
 );
-ALTER TABLE rapport_advanced.formulaire_param ADD UNIQUE (f_id, p_code);
=20
-ALTER TABLE rapport_advanced.formulaire_param
-   ADD COLUMN p_info text;
 COMMENT ON COLUMN rapport_advanced.formulaire_param.p_info IS 'si non vi=
de affiche infobulle';
=20
-ALTER TABLE rapport_advanced.formulaire_param_detail
-  ADD CONSTRAINT fk_formulaire_param_detail_type_row_detail FOREIGN KEY =
(type_detail)
-      REFERENCES rapport_advanced.type_row_detail (tr_id) MATCH SIMPLE
-      ON UPDATE SET NULL ON DELETE SET NULL;
+CREATE INDEX fki_formulaire_param_detail_type_row_detail
+  ON rapport_advanced.formulaire_param_detail
+  USING btree
+  (type_detail);
=20
 CREATE SEQUENCE rapport_advanced.declaration_param_seq;
=20
@@ -90,6 +119,8 @@
   dr_order bigint,
   dr_code text,
   dr_amount numeric(25,4) NOT NULL,
+  dr_type integer,
+  dr_info text,
   CONSTRAINT declaration_row_pkey PRIMARY KEY (dr_id ),
   CONSTRAINT declaration_row_d_id_fkey FOREIGN KEY (d_id)
       REFERENCES rapport_advanced.declaration (d_id) MATCH SIMPLE
@@ -105,6 +136,94 @@
       REFERENCES rapport_advanced.declaration_row (dr_id) MATCH SIMPLE
       ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
 );
-ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_type integer;
-ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_info text;
=20
+COMMENT ON TABLE rapport_advanced.declaration
+  IS 'contains all the declaration';
+COMMENT ON COLUMN rapport_advanced.declaration.d_title IS 'Title from fo=
rmulaire, set when generated';
+COMMENT ON COLUMN rapport_advanced.declaration.d_start IS 'start date';
+COMMENT ON COLUMN rapport_advanced.declaration.d_end IS 'end date';
+COMMENT ON COLUMN rapport_advanced.declaration.to_keep IS 'Y to keep, N =
not to keep, will be deleted';
+COMMENT ON COLUMN rapport_advanced.declaration.d_generated IS 'moment of=
 the computing';
+COMMENT ON COLUMN rapport_advanced.declaration.f_id IS 'pk of the formul=
aire.f_id';
+COMMENT ON COLUMN rapport_advanced.declaration_row.dr_libelle IS 'label =
copied from formulaire_param.p_libelle';
+COMMENT ON COLUMN rapport_advanced.declaration_row.dr_order IS 'order co=
pied from formulaire_param.p_order';
+COMMENT ON COLUMN rapport_advanced.declaration_row.dr_code IS 'code copi=
ed from formulaire_param.p_code';
+COMMENT ON COLUMN rapport_advanced.declaration_row.dr_amount IS 'amount =
computed, normally equal to the sum in declaration_row_detail';
+COMMENT ON COLUMN rapport_advanced.declaration_row.dr_type IS 'Type of l=
ine (titles or formula)';
+COMMENT ON COLUMN rapport_advanced.declaration_row.dr_info IS 'notice co=
pied from formulaire_param.p_info';
+
+
+insert into rapport_advanced.formulaire values (1,'cerfa3310-ca3');
+-- insert into formulaire_param
+
+SELECT pg_catalog.setval('rapport_advanced.formulaire_f_id_seq', 10, tru=
e);
+SELECT pg_catalog.setval('rapport_advanced.formulaire_param_detail_fp_id=
_seq', 73, true);
+
+
+--
+-- TOC entry 2520 (class 0 OID 0)
+-- Dependencies: 2197
+-- Name: formulaire_param_p_id_seq; Type: SEQUENCE SET; Schema: rapport_=
advanced; Owner: dany
+--
+
+SELECT pg_catalog.setval('rapport_advanced.formulaire_param_p_id_seq', 6=
5, true);
+
+
+--
+-- TOC entry 2515 (class 0 OID 18841503)
+-- Dependencies: 2198
+-- Data for Name: formulaire_param; Type: TABLE DATA; Schema: rapport_ad=
vanced; Owner: dany
+--
+
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (33, '0950_base', 'Op=C3=A9ra=
tions imposables =C3=A0 un taux particulier ', 3, 300, 1, 'D=C3=A9compte =
effectu=C3=A9 sur annexe 3310A', 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (35, '0950_taxe', 'Op=C3=A9ra=
tions imposables =C3=A0 un taux particulier', 3, 310, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (36, '0600', 'TVA ant=C3=A9ri=
eurement d=C3=A9duite =C3=A0 reverser', 3, 320, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (37, 'C1', 'Total de la TVA b=
rute', 3, 330, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (38, '0035', 'Dont TVA sur ac=
quisition intracommunautaire', 3, 340, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (39, '0038', 'Dont TVA sur op=
=C3=A9rations =C3=A0 destination de Monaco', 3, 350, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (1, '0979', 'Ventes, Prestati=
ons de services', 3, 10, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (3, '0981', 'Autres op=C3=A9r=
ations imposables', 3, 20, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (4, '0044', 'Achats de presta=
tions de services intracommunautaires', 3, 30, 1, 'Article 283-2 du code =
g=C3=A9n=C3=A9ral de l''imp=C3=B4t', 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (5, '0031', 'Acquisition intr=
acommunautaire', 3, 40, 1, 'Dont vente =C3=A0 distance', 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (6, '0030', 'Livraison d''=C3=
=A9lectricit=C3=A9, de gaz naturel, de chaleur ou de froid imposable en F=
rance', 3, 50, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (7, '0040', 'Achat de biens o=
u de prestations de services r=C3=A9alis=C3=A9 aupr=C3=A8s d''un assujett=
i non =C3=A9tabli en France', 3, 60, 1, 'Article 283-1 du Code G=C3=A9n=C3=
=A9ral des Imp=C3=B4ts', 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (8, '0036', 'R=C3=A9gularisat=
ion', 3, 70, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (9, '0032', 'Exportation hors=
 CE', 3, 80, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (10, '0033', 'Autres op=C3=A9=
rations non imposables', 3, 90, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (11, '0034', 'Livraisons intr=
acommunautaires', 3, 100, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (12, '0029', 'Livraison d''=C3=
=A9lectricit=C3=A9, de gaz naturel, de chaleur, de froid, non imposable e=
n France', 3, 110, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (13, '0037', 'Achats en franc=
hise', 3, 120, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (14, '0043', 'Ventes de biens=
 ou de prestations de services r=C3=A9alis=C3=A9s par un assujetti non =C3=
=A9tabli en France ', 3, 130, 1, 'Article 283-3 du Code G=C3=A9n=C3=A9ral=
 des Imp=C3=B4ts', 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (15, '0039', 'R=C3=A9gularisa=
tion', 3, 140, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (16, 'T2', 'D=C3=A9compte de =
la TVA =C3=A0 payer ', 1, 150, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (17, 'T3', 'Op=C3=A9rations r=
=C3=A9alis=C3=A9es en France m=C3=A9tropolitaine', 6, 160, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (18, '0206_base', 'Taux norma=
l 19,6 % base', 3, 170, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (19, '0206_taxe', 'Taux norma=
l 19,6% tva', 3, 180, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (20, '0105_base', 'Taux r=C3=A9=
duit 5,5% base', 3, 190, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (21, '0105_taxe', 'Taux r=C3=A9=
duit 5,5% tva', 3, 200, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (22, '0150_base', 'Taux r=C3=A9=
duit 7% base', 3, 210, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (23, '0150_taxe', 'Taux r=C3=A9=
duit 7% tva', 3, 220, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (25, '0201_base', 'Taux norma=
l 8,5% base', 3, 240, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (26, '0201_taxe', 'Taux norma=
l 8,5% tva', 3, 250, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (27, '0100_base', 'Taux r=C3=A9=
duit 2,1% base', 3, 260, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (28, '0100_taxe', 'Taux r=C3=A9=
duit 2,1% tva', 3, 270, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (30, '0900_base', 'Anciens ta=
ux base', 3, 290, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (31, '0900_taxe', 'Anciens ta=
ux tva', 3, 290, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (40, 'T2A', 'TVA Brute', 2, 1=
55, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (24, 'T4', 'Op=C3=A9rations r=
=C3=A9alis=C3=A9es dans DOM', 6, 230, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (29, 'T5', 'Op=C3=A9rations i=
mposables =C3=A0 un autre taux ', 6, 280, 1, 'France m=C3=A9tropolitaine =
ou DOM', 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (41, 'T7', 'TVA D=C3=A9ductib=
le', 2, 360, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (42, '0703', 'Biens constitua=
nts des immobilisations', 3, 370, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (43, '0702', 'Autres Biens & =
Services ', 3, 380, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (44, '0059', 'Autre TVA =C3=A0=
 d=C3=A9duire', 3, 390, 1, 'Dont r=C3=A9gularisation sur de la tva collec=
t=C3=A9e', 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (45, '8001', 'Report du cr=C3=
=A9dit apparaissant =C3=A0 la ligne 27 de la pr=C3=A9c=C3=A9dente d=C3=A9=
claration', 3, 400, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (46, 'C2', 'Total TVA d=C3=A9=
ductible', 3, 410, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (47, '0709', 'Dont TVA non pe=
r=C3=A7ue r=C3=A9cup=C3=A9rable par les assujettis disposant d''un =C3=A9=
tablissement stable dans les DOM', 3, 420, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (48, 'T8', 'Cr=C3=A9dit ', 1,=
 430, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (49, '0705', 'Cr=C3=A9dit de =
TVA', 3, 440, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (50, '8002', 'Remboursement d=
emand=C3=A9 sur formulaire 3519', 3, 450, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (51, '8005', 'Cr=C3=A9dit de =
TVA transf=C3=A8r=C3=A9 =C3=A0 la soci=C3=A9t=C3=A9 t=C3=AAte de groupe s=
ur la d=C3=A9claration r=C3=A9capitulative 3310-CA3G', 3, 460, 1, NULL, 1=
);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (52, '8003', 'Cr=C3=A9dit =C3=
=A0 reporter', 3, 470, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (53, 'T9', 'Tva =C3=A0  payer=
', 1, 480, 1, NULL, 1);
+INSERT INTO rapport_advanced.formulaire_param (p_id, p_code, p_libelle, =
p_type, p_order, f_id, p_info, t_id) VALUES (54, 'C3', 'Tva nette', 3, 49=
0, 1, NULL, 1);
+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 Sat Sep 29 21:52:00 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI8hM-0004JC-NM
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 21:52:00 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 03:41:52 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602332.1348969920.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r422 - 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: Sun, 30 Sep 2012 01:51:59 -0000

Author: danydb
Date: 2012-09-30 03:41:51 +0200 (Sun, 30 Sep 2012)
New Revision: 422

Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/include/formulaire.inc.php
Log:
new : delete a form

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	2012-09-30 01:40:56 UTC (rev 421)
+++ trunk/rapport_avance/ajax.php	2012-09-30 01:41:51 UTC (rev 422)
@@ -17,6 +17,10 @@
 		echo '<form method=3D"POST" class=3D"print">';
 		$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>';
 		break;
@@ -88,7 +92,7 @@
 		$form->input_parameter();
 		break;
=20
-	/**********************************************************************=
********************************************
+	/*	 * *****************************************************************=
***********************************************
 	 * Montre un =C3=A9cran pour ajouter une ligne de formulaire dans les p=
aram=C3=A8tre de formulaires
 	 */
 	case 'add_param_detail':
@@ -110,7 +114,7 @@
 	// Delete un formulaire_param_detail
 	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
 	case 'delete_param_detail':
-		$cn->exec_sql("delete from rapport_advanced.formulaire_param_detail wh=
ere fp_id=3D$1",array($fp_id));
+		$cn->exec_sql("delete from rapport_advanced.formulaire_param_detail wh=
ere fp_id=3D$1", array($fp_id));
 		break;
 	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
 	// Display a saved declaration from history
@@ -122,10 +126,9 @@
 	// Delete a saved declaration (from history)
 	///////////////////////////////////////////////////////////////////////=
//////////////////////////////////////////////
 	case 'rapav_declaration_delete':
-		$cn->exec_sql("delete from rapport_advanced.declaration where d_id=3D$=
1",array($_GET['d_id']));
+		$cn->exec_sql("delete from rapport_advanced.declaration where d_id=3D$=
1", array($_GET['d_id']));
 		break;
 	default:
 		break;
-
 }
 ?>

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	2012-09-30 01:40:56 U=
TC (rev 421)
+++ trunk/rapport_avance/include/formulaire.inc.php	2012-09-30 01:41:51 U=
TC (rev 422)
@@ -29,7 +29,15 @@
 require_once 'class_rapav_formulaire.php';
 if ( isset($_POST['form_def_sub']))
 {
-	RAPAV_formulaire::save_definition($_POST);
+	if (isset($_POST['delete']))
+	{
+		$cn->exec_sql('delete from rapport_advanced.formulaire where f_id=3D$1=
',array($_POST['f_id']));
+	}
+	else
+	{
+		RAPAV_formulaire::save_definition($_POST);
+
+	}
 }
 if (isset ($_POST['add_form']))
 {



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


From MAILER-DAEMON Sat Sep 29 21:52:43 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI8i3-0004Lr-SW
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 21:52:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 03:42:34 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602335.1348969963.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r423 - 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: Sun, 30 Sep 2012 01:52:42 -0000

Author: danydb
Date: 2012-09-30 03:42:34 +0200 (Sun, 30 Sep 2012)
New Revision: 423

Modified:
   trunk/rapport_avance/include/class_rapav_declaration.php
Log:
Bug : computing is not  correct

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	2012-09-30 0=
1:41:51 UTC (rev 422)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2012-09-30 0=
1:42:34 UTC (rev 423)
@@ -117,11 +117,11 @@
 			$amount =3D $_POST['amount'];
 			for ($i =3D 0; $i < count($code); $i++)
 			{
-				$cn->exec_sql('update rapport_advanced.declaration_row set dr_amount=
=3D$2 where dr_id=3D$1',array($code[$i],$amount[$i]));
+				$cn->exec_sql('update rapport_advanced.declaration_row set dr_amount=
=3D$2 where dr_id=3D$1', array($code[$i], $amount[$i]));
 			}
 			$cn->commit();
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			alert($e->getTraceAsString());
 		}
@@ -142,7 +142,7 @@
 	function insert()
 	{
 		$data =3D new RAPAV_Declaration_Row_SQL();
-		$data->dr_info=3D$this->param->p_info;
+		$data->dr_info =3D $this->param->p_info;
 		$data->dr_code =3D $this->param->p_code;
 		$data->dr_libelle =3D $this->param->p_libelle;
 		$data->dr_order =3D $this->param->p_order;
@@ -247,7 +247,7 @@
 	{
 		global $cn;
 		bcscale(2);
-		$this->amount =3D 0;
+		$this->amount =3D "0";
=20
 		$array =3D $cn->get_array("select fp_id,p_id,tmp_val,tva_id,fp_formula=
,fp_signed,jrn_def_type,tt_id,type_detail
 			from rapport_advanced.formulaire_param_detail where p_id=3D$1", array=
($this->param->p_id));
@@ -258,7 +258,7 @@
 			$row_detail->dr_id =3D $this->dr_id;
 			$row_detail->d_id =3D $this->d_id;
 			$tmp_amount =3D $row_detail->compute($this->start, $this->end);
-			$this->amount =3D bcadd($tmp_amount, $this->amount);
+			$this->amount =3D bcadd("$tmp_amount", "$this->amount");
 			$row_detail->insert();
 		}
 	}
@@ -334,8 +334,8 @@
 	function compute($p_start, $p_end)
 	{
 		global $cn;
-		$amount =3D Impress::parse_formula($cn, "", $this->form->fp_formula, $=
p_start, $p_end, false, 1);
-		return $amount;
+		$amount =3D Impress::parse_formula($cn, "", $this->form->fp_formula, $=
p_start, $p_end, true, 1);
+		return $amount['montant'];
 	}
=20
 }
@@ -412,8 +412,8 @@
 		{
 			$sql =3D "select coalesce(sum(qs_vat),0) as amount
 						from quant_sold join jrnx using (j_id)
-						where qs_vat_code=3D$1 and
-						(j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date($3,'=
DD.MM.YYYY'))
+						where qs_vat_code=3D$1
+						and (j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date(=
$3,'DD.MM.YYYY'))
 						and j_poste::text like ($4)";
 			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
 				$p_start,
@@ -425,9 +425,10 @@
 		{
 			$sql =3D "select coalesce(sum(qs_vat),0) as amount
 						from quant_sold join jrnx using (j_id)
-						where qs_vat_code=3D$1
-						and (j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date(=
$3,'DD.MM.YYYY'))
+						where qs_vat_code=3D$1 and
+						(j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date($3,'=
DD.MM.YYYY'))
 						and j_poste::text like ($4)";
+
 			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
 				$p_start,
 				$p_end,
@@ -453,10 +454,10 @@
 	{
 		if ($this->form->jrn_def_type =3D=3D 'ACH')
 		{
-			$sql =3D "select coalesce(sum(qs_price),0) as amount from quant_sold
-					join jrnx using (j_id)
-					where qs_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
+			$sql =3D "select coalesce(sum(qp_price),0) as amount from quant_purch=
ase join jrnx using (j_id)
+					where qp_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
 					and j_poste::text like ($4)";
+
 			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
 				$p_start,
 				$p_end,
@@ -465,8 +466,9 @@
 		}
 		if ($this->form->jrn_def_type =3D=3D 'VEN')
 		{
-			$sql =3D "select coalesce(sum(qp_price),0) as amount from quant_purch=
ase join jrnx using (j_id)
-					where qp_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
+			$sql =3D "select coalesce(sum(qs_price),0) as amount from quant_sold
+					join jrnx using (j_id)
+					where qs_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
 					and j_poste::text like ($4)";
 			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
 				$p_start,



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


From MAILER-DAEMON Sat Sep 29 21:53:05 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI8iP-0004Mp-0G
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 21:53:05 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 03:42:56 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602338.1348969984.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r424 - 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: Sun, 30 Sep 2012 01:53:03 -0000

Author: danydb
Date: 2012-09-30 03:42:56 +0200 (Sun, 30 Sep 2012)
New Revision: 424

Modified:
   trunk/rapport_avance/include/historique.inc.php
Log:
new : remove old declaration not kept

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	2012-09-30 01:42:34 U=
TC (rev 423)
+++ trunk/rapport_avance/include/historique.inc.php	2012-09-30 01:42:56 U=
TC (rev 424)
@@ -27,6 +27,7 @@
  * take data from rapport_avance.declaration and display via ajax
  */
 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
 		from rapport_advanced.declaration
@@ -49,7 +50,7 @@
=20
 		</th>
 		<th>
-		=09
+
 		</th>
 	</tr>
 	<? for ($i=3D0;$i<count($data);$i++) :?>



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


From MAILER-DAEMON Sat Sep 29 21:53:39 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI8ix-0004PQ-5J
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 21:53:39 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 03:43:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602339.1348970018.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r425 - 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: Sun, 30 Sep 2012 01:53:38 -0000

Author: danydb
Date: 2012-09-30 03:43:30 +0200 (Sun, 30 Sep 2012)
New Revision: 425

Modified:
   trunk/rapport_avance/include/declaration.inc.php
Log:
new : delete a form

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	2012-09-30 01:42:56 =
UTC (rev 424)
+++ trunk/rapport_avance/include/declaration.inc.php	2012-09-30 01:43:30 =
UTC (rev 425)
@@ -37,6 +37,7 @@
 	$decl->d_id =3D $_POST['d_id'];
 	$decl->load();
 	$decl->to_keep=3D'Y';
+	$decl->f_id=3D$_POST['p_form'];
 	$decl->save();
 	$decl->display();
 	echo '<h2 class=3D"notice"> Sauv=C3=A9</h2>';
@@ -56,6 +57,7 @@
 	{
 		$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']);
 		$decl->display();
 		echo HtmlInput::submit('save', 'Sauver');
 		echo '</form>';



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


From MAILER-DAEMON Sat Sep 29 21:53:58 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TI8jG-0004QD-9R
	for mharc-phpcompta-dev@gnu.org; Sat, 29 Sep 2012 21:53:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 30 Sep 2012 03:43:49 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.602340.1348970038.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r426 - 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: Sun, 30 Sep 2012 01:53:57 -0000

Author: danydb
Date: 2012-09-30 03:43:47 +0200 (Sun, 30 Sep 2012)
New Revision: 426

Modified:
   trunk/rapport_avance/include/class_rapport_avance_sql.php
Log:
add f_id to declaration

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	2012-09-30 =
01:43:30 UTC (rev 425)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2012-09-30 =
01:43:47 UTC (rev 426)
@@ -157,7 +157,8 @@
 			"d_start"=3D>"d_start",
 			"d_end"=3D>"d_end",
 			"to_keep"=3D>"to_keep",
-			"d_generated"=3D>"d_generated"
+			"d_generated"=3D>"d_generated",
+			"f_id"=3D>"f_id"
 		);
=20
 		$this->type =3D array(
@@ -166,7 +167,8 @@
 			"d_start"=3D>"date",
 			"d_end"=3D>"date",
 			"to_keep"=3D>"text",
-			"d_generated"=3D>"date"
+			"d_generated"=3D>"date",
+			"f_id"=3D>"numeric"
 		);
=20
 		$this->default =3D array(



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


