From MAILER-DAEMON Fri Nov 01 15:50:38 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VcKjt-0006Dl-LC
	for mharc-phpcompta-dev@gnu.org; Fri, 01 Nov 2013 15:50:37 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  1 Nov 2013 20:39:57 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.87234.1383335436.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r559 - trunk/rapport_avance/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Nov 2013 19:50:35 -0000

Author: danydb
Date: 2013-11-01 20:39:56 +0100 (Fri, 01 Nov 2013)
New Revision: 559

Modified:
   trunk/rapport_avance/doc/rapav-listing-code.odt
Log:
update doc

Modified: trunk/rapport_avance/doc/rapav-listing-code.odt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



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


From MAILER-DAEMON Sat Nov 02 14:29:30 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vcfww-0002pT-Kf
	for mharc-phpcompta-dev@gnu.org; Sat, 02 Nov 2013 14:29:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  2 Nov 2013 19:18:49 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.87704.1383416969.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r560 - trunk/rapport_avance/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Nov 2013 18:29:29 -0000

Author: danydb
Date: 2013-11-02 19:18:49 +0100 (Sat, 02 Nov 2013)
New Revision: 560

Modified:
   trunk/rapport_avance/doc/rapav-analyse.dia
   trunk/rapport_avance/doc/rapav-listing-code.odt
Log:
update doc

Modified: trunk/rapport_avance/doc/rapav-analyse.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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: trunk/rapport_avance/doc/rapav-listing-code.odt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



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


From MAILER-DAEMON Sat Nov 02 14:29:53 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VcfxJ-0002r7-QE
	for mharc-phpcompta-dev@gnu.org; Sat, 02 Nov 2013 14:29:53 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  2 Nov 2013 19:19:14 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.87705.1383416992.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r561 - trunk/rapport_avance/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Nov 2013 18:29:52 -0000

Author: danydb
Date: 2013-11-02 19:19:14 +0100 (Sat, 02 Nov 2013)
New Revision: 561

Added:
   trunk/rapport_avance/doc/test_unitaire.bin
Log:
Ajout  test unitaire

Added: trunk/rapport_avance/doc/test_unitaire.bin
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/doc/test_unitaire.bin	                        (r=
ev 0)
+++ trunk/rapport_avance/doc/test_unitaire.bin	2013-11-02 18:19:14 UTC (r=
ev 561)
@@ -0,0 +1,21 @@
+RAPAV;4
+"Test unitaire";"Test des diff=C3=A9rentes fonctionnalit=C3=A9"
+142;F1;Formule;3;10;14;1
+143;F2;"Formule N-1";3;20;14;3
+144;F3;"Formule journal OD uniquement";3;30;14;1
+145;PC1;"Poste comptable code tva tous les journaux";3;40;14;1
+146;PC2;"Poste comptable &code tva  tous les journaux N-1";3;50;14;3
+147;PC3;"Poste comptable code tva  Achat";3;60;14;1
+148;P1;"Poste comptable tous les journaux (6% & 4111)";3;70;14;1
+149;P2;"Poste comptable tous les journaux (6% & 4111) N-1";3;80;14;3
+150;P3;"Poste comptable tous les journaux (6% & 4111) uniqt Achat 2";3;9=
0;14;1
+RAPAV_DETAIL
+128;142;;;[44%];;;;1;;;;0
+129;143;;;[44%];;;;1;;;;0
+131;144;;;[44%];;;;1;;;;0
+134;147;%;1;;;ACH;1;2;;;;0
+135;146;%;1;;;ACH;1;2;;;;0
+136;145;%;1;;;ACH;1;2;;;;0
+137;148;6%;;;;;;4;4111;1;;0
+138;149;6%;;;;;;4;4111;1;;0
+139;150;6%;;;;;;4;4111;1;;0



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


From MAILER-DAEMON Tue Nov 05 06:05:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VdeRn-0003RY-Fd
	for mharc-phpcompta-dev@gnu.org; Tue, 05 Nov 2013 06:05:23 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  5 Nov 2013 11:54:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.90101.1383649522.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r562 - trunk/rapport_avance/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Nov 2013 11:05:21 -0000

Author: danydb
Date: 2013-11-05 11:54:27 +0100 (Tue, 05 Nov 2013)
New Revision: 562

Added:
   trunk/rapport_avance/doc/rapav.dia
Log:
RAPAV add graph

Added: trunk/rapport_avance/doc/rapav.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/doc/rapav.dia	                        (rev 0)
+++ trunk/rapport_avance/doc/rapav.dia	2013-11-05 10:54:27 UTC (rev 562)
@@ -0,0 +1,3962 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<dia:diagram xmlns:dia=3D"http://www.lysator.liu.se/~alla/dia/">
+  <dia:diagramdata>
+    <dia:attribute name=3D"background">
+      <dia:color val=3D"#ffffff"/>
+    </dia:attribute>
+    <dia:attribute name=3D"pagebreak">
+      <dia:color val=3D"#000099"/>
+    </dia:attribute>
+    <dia:attribute name=3D"paper">
+      <dia:composite type=3D"paper">
+        <dia:attribute name=3D"name">
+          <dia:string>#Letter#</dia:string>
+        </dia:attribute>
+        <dia:attribute name=3D"tmargin">
+          <dia:real val=3D"2.5399999618530273"/>
+        </dia:attribute>
+        <dia:attribute name=3D"bmargin">
+          <dia:real val=3D"2.5399999618530273"/>
+        </dia:attribute>
+        <dia:attribute name=3D"lmargin">
+          <dia:real val=3D"2.5399999618530273"/>
+        </dia:attribute>
+        <dia:attribute name=3D"rmargin">
+          <dia:real val=3D"2.5399999618530273"/>
+        </dia:attribute>
+        <dia:attribute name=3D"is_portrait">
+          <dia:boolean val=3D"true"/>
+        </dia:attribute>
+        <dia:attribute name=3D"scaling">
+          <dia:real val=3D"1"/>
+        </dia:attribute>
+        <dia:attribute name=3D"fitto">
+          <dia:boolean val=3D"false"/>
+        </dia:attribute>
+      </dia:composite>
+    </dia:attribute>
+    <dia:attribute name=3D"grid">
+      <dia:composite type=3D"grid">
+        <dia:attribute name=3D"width_x">
+          <dia:real val=3D"1"/>
+        </dia:attribute>
+        <dia:attribute name=3D"width_y">
+          <dia:real val=3D"1"/>
+        </dia:attribute>
+        <dia:attribute name=3D"visible_x">
+          <dia:int val=3D"1"/>
+        </dia:attribute>
+        <dia:attribute name=3D"visible_y">
+          <dia:int val=3D"1"/>
+        </dia:attribute>
+        <dia:composite type=3D"color"/>
+      </dia:composite>
+    </dia:attribute>
+    <dia:attribute name=3D"color">
+      <dia:color val=3D"#d8e5e5"/>
+    </dia:attribute>
+    <dia:attribute name=3D"guides">
+      <dia:composite type=3D"guides">
+        <dia:attribute name=3D"hguides"/>
+        <dia:attribute name=3D"vguides"/>
+      </dia:composite>
+    </dia:attribute>
+  </dia:diagramdata>
+  <dia:layer name=3D"Background" visible=3D"true" active=3D"true">
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O0">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"-0.621861,-22.15"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"-0.671861,-22.2;18.4081,-9.1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"-0.621861,-22.15"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"18.98"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"13.000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#declaration#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>#contains all the declaration#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigserial#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_title#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_start#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#date#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_end#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#date#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  to_keep#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#character(1)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_generated#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#timestamp with time zone#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>#now()#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_lob#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#oid#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_filename#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_mimetype#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_size#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_step#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#numeric#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_description#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O1">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"-1.31804,-3.3"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"-1.36804,-3.35;9.62696,5.55"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"-1.31804,-3.3"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"10.895"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"8.7999999999999989"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#declaration_row#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  dr_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  d_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  dr_libelle#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  dr_order#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  dr_code#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  dr_amount#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#numeric(25,4)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  dr_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  dr_start#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#date#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  dr_end#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#date#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O2">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"-2.65499,9.9"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"-2.70499,9.85;8.67501,13.95"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"-2.65499,9.9"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"11.279999999999999"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"4"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#declaration_row_detail#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  ddr_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigserial#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  ddr_amount#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#numeric(25,4)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  dr_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O3">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"28.9261,-15.9"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"28.8761,-15.95;37.9461,-8.65"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"28.9261,-15.9"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"8.9700000000000006"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"7.1999999999999993"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#formulaire#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#serial#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_title#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_description#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_lob#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#oid#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_filename#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_mimetype#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_size#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O4">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"29.5167,-1.45"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"29.4667,-1.5;38.0692,5.8"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"29.5167,-1.45"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"8.5025000000000013"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"7.1999999999999993"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#formulaire_param#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#serial#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_code#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_libelle#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_order#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  t_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O5">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"28.475,7.4"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"28.425,7.35;42.115,20.25"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"28.475,7.4"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"13.59"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"12.800000000000002"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#formulaire_param_detail#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  fp_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#serial#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tmp_val#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#account_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tva_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  fp_formula#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  fp_signed#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  jrn_def_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#character(3)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tt_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  type_detail#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  with_tmp_val#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#account_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  type_sum_account#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  operation_pcm_val#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#account_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  jrn_def_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  date_paid#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O6">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"11.6897,-3.65"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"11.6397,-3.7;20.7097,-0.4"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"11.6897,-3.65"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"8.9700000000000006"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#periode_type#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  t_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  t_description#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O7">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"45.5531,1.05"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"45.5031,1;57.7881,9.1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"45.5531,1.05"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"12.184999999999999"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"8"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#restore_formulaire_param#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_code#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_libelle#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_order#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  f_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_info#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  t_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O8">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"63.6456,17.45"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"63.5956,17.4;78.8681,29.5"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"63.6456,17.45"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"15.172499999999999"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"12.000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#restore_formulaire_param_detail#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  fp_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tmp_val#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#account_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tva_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  fp_formula#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  fp_signed#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  jrn_def_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#character(3)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tt_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  type_detail#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  with_tmp_val#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#account_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  type_sum_account#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#bigint#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  operation_pcm_val#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#account_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  date_paid#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O9">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"12.4794,6.35"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"12.4294,6.3;19.5744,9.6"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"12.4794,6.35"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"7.0449999999999999"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#total_type#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tt_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#serial#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tt_label#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O10">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"11.5203,19.9"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"11.4703,19.85;20.5828,23.15"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"11.5203,19.9"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"9.0124999999999993"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#total_type_account#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tt_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#serial#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tt_label#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O11">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"11.5433,1.5"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"11.4933,1.45;20.5633,4.75"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"11.5433,1.5"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"8.9700000000000006"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#type_row#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  p_description#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O12">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"11.2314,13.55"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"11.1814,13.5;20.6364,16.8"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"11.2314,13.55"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"9.3550000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#type_row_detail#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tr_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  tr_description#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Class" version=3D"0" id=3D"O13">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"65.8512,-9.7"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"65.8012,-9.75;86.4212,-5.65"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_corner">
+        <dia:point val=3D"65.8512,-9.7"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_width">
+        <dia:real val=3D"20.52"/>
+      </dia:attribute>
+      <dia:attribute name=3D"elem_height">
+        <dia:real val=3D"4"/>
+      </dia:attribute>
+      <dia:attribute name=3D"name">
+        <dia:string>#version#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_attributes">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"suppress_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_attributes">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"visible_comments">
+        <dia:boolean val=3D"true"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_operations">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"wrap_after_char">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_line_length">
+        <dia:int val=3D"40"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_tagging">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_width">
+        <dia:real val=3D"0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"fill_color">
+        <dia:color val=3D"#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_color">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font">
+        <dia:font family=3D"monospace" style=3D"0" name=3D"Courier"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font">
+        <dia:font family=3D"monospace" style=3D"88" name=3D"Courier-Bold=
Oblique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font">
+        <dia:font family=3D"monospace" style=3D"8" name=3D"Courier-Obliq=
ue"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font">
+        <dia:font family=3D"sans" style=3D"80" name=3D"Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font">
+        <dia:font family=3D"sans" style=3D"88" name=3D"Helvetica-BoldObl=
ique"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font">
+        <dia:font family=3D"sans" style=3D"8" name=3D"Helvetica-Oblique"=
/>
+      </dia:attribute>
+      <dia:attribute name=3D"normal_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"polymorphic_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_font_height">
+        <dia:real val=3D"0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name=3D"classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"abstract_classname_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"comment_font_height">
+        <dia:real val=3D"1"/>
+      </dia:attribute>
+      <dia:attribute name=3D"attributes">
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  version_id#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#integer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  version_date#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#timestamp without time zone#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>#now()#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type=3D"umlattribute">
+          <dia:attribute name=3D"name">
+            <dia:string>#  version_note#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"type">
+            <dia:string>#text#</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name=3D"visibility">
+            <dia:enum val=3D"3"/>
+          </dia:attribute>
+          <dia:attribute name=3D"abstract">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+          <dia:attribute name=3D"class_scope">
+            <dia:boolean val=3D"false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name=3D"operations"/>
+      <dia:attribute name=3D"template">
+        <dia:boolean val=3D"false"/>
+      </dia:attribute>
+      <dia:attribute name=3D"templates"/>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O14">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"18.4081,-14.3478"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"18.3517,-14.4041;32.4981,-12.5156"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"18.4081,-14.3478"/>
+        <dia:point val=3D"28.8782,-12.9187"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#declaration_f_id_fkey#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"23.6431,-13.6333"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O0" connection=3D"34"/>
+        <dia:connection handle=3D"1" to=3D"O3" connection=3D"22"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O15">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"5.38832,-3.34973"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"5.32659,-9.25739;16.5968,-3.28801"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"5.38832,-3.34973"/>
+        <dia:point val=3D"7.01521,-9.10039"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#declaration_row_d_id_fkey#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"6.20176,-6.22506"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O1" connection=3D"26"/>
+        <dia:connection handle=3D"1" to=3D"O0" connection=3D"34"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O16">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"0.276112,8.9"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"0.209138,5.32739;14.5787,8.96697"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"0.276112,8.9"/>
+        <dia:point val=3D"1.93138,5.54939"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#declaration_row_detail_dr_id_fkey#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"1.10374,7.22469"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"1" to=3D"O1" connection=3D"26"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O17">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"29.5167,2.85"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"20.439,2.525;36.565,3.8023"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"29.5167,2.85"/>
+        <dia:point val=3D"20.5133,3.4"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#formulaire_param_p_type_fkey#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"25.015,3.125"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O4" connection=3D"14"/>
+        <dia:connection handle=3D"1" to=3D"O11" connection=3D"9"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O18">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"33.6778,-1.49998"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"33.1001,-8.70988;44.3695,-1.44876"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"33.6778,-1.49998"/>
+        <dia:point val=3D"33.5012,-8.65002"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#formulaire_param_f_id_fkey#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"33.5895,-5.075"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O4" connection=3D"22"/>
+        <dia:connection handle=3D"1" to=3D"O3" connection=3D"22"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O19">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"29.4664,0.870193"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"20.4977,-4.24106;93.1264,0.932376"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"29.4664,0.870193"/>
+        <dia:point val=3D"20.6597,-1.75"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#formulaire_param_t_id_fkey#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"82.3464,-3.64106"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O4" connection=3D"22"/>
+        <dia:connection handle=3D"1" to=3D"O6" connection=3D"9"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O20">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"34.439,7.35496"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"33.8354,5.69913;47.8138,7.41094"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"34.439,7.35496"/>
+        <dia:point val=3D"34.2385,5.79987"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#formulaire_param_detail_p_id_fkey#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"34.3388,6.57741"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O5" connection=3D"36"/>
+        <dia:connection handle=3D"1" to=3D"O4" connection=3D"22"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O21">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"28.475,14.9"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"19.2457,7.8991;37.8597,14.97"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"28.475,14.9"/>
+        <dia:point val=3D"19.5244,8.25"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#formulaire_param_detail_tt_id_fkey#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"23.9997,11.575"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O5" connection=3D"22"/>
+        <dia:connection handle=3D"1" to=3D"O9" connection=3D"9"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O22">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"28.475,15.7"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"20.5237,14.975;41.4707,15.8514"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"28.475,15.7"/>
+        <dia:point val=3D"20.5864,15.45"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#fk_formulaire_param_detail_type_row_detail#</dia:st=
ring>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"24.5307,15.575"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O5" connection=3D"24"/>
+        <dia:connection handle=3D"1" to=3D"O12" connection=3D"9"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O23">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"28.475,17.3"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"20.2921,17.2318;42.5989,22.1727"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"28.475,17.3"/>
+        <dia:point val=3D"20.5328,21.8"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#formulaire_param_detail_type_sum_account_fkey#</dia=
:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"24.5039,19.55"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O5" connection=3D"28"/>
+        <dia:connection handle=3D"1" to=3D"O10" connection=3D"9"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O24">
+      <dia:attribute name=3D"obj_pos">
+        <dia:point val=3D"63.6456,20.15"/>
+      </dia:attribute>
+      <dia:attribute name=3D"obj_bb">
+        <dia:rectangle val=3D"57.3435,2.77278;69.5468,20.2135"/>
+      </dia:attribute>
+      <dia:attribute name=3D"meta">
+        <dia:composite type=3D"dict"/>
+      </dia:attribute>
+      <dia:attribute name=3D"conn_endpoints">
+        <dia:point val=3D"63.6456,20.15"/>
+        <dia:point val=3D"57.7381,2.95"/>
+      </dia:attribute>
+      <dia:attribute name=3D"constraint">
+        <dia:string>#formulaire_param_fkey#</dia:string>
+      </dia:attribute>
+      <dia:attribute name=3D"text_pos">
+        <dia:point val=3D"60.6918,11.55"/>
+      </dia:attribute>
+      <dia:attribute name=3D"text_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:attribute name=3D"line_colour">
+        <dia:color val=3D"#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle=3D"0" to=3D"O8" connection=3D"10"/>
+        <dia:connection handle=3D"1" to=3D"O7" connection=3D"9"/>
+      </dia:connections>
+    </dia:object>
+  </dia:layer>
+</dia:diagram>



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


From MAILER-DAEMON Tue Nov 05 11:32:09 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VdjY1-0006rI-Ds
	for mharc-phpcompta-dev@gnu.org; Tue, 05 Nov 2013 11:32:09 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  5 Nov 2013 17:21:24 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.90953.1383669128.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r563 - in trunk/rapport_avance: doc 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: Tue, 05 Nov 2013 16:32:08 -0000

Author: danydb
Date: 2013-11-05 17:21:23 +0100 (Tue, 05 Nov 2013)
New Revision: 563

Added:
   trunk/rapport_avance/doc/listing-db.dia
   trunk/rapport_avance/sql/1-add-listing.sql
Removed:
   trunk/rapport_avance/sql/1-ajout-col-formulaire-param-detail.sql
   trunk/rapport_avance/sql/2-date-paiement.sql
Modified:
   trunk/rapport_avance/doc/rapav-analyse.dia
   trunk/rapport_avance/doc/rapav-listing-code.odt
   trunk/rapport_avance/doc/rapav.dia
Log:
update doc analyse

Added: trunk/rapport_avance/doc/listing-db.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: trunk/rapport_avance/doc/listing-db.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/rapport_avance/doc/rapav-analyse.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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: trunk/rapport_avance/doc/rapav-listing-code.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: trunk/rapport_avance/doc/rapav.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/doc/rapav.dia	2013-11-05 10:54:27 UTC (rev 562)
+++ trunk/rapport_avance/doc/rapav.dia	2013-11-05 16:21:23 UTC (rev 563)
@@ -62,7 +62,7 @@
       </dia:composite>
     </dia:attribute>
   </dia:diagramdata>
-  <dia:layer name=3D"Background" visible=3D"true" active=3D"true">
+  <dia:layer name=3D"rapav" visible=3D"true" active=3D"true">
     <dia:object type=3D"UML - Class" version=3D"0" id=3D"O0">
       <dia:attribute name=3D"obj_pos">
         <dia:point val=3D"-0.621861,-22.15"/>
@@ -1245,13 +1245,13 @@
     </dia:object>
     <dia:object type=3D"UML - Class" version=3D"0" id=3D"O4">
       <dia:attribute name=3D"obj_pos">
-        <dia:point val=3D"29.5167,-1.45"/>
+        <dia:point val=3D"30.4167,-5.75"/>
       </dia:attribute>
       <dia:attribute name=3D"obj_bb">
-        <dia:rectangle val=3D"29.4667,-1.5;38.0692,5.8"/>
+        <dia:rectangle val=3D"30.3667,-5.8;38.9692,1.5"/>
       </dia:attribute>
       <dia:attribute name=3D"elem_corner">
-        <dia:point val=3D"29.5167,-1.45"/>
+        <dia:point val=3D"30.4167,-5.75"/>
       </dia:attribute>
       <dia:attribute name=3D"elem_width">
         <dia:real val=3D"8.5025000000000013"/>
@@ -2402,13 +2402,13 @@
     </dia:object>
     <dia:object type=3D"UML - Class" version=3D"0" id=3D"O8">
       <dia:attribute name=3D"obj_pos">
-        <dia:point val=3D"63.6456,17.45"/>
+        <dia:point val=3D"62.3956,0.55"/>
       </dia:attribute>
       <dia:attribute name=3D"obj_bb">
-        <dia:rectangle val=3D"63.5956,17.4;78.8681,29.5"/>
+        <dia:rectangle val=3D"62.3456,0.5;77.6181,12.6"/>
       </dia:attribute>
       <dia:attribute name=3D"elem_corner">
-        <dia:point val=3D"63.6456,17.45"/>
+        <dia:point val=3D"62.3956,0.55"/>
       </dia:attribute>
       <dia:attribute name=3D"elem_width">
         <dia:real val=3D"15.172499999999999"/>
@@ -3440,13 +3440,13 @@
     </dia:object>
     <dia:object type=3D"UML - Class" version=3D"0" id=3D"O13">
       <dia:attribute name=3D"obj_pos">
-        <dia:point val=3D"65.8512,-9.7"/>
+        <dia:point val=3D"43.1012,-13.75"/>
       </dia:attribute>
       <dia:attribute name=3D"obj_bb">
-        <dia:rectangle val=3D"65.8012,-9.75;86.4212,-5.65"/>
+        <dia:rectangle val=3D"43.0512,-13.8;63.6712,-9.7"/>
       </dia:attribute>
       <dia:attribute name=3D"elem_corner">
-        <dia:point val=3D"65.8512,-9.7"/>
+        <dia:point val=3D"43.1012,-13.75"/>
       </dia:attribute>
       <dia:attribute name=3D"elem_width">
         <dia:real val=3D"20.52"/>
@@ -3712,23 +3712,23 @@
     </dia:object>
     <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O17">
       <dia:attribute name=3D"obj_pos">
-        <dia:point val=3D"29.5167,2.85"/>
+        <dia:point val=3D"30.4167,-1.45"/>
       </dia:attribute>
       <dia:attribute name=3D"obj_bb">
-        <dia:rectangle val=3D"20.439,2.525;36.565,3.8023"/>
+        <dia:rectangle val=3D"20.2925,-1.5169;37.015,3.78123"/>
       </dia:attribute>
       <dia:attribute name=3D"meta">
         <dia:composite type=3D"dict"/>
       </dia:attribute>
       <dia:attribute name=3D"conn_endpoints">
-        <dia:point val=3D"29.5167,2.85"/>
+        <dia:point val=3D"30.4167,-1.45"/>
         <dia:point val=3D"20.5133,3.4"/>
       </dia:attribute>
       <dia:attribute name=3D"constraint">
         <dia:string>#formulaire_param_p_type_fkey#</dia:string>
       </dia:attribute>
       <dia:attribute name=3D"text_pos">
-        <dia:point val=3D"25.015,3.125"/>
+        <dia:point val=3D"25.465,0.975"/>
       </dia:attribute>
       <dia:attribute name=3D"text_colour">
         <dia:color val=3D"#000000"/>
@@ -3743,23 +3743,23 @@
     </dia:object>
     <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O18">
       <dia:attribute name=3D"obj_pos">
-        <dia:point val=3D"33.6778,-1.49998"/>
+        <dia:point val=3D"34.2161,-5.7989"/>
       </dia:attribute>
       <dia:attribute name=3D"obj_bb">
-        <dia:rectangle val=3D"33.1001,-8.70988;44.3695,-1.44876"/>
+        <dia:rectangle val=3D"33.4598,-8.74988;44.8195,-5.74313"/>
       </dia:attribute>
       <dia:attribute name=3D"meta">
         <dia:composite type=3D"dict"/>
       </dia:attribute>
       <dia:attribute name=3D"conn_endpoints">
-        <dia:point val=3D"33.6778,-1.49998"/>
-        <dia:point val=3D"33.5012,-8.65002"/>
+        <dia:point val=3D"34.2161,-5.7989"/>
+        <dia:point val=3D"33.8629,-8.6511"/>
       </dia:attribute>
       <dia:attribute name=3D"constraint">
         <dia:string>#formulaire_param_f_id_fkey#</dia:string>
       </dia:attribute>
       <dia:attribute name=3D"text_pos">
-        <dia:point val=3D"33.5895,-5.075"/>
+        <dia:point val=3D"34.0395,-7.225"/>
       </dia:attribute>
       <dia:attribute name=3D"text_colour">
         <dia:color val=3D"#000000"/>
@@ -3774,23 +3774,23 @@
     </dia:object>
     <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O19">
       <dia:attribute name=3D"obj_pos">
-        <dia:point val=3D"29.4664,0.870193"/>
+        <dia:point val=3D"30.3669,-2.02719"/>
       </dia:attribute>
       <dia:attribute name=3D"obj_bb">
-        <dia:rectangle val=3D"20.4977,-4.24106;93.1264,0.932376"/>
+        <dia:rectangle val=3D"20.5983,-5.68975;93.5766,-1.34874"/>
       </dia:attribute>
       <dia:attribute name=3D"meta">
         <dia:composite type=3D"dict"/>
       </dia:attribute>
       <dia:attribute name=3D"conn_endpoints">
-        <dia:point val=3D"29.4664,0.870193"/>
+        <dia:point val=3D"30.3669,-2.02719"/>
         <dia:point val=3D"20.6597,-1.75"/>
       </dia:attribute>
       <dia:attribute name=3D"constraint">
         <dia:string>#formulaire_param_t_id_fkey#</dia:string>
       </dia:attribute>
       <dia:attribute name=3D"text_pos">
-        <dia:point val=3D"82.3464,-3.64106"/>
+        <dia:point val=3D"82.7966,-5.08975"/>
       </dia:attribute>
       <dia:attribute name=3D"text_colour">
         <dia:color val=3D"#000000"/>
@@ -3805,23 +3805,23 @@
     </dia:object>
     <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O20">
       <dia:attribute name=3D"obj_pos">
-        <dia:point val=3D"34.439,7.35496"/>
+        <dia:point val=3D"35.0266,7.35049"/>
       </dia:attribute>
       <dia:attribute name=3D"obj_bb">
-        <dia:rectangle val=3D"33.8354,5.69913;47.8138,7.41094"/>
+        <dia:rectangle val=3D"34.4041,1.43464;48.3911,7.40234"/>
       </dia:attribute>
       <dia:attribute name=3D"meta">
         <dia:composite type=3D"dict"/>
       </dia:attribute>
       <dia:attribute name=3D"conn_endpoints">
-        <dia:point val=3D"34.439,7.35496"/>
-        <dia:point val=3D"34.2385,5.79987"/>
+        <dia:point val=3D"35.0266,7.35049"/>
+        <dia:point val=3D"34.8057,1.49969"/>
       </dia:attribute>
       <dia:attribute name=3D"constraint">
         <dia:string>#formulaire_param_detail_p_id_fkey#</dia:string>
       </dia:attribute>
       <dia:attribute name=3D"text_pos">
-        <dia:point val=3D"34.3388,6.57741"/>
+        <dia:point val=3D"34.9161,4.42509"/>
       </dia:attribute>
       <dia:attribute name=3D"text_colour">
         <dia:color val=3D"#000000"/>
@@ -3929,23 +3929,23 @@
     </dia:object>
     <dia:object type=3D"UML - Constraint" version=3D"0" id=3D"O24">
       <dia:attribute name=3D"obj_pos">
-        <dia:point val=3D"63.6456,20.15"/>
+        <dia:point val=3D"62.3956,3.25"/>
       </dia:attribute>
       <dia:attribute name=3D"obj_bb">
-        <dia:rectangle val=3D"57.3435,2.77278;69.5468,20.2135"/>
+        <dia:rectangle val=3D"57.6625,2.5;68.9218,3.35239"/>
       </dia:attribute>
       <dia:attribute name=3D"meta">
         <dia:composite type=3D"dict"/>
       </dia:attribute>
       <dia:attribute name=3D"conn_endpoints">
-        <dia:point val=3D"63.6456,20.15"/>
+        <dia:point val=3D"62.3956,3.25"/>
         <dia:point val=3D"57.7381,2.95"/>
       </dia:attribute>
       <dia:attribute name=3D"constraint">
         <dia:string>#formulaire_param_fkey#</dia:string>
       </dia:attribute>
       <dia:attribute name=3D"text_pos">
-        <dia:point val=3D"60.6918,11.55"/>
+        <dia:point val=3D"60.0668,3.1"/>
       </dia:attribute>
       <dia:attribute name=3D"text_colour">
         <dia:color val=3D"#000000"/>
@@ -3959,4 +3959,5 @@
       </dia:connections>
     </dia:object>
   </dia:layer>
+  <dia:layer name=3D"listing" visible=3D"true"/>
 </dia:diagram>

Added: trunk/rapport_avance/sql/1-add-listing.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/1-add-listing.sql	                        (r=
ev 0)
+++ trunk/rapport_avance/sql/1-add-listing.sql	2013-11-05 16:21:23 UTC (r=
ev 563)
@@ -0,0 +1,29 @@
+create table rapport_advanced.listing
+(
+    l_id    serial primary key,
+    l_description   text,
+    l_lob oid,
+    l_mimetype text,
+    l_size bigint,
+    fd_id bigint references fiche_def (fd_id) on update cascade on delet=
e null
+);
+create table rapport_advanced.listing_param
+(
+ lp_id serial primary key,
+ l_id bigint constraint fk_listing_param_listing references rapport_adva=
nced.listing(l_id) on update cascade on delete cascade,
+ lp_code text not null constraint c_lp_code check (length (trim(lp_code)=
)> 0),
+ lp_comment text,
+ l_card int default 0,
+ l_order int
+);
+create table rapport_advanced.listing_param_detail
+(
+    ad_id bigint constraint fk_listing_param_detail_attr_def references =
attr_def (ad_id),
+    lp_card_saldo char(1) check (lp_card_saldo in ('C','D','S',NULL)),
+    lp_with_card char (1) check (lp_with_card in ('Y','N')),
+    lp_id bigint constraint fk_listing_param_detail_listing_param refere=
nces rapport_advanced.listing_param (lp_id)
+)  inherits (rapport_Advanced.formulaire_param_detail);
+
+--ALTER TABLE ONLY rapport_advanced.listing_param_detail
+ --   ADD CONSTRAINT listing_param_detail_p_type_fkey FOREIGN KEY (p_typ=
e) REFERENCES rapport_advanced.type_row(p_type);
+

Deleted: trunk/rapport_avance/sql/1-ajout-col-formulaire-param-detail.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/1-ajout-col-formulaire-param-detail.sql	2013=
-11-05 10:54:27 UTC (rev 562)
+++ trunk/rapport_avance/sql/1-ajout-col-formulaire-param-detail.sql	2013=
-11-05 16:21:23 UTC (rev 563)
@@ -1,24 +0,0 @@
-ALTER TABLE rapport_advanced.formulaire_param_detail   ADD COLUMN jrn_de=
f_id bigint;
-COMMENT ON COLUMN rapport_advanced.formulaire_param_detail.jrn_def_id IS=
 'FK to jrn_def, if null then all the ledgers are concerned';
-
-CREATE FUNCTION formulaire_param_detail_jrn_def_id_ins_upd() RETURNS tri=
gger
-    AS $$
-declare
-	jrn_def_id integer;
-begin
-	if NEW.jrn_def_id =3D -1 then
-		jrn_def_id=3DNULL;
-		NEW.jrn_def_id :=3D jrn_def_id;
-	end if;
-	return NEW;
-end;$$;
-language plpgsql;
-
-CREATE INDEX fki_jrn_def_id ON rapport_advanced.formulaire_param_detail =
USING btree (jrn_def_id);
-
-CREATE TRIGGER formulaire_param_detail_trg BEFORE INSERT OR UPDATE OF jr=
n_def_id ON rapport_advanced.formulaire_param_detail FOR EACH ROW EXECUTE=
 PROCEDURE rapport_advanced.formulaire_param_detail_jrn_def_id_ins_upd();
-
-ALTER TABLE rapport_advanced.formulaire_param_detail  ADD CONSTRAINT for=
mulaire_param_detail_jrn_def_id_fkey FOREIGN KEY (jrn_def_id)      REFERE=
NCES jrn_def (jrn_def_id) MATCH SIMPLE      ON UPDATE CASCADE ON DELETE S=
ET NULL DEFERRABLE INITIALLY DEFERRED;
-
-
-

Deleted: trunk/rapport_avance/sql/2-date-paiement.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/2-date-paiement.sql	2013-11-05 10:54:27 UTC =
(rev 562)
+++ trunk/rapport_avance/sql/2-date-paiement.sql	2013-11-05 16:21:23 UTC =
(rev 563)
@@ -1,2 +0,0 @@
-alter table rapport_advanced.formulaire_param_detail add column date_pai=
d integer default 0;
-alter table rapport_advanced.restore_formulaire_param_detail add column =
date_paid integer default 0;



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


From MAILER-DAEMON Tue Nov 05 16:39:29 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VdoLR-0000ln-I9
	for mharc-phpcompta-dev@gnu.org; Tue, 05 Nov 2013 16:39:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  5 Nov 2013 22:28:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.91294.1383687564.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5537 - phpcompta/trunk/dev/manage-code/create-file
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, 05 Nov 2013 21:39:23 -0000

Author: danydb
Date: 2013-11-05 22:28:39 +0100 (Tue, 05 Nov 2013)
New Revision: 5537

Modified:
   phpcompta/trunk/dev/manage-code/create-file/
   phpcompta/trunk/dev/manage-code/create-file/create_config.py
   phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py
Log:
Create file for SQL class


Property changes on: phpcompta/trunk/dev/manage-code/create-file
___________________________________________________________________
Name: svn:ignore
   - .menu_ref_struct.txt.swp
.class_menu_ref_sql.php.swp
.create_config.py.swp
.create_phpclass.py.swp
.profile_struct.txt.swp
.profile_menu_struct.txt.swp

   + .menu_ref_struct.txt.swp
.class_menu_ref_sql.php.swp
.create_config.py.swp
.create_phpclass.py.swp
.profile_struct.txt.swp
.profile_menu_struct.txt.swp
.create_config.py.kate-swp
.create_phpclass.py.kate-swp
.create_phpclass2.py.kate-swp
.class_Jrnx_sql_SQL.php.swo


Modified: phpcompta/trunk/dev/manage-code/create-file/create_config.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/dev/manage-code/create-file/create_config.py	2013-10-=
29 12:58:56 UTC (rev 5536)
+++ phpcompta/trunk/dev/manage-code/create-file/create_config.py	2013-11-=
05 21:28:39 UTC (rev 5537)
@@ -27,6 +27,11 @@
 except:
     print "Utilisation "+sys.argv[0]+" -s nom_du_schema -t nom de la tab=
le + c connexion string"
     print 'example -t jrnxc -c "dbname=3Dxxx user=3Dxx port=3Dxx  passwo=
rd=3Dxxx"'
+    print """
+    This utility create a file, this file can be given as input to the s=
cript
+    create_phpclass.py with the option -f
+    This will create the corresponding PHP File that you need to put in =
the include folder
+    """
     sys.exit(-1)
=20
 cnx=3Dpsycopg2.connect (connexion_string)
@@ -52,7 +57,7 @@
     worlds.append(i.capitalize())
=20
 class_name=3D'_'.join(worlds)
-class_name=3Dclass_name+"_sql"
+class_name=3Dclass_name+"_SQL"
=20
 file.write(class_name+"\n")
 file.write(schema+"."+table+"\n")

Modified: phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py	2013-1=
0-29 12:58:56 UTC (rev 5536)
+++ phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py	2013-1=
1-05 21:28:39 UTC (rev 5537)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+  #!/usr/bin/python
=20
=20
 # Command we have to replace
@@ -8,13 +8,12 @@
 # @class_name@ Name of the class (uppercase)
 # @column_array@ fill the $variable
 # @sql_update@ the sql update
-# @column_comma the column for insert and update
 # read the file with the name
+# @column_comma the column for insert and update
 # first line =3D table name
 # second line =3D pk
=20
 import sys, getopt
-import pdb
=20
 def help():
     print """
@@ -64,418 +63,55 @@
=20
 @endcode
  */
-require_once('class_database.php');
-require_once('ac_common.php');
+require_once('class_phpcompta_sql.php');
=20
=20
 /**
  *@brief Manage the table @table@
 */
-class @class_name@  @mother_class@
+class @class_name@ extends Phpcompta_SQL
 {
   /* example private $variable=3Darray("easy_name"=3D>column_name,"email=
"=3D>"column_name_email","val3"=3D>0); */
- =20
-  protected $variable=3Darray(@column_array@);
-  function __construct ( & $p_cn,$p_id=3D-1) {
-        $this->cn=3D$p_cn;
-        $this->@id@=3D$p_id;
-       =20
-        if ( $p_id =3D=3D -1 ) {
-        /* Initialize an empty object */
-            foreach ($this->variable as $key=3D>$value) $this->$value=3D=
null;
-            $this->@id@=3D$p_id;
-        } else {
-         /* load it */
+  function __construct($p_id=3D-1)
+	{
=20
-         $this->load();
-      }
-  }
-  public function get_parameter($p_string) {
-    if ( array_key_exists($p_string,$this->variable) ) {
-      $idx=3D$this->variable[$p_string];
-      return $this->$idx;
-    }
-    else=20
-      throw new Exception (__FILE__.":".__LINE__.$p_string.'Erreur attri=
but inexistant');
-  }
-  public function set_parameter($p_string,$p_value) {
-    if ( array_key_exists($p_string,$this->variable) ) {
-      $idx=3D$this->variable[$p_string];
-      $this->$idx=3D$p_value;
-    }
-    else=20
-      throw new Exception (__FILE__.":".__LINE__.$p_string.'Erreur attri=
but inexistant');
-  }
-  public function get_info() {    return var_export($this,true);  }
-  public function verify() {
-    // Verify that the elt we want to add is correct
-    /* verify only the datatype */
-    @verify_data_type@
-    @set_tech_user@
-  }
-  public function save() {
-  /* please adapt */
-    if (  $this->@id@ =3D=3D -1 )=20
-      $this->insert();
-    else
-      $this->update();
-  }
-  /**
-   *@brief retrieve array of object thanks a condition
-   *@param $cond condition (where clause) (optional by default all the r=
ows are fetched)
-   * you can use this parameter for the order or subselect
-   *@param $p_array array for the SQL stmt
-   *@see Database::exec_sql get_object  Database::num_row
-   *@return the return value of exec_sql
-   */
-   public function seek($cond=3D'',$p_array=3Dnull)=20
-   {
-     $sql=3D"select * from @table@  $cond";
-     $aobj=3Darray();
-     $ret=3D $this->cn->exec_sql($sql,$p_array);
-     return $ret;
-   }
-   /**
-    *get_seek return the next object, the return of the query must have =
all the column
-    * of the object
-    *@param $p_ret is the return value of an exec_sql
-    *@param $idx is the index
-    *@see seek
-    *@return object=20
-    */
-   public function get_object($p_ret,$idx)
-    {
-     // map each row in a object
-     $oobj=3Dnew @class_name@ ($this->cn);
-     $array=3DDatabase::fetch_array($p_ret,$idx);
-     foreach ($array as $idx=3D>$value) { $oobj->$idx=3D$value; }
-     return $oobj;
-   }
-  public function insert() {
-    if ( $this->verify() !=3D 0 ) return;
-      if( $this->@id@=3D=3D-1 ){
-    /*  please adapt */
-    $sql=3D"insert into @table@(@column_noid@) values (@column_insert@) =
returning @id@";
-   =20
-    $this->@id@=3D$this->cn->get_value(
-		 $sql,
-		 array( @column_this@)
-		 );
-          } else {
-              $sql=3D"insert into @table@(@column_noid@,@id@) values (@c=
olumn_insert_id@) returning @id@";
-   =20
-    $this->@id@=3D$this->cn->get_value(
-		 $sql,
-		 array( @column_this_id@)
-		 );
=20
-          }
-  =20
-  }
+		$this->table =3D "@table@";
+		$this->primary_key =3D "@id@";
=20
-  public function update() {
-    if ( $this->verify() !=3D 0 ) return;
-    /*   please adapt */
-    $sql=3D"@sql_update@";
-    $res=3D$this->cn->exec_sql(
-		 $sql,
-		 array(@column_comma@,$this->@id@)
-		 );
-		=20
-  }
-/**
- *@brief load a object
- *@return 0 on success -1 the object is not found
- */
-  public function load() {
+		$this->name =3D array(
+			@column_array@
+		);
=20
-   $sql=3D"select @column_select@ from @table@ where @id@=3D$1";=20
-    /* please adapt */
-    $res=3D$this->cn->get_array(
-		 $sql,
-		 array($this->@id@)
-		 );
-		=20
-    if ( count($res) =3D=3D 0 ) {
-          /* Initialize an empty object */
-          foreach ($this->variable as $key=3D>$value) $this->$key=3D'';
+		$this->type =3D array(
+			@column_type_array@
+		);
=20
-          return -1;
-          }
-    foreach ($res[0] as $idx=3D>$value) { $this->$idx=3D$value; }
-    return 0;
-  }
+		$this->default =3D array(
+			"@id@" =3D> "auto"
+		);
+		global $cn;
=20
-  public function delete() {
-    $sql=3D"delete from @table@ where @id@=3D$1";=20
-    $res=3D$this->cn->exec_sql($sql,array($this->@id@));
-  }
-  /**
-   * Unit test for the class
-   */=09
-  static function test_me() {
-      $cn=3Dnew Database(25);
-$cn->start();
-    echo h2info('Test object vide');
-    $obj=3Dnew @class_name@($cn);
-    var_dump($obj);
-
-    echo h2info('Test object NON vide');
-    $obj->set_parameter('j_id',3);
-    $obj->load();
-    var_dump($obj);
-
-    echo h2info('Update');
-    $obj->set_parameter('j_qcode','NOUVEAU CODE');
-    $obj->save();
-    $obj->load();
-    var_dump($obj);
-
-    echo h2info('Insert');
-    $obj->set_parameter('j_id',0);
-    $obj->save();
-    $obj->load();
-    var_dump($obj);
-
-    echo h2info('Delete');
-    $obj->delete();
-    echo (($obj->load()=3D=3D0)?'Trouve':'non trouve');
-    var_dump($obj);
-$cn->rollback();
-
-  }
- =20
-}
-// @class_name@::test_me();
-?>
-"""
-    sChild=3D"""<?php
-/**
- *@file
- *@brief Manage the table @table@
- *
- *
-Example
-@code
-
-@endcode
- */
-require_once('class_database.php');
-require_once('ac_common.php');
-
-/**
- *@brief Manage the table @table@
- *@extends @mother_class@
-*/
-class @class_name@  @mother_class@
-{
-  /* example private $variable=3Darray("easy_name"=3D>column_name,"email=
"=3D>"column_name_email","val3"=3D>0); */
- =20
-  protected $variable=3Darray(@column_array@);
-
+		parent::__construct($cn, $p_id);
+	}
   public function verify() {
-    // Verify that the elt we want to add is correct
-    /* verify only the datatype */
-    @verify_data_type@
-    @set_tech_user@
-  }
-  public function save() {
-  /* please adapt */
-    if (  $this->@id@ =3D=3D -1 )=20
-      $this->insert();
-    else
-      $this->update();
-  }
-  public function insert() {
-    if ( $this->verify() !=3D 0 ) return;
-    /*  please adapt */
-    $sql=3D"insert into @table@(@column_noid@) values (@column_insert@) =
returning @id@";
+    parent::verify();
    =20
-    $this->@id@=3D$this->cn->get_value(
-		 $sql,
-		 array( @column_this@)
-		 );
-  =20
   }
-
-  public function update() {
-    if ( $this->verify() !=3D 0 ) return;
-    /*   please adapt */
-    $sql=3D"@sql_update@";
-    $res=3D$this->cn->exec_sql(
-		 $sql,
-		 array(@column_comma@,$this->@id@)
-		 );
-		=20
-  }
-/**
- *@brief load ONE object, the pk must be set before calling
- *@return 0 on success -1 the object is not found
- */
-  public function load() {
-
-   $sql=3D"select @column_select@ from @table@ where @id@=3D$1";=20
-    /* please adapt */
-    $res=3D$this->cn->get_array(
-		 $sql,
-		 array($this->@id@)
-		 );
-		=20
-    if ( count($res) =3D=3D 0 ) {
-          /* Initialize an empty object */
-          foreach ($this->variable as $key=3D>$value) $this->$key=3D'';
-
-          return -1;
-          }
-    foreach ($res[0] as $idx=3D>$value) { $this->$idx=3D$value; }
-    return 0;
-  }
-
-  public function delete() {
-    $sql=3D"delete from @table@ where @id@=3D$1";=20
-    $res=3D$this->cn->exec_sql($sql,array($this->@id@));
-  }
-  /**
-   * Unit test for the class
-   */=09
-  static function test_me() {
-      $cn=3Dnew Database(25);
-$cn->start();
-    echo h2info('Test object vide');
-    $obj=3Dnew @class_name@($cn);
-    var_dump($obj);
-
-    echo h2info('Test object NON vide');
-    $obj->set_parameter('j_id',3);
-    $obj->load();
-    var_dump($obj);
-
-    echo h2info('Update');
-    $obj->set_parameter('j_qcode','NOUVEAU CODE');
-    $obj->save();
-    $obj->load();
-    var_dump($obj);
-
-    echo h2info('Insert');
-    $obj->set_parameter('j_id',0);
-    $obj->save();
-    $obj->load();
-    var_dump($obj);
-
-    echo h2info('Delete');
-    $obj->delete();
-    echo (($obj->load()=3D=3D0)?'Trouve':'non trouve');
-    var_dump($obj);
-$cn->rollback();
-
-  }
  =20
 }
-@class_name@::test_me();
+ =20
 ?>
 """
-    sView=3D"""<?php
-/**
- *@file
- *@brief Manage the view @table@
- *
- *
-Example
-@code
-
-@endcode
- */
-require_once('class_database.php');
-require_once('ac_common.php');
-
-/**
- *@brief Manage the view @table@
-*/
-class @class_name@
-{
-  /* example private $variable=3Darray("easy_name"=3D>column_name,"email=
"=3D>"column_name_email","val3"=3D>0); */
  =20
-  protected $variable=3Darray(@column_array@);
-  function __construct ( & $p_cn) {
-        $this->cn=3D$p_cn;
-  }
=20
-
-/**
- *@brief load ONE object
- *@return 0 on success -1 the object is not found
- */
-  public function load($cond,$array=3Dnull) {
-
-   $sql=3D"select @column_select@ from @table@ $cond";=20
-    /* please adapt */
-    $res=3D$this->cn->get_array(
-		 $sql,
-		 $array
-		 );
-		=20
-    if ( count($res) =3D=3D 0 ) {
-          /* Initialize an empty object */
-          foreach ($this->variable as $key=3D>$value) $this->$key=3D'';
-
-          return -1;
-          }
-    foreach ($res[0] as $idx=3D>$value) { $this->$idx=3D$value; }
-    return 0;
-  }
-
-
-  /**
-   *@brief retrieve array of object thanks a condition
-   *@param $cond condition (where clause) (optional by default all the r=
ows are fetched)
-   * you can use this parameter for the order or subselect
-   *@param $p_array array for the SQL stmt
-   *@see Database::exec_sql get_object  Database::num_row
-   *@return the return value of exec_sql
-   */
-   public function seek($cond=3D'',$p_array=3Dnull)=20
-   {
-     $sql=3D"select * from @table@  $cond";
-     $aobj=3Darray();
-     $ret=3D $this->cn->exec_sql($sql,$p_array);
-     return $ret;
-   }
-   /**
-    *get_seek return the next object, the return of the query must have =
all the column
-    * of the object
-    *@param $p_ret is the return value of an exec_sql
-    *@param $idx is the index
-    *@see seek Database::num_row
-    *@return object=20
-    */
-   public function get_object($p_ret,$idx)
-    {
-     // map each row in a object
-     $oobj=3Dnew @class_name@ ($this->cn);
-     $array=3DDatabase::fetch_array($p_ret,$idx);
-     foreach ($array as $idx=3D>$value) { $oobj->$idx=3D$value; }
-     $aobj=3Dclone $oobj;
-
-     return $aobj;
-   }
-}
-?>
-
-"""
-
     # read the file
     try :
         file=3Dopen(filein,'r')
         line=3Dfile.readlines()
-        mother_name=3D'';mother_class=3D''
-        if line[0].find(':') > 0 :
-            class_name=3D(line[0].split(':'))[0].strip()
-            mother_name=3D(line[0].split(':'))[1].strip()
-            mother_class=3D"extends "+mother_name
-        else:
-            class_name=3Dline[0].strip()
-            mother_name=3D''
-            mother_class=3D''
+        class_name=3Dline[0].strip()
+                 =20
+           =20
         table=3Dline[1].strip()
         (id,type_id,default)=3Dline[2].strip().split('|')
         id=3Did.strip()
@@ -484,7 +120,7 @@
         column_select=3D''
         column_insert=3D''
         fileoutput=3Dopen("class_"+class_name.lower()+".php",'w+')
-	print "Create the file %s "+fileoutput.name
+	print "Create the file "+fileoutput.name
        =20
         sep=3D''
         i=3D1
@@ -514,12 +150,23 @@
         column_insert_id=3Dcolumn_insert+sep+'$'+str(i)+"\n"
         column_this_id=3Dcolumn_this+sep+'$this->'+id
         column_array=3D''
+        column_type_array=3D''
         sep=3D''
         for e in line [3:]:
             if e.find('|') < 0 :
                 continue
             col_name=3D(e.split('|'))[0].strip()
+            col_type=3D(e.split('|'))[1].strip()
+            if col_type =3D=3D 'integer' or col_type =3D=3D 'numeric' or=
 col_type=3D=3D'bigint':
+		col_type=3D"numeric"
+	    elif col_type=3D=3D'text' or col_type=3D=3D'character varying':
+		col_type=3D"text"
+	    elif col_type=3D=3D'date':
+		col_type=3D'date'
+	    else :
+		col_type=3D'set_me'
             column_array+=3Dsep+'"'+col_name+'"=3D>"'+col_name+'"'+"\n"
+            column_type_array+=3Dsep+'"'+col_name+'"=3D>"'+col_type+'"'+=
"\n"
             sep=3D','
         column_array=3D'"'+id+'"=3D>"'+id+'",'+column_array
         sql_update=3D" update "+table
@@ -553,59 +200,23 @@
                    if col_type in ('date',' timestamp without time zone'=
,'timestamp with time zone'):
                        verify_data_type+=3D" if (isDate($this->"+col_id+=
") =3D=3D null )\n \
             throw new Exception('DATATYPE "+col_id+" $this->"+col_id+" d=
ate invalide');\n"
-        if  child =3D=3D True :
-            sChild=3DsChild.replace('@id@',id)
-            sChild=3DsChild.replace('@table@',table)
-            sChild=3DsChild.replace('@class_name@',class_name)
-            sChild=3DsChild.replace('@column_noid@',column_noid)
-            sChild=3DsChild.replace('@column_array@',column_array)
-            sChild=3DsChild.replace('@sql_update@',sql_update)
-            sChild=3DsChild.replace('@column_comma@',column_comma)
-            sChild=3DsChild.replace('@column_this@',column_this)
-            sChild=3DsChild.replace('@column_this_id@',column_this_id)=09
-            sChild=3DsChild.replace('@verify_data_type@',verify_data_typ=
e)
-            sChild=3DsChild.replace('@column_select@',column_select)
-            sChild=3DsChild.replace('@column_insert@',column_insert)
-            sChild=3DsChild.replace('@mother_name@',mother_name)
-            sChild=3DsChild.replace('@mother_class@',mother_class)      =
     =20
-            sChild=3DsChild.replace('@column_insert_id@',column_insert_i=
d)
-            sChild=3DsChild.replace('@set_tech_user@',set_tech_user)
-            fileoutput.writelines(sChild)
-        elif view =3D=3D True:
-            sView=3DsView.replace('@id@',id)
-            sView=3DsView.replace('@table@',table)
-            sView=3DsView.replace('@class_name@',class_name)
-            sView=3DsView.replace('@column_noid@',column_noid)
-            sView=3DsView.replace('@column_array@',column_array)
-            sView=3DsView.replace('@sql_update@',sql_update)
-            sView=3DsView.replace('@column_comma@',column_comma)
-            sView=3DsView.replace('@column_this@',column_this)
-            sView=3DsView.replace('@column_this_id@',column_this_id)=09
-            sView=3DsView.replace('@verify_data_type@',verify_data_type)
-            sView=3DsView.replace('@column_select@',column_select)
-            sView=3DsView.replace('@column_insert@',column_insert)
-            sView=3DsView.replace('@mother_name@',mother_name)
-            sView=3DsView.replace('@mother_class@',mother_class)        =
   =20
-            sView=3DsView.replace('@column_insert_id@',column_insert_id)
-            sView=3DsView.replace('@set_tech_user@',set_tech_user)
-            fileoutput.writelines(sView)
-        else:
-            sParent=3DsParent.replace('@id@',id)
-            sParent=3DsParent.replace('@table@',table)
-            sParent=3DsParent.replace('@class_name@',class_name)
-            sParent=3DsParent.replace('@column_noid@',column_noid)
-            sParent=3DsParent.replace('@column_array@',column_array)
-            sParent=3DsParent.replace('@sql_update@',sql_update)
-            sParent=3DsParent.replace('@column_comma@',column_comma)
-            sParent=3DsParent.replace('@column_this@',column_this)
-	    sParent=3DsParent.replace('@column_this_id@',column_this_id)=09
-            sParent=3DsParent.replace('@verify_data_type@',verify_data_t=
ype)
-            sParent=3DsParent.replace('@column_select@',column_select)
-            sParent=3DsParent.replace('@column_insert@',column_insert)
-            sParent=3DsParent.replace('@column_insert_id@',column_insert=
_id)
-            sParent=3DsParent.replace('@mother_class@',mother_class)
-            sParent=3DsParent.replace('@set_tech_user@',set_tech_user)
-            fileoutput.writelines(sParent)
+      =20
+	sParent=3DsParent.replace('@id@',id)
+	sParent=3DsParent.replace('@table@',table)
+	sParent=3DsParent.replace('@class_name@',class_name)
+	sParent=3DsParent.replace('@column_noid@',column_noid)
+	sParent=3DsParent.replace('@column_array@',column_array)
+	sParent=3DsParent.replace('@column_type_array@',column_type_array)
+	sParent=3DsParent.replace('@sql_update@',sql_update)
+	sParent=3DsParent.replace('@column_comma@',column_comma)
+	sParent=3DsParent.replace('@column_this@',column_this)
+	sParent=3DsParent.replace('@column_this_id@',column_this_id)=09
+	sParent=3DsParent.replace('@verify_data_type@',verify_data_type)
+	sParent=3DsParent.replace('@column_select@',column_select)
+	sParent=3DsParent.replace('@column_insert@',column_insert)
+	sParent=3DsParent.replace('@column_insert_id@',column_insert_id)
+	sParent=3DsParent.replace('@set_tech_user@',set_tech_user)
+	fileoutput.writelines(sParent)
=20
     except :
         print "error "



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


From MAILER-DAEMON Wed Nov 06 11:03:32 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ve5Zs-00064n-2M
	for mharc-phpcompta-dev@gnu.org; Wed, 06 Nov 2013 11:03:32 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  6 Nov 2013 16:52:43 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.91998.1383753810.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r564 - trunk/rapport_avance/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Nov 2013 16:03:29 -0000

Author: danydb
Date: 2013-11-06 16:52:43 +0100 (Wed, 06 Nov 2013)
New Revision: 564

Modified:
   trunk/rapport_avance/doc/listing-db.dia
Log:
update doc=20

Modified: trunk/rapport_avance/doc/listing-db.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



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


From MAILER-DAEMON Wed Nov 06 11:04:26 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ve5ak-0006OO-UJ
	for mharc-phpcompta-dev@gnu.org; Wed, 06 Nov 2013 11:04:26 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  6 Nov 2013 16:53:40 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.92003.1383753865.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r565 - 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: Wed, 06 Nov 2013 16:04:25 -0000

Author: danydb
Date: 2013-11-06 16:53:40 +0100 (Wed, 06 Nov 2013)
New Revision: 565

Added:
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/include/template/rapav_listing_form_add.php
   trunk/rapport_avance/include/template/rapav_listing_to_list.php
Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/liste.inc.php
   trunk/rapport_avance/index.php
   trunk/rapport_avance/rapav_javascript.js
   trunk/rapport_avance/sql/1-add-listing.sql
Log:
Add listing : not yet the doc. modele

Modified: trunk/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax.php	2013-11-06 15:52:43 UTC (rev 564)
+++ trunk/rapport_avance/ajax.php	2013-11-06 15:53:40 UTC (rev 565)
@@ -3,123 +3,151 @@
 global $cn;
 switch ($act)
 {
-	/*	 * *****************************************************************=
************************************** */
-	// Modifie une definition de formulaire
-	/*	 * *****************************************************************=
************************************** */
+    /*     * ***********************************************************=
******************************************** */
+    // Modifie une definition de formulaire
+    /*     * ***********************************************************=
******************************************** */
=20
-	case 'mod_form':
-		require_once 'include/class_rapav_formulaire.php';
-		if (!isset($_GET['f_id']) && isNum($_GET['f_id']) =3D=3D 0)
-			exit();
-		require_once 'include/formulaire_definition_show.inc.php';
-		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>
-			Nouv.
-		</td>
-		<td>
-			<?php echo  HtmlInput::hidden('p_id[]', -1)?>
-			<?php=20
-			$p_code =3D new IText('p_code[]');
-			$p_code->size =3D "10";
-			echo $p_code->input();
-			?>
-		</td>
-		<td>
-			<?php=20
-			$p_libelle =3D new IText('p_libelle[]');
-			$p_libelle->css_size =3D "100%";
-			echo $p_libelle->input();
-			?>
-		</td>
-		<td>
-			<?php=20
-			$p_type =3D new ISelect('p_type[]');
-			$p_type->value =3D $type_row;
-			echo $p_type->input();
-			?>
-		</td>
-		<td>
-			<?php=20
-			$p_type_periode =3D new ISelect('t_id[]');
-			$p_type_periode->value =3D $type_periode;
-			echo $p_type_periode->input();
-			?>
-		</td>
-		<td>
-			<?php=20
-			$p_order =3D new INum('p_order[]');
-			$p_order->prec =3D 0;
-			$p_order->size =3D 4;
-			echo $p_order->input();
-			?>
-		</td>
-		<?php=20
-		break;
-	/*	 * *****************************************************************=
*********************************************
-	 * Montre le r=C3=A9sultat et permet de changer les param=C3=A8trages d=
'un formulaire
-	 * 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();
-		$form->echo_formulaire();
-		$form->input_parameter();
-		break;
+    case 'mod_form':
+        require_once 'include/class_rapav_formulaire.php';
+        if (!isset($_GET['f_id']) && isNum($_GET['f_id']) =3D=3D 0)
+            exit();
+        require_once 'include/formulaire_definition_show.inc.php';
+        break;
+    /*     * ***********************************************************=
***************************************************
+     * Ajoute une ligne dans la definition
+     * *****************************************************************=
********************************************** */
+    case 'add_row_definition':
+        $type_row =3D $cn->make_array("select p_type,p_description from =
rapport_advanced.type_row order by p_description");
+        $type_periode =3D $cn->make_array("select t_id,t_description fro=
m rapport_advanced.periode_type order by t_description");
+        ?>
+        <td>
+            Nouv.
+        </td>
+        <td>
+            <?php echo HtmlInput::hidden('p_id[]', -1) ?>
+            <?php
+            $p_code =3D new IText('p_code[]');
+            $p_code->size =3D "10";
+            echo $p_code->input();
+            ?>
+        </td>
+        <td>
+            <?php
+            $p_libelle =3D new IText('p_libelle[]');
+            $p_libelle->css_size =3D "100%";
+            echo $p_libelle->input();
+            ?>
+        </td>
+        <td>
+            <?php
+            $p_type =3D new ISelect('p_type[]');
+            $p_type->value =3D $type_row;
+            echo $p_type->input();
+            ?>
+        </td>
+        <td>
+            <?php
+            $p_type_periode =3D new ISelect('t_id[]');
+            $p_type_periode->value =3D $type_periode;
+            echo $p_type_periode->input();
+            ?>
+        </td>
+        <td>
+            <?php
+            $p_order =3D new INum('p_order[]');
+            $p_order->prec =3D 0;
+            $p_order->size =3D 4;
+            echo $p_order->input();
+            ?>
+        </td>
+        <?php
+        break;
+    /*     * ***********************************************************=
***************************************************
+     * Montre le r=C3=A9sultat et permet de changer les param=C3=A8trage=
s d'un formulaire
+     * uniquement pour ceux ayant un champs de calcul (formule, code tva=
+poste 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();
+        $form->echo_formulaire();
+        $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':
-		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));
-		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;
-	///////////////////////////////////////////////////////////////////////=
////////////////////////////////////////////////
-	// Remove a template
-	///////////////////////////////////////////////////////////////////////=
////////////////////////////////////////////////
-	case 'rapav_remove_doc_template':
-		require_once 'include/class_rapav_formulaire.php';
-		$rapav=3Dnew Rapav_Formulaire($_GET['f_id']);
-		$rapav->remove_doc_template();
-		break;
+    /*     * ***********************************************************=
*****************************************************
+     * Montre un =C3=A9cran pour ajouter une ligne de formulaire dans le=
s param=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_det=
ail where 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;
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    // Remove a template
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    case 'rapav_remove_doc_template':
+        require_once 'include/class_rapav_formulaire.php';
+        $rapav =3D new Rapav_Formulaire($_GET['f_id']);
+        $rapav->remove_doc_template();
+        break;
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    // Show a div to enter new listing
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    case 'listing_add':
+        require_once 'include/class_rapav_listing.php';
+        ob_start();
+        echo HtmlInput::title_box("Ajout d'un listing", $cout);
+        echo '<form method=3D"POST" enctype=3D"multipart/form-data" id=3D=
"listing_frm" onsubmit=3D"return check_listing_add(\'listing_frm\')">';
+        echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_=
code'));
+        Rapav_Listing::form_add();
+        echo '<p>';
+        echo HtmlInput::submit("listing_add_sb", "Ajout");
+        echo '</p>';
+        echo '</form>';
+        $response =3D ob_get_clean();
+        ob_end_clean();
+        $html =3D escape_xml($response);
+        header('Content-type: text/xml; charset=3DUTF-8');
+        echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl></ctl>
+<code>$html</code>
+</data>
+EOF;
+        exit();
+
+        break;
 }
 ?>

Added: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	                =
        (rev 0)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-06 15:53=
:40 UTC (rev 565)
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Prop=
erties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of class_rapav_listing
+ *
+ * @author dany
+ */
+require_once 'class_rapport_avance_sql.php';
+class Rapav_Listing
+{
+   =20
+    function __construct($p_id=3D-1)
+    {
+        $this->Data=3Dnew RAPAV_Listing_SQL($p_id);
+    }
+    /**
+     * display a list of the existing list
+     */
+    function to_list()
+    {
+       $res=3D $this->Data->seek(' order by l_name');
+       require 'template/rapav_listing_to_list.php';
+    }
+    /**
+     * Display a button for adding a new listing
+     */
+    static function Button_Add_Listing()
+    {
+        $arg=3Darray(
+            'gDossier'=3D>Dossier::id(),
+            'ac'=3D>$_REQUEST['ac'],
+            'pc'=3D>$_REQUEST['plugin_code'],
+            'id'=3D>0,
+            'cin'=3D>'listing_tb_id',
+            'cout'=3D>'listing_add_div');
+        $json=3D'listing_add('.str_replace('"',"'",json_encode($arg)).')=
';
+        echo HtmlInput::button_action("Ajout", $json);
+    }
+    /**
+     * @brief display a form to save a new list
+     *=20
+     */
+    static function form_add()
+    {
+        global $cn;
+        $name=3Dnew IText('name');
+        $description=3Dnew ITextArea('description');
+        $file=3Dnew IFile('listing_mod');
+        $fichedef=3Dnew ISelect('fiche_def');
+        $fichedef->value=3D$cn->make_array('select fd_id,fd_label from f=
iche_def order by fd_label');
+        require 'template/rapav_listing_form_add.php';
+    }
+    function insert($p_array)
+    {
+        if (strlen(trim($p_array['name']))=3D=3D0) {
+            die ('Le nom ne peut pas =C3=AAtre vide');
+        }
+        $this->Data->setp('name',$p_array['name']);
+        $this->Data->setp('description',$p_array['description']);
+        $this->Data->setp('fiche_def_id',$p_array['fiche_def']);
+        $this->Data->insert();
+    }
+   =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	2013-11-06 =
15:52:43 UTC (rev 564)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-06 =
15:53:40 UTC (rev 565)
@@ -280,4 +280,137 @@
 		parent::__construct($cn, $p_id);
 	}
 }
+class RAPAV_Listing_SQL extends phpcompta_sql
+{
+
+    function __construct($p_id =3D -1)
+    {
+        $this->table =3D "rapport_advanced.listing";
+        $this->primary_key =3D "l_id";
+        $this->name =3D array(
+            "id" =3D> "l_id",
+            "description" =3D> "l_description",
+            "name"=3D>'l_name',
+            "lob" =3D> "l_lob",
+            "mimetype" =3D> "l_mimetype",
+            "size" =3D> "l_size",
+            "fiche_def_id" =3D> "fd_id"
+        );
+        $this->type =3D array(
+            "l_id" =3D> "numeric",
+            "l_name"=3D>'text',
+            "l_description" =3D> "text",
+            "l_lob" =3D> "oid",
+            "l_mimetype" =3D> "text",
+            "l_size" =3D> "numeric",
+            "fd_id" =3D> "numeric"
+        );
+        $this->default =3D array(
+            "l_id" =3D> "auto"
+        );
+        global $cn;
+
+        parent::__construct($cn, $p_id);
+    }
+
+}
+
+class RAPAV_Listing_Param_SQL extends Phpcompta_Sql
+{
+
+    function __construct($p_id =3D -1)
+    {
+
+
+        $this->table =3D "rapport_advanced.listing_param_detail";
+        $this->primary_key =3D "fp_id";
+
+        $this->name =3D array(
+            "lp_id" =3D> "lp_id",
+            "listing_id" =3D> "l_id",
+            "code" =3D> "lp_code",
+            "comment" =3D> "lp_comment",
+            "order" =3D> "l_order"
+        );
+
+        $this->type =3D array(
+            "lp_id" =3D> "numeric",
+            "l_id" =3D> "numeric",
+            "lp_code" =3D> "text",
+            "lp_comment" =3D> "text",
+            "l_order" =3D> "numeric"
+        );
+
+        $this->default =3D array(
+            "lp_id" =3D> "auto"
+        );
+        global $cn;
+
+        parent::__construct($cn, $p_id);
+    }
+
+}
+class RAPAV_Listing_Param_Detail extends Phpcompta_Sql
+{
+
+    function __construct($p_id =3D -1)
+    {
+
+
+        $this->table =3D "rapport_advanced.listing_param_detail";
+        $this->primary_key =3D "fp_id";
+
+        $this->name =3D array(
+            "id" =3D> "fp_id",
+            "p_id" =3D> "p_id", // always null
+            "tmp_val" =3D> "tmp_val",
+            "tva_id" =3D> "tva_id",
+            "formula" =3D> "fp_formula",
+            "signed" =3D> "fp_signed",
+            "jrn_def_type" =3D> "jrn_def_type",
+            "acc_vat_sum" =3D> "tt_id",
+            "formula_type" =3D> "type_detail",
+            "with_tmp_val" =3D> "with_tmp_val",
+            "sum_signed" =3D> "type_sum_account",
+            "operation_pcm_val" =3D> "operation_pcm_val",
+            "jrn_def_id" =3D> "jrn_def_id",
+            "date_paid" =3D> "date_paid",
+            "attribut_card" =3D> "ad_id",
+            "card_saldo" =3D> "lp_card_saldo",
+            "with_card" =3D> "lp_with_card",
+            "listing_param_id" =3D> "lp_id"
+        );
+
+        $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",
+            "with_tmp_val" =3D> "text",
+            "type_sum_account" =3D> "numeric",
+            "operation_pcm_val" =3D> "text",
+            "jrn_def_id" =3D> "numeric",
+            "date_paid" =3D> "numeric",
+            "ad_id" =3D> "numeric",
+            "lp_card_saldo" =3D> "text",
+            "lp_with_card" =3D> "text",
+            "lp_id" =3D> "numeric"
+        );
+
+        $this->default =3D array(
+            "fp_id" =3D> "auto",
+            "p_id"  =3D> "auto"  // always null
+        );
+        global $cn;
+
+        parent::__construct($cn, $p_id);
+    }
+
+}
+
 ?>

Modified: trunk/rapport_avance/include/liste.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/liste.inc.php	2013-11-06 15:52:43 UTC (r=
ev 564)
+++ trunk/rapport_avance/include/liste.inc.php	2013-11-06 15:53:40 UTC (r=
ev 565)
@@ -1,3 +1,27 @@
 <?php
+/**
+ * @file
+ * @brief manage the listing
+ */
+var_dump($_POST);
+require_once 'class_rapav_listing.php';
+global $cn;
+$listing=3Dnew Rapav_Listing();
=20
+/**
+ * save new listing
+ */
+if ( isset ($_POST['listing_add_sb']))
+{
+    $new=3Dnew Rapav_Listing();
+    $new->insert($_POST);
+}
+
+////////////////////////////////////////////////////////////////////////=
///////
+//Listing
+////////////////////////////////////////////////////////////////////////=
///////
+$listing->to_list();
+echo '<p>';
+Rapav_Listing::Button_Add_Listing();
+echo '</p>';
 ?>

Added: trunk/rapport_avance/include/template/rapav_listing_form_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_form_add.php	    =
                    (rev 0)
+++ trunk/rapport_avance/include/template/rapav_listing_form_add.php	2013=
-11-06 15:53:40 UTC (rev 565)
@@ -0,0 +1,39 @@
+<table>
+    <tr>
+        <td>
+            Nom
+        </td>
+        <td>
+            <?php echo $name->input();?>
+        </td>
+       =20
+    </tr>
+    <tr>
+        <td>
+            Description
+        </td>
+        <td>
+            <?php echo $description->input();?>
+        </td>
+       =20
+    </tr>
+    <tr>
+        <td>
+            Cat=C3=A9gorie de fiche
+        </td>
+        <td>
+            <?php echo $fichedef->input();?>
+        </td>
+       =20
+    </tr>
+    <tr>
+        <td>
+            Fichier
+        </td>
+        <td>
+            <?php echo $file->input();?>
+        </td>
+       =20
+    </tr>
+
+</table>
\ No newline at end of file

Added: trunk/rapport_avance/include/template/rapav_listing_to_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_to_list.php	     =
                   (rev 0)
+++ trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-06 15:53:40 UTC (rev 565)
@@ -0,0 +1,35 @@
+
+
+<table class=3D"result" id=3D"listing_tb_id">
+    <tr>
+        <th>
+            Nom
+        </th>
+        <th>
+            Description
+        </th>
+        <th>
+           =20
+        </th>
+    </tr>
+    <?php
+    $max=3DDatabase::num_row($res);
+    for ($i=3D0;$i<$max;$i++):
+        $row=3D  Database::fetch_array($res, $i);
+    ?>
+    <tr>
+        <td>
+            <?php echo h($row['l_name']); ?>
+        </td>
+        <td>
+            <?php echo h($row['l_description']); ?>
+        </td>
+        <td>
+            Action
+        </td>
+    </tr>
+    <?php
+    endfor;
+   =20
+    ?>
+</table>
\ 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	2013-11-06 15:52:43 UTC (rev 564)
+++ trunk/rapport_avance/index.php	2013-11-06 15:53:40 UTC (rev 565)
@@ -55,10 +55,10 @@
=20
 $url =3D '?' . dossier::get() . "&plugin_code=3D" . $_REQUEST['plugin_co=
de'] . "&ac=3D" . $_REQUEST['ac'];
 $array =3D array(
-//	array($url . '&sa=3Dli', _('Liste'), _('Cr=C3=A9ation, modification, =
Param=C3=A8tre de listes, mailing list'), 0),
+	array($url . '&sa=3Dli', _('Liste'), _('Cr=C3=A9ation, modification, Pa=
ram=C3=A8tre de listes, mailing list'), 0),
 	array($url . '&sa=3Dfo', _('Formulaire'), _('Cr=C3=A9ation, modificatio=
n, Param=C3=A8tre'), 1),
- 	array($url . '&sa=3Dde', _('G=C3=A9n=C3=A9ration D=C3=A9claration '), =
_('G=C3=A9n=C3=A9ration D=C3=A9claration '), 2),
-// 	array($url . '&sa=3Dde', _('G=C3=A9n=C3=A9ration D=C3=A9claration / =
listing'), _('G=C3=A9n=C3=A9ration D=C3=A9claration / listing'), 2),
+// 	array($url . '&sa=3Dde', _('G=C3=A9n=C3=A9ration D=C3=A9claration ')=
, _('G=C3=A9n=C3=A9ration D=C3=A9claration '), 2),
+ 	array($url . '&sa=3Dde', _('G=C3=A9n=C3=A9ration D=C3=A9claration / li=
sting'), _('G=C3=A9n=C3=A9ration D=C3=A9claration / listing'), 2),
 	array($url . '&sa=3Dhi', _('Historique'), _('Historique des d=C3=A9clar=
ations faites'), 3)
 );
=20

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-06 15:52:43 UTC (rev=
 564)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-06 15:53:40 UTC (rev=
 565)
@@ -430,3 +430,61 @@
 		alert(e.message);
 	}
 }
+/**
+ * Receive a json object and display a window to add a new listing
+ *    - gDossier is the dossier id
+ *    - ac is the AC CODE
+ *    - pc is the plugin CODE
+ *    - cin the table to be updated after save
+ *    - cout the div to display
+ *   =20
+ */
+function listing_add(json)
+{
+    console.log(json)
+    try {
+        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_add' + "&cin=3D" +=
 json.cin + '&cout=3D' + json.cout;
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        try {
+                            var answer =3D req.responseXML;
+                            var a =3D answer.getElementsByTagName('ctl')=
;
+                            var html =3D answer.getElementsByTagName('co=
de');
+                            if (a.length =3D=3D 0) {
+                                var rec =3D req.responseText;
+                                throw 'cannot find ctl element';
+                            }
+                            remove_waiting_box();
+                            var code_html =3D getNodeText(html[0]);=20
+                            code_html =3D unescape_xml(code_html);
+                            add_div({'id':json.cout,'cssclass':'inner_bo=
x','drag':1})
+                            $(json.cout).innerHTML =3D code_html;
+                        } catch (e) {
+                            console.log(e);
+                            console.log(code_html);
+                        }
+                    }
+                }
+        );
+
+    } catch (e)
+    {
+        alert(e.message);
+
+    }
+}
+function check_listing_add(form_id)
+{
+    var str=3D$(form_id)['name'].value;
+    if ( str.trim()=3D=3D'') {
+        error_message('Le nom est obligatoire');
+        return false;
+    }
+    return true;
+}
\ No newline at end of file

Modified: trunk/rapport_avance/sql/1-add-listing.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/1-add-listing.sql	2013-11-06 15:52:43 UTC (r=
ev 564)
+++ trunk/rapport_avance/sql/1-add-listing.sql	2013-11-06 15:53:40 UTC (r=
ev 565)
@@ -1,11 +1,12 @@
 create table rapport_advanced.listing
 (
     l_id    serial primary key,
+    l_name text check (length(trim(l_name)) > 0 and l_name is not null),
     l_description   text,
     l_lob oid,
     l_mimetype text,
     l_size bigint,
-    fd_id bigint references fiche_def (fd_id) on update cascade on delet=
e null
+    fd_id bigint references fiche_def (fd_id) on update cascade on delet=
e set null
 );
 create table rapport_advanced.listing_param
 (
@@ -24,6 +25,28 @@
     lp_id bigint constraint fk_listing_param_detail_listing_param refere=
nces rapport_advanced.listing_param (lp_id)
 )  inherits (rapport_Advanced.formulaire_param_detail);
=20
---ALTER TABLE ONLY rapport_advanced.listing_param_detail
- --   ADD CONSTRAINT listing_param_detail_p_type_fkey FOREIGN KEY (p_typ=
e) REFERENCES rapport_advanced.type_row(p_type);
-
+ALTER TABLE rapport_advanced.listing_param_detail
+  ADD CONSTRAINT fk_listing_param_detail_type_row_detail FOREIGN KEY (ty=
pe_detail)
+      REFERENCES rapport_advanced.type_row_detail (tr_id) MATCH SIMPLE
+      ON UPDATE SET NULL ON DELETE SET NULL;
+ALTER TABLE rapport_advanced.listing_param_detail
+  ADD CONSTRAINT listing_param_detail_jrn_def_id_fkey FOREIGN KEY (jrn_d=
ef_id)
+      REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED=
;
+ALTER TABLE rapport_advanced.listing_param_detail
+  ADD CONSTRAINT listing_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;
+ALTER TABLE rapport_advanced.listing_param_detail
+  ADD CONSTRAINT listing_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.listing_param_detail
+  ADD CONSTRAINT listing_param_detail_type_sum_account_fkey FOREIGN KEY =
(type_sum_account)
+      REFERENCES rapport_advanced.total_type_account (tt_id) MATCH SIMPL=
E
+      ON UPDATE SET NULL ON DELETE SET NULL;
+CREATE TRIGGER listing_param_detail_trg
+  BEFORE INSERT OR UPDATE OF jrn_def_id
+  ON rapport_advanced.listing_param_detail
+  FOR EACH ROW
+  EXECUTE PROCEDURE rapport_advanced.formulaire_param_detail_jrn_def_id_=
ins_upd();



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


From MAILER-DAEMON Wed Nov 06 15:45:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ve9yO-0003Ib-GC
	for mharc-phpcompta-dev@gnu.org; Wed, 06 Nov 2013 15:45:08 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  6 Nov 2013 21:34:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.92219.1383770706.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r566 - in trunk/rapport_avance: doc 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: Wed, 06 Nov 2013 20:45:06 -0000

Author: danydb
Date: 2013-11-06 21:34:19 +0100 (Wed, 06 Nov 2013)
New Revision: 566

Modified:
   trunk/rapport_avance/doc/listing-db.dia
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/template/rapav_listing_to_list.php
   trunk/rapport_avance/sql/1-add-listing.sql
Log:
Add modele to save
Add column filename
Display in list the card category

Modified: trunk/rapport_avance/doc/listing-db.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	2013-11-06 15:53=
:40 UTC (rev 565)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-06 20:34=
:19 UTC (rev 566)
@@ -12,36 +12,40 @@
  * @author dany
  */
 require_once 'class_rapport_avance_sql.php';
+
 class Rapav_Listing
 {
-   =20
-    function __construct($p_id=3D-1)
+
+    function __construct($p_id =3D -1)
     {
-        $this->Data=3Dnew RAPAV_Listing_SQL($p_id);
+        $this->Data =3D new RAPAV_Listing_SQL($p_id);
     }
+
     /**
      * display a list of the existing list
      */
     function to_list()
     {
-       $res=3D $this->Data->seek(' order by l_name');
-       require 'template/rapav_listing_to_list.php';
+        $res =3D $this->Data->seek('join fiche_def using (fd_id) order b=
y l_name');
+        require 'template/rapav_listing_to_list.php';
     }
+
     /**
      * Display a button for adding a new listing
      */
     static function Button_Add_Listing()
     {
-        $arg=3Darray(
-            'gDossier'=3D>Dossier::id(),
-            'ac'=3D>$_REQUEST['ac'],
-            'pc'=3D>$_REQUEST['plugin_code'],
-            'id'=3D>0,
-            'cin'=3D>'listing_tb_id',
-            'cout'=3D>'listing_add_div');
-        $json=3D'listing_add('.str_replace('"',"'",json_encode($arg)).')=
';
+        $arg =3D array(
+            'gDossier' =3D> Dossier::id(),
+            'ac' =3D> $_REQUEST['ac'],
+            'pc' =3D> $_REQUEST['plugin_code'],
+            'id' =3D> 0,
+            'cin' =3D> 'listing_tb_id',
+            'cout' =3D> 'listing_add_div');
+        $json =3D 'listing_add(' . str_replace('"', "'", json_encode($ar=
g)) . ')';
         echo HtmlInput::button_action("Ajout", $json);
     }
+
     /**
      * @brief display a form to save a new list
      *=20
@@ -49,22 +53,86 @@
     static function form_add()
     {
         global $cn;
-        $name=3Dnew IText('name');
-        $description=3Dnew ITextArea('description');
-        $file=3Dnew IFile('listing_mod');
-        $fichedef=3Dnew ISelect('fiche_def');
-        $fichedef->value=3D$cn->make_array('select fd_id,fd_label from f=
iche_def order by fd_label');
+        $name =3D new IText('name');
+        $description =3D new ITextArea('description');
+        $file =3D new IFile('listing_mod');
+        $fichedef =3D new ISelect('fiche_def');
+        $fichedef->value =3D $cn->make_array('select fd_id,fd_label from=
 fiche_def order by fd_label');
         require 'template/rapav_listing_form_add.php';
     }
+
+    /**
+     * Insert a new list into rapport_advanced.listing
+     * @global type $cn
+     * @param type $p_array
+     * @throws Exception
+     */
     function insert($p_array)
     {
-        if (strlen(trim($p_array['name']))=3D=3D0) {
-            die ('Le nom ne peut pas =C3=AAtre vide');
+        global $cn;
+        try
+        {
+            $cn->start();
+            if (strlen(trim($p_array['name'])) =3D=3D 0)
+            {
+                throw new Exception('Le nom ne peut pas =C3=AAtre vide')=
;
+            }
+
+            $this->Data->setp('name', $p_array['name']);
+            $this->Data->setp('description', $p_array['description']);
+            $this->Data->setp('fiche_def_id', $p_array['fiche_def']);
+            $this->Data->insert();
+            $this->load_file();
+            $cn->commit();
+        } catch (Exception $ex)
+        {
+            $cn->rollback();
         }
-        $this->Data->setp('name',$p_array['name']);
-        $this->Data->setp('description',$p_array['description']);
-        $this->Data->setp('fiche_def_id',$p_array['fiche_def']);
-        $this->Data->insert();
     }
-   =20
+
+    /**
+     * @brief=20
+     * @global type $cn
+     * @return int
+     */
+    function load_file()
+    {
+        global $cn;
+        // nothing to save
+        if (sizeof($_FILES) =3D=3D 0)
+            return;
+        try
+        {
+            $name =3D $_FILES['listing_mod']['name'];
+            $new_name =3D tempnam($_ENV['TMP'], 'fiche_def');
+            // check if a file is submitted
+            if (strlen($_FILES['listing_mod']['tmp_name']) !=3D 0)
+            {
+                // upload the file and move it to temp directory
+                if (move_uploaded_file($_FILES['listing_mod']['tmp_name'=
], $new_name))
+                {
+                    $oid =3D $cn->lo_import($new_name);
+                    // check if the lob is in the database
+                    if ($oid =3D=3D false)
+                    {
+                        $cn->rollback();
+                        return 1;
+                    }
+                }
+                // the upload in the database is successfull
+                $this->Data->l_lob =3D $oid;
+                $this->Data->l_filename =3D $_FILES['listing_mod']['name=
'];
+                $this->Data->l_mimetype =3D $_FILES['listing_mod']['type=
'];
+                $this->Data->l_size =3D $_FILES['listing_mod']['size'];
+
+                // update rapav
+                $this->Data->update();
+            }
+        } catch (Exception $ex)
+        {
+            $cn->rollback();
+            throw $ex;
+        }
+    }
+
 }

Modified: trunk/rapport_avance/include/class_rapport_avance_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-06 =
15:53:40 UTC (rev 565)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-06 =
20:34:19 UTC (rev 566)
@@ -292,6 +292,7 @@
             "description" =3D> "l_description",
             "name"=3D>'l_name',
             "lob" =3D> "l_lob",
+            "filename" =3D> "l_filename",
             "mimetype" =3D> "l_mimetype",
             "size" =3D> "l_size",
             "fiche_def_id" =3D> "fd_id"
@@ -301,6 +302,7 @@
             "l_name"=3D>'text',
             "l_description" =3D> "text",
             "l_lob" =3D> "oid",
+            "l_filename" =3D> "text",=20
             "l_mimetype" =3D> "text",
             "l_size" =3D> "numeric",
             "fd_id" =3D> "numeric"

Modified: trunk/rapport_avance/include/template/rapav_listing_to_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-06 15:53:40 UTC (rev 565)
+++ trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-06 20:34:19 UTC (rev 566)
@@ -9,7 +9,7 @@
             Description
         </th>
         <th>
-           =20
+            Cat=C3=A9gorie de fiche
         </th>
     </tr>
     <?php
@@ -25,6 +25,9 @@
             <?php echo h($row['l_description']); ?>
         </td>
         <td>
+            <?php echo h($row['fd_label']); ?>
+        </td>
+        <td>
             Action
         </td>
     </tr>

Modified: trunk/rapport_avance/sql/1-add-listing.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/1-add-listing.sql	2013-11-06 15:53:40 UTC (r=
ev 565)
+++ trunk/rapport_avance/sql/1-add-listing.sql	2013-11-06 20:34:19 UTC (r=
ev 566)
@@ -4,8 +4,9 @@
     l_name text check (length(trim(l_name)) > 0 and l_name is not null),
     l_description   text,
     l_lob oid,
+    l_filename text,
     l_mimetype text,
-    l_size bigint,
+    l_size bigint default 0,
     fd_id bigint references fiche_def (fd_id) on update cascade on delet=
e set null
 );
 create table rapport_advanced.listing_param



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


From MAILER-DAEMON Wed Nov 06 16:02:03 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VeAEl-00081a-PR
	for mharc-phpcompta-dev@gnu.org; Wed, 06 Nov 2013 16:02:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  6 Nov 2013 21:51:16 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.92232.1383771722.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r567 - trunk/rapport_avance/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Nov 2013 21:02:01 -0000

Author: danydb
Date: 2013-11-06 21:51:16 +0100 (Wed, 06 Nov 2013)
New Revision: 567

Modified:
   trunk/rapport_avance/include/template/rapav_listing_to_list.php
Log:
typo

Modified: trunk/rapport_avance/include/template/rapav_listing_to_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-06 20:34:19 UTC (rev 566)
+++ trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-06 20:51:16 UTC (rev 567)
@@ -9,7 +9,7 @@
             Description
         </th>
         <th>
-            Cat=C3=A9gorie de fiche
+            Cat=C3=A9gorie de fiches
         </th>
     </tr>
     <?php



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


From MAILER-DAEMON Wed Nov 06 16:05:28 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VeAI4-0000ta-5q
	for mharc-phpcompta-dev@gnu.org; Wed, 06 Nov 2013 16:05:28 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  6 Nov 2013 21:54:43 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.92235.1383771927.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r568 - trunk/rapport_avance
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Nov 2013 21:05:26 -0000

Author: danydb
Date: 2013-11-06 21:54:43 +0100 (Wed, 06 Nov 2013)
New Revision: 568

Modified:
   trunk/rapport_avance/rapav_javascript.js
Log:
fixed position for the window add listing

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-06 20:51:16 UTC (rev=
 567)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-06 20:54:43 UTC (rev=
 568)
@@ -463,7 +463,8 @@
                             remove_waiting_box();
                             var code_html =3D getNodeText(html[0]);=20
                             code_html =3D unescape_xml(code_html);
-                            add_div({'id':json.cout,'cssclass':'inner_bo=
x','drag':1})
+                            var position=3Dfixed_position(451,217);
+                            add_div({'id':json.cout,'cssclass':'inner_bo=
x','drag':1,'style':position});
                             $(json.cout).innerHTML =3D code_html;
                         } catch (e) {
                             console.log(e);



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


From MAILER-DAEMON Wed Nov 06 16:15:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VeARX-00040D-SI
	for mharc-phpcompta-dev@gnu.org; Wed, 06 Nov 2013 16:15:15 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  6 Nov 2013 22:04:30 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.92240.1383772515.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r569 - trunk/rapport_avance
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Nov 2013 21:15:14 -0000

Author: danydb
Date: 2013-11-06 22:04:30 +0100 (Wed, 06 Nov 2013)
New Revision: 569

Modified:
   trunk/rapport_avance/rapav_javascript.js
Log:
check that name is not empty

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-06 20:54:43 UTC (rev=
 568)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-06 21:04:30 UTC (rev=
 569)
@@ -480,6 +480,11 @@
=20
     }
 }
+/**
+ * Check that the name is not empty before saving a new listing
+ * @param {type} form_id
+ * @returns {Boolean}
+ */
 function check_listing_add(form_id)
 {
     var str=3D$(form_id)['name'].value;



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


From MAILER-DAEMON Thu Nov 07 08:12:27 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VePNr-0004k2-SS
	for mharc-phpcompta-dev@gnu.org; Thu, 07 Nov 2013 08:12:27 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  7 Nov 2013 14:01:40 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.93303.1383829946.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r570 - 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: Thu, 07 Nov 2013 13:12:25 -0000

Author: danydb
Date: 2013-11-07 14:01:40 +0100 (Thu, 07 Nov 2013)
New Revision: 570

Modified:
   trunk/rapport_avance/sql/1-add-listing.sql
Log:
add transaction

Modified: trunk/rapport_avance/sql/1-add-listing.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/1-add-listing.sql	2013-11-06 21:04:30 UTC (r=
ev 569)
+++ trunk/rapport_avance/sql/1-add-listing.sql	2013-11-07 13:01:40 UTC (r=
ev 570)
@@ -1,3 +1,4 @@
+begin;
 create table rapport_advanced.listing
 (
     l_id    serial primary key,
@@ -51,3 +52,4 @@
   ON rapport_advanced.listing_param_detail
   FOR EACH ROW
   EXECUTE PROCEDURE rapport_advanced.formulaire_param_detail_jrn_def_id_=
ins_upd();
+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 Thu Nov 07 09:15:19 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VeQMh-0000dx-Fy
	for mharc-phpcompta-dev@gnu.org; Thu, 07 Nov 2013 09:15:19 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  7 Nov 2013 15:04:33 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.93353.1383833718.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r571 - in trunk/rapport_avance: . include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2013 14:15:18 -0000

Author: danydb
Date: 2013-11-07 15:04:33 +0100 (Thu, 07 Nov 2013)
New Revision: 571

Added:
   trunk/rapport_avance/ajax_listing_modify.php
   trunk/rapport_avance/ajax_listing_remove_modele.php
Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/include/liste.inc.php
   trunk/rapport_avance/include/template/rapav_listing_form_add.php
   trunk/rapport_avance/include/template/rapav_listing_to_list.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Modify listing=20

Modified: trunk/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax.php	2013-11-07 13:01:40 UTC (rev 570)
+++ trunk/rapport_avance/ajax.php	2013-11-07 14:04:33 UTC (rev 571)
@@ -124,29 +124,15 @@
     ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
     // Show a div to enter new listing
     ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    case 'listing_add':
-        require_once 'include/class_rapav_listing.php';
-        ob_start();
-        echo HtmlInput::title_box("Ajout d'un listing", $cout);
-        echo '<form method=3D"POST" enctype=3D"multipart/form-data" id=3D=
"listing_frm" onsubmit=3D"return check_listing_add(\'listing_frm\')">';
-        echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_=
code'));
-        Rapav_Listing::form_add();
-        echo '<p>';
-        echo HtmlInput::submit("listing_add_sb", "Ajout");
-        echo '</p>';
-        echo '</form>';
-        $response =3D ob_get_clean();
-        ob_end_clean();
-        $html =3D escape_xml($response);
-        header('Content-type: text/xml; charset=3DUTF-8');
-        echo <<<EOF
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<data>
-<ctl></ctl>
-<code>$html</code>
-</data>
-EOF;
+    case 'listing_modify':
+       include 'ajax_listing_modify.php';
         exit();
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    // Remove a document modele
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    case 'listing_remove_modele':
+       include 'ajax_listing_remove_modele.php';
+        exit();
=20
         break;
 }

Added: trunk/rapport_avance/ajax_listing_modify.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_listing_modify.php	                        =
(rev 0)
+++ trunk/rapport_avance/ajax_listing_modify.php	2013-11-07 14:04:33 UTC =
(rev 571)
@@ -0,0 +1,30 @@
+<?php
+
+require_once 'include/class_rapav_listing.php';
+$obj=3Dnew Rapav_Listing($id);
+ob_start();
+if ( $id =3D=3D -1 )
+    echo HtmlInput::title_box("Ajout d'un listing", $cout);
+else
+    echo HtmlInput::title_box("Modification d'un listing", $cout);
+
+echo '<form method=3D"POST" enctype=3D"multipart/form-data" id=3D"listin=
g_frm" onsubmit=3D"return check_listing_add(\'listing_frm\')">';
+echo HtmlInput::hidden('l_id',$id);
+echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugin_code')=
);
+$obj->form_modify();
+echo '<p>';
+echo HtmlInput::submit("listing_add_sb", "Ajout");
+echo '</p>';
+echo '</form>';
+$response =3D ob_get_clean();
+ob_end_clean();
+$html =3D escape_xml($response);
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl></ctl>
+<code>$html</code>
+</data>
+EOF;
+?>       =20
\ No newline at end of file

Added: trunk/rapport_avance/ajax_listing_remove_modele.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_listing_remove_modele.php	                 =
       (rev 0)
+++ trunk/rapport_avance/ajax_listing_remove_modele.php	2013-11-07 14:04:=
33 UTC (rev 571)
@@ -0,0 +1,20 @@
+<?php
+require_once 'include/class_rapav_listing.php';
+$obj=3Dnew Rapav_Listing($id);
+$obj->remove_modele();
+
+ob_start();
+$file=3Dnew IFile('listing_mod');
+echo $file->input();
+$response =3D ob_get_clean();
+ob_end_clean();
+$html =3D escape_xml($response);
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl>$cout</ctl>
+<code>$html</code>
+</data>
+EOF;
+?>
\ No newline at end of file

Modified: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	2013-11-07 13:01=
:40 UTC (rev 570)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-07 14:04=
:33 UTC (rev 571)
@@ -13,19 +13,16 @@
  */
 require_once 'class_rapport_avance_sql.php';
=20
-class Rapav_Listing
-{
+class Rapav_Listing {
=20
-    function __construct($p_id =3D -1)
-    {
+    function __construct($p_id =3D -1) {
         $this->Data =3D new RAPAV_Listing_SQL($p_id);
     }
=20
     /**
      * display a list of the existing list
      */
-    function to_list()
-    {
+    function to_list() {
         $res =3D $this->Data->seek('join fiche_def using (fd_id) order b=
y l_name');
         require 'template/rapav_listing_to_list.php';
     }
@@ -33,16 +30,15 @@
     /**
      * Display a button for adding a new listing
      */
-    static function Button_Add_Listing()
-    {
+    static function Button_Add_Listing() {
         $arg =3D array(
             'gDossier' =3D> Dossier::id(),
             'ac' =3D> $_REQUEST['ac'],
             'pc' =3D> $_REQUEST['plugin_code'],
-            'id' =3D> 0,
+            'id' =3D> -1,
             'cin' =3D> 'listing_tb_id',
             'cout' =3D> 'listing_add_div');
-        $json =3D 'listing_add(' . str_replace('"', "'", json_encode($ar=
g)) . ')';
+        $json =3D 'listing_modify(' . str_replace('"', "'", json_encode(=
$arg)) . ')';
         echo HtmlInput::button_action("Ajout", $json);
     }
=20
@@ -50,42 +46,63 @@
      * @brief display a form to save a new list
      *=20
      */
-    static function form_add()
-    {
+    function form_modify() {
         global $cn;
         $name =3D new IText('name');
         $description =3D new ITextArea('description');
         $file =3D new IFile('listing_mod');
         $fichedef =3D new ISelect('fiche_def');
         $fichedef->value =3D $cn->make_array('select fd_id,fd_label from=
 fiche_def order by fd_label');
+        $str_remove =3D "";
+        /*
+         * if $this->l_id <> -1 then modification otherwise add
+         */
+        if ($this->Data->l_id <> -1) {
+            $name->value =3D $this->Data->l_name;
+            $description->value =3D $this->Data->l_description;
+            $fichedef->selected =3D $this->Data->fd_id;
+            $ck =3D new ICheckBox('remove');
+            $str_remove =3D " Cochez pour effacer " . $ck->input();
+            // If there is a file
+            if ($this->Data->l_filename !=3D "") {
+                $file =3D new ISpan('listing_mod_id');
+                // Add js for removing=20
+                $arg =3D array(
+                    'gDossier' =3D> Dossier::id(),
+                    'ac' =3D> $_REQUEST['ac'],
+                    'pc' =3D> $_REQUEST['plugin_code'],
+                    'id' =3D> $this->Data->l_id,
+                    'cin' =3D> '',
+                    'cout' =3D> 'listing_mod_id');
+                $json =3D 'listing_remove_modele(' . str_replace('"', "'=
", json_encode($arg)) . ')';
+                $file->value =3D $this->Data->l_filename . HtmlInput::an=
chor(' <span style=3D"background-color:red">X </span>', "", ' onclick=3D"=
' . $json . '"');
+            }
+        }
         require 'template/rapav_listing_form_add.php';
     }
=20
     /**
-     * Insert a new list into rapport_advanced.listing
+     * Insert or update a listing into rapport_advanced.listing, load al=
so the
+     * file
      * @global type $cn
      * @param type $p_array
      * @throws Exception
      */
-    function insert($p_array)
-    {
+    function save($p_array) {
         global $cn;
-        try
-        {
+        try {
             $cn->start();
-            if (strlen(trim($p_array['name'])) =3D=3D 0)
-            {
+            if (strlen(trim($p_array['name'])) =3D=3D 0) {
                 throw new Exception('Le nom ne peut pas =C3=AAtre vide')=
;
             }
=20
             $this->Data->setp('name', $p_array['name']);
             $this->Data->setp('description', $p_array['description']);
             $this->Data->setp('fiche_def_id', $p_array['fiche_def']);
-            $this->Data->insert();
+            $this->Data->save();
             $this->load_file();
             $cn->commit();
-        } catch (Exception $ex)
-        {
+        } catch (Exception $ex) {
             $cn->rollback();
         }
     }
@@ -95,26 +112,21 @@
      * @global type $cn
      * @return int
      */
-    function load_file()
-    {
+    function load_file() {
         global $cn;
         // nothing to save
         if (sizeof($_FILES) =3D=3D 0)
             return;
-        try
-        {
+        try {
             $name =3D $_FILES['listing_mod']['name'];
             $new_name =3D tempnam($_ENV['TMP'], 'fiche_def');
             // check if a file is submitted
-            if (strlen($_FILES['listing_mod']['tmp_name']) !=3D 0)
-            {
+            if (strlen($_FILES['listing_mod']['tmp_name']) !=3D 0) {
                 // upload the file and move it to temp directory
-                if (move_uploaded_file($_FILES['listing_mod']['tmp_name'=
], $new_name))
-                {
+                if (move_uploaded_file($_FILES['listing_mod']['tmp_name'=
], $new_name)) {
                     $oid =3D $cn->lo_import($new_name);
                     // check if the lob is in the database
-                    if ($oid =3D=3D false)
-                    {
+                    if ($oid =3D=3D false) {
                         $cn->rollback();
                         return 1;
                     }
@@ -128,11 +140,29 @@
                 // update rapav
                 $this->Data->update();
             }
-        } catch (Exception $ex)
-        {
+        } catch (Exception $ex) {
             $cn->rollback();
             throw $ex;
         }
     }
=20
+    function remove_modele() {
+        global $cn;
+        if ($this->Data->l_lob =3D=3D null)
+            return;
+        $cn->start();
+        $this->Data->cn->lo_unlink($this->Data->l_lob);
+        $this->Data->l_filename =3D null;
+        $this->Data->l_lob =3D null;
+        $this->Data->l_size =3D null;
+        $this->Data->l_mimetype =3D null;
+        $this->Data->update();
+        $cn->commit();
+    }
+    function delete()
+    {
+        $this->remove_modele();
+        $this->Data->delete();
+    }
+
 }

Modified: trunk/rapport_avance/include/liste.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/liste.inc.php	2013-11-07 13:01:40 UTC (r=
ev 570)
+++ trunk/rapport_avance/include/liste.inc.php	2013-11-07 14:04:33 UTC (r=
ev 571)
@@ -13,8 +13,11 @@
  */
 if ( isset ($_POST['listing_add_sb']))
 {
-    $new=3Dnew Rapav_Listing();
-    $new->insert($_POST);
+    $new=3Dnew Rapav_Listing($_POST['l_id']);
+    if ( ! isset ($_POST['remove']))
+        $new->save($_POST);
+    else
+        $new->delete($_POST);
 }
=20
 ////////////////////////////////////////////////////////////////////////=
///////

Modified: trunk/rapport_avance/include/template/rapav_listing_form_add.ph=
p
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_form_add.php	2013=
-11-07 13:01:40 UTC (rev 570)
+++ trunk/rapport_avance/include/template/rapav_listing_form_add.php	2013=
-11-07 14:04:33 UTC (rev 571)
@@ -36,4 +36,7 @@
        =20
     </tr>
=20
-</table>
\ No newline at end of file
+</table>
+<?php
+echo $str_remove;
+?>
\ No newline at end of file

Modified: trunk/rapport_avance/include/template/rapav_listing_to_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-07 13:01:40 UTC (rev 570)
+++ trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-07 14:04:33 UTC (rev 571)
@@ -16,10 +16,18 @@
     $max=3DDatabase::num_row($res);
     for ($i=3D0;$i<$max;$i++):
         $row=3D  Database::fetch_array($res, $i);
+        $arg =3D array(
+            'gDossier' =3D> Dossier::id(),
+            'ac' =3D> $_REQUEST['ac'],
+            'pc' =3D> $_REQUEST['plugin_code'],
+            'id' =3D> $row['l_id'],
+            'cin' =3D> 'listing_tb_id',
+            'cout' =3D> 'listing_mod_div');
+        $json =3D 'listing_modify(' . str_replace('"', "'", json_encode(=
$arg)) . ')';
     ?>
     <tr>
         <td>
-            <?php echo h($row['l_name']); ?>
+            <?php echo HtmlInput::anchor(h($row['l_name']),'',' onclick=3D=
"'.$json.'"'); ?>
         </td>
         <td>
             <?php echo h($row['l_description']); ?>

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-07 13:01:40 UTC (rev=
 570)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-07 14:04:33 UTC (rev=
 571)
@@ -439,11 +439,11 @@
  *    - cout the div to display
  *   =20
  */
-function listing_add(json)
+function listing_modify(json)
 {
     console.log(json)
     try {
-        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_add' + "&cin=3D" +=
 json.cin + '&cout=3D' + json.cout;
+        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_modify' + "&cin=3D=
" + json.cin + '&cout=3D' + json.cout+'&id=3D'+json.id;
         waiting_box();
         var action =3D new Ajax.Request(
                 "ajax.php",
@@ -493,4 +493,45 @@
         return false;
     }
     return true;
+}
+
+function listing_remove_modele(json)
+{
+    console.log(json)
+    try {
+        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_remove_modele' + "=
&cin=3D" + json.cin + '&cout=3D' + json.cout+'&id=3D'+json.id;
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        try {
+                            var answer =3D req.responseXML;
+                            var a =3D answer.getElementsByTagName('ctl')=
;
+                            var html =3D answer.getElementsByTagName('co=
de');
+                            if (a.length =3D=3D 0) {
+                                var rec =3D req.responseText;
+                                throw 'cannot find ctl element';
+                            }
+                            remove_waiting_box();
+                            var code_html =3D getNodeText(html[0]);=20
+                            code_html =3D unescape_xml(code_html);
+                             console.log(code_html);
+                           $(json.cout).innerHTML =3D code_html;
+                        } catch (e) {
+                            console.log(e);
+                            console.log(code_html);
+                        }
+                    }
+                }
+        );
+
+    } 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 Thu Nov 07 10:45:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VeRlY-00087e-PQ
	for mharc-phpcompta-dev@gnu.org; Thu, 07 Nov 2013 10:45:04 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  7 Nov 2013 16:34:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.93423.1383839104.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r572 - trunk/rapport_avance
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2013 15:45:03 -0000

Author: danydb
Date: 2013-11-07 16:34:17 +0100 (Thu, 07 Nov 2013)
New Revision: 572

Modified:
   trunk/rapport_avance/ajax_listing_modify.php
Log:
Change Ajout -> Valider

Modified: trunk/rapport_avance/ajax_listing_modify.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_listing_modify.php	2013-11-07 14:04:33 UTC =
(rev 571)
+++ trunk/rapport_avance/ajax_listing_modify.php	2013-11-07 15:34:17 UTC =
(rev 572)
@@ -13,7 +13,7 @@
 echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugin_code')=
);
 $obj->form_modify();
 echo '<p>';
-echo HtmlInput::submit("listing_add_sb", "Ajout");
+echo HtmlInput::submit("listing_add_sb", "Valider");
 echo '</p>';
 echo '</form>';
 $response =3D ob_get_clean();



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


From MAILER-DAEMON Thu Nov 07 10:51:22 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VeRre-0002QP-Py
	for mharc-phpcompta-dev@gnu.org; Thu, 07 Nov 2013 10:51:22 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  7 Nov 2013 16:40:34 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.93438.1383839482.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r573 - 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: Thu, 07 Nov 2013 15:51:21 -0000

Author: danydb
Date: 2013-11-07 16:40:33 +0100 (Thu, 07 Nov 2013)
New Revision: 573

Modified:
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/rapav_javascript.js
Log:

Add exception
Documentation

Modified: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	2013-11-07 15:34=
:17 UTC (rev 572)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-07 15:40=
:33 UTC (rev 573)
@@ -145,24 +145,44 @@
             throw $ex;
         }
     }
-
+/**
+ * @brief remove a document template
+ * @global type $cn database connection
+ * @return type
+ */
     function remove_modele() {
         global $cn;
         if ($this->Data->l_lob =3D=3D null)
             return;
-        $cn->start();
-        $this->Data->cn->lo_unlink($this->Data->l_lob);
-        $this->Data->l_filename =3D null;
-        $this->Data->l_lob =3D null;
-        $this->Data->l_size =3D null;
-        $this->Data->l_mimetype =3D null;
-        $this->Data->update();
-        $cn->commit();
+        try {
+            $cn->start();
+            $this->Data->cn->lo_unlink($this->Data->l_lob);
+            $this->Data->l_filename =3D null;
+            $this->Data->l_lob =3D null;
+            $this->Data->l_size =3D null;
+            $this->Data->l_mimetype =3D null;
+            $this->Data->update();
+            $cn->commit();
+        } catch (Exception $e) {
+            $cn->rollback;
+            throw $ex;
+
+        }
     }
+    /**
+     * @brief delete a listing + lobs
+     * @throws type
+     */
     function delete()
     {
-        $this->remove_modele();
-        $this->Data->delete();
+        try {
+            $this->remove_modele();
+            $this->Data->delete();=20
+        } catch (Exception $e) {
+            $cn->rollback;
+            throw $ex;
+
+        }
     }
=20
 }

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-07 15:34:17 UTC (rev=
 572)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-07 15:40:33 UTC (rev=
 573)
@@ -481,7 +481,7 @@
     }
 }
 /**
- * Check that the name is not empty before saving a new listing
+ * @brief Check that the name is not empty before saving a new listing
  * @param {type} form_id
  * @returns {Boolean}
  */
@@ -494,7 +494,15 @@
     }
     return true;
 }
-
+/**
+ * @brief Remove a document from listing
+ * @param {type} json
+ *    - gDossier is the dossier id
+ *    - ac is the AC CODE
+ *    - pc is the plugin CODE
+ *    - cin not used
+ *    - cout span id where is the name of file=20
+ */
 function listing_remove_modele(json)
 {
     console.log(json)



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


From MAILER-DAEMON Thu Nov 07 14:32:26 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VeVJa-0006p1-Dj
	for mharc-phpcompta-dev@gnu.org; Thu, 07 Nov 2013 14:32:26 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  7 Nov 2013 20:21:38 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.93590.1383852745.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5538 - phpcompta/trunk/dev/manage-code/create-file
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, 07 Nov 2013 19:32:25 -0000

Author: danydb
Date: 2013-11-07 20:21:38 +0100 (Thu, 07 Nov 2013)
New Revision: 5538

Modified:
   phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py
Log:
improve script creation SQL class

Modified: phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py	2013-1=
1-05 21:28:39 UTC (rev 5537)
+++ phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py	2013-1=
1-07 19:21:38 UTC (rev 5538)
@@ -2,14 +2,12 @@
=20
=20
 # Command we have to replace
-# @table@ by the table name
-# @id@ by the primary key
-# @column_noid@ by the list of column (respect order for insert)
-# @class_name@ Name of the class (uppercase)
-# @column_array@ fill the $variable
-# @sql_update@ the sql update
+#    @table@ by the table name
+#    @id@ by the primary key
+#    @class_name@ Name of the class (uppercase)
+#    @column_array@ fill the $this->name
+#    @column_type_array@ fill the $this->type
 # read the file with the name
-# @column_comma the column for insert and update
 # first line =3D table name
 # second line =3D pk
=20
@@ -19,8 +17,6 @@
     print """
     option are -h for help
                -f input file containing the structure
-               -c create the code for a child class
-               -v create the code for a view (so only load and seek)
                -n the PK is not serial
     The input file contains :
     first  line class name : mother class separator : (optionnal)
@@ -31,22 +27,18 @@
     """
 def main():
     try:
-        opts,args=3Dgetopt.getopt(sys.argv[1:],'cf:hv',['child','file','=
help','view','pk-not-serial'])
+        opts,args=3Dgetopt.getopt(sys.argv[1:],'f:h',['file','help','pk-=
not-serial'])
     except getopt.GetOptError, err:
         print str(err)
         help()
         sys.exit(-1)
-    filein=3D'';child=3DFalse;view=3DFalse
+    filein=3D''
     for option,value in opts:
         if option in ('-f','--file'):
             filein=3Dvalue
         elif option in ('-h','--help'):
             help()
             sys.exit(-1)
-        elif option in ('-c','--child'):
-            child=3DTrue
-        elif option in ('-v','--view'):
-            view=3DTrue
         elif option in ('-n','--pk-not-serial'):
 	    nopk=3DTrue
     if filein=3D=3D'' :
@@ -94,9 +86,12 @@
=20
 		parent::__construct($cn, $p_id);
 	}
+  /**
+   *@brief Add here your own code: verify is always call BEFORE insert o=
r update
+   */
   public function verify() {
     parent::verify();
-   =20
+    @set_tech_user@
   }
  =20
 }
@@ -115,10 +110,6 @@
         table=3Dline[1].strip()
         (id,type_id,default)=3Dline[2].strip().split('|')
         id=3Did.strip()
-        column_noid=3D''
-        column_this=3D''
-        column_select=3D''
-        column_insert=3D''
         fileoutput=3Dopen("class_"+class_name.lower()+".php",'w+')
 	print "Create the file "+fileoutput.name
        =20
@@ -134,21 +125,11 @@
 		print "*"*80
 		print ('Warning : tech_date est un champs technique a utiliser avec un=
 trigger')
 		print "*"*80
-            column_this=3Dcolumn_this+sep+'$this->'+col_name+"\n"
-            column_noid=3Dcolumn_noid+sep+col_name+"\n"
=20
 	    if col_name =3D=3D 'tech_user' :
 		set_tech_user=3D" $this->tech_user=3D$_SESSION['g_user']; "
-            if col_type =3D=3D 'date':
-                column_select=3Dcolumn_select+sep+"to_char("+col_name+",=
'DD.MM.YYYY') as "+col_name+"\n"
-		column_insert=3Dcolumn_insert+sep+"to_date($"+str(i)+",'DD.MM.YYYY') \=
n "
-            else:
-                column_select=3Dcolumn_select+sep+col_name+"\n"
-                column_insert=3Dcolumn_insert+sep+'$'+str(i)+"\n"
             i+=3D1               =20
             sep=3D','
-        column_insert_id=3Dcolumn_insert+sep+'$'+str(i)+"\n"
-        column_this_id=3Dcolumn_this+sep+'$this->'+id
         column_array=3D''
         column_type_array=3D''
         sep=3D''
@@ -169,21 +150,8 @@
             column_type_array+=3Dsep+'"'+col_name+'"=3D>"'+col_type+'"'+=
"\n"
             sep=3D','
         column_array=3D'"'+id+'"=3D>"'+id+'",'+column_array
-        sql_update=3D" update "+table
         i=3D1;sep=3D'';set=3D' set '
         column_comma=3D''
-        for e in line[3:]:
-            if e.find('|') < 0 :
-                continue
-            if  (e.split('|'))[1].strip() =3D=3D 'date':
-                  sql_update+=3Dsep+set+(e.split('|'))[0].strip()+" =3Dt=
o_date($"+str(i)+",'DD.MM.YYYY')"+"\n"
-            else:
-                  sql_update+=3Dsep+set+(e.split('|'))[0].strip()+" =3D =
$"+str(i)+"\n"
-            set=3D''
-            column_comma+=3Dsep+"$this->"+(e.split('|'))[0].strip()+"\n"
-            i+=3D1
-            sep=3D','
-        sql_update=3Dsql_update+" where "+id+"=3D $"+str(i)
         verify_data_type=3D''
         # create verify data_type
         for e in line[3:]:
@@ -204,17 +172,8 @@
 	sParent=3DsParent.replace('@id@',id)
 	sParent=3DsParent.replace('@table@',table)
 	sParent=3DsParent.replace('@class_name@',class_name)
-	sParent=3DsParent.replace('@column_noid@',column_noid)
 	sParent=3DsParent.replace('@column_array@',column_array)
 	sParent=3DsParent.replace('@column_type_array@',column_type_array)
-	sParent=3DsParent.replace('@sql_update@',sql_update)
-	sParent=3DsParent.replace('@column_comma@',column_comma)
-	sParent=3DsParent.replace('@column_this@',column_this)
-	sParent=3DsParent.replace('@column_this_id@',column_this_id)=09
-	sParent=3DsParent.replace('@verify_data_type@',verify_data_type)
-	sParent=3DsParent.replace('@column_select@',column_select)
-	sParent=3DsParent.replace('@column_insert@',column_insert)
-	sParent=3DsParent.replace('@column_insert_id@',column_insert_id)
 	sParent=3DsParent.replace('@set_tech_user@',set_tech_user)
 	fileoutput.writelines(sParent)
=20



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


From MAILER-DAEMON Mon Nov 11 11:41:17 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VfuY9-00038B-Ll
	for mharc-phpcompta-dev@gnu.org; Mon, 11 Nov 2013 11:41:17 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 11 Nov 2013 17:30:23 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.100881.1384188076.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r574 - trunk/rapport_avance/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Nov 2013 16:41:15 -0000

Author: danydb
Date: 2013-11-11 17:30:23 +0100 (Mon, 11 Nov 2013)
New Revision: 574

Added:
   trunk/rapport_avance/doc/listing-entity.dia
Log:
entity dia

Added: trunk/rapport_avance/doc/listing-entity.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: trunk/rapport_avance/doc/listing-entity.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream



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


From MAILER-DAEMON Tue Nov 12 05:15:14 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VgB06-00019q-4u
	for mharc-phpcompta-dev@gnu.org; Tue, 12 Nov 2013 05:15:14 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 12 Nov 2013 11:04:21 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.101691.1384251313.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5539 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Nov 2013 10:15:13 -0000

Author: danydb
Date: 2013-11-12 11:04:21 +0100 (Tue, 12 Nov 2013)
New Revision: 5539

Modified:
   phpcompta/trunk/include/template/dashboard.php
Log:
bug #0000913: Dashboard : pas d'appel de la fen?\195?\170tre pr?\195?\169=
f?\195?\169rence

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-11-07 19:21:38 UT=
C (rev 5538)
+++ phpcompta/trunk/include/template/dashboard.php	2013-11-12 10:04:21 UT=
C (rev 5539)
@@ -307,7 +307,7 @@
   else :
 ?>
   <fieldset style=3D"height:50%;width:80%;background-color:white"><legen=
d><?php _('Aucun rapport d=C3=A9fini')?></legend>
-  <a href=3D"javascript:void(0)" onclick=3D"set_preference('.dossier::id=
().')"><?php echo _('Cliquez ici pour mettre =C3=A0 jour vos pr=C3=A9f=C3=
=A9rences')?></a>
+  <a href=3D"javascript:void(0)" onclick=3D"set_preference('<?php echo d=
ossier::id()?>')"><?php echo _('Cliquez ici pour mettre =C3=A0 jour vos p=
r=C3=A9f=C3=A9rences')?></a>
=20
 </fieldset>
 <?php



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


From MAILER-DAEMON Tue Nov 12 09:26:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VgEut-0002df-VK
	for mharc-phpcompta-dev@gnu.org; Tue, 12 Nov 2013 09:26:07 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 12 Nov 2013 15:15:12 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.101905.1384266366.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r575 - in trunk/rapport_avance: . doc include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Nov 2013 14:26:05 -0000

Author: danydb
Date: 2013-11-12 15:15:12 +0100 (Tue, 12 Nov 2013)
New Revision: 575

Added:
   trunk/rapport_avance/include/ajax_listing_display_definition.php
   trunk/rapport_avance/include/template/rapav_listing_form_modify.php
Removed:
   trunk/rapport_avance/include/template/rapav_listing_form_add.php
Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/doc/listing-db.dia
   trunk/rapport_avance/doc/listing-entity.dia
   trunk/rapport_avance/doc/rapav-analyse.dia
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/include/template/rapav_listing_to_list.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Listing : definition

Modified: trunk/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax.php	2013-11-11 16:30:23 UTC (rev 574)
+++ trunk/rapport_avance/ajax.php	2013-11-12 14:15:12 UTC (rev 575)
@@ -133,7 +133,14 @@
     case 'listing_remove_modele':
        include 'ajax_listing_remove_modele.php';
         exit();
-
-        break;
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    // Display the definition of a listing
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    case 'listing_display_definition':
+        include 'ajax_listing_display_definition.php';
+        exit();
+    default:
+        if ( DEBUG) var_dump($_GET);
+        die ("Aucune action demand=C3=A9e");
 }
 ?>

Modified: trunk/rapport_avance/doc/listing-db.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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: trunk/rapport_avance/doc/listing-entity.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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: trunk/rapport_avance/doc/rapav-analyse.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/ajax_listing_display_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/ajax_listing_display_definition.php	    =
                    (rev 0)
+++ trunk/rapport_avance/include/ajax_listing_display_definition.php	2013=
-11-12 14:15:12 UTC (rev 575)
@@ -0,0 +1,19 @@
+<?php
+
+require_once 'include/class_rapav_listing.php';
+$obj=3Dnew Rapav_Listing($id);
+ob_start();
+$obj->display();
+$obj->button_add_param();
+$response =3D ob_get_flush();
+ob_end_clean();
+$html =3D escape_xml($response);
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl></ctl>
+<code>$html</code>
+</data>
+EOF;
+?>       =20
\ No newline at end of file

Modified: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	2013-11-11 16:30=
:23 UTC (rev 574)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-12 14:15=
:12 UTC (rev 575)
@@ -50,6 +50,7 @@
         global $cn;
         $name =3D new IText('name');
         $description =3D new ITextArea('description');
+        $description->style=3D' style=3D"margin:0px;width:100%" class=3D=
"itextarea"';
         $file =3D new IFile('listing_mod');
         $fichedef =3D new ISelect('fiche_def');
         $fichedef->value =3D $cn->make_array('select fd_id,fd_label from=
 fiche_def order by fd_label');
@@ -78,7 +79,7 @@
                 $file->value =3D $this->Data->l_filename . HtmlInput::an=
chor(' <span style=3D"background-color:red">X </span>', "", ' onclick=3D"=
' . $json . '"');
             }
         }
-        require 'template/rapav_listing_form_add.php';
+        require 'template/rapav_listing_form_modify.php';
     }
=20
     /**
@@ -184,5 +185,15 @@
=20
         }
     }
+    /**
+     * @brief display the parameter of a listing
+     * let add or remove detail
+     */
+    function display()
+    {
+        // Load all listing_parameter
=20
+        // Display them avec an anchor to update / delete (javascript)
+    }
+
 }

Deleted: trunk/rapport_avance/include/template/rapav_listing_form_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_form_add.php	2013=
-11-11 16:30:23 UTC (rev 574)
+++ trunk/rapport_avance/include/template/rapav_listing_form_add.php	2013=
-11-12 14:15:12 UTC (rev 575)
@@ -1,42 +0,0 @@
-<table>
-    <tr>
-        <td>
-            Nom
-        </td>
-        <td>
-            <?php echo $name->input();?>
-        </td>
-       =20
-    </tr>
-    <tr>
-        <td>
-            Description
-        </td>
-        <td>
-            <?php echo $description->input();?>
-        </td>
-       =20
-    </tr>
-    <tr>
-        <td>
-            Cat=C3=A9gorie de fiche
-        </td>
-        <td>
-            <?php echo $fichedef->input();?>
-        </td>
-       =20
-    </tr>
-    <tr>
-        <td>
-            Fichier
-        </td>
-        <td>
-            <?php echo $file->input();?>
-        </td>
-       =20
-    </tr>
-
-</table>
-<?php
-echo $str_remove;
-?>
\ No newline at end of file

Copied: trunk/rapport_avance/include/template/rapav_listing_form_modify.p=
hp (from rev 574, trunk/rapport_avance/include/template/rapav_listing_for=
m_add.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_form_modify.php	 =
                       (rev 0)
+++ trunk/rapport_avance/include/template/rapav_listing_form_modify.php	2=
013-11-12 14:15:12 UTC (rev 575)
@@ -0,0 +1,42 @@
+<table>
+    <tr>
+        <td>
+            Nom
+        </td>
+        <td>
+            <?php echo $name->input();?>
+        </td>
+       =20
+    </tr>
+    <tr>
+        <td>
+            Description
+        </td>
+        <td>
+            <?php echo $description->input();?>
+        </td>
+       =20
+    </tr>
+    <tr>
+        <td>
+            Cat=C3=A9gorie de fiche
+        </td>
+        <td>
+            <?php echo $fichedef->input();?>
+        </td>
+       =20
+    </tr>
+    <tr>
+        <td>
+            Fichier
+        </td>
+        <td>
+            <?php echo $file->input();?>
+        </td>
+       =20
+    </tr>
+
+</table>
+<?php
+echo $str_remove;
+?>
\ No newline at end of file

Modified: trunk/rapport_avance/include/template/rapav_listing_to_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-11 16:30:23 UTC (rev 574)
+++ trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-12 14:15:12 UTC (rev 575)
@@ -36,7 +36,18 @@
             <?php echo h($row['fd_label']); ?>
         </td>
         <td>
-            Action
+        <?php
+        $arg =3D array(
+            'gDossier' =3D> Dossier::id(),
+            'ac' =3D> $_REQUEST['ac'],
+            'pc' =3D> $_REQUEST['plugin_code'],
+            'id' =3D> $row['l_id'],
+            'cin' =3D> 'listing_definition_id',
+            'cout' =3D> 'listing_definition_div_id');
+        $json =3D 'listing_definition(' . str_replace('"', "'", json_enc=
ode($arg)) . ')';
+        echo HtmlInput::anchor(h($row['l_name']),'',' onclick=3D"'.$json=
.'"');=20
+        ?>
+           =20
         </td>
     </tr>
     <?php

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-11 16:30:23 UTC (rev=
 574)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-12 14:15:12 UTC (rev=
 575)
@@ -542,4 +542,44 @@
         alert(e.message);
=20
     }
+}
+function listing_definition (json)
+{
+    console.log(json)
+    try {
+        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_display_definition=
' + "&cin=3D" + json.cin + '&cout=3D' + json.cout+'&id=3D'+json.id;
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        try {
+                            var answer =3D req.responseXML;
+                            var a =3D answer.getElementsByTagName('ctl')=
;
+                            var html =3D answer.getElementsByTagName('co=
de');
+                            if (a.length =3D=3D 0) {
+                                var rec =3D req.responseText;
+                                throw 'cannot find ctl element';
+                            }
+                            remove_waiting_box();
+                            var code_html =3D getNodeText(html[0]);=20
+                            code_html =3D unescape_xml(code_html);
+                             console.log(code_html);
+                           $(json.cout).innerHTML =3D code_html;
+                        } catch (e) {
+                            console.log(e);
+                            console.log(code_html);
+                        }
+                    }
+                }
+        );
+
+    } 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 Wed Nov 13 09:58:29 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vgbtl-0000Eu-Oj
	for mharc-phpcompta-dev@gnu.org; Wed, 13 Nov 2013 09:58:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 13 Nov 2013 15:47:33 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.103319.1384354709.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r576 - in trunk/rapport_avance: . doc include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Nov 2013 14:58:28 -0000

Author: danydb
Date: 2013-11-13 15:47:32 +0100 (Wed, 13 Nov 2013)
New Revision: 576

Added:
   trunk/rapport_avance/ajax_listing_display_definition.php
   trunk/rapport_avance/include/class_rapav_listing_param.php
   trunk/rapport_avance/include/template/rapav_listing_definition.php
Removed:
   trunk/rapport_avance/include/ajax_listing_display_definition.php
Modified:
   trunk/rapport_avance/doc/listing-db.dia
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
Log:
Listing : definition

Copied: trunk/rapport_avance/ajax_listing_display_definition.php (from re=
v 575, trunk/rapport_avance/include/ajax_listing_display_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/ajax_listing_display_definition.php	            =
            (rev 0)
+++ trunk/rapport_avance/ajax_listing_display_definition.php	2013-11-13 1=
4:47:32 UTC (rev 576)
@@ -0,0 +1,19 @@
+<?php
+
+require_once 'include/class_rapav_listing.php';
+$obj=3Dnew Rapav_Listing($id);
+ob_start();
+$obj->display();
+$obj->button_add_param();
+$response =3D ob_get_flush();
+ob_end_clean();
+$html =3D escape_xml($response);
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl></ctl>
+<code>$html</code>
+</data>
+EOF;
+?>       =20
\ No newline at end of file

Modified: trunk/rapport_avance/doc/listing-db.dia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/include/ajax_listing_display_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/ajax_listing_display_definition.php	2013=
-11-12 14:15:12 UTC (rev 575)
+++ trunk/rapport_avance/include/ajax_listing_display_definition.php	2013=
-11-13 14:47:32 UTC (rev 576)
@@ -1,19 +0,0 @@
-<?php
-
-require_once 'include/class_rapav_listing.php';
-$obj=3Dnew Rapav_Listing($id);
-ob_start();
-$obj->display();
-$obj->button_add_param();
-$response =3D ob_get_flush();
-ob_end_clean();
-$html =3D escape_xml($response);
-header('Content-type: text/xml; charset=3DUTF-8');
-echo <<<EOF
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<data>
-<ctl></ctl>
-<code>$html</code>
-</data>
-EOF;
-?>       =20
\ No newline at end of file

Modified: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	2013-11-12 14:15=
:12 UTC (rev 575)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-13 14:47=
:32 UTC (rev 576)
@@ -14,9 +14,11 @@
 require_once 'class_rapport_avance_sql.php';
=20
 class Rapav_Listing {
-
+    private $Data; /*!< RAPAV_Listing_SQL */
+    private $a_detail; /*!< array of RAPAV_Listing_Param corresponding t=
o the listing*/
     function __construct($p_id =3D -1) {
         $this->Data =3D new RAPAV_Listing_SQL($p_id);
+        $this->a_detail=3Darray();
     }
=20
     /**
@@ -192,8 +194,17 @@
     function display()
     {
         // Load all listing_parameter
-
+        $this->load_detail();
+       =20
         // Display them avec an anchor to update / delete (javascript)
+        include_once 'template/rapav_listing_definition.php';
     }
-
+   =20
+    function load_detail()
+    {
+        if ( $this->Data->getp('id') =3D=3D -1)=20
+            throw new Exception ("Undefined objet ".__FILE__.':'.__LINE_=
_);
+        $this->a_detail=3D  RAPAV_Listing_Param::get_listing_detail($thi=
s->Data->getp('id'));
+       =20
+    }
 }

Added: trunk/rapport_avance/include/class_rapav_listing_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_rapav_listing_param.php	          =
              (rev 0)
+++ trunk/rapport_avance/include/class_rapav_listing_param.php	2013-11-13=
 14:47:32 UTC (rev 576)
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Prop=
erties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * @brief Manage the tables rapport_advanced.listing_param_detail and
+ * rapport_advanced.listing_param. The data are in Param and Detail
+ *
+ * @author danydb
+ */
+require_once 'class_rapport_avance_sql.php';
+
+class RAPAV_Listing_Param {
+    private  $Param;  /*!< RAPAV_Listing_Param_SQL */
+    private  $Detail;  /*!< RAPAV_Listing_Param_Detail_SQL */
+   =20
+    /**
+     * constructor, initialize Data with a RAPAV_Listing_Param_SQL
+     * @param p_id is the primary key of Listing_Param : which is the FK=
 for the detail
+     *=20
+     */
+    function __construct($p_id=3D-1) {
+        global $cn;
+        $this->Param =3D new RAPAV_Listing_Param_SQL($p_id);
+        $this->Detail=3Dnew RAPAV_Listing_Param_Detail_SQL();
+        if ( $p_id !=3D-1)
+        {
+            $this->load_detail();
+        }
+    }
+    /**
+     * Set the id of Param and load from database=20
+     * @param type $p_id
+     */
+    function set_id ($p_id)
+    {
+        $this->Param->setp('id',$p_id);
+        $this->load();
+      =20
+    }
+    /**
+     * Retrieve data from listing_param_detail
+     * and set Param and Detail
+     * @see load_detail
+     */
+    function load()
+    {
+        $this->Param->load();
+        $this->load_detail();
+       =20
+    }
+    /**
+     * Retrieve data from listing_param_detail
+     */
+    function load_detail()
+    {
+       $id=3D$this->Param->getp('id');
+      =20
+       if ( $id !=3D-1)
+        {
+            $pk_detail=3D$cn->get_value(' select fp_id from=20
+                    rapport_advanced.listing_param_detail
+                    where
+                    lp_id =3D $1',array($id));
+           =20
+            if ($cn->count() !=3D 0)    {
+                $this->Detail->setp('id',-1);
+                return;
+            }
+           =20
+            $this->Detail->setp('id',$pk_detail);
+           =20
+            $this->Detail->load();
+           =20
+        }
+    }
+    /**
+     * Get all data from listing_param and listing_param_detail=20
+     * for a listing
+     * @param $p_id Listing::l_id
+     * @return  array of object RAPAV_Listing_Param
+     */
+    static function get_listing_detail ($p_id)
+    {
+       global $cn;
+       $a_listing_param=3Darray();
+      =20
+       $a_param_id=3D$cn->get_array('select lp_id=20
+               from rapport_advanced.listing_param=20
+               where l_id=3D$1 order by l_order'.array($p_id));
+      =20
+       for ($i=3D0;$i<count($a_param_id);$i++)
+       {
+           $a_listing_param[]=3Dnew RAPAV_Listing_Param($a_param_id['lp_=
id'][$i]);
+       }
+       return $a_listing_param;
+    }
+}

Modified: trunk/rapport_avance/include/class_rapport_avance_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-12 =
14:15:12 UTC (rev 575)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-13 =
14:47:32 UTC (rev 576)
@@ -324,7 +324,7 @@
     {
=20
=20
-        $this->table =3D "rapport_advanced.listing_param_detail";
+        $this->table =3D "rapport_advanced.listing_param";
         $this->primary_key =3D "fp_id";
=20
         $this->name =3D array(
@@ -352,7 +352,7 @@
     }
=20
 }
-class RAPAV_Listing_Param_Detail extends Phpcompta_Sql
+class RAPAV_Listing_Param_Detail_SQL extends Phpcompta_Sql
 {
=20
     function __construct($p_id =3D -1)

Added: trunk/rapport_avance/include/template/rapav_listing_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/rapav_listing_definition.php	  =
                      (rev 0)
+++ trunk/rapport_avance/include/template/rapav_listing_definition.php	20=
13-11-13 14:47:32 UTC (rev 576)
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file
+ * @brief show a list and all of its parameters and detail
+ *=20
+ */
+
+?>
+<table class=3D"result">
+    <tr>
+        <th>
+            Code
+        </th>
+        <th>
+            Commentaire
+        </th>
+        <th>
+            Formules
+        </th>
+        <th>
+            action
+        </th>
+    </tr>
+<?php=20
+    $nb=3Dcount($this->a_detail);
+    for ($i=3D0;$i<$nb;$i++):
+?>
+    <tr>
+        <td>
+           <?php $this->a_detail[$i]->Param->getp('code'); ?>
+        </td>
+        <td>
+           <?php $this->a_detail[$i]->Param->getp('comment'); ?>
+        </td>
+        <td>
+            Formule
+        </td>
+        <td>
+            Efface / modifie
+        </td>
+       =20
+    </tr>
+
+
+<?php
+    endfor;
+?>  =20
+</table>   =20
\ No newline at end of file



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


From MAILER-DAEMON Wed Nov 13 10:09:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vgc40-0002BE-4h
	for mharc-phpcompta-dev@gnu.org; Wed, 13 Nov 2013 10:09:04 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 13 Nov 2013 15:58:04 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.103332.1384355343.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r577 - trunk/rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Nov 2013 15:09:02 -0000

Author: danydb
Date: 2013-11-13 15:58:04 +0100 (Wed, 13 Nov 2013)
New Revision: 577

Modified:
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/include/class_rapav_listing_param.php
Log:
Listing : definition

Modified: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	2013-11-13 14:47=
:32 UTC (rev 576)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-13 14:58=
:04 UTC (rev 577)
@@ -12,7 +12,7 @@
  * @author dany
  */
 require_once 'class_rapport_avance_sql.php';
-
+require_once 'class_rapav_listing_param.php';
 class Rapav_Listing {
     private $Data; /*!< RAPAV_Listing_SQL */
     private $a_detail; /*!< array of RAPAV_Listing_Param corresponding t=
o the listing*/
@@ -207,4 +207,8 @@
         $this->a_detail=3D  RAPAV_Listing_Param::get_listing_detail($thi=
s->Data->getp('id'));
        =20
     }
+    function button_add_param()=20
+    {
+       =20
+    }
 }

Modified: trunk/rapport_avance/include/class_rapav_listing_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_rapav_listing_param.php	2013-11-13=
 14:47:32 UTC (rev 576)
+++ trunk/rapport_avance/include/class_rapav_listing_param.php	2013-11-13=
 14:58:04 UTC (rev 577)
@@ -91,7 +91,7 @@
       =20
        $a_param_id=3D$cn->get_array('select lp_id=20
                from rapport_advanced.listing_param=20
-               where l_id=3D$1 order by l_order'.array($p_id));
+               where l_id=3D$1 order by l_order',array($p_id));
       =20
        for ($i=3D0;$i<count($a_param_id);$i++)
        {



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


From MAILER-DAEMON Thu Nov 14 12:37:45 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vh0rR-0003MW-F5
	for mharc-phpcompta-dev@gnu.org; Thu, 14 Nov 2013 12:37:45 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 14 Nov 2013 18:26:47 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.105162.1384450664.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r578 - in trunk/rapport_avance: . include
	include/template sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Nov 2013 17:37:43 -0000

Author: danydb
Date: 2013-11-14 18:26:46 +0100 (Thu, 14 Nov 2013)
New Revision: 578

Modified:
   trunk/rapport_avance/ajax_listing_display_definition.php
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/include/class_rapav_listing_param.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/liste.inc.php
   trunk/rapport_avance/include/template/rapav_listing_definition.php
   trunk/rapport_avance/rapav_javascript.js
   trunk/rapport_avance/sql/1-add-listing.sql
Log:
Listing_Param and Listing_Param_Detail are not only one table

Modified: trunk/rapport_avance/ajax_listing_display_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/ajax_listing_display_definition.php	2013-11-13 1=
4:58:04 UTC (rev 577)
+++ trunk/rapport_avance/ajax_listing_display_definition.php	2013-11-14 1=
7:26:46 UTC (rev 578)
@@ -4,7 +4,9 @@
 $obj=3Dnew Rapav_Listing($id);
 ob_start();
 $obj->display();
+echo '<p>';
 $obj->button_add_param();
+echo '</p>';
 $response =3D ob_get_flush();
 ob_end_clean();
 $html =3D escape_xml($response);

Modified: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	2013-11-13 14:58=
:04 UTC (rev 577)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-14 17:26=
:46 UTC (rev 578)
@@ -199,7 +199,10 @@
         // Display them avec an anchor to update / delete (javascript)
         include_once 'template/rapav_listing_definition.php';
     }
-   =20
+    /**
+     * @brief Load the detail of a listing
+     * @throws Exception Undefined object
+     */
     function load_detail()
     {
         if ( $this->Data->getp('id') =3D=3D -1)=20
@@ -207,8 +210,21 @@
         $this->a_detail=3D  RAPAV_Listing_Param::get_listing_detail($thi=
s->Data->getp('id'));
        =20
     }
+    /**
+     * @brief Display button for adding detail to a list definition, it =
means
+     */
     function button_add_param()=20
     {
-       =20
+        $button=3Dnew IButton('detail_add_bt','Ajout','detail_add_bt');
+        $arg=3D  json_encode(array(
+            'cin'=3D>'listing_definition_div_id',
+            'gDossier'=3D>Dossier::id(),
+            'id'=3D>$this->Data->getp('id'),
+            'tb_id'=3D>'definition_tb_id',
+            'ac'=3D>$_REQUEST['ac'])
+            );
+        $arg=3Dstr_replace('"',"'",$arg);
+        $button->javascript=3D'listing_param_add('.$arg.')';
+        echo $button->input();
     }
 }

Modified: trunk/rapport_avance/include/class_rapav_listing_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_rapav_listing_param.php	2013-11-13=
 14:58:04 UTC (rev 577)
+++ trunk/rapport_avance/include/class_rapav_listing_param.php	2013-11-14=
 17:26:46 UTC (rev 578)
@@ -16,7 +16,6 @@
=20
 class RAPAV_Listing_Param {
     private  $Param;  /*!< RAPAV_Listing_Param_SQL */
-    private  $Detail;  /*!< RAPAV_Listing_Param_Detail_SQL */
    =20
     /**
      * constructor, initialize Data with a RAPAV_Listing_Param_SQL
@@ -26,11 +25,6 @@
     function __construct($p_id=3D-1) {
         global $cn;
         $this->Param =3D new RAPAV_Listing_Param_SQL($p_id);
-        $this->Detail=3Dnew RAPAV_Listing_Param_Detail_SQL();
-        if ( $p_id !=3D-1)
-        {
-            $this->load_detail();
-        }
     }
     /**
      * Set the id of Param and load from database=20
@@ -50,35 +44,10 @@
     function load()
     {
         $this->Param->load();
-        $this->load_detail();
+        // $this->load_detail();
        =20
     }
     /**
-     * Retrieve data from listing_param_detail
-     */
-    function load_detail()
-    {
-       $id=3D$this->Param->getp('id');
-      =20
-       if ( $id !=3D-1)
-        {
-            $pk_detail=3D$cn->get_value(' select fp_id from=20
-                    rapport_advanced.listing_param_detail
-                    where
-                    lp_id =3D $1',array($id));
-           =20
-            if ($cn->count() !=3D 0)    {
-                $this->Detail->setp('id',-1);
-                return;
-            }
-           =20
-            $this->Detail->setp('id',$pk_detail);
-           =20
-            $this->Detail->load();
-           =20
-        }
-    }
-    /**
      * Get all data from listing_param and listing_param_detail=20
      * for a listing
      * @param $p_id Listing::l_id

Modified: trunk/rapport_avance/include/class_rapport_avance_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-13 =
14:58:04 UTC (rev 577)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-14 =
17:26:46 UTC (rev 578)
@@ -332,39 +332,7 @@
             "listing_id" =3D> "l_id",
             "code" =3D> "lp_code",
             "comment" =3D> "lp_comment",
-            "order" =3D> "l_order"
-        );
-
-        $this->type =3D array(
-            "lp_id" =3D> "numeric",
-            "l_id" =3D> "numeric",
-            "lp_code" =3D> "text",
-            "lp_comment" =3D> "text",
-            "l_order" =3D> "numeric"
-        );
-
-        $this->default =3D array(
-            "lp_id" =3D> "auto"
-        );
-        global $cn;
-
-        parent::__construct($cn, $p_id);
-    }
-
-}
-class RAPAV_Listing_Param_Detail_SQL extends Phpcompta_Sql
-{
-
-    function __construct($p_id =3D -1)
-    {
-
-
-        $this->table =3D "rapport_advanced.listing_param_detail";
-        $this->primary_key =3D "fp_id";
-
-        $this->name =3D array(
-            "id" =3D> "fp_id",
-            "p_id" =3D> "p_id", // always null
+            "order" =3D> "l_order",
             "tmp_val" =3D> "tmp_val",
             "tva_id" =3D> "tva_id",
             "formula" =3D> "fp_formula",
@@ -380,12 +348,14 @@
             "attribut_card" =3D> "ad_id",
             "card_saldo" =3D> "lp_card_saldo",
             "with_card" =3D> "lp_with_card",
-            "listing_param_id" =3D> "lp_id"
         );
=20
         $this->type =3D array(
-            "fp_id" =3D> "numeric",
-            "p_id" =3D> "numeric",
+            "lp_id" =3D> "numeric",
+            "l_id" =3D> "numeric",
+            "lp_code" =3D> "text",
+            "lp_comment" =3D> "text",
+            "l_order" =3D> "numeric",
             "tmp_val" =3D> "text",
             "tva_id" =3D> "numeric",
             "fp_formula" =3D> "text",
@@ -401,12 +371,10 @@
             "ad_id" =3D> "numeric",
             "lp_card_saldo" =3D> "text",
             "lp_with_card" =3D> "text",
-            "lp_id" =3D> "numeric"
         );
=20
         $this->default =3D array(
-            "fp_id" =3D> "auto",
-            "p_id"  =3D> "auto"  // always null
+            "lp_id" =3D> "auto"
         );
         global $cn;
=20
@@ -415,4 +383,5 @@
=20
 }
=20
+
 ?>

Modified: trunk/rapport_avance/include/liste.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/liste.inc.php	2013-11-13 14:58:04 UTC (r=
ev 577)
+++ trunk/rapport_avance/include/liste.inc.php	2013-11-14 17:26:46 UTC (r=
ev 578)
@@ -1,3 +1,4 @@
+<div class=3D"content" id=3D"listing_definition_div_id">
 <?php
 /**
  * @file
@@ -28,3 +29,4 @@
 Rapav_Listing::Button_Add_Listing();
 echo '</p>';
 ?>
+</div>
\ No newline at end of file

Modified: trunk/rapport_avance/include/template/rapav_listing_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/rapav_listing_definition.php	20=
13-11-13 14:58:04 UTC (rev 577)
+++ trunk/rapport_avance/include/template/rapav_listing_definition.php	20=
13-11-14 17:26:46 UTC (rev 578)
@@ -7,7 +7,7 @@
  */
=20
 ?>
-<table class=3D"result">
+<table class=3D"result" id=3D"definition_tb_id">
     <tr>
         <th>
             Code

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-13 14:58:04 UTC (rev=
 577)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-14 17:26:46 UTC (rev=
 578)
@@ -543,6 +543,18 @@
=20
     }
 }
+/**
+ * Show the definition of a list in a div
+ * @param json json object=20
+ * Attributes are=20
+ *     - pc
+ *     - ac
+ *     - gDossier
+ *     - act
+ *     - cin
+ *     - cout
+ *
+ */
 function listing_definition (json)
 {
     console.log(json)
@@ -582,4 +594,17 @@
         alert(e.message);
=20
     }
+}
+/**
+ * @brief display a form for adding a parameter to the current listing
+ * @param  json
+ * Attributes are=20
+ *     - cin    the div to fill
+ *     - tb_id  the table to update
+ *     - gDossier dossier=20
+ *     - ac       the AC code
+ */
+function listing_param_add(json)
+{
+    console.log(json);
 }
\ No newline at end of file

Modified: trunk/rapport_avance/sql/1-add-listing.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/1-add-listing.sql	2013-11-13 14:58:04 UTC (r=
ev 577)
+++ trunk/rapport_avance/sql/1-add-listing.sql	2013-11-14 17:26:46 UTC (r=
ev 578)
@@ -17,39 +17,48 @@
  lp_code text not null constraint c_lp_code check (length (trim(lp_code)=
)> 0),
  lp_comment text,
  l_card int default 0,
- l_order int
+ l_order int,
+ ad_id bigint constraint fk_listing_param_detail_attr_def references att=
r_def (ad_id),
+ lp_card_saldo char(1) check (lp_card_saldo in ('C','D','S',NULL)),
+ lp_with_card char (1) check (lp_with_card in ('Y','N')),
+ tmp_val account_type,
+ tva_id integer,
+ fp_formula text,
+ fp_signed integer,
+ jrn_def_type character(3),
+ tt_id integer,
+ type_detail integer,
+ with_tmp_val account_type,
+ type_sum_account bigint,
+ operation_pcm_val account_type,
+ jrn_def_id bigint, -- FK to jrn_def, if null then all the ledgers are c=
oncerned
+ date_paid integer DEFAULT 0
 );
-create table rapport_advanced.listing_param_detail
-(
-    ad_id bigint constraint fk_listing_param_detail_attr_def references =
attr_def (ad_id),
-    lp_card_saldo char(1) check (lp_card_saldo in ('C','D','S',NULL)),
-    lp_with_card char (1) check (lp_with_card in ('Y','N')),
-    lp_id bigint constraint fk_listing_param_detail_listing_param refere=
nces rapport_advanced.listing_param (lp_id)
-)  inherits (rapport_Advanced.formulaire_param_detail);
=20
-ALTER TABLE rapport_advanced.listing_param_detail
-  ADD CONSTRAINT fk_listing_param_detail_type_row_detail FOREIGN KEY (ty=
pe_detail)
+
+ALTER TABLE rapport_advanced.listing_param
+  ADD CONSTRAINT fk_listing_param_type_row_detail FOREIGN KEY (type_deta=
il)
       REFERENCES rapport_advanced.type_row_detail (tr_id) MATCH SIMPLE
       ON UPDATE SET NULL ON DELETE SET NULL;
-ALTER TABLE rapport_advanced.listing_param_detail
-  ADD CONSTRAINT listing_param_detail_jrn_def_id_fkey FOREIGN KEY (jrn_d=
ef_id)
+ALTER TABLE rapport_advanced.listing_param
+  ADD CONSTRAINT listing_param_jrn_def_id_fkey FOREIGN KEY (jrn_def_id)
       REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE
       ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED=
;
-ALTER TABLE rapport_advanced.listing_param_detail
-  ADD CONSTRAINT listing_param_detail_tt_id_fkey FOREIGN KEY (tt_id)
+ALTER TABLE rapport_advanced.listing_param
+  ADD CONSTRAINT listing_param_tt_id_fkey FOREIGN KEY (tt_id)
       REFERENCES rapport_advanced.total_type (tt_id) MATCH SIMPLE
       ON UPDATE NO ACTION ON DELETE NO ACTION;
-ALTER TABLE rapport_advanced.listing_param_detail
-  ADD CONSTRAINT listing_param_detail_tva_id_fkey FOREIGN KEY (tva_id)
+ALTER TABLE rapport_advanced.listing_param
+  ADD CONSTRAINT listing_param_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.listing_param_detail
-  ADD CONSTRAINT listing_param_detail_type_sum_account_fkey FOREIGN KEY =
(type_sum_account)
+ALTER TABLE rapport_advanced.listing_param
+  ADD CONSTRAINT listing_param_type_sum_account_fkey FOREIGN KEY (type_s=
um_account)
       REFERENCES rapport_advanced.total_type_account (tt_id) MATCH SIMPL=
E
       ON UPDATE SET NULL ON DELETE SET NULL;
-CREATE TRIGGER listing_param_detail_trg
+CREATE TRIGGER listing_param_trg
   BEFORE INSERT OR UPDATE OF jrn_def_id
-  ON rapport_advanced.listing_param_detail
+  ON rapport_advanced.listing_param
   FOR EACH ROW
   EXECUTE PROCEDURE rapport_advanced.formulaire_param_detail_jrn_def_id_=
ins_upd();
 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 Thu Nov 14 13:35:42 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vh1lW-0002LV-5i
	for mharc-phpcompta-dev@gnu.org; Thu, 14 Nov 2013 13:35:42 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 14 Nov 2013 19:24:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.105224.1384454141.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r579 - in trunk/rapport_avance: . include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Nov 2013 18:35:40 -0000

Author: danydb
Date: 2013-11-14 19:24:17 +0100 (Thu, 14 Nov 2013)
New Revision: 579

Added:
   trunk/rapport_avance/ajax_listing_param_add.php
   trunk/rapport_avance/include/template/listing_param_input.php
Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/include/class_rapav_listing_param.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Add parameter : start

Modified: trunk/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax.php	2013-11-14 17:26:46 UTC (rev 578)
+++ trunk/rapport_avance/ajax.php	2013-11-14 18:24:17 UTC (rev 579)
@@ -139,6 +139,12 @@
     case 'listing_display_definition':
         include 'ajax_listing_display_definition.php';
         exit();
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    // Add a param to a listing
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    case 'listing_param_add':
+        include 'ajax_listing_param_add.php';
+        exit();
     default:
         if ( DEBUG) var_dump($_GET);
         die ("Aucune action demand=C3=A9e");

Added: trunk/rapport_avance/ajax_listing_param_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_listing_param_add.php	                     =
   (rev 0)
+++ trunk/rapport_avance/ajax_listing_param_add.php	2013-11-14 18:24:17 U=
TC (rev 579)
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @file
+ * @brief Ajax file
+ */
+require_once 'include/class_rapav_listing.php';
+
+ob_start();
+echo HtmlInput::title_box("Nouveau param=C3=A8tre", $cin);
+$obj=3Dnew RAPAV_Listing($id);
+$obj->add_parameter();
+$response =3D ob_get_clean();
+ob_end_clean();
+$html =3D escape_xml($response);
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl></ctl>
+<code>$html</code>
+</data>
+EOF;
+?>       =20
\ No newline at end of file

Modified: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	2013-11-14 17:26=
:46 UTC (rev 578)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-14 18:24=
:17 UTC (rev 579)
@@ -217,14 +217,20 @@
     {
         $button=3Dnew IButton('detail_add_bt','Ajout','detail_add_bt');
         $arg=3D  json_encode(array(
-            'cin'=3D>'listing_definition_div_id',
+            'cin'=3D>'listing_param_input_div_id',
             'gDossier'=3D>Dossier::id(),
             'id'=3D>$this->Data->getp('id'),
             'tb_id'=3D>'definition_tb_id',
-            'ac'=3D>$_REQUEST['ac'])
+            'ac'=3D>$_REQUEST['ac'],
+            'pc'=3D>$_REQUEST['plugin_code'])
             );
         $arg=3Dstr_replace('"',"'",$arg);
         $button->javascript=3D'listing_param_add('.$arg.')';
         echo $button->input();
     }
+    function add_parameter()
+    {
+        $param=3Dnew RAPAV_Listing_Param();
+        $param->input($this->Data->getp("id"));
+    }
 }

Modified: trunk/rapport_avance/include/class_rapav_listing_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_rapav_listing_param.php	2013-11-14=
 17:26:46 UTC (rev 578)
+++ trunk/rapport_avance/include/class_rapav_listing_param.php	2013-11-14=
 18:24:17 UTC (rev 579)
@@ -68,4 +68,16 @@
        }
        return $a_listing_param;
     }
+    /**
+     * @brief display a div for adding or modifing a parameter
+     * @param $p_id is the listing id
+     */
+    function input($p_id)
+    {
+        $code=3Dnew IText('code_id');
+        $comment=3Dnew IText('comment');
+        $order=3Dnew INum('order');
+       =20
+        require 'template/listing_param_input.php';
+    }
 }

Modified: trunk/rapport_avance/include/class_rapport_avance_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-14 =
17:26:46 UTC (rev 578)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-14 =
18:24:17 UTC (rev 579)
@@ -325,7 +325,7 @@
=20
=20
         $this->table =3D "rapport_advanced.listing_param";
-        $this->primary_key =3D "fp_id";
+        $this->primary_key =3D "lp_id";
=20
         $this->name =3D array(
             "lp_id" =3D> "lp_id",

Added: trunk/rapport_avance/include/template/listing_param_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/listing_param_input.php	       =
                 (rev 0)
+++ trunk/rapport_avance/include/template/listing_param_input.php	2013-11=
-14 18:24:17 UTC (rev 579)
@@ -0,0 +1,5 @@
+<div>
+    <label>Code</label> <?php echo $code->input() ?>
+    <label>Commentaire</label><?php echo $comment->input(); ?>
+    <label>Order apparation</label><?php echo $order->input(); ?>
+</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	2013-11-14 17:26:46 UTC (rev=
 578)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-14 18:24:17 UTC (rev=
 579)
@@ -599,12 +599,51 @@
  * @brief display a form for adding a parameter to the current listing
  * @param  json
  * Attributes are=20
- *     - cin    the div to fill
- *     - tb_id  the table to update
+ *     - cin      the div to fill
+ *     - tb_id    the table to update
  *     - gDossier dossier=20
  *     - ac       the AC code
+ *     - pc       plugin_code
  */
 function listing_param_add(json)
 {
     console.log(json);
+    try {
+        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_param_add' + "&cin=
=3D" + json.cin +'&id=3D'+json.id;
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        try {
+                            var answer =3D req.responseXML;
+                            var a =3D answer.getElementsByTagName('ctl')=
;
+                            var html =3D answer.getElementsByTagName('co=
de');
+                            if (a.length =3D=3D 0) {
+                                var rec =3D req.responseText;
+                                throw 'cannot find ctl element';
+                            }
+                            remove_waiting_box();
+                            var code_html =3D getNodeText(html[0]);=20
+                            code_html =3D unescape_xml(code_html);
+                            console.log(code_html);
+                            var position=3Dfixed_position(451,217);
+                            add_div({'id':json.cin,'cssclass':'inner_box=
','drag':1,'style':position});
+                           $(json.cin).innerHTML =3D code_html;
+                        } catch (e) {
+                            console.log(e);
+                            console.log(code_html);
+                        }
+                    }
+                }
+        );
+
+    } 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 Fri Nov 22 13:20:50 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VjvLW-0002yp-B7
	for mharc-phpcompta-dev@gnu.org; Fri, 22 Nov 2013 13:20:50 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 22 Nov 2013 19:09:37 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.113352.1385144449.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r580 - tag/rel670/rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Nov 2013 18:20:48 -0000

Author: danydb
Date: 2013-11-22 19:09:36 +0100 (Fri, 22 Nov 2013)
New Revision: 580

Modified:
   tag/rel670/rapport_avance/include/class_rapav_declaration.php
Log:
small bug : in formula

Modified: tag/rel670/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
--- tag/rel670/rapport_avance/include/class_rapav_declaration.php	2013-11=
-14 18:24:17 UTC (rev 579)
+++ tag/rel670/rapport_avance/include/class_rapav_declaration.php	2013-11=
-22 18:09:36 UTC (rev 580)
@@ -858,7 +858,7 @@
         {
             $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
+						where qs_vat_code=3D$1=20
 						$sql_date
 						and j_poste::text like ($4)  $filter_ledger";
=20



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


From MAILER-DAEMON Fri Nov 22 13:29:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VjvTU-0007YA-7U
	for mharc-phpcompta-dev@gnu.org; Fri, 22 Nov 2013 13:29:04 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 22 Nov 2013 19:17:56 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.113357.1385144943.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r581 - in trunk: coprop/include rapport_avance
	rapport_avance/doc rapport_avance/include
	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: Fri, 22 Nov 2013 18:29:03 -0000

Author: danydb
Date: 2013-11-22 19:17:56 +0100 (Fri, 22 Nov 2013)
New Revision: 581

Added:
   trunk/rapport_avance/include/class_rapav_listing_formula.php
Modified:
   trunk/coprop/include/class_copro_budget.php
   trunk/rapport_avance/doc/rapav-listing-code.odt
   trunk/rapport_avance/include/class_rapav_listing.php
   trunk/rapport_avance/include/liste.inc.php
   trunk/rapport_avance/include/template/listing_param_input.php
   trunk/rapport_avance/include/template/param_detail_new.php
   trunk/rapport_avance/include/template/rapav_listing_definition.php
   trunk/rapport_avance/include/template/rapav_listing_to_list.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Continue dev - listing=20

Modified: trunk/coprop/include/class_copro_budget.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/class_copro_budget.php	2013-11-22 18:09:36 UTC (=
rev 580)
+++ trunk/coprop/include/class_copro_budget.php	2013-11-22 18:17:56 UTC (=
rev 581)
@@ -9,9 +9,9 @@
=20
         $array=3D$cn->get_array("select b_id, b_name,
                    b_exercice,
-				   b_type,
-				    case when b_type =3D 'OPER' then 'Op=C3=A9rationnel'
-					 when b_type =3D 'PREV' then 'Pr=C3=A9visionnel' else 'inconnu' end=
 as str_type,
+                    b_type,
+                     case when b_type =3D 'OPER' then 'Op=C3=A9rationnel=
'
+                          when b_type =3D 'PREV' then 'Pr=C3=A9visionnel=
' else 'inconnu' end as str_type,
                     b_amount
                     from coprop.budget
                     order by b_name

Modified: trunk/rapport_avance/doc/rapav-listing-code.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: trunk/rapport_avance/include/class_rapav_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/class_rapav_listing.php	2013-11-22 18:09=
:36 UTC (rev 580)
+++ trunk/rapport_avance/include/class_rapav_listing.php	2013-11-22 18:17=
:56 UTC (rev 581)
@@ -193,9 +193,23 @@
      */
     function display()
     {
+        require_once 'class_rapav_listing_formula.php';
         // Load all listing_parameter
         $this->load_detail();
        =20
+        // Button for modifing=20
+        $button=3Dnew IButton('listing_mod_bt_id','Modifie');
+        $arg =3D array(
+            'gDossier' =3D> Dossier::id(),
+            'ac' =3D> $_REQUEST['ac'],
+            'pc' =3D> $_REQUEST['plugin_code'],
+            'id' =3D> $this->Data->l_id,
+            'cin' =3D> 'listing_tb_id',
+            'cout' =3D> 'listing_mod_div');
+        $json =3D 'listing_modify(' . str_replace('"', "'", json_encode(=
$arg)) . ')';
+        $button->javascript=3D$json;
+       =20
+       =20
         // Display them avec an anchor to update / delete (javascript)
         include_once 'template/rapav_listing_definition.php';
     }
@@ -233,4 +247,28 @@
         $param=3Dnew RAPAV_Listing_Param();
         $param->input($this->Data->getp("id"));
     }
+    /**
+     * Return the name of the description of the category of the cards
+     *=20
+     * @return string
+     */
+    function get_categorie_name()
+    {
+        global $cn;
+        if ($this->Data->getp('id')=3D=3D0) return;
+        $cat=3D$cn->get_value('select fd_label from fiche_def where fd_i=
d=3D$1',array($this->Data->getp('fiche_def_id')));
+        return $cat;
+    }
+    /**
+     * Return the name of the description of the category of the cards
+     *=20
+     * @return string
+     */
+    function get_categorie_description()
+    {
+        global $cn;
+        if ($this->Data->getp('id')=3D=3D0) return;
+        $cat=3D$cn->get_value('select fd_description from fiche_def wher=
e fd_id=3D$1',array($this->Data->getp('fiche_def_id')));
+        return $cat;
+    }
 }

Added: trunk/rapport_avance/include/class_rapav_listing_formula.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_listing_formula.php	        =
                (rev 0)
+++ trunk/rapport_avance/include/class_rapav_listing_formula.php	2013-11-=
22 18:17:56 UTC (rev 581)
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Prop=
erties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of class_rapav_listing_formula
+ *
+ * @author dany
+ */
+abstract class RAPAV_Listing_Formula
+{
+    abstract public function display();
+    abstract public function compute();
+    abstract public function input();
+    /**
+     *=20
+     * @param $p_obj RAPAV_Listing_Param_SQL
+     */
+    public function make_object($p_obj)
+    {
+       =20
+    }
+}

Modified: trunk/rapport_avance/include/liste.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/liste.inc.php	2013-11-22 18:09:36 UTC (r=
ev 580)
+++ trunk/rapport_avance/include/liste.inc.php	2013-11-22 18:17:56 UTC (r=
ev 581)
@@ -1,32 +1,38 @@
 <div class=3D"content" id=3D"listing_definition_div_id">
-<?php
-/**
- * @file
- * @brief manage the listing
- */
-var_dump($_POST);
-require_once 'class_rapav_listing.php';
-global $cn;
-$listing=3Dnew Rapav_Listing();
+    <?php
+    /**
+     * @file
+     * @brief manage the listing
+     */
+    var_dump($_POST);
+    require_once 'class_rapav_listing.php';
+    global $cn;
+    $listing =3D new Rapav_Listing();
=20
-/**
- * save new listing
- */
-if ( isset ($_POST['listing_add_sb']))
-{
-    $new=3Dnew Rapav_Listing($_POST['l_id']);
-    if ( ! isset ($_POST['remove']))
-        $new->save($_POST);
-    else
-        $new->delete($_POST);
-}
+    /**
+     * save new listing
+     */
+    if (isset($_POST['listing_add_sb']))
+    {
+        $new =3D new Rapav_Listing($_POST['l_id']);
+        if (!isset($_POST['remove']))
+        {
+            $new->save($_POST);
+            $new->display();
+            echo '<p>';
+            $new->button_add_param();
+            echo '</p>';
+            exit();
+        } else
+            $new->delete($_POST);
+    }
=20
 ////////////////////////////////////////////////////////////////////////=
///////
 //Listing
 ////////////////////////////////////////////////////////////////////////=
///////
-$listing->to_list();
-echo '<p>';
-Rapav_Listing::Button_Add_Listing();
-echo '</p>';
-?>
+    $listing->to_list();
+    echo '<p>';
+    Rapav_Listing::Button_Add_Listing();
+    echo '</p>';
+    ?>
 </div>
\ No newline at end of file

Modified: trunk/rapport_avance/include/template/listing_param_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/listing_param_input.php	2013-11=
-22 18:09:36 UTC (rev 580)
+++ trunk/rapport_avance/include/template/listing_param_input.php	2013-11=
-22 18:17:56 UTC (rev 581)
@@ -1,5 +1,104 @@
 <div>
-    <label>Code</label> <?php echo $code->input() ?>
-    <label>Commentaire</label><?php echo $comment->input(); ?>
-    <label>Order apparation</label><?php echo $order->input(); ?>
+    <table>
+        <tr>
+            <td>
+                <label>Code</label>=20
+            </td>
+            <td>
+                <?php echo $code->input() ?>
+            </tD>
+        </tr>
+        <tr>
+            <td>
+                <label>Commentaire</label>
+            </td>
+            <td>
+                <?php echo $comment->input(); ?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label>Order apparition</label>
+            </td>
+            <td>
+                <?php echo $order->input(); ?>
+            </td>
+        </tr>
+    </table>
+    <table style=3D"width:90%;margin-left:5%" >
+        <tr>
+            <td id=3D"new_formula_id_bt" class=3D"tool" style=3D"backgro=
und:red">
+                <a class=3D"mtitle"  href=3D"javascript:void(0)"  onclic=
k=3D"show_listing_formula('new_formula_id')">
+                    Formule
+                </a>
+            </td>
+            <td id=3D"new_compute_id_bt"  class=3D"tool" style=3D"backgr=
ound:inherit">
+                <a class=3D"mtitle" href=3D"javascript:void(0)"
+                   onclick=3D"show_listing_formula('new_compute_id')">
+                    Compute
+                </a>
+            </td>
+
+            <td id=3D"new_account_id_bt"  class=3D"tool" style=3D"backgr=
ound:inherit">
+                <a class=3D"mtitle" href=3D"javascript:void(0)"   onclic=
k=3D"show_listing_formula('new_account_id')">
+                    Poste comptable
+                </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 style=3D"padding: 10px">
+            <div id=3D"new_formula_id" style=3D"display:block">
+                <p>
+                    Entrer une formule avec des postes comptables, la sy=
ntaxe est la m=C3=AAme que celle des "rapports"
+                </p>
+                <p>
+                    Exemple : [70%]*0.25+[71%]
+                </p>
+
+                <form id=3D"new_padef" method=3D"POST" onsubmit=3D"save_=
param_listing('new_padef');
+                        return false">
+                          <?php echo HtmlInput::request_to_hidden(array(=
'gDossier', 'ac', 'plugin_code', 'p_id')) ?>
+                    <p>
+                        <?php echo HtmlInput::hidden('tab', 'formula') ?=
>
+                        <?php echo "formula"; ?>
+                    </p>
+
+                    <?php echo HtmlInput::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_listing('new_padec');
+                        return false">
+                          <?php echo HtmlInput::request_to_hidden(array(=
'gDossier', 'ac', 'plugin_code', 'p_id')) ?>
+
+                    <?php echo HtmlInput::hidden('tab', 'compute_id') ?>
+                    <?php echo "compute" ?>
+                    <p>
+                        <?php echo HtmlInput::submit('save', 'Sauve') ?>
+                    </p>
+
+                </form>
+            </div>
+            <div id=3D"new_account_id" style=3D"display:none">
+                <form id=3D"new_paded" method=3D"POST" onsubmit=3D"save_=
param_listing('new_paded');
+                        return false">
+
+                    <?php echo HtmlInput::request_to_hidden(array('gDoss=
ier', 'ac', 'plugin_code', 'p_id')) ?>
+
+                    <?php echo HtmlInput::hidden('tab', 'new_account_id'=
) ?>
+                    <?php echo "account" ?>
+
+                    <?php echo HtmlInput::submit('save', 'Sauve') ?>
+
+                </form>
+            </div>
+        </div>
+    </div>
 </div>
\ No newline at end of file

Modified: trunk/rapport_avance/include/template/param_detail_new.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/param_detail_new.php	2013-11-22=
 18:09:36 UTC (rev 580)
+++ trunk/rapport_avance/include/template/param_detail_new.php	2013-11-22=
 18:17:56 UTC (rev 581)
@@ -23,7 +23,7 @@
=20
 /**
  * @file
- * @brief
+ * @brief add parameter for declaration
  *
  */
=20
@@ -32,28 +32,28 @@
 <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')">
+		<a class=3D"mtitle"  href=3D"javascript:void(0)"  onclick=3D"show_rapp=
ort_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')">
+		   onclick=3D"show_rapport_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')">
+		<a class=3D"mtitle" href=3D"javascript:void(0)"   onclick=3D"show_rapp=
ort_formula('new_account_tva_id')">
 			Poste comptable et code TVA
 		</a>
 	</td>
 	<td id=3D"new_account_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_account_id')">
+		<a class=3D"mtitle" href=3D"javascript:void(0)"   onclick=3D"show_rapp=
ort_formula('new_account_id')">
 			Poste comptable
 		</a>
 	</td>
 	<td id=3D"new_reconcile_id_bt"  class=3D"tool" style=3D"background:inhe=
rit">
-		<a class=3D"mtitle" href=3D"javascript:void(0)"   onclick=3D"show_type=
_formula('new_reconcile_id')">
+		<a class=3D"mtitle" href=3D"javascript:void(0)"   onclick=3D"show_rapp=
ort_formula('new_reconcile_id')">
 			Op=C3=A9rations rapproch=C3=A9es
 		</a>
 	</td>

Modified: trunk/rapport_avance/include/template/rapav_listing_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/rapav_listing_definition.php	20=
13-11-22 18:09:36 UTC (rev 580)
+++ trunk/rapport_avance/include/template/rapav_listing_definition.php	20=
13-11-22 18:17:56 UTC (rev 581)
@@ -7,6 +7,17 @@
  */
=20
 ?>
+<p>
+    Nom listing <?php echo h($this->Data->getp('name')); ?>
+</p>
+<p>
+    Description <?php echo h($this->Data->getp('description')); ?>
+</p>
+<p>
+    Cat=C3=A9gorie <?php echo h($this->get_categorie_name()); ?>
+    <?php echo h($this->get_categorie_description());  ?>
+</p>
+<?php echo $button->input(); ?>
 <table class=3D"result" id=3D"definition_tb_id">
     <tr>
         <th>

Modified: trunk/rapport_avance/include/template/rapav_listing_to_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-22 18:09:36 UTC (rev 580)
+++ trunk/rapport_avance/include/template/rapav_listing_to_list.php	2013-=
11-22 18:17:56 UTC (rev 581)
@@ -16,14 +16,14 @@
     $max=3DDatabase::num_row($res);
     for ($i=3D0;$i<$max;$i++):
         $row=3D  Database::fetch_array($res, $i);
-        $arg =3D array(
+     $arg =3D array(
             'gDossier' =3D> Dossier::id(),
             'ac' =3D> $_REQUEST['ac'],
             'pc' =3D> $_REQUEST['plugin_code'],
             'id' =3D> $row['l_id'],
-            'cin' =3D> 'listing_tb_id',
-            'cout' =3D> 'listing_mod_div');
-        $json =3D 'listing_modify(' . str_replace('"', "'", json_encode(=
$arg)) . ')';
+            'cin' =3D> 'listing_definition_id',
+            'cout' =3D> 'listing_definition_div_id');
+        $json =3D 'listing_definition(' . str_replace('"', "'", json_enc=
ode($arg)) . ')';
     ?>
     <tr>
         <td>
@@ -36,17 +36,6 @@
             <?php echo h($row['fd_label']); ?>
         </td>
         <td>
-        <?php
-        $arg =3D array(
-            'gDossier' =3D> Dossier::id(),
-            'ac' =3D> $_REQUEST['ac'],
-            'pc' =3D> $_REQUEST['plugin_code'],
-            'id' =3D> $row['l_id'],
-            'cin' =3D> 'listing_definition_id',
-            'cout' =3D> 'listing_definition_div_id');
-        $json =3D 'listing_definition(' . str_replace('"', "'", json_enc=
ode($arg)) . ')';
-        echo HtmlInput::anchor(h($row['l_name']),'',' onclick=3D"'.$json=
.'"');=20
-        ?>
            =20
         </td>
     </tr>

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-22 18:09:36 UTC (rev=
 580)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-22 18:17:56 UTC (rev=
 581)
@@ -214,9 +214,9 @@
 	}
 }
 /**
- * @brief montre le div contenant le type de formule
+ * @brief montre le div contenant le type de formule pour les rapports
  */
-function show_type_formula(p_toshow)
+function show_rapport_formula(p_toshow)
 {
 	try
 	{
@@ -235,6 +235,27 @@
=20
 }
 /**
+ * @brief montre le div contenant le type de formule pour les listings
+ */
+function show_listing_formula(p_toshow)
+{
+	try
+	{
+		var div=3D['new_formula_id','new_compute_id','new_account_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)
@@ -630,7 +651,7 @@
                             var code_html =3D getNodeText(html[0]);=20
                             code_html =3D unescape_xml(code_html);
                             console.log(code_html);
-                            var position=3Dfixed_position(451,217);
+                            var position=3Dfixed_position(451,217)+';wid=
th:50%';
                             add_div({'id':json.cin,'cssclass':'inner_box=
','drag':1,'style':position});
                            $(json.cin).innerHTML =3D code_html;
                         } catch (e) {



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


From MAILER-DAEMON Fri Nov 22 13:29:25 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VjvTp-0007rN-Ke
	for mharc-phpcompta-dev@gnu.org; Fri, 22 Nov 2013 13:29:25 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 22 Nov 2013 19:18:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.113358.1385144965.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r582 - 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: Fri, 22 Nov 2013 18:29:25 -0000

Author: danydb
Date: 2013-11-22 19:18:19 +0100 (Fri, 22 Nov 2013)
New Revision: 582

Modified:
   trunk/
   trunk/rapport_avance/include/class_rapav_declaration.php
Log:
Merged revisions 580 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel670

........
  r580 | danydb | 2013-11-22 19:09:36 +0100 (ven., 22 nov. 2013) | 1 line
 =20
  small bug : in formula
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel670:1-556
   + /tag/rel670:1-581

Modified: trunk/rapport_avance/include/class_rapav_declaration.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_declaration.php	2013-11-22 1=
8:17:56 UTC (rev 581)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-11-22 1=
8:18:19 UTC (rev 582)
@@ -858,7 +858,7 @@
         {
             $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
+						where qs_vat_code=3D$1=20
 						$sql_date
 						and j_poste::text like ($4)  $filter_ledger";
=20



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


From MAILER-DAEMON Fri Nov 22 14:14:51 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VjwBn-000795-Fx
	for mharc-phpcompta-dev@gnu.org; Fri, 22 Nov 2013 14:14:51 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 22 Nov 2013 20:03:44 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.113401.1385147691.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5540 - phpcompta/tags/rel670/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, 22 Nov 2013 19:14:50 -0000

Author: danydb
Date: 2013-11-22 20:03:43 +0100 (Fri, 22 Nov 2013)
New Revision: 5540

Modified:
   phpcompta/tags/rel670/include/template/dashboard.php
Log:
bug #0000913: Dashboard : pas d'appel de la fen?\195?\170tre pr?\195?\169=
f?\195?\169rence

Modified: phpcompta/tags/rel670/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/rel670/include/template/dashboard.php	2013-11-12 10:04=
:21 UTC (rev 5539)
+++ phpcompta/tags/rel670/include/template/dashboard.php	2013-11-22 19:03=
:43 UTC (rev 5540)
@@ -307,7 +307,7 @@
   else :
 ?>
   <fieldset style=3D"height:50%;width:80%;background-color:white"><legen=
d><?php _('Aucun rapport d=C3=A9fini')?></legend>
-  <a href=3D"javascript:void(0)" onclick=3D"set_preference('.dossier::id=
().')"><?php echo _('Cliquez ici pour mettre =C3=A0 jour vos pr=C3=A9f=C3=
=A9rences')?></a>
+  <a href=3D"javascript:void(0)" onclick=3D"set_preference('<?php echo d=
ossier::id()?>')"><?php echo _('Cliquez ici pour mettre =C3=A0 jour vos p=
r=C3=A9f=C3=A9rences')?></a>
=20
 </fieldset>
 <?php



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


From MAILER-DAEMON Fri Nov 22 14:17:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VjwEF-0007MQ-Rl
	for mharc-phpcompta-dev@gnu.org; Fri, 22 Nov 2013 14:17:23 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 22 Nov 2013 20:06:16 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.113404.1385147843.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5541 - phpcompta/tags/rel670/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Nov 2013 19:17:23 -0000

Author: danydb
Date: 2013-11-22 20:06:16 +0100 (Fri, 22 Nov 2013)
New Revision: 5541

Modified:
   phpcompta/tags/rel670/include/class_acc_account_ledger.php
   phpcompta/tags/rel670/include/export_gl_pdf.php
   phpcompta/tags/rel670/include/impress_gl_comptes.inc.php
Log:
Task #0000916: PRINTGL et PRINTPOSTE

Modified: phpcompta/tags/rel670/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/rel670/include/class_acc_account_ledger.php	2013-11-22=
 19:03:43 UTC (rev 5540)
+++ phpcompta/tags/rel670/include/class_acc_account_ledger.php	2013-11-22=
 19:06:16 UTC (rev 5541)
@@ -146,7 +146,9 @@
         $Res=3D$this->db->exec_sql("select  jr_id,to_char(j_date,'DD.MM.=
YYYY') as j_date_fmt,j_date,".
                                  "case when j_debit=3D't' then j_montant=
 else 0 end as deb_montant,".
                                  "case when j_debit=3D'f' then j_montant=
 else 0 end as cred_montant,".
-                                 " jr_comment as description,jrn_def_nam=
e as jrn_name,".
+                                 " case when j_text is null or j_text =3D=
 '' then jr_comment=20
+                                   else jr_comment||' '||j_text  end
+                as description,jrn_def_name as jrn_name,".
                                  "j_debit, jr_internal,jr_pj_number,
 								 coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter ".
                                  ",pcm_lib ".

Modified: phpcompta/tags/rel670/include/export_gl_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/export_gl_pdf.php	2013-11-22 19:03:43 U=
TC (rev 5540)
+++ phpcompta/tags/rel670/include/export_gl_pdf.php	2013-11-22 19:06:16 U=
TC (rev 5541)
@@ -149,12 +149,12 @@
=20
         $i =3D 0;
 		$side=3D" ".$Poste->get_amount_side($solde);
-        $pdf->Cell($width[$i], 6, shrink_date($detail['j_date_fmt']), 0,=
 0, $lor[$i]);
+        $pdf->LongLine($width[$i], 6, shrink_date($detail['j_date_fmt'])=
, 0, $lor[$i]);
         $i++;
-        $pdf->Cell($width[$i], 6, $detail['jr_internal'], 0, 0, $lor[$i]=
);
+        $pdf->LongLine($width[$i], 6, $detail['jr_internal'], 0, $lor[$i=
] );
         $i++;
         /* limit set to 20 for the substring */
-        $pdf->Cell($width[$i], 6, mb_substr($detail['description'],0,42)=
, 0, 0, $lor[$i]);
+        $pdf->LongLine($width[$i], 6, mb_substr($detail['description'],0=
,120), 0,$lor[$i]);
         $i++;
         $pdf->Cell($width[$i], 6, $detail['jr_pj_number'], 0, 0, $lor[$i=
]);
         $i++;

Modified: phpcompta/tags/rel670/include/impress_gl_comptes.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/impress_gl_comptes.inc.php	2013-11-22 1=
9:03:43 UTC (rev 5540)
+++ phpcompta/tags/rel670/include/impress_gl_comptes.inc.php	2013-11-22 1=
9:06:16 UTC (rev 5541)
@@ -194,19 +194,6 @@
 	$i=3D0;
         foreach ($Poste->row as $detail)
         {
-	  if ($a=3D=3D0) {var_dump($detail);$a=3D1;}
-            /*
-                   [0] =3D> 1 [jr_id] =3D> 1
-                   [1] =3D> 01.02.2009 [j_date_fmt] =3D> 01.02.2009
-                   [2] =3D> 2009-02-01 [j_date] =3D> 2009-02-01
-                   [3] =3D> 0 [deb_montant] =3D> 0
-                   [4] =3D> 12211.9100 [cred_montant] =3D> 12211.9100
-                   [5] =3D> Ecriture douverture [description] =3D> Ecrit=
ure douverture
-                   [6] =3D> Op=C3=A9ration Diverses [jrn_name] =3D> Op=C3=
=A9ration Diverses
-                   [7] =3D> f [j_debit] =3D> f
-                   [8] =3D> 17OD-01-1 [jr_internal] =3D> 17OD-01-1
-                   [9] =3D> ODS1 [jr_pj_number] =3D> ODS1 ) 1
-             */
=20
             if ($detail['cred_montant'] > 0)
             {



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


From MAILER-DAEMON Fri Nov 22 14:22:05 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VjwIn-0000uR-8j
	for mharc-phpcompta-dev@gnu.org; Fri, 22 Nov 2013 14:22:05 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 22 Nov 2013 20:10:57 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.113407.1385148125.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5542 - phpcompta/tags/rel670/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Nov 2013 19:22:04 -0000

Author: danydb
Date: 2013-11-22 20:10:57 +0100 (Fri, 22 Nov 2013)
New Revision: 5542

Modified:
   phpcompta/tags/rel670/include/fiche.inc.php
Log:
Task #0000917: CARD : balance

Modified: phpcompta/tags/rel670/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/fiche.inc.php	2013-11-22 19:06:16 UTC (=
rev 5541)
+++ phpcompta/tags/rel670/include/fiche.inc.php	2013-11-22 19:10:57 UTC (=
rev 5542)
@@ -332,9 +332,7 @@
 			/* only not purged card */
 			if ($_GET['histo'] =3D=3D 5 && $solde['debit'] =3D=3D $solde['credit'=
])
 				continue;
-			$class =3D '';
-			if ($idx % 2 =3D=3D 0)
-				$class =3D 'class=3D"odd"';
+			$class =3D($idx % 2 =3D=3D 0) ?  'class=3D"odd"':'class=3D"even"';
 			$idx++;
                         $sum_cred=3Dbcadd($sum_cred,$solde['credit']);
                         $sum_deb=3Dbcadd($sum_deb,$solde['debit']);



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


From MAILER-DAEMON Fri Nov 22 14:23:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VjwKF-000105-2L
	for mharc-phpcompta-dev@gnu.org; Fri, 22 Nov 2013 14:23:35 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 22 Nov 2013 20:12:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.113408.1385148214.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5543 - phpcompta/trunk
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Nov 2013 19:23:33 -0000

Author: danydb
Date: 2013-11-22 20:12:28 +0100 (Fri, 22 Nov 2013)
New Revision: 5543

Modified:
   phpcompta/trunk/
Log:
Block 5540


Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-blocked
   - /phpcompta/trunk:1917,2460,2501,2508,2569,2610
   + /phpcompta/tags/rel670:5540 /phpcompta/trunk:1917,2460,2501,2508,256=
9,2610



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


From MAILER-DAEMON Fri Nov 22 14:24:19 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VjwKx-0001Ek-Av
	for mharc-phpcompta-dev@gnu.org; Fri, 22 Nov 2013 14:24:19 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 22 Nov 2013 20:13:12 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.113409.1385148258.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5544 - in phpcompta/trunk: . include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Nov 2013 19:24:17 -0000

Author: danydb
Date: 2013-11-22 20:13:12 +0100 (Fri, 22 Nov 2013)
New Revision: 5544

Modified:
   phpcompta/trunk/
   phpcompta/trunk/include/class_acc_account_ledger.php
   phpcompta/trunk/include/export_gl_pdf.php
   phpcompta/trunk/include/fiche.inc.php
   phpcompta/trunk/include/impress_gl_comptes.inc.php
Log:
Merged revisions 5541-5542 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel670

........
  r5541 | danydb | 2013-11-22 20:06:16 +0100 (ven., 22 nov. 2013) | 1 lin=
e
 =20
  Task #0000916: PRINTGL et PRINTPOSTE
........
  r5542 | danydb | 2013-11-22 20:10:57 +0100 (ven., 22 nov. 2013) | 1 lin=
e
 =20
  Task #0000917: CARD : balance
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel670:1-5535
   + /phpcompta/tags/rel670:1-5539,5541-5543

Modified: phpcompta/trunk/include/class_acc_account_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_account_ledger.php	2013-11-22 19:12=
:28 UTC (rev 5543)
+++ phpcompta/trunk/include/class_acc_account_ledger.php	2013-11-22 19:13=
:12 UTC (rev 5544)
@@ -146,7 +146,9 @@
         $Res=3D$this->db->exec_sql("select  jr_id,to_char(j_date,'DD.MM.=
YYYY') as j_date_fmt,j_date,".
                                  "case when j_debit=3D't' then j_montant=
 else 0 end as deb_montant,".
                                  "case when j_debit=3D'f' then j_montant=
 else 0 end as cred_montant,".
-                                 " jr_comment as description,jrn_def_nam=
e as jrn_name,".
+                                 " case when j_text is null or j_text =3D=
 '' then jr_comment=20
+                                   else jr_comment||' '||j_text  end
+                as description,jrn_def_name as jrn_name,".
                                  "j_debit, jr_internal,jr_pj_number,
 								 coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter ".
                                  ",pcm_lib ".

Modified: phpcompta/trunk/include/export_gl_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_gl_pdf.php	2013-11-22 19:12:28 UTC (re=
v 5543)
+++ phpcompta/trunk/include/export_gl_pdf.php	2013-11-22 19:13:12 UTC (re=
v 5544)
@@ -149,12 +149,12 @@
=20
         $i =3D 0;
 		$side=3D" ".$Poste->get_amount_side($solde);
-        $pdf->Cell($width[$i], 6, shrink_date($detail['j_date_fmt']), 0,=
 0, $lor[$i]);
+        $pdf->LongLine($width[$i], 6, shrink_date($detail['j_date_fmt'])=
, 0, $lor[$i]);
         $i++;
-        $pdf->Cell($width[$i], 6, $detail['jr_internal'], 0, 0, $lor[$i]=
);
+        $pdf->LongLine($width[$i], 6, $detail['jr_internal'], 0, $lor[$i=
] );
         $i++;
         /* limit set to 20 for the substring */
-        $pdf->Cell($width[$i], 6, mb_substr($detail['description'],0,42)=
, 0, 0, $lor[$i]);
+        $pdf->LongLine($width[$i], 6, mb_substr($detail['description'],0=
,120), 0,$lor[$i]);
         $i++;
         $pdf->Cell($width[$i], 6, $detail['jr_pj_number'], 0, 0, $lor[$i=
]);
         $i++;

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-11-22 19:12:28 UTC (rev 55=
43)
+++ phpcompta/trunk/include/fiche.inc.php	2013-11-22 19:13:12 UTC (rev 55=
44)
@@ -332,9 +332,7 @@
 			/* only not purged card */
 			if ($_GET['histo'] =3D=3D 5 && $solde['debit'] =3D=3D $solde['credit'=
])
 				continue;
-			$class =3D '';
-			if ($idx % 2 =3D=3D 0)
-				$class =3D 'class=3D"odd"';
+			$class =3D($idx % 2 =3D=3D 0) ?  'class=3D"odd"':'class=3D"even"';
 			$idx++;
                         $sum_cred=3Dbcadd($sum_cred,$solde['credit']);
                         $sum_deb=3Dbcadd($sum_deb,$solde['debit']);

Modified: phpcompta/trunk/include/impress_gl_comptes.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_gl_comptes.inc.php	2013-11-22 19:12:2=
8 UTC (rev 5543)
+++ phpcompta/trunk/include/impress_gl_comptes.inc.php	2013-11-22 19:13:1=
2 UTC (rev 5544)
@@ -194,19 +194,6 @@
 	$i=3D0;
         foreach ($Poste->row as $detail)
         {
-	  if ($a=3D=3D0) {var_dump($detail);$a=3D1;}
-            /*
-                   [0] =3D> 1 [jr_id] =3D> 1
-                   [1] =3D> 01.02.2009 [j_date_fmt] =3D> 01.02.2009
-                   [2] =3D> 2009-02-01 [j_date] =3D> 2009-02-01
-                   [3] =3D> 0 [deb_montant] =3D> 0
-                   [4] =3D> 12211.9100 [cred_montant] =3D> 12211.9100
-                   [5] =3D> Ecriture douverture [description] =3D> Ecrit=
ure douverture
-                   [6] =3D> Op=C3=A9ration Diverses [jrn_name] =3D> Op=C3=
=A9ration Diverses
-                   [7] =3D> f [j_debit] =3D> f
-                   [8] =3D> 17OD-01-1 [jr_internal] =3D> 17OD-01-1
-                   [9] =3D> ODS1 [jr_pj_number] =3D> ODS1 ) 1
-             */
=20
             if ($detail['cred_montant'] > 0)
             {



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


From MAILER-DAEMON Sat Nov 23 08:16:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VkD4K-0007Mx-J2
	for mharc-phpcompta-dev@gnu.org; Sat, 23 Nov 2013 08:16:16 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 23 Nov 2013 14:05:05 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.114039.1385212575.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r583 - 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, 23 Nov 2013 13:16:14 -0000

Author: danydb
Date: 2013-11-23 14:05:05 +0100 (Sat, 23 Nov 2013)
New Revision: 583

Modified:
   trunk/rapport_avance/sql/1-add-listing.sql
Log:
Change listing_param structure, add trigger for formatting lp_code

Modified: trunk/rapport_avance/sql/1-add-listing.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/1-add-listing.sql	2013-11-22 18:18:19 UTC (r=
ev 582)
+++ trunk/rapport_avance/sql/1-add-listing.sql	2013-11-23 13:05:05 UTC (r=
ev 583)
@@ -16,7 +16,6 @@
  l_id bigint constraint fk_listing_param_listing references rapport_adva=
nced.listing(l_id) on update cascade on delete cascade,
  lp_code text not null constraint c_lp_code check (length (trim(lp_code)=
)> 0),
  lp_comment text,
- l_card int default 0,
  l_order int,
  ad_id bigint constraint fk_listing_param_detail_attr_def references att=
r_def (ad_id),
  lp_card_saldo char(1) check (lp_card_saldo in ('C','D','S',NULL)),
@@ -27,7 +26,7 @@
  fp_signed integer,
  jrn_def_type character(3),
  tt_id integer,
- type_detail integer,
+ type_detail text not null,
  with_tmp_val account_type,
  type_sum_account bigint,
  operation_pcm_val account_type,
@@ -61,4 +60,27 @@
   ON rapport_advanced.listing_param
   FOR EACH ROW
   EXECUTE PROCEDURE rapport_advanced.formulaire_param_detail_jrn_def_id_=
ins_upd();
+ alter table rapport_advanced.listing_param add constraint ck_type_detai=
l check (type_detail in ('ATTR','COMP','FORM','SALDO','ACCOUNT'));
+
+CREATE OR REPLACE FUNCTION rapport_advanced.listing_param_code_transform=
()
+ RETURNS trigger
+    AS $function$
+    declare
+        sResult text;
+    begin
+        sResult :=3D lower(NEW.lp_code);
+
+        sResult :=3D translate(sResult,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=
=A2=C3=A4=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuo=
oc');
+        sResult :=3D translate(sResult,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!=
(){}(),;_&|"#''^<>*','');
+
+        NEW.lp_code=3Dupper(sResult);
+
+return NEW;
+
+end;
+$function$
+ LANGUAGE plpgsql;
+
+create trigger listing_param_code_transform_trg before insert or update =
of lp_code on rapport_advanced.listing_param
+    for each row execute procedure rapport_advanced.listing_param_code_t=
ransform();
 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 Nov 23 08:16:52 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VkD4u-0007OM-Q3
	for mharc-phpcompta-dev@gnu.org; Sat, 23 Nov 2013 08:16:52 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 23 Nov 2013 14:05:45 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.114040.1385212612.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r584 - 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, 23 Nov 2013 13:16:52 -0000

Author: danydb
Date: 2013-11-23 14:05:45 +0100 (Sat, 23 Nov 2013)
New Revision: 584

Modified:
   trunk/rapport_avance/ajax_listing_param_add.php
Log:
change ob_get_clean by ob_get_contents

Modified: trunk/rapport_avance/ajax_listing_param_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_listing_param_add.php	2013-11-23 13:05:05 U=
TC (rev 583)
+++ trunk/rapport_avance/ajax_listing_param_add.php	2013-11-23 13:05:45 U=
TC (rev 584)
@@ -9,7 +9,7 @@
 echo HtmlInput::title_box("Nouveau param=C3=A8tre", $cin);
 $obj=3Dnew RAPAV_Listing($id);
 $obj->add_parameter();
-$response =3D ob_get_clean();
+$response =3D ob_get_contents();
 ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');



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


From MAILER-DAEMON Sat Nov 23 08:17:10 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VkD5C-0007QL-0J
	for mharc-phpcompta-dev@gnu.org; Sat, 23 Nov 2013 08:17:10 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 23 Nov 2013 14:06:02 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.114041.1385212629.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r585 - 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, 23 Nov 2013 13:17:08 -0000

Author: danydb
Date: 2013-11-23 14:06:01 +0100 (Sat, 23 Nov 2013)
New Revision: 585

Modified:
   trunk/rapport_avance/ajax_listing_display_definition.php
Log:
change ob_get_clean by ob_get_contents

Modified: trunk/rapport_avance/ajax_listing_display_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/ajax_listing_display_definition.php	2013-11-23 1=
3:05:45 UTC (rev 584)
+++ trunk/rapport_avance/ajax_listing_display_definition.php	2013-11-23 1=
3:06:01 UTC (rev 585)
@@ -7,7 +7,7 @@
 echo '<p>';
 $obj->button_add_param();
 echo '</p>';
-$response =3D ob_get_flush();
+$response =3D ob_get_contents();
 ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');



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


From MAILER-DAEMON Sat Nov 23 08:19:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VkD7E-0008Ag-LQ
	for mharc-phpcompta-dev@gnu.org; Sat, 23 Nov 2013 08:19:16 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 23 Nov 2013 14:08:07 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.114044.1385212755.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r586 - in trunk/rapport_avance: . include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Nov 2013 13:19:15 -0000

Author: danydb
Date: 2013-11-23 14:08:07 +0100 (Sat, 23 Nov 2013)
New Revision: 586

Added:
   trunk/rapport_avance/ajax_save_param_listing.php
Modified:
   trunk/rapport_avance/
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/include/class_rapav_listing_formula.php
   trunk/rapport_avance/include/class_rapav_listing_param.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/template/listing_param_input.php
   trunk/rapport_avance/include/template/rapav_listing_definition.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Save Formula_attribute for Listing


Property changes on: trunk/rapport_avance
___________________________________________________________________
Name: svn:ignore
   + .a.kate-swp


Modified: trunk/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax.php	2013-11-23 13:06:01 UTC (rev 585)
+++ trunk/rapport_avance/ajax.php	2013-11-23 13:08:07 UTC (rev 586)
@@ -145,6 +145,12 @@
     case 'listing_param_add':
         include 'ajax_listing_param_add.php';
         exit();
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    // save a param to a listing
+    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    case 'save_param_listing':
+        include 'ajax_save_param_listing.php';
+        exit();
     default:
         if ( DEBUG) var_dump($_GET);
         die ("Aucune action demand=C3=A9e");

Added: trunk/rapport_avance/ajax_save_param_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/ajax_save_param_listing.php	                    =
    (rev 0)
+++ trunk/rapport_avance/ajax_save_param_listing.php	2013-11-23 13:08:07 =
UTC (rev 586)
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @file
+ * @brief sauve la nouvelle ligne de d=C3=A9tail (listing) et renvoie 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
+ *=20
+ * Param=C3=A8tre entr=C3=A9e
+ *    - gDossier
+ *    - ac
+ *    - plugin_code
+ *    - p_id=20
+ *    - tab valeurs : formula, compute_id, new_account_id, new_attribute=
_id
+ *
+ * Pour attribut :=20
+ *    - attribute_card : num=C3=A9rique ad_id
+ *
+ */
+require_once 'class_impress.php';
+require_once 'include/class_rapav_listing_param.php';
+$formula =3D new RAPAV_Listing_Param_SQL();
+// var_dump($_GET);
+switch ($tab)
+{
+   /* case 'formula':
+        $acc_formula =3D new RAPAV_Formula();
+        $acc_formula->fp_formula =3D $formula_new;
+        $acc_formula->p_id =3D $p_id;
+        $acc_formula->type_detail =3D 1;
+        $acc_formula->jrn_def_id =3D $p_ledger;
+        $acc_formula->date_paid =3D (isset($p_paid)) ? 1 : 0;
+        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_param_detail('%s','%s','%s','%s')\""
+                                    , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $acc_formula->fp_id));
+            $html.=3D'</td>';
+        }
+        break;
+    case 'compute_id':
+        $acc_compute =3D new RAPAV_Compute();
+        $acc_compute->fp_formula =3D $form_compute;
+        $acc_compute->p_id =3D $p_id;
+        $acc_compute->type_detail =3D 3;
+        $acc_compute->jrn_def_id =3D null;
+        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_param_detail('%s','%s','%s','%s')\""
+                                    , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $acc_compute->fp_id));
+            $html.=3D'</td>';
+        }
+        break;
+    case 'new_account_id':
+        $acc_account =3D new RAPAV_Account();
+        $acc_account->tmp_val =3D $account_first;
+        $acc_account->with_tmp_val =3D $account_second;
+        $acc_account->p_id =3D $p_id;
+        $acc_account->type_detail =3D 4;
+        $acc_account->type_sum_account =3D $account_sum_type;
+        $acc_account->jrn_def_id =3D $p_ledger;
+        $acc_account->date_paid =3D (isset($p_paid)) ? 1 : 0;
+        if ($acc_account->verify() =3D=3D 1)
+        {
+            $code =3D 'nok';
+            $html =3D $acc_account->errcode;
+        } else
+        {
+            $acc_account->insert();
+            $fp_id =3D $acc_account->fp_id;
+            $code =3D 'ok';
+            $html =3D '<td>';
+            ob_start();
+            $acc_account->display_row();
+            $html.=3Dob_get_contents();
+            ob_end_clean();
+            $html.=3D '</td>';
+            $html.=3D'<td id=3D"del_' . $acc_account->fp_id . '">';
+            $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"delete_param_detail('%s','%s','%s','%s')\""
+                                    , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $acc_account->fp_id));
+            $html.=3D'</td>';
+        }
+        break;*/
+    case 'new_attribute_id':
+        ob_start();
+        $attr =3D new RAPAV_Formula_Attribute($formula, $listing_id);
+        $attr->save($_GET);
+        $attr->load();
+        $lp_id=3D$attr->data->getp("lp_id");
+        $code =3D 'ok';
+        $html=3D"";
+        echo td($attr->display_code());
+        echo td($attr->display_comment());
+        echo td($attr->display_order());
+        echo td($attr->display());
+        $html.=3Dob_get_contents();
+        ob_end_clean();
+        $html.=3D'<td id=3D"del_' .$lp_id . '">';
+        $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D\"d=
elete_listing_detail('%s','%s','%s','%s')\""
+                                , $_REQUEST['plugin_code'], $_REQUEST['a=
c'], $_REQUEST['gDossier'], $lp_id));
+        $html.=3D'</td>';
+        break;
+}
+
+//echo $html;exit();
+$html =3D escape_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>
+<lp_id>$lp_id</lp_id>
+<l_id>$listing_id</l_id>
+</data>
+EOF;
+?>       =20
\ No newline at end of file

Modified: trunk/rapport_avance/include/class_rapav_listing_formula.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_listing_formula.php	2013-11-=
23 13:06:01 UTC (rev 585)
+++ trunk/rapport_avance/include/class_rapav_listing_formula.php	2013-11-=
23 13:08:07 UTC (rev 586)
@@ -13,15 +13,177 @@
  */
 abstract class RAPAV_Listing_Formula
 {
-    abstract public function display();
-    abstract public function compute();
+
+    abstract public function compute($p_start, $p_end);
+
     abstract public function input();
-    /**
-     *=20
-     * @param $p_obj RAPAV_Listing_Param_SQL
-     */
-    public function make_object($p_obj)
+
+    abstract function save($p_array);
+
+    function save_computed()
     {
        =20
     }
+
+    function get_ledger_name()
+    {
+        global $cn;
+        $ledger =3D "";
+        if ($this->data->jrn_def_id =3D=3D null || $this->data->jrn_def_=
id =3D=3D -1)
+        {
+            $ledger =3D " tous les journaux";
+        } else
+        {
+            $tledger =3D $cn->get_value('select jrn_def_name from jrn_de=
f where jrn_def_id=3D$1', array($this->data->jrn_def_id));
+            $ledger.=3D"  le journal " . $tledger;
+        }
+        return $ledger;
+    }
+
+    static function input_ledger()
+    {
+        global $cn;
+        $select =3D new ISelect('p_ledger');
+        $a_ledger =3D $cn->make_array('select jrn_def_id,jrn_def_name fr=
om jrn_def order by 2', 1);
+        $a_ledger[0]['label'] =3D '-- Tous les journaux -- ';
+        $select->value =3D $a_ledger;
+
+        echo '<p> Filtrage par journal ' . $select->input() . '</p>';
+    }
+
+    static function input_date_paiement()
+    {
+        $ck_paid =3D new ICheckBox('p_paid');
+        echo '<p> La date donn=C3=A9e concerne la date de paiement, ce q=
ui limitera la recherche aux journaux VEN et ACH ';
+        echo HtmlInput::infobulle(36);
+        echo $ck_paid->input();
+        echo '</p>';
+    }
+
+    function set($p_array)
+    {
+        $this->data->setp("code", $p_array["code_id"]);
+        $this->data->setp("comment", $p_array["comment"]);
+        $this->data->setp("order", $p_array["order"]);
+    }
+
+    function set_to_null($p_array)
+    {
+        foreach ($p_array as $key)
+        {
+            $this->data->$key =3D null;
+        }
+    }
+
+    static function make_object(RAPAV_Listing_Param_SQL $obj)
+    {
+        switch ($obj->getp('formula_type'))
+        {
+            case 'ATTR':
+                $ret=3Dnew Rapav_Formula_Attribute($obj);
+                break;
+
+            default:
+                throw new Exception ('Object '.$obj.' invalide ');
+                break;
+          =20
+        }
+        return $ret;
+    }
+    function display_code()
+    {
+        return $this->data->getp('code');
+    }
+    function display_comment()
+    {
+        return $this->data->getp('comment');
+    }
+    function display_order()
+    {
+        return $this->data->getp('order');
+    }
+    function load()
+    {
+        $this->data->load();
+    }
+
 }
+
+////////////////////////////////////////////////////////////////////////=
///////////////////////////
+// RAPAV_Formula_Attribute
+////////////////////////////////////////////////////////////////////////=
///////////////////////////
+/**
+ * @brief Class for the listing detail attribute, this class use RAPAV_L=
isting_Param_SQL
+ * the specific columns are attribut_card
+ */
+class RAPAV_Formula_Attribute extends RAPAV_Listing_Formula
+{
+
+    var $data;           /**< RAPAV_Listing_Param_SQL objet */
+    var $cat;            /**< categorie id */
+    var $sig;            /**< Object signature */
+
+    function __construct(RAPAV_Listing_Param_SQL $obj, $p_cat_id =3D 0)
+    {
+        global $cn;
+        $this->data =3D $obj;
+        if ($p_cat_id =3D=3D 0)
+        {
+            $this->cat =3D $cn->get_value('select fd_id=20
+                                from rapport_advanced.listing=20
+                                where
+                                l_id=3D$1
+                                ', array($this->data->getp('listing_id')=
));
+            if ($this->cat =3D=3D "")
+                throw new Exception(__FILE__ . ':' . __LINE__ . 'Aucune =
cat=C3=A9gorie d=C3=A9finie');
+        }
+        else
+        {
+            $this->cat =3D $p_cat_id;
+        }
+        $this->sig =3D 'ATTR';
+    }
+
+    function display()
+    {
+        global $cn;
+        $desc =3D $cn->get_value('select ad_text from attr_def where ad_=
id=3D$1', array($this->data->getp('attribut_card')));
+        return "Utilisant l'attribut " . h($desc);
+    }
+
+    function compute($p_start, $p_end)
+    {
+        return 0;
+    }
+
+    function input()
+    {
+        global $cn;
+        $select =3D new ISelect('p_attribute');
+
+        $select->value =3D $cn->make_array('select a.ad_id,a.ad_text=20
+                                        from
+                                        attr_def as a join jnt_fic_attr =
as j on (a.ad_id=3Dj.ad_id)
+                                        where
+                                        fd_id=3D' . $this->cat . ' order=
 by 2');
+
+        $select->selected =3D $this->data->getp('attribut_card');
+        return $select->input();
+    }
+
+    function save($p_array)
+    {
+        parent::set($p_array);
+        $this->data->setp('listing_id', $p_array['listing_id']);
+        /* Clean everything but keep the lp_id, l_id, with_Card and ad_i=
d  + common */
+        $a_toclean =3D explode(',', 'operation_pcm_val,with_tmp_val,tmp_=
val, date_paid,jrn_def_id,type_sum_account, tt_id, jrn_def_type, fp_signe=
d, fp_formula, tva_id' .
+                ',lp_card_saldo');
+
+        parent::set_to_null($a_toclean);
+        $this->data->setp('with_card', 'N');
+        $this->data->setp('attribut_card', $p_array['p_attribute']);
+        $this->data->setp('formula_type', 'ATTR');
+        $this->data->save();
+    }
+
+}

Modified: trunk/rapport_avance/include/class_rapav_listing_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_rapav_listing_param.php	2013-11-23=
 13:06:01 UTC (rev 585)
+++ trunk/rapport_avance/include/class_rapav_listing_param.php	2013-11-23=
 13:08:07 UTC (rev 586)
@@ -13,9 +13,10 @@
  * @author danydb
  */
 require_once 'class_rapport_avance_sql.php';
+require_once 'class_rapav_listing_formula.php';
=20
 class RAPAV_Listing_Param {
-    private  $Param;  /*!< RAPAV_Listing_Param_SQL */
+    var  $Param;  /*!< RAPAV_Listing_Param_SQL */
    =20
     /**
      * constructor, initialize Data with a RAPAV_Listing_Param_SQL
@@ -64,7 +65,7 @@
       =20
        for ($i=3D0;$i<count($a_param_id);$i++)
        {
-           $a_listing_param[]=3Dnew RAPAV_Listing_Param($a_param_id['lp_=
id'][$i]);
+           $a_listing_param[]=3Dnew RAPAV_Listing_Param($a_param_id[$i][=
'lp_id']);
        }
        return $a_listing_param;
     }
@@ -77,7 +78,8 @@
         $code=3Dnew IText('code_id');
         $comment=3Dnew IText('comment');
         $order=3Dnew INum('order');
-       =20
+        $order->value=3D10;
+        $attribute=3Dnew RAPAV_Formula_Attribute($this->Param,$p_id);
         require 'template/listing_param_input.php';
     }
 }

Modified: trunk/rapport_avance/include/class_rapport_avance_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-23 =
13:06:01 UTC (rev 585)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-11-23 =
13:08:07 UTC (rev 586)
@@ -319,7 +319,9 @@
=20
 class RAPAV_Listing_Param_SQL extends Phpcompta_Sql
 {
-
+/*
+ *  operation_pcm_val,with_tmp_val,tmp_val,date_paid,jrn_def_id,type_sum=
_account,type_detail,tt_id,jrn_def_type,fp_signed,fp_formula,tva_id,lp_wi=
th_card,lp_card_saldo,ad_id,l_order,l_card,lp_comment,lp_code,l_id,lp_id
+ */
     function __construct($p_id =3D -1)
     {
=20

Modified: trunk/rapport_avance/include/template/listing_param_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/listing_param_input.php	2013-11=
-23 13:06:01 UTC (rev 585)
+++ trunk/rapport_avance/include/template/listing_param_input.php	2013-11=
-23 13:08:07 UTC (rev 586)
@@ -1,32 +1,41 @@
 <div>
-    <table>
+    <form id=3D"common_frm">
+    <?php echo HtmlInput::hidden("listing_id", $p_id); ?>
+        <table >
+            <tr>
+                <td>
+                    <label>Code</label>=20
+                  =20
+                </td>
+                <td>
+                    <?php echo $code->input() ?>
+                </tD>
+                <td>
+                     <p id=3D"code_id_span" class=3D"error"></p>
+                </td>
+               =20
+               =20
+            </tr>
+            <tr>
+                <td>
+                    <label>Commentaire</label>
+                </td>
+                <td>
+                    <?php echo $comment->input(); ?>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label>Ordre d'apparition</label>
+                </td>
+                <td>
+                    <?php echo $order->input(); ?>
+                </td>
+            </tr>
+        </table>
+    </form>
+    <table id=3D"table_<?php echo $p_id;?>" style=3D"width:90%;margin-le=
ft:5%" >
         <tr>
-            <td>
-                <label>Code</label>=20
-            </td>
-            <td>
-                <?php echo $code->input() ?>
-            </tD>
-        </tr>
-        <tr>
-            <td>
-                <label>Commentaire</label>
-            </td>
-            <td>
-                <?php echo $comment->input(); ?>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label>Order apparition</label>
-            </td>
-            <td>
-                <?php echo $order->input(); ?>
-            </td>
-        </tr>
-    </table>
-    <table style=3D"width:90%;margin-left:5%" >
-        <tr>
             <td id=3D"new_formula_id_bt" class=3D"tool" style=3D"backgro=
und:red">
                 <a class=3D"mtitle"  href=3D"javascript:void(0)"  onclic=
k=3D"show_listing_formula('new_formula_id')">
                     Formule
@@ -44,10 +53,15 @@
                     Poste comptable
                 </a>
             </td>
+            <td id=3D"new_attribute_id_bt"  class=3D"tool" style=3D"back=
ground:inherit">
+                <a class=3D"mtitle" href=3D"javascript:void(0)"   onclic=
k=3D"show_listing_formula('new_attribute_id')">
+                    Attribut
+                </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 style=3D"width:90%;height:290px;margin-left:5%">
+        <span class=3D"error" id=3D"info_listing_param_input_div_id"></s=
pan>
=20
         <div style=3D"padding: 10px">
             <div id=3D"new_formula_id" style=3D"display:block">
@@ -95,10 +109,27 @@
                     <?php echo HtmlInput::hidden('tab', 'new_account_id'=
) ?>
                     <?php echo "account" ?>
=20
-                    <?php echo HtmlInput::submit('save', 'Sauve') ?>
+                    <p>
+                        <?php echo HtmlInput::submit('save', 'Sauve') ?>
+                    </p>
=20
                 </form>
             </div>
+            <div id=3D"new_attribute_id" style=3D"display:none">
+                <form id=3D"new_padeattr" method=3D"POST" onsubmit=3D"sa=
ve_param_listing('new_padeattr');
+                        return false">
+
+                    <?php echo HtmlInput::request_to_hidden(array('gDoss=
ier', 'ac', 'plugin_code', 'p_id')) ?>
+
+                    <?php echo HtmlInput::hidden('tab', 'new_attribute_i=
d') ?>
+                    <?php echo $attribute->input(); ?>
+
+                    <p>
+                        <?php echo HtmlInput::submit('save', 'Sauve') ?>
+                    </p>
+
+                </form>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file

Modified: trunk/rapport_avance/include/template/rapav_listing_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/rapav_listing_definition.php	20=
13-11-23 13:06:01 UTC (rev 585)
+++ trunk/rapport_avance/include/template/rapav_listing_definition.php	20=
13-11-23 13:08:07 UTC (rev 586)
@@ -30,6 +30,9 @@
             Formules
         </th>
         <th>
+            Ordre
+        </th>
+        <th>
             action
         </th>
     </tr>
@@ -37,17 +40,23 @@
     $nb=3Dcount($this->a_detail);
     for ($i=3D0;$i<$nb;$i++):
 ?>
-    <tr>
+    <tr id=3D"tr_<?php echo $this->a_detail[$i]->Param->getp('lp_id')?>"=
>
         <td>
-           <?php $this->a_detail[$i]->Param->getp('code'); ?>
+           <?php echo $this->a_detail[$i]->Param->getp('code'); ?>
         </td>
         <td>
-           <?php $this->a_detail[$i]->Param->getp('comment'); ?>
+           <?php echo h($this->a_detail[$i]->Param->getp('comment')); ?>
         </td>
         <td>
-            Formule
+            <?php=20
+            $obj=3D   RAPAV_Listing_Formula::make_object($this->a_detail=
[$i]->Param);
+            echo $obj->display();
+            ?>
         </td>
         <td>
+            <?php echo $this->a_detail[$i]->Param->getp('order'); ?>
+        </td>
+        <td>
             Efface / modifie
         </td>
        =20

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-23 13:06:01 UTC (rev=
 585)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-23 13:08:07 UTC (rev=
 586)
@@ -1,9 +1,9 @@
=20
=20
-content[200]=3D"Le code doit =C3=AAtre unique pour ce formulaire";
-content[201]=3D"Formula TODO";
-content[203]=3D"Utiliser le % pour indiquer les postes comptables qui en=
 d=C3=A9pendent ex: 70% pour reprendre tous les comptes commen=C3=A7ant p=
ar 70";
-content[204]=3D"Filtrer en donnant une date, partie de la description ou=
 de la d=C3=A9claration";
+content[200] =3D "Le code doit =C3=AAtre unique pour ce formulaire";
+content[201] =3D "Formula TODO";
+content[203] =3D "Utiliser le % pour indiquer les postes comptables qui =
en d=C3=A9pendent ex: 70% pour reprendre tous les comptes commen=C3=A7ant=
 par 70";
+content[204] =3D "Filtrer en donnant une date, partie de la description =
ou de la d=C3=A9claration";
=20
 /**
  *@brief show the definition of a form and let it modify it
@@ -12,226 +12,228 @@
  *@param dossier gDossier
  *@param f_id pk of form_def
  */
-function rapav_form_def(plugin_code,ac,dossier,f_id)
+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);
-	}
+    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 =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        remove_waiting_box();
+                        var answer =3D req.responseText;
+                        $('form_mod_div').innerHTML =3D answer;
+                        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)
+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;
-				}
-			}
-			);
+    try
+    {
+        var querystring =3D 'plugin_code=3D' + plugin_code + '&ac=3D' + =
ac + '&gDossier=3D' + dossier + '&act=3Dadd_row_definition';
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        remove_waiting_box();
+                        var answer =3D req.responseText;
+                        var mytable =3D g("table_formulaire_definition_i=
d").tBodies[0];
+                        var nNumberRow =3D mytable.rows.length;
+                        var oRow =3D mytable.insertRow(nNumberRow);
+                        oRow.innerHTML =3D answer;
+                    }
+                }
+        );
=20
-	}catch (e)
-	{
-		alert(e.message);
-	}
+    } catch (e)
+    {
+        alert(e.message);
+    }
 }
=20
 /**
  * @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)
+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(90);
-					var nLeft=3D"200px";
-					var str_style=3D"top:"+nTop+"px;left:"+nLeft+";width:70em;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();
-				}
-			}
-			);
+    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 =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        remove_waiting_box();
+                        removeDiv('param_detail_div');
+                        var nTop =3D calcy(90);
+                        var nLeft =3D "200px";
+                        var str_style =3D "top:" + nTop + "px;left:" + n=
Left + ";width:70em;height:auto";
+                        add_div({
+                            id: 'param_detail_div',
+                            style: str_style,
+                            cssclass: 'inner_box',
+                            drag: 1
+                        });
+                        $('param_detail_div').innerHTML =3D req.response=
Text;
+                        req.responseText.evalScripts();
+                    }
+                }
+        );
=20
-	}catch (e)
-	{
-		alert("add_param_detail"+e.message);
-	}
+    } catch (e)
+    {
+        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)
+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();
-				}
-			}
-			);
+    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 =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        remove_waiting_box();
+                        removeDiv('search_code_div');
+                        var nTop =3D calcy(80);
+                        var nLeft =3D "400px";
+                        var str_style =3D "top:" + nTop + "px;left:" + n=
Left + ";width:50em;height:auto;z-index:4";
+                        add_div({
+                            id: 'search_code_div',
+                            style: str_style,
+                            cssclass: 'inner_box',
+                            drag: 1
+                        });
+                        $('search_code_div').innerHTML =3D req.responseT=
ext;
+                        //req.responseText.evalScripts();
+                    }
+                }
+        );
=20
-	}catch (e)
-	{
-		alert("add_param_detail"+e.message);
-	}
+    } catch (e)
+    {
+        alert("add_param_detail" + e.message);
+    }
 }
 /**
  *@brief delete a parameter detail
  */
-function delete_param_detail(plugin_code,ac,dossier,fp_id)
+function delete_param_detail(plugin_code, ac, dossier, fp_id)
 {
-	try
-	{
-		if ( ! confirm("Confirmez-vous l'effacement ?")) { return false;}
-		waiting_box();
+    try
+    {
+        if (!confirm("Confirmez-vous l'effacement ?")) {
+            return false;
+        }
+        waiting_box();
=20
-		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);
-	}
+        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 =3D new 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  montre les d=C3=A9tails d'un formulaire
  */
-function rapav_form_param(plugin_code,ac,dossier,f_id)
+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);
-	}
+    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 =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        remove_waiting_box();
+                        var answer =3D req.responseText;
+                        $('form_mod_div').innerHTML =3D answer;
+                        answer.evalScripts()
+                    }
+                }
+        );
+    }
+    catch (e)
+    {
+        alert(e.message);
+    }
 }
 /**
  * @brief montre le div contenant le type de formule pour les rapports
  */
 function show_rapport_formula(p_toshow)
 {
-	try
-	{
-		var div=3D['new_account_tva_id','new_formula_id','new_compute_id','new=
_account_id','new_reconcile_id'];
-		for (var r =3D0;r<div.length;r++ ) {
-			$(div[r]).hide();
-			$(div[r]+'_bt').style.backgroundColor=3D"inherit";
+    try
+    {
+        var div =3D ['new_account_tva_id', 'new_formula_id', 'new_comput=
e_id', 'new_account_id', 'new_reconcile_id'];
+        for (var r =3D 0; r < div.length; r++) {
+            $(div[r]).hide();
+            $(div[r] + '_bt').style.backgroundColor =3D "inherit";
=20
-		}
-		$(p_toshow).show();
-		$(p_toshow+'_bt').style.backgroundColor=3D"red";
-	} catch (e)
-{
-		alert (e.message);
-	}
+        }
+        $(p_toshow).show();
+        $(p_toshow + '_bt').style.backgroundColor =3D "red";
+    } catch (e)
+    {
+        alert(e.message);
+    }
=20
 }
 /**
@@ -239,20 +241,20 @@
  */
 function show_listing_formula(p_toshow)
 {
-	try
-	{
-		var div=3D['new_formula_id','new_compute_id','new_account_id'];
-		for (var r =3D0;r<div.length;r++ ) {
-			$(div[r]).hide();
-			$(div[r]+'_bt').style.backgroundColor=3D"inherit";
+    try
+    {
+        var div =3D ['new_formula_id', 'new_compute_id', 'new_account_id=
', 'new_attribute_id'];
+        for (var r =3D 0; r < div.length; r++) {
+            $(div[r]).hide();
+            $(div[r] + '_bt').style.backgroundColor =3D "inherit";
=20
-		}
-		$(p_toshow).show();
-		$(p_toshow+'_bt').style.backgroundColor=3D"red";
-	} catch (e)
-{
-		alert (e.message);
-	}
+        }
+        $(p_toshow).show();
+        $(p_toshow + '_bt').style.backgroundColor =3D "red";
+    } catch (e)
+    {
+        alert(e.message);
+    }
=20
 }
 /**
@@ -260,128 +262,130 @@
  */
 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');
+    try
+    {
+        var qs =3D $(p_form_id).serialize() + '&act=3Dsave_param_detail'=
;
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: qs,
+                    onFailure: error_get_predef,
+                    onSuccess: function infodiv(req, json) {
+                        try {
+                            remove_waiting_box();
+                            var answer =3D req.responseXML;
+                            var acode =3D answer.getElementsByTagName('c=
ode');
+                            var ap_id =3D answer.getElementsByTagName('p=
_id');
+                            var html =3D answer.getElementsByTagName('ht=
ml');
=20
-						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;
-								removeDiv('param_detail_div');
+                            if (acode.length =3D=3D 0) {
+                                var rec =3D req.responseText;
+                                alert('erreur :' + rec);
+                            }
+                            var code =3D acode[0].firstChild.nodeValue;
+                            var code_xml =3D getNodeText(html[0]);
+                            var code_html =3D unescape_xml(code_xml);
+                            if (code =3D=3D 'ok')
+                            {
+                                var afpid =3D answer.getElementsByTagNam=
e('fp_id');
+                                var fp_id =3D afpid[0].firstChild.nodeVa=
lue;
+                                var p_id =3D ap_id[0].firstChild.nodeVal=
ue;
+                                // Ajoute une ligne avec r=C3=A9sultat
+                                var mytable =3D g("table_" + p_id).tBodi=
es[0];
+                                var nNumberRow =3D mytable.rows.length;
+                                var oRow =3D mytable.insertRow(nNumberRo=
w);
+                                oRow.id =3D "tr_" + fp_id;
+                                oRow.innerHTML =3D code_html;
+                                removeDiv('param_detail_div');
=20
-							}
-						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);
-					}
+                            }
+                            if (code =3D=3D 'nok')
+                            {
+                                // montre erreur
+                                $('param_detail_info_div').innerHTML =3D=
 code_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);
+                        }
=20
-				}
-			}
-			);
-	}
-	catch(e)
-	{
-		alert(e.message);
-	}
+                    }
+                }
+        );
+    }
+    catch (e)
+    {
+        alert(e.message);
+    }
=20
-	return false;
+    return false;
 }
-function rapav_declaration_display(plugin_code,ac,dossier,d_id)
+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);
-	}
+    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 =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        remove_waiting_box();
+                        var answer =3D req.responseText;
+                        $('declaration_display_div').innerHTML =3D answe=
r;
+                        answer.evalScripts()
+                    }
+                }
+        );
+    }
+    catch (e)
+    {
+        alert(e.message);
+    }
 }
-function rapav_declaration_delete(plugin_code,ac,dossier,d_id)
+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);
-	}
+    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_i=
d=3D" + d_id;
+        var action =3D new 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-t=
hrough";
+                        $('tr_' + d_id).style.color =3D "red";
+                        $('del_' + d_id).innerHTML =3D "";
+                        $('mod_' + d_id).innerHTML =3D "";
+                    }
+                }
+        );
+    }
+    catch (e)
+    {
+        alert(e.message);
+    }
 }
 /**
  * @brief export of a form
@@ -391,24 +395,24 @@
  * @param d_id id
  * @returns {undefined}
  */
-function rapav_form_export(plugin_code,ac,dossier,d_id)
+function rapav_form_export(plugin_code, ac, dossier, d_id)
 {
-	try {
-		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Drapav_form_export'+"&d_id=3D"+d_id;
-		var action=3Dnew Ajax.Request(
-			"ajax.php",
-			{
-				method:'get',
-				parameters:querystring,
-				onFailure:error_get_predef,
-				onSuccess:null
-			}
-			);
+    try {
+        var querystring =3D 'plugin_code=3D' + plugin_code + '&ac=3D' + =
ac + '&gDossier=3D' + dossier + '&act=3Drapav_form_export' + "&d_id=3D" +=
 d_id;
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: null
+                }
+        );
=20
-	}catch (e)
-	{
-		alert(e.message);
-	}
+    } catch (e)
+    {
+        alert(e.message);
+    }
 }
 /**
  * @brief Remove a template
@@ -418,38 +422,38 @@
  * @param f_id pk of form_def
  *
  * @note sprintf("rapav_remove_doc_template('%s','%s','%s','%s')",
-						$_REQUEST['plugin_code'],
-						$_REQUEST['ac'],
-						$_REQUEST['gDossier'],
-						$this->f_id
-*/
-function rapav_remove_doc_template(plugin_code,ac,dossier,f_id)
+ $_REQUEST['plugin_code'],
+ $_REQUEST['ac'],
+ $_REQUEST['gDossier'],
+ $this->f_id
+ */
+function rapav_remove_doc_template(plugin_code, ac, dossier, f_id)
 {
-	if ( ! confirm ("Confirmez-vous l'effacement de ce mod=C3=A8le ?"))
-		{
-			return;
-		}
-	try {
-		var querystring=3D'plugin_code=3D'+plugin_code+'&ac=3D'+ac+'&gDossier=3D=
'+dossier+'&act=3Drapav_remove_doc_template'+"&f_id=3D"+f_id;
-		var action=3Dnew Ajax.Request(
-			"ajax.php",
-			{
-				method:'get',
-				parameters:querystring,
-				onFailure:error_get_predef,
-				onSuccess:function() {
-					$('rapav_template').style.textDecoration=3D'line-through';
-					$('rapav_template').style.color=3D'red';
-					$('rapav_template_ctl').innerHTML=3D'';
-					$('rapav_new_file').style.display=3D'block';
-				}
-			}
-			);
+    if (!confirm("Confirmez-vous l'effacement de ce mod=C3=A8le ?"))
+    {
+        return;
+    }
+    try {
+        var querystring =3D 'plugin_code=3D' + plugin_code + '&ac=3D' + =
ac + '&gDossier=3D' + dossier + '&act=3Drapav_remove_doc_template' + "&f_=
id=3D" + f_id;
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function() {
+                        $('rapav_template').style.textDecoration =3D 'li=
ne-through';
+                        $('rapav_template').style.color =3D 'red';
+                        $('rapav_template_ctl').innerHTML =3D '';
+                        $('rapav_new_file').style.display =3D 'block';
+                    }
+                }
+        );
=20
-	}catch (e)
-	{
-		alert(e.message);
-	}
+    } catch (e)
+    {
+        alert(e.message);
+    }
 }
 /**
  * Receive a json object and display a window to add a new listing
@@ -464,7 +468,7 @@
 {
     console.log(json)
     try {
-        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_modify' + "&cin=3D=
" + json.cin + '&cout=3D' + json.cout+'&id=3D'+json.id;
+        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_modify' + "&cin=3D=
" + json.cin + '&cout=3D' + json.cout + '&id=3D' + json.id;
         waiting_box();
         var action =3D new Ajax.Request(
                 "ajax.php",
@@ -482,10 +486,10 @@
                                 throw 'cannot find ctl element';
                             }
                             remove_waiting_box();
-                            var code_html =3D getNodeText(html[0]);=20
+                            var code_html =3D getNodeText(html[0]);
                             code_html =3D unescape_xml(code_html);
-                            var position=3Dfixed_position(451,217);
-                            add_div({'id':json.cout,'cssclass':'inner_bo=
x','drag':1,'style':position});
+                            var position =3D fixed_position(451, 217);
+                            add_div({'id': json.cout, 'cssclass': 'inner=
_box', 'drag': 1, 'style': position});
                             $(json.cout).innerHTML =3D code_html;
                         } catch (e) {
                             console.log(e);
@@ -508,8 +512,8 @@
  */
 function check_listing_add(form_id)
 {
-    var str=3D$(form_id)['name'].value;
-    if ( str.trim()=3D=3D'') {
+    var str =3D $(form_id)['name'].value;
+    if (str.trim() =3D=3D '') {
         error_message('Le nom est obligatoire');
         return false;
     }
@@ -528,7 +532,7 @@
 {
     console.log(json)
     try {
-        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_remove_modele' + "=
&cin=3D" + json.cin + '&cout=3D' + json.cout+'&id=3D'+json.id;
+        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_remove_modele' + "=
&cin=3D" + json.cin + '&cout=3D' + json.cout + '&id=3D' + json.id;
         waiting_box();
         var action =3D new Ajax.Request(
                 "ajax.php",
@@ -546,10 +550,10 @@
                                 throw 'cannot find ctl element';
                             }
                             remove_waiting_box();
-                            var code_html =3D getNodeText(html[0]);=20
+                            var code_html =3D getNodeText(html[0]);
                             code_html =3D unescape_xml(code_html);
-                             console.log(code_html);
-                           $(json.cout).innerHTML =3D code_html;
+                            console.log(code_html);
+                            $(json.cout).innerHTML =3D code_html;
                         } catch (e) {
                             console.log(e);
                             console.log(code_html);
@@ -576,11 +580,11 @@
  *     - cout
  *
  */
-function listing_definition (json)
+function listing_definition(json)
 {
     console.log(json)
     try {
-        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_display_definition=
' + "&cin=3D" + json.cin + '&cout=3D' + json.cout+'&id=3D'+json.id;
+        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_display_definition=
' + "&cin=3D" + json.cin + '&cout=3D' + json.cout + '&id=3D' + json.id;
         waiting_box();
         var action =3D new Ajax.Request(
                 "ajax.php",
@@ -598,10 +602,10 @@
                                 throw 'cannot find ctl element';
                             }
                             remove_waiting_box();
-                            var code_html =3D getNodeText(html[0]);=20
+                            var code_html =3D getNodeText(html[0]);
                             code_html =3D unescape_xml(code_html);
-                             console.log(code_html);
-                           $(json.cout).innerHTML =3D code_html;
+                            console.log(code_html);
+                            $(json.cout).innerHTML =3D code_html;
                         } catch (e) {
                             console.log(e);
                             console.log(code_html);
@@ -630,7 +634,7 @@
 {
     console.log(json);
     try {
-        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_param_add' + "&cin=
=3D" + json.cin +'&id=3D'+json.id;
+        var querystring =3D 'plugin_code=3D' + json.pc + '&ac=3D' + json=
.ac + '&gDossier=3D' + json.gDossier + '&act=3Dlisting_param_add' + "&cin=
=3D" + json.cin + '&id=3D' + json.id;
         waiting_box();
         var action =3D new Ajax.Request(
                 "ajax.php",
@@ -648,12 +652,12 @@
                                 throw 'cannot find ctl element';
                             }
                             remove_waiting_box();
-                            var code_html =3D getNodeText(html[0]);=20
+                            var code_html =3D getNodeText(html[0]);
                             code_html =3D unescape_xml(code_html);
                             console.log(code_html);
-                            var position=3Dfixed_position(451,217)+';wid=
th:50%';
-                            add_div({'id':json.cin,'cssclass':'inner_box=
','drag':1,'style':position});
-                           $(json.cin).innerHTML =3D code_html;
+                            var position =3D fixed_position(451, 217) + =
';width:50%';
+                            add_div({'id': json.cin, 'cssclass': 'inner_=
box', 'drag': 1, 'style': position});
+                            $(json.cin).innerHTML =3D code_html;
                         } catch (e) {
                             console.log(e);
                             console.log(code_html);
@@ -667,4 +671,84 @@
         alert(e.message);
=20
     }
+}
+/**
+ * @brief sauve les donn=C3=A9es pour nouvelle formule, code,...
+ * @param p_form_id id du form
+ */
+function save_param_listing(p_form_id)
+{
+    /**
+     * code_id can not be empty
+     */
+    if ( $('code_id').value.trim()=3D=3D'') {
+       $('code_id').style.border=3D"solid 2px red";
+       $('code_id_span').innerHTML=3D' Code ne peut pas =C3=AAtre vide';
+        return false;
+    }
+    try
+    {
+        var qs =3D $(p_form_id).serialize() + '&act=3Dsave_param_listing=
&'+$('common_frm').serialize();
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: qs,
+                    onFailure: error_get_predef,
+                    onSuccess: function infodiv(req, json) {
+                        try {
+                            remove_waiting_box();
+                            var answer =3D req.responseXML;
+                            var acode =3D answer.getElementsByTagName('c=
ode');
+                            var ap_id =3D answer.getElementsByTagName('l=
_id');
+                            var html =3D answer.getElementsByTagName('ht=
ml');
+
+                            if (acode.length =3D=3D 0) {
+                                var rec =3D req.responseText;
+                                alert('erreur :' + rec);
+                            }
+                            var code =3D acode[0].firstChild.nodeValue;
+                            var code_xml =3D getNodeText(html[0]);
+                            var code_html =3D unescape_xml(code_xml);
+                            if (code =3D=3D 'ok')
+                            {
+                                var afpid =3D answer.getElementsByTagNam=
e('lp_id');
+                                var fp_id =3D afpid[0].firstChild.nodeVa=
lue;
+                                var p_id =3D ap_id[0].firstChild.nodeVal=
ue;
+                                // Ajoute une ligne avec r=C3=A9sultat
+                                var mytable =3D g("definition_tb_id").tB=
odies[0];
+                                var nNumberRow =3D mytable.rows.length;
+                                var oRow =3D mytable.insertRow(nNumberRo=
w);
+                                oRow.id =3D "tr_" + fp_id;
+                                oRow.innerHTML =3D code_html;
+                                removeDiv('listing_param_input_div_id');
+
+                            }
+                            if (code =3D=3D 'nok')
+                            {
+                                // montre erreur
+                                $('info_listing_param_input_div_id').inn=
erHTML =3D code_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



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


From MAILER-DAEMON Sat Nov 23 15:42:39 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VkK2J-0007Zc-Pb
	for mharc-phpcompta-dev@gnu.org; Sat, 23 Nov 2013 15:42:39 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 23 Nov 2013 21:31:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.114276.1385239359.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r587 - in trunk/rapport_avance: . include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Nov 2013 20:42:38 -0000

Author: danydb
Date: 2013-11-23 21:31:27 +0100 (Sat, 23 Nov 2013)
New Revision: 587

Modified:
   trunk/rapport_avance/ajax_save_param_listing.php
   trunk/rapport_avance/include/class_rapav_listing_formula.php
   trunk/rapport_avance/include/class_rapav_listing_param.php
   trunk/rapport_avance/include/template/listing_param_input.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Add RAPAV_Formula_Formula : display and save

Modified: trunk/rapport_avance/ajax_save_param_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/ajax_save_param_listing.php	2013-11-23 13:08:07 =
UTC (rev 586)
+++ trunk/rapport_avance/ajax_save_param_listing.php	2013-11-23 20:31:27 =
UTC (rev 587)
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * @brief sauve la nouvelle ligne de d=C3=A9tail (listing) et renvoie un=
 xml
@@ -22,106 +23,106 @@
 // var_dump($_GET);
 switch ($tab)
 {
-   /* case 'formula':
-        $acc_formula =3D new RAPAV_Formula();
-        $acc_formula->fp_formula =3D $formula_new;
-        $acc_formula->p_id =3D $p_id;
-        $acc_formula->type_detail =3D 1;
-        $acc_formula->jrn_def_id =3D $p_ledger;
-        $acc_formula->date_paid =3D (isset($p_paid)) ? 1 : 0;
+    case 'formula':
+        $acc_formula =3D new RAPAV_Formula_Formula($formula);
+        $acc_formula->data->setp('formula', $p_formula);
         if ($acc_formula->verify() =3D=3D 1)
         {
             $code =3D 'nok';
             $html =3D $acc_formula->errcode;
+            $lp_id=3D0;
         } else
         {
-            $acc_formula->insert();
-            $fp_id =3D $acc_formula->fp_id;
+            $acc_formula->save($_GET);
+            $acc_formula->load();
+            $lp_id =3D $acc_formula->data->getp('lp_id');
             $code =3D 'ok';
-            $html =3D '<td>';
             ob_start();
-            $acc_formula->display_row();
+            echo td($acc_formula->display_code());
+            echo td($acc_formula->display_comment());
+            $r=3D$acc_formula->display();
+            echo td($r);
+            echo td($acc_formula->display_order());
             $html.=3Dob_get_contents();
             ob_end_clean();
-            $html.=3D '</td>';
-            $html.=3D'<td id=3D"del_' . $acc_formula->fp_id . '">';
+            $html.=3D'<td id=3D"del_' . $lp_id . '">';
             $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"delete_param_detail('%s','%s','%s','%s')\""
-                                    , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $acc_formula->fp_id));
+                                    , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $lp_id));
             $html.=3D'</td>';
         }
         break;
-    case 'compute_id':
-        $acc_compute =3D new RAPAV_Compute();
-        $acc_compute->fp_formula =3D $form_compute;
-        $acc_compute->p_id =3D $p_id;
-        $acc_compute->type_detail =3D 3;
-        $acc_compute->jrn_def_id =3D null;
-        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_param_detail('%s','%s','%s','%s')\""
-                                    , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $acc_compute->fp_id));
-            $html.=3D'</td>';
-        }
-        break;
-    case 'new_account_id':
-        $acc_account =3D new RAPAV_Account();
-        $acc_account->tmp_val =3D $account_first;
-        $acc_account->with_tmp_val =3D $account_second;
-        $acc_account->p_id =3D $p_id;
-        $acc_account->type_detail =3D 4;
-        $acc_account->type_sum_account =3D $account_sum_type;
-        $acc_account->jrn_def_id =3D $p_ledger;
-        $acc_account->date_paid =3D (isset($p_paid)) ? 1 : 0;
-        if ($acc_account->verify() =3D=3D 1)
-        {
-            $code =3D 'nok';
-            $html =3D $acc_account->errcode;
-        } else
-        {
-            $acc_account->insert();
-            $fp_id =3D $acc_account->fp_id;
-            $code =3D 'ok';
-            $html =3D '<td>';
-            ob_start();
-            $acc_account->display_row();
-            $html.=3Dob_get_contents();
-            ob_end_clean();
-            $html.=3D '</td>';
-            $html.=3D'<td id=3D"del_' . $acc_account->fp_id . '">';
-            $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"delete_param_detail('%s','%s','%s','%s')\""
-                                    , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $acc_account->fp_id));
-            $html.=3D'</td>';
-        }
-        break;*/
+    /*  case 'compute_id':
+      $acc_compute =3D new RAPAV_Compute();
+      $acc_compute->fp_formula =3D $form_compute;
+      $acc_compute->p_id =3D $p_id;
+      $acc_compute->type_detail =3D 3;
+      $acc_compute->jrn_def_id =3D null;
+      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\"del=
ete_param_detail('%s','%s','%s','%s')\""
+      , $_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossier']=
, $acc_compute->fp_id));
+      $html.=3D'</td>';
+      }
+      break;
+      case 'new_account_id':
+      $acc_account =3D new RAPAV_Account();
+      $acc_account->tmp_val =3D $account_first;
+      $acc_account->with_tmp_val =3D $account_second;
+      $acc_account->p_id =3D $p_id;
+      $acc_account->type_detail =3D 4;
+      $acc_account->type_sum_account =3D $account_sum_type;
+      $acc_account->jrn_def_id =3D $p_ledger;
+      $acc_account->date_paid =3D (isset($p_paid)) ? 1 : 0;
+      if ($acc_account->verify() =3D=3D 1)
+      {
+      $code =3D 'nok';
+      $html =3D $acc_account->errcode;
+      } else
+      {
+      $acc_account->insert();
+      $fp_id =3D $acc_account->fp_id;
+      $code =3D 'ok';
+      $html =3D '<td>';
+      ob_start();
+      $acc_account->display_row();
+      $html.=3Dob_get_contents();
+      ob_end_clean();
+      $html.=3D '</td>';
+      $html.=3D'<td id=3D"del_' . $acc_account->fp_id . '">';
+      $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D\"del=
ete_param_detail('%s','%s','%s','%s')\""
+      , $_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossier']=
, $acc_account->fp_id));
+      $html.=3D'</td>';
+      }
+      break; */
     case 'new_attribute_id':
         ob_start();
         $attr =3D new RAPAV_Formula_Attribute($formula, $listing_id);
         $attr->save($_GET);
         $attr->load();
-        $lp_id=3D$attr->data->getp("lp_id");
+        $lp_id =3D $attr->data->getp("lp_id");
         $code =3D 'ok';
-        $html=3D"";
+        $html =3D "";
         echo td($attr->display_code());
         echo td($attr->display_comment());
         echo td($attr->display_order());
         echo td($attr->display());
         $html.=3Dob_get_contents();
         ob_end_clean();
-        $html.=3D'<td id=3D"del_' .$lp_id . '">';
+        $html.=3D'<td id=3D"del_' . $lp_id . '">';
         $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D\"d=
elete_listing_detail('%s','%s','%s','%s')\""
                                 , $_REQUEST['plugin_code'], $_REQUEST['a=
c'], $_REQUEST['gDossier'], $lp_id));
         $html.=3D'</td>';

Modified: trunk/rapport_avance/include/class_rapav_listing_formula.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_listing_formula.php	2013-11-=
23 13:08:07 UTC (rev 586)
+++ trunk/rapport_avance/include/class_rapav_listing_formula.php	2013-11-=
23 20:31:27 UTC (rev 587)
@@ -11,6 +11,8 @@
  *
  * @author dany
  */
+require_once 'class_impress.php';
+
 abstract class RAPAV_Listing_Formula
 {
=20
@@ -80,28 +82,34 @@
         switch ($obj->getp('formula_type'))
         {
             case 'ATTR':
-                $ret=3Dnew Rapav_Formula_Attribute($obj);
+                $ret =3D new Rapav_Formula_Attribute($obj);
                 break;
+            case 'FORM':
+                $ret =3D new Rapav_Formula_Formula($obj);
+                break;
=20
             default:
-                throw new Exception ('Object '.$obj.' invalide ');
+                throw new Exception('Object ' .var_export( $obj,true) . =
' invalide ');
                 break;
-          =20
         }
         return $ret;
     }
+
     function display_code()
     {
         return $this->data->getp('code');
     }
+
     function display_comment()
     {
         return $this->data->getp('comment');
     }
+
     function display_order()
     {
         return $this->data->getp('order');
     }
+
     function load()
     {
         $this->data->load();
@@ -114,15 +122,24 @@
 ////////////////////////////////////////////////////////////////////////=
///////////////////////////
 /**
  * @brief Class for the listing detail attribute, this class use RAPAV_L=
isting_Param_SQL
- * the specific columns are attribut_card
+ * the specific columns are=20
+ *   - attribut_card
  */
 class RAPAV_Formula_Attribute extends RAPAV_Listing_Formula
 {
=20
-    var $data;           /**< RAPAV_Listing_Param_SQL objet */
-    var $cat;            /**< categorie id */
-    var $sig;            /**< Object signature */
+    /**
+     * RAPAV_Listing_Param_SQL objet */
+    var $data;
=20
+    /**
+     * categorie id */
+    var $cat;
+
+    /**
+     * Object signature */
+    var $sig;
+
     function __construct(RAPAV_Listing_Param_SQL $obj, $p_cat_id =3D 0)
     {
         global $cn;
@@ -187,3 +204,108 @@
     }
=20
 }
+
+////////////////////////////////////////////////////////////////////////=
///////
+// RAPAV_Formula_Formula
+////////////////////////////////////////////////////////////////////////=
///////
+/**
+ * @brief Class for the listing detail attribute, this class=20
+ * use RAPAV_Listing_Param_SQL the specific columns are=20
+ *   - fp_formula
+ *   - jrn_def_id
+ *   - date_paid
+ * =20
+ */
+class RAPAV_Formula_Formula extends RAPAV_Listing_Formula
+{
+
+    /**
+     * < RAPAV_Listing_Param_SQL objet */
+    var $data;
+
+    /**
+     * < Object signature=20
+     */
+    var $sig;
+
+    function __construct(RAPAV_Listing_Param_SQL $obj)
+    {
+        global $cn;
+        $this->data =3D $obj;
+        $this->sig =3D 'FORM';
+    }
+
+    function display()
+    {
+        $ledger =3D $this->get_ledger_name();
+        $paid =3D ( $this->data->date_paid !=3D 0 ) ? "la date concerne =
la date de paiement, la recherche sera limit=C3=A9e au journaux de type A=
CH & VEN" : "";
+        $str =3D sprintf("R=C3=A9sultat de la formule %s utilisant $ledg=
er %s", $this->data->fp_formula, $paid);
+        return $str;
+    }
+
+    function compute($p_start, $p_end)
+    {
+        return 0;
+    }
+
+    function input()
+    {
+        $account =3D new IPoste("p_formula", "", "formula_input_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', "formula_input_id");
+        echo $account->input();
+        parent::input_date_paiement();
+        parent::input_ledger();
+    }
+
+    function save($p_array)
+    {
+        parent::set($p_array);
+        $this->data->setp('listing_id', $p_array['listing_id']);
+        /* Clean everything but keep the lp_id, l_id, with_Card and ad_i=
d  + common */
+        $a_toclean =3D explode(',', 'operation_pcm_val,with_tmp_val,tmp_=
val, '
+                . 'type_sum_account, tt_id, '
+                . 'fp_signed,  tva_id'
+                . ',lp_card_saldo,attribut_card');
+
+        parent::set_to_null($a_toclean);
+        $this->data->setp('with_card', 'N');
+        $this->data->setp('formula', $p_array['p_formula']);
+        if (isset($p_array['p_paid']))
+        {
+            $this->data->setp('date_paid', 1);
+        } else
+        {
+            $this->data->setp('date_paid', null);
+           =20
+        }
+        $this->data->setp('jrn_def_id', $p_array['p_ledger']);
+        $this->data->setp('formula_type', 'FORM');
+        $this->data->save();
+    }
+
+    /**
+     * @brief check if the formula is valid, return 1 for an error
+     * and set errode to the error
+     */
+    function verify()
+    {
+        if (Impress::check_formula($this->data->fp_formula) =3D=3D false=
)
+        {
+            $this->errcode =3D "Erreur dans votre formule";
+            return 1;
+        }
+        if (trim($this->data->fp_formula) =3D=3D "")
+        {
+            $this->errcode =3D " Aucune formule trouv=C3=A9e";
+            return 1;
+        }
+        return 0;
+    }
+
+}

Modified: trunk/rapport_avance/include/class_rapav_listing_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_rapav_listing_param.php	2013-11-23=
 13:08:07 UTC (rev 586)
+++ trunk/rapport_avance/include/class_rapav_listing_param.php	2013-11-23=
 20:31:27 UTC (rev 587)
@@ -80,6 +80,7 @@
         $order=3Dnew INum('order');
         $order->value=3D10;
         $attribute=3Dnew RAPAV_Formula_Attribute($this->Param,$p_id);
+        $formula=3Dnew RAPAV_Formula_Formula($this->Param,$p_id);
         require 'template/listing_param_input.php';
     }
 }

Modified: trunk/rapport_avance/include/template/listing_param_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/listing_param_input.php	2013-11=
-23 13:08:07 UTC (rev 586)
+++ trunk/rapport_avance/include/template/listing_param_input.php	2013-11=
-23 20:31:27 UTC (rev 587)
@@ -77,7 +77,7 @@
                           <?php echo HtmlInput::request_to_hidden(array(=
'gDossier', 'ac', 'plugin_code', 'p_id')) ?>
                     <p>
                         <?php echo HtmlInput::hidden('tab', 'formula') ?=
>
-                        <?php echo "formula"; ?>
+                        <?php echo $formula->input() ?>
                     </p>
=20
                     <?php echo HtmlInput::submit('save', 'Sauve') ?>

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-23 13:08:07 UTC (rev=
 586)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-23 20:31:27 UTC (rev=
 587)
@@ -658,10 +658,13 @@
                             var position =3D fixed_position(451, 217) + =
';width:50%';
                             add_div({'id': json.cin, 'cssclass': 'inner_=
box', 'drag': 1, 'style': position});
                             $(json.cin).innerHTML =3D code_html;
+                         =20
                         } catch (e) {
                             console.log(e);
                             console.log(code_html);
                         }
+                        console.log('trying to execute javascript');
+                        code_html.evalScripts();
                     }
                 }
         );



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


From MAILER-DAEMON Sun Nov 24 11:40:22 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VkcjO-0004lf-7R
	for mharc-phpcompta-dev@gnu.org; Sun, 24 Nov 2013 11:40:22 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 24 Nov 2013 17:29:11 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.114753.1385311221.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5545 - phpcompta/tags/rel670/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, 24 Nov 2013 16:40:20 -0000

Author: danydb
Date: 2013-11-24 17:29:10 +0100 (Sun, 24 Nov 2013)
New Revision: 5545

Modified:
   phpcompta/tags/rel670/include/class_fiche.php
Log:
0000918: Somme des colonnes incorrects

Modified: phpcompta/tags/rel670/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/class_fiche.php	2013-11-22 19:13:12 UTC=
 (rev 5544)
+++ phpcompta/tags/rel670/include/class_fiche.php	2013-11-24 16:29:10 UTC=
 (rev 5545)
@@ -1513,7 +1513,7 @@
     function Summary($p_search=3D"",$p_action=3D"",$p_sql=3D"",$p_amount=
=3Dfalse)
     {
         global $g_user;
-		bcscale(4);
+        bcscale(4);
         $str_dossier=3Ddossier::get();
         $p_search=3Dsql_string($p_search);
         $script=3D$_SERVER['PHP_SELF'];
@@ -1592,12 +1592,12 @@
                          " ".$tiers->strAttribut(ATTR_DEF_CP).
                          " ".$tiers->strAttribut(ATTR_DEF_PAYS)).
                 "</TD>";
-            $deb=3D(($amount['debit']=3D=3D0)?0:nbm($amount['debit']));
-            $cred=3D(($amount['credit']=3D=3D0)?0:nbm($amount['credit'])=
);
-            $solde=3Dnbm($amount['solde']);
-            $r.=3D'<TD sorttable_customkey=3D"'.$amount['debit'].'" alig=
n=3D"right"> '.$deb.'</TD>';
-            $r.=3D'<TD sorttable_customkey=3D"'.$amount['credit'].'" ali=
gn=3D"right"> '.$cred.'</TD>';
-            $r.=3D'<TD sorttable_customkey=3D"'.$amount['solde'].'" alig=
n=3D"right"> '.$solde."</TD>";
+            $str_deb=3D(($amount['debit']=3D=3D0)?0:nbm($amount['debit']=
));
+            $str_cred=3D(($amount['credit']=3D=3D0)?0:nbm($amount['credi=
t']));
+            $str_solde=3Dnbm($amount['solde']);
+            $r.=3D'<TD sorttable_customkey=3D"'.$amount['debit'].'" alig=
n=3D"right"> '.$str_deb.'</TD>';
+            $r.=3D'<TD sorttable_customkey=3D"'.$amount['credit'].'" ali=
gn=3D"right"> '.$str_cred.'</TD>';
+            $r.=3D'<TD sorttable_customkey=3D"'.$amount['solde'].'" alig=
n=3D"right"> '.$str_solde."</TD>";
             $deb=3Dbcadd($deb,$amount['debit']);
             $cred=3Dbcadd($cred,$amount['credit']);
=20
@@ -1605,8 +1605,9 @@
=20
         }
 		$r.=3D"<tfoot>";
-		$solde=3Dbcsub($deb,$cred);
-		$r.=3Dtd("").td("").td("Totaux").td(nbm($deb),'class=3D"num"').td(nbm(=
$cred),'class=3D"num"').td(nbm($solde),'class=3D"num"');
+		$solde=3Dabs(bcsub($deb,$cred));
+                $side=3D($deb > $cred)?'D=C3=A9bit':'Cr=C3=A9dit';
+		$r.=3Dtd("").td("").td("Totaux").td(nbm($deb),'class=3D"num"').td(nbm(=
$cred),'class=3D"num"').td(" $side ".nbm($solde),'class=3D"num"');
 		$r.=3D"</tfoot>";
         $r.=3D"</TABLE>";
         $r.=3D$bar;



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


From MAILER-DAEMON Sun Nov 24 11:45:49 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vkcof-0007pa-1M
	for mharc-phpcompta-dev@gnu.org; Sun, 24 Nov 2013 11:45:49 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 24 Nov 2013 17:34:37 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.114756.1385311547.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5546 - in phpcompta/trunk: . include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Nov 2013 16:45:47 -0000

Author: danydb
Date: 2013-11-24 17:34:37 +0100 (Sun, 24 Nov 2013)
New Revision: 5546

Modified:
   phpcompta/trunk/
   phpcompta/trunk/include/class_fiche.php
Log:
Merged revisions 5545 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel670

........
  r5545 | danydb | 2013-11-24 17:29:10 +0100 (dim., 24 nov. 2013) | 1 lin=
e
 =20
  0000918: Somme des colonnes incorrects
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel670:1-5539,5541-5543
   + /phpcompta/tags/rel670:1-5539,5541-5545

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-11-24 16:29:10 UTC (rev =
5545)
+++ phpcompta/trunk/include/class_fiche.php	2013-11-24 16:34:37 UTC (rev =
5546)
@@ -1513,7 +1513,7 @@
     function Summary($p_search=3D"",$p_action=3D"",$p_sql=3D"",$p_amount=
=3Dfalse)
     {
         global $g_user;
-		bcscale(4);
+        bcscale(4);
         $str_dossier=3Ddossier::get();
         $p_search=3Dsql_string($p_search);
         $script=3D$_SERVER['PHP_SELF'];
@@ -1592,12 +1592,12 @@
                          " ".$tiers->strAttribut(ATTR_DEF_CP).
                          " ".$tiers->strAttribut(ATTR_DEF_PAYS)).
                 "</TD>";
-            $deb=3D(($amount['debit']=3D=3D0)?0:nbm($amount['debit']));
-            $cred=3D(($amount['credit']=3D=3D0)?0:nbm($amount['credit'])=
);
-            $solde=3Dnbm($amount['solde']);
-            $r.=3D'<TD sorttable_customkey=3D"'.$amount['debit'].'" alig=
n=3D"right"> '.$deb.'</TD>';
-            $r.=3D'<TD sorttable_customkey=3D"'.$amount['credit'].'" ali=
gn=3D"right"> '.$cred.'</TD>';
-            $r.=3D'<TD sorttable_customkey=3D"'.$amount['solde'].'" alig=
n=3D"right"> '.$solde."</TD>";
+            $str_deb=3D(($amount['debit']=3D=3D0)?0:nbm($amount['debit']=
));
+            $str_cred=3D(($amount['credit']=3D=3D0)?0:nbm($amount['credi=
t']));
+            $str_solde=3Dnbm($amount['solde']);
+            $r.=3D'<TD sorttable_customkey=3D"'.$amount['debit'].'" alig=
n=3D"right"> '.$str_deb.'</TD>';
+            $r.=3D'<TD sorttable_customkey=3D"'.$amount['credit'].'" ali=
gn=3D"right"> '.$str_cred.'</TD>';
+            $r.=3D'<TD sorttable_customkey=3D"'.$amount['solde'].'" alig=
n=3D"right"> '.$str_solde."</TD>";
             $deb=3Dbcadd($deb,$amount['debit']);
             $cred=3Dbcadd($cred,$amount['credit']);
=20
@@ -1605,8 +1605,9 @@
=20
         }
 		$r.=3D"<tfoot>";
-		$solde=3Dbcsub($deb,$cred);
-		$r.=3Dtd("").td("").td("Totaux").td(nbm($deb),'class=3D"num"').td(nbm(=
$cred),'class=3D"num"').td(nbm($solde),'class=3D"num"');
+		$solde=3Dabs(bcsub($deb,$cred));
+                $side=3D($deb > $cred)?'D=C3=A9bit':'Cr=C3=A9dit';
+		$r.=3Dtd("").td("").td("Totaux").td(nbm($deb),'class=3D"num"').td(nbm(=
$cred),'class=3D"num"').td(" $side ".nbm($solde),'class=3D"num"');
 		$r.=3D"</tfoot>";
         $r.=3D"</TABLE>";
         $r.=3D$bar;



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


From MAILER-DAEMON Mon Nov 25 11:43:24 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VkzFs-00005T-K7
	for mharc-phpcompta-dev@gnu.org; Mon, 25 Nov 2013 11:43:24 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 25 Nov 2013 17:32:09 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.116208.1385397803.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r588 - trunk/rapport_avance
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 16:43:23 -0000

Author: danydb
Date: 2013-11-25 17:32:09 +0100 (Mon, 25 Nov 2013)
New Revision: 588

Added:
   trunk/rapport_avance/ajax_add_row_definition.php
   trunk/rapport_avance/ajax_mod_form.php
   trunk/rapport_avance/ajax_mod_param.php
   trunk/rapport_avance/ajax_rapav_declaration_display.php
   trunk/rapport_avance/ajax_rapav_search_code.php
Removed:
   trunk/rapport_avance/ajax_declaration_display.php
   trunk/rapport_avance/ajax_search_code.php
Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/ajax_save_param_listing.php
Log:
r?\195?\169?\195?\169criture de la procedure ajax

Modified: trunk/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax.php	2013-11-23 20:31:27 UTC (rev 587)
+++ trunk/rapport_avance/ajax.php	2013-11-25 16:32:09 UTC (rev 588)
@@ -1,113 +1,25 @@
 <?php
 extract($_GET);
 global $cn;
+$a_action=3Dexplode(',',
+        'mod_form,add_row_definition,mod_param,add_param_detail,'.
+        'rapav_search_code,save_param_detail,rapav_declaration_display,'=
.
+        'listing_modify,listing_remove_modele,listing_display_definition=
,'.
+        'listing_param_add,save_param_listing');
+if ( in_array($act,$a_action ) =3D=3D true )
+{
+    include 'ajax_'.$act.'.php';
+    exit();
+}
 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();
-        require_once 'include/formulaire_definition_show.inc.php';
-        break;
-    /*     * ***********************************************************=
***************************************************
-     * Ajoute une ligne dans la definition
-     * *****************************************************************=
********************************************** */
-    case 'add_row_definition':
-        $type_row =3D $cn->make_array("select p_type,p_description from =
rapport_advanced.type_row order by p_description");
-        $type_periode =3D $cn->make_array("select t_id,t_description fro=
m rapport_advanced.periode_type order by t_description");
-        ?>
-        <td>
-            Nouv.
-        </td>
-        <td>
-            <?php echo HtmlInput::hidden('p_id[]', -1) ?>
-            <?php
-            $p_code =3D new IText('p_code[]');
-            $p_code->size =3D "10";
-            echo $p_code->input();
-            ?>
-        </td>
-        <td>
-            <?php
-            $p_libelle =3D new IText('p_libelle[]');
-            $p_libelle->css_size =3D "100%";
-            echo $p_libelle->input();
-            ?>
-        </td>
-        <td>
-            <?php
-            $p_type =3D new ISelect('p_type[]');
-            $p_type->value =3D $type_row;
-            echo $p_type->input();
-            ?>
-        </td>
-        <td>
-            <?php
-            $p_type_periode =3D new ISelect('t_id[]');
-            $p_type_periode->value =3D $type_periode;
-            echo $p_type_periode->input();
-            ?>
-        </td>
-        <td>
-            <?php
-            $p_order =3D new INum('p_order[]');
-            $p_order->prec =3D 0;
-            $p_order->size =3D 4;
-            echo $p_order->input();
-            ?>
-        </td>
-        <?php
-        break;
-    /*     * ***********************************************************=
***************************************************
-     * Montre le r=C3=A9sultat et permet de changer les param=C3=A8trage=
s d'un formulaire
-     * uniquement pour ceux ayant un champs de calcul (formule, code tva=
+poste 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();
-        $form->echo_formulaire();
-        $form->input_parameter();
-        break;
-
-    /*     * ***********************************************************=
*****************************************************
-     * Montre un =C3=A9cran pour ajouter une ligne de formulaire dans le=
s param=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_det=
ail where 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':
@@ -121,36 +33,6 @@
         $rapav =3D new Rapav_Formulaire($_GET['f_id']);
         $rapav->remove_doc_template();
         break;
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    // Show a div to enter new listing
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    case 'listing_modify':
-       include 'ajax_listing_modify.php';
-        exit();
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    // Remove a document modele
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    case 'listing_remove_modele':
-       include 'ajax_listing_remove_modele.php';
-        exit();
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    // Display the definition of a listing
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    case 'listing_display_definition':
-        include 'ajax_listing_display_definition.php';
-        exit();
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    // Add a param to a listing
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    case 'listing_param_add':
-        include 'ajax_listing_param_add.php';
-        exit();
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    // save a param to a listing
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
-    case 'save_param_listing':
-        include 'ajax_save_param_listing.php';
-        exit();
     default:
         if ( DEBUG) var_dump($_GET);
         die ("Aucune action demand=C3=A9e");

Added: trunk/rapport_avance/ajax_add_row_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/ajax_add_row_definition.php	                    =
    (rev 0)
+++ trunk/rapport_avance/ajax_add_row_definition.php	2013-11-25 16:32:09 =
UTC (rev 588)
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @file
+ * @brief  Ajoute une ligne dans la definition
+ */
+$type_row =3D $cn->make_array("select p_type,p_description from rapport_=
advanced.type_row order by p_description");
+$type_periode =3D $cn->make_array("select t_id,t_description from rappor=
t_advanced.periode_type order by t_description");
+?>
+<td>
+    Nouv.
+</td>
+<td>
+    <?php echo HtmlInput::hidden('p_id[]', -1) ?>
+    <?php
+    $p_code =3D new IText('p_code[]');
+    $p_code->size =3D "10";
+    echo $p_code->input();
+    ?>
+</td>
+<td>
+    <?php
+    $p_libelle =3D new IText('p_libelle[]');
+    $p_libelle->css_size =3D "100%";
+    echo $p_libelle->input();
+    ?>
+</td>
+<td>
+    <?php
+    $p_type =3D new ISelect('p_type[]');
+    $p_type->value =3D $type_row;
+    echo $p_type->input();
+    ?>
+</td>
+<td>
+    <?php
+    $p_type_periode =3D new ISelect('t_id[]');
+    $p_type_periode->value =3D $type_periode;
+    echo $p_type_periode->input();
+    ?>
+</td>
+<td>
+    <?php
+    $p_order =3D new INum('p_order[]');
+    $p_order->prec =3D 0;
+    $p_order->size =3D 4;
+    echo $p_order->input();
+    ?>
+</td>

Deleted: trunk/rapport_avance/ajax_declaration_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_declaration_display.php	2013-11-23 20:31:27=
 UTC (rev 587)
+++ trunk/rapport_avance/ajax_declaration_display.php	2013-11-25 16:32:09=
 UTC (rev 588)
@@ -1,41 +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 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 $decl->anchor_document();
-echo '<hr>';
-$ref=3DHtmlInput::array_to_string(array('gDossier','plugin_code','d_id')=
,$_GET,'extension.raw.php?');
-$ref.=3D"&amp;act=3Dexport_decla_csv";
-echo HtmlInput::button_anchor("Export CSV",$ref,'export_id');
-echo HtmlInput::button_action("Retour","$('declaration_list_div').show()=
; $('declaration_display_div').hide();");
-?>

Added: trunk/rapport_avance/ajax_mod_form.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_mod_form.php	                        (rev 0=
)
+++ trunk/rapport_avance/ajax_mod_form.php	2013-11-25 16:32:09 UTC (rev 5=
88)
@@ -0,0 +1,11 @@
+<?php
+
+//////////////////////////////////////////////////////////////
+// Modifie une definition de formulaire
+//////////////////////////////////////////////////////////////
+require_once 'include/class_rapav_formulaire.php';
+if (!isset($_GET['f_id']) && isNum($_GET['f_id']) =3D=3D 0)
+    exit();
+require_once 'include/formulaire_definition_show.inc.php';
+exit();
+?>
\ No newline at end of file

Added: trunk/rapport_avance/ajax_mod_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/ajax_mod_param.php	                        (rev =
0)
+++ trunk/rapport_avance/ajax_mod_param.php	2013-11-25 16:32:09 UTC (rev =
588)
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @file
+ * @brief Montre le r=C3=A9sultat et permet de changer les param=C3=A8tr=
ages d'un formulaire
+ *  uniquement pour ceux ayant un champs de calcul (formule, code tva+po=
ste comptable + totaux interm=C3=A9diare
+ */
+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();
+$form->echo_formulaire();
+$form->input_parameter();
+?>
\ No newline at end of file

Copied: trunk/rapport_avance/ajax_rapav_declaration_display.php (from rev=
 587, 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_rapav_declaration_display.php	             =
           (rev 0)
+++ trunk/rapport_avance/ajax_rapav_declaration_display.php	2013-11-25 16=
:32:09 UTC (rev 588)
@@ -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 display a declaration from history 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 $decl->anchor_document();
+echo '<hr>';
+$ref=3DHtmlInput::array_to_string(array('gDossier','plugin_code','d_id')=
,$_GET,'extension.raw.php?');
+$ref.=3D"&amp;act=3Dexport_decla_csv";
+echo HtmlInput::button_anchor("Export CSV",$ref,'export_id');
+echo HtmlInput::button_action("Retour","$('declaration_list_div').show()=
; $('declaration_display_div').hide();");
+?>

Copied: trunk/rapport_avance/ajax_rapav_search_code.php (from rev 587, tr=
unk/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_rapav_search_code.php	                     =
   (rev 0)
+++ trunk/rapport_avance/ajax_rapav_search_code.php	2013-11-25 16:32:09 U=
TC (rev 588)
@@ -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 and f_id=3D$1 order by 2",array($f_=
id));
+echo HtmlInput::title_box('Code Formulaire','search_code_div');
+?>
+<table>
+	<tr>
+		<th>
+			Code
+		</th>
+		<th>
+			Libell=C3=A9
+		</th>
+	</tr>
+	<?php for ($i=3D0;$i<count($array);$i++): ?>
+	<tr>
+		<td>
+			<?php echo HtmlInput::anchor(h($array[$i]['p_code']),"",'onclick=3D"$=
(\'form_compute\').value+=3D\'['.$array[$i]['p_code'].']\';removeDiv(\'se=
arch_code_div\');"')?>
+		</td>
+		<td>
+			<?php echo h($array[$i]['p_libelle'])?>
+		</td>
+	</tr>
+	<?php endfor;?>
+</table>

Modified: trunk/rapport_avance/ajax_save_param_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/ajax_save_param_listing.php	2013-11-23 20:31:27 =
UTC (rev 587)
+++ trunk/rapport_avance/ajax_save_param_listing.php	2013-11-25 16:32:09 =
UTC (rev 588)
@@ -46,7 +46,7 @@
             $html.=3Dob_get_contents();
             ob_end_clean();
             $html.=3D'<td id=3D"del_' . $lp_id . '">';
-            $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"delete_param_detail('%s','%s','%s','%s')\""
+            $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"delete_listing_detail('%s','%s','%s','%s')\""
                                     , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $lp_id));
             $html.=3D'</td>';
         }

Deleted: trunk/rapport_avance/ajax_search_code.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_search_code.php	2013-11-23 20:31:27 UTC (re=
v 587)
+++ trunk/rapport_avance/ajax_search_code.php	2013-11-25 16:32:09 UTC (re=
v 588)
@@ -1,52 +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 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 and f_id=3D$1 order by 2",array($f_=
id));
-echo HtmlInput::title_box('Code Formulaire','search_code_div');
-?>
-<table>
-	<tr>
-		<th>
-			Code
-		</th>
-		<th>
-			Libell=C3=A9
-		</th>
-	</tr>
-	<?php for ($i=3D0;$i<count($array);$i++): ?>
-	<tr>
-		<td>
-			<?php echo HtmlInput::anchor(h($array[$i]['p_code']),"",'onclick=3D"$=
(\'form_compute\').value+=3D\'['.$array[$i]['p_code'].']\';removeDiv(\'se=
arch_code_div\');"')?>
-		</td>
-		<td>
-			<?php echo h($array[$i]['p_libelle'])?>
-		</td>
-	</tr>
-	<?php endfor;?>
-</table>



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


From MAILER-DAEMON Mon Nov 25 13:06:48 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vl0Ya-0003Kj-52
	for mharc-phpcompta-dev@gnu.org; Mon, 25 Nov 2013 13:06:48 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 25 Nov 2013 18:55:32 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.116297.1385402807.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r589 - 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: Mon, 25 Nov 2013 18:06:46 -0000

Author: danydb
Date: 2013-11-25 18:55:31 +0100 (Mon, 25 Nov 2013)
New Revision: 589

Added:
   trunk/rapport_avance/ajax_listing_detail_remove.php
Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/ajax_save_param_listing.php
   trunk/rapport_avance/include/template/rapav_listing_definition.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Remove listing detail

Modified: trunk/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax.php	2013-11-25 16:32:09 UTC (rev 588)
+++ trunk/rapport_avance/ajax.php	2013-11-25 17:55:31 UTC (rev 589)
@@ -5,7 +5,7 @@
         'mod_form,add_row_definition,mod_param,add_param_detail,'.
         'rapav_search_code,save_param_detail,rapav_declaration_display,'=
.
         'listing_modify,listing_remove_modele,listing_display_definition=
,'.
-        'listing_param_add,save_param_listing');
+        'listing_param_add,save_param_listing,listing_remove_detail');
 if ( in_array($act,$a_action ) =3D=3D true )
 {
     include 'ajax_'.$act.'.php';
@@ -17,17 +17,19 @@
     // Delete un formulaire_param_detail
     ////////////////////////////////////////////////////////////////////=
/////
     case 'delete_param_detail':
-        $cn->exec_sql("delete from rapport_advanced.formulaire_param_det=
ail where fp_id=3D$1", array($fp_id));
+        $cn->exec_sql("delete from rapport_advanced.formulaire_param_det=
ail "
+                . " where fp_id=3D$1", array($fp_id));
         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']));
+        $cn->exec_sql("delete from rapport_advanced.declaration where d_=
id=3D$1",
+                array($_GET['d_id']));
         break;
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////=
/
     // Remove a template
-    ////////////////////////////////////////////////////////////////////=
///////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////=
/
     case 'rapav_remove_doc_template':
         require_once 'include/class_rapav_formulaire.php';
         $rapav =3D new Rapav_Formulaire($_GET['f_id']);

Added: trunk/rapport_avance/ajax_listing_detail_remove.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_listing_detail_remove.php	                 =
       (rev 0)
+++ trunk/rapport_avance/ajax_listing_detail_remove.php	2013-11-25 17:55:=
31 UTC (rev 589)
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @file
+ * @brief delete a row in Listing_Param
+ */
+global $cn;
+require_once 'include/class_rapav_listing_param.php';
+$del=3Dnew RAPAV_Listing_Param($id);
+$del->Param->delete();
+
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<lp_id>$id</lp_id>
+<code>ok</code>
+</data>
+EOF;
+exit();
+?>    =20

Modified: trunk/rapport_avance/ajax_save_param_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/ajax_save_param_listing.php	2013-11-25 16:32:09 =
UTC (rev 588)
+++ trunk/rapport_avance/ajax_save_param_listing.php	2013-11-25 17:55:31 =
UTC (rev 589)
@@ -46,8 +46,8 @@
             $html.=3Dob_get_contents();
             ob_end_clean();
             $html.=3D'<td id=3D"del_' . $lp_id . '">';
-            $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"delete_listing_detail('%s','%s','%s','%s')\""
-                                    , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $lp_id));
+            $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"listing_detail_remove('%s','%s','%s','%s')\""
+                                    ,  $_REQUEST['gDossier'],$_REQUEST['=
plugin_code'], $_REQUEST['ac'], $lp_id));
             $html.=3D'</td>';
         }
         break;
@@ -123,8 +123,8 @@
         $html.=3Dob_get_contents();
         ob_end_clean();
         $html.=3D'<td id=3D"del_' . $lp_id . '">';
-        $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D\"d=
elete_listing_detail('%s','%s','%s','%s')\""
-                                , $_REQUEST['plugin_code'], $_REQUEST['a=
c'], $_REQUEST['gDossier'], $lp_id));
+        $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D\"l=
isting_detail_remove('%s','%s','%s','%s')\"",
+                                 $_REQUEST['gDossier'], $_REQUEST['plugi=
n_code'], $_REQUEST['ac'], $lp_id));
         $html.=3D'</td>';
         break;
 }

Modified: trunk/rapport_avance/include/template/rapav_listing_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/rapav_listing_definition.php	20=
13-11-25 16:32:09 UTC (rev 588)
+++ trunk/rapport_avance/include/template/rapav_listing_definition.php	20=
13-11-25 17:55:31 UTC (rev 589)
@@ -1,11 +1,9 @@
 <?php
-
 /**
  * @file
  * @brief show a list and all of its parameters and detail
  *=20
  */
-
 ?>
 <p>
     Nom listing <?php echo h($this->Data->getp('name')); ?>
@@ -15,9 +13,9 @@
 </p>
 <p>
     Cat=C3=A9gorie <?php echo h($this->get_categorie_name()); ?>
-    <?php echo h($this->get_categorie_description());  ?>
+<?php echo h($this->get_categorie_description()); ?>
 </p>
-<?php echo $button->input(); ?>
+    <?php echo $button->input(); ?>
 <table class=3D"result" id=3D"definition_tb_id">
     <tr>
         <th>
@@ -36,34 +34,41 @@
             action
         </th>
     </tr>
-<?php=20
-    $nb=3Dcount($this->a_detail);
-    for ($i=3D0;$i<$nb;$i++):
-?>
-    <tr id=3D"tr_<?php echo $this->a_detail[$i]->Param->getp('lp_id')?>"=
>
-        <td>
-           <?php echo $this->a_detail[$i]->Param->getp('code'); ?>
-        </td>
-        <td>
-           <?php echo h($this->a_detail[$i]->Param->getp('comment')); ?>
-        </td>
-        <td>
-            <?php=20
-            $obj=3D   RAPAV_Listing_Formula::make_object($this->a_detail=
[$i]->Param);
-            echo $obj->display();
-            ?>
-        </td>
-        <td>
-            <?php echo $this->a_detail[$i]->Param->getp('order'); ?>
-        </td>
-        <td>
-            Efface / modifie
-        </td>
-       =20
-    </tr>
+<?php
+$nb =3D count($this->a_detail);
+for ($i =3D 0; $i < $nb; $i++):
+    ?>
+        <tr id=3D"tr_<?php echo $this->a_detail[$i]->Param->getp('lp_id'=
) ?>">
+            <td>
+    <?php echo $this->a_detail[$i]->Param->getp('code'); ?>
+            </td>
+            <td>
+    <?php echo h($this->a_detail[$i]->Param->getp('comment')); ?>
+            </td>
+            <td>
+    <?php
+    $obj =3D RAPAV_Listing_Formula::make_object($this->a_detail[$i]->Par=
am);
+    echo $obj->display();
+    ?>
+            </td>
+            <td>
+    <?php echo $this->a_detail[$i]->Param->getp('order'); ?>
+            </td>
+            <td>
+    <?php
+    $json =3D sprintf(" onclick=3D\"listing_detail_remove('%s','%s','%s'=
,'%s')\"",=20
+            Dossier::id(),=20
+            $_REQUEST['plugin_code'],=20
+            $_REQUEST['ac'],=20
+            $this->a_detail[$i]->Param->getp('lp_id') );
+    echo HtmlInput::anchor("Effacer", "", $json)
+    ?>
+            </td>
=20
+        </tr>
=20
-<?php
-    endfor;
-?>  =20
+
+                <?php
+            endfor;
+            ?>  =20
 </table>   =20
\ 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	2013-11-25 16:32:09 UTC (rev=
 588)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-25 17:55:31 UTC (rev=
 589)
@@ -699,7 +699,7 @@
                     method: 'get',
                     parameters: qs,
                     onFailure: error_get_predef,
-                    onSuccess: function infodiv(req, json) {
+                    onSuccess: function (req, json) {
                         try {
                             remove_waiting_box();
                             var answer =3D req.responseXML;
@@ -754,4 +754,60 @@
     }
=20
     return false;
+}
+function listing_detail_remove(dossier,plugin_code,ac,id)
+{
+    if ( confirm('Confirmez-vous effacer ce d=C3=A9tail ?') =3D=3D false=
 )
+    {
+        return;
+    }
+    try {
+        var query=3D'plugin_code=3D' + plugin_code+ '&ac=3D' + ac+ '&gDo=
ssier=3D' +dossier+ '&act=3Dlisting_detail_remove' + "&id=3D"+id;
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: query,
+                    onFailure: error_get_predef,
+                    onSuccess: function (req, json) {
+                        try {
+                            remove_waiting_box();
+                            var answer =3D req.responseXML;
+                            var acode =3D answer.getElementsByTagName('c=
ode');
+                            var lp_id =3D answer.getElementsByTagName('l=
p_id');
+
+                            if (acode.length =3D=3D 0) {
+                                var rec =3D req.responseText;
+                                alert('erreur :' + rec);
+                            }
+                            var code =3D acode[0].firstChild.nodeValue;
+                           =20
+                            if (code =3D=3D 'ok')
+                            {
+                                console.log('tr_'+id);
+                                var row=3D$('tr_'+id);
+                                row.style.color=3D"red";
+                                row.style.textDecoration=3D'line-through=
';
+                                row.cells[row.cells.length-1].innerHTML=3D=
"";
+                                console.log(row.length);
+
+                            }
+                            if (code =3D=3D 'nok')
+                            {
+                                // montre erreur
+                                alert('effacement non possible');
+                            }
+                        }
+                        catch (e) {
+                            alert("callback : listing_detail_remove " + =
e.message);
+                        }
+
+                    }
+                }
+        );
+    } 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 Mon Nov 25 14:34:00 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vl1uy-0003Li-Hx
	for mharc-phpcompta-dev@gnu.org; Mon, 25 Nov 2013 14:34:00 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 25 Nov 2013 20:22:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.116421.1385408039.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r590 - 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: Mon, 25 Nov 2013 19:33:59 -0000

Author: danydb
Date: 2013-11-25 20:22:47 +0100 (Mon, 25 Nov 2013)
New Revision: 590

Modified:
   trunk/rapport_avance/include/template/param_detail_new.php
Log:
typo

Modified: trunk/rapport_avance/include/template/param_detail_new.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/param_detail_new.php	2013-11-25=
 17:55:31 UTC (rev 589)
+++ trunk/rapport_avance/include/template/param_detail_new.php	2013-11-25=
 19:22:47 UTC (rev 590)
@@ -65,7 +65,7 @@
 	<div style=3D"padding: 10px">
 <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"
+	Entrez 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%]
@@ -84,7 +84,7 @@
 </div>
 <div id=3D"new_account_tva_id" style=3D"display: none">
 	<p>
-	Entrer un poste comptable et un code de TVA
+	Entrez 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">
 	<?php echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_c=
ode','p_id'))?>
@@ -98,7 +98,7 @@
 </div>
 <div id=3D"new_compute_id" style=3D"display: none">
 	<p>
-	Entrer une formule avec des codes utilis=C3=A9s dans ce formulaires
+	Entrez une formule avec des codes utilis=C3=A9s dans ce formulaire
 	</p>
 <form id=3D"new_padec" method=3D"POST" onsubmit=3D"save_param_detail('ne=
w_padec');return false">
 	<?php echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_c=
ode','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 Nov 25 15:07:36 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vl2RU-0004Qc-KG
	for mharc-phpcompta-dev@gnu.org; Mon, 25 Nov 2013 15:07:36 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 25 Nov 2013 20:56:25 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.116440.1385410055.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r591 - in trunk/rapport_avance: . include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 20:07:34 -0000

Author: danydb
Date: 2013-11-25 20:56:25 +0100 (Mon, 25 Nov 2013)
New Revision: 591

Added:
   trunk/rapport_avance/ajax_listing_search_code.php
Modified:
   trunk/rapport_avance/ajax.php
   trunk/rapport_avance/ajax_save_param_listing.php
   trunk/rapport_avance/include/class_rapav_listing_formula.php
   trunk/rapport_avance/include/class_rapav_listing_param.php
   trunk/rapport_avance/include/template/listing_param_input.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Add compute and account

Modified: trunk/rapport_avance/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax.php	2013-11-25 19:22:47 UTC (rev 590)
+++ trunk/rapport_avance/ajax.php	2013-11-25 19:56:25 UTC (rev 591)
@@ -5,7 +5,8 @@
         'mod_form,add_row_definition,mod_param,add_param_detail,'.
         'rapav_search_code,save_param_detail,rapav_declaration_display,'=
.
         'listing_modify,listing_remove_modele,listing_display_definition=
,'.
-        'listing_param_add,save_param_listing,listing_remove_detail');
+        'listing_param_add,save_param_listing,listing_detail_remove,'.
+        'listing_search_code');
 if ( in_array($act,$a_action ) =3D=3D true )
 {
     include 'ajax_'.$act.'.php';

Added: trunk/rapport_avance/ajax_listing_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_listing_search_code.php	                   =
     (rev 0)
+++ trunk/rapport_avance/ajax_listing_search_code.php	2013-11-25 19:56:25=
 UTC (rev 591)
@@ -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 show the list of code of the form
+ *
+ */
+global $cn;
+$array=3D$cn->get_array("select lp_id,lp_code,lp_comment=20
+        from rapport_advanced.listing_param=20
+        where l_id=3D$1 order by 2",array($f_id));
+echo HtmlInput::title_box('Code Formulaire','search_code_div');
+?>
+<table>
+	<tr>
+		<th>
+			Code
+		</th>
+		<th>
+			Libell=C3=A9
+		</th>
+	</tr>
+	<?php for ($i=3D0;$i<count($array);$i++): ?>
+	<tr>
+		<td>
+			<?php echo HtmlInput::anchor(h($array[$i]['lp_code']),"",
+                                'onclick=3D"$(\'form_compute\').value+=3D=
\'['.$array[$i]['lp_code'].']\';removeDiv(\'search_code_div\');"')
+                                ?>
+		</td>
+		<td>
+			<?php echo h($array[$i]['lp_comment'])?>
+		</td>
+	</tr>
+	<?php endfor;?>
+</table>

Modified: trunk/rapport_avance/ajax_save_param_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/ajax_save_param_listing.php	2013-11-25 19:22:47 =
UTC (rev 590)
+++ trunk/rapport_avance/ajax_save_param_listing.php	2013-11-25 19:56:25 =
UTC (rev 591)
@@ -20,7 +20,7 @@
 require_once 'class_impress.php';
 require_once 'include/class_rapav_listing_param.php';
 $formula =3D new RAPAV_Listing_Param_SQL();
-// var_dump($_GET);
+
 switch ($tab)
 {
     case 'formula':
@@ -30,7 +30,7 @@
         {
             $code =3D 'nok';
             $html =3D $acc_formula->errcode;
-            $lp_id=3D0;
+            $lp_id =3D 0;
         } else
         {
             $acc_formula->save($_GET);
@@ -40,74 +40,73 @@
             ob_start();
             echo td($acc_formula->display_code());
             echo td($acc_formula->display_comment());
-            $r=3D$acc_formula->display();
+            $r =3D $acc_formula->display();
             echo td($r);
             echo td($acc_formula->display_order());
             $html.=3Dob_get_contents();
             ob_end_clean();
-            $html.=3D'<td id=3D"del_' . $lp_id . '">';
+            $html.=3D'<td>';
             $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"listing_detail_remove('%s','%s','%s','%s')\""
-                                    ,  $_REQUEST['gDossier'],$_REQUEST['=
plugin_code'], $_REQUEST['ac'], $lp_id));
+                                    , $_REQUEST['gDossier'], $_REQUEST['=
plugin_code'], $_REQUEST['ac'], $lp_id));
             $html.=3D'</td>';
         }
         break;
-    /*  case 'compute_id':
-      $acc_compute =3D new RAPAV_Compute();
-      $acc_compute->fp_formula =3D $form_compute;
-      $acc_compute->p_id =3D $p_id;
-      $acc_compute->type_detail =3D 3;
-      $acc_compute->jrn_def_id =3D null;
-      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\"del=
ete_param_detail('%s','%s','%s','%s')\""
-      , $_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossier']=
, $acc_compute->fp_id));
-      $html.=3D'</td>';
-      }
-      break;
-      case 'new_account_id':
-      $acc_account =3D new RAPAV_Account();
-      $acc_account->tmp_val =3D $account_first;
-      $acc_account->with_tmp_val =3D $account_second;
-      $acc_account->p_id =3D $p_id;
-      $acc_account->type_detail =3D 4;
-      $acc_account->type_sum_account =3D $account_sum_type;
-      $acc_account->jrn_def_id =3D $p_ledger;
-      $acc_account->date_paid =3D (isset($p_paid)) ? 1 : 0;
-      if ($acc_account->verify() =3D=3D 1)
-      {
-      $code =3D 'nok';
-      $html =3D $acc_account->errcode;
-      } else
-      {
-      $acc_account->insert();
-      $fp_id =3D $acc_account->fp_id;
-      $code =3D 'ok';
-      $html =3D '<td>';
-      ob_start();
-      $acc_account->display_row();
-      $html.=3Dob_get_contents();
-      ob_end_clean();
-      $html.=3D '</td>';
-      $html.=3D'<td id=3D"del_' . $acc_account->fp_id . '">';
-      $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D\"del=
ete_param_detail('%s','%s','%s','%s')\""
-      , $_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossier']=
, $acc_account->fp_id));
-      $html.=3D'</td>';
-      }
-      break; */
+    case 'compute_id':
+        $compute =3D new RAPAV_Formula_Compute($formula);
+        $compute->data->setp('formula', $form_compute);
+        if ($compute->verify() =3D=3D 1)
+        {
+            $code =3D 'nok';
+            $html =3D $compute->errcode;
+            $lp_id =3D 0;
+        } else
+        {
+            $compute->save($_GET);
+            $compute->load();
+            $lp_id =3D $compute->data->getp('lp_id');
+            $code =3D 'ok';
+            ob_start();
+            echo td($compute->display_code());
+            echo td($compute->display_comment());
+            $r =3D $compute->display();
+            echo td($r);
+            echo td($compute->display_order());
+            $html.=3Dob_get_contents();
+            ob_end_clean();
+            $html.=3D'<td>';
+            $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"listing_detail_remove('%s','%s','%s','%s')\""
+                                    , $_REQUEST['gDossier'], $_REQUEST['=
plugin_code'], $_REQUEST['ac'], $lp_id));
+            $html.=3D'</td>';
+        }
+        break;
+    case 'new_account_id':
+        $compute =3D new RAPAV_Formula_Account($formula);
+        $compute->data->setp('tmp_val', $p_formula);
+        if ($compute->verify() =3D=3D 1)
+        {
+            $code =3D 'nok';
+            $html =3D $compute->errcode;
+            $lp_id =3D 0;
+        } else
+        {
+            $compute->save($_GET);
+            $compute->load();
+            $lp_id =3D $compute->data->getp('lp_id');
+            $code =3D 'ok';
+            ob_start();
+            echo td($compute->display_code());
+            echo td($compute->display_comment());
+            $r =3D $compute->display();
+            echo td($r);
+            echo td($compute->display_order());
+            $html.=3Dob_get_contents();
+            ob_end_clean();
+            $html.=3D'<td>';
+            $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"listing_detail_remove('%s','%s','%s','%s')\""
+                                    , $_REQUEST['gDossier'], $_REQUEST['=
plugin_code'], $_REQUEST['ac'], $lp_id));
+            $html.=3D'</td>';
+        }
+        break;
     case 'new_attribute_id':
         ob_start();
         $attr =3D new RAPAV_Formula_Attribute($formula, $listing_id);
@@ -122,9 +121,8 @@
         echo td($attr->display());
         $html.=3Dob_get_contents();
         ob_end_clean();
-        $html.=3D'<td id=3D"del_' . $lp_id . '">';
-        $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D\"l=
isting_detail_remove('%s','%s','%s','%s')\"",
-                                 $_REQUEST['gDossier'], $_REQUEST['plugi=
n_code'], $_REQUEST['ac'], $lp_id));
+        $html.=3D'<td>';
+        $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D\"l=
isting_detail_remove('%s','%s','%s','%s')\"", $_REQUEST['gDossier'], $_RE=
QUEST['plugin_code'], $_REQUEST['ac'], $lp_id));
         $html.=3D'</td>';
         break;
 }

Modified: trunk/rapport_avance/include/class_rapav_listing_formula.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_listing_formula.php	2013-11-=
25 19:22:47 UTC (rev 590)
+++ trunk/rapport_avance/include/class_rapav_listing_formula.php	2013-11-=
25 19:56:25 UTC (rev 591)
@@ -87,6 +87,12 @@
             case 'FORM':
                 $ret =3D new Rapav_Formula_Formula($obj);
                 break;
+            case 'ACCOUNT':
+                $ret =3D new Rapav_Formula_Account($obj);
+                break;
+            case 'COMP':
+                $ret =3D new Rapav_Formula_Compute($obj);
+                break;
=20
             default:
                 throw new Exception('Object ' .var_export( $obj,true) . =
' invalide ');
@@ -114,6 +120,10 @@
     {
         $this->data->load();
     }
+    function set_listing($p_id)
+    {
+        $this->data->setp('listing_id',$p_id);
+    }
=20
 }
=20
@@ -185,7 +195,7 @@
                                         fd_id=3D' . $this->cat . ' order=
 by 2');
=20
         $select->selected =3D $this->data->getp('attribut_card');
-        return $select->input();
+        return "Attribut =C3=A0 afficher pour chaque fiche ".$select->in=
put();
     }
=20
     function save($p_array)
@@ -228,7 +238,7 @@
      */
     var $sig;
=20
-    function __construct(RAPAV_Listing_Param_SQL $obj)
+    function __construct(RAPAV_Listing_Param_SQL $obj,$p_cat_id =3D 0)
     {
         global $cn;
         $this->data =3D $obj;
@@ -309,3 +319,216 @@
     }
=20
 }
+////////////////////////////////////////////////////////////////////////=
///////
+// RAPAV_Formula_Compute
+////////////////////////////////////////////////////////////////////////=
///////
+/**
+ * @brief Class for the listing detail compute,
+ * Formula compute the already computed code
+ *  this class=20
+ * use RAPAV_Listing_Param_SQL the specific columns are=20
+ *   - fp_formula
+ * =20
+ */
+class RAPAV_Formula_Compute extends RAPAV_Listing_Formula
+{
+
+    /**
+     * < RAPAV_Listing_Param_SQL objet */
+    var $data;
+
+    /**
+     * < Object signature=20
+     */
+    var $sig;
+
+    function __construct(RAPAV_Listing_Param_SQL $obj)
+    {
+        global $cn;
+        $this->data =3D $obj;
+        $this->sig =3D 'COMP';
+    }
+
+    function display()
+    {
+        $str =3D sprintf("Formule avec les codes du formulaire %s ", $th=
is->data->fp_formula);
+        return $str;
+    }
+
+    function compute($p_start, $p_end)
+    {
+        return 0;
+    }
+
+    function input()
+    {
+        global $cn;
+        $f_id=3D$this->data->getp('listing_id');
+        $account =3D new IText("form_compute");
+        $account->size =3D 50;
+        echo $account->input();
+        echo HtmlInput::button('listing_search_code_bt', 'Cherche codes'=
, sprintf(" onclick=3D\"listing_search_code('%s','%s','%s','%s')\"", $_RE=
QUEST['ac'], $_REQUEST['plugin_code'], $_REQUEST['gDossier'], $f_id));
+    }
+
+    function save($p_array)
+    {
+        parent::set($p_array);
+        $this->data->setp('listing_id', $p_array['listing_id']);
+
+        /* Clean everything but keep the lp_id, l_id, ad_id  + common */
+        $a_toclean=3Dexplode (',','operation_pcm_val,with_tmp_val,'
+                . 'tmp_val,date_paid,jrn_def_id,type_sum_account,type_de=
tail,'
+                . 'tt_id,jrn_def_type,fp_signed,tva_id,lp_with_card,'
+                . 'lp_card_saldo,ad_id');
+       =20
+        parent::set_to_null($a_toclean);
+        $this->data->setp('formula', $p_array['form_compute']);
+        $this->data->setp('formula_type', 'COMP');
+        $this->data->save();
+    }
+
+    /**
+     * @brief check if the formula is valid, return 1 for an error
+     * and set errode to the error
+     */
+    function verify()
+    {
+        if (trim($this->data->fp_formula) =3D=3D "")
+        {
+            $this->errcode =3D " Aucune formule trouv=C3=A9e";
+            return 1;
+        }
+
+        // copy $this->form->fp_formula to a variable
+        $formula =3D $this->data->fp_formula;
+
+        // remove the valid
+        preg_match_all("/\[([A-Z]*[0-9]*)*([0-9]*[A-Z]*)\]/i", $formula,=
 $e);
+        $formula =3D preg_replace("/\[([A-Z]*[0-9]*)*([0-9]*[A-Z]*)\]/i"=
, '', $formula);
+        $formula =3D preg_replace('/([0-9]+.{0,1}[0.9]*)*(\+|-|\*|\/)*/'=
, '', $formula);
+        $formula =3D preg_replace('/(\(|\))/', '', $formula);
+        $formula =3D preg_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;
+    }
+
+}
+////////////////////////////////////////////////////////////////////////=
///////
+// RAPAV_Formula_Saldo
+////////////////////////////////////////////////////////////////////////=
///////
+/**
+ * @brief Class for the listing detail account,=20
+ * Compute the saldo of account used with a given accounting, the type o=
f=20
+ * saldo can be
+ *   - C
+ *   - D
+ *   - D - C
+ * You can also choose to get the account saldo of the card or of the gi=
ven
+ * accounting
+ *=20
+ * this class use RAPAV_Listing_Param_SQL the specific columns are=20
+ *   - fp_formula
+ *   - jrn_def_id
+ *   - date_paid
+ *   - tt
+ * =20
+ */
+class RAPAV_Formula_Account extends RAPAV_Listing_Formula
+{
+
+    /**
+     * < RAPAV_Listing_Param_SQL objet */
+    var $data;
+
+    /**
+     * < Object signature=20
+     */
+    var $sig;
+
+    function __construct(RAPAV_Listing_Param_SQL $obj)
+    {
+        global $cn;
+        $this->data =3D $obj;
+        $this->sig =3D 'ACCOUNT';
+    }
+
+    function display()
+    {
+        $ledger =3D $this->get_ledger_name();
+        $paid =3D ( $this->data->date_paid !=3D 0 ) ? "la date concerne =
la date de paiement, la recherche sera limit=C3=A9e au journaux de type A=
CH & VEN" : "";
+        $str =3D sprintf("R=C3=A9sultat de la formule %s utilisant $ledg=
er %s", $this->data->fp_formula, $paid);
+        return $str;
+    }
+
+    function compute($p_start, $p_end)
+    {
+        return 0;
+    }
+
+    function input()
+    {
+        global $cn;
+        $account =3D new IPoste("p_formula", "", "formula_acc_input_id")=
;
+        $account->label =3D _("Recherche poste");
+        $account->set_attribute('gDossier', dossier::id());
+        $account->set_attribute('account', "formula_acc_input_id");
+        echo "Poste comptable utilis=C3=A9e avec chaque fiche ".$account=
->input();
+        $sel_total_type_row=3Dnew ISelect ('tt_id');
+        $sel_total_type_row->value=3D$cn->make_array('select tt_id,tt_la=
bel from '
+                . ' rapport_advanced.total_type_account order by 2');
+       =20
+        echo '<p>';
+        echo "type de total : ".$sel_total_type_row->input();
+        echo '</p>';
+       =20
+        $ck=3Dnew ICheckBox('card_saldo');
+        echo '<p>';
+        echo 'Prendre le total de la fiche '.$ck->input();
+        echo '</p>';
+        parent::input_date_paiement();
+        parent::input_ledger();
+    }
+
+    function save($p_array)
+    {
+        parent::set($p_array);
+        $this->data->setp('listing_id', $p_array['listing_id']);
+        /* Clean everything but keep the lp_id, l_id, with_Card and ad_i=
d  + common */
+        $a_toclean =3D explode(',', 'operation_pcm_val,with_tmp_val,tmp_=
val, '
+                . 'type_sum_account, tt_id, '
+                . 'fp_signed,  tva_id'
+                . ',lp_card_saldo,attribut_card');
+
+        parent::set_to_null($a_toclean);
+        $this->data->setp('with_card', 'N');
+        $this->data->setp('formula', $p_array['p_formula']);
+        if (isset($p_array['p_paid']))
+        {
+            $this->data->setp('date_paid', 1);
+        } else
+        {
+            $this->data->setp('date_paid', null);
+           =20
+        }
+        $this->data->setp('jrn_def_id', $p_array['p_ledger']);
+        $this->data->setp('formula_type', 'ACCOUNT');
+        $this->data->save();
+    }
+
+    /**
+     * @brief check if the formula is valid, return 1 for an error
+     * and set errode to the error
+     * @todo verifier que le poste comptable existe
+     */
+    function verify()
+    {
+        return 0;
+    }
+
+}

Modified: trunk/rapport_avance/include/class_rapav_listing_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_rapav_listing_param.php	2013-11-25=
 19:22:47 UTC (rev 590)
+++ trunk/rapport_avance/include/class_rapav_listing_param.php	2013-11-25=
 19:56:25 UTC (rev 591)
@@ -80,7 +80,10 @@
         $order=3Dnew INum('order');
         $order->value=3D10;
         $attribute=3Dnew RAPAV_Formula_Attribute($this->Param,$p_id);
-        $formula=3Dnew RAPAV_Formula_Formula($this->Param,$p_id);
+        $formula=3Dnew RAPAV_Formula_Formula($this->Param);
+        $compute=3Dnew RAPAV_Formula_Compute($this->Param);
+        $account=3Dnew RAPAV_Formula_Account($this->Param);
+        $account->set_listing($p_id);
         require 'template/listing_param_input.php';
     }
 }

Modified: trunk/rapport_avance/include/template/listing_param_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/template/listing_param_input.php	2013-11=
-25 19:22:47 UTC (rev 590)
+++ trunk/rapport_avance/include/template/listing_param_input.php	2013-11=
-25 19:56:25 UTC (rev 591)
@@ -66,7 +66,7 @@
         <div style=3D"padding: 10px">
             <div id=3D"new_formula_id" style=3D"display:block">
                 <p>
-                    Entrer une formule avec des postes comptables, la sy=
ntaxe est la m=C3=AAme que celle des "rapports"
+                    Entrez une formule avec des postes comptables, la sy=
ntaxe est la m=C3=AAme que celle des "rapports"
                 </p>
                 <p>
                     Exemple : [70%]*0.25+[71%]
@@ -86,14 +86,14 @@
             </div>
             <div id=3D"new_compute_id" style=3D"display:none">
                 <p>
-                    Entrer une formule avec des codes utilis=C3=A9s dans=
 ce formulaires
+                    Entrez une formule avec des codes utilis=C3=A9s dans=
 ce formulaire
                 </p>
                 <form id=3D"new_padec" method=3D"POST" onsubmit=3D"save_=
param_listing('new_padec');
                         return false">
                           <?php echo HtmlInput::request_to_hidden(array(=
'gDossier', 'ac', 'plugin_code', 'p_id')) ?>
=20
                     <?php echo HtmlInput::hidden('tab', 'compute_id') ?>
-                    <?php echo "compute" ?>
+                    <?php echo $compute->input() ?>
                     <p>
                         <?php echo HtmlInput::submit('save', 'Sauve') ?>
                     </p>
@@ -107,8 +107,7 @@
                     <?php echo HtmlInput::request_to_hidden(array('gDoss=
ier', 'ac', 'plugin_code', 'p_id')) ?>
=20
                     <?php echo HtmlInput::hidden('tab', 'new_account_id'=
) ?>
-                    <?php echo "account" ?>
-
+                    <?php echo $account->input() ?>
                     <p>
                         <?php echo HtmlInput::submit('save', 'Sauve') ?>
                     </p>

Modified: trunk/rapport_avance/rapav_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_javascript.js	2013-11-25 19:22:47 UTC (rev=
 590)
+++ trunk/rapport_avance/rapav_javascript.js	2013-11-25 19:56:25 UTC (rev=
 591)
@@ -810,4 +810,42 @@
     {
         alert(e.message);
     }
-}
\ No newline at end of file
+}
+
+/**
+ *@brief display a popup and let you select an existing code
+ */
+function listing_search_code(ac, plugin_code, dossier, f_id)
+{
+    try
+    {
+        var querystring =3D 'plugin_code=3D' + plugin_code + '&ac=3D' + =
ac + '&gDossier=3D' + dossier + '&act=3Dlisting_search_code' + "&f_id=3D"=
 + f_id;
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        remove_waiting_box();
+                        removeDiv('search_code_div');
+                        var nTop =3D calcy(80);
+                        var nLeft =3D "400px";
+                        var str_style =3D "top:" + nTop + "px;left:" + n=
Left + ";width:50em;height:auto;z-index:4";
+                        add_div({
+                            id: 'search_code_div',
+                            style: str_style,
+                            cssclass: 'inner_box',
+                            drag: 1
+                        });
+                        $('search_code_div').innerHTML =3D req.responseT=
ext;
+                    }
+                }
+        );
+
+    } catch (e)
+    {
+        alert("listing_search_code" + e.message);
+    }
+}



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


From MAILER-DAEMON Thu Nov 28 08:58:54 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vm27K-00085l-Kr
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Nov 2013 08:58:54 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Nov 2013 14:47:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.119899.1385647134.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r592 - tag/rel670/import_card/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, 28 Nov 2013 13:58:53 -0000

Author: danydb
Date: 2013-11-28 14:47:36 +0100 (Thu, 28 Nov 2013)
New Revision: 592

Modified:
   tag/rel670/import_card/include/class_import_card.php
Log:
Compute properly the quickcode

Modified: tag/rel670/import_card/include/class_import_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel670/import_card/include/class_import_card.php	2013-11-25 19:56=
:25 UTC (rev 591)
+++ tag/rel670/import_card/include/class_import_card.php	2013-11-28 13:47=
:36 UTC (rev 592)
@@ -174,7 +174,7 @@
 			if ($valid_qcode =3D=3D 0)
 			{
 				$attr =3D sprintf('av_text%d', ATTR_DEF_QUICKCODE);
-				$array[$attr] =3D 'FID';
+				$array[$attr] =3D '';
 			}
 			/*
 			 * Force the creating of an accounting



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


From MAILER-DAEMON Thu Nov 28 08:59:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vm27n-00089w-SV
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Nov 2013 08:59:23 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Nov 2013 14:48:09 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.119900.1385647163.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5547 - phpcompta/tags/rel670/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, 28 Nov 2013 13:59:22 -0000

Author: danydb
Date: 2013-11-28 14:48:09 +0100 (Thu, 28 Nov 2013)
New Revision: 5547

Modified:
   phpcompta/tags/rel670/include/class_fiche.php
Log:
sort the array for fiche properly to have the name BEFORE quickcode and a=
ccounting

Modified: phpcompta/tags/rel670/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/class_fiche.php	2013-11-24 16:34:37 UTC=
 (rev 5546)
+++ phpcompta/tags/rel670/include/class_fiche.php	2013-11-28 13:48:09 UTC=
 (rev 5547)
@@ -741,6 +741,12 @@
         $this->id=3D$fiche_id;
         // first we create the card
         if ( $transaction)    $this->cn->start();
+        /*
+         * Sort the array for having the name AFTER the quickcode and th=
e=20
+         * Accounting
+         */
+        ksort($p_array);
+       =20
         try
         {
             $sql=3Dsprintf("insert into fiche(f_id,fd_id)".



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


From MAILER-DAEMON Thu Nov 28 09:01:02 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vm29O-0000G0-6q
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Nov 2013 09:01:02 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Nov 2013 14:49:45 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.119901.1385647261.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5548 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Nov 2013 14:01:01 -0000

Author: danydb
Date: 2013-11-28 14:49:44 +0100 (Thu, 28 Nov 2013)
New Revision: 5548

Modified:
   phpcompta/trunk/html/style.css
Log:
improve esthetic

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-11-28 13:48:09 UTC (rev 5547)
+++ phpcompta/trunk/html/style.css	2013-11-28 13:49:44 UTC (rev 5548)
@@ -324,10 +324,8 @@
    =20
 }
 td.selectedcell{
-    border-style:inset;
     border-color:blue;
     border-width:1pt ;
-    font-size:1.2em;
     font-weight: bold;
     background:#5D90CD ;
     color:white;



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


From MAILER-DAEMON Thu Nov 28 09:02:00 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vm2AJ-0002Hz-UB
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Nov 2013 09:01:59 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Nov 2013 14:50:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.119910.1385647313.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5549 - in phpcompta/trunk: . include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Nov 2013 14:01:52 -0000

Author: danydb
Date: 2013-11-28 14:50:39 +0100 (Thu, 28 Nov 2013)
New Revision: 5549

Modified:
   phpcompta/trunk/
   phpcompta/trunk/include/class_fiche.php
Log:
Merged revisions 5547 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel670

........
  r5547 | danydb | 2013-11-28 14:48:09 +0100 (jeu., 28 nov. 2013) | 1 lin=
e
 =20
  sort the array for fiche properly to have the name BEFORE quickcode and=
 accounting
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel670:1-5539,5541-5545
   + /phpcompta/tags/rel670:1-5539,5541-5548

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-11-28 13:49:44 UTC (rev =
5548)
+++ phpcompta/trunk/include/class_fiche.php	2013-11-28 13:50:39 UTC (rev =
5549)
@@ -741,6 +741,12 @@
         $this->id=3D$fiche_id;
         // first we create the card
         if ( $transaction)    $this->cn->start();
+        /*
+         * Sort the array for having the name AFTER the quickcode and th=
e=20
+         * Accounting
+         */
+        ksort($p_array);
+       =20
         try
         {
             $sql=3Dsprintf("insert into fiche(f_id,fd_id)".



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


From MAILER-DAEMON Thu Nov 28 11:34:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vm4Xf-0005iw-1X
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Nov 2013 11:34:15 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Nov 2013 17:22:58 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.120020.1385656453.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5550 - phpcompta/tags/rel670/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, 28 Nov 2013 16:34:13 -0000

Author: danydb
Date: 2013-11-28 17:22:58 +0100 (Thu, 28 Nov 2013)
New Revision: 5550

Modified:
   phpcompta/tags/rel670/include/class_periode.php
   phpcompta/tags/rel670/include/periode.inc.php
Log:
Empeche fermeture si une seule periode, empeche erreur si periode inexist=
ante

Modified: phpcompta/tags/rel670/include/class_periode.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/class_periode.php	2013-11-28 13:50:39 U=
TC (rev 5549)
+++ phpcompta/tags/rel670/include/class_periode.php	2013-11-28 16:22:58 U=
TC (rev 5550)
@@ -415,7 +415,7 @@
      */
     function load()
     {
-
+        if ($this->p_id =3D=3D '') $this->p_id=3D-1;
         $row=3D$this->cn->get_array("select p_start,p_end,p_exercice,p_c=
losed,p_central from parm_periode where p_id=3D$1",
                                   array($this->p_id));
         if ($row =3D=3D null ) return -1;

Modified: phpcompta/tags/rel670/include/periode.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/rel670/include/periode.inc.php	2013-11-28 13:50:39 UTC=
 (rev 5549)
+++ phpcompta/tags/rel670/include/periode.inc.php	2013-11-28 16:22:58 UTC=
 (rev 5550)
@@ -89,7 +89,13 @@
     }
     else
     {
-        $Res=3D$cn->exec_sql("delete from parm_periode where p_id=3D$p_p=
er");
+        $count=3D$cn->get_value("select count(*) from parm_periode;");
+        if ( $count > 1 ) {
+            $Res=3D$cn->exec_sql("delete from parm_periode where p_id=3D=
$p_per");
+        }
+        {
+            alert(' D=C3=A9sol=C3=A9 mais vous devez avoir au moins une =
p=C3=A9riode');
+        }
     }
     $choose=3D"yes";
 }



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


From MAILER-DAEMON Thu Nov 28 15:06:50 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vm7rO-0005hO-4i
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Nov 2013 15:06:50 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Nov 2013 20:55:34 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.120186.1385669209.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5552 - phpcompta/tags/rel670/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, 28 Nov 2013 20:06:48 -0000

Author: danydb
Date: 2013-11-28 20:55:34 +0100 (Thu, 28 Nov 2013)
New Revision: 5552

Modified:
   phpcompta/tags/rel670/include/class_stock.php
   phpcompta/tags/rel670/include/class_stock_goods.php
   phpcompta/tags/rel670/include/stock_state.inc.php
Log:
Correct stock insert and reporting

Modified: phpcompta/tags/rel670/include/class_stock.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/class_stock.php	2013-11-28 19:55:32 UTC=
 (rev 5551)
+++ phpcompta/tags/rel670/include/class_stock.php	2013-11-28 19:55:34 UTC=
 (rev 5552)
@@ -259,6 +259,18 @@
 	function build_tmp_table($p_array)
 	{
 		global $cn,$g_user;
+                // exercice=20
+                if (isset ($p_array['state_exercice']))
+                {
+                    $periode=3Dnew Periode($cn);
+                    $date=3D  format_date($p_array['state_exercice'], 'Y=
YYY-MM-DD');
+                    $periode->find_periode($date);
+                   =20
+                } else {
+                    $periode_id=3D$g_user->get_periode();
+                    $periode=3Dnew Periode($cn,$periode_id);
+                }
+                $periode->load();
 		$tmp_id =3D $cn->get_next_seq("public.tmp_stockgood_s_id_seq");
 		$cn->exec_sql("delete from tmp_stockgood where s_date < now() - interv=
al '2 days' ");
 		$cn->exec_sql("insert into tmp_stockgood(s_id) values ($1)", array($tm=
p_id));
@@ -266,16 +278,6 @@
 		// get all readable repository
 		$a_repository =3D $g_user->get_available_repository('R');
=20
-
-		$end_date =3D $cn->get_value("select to_char(max(p_end),'DD.MM.YYYY') =
from parm_periode");
-		if (isset($p_array['state_exercice']))
-		{
-			$tmp_date=3D  format_date($p_array['state_exercice'],'YYYY-MM-DD','DD=
.MM.YYYY');
-			if (isDate($tmp_date) =3D=3D $tmp_date)
-			{
-				$end_date =3D $tmp_date;
-			}
-		}
 		// From ACH : IN
 		$sql_repo_detail =3D "
 			insert into tmp_stockgood_detail(s_id,sg_code,s_qin,r_id,f_id)
@@ -284,13 +286,13 @@
 				where
 					sg_type=3D'd'
 					and j_id is not null
-					and j_id in (select j_id from jrnx where  j_date <=3D to_date($2,'D=
D.MM.YYYY'))
+					and j_id in (select j_id from jrnx where  j_tech_per in (select p_i=
d from parm_periode where p_exercice=3D$2))
 					and r_id  in (select r_id from profile_sec_repository where p_id=3D=
$1)
 					group by r_id,trim(sg_code),f_id
 			";
=20
 		// From VEN : out
-		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $end_dat=
e));
+		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $periode=
->p_exercice));
 		$sql_repo_detail =3D "
 				insert into tmp_stockgood_detail(s_id,sg_code,s_qout,r_id,f_id)
 				select $tmp_id,trim(sg_code) , coalesce(sum(sg_quantity),0) as qout,=
r_id,f_id
@@ -298,11 +300,11 @@
 				where
 					sg_type=3D'c'
 					and sg.j_id is not null
-					and sg.j_id in (select j_id from jrnx where  j_date <=3D to_date($2=
,'DD.MM.YYYY'))
+					and sg.j_id in (select j_id from jrnx where  j_tech_per in (select =
p_id from parm_periode where p_exercice=3D$2))
 					and sg.r_id  in (select r_id from profile_sec_repository where p_id=
=3D$1)
 					group by r_id,trim(sg_code),f_id
 			";
-		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $end_dat=
e));
+		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $periode=
->p_exercice));
=20
 		// From INV  IN
 		$sql_repo_detail =3D "
@@ -312,13 +314,13 @@
 				where
 					sg_type=3D'd'
 					and j_id is null
-					and sg_tech_date <=3D to_date($2,'DD.MM.YYYY')
+					and sg_date >=3D ( select min(p_start) from parm_periode where p_ex=
ercice=3D$2)
+					and sg_date <=3D ( select max(p_end) from parm_periode where p_exer=
cice=3D$2)
 					 and sg.r_id  in (select r_id from profile_sec_repository where p_i=
d=3D$1)
 					group by r_id,trim(sg_code),f_id
 			";
-
 		// From INV: OUT
-		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $end_dat=
e));
+		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $periode=
->p_exercice));
 		$sql_repo_detail =3D "
 				insert into tmp_stockgood_detail(s_id,sg_code,s_qout,r_id,f_id)
 				select $tmp_id,trim(sg_code), coalesce(sum(sg_quantity),0) as qout,r=
_id,f_id
@@ -327,10 +329,10 @@
 					sg_type=3D'c'
 					and j_id is null
 					 and r_id  in (select r_id from profile_sec_repository where p_id=3D=
$1)
-					and sg_tech_date  <=3D to_date($2,'DD.MM.YYYY')
+					and sg_date  <=3D to_date($2,'DD.MM.YYYY')
 					group by r_id,trim(sg_code),f_id
 			";
-		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $end_dat=
e));
+		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $periode=
->p_exercice));
 		return $tmp_id;
 	}
=20

Modified: phpcompta/tags/rel670/include/class_stock_goods.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/rel670/include/class_stock_goods.php	2013-11-28 19:55:=
32 UTC (rev 5551)
+++ phpcompta/tags/rel670/include/class_stock_goods.php	2013-11-28 19:55:=
34 UTC (rev 5552)
@@ -135,9 +135,17 @@
 				if ($p_array['sg_quantity' . $i] !=3D 0 &&
 						trim($p_array['sg_code' . $i]) !=3D '')
 				{
+                                        $stock=3D  strtoupper(trim($p_ar=
ray['sg_code' . $i]));
 					$fiche=3Dnew Fiche($cn);
 					$fiche->get_by_qcode($p_array['sg_code' . $i]);
-					$stock=3D$fiche->strAttribut(ATTR_DEF_STOCK);
+					/*
+                                         * check if code stock does exis=
t
+                                         */
+                                        $count=3D$cn->get_value('select =
count(*) from fiche_detail where ad_id=3D$1 and ad_value=3D$2',
+                                                array(ATTR_DEF_STOCK,$st=
ock));
+                                        if ( $count=3D=3D0) {
+                                            throw new Exception("Code st=
ock inexistant");
+                                        }
 					$a->f_id=3D$fiche->id;
 					$a->sg_code =3D $stock;
 					$a->sg_quantity =3D abs($p_array['sg_quantity' . $i]);

Modified: phpcompta/tags/rel670/include/stock_state.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/stock_state.inc.php	2013-11-28 19:55:32=
 UTC (rev 5551)
+++ phpcompta/tags/rel670/include/stock_state.inc.php	2013-11-28 19:55:34=
 UTC (rev 5552)
@@ -35,7 +35,12 @@
 // Get type =3D table or list
 $iexercice=3Dnew ISelect('state_exercice');
 $iexercice->value=3D$cn->make_array("select  max(p_end) as date_end, p_e=
xercice from parm_periode  group by p_exercice order by 2 desc");
-$iexercice->selected=3D(isset($_GET['state_exercice']))?$_GET['state_exe=
rcice']:"";
+$per=3Dnew Periode($cn,$g_user->get_periode());
+$per->load();
+$date_limit=3D$per->limit_year($per->p_exercice);
+$last_day=3D$per->last_day($date_limit['end']);
+$last_day=3Dformat_date($last_day,'DD.MM.YYYY','YYYY-MM-DD');
+$iexercice->selected=3D(isset($_GET['state_exercice']))?$_GET['state_exe=
rcice']:$last_day;
=20
 $presentation=3Dnew ISelect("present");
 $presentation->value=3Darray (



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


From MAILER-DAEMON Thu Nov 28 15:06:55 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vm7rQ-0005hg-BW
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Nov 2013 15:06:55 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Nov 2013 20:55:32 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.120187.1385669211.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5551 - phpcompta/tags/rel670/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, 28 Nov 2013 20:06:50 -0000

Author: danydb
Date: 2013-11-28 20:55:32 +0100 (Thu, 28 Nov 2013)
New Revision: 5551

Modified:
   phpcompta/tags/rel670/include/export_stock_resume_list.php
Log:
resolve bug in export stock

Modified: phpcompta/tags/rel670/include/export_stock_resume_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/export_stock_resume_list.php	2013-11-28=
 16:22:58 UTC (rev 5550)
+++ phpcompta/tags/rel670/include/export_stock_resume_list.php	2013-11-28=
 19:55:32 UTC (rev 5551)
@@ -28,8 +28,9 @@
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once 'class_stock.php';
+global $cn;
 // var_dump($_GET);
-$stock=3Dnew Stock();
+$stock=3Dnew Stock($cn);
 $tmp_id =3D $stock->build_tmp_table($_GET);
=20
 header('Pragma: public');



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


From MAILER-DAEMON Fri Nov 29 08:04:03 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VmNjn-0000PC-Rx
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Nov 2013 08:04:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Nov 2013 13:52:46 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.120752.1385730243.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5553 - phpcompta/tags/rel670/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Nov 2013 13:04:02 -0000

Author: danydb
Date: 2013-11-29 13:52:45 +0100 (Fri, 29 Nov 2013)
New Revision: 5553

Modified:
   phpcompta/tags/rel670/include/class_acc_ledger_purchase.php
   phpcompta/tags/rel670/include/class_acc_ledger_sold.php
Log:
Bug #922 : cosmetic
Task #922 - Totaux ?\195?\160 0 dans la fiche COMPTA/MENUACH/ACH

Modified: phpcompta/tags/rel670/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/class_acc_ledger_purchase.php	2013-11-2=
8 19:55:34 UTC (rev 5552)
+++ phpcompta/tags/rel670/include/class_acc_ledger_purchase.php	2013-11-2=
9 12:52:45 UTC (rev 5553)
@@ -1482,7 +1482,7 @@
             $r.=3D'<tr>'.td(_('Total TVAC')).td(hb(nbm($tot)),'class=3D"=
num"');
             $r.=3D'</table>';
         } else {
-            $r.=3D'<br>Total '.nbm(hb($tot));
+            $r.=3D'<br>Total '.hb(nbm($tot));
         }
         $r.=3D'</p>';
         /*  Add hidden */

Modified: phpcompta/tags/rel670/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel670/include/class_acc_ledger_sold.php	2013-11-28 19=
:55:34 UTC (rev 5552)
+++ phpcompta/tags/rel670/include/class_acc_ledger_sold.php	2013-11-29 12=
:52:45 UTC (rev 5553)
@@ -809,7 +809,7 @@
             $r.=3D'<tr>'.td(_('Total TVAC')).td(hb(nbm($tot)),'class=3D"=
num"');
             $r.=3D'</table>';
         } else {
-            $r.=3D'<br>Total '.nbm(hb($tot));
+            $r.=3D'<br>Total '.hb(nbm($tot));
         }
        $r.=3D'</p>';
         if (!$p_summary) {



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


From MAILER-DAEMON Fri Nov 29 09:58:14 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VmPWI-0003jT-NL
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Nov 2013 09:58:14 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Nov 2013 15:46:54 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.120817.1385737093.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5554 - in phpcompta/trunk: . include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Nov 2013 14:58:13 -0000

Author: danydb
Date: 2013-11-29 15:46:54 +0100 (Fri, 29 Nov 2013)
New Revision: 5554

Modified:
   phpcompta/trunk/
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_periode.php
   phpcompta/trunk/include/class_stock.php
   phpcompta/trunk/include/class_stock_goods.php
   phpcompta/trunk/include/export_stock_resume_list.php
   phpcompta/trunk/include/periode.inc.php
   phpcompta/trunk/include/stock_state.inc.php
Log:
Merged revisions 5550-5553 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel670

........
  r5550 | danydb | 2013-11-28 17:22:58 +0100 (jeu., 28 nov. 2013) | 1 lin=
e
 =20
  Empeche fermeture si une seule periode, empeche erreur si periode inexi=
stante
........
  r5551 | danydb | 2013-11-28 20:55:32 +0100 (jeu., 28 nov. 2013) | 1 lin=
e
 =20
  resolve bug in export stock
........
  r5552 | danydb | 2013-11-28 20:55:34 +0100 (jeu., 28 nov. 2013) | 1 lin=
e
 =20
  Correct stock insert and reporting
........
  r5553 | danydb | 2013-11-29 13:52:45 +0100 (ven., 29 nov. 2013) | 2 lin=
es
 =20
  Bug #922 : cosmetic
  Task #922 - Totaux ?\195?\160 0 dans la fiche COMPTA/MENUACH/ACH
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel670:1-5539,5541-5548
   + /phpcompta/tags/rel670:1-5539,5541-5553

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-11-29 12:5=
2:45 UTC (rev 5553)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-11-29 14:4=
6:54 UTC (rev 5554)
@@ -1482,7 +1482,7 @@
             $r.=3D'<tr>'.td(_('Total TVAC')).td(hb(nbm($tot)),'class=3D"=
num"');
             $r.=3D'</table>';
         } else {
-            $r.=3D'<br>Total '.nbm(hb($tot));
+            $r.=3D'<br>Total '.hb(nbm($tot));
         }
         $r.=3D'</p>';
         /*  Add hidden */

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-11-29 12:52:45=
 UTC (rev 5553)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-11-29 14:46:54=
 UTC (rev 5554)
@@ -809,7 +809,7 @@
             $r.=3D'<tr>'.td(_('Total TVAC')).td(hb(nbm($tot)),'class=3D"=
num"');
             $r.=3D'</table>';
         } else {
-            $r.=3D'<br>Total '.nbm(hb($tot));
+            $r.=3D'<br>Total '.hb(nbm($tot));
         }
        $r.=3D'</p>';
         if (!$p_summary) {

Modified: phpcompta/trunk/include/class_periode.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_periode.php	2013-11-29 12:52:45 UTC (re=
v 5553)
+++ phpcompta/trunk/include/class_periode.php	2013-11-29 14:46:54 UTC (re=
v 5554)
@@ -415,7 +415,7 @@
      */
     function load()
     {
-
+        if ($this->p_id =3D=3D '') $this->p_id=3D-1;
         $row=3D$this->cn->get_array("select p_start,p_end,p_exercice,p_c=
losed,p_central from parm_periode where p_id=3D$1",
                                   array($this->p_id));
         if ($row =3D=3D null ) return -1;

Modified: phpcompta/trunk/include/class_stock.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_stock.php	2013-11-29 12:52:45 UTC (rev =
5553)
+++ phpcompta/trunk/include/class_stock.php	2013-11-29 14:46:54 UTC (rev =
5554)
@@ -259,6 +259,18 @@
 	function build_tmp_table($p_array)
 	{
 		global $cn,$g_user;
+                // exercice=20
+                if (isset ($p_array['state_exercice']))
+                {
+                    $periode=3Dnew Periode($cn);
+                    $date=3D  format_date($p_array['state_exercice'], 'Y=
YYY-MM-DD');
+                    $periode->find_periode($date);
+                   =20
+                } else {
+                    $periode_id=3D$g_user->get_periode();
+                    $periode=3Dnew Periode($cn,$periode_id);
+                }
+                $periode->load();
 		$tmp_id =3D $cn->get_next_seq("public.tmp_stockgood_s_id_seq");
 		$cn->exec_sql("delete from tmp_stockgood where s_date < now() - interv=
al '2 days' ");
 		$cn->exec_sql("insert into tmp_stockgood(s_id) values ($1)", array($tm=
p_id));
@@ -266,16 +278,6 @@
 		// get all readable repository
 		$a_repository =3D $g_user->get_available_repository('R');
=20
-
-		$end_date =3D $cn->get_value("select to_char(max(p_end),'DD.MM.YYYY') =
from parm_periode");
-		if (isset($p_array['state_exercice']))
-		{
-			$tmp_date=3D  format_date($p_array['state_exercice'],'YYYY-MM-DD','DD=
.MM.YYYY');
-			if (isDate($tmp_date) =3D=3D $tmp_date)
-			{
-				$end_date =3D $tmp_date;
-			}
-		}
 		// From ACH : IN
 		$sql_repo_detail =3D "
 			insert into tmp_stockgood_detail(s_id,sg_code,s_qin,r_id,f_id)
@@ -284,13 +286,13 @@
 				where
 					sg_type=3D'd'
 					and j_id is not null
-					and j_id in (select j_id from jrnx where  j_date <=3D to_date($2,'D=
D.MM.YYYY'))
+					and j_id in (select j_id from jrnx where  j_tech_per in (select p_i=
d from parm_periode where p_exercice=3D$2))
 					and r_id  in (select r_id from profile_sec_repository where p_id=3D=
$1)
 					group by r_id,trim(sg_code),f_id
 			";
=20
 		// From VEN : out
-		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $end_dat=
e));
+		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $periode=
->p_exercice));
 		$sql_repo_detail =3D "
 				insert into tmp_stockgood_detail(s_id,sg_code,s_qout,r_id,f_id)
 				select $tmp_id,trim(sg_code) , coalesce(sum(sg_quantity),0) as qout,=
r_id,f_id
@@ -298,11 +300,11 @@
 				where
 					sg_type=3D'c'
 					and sg.j_id is not null
-					and sg.j_id in (select j_id from jrnx where  j_date <=3D to_date($2=
,'DD.MM.YYYY'))
+					and sg.j_id in (select j_id from jrnx where  j_tech_per in (select =
p_id from parm_periode where p_exercice=3D$2))
 					and sg.r_id  in (select r_id from profile_sec_repository where p_id=
=3D$1)
 					group by r_id,trim(sg_code),f_id
 			";
-		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $end_dat=
e));
+		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $periode=
->p_exercice));
=20
 		// From INV  IN
 		$sql_repo_detail =3D "
@@ -312,13 +314,13 @@
 				where
 					sg_type=3D'd'
 					and j_id is null
-					and sg_tech_date <=3D to_date($2,'DD.MM.YYYY')
+					and sg_date >=3D ( select min(p_start) from parm_periode where p_ex=
ercice=3D$2)
+					and sg_date <=3D ( select max(p_end) from parm_periode where p_exer=
cice=3D$2)
 					 and sg.r_id  in (select r_id from profile_sec_repository where p_i=
d=3D$1)
 					group by r_id,trim(sg_code),f_id
 			";
-
 		// From INV: OUT
-		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $end_dat=
e));
+		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $periode=
->p_exercice));
 		$sql_repo_detail =3D "
 				insert into tmp_stockgood_detail(s_id,sg_code,s_qout,r_id,f_id)
 				select $tmp_id,trim(sg_code), coalesce(sum(sg_quantity),0) as qout,r=
_id,f_id
@@ -327,10 +329,10 @@
 					sg_type=3D'c'
 					and j_id is null
 					 and r_id  in (select r_id from profile_sec_repository where p_id=3D=
$1)
-					and sg_tech_date  <=3D to_date($2,'DD.MM.YYYY')
+					and sg_date  <=3D to_date($2,'DD.MM.YYYY')
 					group by r_id,trim(sg_code),f_id
 			";
-		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $end_dat=
e));
+		$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $periode=
->p_exercice));
 		return $tmp_id;
 	}
=20

Modified: phpcompta/trunk/include/class_stock_goods.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_stock_goods.php	2013-11-29 12:52:45 UTC=
 (rev 5553)
+++ phpcompta/trunk/include/class_stock_goods.php	2013-11-29 14:46:54 UTC=
 (rev 5554)
@@ -135,9 +135,17 @@
 				if ($p_array['sg_quantity' . $i] !=3D 0 &&
 						trim($p_array['sg_code' . $i]) !=3D '')
 				{
+                                        $stock=3D  strtoupper(trim($p_ar=
ray['sg_code' . $i]));
 					$fiche=3Dnew Fiche($cn);
 					$fiche->get_by_qcode($p_array['sg_code' . $i]);
-					$stock=3D$fiche->strAttribut(ATTR_DEF_STOCK);
+					/*
+                                         * check if code stock does exis=
t
+                                         */
+                                        $count=3D$cn->get_value('select =
count(*) from fiche_detail where ad_id=3D$1 and ad_value=3D$2',
+                                                array(ATTR_DEF_STOCK,$st=
ock));
+                                        if ( $count=3D=3D0) {
+                                            throw new Exception("Code st=
ock inexistant");
+                                        }
 					$a->f_id=3D$fiche->id;
 					$a->sg_code =3D $stock;
 					$a->sg_quantity =3D abs($p_array['sg_quantity' . $i]);

Modified: phpcompta/trunk/include/export_stock_resume_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_stock_resume_list.php	2013-11-29 12:52=
:45 UTC (rev 5553)
+++ phpcompta/trunk/include/export_stock_resume_list.php	2013-11-29 14:46=
:54 UTC (rev 5554)
@@ -28,8 +28,9 @@
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once 'class_stock.php';
+global $cn;
 // var_dump($_GET);
-$stock=3Dnew Stock();
+$stock=3Dnew Stock($cn);
 $tmp_id =3D $stock->build_tmp_table($_GET);
=20
 header('Pragma: public');

Modified: phpcompta/trunk/include/periode.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/periode.inc.php	2013-11-29 12:52:45 UTC (rev =
5553)
+++ phpcompta/trunk/include/periode.inc.php	2013-11-29 14:46:54 UTC (rev =
5554)
@@ -89,7 +89,13 @@
     }
     else
     {
-        $Res=3D$cn->exec_sql("delete from parm_periode where p_id=3D$p_p=
er");
+        $count=3D$cn->get_value("select count(*) from parm_periode;");
+        if ( $count > 1 ) {
+            $Res=3D$cn->exec_sql("delete from parm_periode where p_id=3D=
$p_per");
+        }
+        {
+            alert(' D=C3=A9sol=C3=A9 mais vous devez avoir au moins une =
p=C3=A9riode');
+        }
     }
     $choose=3D"yes";
 }

Modified: phpcompta/trunk/include/stock_state.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/stock_state.inc.php	2013-11-29 12:52:45 UTC (=
rev 5553)
+++ phpcompta/trunk/include/stock_state.inc.php	2013-11-29 14:46:54 UTC (=
rev 5554)
@@ -35,7 +35,12 @@
 // Get type =3D table or list
 $iexercice=3Dnew ISelect('state_exercice');
 $iexercice->value=3D$cn->make_array("select  max(p_end) as date_end, p_e=
xercice from parm_periode  group by p_exercice order by 2 desc");
-$iexercice->selected=3D(isset($_GET['state_exercice']))?$_GET['state_exe=
rcice']:"";
+$per=3Dnew Periode($cn,$g_user->get_periode());
+$per->load();
+$date_limit=3D$per->limit_year($per->p_exercice);
+$last_day=3D$per->last_day($date_limit['end']);
+$last_day=3Dformat_date($last_day,'DD.MM.YYYY','YYYY-MM-DD');
+$iexercice->selected=3D(isset($_GET['state_exercice']))?$_GET['state_exe=
rcice']:$last_day;
=20
 $presentation=3Dnew ISelect("present");
 $presentation->value=3Darray (



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


