From MAILER-DAEMON Tue Oct 01 10:22:41 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VR0qX-0007M0-9E
	for mharc-phpcompta-dev@gnu.org; Tue, 01 Oct 2013 10:22:41 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  1 Oct 2013 16:12:45 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.56950.1380637360.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5451 - 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: Tue, 01 Oct 2013 14:22:39 -0000

Author: danydb
Date: 2013-10-01 16:12:44 +0200 (Tue, 01 Oct 2013)
New Revision: 5451

Modified:
   phpcompta/trunk/include/ajax_mod_predf_op.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_pre_op_ach.php
   phpcompta/trunk/include/class_pre_operation.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/compta_ven.inc.php
   phpcompta/trunk/include/operation_ods_confirm.inc.php
   phpcompta/trunk/include/preod.inc.php
Log:
Add description to the predefined operation

Modified: phpcompta/trunk/include/ajax_mod_predf_op.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_mod_predf_op.php	2013-09-29 17:47:15 UTC=
 (rev 5450)
+++ phpcompta/trunk/include/ajax_mod_predf_op.php	2013-10-01 14:12:44 UTC=
 (rev 5451)
@@ -38,6 +38,13 @@
 $name->value =3D $op->od_name;
 $name->size =3D 60;
 echo "Nom =3D" . $name->input();
+$opd_description=3Dnew ITextarea('od_description');
+$opd_description->style=3D' class=3D"itextarea" style=3D"width:30em;heig=
ht:4em;vertical-align:top"';
+$opd_description->value=3D$op->od_description;
+echo '<p>';
+echo "Description (max 50 car.)";
+echo $opd_description->input();
+echo '</p>';
 echo dossier::hidden() . HtmlInput::hidden('od_id', $_GET['id']);
 echo "<hr>";
 ////////////////////////////////////////////////////////////////////////=
//////

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-09-29 17:47:15 UTC =
(rev 5450)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-10-01 14:12:44 UTC =
(rev 5451)
@@ -2090,8 +2090,7 @@
 			$this->internal =3D $internal;
 			// Save now the predef op
 			//------------------------
-			if (isset($opd_save))
-			{
+                        if (isset ($opd_name)){
 				$opd =3D new Pre_Op_Advanced($this->db);
 				$opd->get_post();
 				$opd->save();

Modified: phpcompta/trunk/include/class_pre_op_ach.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ach.php	2013-09-29 17:47:15 UTC =
(rev 5450)
+++ phpcompta/trunk/include/class_pre_op_ach.php	2013-10-01 14:12:44 UTC =
(rev 5451)
@@ -128,7 +128,9 @@
         }
         return $array;
     }
-    /*!\brief load the data from the database and return an array
+    /**
+     * @brief=20
+     * load the data from the database and return an array
      * \return an array
      */
     function load()
@@ -146,7 +148,7 @@
     }
    function display($p_array)
    {
-	   require_once('class_acc_ledger_purchase.php');
+        require_once('class_acc_ledger_purchase.php');
        global $g_parameter,$g_user;
        extract($p_array);
        $ledger=3Dnew Acc_Ledger_Purchase($this->db,$this->jrn_def_id);

Modified: phpcompta/trunk/include/class_pre_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_operation.php	2013-09-29 17:47:15 U=
TC (rev 5450)
+++ phpcompta/trunk/include/class_pre_operation.php	2013-10-01 14:12:44 U=
TC (rev 5451)
@@ -47,17 +47,38 @@
         $this->od_direct=3D'false';
         $this->od_id=3D$p_id;
     }
+    /**
+     * @brief Propose to save the operation into a predefined operation
+     * @return HTML  string
+     */
+    static function save_propose() {
+        $r=3D"<h2>Mod=C3=A8le d'op=C3=A9ration</h2>";
+        $r.=3D '<p class=3D"decale">';
+        $r.=3D "Donnez un nom pour sauver cette op=C3=A9ration comme mod=
=C3=A8le <br>";
+        $opd_name =3D new IText('opd_name');
+        $r.=3D "Nom du mod=C3=A8le " . $opd_name->input();
+        $opd_description=3Dnew ITextarea('od_description');
+        $opd_description->style=3D' class=3D"itextarea" style=3D"width:3=
0em;height:4em;vertical-align:top"';
+        $r.=3D'</p>';
+        $r.=3D '<p class=3D"decale">';
+        $r.=3D 'Description (max 50 car.)';  =20
+        $r.=3D'<br>';
+        $r.=3D$opd_description->input();
+        $r.=3D'</p>';
+        return $r;
+    }
+
     /*!\brief fill the object with the $_POST variable */
     function get_post()
     {
         $this->nb_item=3D$_POST['nb_item'];
         $this->p_jrn=3D$_REQUEST['p_jrn'];
         $this->jrn_type=3D$_POST['jrn_type'];
-
+       =20
 	$this->name=3D$_POST['opd_name'];
=20
         $this->name=3D(trim($this->name)=3D=3D'')?$_POST['e_comm']:$this=
->name;
-
+        $this->description=3D  $_POST['od_description'];
         if ( $this->name=3D=3D"")
         {
             $n=3D$this->db->get_next_seq('op_def_op_seq');
@@ -89,15 +110,16 @@
             echo '<span class=3D"notice">Vous avez atteint le max. d\'op=
&eacute;ration pr&eacute;d&eacute;finie, d&eacute;sol&eacute;</span>';
             return false;
         }
-        $sql=3Dsprintf('insert into op_predef (jrn_def_id,od_name,od_ite=
m,od_jrn_type,od_direct)'.
+        $sql=3D'insert into op_predef (jrn_def_id,od_name,od_item,od_jrn=
_type,od_direct,od_description)'.
                      'values'.
-                     "(%d,'%s',%d,'%s','%s')",
-                     $this->p_jrn,
-                     Database::escape_string($this->name),
+                     "($1,$2,$3,$4,$5  ,$6               )";
+        $this->db->exec_sql($sql,array($this->p_jrn,
+                     $this->name,
                      $this->nb_item,
                      $this->jrn_type,
-                     $this->od_direct);
-        $this->db->exec_sql($sql);
+                     $this->od_direct,
+                     $this->description,
+            ));
         $this->od_id=3D$this->db->get_current_seq('op_def_op_seq');
         return true;
     }
@@ -106,12 +128,12 @@
      */
     function load()
     {
-        $sql=3D"select od_id,jrn_def_id,od_name,od_item,od_jrn_type".
+        $sql=3D"select od_id,jrn_def_id,od_name,od_item,od_jrn_type,od_d=
escription".
              " from op_predef where od_id=3D".$this->od_id.
              " order by od_name";
         $res=3D$this->db->exec_sql($sql);
         $array=3DDatabase::fetch_all($res);
-        foreach (array('jrn_def_id','od_name','od_item','od_jrn_type') a=
s $field) {
+        foreach (array('jrn_def_id','od_name','od_item','od_jrn_type','o=
d_description') as $field) {
             $this->$field=3D$array[0][$field];
         }
         switch ($this->od_jrn_type) {
@@ -139,7 +161,8 @@
                    "e_comm"=3D>$p_array[0]["od_name"],
                    "nb_item"=3D>(($p_array[0]["od_item"]<10?10:$p_array[=
0]["od_item"]))   ,
                    "p_jrn"=3D>$p_array[0]["jrn_def_id"],
-                   "jrn_type"=3D>$p_array[0]["od_jrn_type"]
+                   "jrn_type"=3D>$p_array[0]["od_jrn_type"],
+                   "od_description"=3D>$p_array['0']['od_description']
                );
         return $array;
=20
@@ -175,7 +198,7 @@
      */
     function get_list_ledger()
     {
-        $sql=3D"select od_id,od_name from op_predef ".
+        $sql=3D"select od_id,od_name,od_description from op_predef ".
              " where jrn_def_id=3D".$this->p_jrn.
              " and od_direct =3D'".$this->od_direct."'".
              " order by od_name";
@@ -246,7 +269,15 @@
     /*!\brief show the button for selecting a predefined operation */
     function show_button($p_url)
     {
-        $value=3D$this->get_operation();
+       =20
+       =20
+        $value=3D$this->db->get_array("select od_id,od_name,od_descripti=
on from op_predef ".
+                                     " where jrn_def_id=3D$1".
+                                     " and od_direct =3D$2".
+                                     " order by od_name",array($this->jr=
n_def_id,$this->od_direct ));
+       =20
+        if ( $this->jrn_def_id=3D=3D'') $value=3Darray();
+       =20
         $r=3D"";
         $r.=3D'<h2>Choississez un mod=C3=A8le</h2>';
         $r.=3D'Filtrer '.HtmlInput::filter_table('modele_op_tab', '0', '=
0');
@@ -254,8 +285,9 @@
         for ($i=3D0;$i<count($value);$i++) {
             $r.=3D'<tr class=3D"'.(($i%2=3D=3D0)?"even":"odd").'">';
             $r.=3D'<td>';
-            $r.=3Dsprintf('<a href=3D"%s&pre_def=3D%s" onclick=3D"waitin=
g_box()">%s</a>',$p_url,$value[$i]['value'],$value[$i]['label']);
+            $r.=3Dsprintf('<a href=3D"%s&pre_def=3D%s" onclick=3D"waitin=
g_box()">%s</a> ',$p_url,$value[$i]['od_id'],$value[$i]['od_name']);
             $r.=3D'</td>';
+            $r.=3D'<td>'.h($value[$i]['od_description']).'</td>';
             $r.=3D'</tr>';
         }
         $r.=3D'</table>';

Modified: phpcompta/trunk/include/compta_ach.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ach.inc.php	2013-09-29 17:47:15 UTC (r=
ev 5450)
+++ phpcompta/trunk/include/compta_ach.inc.php	2013-10-01 14:12:44 UTC (r=
ev 5451)
@@ -73,12 +73,7 @@
 		echo HtmlInput::hidden('ac', $_REQUEST['ac']);
 		echo '<div style=3D"clear:both">';
=20
-                echo "<h2>Mod=C3=A8le d'op=C3=A9ration</h2>";
-                echo '<p class=3D"decale">';
-                echo "Donnez un nom pour sauver cette op=C3=A9ration com=
me mod=C3=A8le <br>";
-		$opd_name =3D new IText('opd_name');
-		echo "Nom du mod=C3=A8le " . $opd_name->input();
-                echo '</p>';
+                echo Pre_operation::save_propose();
                 echo '</div>';
 		echo HtmlInput::submit("record", _("Enregistrement"), 'onClick=3D"retu=
rn verify_ca(\'\');"');
 		echo HtmlInput::submit('correct', _("Corriger"));

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2013-09-29 17:47:15 UTC (r=
ev 5450)
+++ phpcompta/trunk/include/compta_ven.inc.php	2013-10-01 14:12:44 UTC (r=
ev 5451)
@@ -81,12 +81,7 @@
 			echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 	    echo '<div style=3D"clear:both">';
            =20
-            echo "<h2>Mod=C3=A8le d'op=C3=A9ration</h2>";
-            echo '<p class=3D"decale">';
-            echo "Donnez un nom pour sauver cette op=C3=A9ration comme m=
od=C3=A8le <br>";
-	    $opd_name=3Dnew IText('opd_name');
-	    echo "Nom du mod=C3=A8le ".$opd_name->input();
-            echo '</p>';
+            echo Pre_operation::save_propose();
 	    echo '</div>';
 	    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
             echo HtmlInput::submit("record",_("Enregistrement"),'onClick=
=3D"return verify_ca(\'\');"');

Modified: phpcompta/trunk/include/operation_ods_confirm.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_confirm.inc.php	2013-09-29 17:4=
7:15 UTC (rev 5450)
+++ phpcompta/trunk/include/operation_ods_confirm.inc.php	2013-10-01 14:1=
2:44 UTC (rev 5451)
@@ -39,13 +39,7 @@
 echo $ledger->confirm($_POST,false);
=20
 echo '<hr>';
-$chk=3Dnew ICheckBox();
-$chk->selected=3Dfalse;
-echo $chk->input('opd_save');
-echo "Sauvez cette op&eacute;ration comme mod=C3=A8le d'op=C3=A9ration ?=
";
-echo '<br/>';
-$opd_name=3Dnew IText('opd_name');
-echo "Nom du mod=C3=A8le ".$opd_name->input();
+echo Pre_operation::save_propose();
 echo '<hr>';
 echo HtmlInput::submit("save","Confirmer");
 echo HtmlInput::submit("correct","Corriger");

Modified: phpcompta/trunk/include/preod.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/preod.inc.php	2013-09-29 17:47:15 UTC (rev 54=
50)
+++ phpcompta/trunk/include/preod.inc.php	2013-10-01 14:12:44 UTC (rev 54=
51)
@@ -88,6 +88,7 @@
       $count++;
=20
         echo '<td>'.h($row['od_name']).'</td>';
+        echo '<td>'.h($row['od_description']).'</td>';
         echo '<td>';
 	echo '<form method=3D"POST" style=3D"margin:0;padding:0">';
         echo dossier::hidden();



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


From MAILER-DAEMON Tue Oct 01 11:28:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VR1ro-0003Cb-NY
	for mharc-phpcompta-dev@gnu.org; Tue, 01 Oct 2013 11:28:04 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  1 Oct 2013 17:18:09 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.57039.1380641283.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5452 - phpcompta/trunk/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Oct 2013 15:28:03 -0000

Author: danydb
Date: 2013-10-01 17:18:09 +0200 (Tue, 01 Oct 2013)
New Revision: 5452

Modified:
   phpcompta/trunk/sql/upgrade.sql
Log:
Add limit op_predef.od_description

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-10-01 14:12:44 UTC (rev 5451)
+++ phpcompta/trunk/sql/upgrade.sql	2013-10-01 15:18:09 UTC (rev 5452)
@@ -261,3 +261,18 @@
 $BODY$
   LANGUAGE plpgsql VOLATILE
=20
+create or replace function comptaproc.opd_limit_description()=20
+returns trigger
+as
+$BEGIN$
+	declare
+		sDescription text;
+	begin
+	sDescription :=3D NEW.od_description;
+	NEW.od_description :=3D substr(sDescription,1,80);
+	return NEW;
+	end;
+$BEGIN$
+LANGUAGE plpgsql;
+
+create trigger opd_limit_description before update or insert on op_prede=
f execute procedure for each row comptaproc.opd_limit_description();



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


From MAILER-DAEMON Tue Oct 01 12:51:56 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VR3Ay-0000fq-J9
	for mharc-phpcompta-dev@gnu.org; Tue, 01 Oct 2013 12:51:56 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  1 Oct 2013 18:42:01 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.57155.1380646316.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5453 - 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: Tue, 01 Oct 2013 16:51:55 -0000

Author: danydb
Date: 2013-10-01 18:42:00 +0200 (Tue, 01 Oct 2013)
New Revision: 5453

Modified:
   phpcompta/trunk/include/class_follow_up.php
Log:
bug : aAction_detail not set

Modified: phpcompta/trunk/include/class_follow_up.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_follow_up.php	2013-10-01 15:18:09 UTC (=
rev 5452)
+++ phpcompta/trunk/include/class_follow_up.php	2013-10-01 16:42:00 UTC (=
rev 5453)
@@ -92,6 +92,7 @@
 		$this->db =3D $p_cn;
 		$this->ag_id=3D$p_id;
 		$this->f_id =3D 0;
+                $this->aAction_detail=3Darray();
 	}
 	static function sql_security_filter($cn,$p_mode)
 	{



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


From MAILER-DAEMON Tue Oct 01 13:12:51 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VR3VD-0001oX-Do
	for mharc-phpcompta-dev@gnu.org; Tue, 01 Oct 2013 13:12:51 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  1 Oct 2013 19:02:54 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.57175.1380647570.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5454 - phpcompta/trunk/html/js
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Oct 2013 17:12:50 -0000

Author: danydb
Date: 2013-10-01 19:02:54 +0200 (Tue, 01 Oct 2013)
New Revision: 5454

Modified:
   phpcompta/trunk/html/js/acc_ledger.js
Log:
Bug : correct align in gestion detail table

Modified: phpcompta/trunk/html/js/acc_ledger.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/acc_ledger.js	2013-10-01 16:42:00 UTC (rev 54=
53)
+++ phpcompta/trunk/html/js/acc_ledger.js	2013-10-01 17:02:54 UTC (rev 54=
54)
@@ -1049,6 +1049,9 @@
             new_tt =3D new_tt.replace(/compute_ledger\(0\)/g, "compute_l=
edger(" + nb.value + ")");
             new_tt =3D new_tt.replace(/clean_tva\(0\)/g, "clean_tva(" + =
nb.value + ")");
             newCell.innerHTML =3D new_tt;
+            if ( mytable.rows[1].cells[e].hasClassName("num") ) {
+                newCell.addClassName("num");
+            }
             new_tt.evalScripts();
         }
=20
@@ -1057,6 +1060,7 @@
         g("e_march" + nb.value + "_price").value =3D '0';
         g("e_march" + nb.value).value =3D "";
         g("e_quant" + nb.value).value =3D "1";
+        g('tvac_march'+nb.value).value=3D"0";
         if ($("e_march" + nb.value + "_tva_amount"))
             g("e_march" + nb.value + "_tva_amount").value =3D 0;
=20



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


From MAILER-DAEMON Tue Oct 01 13:16:12 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VR3YS-0003cZ-05
	for mharc-phpcompta-dev@gnu.org; Tue, 01 Oct 2013 13:16:12 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  1 Oct 2013 19:06:17 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.57184.1380647771.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5455 - 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, 01 Oct 2013 17:16:10 -0000

Author: danydb
Date: 2013-10-01 19:06:16 +0200 (Tue, 01 Oct 2013)
New Revision: 5455

Modified:
   phpcompta/trunk/include/template/detail-action.php
Log:
Hide button in readonly

Modified: phpcompta/trunk/include/template/detail-action.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/detail-action.php	2013-10-01 17:02:5=
4 UTC (rev 5454)
+++ phpcompta/trunk/include/template/detail-action.php	2013-10-01 17:06:1=
6 UTC (rev 5455)
@@ -350,8 +350,10 @@
     <br>Total TVAC
  </div>
 <div>
+ <?php if ( ! $readonly ) :  ?>
     <input name=3D"act" id=3D"act_bt" class=3D"button" value=3D"<?php ec=
ho _('Actualiser')?>" onclick=3D"compute_all_ledger();" type=3D"button">
-  <input type=3D"button" class=3D"button" onclick=3D"gestion_add_row()" =
value=3D"Ajouter une ligne">
+     <input type=3D"button" class=3D"button" onclick=3D"gestion_add_row(=
)" value=3D"Ajouter une ligne">
+<?php endif; ?>        =20
 </div>
 <?php endif; ?>
 </fieldset>



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


From MAILER-DAEMON Thu Oct 03 03:59:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VRdoa-0005OT-IX
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Oct 2013 03:59:16 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Oct 2013 09:49:18 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.59584.1380787155.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5456 - 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, 03 Oct 2013 07:59:15 -0000

Author: danydb
Date: 2013-10-03 09:49:17 +0200 (Thu, 03 Oct 2013)
New Revision: 5456

Modified:
   phpcompta/trunk/include/class_pre_operation.php
Log:
Name of predefined operation hightlighted

Modified: phpcompta/trunk/include/class_pre_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_operation.php	2013-10-01 17:06:16 U=
TC (rev 5455)
+++ phpcompta/trunk/include/class_pre_operation.php	2013-10-03 07:49:17 U=
TC (rev 5456)
@@ -284,7 +284,7 @@
         $r.=3D'<table style=3D"width:100%" id=3D"modele_op_tab">';
         for ($i=3D0;$i<count($value);$i++) {
             $r.=3D'<tr class=3D"'.(($i%2=3D=3D0)?"even":"odd").'">';
-            $r.=3D'<td>';
+            $r.=3D'<td style=3D"font-weight:bold;vertical-align:top;text=
-decoration:underline">';
             $r.=3Dsprintf('<a href=3D"%s&pre_def=3D%s" onclick=3D"waitin=
g_box()">%s</a> ',$p_url,$value[$i]['od_id'],$value[$i]['od_name']);
             $r.=3D'</td>';
             $r.=3D'<td>'.h($value[$i]['od_description']).'</td>';



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


From MAILER-DAEMON Thu Oct 03 04:53:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VReee-0001Jv-1Y
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Oct 2013 04:53:04 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Oct 2013 10:43:06 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.59785.1380790383.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5457 - 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, 03 Oct 2013 08:53:03 -0000

Author: danydb
Date: 2013-10-03 10:43:05 +0200 (Thu, 03 Oct 2013)
New Revision: 5457

Modified:
   phpcompta/trunk/include/class_periode.php
   phpcompta/trunk/include/periode.inc.php
Log:
let you close several periode in one shot

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-10-03 07:49:17 UTC (re=
v 5456)
+++ phpcompta/trunk/include/class_periode.php	2013-10-03 08:43:05 UTC (re=
v 5457)
@@ -202,8 +202,11 @@
                                      from parm_periode
                                      order by p_start,p_end");
             $Max=3DDatabase::num_row($Res);
+            echo '<form id=3D"periode_frm" method=3D"POST" onsubmit=3D"c=
onfirm(\'Confirmez-vous la fermeture des p=C3=A9riodes choisies ?\')" >';
+            echo HtmlInput::array_to_hidden(array('ac','gDossier','jrn_d=
ef_id','choose'), $_REQUEST);
             echo '<TABLE ALIGN=3D"CENTER">';
             echo "</TR>";
+            echo '<th>'.ICheckBox::toggle_checkbox("per_toggle", "period=
e_frm")."</th>";
             echo '<TH> Date d&eacute;but </TH>';
             echo '<TH> Date fin </TH>';
             echo '<TH> Exercice </TH>';
@@ -219,6 +222,14 @@
 		if ( $l_line['p_closed'] =3D=3D 't')
 		  $style=3D"color:red";
                 echo '<TR class=3D"'.$class.'" style=3D"'.$style.'">';
+                echo '<td>';
+                if ( $l_line['p_closed'] =3D=3D 'f') {
+                              $per_to_close=3Dnew ICheckBox('sel_per_clo=
se[]');
+                              $per_to_close->value=3D$l_line['p_id'];
+                             echo $per_to_close->input();
+               }
+               echo '</td>';
+
                 echo '<TD ALIGN=3D"CENTER"> '.$l_line['date_start'].'</T=
D>';
                 echo '<TD  ALIGN=3D"CENTER"> '.$l_line['date_end'].'</TD=
>';
                 echo '<TD  ALIGN=3D"CENTER"> '.$l_line['p_exercice'].'</=
TD>';
@@ -234,9 +245,6 @@
                 }
                 else
                 {
-                    $closed=3D'<TD class=3D"mtitle">';
-                    $closed.=3D'<A class=3D"mtitle" HREF=3D"?ac=3D'.$_RE=
QUEST['ac'].'&action=3Dclosed&p_per=3D'.$l_line['p_id'].'&'.$str_dossier.=
'" onclick=3D"return confirm(\''._('Confirmez cloture').' ?\')"> Cloturer=
</A></td>';
-
                     if ($l_line['count_op'] =3D=3D 0 )
                     {
 		      $change=3DHtmlInput::display_periode($l_line['p_id']);
@@ -246,12 +254,6 @@
 		      $change=3D"Non modifiable";
                     }
 		    $change=3Dtd($change,' class=3D"mtitle" ');
-		    /*
-                    $change.=3D'<A class=3D"mtitle" HREF=3D"?p_action=3D=
periode&action=3Dchange_per&p_per=3D'.
-                             $l_line['p_id']."&p_date_start=3D".$l_line[=
'date_start'].
-                             "&p_date_end=3D".$l_line['date_end']."&p_ex=
ercice=3D".
-                             $l_line['p_exercice']."&$str_dossier\"> Cha=
nger</A></td>";
-		    */
 		    $reopen=3Dtd("");
=20
=20
@@ -269,7 +271,6 @@
                     }
                     $remove.=3D'</td>';
                 }
-                echo "$closed";
                 echo $change;
=20
                 echo $remove;
@@ -277,23 +278,38 @@
 		echo '</TR>';
=20
             }
-            echo '<TR> <FORM  METHOD=3D"POST">';
+            echo '</table>';
+            echo HtmlInput::submit('close_per','Fermeture des p=C3=A9rio=
des s=C3=A9lectionn=C3=A9es');
+            echo '</form>';
+            $but=3Dnew IButton('show_per_add','Ajout d\'une p=C3=A9riode=
');
+            $but->javascript=3D"$('periode_add_div').show();";
+            echo $but->input();
+            echo '<div class=3D"inner_box" style=3D"width:40%;" id=3D"pe=
riode_add_div">';
+            echo HtmlInput::title_box("Ajout d'une p=C3=A9riode","period=
e_add_div","hide");
+            echo '<FORM  METHOD=3D"POST">';
             echo dossier::hidden();
 	    $istart=3Dnew IDate('p_date_start');
 	    $iend=3Dnew IDate('p_date_end');
 	    $iexercice=3Dnew INum('p_exercice');
 	    $iexercice->size=3D5;
-	    echo td($istart->input());
+            echo '<table>';
+            echo '<TR> ';
+            echo td('Date de d=C3=A9but');
+            echo td($istart->input());
+            echo '</tr><tr>';
+            echo td('Date de fin');
 	    echo td($iend->input());
+
+            echo '</tr><tr>';
+            echo td('Exercice');
 	    echo td($iexercice->input());
=20
-            echo '<TD> <INPUT TYPE=3D"SUBMIT" NAME=3D"add_per" Value=3D"=
Ajout"</TD>';
-            echo '<TD></TD>';
-            echo '<TD></TD>';
-            echo '</FORM></TR>';
-
             echo '</TABLE>';
=20
+            echo HtmlInput::submit('add_per','Valider');
+            echo '</FORM>';
+            echo '</div>';
+            echo create_script("$('periode_add_div').hide();");
         }
         else
         {

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-10-03 07:49:17 UTC (rev =
5456)
+++ phpcompta/trunk/include/periode.inc.php	2013-10-03 08:43:05 UTC (rev =
5457)
@@ -59,17 +59,25 @@
=20
     $choose=3D"yes";
   }
-if ( $action=3D=3D"closed")
+/*
+ * Close selected periode
+ */ =20
+if ( isset($_POST['close_per']) )
 {
-    $p_per=3D$_GET['p_per'];
-    $per=3Dnew Periode($cn);
-    $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
-    $per->set_jrn($jrn_def_id);
-    $per->set_periode($p_per);
-    $per->close();
-    $choose=3D"yes";
+	if (isset($_POST['sel_per_close'] ) ) {
+		$a_per_to_close=3D$_POST['sel_per_close'];
+		for ($i=3D0;$i < count($a_per_to_close);$i++) {
+			$per=3Dnew Periode($cn);
+			 $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
+			 $per->set_periode($a_per_to_close[$i]);
+			$per->close();
+	=09
+		}
+	}
+	$choose=3D"yes";
 }
=20
+
 if ( $action=3D=3D "delete_per" )
 {
     $p_per=3D$_GET["p_per"];



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


From MAILER-DAEMON Thu Oct 03 05:20:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VRf5Q-0008Fr-I9
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Oct 2013 05:20:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Oct 2013 11:10:46 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.59919.1380792043.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5458 - 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, 03 Oct 2013 09:20:42 -0000

Author: danydb
Date: 2013-10-03 11:10:46 +0200 (Thu, 03 Oct 2013)
New Revision: 5458

Modified:
   phpcompta/trunk/include/class_periode.php
Log:
let you close several periode in one shot for specific ledger=20

Modified: phpcompta/trunk/include/class_periode.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_periode.php	2013-10-03 08:43:05 UTC (re=
v 5457)
+++ phpcompta/trunk/include/class_periode.php	2013-10-03 09:10:46 UTC (re=
v 5458)
@@ -279,7 +279,9 @@
=20
             }
             echo '</table>';
+            echo '<p style=3D"text-align:center">';
             echo HtmlInput::submit('close_per','Fermeture des p=C3=A9rio=
des s=C3=A9lectionn=C3=A9es');
+            echo '</p>';
             echo '</form>';
             $but=3Dnew IButton('show_per_add','Ajout d\'une p=C3=A9riode=
');
             $but->javascript=3D"$('periode_add_div').show();";
@@ -309,7 +311,11 @@
             echo HtmlInput::submit('add_per','Valider');
             echo '</FORM>';
             echo '</div>';
-            echo create_script("$('periode_add_div').hide();");
+            echo create_script("$('periode_add_div').hide();new Draggabl=
e('periode_add_div',{starteffect:function()
+                                  {
+                                     new Effect.Highlight(obj.id,{scroll=
:window,queue:'end'});
+                                  }}
+                         );");
         }
         else
         {
@@ -321,8 +327,12 @@
                                    $this->jrn_def_id);
             $jrn_name=3DDatabase::fetch_result($r,0,0);
             echo '<h2> Journal '.$jrn_name.'</h2>';
+            echo '<form id=3D"periode_frm" method=3D"POST" onsubmit=3D"c=
onfirm(\'Confirmez-vous la fermeture des p=C3=A9riodes choisies ?\')" >';
+            echo HtmlInput::array_to_hidden(array('ac','gDossier','jrn_d=
ef_id','choose'), $_REQUEST);
+
             echo '<TABLE ALIGN=3D"CENTER">';
             echo "</TR>";
+            echo '<th>'.ICheckBox::toggle_checkbox("per_toggle", "period=
e_frm")."</th>";
             echo '<TH> Date d&eacute;but </TH>';
             echo '<TH> Date fin </TH>';
             echo '<TH> Exercice </TH>';
@@ -335,27 +345,33 @@
 		  echo '<TR style=3D"COLOR:RED">';
 		else
 		  echo '<TR>';
+                echo '<td>';
+                if ( $l_line['status'] =3D=3D 'OP') {
+                              $per_to_close=3Dnew ICheckBox('sel_per_clo=
se[]');
+                              $per_to_close->value=3D$l_line['p_id'];
+                             echo $per_to_close->input();
+               }
+                echo '</td>';
                 echo '<TD ALIGN=3D"CENTER"> '.$l_line['date_start'].'</T=
D>';
                 echo '<TD  ALIGN=3D"CENTER"> '.$l_line['date_end'].'</TD=
>';
                 echo '<TD  ALIGN=3D"CENTER"> '.$l_line['p_exercice'].'</=
TD>';
-
+                $closed=3D"";
                 if ( $l_line['status'] !=3D 'OP' )
                 {
 		  $closed=3Dtd ('<A class=3D"mtitle" HREF=3D"?ac=3D'.$_REQUEST['ac'].'=
&action=3Dreopen&p_per=3D'.$l_line['p_id'].'&'.$str_dossier.'&jrn_def_id=3D=
'.$this->jrn_def_id.'" onclick=3D"return confirm(\''._('Confirmez R=C3=A9=
ouverture').' ?\')"> R=C3=A9ouverture</A>',' class=3D"mtitle"');
 		  //                    $closed=3D($l_line['status']=3D=3D'CE')?'<TD>C=
entralisee</TD>':'<TD>Ferm&eacute;e</TD>';
                 }
-                else
-                {
-                    $closed=3D'<TD class=3D"mtitle">';
-                    $closed.=3D'<A class=3D"mtitle" HREF=3D"?ac=3D'.$_RE=
QUEST['ac'].'&action=3Dclosed&p_per=3D'.$l_line['p_id'].'&'.$str_dossier.=
'&jrn_def_id=3D'.$this->jrn_def_id.'" onclick=3D"return confirm(\''._('Co=
nfirmez Cloture').' ?\')"> Cloturer</A>';
-                    $closed.=3D'</td>';
-                }
+              =20
                 echo "$closed";
=20
                 echo '</TR>';
=20
             }
             echo '</TABLE>';
+            echo '<p style=3D"text-align:center">';
+            echo HtmlInput::submit('close_per','Fermeture des p=C3=A9rio=
des s=C3=A9lectionn=C3=A9es');
+            echo '</p>';
+            echo '</form>';
=20
         }
     }



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


From MAILER-DAEMON Thu Oct 03 06:03:10 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VRfkU-000808-HH
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Oct 2013 06:03:10 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Oct 2013 11:53:12 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.59966.1380794589.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5459 - 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, 03 Oct 2013 10:03:08 -0000

Author: danydb
Date: 2013-10-03 11:53:11 +0200 (Thu, 03 Oct 2013)
New Revision: 5459

Modified:
   phpcompta/trunk/include/class_acc_bilan.php
Log:
HightLight abnormal saldo of accounting

Modified: phpcompta/trunk/include/class_acc_bilan.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_bilan.php	2013-10-03 09:10:46 UTC (=
rev 5458)
+++ phpcompta/trunk/include/class_acc_bilan.php	2013-10-03 09:53:11 UTC (=
rev 5459)
@@ -119,10 +119,9 @@
                 ($solde_signed > 0 && $p_deb =3D=3D 'C' )
             )
             {
-                $ret.=3D '<li>Anomalie pour le compte '.$line['pcm_val']=
.
-                       $line['pcm_lib'].
+                $ret.=3D '<li>Anomalie pour le compte '.HtmlInput::histo=
ry_account($line['pcm_val'],$line['pcm_val'].h($line['pcm_lib']).
                        "  D: ".$solde['debit'].
-                       "  C: ".$solde['credit']." diff ".$solde['solde']=
;
+                       "  C: ".$solde['credit']." diff ".$solde['solde']=
);
                 $count++;
             }
=20



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


From MAILER-DAEMON Thu Oct 03 06:04:19 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VRfla-00087m-VL
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Oct 2013 06:04:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Oct 2013 11:54:22 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.59969.1380794658.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5460 - 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, 03 Oct 2013 10:04:17 -0000

Author: danydb
Date: 2013-10-03 11:54:22 +0200 (Thu, 03 Oct 2013)
New Revision: 5460

Modified:
   phpcompta/trunk/include/class_acc_bilan.php
Log:
HightLight abnormal saldo of accounting

Modified: phpcompta/trunk/include/class_acc_bilan.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_bilan.php	2013-10-03 09:53:11 UTC (=
rev 5459)
+++ phpcompta/trunk/include/class_acc_bilan.php	2013-10-03 09:54:22 UTC (=
rev 5460)
@@ -119,7 +119,7 @@
                 ($solde_signed > 0 && $p_deb =3D=3D 'C' )
             )
             {
-                $ret.=3D '<li>Anomalie pour le compte '.HtmlInput::histo=
ry_account($line['pcm_val'],$line['pcm_val'].h($line['pcm_lib']).
+                $ret.=3D '<li> '.HtmlInput::history_account($line['pcm_v=
al'],'Anomalie pour le compte '.$line['pcm_val'].' '.h($line['pcm_lib']).
                        "  D: ".$solde['debit'].
                        "  C: ".$solde['credit']." diff ".$solde['solde']=
);
                 $count++;



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


From MAILER-DAEMON Thu Oct 03 06:53:00 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VRgWi-0001mn-12
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Oct 2013 06:53:00 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Oct 2013 12:43:02 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.60007.1380797579.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5461 - in phpcompta/trunk: html include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Oct 2013 10:52:58 -0000

Author: danydb
Date: 2013-10-03 12:43:02 +0200 (Thu, 03 Oct 2013)
New Revision: 5461

Modified:
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_acc_operation.php
Log:
Highlight in PRINTPOSTE

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-10-03 09:54:22 UTC (rev 5460)
+++ phpcompta/trunk/html/style.css	2013-10-03 10:43:02 UTC (rev 5461)
@@ -304,6 +304,11 @@
     background-color:#DDE6FF;
     font-size:0.87em;;
 }
+tr.highlight {
+    /* background-color:whitesmoke; */
+    font-size:0.87em;
+    font-weight: bold;
+}
 tr.even {
   font-size:0.87em;;
 }

Modified: phpcompta/trunk/include/class_acc_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_operation.php	2013-10-03 09:54:22 U=
TC (rev 5460)
+++ phpcompta/trunk/include/class_acc_operation.php	2013-10-03 10:43:02 U=
TC (rev 5461)
@@ -306,14 +306,13 @@
         $csv=3D"";
         foreach ($show as $l)
         {
+            $border=3D"";
             if ( $l['j_poste'] =3D=3D $this->poste || ($l['j_qcode']=3D=3D=
$this->qcode && trim($this->qcode) !=3D ''))
-                $border=3D' style=3D"border-bottom:1px solid red;"';
-            else
-                $border=3D'';
-            $r.=3D'<tr>';
-            $r.=3D'<td '.$border.'>';
+                $border=3D' class=3D"highlight"';
+            $r.=3D'<tr '.$border.'>';
+            $r.=3D'<td>';
             $a=3D$l['j_qcode'];
-            ;
+           =20
             $r_notable.=3D$a;
             $r.=3D$a;
             $csv.=3D'"'.$a.'";';



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


From MAILER-DAEMON Thu Oct 03 07:06:12 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VRgjT-0004AS-VV
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Oct 2013 07:06:11 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Oct 2013 12:56:14 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.60019.1380798370.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5462 - 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, 03 Oct 2013 11:06:10 -0000

Author: danydb
Date: 2013-10-03 12:56:13 +0200 (Thu, 03 Oct 2013)
New Revision: 5462

Modified:
   phpcompta/trunk/include/class_acc_account_ledger.php
   phpcompta/trunk/include/class_acc_operation.php
   phpcompta/trunk/include/impress_poste.inc.php
Log:
Highlight in PRINTPOSTE

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-10-03 10:43=
:02 UTC (rev 5461)
+++ phpcompta/trunk/include/class_acc_account_ledger.php	2013-10-03 10:56=
:13 UTC (rev 5462)
@@ -150,7 +150,7 @@
                                  "j_debit, jr_internal,jr_pj_number,
 								 coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter ".
                                  ",pcm_lib ".
-				 ",jr_tech_per,p_exercice ".
+				 ",jr_tech_per,p_exercice,jrn_def_name".
                                  " from jrnx left join jrn_def on (jrn_d=
ef_id=3Dj_jrn_def )".
                                  " left join jrn on (jr_grpt_id=3Dj_grpt=
)".
                                  " left join tmp_pcmn on (j_poste=3Dpcm_=
val)".
@@ -467,7 +467,7 @@
 	}
         $hid=3Dnew IHidden();
=20
-        echo "<table >";
+        echo "<table  >";
         echo '<TR>';
         $str_ople=3D(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',=
$_REQUEST['ople']):'';
 	if ($actiontarget=3D=3D'poste')

Modified: phpcompta/trunk/include/class_acc_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_operation.php	2013-10-03 10:43:02 U=
TC (rev 5461)
+++ phpcompta/trunk/include/class_acc_operation.php	2013-10-03 10:56:13 U=
TC (rev 5462)
@@ -252,7 +252,7 @@
         $filter_sql=3Dstr_replace('jrn_def_id','jr_def_id',$filter_sql);
         if ( $this->jr_id=3D=3D0 ) return;
         $sql=3D" select  jr_date,j_qcode,j_poste,j_montant,jr_internal,c=
ase when j_debit =3D 'f' then 'C' else 'D' end as debit,jr_comment as des=
cription,
-             vw_name,pcm_lib,j_debit,coalesce(comptaproc.get_letter_jnt(=
j_id),-1) as letter ".
+             vw_name,pcm_lib,j_debit,coalesce(comptaproc.get_letter_jnt(=
j_id),-1) as letter,jr_def_id ".
              " from jrnx join jrn on (jr_grpt_id=3Dj_grpt)
              join tmp_pcmn on (j_poste=3Dpcm_val)
              left join vw_fiche_attr on (j_qcode=3Dquick_code)

Modified: phpcompta/trunk/include/impress_poste.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_poste.inc.php	2013-10-03 10:43:02 UTC=
 (rev 5461)
+++ phpcompta/trunk/include/impress_poste.inc.php	2013-10-03 10:56:13 UTC=
 (rev 5462)
@@ -276,14 +276,14 @@
             // Detail
             //----------------------------------------------------------=
------------
             echo Acc_Account_Ledger::HtmlTableHeader();
-            echo '<table class=3D"result" style=3D"width:80%;margin-left=
:10%">';
+            echo '<table  style=3D"width:100%;margin-left:0%">';
             foreach ($a_poste as $poste_id )
             {
                 $Poste=3Dnew Acc_Account_Ledger ($cn,$poste_id['pcm_val'=
]);
                 $Poste->load();
                 $Poste->get_row_date( $_GET['from_periode'], $_GET['to_p=
eriode'],$_GET['ople']);
                 if ( empty($Poste->row)) continue;
-                echo '<tr><td  class=3D"mtitle" style=3D"width:auto" col=
span=3D"6"><h2 class=3D"info">'. $poste_id['pcm_val'].' '.h($Poste->label=
).'</h2></td></tr>';
+                echo '<tr><td  class=3D"mtitle" style=3D"width:auto" col=
span=3D"6"><h2 class=3D"title">'. $poste_id['pcm_val'].' '.h($Poste->labe=
l).'</h2></td></tr>';
=20
                 $detail=3D$Poste->row[0];
=20
@@ -294,6 +294,7 @@
                     /* avoid duplicates */
                     if ( in_array($detail['jr_id'],$old) =3D=3D TRUE ) c=
ontinue;
                     $old[]=3D$detail['jr_id'];
+                    echo tr(td("Journal :".$detail['jrn_def_name'],''),'=
style=3D"width:auto" colspan=3D"6"');
                     echo '<tr><td class=3D"mtitle" style=3D"width:auto" =
colspan=3D"6">'. $detail['j_date'].' '.$detail['jr_internal'].' '.hb($det=
ail['description']).' '.hi($detail['jr_pj_number']).'</td></tr>';
=20
                     $op=3Dnew Acc_Operation($cn);



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


From MAILER-DAEMON Fri Oct 04 11:08:09 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VS6zB-00049N-Uc
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Oct 2013 11:08:09 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Oct 2013 16:57:54 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.61273.1380899289.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5463 - in phpcompta/trunk: html
	html/admin/sql/patch html/js include include/template sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Oct 2013 15:08:08 -0000

Author: danydb
Date: 2013-10-04 16:57:53 +0200 (Fri, 04 Oct 2013)
New Revision: 5463

Added:
   phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-epad.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_calendar.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/dashboard.inc.php
   phpcompta/trunk/include/template/calendar.php
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/sql/upgrade.sql
Log:

Add the SQL scripts for updating database
Style are modified
Calendar - zoom=20


Added: phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	                 =
       (rev 0)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-04 14:57:=
53 UTC (rev 5463)
@@ -0,0 +1,290 @@
+begin;
+
+-- si la fiche utilise le code DEPENSE PRIVEE alors ajout dans QP_DEP_PR=
IV
+create or replace view m as=20
+select qp_id, qp_price from quant_purchase join fiche_detail on (qp_fich=
e=3Df_id and ad_id=3D5) where ad_value in (select p_value from parm_code =
where p_code=3D'DEP_PRIV');
+
+update quant_purchase as e set qp_dep_priv=3D(select qp_price from m whe=
re m.qp_id=3De.qp_id);
+
+update quant_purchase as e set qp_dep_priv=3D(select qp_price from m whe=
re m.qp_id=3De.qp_id);
+
+update quant_purchase as e set qp_dep_priv=3D0 where qp_dep_priv is null=
;
+-- =C3=A9vite les valeurs nulles dans quant_purchase
+update quant_purchase set qp_dep_priv =3D 0 where qp_dep_priv is null;
+
+drop view m;
+
+-- update script insert_quant_purchase
+
+
+CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(
+    p_internal text,=20
+    p_j_id numeric,=20
+    p_fiche text,=20
+    p_quant numeric,=20
+    p_price numeric,=20
+    p_vat numeric,=20
+    p_vat_code integer,=20
+    p_nd_amount numeric,=20
+    p_nd_tva numeric,=20
+    p_nd_tva_recup numeric,=20
+    p_dep_priv numeric,=20
+    p_client text,=20
+    p_tva_sided numeric)
+  RETURNS void AS
+$BODY$
+declare
+        fid_client integer;
+        fid_good   integer;
+        account_priv    account_type;
+        fid_good_account account_type;
+        n_dep_priv numeric;
+begin
+        n_dep_priv :=3D 0;
+        select p_value into account_priv from parm_code where p_code=3D'=
DEP_PRIV';
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                 fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim=
(p_fiche));
+        select ad_value into fid_good_account from fiche_detail where ad=
_id=3D5 and f_id=3Dfid_good;
+        if strpos( fid_good_account , account_priv ) =3D 1 then
+                n_dep_priv=3Dp_price;
+        end if;=20
+           =20
+        insert into quant_purchase
+                (qp_internal,
+                j_id,
+                qp_fiche,
+                qp_quantite,
+                qp_price,
+                qp_vat,
+                qp_vat_code,
+                qp_nd_amount,
+                qp_nd_tva,
+                qp_nd_tva_recup,
+                qp_supplier,
+                qp_dep_priv,
+                qp_vat_sided)
+        values
+                (p_internal,
+                p_j_id,
+                fid_good,
+                p_quant,
+                p_price,
+                p_vat,
+                p_vat_code,
+                p_nd_amount,
+                p_nd_tva,
+                p_nd_tva_recup,
+                fid_client,
+                n_dep_priv,
+                p_tva_sided);
+        return;
+end;
+ $BODY$
+  LANGUAGE plpgsql;
+
+
+-- ajout code manquant dans parm_code
+create or replace function add_parm_code() returns void as
+$fct$
+declare
+    country_code text;
+begin=20
+    select pr_value into country_code from parameter where pr_id=3D'MY_C=
OUNTRY';
+    if country_code=3D'FR' then
+        insert into parm_code (p_code,p_comment,p_value) values ('DNA','=
D=C3=A9pense non d=C3=A9ductible','67');
+        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_D=
NA','TVA non d=C3=A9ductible','');
+        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_D=
ED_IMPOT','TVA d=C3=A9ductible =C3=A0 l''imp=C3=B4t','');
+        insert into parm_code  (p_code,p_comment,p_value) values ('COMPT=
E_COURANT','Poste comptable pour le compte courant','');
+        insert into parm_code  (p_code,p_comment,p_value) values ('COMPT=
E_TVA','TVA =C3=A0 payer ou =C3=A0 recevoir','');
+     end if;
+end;
+$fct$
+language plpgsql;
+
+select add_parm_code();
+
+drop function add_parm_code();
+
+update parm_code set p_value=3D'67' where p_value=3D'6740' and p_code=3D=
'DNA';
+
+ alter table menu_ref add me_description_etendue text;
+
+insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_p=
arameter,me_javascript,me_type,me_description_etendue)
+values
+('NAVI','Navigateur',null,null,'Menu simplifi=C3=A9 pour retrouver rapid=
ement un menu',null,'ask_navigator(<DOSSIER>)','ME','Le navigateur vous p=
r=C3=A9sente une liste de menu auquel vous avez acc=C3=A8s et vous permet=
 d''acc=C3=A8der plus rapidement au menu que vous souhaitez rapidement');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_displ=
ay,pm_default)=20
+values
+('NAVI',null,1,90,'M',0), ('NAVI',null,2,90,'M',0);
+
+insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_p=
arameter,me_javascript,me_type,me_description_etendue)
+values
+('BOOKMARK','Favori',null,null,'Raccourci vers vos menus pr=C3=A9f=C3=A9=
r=C3=A9s',null,'show_bookmark(<DOSSIER>)','ME','Ce menu vous pr=C3=A9sent=
e un menu rapide des menus que vous utilisez le plus souvent');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_displ=
ay,pm_default)=20
+values
+('BOOKMARK',null,1,85,'M',0), ('BOOKMARK',null,2,85,'M',0);
+
+update menu_ref set me_menu=3D'Impression Journaux' where me_code=3D'PRI=
NTJRN';
+update menu_ref set me_description=3D'Impression des journaux' where me_=
code=3D'PRINTJRN';
+update menu_ref set me_menu=3D'Liste Suivi' where me_code=3D'FOLLOW';
+update menu_ref set me_description=3D'Document de suivi sous forme de li=
ste' where me_code=3D'FOLLOW';
+update menu_ref set me_javascript=3D'popup_recherche(<DOSSIER>)' where m=
e_code=3D'SEARCH';
+update menu_ref set me_file=3Dnull,me_javascript=3D'set_preference(<DOSS=
IER>)' , me_description_etendue=3D'Pr=C3=A9f=C3=A9rence de l''utilisateur=
, apparence de l''application pour l''utilisateur, p=C3=A9riode par d=C3=A9=
faut et mot de passe' where me_code=3D'PREFERENCE';
+/*
+ * Vue montrant toutes les possibilit=C3=A9s
+ */
+CREATE OR REPLACE VIEW v_menu_description AS=20
+ WITH t_menu AS (
+         SELECT mr.me_menu, pm.me_code, pm.me_code_dep, pm.p_type_displa=
y, pu.user_name, mr.me_file, mr.me_javascript, mr.me_description, mr.me_d=
escription_etendue
+           FROM profile_menu pm
+      JOIN profile_user pu ON pu.p_id =3D pm.p_id
+   JOIN profile p ON p.p_id =3D pm.p_id
+   JOIN menu_ref mr USING (me_code)
+        )
+ SELECT DISTINCT (COALESCE(v3.me_code || '/'::text, ''::text) || COALESC=
E(v2.me_code, ''::text)) ||=20
+        CASE
+            WHEN v2.me_code IS NULL THEN COALESCE(v1.me_code, ''::text)
+            WHEN v2.me_code IS NOT NULL THEN COALESCE('/'::text || v1.me=
_code, ''::text)
+            ELSE NULL::text
+        END AS code, v1.me_code, v1.me_description, v1.me_description_et=
endue, v1.me_file, v1.user_name, '> '::text || v1.me_menu AS v1menu,=20
+        CASE
+            WHEN COALESCE(v3.me_menu, ''::text) <> ''::text THEN ' > '::=
text || v2.me_menu
+            ELSE v2.me_menu
+        END AS v2menu, v3.me_menu AS v3menu, v3.p_type_display,
+ coalesce(v1.me_javascript,coalesce(v2.me_javascript,v3.me_javascript)) =
as javascript
+   FROM t_menu v1
+   LEFT JOIN t_menu v2 ON v1.me_code_dep =3D v2.me_code
+   LEFT JOIN t_menu v3 ON v2.me_code_dep =3D v3.me_code
+  WHERE v1.p_type_display <> 'P'::text AND (COALESCE(v1.me_file, ''::tex=
t) <> ''::text OR COALESCE(v1.me_javascript, ''::text) <> ''::text);
+
+COMMENT ON VIEW v_menu_description
+  IS 'Description des menus';
+=20
+CREATE TABLE bookmark
+(
+b_id serial primary key,
+b_order integer default 1,
+b_action text,
+login text=20
+);
+comment on table bookmark is 'Bookmark of the connected user';
+
+create table tags (
+    t_id serial primary key,=20
+    t_tag text not null,=20
+    t_description text
+);
+
+create table action_tags
+(
+    at_id serial primary key,
+    t_id integer references tags(t_id) on delete cascade on update casca=
de,
+    ag_id integer references action_gestion(ag_id) on delete cascade on =
update cascade
+);
+/* Config tag */
+insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_p=
arameter,me_javascript,me_type,me_description_etendue)
+values
+('CFGTAG','Configuration =C3=A9tiquette','cfgtags.inc.php',null,'Configu=
ration des tags',null,null,'ME','Configuration des =C3=A9tiquettes. Vous =
pouvez en ajouter, en supprimer ou les modifier');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_displ=
ay,pm_default)=20
+values
+('CFGTAG','PARAM',1,390,'E',0);
+
+update fiche_def set    fd_label=3D'Tr=C3=A9sorerie' where fd_id=3D3;
+update fiche_def_ref set    frd_text=3D'Tr=C3=A9sorerie' where frd_id=3D=
4;
+update jrn_def set jrn_def_name=3D'Tr=C3=A9sorerie' where jrn_def_id=3D1=
;
+update jrn_type set jrn_desc =3D 'Tr=C3=A9sorerie' where jrn_type_id=3D'=
FIN';
+
+CREATE OR REPLACE FUNCTION comptaproc.insert_quick_code(nf_id integer, t=
av_text text)
+  RETURNS integer AS
+$BODY$
+	declare
+	ns integer;
+	nExist integer;
+	tText text;
+	tBase text;
+	tName text;
+	nCount Integer;
+	nDuplicate Integer;
+	begin
+	tText :=3D lower(trim(tav_text));
+	tText :=3D replace(tText,' ','');
+	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
+	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+	nDuplicate :=3D 0;
+	tBase :=3D tText;
+	loop
+		-- take the next sequence
+		select nextval('s_jnt_fic_att_value') into ns;
+		if length (tText) =3D 0 or tText is null then
+			select count(*) into nCount from fiche_detail where f_id=3Dnf_id and =
ad_id=3D1;
+			if nCount =3D 0 then
+				tText :=3D 'FICHE'||ns::text;
+			else
+				select ad_value into tName from fiche_detail where f_id=3Dnf_id and =
ad_id=3D1;
+			=09
+				tName :=3D lower(trim(tName));
+				tName :=3D substr(tName,1,6);
+				tName :=3D replace(tName,' ','');
+				tName :=3D translate(tName,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;=
_&|"#''^<>*','');
+				tName :=3D translate(tName,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=
=A4=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+				tBase :=3D tName;
+				if nDuplicate =3D 0 then
+					tText :=3D tName;
+				else
+					tText :=3D tName||nDuplicate::text;
+				end if;
+			end if;
+		end if;
+		-- av_text already used ?
+		select count(*) into nExist
+			from fiche_detail
+		where
+			ad_id=3D23 and  ad_value=3Dupper(tText);
+
+		if nExist =3D 0 then
+			exit;
+		end if;
+		nDuplicate :=3D nDuplicate + 1 ;
+		tText :=3D tBase || nDuplicate::text;
+	=09
+		if nDuplicate > 9999 then
+			raise Exception 'too many duplicate % duplicate# %',tText,nDuplicate;
+		end if;
+	end loop;
+
+
+	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,2=
3,upper(tText));
+	return ns;
+	end;
+$BODY$
+
+LANGUAGE plpgsql VOLATILE
+
+alter table op_predef add od_description text;
+alter table op_predef add od_description text;
+create or replace function comptaproc.opd_limit_description()=20
+returns trigger
+as
+$BEGIN$
+	declare
+		sDescription text;
+	begin
+	sDescription :=3D NEW.od_description;
+	NEW.od_description :=3D substr(sDescription,1,80);
+	return NEW;
+	end;
+$BEGIN$
+LANGUAGE plpgsql;
+
+create trigger opd_limit_description before update or insert on op_prede=
f execute procedure for each row comptaproc.opd_limit_description();
+
+update menu_ref set me_menu =3D 'Tr=C3=A9sorerie' where me_code=3D'MENUF=
IN';
+
+
+update version set val=3D108;
+
+commit;

Modified: phpcompta/trunk/html/ajax_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_misc.php	2013-10-03 10:56:13 UTC (rev 5462)
+++ phpcompta/trunk/html/ajax_misc.php	2013-10-04 14:57:53 UTC (rev 5463)
@@ -615,6 +615,9 @@
         case 'search_clear_tag':
             require_once 'ajax_search_clear_tag.php';
             break;
+        case 'calendar_zoom':
+            require_once 'ajax_calendar_zoom.php';
+            break;
 	default:
 		var_dump($_GET);
 }

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-10-03 10:56:13 UTC (rev 5462)
+++ phpcompta/trunk/html/js/scripts.js	2013-10-04 14:57:53 UTC (rev 5463)
@@ -593,15 +593,17 @@
  *@brief add dynamically a object for AJAX
  *@param obj.
  * the attributes are
- * - style to add style
- * - id to add an id
- * - class to add a class
- * - html is the content
+ *   - style to add style
+ *   - id to add an id
+ *   - cssclass to add a class
+ *   - html is the content
+ *   - drag is the div can be moved
  */
 function add_div(obj)
 {
     try
     {
+        console.log(obj);
         var top=3Ddocument;
        =20
         if ( ! $(obj.id) )  { var elt=3Dtop.createElement('div');}
@@ -646,7 +648,7 @@
     }
     catch (e)
     {
-        alert("add_div"+e.message);
+        alert("add_div "+e.message);
     }
 }
 /**
@@ -2299,4 +2301,67 @@
 {
     var a=3Ddocument.getElementsByName('ag_id_td');
     for (var i=3D0;i<a.length;i++) {    a[i].style.display=3D'block';   =
 }
+}
+/**
+ *=20
+ * @param {type} obj
+ * object attribute : g
+ *   - Dossier dossier_id,=20
+ *   - invalue DOM Element where you can find the periode to zoom
+ *   - outdiv  ID of the target (DIV)
+ *  =20
+ */
+function calendar_zoom(obj)
+{
+    try {
+       =20
+        var query=3D"";
+        console.log(obj);
+        query=3D"op=3Dcalendar_zoom&gDossier=3D"+obj.gDossier+"&in=3D"+$=
(obj.invalue).value+'&out=3D'+obj.outdiv;
+        console.log(query);
+        waiting_box();
+        var action =3D new Ajax.Request(
+                                      "ajax_misc.php" ,
+                                      {
+                                          method:'get', parameters:query=
,
+                                          onFailure:ajax_misc_failure,
+                                          onSuccess:function(req,j){
+                                                    console.log(1);
+                                                    var answer=3Dreq.res=
ponseXML;
+                                                    console.log(2);
+                                                    var html=3Danswer.ge=
tElementsByTagName('html');
+                                                    console.log(3);
+                                                    if ( html.length =3D=
=3D 0 )
+                                                    {
+                                                    console.log(4);
+                                                        var rec=3Dunesca=
pe_xml(req.responseText);
+                                                        error_message ('=
erreur :'+rec);
+                                                    }
+                                                    var code_html=3DgetN=
odeText(html[0]);
+                                                    code_html=3Dunescape=
_xml(code_html);
+                                                    console.log(5);
+                                                   =20
+                                                    // if the target doe=
sn't exist=20
+                                                    // then create it
+                                                    if ( obj.outdiv =3D=3D=
 undefined ) {
+                                                        obj.outdiv=3D'ca=
lendar_zoom_div';
+                                                    }
+                                                    if (   $(obj.outdiv)=
 =3D=3D undefined) {
+                                                        var str_style=3D=
fixed_position(0,20);
+                                                        add_div({id:obj.=
outdiv,style:'margin-left:3%;width:94%;height:94%;'+str_style,cssclass:"i=
nner_box",drag:1});
+                                                        console.log(5);
+                                                    }
+                                                    remove_waiting_box()=
;
+                                                    console.log(6);
+                                                    $(obj.outdiv).innerH=
TML=3Dcode_html;
+                                                    console.log(7);
+                                                    $(obj.outdiv).show()=
;
+                                          }
+                                      }
+                                      );
+    }catch (e) {
+         error_message('calendar_zoom '+e.getMessage);
+    }
+ =20
+   =20
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-color.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-color.css	2013-10-03 10:56:13 UTC (rev 546=
2)
+++ phpcompta/trunk/html/style-color.css	2013-10-04 14:57:53 UTC (rev 546=
3)
@@ -1,403 +1,430 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-  background-color:#EDF3FF;
- font-size:12px;
-  font-family:verdana,helvetica,sans-serif;
-  padding: 0px 0px 0px 0px ;
-  margin:0;
-  color:blue;
+    background-color:#EDF3FF;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding: 0px 0px 0px 0px ;
+    margin:0;
+    color:blue;
+    font-size:0.90em;
 }
 .notice {
-		color:red;
-        font-style: italic;
-        }
+    color:red;
+    font-style: italic;
+}
=20
 table.sortable, table.table_large, table.result  ,table.resultfooter {
-  color:blue;
-  /* border:blue solid 1px; */
-  width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    /* border:blue solid 1px; */
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
=20
 }
 table.resultfooter tfoot {
-	font-size:110%;
-	font-weight: bold;
+    font-weight: bold;
=20
=20
 }
 table.sortable th,  table.table_large th,table.result th {
-  font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
- border-bottom:1px solid blue;
- border-top:0;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:1px solid blue;
+    border-top:0;
+    font-size:0.75em;;
=20
-  color:#25238F;
-  text-align: left;
-  font-style: italic;
+    color:#25238F;
+    text-align: left;
+    font-style: italic;
=20
 }
=20
 h2 {
-  font-family:verdana,helvetica,sans-serif;
-  font-size:14px;
-  color:grey;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:1.35em;
+    color:grey;
+    margin:1px;
+    padding:1px;
+    font-style: italic;
 }
 div.info {
-	background:#879ed4;
-	color:white;
-	font-size:120%;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
=20
 content h2.info {
-	background:#879ed4;
-  color:black;
-  font-size:14pt;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:black;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 redcontent h2.info {
-  background:#879ed4;
-  color:white;
-  font-size:14pt;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 h2.info {
-  background-color:#879ed4;
-	color:white;
-	font-size:14px;
-  text-align:center;
-  padding:0px;
-  margin:0px;
-  border:1px solid grey;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
=20
 }
=20
+
 h3.info {
-  background:#879ed4;
-  color:white;
-  font-size:14px;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
=20
 h2.info2 {
-  color:blue;
-  font-size:14px;
-  text-align:center;
+    color:blue;
+    font-size:1em;;
+    text-align:center;
=20
 }
=20
=20
 h2.error {
-	background:red;
-	color:white;
-	font-size:14px;
+    background:red;
+    color:white;
+    font-size:0.87em;
 }
=20
=20
 div.u_tmenu {
-  margin-top:0px;
-  width:100%;
- /* background-color:#879ED4; */
+    margin-top:0px;
+    width:100%;
+    /* background-color:#879ED4; */
=20
=20
 }
 div.u_subtmenu {
-  background-color:white	;
-  float:left;
-  clear:both;
-  left:10px;
+    background-color:white	;
+    float:left;
+    clear:both;
+    left:10px;
=20
 }
 div.u_tmenu div.u_tool {
-	   float:left;
+    float:left;
=20
 }
 div.u_tool {
-	float:left;
-	width:  100%;
-	padding-bottom: 20px;
-	}
-div.u_tool div.name {
-       float:left;
-       margin-left:10px;
+    float:left;
+    width:  100%;
+    padding-bottom: 20px;
 }
-div.u_tool {
-	float:right;
-	margin-right:10px;
+div.u_tool #name {
+    float:left;
+    margin-left:10px;
 }
-div.module {
-	position:absolute;
-	top:0px;
-	right:5px;
-	text-align:right;
-	padding:0px;
-	margin: 0px;
+#u_tool {
+    float:right;
+    margin-right:10px;
 }
+td.tool a.mtitle {
+    text-decoration:none;
+    display:inline;
+    color: blue;
+    font-size:0.75em;
+   =20
+}
+td.tool a.mtitle:hover {
+    text-decoration:none;
+    display:inline;
+    font-size:0.75em;;
+    color: darkblue;
+    background-color:#5D90CD;
+
+}
+#top {
+    float:left;
+    margin-bottom: 0.9512%;
+    width: 100%;
+}
+#module {
+    position:absolute;
+    top:0px;
+    right:5px;
+    text-align:right;
+    padding:0px;
+    margin: 0px;
+}
 div.u_subt2menu {
-background-color:lightgrey;
-  left:1%;
+    background-color:lightgrey;
+    left:1%;
=20
 }
 div.lmenu {
-	 float:left;
-	 clear:left;
-	font-size:9px;
+    float:left;
+    clear:left;
+    font-size:0.75em;;
=20
 }
 div.lextmenu {
=20
-	float:left;
-	font-family:verdana,helvetica,sans-serif;
-	font-size:9px;
+    float:left;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:0.75em;;
=20
 }
 div.searchmenu {
-  left:30px;
-  width:95px;
-  top:100px;
-  position:absolute;
+    left:30px;
+    width:95px;
+    top:100px;
+    position:absolute;
=20
 }
=20
 div.recherche_form{
-	width:700px;
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
-  border-style:outset;
-  border-width:1px;
+    width:700px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-style:outset;
+    border-width:1px;
=20
 }
 div.redcontent{
=20
-         float:left;
-	 padding-top:7px;
-	 padding-left:8px;
-         font-size:9px;
-         font-family:verdana,helvetica,sans-serif;
-	 width:75%;
+    float:left;
+    padding-top:7px;
+    padding-left:8px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    width:75%;
=20
 }
 div.content{
+    padding-top:0.0030%;
+    margin-top:0.0030%;
+    width:100%;
+    font-family:arial,verdana,sans-serif,helvetica;
=20
-		padding-top:2px;
-		margin-top:2px;
-         width:100%;
-         font-family:verdana,helvetica,sans-serif;
=20
-
 }
 div.content30{
=20
-         float:left;
-	 padding-top:7px;
-         width:35%;
-         font-family:verdana,helvetica,sans-serif;
+    float:left;
+    padding-top:7px;
+    width:35%;
+    font-family:arial,verdana,sans-serif,helvetica;
=20
 }
 div.no span{
-	position:static;
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:bold;
-	color:red;
+    position:static;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:bold;
+    color:red;
=20
 }
=20
 table.document {
-   color:blue;
-   width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
=20
 }
 table.document th{
-  font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
-  border-bottom:2px solid blue;
-  border-top:0;
-  color:#25238F;
-  text-align: left;
-  background-color:#EDF3FF;
-  font-style: italic;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:2px solid blue;
+    border-top:0;
+    color:#25238F;
+    text-align: left;
+    background-color:#EDF3FF;
+    font-style: italic;
 }
 .error {
-width:60%;
-margin-left:20%;
-text-align: center;
+    width:60%;
+    margin-left:20%;
+    text-align: center;
=20
-color:white;
-background-color:red;
-font-weight: bolder;
-font-size:120%;
+    color:white;
+    background-color:red;
+    font-weight: bolder;
+    font-size:0.87em;
 }
=20
 table.mtitle {
-	border:0;
-	text-align:center
+    border:0;
+    text-align:center
 }
 td.mshort {
-  height:15px;
-  width:60px;
-  text-align:center;
-  border:  1px solid;
-  color:#5D90CD ;
-  background-color:#DDE6FF;
+    height:15px;
+    width:60px;
+    text-align:center;
+    border:  1px solid;
+    color:#5D90CD ;
+    background-color:#DDE6FF;
 }
 td.mtitle {
-	text-align:center;
-	width:95px;
-        height :30px;
-	font-size:10px;
+    text-align:center;
+    width:95px;
+    height :30px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
+    border-radius:5px;
 }
 td.msubtitle {
-	text-align:center;
-	height:20px;
-	font-size:10px;
+    text-align:center;
+    height:20px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
 }
 span.mtitle {
-	color:gray;
-	background-color:blue;
-	font-size:10px;
-	border-style:groove
+    color:gray;
+    background-color:blue;
+    font-size:0.75em;;
+    border-style:groove
 }
 span.odd {
-  background-color:#ECF3FF;
-  display:block;
- }
+    background-color:#ECF3FF;
+    display:block;
+}
 span.even {
-  background-color:#DDE6FF;
-  display:block;
- }
+    background-color:#DDE6FF;
+    display:block;
+}
=20
 tr.odd {
-	background-color:#DDE6FF;
-	font-size:10px;
+    background-color:#DDE6FF;
+    font-size:0.87em;;
 }
-tr {
-	font-size:10px;
+tr.highlight {
+    /* background-color:whitesmoke; */
+    font-size:0.87em;
+    font-weight: bold;
 }
+tr.even {
+  font-size:0.87em;;
+}
 td.odd{
-	background-color:#DDE6FF ;
-	font-size:10px;
+    background-color:#DDE6FF ;
 }
 td.even{
-	border:0px;
-	font-size:10px;
+    border:0px;
 }
 td.cell{
-	    height:32px;
-	     padding: 1px;
+    height:32px;
+    padding: 1px;
+   =20
 }
 td.selectedcell{
-	border-style:inset;
-        border-color:blue;
-	border-width:1pt ;
-	font-size:10px;
-        background:#5D90CD ;
-        color:white;
-        text-align:center;
-	     width:120px;
+    border-style:inset;
+    border-color:blue;
+    border-width:1pt ;
+    font-size:1.2em;
+    font-weight: bold;
+    background:#5D90CD ;
+    color:white;
+    text-align:center;
+    width:120px;
+    border-radius:5px;
 }
 a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
- color: blue;
+    text-decoration:none;
+    display:inline;
+    color: blue;
=20
 }
 a.mtitle:hover {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
+    text-decoration:none;
+    display:inline;
=20
- color: darkblue;
-background-color:#5D90CD;
+    color: darkblue;
+    background-color:#5D90CD;
=20
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
- font-size:1em;
- text-decoration:none;
- display:block;
- color:white;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color:white;
 }
 a.dossier {
-  font-size:10px;
-  text-decoration:none;
-  display:block;
-   color: #202267;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color: #202267;
=20
 }
 tr.odd:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 tr.even:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 a.cell {
-  text-decoration:none;
-  display:block;
-  color:blue;
-  background-color:white;
-  font-size:9px;
+    text-decoration:none;
+    display:block;
+    color:blue;
+    background-color:white;
+    font-size:0.75em;;
 }
=20
 a.cell:hover {
-  font-size:9px;
-  color:white;
-  background-color:#5D90CD;
-  text-decoration:none;
-  display:block;
-	}
+    font-size:0.75em;;
+    color:white;
+    background-color:#5D90CD;
+    text-decoration:none;
+    display:block;
+}
=20
=20
 a.one:link {
-	text-decoration:none;
-	color:#3010FF
+    text-decoration:none;
+    color:#3010FF
 }
 a.one:visited {
-	text-decoration:none;
-	color:#3010FF
-	}
+    text-decoration:none;
+    color:#3010FF
+}
=20
 a.one:active {
-	background: #0000FF;
-	}
+    background: #0000FF;
+}
=20
 a.one:hover {
-	    text-decoration:underline;
-	background:#3010FF;
-	color:#FFFFFF;
-	}
+    text-decoration:underline;
+    background:#3010FF;
+    color:#FFFFFF;
+}
=20
=20
 a.detail
 {
-  font-size:9px;
-  font-family:verdana,helvetica,sans-serif;
+    font-size:0.87em;;
+    font-family:arial,verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -405,8 +432,8 @@
=20
 a.detail:hover
 {
-  font-size:9px;
-  font-family:verdana,helvetica,sans-serif;
+/*    font-size:0.75em;; */
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -414,19 +441,19 @@
 }
=20
 li.menuv,ol.menuv {
-	 display:inline;
-	 padding:1em 1em;
+    display:inline;
+    padding:1em 1em;
 }
 div.redcontent a {
-  font-family:verdana,helvetica,sans-serif;
-  text-decoration: none;
-  display: block;
-  color: blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
=20
 }
=20
 div.redcontent a:hover {
-  font-family:verdana,helvetica,sans-serif;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -434,17 +461,17 @@
=20
 }
 div.content a {
-  font-family:verdana,helvetica,sans-serif;
-  text-decoration: none;
-  display: block;
-  color: blue;
-padding: 0;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
+    padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-  font-family:verdana,helvetica,sans-serif;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -453,477 +480,506 @@
 }
=20
 div.redcontent a.mtitle {
-  text-decoration:none;
-  display:inline;
+    text-decoration:none;
+    display:inline;
=20
=20
-  color:black;
+    color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  color:white;
-  background-color:darkblue;
+    text-decoration:none;
+    display:inline;
+    color:white;
+    background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
-  color:blue;
+    text-decoration:none;
+    display:inline;
+    color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:darkblue;
-  color:white;
+    text-decoration:none;
+    display:inline;
+    background-color:darkblue;
+    color:white;
=20
=20
 }
 div.redcontent input.text {
-   font-family:verdana,helvetica,sans-serif;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  background-color:orange;
-  border-width:1px;
-  color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    background-color:orange;
+    border-width:1px;
+    color:blue;
 }
 div.content input.text {
-   font-family:verdana,helvetica,sans-serif;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  border-width:1px;
-  background-color:orange;
-  color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    border-width:1px;
+    background-color:orange;
+    color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.content input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.redcontent textarea:focus {
-background-color: orange;
+    background-color: orange;
 }
 .document {
-color: #1a207d;
-border-collapse:collapse;
+    color: #1a207d;
+    border-collapse:collapse;
 }
-a.document{
-  font-size:12px;
-  text-decoration:none;
-  display:block;
+div.content a.document, a.document{
+/*    font-size:0.75em;;*/
+    text-decoration:underline;
+    display:block;
 }
 a.document:hover {
-  text-decoration:none;
-  display:block;
+    text-decoration:none;
+    display:block;
=20
=20
 }
 .input_text_ro {
-	   border:solid 1px blue;
-	   background:#EDEDED;
-	   color:blue;
-	margin:1px;
+    border:solid 1px blue;
+    background:#EDEDED;
+    color:blue;
+    margin:1px;
 }
 .input_text {
-	   border:groove 1px blue;
-	margin:1px;
+    border:groove 1px blue;
+    margin:1px;
 }
 .input_text:hover {
-	border:groove 1px blue;
-	margin:1px;
-	background-color: orange;
+    border:groove 1px blue;
+    margin:1px;
+    background-color: orange;
 }
 h1.legend, legend {
-font-weight: bold;
-font-style: italic;
-font-size: 110% ;
+    font-weight: bold;
+    font-style: italic;
+    font-size: 1.2em ;
=20
 }
 fieldset fieldset legend {
-	 font-size:110%;
-	 color:grey;
-	 }
+    font-size:0.87em;
+    color:grey;
+}
 select {
-border: 1px solid blue;
-margin:2px;
-background-color:white;
+    border: 1px solid blue;
+    margin:2px;
+    background-color:white;
=20
 }
=20
=20
=20
 .infobulle {
-	   position:absolute;
-	   border:1px solid black;
-	   background-color:yellow;
-	   padding-bottom: 10;
-	   padding-top: 10;
-	   padding-left: 10;
-	   padding-right: 10;
-	   color:black;
-	   top:0;left:0;
-	   visibility:hidden;
-	   width:25em;
-		z-index:20;
+    position:absolute;
+    border:1px solid black;
+    background-color:yellow;
+    padding-bottom: 10;
+    padding-top: 10;
+    padding-left: 10;
+    padding-right: 10;
+    color:black;
+    top:0;left:0;
+    visibility:hidden;
+    width:25em;
+    z-index:20;
 }
=20
 span.action {
-	height:3em;
+    height:3em;
=20
 }
 td.num {
-	text-align:right;
+    text-align:right;
 }
 tr.priority1 {
-	background-color: coral;
-	}
+    background-color: coral;
+}
 span.action a.action {
-  border:2px outset ;
-  padding-left: 3px;
-  padding-right:3px;
-  text-decoration:none;
-  font-size:14px;
+    border:2px outset ;
+    padding-left: 3px;
+    padding-right:3px;
+    text-decoration:none;
+    font-size:0.87em;
=20
-  display:inline;
-  color:black;
-  background-color:lightgrey;
+    display:inline;
+    color:black;
+    background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:lightblue;
-  color:black;
+    text-decoration:none;
+    display:inline;
+    background-color:lightblue;
+    color:black;
 }
 div.popup_back{
-	position:absolute;
-	top:0px;
-	left:0px;
-	opacity:0.6;
-	width:100%;
-	height:100%;
-	z-index:1;
-	/*background-color:lightgrey;*/
+    position:absolute;
+    top:0px;
+    left:0px;
+    opacity:0.6;
+    width:100%;
+    height:100%;
+    z-index:1;
+    /*background-color:lightgrey;*/
=20
-	display:none;
+    display:none;
 }
=20
 div.popup_border_title {
-	position:absolute;
-	top:20%;
-	left:10%;
-	width:60%;
-	height:80%;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 2px outset #201e87;
-	background-color:#879ED4;
-	font-size: 110% ;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/
-	color: white;
-	display:none;
-	/*opacity:1;
-	filter:alpha(opacity=3D100);*/
+    position:absolute;
+    top:20%;
+    left:10%;
+    width:60%;
+    height:80%;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 2px outset #201e87;
+    background-color:#879ED4;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    /*border-bottom: 2px solid #201e87;*/
+    color: white;
+    display:none;
+    /*opacity:1;
+    filter:alpha(opacity=3D100);*/
=20
-	}
+}
 div.popup_border_notitle {
-	position:absolute;
-	top:20%;
-	left:20%;
-	width:60%;
-	height:80% ;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 3px outset #201e87;
-	background-color: #879ED4;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	display:none;
-	color: white;
-	/*opacity:0.7;
-	filter:alpha(opacity=3D70);
-	*/
-	}
+    position:absolute;
+    top:20%;
+    left:20%;
+    width:60%;
+    height:80% ;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 3px outset #201e87;
+    background-color: #879ED4;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    display:none;
+    color: white;
+    /*opacity:0.7;
+    filter:alpha(opacity=3D70);
+    */
+}
=20
 div.popup_content {
-	position:absolute;
-	top:16;
-	bottom:0;
-	left:0;
-	right:0;
-	width:100%;
-	height:96%;
-	overflow: auto;
-	background-color:#DFE7FF;
-	font-size:10px ;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: normal;
-	font-weight: normal;
-	color: black;
-	text-align: left;
-	display:none;
-	z-index:10;
-	/*opacity:1;
-	filter:alpha(opacity=3D100);*/
+    position:absolute;
+    top:16;
+    bottom:0;
+    left:0;
+    right:0;
+    width:100%;
+    height:96%;
+    overflow: auto;
+    background-color:#DFE7FF;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: normal;
+    font-weight: normal;
+    color: black;
+    text-align: left;
+    display:none;
+    z-index:10;
+    /*opacity:1;
+    filter:alpha(opacity=3D100);*/
 }
 div.autocomplete {
-  position:relative;
-  background-color:white;
-  border:1px solid #888;
-  margin:0;
-  padding:0;
-  text-align:left;
-  font-size:12px;
-
+    position:relative;
+    background-color:white;
+    border:1px solid #888;
+    margin:0;
+    padding:0;
+    text-align:left;
 }
 div.autocomplete em {
-	color:blue;
-	font-weight:bold;
+    color:blue;
+    font-weight:bold;
 }
 div.autocomplete ul {
-  list-style-type:none;
-  background-color:white;
-  border:1px solid #888;
-  width:375px;
-  margin:0;
-  padding:0;
+    list-style-type:none;
+    background-color:white;
+    border:1px solid #888;
+    width:375px;
+    margin:0;
+    padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
-  list-style-type:none;
-  display:block;
-  margin:0;
-  padding:0px;
-  /*height:32px;*/
-  cursor:pointer;
+    list-style-type:none;
+    display:block;
+    margin:0;
+    padding:0px;
+    /*height:32px;*/
+    cursor:pointer;
 }
-span.informal{ font-size:95%; color:black;}
+span.informal{=20
+    color:black;
+}
=20
 ul.select_table  {
-	/*padding:5px;*/
-	overflow:hidden;
-	}
+    /*padding:5px;*/
+    overflow:hidden;
+}
 ul.select_table a{
-	width:100%;
-	display:block;
-	background-color:inherit;
-	color: black;
-	text-decoration:none;
-	}
+    width:100%;
+    display:block;
+    background-color:inherit;
+    color: black;
+    text-decoration:none;
+}
 ul.select_table a:hover{
-	background-color:white;
-	color:black;
-	/*text-decoration:underline;*/
-	}
+    background-color:white;
+    color:black;
+    /*text-decoration:underline;*/
+}
 ul.select_table li {
-	display:table-row;
-	list-style-type: none;
-	}
+    display:table-row;
+    list-style-type: none;
+}
 ul.select_table li span {
-	display:table-cell;
-	width:25em;
-	margin: 0px;
-	padding:  0px;
+    display:table-cell;
+    width:25em;
+    margin: 0px;
+    padding:  0px;
 }
=20
 div.pc_calendar{
=20
-		float:left;
+    float:left;
=20
-		}
+}
 div.pc_calendar table {
-	text-align:center;
+    text-align:center;
=20
 }
 div.pc_calendar tr{
-	height:40;
+    font-size:0.87em;
+}
+div.pc_calendar tr{
+    height:40;
=20
=20
 }
 div.pc_calendar td{
-	width:14%;
-	border:#879ed4 solid 1px;
+    width:14%;
+    border:#879ed4 solid 1px;
 }
=20
 div.pc_calendar td.weekend {
-	background-color:#cce0e6;
+    background-color:#cce0e6;
=20
 }
 div.pc_calendar td.workday{
-	background-color:inherit;
-
-
+    background-color:inherit;
 }
 div.pc_calendar span.day{
-	font-weight: bold;
-	display:block;
+    font-weight: bold;
+    display:block;
=20
 }
 div.pc_calendar span.event{
-	font-weight: bolder;
+    font-weight: bolder;
=20
 }
 span.todo  {
-	text-align: left;
-	background-color:yellow;
+    text-align: left;
+    background-color:yellow;
=20
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
-background-color:lightgrey;
-color:black;
-cursor:inherit;
--moz-user-focus:ignore;
--moz-user-input:disabled;
+    -moz-user-focus:ignore;
+    -moz-user-input:disabled;
+    background-color:lightgrey;
+    color:black;
+    cursor:inherit;
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:10;
-	color:white;
-	font-weight: bold;
+    color:white;
+    font-weight: bold;
+    font-size:0.87em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
=20
-	text-decoration:none;
-	font-family: verdana,helvetica,sans-serif;
-	background-image: url("image/bg-submit2.gif");
-	background-repeat: repeat-x;
-	background-position: left;
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0px;
+    padding:8px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 5px;
+    moz-border-radius:5px;
=20
-	border-style:  outset ;
-	border-color:  blue ;
-	border-width:0;
-	padding-bottom: 4;
-	padding-top: 4;
-	padding-right: 6;
-	padding-left:  6;
-	margin-top:3px;
-	cursor:pointer;
-	margin:1 2 1 2;
-    border-radius: 4px;
-	-moz-border-radius:4px;
-
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
-	cursor:pointer;
-	background-color:white;
-	border-style:  inset ;
-	color:red;
-	margin:1 2 1 2;
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
=20
-	}
-	td.tool {
-	border: solid 1px gray;
-	background-color: white;
+}
+a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutt=
on {
+    color:white;
+    font-weight: bold;
+    font-size:0.75em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
=20
-	}
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0;
+    padding-bottom: 3px;
+    padding-top: 3px;
+    padding-right: 3px;
+    padding-left:  3px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 2px;
+    moz-border-radius:2px;
+
+}
+a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.co=
ntent a.smallbutton:hover  {
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
+
+}
+td.tool {
+    border: solid 1px gray;
+    background-color: white;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
+}
 div.topmenu {
-	margin-top:2px;
+
 }
=20
-h2.dossier {
-	color:darkblue;
-	font-style: italic;
-	display:inline;
-	font-size:14px;
-	margin:0px;
-	padding:0px;
-	font-variant:small-caps;
+#dossier h2{
+    color:darkblue;
+    display:inline;
+    font-size:2em;
+    margin:0px;
+    padding:0px;
+    font-variant:small-caps;
 }
 /* </style> */
-div.add_todo_list {
-                    border:1px solid blue;
-                    display:none;
-                    background-color:#BFD0FF;
-                    padding:3;
-                    position:absolute;
-                    text-align:left;
-                    line-height:3em;
-                    z-index:1;
-                    width:345px;
-                }
+#add_todo_list {
+    border:1px solid blue;
+    display:none;
+    background-color:#BFD0FF;
+    padding:0.0015%;
+    position:absolute;
+    text-align:left;
+    z-index:1;
+    width:17.9687%;
+}
 div.welcome {
=20
 }
 div.gest_name {
-	float:left;
-	margin-left:150;
-	margin-top:15
+    float:left;
+    margin-left:150;
+    margin-top:15
 }
 h2.gest_name {
-	border-left: 5px solid  #403a8d;
-	border-bottom:1px solid  #b4bbc2;
-		border-top:1px solid  #b4bbc2;
-		border-right:1px solid  #b4bbc2;
-	padding: 5px;
-	width: 40%;
+    border-left: 5px solid  #403a8d;
+    border-bottom:1px solid  #b4bbc2;
+    border-top:1px solid  #b4bbc2;
+    border-right:1px solid  #b4bbc2;
+    padding: 5px;
+    width: 40%;
 }
 body.op_detail_frame,div.op_detail_frame  {
-  background-color:#e4e7ed;
-  height:100%; width:100%;
+    background-color:#e4e7ed;
+    height:100%; width:100%;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
=20
=20
 }
 div.inner_box  {
-  background-color:#e4e7ed;
- font-size:10;
-  font-family:verdana,helvetica,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:3;
-
-position:absolute;
-left:10%;
-
-
-border:1px solid darkblue;
-
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:10%;
+    border:1px solid darkblue;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
 div.op_detail_title {
-	background-color:grey;
-/*	width:500;*/
+    background-color:grey;
+    /*	width:500;*/
=20
=20
 }
 div#div_jrn{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-		      background-color:#EDF3FF;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
=20
 }
- div#div_cat{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-             background-color:#EDF3FF;
+div#div_cat{
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
=20
 }
=20
@@ -932,227 +988,373 @@
=20
 div#search_form
 {
-              position:absolute;
-              border:1px solid black;
-              top:15%;left:100px;
-              margin-left:25%;
-              z-index:2;
-              width:50%;
-              display:none;
-	      background-color:#e4e7ed;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100px;
+    margin-left:25%;
+    z-index:2;
+    width:50%;
+    display:none;
+    background-color:#e4e7ed;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
=20
 table.sortable td, table.table_large td, table.result td
 {
-	padding-left:5px;
-	padding-right:5px;
+    padding-left:5px;
+    padding-right:5px;
 }
 table.info_op
 {
-	font-size:18;
-	width:100%;
+    width:100%;
 }
 table.info_op tr
 {
-font-size:14;
-background:white;
+    background:white;
 }
 h2#jrn_name
 {
-	color:blue;
-	font-size:22;
-	margin-right:30%;
-	float: right;
-
+    color:blue;
+    font-size:2.74em;
+    margin-right:30%;
+    float: right;
 }
 tr.footer{
-	font-size:14;
-	font-style: italic;
-	font-weight: bold;
+    font-size:0.87em;
+    font-style: italic;
+    font-weight: bold;
=20
 }
 span.remain {
-	font-weight: bold;
-	color:black;
-	}
+    font-weight: bold;
+    color:black;
+}
=20
 div#jrn_name_div
 {
-	float: right;
-	margin-right:150;
+    float: right;
+    margin-right:150;
=20
=20
 }
 #predef_form {
-	margin-left:20%;
-	width:60%;
-
+    margin-left:20%;
+    width:60%;
+    position: absolute;
 }
 #direct
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
+    font-size:0.87em;;
 }
 #calc
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
 }
 div#wait_box
 {
-  background-color:#F1E6E6;
- font-size:10;
-  font-family: verdana,helvetica,arial,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:10;
+    background-color:#F1E6E6;
+    font-size:0.87em;
+    font-family: arial,verdana,helvetica,arial,sans-serif;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:10;
=20
-position:absolute;
-left:30%;
-top:30%;
+    position:absolute;
+    left:30%;
+    top:30%;
=20
=20
-border:1px solid darkblue;
+    border:1px solid darkblue;
=20
 }
 #wait_box h2
 {
-color:black;
-text-align:center;
+    color:black;
+    text-align:center;
 }
 div#div_jrnsearch_op{
=20
-              border:1px solid black;
-              display:none;
-              width:50em;
-		      background-color:#EDF3FF;
-			  position:absolute;
-			  z-index: 5;
+    border:1px solid black;
+    display:none;
+    width:50em;
+    background-color:#EDF3FF;
+    position:absolute;
+    z-index: 5;
=20
 }
 ul {
-	padding-left: 110px;
+    padding-left: 110px;
 }
 a.line,div.content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
- color: #0000ff;
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
-  color: #0000ff;
-     background-color: rgb(93, 144, 205);
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
+    background-color: rgb(93, 144, 205);
 }
 #close_div
 {
- background-color:white;
- color:blue;
- text-decoration:none;
- border:1px solid blue;
- margin-left: 2px;
- margin-right:2px;
- margin-top:0px;
- font-size:10px;
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:2px;
+    margin-top:0px;
+    font-size:0.90em;
 }
 #close_div:hover
 {
-	background-color: orange;
+    background-color: orange;
 }
+#popmeout
+{
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:18px;
+    font-size:0.90em;
+}
+#popmeout:hover
+{
+    background-color: orange;
+}
 table.table_large tr.odd ,table.table_large tr.even {
=20
-	height:32px;
+    height:32px;
 }
 #calc1
 {
-	position:absolute;
-	display:block;
-	top:30px;
-	left:150px;
-	width:300px;
-	border:1px solid black;
-	background-color:#aec3e8;
-	font-size:16px;
-	padding: 20px 20px;
+    position:absolute;
+    display:block;
+    top:30px;
+    left:150px;
+    width:300px;
+    border:1px solid black;
+    background-color:#aec3e8;
+    font-size:0.87em;
+    padding: 20px 20px;
 }
 span.invoice
 {
-    font-size: 120%;
+    font-size: 1.2em;
     font-style: italic;
     display:block;
     margin: 20px;
     font-weight: bold;
 }
 a.nav,div.content a.nav,div.redcontent a.nav {
-	display:inline;
-	text-decoration:none;
-	font-size:1em;
+    display:inline;
+    text-decoration:none;
+    font-size:0.75em;;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
-	display:inline;
-	text-decoration:none;
-	background-color:darkblue;
-	color:white;
-	font-size:1em;
+    display:inline;
+    text-decoration:none;
+    background-color:darkblue;
+    color:white;
+    font-size:0.75em;;
 }
 #dossier {
-	display:inline;
-	float:left;
-	width:40em;
-	top:0px;
+    display:inline;
+    float:left;
+    width:100%;
+    top:0px;
+    text-align: center;
 }
 div.foldercontent {
-	padding:20px 30px 0px 40px;
-	}
+    padding:20px 30px 0px 40px;
+}
=20
 h1.title {
-	color: blue;
-	font-size:18px;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    font-style: italic;
 }
 h2.title {
-	color: blue;
-	font-size:14px;
-	font-weight:bold;
-	font-style: italic;
-	margin-left: 15px;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0.24%;
+    border:1px solid darkblue;
+
 }
 h3.title {
-	color: blue;
-	font-size:14px;
-	margin-left: 30px;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 30px;
 }
 h4.title {
-	color: blue;
-	font-size:12px;
-	margin-left: 45px;
-	text-decoration: underline;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: underline;
 }
 h5.title {
-	color: blue;
-	font-size:12px;
-	margin-left: 45px;
-	text-decoration: none;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: none;
+    font-style: italic;
 }
 div.myfieldset
 {
-	margin-top: 5px;
-	margin-left:5px;
-	margin-right: 5px;
-	border:lightgrey 2px groove;
+    margin-top: 5px;
+    margin-left:5px;
+    margin-right: 5px;
+    border:lightgrey 2px groove;
+    border-radius: 4px;
 }
 #info_div {
-	display:none;
-	background-color: yellow;
-	color:black;
-	z-index: 15;
-	position: absolute;
-	top:20;
-	left:20;
-}
\ No newline at end of file
+    display:none;
+    background-color: yellow;
+    color:black;
+    z-index: 15;
+    position: absolute;
+    top:0;
+    left:45%;
+}
+div.menu2 a.mtitle{
+   =20
+}
+div.menu3 {
+   =20
+}
+#go_submit_id {
+    font-size:1.25em;
+}
+.decale {
+    margin-left:30px;
+}
+#folder {
+    font-size:1.4em;
+    width:auto;
+    border-width:0px;
+    border-collapse:collapse;
+   =20
+   =20
+}
+/*#folder tr.odd,#folder tr.even {
+    font-size : 1.2em;
+}*/
+textarea.itextarea{
+    border:solid blue 1px;
+    width:90%;
+    margin-left:5%;
+}
+div#modele_op_div{
+    display: none;
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:30%;
+    width:40%;
+    border:1px solid darkblue;
+}
+div#notice {
+    position:absolute;
+    right:5%;
+    top:200px;
+    background-color:yellow;
+    border: 1px solid black;
+}
+div.name  {
+    position:absolute;
+    top:0px;
+    left:0px;
+}
+div#box_search_card {
+    position:absolute;
+    right:15.625%;
+    top:115px;
+}
+div.bxbutton
+{
+    float:right;
+    height:10px;
+    display:block;
+    margin-top:0.48%;
+    margin-right:0.48%;
+}
+div.inner_box tr.odd {
+    background:  #CBD9F4;
+}
+#modele_op_tab tr.odd {
+    background:  #CBD9F4;
+}
+div#bookmark_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+   border:1px solid darkblue;
+   top:2em;
+   left:30%;
+   width:40%;
+}
+div#preference_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    border:1px solid darkblue;
+    top:2em;
+    left:20%;
+    width:50%;
+}
+#error_div{
+    position:absolute;
+    border:1px solid black;
+    background-color:whitesmoke;
+    padding-bottom: 2px;
+    padding-top: 2px;
+    padding-left: 2px;
+    padding-right: 2px;
+    color:red;
+    top:40%;left:25%;
+    visibility:hidden;
+    width:40em;
+    z-index:20;
+}
+#error_div h2 {
+    background: red;
+}
+div#error_content_div {
+   font-size: 1.2em;
+   color:error;
+   font-weight: bold;
+   text-align: center;
+}
+td.workday ol {
+	margin:0px;
+	padding:0px;
+	list-style-type:none;
+	text-align:left;
+}

Modified: phpcompta/trunk/html/style-epad.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-epad.css	2013-10-03 10:56:13 UTC (rev 5462=
)
+++ phpcompta/trunk/html/style-epad.css	2013-10-04 14:57:53 UTC (rev 5463=
)
@@ -1,413 +1,427 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-  background-color:#EDF3FF;
-  font-size:100%;
-  font-family:verdana,sans-serif,helvetica;
-  padding: 0px 0px 0px 0px ;
-  margin:0;
-  color:blue;
+    background-color:#EDF3FF;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding: 0px 0px 0px 0px ;
+    margin:0;
+    color:blue;
+    font-size:1.35em;
 }
-#info_div {
-	display:none;
-	background-color: yellow;
-	color:black;
-	z-index: 15;
-	position: absolute;
-	top:0;
-	left:45%;
+.notice {
+    color:red;
+    font-style: italic;
 }
=20
-.notice {
-	color:red;
-        font-style: italic;
-        }
-
 table.sortable, table.table_large, table.result  ,table.resultfooter {
-  color:blue;
-  /* border:blue solid 1px; */
-  width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    /* border:blue solid 1px; */
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
=20
 }
 table.resultfooter tfoot {
-	font-size:110%;
-	font-weight: bold;
+    font-weight: bold;
=20
=20
 }
 table.sortable th,  table.table_large th,table.result th {
-  font-weight:bold;
-  font-family:verdana,sans-serif,helvetica;
- border-bottom:1px solid blue;
- border-top:0;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:1px solid blue;
+    border-top:0;
+    font-size:0.75em;;
=20
-  color:#25238F;
-  text-align: left;
-  font-style: italic;
+    color:#25238F;
+    text-align: left;
+    font-style: italic;
=20
 }
=20
 h2 {
-  font-family:verdana,sans-serif,helvetica;
-  font-size:120%;
-  color:grey;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:1.35em;
+    color:grey;
+    margin:1px;
+    padding:1px;
+    font-style: italic;
 }
 div.info {
-	background:#879ed4;
-	color:white;
-	font-size:120%;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
=20
 content h2.info {
-	background:#879ed4;
-  color:black;
-  font-size:120%;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:black;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 redcontent h2.info {
-  background:#879ed4;
-  color:white;
-  font-size:120%;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 h2.info {
-  background-color:#879ed4;
-	color:white;
-	font-size:120%;
-  text-align:center;
-  padding:0px;
-  margin:0px;
-  border:1px solid grey;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
=20
 }
=20
+
 h3.info {
-  background:#879ed4;
-  color:white;
-  font-size:120%;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
=20
 h2.info2 {
-  color:blue;
-  font-size:100%;
-  text-align:center;
+    color:blue;
+    font-size:1em;;
+    text-align:center;
=20
 }
=20
=20
 h2.error {
-	background:red;
-	color:white;
-	font-size:120%;
+    background:red;
+    color:white;
+    font-size:0.87em;
 }
=20
=20
 div.u_tmenu {
-  margin-top:0px;
-  width:100%;
- /* background-color:#879ED4; */
+    margin-top:0px;
+    width:100%;
+    /* background-color:#879ED4; */
=20
=20
 }
 div.u_subtmenu {
-  background-color:white	;
-  float:left;
-  clear:both;
-  left:10px;
+    background-color:white	;
+    float:left;
+    clear:both;
+    left:10px;
=20
 }
 div.u_tmenu div.u_tool {
-	   float:left;
+    float:left;
=20
 }
 div.u_tool {
-	float:left;
-	width:  100%;
-	padding-bottom: 20px;
-	}
-div.u_tool div.name {
-       float:left;
-       margin-left:10px;
+    float:left;
+    width:  100%;
+    padding-bottom: 20px;
 }
-div.u_tool {
-	float:right;
-	margin-right:10px;
+div.u_tool #name {
+    float:left;
+    margin-left:10px;
 }
-div.module {
-	position:absolute;
-	top:0px;
-	right:5px;
-	text-align:right;
-	padding:0px;
-	margin: 0px;
+#u_tool {
+    float:right;
+    margin-right:10px;
 }
+td.tool a.mtitle {
+    text-decoration:none;
+    display:inline;
+    color: blue;
+    font-size:0.75em;
+   =20
+}
+td.tool a.mtitle:hover {
+    text-decoration:none;
+    display:inline;
+    font-size:0.75em;;
+    color: darkblue;
+    background-color:#5D90CD;
+
+}
+#top {
+    float:left;
+    margin-bottom: 0.9512%;
+    width: 100%;
+}
+#module {
+    position:absolute;
+    top:0px;
+    right:5px;
+    text-align:right;
+    padding:0px;
+    margin: 0px;
+}
 div.u_subt2menu {
-background-color:lightgrey;
-  left:1%;
+    background-color:lightgrey;
+    left:1%;
=20
 }
 div.lmenu {
-	 float:left;
-	 clear:left;
-	font-size:90%;
+    float:left;
+    clear:left;
+    font-size:0.75em;;
=20
 }
 div.lextmenu {
=20
-	float:left;
-	font-family:verdana,sans-serif,helvetica;
-	font-size:90%;
+    float:left;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:0.75em;;
=20
 }
 div.searchmenu {
-  left:30px;
-  width:95px;
-  top:100px;
-  position:absolute;
+    left:30px;
+    width:95px;
+    top:100px;
+    position:absolute;
=20
 }
=20
 div.recherche_form{
-	width:700px;
-	font-size:90%;
-	font-family:verdana,sans-serif,helvetica;
-  border-style:outset;
-  border-width:1px;
+    width:700px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-style:outset;
+    border-width:1px;
=20
 }
 div.redcontent{
=20
-         float:left;
-	 padding-top:7px;
-	 padding-left:8px;
-         font-size:90%;
-         font-family:verdana,sans-serif,helvetica;
-	 width:75%;
+    float:left;
+    padding-top:7px;
+    padding-left:8px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    width:75%;
=20
 }
 div.content{
+    padding-top:0.0030%;
+    margin-top:0.0030%;
+    width:100%;
+    font-family:arial,verdana,sans-serif,helvetica;
=20
-		padding-top:2px;
-		margin-top:2px;
-         width:100%;
-         font-family:verdana,sans-serif,helvetica;
=20
-
 }
 div.content30{
=20
-         float:left;
-	 padding-top:7px;
-         width:35%;
-         font-family:verdana,sans-serif,helvetica;
+    float:left;
+    padding-top:7px;
+    width:35%;
+    font-family:arial,verdana,sans-serif,helvetica;
=20
 }
 div.no span{
-	position:static;
-	font-family:verdana,sans-serif,helvetica;
-	font-weight:bold;
-	color:red;
+    position:static;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:bold;
+    color:red;
=20
 }
=20
 table.document {
-   color:blue;
-   width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
=20
 }
 table.document th{
-  font-weight:bold;
-  font-family:verdana,sans-serif,helvetica;
-  border-bottom:2px solid blue;
-  border-top:0;
-  color:#25238F;
-  text-align: left;
-  background-color:#EDF3FF;
-  font-style: italic;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:2px solid blue;
+    border-top:0;
+    color:#25238F;
+    text-align: left;
+    background-color:#EDF3FF;
+    font-style: italic;
 }
 .error {
-width:60%;
-margin-left:20%;
-text-align: center;
+    width:60%;
+    margin-left:20%;
+    text-align: center;
=20
-color:white;
-background-color:red;
-font-weight: bolder;
-font-size:120%;
+    color:white;
+    background-color:red;
+    font-weight: bolder;
+    font-size:0.87em;
 }
=20
 table.mtitle {
-	border:0;
-	text-align:center
+    border:0;
+    text-align:center
 }
 td.mshort {
-  height:15px;
-  width:60px;
-  text-align:center;
-  border:  1px solid;
-  color:#5D90CD ;
-  background-color:#DDE6FF;
+    height:15px;
+    width:60px;
+    text-align:center;
+    border:  1px solid;
+    color:#5D90CD ;
+    background-color:#DDE6FF;
 }
 td.mtitle {
-	text-align:center;
-	width:95px;
-        height :30px;
-	font-size:90%;
+    text-align:center;
+    width:95px;
+    height :30px;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
 }
 td.msubtitle {
-	text-align:center;
-	height:20px;
-	font-size:90%;
+    text-align:center;
+    height:20px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
 }
 span.mtitle {
-	color:gray;
-	background-color:blue;
-	font-size:90%;
-	border-style:groove
+    color:gray;
+    background-color:blue;
+    font-size:0.75em;;
+    border-style:groove
 }
 span.odd {
-  background-color:#ECF3FF;
-  display:block;
- }
+    background-color:#ECF3FF;
+    display:block;
+}
 span.even {
-  background-color:#DDE6FF;
-  display:block;
- }
+    background-color:#DDE6FF;
+    display:block;
+}
=20
 tr.odd {
-	background-color:#DDE6FF;
-	font-size:90%;
+    background-color:#DDE6FF;
+    font-size:1em;;
 }
-tr {
-	font-size:90%;
+tr.highlight {
+    /* background-color:whitesmoke; */
+    font-size:0.87em;
+    font-weight: bold;
 }
+tr.even {
+  font-size:1em;;
+}
 td.odd{
-	background-color:#DDE6FF ;
-	font-size:90%;
+    background-color:#DDE6FF ;
 }
 td.even{
-	border:0px;
-	font-size:90%;
+    border:0px;
 }
 td.cell{
-	    height:32px;
-	     padding: 1px;
+    height:32px;
+    padding: 1px;
+   =20
 }
 td.selectedcell{
-	border-style:inset;
-        border-color:blue;
-	border-width:1pt ;
-	font-size:90%;
-        background:#5D90CD ;
-        color:white;
-        text-align:center;
-	     width:120px;
+    border-style:inset;
+    border-color:blue;
+    border-width:1pt ;
+    font-size:1.2em;
+    font-weight: bold;
+    background:#5D90CD ;
+    color:white;
+    text-align:center;
+    width:120px;
 }
 a.mtitle {
-  font-size:90%;
-  text-decoration:none;
-  display:inline;
- color: blue;
+    text-decoration:none;
+    display:inline;
+    color: blue;
=20
 }
 a.mtitle:hover {
-  font-size:90%;
-  text-decoration:none;
-  display:inline;
+    text-decoration:none;
+    display:inline;
=20
- color: darkblue;
-background-color:#5D90CD;
+    color: darkblue;
+    background-color:#5D90CD;
=20
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
- font-size:90%;
- text-decoration:none;
- display:block;
- color:white;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color:white;
 }
 a.dossier {
-  font-size:90%;
-  text-decoration:none;
-  display:block;
-   color: #202267;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color: #202267;
=20
 }
 tr.odd:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 tr.even:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 a.cell {
-  text-decoration:none;
-  display:block;
-  color:blue;
-  background-color:white;
-  font-size:90%;
+    text-decoration:none;
+    display:block;
+    color:blue;
+    background-color:white;
+    font-size:0.75em;;
 }
=20
 a.cell:hover {
-  font-size:90%;
-  color:white;
-  background-color:#5D90CD;
-  text-decoration:none;
-  display:block;
-	}
+    font-size:0.75em;;
+    color:white;
+    background-color:#5D90CD;
+    text-decoration:none;
+    display:block;
+}
=20
=20
 a.one:link {
-	text-decoration:none;
-	color:#3010FF
+    text-decoration:none;
+    color:#3010FF
 }
 a.one:visited {
-	text-decoration:none;
-	color:#3010FF
-	}
+    text-decoration:none;
+    color:#3010FF
+}
=20
 a.one:active {
-	background: #0000FF;
-	}
+    background: #0000FF;
+}
=20
 a.one:hover {
-	    text-decoration:underline;
-	background:#3010FF;
-	color:#FFFFFF;
-	}
+    text-decoration:underline;
+    background:#3010FF;
+    color:#FFFFFF;
+}
=20
=20
 a.detail
 {
-  font-size:90%;
-  font-family:verdana,sans-serif,helvetica;
+    font-size:0.87em;;
+    font-family:arial,verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -415,8 +429,8 @@
=20
 a.detail:hover
 {
-  font-size:90%;
-  font-family:verdana,sans-serif,helvetica;
+/*    font-size:0.75em;; */
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -424,19 +438,19 @@
 }
=20
 li.menuv,ol.menuv {
-	 display:inline;
-	 padding:1em 1em;
+    display:inline;
+    padding:1em 1em;
 }
 div.redcontent a {
-  font-family:verdana,sans-serif,helvetica;
-  text-decoration: none;
-  display: block;
-  color: blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
=20
 }
=20
 div.redcontent a:hover {
-  font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -444,17 +458,17 @@
=20
 }
 div.content a {
-  font-family:verdana,sans-serif,helvetica;
-  text-decoration: none;
-  display: block;
-  color: blue;
-padding: 0;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
+    padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-  font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -463,477 +477,501 @@
 }
=20
 div.redcontent a.mtitle {
-  text-decoration:none;
-  display:inline;
+    text-decoration:none;
+    display:inline;
=20
=20
-  color:black;
+    color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  color:white;
-  background-color:darkblue;
+    text-decoration:none;
+    display:inline;
+    color:white;
+    background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-  font-size:90%;
-  text-decoration:none;
-  display:inline;
-  color:blue;
+    text-decoration:none;
+    display:inline;
+    color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:darkblue;
-  color:white;
+    text-decoration:none;
+    display:inline;
+    background-color:darkblue;
+    color:white;
=20
=20
 }
 div.redcontent input.text {
-   font-family:verdana,sans-serif,helvetica;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  background-color:orange;
-  border-width:1px;
-  color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    background-color:orange;
+    border-width:1px;
+    color:blue;
 }
 div.content input.text {
-   font-family:verdana,sans-serif,helvetica;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  border-width:1px;
-  background-color:orange;
-  color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    border-width:1px;
+    background-color:orange;
+    color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.content input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.redcontent textarea:focus {
-background-color: orange;
+    background-color: orange;
 }
 .document {
-color: #1a207d;
-border-collapse:collapse;
+    color: #1a207d;
+    border-collapse:collapse;
 }
-a.document{
-  font-size:100%;
-  text-decoration:none;
-  display:block;
+div.content a.document, a.document{
+/*    font-size:0.75em;;*/
+    text-decoration:underline;
+    display:block;
 }
 a.document:hover {
-  text-decoration:none;
-  display:block;
+    text-decoration:none;
+    display:block;
=20
=20
 }
 .input_text_ro {
-	   border:solid 1px blue;
-	   background:#EDEDED;
-	   color:blue;
-	margin:1px;
+    border:solid 1px blue;
+    background:#EDEDED;
+    color:blue;
+    margin:1px;
 }
 .input_text {
-	   border:groove 1px blue;
-	margin:1px;
+    border:groove 1px blue;
+    margin:1px;
 }
 .input_text:hover {
-	border:groove 1px blue;
-	margin:1px;
-	background-color: orange;
+    border:groove 1px blue;
+    margin:1px;
+    background-color: orange;
 }
 h1.legend, legend {
-font-weight: bold;
-font-style: italic;
-font-size: 120% ;
+    font-weight: bold;
+    font-style: italic;
+    font-size: 1.2em ;
=20
 }
 fieldset fieldset legend {
-	 font-size:120%;
-	 color:grey;
-	 }
+    font-size:0.87em;
+    color:grey;
+}
 select {
-border: 1px solid blue;
-margin:2px;
-background-color:white;
+    border: 1px solid blue;
+    margin:2px;
+    background-color:white;
=20
 }
=20
=20
=20
 .infobulle {
-	   position:absolute;
-	   border:1px solid black;
-	   background-color:yellow;
-	   padding-bottom: 10;
-	   padding-top: 10;
-	   padding-left: 10;
-	   padding-right: 10;
-	   color:black;
-	   top:0;left:0;
-	   visibility:hidden;
-	   width:25em;
-		z-index:20;
+    position:absolute;
+    border:1px solid black;
+    background-color:yellow;
+    padding-bottom: 10;
+    padding-top: 10;
+    padding-left: 10;
+    padding-right: 10;
+    color:black;
+    top:0;left:0;
+    visibility:hidden;
+    width:25em;
+    z-index:20;
 }
=20
 span.action {
-	height:3em;
+    height:3em;
=20
 }
 td.num {
-	text-align:right;
+    text-align:right;
 }
 tr.priority1 {
-	background-color: coral;
-	}
+    background-color: coral;
+}
 span.action a.action {
-  border:2px outset ;
-  padding-left: 3px;
-  padding-right:3px;
-  text-decoration:none;
-  font-size:120%;
+    border:2px outset ;
+    padding-left: 3px;
+    padding-right:3px;
+    text-decoration:none;
+    font-size:0.87em;
=20
-  display:inline;
-  color:black;
-  background-color:lightgrey;
+    display:inline;
+    color:black;
+    background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:lightblue;
-  color:black;
+    text-decoration:none;
+    display:inline;
+    background-color:lightblue;
+    color:black;
 }
 div.popup_back{
-	position:absolute;
-	top:0px;
-	left:0px;
-	opacity:0.6;
-	width:100%;
-	height:100%;
-	z-index:1;
-	/*background-color:lightgrey;*/
+    position:absolute;
+    top:0px;
+    left:0px;
+    opacity:0.6;
+    width:100%;
+    height:100%;
+    z-index:1;
+    /*background-color:lightgrey;*/
=20
-	display:none;
+    display:none;
 }
=20
 div.popup_border_title {
-	position:absolute;
-	top:20%;
-	left:10%;
-	width:60%;
-	height:80%;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 2px outset #201e87;
-	background-color:#879ED4;
-	font-size: 100% ;
-	font-family: verdana,sans-serif,helvetica;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/
-	color: white;
-	display:none;
-	/*opacity:1;
-	filter:alpha(opacity=3D100);*/
+    position:absolute;
+    top:20%;
+    left:10%;
+    width:60%;
+    height:80%;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 2px outset #201e87;
+    background-color:#879ED4;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    /*border-bottom: 2px solid #201e87;*/
+    color: white;
+    display:none;
+    /*opacity:1;
+    filter:alpha(opacity=3D100);*/
=20
-	}
+}
 div.popup_border_notitle {
-	position:absolute;
-	top:20%;
-	left:20%;
-	width:60%;
-	height:80% ;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 3px outset #201e87;
-	background-color: #879ED4;
-	font-family: verdana,sans-serif,helvetica;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	display:none;
-	color: white;
-	/*opacity:0.7;
-	filter:alpha(opacity=3D70);
-	*/
-	}
+    position:absolute;
+    top:20%;
+    left:20%;
+    width:60%;
+    height:80% ;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 3px outset #201e87;
+    background-color: #879ED4;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    display:none;
+    color: white;
+    /*opacity:0.7;
+    filter:alpha(opacity=3D70);
+    */
+}
=20
 div.popup_content {
-	position:absolute;
-	top:16;
-	bottom:0;
-	left:0;
-	right:0;
-	width:100%;
-	height:96%;
-	overflow: auto;
-	background-color:#DFE7FF;
-	font-size:90% ;
-	font-family: verdana,sans-serif,helvetica;
-	font-style: normal;
-	font-weight: normal;
-	color: black;
-	text-align: left;
-	display:none;
-	z-index:10;
-	/*opacity:1;
-	filter:alpha(opacity=3D100);*/
+    position:absolute;
+    top:16;
+    bottom:0;
+    left:0;
+    right:0;
+    width:100%;
+    height:96%;
+    overflow: auto;
+    background-color:#DFE7FF;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: normal;
+    font-weight: normal;
+    color: black;
+    text-align: left;
+    display:none;
+    z-index:10;
+    /*opacity:1;
+    filter:alpha(opacity=3D100);*/
 }
 div.autocomplete {
-  position:relative;
-  background-color:white;
-  border:1px solid #888;
-  margin:0;
-  padding:0;
-  text-align:left;
-  font-size:100%;
-
+    position:relative;
+    background-color:white;
+    border:1px solid #888;
+    margin:0;
+    padding:0;
+    text-align:left;
 }
 div.autocomplete em {
-	color:blue;
-	font-weight:bold;
+    color:blue;
+    font-weight:bold;
 }
 div.autocomplete ul {
-  list-style-type:none;
-  background-color:white;
-  border:1px solid #888;
-  width:375px;
-  margin:0;
-  padding:0;
+    list-style-type:none;
+    background-color:white;
+    border:1px solid #888;
+    width:375px;
+    margin:0;
+    padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
-  list-style-type:none;
-  display:block;
-  margin:0;
-  padding:0px;
-  /*height:32px;*/
-  cursor:pointer;
+    list-style-type:none;
+    display:block;
+    margin:0;
+    padding:0px;
+    /*height:32px;*/
+    cursor:pointer;
 }
-span.informal{ font-size:95%; color:black;}
+span.informal{=20
+    color:black;
+}
=20
 ul.select_table  {
-	/*padding:5px;*/
-	overflow:hidden;
-	}
+    /*padding:5px;*/
+    overflow:hidden;
+}
 ul.select_table a{
-	width:100%;
-	display:block;
-	background-color:inherit;
-	color: black;
-	text-decoration:none;
-	}
+    width:100%;
+    display:block;
+    background-color:inherit;
+    color: black;
+    text-decoration:none;
+}
 ul.select_table a:hover{
-	background-color:white;
-	color:black;
-	/*text-decoration:underline;*/
-	}
+    background-color:white;
+    color:black;
+    /*text-decoration:underline;*/
+}
 ul.select_table li {
-	display:table-row;
-	list-style-type: none;
-	}
+    display:table-row;
+    list-style-type: none;
+}
 ul.select_table li span {
-	display:table-cell;
-	width:25em;
-	margin: 0px;
-	padding:  0px;
+    display:table-cell;
+    width:25em;
+    margin: 0px;
+    padding:  0px;
 }
=20
 div.pc_calendar{
=20
-		float:left;
+    float:left;
=20
-		}
+}
 div.pc_calendar table {
-	text-align:center;
+    text-align:center;
=20
 }
 div.pc_calendar tr{
-	height:40;
+    font-size:0.87em;
+}
+div.pc_calendar tr{
+    height:40;
=20
=20
 }
 div.pc_calendar td{
-	width:14%;
-	border:#879ed4 solid 1px;
+    width:14%;
+    border:#879ed4 solid 1px;
 }
=20
 div.pc_calendar td.weekend {
-	background-color:#cce0e6;
+    background-color:#cce0e6;
=20
 }
 div.pc_calendar td.workday{
-	background-color:inherit;
-
-
+    background-color:inherit;
 }
 div.pc_calendar span.day{
-	font-weight: bold;
-	display:block;
+    font-weight: bold;
+    display:block;
=20
 }
 div.pc_calendar span.event{
-	font-weight: bolder;
+    font-weight: bolder;
=20
 }
 span.todo  {
-	text-align: left;
-	background-color:yellow;
+    text-align: left;
+    background-color:yellow;
=20
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
--moz-user-focus:ignore;
--moz-user-input:disabled;
-background-color:lightgrey;
-color:black;
-cursor:inherit;
+    -moz-user-focus:ignore;
+    -moz-user-input:disabled;
+    background-color:lightgrey;
+    color:black;
+    cursor:inherit;
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:90%;
-	color:white;
-	font-weight: bold;
+    color:white;
+    font-weight: bold;
+    font-size:0.87em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
=20
-	text-decoration:none;
-	font-family: verdana,sans-serif,helvetica;
-	background-image: url("image/bg-submit2.gif");
-	background-repeat: repeat-x;
-	background-position: left;
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0px;
+    padding:8px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
=20
-	border-style:  outset ;
-	border-color:  blue ;
-	border-width:0;
-	padding-bottom: 4;
-	padding-top: 4;
-	padding-right: 6;
-	padding-left:  6;
-	margin-top:3px;
-	cursor:pointer;
-	margin:1 2 1 2;
-        border-radius: 4px;
-	moz-border-radius:4px;
-
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
-	cursor:pointer;
-	background-color:white;
-	border-style:  inset ;
-	color:red;
-	margin:1 2 1 2;
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
=20
-	}
-	td.tool {
-	border: solid 1px gray;
-	background-color: white;
-	border-bottom-width: 2px;
-	}
+}
+a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutt=
on {
+    color:white;
+    font-weight: bold;
+    font-size:0.75em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
+
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0;
+    padding-bottom: 3px;
+    padding-top: 3px;
+    padding-right: 3px;
+    padding-left:  3px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+
+}
+a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.co=
ntent a.smallbutton:hover  {
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
+
+}
+td.tool {
+    border: solid 1px gray;
+    background-color: white;
+    border-bottom-width: 2px;
+    text-align:center;
+}
 div.topmenu {
-	margin-top:2px;
+
 }
=20
-h2.dossier {
-	color:darkblue;
-	font-style: italic;
-	display:inline;
-	font-size:120%;
-	margin:0px;
-	padding:0px;
-	font-variant:small-caps;
+#dossier h2{
+    color:darkblue;
+    display:inline;
+    font-size:2em;
+    margin:0px;
+    padding:0px;
+    font-variant:small-caps;
 }
 /* </style> */
-div.add_todo_list {
-                    border:1px solid blue;
-                    display:none;
-                    background-color:#BFD0FF;
-                    padding:3;
-                    position:absolute;
-                    text-align:left;
-                    line-height:3em;
-                    z-index:1;
-                    width:345px;
-                }
+#add_todo_list {
+    border:1px solid blue;
+    display:none;
+    background-color:#BFD0FF;
+    padding:0.0015%;
+    position:absolute;
+    text-align:left;
+    z-index:1;
+    width:17.9687%;
+}
 div.welcome {
=20
 }
 div.gest_name {
-	float:left;
-	margin-left:150;
-	margin-top:15
+    float:left;
+    margin-left:150;
+    margin-top:15
 }
 h2.gest_name {
-	border-left: 5px solid  #403a8d;
-	border-bottom:1px solid  #b4bbc2;
-		border-top:1px solid  #b4bbc2;
-		border-right:1px solid  #b4bbc2;
-	padding: 5px;
-	width: 40%;
+    border-left: 5px solid  #403a8d;
+    border-bottom:1px solid  #b4bbc2;
+    border-top:1px solid  #b4bbc2;
+    border-right:1px solid  #b4bbc2;
+    padding: 5px;
+    width: 40%;
 }
 body.op_detail_frame,div.op_detail_frame  {
-  background-color:#e4e7ed;
-  height:100%; width:100%;
+    background-color:#e4e7ed;
+    height:100%; width:100%;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
=20
=20
 }
 div.inner_box  {
-  background-color:#e4e7ed;
- font-size:100%;
-  font-family:verdana,sans-serif,helvetica;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:3;
-
-position:absolute;
-left:10%;
-
-
-border:1px solid darkblue;
-
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:10%;
+    border:1px solid darkblue;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
 div.op_detail_title {
-	background-color:grey;
-/*	width:500;*/
+    background-color:grey;
+    /*	width:500;*/
=20
=20
 }
 div#div_jrn{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-		      background-color:#EDF3FF;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
=20
 }
- div#div_cat{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-             background-color:#EDF3FF;
+div#div_cat{
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
=20
 }
=20
@@ -942,218 +980,372 @@
=20
 div#search_form
 {
-              position:absolute;
-              border:1px solid black;
-              top:15%;left:100px;
-              margin-left:25%;
-              z-index:2;
-              width:50%;
-              display:none;
-	      background-color:#e4e7ed;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100px;
+    margin-left:25%;
+    z-index:2;
+    width:50%;
+    display:none;
+    background-color:#e4e7ed;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
=20
 table.sortable td, table.table_large td, table.result td
 {
-	padding-left:5px;
-	padding-right:5px;
+    padding-left:5px;
+    padding-right:5px;
 }
 table.info_op
 {
-	font-size:100%;
-	width:100%;
+    width:100%;
 }
 table.info_op tr
 {
-font-size:120%;
-background:white;
+    background:white;
 }
 h2#jrn_name
 {
-	color:blue;
-	font-size:120%;
-	margin-right:30%;
-	float: right;
-
+    color:blue;
+    font-size:2.74em;
+    margin-right:30%;
+    float: right;
 }
 tr.footer{
-	font-size:120%;
-	font-style: italic;
-	font-weight: bold;
+    font-size:0.87em;
+    font-style: italic;
+    font-weight: bold;
=20
 }
 span.remain {
-	font-weight: bold;
-	color:black;
-	}
+    font-weight: bold;
+    color:black;
+}
=20
 div#jrn_name_div
 {
-	float: right;
-	margin-right:150;
+    float: right;
+    margin-right:150;
=20
=20
 }
 #predef_form {
-	margin-left:20%;
-	width:60%;
-
+    margin-left:20%;
+    width:60%;
+    position: absolute;
 }
 #direct
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
+    font-size:0.87em;;
 }
 #calc
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
 }
 div#wait_box
 {
-  background-color:#F1E6E6;
- font-size:120%;
-  font-family: verdana,helvetica,arial,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:10;
+    background-color:#F1E6E6;
+    font-size:0.87em;
+    font-family: arial,verdana,helvetica,arial,sans-serif;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:10;
=20
-position:absolute;
-left:30%;
-top:30%;
+    position:absolute;
+    left:30%;
+    top:30%;
=20
=20
-border:1px solid darkblue;
+    border:1px solid darkblue;
=20
 }
 #wait_box h2
 {
-color:black;
-text-align:center;
+    color:black;
+    text-align:center;
 }
 div#div_jrnsearch_op{
=20
-              border:1px solid black;
-              display:none;
-              width:50em;
-		      background-color:#EDF3FF;
-			  position:absolute;
-			  z-index: 5;
+    border:1px solid black;
+    display:none;
+    width:50em;
+    background-color:#EDF3FF;
+    position:absolute;
+    z-index: 5;
=20
 }
 ul {
-	padding-left: 110px;
+    padding-left: 110px;
 }
 a.line,div.content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
- color: #0000ff;
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
-  color: #0000ff;
-     background-color: rgb(93, 144, 205);
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
+    background-color: rgb(93, 144, 205);
 }
 #close_div
 {
- background-color:white;
- color:blue;
- text-decoration:none;
- border:1px solid blue;
- margin-left: 2px;
- margin-right:2px;
- margin-top:0px;
- font-size:90%;
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:2px;
+    margin-top:0px;
+    font-size:0.90em;
 }
 #close_div:hover
 {
-	background-color: orange;
+    background-color: orange;
 }
+#popmeout
+{
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:18px;
+    font-size:0.90em;
+}
+#popmeout:hover
+{
+    background-color: orange;
+}
 table.table_large tr.odd ,table.table_large tr.even {
=20
-	height:32px;
+    height:32px;
 }
 #calc1
 {
-	position:absolute;
-	display:block;
-	top:30px;
-	left:150px;
-	width:300px;
-	border:1px solid black;
-	background-color:#aec3e8;
-	font-size:120%;
-	padding: 20px 20px;
+    position:absolute;
+    display:block;
+    top:30px;
+    left:150px;
+    width:300px;
+    border:1px solid black;
+    background-color:#aec3e8;
+    font-size:0.87em;
+    padding: 20px 20px;
 }
 span.invoice
 {
-    font-size: 120%;
+    font-size: 1.2em;
     font-style: italic;
     display:block;
     margin: 20px;
     font-weight: bold;
 }
 a.nav,div.content a.nav,div.redcontent a.nav {
-	display:inline;
-	text-decoration:none;
-	font-size:100%;
+    display:inline;
+    text-decoration:none;
+    font-size:0.75em;;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
-	display:inline;
-	text-decoration:none;
-	background-color:darkblue;
-	color:white;
-	font-size:100%;
+    display:inline;
+    text-decoration:none;
+    background-color:darkblue;
+    color:white;
+    font-size:0.75em;;
 }
 #dossier {
-	display:inline;
-	float:left;
-	width:40em;
-	top:0px;
+    display:inline;
+    float:left;
+    width:100%;
+    top:0px;
+    text-align: center;
 }
 div.foldercontent {
-	padding:20px 30px 0px 40px;
-	}
+    padding:20px 30px 0px 40px;
+}
=20
 h1.title {
-	color: blue;
-	font-size:120%;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    font-style: italic;
 }
 h2.title {
-	color: blue;
-	font-size:120%;
-	font-weight:bold;
-	font-style: italic;
-	margin-left: 15px;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0.24%;
+    border:1px solid darkblue;
+
 }
 h3.title {
-	color: blue;
-	font-size:120%;
-	margin-left: 30px;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 30px;
 }
 h4.title {
-	color: blue;
-	font-size:120%;
-	margin-left: 45px;
-	text-decoration: underline;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: underline;
 }
 h5.title {
-	color: blue;
-	font-size:120%;
-	margin-left: 45px;
-	text-decoration: none;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: none;
+    font-style: italic;
 }
 div.myfieldset
 {
-	margin-top: 5px;
-	margin-left:5px;
-	margin-right: 5px;
-	border:lightgrey 2px groove;
+    margin-top: 5px;
+    margin-left:5px;
+    margin-right: 5px;
+    border:lightgrey 2px groove;
 }
+#info_div {
+    display:none;
+    background-color: yellow;
+    color:black;
+    z-index: 15;
+    position: absolute;
+    top:0;
+    left:45%;
+}
+div.menu2 a.mtitle{
+   =20
+}
+div.menu3 {
+   =20
+}
+#go_submit_id {
+//    font-size:1.25em;
+}
+.decale {
+    margin-left:30px;
+}
+#folder {
+    font-size:1.4em;
+    width:auto;
+    border-width:0px;
+    border-collapse:collapse;
+   =20
+   =20
+}
+/*#folder tr.odd,#folder tr.even {
+    font-size : 1.2em;
+}*/
+textarea.itextarea{
+    border:solid blue 1px;
+    width:90%;
+    margin-left:5%;
+}
+div#modele_op_div{
+    display: none;
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:30%;
+    width:40%;
+    border:1px solid darkblue;
+}
+div#notice {
+    position:absolute;
+    right:5%;
+    top:200px;
+    background-color:yellow;
+    border: 1px solid black;
+}
+div.name  {
+    position:absolute;
+    top:0px;
+    left:0px;
+}
+div#box_search_card {
+    position:absolute;
+    right:15.625%;
+    top:115px;
+}
+div.bxbutton
+{
+    float:right;
+    height:10px;
+    display:block;
+    margin-top:0.48%;
+    margin-right:0.48%;
+}
+div.inner_box tr.odd {
+    background:  #CBD9F4;
+}
+#modele_op_tab tr.odd {
+    background:  #CBD9F4;
+}
+div#bookmark_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+   border:1px solid darkblue;
+   top:2em;
+   left:30%;
+   width:40%;
+}
+div#preference_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    border:1px solid darkblue;
+    top:2em;
+    left:20%;
+    width:50%;
+}
+#error_div{
+    position:absolute;
+    border:1px solid black;
+    background-color:whitesmoke;
+    padding-bottom: 2px;
+    padding-top: 2px;
+    padding-left: 2px;
+    padding-right: 2px;
+    color:red;
+    top:40%;left:25%;
+    visibility:hidden;
+    width:40em;
+    z-index:20;
+}
+#error_div h2 {
+    background: red;
+}
+div#error_content_div {
+   font-size: 1.2em;
+   color:error;
+   font-weight: bold;
+   text-align: center;
+}
+td.workday ol {
+	margin:0px;
+	padding:0px;
+	list-style-type:none;
+	text-align:left;
+}

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2013-10-03 10:56:13 UTC (rev 546=
2)
+++ phpcompta/trunk/html/style-light.css	2013-10-04 14:57:53 UTC (rev 546=
3)
@@ -1,402 +1,427 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-	background-color:#EDF3FF;
-	font-size:12px;
-	font-family:verdana,helvetica,sans-serif;
-	padding: 0px 0px 0px 0px ;
-	margin:0;
-	color:blue;
+    background-color:#EDF3FF;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding: 0px 0px 0px 0px ;
+    margin:0;
+    color:black;
+    font-size:0.85em;
 }
 .notice {
-	background: white;
-	color:red;
-	font-style: italic;
+    color:red;
+    font-style: italic;
 }
=20
 table.sortable, table.table_large, table.result  ,table.resultfooter {
-	color:blue;
-	/* border:blue solid 1px; */
-	width:100%;
-	border-spacing:  0px;
-	border-collapse:collapse;
+    color:blue;
+    /* border:blue solid 1px; */
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
=20
 }
 table.resultfooter tfoot {
-	font-size:110%;
-	font-weight: bold;
+    font-weight: bold;
+
+
 }
+table.sortable th,  table.table_large th,table.result th {
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:1px solid blue;
+    border-top:0;
+    font-size:0.75em;;
=20
-table.table_large th,table.result th ,table.sortable th{
-	font-weight:bold;
-	font-family:verdana,helvetica,sans-serif;
-	border-bottom:1px solid blue;
-	border-top:0;
+    color:#25238F;
+    text-align: left;
+    font-style: italic;
=20
-	color:#25238F;
-	text-align: left;
-	font-style: italic;
-
 }
=20
 h2 {
-	font-family:verdana,helvetica,sans-serif;
-	font-size:14px;
-	color:grey;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:1.35em;
+    color:grey;
+    margin:1px;
+    padding:1px;
+    font-style: italic;
 }
 div.info {
-	background:#879ed4;
-	color:white;
-	font-size:120%;
-	text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
=20
 content h2.info {
-	background:#879ed4;
-	color:black;
-	font-size:14pt;
-	text-align:center;
-	padding:0px;
-	margin:0px;
+    background:#879ed4;
+    color:black;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 redcontent h2.info {
-	background:#879ed4;
-	color:white;
-	font-size:14pt;
-	text-align:center;
-	padding:0px;
-	margin:0px;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 h2.info {
-	background-color:#C6C6D1;
-	color:white;
-	font-size:14px;
-	text-align:center;
-	padding:0px;
-	margin:0px;
-	border:1px solid grey;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0px;
+    margin:0px;
=20
 }
-table h2.info
-{
-	font-variant: small-caps;
-	background-color: inherit;
-	color:darkblue;
-}
+
+
 h3.info {
-	background:#879ed4;
-	color:white;
-	font-size:12px;
-	text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:0.87em;
+    text-align:center;
 }
=20
 h2.info2 {
-	color:blue;
-	font-size:14px;
-	text-align:center;
+    color:blue;
+    font-size:1em;;
+    text-align:center;
=20
 }
=20
=20
 h2.error {
-	background:red;
-	color:white;
-	font-size:14px;
+    background:red;
+    color:white;
+    font-size:0.87em;
 }
=20
+
 div.u_tmenu {
-	margin-top:0px;
-	width:100%;
-	/* background-color:#879ED4; */
+    margin-top:0px;
+    width:100%;
+    /* background-color:#879ED4; */
=20
=20
 }
 div.u_subtmenu {
-	background-color:white	;
-	float:left;
-	clear:both;
-	left:10px;
+    background-color:white	;
+    float:left;
+    clear:both;
+    left:10px;
=20
 }
 div.u_tmenu div.u_tool {
-	float:left;
+    float:left;
=20
 }
 div.u_tool {
-	float:left;
-	width:  100%;
+    float:left;
+    width:  100%;
+    padding-bottom: 20px;
 }
-div.u_tool div.name {
-	float:left;
-	margin-left:10px;
+div.u_tool #name {
+    float:left;
+    margin-left:10px;
 }
-div.u_tool {
-	float:right;
-	margin-right:10px;
+#u_tool {
+    float:right;
+    margin-right:10px;
 }
-div.module {
-	position:absolute;
-	top:0px;
-	right:5px;
-	text-align:right;
-	padding:0px;
-	margin: 0px;
+td.tool a.mtitle {
+    text-decoration:none;
+    display:inline;
+    color: blue;
+    font-size:0.75em;
+   =20
 }
+td.tool a.mtitle:hover {
+    text-decoration:none;
+    display:inline;
+    font-size:0.75em;;
+    color: darkblue;
+    background-color:#5D90CD;
+
+}
+#top {
+    float:left;
+    margin-bottom: 0.9512%;
+    width: 100%;
+}
+#module {
+    position:absolute;
+    top:0px;
+    right:5px;
+    text-align:right;
+    padding:0px;
+    margin: 0px;
+}
 div.u_subt2menu {
-	background-color:lightgrey;
-	left:1%;
+    background-color:lightgrey;
+    left:1%;
=20
 }
 div.lmenu {
-	float:left;
-	clear:left;
-	font-size:9px;
+    float:left;
+    clear:left;
+    font-size:0.75em;;
=20
 }
 div.lextmenu {
=20
-	float:left;
-	font-family:verdana,helvetica,sans-serif;
-	font-size:9px;
+    float:left;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:0.75em;;
=20
 }
 div.searchmenu {
-	left:30px;
-	width:95px;
-	top:100px;
-	position:absolute;
+    left:30px;
+    width:95px;
+    top:100px;
+    position:absolute;
=20
 }
=20
 div.recherche_form{
-	width:700px;
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
-	border-style:outset;
-	border-width:1px;
+    width:700px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-style:outset;
+    border-width:1px;
=20
 }
 div.redcontent{
=20
-	float:left;
-	padding-top:7px;
-	padding-left:8px;
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
-	width:75%;
+    float:left;
+    padding-top:7px;
+    padding-left:8px;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
+    width:75%;
=20
 }
 div.content{
+    padding-top:0.0030%;
+    margin-top:0.0030%;
+    width:100%;
+    font-family:arial,verdana,sans-serif,helvetica;
=20
-	padding-top:7px;
-	width:100%;
-	font-family:verdana,helvetica,sans-serif;
+
 }
 div.content30{
=20
-	float:left;
-	padding-top:7px;
-	width:35%;
-	font-family:verdana,helvetica,sans-serif;
+    float:left;
+    padding-top:7px;
+    width:35%;
+    font-family:arial,verdana,sans-serif,helvetica;
=20
 }
 div.no span{
-	position:static;
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:bold;
-	color:red;
+    position:static;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:bold;
+    color:red;
=20
 }
=20
 table.document {
-	color:blue;
-	width:100%;
-	border-spacing:  0px;
-	border-collapse:collapse;
+    color:blue;
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
=20
 }
 table.document th{
-	font-weight:bold;
-	font-family:verdana,helvetica,sans-serif;
-	border-bottom:2px solid blue;
-	border-top:0;
-	color:#25238F;
-	text-align: left;
-	background-color:#EDF3FF;
-	font-style: italic;
+    font-weight:bold;
+    font-family:arial,verdana,sans-serif,helvetica;
+    border-bottom:2px solid blue;
+    border-top:0;
+    color:#25238F;
+    text-align: left;
+    background-color:#EDF3FF;
+    font-style: italic;
 }
 .error {
-	width:60%;
-	margin-left:20%;
-	text-align: center;
+    width:60%;
+    margin-left:20%;
+    text-align: center;
=20
-	color:white;
-	background-color:red;
-	font-weight: bolder;
-	font-size:120%;
+    color:white;
+    background-color:red;
+    font-weight: bolder;
+    font-size:0.87em;
 }
=20
 table.mtitle {
-	border:0;
-	text-align:center
+    border:0;
+    text-align:center
 }
 td.mshort {
-	height:15px;
-	width:60px;
-	text-align:center;
-	border:  1px solid;
-	color:#5D90CD ;
-	background-color:#DDE6FF;
+    height:15px;
+    width:60px;
+    text-align:center;
+    border:  1px solid;
+    color:#5D90CD ;
+    background-color:#DDE6FF;
 }
 td.mtitle {
-	text-align:center;
-	width:95px;
-	height :30px;
-	font-size:10px;
+    text-align:center;
+    width:95px;
+    height :30px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
 }
 td.msubtitle {
-	text-align:center;
-	height:20px;
-	font-size:10px;
+    text-align:center;
+    height:20px;
+    font-size:0.75em;;
     background-color:#DDE6FF;
 }
 span.mtitle {
-	color:gray;
-	background-color:blue;
-	font-size:10px;
-	border-style:groove
+    color:gray;
+    background-color:blue;
+    font-size:0.75em;;
+    border-style:groove
 }
 span.odd {
-	background-color:#ECF3FF;
-	display:block;
+    background-color:#ECF3FF;
+    display:block;
 }
 span.even {
-	background-color:#DDE6FF;
-	display:block;
+    background-color:#DDE6FF;
+    display:block;
 }
=20
 tr.odd {
-	background-color:#DDE6FF;
-	font-size:10px;
+    background-color:#DDE6FF;
+    font-size:0.87em;;
 }
-tr {
-	font-size:10px;
+tr.highlight {
+    /* background-color:whitesmoke; */
+    font-size:0.87em;
+    font-weight: bold;
 }
+tr.even {
+  font-size:0.87em;;
+}
 td.odd{
-	background-color:#DDE6FF ;
-	font-size:10px;
+    background-color:#DDE6FF ;
 }
 td.even{
-	border:0px;
-	font-size:10px;
+    border:0px;
 }
 td.cell{
-	height:32px;
-	padding: 1px;
+    height:32px;
+    padding: 1px;
+   =20
 }
 td.selectedcell{
-	border-style:inset;
-	border-color:blue;
-	border-width:1pt ;
-	font-size:10px;
-	background:#5D90CD ;
-	color:white;
-	text-align:center;
-	width:120px;
+    border-style:inset;
+    border-color:blue;
+    border-width:1pt ;
+    font-size:1.2em;
+    font-weight: bold;
+    background:#5D90CD ;
+    color:white;
+    text-align:center;
+    width:120px;
+    border-radius:5px;
 }
 a.mtitle {
-	font-size:10px;
-	text-decoration:none;
-	display:inline;
-	color: blue;
-
+    text-decoration:none;
+    display:inline;
 }
 a.mtitle:hover {
-	font-size:10px;
-	text-decoration:none;
-	display:inline;
-	color: darkblue;
-	background-color:#5D90CD;
+    text-decoration:none;
+    display:inline;
=20
+    color: darkblue;
+    background-color:#5D90CD;
+
 }
-td.selectedcell a.mtitle {
-	font-size:1em;
-	text-decoration:none;
-	display:block;
-	color:lightgrey;
+td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color:white;
 }
 a.dossier {
-	font-size:10px;
-	text-decoration:none;
-	display:block;
-	color: #202267;
+    font-size:0.75em;;
+    text-decoration:none;
+    display:block;
+    color: #202267;
=20
 }
 tr.odd:hover td
 {
-	text-decoration:none;
-	background-color: #a9d6e4;
-	color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 tr.even:hover td
 {
-	text-decoration:none;
-	background-color: #a9d6e4;
-	color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-	background-color:#a9d6e4;
-	color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-	background-color:#a9d6e4;
-	color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 a.cell {
-	text-decoration:none;
-	display:block;
-	color:blue;
-	background-color:white;
-	font-size:9px;
+    text-decoration:none;
+    display:block;
+    color:blue;
+    background-color:white;
+    font-size:0.75em;;
 }
=20
 a.cell:hover {
-	font-size:9px;
-	color:white;
-	background-color:#5D90CD;
-	text-decoration:none;
-	display:block;
+    font-size:0.75em;;
+    color:white;
+    background-color:#5D90CD;
+    text-decoration:none;
+    display:block;
 }
=20
=20
 a.one:link {
-	text-decoration:none;
-	color:#3010FF
+    text-decoration:none;
+    color:#3010FF
 }
 a.one:visited {
-	text-decoration:none;
-	color:#3010FF
+    text-decoration:none;
+    color:#3010FF
 }
=20
 a.one:active {
-	background: #0000FF;
+    background: #0000FF;
 }
=20
 a.one:hover {
-	text-decoration:underline;
-	background:#3010FF;
-	color:#FFFFFF;
+    text-decoration:underline;
+    background:#3010FF;
+    color:#FFFFFF;
 }
=20
=20
 a.detail
 {
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
+    font-size:0.87em;;
+    font-family:arial,verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -404,8 +429,8 @@
=20
 a.detail:hover
 {
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
+/*    font-size:0.75em;; */
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -413,19 +438,19 @@
 }
=20
 li.menuv,ol.menuv {
-	display:inline;
-	padding:1em 1em;
+    display:inline;
+    padding:1em 1em;
 }
 div.redcontent a {
-	font-family:verdana,helvetica,sans-serif;
-	text-decoration: none;
-	display: block;
-	color: blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
=20
 }
=20
 div.redcontent a:hover {
-	font-family:verdana,helvetica,sans-serif;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -433,17 +458,17 @@
=20
 }
 div.content a {
-	font-family:verdana,helvetica,sans-serif;
-	text-decoration: none;
-	display: block;
-	color: blue;
-	padding: 0;
+    font-family:arial,verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
+    padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-	font-family:verdana,helvetica,sans-serif;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -452,481 +477,500 @@
 }
=20
 div.redcontent a.mtitle {
-	text-decoration:none;
-	display:inline;
+    text-decoration:none;
+    display:inline;
=20
=20
-	color:black;
+    color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-	text-decoration:none;
-	display:inline;
-	color:white;
-	background-color:darkblue;
+    text-decoration:none;
+    display:inline;
+    color:white;
+    background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-	font-size:10px;
-	text-decoration:none;
-	display:inline;
-	color:blue;
+    text-decoration:none;
+    display:inline;
+    color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-	text-decoration:none;
-	display:inline;
-	background-color:darkblue;
-	color:white;
+    text-decoration:none;
+    display:inline;
+    background-color:darkblue;
+    color:white;
=20
=20
 }
 div.redcontent input.text {
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:normal;
-	border-color:336699;
-	border-style:solid;
-	background-color:orange;
-	border-width:1px;
-	color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    background-color:orange;
+    border-width:1px;
+    color:blue;
 }
 div.content input.text {
-	font-family:verdana,helvetica,sans-serif;
-	font-weight:normal;
-	border-color:336699;
-	border-style:solid;
-	border-width:1px;
-	background-color:orange;
-	color:blue;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    border-width:1px;
+    background-color:orange;
+    color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-	background-color:orange;
+    background-color:orange;
 }
 div.content input:focus {
-	background-color:orange;
+    background-color:orange;
 }
 div.redcontent textarea:focus {
-	background-color: orange;
+    background-color: orange;
 }
 .document {
-	color: #1a207d;
-	border-collapse:collapse;
+    color: #1a207d;
+    border-collapse:collapse;
 }
-a.document{
-	font-size:12px;
-	text-decoration:none;
-	display:block;
+div.content a.document, a.document{
+/*    font-size:0.75em;;*/
+    text-decoration:underline;
+    display:block;
 }
 a.document:hover {
-	text-decoration:none;
-	display:block;
+    text-decoration:none;
+    display:block;
=20
=20
 }
 .input_text_ro {
-	   border:solid 1px blue;
-	   background:#EDEDED;
-	margin:1px;
+    border:solid 1px blue;
+    background:#EDEDED;
+    color:blue;
+    margin:1px;
 }
 .input_text {
-	border:groove 1px blue;
-	margin:1px;
+    border:groove 1px blue;
+    margin:1px;
 }
 .input_text:hover {
-	border:groove 1px blue;
-	margin:1px;
-	background-color: orange;
+    border:groove 1px blue;
+    margin:1px;
+    background-color: orange;
 }
 h1.legend, legend {
-	font-weight: bold;
-	font-style: italic;
-	font-size: 120% ;
+    font-weight: bold;
+    font-style: italic;
+    font-size: 1.2em ;
=20
 }
 fieldset fieldset legend {
-	font-size:110%;
-	color:grey;
+    font-size:0.87em;
+    color:grey;
 }
 select {
-	border: 1px solid blue;
-	margin:2px;
-	background-color:white;
+    border: 1px solid blue;
+    margin:2px;
+    background-color:white;
=20
-
 }
=20
=20
=20
 .infobulle {
-	position:absolute;
-	border:1px solid black;
-	background-color:yellow;
-	padding-bottom: 10;
-	padding-top: 10;
-	padding-left: 10;
-	padding-right: 10;
-	color:black;
-	top:0;left:0;
-	visibility:hidden;
-	width:25em;
-	z-index:20;
+    position:absolute;
+    border:1px solid black;
+    background-color:yellow;
+    padding-bottom: 10;
+    padding-top: 10;
+    padding-left: 10;
+    padding-right: 10;
+    color:black;
+    top:0;left:0;
+    visibility:hidden;
+    width:25em;
+    z-index:20;
 }
=20
 span.action {
-	height:3em;
+    height:3em;
=20
 }
 td.num {
-	text-align:right;
+    text-align:right;
 }
 tr.priority1 {
-	background-color:red;
+    background-color: coral;
 }
 span.action a.action {
-	border:2px outset ;
-	padding-left: 3px;
-	padding-right:3px;
-	text-decoration:none;
-	font-size:14px;
+    border:2px outset ;
+    padding-left: 3px;
+    padding-right:3px;
+    text-decoration:none;
+    font-size:0.87em;
=20
-	display:inline;
-	color:black;
-	background-color:lightgrey;
+    display:inline;
+    color:black;
+    background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-	text-decoration:none;
-	display:inline;
-	background-color:lightblue;
-	color:black;
+    text-decoration:none;
+    display:inline;
+    background-color:lightblue;
+    color:black;
 }
 div.popup_back{
-	position:absolute;
-	top:0px;
-	left:0px;
-	opacity:0.6;
-	width:100%;
-	height:100%;
-	z-index:1;
-	/*background-color:lightgrey;*/
+    position:absolute;
+    top:0px;
+    left:0px;
+    opacity:0.6;
+    width:100%;
+    height:100%;
+    z-index:1;
+    /*background-color:lightgrey;*/
=20
-	display:none;
+    display:none;
 }
=20
 div.popup_border_title {
-	position:absolute;
-	top:20%;
-	left:10%;
-	width:60%;
-	height:80%;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 2px outset #201e87;
-	background-color:#879ED4;
-	font-size: 110% ;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/
-	color: white;
-	display:none;
-	/*opacity:1;
-	filter:alpha(opacity=3D100);*/
+    position:absolute;
+    top:20%;
+    left:10%;
+    width:60%;
+    height:80%;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 2px outset #201e87;
+    background-color:#879ED4;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    /*border-bottom: 2px solid #201e87;*/
+    color: white;
+    display:none;
+    /*opacity:1;
+    filter:alpha(opacity=3D100);*/
=20
 }
 div.popup_border_notitle {
-	position:absolute;
-	top:20%;
-	left:20%;
-	width:60%;
-	height:80% ;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 3px outset #201e87;
-	background-color: #879ED4;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	display:none;
-	color: white;
-	/*opacity:0.7;
-	filter:alpha(opacity=3D70);
-	*/
+    position:absolute;
+    top:20%;
+    left:20%;
+    width:60%;
+    height:80% ;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 3px outset #201e87;
+    background-color: #879ED4;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    display:none;
+    color: white;
+    /*opacity:0.7;
+    filter:alpha(opacity=3D70);
+    */
 }
=20
 div.popup_content {
-	position:absolute;
-	top:16;
-	bottom:0;
-	left:0;
-	right:0;
-	width:100%;
-	height:96%;
-	overflow: auto;
-	background-color:#DFE7FF;
-	font-size:10px ;
-	font-family: verdana,helvetica,sans-serif;
-	font-style: normal;
-	font-weight: normal;
-	color: black;
-	text-align: left;
-	display:none;
-	z-index:10;
-	/*opacity:1;
-	filter:alpha(opacity=3D100);*/
+    position:absolute;
+    top:16;
+    bottom:0;
+    left:0;
+    right:0;
+    width:100%;
+    height:96%;
+    overflow: auto;
+    background-color:#DFE7FF;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
+    font-style: normal;
+    font-weight: normal;
+    color: black;
+    text-align: left;
+    display:none;
+    z-index:10;
+    /*opacity:1;
+    filter:alpha(opacity=3D100);*/
 }
 div.autocomplete {
-	position:relative;
-	background-color:white;
-	border:1px solid #888;
-	margin:0;
-	padding:0;
-	text-align:left;
-	font-size:12px;
-
+    position:relative;
+    background-color:white;
+    border:1px solid #888;
+    margin:0;
+    padding:0;
+    text-align:left;
 }
 div.autocomplete em {
-	color:blue;
-	font-weight:bold;
+    color:blue;
+    font-weight:bold;
 }
 div.autocomplete ul {
-	list-style-type:none;
-	background-color:white;
-	border:1px solid #888;
-	width:375px;
-	margin:0;
-	padding:0;
+    list-style-type:none;
+    background-color:white;
+    border:1px solid #888;
+    width:375px;
+    margin:0;
+    padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
-	list-style-type:none;
-	display:block;
-	margin:0;
-	padding:0px;
-	/*height:32px;*/
-	cursor:pointer;
+    list-style-type:none;
+    display:block;
+    margin:0;
+    padding:0px;
+    /*height:32px;*/
+    cursor:pointer;
 }
-span.informal{ font-size:95%; color:black;}
+span.informal{=20
+    color:black;
+}
=20
 ul.select_table  {
-	/*padding:5px;*/
-	overflow:hidden;
+    /*padding:5px;*/
+    overflow:hidden;
 }
 ul.select_table a{
-	width:100%;
-	display:block;
-	background-color:inherit;
-	color: black;
-	text-decoration:none;
+    width:100%;
+    display:block;
+    background-color:inherit;
+    color: black;
+    text-decoration:none;
 }
 ul.select_table a:hover{
-	background-color:white;
-	color:black;
-	/*text-decoration:underline;*/
+    background-color:white;
+    color:black;
+    /*text-decoration:underline;*/
 }
 ul.select_table li {
-	display:table-row;
-	list-style-type: none;
+    display:table-row;
+    list-style-type: none;
 }
 ul.select_table li span {
-	display:table-cell;
-	margin: 0px;
-	padding:  0px;
+    display:table-cell;
+    width:25em;
+    margin: 0px;
+    padding:  0px;
 }
=20
 div.pc_calendar{
=20
-	float:left;
+    float:left;
=20
 }
 div.pc_calendar table {
-	text-align:center;
+    text-align:center;
=20
 }
 div.pc_calendar tr{
-	height:40;
+    font-size:0.87em;
+}
+div.pc_calendar tr{
+    height:40;
=20
=20
 }
 div.pc_calendar td{
-	width:14%;
-	border:#879ed4 solid 1px;
+    width:14%;
+    border:#879ed4 solid 1px;
 }
=20
 div.pc_calendar td.weekend {
-	background-color:#cce0e6;
+    background-color:#cce0e6;
=20
 }
 div.pc_calendar td.workday{
-	background-color:inherit;
-
-
+    background-color:inherit;
 }
 div.pc_calendar span.day{
-	font-weight: bold;
-	display:block;
+    font-weight: bold;
+    display:block;
=20
 }
 div.pc_calendar span.event{
-	font-weight: bolder;
+    font-weight: bolder;
=20
 }
 span.todo  {
-	text-align: left;
-	background-color:yellow;
+    text-align: left;
+    background-color:yellow;
=20
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
-	-moz-user-focus:ignore;
-	-moz-user-input:disabled;
-background-color: teal;
-
-	color:black;
-	cursor:inherit;
+    -moz-user-focus:ignore;
+    -moz-user-input:disabled;
+    background-color:lightgrey;
+    color:black;
+    cursor:inherit;
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:10px;
-	color:white;
-	font-weight: bold;
-	border:1px black outset  ;
+    color:white;
+    font-weight: bold;
+    font-size:0.87em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
=20
-background-image: url("image/bg-submit3.gif");
-background-repeat: repeat-x;
-	background-position: left;
-	text-decoration:none;
-	font-family: arial,helvetica,sans-serif;
-	padding-bottom: 4px;
-	padding-top: 4px;
-	padding-right: 6px;
-	padding-left:  6px;
-	margin-top:3px;
-	margin-bottom:3px;
-	margin-right:3px;
-	margin-left:3px;
-	cursor:pointer;
-	font-size:1.1em;
-	    border-radius: 8px;
-	-moz-border-radius:8px;
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0px;
+    padding:8px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 5px;
+    moz-border-radius:5px;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
-	cursor:pointer;
-	color:#90f979;
-	margin-top:3px;
-	margin-bottom:3px;
-	margin-right:3px;
-	margin-left:3px;
-    border-radius: px;
-	-moz-border-radius:8px;
-border:1px #90f979 inset;
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
+
 }
+a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutt=
on {
+    color:white;
+    font-weight: bold;
+    font-size:0.75em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
+
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0;
+    padding-bottom: 3px;
+    padding-top: 3px;
+    padding-right: 3px;
+    padding-left:  3px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 2px;
+    moz-border-radius:2px;
+
+}
+a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.co=
ntent a.smallbutton:hover  {
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
+
+}
 td.tool {
-	border: solid 1px gray;
-	border-bottom-width: 3px;
+    border: solid 1px gray;
+    background-color: white;
+    border-bottom-width: 2px;
+    text-align:center;
+    border-radius:2px;
 }
 div.topmenu {
=20
-	width:100%;
-
 }
=20
-h2.dossier {
-	color:darkblue;
-	font-style: italic;
-	display:inline;
-
-	font-size:14px;
-	margin:0;
-	padding:0;
-	text-align:center;
+#dossier h2{
+    color:darkblue;
+    display:inline;
+    font-size:2em;
+    margin:0px;
+    padding:0px;
+    font-variant:small-caps;
 }
 /* </style> */
-div.add_todo_list {
-	border:1px solid blue;
-	display:none;
-	background-color:#BFD0FF;
-	padding:3;
-	position:absolute;
-	text-align:left;
-	line-height:3em;
-	z-index:1;
-        width:345px;
+#add_todo_list {
+    border:1px solid blue;
+    display:none;
+    background-color:#BFD0FF;
+    padding:0.0015%;
+    position:absolute;
+    text-align:left;
+    z-index:1;
+    width:17.9687%;
 }
 div.welcome {
=20
 }
 div.gest_name {
-	float:right;
-	margin-right:150;
-	margin-top:15
+    float:left;
+    margin-left:150;
+    margin-top:15
 }
 h2.gest_name {
-	border-left: 5px solid  #403a8d;
-	border-bottom:1px solid  #b4bbc2;
-	border-top:1px solid  #b4bbc2;
-	border-right:1px solid  #b4bbc2;
-	padding: 5px;
+    border-left: 5px solid  #403a8d;
+    border-bottom:1px solid  #b4bbc2;
+    border-top:1px solid  #b4bbc2;
+    border-right:1px solid  #b4bbc2;
+    padding: 5px;
+    width: 40%;
 }
 body.op_detail_frame,div.op_detail_frame  {
-	background-color:#e4e7ed;
-	height:100%; width:100%;
+    background-color:#e4e7ed;
+    height:100%; width:100%;
=20
-
 }
 div.inner_box  {
-	background-color:#e4e7ed;
-	font-size:10;
-	font-family:verdana,helvetica,sans-serif;
-	padding:0;
-	margin:0;
-	overflow:hidden;
-	z-index:3;
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:10%;
+    border:1px solid darkblue;
=20
-	position:absolute;
-	left:10%;
-
-
-	border:1px solid darkblue;
-
 }
 div.op_detail_title {
-	background-color:grey;
-	/*	width:500;*/
+    background-color:grey;
+    /*	width:500;*/
=20
=20
 }
 div#div_jrn{
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	visibility:hidden;
-	z-index:2;
-	width:50em;
-	background-color:#EDF3FF;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
=20
 }
 div#div_cat{
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	visibility:hidden;
-	z-index:2;
-	width:50em;
-	background-color:#EDF3FF;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
=20
 }
=20
@@ -935,221 +979,373 @@
=20
 div#search_form
 {
-	position:absolute;
-	border:1px solid black;
-	top:15%;left:100;
-	margin-left:25%
-		z-index:2;
-	width:50%;
-	display:none;
-	background-color:#e4e7ed;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100px;
+    margin-left:25%;
+    z-index:2;
+    width:50%;
+    display:none;
+    background-color:#e4e7ed;
+-moz-box-shadow: 10px 10px 5px #888;
+-webkit-box-shadow: 10px 10px 5px #888;
+box-shadow: 10px 10px 5px #888;
 }
=20
-table.table_large td, table.result td,table.sortable td
+table.sortable td, table.table_large td, table.result td
 {
-	padding-left:5px;
-	padding-right:5px;
+    padding-left:5px;
+    padding-right:5px;
 }
 table.info_op
 {
-	font-size:18;
-	width:100%;
+    width:100%;
 }
 table.info_op tr
 {
-	font-size:14;
-	background:white;
+    background:white;
 }
 h2#jrn_name
 {
-	margin-right:30%;
-	float: right;
-
+    color:blue;
+    font-size:2.74em;
+    margin-right:30%;
+    float: right;
 }
 tr.footer{
-	font-size:14;
-	font-style: italic;
-	font-weight: bold;
+    font-size:0.87em;
+    font-style: italic;
+    font-weight: bold;
=20
 }
 span.remain {
-	font-weight: bold;
-	color:black;
+    font-weight: bold;
+    color:black;
 }
=20
 div#jrn_name_div
 {
-	float: right;
-	margin-right:150;
+    float: right;
+    margin-right:150;
=20
=20
 }
 #predef_form {
-	margin-left:20%;
-	width:60%;
-
+    margin-left:20%;
+    width:60%;
+    position: absolute;
 }
 #direct
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
+    font-size:0.87em;;
 }
 #calc
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
 }
 div#wait_box
 {
-	background-color:#F1E6E6;
-	font-size:10;
-	font-family: verdana,helvetica,arial,sans-serif;
-	padding:0;
-	margin:0;
-	overflow:hidden;
-	z-index:10;
+    background-color:#F1E6E6;
+    font-size:0.87em;
+    font-family: arial,verdana,helvetica,arial,sans-serif;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:10;
=20
-	position:absolute;
-	left:30%;
-	top:30%;
+    position:absolute;
+    left:30%;
+    top:30%;
=20
=20
-	border:1px solid darkblue;
+    border:1px solid darkblue;
=20
 }
 #wait_box h2
 {
-	color:black;
-	text-align:center;
+    color:black;
+    text-align:center;
 }
 div#div_jrnsearch_op{
=20
-	border:1px solid black;
-	display:none;
-	width:50em;
-	background-color:#EDF3FF;
-	position:absolute;
-	z-index: 5;
+    border:1px solid black;
+    display:none;
+    width:50em;
+    background-color:#EDF3FF;
+    position:absolute;
+    z-index: 5;
=20
 }
 ul {
-	padding-left: 110px;
+    padding-left: 110px;
 }
 a.line,div.content a.line
 {
-	font-size:110%;
-	text-decoration:underline;
-	display:inline;
-	color: #0000ff;
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-	font-size:110%;
-	text-decoration:underline;
-	display:inline;
-	color: #0000ff;
-	background-color: rgb(93, 144, 205);
+   font-size:0.87em;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
+    background-color: rgb(93, 144, 205);
 }
 #close_div
 {
-	background-color:white;
-	color:black;
-	font-family: arial;
-	text-decoration:none;
-	border:1px solid black;
-	margin-left: 2px;
-	margin-right:2px;
-	margin-top:0px;
-	font-size:10px;
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:2px;
+    margin-top:0px;
+    font-size:0.90em;
 }
+#close_div:hover
+{
+    background-color: orange;
+}
+#popmeout
+{
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:18px;
+    font-size:0.90em;
+}
+#popmeout:hover
+{
+    background-color: orange;
+}
 table.table_large tr.odd ,table.table_large tr.even {
=20
-	height:32px;
+    height:32px;
 }
 #calc1
 {
-	position:absolute;
-	display:block;
-	top:30px;
-	left:150px;
-	width:300px;
-	border:1px solid black;
-	background-color:#aec3e8;
-	font-size:16px;
-	padding: 20px 20px;
+    position:absolute;
+    display:block;
+    top:30px;
+    left:150px;
+    width:300px;
+    border:1px solid black;
+    background-color:#aec3e8;
+    font-size:0.87em;
+    padding: 20px 20px;
 }
 span.invoice
 {
-    font-size: 120%;
+    font-size: 1.2em;
     font-style: italic;
     display:block;
     margin: 20px;
     font-weight: bold;
 }
 a.nav,div.content a.nav,div.redcontent a.nav {
-	display:inline;
-	text-decoration:none;
-	font-size:1em;
+    display:inline;
+    text-decoration:none;
+    font-size:0.75em;;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
-	display:inline;
-	text-decoration:none;
-	background-color:darkblue;
-	color:white;
-	font-size:1em;
+    display:inline;
+    text-decoration:none;
+    background-color:darkblue;
+    color:white;
+    font-size:0.75em;;
 }
 #dossier {
-	display:inline;
-	float:left;
-	width:40em;
-	top:0px;
+    display:inline;
+    float:left;
+    width:100%;
+    top:0px;
+    text-align: center;
 }
 div.foldercontent {
-	padding:20px 30px 0px 40px;
-	}
+    padding:20px 30px 0px 40px;
+}
=20
 h1.title {
-	color: #046fff;
-	font-size:24px;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    font-style: italic;
 }
 h2.title {
-	color: #046fff;
-	font-size:16px;
-	font-style: italic;
-	margin-left: 15px;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0.24%;
+    border:1px solid darkblue;
+
 }
 h3.title {
-	color: #046fff;
-	font-size:14px;
-	margin-left: 30px;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 30px;
 }
 h4.title {
-	color: #046fff;
-	font-size:12px;
-	margin-left: 45px;
-	text-decoration: underline;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: underline;
 }
 h5.title {
-	color: #046fff;
-	font-size:12px;
-	margin-left: 45px;
-	text-decoration: none;
-	font-style: italic;
+    color: blue;
+    font-size:0.87em;
+    margin-left: 45px;
+    text-decoration: none;
+    font-style: italic;
 }
 div.myfieldset
 {
-	margin-top: 5px;
-	margin-left:5px;
-	margin-right: 5px;
-	border:lightgrey 2px groove;
+    margin-top: 5px;
+    margin-left:5px;
+    margin-right: 5px;
+    border:lightgrey 2px groove;
+    border-radius: 4px;
 }
 #info_div {
-	display:none;
-	background-color: blue;
-	color:white;
-	z-index: 15;
-	position: absolute;
-	top:0;
-	left:0;
-}
\ No newline at end of file
+    display:none;
+    background-color: yellow;
+    color:black;
+    z-index: 15;
+    position: absolute;
+    top:0;
+    left:45%;
+}
+div.menu2 a.mtitle{
+   =20
+}
+div.menu3 {
+   =20
+}
+#go_submit_id {
+    font-size:1.25em;
+}
+.decale {
+    margin-left:30px;
+}
+#folder {
+    font-size:1.4em;
+    width:auto;
+    border-width:0px;
+    border-collapse:collapse;
+   =20
+   =20
+}
+/*#folder tr.odd,#folder tr.even {
+    font-size : 1.2em;
+}*/
+textarea.itextarea{
+    border:solid blue 1px;
+    width:90%;
+    margin-left:5%;
+}
+div#modele_op_div{
+    display: none;
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:30%;
+    width:40%;
+    border:1px solid darkblue;
+}
+div#notice {
+    position:absolute;
+    right:5%;
+    top:200px;
+    background-color:yellow;
+    border: 1px solid black;
+}
+div.name  {
+    position:absolute;
+    top:0px;
+    left:0px;
+}
+div#box_search_card {
+    position:absolute;
+    right:15.625%;
+    top:115px;
+}
+div.bxbutton
+{
+    float:right;
+    height:10px;
+    display:block;
+    margin-top:0.48%;
+    margin-right:0.48%;
+}
+div.inner_box tr.odd {
+    background:  #CBD9F4;
+}
+#modele_op_tab tr.odd {
+    background:  #CBD9F4;
+}
+div#bookmark_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+   border:1px solid darkblue;
+   top:2em;
+   left:30%;
+   width:40%;
+}
+div#preference_div {
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    border:1px solid darkblue;
+    top:2em;
+    left:20%;
+    width:50%;
+}
+#error_div{
+    position:absolute;
+    border:1px solid black;
+    background-color:whitesmoke;
+    padding-bottom: 2px;
+    padding-top: 2px;
+    padding-left: 2px;
+    padding-right: 2px;
+    color:red;
+    top:40%;left:25%;
+    visibility:hidden;
+    width:40em;
+    z-index:20;
+}
+#error_div h2 {
+    background: red;
+}
+div#error_content_div {
+   font-size: 1.2em;
+   color:error;
+   font-weight: bold;
+   text-align: center;
+}
+td.workday ol {
+	margin:0px;
+	padding:0px;
+	list-style-type:none;
+	text-align:left;
+}

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-10-03 10:56:13 UTC (rev 5462)
+++ phpcompta/trunk/html/style.css	2013-10-04 14:57:53 UTC (rev 5463)
@@ -803,8 +803,6 @@
 }
 div.pc_calendar td.workday{
     background-color:inherit;
-
-
 }
 div.pc_calendar span.day{
     font-weight: bold;
@@ -1354,3 +1352,9 @@
    font-weight: bold;
    text-align: center;
 }
+td.workday ol {
+	margin:0px;
+	padding:0px;
+	list-style-type:none;
+	text-align:left;
+}

Modified: phpcompta/trunk/include/class_calendar.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_calendar.php	2013-10-03 10:56:13 UTC (r=
ev 5462)
+++ phpcompta/trunk/include/class_calendar.php	2013-10-04 14:57:53 UTC (r=
ev 5463)
@@ -45,14 +45,15 @@
=20
     /*!\brief fill the array given as parameter with the data from actio=
n_gestion
      *\param $p_array array of the date of the month
+     * \param $p_style is either short or long, short: for a small title=
, long for a complete one
      */
-    function fill_from_action(&$p_array)
+    function fill_from_action(&$p_array,$p_style)
     {
 		global $g_user;
 		$profile=3D$g_user->get_profile();
=20
         $cn=3Dnew Database(dossier::id());
-        $sql=3D"select ag_id,to_char(ag_remind_date,'DD')::integer as ag=
_timestamp_day,ag_title
+        $sql=3D"select ag_id,to_char(ag_remind_date,'DD')::integer as ag=
_timestamp_day,ag_title,ag_hour
 			".
              " from action_gestion ".
              " where ".
@@ -66,17 +67,21 @@
         for ($i=3D0;$i<count($array);$i++)
         {
             $ind=3D$array[$i]['ag_timestamp_day'];
+            $this->action[$ind][]=3D$array[$i]['ag_id'];
+            $this->title[$ind][]=3D$array[$i]['ag_title'];
+            $this->hour[$ind][]=3D$array[$i]['ag_hour'];
=20
-			$this->action[$ind][]=3D$array[$i]['ag_id'];
-			$this->title[$ind][]=3D$array[$i]['ag_title'];
-
         }
 		/*
 		 * Fill foreach day
 		 */
+        if ( $p_style =3D=3D "short")
+        {
 		foreach ($this->action as $day=3D>$aAction)
 		{
-			if ($p_array[$day]=3D=3D"")  $p_array[$day]=3D'<span class=3D"input_t=
ext" onclick=3D"display_task(\'tsk'.$day.'\');">'." ".count($aAction)." "=
._("T=C3=A2ches").'</span>';
+			if ($p_array[$day]=3D=3D"")  {
+                                $p_array[$day]=3D'<span class=3D"input_t=
ext" onclick=3D"display_task(\'tsk'.$day.'\');">'." ".count($aAction)." "=
._("T=C3=A2ches").'</span>';
+                        }
 			$this->action_div[$day]=3D'<div id=3D"tsk'.$day.'" class=3D"inner_box=
" style=3D"width:200;display:none">';
 			$this->action_div[$day].=3DHtmlInput::title_box($day."/".$this->month=
."/".$this->year, "tsk".$day, "hide");
 			 $this->action_div[$day].=3D"<ol>";
@@ -86,24 +91,56 @@
 			}
 			$this->action_div[$day].=3D'</ol></div>';
 		}
+        }
+        else if ( $p_style =3D=3D "long")
+        {
+		foreach ($this->action as $day=3D>$aAction)
+		{
+                        $p_array[$day].=3D"<ol>";
+			for ($i=3D0;$i<count($aAction);$i++)
+			{
+				$p_array[$day].=3D'<li>&rarr;'.HtmlInput::detail_action($aAction[$i]=
, $this->hour[$day][$i]." ".$this->title[$day][$i]).'</li>';
+			}
+			$p_array[$day].=3D'</ol>';
+		}
+        }
     }
     /*!\brief fill the array given as parameter with the data from todo
      *\param $p_array array of the date of the month
+     * \param $p_style is either short or long, short: for a small title=
, long for a complete one
      */
-    function fill_from_todo(&$p_array)
+    function fill_from_todo(&$p_array,$p_style)
     {
         $cn=3Dnew Database(dossier::id());
-        $sql=3D"select count(*) as nb,to_char(tl_date,'DD')::integer as =
tl_date_day ".
-             " from todo_list ".
-             " where ".
-             " to_char(tl_date,'MM')::integer=3D$1 ".
-             " and to_char(tl_date,'YYYY')::integer=3D$2 ".
-             " and use_login=3D$3 group by to_char(tl_date,'DD')::intege=
r ";
-        $array=3D$cn->get_array($sql,array($this->month,$this->year,$_SE=
SSION['g_user']));
-        for ($i=3D0;$i<count($array);$i++)
+        if ($p_style=3D=3D"short")
         {
-            $ind=3D$array[$i]['tl_date_day'];
-            $p_array[$ind].=3D"<span style=3D\"display:block\" class=3D\=
"todo\">".h($array[$i]['nb'])." "._('Notes').'</span>';
+            $sql=3D"select count(*) as nb,to_char(tl_date,'DD')::integer=
 as tl_date_day ".
+                 " from todo_list ".
+                 " where ".
+                 " to_char(tl_date,'MM')::integer=3D$1 ".
+                 " and to_char(tl_date,'YYYY')::integer=3D$2 ".
+                 " and use_login=3D$3 group by to_char(tl_date,'DD')::in=
teger ";
+            $array=3D$cn->get_array($sql,array($this->month,$this->year,=
$_SESSION['g_user']));
+            for ($i=3D0;$i<count($array);$i++)
+            {
+                $ind=3D$array[$i]['tl_date_day'];
+                $p_array[$ind].=3D"<span style=3D\"display:block\" class=
=3D\"todo\">".h($array[$i]['nb'])." "._('Notes').'</span>';
+            }
+        } else if ($p_style=3D=3D"long")
+        {
+            $sql=3D"select to_char(tl_date,'DD')::integer as tl_date_day=
,tl_title ".
+                 " from todo_list ".
+                 " where ".
+                 " to_char(tl_date,'MM')::integer=3D$1 ".
+                 " and to_char(tl_date,'YYYY')::integer=3D$2 ".
+                 " and use_login=3D$3  ";
+            $array=3D$cn->get_array($sql,array($this->month,$this->year,=
$_SESSION['g_user']));
+            for ($i=3D0;$i<count($array);$i++)
+            {
+                $ind=3D$array[$i]['tl_date_day'];
+               =20
+               $p_array[$ind].=3D"<span style=3D\"display:block\" class=3D=
\"todo\">".h($array[$i]['tl_title']).'</span>';
+            }
         }
     }
     /*!\brief display a calendar after a call to Calendar::fill
@@ -124,8 +161,8 @@
         /* weekday */
         $week=3Darray(_('Dimanche'),_('Lundi'),_('Mardi'),_('Mercredi'),=
_('Jeudi'),_('Vendredi'),_('Samedi'));
=20
-        $this->fill_from_action($cell);
-        $this->fill_from_todo($cell);
+        $this->fill_from_action($cell,"short");
+        $this->fill_from_todo($cell,"short");
         $wMonth=3Dnew ISelect('per');
         $cn=3Dnew Database(dossier::id());
         $wMonth->value=3D$cn->make_array("select p_id,to_char(p_start,'M=
M/YYYY') from parm_periode where p_exercice =3D '$exercice_user' order by=
 p_start");
@@ -193,5 +230,49 @@
     {
         $this->default_periode=3D$p_per;
     }
+    /**
+     * @brief zoom the calendar
+     */
+    function zoom()
+    {
+        global $g_user;
+        $exercice_user=3D$g_user->get_exercice();
+        /* day */
+        $cell=3Darray();
+        for ($i=3D0;$i<42;$i++)
+        {
+            $cell[$i]=3D"";
+        }
+        $this->set_month_year();
+        /* weekday */
+        $week=3Darray(_('Dimanche'),_('Lundi'),_('Mardi'),_('Mercredi'),=
_('Jeudi'),_('Vendredi'),_('Samedi'));
=20
+        $this->fill_from_action($cell,"long");
+        $this->fill_from_todo($cell,"long");
+        $wMonth=3Dnew ISelect('per_div');
+        $cn=3Dnew Database(dossier::id());
+        $wMonth->value=3D$cn->make_array("select p_id,to_char(p_start,'M=
M/YYYY') from parm_periode where p_exercice =3D '$exercice_user' order by=
 p_start");
+        $wMonth->selected=3D$this->default_periode;
+        $wMonth->javascript=3Dsprintf("onchange=3Dcalendar_zoom({gDossie=
r:%d,invalue:'%s',outvalue:'%s'})",
+            dossier::id(),'per_div','calendar_zoom_div');
+        $wMonth->set_attribute('gDossier',dossier::id());
+        $month_year=3D$wMonth->input().$wMonth->get_js_attr();
+        ob_start();
+        require_once('template/calendar.php');
+
+        if (count($this->action_div) > 0)
+        {
+                foreach ($this->action_div as $day)
+                {
+                        echo $day;
+                }
+        }
+	$ret=3Dob_get_contents();
+        ob_end_clean();
+        return $ret;
+    }
+    static function test_me() {
+       =20
+    }
+
 }

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-10-03 10:56:13 UTC =
(rev 5462)
+++ phpcompta/trunk/include/class_html_input.php	2013-10-04 14:57:53 UTC =
(rev 5463)
@@ -242,7 +242,7 @@
 	 * @param $p_modify let you modify an operation
 	 *
 	 */
-	 static function detail_action($ag_id,$p_mesg,$p_modify=3D1)
+    static function detail_action($ag_id,$p_mesg,$p_modify=3D1)
     {
         return sprintf('<A class=3D"detail" style=3D"text-decoration:und=
erline;display:inline" HREF=3D"javascript:view_action(%d,%d,%d)">%s</A>',
                        $ag_id,dossier::id(),$p_modify,$p_mesg);
@@ -745,5 +745,16 @@
 		$r =3D '<A  style=3D"color:red;text-decoration:underline" href=3D"java=
script:void(0)" onclick=3D"show_reconcile(\'' . $p_div . '\',\'' . $let .=
 '\')">' . $let . '</A>';
 		return $r;
 	}
+        /**
+         * Zoom the calendar
+         * @param type $obj objet json for the javascript
+         * @see calendar_zoom in scripts.js=20
+         */
+        static function calendar_zoom($obj)
+        {
+            $button=3Dnew ISmallButton("calendar", "Calendrier");
+            $button->javascript=3D"calendar_zoom($obj)";
+            return $button->input();
+        }
=20
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-10-03 10:56:13 UTC (rev 546=
2)
+++ phpcompta/trunk/include/constant.php	2013-10-04 14:57:53 UTC (rev 546=
3)
@@ -81,7 +81,7 @@
 define ('MAX_CAT',15);
 define ('MAX_CARD_SEARCH',550);
 define ('MAX_FORECAST_ITEM',10);
-define ('MAX_PREDEFINED_OPERATION',30);
+define ('MAX_PREDEFINED_OPERATION',50);
 define ('MAX_COMPTE_CARD',4);
 define ('COMPTA_MAX_YEAR',2100);
 define ('COMPTA_MIN_YEAR',1990);

Modified: phpcompta/trunk/include/dashboard.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/dashboard.inc.php	2013-10-03 10:56:13 UTC (re=
v 5462)
+++ phpcompta/trunk/include/dashboard.inc.php	2013-10-04 14:57:53 UTC (re=
v 5463)
@@ -20,6 +20,9 @@
 /* others report */
 $cal=3Dnew Calendar();
 $cal->get_preference();
+
+$obj=3Dsprintf("{gDossier:%d,invalue:'%s',outdiv:'%s'}",
+        dossier::id(),'per','calendar_zoom_div');
 $Operation=3Dnew Follow_Up($cn);
 $last_operation=3D$Operation->get_today();
 $late_operation=3D$Operation->get_late();

Modified: phpcompta/trunk/include/template/calendar.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/calendar.php	2013-10-03 10:56:13 UTC=
 (rev 5462)
+++ phpcompta/trunk/include/template/calendar.php	2013-10-04 14:57:53 UTC=
 (rev 5463)
@@ -1,6 +1,6 @@
 <div class=3D"pc_calendar" id=3D"user_cal" style=3D"width:100%">
 <?php echo $month_year?>
-<table width=3D"100%">
+<table style=3D"width:100%;height:80%">
 <tr>
 <?php
 for ($i=3D0;$i<=3D6;$i++){

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-10-03 10:56:13 UT=
C (rev 5462)
+++ phpcompta/trunk/include/template/dashboard.php	2013-10-04 14:57:53 UT=
C (rev 5463)
@@ -2,6 +2,7 @@
 <fieldset >
 <legend><?php echo _('Calendrier')?>
 </legend>
+<?php echo HtmlInput::calendar_zoom($obj); ?>
 <?php echo $cal->display(); ?>
 </fieldset>
 </div>

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-10-03 10:56:13 UTC (rev 5462)
+++ phpcompta/trunk/sql/upgrade.sql	2013-10-04 14:57:53 UTC (rev 5463)
@@ -1,278 +0,0 @@
--- si la fiche utilise le code DEPENSE PRIVEE alors ajout dans QP_DEP_PR=
IV
-create or replace view m as=20
-select qp_id, qp_price from quant_purchase join fiche_detail on (qp_fich=
e=3Df_id and ad_id=3D5) where ad_value in (select p_value from parm_code =
where p_code=3D'DEP_PRIV');
-
-update quant_purchase as e set qp_dep_priv=3D(select qp_price from m whe=
re m.qp_id=3De.qp_id);
-
-update quant_purchase as e set qp_dep_priv=3D(select qp_price from m whe=
re m.qp_id=3De.qp_id);
-
-update quant_purchase as e set qp_dep_priv=3D0 where qp_dep_priv is null=
;
--- =C3=A9vite les valeurs nulles dans quant_purchase
-update quant_purchase set qp_dep_priv =3D 0 where qp_dep_priv is null;
-
-drop view m;
-
--- update script insert_quant_purchase
-
-
-CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(
-    p_internal text,=20
-    p_j_id numeric,=20
-    p_fiche text,=20
-    p_quant numeric,=20
-    p_price numeric,=20
-    p_vat numeric,=20
-    p_vat_code integer,=20
-    p_nd_amount numeric,=20
-    p_nd_tva numeric,=20
-    p_nd_tva_recup numeric,=20
-    p_dep_priv numeric,=20
-    p_client text,=20
-    p_tva_sided numeric)
-  RETURNS void AS
-$BODY$
-declare
-        fid_client integer;
-        fid_good   integer;
-        account_priv    account_type;
-        fid_good_account account_type;
-        n_dep_priv numeric;
-begin
-        n_dep_priv :=3D 0;
-        select p_value into account_priv from parm_code where p_code=3D'=
DEP_PRIV';
-        select f_id into fid_client from
-                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
-        select f_id into fid_good from
-                 fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim=
(p_fiche));
-        select ad_value into fid_good_account from fiche_detail where ad=
_id=3D5 and f_id=3Dfid_good;
-        if strpos( fid_good_account , account_priv ) =3D 1 then
-                n_dep_priv=3Dp_price;
-        end if;=20
-           =20
-        insert into quant_purchase
-                (qp_internal,
-                j_id,
-                qp_fiche,
-                qp_quantite,
-                qp_price,
-                qp_vat,
-                qp_vat_code,
-                qp_nd_amount,
-                qp_nd_tva,
-                qp_nd_tva_recup,
-                qp_supplier,
-                qp_dep_priv,
-                qp_vat_sided)
-        values
-                (p_internal,
-                p_j_id,
-                fid_good,
-                p_quant,
-                p_price,
-                p_vat,
-                p_vat_code,
-                p_nd_amount,
-                p_nd_tva,
-                p_nd_tva_recup,
-                fid_client,
-                n_dep_priv,
-                p_tva_sided);
-        return;
-end;
- $BODY$
-  LANGUAGE plpgsql;
-
-
--- ajout code manquant dans parm_code
-create or replace function add_parm_code() returns void as
-$fct$
-declare
-    country_code text;
-begin=20
-    select pr_value into country_code from parameter where pr_id=3D'MY_C=
OUNTRY';
-    if country_code=3D'FR' then
-        insert into parm_code (p_code,p_comment,p_value) values ('DNA','=
D=C3=A9pense non d=C3=A9ductible','67');
-        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_D=
NA','TVA non d=C3=A9ductible','');
-        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_D=
ED_IMPOT','TVA d=C3=A9ductible =C3=A0 l''imp=C3=B4t','');
-        insert into parm_code  (p_code,p_comment,p_value) values ('COMPT=
E_COURANT','Poste comptable pour le compte courant','');
-        insert into parm_code  (p_code,p_comment,p_value) values ('COMPT=
E_TVA','TVA =C3=A0 payer ou =C3=A0 recevoir','');
-     end if;
-end;
-$fct$
-language plpgsql;
-
-select add_parm_code();
-
-drop function add_parm_code();
-
-update parm_code set p_value=3D'67' where p_value=3D'6740' and p_code=3D=
'DNA';
-
- alter table menu_ref add me_description_etendue text;
-
-insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_p=
arameter,me_javascript,me_type,me_description_etendue)
-values
-('NAVI','Navigateur',null,null,'Menu simplifi=C3=A9 pour retrouver rapid=
ement un menu',null,'ask_navigator(<DOSSIER>)','ME','Le navigateur vous p=
r=C3=A9sente une liste de menu auquel vous avez acc=C3=A8s et vous permet=
 d''acc=C3=A8der plus rapidement au menu que vous souhaitez rapidement');
-
-insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_displ=
ay,pm_default)=20
-values
-('NAVI',null,1,90,'M',0), ('NAVI',null,2,90,'M',0);
-
-insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_p=
arameter,me_javascript,me_type,me_description_etendue)
-values
-('BOOKMARK','Favori',null,null,'Raccourci vers vos menus pr=C3=A9f=C3=A9=
r=C3=A9s',null,'show_bookmark(<DOSSIER>)','ME','Ce menu vous pr=C3=A9sent=
e un menu rapide des menus que vous utilisez le plus souvent');
-
-insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_displ=
ay,pm_default)=20
-values
-('BOOKMARK',null,1,85,'M',0), ('BOOKMARK',null,2,85,'M',0);
-
-update menu_ref set me_menu=3D'Impression Journaux' where me_code=3D'PRI=
NTJRN';
-update menu_ref set me_description=3D'Impression des journaux' where me_=
code=3D'PRINTJRN';
-update menu_ref set me_menu=3D'Liste Suivi' where me_code=3D'FOLLOW';
-update menu_ref set me_description=3D'Document de suivi sous forme de li=
ste' where me_code=3D'FOLLOW';
-update menu_ref set me_javascript=3D'popup_recherche(<DOSSIER>)' where m=
e_code=3D'SEARCH';
-update menu_ref set me_file=3Dnull,me_javascript=3D'set_preference(<DOSS=
IER>)' , me_description_etendue=3D'Pr=C3=A9f=C3=A9rence de l''utilisateur=
, apparence de l''application pour l''utilisateur, p=C3=A9riode par d=C3=A9=
faut et mot de passe' where me_code=3D'PREFERENCE';
-/*
- * Vue montrant toutes les possibilit=C3=A9s
- */
-CREATE OR REPLACE VIEW v_menu_description AS=20
- WITH t_menu AS (
-         SELECT mr.me_menu, pm.me_code, pm.me_code_dep, pm.p_type_displa=
y, pu.user_name, mr.me_file, mr.me_javascript, mr.me_description, mr.me_d=
escription_etendue
-           FROM profile_menu pm
-      JOIN profile_user pu ON pu.p_id =3D pm.p_id
-   JOIN profile p ON p.p_id =3D pm.p_id
-   JOIN menu_ref mr USING (me_code)
-        )
- SELECT DISTINCT (COALESCE(v3.me_code || '/'::text, ''::text) || COALESC=
E(v2.me_code, ''::text)) ||=20
-        CASE
-            WHEN v2.me_code IS NULL THEN COALESCE(v1.me_code, ''::text)
-            WHEN v2.me_code IS NOT NULL THEN COALESCE('/'::text || v1.me=
_code, ''::text)
-            ELSE NULL::text
-        END AS code, v1.me_code, v1.me_description, v1.me_description_et=
endue, v1.me_file, v1.user_name, '> '::text || v1.me_menu AS v1menu,=20
-        CASE
-            WHEN COALESCE(v3.me_menu, ''::text) <> ''::text THEN ' > '::=
text || v2.me_menu
-            ELSE v2.me_menu
-        END AS v2menu, v3.me_menu AS v3menu, v3.p_type_display,
- coalesce(v1.me_javascript,coalesce(v2.me_javascript,v3.me_javascript)) =
as javascript
-   FROM t_menu v1
-   LEFT JOIN t_menu v2 ON v1.me_code_dep =3D v2.me_code
-   LEFT JOIN t_menu v3 ON v2.me_code_dep =3D v3.me_code
-  WHERE v1.p_type_display <> 'P'::text AND (COALESCE(v1.me_file, ''::tex=
t) <> ''::text OR COALESCE(v1.me_javascript, ''::text) <> ''::text);
-
-COMMENT ON VIEW v_menu_description
-  IS 'Description des menus';
-=20
-CREATE TABLE bookmark
-(
-b_id serial primary key,
-b_order integer default 1,
-b_action text,
-login text=20
-);
-comment on table bookmark is 'Bookmark of the connected user';
-
-create table tags (
-    t_id serial primary key,=20
-    t_tag text not null,=20
-    t_description text
-);
-
-create table action_tags
-(
-    at_id serial primary key,
-    t_id integer references tags(t_id) on delete cascade on update casca=
de,
-    ag_id integer references action_gestion(ag_id) on delete cascade on =
update cascade
-);
-/* Config tag */
-insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_p=
arameter,me_javascript,me_type,me_description_etendue)
-values
-('CFGTAG','Configuration =C3=A9tiquette','cfgtags.inc.php',null,'Configu=
ration des tags',null,null,'ME','Configuration des =C3=A9tiquettes. Vous =
pouvez en ajouter, en supprimer ou les modifier');
-
-insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_displ=
ay,pm_default)=20
-values
-('CFGTAG','PARAM',1,390,'E',0);
-
-update fiche_def set    fd_label=3D'Tr=C3=A9sorerie' where fd_id=3D3;
-update fiche_def_ref set    frd_text=3D'Tr=C3=A9sorerie' where frd_id=3D=
4;
-update jrn_def set jrn_def_name=3D'Tr=C3=A9sorerie' where jrn_def_id=3D1=
;
-update jrn_type set jrn_desc =3D 'Tr=C3=A9sorerie' where jrn_type_id=3D'=
FIN';
-
-CREATE OR REPLACE FUNCTION comptaproc.insert_quick_code(nf_id integer, t=
av_text text)
-  RETURNS integer AS
-$BODY$
-	declare
-	ns integer;
-	nExist integer;
-	tText text;
-	tBase text;
-	tName text;
-	nCount Integer;
-	nDuplicate Integer;
-	begin
-	tText :=3D lower(trim(tav_text));
-	tText :=3D replace(tText,' ','');
-	tText :=3D translate(tText,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;_&|=
"#''^<>*','');
-	tText :=3D translate(tText,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
-	nDuplicate :=3D 0;
-	tBase :=3D tText;
-	loop
-		-- take the next sequence
-		select nextval('s_jnt_fic_att_value') into ns;
-		if length (tText) =3D 0 or tText is null then
-			select count(*) into nCount from fiche_detail where f_id=3Dnf_id and =
ad_id=3D1;
-			if nCount =3D 0 then
-				tText :=3D 'FICHE'||ns::text;
-			else
-				select ad_value into tName from fiche_detail where f_id=3Dnf_id and =
ad_id=3D1;
-			=09
-				tName :=3D lower(trim(tName));
-				tName :=3D substr(tName,1,6);
-				tName :=3D replace(tName,' ','');
-				tName :=3D translate(tName,E' $=E2=82=AC=C2=B5=C2=A3%.+-/\\!(){}(),;=
_&|"#''^<>*','');
-				tName :=3D translate(tName,E'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=
=A4=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
-				tBase :=3D tName;
-				if nDuplicate =3D 0 then
-					tText :=3D tName;
-				else
-					tText :=3D tName||nDuplicate::text;
-				end if;
-			end if;
-		end if;
-		-- av_text already used ?
-		select count(*) into nExist
-			from fiche_detail
-		where
-			ad_id=3D23 and  ad_value=3Dupper(tText);
-
-		if nExist =3D 0 then
-			exit;
-		end if;
-		nDuplicate :=3D nDuplicate + 1 ;
-		tText :=3D tBase || nDuplicate::text;
-	=09
-		if nDuplicate > 9999 then
-			raise Exception 'too many duplicate % duplicate# %',tText,nDuplicate;
-		end if;
-	end loop;
-
-
-	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,2=
3,upper(tText));
-	return ns;
-	end;
-$BODY$
-  LANGUAGE plpgsql VOLATILE
-
-create or replace function comptaproc.opd_limit_description()=20
-returns trigger
-as
-$BEGIN$
-	declare
-		sDescription text;
-	begin
-	sDescription :=3D NEW.od_description;
-	NEW.od_description :=3D substr(sDescription,1,80);
-	return NEW;
-	end;
-$BEGIN$
-LANGUAGE plpgsql;
-
-create trigger opd_limit_description before update or insert on op_prede=
f execute procedure for each row comptaproc.opd_limit_description();



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


From MAILER-DAEMON Fri Oct 04 11:08:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VS6zk-0004H5-Hl
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Oct 2013 11:08:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Oct 2013 16:58:47 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.61278.1380899324.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5464 - 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, 04 Oct 2013 15:08:44 -0000

Author: danydb
Date: 2013-10-04 16:58:46 +0200 (Fri, 04 Oct 2013)
New Revision: 5464

Modified:
   phpcompta/trunk/include/constant.php
Log:
update constant.php

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-10-04 14:57:53 UTC (rev 546=
3)
+++ phpcompta/trunk/include/constant.php	2013-10-04 14:58:46 UTC (rev 546=
4)
@@ -60,9 +60,9 @@
 $g_failed=3D"<span style=3D\"font-size:18px;color:red\">&#x2716;</span>"=
;
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /* uncomment for development */
- define ('SVNINFO',5900);
- define ("DEBUG",true);
-//define ("DEBUG",false);
+// define ('SVNINFO',5900);
+// define ("DEBUG",true);
+define ("DEBUG",false);
=20
 $version_phpcompta=3DSVNINFO;
 // If you don't want to be notified of the update



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


From MAILER-DAEMON Fri Oct 04 11:57:31 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VS7kx-0000c7-DZ
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Oct 2013 11:57:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Oct 2013 17:47:32 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.61301.1380902250.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5465 - phpcompta/trunk/html/admin/sql/patch
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Oct 2013 15:57:30 -0000

Author: danydb
Date: 2013-10-04 17:47:31 +0200 (Fri, 04 Oct 2013)
New Revision: 5465

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
Log:
correct script sql

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-04 14:58:=
46 UTC (rev 5464)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-04 15:47:=
31 UTC (rev 5465)
@@ -265,7 +265,6 @@
 LANGUAGE plpgsql VOLATILE
=20
 alter table op_predef add od_description text;
-alter table op_predef add od_description text;
 create or replace function comptaproc.opd_limit_description()=20
 returns trigger
 as



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


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

Author: danydb
Date: 2013-10-04 17:48:31 +0200 (Fri, 04 Oct 2013)
New Revision: 5466

Modified:
   phpcompta/trunk/html/index.php
Log:
update version

Modified: phpcompta/trunk/html/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/index.php	2013-10-04 15:47:31 UTC (rev 5465)
+++ phpcompta/trunk/html/index.php	2013-10-04 15:48:31 UTC (rev 5466)
@@ -189,7 +189,7 @@
=20
 echo '
 <span style=3D"background-color:#879ed4;color:white;padding-left:4px;pad=
ding-right:4px;">
-version  6.6.SVNINFO - '.$my_domain.'
+version  6.7pre-release SVNINFO - '.$my_domain.'
 </span>
 <BR>
 <BR>



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


From MAILER-DAEMON Fri Oct 04 12:00:37 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VS7nw-0001Th-NK
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Oct 2013 12:00:37 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Oct 2013 17:50:37 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.61303.1380902435.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5467 - phpcompta/trunk/html/admin/sql/patch
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Oct 2013 16:00:34 -0000

Author: danydb
Date: 2013-10-04 17:50:36 +0200 (Fri, 04 Oct 2013)
New Revision: 5467

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
Log:
correct script sql

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-04 15:48:=
31 UTC (rev 5466)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-04 15:50:=
36 UTC (rev 5467)
@@ -279,7 +279,7 @@
 $BEGIN$
 LANGUAGE plpgsql;
=20
-create trigger opd_limit_description before update or insert on op_prede=
f execute procedure for each row comptaproc.opd_limit_description();
+create trigger opd_limit_description before update or insert on op_prede=
f for each row execute procedure comptaproc.opd_limit_description();
=20
 update menu_ref set me_menu =3D 'Tr=C3=A9sorerie' where me_code=3D'MENUF=
IN';
=20



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


From MAILER-DAEMON Sat Oct 05 10:40:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VST23-0004UQ-Sh
	for mharc-phpcompta-dev@gnu.org; Sat, 05 Oct 2013 10:40:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  5 Oct 2013 16:30:34 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.61946.1380984035.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5468 - in phpcompta/trunk: html/admin/sql/patch
	include sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Oct 2013 14:40:34 -0000

Author: danydb
Date: 2013-10-05 16:30:34 +0200 (Sat, 05 Oct 2013)
New Revision: 5468

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
   phpcompta/trunk/include/class_contact.php
   phpcompta/trunk/include/contact.inc.php
   phpcompta/trunk/sql/upgrade.sql
Log:
Add contact menu

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-04 15:50:=
36 UTC (rev 5467)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-05 14:30:=
34 UTC (rev 5468)
@@ -283,7 +283,24 @@
=20
 update menu_ref set me_menu =3D 'Tr=C3=A9sorerie' where me_code=3D'MENUF=
IN';
=20
+create or replace function do_insert() returns void
+as
+$$
+declare
+    nCount integer;
+begin
+    select count(*) into nCount from menu_ref where me_file=3D'contact.i=
nc.php';
+    if nCount =3D 0 then
+        insert into menu_ref(ME_CODE,me_menu,me_file,me_description,me_t=
ype) values ('CONTACT','Contact','contact.inc.php','Liste des contacts','=
ME');
+    end if;
+end;
+$$
+language plpgsql;
=20
+select do_insert();
+
+drop function do_insert();
+
 update version set val=3D108;
=20
 commit;

Modified: phpcompta/trunk/include/class_contact.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_contact.php	2013-10-04 15:50:36 UTC (re=
v 5467)
+++ phpcompta/trunk/include/class_contact.php	2013-10-05 14:30:34 UTC (re=
v 5468)
@@ -79,8 +79,8 @@
=20
 		if ( $all_contact =3D=3D 0 ) return "";
         $r=3D$bar;
-        $r.=3D'<table border=3D"0"  width=3D"95%">
-            <TR style=3D"background-color:lightgrey;">
+        $r.=3D'<table id=3D"contact_tb" class=3D"sortable">
+            <TR>
             <th>Quick Code</th>
             <th>Nom</th>
             <th>Pr=C3=A9nom</th>
@@ -123,8 +123,7 @@
             }
             $r.=3D"<TR>";
             $qcode=3D$contact->strAttribut(ATTR_DEF_QUICKCODE);
-            $r.=3D'<TD><A HREF=3D"javascript:void(0)" onclick=3D"this.ip=
opup=3D\'ipopcard\';this.qcode=3D(\''.$qcode.'\');fill_ipopcard(this);">'=
.$qcode.
-                "</A></TD>";
+            $r.=3D'<TD>'.HtmlInput::card_detail($qcode)."</TD>";
             $r.=3D"<TD>".$contact->strAttribut(ATTR_DEF_NAME)."</TD>";
             $r.=3D"<TD>".$contact->strAttribut(ATTR_DEF_FIRST_NAME)."</T=
D>";
             $r.=3D"<TD>".$l_company_name."</TD>";

Modified: phpcompta/trunk/include/contact.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/contact.inc.php	2013-10-04 15:50:36 UTC (rev =
5467)
+++ phpcompta/trunk/include/contact.inc.php	2013-10-05 14:30:34 UTC (rev =
5468)
@@ -71,7 +71,7 @@
 		<?php
 		echo dossier::hidden();
 		$a =3D (isset($_GET['query'])) ? $_GET['query'] : "";
-		printf(_('Recherche') . ' <input class=3D"input_text" type=3D"text" na=
me=3D"query" value=3D"%s">', $a);
+		printf(_('Recherche') . HtmlInput::filter_table("contact_tb", "0,1,2,3=
,4,5,6", 1));
 		$sel_card =3D new ISelect('cat');
 		$sel_card->value =3D $cn->make_array('select fd_id, fd_label from fich=
e_def ' .
 			' where  frd_id=3D' . FICHE_TYPE_CONTACT .

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-10-04 15:50:36 UTC (rev 5467)
+++ phpcompta/trunk/sql/upgrade.sql	2013-10-05 14:30:34 UTC (rev 5468)
@@ -0,0 +1,17 @@
+create or replace function do_insert() returns void
+as
+$$
+declare
+    nCount integer;
+begin
+    select count(*) into nCount from menu_ref where me_file=3D'contact.i=
nc.php';
+    if nCount =3D 0 then
+        insert into menu_ref(ME_CODE,me_menu,me_file,me_description,me_t=
ype) values ('CONTACT','Contact','contact.inc.php','Liste des contacts','=
ME');
+    end if;
+end;
+$$
+language plpgsql;
+
+select do_insert();
+
+drop function do_insert();
\ 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 Oct 05 13:53:09 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VSW2P-0001Zw-JP
	for mharc-phpcompta-dev@gnu.org; Sat, 05 Oct 2013 13:53:09 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  5 Oct 2013 19:43:08 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.61994.1380995589.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5469 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Oct 2013 17:53:08 -0000

Author: danydb
Date: 2013-10-05 19:43:07 +0200 (Sat, 05 Oct 2013)
New Revision: 5469

Modified:
   phpcompta/trunk/include/opening.inc.php
Log:
do not use fieldset


Modified: phpcompta/trunk/include/opening.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/opening.inc.php	2013-10-05 14:30:34 UTC (rev =
5468)
+++ phpcompta/trunk/include/opening.inc.php	2013-10-05 17:43:07 UTC (rev =
5469)
@@ -100,7 +100,8 @@
 if ($sa =3D=3D '')
 {
 	echo '<div class=3D"content">';
-	echo '<fieldset><legend> Etape 1 </legend>';
+       =20
+	echo '<h1 class=3D"legend"> Etape 1 </h1>';
=20
 	echo 'Choississez le dossier o=C3=B9 sont les soldes =C3=A0 importer';
 	$avail =3D $g_user->get_available_folder();
@@ -130,8 +131,8 @@
 	echo HtmlInput::submit('ok', 'Continuer');
=20
 	echo '</form>';
-	echo '</fieldset>';
 	echo '</div>';
+	echo '</div>';
 	exit();
 }
 /* --------------------------------------------------
@@ -141,7 +142,7 @@
 if ($sa =3D=3D 'step2')
 {
 	echo '<div class=3D"content">' .
-	'<fieldset><legend>Etape 2</legend>' .
+	'<div><h1 class=3D"legend">Etape 2</h1>' .
 	'<h2 class=3D"info">' . dossier::name($_REQUEST['f']) . '</h2>' .
 	'<form class=3D"print" method=3D"post">' .
 	' Choississez l\'exercice du dossier ';
@@ -170,7 +171,7 @@
 if ($sa =3D=3D 'step3')
 {
 	echo '<div class=3D"content">' .
-	'<fieldset><legend>Etape 3</legend>' .
+	'<div><h1 class=3D"legend">Etape 3</h1>' .
 	'<h2 class=3D"info">' . dossier::name($_REQUEST['f']) . '</h2>' .
 	'<form class=3D"print" method=3D"post">' .
 	' Choississez le journal qui contiendra l\'op=C3=A9ration d\'ouverture =
';
@@ -207,7 +208,7 @@
 if ($sa =3D=3D 'step4')
 {
 	echo '<div class=3D"content">';
-	echo '<fieldset><legend> Derni=C3=A8re =C3=A9tape</legend>';
+	echo '<div><h1 class=3D"legend"> Derni=C3=A8re =C3=A9tape</h1>';
 	$cn_target =3D new Database($_REQUEST['f']);
 	$saldo =3D new Acc_Ledger($cn_target, 0);
 	$array =3D $saldo->get_saldo_exercice($_REQUEST['p_periode']);



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


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

Author: danydb
Date: 2013-10-05 19:43:30 +0200 (Sat, 05 Oct 2013)
New Revision: 5470

Modified:
   phpcompta/trunk/include/class_pre_operation.php
Log:
enlarge div for list of predefined operations

Modified: phpcompta/trunk/include/class_pre_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_operation.php	2013-10-05 17:43:07 U=
TC (rev 5469)
+++ phpcompta/trunk/include/class_pre_operation.php	2013-10-05 17:43:30 U=
TC (rev 5470)
@@ -247,7 +247,7 @@
     function form_get ($p_url)
     {
         $r=3DHtmlInput::button_action("Mod=C3=A8le d'op=C3=A9rations", '=
 $(\'modele_op_div\').style.display=3D\'block\';$(\'lk_modele_op_tab\').f=
ocus();');
-        $r.=3D'<div id=3D"modele_op_div">';
+        $r.=3D'<div id=3D"modele_op_div" style=3D"z-index:2;width:100%" =
class=3D"noprint">';
         $r.=3DHtmlInput::title_box("Mod=C3=A8le d'op=C3=A9rations ", 'mo=
dele_op_div', 'hide');
         $hid=3Dnew IHidden();
         $r.=3D$hid->input("action","use_opd");



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


From MAILER-DAEMON Sat Oct 05 13:54:14 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VSW3R-0001fO-Vo
	for mharc-phpcompta-dev@gnu.org; Sat, 05 Oct 2013 13:54:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  5 Oct 2013 19:44:14 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.61996.1380995653.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5471 - 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: Sat, 05 Oct 2013 17:54:12 -0000

Author: danydb
Date: 2013-10-05 19:44:13 +0200 (Sat, 05 Oct 2013)
New Revision: 5471

Modified:
   phpcompta/trunk/html/style-print.css
Log:
Do not print hidden list of predefined operation

Modified: phpcompta/trunk/html/style-print.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-print.css	2013-10-05 17:43:30 UTC (rev 547=
0)
+++ phpcompta/trunk/html/style-print.css	2013-10-05 17:44:13 UTC (rev 547=
1)
@@ -16,7 +16,7 @@
   display:none;
  }
=20
-.button {
+.button, .smallbutton{
 	display:none;
 	}
 div.recherche_form {



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


From MAILER-DAEMON Sat Oct 05 13:56:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VSW5s-0001pY-Aa
	for mharc-phpcompta-dev@gnu.org; Sat, 05 Oct 2013 13:56:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  5 Oct 2013 19:46:44 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.61997.1380995803.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r526 - trunk/amortis
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, 05 Oct 2013 17:56:43 -0000

Author: danydb
Date: 2013-10-05 19:46:43 +0200 (Sat, 05 Oct 2013)
New Revision: 526

Modified:
   trunk/amortis/amortize_javascript.js
Log:
enlarge div

Modified: trunk/amortis/amortize_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/amortize_javascript.js	2013-07-23 15:46:56 UTC (rev 525=
)
+++ trunk/amortis/amortize_javascript.js	2013-10-05 17:46:43 UTC (rev 526=
)
@@ -28,9 +28,9 @@
      {
             sx=3Ddocument.body.scrollTop+120;
      }
-    var str_style=3D"top:"+sx+";width:50%;height:70%";
+    var str_style=3D"top:"+sx+";width:60%;height:70%";
=20
-    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing()};
+    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20
     add_div(div);
=20
@@ -61,9 +61,9 @@
      {
             sx=3Ddocument.body.scrollTop+120;
      }
-    var str_style=3D"top:"+sx+";width:50%;height:auto";
+    var str_style=3D"top:"+sx+";width:60%;height:auto";
=20
-    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing()};
+    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20
     add_div(div);
=20



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


From MAILER-DAEMON Sat Oct 05 13:57:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VSW6G-0001tK-QZ
	for mharc-phpcompta-dev@gnu.org; Sat, 05 Oct 2013 13:57:08 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  5 Oct 2013 19:47:08 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.61998.1380995827.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r527 - in trunk: . rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Oct 2013 17:57:07 -0000

Author: danydb
Date: 2013-10-05 19:47:08 +0200 (Sat, 05 Oct 2013)
New Revision: 527

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

........
  r525 | danydb | 2013-07-23 17:46:56 +0200 (mar., 23 juil. 2013) | 1 lin=
e
 =20
  Bug in RAPAV_DD_ACCOUNT, the code for ledger of purchase was wrong
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel660:1-523
   + /tag/rel660:1-526

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-10-05 1=
7:46:43 UTC (rev 526)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-10-05 1=
7:47:08 UTC (rev 527)
@@ -405,7 +405,7 @@
 	{
 		static $s_start =3D "";
 		static $s_count =3D 0;
-           =20
+
 		if ($s_start =3D=3D "")
 		{
 			$s_start =3D $p_start;
@@ -766,9 +766,9 @@
 	{
 		if ($this->form->jrn_def_type =3D=3D 'ACH')
 		{
-			$sql =3D "select coalesce(sum(qs_vat),0) as amount
-						from quant_sold join jrnx using (j_id)
-						where qs_vat_code=3D$1
+			$sql =3D "select coalesce(sum(qp_vat),0) as amount
+						from quant_purchase join jrnx using (j_id)
+						where qp_vat_code=3D$1
 						and (j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date(=
$3,'DD.MM.YYYY'))
 						and j_poste::text like ($4)";
 			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,



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


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

Author: danydb
Date: 2013-10-06 01:04:03 +0200 (Sun, 06 Oct 2013)
New Revision: 5472

Modified:
   phpcompta/trunk/include/class_impress.php
Log:
indent

Modified: phpcompta/trunk/include/class_impress.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_impress.php	2013-10-05 17:44:13 UTC (re=
v 5471)
+++ phpcompta/trunk/include/class_impress.php	2013-10-05 23:04:03 UTC (re=
v 5472)
@@ -111,7 +111,7 @@
                         try
                           {
                             $pfrom=3D$oPeriode->find_periode('01.'.$from=
);
-							$cond=3D  sql_filter_per($p_cn, $pfrom, $p_end,'p_id','j_tech_per=
');
+                            $cond=3D  sql_filter_per($p_cn, $pfrom, $p_e=
nd,'p_id','j_tech_per');
                           }
                         catch (Exception $exp)
                           {



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


From MAILER-DAEMON Sat Oct 05 19:14:06 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VSb30-0000Wx-0M
	for mharc-phpcompta-dev@gnu.org; Sat, 05 Oct 2013 19:14:06 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun,  6 Oct 2013 01:04:06 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.62101.1381014845.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5473 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Oct 2013 23:14:05 -0000

Author: danydb
Date: 2013-10-06 01:04:06 +0200 (Sun, 06 Oct 2013)
New Revision: 5473

Modified:
   phpcompta/trunk/include/template/param_jrn.php
Log:
Inversion journaux

Modified: phpcompta/trunk/include/template/param_jrn.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/param_jrn.php	2013-10-05 23:04:03 UT=
C (rev 5472)
+++ phpcompta/trunk/include/template/param_jrn.php	2013-10-05 23:04:06 UT=
C (rev 5473)
@@ -126,10 +126,10 @@
     <TABLE class=3D"result" style=3D"width:80%;margin-left:10%;">
         <tr>
             <th>
-                Fournisseurs (D)
+                Services, fournitures ou biens  achet=C3=A9s (C)
             </th>
             <th>
-                Services, fournitures ou biens  achet=C3=A9s (C)
+                Fournisseurs (D)
             </th>
         </tr>
    =20
@@ -178,10 +178,10 @@
        =20
         <tr>
             <th>
-                Services, fournitures ou biens  vendus (D)
+                Clients (C)
             </th>
             <th>
-                Clients (C)
+                Services, fournitures ou biens  vendus (D)
             </th>
         </tr>
    =20



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


From MAILER-DAEMON Tue Oct 08 10:14:52 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VTY3o-0000FC-GR
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Oct 2013 10:14:52 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  8 Oct 2013 16:04:47 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.65049.1381241692.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5474 - 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: Tue, 08 Oct 2013 14:14:51 -0000

Author: danydb
Date: 2013-10-08 16:04:46 +0200 (Tue, 08 Oct 2013)
New Revision: 5474

Added:
   phpcompta/trunk/include/class_print_ledger.php
   phpcompta/trunk/include/class_print_ledger_detail_item.php
Modified:
   phpcompta/trunk/include/class_print_ledger_detail.php
   phpcompta/trunk/include/export_ledger_pdf.php
Log:
Task #890 PRINTJRN : export PDF et CSV des op?\195?\169rations d?\195?\16=
9taill?\195?\169es


Added: phpcompta/trunk/include/class_print_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_print_ledger.php	                      =
  (rev 0)
+++ phpcompta/trunk/include/class_print_ledger.php	2013-10-08 14:04:46 UT=
C (rev 5474)
@@ -0,0 +1,129 @@
+<?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
+ */
+
+/**
+ *  Parent class for the print_ledger class
+ *
+ * @author danydb
+ */
+require_once 'class_database.php';
+require_once('class_print_ledger_detail.php');
+require_once('class_print_ledger_simple.php');
+require_once('class_print_ledger_simple_without_vat.php');
+require_once('class_print_ledger_fin.php');
+require_once('class_print_ledger_misc.php');
+
+/**
+ * @brief Strategie class for the print_ledger class
+ *=20
+ */
+class Print_Ledger {
+
+    /**
+     * Create an object Print_Ledger* depending on $p_type_export ( 0 =3D=
> accounting
+     * 1-> one row per operation 2-> detail of item)
+     * @param type $cn
+     * @param type $p_type_export
+     * @param type $p_format_output CSV or PDF
+     * @param Acc_Ledger $ledger
+     */
+    static function factory(Database $cn, $p_type_export, $p_format_outp=
ut, Acc_Ledger $p_ledger) {
+        /**
+         * For PDF output
+         */
+        if ($p_format_output =3D=3D 'PDF') {
+            switch ($p_type_export) {
+                case 0:
+                    //---------------------------------------------
+                    // Detailled Printing (accounting )
+                    //---------------------------------------------
+                    return new Print_Ledger_Detail($cn, $p_ledger);
+                    break;
+
+                case 1:
+                    //--------------------------------------------------=
--------------------
+                    // Simple Printing Purchase Ledger
+                    //--------------------------------------------------=
-------------------
+                    $own =3D new Own($cn);
+                    $jrn_type =3D $p_ledger->get_type();
+
+
+                    if ($jrn_type =3D=3D 'ACH' || $jrn_type =3D=3D 'VEN'=
) {
+                        if (
+                                ($jrn_type =3D=3D 'ACH' && $cn->get_valu=
e('select count(qp_id) from quant_purchase') =3D=3D 0) ||
+                                ($jrn_type =3D=3D 'VEN' && $cn->get_valu=
e('select count(qs_id) from quant_sold') =3D=3D 0)
+                        ) {
+                            $pdf =3D new Print_Ledger_Simple_without_vat=
($cn, $p_ledger);
+                            $pdf->set_error('Ce journal ne peut =C3=AAtr=
e imprim=C3=A9 en mode simple');
+                            return $pdf;
+                        }
+                        if ($own->MY_TVA_USE =3D=3D 'Y') {
+                            $pdf =3D new Print_Ledger_Simple($cn, $p_led=
ger);
+                            return $pdf;
+                        }
+                        if ($own->MY_TVA_USE =3D=3D 'N') {
+                            $pdf =3D new Print_Ledger_Simple_without_vat=
($cn, $p_ledger);
+                            return $pdf;
+                        }
+                    }
+
+                    if ($jrn_type =3D=3D 'FIN') {
+                        $pdf =3D new Print_Ledger_Financial($cn, $p_ledg=
er);
+                        return $pdf;
+                    }
+                    if ($jrn_type =3D=3D 'ODS' || $p_ledger->id =3D=3D 0=
) {
+                        $pdf =3D new Print_Ledger_Misc($cn, $p_ledger);
+                        return $pdf;
+                    }
+                    break;
+                case 2:
+                    /*                     * ***************************=
*****************************
+                     * Print Detail Operation + Item
+                     * *************************************************=
******** */
+                    $own =3D new Own($cn);
+                    $jrn_type =3D $p_ledger->get_type();
+                    if ($jrn_type =3D=3D 'FIN') {
+                        $pdf =3D new Print_Ledger_Financial($cn, $p_ledg=
er);
+                        return $pdf;
+                        ;
+                    }
+                    if ($jrn_type =3D=3D 'ODS' || $p_ledger->id =3D=3D 0=
) {
+                        $pdf =3D new Print_Ledger_Misc($cn, $p_ledger);
+                        return $pdf;
+                    }
+                    if (
+                            ($jrn_type =3D=3D 'ACH' && $cn->get_value('s=
elect count(qp_id) from quant_purchase') =3D=3D 0) ||
+                            ($jrn_type =3D=3D 'VEN' && $cn->get_value('s=
elect count(qs_id) from quant_sold') =3D=3D 0)
+                    ) {
+                        $pdf =3D new Print_Ledger_Simple_without_vat($cn=
, $p_ledger);
+                        $pdf->set_error('Ce journal ne peut =C3=AAtre im=
prim=C3=A9 en mode simple');
+                        return $pdf;
+                    }
+                    $pdf =3D new Print_Ledger_Detail_Item($cn,$p_ledger)=
;
+                    return $pdf;
+                   =20
+            } // end switch
+        } // end $p_format =3D=3D PDF
+    }
+
+// end function
+}
+
+?>

Modified: phpcompta/trunk/include/class_print_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_detail.php	2013-10-05 23:0=
4:06 UTC (rev 5473)
+++ phpcompta/trunk/include/class_print_ledger_detail.php	2013-10-08 14:0=
4:46 UTC (rev 5474)
@@ -28,12 +28,13 @@
=20
 class Print_Ledger_Detail extends PDF
 {
-    public function __construct ($p_cn =3D null, $orientation =3D 'P', $=
unit =3D 'mm', $format =3D 'A4')
+    public function __construct ($p_cn =3D null, Acc_Ledger $ledger)
     {
=20
         if($p_cn =3D=3D null) die("No database connection. Abort.");
-
+       =20
         parent::__construct($p_cn,'L', 'mm', 'A4');
+        $this->ledger=3D$ledger;
         date_default_timezone_set ('Europe/Paris');
=20
     }
@@ -70,13 +71,14 @@
         return parent::Cell($w, $h, $txt, $border, $ln, $align, $fill, $=
link);
     }
=20
-    function export($Jrn)
+    function export()
     {
+       =20
         // detailled printing
         $rap_deb=3D0;
         $rap_cred=3D0;
         // take all operations from jrn
-        $array=3D$Jrn->get_operation($_GET['from_periode'],$_GET['to_per=
iode']);
+        $array=3D$this->ledger->get_operation($_GET['from_periode'],$_GE=
T['to_periode']);
=20
         $this->SetFont('DejaVu','BI',7);
         $this->Cell(215,7,'report D=C3=A9bit',0,0,'R');

Added: phpcompta/trunk/include/class_print_ledger_detail_item.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_detail_item.php	          =
              (rev 0)
+++ phpcompta/trunk/include/class_print_ledger_detail_item.php	2013-10-08=
 14:04:46 UTC (rev 5474)
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Print detail of operation PURCHASE or SOLD plus the items
+ * There is no report of the different amounts
+ *
+ * @author danydb
+ */
+class Print_Ledger_Detail_Item extends PDF
+{
+    public function __construct ($p_cn,$p_jrn)
+    {
+
+        if($p_cn =3D=3D null) die("No database connection. Abort.");
+
+        parent::__construct($p_cn,'L', 'mm', 'A4');
+        $this->ledger=3D$p_jrn;
+       =20
+    }
+
+    function setDossierInfo($dossier =3D "n/a")
+    {
+        $this->dossier =3D dossier::name()." ".$dossier;
+    }
+    /**
+     *@brief write the header of each page
+     */
+    function Header()
+    {
+        //Arial bold 12
+        $this->SetFont('DejaVu', 'B', 12);
+        //Title
+        $this->Cell(0,10,$this->dossier, 'B', 0, 'C');
+        //Line break
+        $this->Ln(20);
+       =20
+    }
+    /**
+     *@brief write the Footer
+     */
+    function Footer()
+    {
+        //Position at 3 cm from bottom
+        $this->SetY(-20);
+        /* write reporting  */
+        $this->Cell(143,6,'Total page ','T',0,'R'); /* HTVA */
+        $this->Cell(15,6,nbm($this->tp_htva),'T',0,'R'); /* HTVA */
+        if ( $this->jrn_type !=3D'VEN')
+        {
+            $this->Cell(15,6,nbm($this->tp_priv),'T',0,'R');  /* prive *=
/
+            $this->Cell(15,6,nbm($this->tp_nd),'T',0,'R');  /* Tva ND */
+        }
+        foreach($this->a_Tva as $line_tva)
+        {
+            $l=3D$line_tva['tva_id'];
+            $this->Cell(15,6,nbm($this->tp_tva[$l]),'T',0,'R');
+        }
+        $this->Cell(15,6,nbm($this->tp_tvac),'T',0,'R'); /* Tvac */
+        $this->Ln(2);
+
+        $this->Cell(143,6,'report',0,0,'R'); /* HTVA */
+        $this->Cell(15,6,nbm($this->rap_htva),0,0,'R'); /* HTVA */
+        if ( $this->jrn_type !=3D'VEN')
+        {
+            $this->Cell(15,6,nbm($this->rap_priv),0,0,'R');  /* prive */
+            $this->Cell(15,6,nbm($this->rap_nd),0,0,'R');  /* Tva ND */
+        }
+        foreach($this->a_Tva as $line_tva)
+        {
+            $l=3D$line_tva['tva_id'];
+            $this->Cell(15,6,nbm($this->rap_tva[$l]),0,0,'R');
+        }
+        $this->Cell(15,6,nbm($this->rap_tvac),0,0,'R'); /* Tvac */
+        $this->Ln(2);
+
+        //Arial italic 8
+        $this->SetFont('Arial', 'I', 8);
+        //Page number
+        $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'=
/{nb}',0,0,'L');
+        // Created by PhpCompta
+        $this->Cell(0,8,'Created by Phpcompta, online on http://www.aeva=
lys.eu',0,0,'R',false,'http://www.aevalys.eu');
+    }
+
+    function Cell ($w, $h=3D0, $txt=3D'', $border=3D0, $ln=3D0, $align=3D=
'', $fill=3Dfalse, $link=3D'')
+    {
+        $txt =3D str_replace("\\", "", $txt);
+        return parent::Cell($w, $h, $txt, $border, $ln, $align, $fill, $=
link);
+    }
+    /**
+     *@brief export the ledger in  PDF
+     */
+    function export()
+    {
+      bcscale(2);
+        $a_jrn=3D$this->ledger->get_operation($_GET['from_periode'],
+                                            $_GET['to_periode']);
+
+        if ( $a_jrn =3D=3D null ) return;
+        for ( $i=3D0;$i<count($a_jrn);$i++)
+        {
+           =20
+        }
+    }
+
+}
+?>

Modified: phpcompta/trunk/include/export_ledger_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_ledger_pdf.php	2013-10-05 23:04:06 UTC=
 (rev 5473)
+++ phpcompta/trunk/include/export_ledger_pdf.php	2013-10-08 14:04:46 UTC=
 (rev 5474)
@@ -21,13 +21,14 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 // $Revision$
-/*! \file
+/* ! \file
  * \brief Send a ledger in a pdf format
  *
  */
-if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
 require_once('class_dossier.php');
-$gDossier=3Ddossier::id();
+$gDossier =3D dossier::id();
 require_once('class_pdf.php');
 include_once('class_user.php');
 include_once("ac_common.php");
@@ -36,146 +37,44 @@
 include_once("class_acc_ledger.php");
 require_once('class_own.php');
 require_once('class_periode.php');
-require_once('class_print_ledger_detail.php');
-require_once('class_print_ledger_simple.php');
-require_once('class_print_ledger_simple_without_vat.php');
-require_once('class_print_ledger_fin.php');
-require_once('class_print_ledger_misc.php');
+require_once 'class_print_ledger.php';
=20
=20
-$cn=3Dnew Database($gDossier);
-$periode=3Dnew Periode($cn);
+        $cn =3D new Database($gDossier);
+$periode =3D new Periode($cn);
=20
-$l_type=3D"JRN";
-$own=3Dnew Own($cn);
+$l_type =3D "JRN";
+$own =3D new Own($cn);
=20
-$Jrn=3Dnew Acc_Ledger($cn,$_GET['jrn_id']);
+$Jrn =3D new Acc_Ledger($cn, $_GET['jrn_id']);
=20
 $Jrn->get_name();
 $g_user->Check();
 $g_user->check_dossier($gDossier);
=20
 // Security
-if ( $_GET['jrn_id']!=3D0 &&  $g_user->check_jrn($_GET['jrn_id']) =3D=3D=
 'X' )
-{
+if ($_GET['jrn_id'] !=3D 0 && $g_user->check_jrn($_GET['jrn_id']) =3D=3D=
 'X') {
     /* Cannot Access */
     NoAccess();
 }
=20
-$ret=3D"";
+$ret =3D "";
=20
-// filter : 0 for Grand Livre otherwise 1
-$filter=3D( $Jrn->id =3D=3D 0)?0:1;
-$jrn_type=3D$Jrn->get_type();
+$jrn_type =3D $Jrn->get_type();
=20
-//----------------------------------------------------------------------
-// Detailled Printing
-//---------------------------------------------------------------------
-if ( $_REQUEST['p_simple']=3D=3D 0 )
-{
-    $pdf=3Dnew Print_Ledger_Detail($cn);
-    $pdf->setDossierInfo($Jrn->name);
-    $pdf->AliasNbPages();
-    $pdf->AddPage();
-    $pdf->SetAuthor('Phpcompta');
-    $pdf->setTitle("Journal",true);
+$pdf =3D Print_Ledger::factory($cn, $_REQUEST['p_simple'], "PDF", $Jrn);
=20
-    $pdf->export($Jrn);
+$pdf->setDossierInfo($Jrn->name);
+$pdf->AliasNbPages();
+$pdf->AddPage();
+$pdf->SetAuthor('Phpcompta');
+$pdf->setTitle("Journal", true);
=20
-    $fDate=3Ddate('dmy-Hi');
-    $pdf->Output('journal-'.$fDate.'.pdf','D');
-    exit(0);
+$pdf->export();
=20
-} // impression detaill=C3=A9
-//----------------------------------------------------------------------
-// Simple Printing Purchase Ledger
-//---------------------------------------------------------------------
-if   (  $_REQUEST['p_simple']=3D=3D 1 )
-{
-    if ( $jrn_type=3D=3D'ACH' || $jrn_type=3D=3D'VEN')
-    {
-        if ( $jrn_type=3D=3D'ACH' && $cn->get_value('select count(qp_id)=
 from quant_purchase') =3D=3D 0 )
-        {
-            $pdf=3D new Print_Ledger_Simple_without_vat($cn,$Jrn);
-            $pdf->setDossierInfo($Jrn->name);
-            $pdf->AliasNbPages();
-            $pdf->AddPage();
-            $pdf->SetAuthor('Phpcompta');
-            $pdf->setTitle("Journal",true);
+$fDate =3D date('dmy-Hi');
+$pdf->Output('journal-' . $fDate . '.pdf', 'D');
+exit(0);
=20
-            $pdf->Cell(0,6,'Ce journal ne peut =C3=AAtre imprim=C3=A9 en=
 mode simple');
-            $pdf->output('erreur.pdf','D');
-            exit();
-        }
-        if ( $jrn_type=3D=3D'VEN' && $cn->get_value('select count(qs_id)=
 from quant_sold') =3D=3D 0 )
-        {
-            $pdf=3D new Print_Ledger_Simple_without_vat($cn,$Jrn);
-            $pdf->setDossierInfo($Jrn->name);
-            $pdf->AliasNbPages();
-            $pdf->AddPage();
-            $pdf->Cell(0,6,'Ce journal ne peut =C3=AAtre imprim=C3=A9 en=
 mode simple');
-            $pdf->output('erreur.pdf','D');
-            exit();
-        }
=20
-        if ( $own->MY_TVA_USE=3D=3D'Y')
-        {
-            $pdf=3D new Print_Ledger_Simple($cn,$Jrn);
-            $pdf->setDossierInfo($Jrn->name);
-            $pdf->AliasNbPages();
-            $pdf->AddPage();
-            $pdf->SetAuthor('Phpcompta');
-            $pdf->setTitle("Journal",true);
-
-            $pdf->export();
-            $fDate=3Ddate('dmy-Hi');
-            $pdf->Output('journal-'.$fDate.'.pdf','D');
-            exit(0);
-        }
-        if ( $own->MY_TVA_USE=3D=3D'N')
-        {
-            $pdf=3D new Print_Ledger_Simple_without_vat($cn,$Jrn);
-            $pdf->setDossierInfo($Jrn->name);
-            $pdf->AliasNbPages();
-            $pdf->AddPage();
-            $pdf->SetAuthor('Phpcompta');
-            $pdf->setTitle("Journal", true);
-
-            $pdf->export($Jrn);
-            $fDate=3Ddate('dmy-Hi');
-            $pdf->Output('journal-'.$fDate.'.pdf','D');
-            exit(0);
-        }
-
-    }
-
-    if ($jrn_type=3D=3D'FIN')
-    {
-        $pdf=3D new Print_Ledger_Financial($cn,$Jrn);
-        $pdf->setDossierInfo($Jrn->name);
-        $pdf->AliasNbPages();
-        $pdf->AddPage();
-        $pdf->SetAuthor('Phpcompta');
-        $pdf->setTitle("Journal",true);
-
-        $pdf->export();
-        $fDate=3Ddate('dmy-Hi');
-        $pdf->Output('journal-'.$fDate.'.pdf','D');
-        exit(0);
-    }
-    if ( $jrn_type=3D=3D'ODS' || $Jrn->id=3D=3D0)
-    {
-        $pdf=3D new Print_Ledger_Misc($cn,$Jrn);
-        $pdf->setDossierInfo($Jrn->name);
-        $pdf->AliasNbPages();
-        $pdf->SetAuthor('Phpcompta');
-        $pdf->setTitle("Journal",true);
-
-        $pdf->AddPage();
-        $pdf->export();
-        $fDate=3Ddate('dmy-Hi');
-        $pdf->Output('journal-'.$fDate.'.pdf','D');
-        exit(0);
-    }
-}
 ?>



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


From MAILER-DAEMON Tue Oct 08 12:41:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VTaLF-0007Ax-Md
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Oct 2013 12:41:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  8 Oct 2013 18:30:56 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.65175.1381250461.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5475 - phpcompta/trunk/html/js
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Oct 2013 16:41:00 -0000

Author: danydb
Date: 2013-10-08 18:30:56 +0200 (Tue, 08 Oct 2013)
New Revision: 5475

Modified:
   phpcompta/trunk/html/js/scripts.js
Log:
remove debug information javascript

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-10-08 14:04:46 UTC (rev 5474)
+++ phpcompta/trunk/html/js/scripts.js	2013-10-08 16:30:56 UTC (rev 5475)
@@ -603,7 +603,6 @@
 {
     try
     {
-        console.log(obj);
         var top=3Ddocument;
        =20
         if ( ! $(obj.id) )  { var elt=3Dtop.createElement('div');}
@@ -2003,7 +2002,6 @@
 {
     try {
         waiting_box();
-        console.log(p_post);
         var queryString=3D"op=3Dtag_detail&tag=3D"+p_tag_id+"&gDossier=3D=
"+p_dossier+"&ac=3D"+p_ac+'&form=3D'+p_post;
 	var action =3D new Ajax.Request(
 				  "ajax_misc.php" ,
@@ -2316,9 +2314,7 @@
     try {
        =20
         var query=3D"";
-        console.log(obj);
         query=3D"op=3Dcalendar_zoom&gDossier=3D"+obj.gDossier+"&in=3D"+$=
(obj.invalue).value+'&out=3D'+obj.outdiv;
-        console.log(query);
         waiting_box();
         var action =3D new Ajax.Request(
                                       "ajax_misc.php" ,
@@ -2326,20 +2322,15 @@
                                           method:'get', parameters:query=
,
                                           onFailure:ajax_misc_failure,
                                           onSuccess:function(req,j){
-                                                    console.log(1);
                                                     var answer=3Dreq.res=
ponseXML;
-                                                    console.log(2);
                                                     var html=3Danswer.ge=
tElementsByTagName('html');
-                                                    console.log(3);
                                                     if ( html.length =3D=
=3D 0 )
                                                     {
-                                                    console.log(4);
                                                         var rec=3Dunesca=
pe_xml(req.responseText);
                                                         error_message ('=
erreur :'+rec);
                                                     }
                                                     var code_html=3DgetN=
odeText(html[0]);
                                                     code_html=3Dunescape=
_xml(code_html);
-                                                    console.log(5);
                                                    =20
                                                     // if the target doe=
sn't exist=20
                                                     // then create it
@@ -2349,12 +2340,9 @@
                                                     if (   $(obj.outdiv)=
 =3D=3D undefined) {
                                                         var str_style=3D=
fixed_position(0,20);
                                                         add_div({id:obj.=
outdiv,style:'margin-left:3%;width:94%;height:94%;'+str_style,cssclass:"i=
nner_box",drag:1});
-                                                        console.log(5);
                                                     }
                                                     remove_waiting_box()=
;
-                                                    console.log(6);
                                                     $(obj.outdiv).innerH=
TML=3Dcode_html;
-                                                    console.log(7);
                                                     $(obj.outdiv).show()=
;
                                           }
                                       }
@@ -2364,4 +2352,4 @@
     }
  =20
    =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 Tue Oct 08 12:46:21 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VTaQP-0007pN-MZ
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Oct 2013 12:46:21 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  8 Oct 2013 18:36:16 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.65178.1381250781.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5476 - phpcompta/tags/rel650/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, 08 Oct 2013 16:46:21 -0000

Author: danydb
Date: 2013-10-08 18:36:16 +0200 (Tue, 08 Oct 2013)
New Revision: 5476

Added:
   phpcompta/tags/rel650/sql/t870-upgrade.sql
   phpcompta/tags/rel650/sql/t872-upgrade.sql
Log:
task 870 & 872

Added: phpcompta/tags/rel650/sql/t870-upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/sql/t870-upgrade.sql	                        (r=
ev 0)
+++ phpcompta/tags/rel650/sql/t870-upgrade.sql	2013-10-08 16:36:16 UTC (r=
ev 5476)
@@ -0,0 +1,43 @@
+=EF=BB=BF-- View: syndicat.vw_historic
+
+DROP VIEW syndicat.vw_historic;
+
+CREATE OR REPLACE VIEW syndicat.vw_historic AS=20
+         SELECT operation.o_id AS id, operation.o_date AS xdate, operati=
on.o_label AS label, ( SELECT sum(operation_detail.od_amount) AS sum
+                   FROM syndicat.operation_detail
+                  WHERE operation_detail.o_id =3D operation.o_id) AS sum=
_operation, 'O'::text AS type_table, operation.sect_id, operation.jrn_def=
_id, operation.o_id, operation.o_receipt,=20
+                CASE
+                    WHEN operation.o_third =3D 0 THEN operation.o_benef
+                    ELSE operation.o_third
+                END AS tiers, n.name, n.first_name,=20
+                CASE
+                    WHEN operation.o_type =3D 'N'::bpchar THEN 'NOTE'::t=
ext
+                    WHEN operation.o_type =3D 'A'::bpchar THEN 'ACHA'::t=
ext
+                    WHEN operation.o_type =3D 'V'::bpchar THEN 'RECE'::t=
ext
+                    ELSE NULL::text
+                END AS type_opr, ( SELECT jrn_def.jrn_def_name
+                   FROM jrn_def
+                  WHERE jrn_def.jrn_def_id =3D operation.jrn_def_id) AS =
ledger_name,
+		  mp_description=20
+           FROM syndicat.operation
+      LEFT JOIN ( SELECT a.f_id, a.ad_value AS name, b.ad_value AS first=
_name
+                   FROM fiche_detail a
+              LEFT JOIN fiche_detail b ON a.f_id =3D b.f_id AND b.ad_id =
=3D 32
+             WHERE a.ad_id =3D 1) n ON operation.o_benef =3D n.f_id OR o=
peration.o_third =3D n.f_id
+      left join syndicat.payment_method on (mp_id =3D o_payment)
+UNION ALL=20
+         SELECT bank.b_id AS id, bank.b_date AS xdate, bank.b_libelle AS=
 label, bank.b_amount AS sum_operation, 'B'::text AS type_table, bank.sec=
t_id, bank.jrn_def_id, bank.o_id, ''::text AS o_receipt, bank.b_other AS =
tiers, n.name, n.first_name, bank_code.b_type AS type_opr, ( SELECT jrn_d=
ef.jrn_def_name
+                   FROM jrn_def
+                  WHERE jrn_def.jrn_def_id =3D bank.jrn_def_id) AS ledge=
r_name,
+                  mp_description
+           FROM syndicat.bank
+      JOIN syndicat.bank_code ON bank.b_code =3D bank_code.b_code
+   LEFT JOIN ( SELECT a.f_id, a.ad_value AS name, b.ad_value AS first_na=
me
+                 FROM fiche_detail a
+         LEFT JOIN fiche_detail b ON a.f_id =3D b.f_id AND b.ad_id =3D 3=
2
+           WHERE a.ad_id =3D 1) n ON n.f_id =3D bank.b_other
+      left join syndicat.payment_method on (mp_id =3D b_payment)        =
  =20
+
+ALTER TABLE syndicat.vw_historic
+  OWNER TO phpcompta;
+

Added: phpcompta/tags/rel650/sql/t872-upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/sql/t872-upgrade.sql	                        (r=
ev 0)
+++ phpcompta/tags/rel650/sql/t872-upgrade.sql	2013-10-08 16:36:16 UTC (r=
ev 5476)
@@ -0,0 +1,45 @@
+=EF=BB=BF-- View: syndicat.vw_historic
+
+DROP VIEW syndicat.vw_historic;
+
+CREATE OR REPLACE VIEW syndicat.vw_historic AS=20
+         SELECT operation.o_id AS id, operation.o_date AS xdate, operati=
on.o_label AS label, ( SELECT sum(operation_detail.od_amount) AS sum
+                   FROM syndicat.operation_detail
+                  WHERE operation_detail.o_id =3D operation.o_id) AS sum=
_operation, 'O'::text AS type_table, operation.sect_id, operation.jrn_def=
_id, operation.o_id, operation.o_receipt,=20
+                CASE
+                    WHEN operation.o_third =3D 0 THEN operation.o_benef
+                    ELSE operation.o_third
+                END AS tiers, n.name, n.first_name,=20
+                CASE
+                    WHEN operation.o_type =3D 'N'::bpchar THEN 'NOTE'::t=
ext
+                    WHEN operation.o_type =3D 'A'::bpchar THEN 'ACHA'::t=
ext
+                    WHEN operation.o_type =3D 'V'::bpchar THEN 'RECE'::t=
ext
+                    ELSE NULL::text
+                END AS type_opr, ( SELECT jrn_def.jrn_def_name
+                   FROM jrn_def
+                  WHERE jrn_def.jrn_def_id =3D operation.jrn_def_id) AS =
ledger_name,
+		  mp_description ,
+		    (select string_agg(po_name, ',' order by po_name) from poste_analy=
tique where po_id in (select po_id from syndicat.operation_detail where o=
_id=3Doperation.o_id) )as activite
+           FROM syndicat.operation
+      LEFT JOIN ( SELECT a.f_id, a.ad_value AS name, b.ad_value AS first=
_name
+                   FROM fiche_detail a
+              LEFT JOIN fiche_detail b ON a.f_id =3D b.f_id AND b.ad_id =
=3D 32
+             WHERE a.ad_id =3D 1) n ON operation.o_benef =3D n.f_id OR o=
peration.o_third =3D n.f_id
+      left join syndicat.payment_method on (mp_id =3D o_payment)
+      UNION ALL=20
+         SELECT bank.b_id AS id, bank.b_date AS xdate, bank.b_libelle AS=
 label, bank.b_amount AS sum_operation, 'B'::text AS type_table, bank.sec=
t_id, bank.jrn_def_id, bank.o_id, ''::text AS o_receipt, bank.b_other AS =
tiers, n.name, n.first_name, bank_code.b_type AS type_opr, ( SELECT jrn_d=
ef.jrn_def_name
+                   FROM jrn_def
+                  WHERE jrn_def.jrn_def_id =3D bank.jrn_def_id) AS ledge=
r_name,
+                  mp_description,
+                  ''=20
+           FROM syndicat.bank
+      JOIN syndicat.bank_code ON bank.b_code =3D bank_code.b_code
+   LEFT JOIN ( SELECT a.f_id, a.ad_value AS name, b.ad_value AS first_na=
me
+                 FROM fiche_detail a
+         LEFT JOIN fiche_detail b ON a.f_id =3D b.f_id AND b.ad_id =3D 3=
2
+           WHERE a.ad_id =3D 1) n ON n.f_id =3D bank.b_other
+      left join syndicat.payment_method on (mp_id =3D b_payment)        =
  =20
+
+ALTER TABLE syndicat.vw_historic
+  OWNER TO phpcompta;
+



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


From MAILER-DAEMON Tue Oct 08 12:47:36 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VTaRb-00081y-UK
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Oct 2013 12:47:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  8 Oct 2013 18:37:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.65179.1381250855.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5477 - phpcompta/tags/rel650/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, 08 Oct 2013 16:47:34 -0000

Author: danydb
Date: 2013-10-08 18:37:31 +0200 (Tue, 08 Oct 2013)
New Revision: 5477

Removed:
   phpcompta/tags/rel650/sql/t870-upgrade.sql
   phpcompta/tags/rel650/sql/t872-upgrade.sql
Log:
misplaced files


Deleted: phpcompta/tags/rel650/sql/t870-upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/sql/t870-upgrade.sql	2013-10-08 16:36:16 UTC (r=
ev 5476)
+++ phpcompta/tags/rel650/sql/t870-upgrade.sql	2013-10-08 16:37:31 UTC (r=
ev 5477)
@@ -1,43 +0,0 @@
-=EF=BB=BF-- View: syndicat.vw_historic
-
-DROP VIEW syndicat.vw_historic;
-
-CREATE OR REPLACE VIEW syndicat.vw_historic AS=20
-         SELECT operation.o_id AS id, operation.o_date AS xdate, operati=
on.o_label AS label, ( SELECT sum(operation_detail.od_amount) AS sum
-                   FROM syndicat.operation_detail
-                  WHERE operation_detail.o_id =3D operation.o_id) AS sum=
_operation, 'O'::text AS type_table, operation.sect_id, operation.jrn_def=
_id, operation.o_id, operation.o_receipt,=20
-                CASE
-                    WHEN operation.o_third =3D 0 THEN operation.o_benef
-                    ELSE operation.o_third
-                END AS tiers, n.name, n.first_name,=20
-                CASE
-                    WHEN operation.o_type =3D 'N'::bpchar THEN 'NOTE'::t=
ext
-                    WHEN operation.o_type =3D 'A'::bpchar THEN 'ACHA'::t=
ext
-                    WHEN operation.o_type =3D 'V'::bpchar THEN 'RECE'::t=
ext
-                    ELSE NULL::text
-                END AS type_opr, ( SELECT jrn_def.jrn_def_name
-                   FROM jrn_def
-                  WHERE jrn_def.jrn_def_id =3D operation.jrn_def_id) AS =
ledger_name,
-		  mp_description=20
-           FROM syndicat.operation
-      LEFT JOIN ( SELECT a.f_id, a.ad_value AS name, b.ad_value AS first=
_name
-                   FROM fiche_detail a
-              LEFT JOIN fiche_detail b ON a.f_id =3D b.f_id AND b.ad_id =
=3D 32
-             WHERE a.ad_id =3D 1) n ON operation.o_benef =3D n.f_id OR o=
peration.o_third =3D n.f_id
-      left join syndicat.payment_method on (mp_id =3D o_payment)
-UNION ALL=20
-         SELECT bank.b_id AS id, bank.b_date AS xdate, bank.b_libelle AS=
 label, bank.b_amount AS sum_operation, 'B'::text AS type_table, bank.sec=
t_id, bank.jrn_def_id, bank.o_id, ''::text AS o_receipt, bank.b_other AS =
tiers, n.name, n.first_name, bank_code.b_type AS type_opr, ( SELECT jrn_d=
ef.jrn_def_name
-                   FROM jrn_def
-                  WHERE jrn_def.jrn_def_id =3D bank.jrn_def_id) AS ledge=
r_name,
-                  mp_description
-           FROM syndicat.bank
-      JOIN syndicat.bank_code ON bank.b_code =3D bank_code.b_code
-   LEFT JOIN ( SELECT a.f_id, a.ad_value AS name, b.ad_value AS first_na=
me
-                 FROM fiche_detail a
-         LEFT JOIN fiche_detail b ON a.f_id =3D b.f_id AND b.ad_id =3D 3=
2
-           WHERE a.ad_id =3D 1) n ON n.f_id =3D bank.b_other
-      left join syndicat.payment_method on (mp_id =3D b_payment)        =
  =20
-
-ALTER TABLE syndicat.vw_historic
-  OWNER TO phpcompta;
-

Deleted: phpcompta/tags/rel650/sql/t872-upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/sql/t872-upgrade.sql	2013-10-08 16:36:16 UTC (r=
ev 5476)
+++ phpcompta/tags/rel650/sql/t872-upgrade.sql	2013-10-08 16:37:31 UTC (r=
ev 5477)
@@ -1,45 +0,0 @@
-=EF=BB=BF-- View: syndicat.vw_historic
-
-DROP VIEW syndicat.vw_historic;
-
-CREATE OR REPLACE VIEW syndicat.vw_historic AS=20
-         SELECT operation.o_id AS id, operation.o_date AS xdate, operati=
on.o_label AS label, ( SELECT sum(operation_detail.od_amount) AS sum
-                   FROM syndicat.operation_detail
-                  WHERE operation_detail.o_id =3D operation.o_id) AS sum=
_operation, 'O'::text AS type_table, operation.sect_id, operation.jrn_def=
_id, operation.o_id, operation.o_receipt,=20
-                CASE
-                    WHEN operation.o_third =3D 0 THEN operation.o_benef
-                    ELSE operation.o_third
-                END AS tiers, n.name, n.first_name,=20
-                CASE
-                    WHEN operation.o_type =3D 'N'::bpchar THEN 'NOTE'::t=
ext
-                    WHEN operation.o_type =3D 'A'::bpchar THEN 'ACHA'::t=
ext
-                    WHEN operation.o_type =3D 'V'::bpchar THEN 'RECE'::t=
ext
-                    ELSE NULL::text
-                END AS type_opr, ( SELECT jrn_def.jrn_def_name
-                   FROM jrn_def
-                  WHERE jrn_def.jrn_def_id =3D operation.jrn_def_id) AS =
ledger_name,
-		  mp_description ,
-		    (select string_agg(po_name, ',' order by po_name) from poste_analy=
tique where po_id in (select po_id from syndicat.operation_detail where o=
_id=3Doperation.o_id) )as activite
-           FROM syndicat.operation
-      LEFT JOIN ( SELECT a.f_id, a.ad_value AS name, b.ad_value AS first=
_name
-                   FROM fiche_detail a
-              LEFT JOIN fiche_detail b ON a.f_id =3D b.f_id AND b.ad_id =
=3D 32
-             WHERE a.ad_id =3D 1) n ON operation.o_benef =3D n.f_id OR o=
peration.o_third =3D n.f_id
-      left join syndicat.payment_method on (mp_id =3D o_payment)
-      UNION ALL=20
-         SELECT bank.b_id AS id, bank.b_date AS xdate, bank.b_libelle AS=
 label, bank.b_amount AS sum_operation, 'B'::text AS type_table, bank.sec=
t_id, bank.jrn_def_id, bank.o_id, ''::text AS o_receipt, bank.b_other AS =
tiers, n.name, n.first_name, bank_code.b_type AS type_opr, ( SELECT jrn_d=
ef.jrn_def_name
-                   FROM jrn_def
-                  WHERE jrn_def.jrn_def_id =3D bank.jrn_def_id) AS ledge=
r_name,
-                  mp_description,
-                  ''=20
-           FROM syndicat.bank
-      JOIN syndicat.bank_code ON bank.b_code =3D bank_code.b_code
-   LEFT JOIN ( SELECT a.f_id, a.ad_value AS name, b.ad_value AS first_na=
me
-                 FROM fiche_detail a
-         LEFT JOIN fiche_detail b ON a.f_id =3D b.f_id AND b.ad_id =3D 3=
2
-           WHERE a.ad_id =3D 1) n ON n.f_id =3D bank.b_other
-      left join syndicat.payment_method on (mp_id =3D b_payment)        =
  =20
-
-ALTER TABLE syndicat.vw_historic
-  OWNER TO phpcompta;
-



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


From MAILER-DAEMON Tue Oct 08 14:49:03 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VTcL9-0005hw-Rm
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Oct 2013 14:49:03 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  8 Oct 2013 20:38:59 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.65269.1381258142.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5478 - 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: Tue, 08 Oct 2013 18:49:02 -0000

Author: danydb
Date: 2013-10-08 20:38:59 +0200 (Tue, 08 Oct 2013)
New Revision: 5478

Added:
   phpcompta/trunk/include/ajax_calendar_zoom.php
Log:
Task #893 Zoom sur le Calendrier


Added: phpcompta/trunk/include/ajax_calendar_zoom.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_calendar_zoom.php	                      =
  (rev 0)
+++ phpcompta/trunk/include/ajax_calendar_zoom.php	2013-10-08 18:38:59 UT=
C (rev 5478)
@@ -0,0 +1,43 @@
+<?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
+if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
+require_once 'class_calendar.php';
+ob_start();
+echo HtmlInput::title_box("Calendrier", "calendar_zoom_div");
+$cal=3Dnew Calendar();
+$cal->set_periode($_GET['in']);
+echo $cal->zoom();
+$response=3D  ob_get_clean();
+ob_end_clean();
+
+$html=3Descape_xml($response);
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl></ctl>
+<html>$html</html>
+</data>
+EOF;
+exit();
+
+
+?>



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


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

Author: danydb
Date: 2013-10-09 19:07:34 +0200 (Wed, 09 Oct 2013)
New Revision: 5479

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
Log:
Bug : ODS save each time a template

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-10-08 18:38:59 UTC =
(rev 5478)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-10-09 17:07:34 UTC =
(rev 5479)
@@ -2090,7 +2090,7 @@
 			$this->internal =3D $internal;
 			// Save now the predef op
 			//------------------------
-                        if (isset ($opd_name)){
+                        if (isset ($opd_name) && trim($opd_name) !=3D ""=
 ){
 				$opd =3D new Pre_Op_Advanced($this->db);
 				$opd->get_post();
 				$opd->save();



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


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

Author: danydb
Date: 2013-10-09 19:53:24 +0200 (Wed, 09 Oct 2013)
New Revision: 5480

Modified:
   phpcompta/trunk/include/class_pre_op_advanced.php
Log:
Bug : cannot save accounting in predef

Modified: phpcompta/trunk/include/class_pre_op_advanced.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_advanced.php	2013-10-09 17:07:34=
 UTC (rev 5479)
+++ phpcompta/trunk/include/class_pre_op_advanced.php	2013-10-09 17:53:24=
 UTC (rev 5480)
@@ -46,8 +46,8 @@
         {
             if ( ! isset ($_POST['poste'.$i]) && ! isset ($_POST['qc_'.$=
i]))
                 continue;
-            $this->{'poste'.$i}=3D(isset($_POST['qc_'.$i]))?$_POST['qc_'=
.$i]:$_POST['poste'.$i];
-            $this->{'isqc'.$i}=3D(isset($_POST['qc_'.$i]))?'t':'f';
+            $this->{'poste'.$i}=3D(trim($_POST['qc_'.$i]) !=3D "" )?$_PO=
ST['qc_'.$i]:$_POST['poste'.$i];
+            $this->{'isqc'.$i}=3D(trim($_POST['qc_'.$i]) !=3D "")?'t':'f=
';
             $this->{"amount".$i}=3D$_POST['amount'.$i];
             $this->{"ck".$i}=3D(isset($_POST['ck'.$i]))?'t':'f';
=20



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


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

Author: danydb
Date: 2013-10-09 20:21:43 +0200 (Wed, 09 Oct 2013)
New Revision: 5481

Modified:
   phpcompta/trunk/include/class_calendar.php
   phpcompta/trunk/include/template/calendar.php
   phpcompta/trunk/include/template/dashboard.php
Log:
Improve calendar and fix bug for appearance in chrome


Modified: phpcompta/trunk/include/class_calendar.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_calendar.php	2013-10-09 17:53:24 UTC (r=
ev 5480)
+++ phpcompta/trunk/include/class_calendar.php	2013-10-09 18:21:43 UTC (r=
ev 5481)
@@ -53,9 +53,11 @@
 		$profile=3D$g_user->get_profile();
=20
         $cn=3Dnew Database(dossier::id());
-        $sql=3D"select ag_id,to_char(ag_remind_date,'DD')::integer as ag=
_timestamp_day,ag_title,ag_hour
+        $sql=3D"select ag_id,to_char(ag_remind_date,'DD')::integer as ag=
_timestamp_day,ag_title,ag_hour,
+             coalesce(name,'interne') as str_name
 			".
              " from action_gestion ".
+             "  left join vw_fiche_name  on (f_id=3Df_id_dest) ".
              " where ".
              " to_char(ag_remind_date,'MM')::integer=3D$1 ".
              " and to_char(ag_remind_date,'YYYY')::integer=3D$2 ".
@@ -70,6 +72,7 @@
             $this->action[$ind][]=3D$array[$i]['ag_id'];
             $this->title[$ind][]=3D$array[$i]['ag_title'];
             $this->hour[$ind][]=3D$array[$i]['ag_hour'];
+            $this->str_name[$ind][]=3D$array[$i]['str_name'];
=20
         }
 		/*
@@ -99,7 +102,7 @@
                         $p_array[$day].=3D"<ol>";
 			for ($i=3D0;$i<count($aAction);$i++)
 			{
-				$p_array[$day].=3D'<li>&rarr;'.HtmlInput::detail_action($aAction[$i]=
, $this->hour[$day][$i]." ".$this->title[$day][$i]).'</li>';
+				$p_array[$day].=3D'<li>'.hb($this->str_name[$day][$i]).'&rarr;'.Html=
Input::detail_action($aAction[$i], $this->hour[$day][$i]." ".$this->title=
[$day][$i]).'</li>';
 			}
 			$p_array[$day].=3D'</ol>';
 		}
@@ -171,6 +174,7 @@
         $wMonth->set_attribute('gDossier',dossier::id());
         $month_year=3D$wMonth->input().$wMonth->get_js_attr();
         ob_start();
+        $zoom=3D0;
         require_once('template/calendar.php');
=20
 		if (count($this->action_div) > 0)
@@ -257,6 +261,7 @@
             dossier::id(),'per_div','calendar_zoom_div');
         $wMonth->set_attribute('gDossier',dossier::id());
         $month_year=3D$wMonth->input().$wMonth->get_js_attr();
+        $zoom=3D1;
         ob_start();
         require_once('template/calendar.php');
=20

Modified: phpcompta/trunk/include/template/calendar.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/calendar.php	2013-10-09 17:53:24 UTC=
 (rev 5480)
+++ phpcompta/trunk/include/template/calendar.php	2013-10-09 18:21:43 UTC=
 (rev 5481)
@@ -1,6 +1,10 @@
 <div class=3D"pc_calendar" id=3D"user_cal" style=3D"width:100%">
 <?php echo $month_year?>
+<?php if ($zoom =3D=3D 1 ): ?>   =20
 <table style=3D"width:100%;height:80%">
+    <?php else: ?>
+<table style=3D"width:100%;">
+    <?php endif; ?>
 <tr>
 <?php
 for ($i=3D0;$i<=3D6;$i++){

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-10-09 17:53:24 UT=
C (rev 5480)
+++ phpcompta/trunk/include/template/dashboard.php	2013-10-09 18:21:43 UT=
C (rev 5481)
@@ -153,7 +153,7 @@
 ?>
 </fieldset>
 </div>
-<div style=3D"float:left;clear:both"></div>
+
 <div style=3D"float:right;width: 49%">
 =09
 <div id=3D"action_late_div"  class=3D"inner_box" style=3D"display:none;m=
argin-left:25%;top:25%;width: 50%;height:50%;overflow: auto;">



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


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

Author: danydb
Date: 2013-10-11 20:09:06 +0200 (Fri, 11 Oct 2013)
New Revision: 5482

Modified:
   phpcompta/trunk/include/template/dashboard.php
Log:
Am?\195?\169liore apparence

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-10-09 18:21:43 UT=
C (rev 5481)
+++ phpcompta/trunk/include/template/dashboard.php	2013-10-11 18:09:06 UT=
C (rev 5482)
@@ -222,6 +222,36 @@
 	<?php display_dashboard_operation($customer_now,"Encaissement clients a=
ujourd'hui",'customer_now_div'); ?>
 	<?php display_dashboard_operation($customer_late,"Clients en retard",'c=
ustomer_late_div'); ?>
 </div>
+<div style=3D"float:right;width: 49%">
+<fieldset>
+<legend><?php echo _('Derni=C3=A8res op=C3=A9rations')?>
+</legend>
+<table style=3D"width: 100%">
+<?php
+for($i=3D0;$i<count($last_ledger);$i++):
+	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
+?>
+<tr <?php echo $class ?>>
+	<td><?php echo   smaller_date($last_ledger[$i]['jr_date_fmt'])?>
+	</td>
+	<td>
+		<?php echo $last_ledger[$i]['jrn_def_code']?>
+	</td>
+<td>
+   <?php echo h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?=
>
+</td>
+<td>
+<?php echo HtmlInput::detail_op($last_ledger[$i]['jr_id'], $last_ledger[=
$i]['jr_internal'])?>
+</td>
+<td class=3D"num">
+<?php echo nbm($last_ledger[$i]['jr_montant'])?>
+</td>
+
+</tr>
+<?php endfor;?>
+</ul></table>
+</fieldset>
+</div>
 <!-- Mini rapport -->
 	<div style=3D"float:left;width: 49%">
 <?php
@@ -274,36 +304,7 @@
 ?>
 </div>
=20
-<div style=3D"float:right;width: 49%">
-<fieldset>
-<legend><?php echo _('Derni=C3=A8res op=C3=A9rations')?>
-</legend>
-<table style=3D"width: 100%">
-<?php
-for($i=3D0;$i<count($last_ledger);$i++):
-	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
-?>
-<tr <?php echo $class ?>>
-	<td><?php echo   smaller_date($last_ledger[$i]['jr_date_fmt'])?>
-	</td>
-	<td>
-		<?php echo $last_ledger[$i]['jrn_def_code']?>
-	</td>
-<td>
-   <?php echo h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?=
>
-</td>
-<td>
-<?php echo HtmlInput::detail_op($last_ledger[$i]['jr_id'], $last_ledger[=
$i]['jr_internal'])?>
-</td>
-<td class=3D"num">
-<?php echo nbm($last_ledger[$i]['jr_montant'])?>
-</td>
=20
-</tr>
-<?php endfor;?>
-</ul></table>
-</fieldset>
-</div>
=20
=20
=20



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


From MAILER-DAEMON Fri Oct 11 17:37:51 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VUkP9-0001Jb-0h
	for mharc-phpcompta-dev@gnu.org; Fri, 11 Oct 2013 17:37:51 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 11 Oct 2013 23:27:40 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.69664.1381527470.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5483 - phpcompta/trunk/html/admin/sql/patch
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Oct 2013 21:37:49 -0000

Author: danydb
Date: 2013-10-11 23:27:39 +0200 (Fri, 11 Oct 2013)
New Revision: 5483

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
Log:
Bug missing ;

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-11 18:09:=
06 UTC (rev 5482)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-11 21:27:=
39 UTC (rev 5483)
@@ -262,7 +262,7 @@
 	end;
 $BODY$
=20
-LANGUAGE plpgsql VOLATILE
+LANGUAGE plpgsql VOLATILE;
=20
 alter table op_predef add od_description text;
 create or replace function comptaproc.opd_limit_description()=20



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


From MAILER-DAEMON Fri Oct 11 17:39:49 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VUkR3-0001YQ-Lr
	for mharc-phpcompta-dev@gnu.org; Fri, 11 Oct 2013 17:39:49 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 11 Oct 2013 23:29:38 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.69665.1381527589.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5484 - 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, 11 Oct 2013 21:39:48 -0000

Author: danydb
Date: 2013-10-11 23:29:38 +0200 (Fri, 11 Oct 2013)
New Revision: 5484

Modified:
   phpcompta/trunk/include/impress_jrn.inc.php
Log:
Montant n?\195?\169gatif pour ACH et VEN

Modified: phpcompta/trunk/include/impress_jrn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_jrn.inc.php	2013-10-11 21:27:39 UTC (=
rev 5483)
+++ phpcompta/trunk/include/impress_jrn.inc.php	2013-10-11 21:29:38 UTC (=
rev 5484)
@@ -350,7 +350,12 @@
 			}
 			else
 			{
-				echo  nbm($line['montant']) ;
+				if ( isset ($line['TVAC'])) {
+                                    echo  ( nbm($line['TVAC'])  < 0 ) ? =
"<font color=3D\"red\">  - " . nbm($line['TVAC']) . "</font>" : nbm($line=
['TVAC']);
+                                } else
+                                {
+                                    echo  nbm($line['montant']) ;
+                                }
 			}
 			echo  "</TD>";
 			echo "</tr>";



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


From MAILER-DAEMON Fri Oct 11 17:40:27 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VUkRf-0001fV-SJ
	for mharc-phpcompta-dev@gnu.org; Fri, 11 Oct 2013 17:40:27 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 11 Oct 2013 23:30:19 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.69666.1381527627.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5485 - 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, 11 Oct 2013 21:40:26 -0000

Author: danydb
Date: 2013-10-11 23:30:18 +0200 (Fri, 11 Oct 2013)
New Revision: 5485

Modified:
   phpcompta/trunk/include/class_print_ledger.php
Log:
typo

Modified: phpcompta/trunk/include/class_print_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_print_ledger.php	2013-10-11 21:29:38 UT=
C (rev 5484)
+++ phpcompta/trunk/include/class_print_ledger.php	2013-10-11 21:30:18 UT=
C (rev 5485)
@@ -94,9 +94,9 @@
                     }
                     break;
                 case 2:
-                    /*                     * ***************************=
*****************************
+                    /***************************************************=
*******
                      * Print Detail Operation + Item
-                     * *************************************************=
******** */
+                     ***************************************************=
******* */
                     $own =3D new Own($cn);
                     $jrn_type =3D $p_ledger->get_type();
                     if ($jrn_type =3D=3D 'FIN') {



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


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

Author: danydb
Date: 2013-10-11 23:30:56 +0200 (Fri, 11 Oct 2013)
New Revision: 5486

Modified:
   phpcompta/trunk/sql/upgrade.sql
Log:
Ajout description

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-10-11 21:30:18 UTC (rev 5485)
+++ phpcompta/trunk/sql/upgrade.sql	2013-10-11 21:30:56 UTC (rev 5486)
@@ -14,4 +14,96 @@
=20
 select do_insert();
=20
-drop function do_insert();
\ No newline at end of file
+drop function do_insert();
+
+  update menu_ref set me_description_etendue=3D'Liste de tous vos contac=
ts' where me_code=3D'CONTACT' ;
+ update menu_ref set me_description_etendue=3D'Vous permet d''encoder de=
s achats, d=C3=A9penses, des notes de frais ou des notes de cr=C3=A9dits,=
 vous pouvez sp=C3=A9cifier un b=C3=A9n=C3=A9ficiaire ou un autre moyen d=
e paiement' where me_code=3D'ACH' ;
+ update menu_ref set me_description_etendue=3D'Historique des imputation=
s analytiques' where me_code=3D'ANCHOP' ;
+ update menu_ref set me_description_etendue=3D'Balance simple des imputa=
tions analytiques' where me_code=3D'ANCBS' ;
+ update menu_ref set me_description_etendue=3D'Tableau li=C3=A9 =C3=A0 l=
a comptabilit=C3=A9' where me_code=3D'ANCTAB' ;
+ update menu_ref set me_description_etendue=3D'Lien entre comptabilit=C3=
=A9 et Comptabilit=C3=A9 analytique' where me_code=3D'ANCBCC' ;
+ update menu_ref set me_description_etendue=3D'Balance par groupe' where=
 me_code=3D'ANCGR' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter des tau=
x de TVA ou de les modifier ainsi que les postes comptables de ces TVA, c=
es TVA sont utilisables dans les menus de vente et d''achat' where me_cod=
e=3D'CFGTVA' ;
+ update menu_ref set me_description_etendue=3D'Encodage de tous vos reve=
nus ou vente' where me_code=3D'VEN' ;
+ update menu_ref set me_description_etendue=3D'Ajout de menu ou de plugi=
ns' where me_code=3D'CFGMENU' ;
+ update menu_ref set me_description_etendue=3D'Suivi des fournisseurs : =
devis, lettres, email....' where me_code=3D'SUPPL' ;
+ update menu_ref set me_description_etendue=3D'Op=C3=A9rations diverses =
en Analytique' where me_code=3D'ANCODS' ;
+ update menu_ref set me_description_etendue=3D'Cr=C3=A9ation de rapport =
sur mesure, comme les ratios, vous permet de cr=C3=A9er des graphiques de=
 vos donn=C3=A9es (vente, achat...)' where me_code=3D'REPORT' ;
+ update menu_ref set me_description_etendue=3D'Menu regroupant les plugi=
ns' where me_code=3D'EXT' ;
+ update menu_ref set me_description_etendue=3D'Les op=C3=A9rations pr=C3=
=A9d=C3=A9finies sont des op=C3=A9rations que vous faites r=C3=A9guli=C3=A8=
rement (loyer, abonnement,...) ' where me_code=3D'PREDOP' ;
+ update menu_ref set me_description_etendue=3D'Axe analytique' where me_=
code=3D'PLANANC' ;
+ update menu_ref set me_description_etendue=3D'Regroupement de compte an=
alytique' where me_code=3D'ANCGROUP' ;
+ update menu_ref set me_description_etendue=3D'Op=C3=A9ration diverses t=
els que les amortissements, les augmentations de capital, les salaires, .=
..' where me_code=3D'ODS' ;
+ update menu_ref set me_description_etendue=3D'Encodage d''un extrait ba=
ncaire (=3Drelev=C3=A9 bancaire)' where me_code=3D'FIN' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations un menu de recherche dans une nouvelle fen=C3=AAtre, vous=
 permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9re=
sse' where me_code=3D'JSSEARCH' ;
+ update menu_ref set me_description_etendue=3D'Suivi client : devis, r=C3=
=A9union, courrier, commande...' where me_code=3D'CUST' ;
+ update menu_ref set me_description_etendue=3D'Vous permet d''ajouter de=
 nouveaux type de documents (bordereau de livraison, devis..)' where me_c=
ode=3D'CFGCATDOC' ;
+ update menu_ref set me_description_etendue=3D'Lettrage par fiche' where=
 me_code=3D'LETCARD' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux d''achats un menu de recherche, vous pe=
rmettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9resse=
' where me_code=3D'ACHISTO' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux d''op=C3=A9rations diverses un menu de =
recherche, vous permettra de retrouver rapidement l''op=C3=A9ration qui v=
ous int=C3=A9resse' where me_code=3D'ODHISTO' ;
+ update menu_ref set me_description_etendue=3D'Impression du d=C3=A9tail=
 d''un poste comptable' where me_code=3D'PRINTPOSTE' ;
+ update menu_ref set me_description_etendue=3D'Impression de rapport per=
sonnalis=C3=A9, il est aussi possible d''exporter en CSV afin de faire de=
s graphiques' where me_code=3D'PRINTREPORT' ;
+ update menu_ref set me_description_etendue=3D'Impression du grand livre=
' where me_code=3D'PRINTGL' ;
+ update menu_ref set me_description_etendue=3D'Impression des balances c=
omptables' where me_code=3D'PRINTBAL' ;
+ update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us d''achats(nouvelle op=C3=A9ration, historique...)' where me_code=3D'ME=
NUACH' ;
+ update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us et les profils' where me_code=3D'MOD' ;
+ update menu_ref set me_description_etendue=3D'Module param=C3=A8tres' w=
here me_code=3D'PARAM' ;
+ update menu_ref set me_description_etendue=3D'Menu impression' where me=
_code=3D'PRINT' ;
+ update menu_ref set me_description_etendue=3D'Regroupement des menus de=
s journaux de tr=C3=A9sorerie' where me_code=3D'BK' ;
+ update menu_ref set me_description_etendue=3D'Grand livre pour la compt=
abilit=C3=A9 analytique' where me_code=3D'ANCGL' ;
+ update menu_ref set me_description_etendue=3D'Module gestion' where me_=
code=3D'GESTION' ;
+ update menu_ref set me_description_etendue=3D'Menu Lettrage' where me_c=
ode=3D'LET' ;
+ update menu_ref set me_description_etendue=3D'Choix de votre dossier' w=
here me_code=3D'ACCESS' ;
+ update menu_ref set me_description_etendue=3D'Module comptabilit=C3=A9'=
 where me_code=3D'COMPTA' ;
+ update menu_ref set me_description_etendue=3D'Menu de diff=C3=A9rents p=
aram=C3=A8tres' where me_code=3D'DIVPARM' ;
+ update menu_ref set me_description_etendue=3D'D=C3=A9connexion ' where =
me_code=3D'LOGOUT' ;
+ update menu_ref set me_description_etendue=3D'Configuration des profils=
 des utilisateurs, permet de fixer les journaux, profils dans les documen=
ts et stock que  ce profil peut utiliser. Cela limite les utilisateurs pu=
isque ceux-ci ont un profil' where me_code=3D'CFGPRO' ;
+ update menu_ref set me_description_etendue=3D'Config. poste comptable d=
e base' where me_code=3D'CFGACC' ;
+ update menu_ref set me_description_etendue=3D'Permet d''avoir la balanc=
e de toutes vos fiches, les r=C3=A9sum=C3=A9s exportables en CSV, les his=
toriques avec ou sans lettrages' where me_code=3D'CARD' ;
+ update menu_ref set me_description_etendue=3D'Pr=C3=A9f=C3=A9rence de l=
''utilisateur, apparence de l''application pour l''utilisateur, p=C3=A9ri=
ode par d=C3=A9faut et mot de passe' where me_code=3D'PREFERENCE' ;
+ update menu_ref set me_description_etendue=3D'Configuration des tags ou=
 dossiers, on l''appele tag ou dossier suivant la fa=C3=A7on dont vous ut=
ilisez=20
+cette fonctionnalit=C3=A9. Vous pouvez en ajouter, en supprimer ou les m=
odifier' where me_code=3D'CFGTAG' ;
+ update menu_ref set me_description_etendue=3D'Balance double crois=C3=A9=
es des imputations analytiques' where me_code=3D'ANCBC2' ;
+ update menu_ref set me_description_etendue=3D'Information sur votre soc=
i=C3=A9t=C3=A9 : nom, adresse... utilis=C3=A9 lors de la g=C3=A9n=C3=A9ra=
tion de documents' where me_code=3D'COMPANY' ;
+ update menu_ref set me_description_etendue=3D'Gestion des p=C3=A9riodes=
 : cl=C3=B4ture, ajout de p=C3=A9riode, afin de cr=C3=A9er des p=C3=A9rio=
des vous pouvez aussi utiliser le plugin outil comptable' where me_code=3D=
'PERIODE' ;
+ update menu_ref set me_description_etendue=3D'V=C3=A9rifie que votre co=
mptabilit=C3=A9 ne contient pas d''erreur de base, tels que l''=C3=A9quil=
ibre entre le passif et l''actif, l''utilisation des postes comptables...=
' where me_code=3D'VERIFBIL' ;
+ update menu_ref set me_description_etendue=3D'Ecriture d''ouverture ou =
=C3=A9criture =C3=A0 nouveau, reporte les soldes des comptes de l''ann=C3=
=A9e pass=C3=A9 du poste comptable 0xxx =C3=A0 5xxxx sur l''ann=C3=A9e co=
urante' where me_code=3D'OPEN' ;
+ update menu_ref set me_description_etendue=3D'Chargement de mod=C3=A8le=
s de documents qui seront g=C3=A9n=C3=A9r=C3=A9s par PhpCompta, les forma=
ts utilisables sont libreoffice, html, text et rtf' where me_code=3D'CFGD=
OC' ;
+ update menu_ref set me_description_etendue=3D'Cr=C3=A9ation et modifica=
tion des journaux, pr=C3=A9fixe des pi=C3=A8ces justificatives, num=C3=A9=
rotation, cat=C3=A9gories de fiches accessibles =C3=A0 ce journal' where =
me_code=3D'CFGLED' ;
+ update menu_ref set me_description_etendue=3D'Configuration de la s=C3=A9=
curit=C3=A9, vous permet de donner un profil =C3=A0 vos utilisateurs, cel=
a leur permettra d''utiliser ce que vous souhaitez qu''ils puissent utili=
ser' where me_code=3D'CFGSEC' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
eaux attributs que vous pourrez par la suite ajouter =C3=A0 des cat=C3=A9=
gories de fiches' where me_code=3D'CFGATCARD' ;
+ update menu_ref set me_description_etendue=3D'Historique des mouvement =
de stock' where me_code=3D'STOCK_HISTO' ;
+ update menu_ref set me_description_etendue=3D'Etat des stock' where me_=
code=3D'STOCK_STATE' ;
+ update menu_ref set me_description_etendue=3D'Modification des stocks (=
inventaire)' where me_code=3D'STOCK_INV' ;
+ update menu_ref set me_description_etendue=3D'Liste des changements man=
uels des stocks' where me_code=3D'STOCK_INVHISTO' ;
+ update menu_ref set me_description_etendue=3D'Le navigateur vous pr=C3=A9=
sente une liste de menu auquel vous avez acc=C3=A8s et vous permet d''acc=
=C3=A8der plus rapidement au menu que vous souhaitez' where me_code=3D'NA=
VI' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans tous  les journaux auquels vous avez acc=C3=A8s, vou=
s permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9r=
esse sur base de la date, du poste comptable, des montants...' where me_c=
ode=3D'SEARCH' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations un menu de recherche, vous permettra de retrouver rapidem=
ent l''op=C3=A9ration qui vous int=C3=A9resse' where me_code=3D'HIST' ;
+ update menu_ref set me_description_etendue=3D'Permet de faire correspon=
dre vos extraits bancaires avec les op=C3=A9rations de vente ou d''achat,=
 le lettrage se fait automatiquement' where me_code=3D'FREC' ;
+ update menu_ref set me_description_etendue=3D'Solde des journaux de tr=C3=
=A9sorerie cela concerne les comptes en banques, caisse , les ch=C3=A8que=
s... ' where me_code=3D'FSALDO' ;
+ update menu_ref set me_description_etendue=3D'lettrage par poste compta=
ble' where me_code=3D'LETACC' ;
+ update menu_ref set me_description_etendue=3D'Balance par cat=C3=A9gori=
e de fiche ou pour toutes les fiches ayant un poste comptable' where me_c=
ode=3D'CARDBAL' ;
+ update menu_ref set me_description_etendue=3D'Modification de votre pla=
n comptable, parfois il est plus rapide d''utiliser le plugin "Poste Comp=
table"' where me_code=3D'CFGPCMN' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux de vente un menu de recherche, vous per=
mettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9resse'=
 where me_code=3D'VEHISTO' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux de tr=C3=A9sorerie un menu de recherche=
, vous permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=
=A9resse' where me_code=3D'FIHISTO' ;
+ update menu_ref set me_description_etendue=3D'Impression des rapprochem=
ents : op=C3=A9rations non rapproch=C3=A9es ou avec des montants diff=C3=A9=
rents' where me_code=3D'PRINTREC' ;
+ update menu_ref set me_description_etendue=3D'Impression de bilan, ce m=
odule est basique, il est plus int=C3=A9ressant d''utiliser le plugin "ra=
pport avanc=C3=A9s"' where me_code=3D'PRINTBILAN' ;
+ update menu_ref set me_description_etendue=3D'Configuration des entrepo=
ts de d=C3=A9p=C3=B4ts' where me_code=3D'CFGSTOCK' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
elles cat=C3=A9gorie de fiche, d''ajouter des attributs =C3=A0 ces cat=C3=
=A9gories (num=C3=A9ro de t=C3=A9l=C3=A9phone, gsm, email...)' where me_c=
ode=3D'STOCK' ;
+ update menu_ref set me_description_etendue=3D'Permet de changer le post=
e comptable de base des cat=C3=A9gories de fiches' where me_code=3D'CFGCA=
RDCAT' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
elles cat=C3=A9gorie de fiche, d''ajouter des attributs =C3=A0 ces cat=C3=
=A9gories (num=C3=A9ro de t=C3=A9l=C3=A9phone, gsm, email...)' where me_c=
ode=3D'CFGCARD' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter des =C3=
=A9tat pour les documents utilis=C3=A9s dans le suivi (=C3=A0 faire, =C3=A0=
 suivre...)' where me_code=3D'CFGDOCST' ;
+ update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us d''op=C3=A9rations diverses (nouvelle op=C3=A9ration, historique...)' =
where me_code=3D'MENUODS' ;
+ update menu_ref set me_description_etendue=3D'Impression des journaux a=
vec les d=C3=A9tails pour les parties priv=C3=A9s, la TVA et ce qui est n=
on d=C3=A9ductibles en ce qui concerne les journaux de vente et d''achat'=
 where me_code=3D'PRINTJRN' ;
+ update menu_ref set me_description_etendue=3D'Regroupement des menus ve=
ntes et recettes' where me_code=3D'VENMENU' ;
+ update menu_ref set me_description_etendue=3D'Impression compta. analyt=
ique' where me_code=3D'ANCIMP' ;
+ update menu_ref set me_description_etendue=3D'Module comptabilit=C3=A9 =
analytique' where me_code=3D'ANC' ;
+ update menu_ref set me_description_etendue=3D'Tableau de suivi, vous pe=
rmet de voir en un coup d''oeil vos derni=C3=A8res op=C3=A9rations, un pe=
tit calendrier, une liste de chose =C3=A0 faire...' where me_code=3D'DASH=
BOARD' ;
+ update menu_ref set me_description_etendue=3D'Menu regroupant la cr=C3=A9=
ation de rapport, la v=C3=A9rification de la comptabilit=C3=A9...' where =
me_code=3D'ADV' ;
+ update menu_ref set me_description_etendue=3D'Ce menu vous pr=C3=A9sent=
e  un menu rapide de vos menus pr=C3=A9f=C3=A9r=C3=A9s' where me_code=3D'=
BOOKMARK' ;
+ update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us de tr=C3=A9sorerie (nouvelle op=C3=A9ration, historique...)' where me_=
code=3D'MENUFIN' ;
+ update menu_ref set me_description_etendue=3D'Liste de vos suivis, en f=
ait de tous les documents, r=C3=A9unions ... dont vous avez besoin afin d=
e suivre vos clients, fournisseurs ou administrations. Il permet la g=C3=A9=
n=C3=A9ration de documents comme les devis, les bordereau de livraison...=
' where me_code=3D'FOLLOW' ;
+ update menu_ref set me_description_etendue=3D'Configuration des moyens =
de paiements que vous voulez utiliser dans les journaux de type VEN ou AC=
H, les moyens de paiement permettent de g=C3=A9n=C3=A9rer l''op=C3=A9rati=
on de tr=C3=A9sorerie en m=C3=AAme temps que l''achat, la note de frais o=
u la vente' where me_code=3D'CFGPAY' ;
+ update menu_ref set me_description_etendue=3D'Suivi des administrations=
 : courrrier, d=C3=A9clarations.' where me_code=3D'ADM' ;
+ update menu_ref set me_description_etendue=3D'Pr=C3=A9vision de vos ach=
ats, revenus, permet de suivre l''=C3=A9volution de votre soci=C3=A9t=C3=A9=
. Vos pr=C3=A9visions sont des formules sur les postes comptables et vous=
 permettent aussi vos marges brutes.' where me_code=3D'FORECAST' ;
+



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


From MAILER-DAEMON Sat Oct 12 10:38:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VV0KP-00040b-1P
	for mharc-phpcompta-dev@gnu.org; Sat, 12 Oct 2013 10:38:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 12 Oct 2013 16:27:49 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.70000.1381588679.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5487 - in phpcompta/trunk: include sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Oct 2013 14:37:59 -0000

Author: danydb
Date: 2013-10-12 16:27:48 +0200 (Sat, 12 Oct 2013)
New Revision: 5487

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_print_ledger.php
   phpcompta/trunk/include/class_print_ledger_detail_item.php
   phpcompta/trunk/include/export_ledger_csv.php
   phpcompta/trunk/include/impress_jrn.inc.php
   phpcompta/trunk/sql/upgrade.sql
Log:
task #0000890: PRINTJRN : export PDF et CSV des operations detaillees

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-10-11 21:3=
0:56 UTC (rev 5486)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-10-12 14:2=
7:48 UTC (rev 5487)
@@ -1629,6 +1629,33 @@
=20
=20
     }
+    /**
+     * Retrieve data from the view v_detail_purchase
+     * @global  $g_user connected user
+     * @param $p_from jrn.jr_tech_per from=20
+     * @param type $p_end jrn.jr_tech_per to
+     * @return type
+     */
+    function get_detail_purchase($p_from,$p_end)
+    {
+        global $g_user;
+        // Journal valide
+        if ( $this->id =3D=3D 0 ) die (__FILE__.":".__LINE__." Journal i=
nvalide");
+       =20
+        // Securite
+        if ( $g_user->get_ledger_access($this->id) =3D=3D 'X' ) return n=
ull;
+       =20
+        // get the data from the view
+        $sql =3D "select *=20
+                from v_detail_purchase
+                 where=20
+                jr_def_id =3D $1=20
+                and  jr_date >=3D (select p_start from parm_periode wher=
e p_id =3D $2)=20
+		and  jr_date <=3D (select p_end from parm_periode where p_id  =3D $3) =
"
+                .' order by jr_date,substring(jr_pj_number,\'[0-9]+$\'):=
:numeric asc ';
+        $ret =3D $this->db->exec_sql($sql, array($this->id,$p_from, $p_e=
nd));
+        return $ret;
+    }
=20
 }
=20

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-10-11 21:30:56=
 UTC (rev 5486)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-10-12 14:27:48=
 UTC (rev 5487)
@@ -1271,7 +1271,33 @@
         $r.=3D create_script("$('" . $Date->id . "').focus()");
         return $r;
     }
-
+    /**
+     * Retrieve data from the view v_detail_sale
+     * @global  $g_user connected user
+     * @param $p_from jrn.jr_tech_per from=20
+     * @param type $p_end jrn.jr_tech_per to
+     * @return type
+     */
+    function get_detail_sale($p_from,$p_end)
+    {
+        global $g_user;
+        // Journal valide
+        if ( $this->id =3D=3D 0 ) die (__FILE__.":".__LINE__." Journal i=
nvalide");
+       =20
+        // Securite
+        if ( $g_user->get_ledger_access($this->id) =3D=3D 'X' ) return n=
ull;
+       =20
+        // get the data from the view
+        $sql =3D "select *=20
+                from v_detail_sale
+                 where=20
+                jr_def_id =3D $1=20
+                and  jr_date >=3D (select p_start from parm_periode wher=
e p_id =3D $2)=20
+		and  jr_date <=3D (select p_end from parm_periode where p_id  =3D $3) =
"
+                .' order by jr_date,substring(jr_pj_number,\'[0-9]+$\'):=
:numeric asc ';
+        $ret =3D $this->db->exec_sql($sql, array($this->id,$p_from, $p_e=
nd));
+        return $ret;
+    }
     /* !\brief test function
      */
=20

Modified: phpcompta/trunk/include/class_print_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_print_ledger.php	2013-10-11 21:30:56 UT=
C (rev 5486)
+++ phpcompta/trunk/include/class_print_ledger.php	2013-10-12 14:27:48 UT=
C (rev 5487)
@@ -29,6 +29,7 @@
 require_once('class_print_ledger_simple_without_vat.php');
 require_once('class_print_ledger_fin.php');
 require_once('class_print_ledger_misc.php');
+require_once 'class_print_ledger_detail_item.php';
=20
 /**
  * @brief Strategie class for the print_ledger class

Modified: phpcompta/trunk/include/class_print_ledger_detail_item.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_detail_item.php	2013-10-11=
 21:30:56 UTC (rev 5486)
+++ phpcompta/trunk/include/class_print_ledger_detail_item.php	2013-10-12=
 14:27:48 UTC (rev 5487)
@@ -5,9 +5,11 @@
  *
  * @author danydb
  */
-class Print_Ledger_Detail_Item extends PDF
+require_once 'class_acc_ledger_sold.php';
+require_once 'class_acc_ledger_purchase.php';
+class Print_Ledger_Detail_Item extends PDFLand
 {
-    public function __construct ($p_cn,$p_jrn)
+    public function __construct (Database $p_cn,Acc_Ledger $p_jrn)
     {
=20
         if($p_cn =3D=3D null) die("No database connection. Abort.");
@@ -39,39 +41,8 @@
      */
     function Footer()
     {
-        //Position at 3 cm from bottom
-        $this->SetY(-20);
-        /* write reporting  */
-        $this->Cell(143,6,'Total page ','T',0,'R'); /* HTVA */
-        $this->Cell(15,6,nbm($this->tp_htva),'T',0,'R'); /* HTVA */
-        if ( $this->jrn_type !=3D'VEN')
-        {
-            $this->Cell(15,6,nbm($this->tp_priv),'T',0,'R');  /* prive *=
/
-            $this->Cell(15,6,nbm($this->tp_nd),'T',0,'R');  /* Tva ND */
-        }
-        foreach($this->a_Tva as $line_tva)
-        {
-            $l=3D$line_tva['tva_id'];
-            $this->Cell(15,6,nbm($this->tp_tva[$l]),'T',0,'R');
-        }
-        $this->Cell(15,6,nbm($this->tp_tvac),'T',0,'R'); /* Tvac */
         $this->Ln(2);
-
-        $this->Cell(143,6,'report',0,0,'R'); /* HTVA */
-        $this->Cell(15,6,nbm($this->rap_htva),0,0,'R'); /* HTVA */
-        if ( $this->jrn_type !=3D'VEN')
-        {
-            $this->Cell(15,6,nbm($this->rap_priv),0,0,'R');  /* prive */
-            $this->Cell(15,6,nbm($this->rap_nd),0,0,'R');  /* Tva ND */
-        }
-        foreach($this->a_Tva as $line_tva)
-        {
-            $l=3D$line_tva['tva_id'];
-            $this->Cell(15,6,nbm($this->rap_tva[$l]),0,0,'R');
-        }
-        $this->Cell(15,6,nbm($this->rap_tvac),0,0,'R'); /* Tvac */
-        $this->Ln(2);
-
+        $this->Cell(0,8,' Journal '.$this->ledger->get_name(),0,0,'C');
         //Arial italic 8
         $this->SetFont('Arial', 'I', 8);
         //Page number
@@ -91,12 +62,69 @@
     function export()
     {
       bcscale(2);
-        $a_jrn=3D$this->ledger->get_operation($_GET['from_periode'],
-                                            $_GET['to_periode']);
-
-        if ( $a_jrn =3D=3D null ) return;
-        for ( $i=3D0;$i<count($a_jrn);$i++)
+      $jrn_type=3D$this->ledger->get_type();
+      switch ($jrn_type)
+      {
+          case 'VEN':
+              $ledger=3Dnew Acc_Ledger_Sold($this->cn, $this->ledger->jr=
n_def_id);
+              $ret_detail=3D$ledger->get_detail_sale($_GET['from_periode=
'],$_GET['to_periode']);
+              break;
+          case 'ACH':
+                $ledger=3Dnew Acc_Ledger_Purchase($this->cn, $this->ledg=
er->jrn_def_id);
+                $ret_detail=3D$ledger->get_detail_purchase($_GET['from_p=
eriode'],$_GET['to_periode']);
+              break;
+          default:
+              die (__FILE__.":".__LINE__.'Journal invalide');
+              break;
+      }
+        if ( $ret_detail =3D=3D null ) return;
+        $nb=3DDatabase::num_row($ret_detail);
+        $this->SetFont('DejaVu', '', 6);
+        $internal=3D"";
+        $this->SetFillColor(220,221,255);
+        $high=3D4;
+        for ( $i=3D0;$i< $nb ;$i++)
         {
+            $row=3DDatabase::fetch_array($ret_detail, $i);
+            if ($internal !=3D $row['jr_internal'])
+            {
+                // Print the general info line width=3D270mm
+                $this->LongLine(20, $high, $row['jr_date'],1,  'L', true=
);
+                $this->Cell(20, $high, $row['jr_internal'], 1, 0, 'L', t=
rue);
+                $this->LongLine(70, $high, $row['quick_code']." ".$row['=
tiers_name'],1,'L',true);
+                $this->LongLine(100, $high, $row['jr_comment'],1,'L',tru=
e);
+                $this->Cell(20, $high, nbm($row['htva']), 1, 0, 'R', tru=
e);
+                $this->Cell(20, $high, nbm($row['tot_vat']), 1, 0, 'R', =
true);
+                $sum=3Dbcadd($row['htva'],$row['tot_vat']);
+                $this->Cell(20, $high, nbm($sum), 1, 0, 'R', true);
+                $internal=3D$row['jr_internal'];
+                $this->Ln(6);
+                //
+                // Header detail
+                $this->LongLine(30,$high,'QuickCode');
+                $this->Cell(30,$high,'Poste');
+                $this->LongLine(90,$high,'Libell=C3=A9');
+                $this->Cell(20,$high,'Prix/Unit',0,0,'R');
+                $this->Cell(20,$high,'Quant.',0,0,'R');
+                $this->Cell(20,$high,'HTVA',0,0,'R');
+                $this->Cell(20,$high,'Code TVA');
+                $this->Cell(20,$high,'TVA',0,0,'R');
+                $this->Cell(20,$high,'TVAC',0,0,'R');
+                $this->Ln(6);
+            }
+            // Print detail sale / purchase
+            $this->LongLine(30,$high,$row['j_qcode']);
+            $this->Cell(30,$high,$row['j_poste']);
+            $comment=3D($row['j_text']=3D=3D"")?$row['item_name']:$row['=
j_text'];
+            $this->LongLine(90,$high,$comment);
+            $this->Cell(20,$high,nbm($row['price_per_unit']),0,0,'R');
+            $this->Cell(20,$high,nbm($row['quantity']),0,0,'R');
+            $this->Cell(20,$high,nbm($row['price']),0,0,'R');
+            $this->Cell(20,$high,$row['vat_code']." ".$row['tva_label'])=
;
+            $this->Cell(20,$high,nbm($row['vat']),0,0,'R');
+            $sum=3Dbcadd($row['price'],$row['vat']);
+            $this->Cell(20,$high,nbm($sum),0,0,'R');
+            $this->Ln(6);
            =20
         }
     }

Modified: phpcompta/trunk/include/export_ledger_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_ledger_csv.php	2013-10-11 21:30:56 UTC=
 (rev 5486)
+++ phpcompta/trunk/include/export_ledger_csv.php	2013-10-12 14:27:48 UTC=
 (rev 5487)
@@ -27,7 +27,8 @@
 header('Content-Disposition: attachment;filename=3D"jrn.csv"',FALSE);
 include_once ("ac_common.php");
 require_once('class_own.php');
-
+require_once 'class_acc_ledger_sold.php';
+require_once 'class_acc_ledger_purchase.php';
 require_once('class_dossier.php');
 $gDossier=3Ddossier::id();
=20
@@ -50,6 +51,54 @@
 $Jrn->get_name();
 $jrn_type=3D$Jrn->get_type();
=20
+//
+// With Detail per item which is possible only for VEN or ACH
+//=20
+if ($_GET['p_simple'] =3D=3D 2)
+{
+    if ($jrn_type !=3D 'ACH' && $jrn_type !=3D 'VEN' || $Jrn->id =3D=3D =
0)
+    {
+        $_GET['p_simple'] =3D 0;
+    }
+    else
+    {
+        switch ($jrn_type)
+        {
+            case 'VEN':
+                $ledger =3D new Acc_Ledger_Sold($cn, $_GET['jrn_id']);
+                $ret_detail =3D $ledger->get_detail_sale($_GET['from_per=
iode'], $_GET['to_periode']);
+                break;
+            case 'ACH':
+                $ledger =3D new Acc_Ledger_Purchase($cn, $_GET['jrn_id']=
);
+                $ret_detail =3D $ledger->get_detail_purchase($_GET['from=
_periode'], $_GET['to_periode']);
+               =20
+                break;
+            default:
+                die(__FILE__ . ":" . __LINE__ . 'Journal invalide');
+                break;
+        }
+        if ($ret_detail =3D=3D null)
+            return;
+        $nb =3D Database::num_row($ret_detail);
+        $output=3Dfopen("php://output","w");
+       =20
+        for ($i =3D 0;$i < $nb ; $i++) {
+            $row=3DDatabase::fetch_array($ret_detail, $i);
+            if ( $i =3D=3D 0 ) {
+              foreach ($row as $key=3D>$value) {
+                  if (isNumber($key) =3D=3D 0 )$array_key[]=3D$key;
+              }
+              fputcsv($output,$array_key,';');
+            }
+            $a_row=3Darray();
+            for ($j=3D0;$j < count($row) / 2;$j++) {
+                $a_row[]=3D$row[$j];
+            }
+            fputcsv($output,$a_row,';');
+            unset($a_row);
+        }
+    }
+}
 // Detailled printing
 //---
 if  ( $_GET['p_simple'] =3D=3D 0 )
@@ -85,7 +134,7 @@
     }
     exit;
 }
-else
+else if  ($_GET['p_simple'] =3D=3D 0)
 {
     $Row=3D$Jrn->get_rowSimple($_GET['from_periode'],
                              $_GET['to_periode'],

Modified: phpcompta/trunk/include/impress_jrn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_jrn.inc.php	2013-10-11 21:30:56 UTC (=
rev 5486)
+++ phpcompta/trunk/include/impress_jrn.inc.php	2013-10-12 14:27:48 UTC (=
rev 5487)
@@ -172,33 +172,31 @@
 	echo '<h2 class=3D"info">' . h($Jrn->name) . '</h2>';
 	echo "<table>";
 	echo '<TR>';
-	if ($_GET['p_simple'] =3D=3D 0 || $_GET['p_simple'] =3D=3D 1)
-	{
-		echo '<TD><form method=3D"GET" ACTION=3D"?">' . dossier::hidden() .
-		$hid->input("type", "jrn") . $hid->input('p_action', 'impress') . "</f=
orm></TD>";
+        echo '<TD><form method=3D"GET" ACTION=3D"?">' . dossier::hidden(=
) .
+        $hid->input("type", "jrn") . $hid->input('p_action', 'impress') =
. "</form></TD>";
=20
-		echo '<TD><form method=3D"GET" ACTION=3D"export.php">' . dossier::hidd=
en() .
-		HtmlInput::submit('bt_pdf', "Export PDF") .
-		HtmlInput::hidden('act', 'PDF:ledger') .
-		$hid->input("type", "jrn") .
-		$hid->input("jrn_id", $Jrn->id) .
-		$hid->input("from_periode", $_GET['from_periode']) .
-		$hid->input("to_periode", $_GET['to_periode']);
-		echo $hid->input("p_simple", $_GET['p_simple']);
-		echo HtmlInput::get_to_hidden(array('ac', 'type'));
-		echo "</form></TD>";
+        echo '<TD><form method=3D"GET" ACTION=3D"export.php">' . dossier=
::hidden() .
+        HtmlInput::submit('bt_pdf', "Export PDF") .
+        HtmlInput::hidden('act', 'PDF:ledger') .
+        $hid->input("type", "jrn") .
+        $hid->input("jrn_id", $Jrn->id) .
+        $hid->input("from_periode", $_GET['from_periode']) .
+        $hid->input("to_periode", $_GET['to_periode']);
+        echo $hid->input("p_simple", $_GET['p_simple']);
+        echo HtmlInput::get_to_hidden(array('ac', 'type'));
+        echo "</form></TD>";
=20
-		echo '<TD><form method=3D"GET" ACTION=3D"export.php">' . dossier::hidd=
en() .
-		HtmlInput::submit('bt_csv', "Export CSV") .
-		HtmlInput::hidden('act', 'CSV:ledger') .
-		$hid->input("type", "jrn") .
-		$hid->input("jrn_id", $Jrn->id) .
-		$hid->input("from_periode", $_GET['from_periode']) .
-		$hid->input("to_periode", $_GET['to_periode']);
-		echo $hid->input("p_simple", $_GET['p_simple']);
-		echo HtmlInput::get_to_hidden(array('ac', 'type'));
-		echo "</form></TD>";
-	}
+        echo '<TD><form method=3D"GET" ACTION=3D"export.php">' . dossier=
::hidden() .
+        HtmlInput::submit('bt_csv', "Export CSV") .
+        HtmlInput::hidden('act', 'CSV:ledger') .
+        $hid->input("type", "jrn") .
+        $hid->input("jrn_id", $Jrn->id) .
+        $hid->input("from_periode", $_GET['from_periode']) .
+        $hid->input("to_periode", $_GET['to_periode']);
+        echo $hid->input("p_simple", $_GET['p_simple']);
+        echo HtmlInput::get_to_hidden(array('ac', 'type'));
+        echo "</form></TD>";
+
 	echo '<td style=3D"vertical-align:top">';
 	echo HtmlInput::print_window();
 	echo '</td>';

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-10-11 21:30:56 UTC (rev 5486)
+++ phpcompta/trunk/sql/upgrade.sql	2013-10-12 14:27:48 UTC (rev 5487)
@@ -107,3 +107,84 @@
  update menu_ref set me_description_etendue=3D'Suivi des administrations=
 : courrrier, d=C3=A9clarations.' where me_code=3D'ADM' ;
  update menu_ref set me_description_etendue=3D'Pr=C3=A9vision de vos ach=
ats, revenus, permet de suivre l''=C3=A9volution de votre soci=C3=A9t=C3=A9=
. Vos pr=C3=A9visions sont des formules sur les postes comptables et vous=
 permettent aussi vos marges brutes.' where me_code=3D'FORECAST' ;
=20
+CREATE OR REPLACE VIEW v_detail_sale AS=20
+with m as=20
+	(select sum(qs_price) as htva, sum(qs_vat) as tot_vat,jr_id from quant_=
sold join jrnx using (j_id) join jrn on (j_grpt=3Djr_grpt_id) group by jr=
_id)
+ SELECT jrn.jr_id,=20
+	jrn.jr_date,=20
+	jrn.jr_tech_per,=20
+	jrn.jr_comment,=20
+	jrn.jr_pj_number,=20
+	jrn.jr_internal,=20
+	jrn.jr_def_id,=20
+	jrnx.j_poste,=20
+	jrnx.j_text,=20
+	jrnx.j_qcode,=20
+	quant_sold.qs_fiche as item_card,=20
+	a.name AS item_name,=20
+	quant_sold.qs_client,=20
+	b.vw_name AS tiers_name,=20
+	b.quick_code,=20
+	tva_rate.tva_label,=20
+	tva_rate.tva_comment,=20
+	tva_rate.tva_both_side,=20
+	quant_sold.qs_vat_sided as vat_sided,=20
+	quant_sold.qs_vat_code as vat_code,=20
+	quant_sold.qs_vat as vat,=20
+	quant_sold.qs_price as price,=20
+	quant_sold.qs_quantite as quantity,=20
+	quant_sold.qs_price / quant_sold.qs_quantite AS price_per_unit
+	, htva
+	,tot_vat
+   FROM jrn
+   JOIN jrnx ON jrn.jr_grpt_id =3D jrnx.j_grpt
+   JOIN quant_sold USING (j_id)
+   JOIN vw_fiche_name a ON quant_sold.qs_fiche =3D a.f_id
+   JOIN vw_fiche_attr b ON quant_sold.qs_client =3D b.f_id
+   JOIN tva_rate ON quant_sold.qs_vat_code =3D tva_rate.tva_id
+   join m on (m.jr_id=3Djrn.jr_id)
+   ;
+
+CREATE OR REPLACE VIEW v_detail_purchase AS=20
+ WITH m AS (
+         SELECT sum(quant_purchase.qp_price) AS htva, sum(quant_purchase=
.qp_vat) AS tot_vat, jrn.jr_id
+           FROM quant_purchase
+      JOIN jrnx USING (j_id)
+   JOIN jrn ON jrnx.j_grpt =3D jrn.jr_grpt_id
+  GROUP BY jrn.jr_id
+        )
+ SELECT jrn.jr_id,=20
+            jrn.jr_date
+        , jrn.jr_tech_per
+        , jrn.jr_comment
+        , jrn.jr_pj_number
+        , jrn.jr_internal
+        , jrn.jr_def_id
+        , jrnx.j_poste
+        , jrnx.j_text
+        , jrnx.j_qcode
+        , quant_purchase.qp_fiche AS item_card
+        , a.name AS item_name
+        , quant_purchase.qp_supplier
+        , b.vw_name AS tiers_name
+        , b.quick_code
+        , tva_rate.tva_label
+        , tva_rate.tva_comment
+        , tva_rate.tva_both_side
+        , quant_purchase.qp_vat_sided AS vat_sided
+        , quant_purchase.qp_vat_code AS vat_code
+        , quant_purchase.qp_vat AS vat
+        , quant_purchase.qp_price AS price
+        , quant_purchase.qp_quantite AS quantity
+        , quant_purchase.qp_price / quant_purchase.qp_quantite AS price_=
per_unit
+        , quant_purchase.qp_nd_amount AS non_ded_amount
+        , quant_purchase.qp_nd_tva AS non_ded_tva
+        , quant_purchase.qp_nd_tva_recup AS non_ded_tva_recup
+        , m.htva, m.tot_vat
+   FROM jrn
+   JOIN jrnx ON jrn.jr_grpt_id =3D jrnx.j_grpt
+   JOIN quant_purchase USING (j_id)
+   JOIN vw_fiche_name a ON quant_purchase.qp_fiche =3D a.f_id
+   JOIN vw_fiche_attr b ON quant_purchase.qp_supplier =3D b.f_id
+   JOIN tva_rate ON quant_purchase.qp_vat_code =3D tva_rate.tva_id
+   JOIN m ON m.jr_id =3D jrn.jr_id;



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


From MAILER-DAEMON Sat Oct 12 10:38:25 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VV0Kn-00048W-8h
	for mharc-phpcompta-dev@gnu.org; Sat, 12 Oct 2013 10:38:25 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 12 Oct 2013 16:28:16 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.70007.1381588705.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5488 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Oct 2013 14:38:24 -0000

Author: danydb
Date: 2013-10-12 16:28:15 +0200 (Sat, 12 Oct 2013)
New Revision: 5488

Modified:
   phpcompta/trunk/include/template/dashboard.php
Log:
placement dashboard

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-10-12 14:27:48 UT=
C (rev 5487)
+++ phpcompta/trunk/include/template/dashboard.php	2013-10-12 14:28:15 UT=
C (rev 5488)
@@ -222,38 +222,9 @@
 	<?php display_dashboard_operation($customer_now,"Encaissement clients a=
ujourd'hui",'customer_now_div'); ?>
 	<?php display_dashboard_operation($customer_late,"Clients en retard",'c=
ustomer_late_div'); ?>
 </div>
-<div style=3D"float:right;width: 49%">
-<fieldset>
-<legend><?php echo _('Derni=C3=A8res op=C3=A9rations')?>
-</legend>
-<table style=3D"width: 100%">
-<?php
-for($i=3D0;$i<count($last_ledger);$i++):
-	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
-?>
-<tr <?php echo $class ?>>
-	<td><?php echo   smaller_date($last_ledger[$i]['jr_date_fmt'])?>
-	</td>
-	<td>
-		<?php echo $last_ledger[$i]['jrn_def_code']?>
-	</td>
-<td>
-   <?php echo h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?=
>
-</td>
-<td>
-<?php echo HtmlInput::detail_op($last_ledger[$i]['jr_id'], $last_ledger[=
$i]['jr_internal'])?>
-</td>
-<td class=3D"num">
-<?php echo nbm($last_ledger[$i]['jr_montant'])?>
-</td>
=20
-</tr>
-<?php endfor;?>
-</ul></table>
-</fieldset>
-</div>
 <!-- Mini rapport -->
-	<div style=3D"float:left;width: 49%">
+	<div style=3D"float:left;width: 47%">
 <?php
 /*
  * Mini Report
@@ -304,7 +275,36 @@
 ?>
 </div>
=20
+<div style=3D"float:right;width: 47%">
+<fieldset>
+<legend><?php echo _('Derni=C3=A8res op=C3=A9rations')?>
+</legend>
+<table style=3D"width: 100%">
+<?php
+for($i=3D0;$i<count($last_ledger);$i++):
+	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
+?>
+<tr <?php echo $class ?>>
+	<td><?php echo   smaller_date($last_ledger[$i]['jr_date_fmt'])?>
+	</td>
+	<td>
+		<?php echo $last_ledger[$i]['jrn_def_code']?>
+	</td>
+<td>
+   <?php echo h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?=
>
+</td>
+<td>
+<?php echo HtmlInput::detail_op($last_ledger[$i]['jr_id'], $last_ledger[=
$i]['jr_internal'])?>
+</td>
+<td class=3D"num">
+<?php echo nbm($last_ledger[$i]['jr_montant'])?>
+</td>
=20
+</tr>
+<?php endfor;?>
+</ul></table>
+</fieldset>
+</div>
=20
=20
=20
@@ -331,6 +331,7 @@
 ?>
 </form>
 </div>
+
 <script type=3D"text/javascript" language=3D"javascript" charset=3D"utf-=
8">
 function display_detail(div) {
 	$(div).style.display=3D"block";



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


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

Author: danydb
Date: 2013-10-12 20:00:42 +0200 (Sat, 12 Oct 2013)
New Revision: 5489

Modified:
   phpcompta/trunk/include/template/dashboard.php
Log:
placement dashboard

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-10-12 14:28:15 UT=
C (rev 5488)
+++ phpcompta/trunk/include/template/dashboard.php	2013-10-12 18:00:42 UT=
C (rev 5489)
@@ -1,13 +1,8 @@
-<div style=3D"float:left;width: 49%">
-<fieldset >
-<legend><?php echo _('Calendrier')?>
-</legend>
-<?php echo HtmlInput::calendar_zoom($obj); ?>
-<?php echo $cal->display(); ?>
-</fieldset>
-</div>
+<!-- left div -->
+<div style=3D"float:right;width: 49%">
=20
 <?php
+
 /*
  * Todo list
  */
@@ -24,7 +19,7 @@
 $todo=3Dnew Todo_List($cn);
 $array=3D$todo->load_all();
 ?>
-<div style=3D"float:right;width: 49%">
+<div style=3D"float:right;width: 100%">
 <fieldset>=20
     <legend> Situation </legend>
     <table class=3D'result'>
@@ -153,8 +148,7 @@
 ?>
 </fieldset>
 </div>
-
-<div style=3D"float:right;width: 49%">
+<div style=3D"float:right;width: 100%">
 =09
 <div id=3D"action_late_div"  class=3D"inner_box" style=3D"display:none;m=
argin-left:25%;top:25%;width: 50%;height:50%;overflow: auto;">
 	<?php
@@ -223,8 +217,52 @@
 	<?php display_dashboard_operation($customer_late,"Clients en retard",'c=
ustomer_late_div'); ?>
 </div>
=20
+
+
+<div style=3D"float:right;width: 100%">
+<fieldset>
+<legend><?php echo _('Derni=C3=A8res op=C3=A9rations')?>
+</legend>
+<table style=3D"width: 100%">
+<?php
+for($i=3D0;$i<count($last_ledger);$i++):
+	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
+?>
+<tr <?php echo $class ?>>
+	<td><?php echo   smaller_date($last_ledger[$i]['jr_date_fmt'])?>
+	</td>
+	<td>
+		<?php echo $last_ledger[$i]['jrn_def_code']?>
+	</td>
+<td>
+   <?php echo h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?=
>
+</td>
+<td>
+<?php echo HtmlInput::detail_op($last_ledger[$i]['jr_id'], $last_ledger[=
$i]['jr_internal'])?>
+</td>
+<td class=3D"num">
+<?php echo nbm($last_ledger[$i]['jr_montant'])?>
+</td>
+
+</tr>
+<?php endfor;?>
+</ul></table>
+</fieldset>
+</div>
+
+</div>
+<div style=3D"float:right;width: 49%">
+   =20
+<div style=3D"float:left;width: 100%">
+<fieldset >
+<legend><?php echo _('Calendrier')?>
+</legend>
+<?php echo HtmlInput::calendar_zoom($obj); ?>
+<?php echo $cal->display(); ?>
+</fieldset>
+</div>
 <!-- Mini rapport -->
-	<div style=3D"float:left;width: 47%">
+<div style=3D"float:left;width: 100%">
 <?php
 /*
  * Mini Report
@@ -238,8 +276,9 @@
   $report=3D0;
 }
=20
-if ( $report !=3D 0 ) {
-  echo '<fieldset style=3D"height:50%;"><legend>'.$rapport->get_name().'=
</legend>';
+if ( $report !=3D 0 ) : ?>
+<fieldset style=3D"height:50%;"><legend><?php echo $rapport->get_name()?=
></legend>
+<?php   =20
   $exercice=3D$g_user->get_exercice();
   if ( $exercice =3D=3D 0 ) {
     alert(_('Aucune periode par defaut'));
@@ -261,53 +300,22 @@
     }
     echo '</table>';
   }
-  echo '</fieldset>';
-  echo '</div>';
- } else {
-  echo '<fieldset style=3D"height:50%;width:80%;background-color:white">=
<legend>'._('Aucun rapport d=C3=A9fini').'</legend>';
-  echo '<a href=3D"javascript:void(0)" onclick=3D"set_preference('.dossi=
er::id().')">'._('Cliquez ici pour mettre =C3=A0 jour vos pr=C3=A9f=C3=A9=
rences').'</a>';
-
-
-echo '</fieldset>';
-echo '</div>';
-}
-
+  ?>
+  </fieldset>
+<?php
+  else :
 ?>
-</div>
+  <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>
=20
-<div style=3D"float:right;width: 47%">
-<fieldset>
-<legend><?php echo _('Derni=C3=A8res op=C3=A9rations')?>
-</legend>
-<table style=3D"width: 100%">
+</fieldset>
 <?php
-for($i=3D0;$i<count($last_ledger);$i++):
-	$class=3D($i%2=3D=3D0)?' class=3D"even" ':' class=3D"odd" ';
+endif;
 ?>
-<tr <?php echo $class ?>>
-	<td><?php echo   smaller_date($last_ledger[$i]['jr_date_fmt'])?>
-	</td>
-	<td>
-		<?php echo $last_ledger[$i]['jrn_def_code']?>
-	</td>
-<td>
-   <?php echo h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?=
>
-</td>
-<td>
-<?php echo HtmlInput::detail_op($last_ledger[$i]['jr_id'], $last_ledger[=
$i]['jr_internal'])?>
-</td>
-<td class=3D"num">
-<?php echo nbm($last_ledger[$i]['jr_montant'])?>
-</td>
-
-</tr>
-<?php endfor;?>
-</ul></table>
-</fieldset>
 </div>
+</div>
=20
=20
-
 <div id=3D"add_todo_list" >
 	<script charset=3D"utf8" type=3D"text/javascript" language=3D"javascrip=
t">
 		new Draggable($('add_todo_list'),{});



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


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

Author: danydb
Date: 2013-10-12 22:04:39 +0200 (Sat, 12 Oct 2013)
New Revision: 5490

Modified:
   phpcompta/trunk/include/class_acc_reconciliation.php
   phpcompta/trunk/include/template/impress_reconciliation.php
Log:
task #0000891: Impression des op?\195?\169rations ainsi que les op?\195?\=
169rations rapproch?\195?\169es

Modified: phpcompta/trunk/include/class_acc_reconciliation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_reconciliation.php	2013-10-12 18:00=
:42 UTC (rev 5489)
+++ phpcompta/trunk/include/class_acc_reconciliation.php	2013-10-12 20:04=
:39 UTC (rev 5490)
@@ -255,7 +255,7 @@
     }
     /**
      *@brief return array of not-reconciled operation
-
+    * Prepare and put in memory the SQL detail_quant
     */
     function get_not_reconciled()
     {
@@ -270,7 +270,7 @@
             $this->jr_id=3D$array[$i]['jr_id'];
             $ret[$i]['first']=3D$this->fill_info();
         }
-
+        $this->db->prepare('detail_quant','select * from v_quant_detail =
where jr_id=3D$1');
         return $ret;
     }
     /**
@@ -302,6 +302,7 @@
     }
     /**
      *@brief return array of reconciled operation
+     * Prepare and put in memory the SQL detail_quant
      *@return
      *@note
      *@see
@@ -330,10 +331,12 @@
                 $ret[$i]['depend'][$e]=3D$this->fill_info();
             }
         }
+        $this->db->prepare('detail_quant','select * from v_quant_detail =
where jr_id=3D$1');
         return $ret;
     }
     /**
      *@brief
+     * Prepare and put in memory the SQL detail_quant
      *@param
      *@return
      *@note
@@ -389,6 +392,18 @@
       return $sql;
=20
     }
+    function show_detail($p_ret)
+    {
+        if (Database::num_row($p_ret)> 0)
+        {
+            echo '<tr class=3D"odd">';
+            echo '<td></td>';
+            echo '<td colspan=3D"5" style=3D"border:1px solid black;widt=
h:auto">';
+            include 'template/impress_reconciliation_detail.php';
+            echo '</td>';
+            echo '</tr>';
+        }
+    }
     static function test_me()
     {
         $cn=3Dnew Database(dossier::id());

Modified: phpcompta/trunk/include/template/impress_reconciliation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/impress_reconciliation.php	2013-10-1=
2 18:00:42 UTC (rev 5489)
+++ phpcompta/trunk/include/template/impress_reconciliation.php	2013-10-1=
2 20:04:39 UTC (rev 5490)
@@ -21,6 +21,7 @@
 </tr>
 <?php=20
 for ($i=3D0;$i<count($array);$i++) {
+       =20
 	$r=3D'';
 	$r.=3Dtd($i);
 	$r.=3Dtd(format_date($array[$i]['first']['jr_date']));
@@ -31,6 +32,9 @@
 	$r.=3Dtd($array[$i]['first']['jr_comment']);
 	$r.=3Dtd(nbm($array[$i]['first']['jr_montant']),'style=3D"text-align:ri=
ght"');
 	echo tr($r);
+        // check if operation does exist in v_detail_quant
+        $ret=3D$a->db->execute('detail_quant',array($array[$i]['first'][=
'jr_id']));
+        $a->show_detail($ret);
 	if ( isset($array[$i]['depend']) )
 	{
 		$limit=3Dcount($array[$i]['depend'])-1;
@@ -48,7 +52,10 @@
 				echo '<tr style=3D"border-bottom: 1px solid  #4f4f7d;">'.$r.'</tr>';
 			else
 				echo tr($r);
+                        $ret=3D$a->db->execute('detail_quant',array($arr=
ay[$i]['depend'][$e]['jr_id']));
+                        $a->show_detail($ret);
 			}
+                        =20
 	}
 }
 ?>



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


From MAILER-DAEMON Sat Oct 12 16:15:58 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VV5bS-00073n-Gu
	for mharc-phpcompta-dev@gnu.org; Sat, 12 Oct 2013 16:15:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 12 Oct 2013 22:05:47 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.70096.1381608958.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5491 - phpcompta/trunk/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Oct 2013 20:15:57 -0000

Author: danydb
Date: 2013-10-12 22:05:47 +0200 (Sat, 12 Oct 2013)
New Revision: 5491

Added:
   phpcompta/trunk/sql/detail-operation-rapprochement.sql
Log:
task #0000891: Impression des op?\195?\169rations ainsi que les op?\195?\=
169rations rapproch?\195?\169es
Cr?\195?\169ation de la vue : ?\195?\160 integrer dans le patch

Added: phpcompta/trunk/sql/detail-operation-rapprochement.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/detail-operation-rapprochement.sql	              =
          (rev 0)
+++ phpcompta/trunk/sql/detail-operation-rapprochement.sql	2013-10-12 20:=
05:47 UTC (rev 5491)
@@ -0,0 +1,43 @@
+=EF=BB=BFdrop view v_quant_detail;
+create or replace view v_quant_detail as
+with quant as=20
+	(select=20
+		j_id,
+		qp_fiche as fiche_id,
+		qp_supplier as tiers,=20
+		qp_vat as vat_amount,
+		qp_price as price,
+		qp_vat_code as vat_code,
+		qp_dep_priv as dep_priv,
+		qp_nd_tva as nd_tva,
+		qp_nd_tva_recup as nd_tva_recup,
+		qp_nd_amount	as nd_amount,
+		qp_vat_sided as vat_sided
+		from quant_purchase
+	union all=09
+	select=20
+		j_id,
+		qs_fiche,
+		qs_client,
+		qs_vat,
+		qs_price,
+		qs_vat_code,
+		0,
+		0,
+		0,
+		0,
+		qs_vat_sided
+	from=20
+		quant_sold
+)=09
+select=20
+	jr_id,quant.tiers,jrn_def_name,jrn_def_type,name,jr_comment,jr_montant,=
sum(price) as price,vat_code,sum(vat_amount) as vat_amount,sum(dep_priv) =
as dep_priv,sum(nd_tva) as nd_tva,sum(nd_tva_recup) as nd_tva_recup,sum(n=
d_amount) as nd_amount,vat_sided,tva_label
+from=20
+jrn
+join jrnx on (jrnx.j_grpt=3Djrn.jr_grpt_id)
+join quant using (j_id)
+left join vw_fiche_name on (tiers=3Dvw_fiche_name.f_id)
+join jrn_def on (jrn_def_id=3Djr_def_id)
+join tva_rate on (tva_id=3Dvat_code)
+group by
+jr_id,quant.tiers,jr_comment,jr_montant,vat_code,vat_sided,name,jrn_def_=
name,jrn_def_type,tva_label;
\ 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 Oct 12 16:33:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VV5se-0001hn-UN
	for mharc-phpcompta-dev@gnu.org; Sat, 12 Oct 2013 16:33:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 12 Oct 2013 22:23:34 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.70099.1381610024.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5492 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Oct 2013 20:33:43 -0000

Author: danydb
Date: 2013-10-12 22:23:33 +0200 (Sat, 12 Oct 2013)
New Revision: 5492

Modified:
   phpcompta/trunk/include/export_ledger_csv.php
Log:
task #0000890: PRINTJRN : export PDF et CSV des operations detaillees
Cosmetique : nom export csv

Modified: phpcompta/trunk/include/export_ledger_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_ledger_csv.php	2013-10-12 20:05:47 UTC=
 (rev 5491)
+++ phpcompta/trunk/include/export_ledger_csv.php	2013-10-12 20:23:33 UTC=
 (rev 5492)
@@ -22,9 +22,10 @@
  * \brief Send a ledger in CSV format
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+$fDate =3D date('dmy-Hi');
 header('Pragma: public');
 header('Content-type: application/csv');
-header('Content-Disposition: attachment;filename=3D"jrn.csv"',FALSE);
+header('Content-Disposition: attachment;filename=3D"jrn-'.$fDate.'.csv"'=
,FALSE);
 include_once ("ac_common.php");
 require_once('class_own.php');
 require_once 'class_acc_ledger_sold.php';



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


From MAILER-DAEMON Sun Oct 13 10:14:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VVMRQ-0007TT-UX
	for mharc-phpcompta-dev@gnu.org; Sun, 13 Oct 2013 10:14:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 13 Oct 2013 16:04:32 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.70474.1381673684.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r528 - tag/rel660/rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 14:14:43 -0000

Author: danydb
Date: 2013-10-13 16:04:31 +0200 (Sun, 13 Oct 2013)
New Revision: 528

Modified:
   tag/rel660/rapport_avance/include/class_formulaire_param.php
Log:
Bug when restoring rapport

Modified: tag/rel660/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel660/rapport_avance/include/class_formulaire_param.php	2013-10-=
05 17:47:08 UTC (rev 527)
+++ tag/rel660/rapport_avance/include/class_formulaire_param.php	2013-10-=
13 14:04:31 UTC (rev 528)
@@ -99,7 +99,7 @@
 	{
 		global $cn;
 		$in =3D fopen($filename, "r");
-		$cn->start();
+		/* DEBUG $cn->start(); */
 		try
 		{
 			$a =3D fgetcsv($in, 0, ";");
@@ -149,17 +149,29 @@
 				VALUES ($1, $2, $3, $4, $5, $6, $7,$8, $9, $10, $11, $12)", $t);
 			}
 			/// Update now the table  rapport_advanced.restore_formulaire_param a=
nd set the correct pk
-			$cn->exec_sql("update rapport_advanced.restore_formulaire_param set p=
_id=3Dnextval('rapport_advanced.formulaire_param_p_id_seq')");
+			/// $cn->exec_sql("update rapport_advanced.restore_formulaire_param s=
et p_id=3Dnextval('rapport_advanced.formulaire_param_p_id_seq')");
+                       =20
+                        // Insert row by row + detail=20
+                        $array=3D$cn->get_array("select p_id,p_code,p_li=
belle,p_order,f_id,t_id from rapport_advanced.restore_formulaire_param wh=
ere f_id=3D$1",array($form->f_id));
+                        // Prepare stmt for the details
+                        $cn->prepare('detail','select p_id,tmp_val,tva_i=
d,fp_formula,fp_signed, jrn_def_type,tt_id,type_detail,with_tmp_val,type_=
sum_account,operation_pcm_val=20
+                                    from  rapport_advanced.restore_formu=
laire_param_detail where p_id=3D$1');
+                        $nb=3Dcount($array);
+                        for ($e=3D0;$e<$nb;$e++)
+                        {
+                            // Insert first into  rapport_advanced.formu=
laire_param
+        			$new_pid=3D$cn->get_value("insert into rapport_advanced.formu=
laire_param (p_code, p_libelle, p_type, p_order, f_id, t_id)
+                                   select   p_code, p_libelle, p_type, p=
_order, f_id, t_id
+				from rapport_advanced.restore_formulaire_param where p_id=3D$1 retur=
ning p_id",array($array[$e]['p_id']));
+                            // Insert detail=20
+                                $cn->exec_sql("insert into rapport_advan=
ced.formulaire_param_detail select nextval('rapport_advanced.formulaire_p=
aram_detail_fp_id_seq'), $new_pid, tmp_val, tva_id, fp_formula, fp_signed=
, jrn_def_type,
+                    tt_id, type_detail, with_tmp_val, type_sum_account, =
operation_pcm_val from  rapport_advanced.restore_formulaire_param_detail =
where p_id =3D$1
+                                ",array($array[$e]['p_id']));
+                        }
=20
-			$cn->exec_sql('insert into rapport_advanced.formulaire_param select  =
p_id, p_code, p_libelle, p_type, p_order, f_id, t_id
-				from rapport_advanced.restore_formulaire_param where f_id=3D$1',arra=
y($form->f_id));
=20
-			$cn->exec_sql("insert into rapport_advanced.formulaire_param_detail s=
elect nextval('rapport_advanced.formulaire_param_detail_fp_id_seq'), p_id=
, tmp_val, tva_id, fp_formula, fp_signed, jrn_def_type,
-            tt_id, type_detail, with_tmp_val, type_sum_account, operatio=
n_pcm_val from  rapport_advanced.restore_formulaire_param_detail where p_=
id in (
-			select p_id from rapport_advanced.restore_formulaire_param where f_id=
=3D$1)",array($form->f_id));
-
-			$cn->exec_sql('delete from  rapport_advanced.restore_formulaire_param=
 where f_id=3D$1',array($form->f_id));
-			$cn->commit();
+		/*DEBUG	$cn->exec_sql('delete from  rapport_advanced.restore_formulair=
e_param where f_id=3D$1',array($form->f_id));
+			$cn->commit();*/
 		}
 		catch (Exception $exc)
 		{



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


From MAILER-DAEMON Sun Oct 13 10:16:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VVMSt-0007v3-Q9
	for mharc-phpcompta-dev@gnu.org; Sun, 13 Oct 2013 10:16:15 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 13 Oct 2013 16:06:04 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.70475.1381673775.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r529 - in trunk: . rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 14:16:15 -0000

Author: danydb
Date: 2013-10-13 16:06:04 +0200 (Sun, 13 Oct 2013)
New Revision: 529

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

........
  r528 | danydb | 2013-10-13 16:04:31 +0200 (dim., 13 oct. 2013) | 1 line
 =20
  Bug when restoring rapport
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel660:1-526
   + /tag/rel660:1-528

Modified: trunk/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_formulaire_param.php	2013-10-13 14=
:04:31 UTC (rev 528)
+++ trunk/rapport_avance/include/class_formulaire_param.php	2013-10-13 14=
:06:04 UTC (rev 529)
@@ -99,7 +99,7 @@
 	{
 		global $cn;
 		$in =3D fopen($filename, "r");
-		$cn->start();
+		/* DEBUG $cn->start(); */
 		try
 		{
 			$a =3D fgetcsv($in, 0, ";");
@@ -149,17 +149,29 @@
 				VALUES ($1, $2, $3, $4, $5, $6, $7,$8, $9, $10, $11, $12)", $t);
 			}
 			/// Update now the table  rapport_advanced.restore_formulaire_param a=
nd set the correct pk
-			$cn->exec_sql("update rapport_advanced.restore_formulaire_param set p=
_id=3Dnextval('rapport_advanced.formulaire_param_p_id_seq')");
+			/// $cn->exec_sql("update rapport_advanced.restore_formulaire_param s=
et p_id=3Dnextval('rapport_advanced.formulaire_param_p_id_seq')");
+                       =20
+                        // Insert row by row + detail=20
+                        $array=3D$cn->get_array("select p_id,p_code,p_li=
belle,p_order,f_id,t_id from rapport_advanced.restore_formulaire_param wh=
ere f_id=3D$1",array($form->f_id));
+                        // Prepare stmt for the details
+                        $cn->prepare('detail','select p_id,tmp_val,tva_i=
d,fp_formula,fp_signed, jrn_def_type,tt_id,type_detail,with_tmp_val,type_=
sum_account,operation_pcm_val=20
+                                    from  rapport_advanced.restore_formu=
laire_param_detail where p_id=3D$1');
+                        $nb=3Dcount($array);
+                        for ($e=3D0;$e<$nb;$e++)
+                        {
+                            // Insert first into  rapport_advanced.formu=
laire_param
+        			$new_pid=3D$cn->get_value("insert into rapport_advanced.formu=
laire_param (p_code, p_libelle, p_type, p_order, f_id, t_id)
+                                   select   p_code, p_libelle, p_type, p=
_order, f_id, t_id
+				from rapport_advanced.restore_formulaire_param where p_id=3D$1 retur=
ning p_id",array($array[$e]['p_id']));
+                            // Insert detail=20
+                                $cn->exec_sql("insert into rapport_advan=
ced.formulaire_param_detail select nextval('rapport_advanced.formulaire_p=
aram_detail_fp_id_seq'), $new_pid, tmp_val, tva_id, fp_formula, fp_signed=
, jrn_def_type,
+                    tt_id, type_detail, with_tmp_val, type_sum_account, =
operation_pcm_val from  rapport_advanced.restore_formulaire_param_detail =
where p_id =3D$1
+                                ",array($array[$e]['p_id']));
+                        }
=20
-			$cn->exec_sql('insert into rapport_advanced.formulaire_param select  =
p_id, p_code, p_libelle, p_type, p_order, f_id, t_id
-				from rapport_advanced.restore_formulaire_param where f_id=3D$1',arra=
y($form->f_id));
=20
-			$cn->exec_sql("insert into rapport_advanced.formulaire_param_detail s=
elect nextval('rapport_advanced.formulaire_param_detail_fp_id_seq'), p_id=
, tmp_val, tva_id, fp_formula, fp_signed, jrn_def_type,
-            tt_id, type_detail, with_tmp_val, type_sum_account, operatio=
n_pcm_val from  rapport_advanced.restore_formulaire_param_detail where p_=
id in (
-			select p_id from rapport_advanced.restore_formulaire_param where f_id=
=3D$1)",array($form->f_id));
-
-			$cn->exec_sql('delete from  rapport_advanced.restore_formulaire_param=
 where f_id=3D$1',array($form->f_id));
-			$cn->commit();
+		/*DEBUG	$cn->exec_sql('delete from  rapport_advanced.restore_formulair=
e_param where f_id=3D$1',array($form->f_id));
+			$cn->commit();*/
 		}
 		catch (Exception $exc)
 		{



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


From MAILER-DAEMON Sun Oct 13 14:50:58 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VVQkk-00071a-5k
	for mharc-phpcompta-dev@gnu.org; Sun, 13 Oct 2013 14:50:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 13 Oct 2013 20:40:42 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.70704.1381690257.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r530 - tag/rel660/rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 18:50:56 -0000

Author: danydb
Date: 2013-10-13 20:40:42 +0200 (Sun, 13 Oct 2013)
New Revision: 530

Modified:
   tag/rel660/rapport_avance/include/class_formulaire_param.php
Log:
remove debug info

Modified: tag/rel660/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel660/rapport_avance/include/class_formulaire_param.php	2013-10-=
13 14:06:04 UTC (rev 529)
+++ tag/rel660/rapport_avance/include/class_formulaire_param.php	2013-10-=
13 18:40:42 UTC (rev 530)
@@ -99,7 +99,7 @@
 	{
 		global $cn;
 		$in =3D fopen($filename, "r");
-		/* DEBUG $cn->start(); */
+		$cn->start();=20
 		try
 		{
 			$a =3D fgetcsv($in, 0, ";");
@@ -170,8 +170,8 @@
                         }
=20
=20
-		/*DEBUG	$cn->exec_sql('delete from  rapport_advanced.restore_formulair=
e_param where f_id=3D$1',array($form->f_id));
-			$cn->commit();*/
+                    $cn->exec_sql('delete from  rapport_advanced.restore=
_formulaire_param where f_id=3D$1',array($form->f_id));
+                    $cn->commit();
 		}
 		catch (Exception $exc)
 		{



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


From MAILER-DAEMON Sun Oct 13 14:51:40 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VVQlQ-00074h-Cl
	for mharc-phpcompta-dev@gnu.org; Sun, 13 Oct 2013 14:51:40 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 13 Oct 2013 20:41:30 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.70709.1381690299.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r531 - in trunk: . rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 18:51:39 -0000

Author: danydb
Date: 2013-10-13 20:41:29 +0200 (Sun, 13 Oct 2013)
New Revision: 531

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

........
  r530 | danydb | 2013-10-13 20:40:42 +0200 (dim., 13 oct. 2013) | 1 line
 =20
  remove debug info
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel660:1-528
   + /tag/rel660:1-530

Modified: trunk/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_formulaire_param.php	2013-10-13 18=
:40:42 UTC (rev 530)
+++ trunk/rapport_avance/include/class_formulaire_param.php	2013-10-13 18=
:41:29 UTC (rev 531)
@@ -99,7 +99,7 @@
 	{
 		global $cn;
 		$in =3D fopen($filename, "r");
-		/* DEBUG $cn->start(); */
+		$cn->start();=20
 		try
 		{
 			$a =3D fgetcsv($in, 0, ";");
@@ -170,8 +170,8 @@
                         }
=20
=20
-		/*DEBUG	$cn->exec_sql('delete from  rapport_advanced.restore_formulair=
e_param where f_id=3D$1',array($form->f_id));
-			$cn->commit();*/
+                    $cn->exec_sql('delete from  rapport_advanced.restore=
_formulaire_param where f_id=3D$1',array($form->f_id));
+                    $cn->commit();
 		}
 		catch (Exception $exc)
 		{



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


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

Author: danydb
Date: 2013-10-14 20:36:57 +0200 (Mon, 14 Oct 2013)
New Revision: 5493

Modified:
   phpcompta/trunk/include/class_todo_list.php
   phpcompta/trunk/include/template/dashboard.php
Log:
task #0000899: Dans la todo list : tri

Modified: phpcompta/trunk/include/class_todo_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_todo_list.php	2013-10-12 20:23:33 UTC (=
rev 5492)
+++ phpcompta/trunk/include/class_todo_list.php	2013-10-14 18:36:57 UTC (=
rev 5493)
@@ -184,7 +184,7 @@
      */
     public function load_all()
     {
-        $sql=3D"select tl_id, tl_title,tl_desc,to_char( tl_date,'DD.MM.Y=
YYY') as str_tl_date
+        $sql=3D"select tl_id, tl_title,tl_desc,to_char( tl_date,'DD.MM.Y=
YYY') as str_tl_date,tl_date
              from todo_list where use_login=3D$1".
              " order by tl_date::date asc";
         $res=3D$this->cn->exec_sql(

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-10-12 20:23:33 UT=
C (rev 5492)
+++ phpcompta/trunk/include/template/dashboard.php	2013-10-14 18:36:57 UT=
C (rev 5493)
@@ -121,7 +121,8 @@
 <?php
 echo HtmlInput::button('add',_('Ajout'),'onClick=3D"add_todo()"');
 if ( ! empty ($array) )  {
-  echo '<table id=3D"table_todo" width=3D"100%">';
+  echo '<table id=3D"table_todo" class=3D"sortable" width=3D"100%">';
+  echo '<tr><th class=3D" sorttable_sorted_reverse">Date <span id=3D"sor=
ttable_sortrevind">&nbsp;&blacktriangle;</span></th><th>Titre</th><th></t=
h>';
   $nb=3D0;
   $today=3Ddate('d.m.Y');
=20
@@ -130,7 +131,7 @@
     if ( strcmp($today,$row['str_tl_date'])=3D=3D0) { $odd.=3D' style=3D=
"background-color:#FFEA00"';}
     $nb++;
     echo '<tr id=3D"tr'.$row['tl_id'].'" '.$odd.'>'.
-      '<td>'.
+      '<td sorttable_customkey=3D"'.$row['tl_date'].'>">'.
       $row['str_tl_date'].
       '</td>'.
       '<td>'.



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


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

Author: danydb
Date: 2013-10-14 20:37:39 +0200 (Mon, 14 Oct 2013)
New Revision: 5494

Added:
   phpcompta/trunk/sql/1-detail-operation-rapprochement.sql
Removed:
   phpcompta/trunk/sql/detail-operation-rapprochement.sql
Log:
rename

Copied: phpcompta/trunk/sql/1-detail-operation-rapprochement.sql (from re=
v 5492, phpcompta/trunk/sql/detail-operation-rapprochement.sql)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/1-detail-operation-rapprochement.sql	            =
            (rev 0)
+++ phpcompta/trunk/sql/1-detail-operation-rapprochement.sql	2013-10-14 1=
8:37:39 UTC (rev 5494)
@@ -0,0 +1,43 @@
+=EF=BB=BFdrop view v_quant_detail;
+create or replace view v_quant_detail as
+with quant as=20
+	(select=20
+		j_id,
+		qp_fiche as fiche_id,
+		qp_supplier as tiers,=20
+		qp_vat as vat_amount,
+		qp_price as price,
+		qp_vat_code as vat_code,
+		qp_dep_priv as dep_priv,
+		qp_nd_tva as nd_tva,
+		qp_nd_tva_recup as nd_tva_recup,
+		qp_nd_amount	as nd_amount,
+		qp_vat_sided as vat_sided
+		from quant_purchase
+	union all=09
+	select=20
+		j_id,
+		qs_fiche,
+		qs_client,
+		qs_vat,
+		qs_price,
+		qs_vat_code,
+		0,
+		0,
+		0,
+		0,
+		qs_vat_sided
+	from=20
+		quant_sold
+)=09
+select=20
+	jr_id,quant.tiers,jrn_def_name,jrn_def_type,name,jr_comment,jr_montant,=
sum(price) as price,vat_code,sum(vat_amount) as vat_amount,sum(dep_priv) =
as dep_priv,sum(nd_tva) as nd_tva,sum(nd_tva_recup) as nd_tva_recup,sum(n=
d_amount) as nd_amount,vat_sided,tva_label
+from=20
+jrn
+join jrnx on (jrnx.j_grpt=3Djrn.jr_grpt_id)
+join quant using (j_id)
+left join vw_fiche_name on (tiers=3Dvw_fiche_name.f_id)
+join jrn_def on (jrn_def_id=3Djr_def_id)
+join tva_rate on (tva_id=3Dvat_code)
+group by
+jr_id,quant.tiers,jr_comment,jr_montant,vat_code,vat_sided,name,jrn_def_=
name,jrn_def_type,tva_label;
\ No newline at end of file

Deleted: phpcompta/trunk/sql/detail-operation-rapprochement.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/detail-operation-rapprochement.sql	2013-10-14 18:=
36:57 UTC (rev 5493)
+++ phpcompta/trunk/sql/detail-operation-rapprochement.sql	2013-10-14 18:=
37:39 UTC (rev 5494)
@@ -1,43 +0,0 @@
-=EF=BB=BFdrop view v_quant_detail;
-create or replace view v_quant_detail as
-with quant as=20
-	(select=20
-		j_id,
-		qp_fiche as fiche_id,
-		qp_supplier as tiers,=20
-		qp_vat as vat_amount,
-		qp_price as price,
-		qp_vat_code as vat_code,
-		qp_dep_priv as dep_priv,
-		qp_nd_tva as nd_tva,
-		qp_nd_tva_recup as nd_tva_recup,
-		qp_nd_amount	as nd_amount,
-		qp_vat_sided as vat_sided
-		from quant_purchase
-	union all=09
-	select=20
-		j_id,
-		qs_fiche,
-		qs_client,
-		qs_vat,
-		qs_price,
-		qs_vat_code,
-		0,
-		0,
-		0,
-		0,
-		qs_vat_sided
-	from=20
-		quant_sold
-)=09
-select=20
-	jr_id,quant.tiers,jrn_def_name,jrn_def_type,name,jr_comment,jr_montant,=
sum(price) as price,vat_code,sum(vat_amount) as vat_amount,sum(dep_priv) =
as dep_priv,sum(nd_tva) as nd_tva,sum(nd_tva_recup) as nd_tva_recup,sum(n=
d_amount) as nd_amount,vat_sided,tva_label
-from=20
-jrn
-join jrnx on (jrnx.j_grpt=3Djrn.jr_grpt_id)
-join quant using (j_id)
-left join vw_fiche_name on (tiers=3Dvw_fiche_name.f_id)
-join jrn_def on (jrn_def_id=3Djr_def_id)
-join tva_rate on (tva_id=3Dvat_code)
-group by
-jr_id,quant.tiers,jr_comment,jr_montant,vat_code,vat_sided,name,jrn_def_=
name,jrn_def_type,tva_label;
\ 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 Oct 14 15:28:22 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VVnoU-0006ex-F9
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Oct 2013 15:28:22 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Oct 2013 21:18:08 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.71414.1381778901.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r532 - trunk/importbank/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, 14 Oct 2013 19:28:21 -0000

Author: danydb
Date: 2013-10-14 21:18:07 +0200 (Mon, 14 Oct 2013)
New Revision: 532

Modified:
   trunk/importbank/include/template/show_list.php
Log:
task #0000897: IMPORTBANK : tri et filtre sur le d?\195?\169tails

Modified: trunk/importbank/include/template/show_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/show_list.php	2013-10-13 18:41:29 U=
TC (rev 531)
+++ trunk/importbank/include/template/show_list.php	2013-10-14 19:18:07 U=
TC (rev 532)
@@ -10,12 +10,12 @@
 <?php echo HtmlInput::submit('delete_record','Effacer')?>
 <?php echo HtmlInput::submit('transfer_record','Transf=C3=A8rer')?>
 </form>
-
-<table class=3D"table_large">
+<?php echo HtmlInput::filter_table('record_tb_id','1,2,3,4,5,6,7',1); ?>
+<table id=3D"record_tb_id" class=3D"sortable" >
 	<TR>
 	<th></th>
 	<TH>N=C2=B0 op=C3=A9ration</TH>
-	<th>Date</th>
+	<th  class=3D" sorttable_sorted_reverse" >Date <span id=3D"sorttable_so=
rtrevind">&nbsp;&blacktriangle;</span></th>
 	<th>Montant</th>
 	<th>Etat</th>
 	<th>Tiers</th>
@@ -33,18 +33,18 @@
=20
 ?>
 <tr <?php echo $class?> >
-<td>
+<td sorttable_customkey=3D"1">
 	<?php echo HtmlInput::button('bt'.$row['id'],'Reconcilie',$javascript)?=
>
 </td>
 <TD>
 <?php echo $row['ref_operation']?>
 </TD>
=20
-<TD>
+<TD sorttable_customkey=3D"<?php echo $row['tp_date']; ?>">
 <?php echo format_date($row['tp_date'])?>
 </TD>
=20
-<td class=3D"num">
+<td class=3D"num" sorttable_customkey=3D"<?php echo $row['amount']; ?>">
 <?php echo nbm($row['amount'])?>
 </td>
 <td id=3D"<?php echo 'st'.$row['id']?>" <?php echo Import_Bank::color_st=
atus($row['status'])?>  >



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


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

Author: danydb
Date: 2013-10-14 23:15:36 +0200 (Mon, 14 Oct 2013)
New Revision: 5495

Modified:
   phpcompta/trunk/include/class_acc_reconciliation.php
   phpcompta/trunk/include/impress_rec.inc.php
Log:
Export CSV Reconciliation=20

Modified: phpcompta/trunk/include/class_acc_reconciliation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_reconciliation.php	2013-10-14 18:37=
:39 UTC (rev 5494)
+++ phpcompta/trunk/include/class_acc_reconciliation.php	2013-10-14 21:15=
:36 UTC (rev 5495)
@@ -349,13 +349,14 @@
     {
         $array=3D$this->get_reconciled();
         $ret=3Darray();
+        bcscale(2);
         for ($i=3D0;$i<count($array);$i++)
         {
             $first_amount=3D$array[$i]['first']['jr_montant'];
             $second_amount=3D0;
             for ($e=3D0;$e<count($array[$i]['depend']);$e++)
             {
-                $second_amount+=3D$array[$i]['depend'][$e]['jr_montant']=
;
+                $second_amount=3Dbcadd($second_amount,$array[$i]['depend=
'][$e]['jr_montant']);
             }
             if ( $p_equal &&  $first_amount=3D=3D$second_amount)
             {
@@ -404,25 +405,110 @@
             echo '</tr>';
         }
     }
+    /**
+     * Export to CSV
+     * @param type $p_choice=20
+     *=20
+     * @note must be set before calling
+     *    - $this->a_jrn       array of ledger
+     *    - $this->start_day start date
+     *    - $this->end_day end date
+     * @see Acc_Reconciliation::get_data
+     */
+    function export_csv($p_choice)
+    {
+        $array =3D $this->get_data($p_choice);
+        for ($i =3D 0; $i < count($array); $i++)
+        {
+            // ---------------------------------------
+            // first index has 2 arrays : first & depend[]
+            // ---------------------------------------
+
+            $first =3D $array[$i]['first'];
+            $a_depend =3D array();
+            if (isset($array[$i]['depend']))
+            {
+                $a_depend =3D $array[$i]['depend'];
+                //----- HEADER ----
+                if ($i =3D=3D 0)
+                {
+                    printf('"n=C2=B0";"Date";"internal";"libell=C3=A9";"=
n=C2=B0 pi=C3=A8ce";"nom journal";"type journal";"montant"');
+                    printf(';"<->";"Date";"internal";"libell=C3=A9";"n=C2=
=B0 pi=C3=A8ce";"nom journal";"type journal";"montant"' . "\n\r");
+                }
+            }
+            else
+            {
+                //----- HEADER ----
+                if ($i =3D=3D 0)
+                {
+                    printf('"n=C2=B0";"Date";"internal";"libell=C3=A9";"=
n=C2=B0 pi=C3=A8ce";"nom journal";"type journal";"montant"' . "\n\r");
+                }
+            }
+            // --------------------------
+            // Print First
+            // --------------------------
+            printf('%d;"%s";"%s";"%s";"%s";"%s";"%s";%f',$i, $first['jr_=
date'], $first['jr_internal'], $first['jr_comment'], $first['jr_pj_number=
'], $first['jrn_def_name'], $first['jrn_def_type'], $first['jr_montant'])=
;
+            if (count($a_depend) > 0)
+            {
+                // --------------------------------------
+                // Print first depending operation
+                // --------------------------------------
+                $depend =3D $a_depend[0];
+                printf(';"<->";"%s";"%s";"%s";"%s";"%s";"%s";%f' . "\n\r=
", $depend['jr_date'], $depend['jr_internal'], $depend['jr_comment'], $de=
pend['jr_pj_number'], $depend['jrn_def_name'], $depend['jrn_def_type'], $=
depend['jr_montant']);
+
+                // --------------------------------------
+                // print other depending operation if any
+                // --------------------------------------
+                for ($e =3D 1; $e < count($a_depend); $e++)
+                {
+                    $depend =3D $a_depend[$e];
+                    printf(';;;;;;;"<->";');
+                    printf('"%s";"%s";"%s";"%s";"%s";"%s";%f' . "\n\r", =
$depend['jr_date'], $depend['jr_internal'], $depend['jr_comment'], $depen=
d['jr_pj_number'], $depend['jrn_def_name'], $depend['jrn_def_type'], $dep=
end['jr_montant']);
+                }
+            }
+            else
+            {
+                printf("\n\r");
+            }
+        }
+    }
+
+    /**
+     *=20
+     * @param type $p_choice
+     *       - 0 : operation reconcilied
+     *       - 1 : reconcilied with different amount
+     *       - 2 : reconcilied with same amount
+     *       - 3 : not reconcilied=20
+     * @return $array
+     */
+    function get_data($p_choice)
+    {
+        switch ($p_choice)
+        {
+            case 0:
+                $array =3D $this->get_reconciled();
+                break;
+            case 1:
+                $array =3D $this->get_reconciled_amount(false);
+                break;
+            case 2:
+                $array =3D $this->get_reconciled_amount(true);
+                break;
+            case 3:
+                $array =3D $this->get_not_reconciled();
+                break;
+            default:
+                echo "Choix invalid";
+                exit();
+        }
+        return $array;
+    }
+
     static function test_me()
     {
         $cn=3Dnew Database(dossier::id());
         $rap=3Dnew Acc_Reconciliation($cn);
-        /*    $rap->set_jr_id(38);
-        $a=3D$rap->get();
-        print_r($a);
-        $rap->remove(4);
-        $rap->insert("4,5,6");
-        $a=3D$rap->get();
-        print_r($a);
-        echo Acc_Reconciliation::$javascript;
-        $w=3D$rap->widget();
-        $w->name=3D"jr_concerned";
-
-        $w->extra2=3D"";
-        echo $w->input();
-        */
-        //var_dump($rap->get_reconciled(''));
         var_dump($rap->get_reconciled_amount('',false));
     }
=20

Modified: phpcompta/trunk/include/impress_rec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_rec.inc.php	2013-10-14 18:37:39 UTC (=
rev 5494)
+++ phpcompta/trunk/include/impress_rec.inc.php	2013-10-14 21:15:36 UTC (=
rev 5495)
@@ -83,29 +83,21 @@
 echo '</div>';
 echo '<div class=3D"content">';
 if ( ! isset($_GET['vis'])) exit();
-$a=3Dnew Acc_Reconciliation($cn);
-$a->a_jrn=3D$r_jrn;
-$a->start_day=3D$dstart->value;
-$a->end_day=3D$dend->value;
+$acc_reconciliation=3Dnew Acc_Reconciliation($cn);
+$acc_reconciliation->a_jrn=3D$r_jrn;
+$acc_reconciliation->start_day=3D$dstart->value;
+$acc_reconciliation->end_day=3D$dend->value;
=20
-switch ($choice)
-{
-case 0:
-    $array=3D$a->get_reconciled();
-    break;
-case 1:
-    $array=3D$a->get_reconciled_amount(false);
-    break;
-case 2:
-    $array=3D$a->get_reconciled_amount(true);
-    break;
-case 3:
-    $array=3D$a->get_not_reconciled();
-    break;
-default:
-    echo "Choix invalid";
-    exit();
-}
+$array=3D$acc_reconciliation->get_data($choice);
+
 $gDossier=3DDossier::id();
+?>
+<form method=3D"get" action=3D"export.php">
+    <?php echo HtmlInput::get_to_hidden(array('ac','gDossier','p_end','p=
_start','choice','r_jrn'));
+    echo HtmlInput::hidden('act','CSV:Reconciliation');
+    echo HtmlInput::submit("csv_bt", "Export CSV");
+    ?>
+</form>
+<?php
 require_once('template/impress_reconciliation.php');
 exit();
\ 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 Oct 14 17:29:00 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VVphE-00060d-OB
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Oct 2013 17:29:00 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Oct 2013 23:18:48 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.71504.1381786139.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5496 - phpcompta/trunk/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 21:28:59 -0000

Author: danydb
Date: 2013-10-14 23:18:47 +0200 (Mon, 14 Oct 2013)
New Revision: 5496

Added:
   phpcompta/trunk/sql/2-insert-csv-menu.sql.sql
Log:
Export CSV Reconciliation=20

Added: phpcompta/trunk/sql/2-insert-csv-menu.sql.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/2-insert-csv-menu.sql.sql	                       =
 (rev 0)
+++ phpcompta/trunk/sql/2-insert-csv-menu.sql.sql	2013-10-14 21:18:47 UTC=
 (rev 5496)
@@ -0,0 +1,7 @@
+insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_p=
arameter,me_javascript,me_type,me_description_etendue)
+values
+('CSV:Reconciliation','Export op=C3=A9rations rapproch=C3=A9es','export_=
rec_csv.php',null,'Export op=C3=A9rations rapproch=C3=A9es en CSV',null,n=
ull,'PR','');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_displ=
ay,pm_default)=20
+values
+('CSV:Reconciliation',null,1,0,'P',0), ('CSV:Reconciliation',null,2,null=
,'P',0);



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


From MAILER-DAEMON Mon Oct 14 17:30:11 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VVpiN-00069b-9I
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Oct 2013 17:30:11 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Oct 2013 23:19:46 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.71505.1381786209.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5497 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 21:30:08 -0000

Author: danydb
Date: 2013-10-14 23:19:46 +0200 (Mon, 14 Oct 2013)
New Revision: 5497

Added:
   phpcompta/trunk/include/export_rec_csv.php
Log:
Export CSV Reconciliation=20

Added: phpcompta/trunk/include/export_rec_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_rec_csv.php	                        (r=
ev 0)
+++ phpcompta/trunk/include/export_rec_csv.php	2013-10-14 21:19:46 UTC (r=
ev 5497)
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Export to CSV the operations asked in impress_rec.inc.php
+ * variable set $g_user,$cn
+ * @see impress_rec.inc.php
+ */
+if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+$Date=3Ddate('Ymd');
+$filename=3D"reconcialed_operation-".$Date;
+
+header('Pragma: public');
+header('Content-type: application/csv');
+header('Content-Disposition: attachment;filename=3D"'.$filename.'.csv"',=
FALSE);
+
+require_once 'class_acc_reconciliation.php';
+include_once ("ac_common.php");
+require_once('class_database.php');
+require_once('class_dossier.php');
+// --------------------------
+// Check if all mandatory arg are passed
+foreach (array('choice','p_end','p_start') as $arg)
+{
+    if ( ! isset ($_GET[$arg])) {
+        die ("argument [".$arg."] is missing");
+    }
+}
+extract($_GET);
+$r_jrn=3D(isset($r_jrn))?$r_jrn:'';
+// -------------------------
+// Create object and export
+$acc_reconciliation=3Dnew Acc_Reconciliation($cn);
+$acc_reconciliation->a_jrn=3D$r_jrn;
+$acc_reconciliation->start_day=3D$p_start;
+$acc_reconciliation->end_day=3D$p_end;
+
+$array=3D$acc_reconciliation->export_csv($choice);
\ 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 Oct 14 17:32:21 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VVpkT-0007CQ-FC
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Oct 2013 17:32:21 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Oct 2013 23:22:08 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.71508.1381786340.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5498 - 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: Mon, 14 Oct 2013 21:32:20 -0000

Author: danydb
Date: 2013-10-14 23:22:08 +0200 (Mon, 14 Oct 2013)
New Revision: 5498

Modified:
   phpcompta/trunk/include/template/impress_reconciliation.php
Log:
Export CSV Reconciliation=20

Modified: phpcompta/trunk/include/template/impress_reconciliation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/impress_reconciliation.php	2013-10-1=
4 21:19:46 UTC (rev 5497)
+++ phpcompta/trunk/include/template/impress_reconciliation.php	2013-10-1=
4 21:22:08 UTC (rev 5498)
@@ -33,8 +33,8 @@
 	$r.=3Dtd(nbm($array[$i]['first']['jr_montant']),'style=3D"text-align:ri=
ght"');
 	echo tr($r);
         // check if operation does exist in v_detail_quant
-        $ret=3D$a->db->execute('detail_quant',array($array[$i]['first'][=
'jr_id']));
-        $a->show_detail($ret);
+        $ret=3D$acc_reconciliation->db->execute('detail_quant',array($ar=
ray[$i]['first']['jr_id']));
+        $acc_reconciliation->show_detail($ret);
 	if ( isset($array[$i]['depend']) )
 	{
 		$limit=3Dcount($array[$i]['depend'])-1;
@@ -52,8 +52,8 @@
 				echo '<tr style=3D"border-bottom: 1px solid  #4f4f7d;">'.$r.'</tr>';
 			else
 				echo tr($r);
-                        $ret=3D$a->db->execute('detail_quant',array($arr=
ay[$i]['depend'][$e]['jr_id']));
-                        $a->show_detail($ret);
+                        $ret=3D$acc_reconciliation->db->execute('detail_=
quant',array($array[$i]['depend'][$e]['jr_id']));
+                        $acc_reconciliation->show_detail($ret);
 			}
                         =20
 	}



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


From MAILER-DAEMON Mon Oct 14 17:33:38 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VVpli-0007Ji-Qf
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Oct 2013 17:33:38 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Oct 2013 23:23:26 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.71509.1381786417.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5499 - 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: Mon, 14 Oct 2013 21:33:37 -0000

Author: danydb
Date: 2013-10-14 23:23:25 +0200 (Mon, 14 Oct 2013)
New Revision: 5499

Added:
   phpcompta/trunk/include/template/impress_reconciliation_detail.php
Log:
Export CSV Reconciliation=20

Added: phpcompta/trunk/include/template/impress_reconciliation_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/impress_reconciliation_detail.php	  =
                      (rev 0)
+++ phpcompta/trunk/include/template/impress_reconciliation_detail.php	20=
13-10-14 21:23:25 UTC (rev 5499)
@@ -0,0 +1,101 @@
+<table class=3D"result">
+    <tr>
+        <th>
+           =20
+        </th>
+         <th style=3D"text-align:right">
+            Prix HTVA
+        </th>
+        <th style=3D"text-align:right">
+            Non Deductible
+        </th>
+        <th style=3D"text-align:right" >
+            code tva
+        </th>
+        <th style=3D"text-align:right">
+            TVA
+        </th>
+        <th style=3D"text-align:right">
+            Tva ND
+        </th>
+        <th style=3D"text-align:right">
+            TVAC
+        </th>
+    </tr>
+<?php=20
+$nb_record=3DDatabase::num_row($p_ret);
+bcscale(2);
+$tot_cum_price=3D0;
+$tot_cum_vat=3D0;
+$tot_cum_nd=3D0;
+$tot_cum_nd_tva=3D0;
+$tot_cum_tvac=3D0;
+for ($i=3D0;$i < $nb_record;$i++)    :
+    $row=3DDatabase::fetch_array($p_ret,$i);
+    $tot_cum_price=3Dbcadd($tot_cum_price,$row['price']);
+   =20
+    $tot_cum_vat=3Dbcadd($tot_cum_vat,$row['vat_amount']);
+   =20
+
+?>   =20
+
+    <tr>
+        <td>
+           =20
+        </td>
+        <td class=3D"num">
+          <?php  echo nbm($row['price']); ?>
+        </td>
+        <td class=3D"num">
+            <?php  $tot_price=3Dbcadd($row['nd_amount'],$row['dep_priv']=
);=20
+            $tot_cum_nd=3Dbcadd($tot_cum_nd,$tot_price);
+            echo nbm($tot_price); ?> =20
+        </td>
+        <td class=3D"num">
+          <?php  echo $row['tva_label']; ?>
+        </td>
+        <td class=3D"num">
+          <?php  echo nbm($row['vat_amount']); ?>
+        </td>
+        <td class=3D"num">
+          <?php  $tot_vat=3Dbcadd($row['nd_tva'],$row['nd_tva_recup']);=20
+          $tot_cum_nd_tva=3Dbcadd($tot_cum_nd_tva,$tot_vat);
+          echo nbm($tot_vat); ?> =20
+        </td>
+        <td class=3D"num">
+            <?php=20
+            $tot=3Dbcadd($tot_vat,$row['price']);
+            $tot=3Dbcadd($tot,$row['vat_amount']);
+            $tot_cum_tvac=3Dbcadd($tot_cum_tvac,$tot);
+            echo nbm($tot);
+            ?>
+        </td>   =20
+    </tr>
+<?php
+          endfor;
+?>
+    <tfoot>
+    <td>
+        Totaux
+    </td>
+    <td class=3D"num">
+        <?php echo nbm($tot_cum_price); ?>
+    </td>
+    <td class=3D"num">
+        <?php echo nbm($tot_cum_nd); ?>
+    </td>
+    <td>
+       =20
+    </td>
+    <td class=3D"num">
+        <?php echo nbm($tot_cum_vat); ?>
+    </td>
+    <td class=3D"num">
+        <?php echo nbm($tot_cum_nd_tva); ?>
+    </td>
+    <td class=3D"num">
+        <?php=20
+        echo nbm($tot_cum_tvac); ?>
+    </td>
+    </tfoot>
+</table>       =20



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


From MAILER-DAEMON Wed Oct 16 17:32:58 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWYiA-00014C-Nm
	for mharc-phpcompta-dev@gnu.org; Wed, 16 Oct 2013 17:32:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 16 Oct 2013 23:22:41 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.73794.1381959177.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5500 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2013 21:32:57 -0000

Author: danydb
Date: 2013-10-16 23:22:40 +0200 (Wed, 16 Oct 2013)
New Revision: 5500

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
Log:
Move the receipt number to the top

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-10-14 21:2=
3:25 UTC (rev 5499)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-10-16 21:2=
2:40 UTC (rev 5500)
@@ -1276,11 +1276,26 @@
             $r.=3D"</tr>";
         }
         $r.=3D'<tr>';
+         if ( ! $p_summary) {
+            $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'. hb(=
$e_pj) . '</td>';
+        } else {
+           =20
+             if ( strcmp($this->pj,$e_pj) !=3D 0 )
+            {
+                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) .=20
+                        '<span class=3D"notice"> '._('Attention num=C3=A9=
ro pi=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</span></td>=
';
+            } else {
+                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) . '</td>';
+            }
+        }
+        $r.=3D'</tr>';
         $r.=3D'<td> ' . _('Date') . '</td><td> ' . hb($e_date) . '</td>'=
;
         $r.=3D'</tr>';
         $r.=3D'<tr>';
         $r.=3D'<td>' . _('Echeance') . '</td><td> ' . hb($e_ech) . '</td=
>';
         $r.=3D'</tr>';
+      =20
+    =20
         $r.=3D'<tr>';
         $r.=3D'<td> ' . _('P=C3=A9riode Comptable') . '</td><td> ' .hb( =
$date_limit['p_start'] . '-' . $date_limit['p_end']) . '</td>';
         $r.=3D'</tr>';
@@ -1291,19 +1306,7 @@
         $r.=3D'<td> ' . _('Libell=C3=A9') . '</td><td> ' . hb($e_comm) .=
 '</td>';
         $r.=3D'</tr>';
         $r.=3D'<tr>';
-        if ( ! $p_summary) {
-            $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'. hb(=
$e_pj) . '</td>';
-        } else {
-           =20
-             if ( strcmp($this->pj,$e_pj) !=3D 0 )
-            {
-                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) .=20
-                        '<span class=3D"notice"> '._('Attention num=C3=A9=
ro pi=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</span></td>=
';
-            } else {
-                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) . '</td>';
-            }
-        }
-        $r.=3D'</tr>';
+       =20
         $r.=3D'<tr>';
         $r.=3D'<td> ' . _('Fournisseur') . '</td><td> ' . hb($e_client .=
 ':' . $client_name) . '</td>';
         $r.=3D'</tr>';

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-10-14 21:23:25=
 UTC (rev 5499)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-10-16 21:22:40=
 UTC (rev 5500)
@@ -628,6 +628,20 @@
             $r.=3D"</tr>";
         }
         $r.=3D'<tr>';
+        if ( ! $p_summary) {
+            $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'. hb(=
$e_pj) . '</td>';
+        } else {
+           =20
+             if ( strcmp($this->pj,$e_pj) !=3D 0 )
+            {
+                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) .=20
+                        '<span class=3D"notice"> '._('Attention num=C3=A9=
ro pi=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</span></td>=
';
+            } else {
+                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) . '</td>';
+            }
+        }
+        $r.=3D'</tr>';
+        $r.=3D'<tr>';
         $r.=3D'<td> ' . _('Date') . '</td><td> ' . hb($e_date) . '</td>'=
;
         $r.=3D'</tr>';
         $r.=3D'<tr>';
@@ -642,21 +656,8 @@
         $r.=3D'<tr>';
         $r.=3D'<td> ' . _('Libell=C3=A9') . '</td><td> ' . hb($e_comm) .=
 '</td>';
         $r.=3D'</tr>';
+       =20
         $r.=3D'<tr>';
-        if ( ! $p_summary) {
-            $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'. hb(=
$e_pj) . '</td>';
-        } else {
-           =20
-             if ( strcmp($this->pj,$e_pj) !=3D 0 )
-            {
-                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) .=20
-                        '<span class=3D"notice"> '._('Attention num=C3=A9=
ro pi=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</span></td>=
';
-            } else {
-                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) . '</td>';
-            }
-        }
-        $r.=3D'</tr>';
-        $r.=3D'<tr>';
         $r.=3D'<td> ' . _('Client') . '</td><td> ' . hb($e_client . ':' =
. $client_name) . '</td>';
         $r.=3D'</tr>';
         $r.=3D'</table>';



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


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

Author: danydb
Date: 2013-10-16 23:28:52 +0200 (Wed, 16 Oct 2013)
New Revision: 5501

Modified:
   phpcompta/trunk/include/periode.inc.php
Log:
Bug cannot close for a ledger

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-10-16 21:22:40 UTC (rev =
5500)
+++ phpcompta/trunk/include/periode.inc.php	2013-10-16 21:28:52 UTC (rev =
5501)
@@ -69,6 +69,7 @@
 		for ($i=3D0;$i < count($a_per_to_close);$i++) {
 			$per=3Dnew Periode($cn);
 			 $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
+                         $per->jrn_def_id=3D$jrn_def_id;
 			 $per->set_periode($a_per_to_close[$i]);
 			$per->close();
 	=09
@@ -105,7 +106,9 @@
   }
 if ( $choose=3D=3D"yes" )
 {
+    echo '<p>';
     echo HtmlInput::button_anchor('Autre Journal ?','?choose=3Dno&ac=3D'=
.$_REQUEST['ac'].'&gDossier=3D'.dossier::id());
+    echo '</p>';
     $per=3Dnew Periode($cn);
     $jrn=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
     $per->set_jrn($jrn);



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


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

Author: danydb
Date: 2013-10-16 23:42:28 +0200 (Wed, 16 Oct 2013)
New Revision: 5502

Modified:
   phpcompta/trunk/include/fiche.inc.php
Log:
show reconciliation in card -> historic

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-10-16 21:28:52 UTC (rev 55=
01)
+++ phpcompta/trunk/include/fiche.inc.php	2013-10-16 21:42:28 UTC (rev 55=
02)
@@ -447,11 +447,15 @@
 		bcscale(2);
 		for ($i =3D 0; $i < count($letter->content); $i++)
 		{
+                    $row =3D $letter->content[$i];
+                        if ($row['letter']!=3D-1) {
+                            $html_letter=3Dstrtoupper(base_convert($row[=
'letter'],10,36));
+                        }
 			if ($i % 2 =3D=3D 0)
-				echo '<tr class=3D"even">';
+				echo '<tr class=3D"even" name=3D"tr_'.$html_letter.'_">';
 			else
-				echo '<tr class=3D"odd">';
-			$row =3D $letter->content[$i];
+				echo '<tr class=3D"odd" name=3D"tr_'.$html_letter.'_">';
+		=09
 			echo td($row['j_date_fmt']);
 			echo td(h($row['jr_pj_number']));
 			echo td(HtmlInput::detail_op($row['jr_id'], $row['jr_internal']));
@@ -459,7 +463,7 @@
 			if ($row['j_debit'] =3D=3D 't')
 			{
 				echo td(nbm($row['j_montant']), ' style=3D"text-align:right"');
-				$amount_deb+=3D$row['j_montant'];
+				$amount_deb=3Dbcadd($amount_deb,$row['j_montant']);
 				$prog =3D bcadd($prog, $row['j_montant']);
 				echo td("");
 			}
@@ -467,18 +471,18 @@
 			{
 				echo td("");
 				echo td(nbm($row['j_montant']), ' style=3D"text-align:right"');
-				$amount_cred+=3D$row['j_montant'];
+				$amount_cred=3Dbcadd($amount_cred,$row['j_montant']);
 				$prog =3D bcsub($prog, $row['j_montant']);
 			}
 			$side =3D "&nbsp;" . $fiche->get_amount_side($prog);
 			echo td(nbm($prog) . $side, 'style=3D"text-align:right"');
-			if ($row['letter'] !=3D -1)
-			{
-				$span_error =3D "";
+                        $html_let=3D"";
+                        if ($row['letter']!=3D-1) {
+                            $span_error =3D "";
 				if ($row['letter_diff'] !=3D 0)
 					$span_error =3D $g_failed;
-				echo td(strtoupper(base_convert($row['letter'],10,36)) . $span_error=
);
-			}
+                                echo '<td>'.HtmlInput::show_reconcile(""=
, $html_letter.$span_error).'</td>';
+                        }
 			else
 				echo td('');
 			echo '</tr>';



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


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

Author: danydb
Date: 2013-10-16 23:46:56 +0200 (Wed, 16 Oct 2013)
New Revision: 5503

Modified:
   phpcompta/trunk/include/dossier.inc.php
   phpcompta/trunk/include/modele.inc.php
   phpcompta/trunk/include/user.inc.php
Log:
Esthetic : button place

Modified: phpcompta/trunk/include/dossier.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/dossier.inc.php	2013-10-16 21:42:28 UTC (rev =
5502)
+++ phpcompta/trunk/include/dossier.inc.php	2013-10-16 21:46:56 UTC (rev =
5503)
@@ -156,8 +156,10 @@
 if ( $sa =3D=3D 'list' )
 {
 	require_once('class_sort_table.php');
-    echo HtmlInput::button_anchor(_('Rafra=C3=AEchir'),'admin_repo.php?a=
ction=3Ddossier_mgt');
-    echo HtmlInput::button_anchor(_('Ajouter'),'admin_repo.php?action=3D=
dossier_mgt&sa=3Dadd');
+        echo '<p>';
+        echo HtmlInput::button_anchor(_('Rafra=C3=AEchir'),'admin_repo.p=
hp?action=3Ddossier_mgt');
+        echo HtmlInput::button_anchor(_('Ajouter'),'admin_repo.php?actio=
n=3Ddossier_mgt&sa=3Dadd');
+        echo '</p>';
 	$header=3Dnew Sort_Table();
 	$url=3D$_SERVER['PHP_SELF']."?sa=3Dlist&action=3D".$_REQUEST['action'];
 	$header->add("id",$url," order by dos_id asc"," order by dos_id desc","=
da","dd");

Modified: phpcompta/trunk/include/modele.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/modele.inc.php	2013-10-16 21:42:28 UTC (rev 5=
502)
+++ phpcompta/trunk/include/modele.inc.php	2013-10-16 21:46:56 UTC (rev 5=
503)
@@ -230,9 +230,10 @@
 	else
 	{
=20
-
+                echo '<p>';
 		echo HtmlInput::button_anchor('Rafra&icirc;chir', 'admin_repo.php?acti=
on=3Dmodele_mgt');
 		echo HtmlInput::button_anchor('Ajouter', 'admin_repo.php?action=3Dmode=
le_mgt&sa=3Dadd');
+                echo '</p>';
 		echo '<span style=3D"display:block;margin-top:10">';
 		echo _('Filtre').HtmlInput::infobulle(23);
 		echo HtmlInput::filter_table("t_modele", "0,1,2","1");

Modified: phpcompta/trunk/include/user.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user.inc.php	2013-10-16 21:42:28 UTC (rev 550=
2)
+++ phpcompta/trunk/include/user.inc.php	2013-10-16 21:46:56 UTC (rev 550=
3)
@@ -88,7 +88,9 @@
 </div>
=20
 <?php
+echo '<p>';
 echo HtmlInput::button_action("Ajout utilisateur", "$('create_user').sho=
w();$('cu').hide()","cu");
+echo '</p>';
 // Show all the existing user on 7 columns
 $repo=3Dnew Dossier(0);
 /******************************************************/



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


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

Author: danydb
Date: 2013-10-16 23:47:14 +0200 (Wed, 16 Oct 2013)
New Revision: 5504

Modified:
   phpcompta/trunk/include/fiche.inc.php
Log:
show reconciliation in card -> historic

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-10-16 21:46:56 UTC (rev 55=
03)
+++ phpcompta/trunk/include/fiche.inc.php	2013-10-16 21:47:14 UTC (rev 55=
04)
@@ -448,6 +448,7 @@
 		for ($i =3D 0; $i < count($letter->content); $i++)
 		{
                     $row =3D $letter->content[$i];
+                     $html_letter=3D"";
                         if ($row['letter']!=3D-1) {
                             $html_letter=3Dstrtoupper(base_convert($row[=
'letter'],10,36));
                         }



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


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

Author: danydb
Date: 2013-10-16 23:56:08 +0200 (Wed, 16 Oct 2013)
New Revision: 5505

Modified:
   phpcompta/trunk/sql/1-detail-operation-rapprochement.sql
Log:
do not drop an inexisting view

Modified: phpcompta/trunk/sql/1-detail-operation-rapprochement.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/1-detail-operation-rapprochement.sql	2013-10-16 2=
1:47:14 UTC (rev 5504)
+++ phpcompta/trunk/sql/1-detail-operation-rapprochement.sql	2013-10-16 2=
1:56:08 UTC (rev 5505)
@@ -1,4 +1,4 @@
-=EF=BB=BFdrop view v_quant_detail;
+--=EF=BB=BFdrop view v_quant_detail;
 create or replace view v_quant_detail as
 with quant as=20
 	(select=20



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


From MAILER-DAEMON Thu Oct 17 11:45:49 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWpll-0006Zf-MZ
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Oct 2013 11:45:49 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Oct 2013 17:35:28 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.74472.1382024746.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r533 - 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: Thu, 17 Oct 2013 15:45:45 -0000

Author: danydb
Date: 2013-10-17 17:35:28 +0200 (Thu, 17 Oct 2013)
New Revision: 533

Modified:
   trunk/rapport_avance/doc/rapav.odt
Log:
update doc

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



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


From MAILER-DAEMON Thu Oct 17 15:19:06 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWt6A-0004r4-KL
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Oct 2013 15:19:06 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Oct 2013 21:08:38 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.74615.1382037545.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r534 - 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, 17 Oct 2013 19:19:04 -0000

Author: danydb
Date: 2013-10-17 21:08:37 +0200 (Thu, 17 Oct 2013)
New Revision: 534

Added:
   trunk/rapport_avance/sql/1-ajout-col-formulaire-param-detail.sql
Modified:
   trunk/rapport_avance/ajax_save_param_detail.php
   trunk/rapport_avance/include/class_formulaire_param_detail.php
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/template/param_detail_new.php
Log:
Ajout de journal comme filtre

Modified: trunk/rapport_avance/ajax_save_param_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_save_param_detail.php	2013-10-17 15:35:28 U=
TC (rev 533)
+++ trunk/rapport_avance/ajax_save_param_detail.php	2013-10-17 19:08:37 U=
TC (rev 534)
@@ -42,6 +42,7 @@
 		$acc_tva->p_id =3D $p_id;
 		$acc_tva->type_detail =3D 2;
 		$acc_tva->tt_id =3D $code_base;
+                $acc_tva->jrn_def_id=3D$p_ledger;
 		if ($acc_tva->verify() =3D=3D 1)
 		{
 			$code =3D 'nok';
@@ -69,6 +70,7 @@
 		$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;
 		if ($acc_formula->verify() =3D=3D 1)
 		{
 			$code =3D 'nok';
@@ -96,6 +98,7 @@
 		$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=3Dnull;
 		if ($acc_compute->verify() =3D=3D 1)
 		{
 			$code =3D 'nok';
@@ -125,6 +128,7 @@
 		$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;
 		if ($acc_account->verify() =3D=3D 1)
 		{
 			$code =3D 'nok';
@@ -156,6 +160,7 @@
 		$acc_account->p_id =3D $p_id;
 		$acc_account->type_detail =3D 5;
 		$acc_account->type_sum_account=3D $account_sum_type;
+                $acc_account->jrn_def_id=3D$p_ledger;
 		if ($acc_account->verify() =3D=3D 1)
 		{
 			$code =3D 'nok';

Modified: trunk/rapport_avance/include/class_formulaire_param_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_formulaire_param_detail.php	2013-1=
0-17 15:35:28 UTC (rev 533)
+++ trunk/rapport_avance/include/class_formulaire_param_detail.php	2013-1=
0-17 19:08:37 UTC (rev 534)
@@ -32,290 +32,315 @@
 class Formulaire_Param_Detail extends Formulaire_Param_Detail_SQL
 {
=20
-	function input_new($p_id)
-	{
-		$parent =3D new Formulaire_Param($p_id);
-		echo HtmlInput::title_box('Formule', 'param_detail_div');
-		echo '<h2>'.$parent->p_code . " " . $parent->p_libelle.'</h2>';
-		require_once 'template/param_detail_new.php';
-	}
+    function input_new($p_id)
+    {
+        global $cn;
+        $parent =3D new Formulaire_Param($p_id);
+        echo HtmlInput::title_box('Formule', 'param_detail_div');
+        echo '<h2>' . $parent->p_code . " " . $parent->p_libelle . '</h2=
>';
+        $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;
+        require_once 'template/param_detail_new.php';
+    }
=20
+    function get_ledger_name()
+    {
+        global $cn;
+        $ledger =3D "";
+        if ($this->jrn_def_id =3D=3D null || $this->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->jrn_def_id));
+            $ledger.=3D"  le journal " . $tledger;
+        }
+        return $ledger;
+    }
+
 }
=20
 class RAPAV_Formula extends Formulaire_Param_Detail
 {
=20
-	function display_row()
-	{
-		printf("R=C3=A9sultat de la formule %s", $this->fp_formula);
-	}
+    function display_row()
+    {
+        $ledger =3D $this->get_ledger_name();
+        printf("R=C3=A9sultat de la formule %s utilisant $ledger", $this=
->fp_formula);
+    }
=20
-	static function new_row()
-	{
-		$account =3D new IPoste("formula_new", "", "form_id");
-		$account->size =3D 50;
-		$account->label =3D _("Recherche poste");
-		$account->set_attribute('gDossier', dossier::id());
-		$account->set_attribute('bracket', 1);
-		$account->set_attribute('no_overwrite', 1);
-		$account->set_attribute('noquery', 1);
-		$account->set_attribute('account', $account->id);
-		echo $account->input();
-	}
+    static function new_row()
+    {
+        $account =3D new IPoste("formula_new", "", "form_id");
+        $account->size =3D 50;
+        $account->label =3D _("Recherche poste");
+        $account->set_attribute('gDossier', dossier::id());
+        $account->set_attribute('bracket', 1);
+        $account->set_attribute('no_overwrite', 1);
+        $account->set_attribute('noquery', 1);
+        $account->set_attribute('account', $account->id);
+        echo $account->input();
+    }
=20
-	function verify()
-	{
-		if (Impress::check_formula($this->fp_formula)=3D=3Dfalse)
-		{
-			$this->errcode=3D"Erreur dans votre formule";
-			return 1;
-		}
-		if ( trim($this->fp_formula)=3D=3D"")
-		{
-			$this->errcode=3D" Aucune formule trouv=C3=A9e";
-			return 1;
-		}
-		return 0;
-	}
+    function verify()
+    {
+        if (Impress::check_formula($this->fp_formula) =3D=3D false)
+        {
+            $this->errcode =3D "Erreur dans votre formule";
+            return 1;
+        }
+        if (trim($this->fp_formula) =3D=3D "")
+        {
+            $this->errcode =3D " Aucune formule trouv=C3=A9e";
+            return 1;
+        }
+        return 0;
+    }
+
 }
=20
 class RAPAV_Account_Tva extends Formulaire_Param_Detail
 {
=20
-	function display_row()
-	{
-		global $cn;
-		$type_total=3D$cn->get_value("select tt_label from rapport_advanced.to=
tal_type where tt_id=3D$1",array($this->tt_id));
-		printf("Poste comptable %s avec le code tva %s (%s) dans le journal %s=
 [ %s ]",
-				$this->tmp_val, $this->tva_id, $this->tva_id, $this->jrn_def_type,$t=
ype_total);
-	}
+    function display_row()
+    {
+        global $cn;
+        $ledger =3D $this->get_ledger_name();
+        $type_total =3D $cn->get_value("select tt_label from rapport_adv=
anced.total_type where tt_id=3D$1", array($this->tt_id));
+        printf("Poste comptable %s avec le code tva %s (%s) dans le jour=
nal de type %s [ %s ] $ledger", $this->tmp_val, $this->tva_id, $this->tva=
_id, $this->jrn_def_type, $type_total);
+    }
=20
-	static function new_row()
-	{
-		global $cn;
-		$account =3D new IPoste("formtva", "", "formtva_id");
-		$account->size =3D 20;
-		$account->label =3D _("Recherche poste");
-		$account->set_attribute('gDossier', dossier::id());
-		$account->set_attribute('noquery', 1);
-		$account->set_attribute('account', $account->id);
+    static function new_row()
+    {
+        global $cn;
+        $account =3D new IPoste("formtva", "", "formtva_id");
+        $account->size =3D 20;
+        $account->label =3D _("Recherche poste");
+        $account->set_attribute('gDossier', dossier::id());
+        $account->set_attribute('noquery', 1);
+        $account->set_attribute('account', $account->id);
=20
-		$tva =3D new ITva_Popup("code_tva");
-		$tva->id =3D HtmlInput::generate_id("code_tva");
-		$tva->set_attribute('gDossier', dossier::id());
+        $tva =3D new ITva_Popup("code_tva");
+        $tva->id =3D HtmlInput::generate_id("code_tva");
+        $tva->set_attribute('gDossier', dossier::id());
=20
-		// Jrn type
-		$select =3D new ISelect('code_jrn');
-		$select->value =3D array(
-			array('value' =3D> 'VEN', 'label' =3D> 'journaux Vente'),
-			array('value' =3D> 'ACH', 'label' =3D> 'journaux Achat')
-		);
-		echo '<table>';
-		echo '<tr><td>Poste comptable</td>';
-		echo td($account->input());
-		echo '</tr>';
-		echo td('TVA') . td($tva->input());
-		echo '</tr>';
-		echo td(_('Choix du type de journal ')) . td($select->input());
-		// Base or VAT
-		echo '</tr>';
-		$code_base =3D new ISelect('code_base');
-		$code_base->value =3D $cn->make_array("select tt_id,tt_label from rapp=
ort_advanced.total_type order by 2");
-		echo td("Type de total");
-		echo td($code_base->input());
-		echo '</tr>';
-		echo '</table>';
-	}
+        // Jrn type
+        $select =3D new ISelect('code_jrn');
+        $select->value =3D array(
+            array('value' =3D> 'VEN', 'label' =3D> 'journaux Vente'),
+            array('value' =3D> 'ACH', 'label' =3D> 'journaux Achat')
+        );
+        echo '<table>';
+        echo '<tr><td>Poste comptable</td>';
+        echo td($account->input());
+        echo '</tr>';
+        echo td('TVA') . td($tva->input());
+        echo '</tr>';
+        echo td(_('Choix du type de journal ')) . td($select->input());
+        // Base or VAT
+        echo '</tr>';
+        $code_base =3D new ISelect('code_base');
+        $code_base->value =3D $cn->make_array("select tt_id,tt_label fro=
m rapport_advanced.total_type order by 2");
+        echo td("Type de total");
+        echo td($code_base->input());
+        echo '</tr>';
+        echo '</table>';
+    }
=20
-	function verify()
-	{
-		global $cn;
-		if (trim($this->tmp_val) =3D=3D "")
-		{
-			$this->errcode =3D 'Poste comptable est vide';
-			return 1;
-		}
-		$count =3D $cn->get_value("select count(*) from tva_rate where tva_id=3D=
$1", array($this->tva_id));
-		if ($count =3D=3D 0)
-		{
-			$this->errcode =3D 'Code TVA inexistant';
-			return 1;
-		}
-	}
+    function verify()
+    {
+        global $cn;
+        if (trim($this->tmp_val) =3D=3D "")
+        {
+            $this->errcode =3D 'Poste comptable est vide';
+            return 1;
+        }
+        $count =3D $cn->get_value("select count(*) from tva_rate where t=
va_id=3D$1", array($this->tva_id));
+        if ($count =3D=3D 0)
+        {
+            $this->errcode =3D 'Code TVA inexistant';
+            return 1;
+        }
+    }
=20
 }
=20
 class RAPAV_Compute extends Formulaire_Param_Detail
 {
=20
-	function display_row()
-	{
-		printf("Total des codes du formulaire %s", $this->fp_formula);
-	}
+    function display_row()
+    {
+        printf("Total des codes du formulaire %s", $this->fp_formula);
+    }
=20
-	static function new_row($p_id)
-	{
-		global $cn;
-		$f_id =3D $cn->get_value("select f_id from rapport_advanced.formulaire=
_param where p_id=3D$1", array($p_id));
-		$account =3D new IText("form_compute");
-		$account->size =3D 50;
-		echo $account->input();
-		echo HtmlInput::button('rapav_search_code_bt', 'Cherche codes', sprint=
f(" onclick=3D\"rapav_search_code('%s','%s','%s','%s')\"", $_REQUEST['ac'=
], $_REQUEST['plugin_code'], $_REQUEST['gDossier'], $f_id));
-	}
-	function verify()
-	{
+    static function new_row($p_id)
+    {
+        global $cn;
+        $f_id =3D $cn->get_value("select f_id from rapport_advanced.form=
ulaire_param where p_id=3D$1", array($p_id));
+        $account =3D new IText("form_compute");
+        $account->size =3D 50;
+        echo $account->input();
+        echo HtmlInput::button('rapav_search_code_bt', 'Cherche codes', =
sprintf(" onclick=3D\"rapav_search_code('%s','%s','%s','%s')\"", $_REQUES=
T['ac'], $_REQUEST['plugin_code'], $_REQUEST['gDossier'], $f_id));
+    }
=20
-		if ( trim($this->fp_formula)=3D=3D"")
-		{
-			$this->errcode=3D" Aucune formule trouv=C3=A9e";
-			return 1;
-		}
+    function verify()
+    {
=20
-		// copy $this->form->fp_formula to a variable
-		$formula =3D $this->fp_formula;
+        if (trim($this->fp_formula) =3D=3D "")
+        {
+            $this->errcode =3D " Aucune formule trouv=C3=A9e";
+            return 1;
+        }
=20
-		// remove the valid
-		preg_match_all("/\[([A-Z]*[0-9]*)*([0-9]*[A-Z]*)\]/i", $formula, $e);
-		$formula=3Dpreg_replace("/\[([A-Z]*[0-9]*)*([0-9]*[A-Z]*)\]/i", '',$fo=
rmula);
-		$formula=3Dpreg_replace('/([0-9]+.{0,1}[0.9]*)*(\+|-|\*|\/)*/','',$for=
mula);
-		$formula=3Dpreg_replace('/(\(|\))/','',$formula);
-		$formula=3Dpreg_replace('/\s/','',$formula);
+        // copy $this->form->fp_formula to a variable
+        $formula =3D $this->fp_formula;
=20
-		// if something remains it should be a mistake
-		if ($formula !=3D '')
-		{
-			$this->errcode=3D" Erreur dans la formule ".$formula;
-			return 1;
-		}
-		return 0;
-	}
+        // 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);
=20
+        // if something remains it should be a mistake
+        if ($formula !=3D '')
+        {
+            $this->errcode =3D " Erreur dans la formule " . $formula;
+            return 1;
+        }
+        return 0;
+    }
+
 }
+
 /**
- *@brief poste comptable utilis=C3=A9 avec le poste comptable, choix ent=
re diff cr=C3=A9dit - debit, diff d=C3=A9bit-cr=C3=A9dit, cr=C3=A9dit, d=C3=
=A9bit
+ * @brief poste comptable utilis=C3=A9 avec le poste comptable, choix en=
tre diff cr=C3=A9dit - debit, diff d=C3=A9bit-cr=C3=A9dit, cr=C3=A9dit, d=
=C3=A9bit
  */
 class RAPAV_Account extends Formulaire_Param_Detail
 {
=20
-	function display_row()
-	{
-		global $cn;
-		$total_type_account=3D$cn->get_value('select tt_label from rapport_adv=
anced.total_type_account where tt_id=3D$1',
-				array($this->type_sum_account));
-		printf("Total %s poste comptable %s utilis=C3=A9 avec le poste comptab=
le %s",
-				$total_type_account,$this->tmp_val,$this->with_tmp_val);
-	}
+    function display_row()
+    {
+        global $cn;
+        $ledger =3D $this->get_ledger_name();
+        $total_type_account =3D $cn->get_value('select tt_label from rap=
port_advanced.total_type_account where tt_id=3D$1', array($this->type_sum=
_account));
+        printf("Total %s poste comptable %s utilis=C3=A9 avec le poste c=
omptable %s utilisant $ledger", $total_type_account, $this->tmp_val, $thi=
s->with_tmp_val);
+    }
=20
-	static function new_row($p_id)
-	{
-		global $cn;
-		$sum_type=3Dnew ISelect('account_sum_type');
-		$sum_type->value=3D$cn->make_array("select tt_id, tt_label from rappor=
t_advanced.total_type_account ");
+    static function new_row($p_id)
+    {
+        global $cn;
+        $sum_type =3D new ISelect('account_sum_type');
+        $sum_type->value =3D $cn->make_array("select tt_id, tt_label fro=
m rapport_advanced.total_type_account ");
=20
-		$account =3D new IPoste("account_first", "", "account_first_id");
-		$account->size =3D 10;
-		$account->label =3D _("Recherche poste");
-		$account->set_attribute('gDossier', dossier::id());
-		$account->set_attribute('account', $account->id);
+        $account =3D new IPoste("account_first", "", "account_first_id")=
;
+        $account->size =3D 10;
+        $account->label =3D _("Recherche poste");
+        $account->set_attribute('gDossier', dossier::id());
+        $account->set_attribute('account', $account->id);
=20
-		$account_second =3D new IPoste("account_second", "", "account_second_i=
d");
-		$account_second->size =3D 10;
-		$account_second->label =3D _("Recherche poste");
-		$account_second->set_attribute('gDossier', dossier::id());
-		$account_second->set_attribute('account', $account_second->id);
-		echo '<p>';
-		echo 'Calculer ';
-		echo $sum_type->input();
-		echo '</p>';
-		echo '<p>';
-		echo 'du poste comptable '.HtmlInput::infobulle(203);
-		echo $account->input();
-		echo '</p>';
-		echo '<p>';
-		echo ' utilis=C3=A9 avec le poste comptable '.HtmlInput::infobulle(203=
);
-		echo $account_second->input();
-		echo '</p>';
-	}
-	function verify()
-	{
+        $account_second =3D new IPoste("account_second", "", "account_se=
cond_id");
+        $account_second->size =3D 10;
+        $account_second->label =3D _("Recherche poste");
+        $account_second->set_attribute('gDossier', dossier::id());
+        $account_second->set_attribute('account', $account_second->id);
+        echo '<p>';
+        echo 'Calculer ';
+        echo $sum_type->input();
+        echo '</p>';
+        echo '<p>';
+        echo 'du poste comptable ' . HtmlInput::infobulle(203);
+        echo $account->input();
+        echo '</p>';
+        echo '<p>';
+        echo ' utilis=C3=A9 avec le poste comptable ' . HtmlInput::infob=
ulle(203);
+        echo $account_second->input();
+        echo '</p>';
+    }
=20
-		if ( trim($this->tmp_val)=3D=3D"" || trim($this->with_tmp_val)=3D=3D""=
)
-		{
-			$this->errcode=3D" Un poste comptable est manquant";
-			return 1;
-		}
-		return 0;
-	}
+    function verify()
+    {
=20
+        if (trim($this->tmp_val) =3D=3D "" || trim($this->with_tmp_val) =
=3D=3D "")
+        {
+            $this->errcode =3D " Un poste comptable est manquant";
+            return 1;
+        }
+        return 0;
+    }
+
 }
+
 /**
- *@brief poste comptable utilis=C3=A9 avec le poste comptable, choix ent=
re diff cr=C3=A9dit - debit, diff d=C3=A9bit-cr=C3=A9dit, cr=C3=A9dit, d=C3=
=A9bit
+ * @brief poste comptable utilis=C3=A9 avec le poste comptable, choix en=
tre diff cr=C3=A9dit - debit, diff d=C3=A9bit-cr=C3=A9dit, cr=C3=A9dit, d=
=C3=A9bit
  */
 class RAPAV_Reconcile extends Formulaire_Param_Detail
 {
=20
-	function display_row()
-	{
-		global $cn;
-		$total_type_account=3D$cn->get_value('select tt_label from rapport_adv=
anced.total_type_account where tt_id=3D$1',
-				array($this->type_sum_account));
-		printf("Total %s poste comptable %s utilis=C3=A9 avec le poste comptab=
le %s rapproch=C3=A9e dans la p=C3=A9riode donn=C3=A9e
-			avec une op=C3=A9ration utilisant le poste comptable %s",
-				$total_type_account,$this->tmp_val,$this->with_tmp_val,$this->operat=
ion_pcm_val);
-	}
+    function display_row()
+    {
+        global $cn;
+        $total_type_account =3D $cn->get_value('select tt_label from rap=
port_advanced.total_type_account where tt_id=3D$1', array($this->type_sum=
_account));
+        $ledger =3D $this->get_ledger_name();
+        printf("Total %s poste comptable %s utilis=C3=A9 avec le poste c=
omptable %s rapproch=C3=A9e dans la p=C3=A9riode donn=C3=A9e
+			avec une op=C3=A9ration utilisant le poste comptable %s  utisant $led=
ger", $total_type_account, $this->tmp_val, $this->with_tmp_val, $this->op=
eration_pcm_val);
+    }
=20
-	static function new_row($p_id)
-	{
-		global $cn;
-		$sum_type=3Dnew ISelect('account_sum_type');
-		$sum_type->value=3D$cn->make_array("select tt_id, tt_label from rappor=
t_advanced.total_type_account ");
+    static function new_row($p_id)
+    {
+        global $cn;
+        $sum_type =3D new ISelect('account_sum_type');
+        $sum_type->value =3D $cn->make_array("select tt_id, tt_label fro=
m rapport_advanced.total_type_account ");
=20
-		$account =3D new IPoste("acrec_first", "", "acrec_first_id");
-		$account->size =3D 10;
-		$account->label =3D _("Recherche poste");
-		$account->set_attribute('gDossier', dossier::id());
-		$account->set_attribute('account', $account->id);
+        $account =3D new IPoste("acrec_first", "", "acrec_first_id");
+        $account->size =3D 10;
+        $account->label =3D _("Recherche poste");
+        $account->set_attribute('gDossier', dossier::id());
+        $account->set_attribute('account', $account->id);
=20
-		$account_second =3D new IPoste("acrec_second", "", "acrec_second_id");
-		$account_second->size =3D 10;
-		$account_second->label =3D _("Recherche poste");
-		$account_second->set_attribute('gDossier', dossier::id());
-		$account_second->set_attribute('account', $account_second->id);
+        $account_second =3D new IPoste("acrec_second", "", "acrec_second=
_id");
+        $account_second->size =3D 10;
+        $account_second->label =3D _("Recherche poste");
+        $account_second->set_attribute('gDossier', dossier::id());
+        $account_second->set_attribute('account', $account_second->id);
=20
-		$account_third =3D new IPoste("acrec_third", "", "acrec_third_id");
-		$account_third->size =3D 10;
-		$account_third->label =3D _("Recherche poste");
-		$account_third->set_attribute('gDossier', dossier::id());
-		$account_third->set_attribute('account', $account_third->id);
-		echo '<p>';
-		echo 'Calculer ';
-		echo $sum_type->input();
-		echo '</p>';
-		echo '<p>';
-		echo 'du poste comptable '.HtmlInput::infobulle(203);
-		echo $account->input();
-		echo '</p>';
-		echo '<p>';
-		echo ' utilis=C3=A9 avec le poste comptable '.HtmlInput::infobulle(203=
);
-		echo $account_second->input();
-		echo '</p>';
-		echo '<p>';
-		echo ' rapproch=C3=A9 avec une op=C3=A9ration dans la p=C3=A9riode don=
n=C3=A9e utilisant le poste comptable '.HtmlInput::infobulle(203);
-		echo $account_third->input();
+        $account_third =3D new IPoste("acrec_third", "", "acrec_third_id=
");
+        $account_third->size =3D 10;
+        $account_third->label =3D _("Recherche poste");
+        $account_third->set_attribute('gDossier', dossier::id());
+        $account_third->set_attribute('account', $account_third->id);
+        echo '<p>';
+        echo 'Calculer ';
+        echo $sum_type->input();
+        echo '</p>';
+        echo '<p>';
+        echo 'du poste comptable ' . HtmlInput::infobulle(203);
+        echo $account->input();
+        echo '</p>';
+        echo '<p>';
+        echo ' utilis=C3=A9 avec le poste comptable ' . HtmlInput::infob=
ulle(203);
+        echo $account_second->input();
+        echo '</p>';
+        echo '<p>';
+        echo ' rapproch=C3=A9 avec une op=C3=A9ration dans la p=C3=A9rio=
de donn=C3=A9e utilisant le poste comptable ' . HtmlInput::infobulle(203)=
;
+        echo $account_third->input();
=20
-		echo '</p>';
-	}
-	function verify()
-	{
+        echo '</p>';
+    }
=20
-		if ( trim($this->tmp_val)=3D=3D"" || trim($this->with_tmp_val)=3D=3D""=
 ||trim($this->operation_pcm_val)=3D=3D'')
-		{
-			$this->errcode=3D" Un poste comptable est manquant";
-			return 1;
-		}
-		return 0;
-	}
+    function verify()
+    {
=20
+        if (trim($this->tmp_val) =3D=3D "" || trim($this->with_tmp_val) =
=3D=3D "" || trim($this->operation_pcm_val) =3D=3D '')
+        {
+            $this->errcode =3D " Un poste comptable est manquant";
+            return 1;
+        }
+        return 0;
+    }
+
 }
=20
 ?>

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-10-17 1=
5:35:28 UTC (rev 533)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-10-17 1=
9:08:37 UTC (rev 534)
@@ -37,439 +37,448 @@
 class Rapav_Declaration extends RAPAV_Declaration_SQL
 {
=20
-	function __construct()
-	{
-		$this->form =3D new RAPAV_Formulaire();
-		parent::__construct();
-	}
-	/**
-	 * @brief export a declaration to CSV
-	 * @global $cn database conx
-	 * @param $p_id pk of rapav_declaration
-	 */
-	static function to_csv($p_id)
-	{
-		global $cn;
-		$a_row=3D$cn->get_array('select dr_code,dr_libelle,dr_amount,dr_start,=
dr_end
+    function __construct()
+    {
+        $this->form =3D new RAPAV_Formulaire();
+        parent::__construct();
+    }
+
+    /**
+     * @brief export a declaration to CSV
+     * @global $cn database conx
+     * @param $p_id pk of rapav_declaration
+     */
+    static function to_csv($p_id)
+    {
+        global $cn;
+        $a_row =3D $cn->get_array('select dr_code,dr_libelle,dr_amount,d=
r_start,dr_end
 			from rapport_advanced.declaration_row
-			where d_id=3D$1 order by dr_order,dr_start',array($p_id));
+			where d_id=3D$1 order by dr_order,dr_start', array($p_id));
=20
-		$a_title=3D$cn->get_array("select d_title
+        $a_title =3D $cn->get_array("select d_title
 			,to_char(d_start,'DD.MM.YYYY') as start
 			,to_char(d_end,'DD.MM.YYYY') as end
 			from
 			rapport_advanced.declaration
 			where
-			d_id=3D$1",array($p_id));
-		$title=3D$a_title[0]['d_title']."-".$a_title[0]['start']."-".$a_title[=
0]['end'];
-		$title =3D mb_strtolower($title, 'UTF-8');
-		$title =3D str_replace(array('/', '*', '<', '>', '*', '.', '+', ':', '=
?', '!', " ", ";"), "_", $title);
-		$out =3D fopen("php://output", "w");
+			d_id=3D$1", array($p_id));
+        $title =3D $a_title[0]['d_title'] . "-" . $a_title[0]['start'] .=
 "-" . $a_title[0]['end'];
+        $title =3D mb_strtolower($title, 'UTF-8');
+        $title =3D str_replace(array('/', '*', '<', '>', '*', '.', '+', =
':', '?', '!', " ", ";"), "_", $title);
+        $out =3D fopen("php://output", "w");
=20
-		header('Pragma: public');
-		header('Content-type: application/csv');
-		header('Content-Disposition: attachment;filename=3D"' . $title . '.csv=
"', FALSE);
-		fputcsv($out, $a_title[0], ";");
+        header('Pragma: public');
+        header('Content-type: application/csv');
+        header('Content-Disposition: attachment;filename=3D"' . $title .=
 '.csv"', FALSE);
+        fputcsv($out, $a_title[0], ";");
=20
-		for ($i =3D 0; $i < count($a_row); $i++)
-		{
-			printf ('"%s";"%s";%s;"%s";"%s"'."\r\n",
-					$a_row[$i]['dr_code'],
-					$a_row[$i]['dr_libelle'],
-					nb($a_row[$i]['dr_amount']),
-					format_date($a_row[$i]['dr_start']),
-					format_date($a_row[$i]['dr_end'])
-					);
-		}
-	}
-	function get_file_to_parse()
-	{
-		global $cn;
-		// create a temp directory in /tmp to unpack file and to parse it
-        $dirname=3Dtempnam($_ENV['TMP'],'rapav_');
+        for ($i =3D 0; $i < count($a_row); $i++)
+        {
+            printf('"%s";"%s";%s;"%s";"%s"' . "\r\n", $a_row[$i]['dr_cod=
e'], $a_row[$i]['dr_libelle'], nb($a_row[$i]['dr_amount']), format_date($=
a_row[$i]['dr_start']), format_date($a_row[$i]['dr_end'])
+            );
+        }
+    }
=20
+    function get_file_to_parse()
+    {
+        global $cn;
+        // create a temp directory in /tmp to unpack file and to parse i=
t
+        $dirname =3D tempnam($_ENV['TMP'], 'rapav_');
=20
+
         unlink($dirname);
-        mkdir ($dirname);
+        mkdir($dirname);
         chdir($dirname);
         // Retrieve the lob and save it into $dirname
         $cn->start();
=20
=20
-        $filename=3D$this->d_filename;
-        $exp=3D$cn->lo_export($this->d_lob,$dirname.DIRECTORY_SEPARATOR.=
$filename);
+        $filename =3D $this->d_filename;
+        $exp =3D $cn->lo_export($this->d_lob, $dirname . DIRECTORY_SEPAR=
ATOR . $filename);
=20
-		if ( $exp =3D=3D=3D false ) echo_warning( __FILE__.":".__LINE__."Expor=
t NOK $filename");
+        if ($exp =3D=3D=3D false)
+            echo_warning(__FILE__ . ":" . __LINE__ . "Export NOK $filena=
me");
=20
-        $type=3D"n";
+        $type =3D "n";
         // if the doc is a OOo, we need to unzip it first
         // and the name of the file to change is always content.xml
-        if ( strpos($this->d_mimetype,'vnd.oasis') !=3D 0 )
+        if (strpos($this->d_mimetype, 'vnd.oasis') !=3D 0)
         {
             ob_start();
-			$zip =3D new Zip_Extended;
-			if ($zip->open($filename) =3D=3D=3D TRUE) {
-				$zip->extractTo($dirname.DIRECTORY_SEPARATOR);
-				$zip->close();
-			} else {
-				echo __FILE__.":".__LINE__."cannot unzip model ".$filename;
-			}
+            $zip =3D new Zip_Extended;
+            if ($zip->open($filename) =3D=3D=3D TRUE)
+            {
+                $zip->extractTo($dirname . DIRECTORY_SEPARATOR);
+                $zip->close();
+            } else
+            {
+                echo __FILE__ . ":" . __LINE__ . "cannot unzip model " .=
 $filename;
+            }
=20
             // Remove the file we do  not need anymore
             unlink($filename);
             ob_end_clean();
-            $file_to_parse=3D"content.xml";
-            $type=3D"OOo";
-        }
-        else
-            $file_to_parse=3D$filename;
+            $file_to_parse =3D "content.xml";
+            $type =3D "OOo";
+        } else
+            $file_to_parse =3D $filename;
=20
-		$cn->commit();
-		return array($file_to_parse,$dirname,$type);
-	}
-	function generate_document()
-	{
-		global $cn;
-		if ( $this->d_filename =3D=3D "") return;
+        $cn->commit();
+        return array($file_to_parse, $dirname, $type);
+    }
=20
-		list($file_to_parse,$dirname,$type)=3D$this->get_file_to_parse();
+    function generate_document()
+    {
+        global $cn;
+        if ($this->d_filename =3D=3D "")
+            return;
=20
-		 // parse the document
-        $this->parse_document($dirname,$file_to_parse,$type);
+        list($file_to_parse, $dirname, $type) =3D $this->get_file_to_par=
se();
=20
-		// Add special tag
-        $this->special_tag($dirname,$file_to_parse,$type);
+        // parse the document
+        $this->parse_document($dirname, $file_to_parse, $type);
=20
-		// if the doc is a OOo, we need to re-zip it
-        if ($type=3D=3D'OOo' )
+        // Add special tag
+        $this->special_tag($dirname, $file_to_parse, $type);
+
+        // if the doc is a OOo, we need to re-zip it
+        if ($type =3D=3D 'OOo')
         {
             ob_start();
-			 $zip =3D new Zip_Extended;
+            $zip =3D new Zip_Extended;
             $res =3D $zip->open($this->d_filename, ZipArchive::CREATE);
-            if($res !=3D=3D TRUE)
-			{
-				echo __FILE__.":".__LINE__."cannot recreate zip";
-				exit;
-			}
-			$zip->add_recurse_folder($dirname.DIRECTORY_SEPARATOR);
-			$zip->close();
+            if ($res !=3D=3D TRUE)
+            {
+                echo __FILE__ . ":" . __LINE__ . "cannot recreate zip";
+                exit;
+            }
+            $zip->add_recurse_folder($dirname . DIRECTORY_SEPARATOR);
+            $zip->close();
=20
             ob_end_clean();
=20
-            $file_to_save=3D$this->d_filename;
+            $file_to_save =3D $this->d_filename;
+        } else
+        {
+            $file_to_save =3D $file_to_parse;
         }
-		else
-		{
-			$file_to_save=3D$file_to_parse;
-		}
=20
-        $this->load_document($dirname.DIRECTORY_SEPARATOR.$file_to_save)=
;
-	}
-	function parse_document($p_dir,$p_filename,$p_type)
-	{
-		global $cn;
-		// Retrieve all the code + amount
-		if ($p_type =3D=3D "OOo")	{
-			$array=3D$cn->get_array("select '&lt;&lt;'||dr_code||'&gt;&gt;' as co=
de,dr_amount from rapport_advanced.declaration_row where d_id=3D$1 and dr=
_type=3D3",array($this->d_id));
-		}
-		else {
-			$array=3D$cn->get_array("select '<<'||dr_code||'>>' as code,dr_amount=
 from rapport_advanced.declaration_row where d_id=3D$1 and dr_type=3D3",a=
rray($this->d_id));
-		}
+        $this->load_document($dirname . DIRECTORY_SEPARATOR . $file_to_s=
ave);
+    }
=20
-		// open the files
-		$ifile=3Dfopen($p_dir.'/'.$p_filename,'r');
+    function parse_document($p_dir, $p_filename, $p_type)
+    {
+        global $cn;
+        // Retrieve all the code + amount
+        if ($p_type =3D=3D "OOo")
+        {
+            $array =3D $cn->get_array("select '&lt;&lt;'||dr_code||'&gt;=
&gt;' as code,dr_amount from rapport_advanced.declaration_row where d_id=3D=
$1 and dr_type=3D3", array($this->d_id));
+        } else
+        {
+            $array =3D $cn->get_array("select '<<'||dr_code||'>>' as cod=
e,dr_amount from rapport_advanced.declaration_row where d_id=3D$1 and dr_=
type=3D3", array($this->d_id));
+        }
=20
-		// check if tmpdir exist otherwise create it
-		$temp_dir=3D$_SERVER["DOCUMENT_ROOT"].DIRECTORY_SEPARATOR.'tmp';
-		if ( is_dir($temp_dir) =3D=3D false )
-		{
-			if ( mkdir($temp_dir) =3D=3D false )
-				{
-					echo "Ne peut pas cr=C3=A9er le r=C3=A9pertoire ".$temp_dir;
-					exit();
-				}
-		}
-		// Compute output_name
-		$oname=3Dtempnam($temp_dir,"rapport_avance_");
-		$ofile=3Dfopen($oname,"w+");
+        // open the files
+        $ifile =3D fopen($p_dir . '/' . $p_filename, 'r');
=20
-		// read ifile
-		while (! feof ($ifile))
-		{
-			$buffer=3Dfgets($ifile);
-			// for each code replace in p_filename the code surrounded by << >> b=
y the amount (value) or &lt; or &gt;
-			foreach ($array as $key=3D>$value)
-			{
-				 if ( is_numeric($value['dr_amount']) )
-				{
-					$searched=3D'office:value-type=3D"string"><text:p>'.$value['code'];
-					$replaced=3D'office:value-type=3D"float" office:value=3D"'.$value['=
dr_amount'].'"><text:p>'.$value['code'];
-					$buffer=3Dstr_replace($searched, $replaced, $buffer);
-				}
-				$buffer=3Dstr_replace($value['code'],$value['dr_amount'],$buffer);
-			}
-			// write to output
-			fwrite($ofile,$buffer);
-		}
+        // check if tmpdir exist otherwise create it
+        $temp_dir =3D $_SERVER["DOCUMENT_ROOT"] . DIRECTORY_SEPARATOR . =
'tmp';
+        if (is_dir($temp_dir) =3D=3D false)
+        {
+            if (mkdir($temp_dir) =3D=3D false)
+            {
+                echo "Ne peut pas cr=C3=A9er le r=C3=A9pertoire " . $tem=
p_dir;
+                exit();
+            }
+        }
+        // Compute output_name
+        $oname =3D tempnam($temp_dir, "rapport_avance_");
+        $ofile =3D fopen($oname, "w+");
=20
-		// copy the output to input
-		fclose($ifile);
-		fclose($ofile);
+        // read ifile
+        while (!feof($ifile))
+        {
+            $buffer =3D fgets($ifile);
+            // for each code replace in p_filename the code surrounded b=
y << >> by the amount (value) or &lt; or &gt;
+            foreach ($array as $key =3D> $value)
+            {
+                if (is_numeric($value['dr_amount']))
+                {
+                    $searched =3D 'office:value-type=3D"string"><text:p>=
' . $value['code'];
+                    $replaced =3D 'office:value-type=3D"float" office:va=
lue=3D"' . $value['dr_amount'] . '"><text:p>' . $value['code'];
+                    $buffer =3D str_replace($searched, $replaced, $buffe=
r);
+                }
+                $buffer =3D str_replace($value['code'], $value['dr_amoun=
t'], $buffer);
+            }
+            // write to output
+            fwrite($ofile, $buffer);
+        }
=20
-		if ( ($ret=3Dcopy ($oname,$p_dir.'/'.$p_filename)) =3D=3D FALSE )
-		{
-			echo _('Ne peut pas sauver '.$oname.' vers '.$p_dir.'/'.$p_filename.'=
 code d\'erreur =3D'.$ret);
-		}
-		/**
-		 * @todo clean files
-		 */
-		// unlink ($oname);
+        // copy the output to input
+        fclose($ifile);
+        fclose($ofile);
=20
-	}
-	function special_tag($p_dir,$p_filename,$p_type)
-	{
-		global $cn,$g_parameter;
-		// Retrieve all the code + libelle
-		$array[]=3Darray('code'=3D>'PERIODE_DECLARATION','value'=3D>  format_d=
ate($this->d_start)." - ".format_date($this->d_end));
-		$array[]=3Darray('code'=3D>'TITRE','value'=3D>$this->d_title);
-		$array[]=3Darray('code'=3D>'DOSSIER','value'=3D>$cn->format_name($_REQ=
UEST['gDossier'],'dos'));
-		$array[]=3Darray('code'=3D>'NAME','value'=3D>$g_parameter->MY_NAME);
-		$array[]=3Darray('code'=3D>'STREET','value'=3D>$g_parameter->MY_STREET=
);
-		$array[]=3Darray('code'=3D>'NUMBER','value'=3D>$g_parameter->MY_NUMBER=
);
-		$array[]=3Darray('code'=3D>'LOCALITE','value'=3D>$g_parameter->MY_COMM=
UNE);
-		$array[]=3Darray('code'=3D>'COUNTRY','value'=3D>$g_parameter->MY_PAYS)=
;
-		$array[]=3Darray('code'=3D>'PHONE','value'=3D>$g_parameter->MY_TEL);
-		$array[]=3Darray('code'=3D>'CEDEX','value'=3D>$g_parameter->MY_CP);
-		$array[]=3Darray('code'=3D>'FAX','value'=3D>$g_parameter->MY_FAX);
-		$array[]=3Darray('code'=3D>'NOTE','value'=3D>$this->d_description);
+        if (($ret =3D copy($oname, $p_dir . '/' . $p_filename)) =3D=3D F=
ALSE)
+        {
+            echo _('Ne peut pas sauver ' . $oname . ' vers ' . $p_dir . =
'/' . $p_filename . ' code d\'erreur =3D' . $ret);
+        }
+        /**
+         * @todo clean files
+         */
+        // unlink ($oname);
+    }
=20
-		// open the files
-		$ifile=3Dfopen($p_dir.'/'.$p_filename,'r');
+    function special_tag($p_dir, $p_filename, $p_type)
+    {
+        global $cn, $g_parameter;
+        // Retrieve all the code + libelle
+        $array[] =3D array('code' =3D> 'PERIODE_DECLARATION', 'value' =3D=
> format_date($this->d_start) . " - " . format_date($this->d_end));
+        $array[] =3D array('code' =3D> 'TITRE', 'value' =3D> $this->d_ti=
tle);
+        $array[] =3D array('code' =3D> 'DOSSIER', 'value' =3D> $cn->form=
at_name($_REQUEST['gDossier'], 'dos'));
+        $array[] =3D array('code' =3D> 'NAME', 'value' =3D> $g_parameter=
->MY_NAME);
+        $array[] =3D array('code' =3D> 'STREET', 'value' =3D> $g_paramet=
er->MY_STREET);
+        $array[] =3D array('code' =3D> 'NUMBER', 'value' =3D> $g_paramet=
er->MY_NUMBER);
+        $array[] =3D array('code' =3D> 'LOCALITE', 'value' =3D> $g_param=
eter->MY_COMMUNE);
+        $array[] =3D array('code' =3D> 'COUNTRY', 'value' =3D> $g_parame=
ter->MY_PAYS);
+        $array[] =3D array('code' =3D> 'PHONE', 'value' =3D> $g_paramete=
r->MY_TEL);
+        $array[] =3D array('code' =3D> 'CEDEX', 'value' =3D> $g_paramete=
r->MY_CP);
+        $array[] =3D array('code' =3D> 'FAX', 'value' =3D> $g_parameter-=
>MY_FAX);
+        $array[] =3D array('code' =3D> 'NOTE', 'value' =3D> $this->d_des=
cription);
=20
-		// check if tmpdir exist otherwise create it
-		$temp_dir=3D$_SERVER["DOCUMENT_ROOT"].DIRECTORY_SEPARATOR.'tmp';
-		if ( is_dir($temp_dir) =3D=3D false )
-		{
-			if ( mkdir($temp_dir) =3D=3D false )
-				{
-					echo "Ne peut pas cr=C3=A9er le r=C3=A9pertoire ".$temp_dir;
-					exit();
-				}
-		}
-		// Compute output_name
-		$oname=3Dtempnam($temp_dir,"rapport_avance_");
-		$ofile=3Dfopen($oname,"w+");
+        // open the files
+        $ifile =3D fopen($p_dir . '/' . $p_filename, 'r');
=20
-		// read ifile
-		while (! feof ($ifile))
-		{
-			$buffer=3Dfgets($ifile);
-			// for each code replace in p_filename the code surrounded by << >> b=
y the amount (value) or &lt; or &gt;
-			foreach ($array as $key=3D>$value)
-			{
-				if ( $p_type=3D=3D'OOo')
-				{
-					$replace=3D'&lt;&lt;'.$value['code'].'&gt;&gt;';
-					$fmt_value=3D$value['value'];
-					$fmt_value=3Dstr_replace('&','&amp;',$fmt_value);
-					$fmt_value=3Dstr_replace('<','&lt;',$fmt_value);
-					$fmt_value=3Dstr_replace('>','&gt;',$fmt_value);
-					$fmt_value=3Dstr_replace('"','&quot;',$fmt_value);
-					$fmt_value=3Dstr_replace("'",'&apos;',$fmt_value);
-				} else {
-					$replace=3D'<<'.$value['code'].'>>';
-					$fmt_value=3D  $value['value'];
-				}
-				$buffer=3Dstr_replace($replace,$fmt_value,$buffer);
-			}
-			// write to output
-			fwrite($ofile,$buffer);
-		}
+        // check if tmpdir exist otherwise create it
+        $temp_dir =3D $_SERVER["DOCUMENT_ROOT"] . DIRECTORY_SEPARATOR . =
'tmp';
+        if (is_dir($temp_dir) =3D=3D false)
+        {
+            if (mkdir($temp_dir) =3D=3D false)
+            {
+                echo "Ne peut pas cr=C3=A9er le r=C3=A9pertoire " . $tem=
p_dir;
+                exit();
+            }
+        }
+        // Compute output_name
+        $oname =3D tempnam($temp_dir, "rapport_avance_");
+        $ofile =3D fopen($oname, "w+");
=20
-		// copy the output to input
-		fclose($ifile);
-		fclose($ofile);
+        // read ifile
+        while (!feof($ifile))
+        {
+            $buffer =3D fgets($ifile);
+            // for each code replace in p_filename the code surrounded b=
y << >> by the amount (value) or &lt; or &gt;
+            foreach ($array as $key =3D> $value)
+            {
+                if ($p_type =3D=3D 'OOo')
+                {
+                    $replace =3D '&lt;&lt;' . $value['code'] . '&gt;&gt;=
';
+                    $fmt_value =3D $value['value'];
+                    $fmt_value =3D str_replace('&', '&amp;', $fmt_value)=
;
+                    $fmt_value =3D str_replace('<', '&lt;', $fmt_value);
+                    $fmt_value =3D str_replace('>', '&gt;', $fmt_value);
+                    $fmt_value =3D str_replace('"', '&quot;', $fmt_value=
);
+                    $fmt_value =3D str_replace("'", '&apos;', $fmt_value=
);
+                } else
+                {
+                    $replace =3D '<<' . $value['code'] . '>>';
+                    $fmt_value =3D $value['value'];
+                }
+                $buffer =3D str_replace($replace, $fmt_value, $buffer);
+            }
+            // write to output
+            fwrite($ofile, $buffer);
+        }
=20
-		if ( ($ret=3Dcopy ($oname,$p_dir.'/'.$p_filename)) =3D=3D FALSE )
-		{
-			echo _('Ne peut pas sauver '.$oname.' vers '.$p_dir.'/'.$p_filename.'=
 code d\'erreur =3D'.$ret);
-		}
-		/**
-		 * @todo clean files
-		 */
-		// unlink ($oname);
+        // copy the output to input
+        fclose($ifile);
+        fclose($ofile);
=20
-	}
-	function load_document($p_file)
-	{
-		global $cn;
-		$cn->start();
-		$this->d_lob=3D$cn->lo_import($p_file);
-		if ( $this->d_lob =3D=3D false )
-			{
-				echo "ne peut pas importer [$p_file]";
-				return 1;
-			}
-		$this->d_size=3D  filesize($p_file);
-		$date=3Ddate('ymd-Hi');
-		$this->d_filename=3D$date.'-'.$this->d_filename;
-		$this->update();
-		$cn->commit();
+        if (($ret =3D copy($oname, $p_dir . '/' . $p_filename)) =3D=3D F=
ALSE)
+        {
+            echo _('Ne peut pas sauver ' . $oname . ' vers ' . $p_dir . =
'/' . $p_filename . ' code d\'erreur =3D' . $ret);
+        }
+        /**
+         * @todo clean files
+         */
+        // unlink ($oname);
+    }
=20
+    function load_document($p_file)
+    {
+        global $cn;
+        $cn->start();
+        $this->d_lob =3D $cn->lo_import($p_file);
+        if ($this->d_lob =3D=3D false)
+        {
+            echo "ne peut pas importer [$p_file]";
+            return 1;
+        }
+        $this->d_size =3D filesize($p_file);
+        $date =3D date('ymd-Hi');
+        $this->d_filename =3D $date . '-' . $this->d_filename;
+        $this->update();
+        $cn->commit();
+    }
=20
-	}
-	/**
-	 *
-	 * @global $cn $cn
-	 * @param type $p_id
-	 * @param type $p_start
-	 * @param type $p_end
-	 * @param type $p_step
-	 */
-	function compute($p_id, $p_start, $p_end,$p_step)
-	{
-		global $cn;
-		$cn->start();
-		// Load the parameter from formulaire_param_detail
-		// create object_rapav_declaration
-		//   compute
-		// save the parameter
-		$this->form->f_id =3D $p_id;
-		$this->form->load();
-		$this->d_title =3D $this->form->f_title;
-		$this->d_start =3D $p_start;
-		$this->d_end =3D $p_end;
-		$this->to_keep =3D 'N';
-		$this->d_lob=3D$this->form->f_lob;
-		$this->d_filename=3D$this->form->f_filename;
-		$this->d_mimetype=3D$this->form->f_mimetype;
-		$this->d_size=3D$this->form->f_size;
-		$this->d_step=3D$p_step;
-		$this->insert();
-		/*
-		 * First we compute the formula and tva_code for each detail
-		 */
-		$array =3D $cn->get_array("select p_id,p_code,p_libelle,p_type,p_order=
,f_id,t_id
+    /**
+     *
+     * @global $cn $cn
+     * @param type $p_id
+     * @param type $p_start
+     * @param type $p_end
+     * @param type $p_step
+     */
+    function compute($p_id, $p_start, $p_end, $p_step)
+    {
+        global $cn;
+        $cn->start();
+        // Load the parameter from formulaire_param_detail
+        // create object_rapav_declaration
+        //   compute
+        // save the parameter
+        $this->form->f_id =3D $p_id;
+        $this->form->load();
+        $this->d_title =3D $this->form->f_title;
+        $this->d_start =3D $p_start;
+        $this->d_end =3D $p_end;
+        $this->to_keep =3D 'N';
+        $this->d_lob =3D $this->form->f_lob;
+        $this->d_filename =3D $this->form->f_filename;
+        $this->d_mimetype =3D $this->form->f_mimetype;
+        $this->d_size =3D $this->form->f_size;
+        $this->d_step =3D $p_step;
+        $this->insert();
+        /*
+         * First we compute the formula and tva_code for each detail
+         */
+        $array =3D $cn->get_array("select p_id,p_code,p_libelle,p_type,p=
_order,f_id,t_id
 			from rapport_advanced.formulaire_param
 			where
 			f_id=3D$1
 			order by p_order", array($p_id));
-		/**
-		 * if step !=3D 0, recompute the date
-		 */
-		if ($p_step =3D=3D 0)
-		{
-			// compute each row
-			for ($i =3D 0; $i < count($array); $i++)
-			{
-				$row =3D new Rapav_Declaration_Param();
-				$row->d_id =3D $this->d_id;
-				$row->dr_id =3D $cn->get_next_seq('rapport_advanced.declaration_para=
m_seq');
-				$row->from_array($array[$i]);
-				if ( $array[$i]['p_type']=3D=3D3) {
-					$row->compute($p_start, $p_end);
-				} else {
-					$row->amount =3D 0;
-				}
-				$row->dr_start=3D$p_start;
-				$row->dr_end=3D$p_end;
-				$row->insert();
-			}
-		}
-		else
-		{
-			// compute new date, stored in $this->start and $this->end
-			while ($this->compute_interval($p_start, $p_end, $p_step) =3D=3D 1)
-			{
-				for ($i =3D 0; $i < count($array); $i++)
-				{
-					$row =3D new Rapav_Declaration_Param();
-					$row->d_id =3D $this->d_id;
-					$row->dr_id =3D $cn->get_next_seq('rapport_advanced.declaration_par=
am_seq');
-					$row->from_array($array[$i]);
-					if ($array[$i]['p_type'] =3D=3D 3)
-					{
-						$row->compute($this->start, $this->end);
-						$row->dr_start=3D$this->start;
-						$row->dr_end=3D$this->end;
-						$row->insert();
-					}
-				}
-			}
+        /**
+         * if step !=3D 0, recompute the date
+         */
+        if ($p_step =3D=3D 0)
+        {
+            // compute each row
+            for ($i =3D 0; $i < count($array); $i++)
+            {
+                $row =3D new Rapav_Declaration_Param();
+                $row->d_id =3D $this->d_id;
+                $row->dr_id =3D $cn->get_next_seq('rapport_advanced.decl=
aration_param_seq');
+                $row->from_array($array[$i]);
+                if ($array[$i]['p_type'] =3D=3D 3)
+                {
+                    $row->compute($p_start, $p_end);
+                } else
+                {
+                    $row->amount =3D 0;
+                }
+                $row->dr_start =3D $p_start;
+                $row->dr_end =3D $p_end;
+                $row->insert();
+            }
+        } else
+        {
+            // compute new date, stored in $this->start and $this->end
+            while ($this->compute_interval($p_start, $p_end, $p_step) =3D=
=3D 1)
+            {
+                for ($i =3D 0; $i < count($array); $i++)
+                {
+                    $row =3D new Rapav_Declaration_Param();
+                    $row->d_id =3D $this->d_id;
+                    $row->dr_id =3D $cn->get_next_seq('rapport_advanced.=
declaration_param_seq');
+                    $row->from_array($array[$i]);
+                    if ($array[$i]['p_type'] =3D=3D 3)
+                    {
+                        $row->compute($this->start, $this->end);
+                        $row->dr_start =3D $this->start;
+                        $row->dr_end =3D $this->end;
+                        $row->insert();
+                    }
+                }
+            }
+        }
+        $cn->commit();
+    }
=20
+    function compute_interval($p_start, $p_end, $p_step)
+    {
+        static $s_start =3D "";
+        static $s_count =3D 0;
=20
-		}
-		$cn->commit();
-	}
-	function compute_interval($p_start, $p_end, $p_step)
-	{
-		static $s_start =3D "";
-		static $s_count =3D 0;
+        if ($s_start =3D=3D "")
+        {
+            $s_start =3D $p_start;
+        }
+        $s_count++;
+        // initialize datetime object
+        $date_start =3D DateTime::createFromFormat('d.m.Y', $s_start);
+        $date_end =3D DateTime::createFromFormat('d.m.Y', $s_start);
+        $date_finish =3D DateTime::createFromFormat('d.m.Y', $p_end);
=20
-		if ($s_start =3D=3D "")
-		{
-			$s_start =3D $p_start;
-		}
-		$s_count++;
-		// initialize datetime object
-		$date_start =3D DateTime::createFromFormat('d.m.Y',$s_start);
-		$date_end =3D DateTime::createFromFormat('d.m.Y',$s_start);
-		$date_finish =3D DateTime::createFromFormat('d.m.Y',$p_end);
+        $add =3D $this->get_interval($p_step);
=20
-		$add =3D $this->get_interval($p_step);
=20
+        if ($s_count > 1)
+        {
+            $date_start->add($add);
+            $date_end->add($add);
+        }
+        // compute date_end
+        $date_end->add($add);
+        $date_end->sub(new DateInterval('P1D'));
+        // if date_end > date_finish then stop
+        if ($date_end > $date_finish)
+            return 0;
+        $this->start =3D $date_start->format("d.m.Y");
+        $this->end =3D $date_end->format("d.m.Y");
+        $s_start =3D $this->start;
+        return 1;
+    }
=20
-		if ($s_count > 1)	{ $date_start->add($add); $date_end->add($add);}
-		// compute date_end
-		$date_end->add($add);
-		$date_end->sub(new DateInterval('P1D'));
-		// if date_end > date_finish then stop
-		if ($date_end > $date_finish) 			return 0;
-		$this->start =3D $date_start->format("d.m.Y");
-		$this->end =3D $date_end->format("d.m.Y");
-		$s_start =3D $this->start;
-		return 1;
-	}
-	function get_interval($p_step)
-	{
-		$array_interval =3D array("", "P7D", "P14D", "P1M", "P2M", "P3M");
-		return new DateInterval($array_interval[$p_step]);
-	}
-	function anchor_document()
-	{
-		$url=3DHtmlInput::request_to_string(array('gDossier','ac','plugin_code=
'));
-		$url=3D'extension.raw.php'.$url.'&amp;act=3Dexport_decla_document&amp;=
id=3D'.$this->d_id;
-		return HtmlInput::anchor($this->d_filename,$url);
-	}
-	function display()
-	{
-		global $cn;
-		$array =3D $cn->get_array('select * from rapport_advanced.declaration_=
row where d_id=3D$1 order by dr_order,dr_start', array($this->d_id));
-		require_once 'template/declaration_display.php';
-	}
+    function get_interval($p_step)
+    {
+        $array_interval =3D array("", "P7D", "P14D", "P1M", "P2M", "P3M"=
);
+        return new DateInterval($array_interval[$p_step]);
+    }
=20
-	function save()
-	{
-		global $cn;
-		try
-		{
-			$cn->start();
-			$this->to_keep =3D 'Y';
-			$this->update();
-			$code =3D $_POST['code'];
-			$amount =3D $_POST['amount'];
-			for ($i =3D 0; $i < count($code); $i++)
-			{
-				$cn->exec_sql('update rapport_advanced.declaration_row set dr_amount=
=3D$2 where dr_id=3D$1', array($code[$i], $amount[$i]));
-			}
-			$cn->commit();
-		}
-		catch (Exception $e)
-		{
-			alert($e->getTraceAsString());
-		}
-	}
+    function anchor_document()
+    {
+        $url =3D HtmlInput::request_to_string(array('gDossier', 'ac', 'p=
lugin_code'));
+        $url =3D 'extension.raw.php' . $url . '&amp;act=3Dexport_decla_d=
ocument&amp;id=3D' . $this->d_id;
+        return HtmlInput::anchor($this->d_filename, $url);
+    }
=20
+    function display()
+    {
+        global $cn;
+        $array =3D $cn->get_array('select * from rapport_advanced.declar=
ation_row where d_id=3D$1 order by dr_order,dr_start', array($this->d_id)=
);
+        require_once 'template/declaration_display.php';
+    }
+
+    function save()
+    {
+        global $cn;
+        try
+        {
+            $cn->start();
+            $this->to_keep =3D 'Y';
+            $this->update();
+            $code =3D $_POST['code'];
+            $amount =3D $_POST['amount'];
+            for ($i =3D 0; $i < count($code); $i++)
+            {
+                $cn->exec_sql('update rapport_advanced.declaration_row s=
et dr_amount=3D$2 where dr_id=3D$1', array($code[$i], $amount[$i]));
+            }
+            $cn->commit();
+        } catch (Exception $e)
+        {
+            alert($e->getTraceAsString());
+        }
+    }
+
 }
=20
 /**
@@ -479,138 +488,138 @@
 class Rapav_Declaration_Param
 {
=20
-	/**
-	 * @brief insert into rapport_advanced.formulaire_param
-	 */
-	function insert()
-	{
-		$data =3D new RAPAV_Declaration_Row_SQL();
-		$data->dr_code =3D $this->param->p_code;
-		$data->dr_libelle =3D $this->param->p_libelle;
-		$data->dr_order =3D $this->param->p_order;
-		$data->dr_amount =3D $this->amount;
-		$data->d_id =3D $this->d_id;
-		$data->dr_id =3D $this->dr_id;
-		$data->dr_type =3D $this->param->p_type;
-		$data->dr_start=3D$this->dr_start;
-		$data->dr_end=3D$this->dr_end;
-		$data->insert();
-	}
+    /**
+     * @brief insert into rapport_advanced.formulaire_param
+     */
+    function insert()
+    {
+        $data =3D new RAPAV_Declaration_Row_SQL();
+        $data->dr_code =3D $this->param->p_code;
+        $data->dr_libelle =3D $this->param->p_libelle;
+        $data->dr_order =3D $this->param->p_order;
+        $data->dr_amount =3D $this->amount;
+        $data->d_id =3D $this->d_id;
+        $data->dr_id =3D $this->dr_id;
+        $data->dr_type =3D $this->param->p_type;
+        $data->dr_start =3D $this->dr_start;
+        $data->dr_end =3D $this->dr_end;
+        $data->insert();
+    }
=20
-	/**
-	 * @brief set the attribute param with the content of the array.
-	 * keys :
-	 *    - 'p_id',
-	 *    - 'p_code',
-	 *    - 'p_libelle',
-	 *    - 'p_type',
-	 *    - 'p_order',
-	 *    - 'f_id',
-	 *    - 't_id'
-	 * @param type $p_array
-	 */
-	function from_array($p_array)
-	{
-		$this->param =3D new Formulaire_Param();
-		foreach (array('p_id', 'p_code', 'p_libelle', 'p_type', 'p_order', 'f_=
id', 't_id') as $e)
-		{
-			$this->param->$e =3D $p_array[$e];
-		}
-		$this->param->load();
-	}
+    /**
+     * @brief set the attribute param with the content of the array.
+     * keys :
+     *    - 'p_id',
+     *    - 'p_code',
+     *    - 'p_libelle',
+     *    - 'p_type',
+     *    - 'p_order',
+     *    - 'f_id',
+     *    - 't_id'
+     * @param type $p_array
+     */
+    function from_array($p_array)
+    {
+        $this->param =3D new Formulaire_Param();
+        foreach (array('p_id', 'p_code', 'p_libelle', 'p_type', 'p_order=
', 'f_id', 't_id') as $e)
+        {
+            $this->param->$e =3D $p_array[$e];
+        }
+        $this->param->load();
+    }
=20
-	/**
-	 * @brief compute the date following the attribute t_id (match rapport_=
advanced.periode_type and
-	 * store the result into $this->start and $this-> end
-	 *   - 1 date from the FORM
-	 *   - 2 N
-	 *   - 3 N-1
-	 *   - 4 N-2
-	 *   - 5 N-3
-	 * @param $p_start requested date
-	 * @param $p_end requested date
-	 */
-	function compute_date($p_start, $p_end)
-	{
-		global $g_user;
-			switch ($this->param->t_id)
-			{
-				case 1:
-					$this->start =3D $p_start;
-					$this->end =3D $p_end;
-				return;
-					break;
-				case 2:
-					list($this->start, $this->end) =3D $g_user->get_limit_current_exerc=
ice();
-				return;
-					break;
-				case 3:
-					$exercice =3D $g_user->get_exercice();
-					$exercice--;
-					break;
-				case 4:
-					$exercice =3D $g_user->get_exercice();
-					$exercice-=3D2;
-					break;
-				case 5:
-					$exercice =3D $g_user->get_exercice();
-					$exercice-=3D3;
-					break;
-				case 6:
-					list($this->start, $this->end) =3D $g_user->get_limit_current_exerc=
ice();
-				$this->end=3D$p_end;
-				return;
-					break;
-				default:
-					throw new Exception('compute_date : t_id est incorrect');
-			}
-			global $cn;
+    /**
+     * @brief compute the date following the attribute t_id (match rappo=
rt_advanced.periode_type and
+     * store the result into $this->start and $this-> end
+     *   - 1 date from the FORM
+     *   - 2 N
+     *   - 3 N-1
+     *   - 4 N-2
+     *   - 5 N-3
+     * @param $p_start requested date
+     * @param $p_end requested date
+     */
+    function compute_date($p_start, $p_end)
+    {
+        global $g_user;
+        switch ($this->param->t_id)
+        {
+            case 1:
+                $this->start =3D $p_start;
+                $this->end =3D $p_end;
+                return;
+                break;
+            case 2:
+                list($this->start, $this->end) =3D $g_user->get_limit_cu=
rrent_exercice();
+                return;
+                break;
+            case 3:
+                $exercice =3D $g_user->get_exercice();
+                $exercice--;
+                break;
+            case 4:
+                $exercice =3D $g_user->get_exercice();
+                $exercice-=3D2;
+                break;
+            case 5:
+                $exercice =3D $g_user->get_exercice();
+                $exercice-=3D3;
+                break;
+            case 6:
+                list($this->start, $this->end) =3D $g_user->get_limit_cu=
rrent_exercice();
+                $this->end =3D $p_end;
+                return;
+                break;
+            default:
+                throw new Exception('compute_date : t_id est incorrect')=
;
+        }
+        global $cn;
=20
-			// If exercice does not exist then
-			// set the date end and start to 01.01.1900
+        // If exercice does not exist then
+        // set the date end and start to 01.01.1900
=20
-			$exist_exercice =3D $cn->get_value('select count(p_id) from parm_peri=
ode where p_exercice=3D$1', array($exercice));
-			if ($exist_exercice =3D=3D 0)
-			{
-				$this->start =3D '01.01.1900';
-				$this->end =3D '01.01.1900';
-			return;
-			}
-			// Retrieve start & end date
-			$periode =3D new Periode($cn);
-			list($per_start, $per_end) =3D $periode->get_limit($exercice);
-			$this->start =3D $per_start->first_day();
-			$this->end =3D $per_end->last_day();
-		}
+        $exist_exercice =3D $cn->get_value('select count(p_id) from parm=
_periode where p_exercice=3D$1', array($exercice));
+        if ($exist_exercice =3D=3D 0)
+        {
+            $this->start =3D '01.01.1900';
+            $this->end =3D '01.01.1900';
+            return;
+        }
+        // Retrieve start & end date
+        $periode =3D new Periode($cn);
+        list($per_start, $per_end) =3D $periode->get_limit($exercice);
+        $this->start =3D $per_start->first_day();
+        $this->end =3D $per_end->last_day();
+    }
=20
-	/*	 * *
-	 * @brief compute amount of all the detail of apport_advanced.formulair=
e_param
-	 * @param $p_start requested start date
-	 * @param $p_start requested end date
-	 *
-	 *
-	 */
+    /*     * *
+     * @brief compute amount of all the detail of apport_advanced.formul=
aire_param
+     * @param $p_start requested start date
+     * @param $p_start requested end date
+     *
+     *
+     */
=20
-	function compute($p_start, $p_end)
-	{
-		global $cn;
-		bcscale(2);
-		$this->amount =3D "0";
+    function compute($p_start, $p_end)
+    {
+        global $cn;
+        bcscale(2);
+        $this->amount =3D "0";
=20
-		$array =3D $cn->get_array("select fp_id,p_id,tmp_val,tva_id,fp_formula=
,fp_signed,jrn_def_type,tt_id,type_detail,
-			with_tmp_val,type_sum_account,operation_pcm_val
+        $array =3D $cn->get_array("select fp_id,p_id,tmp_val,tva_id,fp_f=
ormula,fp_signed,jrn_def_type,tt_id,type_detail,
+			with_tmp_val,type_sum_account,operation_pcm_val,jrn_def_id
 			from rapport_advanced.formulaire_param_detail where p_id=3D$1", array=
($this->param->p_id));
-		$this->compute_date($p_start, $p_end);
-		for ($e =3D 0; $e < count($array); $e++)
-		{
-			$row_detail =3D Rapav_Declaration_Detail::factory($array[$e]);
-			$row_detail->dr_id =3D $this->dr_id;
-			$row_detail->d_id =3D $this->d_id;
-			$tmp_amount =3D $row_detail->compute($this->start, $this->end);
-			$this->amount =3D bcadd("$tmp_amount", "$this->amount");
-			$row_detail->insert();
-		}
-	}
+        $this->compute_date($p_start, $p_end);
+        for ($e =3D 0; $e < count($array); $e++)
+        {
+            $row_detail =3D Rapav_Declaration_Detail::factory($array[$e]=
);
+            $row_detail->dr_id =3D $this->dr_id;
+            $row_detail->d_id =3D $this->d_id;
+            $tmp_amount =3D $row_detail->compute($this->start, $this->en=
d);
+            $this->amount =3D bcadd("$tmp_amount", "$this->amount");
+            $row_detail->insert();
+        }
+    }
=20
 }
=20
@@ -620,55 +629,54 @@
 class Rapav_Declaration_Detail extends RAPAV_Declaration_Row_Detail_SQL
 {
=20
-	/**
-	 * @brief create an object RAPAV_dd_Formula, RAPAV_dd_Account_Tva or Ra=
pav_dd_compute following the idx type_detail
-	 * @param type $p_array
-	 * @return object RAPAV_dd_Formula, RAPAV_dd_Account_Tva or Rapav_dd_co=
mpute
-	 * @throws if the type is not known
-	 */
-	static function factory($p_array)
-	{
-		switch ($p_array['type_detail'])
-		{
-			case '1':
-				$ret =3D new Rapav_dd_Formula();
-				break;
-			case '2':
-				$ret =3D new Rapav_dd_Account_Tva();
-				break;
-			case '3':
-				$ret =3D new Rapav_dd_Compute();
-				break;
-			case '4':
-				$ret =3D new Rapav_dd_Account();
-				break;
-			case '5':
-				$ret =3D new Rapav_dd_Reconcile();
-				break;
-			default:
-				throw new Exception("Type inconnu");
-		}
+    /**
+     * @brief create an object RAPAV_dd_Formula, RAPAV_dd_Account_Tva or=
 Rapav_dd_compute following the idx type_detail
+     * @param type $p_array
+     * @return object RAPAV_dd_Formula, RAPAV_dd_Account_Tva or Rapav_dd=
_compute
+     * @throws if the type is not known
+     */
+    static function factory($p_array)
+    {
+        switch ($p_array['type_detail'])
+        {
+            case '1':
+                $ret =3D new Rapav_dd_Formula();
+                break;
+            case '2':
+                $ret =3D new Rapav_dd_Account_Tva();
+                break;
+            case '3':
+                $ret =3D new Rapav_dd_Compute();
+                break;
+            case '4':
+                $ret =3D new Rapav_dd_Account();
+                break;
+            case '5':
+                $ret =3D new Rapav_dd_Reconcile();
+                break;
+            default:
+                throw new Exception("Type inconnu");
+        }
=20
-		$ret->from_array($p_array);
-		$ret->ddr_amount =3D 0; // cannot be null
-		return $ret;
-	}
+        $ret->from_array($p_array);
+        $ret->ddr_amount =3D 0; // cannot be null
+        return $ret;
+    }
=20
-	/**
-	 * @brief the p_array contains a row from formulaire_param_detail
-	 * it will be copied into this->form.
-	 * @param type $p_array match formulaire_param_detail table structure
-	 */
-	function from_array($p_array)
-	{
-		$this->form =3D new Formulaire_Param_Detail();
-		$attribute =3D explode(',',
-				'fp_id,p_id,tmp_val,tva_id,fp_formula,fp_signed,jrn_def_type,tt_id,t=
ype_detail,with_tmp_val,type_sum_account,operation_pcm_val');
-		foreach ($attribute as $e)
-		{
-			$this->form->$e =3D $p_array[$e];
-		}
-	}
+    /**
+     * @brief the p_array contains a row from formulaire_param_detail
+     * it will be copied into this->form.
+     * @param type $p_array match formulaire_param_detail table structur=
e
+     */
+    function from_array($p_array)
+    {
+        $this->form =3D new Formulaire_Param_Detail();
+        $attribute =3D explode(',', 'fp_id,p_id,tmp_val,tva_id,fp_formul=
a,fp_signed,jrn_def_type,tt_id,type_detail,with_tmp_val,type_sum_account,=
operation_pcm_val,jrn_def_id');
+        foreach ($attribute as $e)
+        {
+            $this->form->$e =3D $p_array[$e];
+        }
+    }
=20
 }
=20
@@ -679,20 +687,20 @@
 class Rapav_dd_Formula extends Rapav_Declaration_Detail
 {
=20
-	/**
-	 * compute the amount for one detail of type formula
-	 *  rapport_advanced.formulaire_param_detail
-	 * @global type $cn database connexion
-	 * @param $p_start (date) : computed start date
-	 * @param $p_end (date) computed start date
-	 * @return numeric amount computed
-	 */
-	function compute($p_start, $p_end)
-	{
-		global $cn;
-		$amount =3D Impress::parse_formula($cn, "", $this->form->fp_formula, $=
p_start, $p_end, true, 1);
-		return $amount['montant'];
-	}
+    /**
+     * compute the amount for one detail of type formula
+     *  rapport_advanced.formulaire_param_detail
+     * @global type $cn database connexion
+     * @param $p_start (date) : computed start date
+     * @param $p_end (date) computed start date
+     * @return numeric amount computed
+     */
+    function compute($p_start, $p_end)
+    {
+        global $cn;
+        $amount =3D Impress::parse_formula($cn, "", $this->form->fp_form=
ula, $p_start, $p_end, true, 1);
+        return $amount['montant'];
+    }
=20
 }
=20
@@ -703,41 +711,41 @@
 class Rapav_dd_Compute extends Rapav_Declaration_Detail
 {
=20
-	/**
-	 * compute the amount for one detail
-	 *  rapport_advanced.formulaire_param_detail
-	 * the attribute d_id and dr_id must be set before the call
-	 * @global type $cn database connexion
-	 * @param $p_start (date) : computed start date not used
-	 * @param $p_end (date) computed start date not used
-	 * @return numeric amount computed
-	 */
-	function compute($p_start, $p_end)
-	{
-		global $cn;
-		$amount =3D 0;
-		bcscale(2);
+    /**
+     * compute the amount for one detail
+     *  rapport_advanced.formulaire_param_detail
+     * the attribute d_id and dr_id must be set before the call
+     * @global type $cn database connexion
+     * @param $p_start (date) : computed start date not used
+     * @param $p_end (date) computed start date not used
+     * @return numeric amount computed
+     */
+    function compute($p_start, $p_end)
+    {
+        global $cn;
+        $amount =3D 0;
+        bcscale(2);
=20
-		// copy $this->form->fp_formula to a variable
-		$formula =3D $this->form->fp_formula;
+        // copy $this->form->fp_formula to a variable
+        $formula =3D $this->form->fp_formula;
=20
-		// split the string from  into smaller piece
-		preg_match_all("/\[([A-Z]*[0-9]*)*([0-9]*[A-Z]*)\]/i", $formula, $e);
-		$tmp =3D $e[0];
+        // split the string from  into smaller piece
+        preg_match_all("/\[([A-Z]*[0-9]*)*([0-9]*[A-Z]*)\]/i", $formula,=
 $e);
+        $tmp =3D $e[0];
=20
-		foreach ($tmp as $piece)
-		{
-			// Find the code in the database
-			$search =3D str_replace('[', '', $piece);
-			$search =3D str_replace(']', '', $search);
-			$value =3D $cn->get_value('select coalesce(sum(dr_amount),0) as value
+        foreach ($tmp as $piece)
+        {
+            // Find the code in the database
+            $search =3D str_replace('[', '', $piece);
+            $search =3D str_replace(']', '', $search);
+            $value =3D $cn->get_value('select coalesce(sum(dr_amount),0)=
 as value
 				from rapport_advanced.declaration_row where d_id=3D$1 and dr_code=3D=
$2', array($this->d_id, $search));
-			$formula =3D str_replace($piece, $value, $formula);
-		}
-		eval('$amount =3D ' . $formula . ';');
-		//
-		return $amount;
-	}
+            $formula =3D str_replace($piece, $value, $formula);
+        }
+        eval('$amount =3D ' . $formula . ';');
+        //
+        return $amount;
+    }
=20
 }
=20
@@ -754,128 +762,139 @@
 class Rapav_dd_Account_Tva extends Rapav_Declaration_Detail
 {
=20
-	/**
-	 * compute the amount of tva using the given account in either the ledg=
er ACH or VEN
-	 * following the $this->form->jrn_def_type.
-	 * set the $this->errcode if something wrong has happened
-	 * @param  $p_start start date
-	 * @param $p_end end date
-	 * @return amount
-	 */
-	private function compute_tva($p_start, $p_end)
-	{
-		if ($this->form->jrn_def_type =3D=3D 'ACH')
-		{
-			$sql =3D "select coalesce(sum(qp_vat),0) as amount
+    /**
+     * compute the amount of tva using the given account in either the l=
edger ACH or VEN
+     * following the $this->form->jrn_def_type.
+     * set the $this->errcode if something wrong has happened
+     * @param  $p_start start date
+     * @param $p_end end date
+     * @return amount
+     */
+    private function compute_tva($p_start, $p_end)
+    {
+        $filter_ledger =3D "";
+        if ($this->form->jrn_def_id !=3D "")
+        {
+            $filter_ledger =3D " and j_jrn_def =3D " . sql_string($this-=
>form->jrn_def_id);
+        }
+        if ($this->form->jrn_def_type =3D=3D 'ACH')
+        {
+
+            $sql =3D "select coalesce(sum(qp_vat),0) as amount
 						from quant_purchase join jrnx using (j_id)
 						where qp_vat_code=3D$1
 						and (j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date(=
$3,'DD.MM.YYYY'))
-						and j_poste::text like ($4)";
-			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
-				$p_start,
-				$p_end,
-				$this->form->tmp_val));
-			return $amount;
-		}
-		if ($this->form->jrn_def_type =3D=3D 'VEN')
-		{
-			$sql =3D "select coalesce(sum(qs_vat),0) as amount
+						and j_poste::text like ($4) $filter_ledger";
+            $amount =3D $this->cn->get_value($sql, array($this->form->tv=
a_id,
+                $p_start,
+                $p_end,
+                $this->form->tmp_val));
+            return $amount;
+        }
+        if ($this->form->jrn_def_type =3D=3D 'VEN')
+        {
+            $sql =3D "select coalesce(sum(qs_vat),0) as amount
 						from quant_sold join jrnx using (j_id)
 						where qs_vat_code=3D$1 and
 						(j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date($3,'=
DD.MM.YYYY'))
-						and j_poste::text like ($4)";
+						and j_poste::text like ($4)  $filter_ledger";
=20
-			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
-				$p_start,
-				$p_end,
-				$this->form->tmp_val));
-			return $amount;
-		}
-		$this->errcode =3D 'Erreur dans le journal';
-		return 0;
-	}
+            $amount =3D $this->cn->get_value($sql, array($this->form->tv=
a_id,
+                $p_start,
+                $p_end,
+                $this->form->tmp_val));
+            return $amount;
+        }
+        $this->errcode =3D 'Erreur dans le journal';
+        return 0;
+    }
=20
-	/**
-	 * compute the amount of account using the given tva_id in either the l=
edger ACH or VEN
-	 * following the $this->form->jrn_def_type.
-	 * Set the $this->errcode if something wrong has happened
-	 * @param  $p_start start date
-	 * @param $p_end end date
-	 * @return amount
-	 * @param type $p_start
-	 * @param type $p_end
-	 * @return \amount|int
-	 */
-	private function compute_amount($p_start, $p_end)
-	{
-		if ($this->form->jrn_def_type =3D=3D 'ACH')
-		{
-			$sql =3D "select coalesce(sum(qp_price),0) as amount from quant_purch=
ase join jrnx using (j_id)
+    /**
+     * compute the amount of account using the given tva_id in either th=
e ledger ACH or VEN
+     * following the $this->form->jrn_def_type.
+     * Set the $this->errcode if something wrong has happened
+     * @param  $p_start start date
+     * @param $p_end end date
+     * @return amount
+     * @param type $p_start
+     * @param type $p_end
+     * @return \amount|int
+     */
+    private function compute_amount($p_start, $p_end)
+    {
+         $filter_ledger =3D "";
+        if ($this->form->jrn_def_id !=3D "")
+        {
+            $filter_ledger =3D " and j_jrn_def =3D " . sql_string($this-=
>form->jrn_def_id);
+        }
+        if ($this->form->jrn_def_type =3D=3D 'ACH')
+        {
+            $sql =3D "select coalesce(sum(qp_price),0) as amount from qu=
ant_purchase join jrnx using (j_id)
 					where qp_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
-					and j_poste::text like ($4)";
+					and j_poste::text like ($4) $filter_ledger";
=20
-			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
-				$p_start,
-				$p_end,
-				$this->form->tmp_val));
-			return $amount;
-		}
-		if ($this->form->jrn_def_type =3D=3D 'VEN')
-		{
-			$sql =3D "select coalesce(sum(qs_price),0) as amount from quant_sold
+            $amount =3D $this->cn->get_value($sql, array($this->form->tv=
a_id,
+                $p_start,
+                $p_end,
+                $this->form->tmp_val));
+            return $amount;
+        }
+        if ($this->form->jrn_def_type =3D=3D 'VEN')
+        {
+            $sql =3D "select coalesce(sum(qs_price),0) as amount from qu=
ant_sold
 					join jrnx using (j_id)
 					where qs_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
-					and j_poste::text like ($4)";
-			$amount =3D $this->cn->get_value($sql, array($this->form->tva_id,
-				$p_start,
-				$p_end,
-				$this->form->tmp_val));
-			return $amount;
-		}
-		$this->errcode =3D 'Erreur dans le journal';
-		return 0;
-	}
+					and j_poste::text like ($4) $filter_ledger";
+            $amount =3D $this->cn->get_value($sql, array($this->form->tv=
a_id,
+                $p_start,
+                $p_end,
+                $this->form->tmp_val));
+            return $amount;
+        }
+        $this->errcode =3D 'Erreur dans le journal';
+        return 0;
+    }
=20
-	/**
-	 * Compute the amount of TVA or Account, call internally private functi=
ons
-	 * @see Rapav_dd_Account_Tva::computa_amount Rapav_dd_Account_Tva::comp=
ute_tva
-	 * @param $p_start start date
-	 * @param $p_end end date
-	 * @return amount computed
-	 * @throws Exception
-	 */
-	function compute($p_start, $p_end)
-	{
-		bcscale(2);
-		// Retrieve the account for the tva_id, we need the DEB for VEN and CR=
ED for ACH
-		//
+    /**
+     * Compute the amount of TVA or Account, call internally private fun=
ctions
+     * @see Rapav_dd_Account_Tva::computa_amount Rapav_dd_Account_Tva::c=
ompute_tva
+     * @param $p_start start date
+     * @param $p_end end date
+     * @return amount computed
+     * @throws Exception
+     */
+    function compute($p_start, $p_end)
+    {
+        bcscale(2);
+        // Retrieve the account for the tva_id, we need the DEB for VEN =
and CRED for ACH
+        //
 		// tt_id gives the type of total
-		//  - 0 TVA + Account
-		//  - 1 TVA
-		//  - 2 Account
-		switch ($this->form->tt_id)
-		{
-			case 0:
-				$t1_amount =3D $this->compute_amount($p_start, $p_end);
-				$t2_amount =3D $this->compute_tva($p_start, $p_end);
-				$amount =3D bcadd($t1_amount, $t2_amount);
-				break;
-			case 1:
-				$amount =3D $this->compute_tva($p_start, $p_end);
-				$amount =3D bcadd($amount, 0);
-				break;
+        //  - 0 TVA + Account
+        //  - 1 TVA
+        //  - 2 Account
+        switch ($this->form->tt_id)
+        {
+            case 0:
+                $t1_amount =3D $this->compute_amount($p_start, $p_end);
+                $t2_amount =3D $this->compute_tva($p_start, $p_end);
+                $amount =3D bcadd($t1_amount, $t2_amount);
+                break;
+            case 1:
+                $amount =3D $this->compute_tva($p_start, $p_end);
+                $amount =3D bcadd($amount, 0);
+                break;
=20
-			case 2:
-				$amount =3D $this->compute_amount($p_start, $p_end);
-				$amount =3D bcadd($amount, 0);
-				break;
+            case 2:
+                $amount =3D $this->compute_amount($p_start, $p_end);
+                $amount =3D bcadd($amount, 0);
+                break;
=20
-			default:
-				throw new Exception('Type de total invalide');
-				break;
-		}
-		return $amount;
-	}
+            default:
+                throw new Exception('Type de total invalide');
+                break;
+        }
+        return $amount;
+    }
=20
 }
=20
@@ -892,101 +911,112 @@
 class Rapav_dd_Account extends Rapav_Declaration_Detail
 {
=20
-	function compute($p_start, $p_end)
-	{
-		global $cn;
-		bcscale(2);
-		switch ($this->form->type_sum_account)
-		{
-			// Saldo
-			case 1:
-			case 2:
-				// Compute D-C
-				$sql =3D "
-						select sum(jrnx_amount)
-						from (
-							select distinct jrn1.j_id,case when jrn1.j_debit =3D 't' then jrn=
1.j_montant else jrn1.j_montant*(-1) end as jrnx_amount
-							from jrnx as jrn1
-							join jrnx as jrn2 on (jrn1.j_grpt=3Djrn2.j_grpt)
-							where
-							jrn1.j_poste like $1
-							and
-							jrn2.j_poste like $2
-							and (jrn1.j_date >=3D to_date($3,'DD.MM.YYYY') and jrn1.j_date <=3D=
 to_date($4,'DD.MM.YYYY'))
-							) as tv_amount
+    function compute($p_start, $p_end)
+    {
+        global $cn;
+        $filter_ledger =3D "";
+        if ($this->form->jrn_def_id !=3D "")
+        {
+            $filter_ledger =3D " and jrn1.j_jrn_def =3D " . sql_string($=
this->form->jrn_def_id);
+        }
+        bcscale(2);
+        switch ($this->form->type_sum_account)
+        {
+            // Saldo
+            case 1:
+            case 2:
+                // Compute D-C
+                $sql =3D "
+                        select sum(jrnx_amount)
+                        from (
+                                select distinct jrn1.j_id,case when jrn1=
.j_debit =3D 't' then jrn1.j_montant else jrn1.j_montant*(-1) end as jrnx=
_amount
+                                from jrnx as jrn1
+                                join jrnx as jrn2 on (jrn1.j_grpt=3Djrn2=
.j_grpt)
+                                where
+                                jrn1.j_poste like $1
+                                and
+                                jrn2.j_poste like $2
+                                and (jrn1.j_date >=3D to_date($3,'DD.MM.=
YYYY') and jrn1.j_date <=3D to_date($4,'DD.MM.YYYY'))
+                                $filter_ledger
+                                ) as tv_amount
 							 ";
-				$amount=3D$cn->get_value($sql,array(
-					$this->form->tmp_val,
-					$this->form->with_tmp_val,
-					$p_start,
-					$p_end
-					));
-				// if C-D is asked then reverse the result
-				if ($this->form->type_sum_account=3D=3D2) $amount=3Dbcmul($amount,-1=
);
-				break;
-			// Only DEBIT
-			case 3:
-					$sql =3D "
-						select sum(jrnx_amount)
-						from (
-							select distinct jrn1.j_id,jrn1.j_montant as jrnx_amount
-							from jrnx as jrn1
-							join jrnx as jrn2 on (jrn1.j_grpt=3Djrn2.j_grpt)
-							where
-							jrn1.j_poste like $1
-							and
-							jrn2.j_poste like $2
-							and
-							jrn1.j_debit=3D't'
-							and
-							(jrn1.j_date >=3D to_date($3,'DD.MM.YYYY') and jrn1.j_date <=3D t=
o_date($4,'DD.MM.YYYY'))
-							) as tv_amount
+                $amount =3D $cn->get_value($sql, array(
+                    $this->form->tmp_val,
+                    $this->form->with_tmp_val,
+                    $p_start,
+                    $p_end
+                ));
+                // if C-D is asked then reverse the result
+                if ($this->form->type_sum_account =3D=3D 2)
+                    $amount =3D bcmul($amount, -1);
+                break;
+            // Only DEBIT
+            case 3:
+                $sql =3D "
+                        select sum(jrnx_amount)
+                        from (
+                                select distinct jrn1.j_id,jrn1.j_montant=
 as jrnx_amount
+                                from jrnx as jrn1
+                                join jrnx as jrn2 on (jrn1.j_grpt=3Djrn2=
.j_grpt)
+                                where
+                                jrn1.j_poste like $1
+                                and
+                                jrn2.j_poste like $2
+                                and
+                                jrn1.j_debit=3D't'
+                                and
+                                (jrn1.j_date >=3D to_date($3,'DD.MM.YYYY=
') and jrn1.j_date <=3D to_date($4,'DD.MM.YYYY'))
+                                $filter_ledger
+                                ) as tv_amount
 							 ";
-				$amount=3D$cn->get_value($sql,array(
-					$this->form->tmp_val,
-					$this->form->with_tmp_val,
-					$p_start,
-					$p_end
-					));
-				break;
-			// Only CREDIT
-			case 4:
-					$sql =3D "
-						select sum(jrnx_amount)
-						from (
-							select distinct jrn1.j_id,jrn1.j_montant as jrnx_amount
-							from jrnx as jrn1
-							join jrnx as jrn2 on (jrn1.j_grpt=3Djrn2.j_grpt)
-							where
-							jrn1.j_poste like $1
-							and
-							jrn2.j_poste like $2
-							and
-							jrn1.j_debit=3D'f'
-							and
-							(jrn1.j_date >=3D to_date($3,'DD.MM.YYYY') and jrn1.j_date <=3D t=
o_date($4,'DD.MM.YYYY'))
-							) as tv_amount
+                $amount =3D $cn->get_value($sql, array(
+                    $this->form->tmp_val,
+                    $this->form->with_tmp_val,
+                    $p_start,
+                    $p_end
+                ));
+                break;
+            // Only CREDIT
+            case 4:
+                $sql =3D "
+                        select sum(jrnx_amount)
+                        from (
+                                select distinct jrn1.j_id,jrn1.j_montant=
 as jrnx_amount
+                                from jrnx as jrn1
+                                join jrnx as jrn2 on (jrn1.j_grpt=3Djrn2=
.j_grpt)
+                                where
+                                jrn1.j_poste like $1
+                                and
+                                jrn2.j_poste like $2
+                                and
+                                jrn1.j_debit=3D'f'
+                                and
+                                (jrn1.j_date >=3D to_date($3,'DD.MM.YYYY=
') and jrn1.j_date <=3D to_date($4,'DD.MM.YYYY'))
+                                $filter_ledger
+                                ) as tv_amount
 							 ";
-				$amount=3D$cn->get_value($sql,array(
-					$this->form->tmp_val,
-					$this->form->with_tmp_val,
-					$p_start,
-					$p_end
-					));
-				break;
+                $amount =3D $cn->get_value($sql, array(
+                    $this->form->tmp_val,
+                    $this->form->with_tmp_val,
+                    $p_start,
+                    $p_end
+                ));
+                break;
=20
-			default:
-				if ( DEBUG) var_dump($this);
-				die (__FILE__.":".__LINE__." UNKNOW SUM TYPE");
-				break;
-		}
-		/*
-		 * 4 possibilities with type_sum_account
-		 */
-		return $amount;
-	}
+            default:
+                if (DEBUG)
+                    var_dump($this);
+                die(__FILE__ . ":" . __LINE__ . " UNKNOW SUM TYPE");
+                break;
+        }
+        /*
+         * 4 possibilities with type_sum_account
+         */
+        return $amount;
+    }
=20
 }
+
 /**
  * @brief handle the param_detail type Account
  * The type_sum_account gives the type of total
@@ -1000,122 +1030,133 @@
 class Rapav_dd_Reconcile extends Rapav_Declaration_Detail
 {
=20
-	function compute($p_start, $p_end)
-	{
-		global $cn;
-		bcscale(2);
-		switch ($this->form->type_sum_account)
-		{
-			// Saldo
-			case 1:
-			case 2:
-				// Compute D-C
-				$sql =3D "
-						select sum(tv_amount.jrnx_amount)
-							from (
-								select distinct jrn1.j_id,j1.jr_id,
-								case when jrn1.j_debit =3D 't' then jrn1.j_montant else jrn1.j_m=
ontant*(-1) end as jrnx_amount
-								from jrnx as jrn1
-								join jrnx as jrn2 on (jrn1.j_grpt=3Djrn2.j_grpt)
-								join jrn as j1 on (jrn1.j_grpt=3Dj1.jr_grpt_id)
-								where
-								jrn1.j_poste like $1
-								and	jrn2.j_poste like $2
-								) as tv_amount
-							join jrn_rapt as rap1 on (rap1.jr_id=3Dtv_amount.jr_id or rap1.jr=
a_concerned=3Dtv_amount.jr_id)
-							join (select distinct jrn3.j_id,j2.jr_id
-								from jrnx as jrn3
-								join jrn as j2 on (j2.jr_grpt_id=3Djrn3.j_grpt)
-								where
-							(jrn3.j_date >=3D to_date($3,'DD.MM.YYYY') and jrn3.j_date <=3D t=
o_date($4,'DD.MM.YYYY')) and
-								 jrn3.j_poste like $5) as reconc on (rap1.jr_id=3Dreconc.jr_id o=
r rap1.jra_concerned=3Dreconc.jr_id)
+    function compute($p_start, $p_end)
+    {
+        global $cn;
+        bcscale(2);
+        $filter_ledger =3D "";
+        if ($this->form->jrn_def_id !=3D "")
+        {
+            $filter_ledger =3D " and jrn1.j_jrn_def =3D " . sql_string($=
this->form->jrn_def_id);
+        }
+        switch ($this->form->type_sum_account)
+        {
+            // Saldo
+            case 1:
+            case 2:
+                // Compute D-C
+                $sql =3D "
+                        select sum(tv_amount.jrnx_amount)
+                                from (
+                                        select distinct jrn1.j_id,j1.jr_=
id,
+                                        case when jrn1.j_debit =3D 't' t=
hen jrn1.j_montant else jrn1.j_montant*(-1) end as jrnx_amount
+                                        from jrnx as jrn1
+                                        join jrnx as jrn2 on (jrn1.j_grp=
t=3Djrn2.j_grpt)
+                                        join jrn as j1 on (jrn1.j_grpt=3D=
j1.jr_grpt_id)
+                                        where
+                                        jrn1.j_poste like $1
+                                        and	jrn2.j_poste like $2
+                                        $filter_ledger
+                                        ) as tv_amount
+                                join jrn_rapt as rap1 on (rap1.jr_id=3Dt=
v_amount.jr_id or rap1.jra_concerned=3Dtv_amount.jr_id)
+                                join (select distinct jrn3.j_id,j2.jr_id
+                                        from jrnx as jrn3
+                                        join jrn as j2 on (j2.jr_grpt_id=
=3Djrn3.j_grpt)
+                                        where
+                                (jrn3.j_date >=3D to_date($3,'DD.MM.YYYY=
') and jrn3.j_date <=3D to_date($4,'DD.MM.YYYY')) and
+                                         jrn3.j_poste like $5) as reconc=
 on (rap1.jr_id=3Dreconc.jr_id or rap1.jra_concerned=3Dreconc.jr_id)
=20
 							 ";
-				$amount=3D$cn->get_value($sql,array(
-					$this->form->tmp_val,
-					$this->form->with_tmp_val,
-					$p_start,
-					$p_end,
-					$this->form->operation_pcm_val
-					));
-				// if C-D is asked then reverse the result
-				if ($this->form->type_sum_account=3D=3D2) $amount=3Dbcmul($amount,-1=
);
-				break;
-			// Only DEBIT
-			case 3:
-					$sql =3D "
-						select sum(tv_amount.jrnx_amount)
-							from (
-								select distinct jrn1.j_id,j1.jr_id,
-								jrn1.j_montant as jrnx_amount
-								from jrnx as jrn1
-								join jrnx as jrn2 on (jrn1.j_grpt=3Djrn2.j_grpt)
-								join jrn as j1 on (jrn1.j_grpt=3Dj1.jr_grpt_id)
-								where
-								jrn1.j_poste like $1
-								and	jrn2.j_poste like $2
-								and jrn1.j_debit=3D't'
-								) as tv_amount
-							join jrn_rapt as rap1 on (rap1.jr_id=3Dtv_amount.jr_id or rap1.jr=
a_concerned=3Dtv_amount.jr_id)
-							join (select distinct jrn3.j_id,j2.jr_id
-								from jrnx as jrn3
-								join jrn as j2 on (j2.jr_grpt_id=3Djrn3.j_grpt)
-								where
-							(jrn3.j_date >=3D to_date($3,'DD.MM.YYYY') and jrn3.j_date <=3D t=
o_date($4,'DD.MM.YYYY')) and
-								 jrn3.j_poste like $5) as reconc on (rap1.jr_id=3Dreconc.jr_id o=
r rap1.jra_concerned=3Dreconc.jr_id)
+                $amount =3D $cn->get_value($sql, array(
+                    $this->form->tmp_val,
+                    $this->form->with_tmp_val,
+                    $p_start,
+                    $p_end,
+                    $this->form->operation_pcm_val
+                ));
+                // if C-D is asked then reverse the result
+                if ($this->form->type_sum_account =3D=3D 2)
+                    $amount =3D bcmul($amount, -1);
+                break;
+            // Only DEBIT
+            case 3:
+                $sql =3D "
+                        select sum(tv_amount.jrnx_amount)
+                                from (
+                                        select distinct jrn1.j_id,j1.jr_=
id,
+                                        jrn1.j_montant as jrnx_amount
+                                        from jrnx as jrn1
+                                        join jrnx as jrn2 on (jrn1.j_grp=
t=3Djrn2.j_grpt)
+                                        join jrn as j1 on (jrn1.j_grpt=3D=
j1.jr_grpt_id)
+                                        where
+                                        jrn1.j_poste like $1
+                                        and	jrn2.j_poste like $2
+                                        and jrn1.j_debit=3D't'
+                                        $filter_ledger
+                                        ) as tv_amount
+                                join jrn_rapt as rap1 on (rap1.jr_id=3Dt=
v_amount.jr_id or rap1.jra_concerned=3Dtv_amount.jr_id)
+                                join (select distinct jrn3.j_id,j2.jr_id
+                                        from jrnx as jrn3
+                                        join jrn as j2 on (j2.jr_grpt_id=
=3Djrn3.j_grpt)
+                                        where
+                                (jrn3.j_date >=3D to_date($3,'DD.MM.YYYY=
') and jrn3.j_date <=3D to_date($4,'DD.MM.YYYY')) and
+                                         jrn3.j_poste like $5) as reconc=
 on (rap1.jr_id=3Dreconc.jr_id or rap1.jra_concerned=3Dreconc.jr_id)
=20
 							 ";
-				$amount=3D$cn->get_value($sql,array(
-					$this->form->tmp_val,
-					$this->form->with_tmp_val,
-					$p_start,
-					$p_end,
-					$this->form->operation_pcm_val
-					));
-				break;
-			// Only CREDIT
-			case 4:
-					$sql =3D "
-					select sum(tv_amount.jrnx_amount)
-							from (
-								select distinct jrn1.j_id,j1.jr_id,
-								jrn1.j_montant  as jrnx_amount
-								from jrnx as jrn1
-								join jrnx as jrn2 on (jrn1.j_grpt=3Djrn2.j_grpt)
-								join jrn as j1 on (jrn1.j_grpt=3Dj1.jr_grpt_id)
-								where
-								jrn1.j_poste like $1
-								and	jrn2.j_poste like $2
-								and jrn1.j_debit=3D'f'
-								) as tv_amount
-							join jrn_rapt as rap1 on (rap1.jr_id=3Dtv_amount.jr_id or rap1.jr=
a_concerned=3Dtv_amount.jr_id)
-							join (select distinct jrn3.j_id,j2.jr_id
-								from jrnx as jrn3
-								join jrn as j2 on (j2.jr_grpt_id=3Djrn3.j_grpt)
-								where
-							(jrn3.j_date >=3D to_date($3,'DD.MM.YYYY') and jrn3.j_date <=3D t=
o_date($4,'DD.MM.YYYY')) and
-								 jrn3.j_poste like $5) as reconc on (rap1.jr_id=3Dreconc.jr_id o=
r rap1.jra_concerned=3Dreconc.jr_id)
+                $amount =3D $cn->get_value($sql, array(
+                    $this->form->tmp_val,
+                    $this->form->with_tmp_val,
+                    $p_start,
+                    $p_end,
+                    $this->form->operation_pcm_val
+                ));
+                break;
+            // Only CREDIT
+            case 4:
+                $sql =3D "
+                        select sum(tv_amount.jrnx_amount)
+                                        from (
+                                                select distinct jrn1.j_i=
d,j1.jr_id,
+                                                jrn1.j_montant  as jrnx_=
amount
+                                                from jrnx as jrn1
+                                                join jrnx as jrn2 on (jr=
n1.j_grpt=3Djrn2.j_grpt)
+                                                join jrn as j1 on (jrn1.=
j_grpt=3Dj1.jr_grpt_id)
+                                                where
+                                                jrn1.j_poste like $1
+                                                and	jrn2.j_poste like $2
+                                                and jrn1.j_debit=3D'f'
+                                                $filter_ledger
+                                                ) as tv_amount
+                                        join jrn_rapt as rap1 on (rap1.j=
r_id=3Dtv_amount.jr_id or rap1.jra_concerned=3Dtv_amount.jr_id)
+                                        join (select distinct jrn3.j_id,=
j2.jr_id
+                                                from jrnx as jrn3
+                                                join jrn as j2 on (j2.jr=
_grpt_id=3Djrn3.j_grpt)
+                                                where
+                                        (jrn3.j_date >=3D to_date($3,'DD=
.MM.YYYY') and jrn3.j_date <=3D to_date($4,'DD.MM.YYYY')) and
+                                                 jrn3.j_poste like $5) a=
s reconc on (rap1.jr_id=3Dreconc.jr_id or rap1.jra_concerned=3Dreconc.jr_=
id)
=20
 							 ";
-				$amount=3D$cn->get_value($sql,array(
-					$this->form->tmp_val,
-					$this->form->with_tmp_val,
-					$p_start,
-					$p_end,
-					$this->form->operation_pcm_val
-					));
-				break;
+                $amount =3D $cn->get_value($sql, array(
+                    $this->form->tmp_val,
+                    $this->form->with_tmp_val,
+                    $p_start,
+                    $p_end,
+                    $this->form->operation_pcm_val
+                ));
+                break;
=20
-			default:
-				if ( DEBUG) var_dump($this);
-				die (__FILE__.":".__LINE__." UNKNOW SUM TYPE");
-				break;
-		}
-		/*
-		 * 4 possibilities with type_sum_account
-		 */
-		return $amount;
-	}
+            default:
+                if (DEBUG)
+                    var_dump($this);
+                die(__FILE__ . ":" . __LINE__ . " UNKNOW SUM TYPE");
+                break;
+        }
+        /*
+         * 4 possibilities with type_sum_account
+         */
+        return $amount;
+    }
=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-10-17 =
15:35:28 UTC (rev 533)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-10-17 =
19:08:37 UTC (rev 534)
@@ -127,7 +127,8 @@
 			"type_detail"=3D>"type_detail",
 			"with_tmp_val"=3D>"with_tmp_val",
 			"type_sum_account"=3D>"type_sum_account",
-			"operation_pcm_val"=3D>"operation_pcm_val"
+			"operation_pcm_val"=3D>"operation_pcm_val",
+                        "jrn_def_id"=3D>"jrn_def_id"
 		);
=20
 		$this->type =3D array(
@@ -142,7 +143,8 @@
 			"type_detail"=3D>"numeric",
 			"with_tmp_val"=3D>"text",
 			"type_sum_account"=3D>"numeric",
-			"operation_pcm_val"=3D>"text"
+			"operation_pcm_val"=3D>"text",
+                         "jrn_def_id"=3D>"numeric"
=20
 		);
=20

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-10-17=
 15:35:28 UTC (rev 533)
+++ trunk/rapport_avance/include/template/param_detail_new.php	2013-10-17=
 19:08:37 UTC (rev 534)
@@ -77,6 +77,7 @@
 	<?php echo HtmlInput::hidden('tab','formula')?>
 		<?php echo RAPAV_Formula::new_row()?>
 	</p>
+        <p> Filtrage par journal <?php echo $select->input(); ?> </p>
 <?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
@@ -90,6 +91,7 @@
=20
 	<?php echo HtmlInput::hidden('tab','account_tva')?>
 		<?php echo RAPAV_Account_Tva::new_row()?>
+    <p> Filtrage par journal <?php echo $select->input(); ?> </p>
 <?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
@@ -114,6 +116,7 @@
=20
 	<?php echo HtmlInput::hidden('tab','new_account_id')?>
 		<?php echo RAPAV_Account::new_row($p_id)?>
+    <p> Filtrage par journal <?php echo $select->input(); ?> </p>
 <?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
@@ -125,6 +128,7 @@
=20
 	<?php echo HtmlInput::hidden('tab','new_reconcile_id')?>
 		<?php echo RAPAV_Reconcile::new_row($p_id)?>
+    <p> Filtrage par journal <?php echo $select->input(); ?> </p>
 <?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>

Added: 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	    =
                    (rev 0)
+++ trunk/rapport_avance/sql/1-ajout-col-formulaire-param-detail.sql	2013=
-10-17 19:08:37 UTC (rev 534)
@@ -0,0 +1,18 @@
+ALTER TABLE rapport_advanced.formulaire_param_detail
+   ADD COLUMN jrn_def_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';
+ALTER TABLE rapport_advanced.formulaire_param_detail
+  ADD CONSTRAINT formulaire_param_detail_jrn_def_id_fkey FOREIGN KEY (jr=
n_def_id)
+      REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED=
;
+ALTER TABLE rapport_advanced.formulaire_param_detail
+  ADD CONSTRAINT formulaire_param_detail_jrn_def_id_fkey FOREIGN KEY (jr=
n_def_id)
+      REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED=
;
+CREATE TRIGGER formulaire_param_detail_trg
+  BEFORE INSERT OR UPDATE OF jrn_def_id
+  ON rapport_advanced.formulaire_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 Thu Oct 17 15:52:49 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWtcn-00040f-BV
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Oct 2013 15:52:49 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Oct 2013 21:42:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.74634.1382039568.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r535 - 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, 17 Oct 2013 19:52:47 -0000

Author: danydb
Date: 2013-10-17 21:42:30 +0200 (Thu, 17 Oct 2013)
New Revision: 535

Modified:
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/index.php
Log:
Ajout de journal comme filtre correction pour formule

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-10-17 1=
9:08:37 UTC (rev 534)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-10-17 1=
9:42:30 UTC (rev 535)
@@ -698,7 +698,12 @@
     function compute($p_start, $p_end)
     {
         global $cn;
-        $amount =3D Impress::parse_formula($cn, "", $this->form->fp_form=
ula, $p_start, $p_end, true, 1);
+        $sql=3D"";
+        if ($this->form->jrn_def_id !=3Dnull )=20
+        {
+            $sql=3D' and j_jrn_def =3D'.$this->form->jrn_def_id;
+        }
+        $amount =3D Impress::parse_formula($cn, "", $this->form->fp_form=
ula, $p_start, $p_end, true, 1,$sql);
         return $amount['montant'];
     }
=20

Modified: trunk/rapport_avance/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/index.php	2013-10-17 19:08:37 UTC (rev 534)
+++ trunk/rapport_avance/index.php	2013-10-17 19:42:30 UTC (rev 535)
@@ -55,6 +55,7 @@
=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, 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', _('D=C3=A9claration'), _('D=C3=A9claration TVA=
 calcul=C3=A9e'), 2),
 	array($url . '&sa=3Dhi', _('Historique'), _('Historique des d=C3=A9clar=
ations faites'), 3)
@@ -73,6 +74,9 @@
 	case 'hi':
 		$def =3D 3;
 		break;
+        case 'li':
+                $def=3D0;
+                break;
 }
=20
 $cn =3D new Database(dossier::id());
@@ -84,6 +88,13 @@
 echo ShowItem($array, 'H', 'mtitle ', 'mtitle ', $def, ' style=3D"width:=
80%;margin-left:10%;border-collapse: separate;border-spacing:  5px;"');
 echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
 // include the right file
+if ($def =3D=3D 0)
+{
+	require_once('include/liste.inc.php');
+	exit();
+}
+
+// include the right file
 if ($def =3D=3D 1)
 {
 	require_once('include/formulaire.inc.php');



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


From MAILER-DAEMON Thu Oct 17 15:54:57 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWter-0004DK-OT
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Oct 2013 15:54:57 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Oct 2013 21:44:41 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.74637.1382039697.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5506 - 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, 17 Oct 2013 19:54:57 -0000

Author: danydb
Date: 2013-10-17 21:44:41 +0200 (Thu, 17 Oct 2013)
New Revision: 5506

Modified:
   phpcompta/trunk/include/class_impress.php
Log:
add the possibility to add an SQL stmt to parse_formula, used by plugin

Modified: phpcompta/trunk/include/class_impress.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_impress.php	2013-10-16 21:56:08 UTC (re=
v 5505)
+++ phpcompta/trunk/include/class_impress.php	2013-10-17 19:44:41 UTC (re=
v 5506)
@@ -40,7 +40,7 @@
      *
      *
      */
-    static function parse_formula($p_cn,$p_label,$p_formula,$p_start,$p_=
end,$p_eval=3Dtrue,$p_type_date=3D0)
+    static function parse_formula($p_cn,$p_label,$p_formula,$p_start,$p_=
end,$p_eval=3Dtrue,$p_type_date=3D0,$p_sql=3D"")
     {
         global $g_user;
         if ( Impress::check_formula($p_formula) =3D=3D false)
@@ -138,7 +138,7 @@
=20
                 // Get sum of account
                 $P=3Dnew Acc_Account_Ledger($p_cn,$line);
-                $detail=3D$P->get_solde_detail($cond);
+                $detail=3D$P->get_solde_detail($cond.$p_sql);
=20
=20
                 if ( $compute=3D=3D'all')



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


From MAILER-DAEMON Thu Oct 17 17:51:32 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWvTg-0003ps-7V
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Oct 2013 17:51:32 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Oct 2013 23:41:13 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.74885.1382046691.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r537 - 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, 17 Oct 2013 21:51:31 -0000

Author: danydb
Date: 2013-10-17 23:41:13 +0200 (Thu, 17 Oct 2013)
New Revision: 537

Modified:
   trunk/rapport_avance/include/class_formulaire_param.php
Log:
correct doc

Modified: trunk/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_formulaire_param.php	2013-10-17 21=
:41:11 UTC (rev 536)
+++ trunk/rapport_avance/include/class_formulaire_param.php	2013-10-17 21=
:41:13 UTC (rev 537)
@@ -38,7 +38,7 @@
 	/**
 	 * Factory, create an object following the $form->p_type,
 	 * @param Formulaire_Param_Sql $form
-	 * @return \Formulaire_Title1|\Formulaire_Title2|\Formulaire_Title3|\Fo=
rmulaire_Formula
+	 * @return Formulaire_Title1| Formulaire_Title2| Formulaire_Title3| For=
mulaire_Formula
 	 */
 	static function factory(Formulaire_Param_Sql $form)
 	{
@@ -183,7 +183,7 @@
 }
=20
 /**
- * @brief mother class of \Formulaire_Title1|\Formulaire_Title2|\Formula=
ire_Title3|\Formulaire_Formula
+ * @brief mother class of Formulaire_Title1| Formulaire_Title2| Formulai=
re_Title3| Formulaire_Formula
  */
 class Formulaire_Row
 {
@@ -328,7 +328,7 @@
 	 * @brief return an object following the key type_detail of the array p=
assed in parameter
 	 *
 	 * @param type $p_index
-	 * @return \RAPAV_Formula|\RAPAV_Account_Tva|\RAPAV_Compute
+	 * @return RAPAV_Formula| RAPAV_Account_Tva| RAPAV_Compute
 	 */
 	function make_object($p_index)
 	{



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


From MAILER-DAEMON Thu Oct 17 17:51:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWvTj-0003tY-Ck
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Oct 2013 17:51:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Oct 2013 23:41:12 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.74886.1382046695.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r536 - 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, 17 Oct 2013 21:51:34 -0000

Author: danydb
Date: 2013-10-17 23:41:11 +0200 (Thu, 17 Oct 2013)
New Revision: 536

Modified:
   trunk/rapport_avance/index.php
Log:
Depend of version phpcompta >=3D 5506

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-10-17 19:42:30 UTC (rev 535)
+++ trunk/rapport_avance/index.php	2013-10-17 21:41:11 UTC (rev 536)
@@ -27,7 +27,7 @@
=20
 global $version_plugin;
 $version_plugin =3D SVNINFO;
-Extension::check_version(5220);
+Extension::check_version(5506);
 require_once 'class_phpcompta_sql.php';
 require_once 'rapav_constant.php';
 require_once 'class_impress.php';



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


From MAILER-DAEMON Thu Oct 17 18:00:58 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWvco-00061Q-0h
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Oct 2013 18:00:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Oct 2013 23:50:30 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.74889.1382047256.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r538 - 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: Thu, 17 Oct 2013 22:00:56 -0000

Author: danydb
Date: 2013-10-17 23:50:30 +0200 (Thu, 17 Oct 2013)
New Revision: 538

Modified:
   trunk/rapport_avance/include/template/param_detail_new.php
Log:
Place button submit

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-10-17=
 21:41:13 UTC (rev 537)
+++ trunk/rapport_avance/include/template/param_detail_new.php	2013-10-17=
 21:50:30 UTC (rev 538)
@@ -105,7 +105,9 @@
=20
 	<?php echo HtmlInput::hidden('tab','compute_id')?>
 		<?php echo RAPAV_Compute::new_row($p_id)?>
+    <p>
 <?php echo HtmlInput::submit('save','Sauve')?>
+    </p>
=20
 </form>
 </div>



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


From MAILER-DAEMON Thu Oct 17 19:46:45 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWxHB-0008Au-4p
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Oct 2013 19:46:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Oct 2013 01:36:27 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.74928.1382053604.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r539 - 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, 17 Oct 2013 23:46:44 -0000

Author: danydb
Date: 2013-10-18 01:36:26 +0200 (Fri, 18 Oct 2013)
New Revision: 539

Modified:
   trunk/rapport_avance/include/class_rapav_declaration.php
Log:
remove temp file=20

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-10-17 2=
1:50:30 UTC (rev 538)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-10-17 2=
3:36:26 UTC (rev 539)
@@ -222,10 +222,7 @@
         {
             echo _('Ne peut pas sauver ' . $oname . ' vers ' . $p_dir . =
'/' . $p_filename . ' code d\'erreur =3D' . $ret);
         }
-        /**
-         * @todo clean files
-         */
-        // unlink ($oname);
+       unlink ($oname);
     }
=20
     function special_tag($p_dir, $p_filename, $p_type)
@@ -297,10 +294,7 @@
         {
             echo _('Ne peut pas sauver ' . $oname . ' vers ' . $p_dir . =
'/' . $p_filename . ' code d\'erreur =3D' . $ret);
         }
-        /**
-         * @todo clean files
-         */
-        // unlink ($oname);
+        unlink ($oname);
     }
=20
     function load_document($p_file)



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


From MAILER-DAEMON Thu Oct 17 19:46:54 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VWxHK-0008DY-Eb
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Oct 2013 19:46:54 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Oct 2013 01:36:37 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.74929.1382053613.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r540 - 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, 17 Oct 2013 23:46:52 -0000

Author: danydb
Date: 2013-10-18 01:36:36 +0200 (Fri, 18 Oct 2013)
New Revision: 540

Modified:
   trunk/rapport_avance/include/class_formulaire_param_detail.php
Log:
typo

Modified: trunk/rapport_avance/include/class_formulaire_param_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_formulaire_param_detail.php	2013-1=
0-17 23:36:26 UTC (rev 539)
+++ trunk/rapport_avance/include/class_formulaire_param_detail.php	2013-1=
0-17 23:36:36 UTC (rev 540)
@@ -285,7 +285,7 @@
         $total_type_account =3D $cn->get_value('select tt_label from rap=
port_advanced.total_type_account where tt_id=3D$1', array($this->type_sum=
_account));
         $ledger =3D $this->get_ledger_name();
         printf("Total %s poste comptable %s utilis=C3=A9 avec le poste c=
omptable %s rapproch=C3=A9e dans la p=C3=A9riode donn=C3=A9e
-			avec une op=C3=A9ration utilisant le poste comptable %s  utisant $led=
ger", $total_type_account, $this->tmp_val, $this->with_tmp_val, $this->op=
eration_pcm_val);
+			avec une op=C3=A9ration utilisant le poste comptable %s  utilisant $l=
edger", $total_type_account, $this->tmp_val, $this->with_tmp_val, $this->=
operation_pcm_val);
     }
=20
     static function new_row($p_id)



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


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

Author: danydb
Date: 2013-10-19 15:06:49 +0200 (Sat, 19 Oct 2013)
New Revision: 5507

Modified:
   phpcompta/trunk/sql/upgrade.sql
Log:
update description for stocks

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-10-17 19:44:41 UTC (rev 5506)
+++ phpcompta/trunk/sql/upgrade.sql	2013-10-19 13:06:49 UTC (rev 5507)
@@ -72,10 +72,9 @@
  update menu_ref set me_description_etendue=3D'Cr=C3=A9ation et modifica=
tion des journaux, pr=C3=A9fixe des pi=C3=A8ces justificatives, num=C3=A9=
rotation, cat=C3=A9gories de fiches accessibles =C3=A0 ce journal' where =
me_code=3D'CFGLED' ;
  update menu_ref set me_description_etendue=3D'Configuration de la s=C3=A9=
curit=C3=A9, vous permet de donner un profil =C3=A0 vos utilisateurs, cel=
a leur permettra d''utiliser ce que vous souhaitez qu''ils puissent utili=
ser' where me_code=3D'CFGSEC' ;
  update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
eaux attributs que vous pourrez par la suite ajouter =C3=A0 des cat=C3=A9=
gories de fiches' where me_code=3D'CFGATCARD' ;
- update menu_ref set me_description_etendue=3D'Historique des mouvement =
de stock' where me_code=3D'STOCK_HISTO' ;
- update menu_ref set me_description_etendue=3D'Etat des stock' where me_=
code=3D'STOCK_STATE' ;
- update menu_ref set me_description_etendue=3D'Modification des stocks (=
inventaire)' where me_code=3D'STOCK_INV' ;
- update menu_ref set me_description_etendue=3D'Liste des changements man=
uels des stocks' where me_code=3D'STOCK_INVHISTO' ;
+ update menu_ref set me_description_etendue=3D'Etat des stock de l''exer=
cice indiqu=C3=A9' where me_code=3D'STOCK_STATE' ;
+ update menu_ref set me_description_etendue=3D'Modification des stocks, =
menu utilis=C3=A9 pour l''inventaire' where me_code=3D'STOCK_INV' ;
+ update menu_ref set me_description_etendue=3D'Liste des changements man=
uels des stocks, inventaire, transfert de marchandises entre d=C3=A9p=C3=B4=
ts...' where me_code=3D'STOCK_INVHISTO' ;
  update menu_ref set me_description_etendue=3D'Le navigateur vous pr=C3=A9=
sente une liste de menu auquel vous avez acc=C3=A8s et vous permet d''acc=
=C3=A8der plus rapidement au menu que vous souhaitez' where me_code=3D'NA=
VI' ;
  update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans tous  les journaux auquels vous avez acc=C3=A8s, vou=
s permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9r=
esse sur base de la date, du poste comptable, des montants...' where me_c=
ode=3D'SEARCH' ;
  update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations un menu de recherche, vous permettra de retrouver rapidem=
ent l''op=C3=A9ration qui vous int=C3=A9resse' where me_code=3D'HIST' ;



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


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

Author: danydb
Date: 2013-10-19 15:23:30 +0200 (Sat, 19 Oct 2013)
New Revision: 5508

Modified:
   phpcompta/trunk/include/class_html_input.php
Log:
Card_detail without history

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-10-19 13:06:49 UTC =
(rev 5507)
+++ phpcompta/trunk/include/class_html_input.php	2013-10-19 13:23:30 UTC =
(rev 5508)
@@ -456,12 +456,13 @@
     /**
      *show the detail of a card
      */
-    static function card_detail($p_qcode,$pname=3D'',$p_style=3D"")
+    static function card_detail($p_qcode,$pname=3D'',$p_style=3D"",$p_no=
history=3Dfalse)
     {
       //if ($pname=3D=3D'')$pname=3D$p_qcode;
       $r=3D"";
-      $r.=3Dsprintf('<a href=3D"javascript:void(0)" %s onclick=3D"fill_i=
popcard({qcode:\'%s\'})">%s [%s]</a>',
-		  $p_style,$p_qcode,$pname,$p_qcode);
+      $histo=3D($p_nohistory=3D=3Dtrue)?' ,nohistory:1':"";
+      $r.=3Dsprintf('<a href=3D"javascript:void(0)" %s onclick=3D"fill_i=
popcard({qcode:\'%s\' %s})">%s [%s]</a>',
+		  $p_style,$p_qcode,$histo,$pname,$p_qcode);
       return $r;
     }
     /**



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


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

Author: danydb
Date: 2013-10-19 15:23:51 +0200 (Sat, 19 Oct 2013)
New Revision: 5509

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
Log:
improve me_description_etendu for stock

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade107.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-19 13:23:=
30 UTC (rev 5508)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade107.sql	2013-10-19 13:23:=
51 UTC (rev 5509)
@@ -193,10 +193,7 @@
 values
 ('CFGTAG','PARAM',1,390,'E',0);
=20
-update fiche_def set    fd_label=3D'Tr=C3=A9sorerie' where fd_id=3D3;
 update fiche_def_ref set    frd_text=3D'Tr=C3=A9sorerie' where frd_id=3D=
4;
-update jrn_def set jrn_def_name=3D'Tr=C3=A9sorerie' where jrn_def_id=3D1=
;
-update jrn_type set jrn_desc =3D 'Tr=C3=A9sorerie' where jrn_type_id=3D'=
FIN';
=20
 CREATE OR REPLACE FUNCTION comptaproc.insert_quick_code(nf_id integer, t=
av_text text)
   RETURNS integer AS



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


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

Author: danydb
Date: 2013-10-19 15:24:09 +0200 (Sat, 19 Oct 2013)
New Revision: 5510

Modified:
   phpcompta/trunk/include/template/stock_histo.php
   phpcompta/trunk/include/template/stock_inv.php
   phpcompta/trunk/include/template/stock_summary_list.php
   phpcompta/trunk/include/template/stock_summary_table.php
Log:
Improve stock : remove history

Modified: phpcompta/trunk/include/template/stock_histo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_histo.php	2013-10-19 13:23:51 =
UTC (rev 5509)
+++ phpcompta/trunk/include/template/stock_histo.php	2013-10-19 13:24:09 =
UTC (rev 5510)
@@ -53,7 +53,7 @@
 			<?php echo $row['cdate']?>
 		</td>
 		<td>
-			<?php echo HtmlInput::card_detail($row['sg_code'],"",' class=3D"line"=
 ')?>
+			<?php echo HtmlInput::card_detail($row['sg_code'],"",' class=3D"line"=
 ',true)?>
 		</td>
 		<td>
 			<?php echo $row['r_name']?>

Modified: phpcompta/trunk/include/template/stock_inv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_inv.php	2013-10-19 13:23:51 UT=
C (rev 5509)
+++ phpcompta/trunk/include/template/stock_inv.php	2013-10-19 13:24:09 UT=
C (rev 5510)
@@ -76,7 +76,7 @@
 			<?php echo $sg_code[$i]->search()?>
 			<?php echo $label[$i]->input()?>
 <?php else: ?>
-			<?php if ( trim($sg_code[$i]->value) !=3D "")  echo HtmlInput::card_d=
etail($sg_code[$i]->value,h($sg_code[$i]->value),' class=3D"line"')?>
+			<?php if ( trim($sg_code[$i]->value) !=3D "")  echo HtmlInput::card_d=
etail($sg_code[$i]->value,h($sg_code[$i]->value),' class=3D"line"',true)?=
>
 <?php endif ?>
=20
 		</td>

Modified: phpcompta/trunk/include/template/stock_summary_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_summary_list.php	2013-10-19 13=
:23:51 UTC (rev 5509)
+++ phpcompta/trunk/include/template/stock_summary_list.php	2013-10-19 13=
:24:09 UTC (rev 5510)
@@ -75,7 +75,7 @@
 	?>
 	<tr>
 		<td>
-			<?php echo HtmlInput::card_detail($a_stock[$s]['sg_code'])?>
+			<?php echo HtmlInput::card_detail($a_stock[$s]['sg_code'],'','',true)=
?>
 		</td>
 		<td>
 			<?php=20

Modified: phpcompta/trunk/include/template/stock_summary_table.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_summary_table.php	2013-10-19 1=
3:23:51 UTC (rev 5509)
+++ phpcompta/trunk/include/template/stock_summary_table.php	2013-10-19 1=
3:24:09 UTC (rev 5510)
@@ -48,7 +48,7 @@
=20
 		<tr <?php echo $class?> >
 			<td>
-				<?php echo HtmlInput::card_detail($a_code[$x]['sg_code'])?>
+				<?php echo HtmlInput::card_detail($a_code[$x]['sg_code'],"","",true)=
?>
 			</td>
 			<?php=20
 			$n_in=3D0;$n_out=3D0;



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


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

Author: danydb
Date: 2013-10-19 15:44:24 +0200 (Sat, 19 Oct 2013)
New Revision: 5511

Modified:
   phpcompta/trunk/include/stock_inv_histo.inc.php
Log:
Remove button in table

Modified: phpcompta/trunk/include/stock_inv_histo.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/stock_inv_histo.inc.php	2013-10-19 13:24:09 U=
TC (rev 5510)
+++ phpcompta/trunk/include/stock_inv_histo.inc.php	2013-10-19 13:44:24 U=
TC (rev 5511)
@@ -88,7 +88,7 @@
 			<?php echo $a_change[$e]['tech_user']?>
 		</td>
 		<td>
-			<?php echo HtmlInput::button_action("D=C3=A9tail",sprintf("stock_inv_=
detail('%s','%s')",$gDossier,$a_change[$e]['c_id']));?>
+			<?php echo HtmlInput::anchor("D=C3=A9tail","javascript:void()",sprint=
f("onclick=3D\"stock_inv_detail('%s','%s')\"",$gDossier,$a_change[$e]['c_=
id']));?>
 		</td>
=20
 	</tr>



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


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

Author: danydb
Date: 2013-10-19 16:53:49 +0200 (Sat, 19 Oct 2013)
New Revision: 5512

Modified:
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/ajax_view_mod_stock.php
   phpcompta/trunk/include/class_stock_goods.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/template/stock_inv.php
Log:
Unlimited stock code
Fix bug in STOCK_INV
Set MAX_ARTICLE_STOCK
Add button to add a row

Modified: phpcompta/trunk/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/scripts.js	2013-10-19 13:44:24 UTC (rev 5511)
+++ phpcompta/trunk/html/js/scripts.js	2013-10-19 14:53:49 UTC (rev 5512)
@@ -2353,3 +2353,40 @@
  =20
    =20
 }
+/**
+ * @brief add a line in the form for the stock
+ */
+function stock_add_row()
+{
+	try{
+    style=3D'class=3D"input_text"';
+    var mytable=3Dg("stock_tb").tBodies[0];
+    var ofirstRow=3Dmytable.rows[1];
+    var line=3Dmytable.rows.length;
+    var nCell=3Dmytable.rows[1].cells.length;
+    var row=3Dmytable.insertRow(line);
+    var nb=3Dg("row");
+    for (var e=3D0;e<nCell;e++)
+    {
+        var newCell=3Drow.insertCell(e);
+        if (mytable.rows[1].cells[e].hasClassName('num') ) { newCell.add=
ClassName("num");}
+       =20
+        var tt=3DofirstRow.cells[e].innerHTML;
+        var new_tt=3Dtt.replace(/sg_code0/g,"sg_code"+nb.value);
+        new_tt=3Dnew_tt.replace(/sg_quantity0/g,"sg_quantity"+nb.value);
+        new_tt=3Dnew_tt.replace(/label0/g,"label"+nb.value);
+        newCell.innerHTML=3Dnew_tt;
+        new_tt.evalScripts();
+    }
+
+    g("sg_code"+nb.value).innerHTML=3D'&nbsp;';
+    g("sg_code"+nb.value).value=3D'';
+    g("label"+nb.value).innerHTML=3D'';
+    g("sg_quantity"+nb.value).value=3D'0';
+
+    nb.value++;
+
+    new_tt.evalScripts();
+	} catch(e) {alert(e.message);}
+
+}
\ No newline at end of file

Modified: phpcompta/trunk/include/ajax_view_mod_stock.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_view_mod_stock.php	2013-10-19 13:44:24 U=
TC (rev 5511)
+++ phpcompta/trunk/include/ajax_view_mod_stock.php	2013-10-19 14:53:49 U=
TC (rev 5512)
@@ -42,7 +42,7 @@
 	$p_array['sg_code'.$i]=3D$array[$i]['sg_code'];
 	$p_array['sg_quantity'.$i]=3D$array[$i]['sg_quantity'];
 	$p_array['sg_type'.$i]=3D$array[$i]['sg_type'];
-
+        $p_array['row']=3D$i+1;
 }
 echo $st->input($p_array,true);
 ?>

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-10-19 13:44:24 UTC=
 (rev 5511)
+++ phpcompta/trunk/include/class_stock_goods.php	2013-10-19 14:53:49 UTC=
 (rev 5512)
@@ -75,10 +75,20 @@
 			exit();
 		}
 		$idepo->selected =3D $p_depot;
-		for ($e =3D 0; $e < MAX_ARTICLE; $e++)
+                if ($p_readonly ) {
+                    $nb=3D$row;
+                } else {
+                    if (isset ($row ) )
+                    {
+                        $nb=3D($row > MAX_ARTICLE_STOCK)?$row:MAX_ARTICL=
E_STOCK;
+                    }else {
+                        $nb=3DMAX_ARTICLE_STOCK;
+                    }
+                }
+		for ($e =3D 0; $e < $nb; $e++)
 		{//ATTR_DEF_STOCKfiche_
 			$sg_code[$e] =3D new ICard('sg_code' . $e);
-			$sg_code[$e]->extra =3D "[sql]  f_id in (select distinct f_id from fi=
che_Detail where ad_id=3D19 and coalesce(ad_value,\'\') <> \'\')";
+			$sg_code[$e]->extra =3D "[sql]  fd_id =3D 500000";
 			$sg_code[$e]->set_attribute("typecard", $sg_code[$e]->extra);
 			$sg_code[$e]->set_attribute("label", "label" . $e);
 			$sg_code[$e]->value =3D (isset(${'sg_code' . $e})) ? ${'sg_code' . $e=
} : '';
@@ -109,7 +119,7 @@
 			if (isDate($p_array['p_date']) =3D=3D null)
 				throw new Exception('Date invalide');
 			$cn->start();
-			$ch =3D new Stock_Change_Sql();
+			$ch =3D new Stock_Change_Sql($cn);
 			$ch->setp("c_comment", $p_array['p_motif']);
 			$ch->setp("r_id", $p_array['p_depot']);
 			$ch->setp("c_date", $p_array['p_date']);
@@ -118,10 +128,10 @@
 			$per =3D new Periode($cn);
 			$periode =3D $per->find_periode($p_array['p_date']);
 			$exercice =3D $per->get_exercice($periode);
-
-			for ($i =3D 0; $i < MAX_ARTICLE; $i++)
+                        $nb=3D$p_array['row'];
+			for ($i =3D 0; $i < $nb; $i++)
 			{
-				$a =3D new Stock_Goods_Sql();
+				$a =3D new Stock_Goods_Sql($cn);
 				if ($p_array['sg_quantity' . $i] !=3D 0 &&
 						trim($p_array['sg_code' . $i]) !=3D '')
 				{

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-10-19 13:44:24 UTC (rev 551=
1)
+++ phpcompta/trunk/include/constant.php	2013-10-19 14:53:49 UTC (rev 551=
2)
@@ -78,6 +78,7 @@
=20
 define ("MAX_COMPTE",4);
 define ('MAX_ARTICLE',5);
+define ('MAX_ARTICLE_STOCK',20);
 define ('MAX_CAT',15);
 define ('MAX_CARD_SEARCH',550);
 define ('MAX_FORECAST_ITEM',10);

Modified: phpcompta/trunk/include/template/stock_inv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_inv.php	2013-10-19 13:44:24 UT=
C (rev 5511)
+++ phpcompta/trunk/include/template/stock_inv.php	2013-10-19 14:53:49 UT=
C (rev 5512)
@@ -54,7 +54,7 @@
 		</td>
 	</tr>
 </table>
-<table style=3D"width: 80%">
+<table id=3D"stock_tb" style=3D"width: 80%">
 	<tr>
 		<th style=3D"text-align: left">
 			Code Stock
@@ -68,7 +68,7 @@
 			Quantit=C3=A9
 		</th>
 	</tr>
-<?php for($i=3D0;$i<MAX_ARTICLE;$i++): ?>
+<?php for($i=3D0;$i<$nb;$i++): ?>
 	<tr>
 		<td>
 <?php if ( $p_readonly =3D=3D false) : ?>
@@ -86,9 +86,9 @@
 		</td>
 <?php endif;?>
 		<TD class=3D"num"">
-			<?php if ($sg_quantity[$i]->value=3D=3D0 && $p_readonly=3D=3Dtrue):?>
+		<?php if ($sg_quantity[$i]->value=3D=3D0 && $p_readonly=3D=3Dtrue):?>
=20
-			<?php else : ?>
+		<?php else : ?>
 			<?php echo $sg_quantity[$i]->input()?>
 			<?php endif;?>
 		</td>
@@ -100,6 +100,8 @@
 	</tr>
 <?php endfor; ?>
 </table>
+<?php if ($p_readonly =3D=3D false) echo HtmlInput::button_action('Ajout=
er une ligne','stock_add_row();')?>
 <?php if ($p_readonly =3D=3D false) echo HtmlInput::submit('save','Sauve=
r')?>
+<?php if ($p_readonly =3D=3D false) echo HtmlInput::hidden('row',$nb)?>
 	</form>
 </div>
\ No newline at end of file



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


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

Author: danydb
Date: 2013-10-19 16:58:12 +0200 (Sat, 19 Oct 2013)
New Revision: 5513

Modified:
   phpcompta/trunk/include/template/stock_inv.php
Log:
Print the inventaire

Modified: phpcompta/trunk/include/template/stock_inv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/stock_inv.php	2013-10-19 14:53:49 UT=
C (rev 5512)
+++ phpcompta/trunk/include/template/stock_inv.php	2013-10-19 14:58:12 UT=
C (rev 5513)
@@ -28,7 +28,7 @@
  */
 ?>
 <div class=3D"content">
-	<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
+	<form method=3D"POST" class=3D"print" onsubmit=3D"return confirm('Vous =
confirmez ?')">
 <table>
 	<tr><td>
 			Date



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


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

Author: danydb
Date: 2013-10-19 21:48:39 +0200 (Sat, 19 Oct 2013)
New Revision: 5514

Modified:
   phpcompta/trunk/include/class_html_input.php
Log:
Fix bug : array not set

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-10-19 14:58:12 UTC =
(rev 5513)
+++ phpcompta/trunk/include/class_html_input.php	2013-10-19 19:48:39 UTC =
(rev 5514)
@@ -483,8 +483,12 @@
           if (is_array($global_array[$a]) =3D=3D false ) {
                 $r.=3DHtmlInput::hidden($a,$global_array [$a]);
               } else {
-                  for ($i=3D0;$i<count($global_array[$a]);$i++) {
-                      $r.=3DHtmlInput::hidden($a."[]",$global_array [$a]=
[$i]);
+                  if (count($global_array[$a]) > 0)
+                  {
+                      foreach ($global_array[$a] as $value)
+                      {
+                          $r.=3DHtmlInput::hidden($a."[]",$value);
+                    }
                   }
               }
 	}



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


From MAILER-DAEMON Sat Oct 19 16:03:29 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VXckD-0002TL-JC
	for mharc-phpcompta-dev@gnu.org; Sat, 19 Oct 2013 16:03:29 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 19 Oct 2013 21:53:10 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.76165.1382213009.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5515 - phpcompta/trunk/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Oct 2013 20:03:28 -0000

Author: danydb
Date: 2013-10-19 21:53:10 +0200 (Sat, 19 Oct 2013)
New Revision: 5515

Added:
   phpcompta/trunk/sql/3-stock-col-change.sql
Log:
Change col. type because to_char does not work with timezone

Added: phpcompta/trunk/sql/3-stock-col-change.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/3-stock-col-change.sql	                        (r=
ev 0)
+++ phpcompta/trunk/sql/3-stock-col-change.sql	2013-10-19 19:53:10 UTC (r=
ev 5515)
@@ -0,0 +1 @@
+alter table stock_change alter tech_date type time;



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


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

Author: danydb
Date: 2013-10-19 22:22:02 +0200 (Sat, 19 Oct 2013)
New Revision: 5516

Modified:
   phpcompta/trunk/include/export_ledger_csv.php
   phpcompta/trunk/include/impress_rec.inc.php
   phpcompta/trunk/include/template/print_ledger_simple.php
Log:
Add reconcilied operation

Modified: phpcompta/trunk/include/export_ledger_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_ledger_csv.php	2013-10-19 19:53:10 UTC=
 (rev 5515)
+++ phpcompta/trunk/include/export_ledger_csv.php	2013-10-19 20:22:02 UTC=
 (rev 5516)
@@ -135,7 +135,7 @@
     }
     exit;
 }
-else if  ($_GET['p_simple'] =3D=3D 0)
+else if  ($_GET['p_simple'] =3D=3D 1)
 {
     $Row=3D$Jrn->get_rowSimple($_GET['from_periode'],
                              $_GET['to_periode'],
@@ -183,6 +183,8 @@
 //-----------------------------------------------------
     if ( $jrn_type=3D=3D'ACH' || $jrn_type=3D=3D'VEN')
     {
+        $cn->prepare('reconcile_date',"select to_char(jr_date,'DD.MM.YY'=
) as str_date,* from jrn where jr_id in (select jra_concerned from jrn_ra=
pt where jr_id =3D $1 union all select jr_id from jrn_rapt where jra_conc=
erned=3D$1)");
+
         $own=3Dnew Own($cn);
         $col_tva=3D"";
=20
@@ -194,7 +196,7 @@
                 $col_tva.=3D'"Tva '.$line_tva['tva_label'].'";';
             }
         }
-        echo '"Date";"operation";"Client/Fourn.";"Commentaire";"inter.";=
"HTVA";priv=C3=A9;DNA;tva non ded.;'.$col_tva.'"TVAC"'."\n\r";
+        echo '"Date";"operation";"Client/Fourn.";"Commentaire";"inter.";=
"HTVA";priv=C3=A9;DNA;tva non ded.;op=C3=A9rations li=C3=A9es'.$col_tva.'=
"TVAC"'."\n\r";
         foreach ($Row as $line)
         {
             printf('"%s";"%s";"%s";"%s";"%s";%s;%s;%s;%s;',
@@ -233,6 +235,18 @@
                 }
             }
             echo nb ($line['TVAC']);
+            /**
+             * Retrieve payment if any
+             */
+             $ret_reconcile=3D$cn->execute('reconcile_date',array($line[=
'jr_id']));
+             $max=3DDatabase::num_row($ret_reconcile);
+            if ($max > 0) {
+                $sep=3D";";
+                for ($e=3D0;$e<$max;$e++) {
+                    $row=3DDatabase::fetch_array($ret_reconcile, $e);
+                    echo $sep.$row['str_date'].'; '. $row['jr_internal']=
;
+                }
+            }
 	    printf("\r\n");
=20
         }

Modified: phpcompta/trunk/include/impress_rec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_rec.inc.php	2013-10-19 19:53:10 UTC (=
rev 5515)
+++ phpcompta/trunk/include/impress_rec.inc.php	2013-10-19 20:22:02 UTC (=
rev 5516)
@@ -52,7 +52,7 @@
 $dend=3Dnew IDate('p_end');
 $dend->value=3D(isset($_REQUEST['p_end']))?$_REQUEST['p_end']:$end;
=20
-echo "Depuis ".$dstart->input()." jusque ".$dend->input();
+echo "Op=C3=A9rations entre ".$dstart->input()." jusque ".$dend->input()=
;
 echo '<ol style=3D"list-style-type:none;">';
=20
 $radio->selected=3D($choice=3D=3D0)?true:false;

Modified: phpcompta/trunk/include/template/print_ledger_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/print_ledger_simple.php	2013-10-19 1=
9:53:10 UTC (rev 5515)
+++ phpcompta/trunk/include/template/print_ledger_simple.php	2013-10-19 2=
0:22:02 UTC (rev 5516)
@@ -9,6 +9,7 @@
         <th style=3D"text-align:right">Priv=C3=A9</th>
         <th style=3D"text-align:right">DNA</th>
         <th style=3D"text-align:right">TVA ND</th>
+       =20
 <?php
 $col_tva=3D"";
=20
@@ -23,11 +24,18 @@
 echo $col_tva;     =20
 ?>
         <th style=3D"text-align:right">TVAC</th>
+        <th>Op=C3=A9rations rapproch=C3=A9es</th>
     </tr>
 <?php
 $i =3D 0;
+$cn->prepare('reconcile_date','select * from jrn where jr_id in (select =
jra_concerned from jrn_rapt where jr_id =3D $1 union all select jr_id fro=
m jrn_rapt where jra_concerned=3D$1)');
 foreach ($Row as $line) {
     $i++;
+    /*
+     * Get date of reconcile operation
+     */
+    $ret_reconcile=3D$cn->execute('reconcile_date',array($line['jr_id'])=
);
+  =20
     $class =3D ($i % 2 =3D=3D 0) ? ' class=3D"even" ' : ' class=3D"odd" =
';
     echo "<tr $class>";
     echo "<TD>" . smaller_date($line['date']) . "</TD>";
@@ -68,6 +76,20 @@
                     }
     }
     echo '<td class=3D"num">'.$line['TVAC'].'</td>';
+    /*
+     * If reconcile print them
+     */
+    echo '<td>';
+    $max=3DDatabase::num_row($ret_reconcile);
+    if ($max > 0) {
+        $sep=3D"";
+        for ($e=3D0;$e<$max;$e++) {
+            $row=3DDatabase::fetch_array($ret_reconcile, $e);
+            echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date']=
.' '. $row['jr_internal']);
+            $sep=3D' ,';
+        }
+    }
+    echo '</td>';
     echo "</tr>";
 }
 ?>



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


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

Author: danydb
Date: 2013-10-19 22:28:13 +0200 (Sat, 19 Oct 2013)
New Revision: 5517

Modified:
   phpcompta/trunk/html/js/infobulle.js
Log:
esthetic

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-10-19 20:22:02 UTC (rev 551=
6)
+++ phpcompta/trunk/html/js/infobulle.js	2013-10-19 20:28:13 UTC (rev 551=
7)
@@ -59,7 +59,7 @@
 content[29]=3D"Si vous ne donnez pas de nom, ce sera le nom du fichier q=
ui sera utilis=C3=A9";
 content[30]=3D"Peut contenir une information telle que le message struct=
ur=C3=A9 sur le virement";
 content[31]=3D"Peut contenir un num=C3=A9ro de bon de commande";
-content[32]=3D'<h3>        Remarque  : choix possibles    </h3>    <ul> =
       <li> D=C3=A9tail op=C3=A9rations ne donne pas le m=C3=AAme r=C3=A9=
sultat si on regarde tous les journaux ou un journal de type ACH ou VEN</=
li>        <li> Liste op=C3=A9rations ne donne pas le m=C3=AAme r=C3=A9su=
ltat si on regarde tous les journaux ou un journal de type ACH ou VEN</li=
>        <li> Journaux VEN ou ACH en mode "d=C3=A9tail op=C3=A9rations" d=
onne les d=C3=A9tails des factures, y compris les montants, TVA et quanti=
t=C3=A9 par article</li>        <li> Journaux VEN ou ACH en mode "liste o=
p=C3=A9rations" donne pour chaque op=C3=A9ration, le total de la TVA, ND,=
 ...</li>    </ul>';
+content[32]=3D'<h3>        Remarque  : choix possibles    </h3>    <ul s=
tyle=3D"padding-left:15px">        <li> D=C3=A9tail op=C3=A9rations ne do=
nne pas le m=C3=AAme r=C3=A9sultat si on regarde tous les journaux ou un =
journal de type ACH ou VEN</li>        <li> Liste op=C3=A9rations ne donn=
e pas le m=C3=AAme r=C3=A9sultat si on regarde tous les journaux ou un jo=
urnal de type ACH ou VEN</li>        <li> Journaux VEN ou ACH en mode "d=C3=
=A9tail op=C3=A9rations" donne les d=C3=A9tails des factures, y compris l=
es montants, TVA et quantit=C3=A9 par article</li>        <li> Journaux V=
EN ou ACH en mode "liste op=C3=A9rations" donne pour chaque op=C3=A9ratio=
n, le total de la TVA, ND, ...</li>    </ul>';
 content[33]=3D'le type vaut :<ul>	<li> ME pour Menu</li>	<li> PR pour le=
s impressions </li>	<li> PL pour les plugins</li>	<li> SP pour des valeur=
s sp=C3=A9ciales</li>	</ul>';
 content[34]=3D'Cliquez sur le code AD pour ouvrir le menu dans un nouvel=
 onglet';
 content[35]=3D'Cliquez sur le chemin pour ouvrir le menu';



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


From MAILER-DAEMON Sun Oct 20 15:23:52 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VXybQ-00069v-09
	for mharc-phpcompta-dev@gnu.org; Sun, 20 Oct 2013 15:23:52 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 20 Oct 2013 21:13:27 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.76564.1382297031.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5518 - in phpcompta/trunk: html include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Oct 2013 19:23:50 -0000

Author: danydb
Date: 2013-10-20 21:13:26 +0200 (Sun, 20 Oct 2013)
New Revision: 5518

Modified:
   phpcompta/trunk/html/ajax_ledger.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_operation.php
   phpcompta/trunk/include/class_acc_reconciliation.php
   phpcompta/trunk/include/export_histo_csv.php
   phpcompta/trunk/include/export_ledger_csv.php
   phpcompta/trunk/include/template/ledger_detail_ach.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
   phpcompta/trunk/include/template/print_ledger_simple.php
Log:
task #0000900: Ajout d'une date de paiement

Modified: phpcompta/trunk/html/ajax_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_ledger.php	2013-10-19 20:28:13 UTC (rev 551=
7)
+++ phpcompta/trunk/html/ajax_ledger.php	2013-10-20 19:13:26 UTC (rev 551=
8)
@@ -405,6 +405,24 @@
=20
 		}
 	    }
+           =20
+	  if (isset($_POST['p_date_paid']) )
+	    {
+	      $ech=3D$_POST['p_date_paid'];
+	      if ( trim($ech) !=3D '' && isDate($ech) !=3D null)
+		{
+		  $cn->exec_sql("update jrn set jr_date_paid=3Dto_date($1,'DD.MM.YYYY'=
) where jr_id=3D$2",
+				array($ech,$jr_id));
+
+		}
+	      else
+		{
+		  $cn->exec_sql("update jrn set jr_date_paid=3Dnull where jr_id=3D$1",
+				array($jr_id));
+
+		}
+	    }
+           =20
             $cn->exec_sql("update jrn set jr_comment=3D$1,jr_pj_number=3D=
$2,jr_date=3Dto_date($4,'DD.MM.YYYY') where jr_id=3D$3",
                           array($_POST['lib'],$_POST['npj'],$jr_id,$_POS=
T['p_date']));
 	    $cn->exec_sql("update jrnx set j_date=3Dto_date($1,'DD.MM.YYYY') wh=
ere j_grpt in (select jr_grpt_id from jrn where jr_id=3D$2)",

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-10-19 20:28:13 UTC =
(rev 5517)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-10-20 19:13:26 UTC =
(rev 5518)
@@ -538,6 +538,7 @@
              jrn.jr_montant as montant,
              substr(jrn.jr_comment,1,35) as comment,
              to_char(jrn.jr_date,'DD-MM-YYYY') as date,
+             to_char(jrn.jr_date_paid,'DD-MM-YYYY') as date_paid,
              jr_pj_number,
              jr_internal,
              jrn.jr_grpt_id as grpt_id,
@@ -815,6 +816,7 @@
 		$str_dossier =3D dossier::get();
 		$table->add("Date", $url, 'order by jr_date asc,substring(jr_pj_number=
,\'[0-9]+$\')::numeric asc', 'order by  jr_date desc,substring(jr_pj_numb=
er,\'[0-9]+$\')::numeric desc', "da", "dd");
 		$table->add('Echeance', $url, " order by  jr_ech asc", " order by  jr_=
ech desc", 'ea', 'ed');
+		$table->add('Paiement', $url, " order by  jr_date_paid asc", " order b=
y  jr_date_paid desc", 'eap', 'edp');
 		$table->add('PJ', $url, ' order by  substring(jr_pj_number,\'[0-9]+$\'=
)::numeric asc ', ' order by  substring(jr_pj_number,\'[0-9]+$\')::numeri=
c desc ', "pja", "pjd");
 		$table->add('Tiers', $url, " order by  name asc", " order by  name des=
c", 'na', 'nd');
 		$table->add('Montant', $url, " order by jr_montant asc", " order by jr=
_montant desc", "ma", "md");
@@ -854,9 +856,10 @@
 		$r.=3D'<th>' . $table->get_header(1) . '</td>';
 		$r.=3D'<th>' . $table->get_header(2) . '</th>';
 		$r.=3D'<th>' . $table->get_header(3) . '</th>';
+		$r.=3D'<th>' . $table->get_header(4) . '</th>';
+		$r.=3D'<th>' . $table->get_header(6) . '</th>';
+		$r.=3Dth('Notes', ' style=3D"width:15%"');
 		$r.=3D'<th>' . $table->get_header(5) . '</th>';
-		$r.=3Dth('Notes', ' style=3D"width:15%"');
-		$r.=3D'<th>' . $table->get_header(4) . '</th>';
 		// if $p_paid is not equal to 0 then we have a paid column
 		if ($p_paid !=3D 0)
 		{
@@ -894,12 +897,15 @@
 				$r.=3Dtd($row['jrn_def_name']);
 			// date
 			$r.=3D"<TD>";
-			$r.=3Dsmaller_date($row['str_jr_date']);
+			$r.=3D$row['str_jr_date'];
 			$r.=3D"</TD>";
 			// echeance
 			$r.=3D"<TD>";
-			$r.=3Dsmaller_date($row['str_jr_ech']);
+			$r.=3D$row['str_jr_ech'];
 			$r.=3D"</TD>";
+			$r.=3D"<TD>";
+			$r.=3D$row['str_jr_date_paid'];
+			$r.=3D"</TD>";
=20
 			// pj
 			$r.=3D"<TD>";
@@ -2544,8 +2550,8 @@
 		$sql =3D "select jr_id	,
              jr_montant,
              substr(jr_comment,1,60) as jr_comment,
-             to_char(jr_ech,'DD.MM.YYYY') as str_jr_ech,
-             to_char(jr_date,'DD.MM.YYYY') as str_jr_date,
+             to_char(jr_ech,'DD.MM.YY') as str_jr_ech,
+             to_char(jr_date,'DD.MM.YY') as str_jr_date,
              jr_date as jr_date_order,
              jr_grpt_id,
              jr_rapt,
@@ -2593,9 +2599,9 @@
 				 (select qp_internal,qp_price,qp_nd_tva,qp_nd_tva_recup,case when qp=
_vat_sided<>0 then 0 else qp_vat end as vat from quant_purchase where qp_=
internal=3DX.jr_internal) as invoice_purchase
 			)
 		else null
-		end as total_invoice
-
-
+		end as total_invoice,
+            jr_date_paid,
+            to_char(jr_date_paid,'DD.MM.YY') as str_jr_date_paid
              from
              jrn as X left join jrn_note using(jr_id)
              join jrn_def on jrn_def_id=3Djr_def_id

Modified: phpcompta/trunk/include/class_acc_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_operation.php	2013-10-19 20:28:13 U=
TC (rev 5517)
+++ phpcompta/trunk/include/class_acc_operation.php	2013-10-20 19:13:26 U=
TC (rev 5518)
@@ -44,6 +44,7 @@
     var $periode;			/*!< periode to use */
     var $amount;			/*!< amount of the operatoin */
     var $grpt;			/*!< the group id */
+    var $date_paid;
     /*!
      * \brief constructor set automatically the attributes user and peri=
ode
      * \param $p_cn the databse connection
@@ -591,7 +592,7 @@
         $sql=3D"SELECT jr_id, jr_def_id, jr_montant, jr_comment, jr_date=
, jr_grpt_id,
              jr_internal, jr_tech_date, jr_tech_per, jrn_ech, jr_ech, jr=
_rapt,jr_ech,
              jr_valid, jr_opid, jr_c_opid, jr_pj, jr_pj_name, jr_pj_type=
,
-             jr_pj_number, jr_mt,jr_rapt
+             jr_pj_number, jr_mt,jr_rapt,jr_date_paid
              FROM jrn where jr_id=3D$1";
         $array=3D$this->db->get_array($sql,array($this->jr_id));
         if ( count($array) =3D=3D 0 ) throw new Exception('Aucune ligne =
trouv=C3=A9e');

Modified: phpcompta/trunk/include/class_acc_reconciliation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_reconciliation.php	2013-10-19 20:28=
:13 UTC (rev 5517)
+++ phpcompta/trunk/include/class_acc_reconciliation.php	2013-10-20 19:13=
:26 UTC (rev 5518)
@@ -125,8 +125,26 @@
             // Ok we can insert
             $Res=3D$this->db->exec_sql("insert into jrn_rapt(jr_id,jra_c=
oncerned) values ".
                                     "(".$this->jr_id.",$jr_id2)");
-			// try to letter automatically same account from both operation
-			$this->auto_letter($jr_id2);
+            // try to letter automatically same account from both operat=
ion
+            $this->auto_letter($jr_id2);
+           =20
+            // update date of paiement ---------------------------------=
--------------------------------------
+            $source_type=3D$this->db->get_value("select substr(jr_intern=
al,1,1) from jrn where jr_id=3D$1",array($this->jr_id));
+            $dest_type=3D$this->db->get_value("select substr(jr_internal=
,1,1) from jrn where jr_id=3D$1",array($jr_id2));
+            if (($source_type =3D=3D'A' || $source_type=3D=3D'V') && ($d=
est_type !=3D 'A' && $dest_type !=3D 'V'))
+            {
+                // set the date on source
+                $date=3D$this->db->get_value('select jr_date from jrn wh=
ere jr_id=3D$1',array($jr_id2));
+                if ( trim ($date) =3D=3D '') $date=3Dnull;
+                $this->db->exec_sql('update jrn set jr_date_paid=3D$1 wh=
ere jr_id=3D$2 and jr_date_paid is null ',array($date,$this->jr_id));
+            }
+            if (($source_type !=3D'A' && $source_type !=3D'V') && ($dest=
_type =3D=3D 'A' || $dest_type =3D=3D 'V'))
+            {
+                // set the date on dest
+                $date=3D$this->db->get_value('select jr_date from jrn wh=
ere jr_id=3D$1',array($this->jr_id));
+                if (trim($date) =3D=3D '') $date=3Dnull;
+                $this->db->exec_sql('update jrn set jr_date_paid=3D$1 wh=
ere jr_id=3D$2 and jr_date_paid is null ',array($date,$jr_id2));
+            }
         }
         return true;
     }

Modified: phpcompta/trunk/include/export_histo_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_histo_csv.php	2013-10-19 20:28:13 UTC =
(rev 5517)
+++ phpcompta/trunk/include/export_histo_csv.php	2013-10-20 19:13:26 UTC =
(rev 5518)
@@ -39,6 +39,7 @@
 printf('"%s";',"Journal");
 printf('"%s";',"Date");
 printf('"%s";',"Echeance");
+printf('"%s";',"Paiement");
 printf('"%s";',"Piece");
 printf('"%s";',"Tiers");
 printf('"%s";',"Description");
@@ -52,6 +53,7 @@
     printf('"%s";',$res[$i]['jrn_def_name']);
     printf('"%s";',$res[$i]['str_jr_date']);
     printf('"%s";',$res[$i]['str_jr_ech']);
+    printf('"%s";',$res[$i]['str_jr_date_paid']);
     printf('"%s";',$res[$i]['jr_pj_number']);
     printf('"%s";',$res[$i]['quick_code']);
     printf('"%s %s";',$res[$i]['name'],$res[$i]['first_name']);

Modified: phpcompta/trunk/include/export_ledger_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_ledger_csv.php	2013-10-19 20:28:13 UTC=
 (rev 5517)
+++ phpcompta/trunk/include/export_ledger_csv.php	2013-10-20 19:13:26 UTC=
 (rev 5518)
@@ -196,11 +196,12 @@
                 $col_tva.=3D'"Tva '.$line_tva['tva_label'].'";';
             }
         }
-        echo '"Date";"operation";"Client/Fourn.";"Commentaire";"inter.";=
"HTVA";priv=C3=A9;DNA;tva non ded.;op=C3=A9rations li=C3=A9es'.$col_tva.'=
"TVAC"'."\n\r";
+        echo '"Date";"Paiement";"operation";"Client/Fourn.";"Commentaire=
";"inter.";"HTVA";priv=C3=A9;DNA;tva non ded.;op=C3=A9rations li=C3=A9es'=
.$col_tva.'"TVAC"'."\n\r";
         foreach ($Row as $line)
         {
             printf('"%s";"%s";"%s";"%s";"%s";%s;%s;%s;%s;',
                    $line['date'],
+                   $line['date_paid'],
                    $line['num'],
                    $Jrn->get_tiers($line['jrn_def_type'],$line['jr_id'])=
,
                    $line['comment'],

Modified: phpcompta/trunk/include/template/ledger_detail_ach.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_ach.php	2013-10-19 20:=
28:13 UTC (rev 5517)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php	2013-10-20 19:=
13:26 UTC (rev 5518)
@@ -1,297 +1,316 @@
 <?php require_once('template/ledger_detail_top.php'); ?>
 <div class=3D"content" style=3D"padding:0;">
-<?php=20
-  require_once('class_own.php');
-  $owner=3Dnew Own($cn);
-?>
+    <?php
+    require_once('class_own.php');
+    $owner =3D new Own($cn);
+    ?>
=20
-    <?php if ( $access=3D=3D'W') : ?>
-<form  class=3D"print" onsubmit=3D"return op_save(this);">
-   <?php endif; ?>
+    <?php if ($access =3D=3D 'W') : ?>
+        <form  class=3D"print" onsubmit=3D"return op_save(this);">
+        <?php endif; ?>
=20
-    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
-    <table style=3D"width:100%">
-    <tr><td>
-							<table>
-							<tr><td>
-							<?php
-							$date=3Dnew IDate('p_date');
-							$date->value=3Dformat_date($obj->det->jr_date);
-							 echo td('Date').td($date->input());
+        <?php echo HtmlInput::hidden('whatdiv', $div) . HtmlInput::hidde=
n('jr_id', $jr_id) . dossier::hidden(); ?>
+        <table style=3D"width:100%">
+            <tr><td>
+                    <table>
+                            <td></td>
+                        <?php
+                        $date =3D new IDate('p_date');
+                        $date->value =3D format_date($obj->det->jr_date)=
;
+                        echo td('Date') . td($date->input());
+                        ?>
+                        <tr>
+                            <td></td>
+                            <?php
+                            $date_ech =3D new IDate('p_ech');
+                            $date_ech->value =3D format_date($obj->det->=
jr_ech);
+                            echo td('Echeance') . td($date_ech->input())=
;
+                            ?>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td>
+                                Date paiement
+                            </td>
+                            <td>
+                                <?php
+                                $date_paid =3D new IDate('p_date_paid');
+                                $date_paid->value =3D format_date($obj->=
det->jr_date_paid);
+                                echo $date_paid->input();
+                                ?>
+                            </td>
+                        </tr>
=20
-							 ?>
-							</td>
-							<tr>
-							<td>
-							<?php
-							$date_ech=3Dnew IDate('p_ech');
-							$date_ech->value=3Dformat_date($obj->det->jr_ech);
-							 echo td('Echeance').td($date_ech->input());
+                        <tr><td>
+                                <?php
+                                $bk =3D new Fiche($cn, $obj->det->array[=
0]['qp_supplier']);
+                                echo td(_('Fournisseur'));
=20
-							 ?>
-							</td>
-							</tr>
+                                $view_card_detail =3D HtmlInput::card_de=
tail($bk->get_quick_code(), h($bk->getName()), ' class=3D"line" ');
+                                echo td($view_card_detail);
+                                ?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <?php
+                                $itext =3D new IText('npj');
+                                $itext->value =3D strip_tags($obj->det->=
jr_pj_number);
+                                echo td(_('Pi=C3=A8ce')) . td($itext->in=
put());
+                                ?>
+                            </td>
+                        <tr>
+                            <td>
+                                <?php
+                                $itext =3D new IText('lib');
+                                $itext->value =3D strip_tags($obj->det->=
jr_comment);
+                                $itext->size =3D 40;
+                                echo td(_('Libell=C3=A9')) . td($itext->=
input(), ' colspan=3D"2" ');
+                                ?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td>Pay=C3=A9</td>
+                            <td>
+                                <?php
+                                $ipaid =3D new ICheckBox("ipaid", 'paid'=
);
+                                $ipaid->selected =3D ($obj->det->jr_rapt=
 =3D=3D 'paid');
+                                echo $ipaid->input();
+                                ?>
+                            </td>
+                        </tr>
=20
-							<tr><td>
-							<?php=20
-							$bk=3Dnew Fiche($cn,$obj->det->array[0]['qp_supplier']);
-							echo td(_('Fournisseur'));
+                    </table>
+                </td><td>
+                    <table style=3D"border:solid 1px yellow">
+                        <tr>
+                            <td>
+                                Note
+                            </td></tr>
+                        <tr>
+                            <td>
+                                <?php
+                                $inote =3D new ITextarea('jrn_note');
+                                $inote->width =3D 25;
+                                $inote->heigh =3D 5;
+                                $inote->value =3D strip_tags($obj->det->=
note);
+                                echo $inote->input();
+                                ?>
=20
-							$view_card_detail=3DHtmlInput::card_detail($bk->get_quick_code(),=
h($bk->getName()), ' class=3D"line" ');
-							echo td($view_card_detail);
-							?>
-							</td>
-							</tr>
-							<tr>
-							<td>
-							<?php=20
-							$itext=3Dnew IText('npj');
-							$itext->value=3Dstrip_tags($obj->det->jr_pj_number);
-							echo td(_('Pi=C3=A8ce')).td($itext->input());
-							?>
-							</td>
-							<tr>
-							<td>
-							<?php=20
-							  $itext=3Dnew IText('lib');
-							  $itext->value=3Dstrip_tags($obj->det->jr_comment);
-							  $itext->size=3D40;
-							echo td(_('Libell=C3=A9')).td($itext->input(),' colspan=3D"2" ');
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
=20
+        </table>
+        <div class=3D"myfieldset">
+            <h1 class=3D"legend"><?php echo _('D=C3=A9tail') ?></h1>
+            <table class=3D"result">
+                <?php
+                bcscale(2);
+                $total_htva =3D 0;
+                $total_tvac =3D 0;
+                echo th(_('Quick Code'));
+                echo th(_('Description'));
+                if ($owner->MY_TVA_USE =3D=3D 'Y')
+                {
+                    echo th(_('Taux TVA'), 'style=3D"text-align:right"')=
;
+                } else
+                {
+                    echo th('');
+                }
+                echo th(_('Prix/Un.'), 'style=3D"text-align:right"');
+                echo th(_('Quantit=C3=A9'), 'style=3D"text-align:right"'=
);
+                echo th(_('Non ded'), 'style=3D"text-align:right"');
=20
-							?>
-							</td>
-							</tr>
-                                                           <tr>
-															   <td></td>
-                                                            <td>Pay=C3=A9=
</td>
-                                                            <td>
-                                                                <?php=20
-                                                                $ipaid=3D=
new ICheckBox("ipaid",'paid');
-                                                                $ipaid->=
selected=3D($obj->det->jr_rapt=3D=3D'paid');
-                                                                echo $ip=
aid->input();
-                                                                ?>
-                                                            </td>
-                                                        </tr>
-				</table>
-				</td><td>
-				<table style=3D"border:solid 1px yellow">
-				<tr>
-				<td>
-					Note
-				</td></tr>
-				<tr>
-				<td>
-				<?php=20
-				$inote=3Dnew ITextarea('jrn_note');
-				$inote->width=3D25;
-				$inote->heigh=3D5;
-				$inote->value=3Dstrip_tags($obj->det->note);
-				echo $inote->input();
-				?>
+                if ($owner->MY_TVA_USE =3D=3D 'Y')
+                {
+                    echo th(_('HTVA'), 'style=3D"text-align:right"');
+                    echo th(_('TVA'), 'style=3D"text-align:right"');
+                    echo th(_('TVAC'), 'style=3D"text-align:right"');
+                } else
+                    echo th(_('Total'), 'style=3D"text-align:right"');
=20
-				</td>
-				</tr>
-				</table>
-				</td>
-				</tr>
+                if ($owner->MY_ANALYTIC !=3D 'nu' && $div =3D=3D 'popup'=
)
+                {
+                    $anc =3D new Anc_Plan($cn);
+                    $a_anc =3D $anc->get_list(' order by pa_id ');
+                    $x =3D count($a_anc);
+                    /* set the width of the col */
+                    echo '<th colspan=3D"' . $x . '">' . _('Compt. Analy=
tique') . '</th>';
=20
-</table>
-<div class=3D"myfieldset">
-	<h1 class=3D"legend"><?php echo _('D=C3=A9tail')?></h1>
-<table class=3D"result">
-<?php=20
-  bcscale(2);
-  $total_htva=3D0;$total_tvac=3D0;
-  echo th(_('Quick Code'));
-echo th(_('Description'));
-if ( $owner->MY_TVA_USE =3D=3D 'Y') {
-  echo th(_('Taux TVA'), 'style=3D"text-align:right"');
-} else {
-  echo th('');
-}
-echo th(_('Prix/Un.'), 'style=3D"text-align:right"');
-echo th(_('Quantit=C3=A9'), 'style=3D"text-align:right"');
-echo th(_('Non ded'), 'style=3D"text-align:right"');
+                    /* add hidden variables pa[] to hold the value of pa=
_id */
+                    echo Anc_Plan::hidden($a_anc);
+                }
+                echo '</tr>';
+                for ($e =3D 0; $e < count($obj->det->array); $e++)
+                {
+                    $row =3D '';
+                    $q =3D $obj->det->array[$e];
+                    $fiche =3D new Fiche($cn, $q['qp_fiche']);
+                    $view_card_detail =3D HtmlInput::card_detail($fiche-=
>strAttribut(ATTR_DEF_QUICKCODE), "", ' class=3D"line" ');
+                    $row =3D td($view_card_detail);
+                    $sym_tva =3D '';
=20
-if ( $owner->MY_TVA_USE =3D=3D 'Y') {
-  echo th(_('HTVA'), 'style=3D"text-align:right"');
-  echo th(_('TVA'), 'style=3D"text-align:right"');
-  echo th(_('TVAC'), 'style=3D"text-align:right"');
-}else
-  echo th(_('Total'), 'style=3D"text-align:right"');
+                    if ($owner->MY_TVA_USE =3D=3D 'Y' && $q['qp_vat_code=
'] !=3D '')
+                    {
+                        /* retrieve TVA symbol */
+                        $tva =3D new Acc_Tva($cn, $q['qp_vat_code']);
+                        $tva->load();
+                        $sym_tva =3D h($tva->get_parameter('label'));
+                    }
+                    if ($owner->MY_UPDLAB =3D=3D 'Y')
+                    {
+                        $l_lib =3D ($q['j_text'] =3D=3D '') ? $fiche->st=
rAttribut(ATTR_DEF_NAME) : $q['j_text'];
+                        $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id=
']);
+                        $input =3D new IText("e_march" . $q['j_id'] . "_=
label", $l_lib);
+                        $input->css_size =3D "100%";
+                    } else
+                    {
+                        $input =3D new ISpan("e_march" . $q['j_id'] . "_=
label");
+                        $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id=
']);
+                        $input->value =3D $fiche->strAttribut(ATTR_DEF_N=
AME);
+                    }
+                    $row.=3Dtd($input->input() . $hidden);
+                    $row.=3Dtd($sym_tva, 'style=3D"text-align:center"');
+                    $pu =3D 0;
+                    if ($q['qp_quantite'] !=3D 0)
+                        $pu =3D bcdiv($q['qp_price'], $q['qp_quantite'])=
;
+                    $row.=3Dtd(nbm($pu), 'class=3D"num"');
+                    $row.=3Dtd(nbm($q['qp_quantite']), 'class=3D"num"');
=20
-    if ($owner->MY_ANALYTIC !=3D 'nu' && $div=3D=3D'popup'){
-      $anc=3Dnew Anc_Plan($cn);
-      $a_anc=3D$anc->get_list(' order by pa_id ');
-      $x=3Dcount($a_anc);
-      /* set the width of the col */
-      echo '<th colspan=3D"'.$x.'">'._('Compt. Analytique').'</th>';
+                    $no_ded =3D bcadd($q['qp_dep_priv'], $q['qp_nd_amoun=
t']);
+                    $row.=3Dtd(nbm($no_ded), ' style=3D"text-align:right=
"');
+                    $htva =3D $q['qp_price'];
=20
-      /* add hidden variables pa[] to hold the value of pa_id */
-      echo Anc_Plan::hidden($a_anc);
-    }
-echo '</tr>';
-  for ($e=3D0;$e<count($obj->det->array);$e++) {
-    $row=3D'';
-    $q=3D$obj->det->array[$e];
-    $fiche=3Dnew Fiche($cn,$q['qp_fiche']);
-	$view_card_detail=3DHtmlInput::card_detail($fiche->strAttribut(ATTR_DEF=
_QUICKCODE),"", ' class=3D"line" ');
-   $row=3Dtd($view_card_detail);
-   $sym_tva=3D'';
=20
-   if ( $owner->MY_TVA_USE=3D=3D'Y' && $q['qp_vat_code'] !=3D '') {
-     /* retrieve TVA symbol */
-     $tva=3Dnew Acc_Tva($cn,$q['qp_vat_code']);
-     $tva->load();
-     $sym_tva=3Dh($tva->get_parameter('label'));
-   }
-   if ($owner->MY_UPDLAB =3D=3D 'Y')
-    {
-        $l_lib =3D ($q['j_text'] =3D=3D '') ? $fiche->strAttribut(ATTR_D=
EF_NAME) : $q['j_text'];
-        $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']);
-        $input =3D new IText("e_march" . $q['j_id'] . "_label", $l_lib);
-        $input->css_size=3D"100%";
-    }
-    else
-    {
-        $input =3D new ISpan("e_march" . $q['j_id'] . "_label");
-        $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']);
-        $input->value =3D $fiche->strAttribut(ATTR_DEF_NAME);
-    }
-    $row.=3Dtd($input->input().$hidden);
-    $row.=3Dtd($sym_tva,'style=3D"text-align:center"');
-	$pu=3D0;
-	if ( $q['qp_quantite'] !=3D 0 ) $pu=3Dbcdiv($q['qp_price'],$q['qp_quant=
ite']);
-    $row.=3Dtd(nbm($pu),'class=3D"num"');
-    $row.=3Dtd(nbm($q['qp_quantite']),'class=3D"num"');
+                    $row.=3Dtd(nbm($htva), 'class=3D"num"');
+                    $tvac =3D bcadd($htva, $q['qp_vat']);
+                    $tvac =3D bcadd($tvac, $q['qp_nd_tva']);
+                    $tvac =3D bcadd($tvac, $q['qp_nd_tva_recup']);
=20
-    $no_ded=3Dbcadd($q['qp_dep_priv'],$q['qp_nd_amount']);
-    $row.=3Dtd(nbm($no_ded),' style=3D"text-align:right"');
-    $htva=3D$q['qp_price'];
=20
+                    if ($owner->MY_TVA_USE =3D=3D 'Y')
+                    {
+                        $tva_amount =3D bcadd($q['qp_vat'], $q['qp_nd_tv=
a']);
+                        $tva_amount =3D bcadd($tva_amount, $q['qp_nd_tva=
_recup']);
+                        $class =3D "";
+                        if ($q['qp_vat_sided'] <> 0)
+                        {
+                            $class =3D ' style=3D"text-decoration:line-t=
hrough"';
+                            $tvac =3D bcsub($tvac, $q['qp_vat']);
+                        }
+                        $row.=3Dtd(nbm($tva_amount), 'class=3D"num" ' . =
$class);
+                        $row.=3Dtd(nbm($tvac), 'class=3D"num"');
+                    }
+                    $total_tvac+=3D$tvac;
+                    $total_htva+=3D$htva;
+                    /* Analytic accountancy */
+                    if ($owner->MY_ANALYTIC !=3D "nu" && $div =3D=3D 'po=
pup')
+                    {
+                        $poste =3D $fiche->strAttribut(ATTR_DEF_ACCOUNT)=
;
+                        if (preg_match('/^(6|7)/', $poste))
+                        {
+                            $anc_op =3D new Anc_Operation($cn);
+                            $anc_op->j_id =3D $q['j_id'];
+                            echo HtmlInput::hidden('op[]', $anc_op->j_id=
);
+                            /* compute total price */
+                            bcscale(2);
=20
-    $row.=3Dtd(nbm($htva),'class=3D"num"');
-    $tvac=3Dbcadd($htva,$q['qp_vat']);
-    $tvac=3Dbcadd($tvac,$q['qp_nd_tva']);
-    $tvac=3Dbcadd($tvac,$q['qp_nd_tva_recup']);
+                            $row.=3D$anc_op->display_table(1, $htva, $di=
v);
+                        } else
+                        {
+                            $row.=3Dtd('');
+                        }
+                    }
+                    echo tr($row);
+                }
+                if ($owner->MY_TVA_USE =3D=3D 'Y')
+                    $row =3D td(_('Total'), ' style=3D"font-style:italic=
;text-align:right;font-weight: bolder;width:auto" colspan=3D"6"');
+                else
+                    $row =3D td(_('Total'), ' style=3D"font-style:italic=
;text-align:right;font-weight: bolder;width:auto" colspan=3D"6"');
+                $row.=3Dtd(nbm($total_htva), 'class=3D"num" style=3D"fon=
t-style:italic;font-weight: bolder;"');
+                if ($owner->MY_TVA_USE =3D=3D 'Y')
+                    $row.=3Dtd("") . td(nbm($total_tvac), 'class=3D"num"=
 style=3D"font-style:italic;font-weight: bolder;"');
+                echo tr($row);
+                ?>
+            </table>
=20
=20
-    if ($owner->MY_TVA_USE=3D=3D'Y')
-      {
-		$tva_amount=3Dbcadd($q['qp_vat'],$q['qp_nd_tva']);
-		$tva_amount=3Dbcadd($tva_amount,$q['qp_nd_tva_recup']);
-		$class=3D"";
-		if ($q['qp_vat_sided']<>0) {
-			$class=3D' style=3D"text-decoration:line-through"';
-			$tvac=3Dbcsub($tvac,$q['qp_vat']);
-		}
-		$row.=3Dtd(nbm($tva_amount),'class=3D"num" '.$class);
-		$row.=3Dtd(nbm($tvac),'class=3D"num"');
-      }
-    $total_tvac+=3D$tvac;
-    $total_htva+=3D$htva;
-    /* Analytic accountancy */
-    if ( $owner->MY_ANALYTIC !=3D "nu" && $div =3D=3D 'popup'){
-      $poste=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT);
-      if ( preg_match('/^(6|7)/',$poste)) {
-	$anc_op=3Dnew Anc_Operation($cn);
-	$anc_op->j_id=3D$q['j_id'];
-	echo HtmlInput::hidden('op[]',$anc_op->j_id);
-	/* compute total price */
-	bcscale(2);
+        </div>
+        <div class=3D"myfieldset">
+            <h1 class=3D"legend"><?php echo _('Ecritures comptables') ?>=
</h1>
=20
-	$row.=3D$anc_op->display_table(1,$htva,$div);
=20
-      }  else {
-	$row.=3Dtd('');
-      }
-    }
-    echo tr($row);
+            <?php
+            /* if it is not in a popup, the details are hidden */
+            if ($div !=3D 'popup')
+            {
+                $ib =3D new IButton("a" . $div);
+                $ib->label =3D 'Afficher';
+                $ib->javascript =3D "g('detail_" . $div . "').style.disp=
lay=3D'block';g('a" . $div . "').style.display=3D'none';";
+                echo $ib->input();
+                echo '<div id=3D"detail_' . $div . '" class=3D"content" =
style=3D"display:none">';
+                $ib =3D new IButton("h" . $div);
+                $ib->label =3D 'Cacher';
+                $ib->javascript =3D "g('detail_" . $div . "').style.disp=
lay=3D'none';g('a" . $div . "').style.display=3D'block';";
+                echo $ib->input();
+            } else
+                echo '<div class=3D"content">';
+            $detail =3D new Acc_Misc($cn, $obj->jr_id);
+            $detail->get();
+            ?>
+            <table class=3D"result">
+                <tr>
+                    <?php
+                    echo th(_('Poste Comptable'));
+                    echo th(_('Quick Code'));
+                    echo th(_('Libell=C3=A9'));
+                    echo th(_('D=C3=A9bit'), ' style=3D"text-align:right=
"');
+                    echo th(_('Cr=C3=A9dit'), ' style=3D"text-align:righ=
t"');
+                    echo '</tr>';
+                    for ($e =3D 0; $e < count($detail->det->array); $e++=
)
+                    {
+                        $row =3D '';
+                        $q =3D $detail->det->array;
+                        $view_history =3D sprintf('<A class=3D"detail" s=
tyle=3D"text-decoration:underline" HREF=3D"javascript:view_history_accoun=
t(\'%s\',\'%s\')" >%s</A>', $q[$e]['j_poste'], $gDossier, $q[$e]['j_poste=
']);
=20
-  }
-  if ($owner->MY_TVA_USE=3D=3D'Y')
-	  $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;f=
ont-weight: bolder;width:auto" colspan=3D"6"');
-  else
-	  $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;f=
ont-weight: bolder;width:auto" colspan=3D"6"');
-$row.=3Dtd(nbm($total_htva),'class=3D"num" style=3D"font-style:italic;fo=
nt-weight: bolder;"');
-if ($owner->MY_TVA_USE=3D=3D'Y')
-  $row.=3Dtd("").td(nbm($total_tvac),'class=3D"num" style=3D"font-style:=
italic;font-weight: bolder;"');
-echo tr($row);
-?>
-</table>
-
-
+                        $row.=3Dtd($view_history);
+                        if ($q[$e]['j_qcode'] !=3D '')
+                        {
+                            $fiche =3D new Fiche($cn);
+                            $fiche->get_by_qcode($q[$e]['j_qcode']);
+                            $view_history =3D sprintf('<A class=3D"detai=
l" style=3D"text-decoration:underline" HREF=3D"javascript:view_history_ca=
rd(\'%s\',\'%s\')" >%s</A>', $fiche->id, $gDossier, $q[$e]['j_qcode']);
+                        } else
+                            $view_history =3D '';
+                        $row.=3Dtd($view_history);
+                        /* $row=3Dtd($q[$e]['j_poste']); */
+                        /* $row.=3Dtd($q[$e]['j_qcode']); */
+                        if ($q[$e]['j_qcode'] !=3D '')
+                        {
+                            // nom de la fiche
+                            $ff =3D new Fiche($cn);
+                            $ff->get_by_qcode($q[$e]['j_qcode']);
+                            $row.=3Dtd($ff->strAttribut(h(ATTR_DEF_NAME)=
));
+                        } else
+                        {
+                            // libell=C3=A9 du compte
+                            $name =3D $cn->get_value('select pcm_lib fro=
m tmp_pcmn where pcm_val=3D$1', array($q[$e]['j_poste']));
+                            $row.=3Dtd(h($name));
+                        }
+                        $montant =3D td(nbm($q[$e]['j_montant']), 'class=
=3D"num"');
+                        $row.=3D($q[$e]['j_debit'] =3D=3D 't') ? $montan=
t : td('');
+                        $row.=3D($q[$e]['j_debit'] =3D=3D 'f') ? $montan=
t : td('');
+                        echo tr($row);
+                    }
+                    ?>
+            </table>
+        </div>
 </div>
-	<div class=3D"myfieldset">
-	<h1 class=3D"legend"><?php echo _('Ecritures comptables')?></h1>
=20
-
-<?php=20
-  /* if it is not in a popup, the details are hidden */
-  if ( $div !=3D 'popup') {
-    $ib=3Dnew IButton ("a".$div);
-    $ib->label=3D'Afficher';
-    $ib->javascript=3D"g('detail_".$div."').style.display=3D'block';g('a=
".$div."').style.display=3D'none';";
-    echo $ib->input();
-    echo '<div id=3D"detail_'.$div.'" class=3D"content" style=3D"display=
:none">';
-    $ib=3Dnew IButton ("h".$div);
-    $ib->label=3D'Cacher';
-    $ib->javascript=3D"g('detail_".$div."').style.display=3D'none';g('a"=
.$div."').style.display=3D'block';";
-    echo $ib->input();
-  } else
-    echo '<div class=3D"content">';
-$detail=3Dnew Acc_Misc($cn,$obj->jr_id);
-$detail->get();
-?>
-<table class=3D"result">
-<tr>
-<?php=20
- echo th(_('Poste Comptable'));
-    echo th(_('Quick Code'));
-    echo th(_('Libell=C3=A9'));
-echo th(_('D=C3=A9bit'),' style=3D"text-align:right"');
-echo th(_('Cr=C3=A9dit'),' style=3D"text-align:right"');
-echo '</tr>';
-  for ($e=3D0;$e<count($detail->det->array);$e++) {
-    $row=3D''; $q=3D$detail->det->array;
-   $view_history=3D sprintf('<A class=3D"detail" style=3D"text-decoratio=
n:underline" HREF=3D"javascript:view_history_account(\'%s\',\'%s\')" >%s<=
/A>',
-			   $q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']);
-
-    $row.=3Dtd($view_history);
-    if ( $q[$e]['j_qcode'] !=3D''){
-      $fiche=3Dnew Fiche($cn);
-      $fiche->get_by_qcode($q[$e]['j_qcode']);
-      $view_history=3D sprintf('<A class=3D"detail" style=3D"text-decora=
tion:underline" HREF=3D"javascript:view_history_card(\'%s\',\'%s\')" >%s<=
/A>',
-			     $fiche->id,$gDossier, $q[$e]['j_qcode']);
-    }
-    else
-      $view_history=3D'';
-    $row.=3Dtd($view_history);
-    /* $row=3Dtd($q[$e]['j_poste']); */
-    /* $row.=3Dtd($q[$e]['j_qcode']); */
-    if ( $q[$e]['j_qcode'] !=3D'') {
-      // nom de la fiche
-      $ff=3Dnew Fiche($cn);
-      $ff->get_by_qcode( $q[$e]['j_qcode']);
-      $row.=3Dtd($ff->strAttribut(h(ATTR_DEF_NAME)));
-    } else {
-      // libell=C3=A9 du compte
-      $name=3D$cn->get_value('select pcm_lib from tmp_pcmn where pcm_val=
=3D$1',array($q[$e]['j_poste']));
-      $row.=3Dtd(h($name));
-    }
-    $montant=3Dtd(nbm($q[$e]['j_montant']),'class=3D"num"');
-    $row.=3D($q[$e]['j_debit']=3D=3D't')?$montant:td('');
-    $row.=3D($q[$e]['j_debit']=3D=3D'f')?$montant:td('');
-    echo tr($row);
-
-  }
-?>
-</table>
-</div>
-</div>
-
-<?php=20
+<?php
 require_once('ledger_detail_bottom.php');
 ?>
 </div>

Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_ven.php	2013-10-19 20:=
28:13 UTC (rev 5517)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php	2013-10-20 19:=
13:26 UTC (rev 5518)
@@ -1,295 +1,312 @@
 <?php require_once('template/ledger_detail_top.php'); ?>
 <div class=3D"content" style=3D"padding:0;">
-<?php=20
-  require_once('class_own.php');
-  $owner=3Dnew Own($cn);
-?>
+    <?php
+    require_once('class_own.php');
+    $owner =3D new Own($cn);
+    ?>
=20
-    <?php if ( $access=3D=3D'W') : ?>
-<form class=3D"print" onsubmit=3D"return op_save(this);">
-   <?php endif; ?>
+    <?php if ($access =3D=3D 'W') : ?>
+        <form class=3D"print" onsubmit=3D"return op_save(this);">
+        <?php endif; ?>
=20
-    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
-  <table style=3D"width:100%">
-  <tr><td>
-						<table>
-						<tr><td>
-						<?php
-						$date=3Dnew IDate('p_date');
-						$date->value=3Dformat_date($obj->det->jr_date);
-						 echo td('Date').td($date->input());
+        <?php echo HtmlInput::hidden('whatdiv', $div) . HtmlInput::hidde=
n('jr_id', $jr_id) . dossier::hidden(); ?>
+        <table style=3D"width:100%">
+            <tr><td>
+                    <table>
+                        <tr>
+                           =20
+                                <?php
+                                $date =3D new IDate('p_date');
+                                $date->value =3D format_date($obj->det->=
jr_date);
+                                echo td('Date') . td($date->input());
+                                ?>
+                        </tr>
+                        <tr>
+                                <?php
+                                $date_ech =3D new IDate('p_ech');
+                                $date_ech->value =3D format_date($obj->d=
et->jr_ech);
+                                echo td('Echeance') . td($date_ech->inpu=
t());
+                                ?>
+                                                    <tr>
+                            <td></td>
+                            <td>
+                                Date paiement
+                            </td>
+                            <td>
+<?php
+$date_paid =3D new IDate('p_date_paid');
+$date_paid->value =3D format_date($obj->det->jr_date_paid);
+echo $date_paid->input();
+?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+<?php
+$bk =3D new Fiche($cn, $obj->det->array[0]['qs_client']);
+echo td(_('Client'));
=20
-						 ?>
-						 </td>
-						</tr>
-										<tr>
-							<td>
-							<?php
-							$date_ech=3Dnew IDate('p_ech');
-							$date_ech->value=3Dformat_date($obj->det->jr_ech);
-							 echo td('Echeance').td($date_ech->input());
+$view_card_detail =3D HtmlInput::card_detail($bk->get_quick_code(), h($b=
k->getName()), ' class=3D"line" ');
+echo td($view_card_detail);
+?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+<?php
+$itext =3D new IText('npj');
+$itext->value =3D strip_tags($obj->det->jr_pj_number);
+echo td(_('Pi=C3=A8ce')) . td($itext->input());
+?>
+                            </td>
+                        <tr>
+                            <td>
+<?php
+$itext =3D new IText('lib');
+$itext->value =3D strip_tags($obj->det->jr_comment);
+$itext->size =3D 40;
+echo td(_('Libell=C3=A9')) . td($itext->input(), ' colspan=3D"2" ');
+?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td>Pay=C3=A9</td>
+                            <td>
+<?php
+$ipaid =3D new ICheckBox("ipaid", 'paid');
+$ipaid->selected =3D ($obj->det->jr_rapt =3D=3D 'paid');
+echo $ipaid->input();
+?>
+                            </td>
+                        </tr>
=20
-							 ?>
-							</td>
-						<tr>
-						<td>
-						<?php=20
-						$bk=3Dnew Fiche($cn,$obj->det->array[0]['qs_client']);
-						echo td(_('Client'));
+                    </table>
+                </td>
+                <td style=3D'width:50%'>
+                    <table style=3D"width:100%;border:solid 1px yellow">
+                        <tr>
+                            <td>
+                                Note
+                            </td></tr>
+                        <tr>
+                            <td>
+<?php
+$inote =3D new ITextarea('jrn_note');
+$inote->width =3D 25;
+$inote->heigh =3D 5;
+$inote->value =3D strip_tags($obj->det->note);
+echo $inote->input();
+?>
=20
-						$view_card_detail=3DHtmlInput::card_detail($bk->get_quick_code(),h=
($bk->getName()), ' class=3D"line" ');
-							echo td($view_card_detail);
-						?>
-						</td>
-						</tr>
-						<tr>
-						<td>
-						<?php=20
-						$itext=3Dnew IText('npj');
-						$itext->value=3Dstrip_tags($obj->det->jr_pj_number);
-						echo td(_('Pi=C3=A8ce')).td($itext->input());
-						?>
-						</td>
-						<tr>
-						<td>
-						<?php=20
-						  $itext=3Dnew IText('lib');
-						  $itext->value=3Dstrip_tags($obj->det->jr_comment);
-						  $itext->size=3D40;
-						echo td(_('Libell=C3=A9')).td($itext->input(),' colspan=3D"2" ');
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+        <div class=3D"myfieldset">
+            <h1 class=3D"legend">
+<?php echo _('D=C3=A9tail') ?>
+            </h1>
+            <table class=3D"result">
+                <?php
+                bcscale(2);
+                $total_htva =3D 0;
+                $total_tvac =3D 0;
+                echo th(_('Quick Code'));
+                echo th(_('Description'));
+                echo th(_('Prix/Un'), 'style=3D"text-align:right"');
+                echo th(_('Quantit=C3=A9'), 'style=3D"text-align:right"'=
);
+                if ($owner->MY_TVA_USE =3D=3D 'Y')
+                    echo th(_('Taux TVA'), 'style=3D"text-align:right"')=
;
+                else
+                    echo th('');
+                if ($owner->MY_TVA_USE =3D=3D 'Y')
+                {
+                    echo th(_('HTVA'), 'style=3D"text-align:right"');
+                    echo th(_('TVA'), 'style=3D"text-align:right"');
+                    echo th(_('TVAC'), 'style=3D"text-align:right"');
+                } else
+                    echo th(_('Total'), 'style=3D"text-align:right"');
=20
+                if ($owner->MY_ANALYTIC !=3D 'nu' && $div =3D=3D 'popup'=
)
+                {
+                    $anc =3D new Anc_Plan($cn);
+                    $a_anc =3D $anc->get_list(" order by pa_id ");
+                    $x =3D count($a_anc);
+                    /* set the width of the col */
+                    echo '<th colspan=3D"' . $x . '">' . _('Compt. Analy=
tique') . '</th>';
=20
-						?>
-						</td>
-						</tr>
-                                               <tr>
-												   <td></td>
-                                                        <td>Pay=C3=A9</t=
d>
-                                                        <td>
-                                                            <?php=20
-                                                            $ipaid=3Dnew=
 ICheckBox("ipaid",'paid');
-                                                            $ipaid->sele=
cted=3D($obj->det->jr_rapt=3D=3D'paid');
-                                                            echo $ipaid-=
>input();
-                                                            ?>
-                                                        </td>
-                                                    </tr>
-						</table>
-</td>
-<td style=3D'width:50%'>
-			<table style=3D"width:100%;border:solid 1px yellow">
-			<tr>
-			<td>
-				Note
-			</td></tr>
-			<tr>
-			<td>
-			<?php=20
-			$inote=3Dnew ITextarea('jrn_note');
-			$inote->width=3D25;
-			$inote->heigh=3D5;
-			$inote->value=3Dstrip_tags($obj->det->note);
-			echo $inote->input();
-			?>
+                    /* add hidden variables pa[] to hold the value of pa=
_id */
+                    echo Anc_Plan::hidden($a_anc);
+                }
=20
-			</td>
-			</tr>
-			</table>
-</td>
-</tr>
-</table>
-<div class=3D"myfieldset">
-	<h1 class=3D"legend">
-<?php echo _('D=C3=A9tail')?>
-	</h1>
-<table class=3D"result">
-<?php=20
-  bcscale(2);
-  $total_htva=3D0;$total_tvac=3D0;
-  echo th(_('Quick Code'));
-echo th(_('Description'));
-echo th(_('Prix/Un'), 'style=3D"text-align:right"');
-echo th(_('Quantit=C3=A9'), 'style=3D"text-align:right"');
-if ( $owner->MY_TVA_USE =3D=3D 'Y')
-  echo th(_('Taux TVA'), 'style=3D"text-align:right"');
-else
-  echo th('');
-if ( $owner->MY_TVA_USE =3D=3D 'Y') {
-  echo th(_('HTVA'), 'style=3D"text-align:right"');
-  echo th(_('TVA'), 'style=3D"text-align:right"');
-  echo th(_('TVAC'), 'style=3D"text-align:right"');
-} else
-  echo th(_('Total'), 'style=3D"text-align:right"');
+                echo '</tr>';
+                for ($e =3D 0; $e < count($obj->det->array); $e++)
+                {
+                    $row =3D '';
+                    $q =3D $obj->det->array[$e];
+                    $fiche =3D new Fiche($cn, $q['qs_fiche']);
+                    $view_card_detail =3D HtmlInput::card_detail($fiche-=
>strAttribut(ATTR_DEF_QUICKCODE), "", ' class=3D"line" ');
+                    $row.=3Dtd($view_card_detail);
+                    if ($owner->MY_UPDLAB =3D=3D 'Y')
+                    {
+                        $l_lib =3D ($q['j_text'] =3D=3D '') ? $fiche->st=
rAttribut(ATTR_DEF_NAME) : $q['j_text'];
+                        $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id=
']);
+                        $input =3D new IText("e_march" . $q['j_id'] . "_=
label", $l_lib);
+                        $input->css_size =3D "100%";
+                    } else
+                    {
+                        $input =3D new ISpan("e_march" . $q['j_id'] . "_=
label");
+                        $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id=
']);
+                        $input->value =3D $fiche->strAttribut(ATTR_DEF_N=
AME);
+                    }
=20
-    if ($owner->MY_ANALYTIC !=3D 'nu' && $div =3D=3D 'popup'){
-      $anc=3Dnew Anc_Plan($cn);
-      $a_anc=3D$anc->get_list(" order by pa_id ");
-      $x=3Dcount($a_anc);
-      /* set the width of the col */
-      echo '<th colspan=3D"'.$x.'">'._('Compt. Analytique').'</th>';
+                    $row.=3Dtd($input->input() . $hidden);
+                    $sym_tva =3D '';
+                    $pu =3D 0;
+                    if ($q['qs_quantite'] !=3D 0)
+                        $pu =3D bcdiv($q['qs_price'], $q['qs_quantite'])=
;
+                    $row.=3Dtd(nbm($pu), 'class=3D"num"');
+                    $row.=3Dtd(nbm($q['qs_quantite']), 'class=3D"num"');
+                    $sym_tva =3D '';
+                    if ($owner->MY_TVA_USE =3D=3D 'Y' && $q['qs_vat_code=
'] !=3D '')
+                    {
+                        /* retrieve TVA symbol */
+                        $tva =3D new Acc_Tva($cn, $q['qs_vat_code']);
+                        $tva->load();
+                        $sym_tva =3D (h($tva->get_parameter('label')));
+                        //     $sym_tva=3D$sym
+                    }
=20
-      /* add hidden variables pa[] to hold the value of pa_id */
-      echo Anc_Plan::hidden($a_anc);
-    }
+                    $row.=3Dtd($sym_tva, 'style=3D"text-align:center"');
=20
-echo '</tr>';
-  for ($e=3D0;$e<count($obj->det->array);$e++) {
-    $row=3D'';
-    $q=3D$obj->det->array[$e];
-    $fiche=3Dnew Fiche($cn,$q['qs_fiche']);
-	$view_card_detail=3DHtmlInput::card_detail($fiche->strAttribut(ATTR_DEF=
_QUICKCODE),"", ' class=3D"line" ');
-	$row.=3Dtd($view_card_detail);
-	if ($owner->MY_UPDLAB =3D=3D 'Y')
-    {
-        $l_lib =3D ($q['j_text'] =3D=3D '') ? $fiche->strAttribut(ATTR_D=
EF_NAME) : $q['j_text'];
-        $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']);
-        $input =3D new IText("e_march" . $q['j_id'] . "_label", $l_lib);
-        $input->css_size=3D"100%";
-    }
-    else
-    {
-        $input =3D new ISpan("e_march" . $q['j_id'] . "_label");
-        $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']);
-        $input->value =3D $fiche->strAttribut(ATTR_DEF_NAME);
-    }
+                    $htva =3D $q['qs_price'];
=20
-    $row.=3Dtd($input->input().$hidden);
-    $sym_tva=3D'';
-	$pu=3D0;
-	if ($q['qs_quantite'] !=3D 0)	$pu=3Dbcdiv($q['qs_price'],$q['qs_quantit=
e']);
-    $row.=3Dtd(nbm($pu),'class=3D"num"');
-    $row.=3Dtd(nbm($q['qs_quantite']),'class=3D"num"');
-	$sym_tva=3D'';
-   if ( $owner->MY_TVA_USE=3D=3D'Y' && $q['qs_vat_code'] !=3D '') {
-     /* retrieve TVA symbol */
-     $tva=3Dnew Acc_Tva($cn,$q['qs_vat_code']);
-     $tva->load();
-     $sym_tva=3D(h($tva->get_parameter('label')));
-     //     $sym_tva=3D$sym
-   }
+                    $row.=3Dtd(nbm($htva), 'class=3D"num"');
+                    $tvac =3D bcadd($htva, $q['qs_vat']);
+                    if ($owner->MY_TVA_USE =3D=3D 'Y')
+                    {
+                        $class =3D "";
+                        if ($q['qs_vat_sided'] !=3D 0)
+                        {
+                            $class =3D ' style=3D"text-decoration:line-t=
hrough"';
+                            $tvac =3D bcsub($tvac, $q['qs_vat']);
+                        }
+                        $row.=3Dtd(nbm($q['qs_vat']), 'class=3D"num"' . =
$class);
+                        $row.=3Dtd(nbm($tvac), 'class=3D"num"');
+                    }
+                    $total_tvac =3D bcadd($total_tvac, $tvac);
+                    $total_htva =3D bcadd($total_htva, $htva);
+                    /* Analytic accountancy */
+                    if ($owner->MY_ANALYTIC !=3D "nu" && $div =3D=3D 'po=
pup')
+                    {
+                        $poste =3D $fiche->strAttribut(ATTR_DEF_ACCOUNT)=
;
+                        if (preg_match('/^(6|7)/', $poste))
+                        {
+                            $anc_op =3D new Anc_Operation($cn);
+                            $anc_op->j_id =3D $q['j_id'];
+                            echo HtmlInput::hidden('op[]', $anc_op->j_id=
);
+                            /* compute total price */
+                            bcscale(2);
=20
-   $row.=3Dtd($sym_tva,'style=3D"text-align:center"');
+                            $row.=3D$anc_op->display_table(1, $htva, $di=
v);
+                        } else
+                        {
+                            $row.=3Dtd('');
+                        }
+                    }
+                    echo tr($row);
+                }
+                if ($owner->MY_TVA_USE =3D=3D 'Y')
+                    $row =3D td(_('Total'), ' style=3D"font-style:italic=
;text-align:right;font-weight: bolder;" colspan=3D"5"');
+                else
+                    $row =3D td(_('Total'), ' style=3D"font-style:italic=
;text-align:right;font-weight: bolder;" colspan=3D"5"');
+                $row.=3Dtd(nbm($total_htva), 'class=3D"num" style=3D"fon=
t-style:italic;font-weight: bolder;"');
+                if ($owner->MY_TVA_USE =3D=3D 'Y')
+                    $row.=3Dtd("") . td(nbm($total_tvac), 'class=3D"num"=
 style=3D"font-style:italic;font-weight: bolder;"');
+                echo tr($row);
+                ?>
+            </table>
+            </td>
+            </tr>
+            </table>
+            </td>
+            </tr>
+            </table>
+        </div>
+        <div class=3D"myfieldset">
+            <h1 class=3D"legend">
+            <?php echo _('Ecritures comptables') ?>
+            </h1>
+            <?php
+            /* if it is not in a popup, the details are hidden */
+            if ($div !=3D 'popup')
+            {
+                $ib =3D new IButton("a" . $div);
+                $ib->label =3D 'Afficher';
+                $ib->javascript =3D "g('detail_" . $div . "').style.disp=
lay=3D'block';g('a" . $div . "').style.display=3D'none';";
+                echo $ib->input();
+                echo '<div id=3D"detail_' . $div . '" style=3D"display:n=
one">';
+                $ib =3D new IButton("h" . $div);
+                $ib->label =3D 'Cacher';
+                $ib->javascript =3D "g('detail_" . $div . "').style.disp=
lay=3D'none';g('a" . $div . "').style.display=3D'block';";
+                echo $ib->input();
+            } else
+                echo '<div>';
=20
-    $htva=3D$q['qs_price'];
+            $detail =3D new Acc_Misc($cn, $obj->jr_id);
+            $detail->get();
+            ?>
=20
-    $row.=3Dtd(nbm($htva),'class=3D"num"');
-    $tvac=3Dbcadd($htva,$q['qs_vat']);
-    if ($owner->MY_TVA_USE=3D=3D'Y')
-      {
-		$class=3D"";
-		if ($q['qs_vat_sided'] !=3D 0) {
-			$class=3D' style=3D"text-decoration:line-through"';
-			$tvac=3Dbcsub($tvac,$q['qs_vat']);
-		}
-		$row.=3Dtd(nbm($q['qs_vat']),'class=3D"num"'.$class);
-		$row.=3Dtd(nbm($tvac),'class=3D"num"');
-      }
-    $total_tvac=3Dbcadd($total_tvac,$tvac);
-    $total_htva=3Dbcadd($total_htva,$htva);
-    /* Analytic accountancy */
-    if ( $owner->MY_ANALYTIC !=3D "nu" && $div =3D=3D 'popup'){
-      $poste=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT);
-      if ( preg_match('/^(6|7)/',$poste)) {
-	$anc_op=3Dnew Anc_Operation($cn);
-	$anc_op->j_id=3D$q['j_id'];
-	echo HtmlInput::hidden('op[]',$anc_op->j_id);
-	/* compute total price */
-	bcscale(2);
+            <table class=3D"result">
+                <tr>
+                    <?php
+                    echo th(_('Poste Comptable'));
+                    echo th(_('Quick Code'));
+                    echo th(_('Libell=C3=A9'));
+                    echo th(_('D=C3=A9bit'), ' style=3D"text-align:right=
"');
+                    echo th(_('Cr=C3=A9dit'), ' style=3D"text-align:righ=
t"');
+                    echo '</tr>';
+                    for ($e =3D 0; $e < count($detail->det->array); $e++=
)
+                    {
+                        $row =3D '';
+                        $q =3D $detail->det->array[$e];
+                        $view_history =3D sprintf('<A class=3D"detail" s=
tyle=3D"text-decoration:underline" HREF=3D"javascript:view_history_accoun=
t(\'%s\',\'%s\')" >%s</A>', $q['j_poste'], $gDossier, $q['j_poste']);
=20
-	$row.=3D$anc_op->display_table(1,$htva,$div);
+                        $row.=3Dtd($view_history);
+                        if ($q['j_qcode'] !=3D '')
+                        {
+                            $fiche =3D new Fiche($cn);
+                            $fiche->get_by_qcode($q['j_qcode']);
+                            $view_history =3D sprintf('<A class=3D"detai=
l" style=3D"text-decoration:underline" HREF=3D"javascript:view_history_ca=
rd(\'%s\',\'%s\')" >%s</A>', $fiche->id, $gDossier, $q['j_qcode']);
+                        } else
+                            $view_history =3D '';
+                        $row.=3Dtd($view_history);
=20
-      }  else {
-	$row.=3Dtd('');
-      }
-    }
-    echo tr($row);
-
-  }
-  if ($owner->MY_TVA_USE=3D=3D'Y')
-	$row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;fon=
t-weight: bolder;" colspan=3D"5"');
-  else
-	$row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;fon=
t-weight: bolder;" colspan=3D"5"');
-$row.=3Dtd(nbm($total_htva),'class=3D"num" style=3D"font-style:italic;fo=
nt-weight: bolder;"');
-if ($owner->MY_TVA_USE=3D=3D'Y')
-  $row.=3Dtd("").td(nbm($total_tvac),'class=3D"num" style=3D"font-style:=
italic;font-weight: bolder;"');
-echo tr($row);
-?>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
+                        if ($q['j_qcode'] !=3D '')
+                        {
+                            // nom de la fiche
+                            $ff =3D new Fiche($cn);
+                            $ff->get_by_qcode($q['j_qcode']);
+                            $row.=3Dtd($ff->strAttribut(h(ATTR_DEF_NAME)=
));
+                        } else
+                        {
+                            // libell=C3=A9 du compte
+                            $name =3D $cn->get_value('select pcm_lib fro=
m tmp_pcmn where pcm_val=3D$1', array($q['j_poste']));
+                            $row.=3Dtd(h($name));
+                        }
+                        $montant =3D td(nbm($q['j_montant']), 'class=3D"=
num"');
+                        $row.=3D($q['j_debit'] =3D=3D 't') ? $montant : =
td('');
+                        $row.=3D($q['j_debit'] =3D=3D 'f') ? $montant : =
td('');
+                        echo tr($row);
+                    }
+                    ?>
+            </table>
+        </div>
 </div>
-<div class=3D"myfieldset">
-	<h1 class=3D"legend">
-<?php echo _('Ecritures comptables')?>
-	</h1>
-	<?php=20
-  /* if it is not in a popup, the details are hidden */
-  if ( $div !=3D 'popup') {
-    $ib=3Dnew IButton ("a".$div);
-    $ib->label=3D'Afficher';
-    $ib->javascript=3D"g('detail_".$div."').style.display=3D'block';g('a=
".$div."').style.display=3D'none';";
-    echo $ib->input();
-    echo '<div id=3D"detail_'.$div.'" style=3D"display:none">';
-    $ib=3Dnew IButton ("h".$div);
-    $ib->label=3D'Cacher';
-    $ib->javascript=3D"g('detail_".$div."').style.display=3D'none';g('a"=
.$div."').style.display=3D'block';";
-    echo $ib->input();
-  } else
-    echo '<div>';
-
-  $detail=3Dnew Acc_Misc($cn,$obj->jr_id);
-$detail->get();
-?>
-
-<table class=3D"result">
-<tr>
-<?php=20
- echo th(_('Poste Comptable'));
-    echo th(_('Quick Code'));
-    echo th(_('Libell=C3=A9'));
-echo th(_('D=C3=A9bit'),' style=3D"text-align:right"');
-echo th(_('Cr=C3=A9dit'),' style=3D"text-align:right"');
-echo '</tr>';
-  for ($e=3D0;$e<count($detail->det->array);$e++) {
-    $row=3D''; $q=3D$detail->det->array[$e];
-   $view_history=3D sprintf('<A class=3D"detail" style=3D"text-decoratio=
n:underline" HREF=3D"javascript:view_history_account(\'%s\',\'%s\')" >%s<=
/A>',
-			   $q['j_poste'], $gDossier, $q['j_poste']);
-
-    $row.=3Dtd($view_history);
-    if ( $q['j_qcode'] !=3D''){
-      $fiche=3Dnew Fiche($cn);
-      $fiche->get_by_qcode($q['j_qcode']);
-      $view_history=3D sprintf('<A class=3D"detail" style=3D"text-decora=
tion:underline" HREF=3D"javascript:view_history_card(\'%s\',\'%s\')" >%s<=
/A>',
-			     $fiche->id,$gDossier, $q['j_qcode']);
-    }
-    else
-      $view_history=3D'';
-    $row.=3Dtd($view_history);
-
-    if ( $q['j_qcode'] !=3D'') {
-      // nom de la fiche
-      $ff=3Dnew Fiche($cn);
-      $ff->get_by_qcode( $q['j_qcode']);
-      $row.=3Dtd($ff->strAttribut(h(ATTR_DEF_NAME)));
-    } else {
-      // libell=C3=A9 du compte
-      $name=3D$cn->get_value('select pcm_lib from tmp_pcmn where pcm_val=
=3D$1',array($q['j_poste']));
-      $row.=3Dtd(h($name));
-    }
-    $montant=3Dtd(nbm($q['j_montant']),'class=3D"num"');
-    $row.=3D($q['j_debit']=3D=3D't')?$montant:td('');
-    $row.=3D($q['j_debit']=3D=3D'f')?$montant:td('');
-    echo tr($row);
-
-  }
-?>
-</table>
-</div>
-</div>
-<?php=20
+<?php
 require_once('ledger_detail_bottom.php');
 ?>
 </div>

Modified: phpcompta/trunk/include/template/print_ledger_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/print_ledger_simple.php	2013-10-19 2=
0:28:13 UTC (rev 5517)
+++ phpcompta/trunk/include/template/print_ledger_simple.php	2013-10-20 1=
9:13:26 UTC (rev 5518)
@@ -2,6 +2,7 @@
     <tr>
         <th>Pi=C3=A8ce</th>
         <th>Date</th>
+        <th>Paiement</th>
         <th>Ref</th>
         <th>Client / Fournisseur</th>
         <th>Description</th>
@@ -38,8 +39,9 @@
   =20
     $class =3D ($i % 2 =3D=3D 0) ? ' class=3D"even" ' : ' class=3D"odd" =
';
     echo "<tr $class>";
+    echo "<TD>" . h($line['jr_pj_number']) . "</TD>";
     echo "<TD>" . smaller_date($line['date']) . "</TD>";
-    echo "<TD>" . h($line['jr_pj_number']) . "</TD>";
+    echo "<TD>" . smaller_date($line['date_paid']) . "</TD>";
     echo "<TD>" . HtmlInput::detail_op($line['jr_id'], $line['jr_interna=
l']) . "</TD>";
     $tiers =3D $Jrn->get_tiers($line['jrn_def_type'], $line['jr_id']);
     echo td($tiers);



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


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

Author: danydb
Date: 2013-10-20 21:27:54 +0200 (Sun, 20 Oct 2013)
New Revision: 5519

Modified:
   phpcompta/trunk/include/template/ledger_detail_ven.php
Log:
task #0000900: Ajout d'une date de paiement

Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_ven.php	2013-10-20 19:=
13:26 UTC (rev 5518)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php	2013-10-20 19:=
27:54 UTC (rev 5519)
@@ -15,6 +15,7 @@
                     <table>
                         <tr>
                            =20
+                            <td></td>
                                 <?php
                                 $date =3D new IDate('p_date');
                                 $date->value =3D format_date($obj->det->=
jr_date);
@@ -22,6 +23,7 @@
                                 ?>
                         </tr>
                         <tr>
+                            <td></td>
                                 <?php
                                 $date_ech =3D new IDate('p_ech');
                                 $date_ech->value =3D format_date($obj->d=
et->jr_ech);



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


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

Author: danydb
Date: 2013-10-20 21:42:58 +0200 (Sun, 20 Oct 2013)
New Revision: 5520

Modified:
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/template/ledger_search.php
   phpcompta/trunk/release-note
Log:
task #0000900: Ajout d'une date de paiement : recherche histo

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-10-20 19:27:54 UTC (rev 551=
9)
+++ phpcompta/trunk/html/js/infobulle.js	2013-10-20 19:42:58 UTC (rev 552=
0)
@@ -63,6 +63,7 @@
 content[33]=3D'le type vaut :<ul>	<li> ME pour Menu</li>	<li> PR pour le=
s impressions </li>	<li> PL pour les plugins</li>	<li> SP pour des valeur=
s sp=C3=A9ciales</li>	</ul>';
 content[34]=3D'Cliquez sur le code AD pour ouvrir le menu dans un nouvel=
 onglet';
 content[35]=3D'Cliquez sur le chemin pour ouvrir le menu';
+content[36]=3D'Ne concerne que les journaux de type ACH & VEN, en pr=C3=A9=
cisant une date ici vous excluez d\'office les autres journaux';
 function showBulle(p_ctl){
     d=3Ddocument.getElementById('bulle');
     d.innerHTML=3Dcontent[p_ctl];

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-10-20 19:27:54 UTC =
(rev 5519)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-10-20 19:42:58 UTC =
(rev 5520)
@@ -2428,7 +2428,14 @@
=20
 		$selected =3D (isset($_REQUEST['r_jrn' . $div])) ? $_REQUEST['r_jrn' .=
 $div] : null;
 		$f_ledger =3D HtmlInput::select_ledger($filter_ledger, $selected, $div=
);
-
+                /* Compute date for exercice */
+                $period =3D $g_user->get_periode();
+                $per =3D new Periode($this->db, $period);
+		$exercice =3D $per->get_exercice();
+		list($per_start, $per_end) =3D $per->get_limit($exercice);
+		$date_end =3D $per_end->last_day();
+                $date_start=3D$per_start->first_day();
+                       =20
 		/* widget for date_start */
 		$f_date_start =3D new IDate('date_start');
 		/* all periode or only the selected one */
@@ -2438,12 +2445,7 @@
 		}
 		else
 		{
-			$period =3D $g_user->get_periode();
-			$per =3D new Periode($this->db, $period);
-			$exercice =3D $per->get_exercice();
-			list($per_start, $per_end) =3D $per->get_limit($exercice);
-			$f_date_start->value =3D $per_start->first_day();
-			$date_end =3D $per_end->last_day();
+                        $f_date_start->value=3D$date_start;
 		}
=20
 		/* widget for date_end */
@@ -2457,7 +2459,13 @@
 		{
 			$f_date_end->value =3D $date_end;
 		}
-
+                /* widget for date term */
+                $f_date_paid_start=3Dnew IDate('date_paid_start');
+                $f_date_paid_end=3Dnew IDate('date_paid_end');
+               =20
+                $f_date_paid_start->value=3D(isset($_REQUEST['date_paid_=
start']))?$_REQUEST['date_paid_start']:'';
+                $f_date_paid_end->value=3D(isset($_REQUEST['date_paid_en=
d']))?$_REQUEST['date_paid_end']:'';
+               =20
 		/* widget for desc */
 		$f_descript =3D new IText('desc');
 		$f_descript->size =3D 40;
@@ -2643,6 +2651,7 @@
 		$fil_qcode =3D '';
 		$fil_account =3D '';
 		$fil_paid =3D '';
+                $fil_date_paid=3D'';
=20
 		$and =3D '';
 		$g_user =3D new User($this->db);
@@ -2724,6 +2733,17 @@
 			$fil_date.=3D$and . " jr_date <=3D to_date('" . $date_end . "','DD.MM=
.YYYY')";
 			$and =3D " and ";
 		}
+		// date paiement
+		if (isset($date_paid_start) && isDate($date_paid_start) !=3D null)
+		{
+			$fil_date_paid =3D $and . " jr_date_paid >=3D to_date('" . $date_paid=
_start . "','DD.MM.YYYY')";
+			$and =3D " and ";
+		}
+		if (isset($date_paid_end) && isDate($date_paid_end) !=3D null)
+		{
+			$fil_date_paid.=3D$and . " jr_date_paid <=3D to_date('" . $date_paid_=
end . "','DD.MM.YYYY')";
+			$and =3D " and ";
+		}
 		// comment
 		if (isset($desc) && $desc !=3D null)
 		{
@@ -2770,7 +2790,7 @@
 					" uj_login=3D'" . $_SESSION['g_user'] . "'" .
 					" and uj_priv in ('R','W'))";
 		}
-		$where =3D $fil_ledger . $fil_amount . $fil_date . $fil_desc . $fil_se=
c . $fil_amount . $fil_qcode . $fil_paid . $fil_account;
+		$where =3D $fil_ledger . $fil_amount . $fil_date . $fil_desc . $fil_se=
c . $fil_amount . $fil_qcode . $fil_paid . $fil_account.$fil_date_paid;
 		$sql.=3D" where " . $where;
 		return array($sql, $where);
 	}

Modified: phpcompta/trunk/include/template/ledger_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_search.php	2013-10-20 19:27:5=
4 UTC (rev 5519)
+++ phpcompta/trunk/include/template/ledger_search.php	2013-10-20 19:42:5=
8 UTC (rev 5520)
@@ -17,6 +17,14 @@
 <?php echo $f_date_start->input();  ?> <?php echo _('et')?> <?php echo $=
f_date_end->input();  ?>
 </td>
 </tr>
+<tr>
+<td style=3D"text-align:right;width:30em">
+<?php echo _('Et paiement compris entre les date ').HtmlInput::infobulle=
(36); ?>
+</td>
+<td>
+<?php echo $f_date_paid_start->input();  ?> <?php echo _('et')?> <?php e=
cho $f_date_paid_end->input();  ?>
+</td>
+</tr>
=20
 <tr>
 <td style=3D"text-align:right;width:30em">

Modified: phpcompta/trunk/release-note
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/release-note	2013-10-20 19:27:54 UTC (rev 5519)
+++ phpcompta/trunk/release-note	2013-10-20 19:42:58 UTC (rev 5520)
@@ -60,6 +60,17 @@
 Possibilit=C3=A9 de changer l'=C3=A9tat de plusieurs documents
=20
=20
+Stock
+=3D=3D=3D=3D=3D
+Inventaire annuel
+
+Date de paiement
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+Lors de rapprochement
+Dans le d=C3=A9tail journaux ACH et VEN
+Dans l'impression PRINTJRN + export CSV
+Dans l'historique
+
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 || A faire
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -70,12 +81,8 @@
 Par journal
 ou par profil
=20
-Stock
-=3D=3D=3D=3D=3D
-Inventaire annuel
=20
=20
=20
=20
=20
-



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


From MAILER-DAEMON Sun Oct 20 16:44:07 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VXzr5-0004i0-95
	for mharc-phpcompta-dev@gnu.org; Sun, 20 Oct 2013 16:44:07 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 20 Oct 2013 22:33:45 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.76602.1382301846.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5521 - 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, 20 Oct 2013 20:44:05 -0000

Author: danydb
Date: 2013-10-20 22:33:45 +0200 (Sun, 20 Oct 2013)
New Revision: 5521

Modified:
   phpcompta/trunk/include/history_operation.inc.php
   phpcompta/trunk/include/user_common.php
Log:
Bug with image next/previous

Modified: phpcompta/trunk/include/history_operation.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/history_operation.inc.php	2013-10-20 19:42:58=
 UTC (rev 5520)
+++ phpcompta/trunk/include/history_operation.inc.php	2013-10-20 20:33:45=
 UTC (rev 5521)
@@ -144,7 +144,9 @@
 /*
  * Export to csv
  */
-$r =3D HtmlInput::get_to_hidden(array('l', 'date_start', 'date_end', 'de=
sc', 'amount_min', 'amount_max', 'qcode', 'accounting', 'unpaid', 'gDossi=
er', 'ledger_type', 'p_action'));
+$r =3D HtmlInput::get_to_hidden(array('l', 'date_paid_start','date_paid_=
end',
+    'date_start', 'date_end', 'desc', 'amount_min', 'amount_max', 'qcode=
',=20
+    'accounting', 'unpaid', 'gDossier', 'ledger_type', 'p_action'));
 if (isset($_GET['r_jrn']))
 {
 	foreach ($_GET['r_jrn'] as $k =3D> $v)

Modified: phpcompta/trunk/include/user_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user_common.php	2013-10-20 19:42:58 UTC (rev =
5520)
+++ phpcompta/trunk/include/user_common.php	2013-10-20 20:33:45 UTC (rev =
5521)
@@ -116,9 +116,9 @@
         $step=3D$p_size;
         $offset=3D($e-1)*$step;
=20
-        $r=3D'<A class=3D"mtitle" href=3D"'.$_SERVER['PHP_SELF']."?".$ur=
l."&offset=3D$offset&step=3D$step&page=3D$e&size=3D$step".'" '.$p_javascr=
ipt.'>';
-        //$r.=3D"Pr&eacute;c&eacute;dent";
-        $r.=3D'<INPUT TYPE=3D"IMAGE" width=3D"12" SRC=3D"image/go-previo=
us.png">';
+        $r=3D'<A class=3D"mtitle" href=3D"'.basename($_SERVER['SCRIPT_FI=
LENAME'])."?".$url."&offset=3D$offset&step=3D$step&page=3D$e&size=3D$step=
".'" '.$p_javascript.'>';
+        $r.=3D" 	&larr;";
+        // $r.=3D'<INPUT TYPE=3D"IMAGE" width=3D"12" SRC=3D"image/go-pre=
vious.png">';
         $r.=3D"</A>&nbsp;&nbsp;";
     }
     //------------------------------------------------------------------=
----
@@ -162,8 +162,8 @@
         $offset=3D($e-1)*$step;
=20
         $r.=3D'&nbsp;<A class=3D"mtitle" href=3D"'.$_SERVER['PHP_SELF'].=
"?".$url."&offset=3D$offset&step=3D$step&page=3D$e&size=3D$step".'" '.$p_=
javascript.' >';
-        //$r.=3D"Suivant";
-        $r.=3D'<INPUT TYPE=3D"IMAGE" width=3D"12" SRC=3D"image/go-next.p=
ng">';
+        $r.=3D"&rarr;";
+        //$r.=3D'<INPUT TYPE=3D"IMAGE" width=3D"12" SRC=3D"image/go-next=
.png">';
         $r.=3D"</A>";
     }
=20



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


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

Author: danydb
Date: 2013-10-20 22:35:50 +0200 (Sun, 20 Oct 2013)
New Revision: 5522

Added:
   phpcompta/trunk/sql/4-date-paiement.sql
Log:
task #0000900: Ajout d une date de paiement

Added: phpcompta/trunk/sql/4-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
--- phpcompta/trunk/sql/4-date-paiement.sql	                        (rev =
0)
+++ phpcompta/trunk/sql/4-date-paiement.sql	2013-10-20 20:35:50 UTC (rev =
5522)
@@ -0,0 +1,33 @@
+alter table jrn add column jr_date_paid date;
+
+ set search_path=3Dpublic,comptaproc;
+
+create or replace function set_paiement_date() returns void
+as
+$body$
+declare=20
+	row_jrn jrn%ROWTYPE;
+	cursor_jrn cursor for select * from jrn where substr(jr_internal,1,1) i=
n ('A','V') and jr_date_paid is null;
+	n_rec jrn_rapt.jr_id%TYPE;
+	nCount integer;
+	jrn_date jrn.jr_date%TYPE;
+begin
+	for row_jrn in cursor_jrn
+	loop
+		select count(*) into nCount from jrn_rapt where jr_id=3Drow_jrn.jr_id =
or jra_concerned=3Drow_jrn.jr_id;
+		if nCount =3D 1 then
+			select jr_id into n_rec from jrn_rapt where  jra_concerned=3Drow_jrn.=
jr_id;
+			if NOT FOUND then
+				select jra_concerned into n_rec from jrn_rapt where  jr_id=3Drow_jrn=
.jr_id;
+			end if;
+			select jr_date into jrn_date from jrn where jr_id=3Dn_rec;
+			update jrn set jr_date_paid =3D jrn_date where current of cursor_jrn;
+		end if;
+
+	end loop;
+
+end;
+$body$
+language plpgsql;
+
+select set_paiement_date();
\ No newline at end of file



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


From MAILER-DAEMON Wed Oct 23 10:27:13 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VYzOz-0007y5-Ap
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 10:27:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 16:16:45 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79044.1382538432.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5523 - phpcompta/trunk/html/admin/sql/patch
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 14:27:11 -0000

Author: danydb
Date: 2013-10-23 16:16:43 +0200 (Wed, 23 Oct 2013)
New Revision: 5523

Added:
   phpcompta/trunk/html/admin/sql/patch/upgrade108.sql
Log:
New db patch

Added: phpcompta/trunk/html/admin/sql/patch/upgrade108.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/patch/upgrade108.sql	                 =
       (rev 0)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade108.sql	2013-10-23 14:16:=
43 UTC (rev 5523)
@@ -0,0 +1,265 @@
+begin;
+
+  update menu_ref set me_description_etendue=3D'Liste de tous vos contac=
ts' where me_code=3D'CONTACT' ;
+ update menu_ref set me_description_etendue=3D'Vous permet d''encoder de=
s achats, d=C3=A9penses, des notes de frais ou des notes de cr=C3=A9dits,=
 vous pouvez sp=C3=A9cifier un b=C3=A9n=C3=A9ficiaire ou un autre moyen d=
e paiement' where me_code=3D'ACH' ;
+ update menu_ref set me_description_etendue=3D'Historique des imputation=
s analytiques' where me_code=3D'ANCHOP' ;
+ update menu_ref set me_description_etendue=3D'Balance simple des imputa=
tions analytiques' where me_code=3D'ANCBS' ;
+ update menu_ref set me_description_etendue=3D'Tableau li=C3=A9 =C3=A0 l=
a comptabilit=C3=A9' where me_code=3D'ANCTAB' ;
+ update menu_ref set me_description_etendue=3D'Lien entre comptabilit=C3=
=A9 et Comptabilit=C3=A9 analytique' where me_code=3D'ANCBCC' ;
+ update menu_ref set me_description_etendue=3D'Balance par groupe' where=
 me_code=3D'ANCGR' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter des tau=
x de TVA ou de les modifier ainsi que les postes comptables de ces TVA, c=
es TVA sont utilisables dans les menus de vente et d''achat' where me_cod=
e=3D'CFGTVA' ;
+ update menu_ref set me_description_etendue=3D'Encodage de tous vos reve=
nus ou vente' where me_code=3D'VEN' ;
+ update menu_ref set me_description_etendue=3D'Ajout de menu ou de plugi=
ns' where me_code=3D'CFGMENU' ;
+ update menu_ref set me_description_etendue=3D'Suivi des fournisseurs : =
devis, lettres, email....' where me_code=3D'SUPPL' ;
+ update menu_ref set me_description_etendue=3D'Op=C3=A9rations diverses =
en Analytique' where me_code=3D'ANCODS' ;
+ update menu_ref set me_description_etendue=3D'Cr=C3=A9ation de rapport =
sur mesure, comme les ratios, vous permet de cr=C3=A9er des graphiques de=
 vos donn=C3=A9es (vente, achat...)' where me_code=3D'REPORT' ;
+ update menu_ref set me_description_etendue=3D'Menu regroupant les plugi=
ns' where me_code=3D'EXT' ;
+ update menu_ref set me_description_etendue=3D'Les op=C3=A9rations pr=C3=
=A9d=C3=A9finies sont des op=C3=A9rations que vous faites r=C3=A9guli=C3=A8=
rement (loyer, abonnement,...) ' where me_code=3D'PREDOP' ;
+ update menu_ref set me_description_etendue=3D'Axe analytique' where me_=
code=3D'PLANANC' ;
+ update menu_ref set me_description_etendue=3D'Regroupement de compte an=
alytique' where me_code=3D'ANCGROUP' ;
+ update menu_ref set me_description_etendue=3D'Op=C3=A9ration diverses t=
els que les amortissements, les augmentations de capital, les salaires, .=
..' where me_code=3D'ODS' ;
+ update menu_ref set me_description_etendue=3D'Encodage d''un extrait ba=
ncaire (=3Drelev=C3=A9 bancaire)' where me_code=3D'FIN' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations un menu de recherche dans une nouvelle fen=C3=AAtre, vous=
 permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9re=
sse' where me_code=3D'JSSEARCH' ;
+ update menu_ref set me_description_etendue=3D'Suivi client : devis, r=C3=
=A9union, courrier, commande...' where me_code=3D'CUST' ;
+ update menu_ref set me_description_etendue=3D'Vous permet d''ajouter de=
 nouveaux type de documents (bordereau de livraison, devis..)' where me_c=
ode=3D'CFGCATDOC' ;
+ update menu_ref set me_description_etendue=3D'Lettrage par fiche' where=
 me_code=3D'LETCARD' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux d''achats un menu de recherche, vous pe=
rmettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9resse=
' where me_code=3D'ACHISTO' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux d''op=C3=A9rations diverses un menu de =
recherche, vous permettra de retrouver rapidement l''op=C3=A9ration qui v=
ous int=C3=A9resse' where me_code=3D'ODHISTO' ;
+ update menu_ref set me_description_etendue=3D'Impression du d=C3=A9tail=
 d''un poste comptable' where me_code=3D'PRINTPOSTE' ;
+ update menu_ref set me_description_etendue=3D'Impression de rapport per=
sonnalis=C3=A9, il est aussi possible d''exporter en CSV afin de faire de=
s graphiques' where me_code=3D'PRINTREPORT' ;
+ update menu_ref set me_description_etendue=3D'Impression du grand livre=
' where me_code=3D'PRINTGL' ;
+ update menu_ref set me_description_etendue=3D'Impression des balances c=
omptables' where me_code=3D'PRINTBAL' ;
+ update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us d''achats(nouvelle op=C3=A9ration, historique...)' where me_code=3D'ME=
NUACH' ;
+ update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us et les profils' where me_code=3D'MOD' ;
+ update menu_ref set me_description_etendue=3D'Module param=C3=A8tres' w=
here me_code=3D'PARAM' ;
+ update menu_ref set me_description_etendue=3D'Menu impression' where me=
_code=3D'PRINT' ;
+ update menu_ref set me_description_etendue=3D'Regroupement des menus de=
s journaux de tr=C3=A9sorerie' where me_code=3D'BK' ;
+ update menu_ref set me_description_etendue=3D'Grand livre pour la compt=
abilit=C3=A9 analytique' where me_code=3D'ANCGL' ;
+ update menu_ref set me_description_etendue=3D'Module gestion' where me_=
code=3D'GESTION' ;
+ update menu_ref set me_description_etendue=3D'Menu Lettrage' where me_c=
ode=3D'LET' ;
+ update menu_ref set me_description_etendue=3D'Choix de votre dossier' w=
here me_code=3D'ACCESS' ;
+ update menu_ref set me_description_etendue=3D'Module comptabilit=C3=A9'=
 where me_code=3D'COMPTA' ;
+ update menu_ref set me_description_etendue=3D'Menu de diff=C3=A9rents p=
aram=C3=A8tres' where me_code=3D'DIVPARM' ;
+ update menu_ref set me_description_etendue=3D'D=C3=A9connexion ' where =
me_code=3D'LOGOUT' ;
+ update menu_ref set me_description_etendue=3D'Configuration des profils=
 des utilisateurs, permet de fixer les journaux, profils dans les documen=
ts et stock que  ce profil peut utiliser. Cela limite les utilisateurs pu=
isque ceux-ci ont un profil' where me_code=3D'CFGPRO' ;
+ update menu_ref set me_description_etendue=3D'Config. poste comptable d=
e base' where me_code=3D'CFGACC' ;
+ update menu_ref set me_description_etendue=3D'Permet d''avoir la balanc=
e de toutes vos fiches, les r=C3=A9sum=C3=A9s exportables en CSV, les his=
toriques avec ou sans lettrages' where me_code=3D'CARD' ;
+ update menu_ref set me_description_etendue=3D'Pr=C3=A9f=C3=A9rence de l=
''utilisateur, apparence de l''application pour l''utilisateur, p=C3=A9ri=
ode par d=C3=A9faut et mot de passe' where me_code=3D'PREFERENCE' ;
+ update menu_ref set me_description_etendue=3D'Configuration des tags ou=
 dossiers, on l''appele tag ou dossier suivant la fa=C3=A7on dont vous ut=
ilisez=20
+cette fonctionnalit=C3=A9. Vous pouvez en ajouter, en supprimer ou les m=
odifier' where me_code=3D'CFGTAG' ;
+ update menu_ref set me_description_etendue=3D'Balance double crois=C3=A9=
es des imputations analytiques' where me_code=3D'ANCBC2' ;
+ update menu_ref set me_description_etendue=3D'Information sur votre soc=
i=C3=A9t=C3=A9 : nom, adresse... utilis=C3=A9 lors de la g=C3=A9n=C3=A9ra=
tion de documents' where me_code=3D'COMPANY' ;
+ update menu_ref set me_description_etendue=3D'Gestion des p=C3=A9riodes=
 : cl=C3=B4ture, ajout de p=C3=A9riode, afin de cr=C3=A9er des p=C3=A9rio=
des vous pouvez aussi utiliser le plugin outil comptable' where me_code=3D=
'PERIODE' ;
+ update menu_ref set me_description_etendue=3D'V=C3=A9rifie que votre co=
mptabilit=C3=A9 ne contient pas d''erreur de base, tels que l''=C3=A9quil=
ibre entre le passif et l''actif, l''utilisation des postes comptables...=
' where me_code=3D'VERIFBIL' ;
+ update menu_ref set me_description_etendue=3D'Ecriture d''ouverture ou =
=C3=A9criture =C3=A0 nouveau, reporte les soldes des comptes de l''ann=C3=
=A9e pass=C3=A9 du poste comptable 0xxx =C3=A0 5xxxx sur l''ann=C3=A9e co=
urante' where me_code=3D'OPEN' ;
+ update menu_ref set me_description_etendue=3D'Chargement de mod=C3=A8le=
s de documents qui seront g=C3=A9n=C3=A9r=C3=A9s par PhpCompta, les forma=
ts utilisables sont libreoffice, html, text et rtf' where me_code=3D'CFGD=
OC' ;
+ update menu_ref set me_description_etendue=3D'Cr=C3=A9ation et modifica=
tion des journaux, pr=C3=A9fixe des pi=C3=A8ces justificatives, num=C3=A9=
rotation, cat=C3=A9gories de fiches accessibles =C3=A0 ce journal' where =
me_code=3D'CFGLED' ;
+ update menu_ref set me_description_etendue=3D'Configuration de la s=C3=A9=
curit=C3=A9, vous permet de donner un profil =C3=A0 vos utilisateurs, cel=
a leur permettra d''utiliser ce que vous souhaitez qu''ils puissent utili=
ser' where me_code=3D'CFGSEC' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
eaux attributs que vous pourrez par la suite ajouter =C3=A0 des cat=C3=A9=
gories de fiches' where me_code=3D'CFGATCARD' ;
+ update menu_ref set me_description_etendue=3D'Etat des stock de l''exer=
cice indiqu=C3=A9' where me_code=3D'STOCK_STATE' ;
+ update menu_ref set me_description_etendue=3D'Modification des stocks, =
menu utilis=C3=A9 pour l''inventaire' where me_code=3D'STOCK_INV' ;
+ update menu_ref set me_description_etendue=3D'Liste des changements man=
uels des stocks, inventaire, transfert de marchandises entre d=C3=A9p=C3=B4=
ts...' where me_code=3D'STOCK_INVHISTO' ;
+ update menu_ref set me_description_etendue=3D'Le navigateur vous pr=C3=A9=
sente une liste de menu auquel vous avez acc=C3=A8s et vous permet d''acc=
=C3=A8der plus rapidement au menu que vous souhaitez' where me_code=3D'NA=
VI' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans tous  les journaux auquels vous avez acc=C3=A8s, vou=
s permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9r=
esse sur base de la date, du poste comptable, des montants...' where me_c=
ode=3D'SEARCH' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations un menu de recherche, vous permettra de retrouver rapidem=
ent l''op=C3=A9ration qui vous int=C3=A9resse' where me_code=3D'HIST' ;
+ update menu_ref set me_description_etendue=3D'Permet de faire correspon=
dre vos extraits bancaires avec les op=C3=A9rations de vente ou d''achat,=
 le lettrage se fait automatiquement' where me_code=3D'FREC' ;
+ update menu_ref set me_description_etendue=3D'Solde des journaux de tr=C3=
=A9sorerie cela concerne les comptes en banques, caisse , les ch=C3=A8que=
s... ' where me_code=3D'FSALDO' ;
+ update menu_ref set me_description_etendue=3D'lettrage par poste compta=
ble' where me_code=3D'LETACC' ;
+ update menu_ref set me_description_etendue=3D'Balance par cat=C3=A9gori=
e de fiche ou pour toutes les fiches ayant un poste comptable' where me_c=
ode=3D'CARDBAL' ;
+ update menu_ref set me_description_etendue=3D'Modification de votre pla=
n comptable, parfois il est plus rapide d''utiliser le plugin "Poste Comp=
table"' where me_code=3D'CFGPCMN' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux de vente un menu de recherche, vous per=
mettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9resse'=
 where me_code=3D'VEHISTO' ;
+ update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux de tr=C3=A9sorerie un menu de recherche=
, vous permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=
=A9resse' where me_code=3D'FIHISTO' ;
+ update menu_ref set me_description_etendue=3D'Impression des rapprochem=
ents : op=C3=A9rations non rapproch=C3=A9es ou avec des montants diff=C3=A9=
rents' where me_code=3D'PRINTREC' ;
+ update menu_ref set me_description_etendue=3D'Impression de bilan, ce m=
odule est basique, il est plus int=C3=A9ressant d''utiliser le plugin "ra=
pport avanc=C3=A9s"' where me_code=3D'PRINTBILAN' ;
+ update menu_ref set me_description_etendue=3D'Configuration des entrepo=
ts de d=C3=A9p=C3=B4ts' where me_code=3D'CFGSTOCK' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
elles cat=C3=A9gorie de fiche, d''ajouter des attributs =C3=A0 ces cat=C3=
=A9gories (num=C3=A9ro de t=C3=A9l=C3=A9phone, gsm, email...)' where me_c=
ode=3D'STOCK' ;
+ update menu_ref set me_description_etendue=3D'Permet de changer le post=
e comptable de base des cat=C3=A9gories de fiches' where me_code=3D'CFGCA=
RDCAT' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
elles cat=C3=A9gorie de fiche, d''ajouter des attributs =C3=A0 ces cat=C3=
=A9gories (num=C3=A9ro de t=C3=A9l=C3=A9phone, gsm, email...)' where me_c=
ode=3D'CFGCARD' ;
+ update menu_ref set me_description_etendue=3D'Permet d''ajouter des =C3=
=A9tat pour les documents utilis=C3=A9s dans le suivi (=C3=A0 faire, =C3=A0=
 suivre...)' where me_code=3D'CFGDOCST' ;
+ update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us d''op=C3=A9rations diverses (nouvelle op=C3=A9ration, historique...)' =
where me_code=3D'MENUODS' ;
+ update menu_ref set me_description_etendue=3D'Impression des journaux a=
vec les d=C3=A9tails pour les parties priv=C3=A9s, la TVA et ce qui est n=
on d=C3=A9ductibles en ce qui concerne les journaux de vente et d''achat'=
 where me_code=3D'PRINTJRN' ;
+ update menu_ref set me_description_etendue=3D'Regroupement des menus ve=
ntes et recettes' where me_code=3D'VENMENU' ;
+ update menu_ref set me_description_etendue=3D'Impression compta. analyt=
ique' where me_code=3D'ANCIMP' ;
+ update menu_ref set me_description_etendue=3D'Module comptabilit=C3=A9 =
analytique' where me_code=3D'ANC' ;
+ update menu_ref set me_description_etendue=3D'Tableau de suivi, vous pe=
rmet de voir en un coup d''oeil vos derni=C3=A8res op=C3=A9rations, un pe=
tit calendrier, une liste de chose =C3=A0 faire...' where me_code=3D'DASH=
BOARD' ;
+ update menu_ref set me_description_etendue=3D'Menu regroupant la cr=C3=A9=
ation de rapport, la v=C3=A9rification de la comptabilit=C3=A9...' where =
me_code=3D'ADV' ;
+ update menu_ref set me_description_etendue=3D'Ce menu vous pr=C3=A9sent=
e  un menu rapide de vos menus pr=C3=A9f=C3=A9r=C3=A9s' where me_code=3D'=
BOOKMARK' ;
+ update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us de tr=C3=A9sorerie (nouvelle op=C3=A9ration, historique...)' where me_=
code=3D'MENUFIN' ;
+ update menu_ref set me_description_etendue=3D'Liste de vos suivis, en f=
ait de tous les documents, r=C3=A9unions ... dont vous avez besoin afin d=
e suivre vos clients, fournisseurs ou administrations. Il permet la g=C3=A9=
n=C3=A9ration de documents comme les devis, les bordereau de livraison...=
' where me_code=3D'FOLLOW' ;
+ update menu_ref set me_description_etendue=3D'Configuration des moyens =
de paiements que vous voulez utiliser dans les journaux de type VEN ou AC=
H, les moyens de paiement permettent de g=C3=A9n=C3=A9rer l''op=C3=A9rati=
on de tr=C3=A9sorerie en m=C3=AAme temps que l''achat, la note de frais o=
u la vente' where me_code=3D'CFGPAY' ;
+ update menu_ref set me_description_etendue=3D'Suivi des administrations=
 : courrrier, d=C3=A9clarations.' where me_code=3D'ADM' ;
+ update menu_ref set me_description_etendue=3D'Pr=C3=A9vision de vos ach=
ats, revenus, permet de suivre l''=C3=A9volution de votre soci=C3=A9t=C3=A9=
. Vos pr=C3=A9visions sont des formules sur les postes comptables et vous=
 permettent aussi vos marges brutes.' where me_code=3D'FORECAST' ;
+
+CREATE OR REPLACE VIEW v_detail_sale AS=20
+with m as=20
+	(select sum(qs_price) as htva, sum(qs_vat) as tot_vat,jr_id from quant_=
sold join jrnx using (j_id) join jrn on (j_grpt=3Djr_grpt_id) group by jr=
_id)
+ SELECT jrn.jr_id,=20
+	jrn.jr_date,=20
+	jrn.jr_tech_per,=20
+	jrn.jr_comment,=20
+	jrn.jr_pj_number,=20
+	jrn.jr_internal,=20
+	jrn.jr_def_id,=20
+	jrnx.j_poste,=20
+	jrnx.j_text,=20
+	jrnx.j_qcode,=20
+	quant_sold.qs_fiche as item_card,=20
+	a.name AS item_name,=20
+	quant_sold.qs_client,=20
+	b.vw_name AS tiers_name,=20
+	b.quick_code,=20
+	tva_rate.tva_label,=20
+	tva_rate.tva_comment,=20
+	tva_rate.tva_both_side,=20
+	quant_sold.qs_vat_sided as vat_sided,=20
+	quant_sold.qs_vat_code as vat_code,=20
+	quant_sold.qs_vat as vat,=20
+	quant_sold.qs_price as price,=20
+	quant_sold.qs_quantite as quantity,=20
+	quant_sold.qs_price / quant_sold.qs_quantite AS price_per_unit
+	, htva
+	,tot_vat
+   FROM jrn
+   JOIN jrnx ON jrn.jr_grpt_id =3D jrnx.j_grpt
+   JOIN quant_sold USING (j_id)
+   JOIN vw_fiche_name a ON quant_sold.qs_fiche =3D a.f_id
+   JOIN vw_fiche_attr b ON quant_sold.qs_client =3D b.f_id
+   JOIN tva_rate ON quant_sold.qs_vat_code =3D tva_rate.tva_id
+   join m on (m.jr_id=3Djrn.jr_id)
+   ;
+
+CREATE OR REPLACE VIEW v_detail_purchase AS=20
+ WITH m AS (
+         SELECT sum(quant_purchase.qp_price) AS htva, sum(quant_purchase=
.qp_vat) AS tot_vat, jrn.jr_id
+           FROM quant_purchase
+      JOIN jrnx USING (j_id)
+   JOIN jrn ON jrnx.j_grpt =3D jrn.jr_grpt_id
+  GROUP BY jrn.jr_id
+        )
+ SELECT jrn.jr_id,=20
+            jrn.jr_date
+        , jrn.jr_tech_per
+        , jrn.jr_comment
+        , jrn.jr_pj_number
+        , jrn.jr_internal
+        , jrn.jr_def_id
+        , jrnx.j_poste
+        , jrnx.j_text
+        , jrnx.j_qcode
+        , quant_purchase.qp_fiche AS item_card
+        , a.name AS item_name
+        , quant_purchase.qp_supplier
+        , b.vw_name AS tiers_name
+        , b.quick_code
+        , tva_rate.tva_label
+        , tva_rate.tva_comment
+        , tva_rate.tva_both_side
+        , quant_purchase.qp_vat_sided AS vat_sided
+        , quant_purchase.qp_vat_code AS vat_code
+        , quant_purchase.qp_vat AS vat
+        , quant_purchase.qp_price AS price
+        , quant_purchase.qp_quantite AS quantity
+        , quant_purchase.qp_price / quant_purchase.qp_quantite AS price_=
per_unit
+        , quant_purchase.qp_nd_amount AS non_ded_amount
+        , quant_purchase.qp_nd_tva AS non_ded_tva
+        , quant_purchase.qp_nd_tva_recup AS non_ded_tva_recup
+        , m.htva, m.tot_vat
+   FROM jrn
+   JOIN jrnx ON jrn.jr_grpt_id =3D jrnx.j_grpt
+   JOIN quant_purchase USING (j_id)
+   JOIN vw_fiche_name a ON quant_purchase.qp_fiche =3D a.f_id
+   JOIN vw_fiche_attr b ON quant_purchase.qp_supplier =3D b.f_id
+   JOIN tva_rate ON quant_purchase.qp_vat_code =3D tva_rate.tva_id
+   JOIN m ON m.jr_id =3D jrn.jr_id;
+
+   create or replace view v_quant_detail as
+with quant as=20
+	(select=20
+		j_id,
+		qp_fiche as fiche_id,
+		qp_supplier as tiers,=20
+		qp_vat as vat_amount,
+		qp_price as price,
+		qp_vat_code as vat_code,
+		qp_dep_priv as dep_priv,
+		qp_nd_tva as nd_tva,
+		qp_nd_tva_recup as nd_tva_recup,
+		qp_nd_amount	as nd_amount,
+		qp_vat_sided as vat_sided
+		from quant_purchase
+	union all=09
+	select=20
+		j_id,
+		qs_fiche,
+		qs_client,
+		qs_vat,
+		qs_price,
+		qs_vat_code,
+		0,
+		0,
+		0,
+		0,
+		qs_vat_sided
+	from=20
+		quant_sold
+)=09
+select=20
+	jr_id,quant.tiers,jrn_def_name,jrn_def_type,name,jr_comment,jr_montant,=
sum(price) as price,vat_code,sum(vat_amount) as vat_amount,sum(dep_priv) =
as dep_priv,sum(nd_tva) as nd_tva,sum(nd_tva_recup) as nd_tva_recup,sum(n=
d_amount) as nd_amount,vat_sided,tva_label
+from=20
+jrn
+join jrnx on (jrnx.j_grpt=3Djrn.jr_grpt_id)
+join quant using (j_id)
+left join vw_fiche_name on (tiers=3Dvw_fiche_name.f_id)
+join jrn_def on (jrn_def_id=3Djr_def_id)
+join tva_rate on (tva_id=3Dvat_code)
+group by
+jr_id,quant.tiers,jr_comment,jr_montant,vat_code,vat_sided,name,jrn_def_=
name,jrn_def_type,tva_label;
+
+
+insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_p=
arameter,me_javascript,me_type,me_description_etendue)
+values
+('CSV:Reconciliation','Export op=C3=A9rations rapproch=C3=A9es','export_=
rec_csv.php',null,'Export op=C3=A9rations rapproch=C3=A9es en CSV',null,n=
ull,'PR','');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_displ=
ay,pm_default)=20
+values
+('CSV:Reconciliation',null,1,0,'P',0), ('CSV:Reconciliation',null,2,null=
,'P',0);
+
+alter table stock_change alter tech_date type time;
+
+alter table jrn add column jr_date_paid date;
+
+create or replace function set_paiement_date() returns void
+  as
+  $body$
+  declare=20
+	  row_jrn jrn%ROWTYPE;
+	  cursor_jrn cursor for select * from jrn where substr(jr_internal,1,1)=
 in ('A','V') and jr_date_paid is null;
+	  n_rec jrn_rapt.jr_id%TYPE;
+	  nCount integer;
+	  jrn_date jrn.jr_date%TYPE;
+  begin
+	  for row_jrn in cursor_jrn
+	  loop
+		  select count(*) into nCount from jrn_rapt where jr_id=3Drow_jrn.jr_i=
d or jra_concerned=3Drow_jrn.jr_id;
+		  if nCount =3D 1 then
+			  select jr_id into n_rec from jrn_rapt where  jra_concerned=3Drow_jr=
n.jr_id;
+			  if NOT FOUND then
+				  select jra_concerned into n_rec from jrn_rapt where  jr_id=3Drow_j=
rn.jr_id;
+			  end if;
+			  select jr_date into jrn_date from jrn where jr_id=3Dn_rec;
+			  update jrn set jr_date_paid =3D jrn_date where current of cursor_jr=
n;
+		  end if;
+
+	  end loop;
+
+end;
+$body$
+language plpgsql;
+
+select set_paiement_date();
+
+drop function set_paiement_date();
+
+update version set val=3D109;
+
+commit;
\ No newline at end of file



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


From MAILER-DAEMON Wed Oct 23 10:30:13 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VYzRt-0008Hp-4h
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 10:30:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 16:19:45 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79045.1382538611.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5524 - in phpcompta/trunk: html/admin/sql/patch
	include sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 14:30:11 -0000

Author: danydb
Date: 2013-10-23 16:19:44 +0200 (Wed, 23 Oct 2013)
New Revision: 5524

Modified:
   phpcompta/trunk/html/admin/sql/patch/
   phpcompta/trunk/include/class_database.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/sql/upgrade.sql
Log:
Add patch upgrade108.sql


Property changes on: phpcompta/trunk/html/admin/sql/patch
___________________________________________________________________
Name: svn:ignore
   - .ac-upgrade13.sql.swp
.ac-upgrade12.sql.swp

   + .ac-upgrade13.sql.swp
.ac-upgrade12.sql.swp
.upgrade107.sql.kate-swp


Modified: phpcompta/trunk/include/class_database.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_database.php	2013-10-23 14:16:43 UTC (r=
ev 5523)
+++ phpcompta/trunk/include/class_database.php	2013-10-23 14:19:44 UTC (r=
ev 5524)
@@ -110,6 +110,7 @@
         $this->db=3D$a;
         if ( $this->exist_schema('comptaproc') )
             pg_exec($this->db,'set search_path to public,comptaproc;');
+            pg_exec($this->db,'set DateStyle to ISO, MDY;');
         ob_end_clean();
     }
=20

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-10-23 14:16:43 UTC (rev 552=
3)
+++ phpcompta/trunk/include/constant.php	2013-10-23 14:19:44 UTC (rev 552=
4)
@@ -71,7 +71,7 @@
 define ("SITE_UPDATE_PLUGIN",'http://www.phpcompta.eu/plugin_last_versio=
n.txt');
=20
=20
-define ("DBVERSION",108);
+define ("DBVERSION",109);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",14);
 define ('NOTFOUND','--not found--');

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-10-23 14:16:43 UTC (rev 5523)
+++ phpcompta/trunk/sql/upgrade.sql	2013-10-23 14:19:44 UTC (rev 5524)
@@ -1,189 +0,0 @@
-create or replace function do_insert() returns void
-as
-$$
-declare
-    nCount integer;
-begin
-    select count(*) into nCount from menu_ref where me_file=3D'contact.i=
nc.php';
-    if nCount =3D 0 then
-        insert into menu_ref(ME_CODE,me_menu,me_file,me_description,me_t=
ype) values ('CONTACT','Contact','contact.inc.php','Liste des contacts','=
ME');
-    end if;
-end;
-$$
-language plpgsql;
-
-select do_insert();
-
-drop function do_insert();
-
-  update menu_ref set me_description_etendue=3D'Liste de tous vos contac=
ts' where me_code=3D'CONTACT' ;
- update menu_ref set me_description_etendue=3D'Vous permet d''encoder de=
s achats, d=C3=A9penses, des notes de frais ou des notes de cr=C3=A9dits,=
 vous pouvez sp=C3=A9cifier un b=C3=A9n=C3=A9ficiaire ou un autre moyen d=
e paiement' where me_code=3D'ACH' ;
- update menu_ref set me_description_etendue=3D'Historique des imputation=
s analytiques' where me_code=3D'ANCHOP' ;
- update menu_ref set me_description_etendue=3D'Balance simple des imputa=
tions analytiques' where me_code=3D'ANCBS' ;
- update menu_ref set me_description_etendue=3D'Tableau li=C3=A9 =C3=A0 l=
a comptabilit=C3=A9' where me_code=3D'ANCTAB' ;
- update menu_ref set me_description_etendue=3D'Lien entre comptabilit=C3=
=A9 et Comptabilit=C3=A9 analytique' where me_code=3D'ANCBCC' ;
- update menu_ref set me_description_etendue=3D'Balance par groupe' where=
 me_code=3D'ANCGR' ;
- update menu_ref set me_description_etendue=3D'Permet d''ajouter des tau=
x de TVA ou de les modifier ainsi que les postes comptables de ces TVA, c=
es TVA sont utilisables dans les menus de vente et d''achat' where me_cod=
e=3D'CFGTVA' ;
- update menu_ref set me_description_etendue=3D'Encodage de tous vos reve=
nus ou vente' where me_code=3D'VEN' ;
- update menu_ref set me_description_etendue=3D'Ajout de menu ou de plugi=
ns' where me_code=3D'CFGMENU' ;
- update menu_ref set me_description_etendue=3D'Suivi des fournisseurs : =
devis, lettres, email....' where me_code=3D'SUPPL' ;
- update menu_ref set me_description_etendue=3D'Op=C3=A9rations diverses =
en Analytique' where me_code=3D'ANCODS' ;
- update menu_ref set me_description_etendue=3D'Cr=C3=A9ation de rapport =
sur mesure, comme les ratios, vous permet de cr=C3=A9er des graphiques de=
 vos donn=C3=A9es (vente, achat...)' where me_code=3D'REPORT' ;
- update menu_ref set me_description_etendue=3D'Menu regroupant les plugi=
ns' where me_code=3D'EXT' ;
- update menu_ref set me_description_etendue=3D'Les op=C3=A9rations pr=C3=
=A9d=C3=A9finies sont des op=C3=A9rations que vous faites r=C3=A9guli=C3=A8=
rement (loyer, abonnement,...) ' where me_code=3D'PREDOP' ;
- update menu_ref set me_description_etendue=3D'Axe analytique' where me_=
code=3D'PLANANC' ;
- update menu_ref set me_description_etendue=3D'Regroupement de compte an=
alytique' where me_code=3D'ANCGROUP' ;
- update menu_ref set me_description_etendue=3D'Op=C3=A9ration diverses t=
els que les amortissements, les augmentations de capital, les salaires, .=
..' where me_code=3D'ODS' ;
- update menu_ref set me_description_etendue=3D'Encodage d''un extrait ba=
ncaire (=3Drelev=C3=A9 bancaire)' where me_code=3D'FIN' ;
- update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations un menu de recherche dans une nouvelle fen=C3=AAtre, vous=
 permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9re=
sse' where me_code=3D'JSSEARCH' ;
- update menu_ref set me_description_etendue=3D'Suivi client : devis, r=C3=
=A9union, courrier, commande...' where me_code=3D'CUST' ;
- update menu_ref set me_description_etendue=3D'Vous permet d''ajouter de=
 nouveaux type de documents (bordereau de livraison, devis..)' where me_c=
ode=3D'CFGCATDOC' ;
- update menu_ref set me_description_etendue=3D'Lettrage par fiche' where=
 me_code=3D'LETCARD' ;
- update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux d''achats un menu de recherche, vous pe=
rmettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9resse=
' where me_code=3D'ACHISTO' ;
- update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux d''op=C3=A9rations diverses un menu de =
recherche, vous permettra de retrouver rapidement l''op=C3=A9ration qui v=
ous int=C3=A9resse' where me_code=3D'ODHISTO' ;
- update menu_ref set me_description_etendue=3D'Impression du d=C3=A9tail=
 d''un poste comptable' where me_code=3D'PRINTPOSTE' ;
- update menu_ref set me_description_etendue=3D'Impression de rapport per=
sonnalis=C3=A9, il est aussi possible d''exporter en CSV afin de faire de=
s graphiques' where me_code=3D'PRINTREPORT' ;
- update menu_ref set me_description_etendue=3D'Impression du grand livre=
' where me_code=3D'PRINTGL' ;
- update menu_ref set me_description_etendue=3D'Impression des balances c=
omptables' where me_code=3D'PRINTBAL' ;
- update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us d''achats(nouvelle op=C3=A9ration, historique...)' where me_code=3D'ME=
NUACH' ;
- update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us et les profils' where me_code=3D'MOD' ;
- update menu_ref set me_description_etendue=3D'Module param=C3=A8tres' w=
here me_code=3D'PARAM' ;
- update menu_ref set me_description_etendue=3D'Menu impression' where me=
_code=3D'PRINT' ;
- update menu_ref set me_description_etendue=3D'Regroupement des menus de=
s journaux de tr=C3=A9sorerie' where me_code=3D'BK' ;
- update menu_ref set me_description_etendue=3D'Grand livre pour la compt=
abilit=C3=A9 analytique' where me_code=3D'ANCGL' ;
- update menu_ref set me_description_etendue=3D'Module gestion' where me_=
code=3D'GESTION' ;
- update menu_ref set me_description_etendue=3D'Menu Lettrage' where me_c=
ode=3D'LET' ;
- update menu_ref set me_description_etendue=3D'Choix de votre dossier' w=
here me_code=3D'ACCESS' ;
- update menu_ref set me_description_etendue=3D'Module comptabilit=C3=A9'=
 where me_code=3D'COMPTA' ;
- update menu_ref set me_description_etendue=3D'Menu de diff=C3=A9rents p=
aram=C3=A8tres' where me_code=3D'DIVPARM' ;
- update menu_ref set me_description_etendue=3D'D=C3=A9connexion ' where =
me_code=3D'LOGOUT' ;
- update menu_ref set me_description_etendue=3D'Configuration des profils=
 des utilisateurs, permet de fixer les journaux, profils dans les documen=
ts et stock que  ce profil peut utiliser. Cela limite les utilisateurs pu=
isque ceux-ci ont un profil' where me_code=3D'CFGPRO' ;
- update menu_ref set me_description_etendue=3D'Config. poste comptable d=
e base' where me_code=3D'CFGACC' ;
- update menu_ref set me_description_etendue=3D'Permet d''avoir la balanc=
e de toutes vos fiches, les r=C3=A9sum=C3=A9s exportables en CSV, les his=
toriques avec ou sans lettrages' where me_code=3D'CARD' ;
- update menu_ref set me_description_etendue=3D'Pr=C3=A9f=C3=A9rence de l=
''utilisateur, apparence de l''application pour l''utilisateur, p=C3=A9ri=
ode par d=C3=A9faut et mot de passe' where me_code=3D'PREFERENCE' ;
- update menu_ref set me_description_etendue=3D'Configuration des tags ou=
 dossiers, on l''appele tag ou dossier suivant la fa=C3=A7on dont vous ut=
ilisez=20
-cette fonctionnalit=C3=A9. Vous pouvez en ajouter, en supprimer ou les m=
odifier' where me_code=3D'CFGTAG' ;
- update menu_ref set me_description_etendue=3D'Balance double crois=C3=A9=
es des imputations analytiques' where me_code=3D'ANCBC2' ;
- update menu_ref set me_description_etendue=3D'Information sur votre soc=
i=C3=A9t=C3=A9 : nom, adresse... utilis=C3=A9 lors de la g=C3=A9n=C3=A9ra=
tion de documents' where me_code=3D'COMPANY' ;
- update menu_ref set me_description_etendue=3D'Gestion des p=C3=A9riodes=
 : cl=C3=B4ture, ajout de p=C3=A9riode, afin de cr=C3=A9er des p=C3=A9rio=
des vous pouvez aussi utiliser le plugin outil comptable' where me_code=3D=
'PERIODE' ;
- update menu_ref set me_description_etendue=3D'V=C3=A9rifie que votre co=
mptabilit=C3=A9 ne contient pas d''erreur de base, tels que l''=C3=A9quil=
ibre entre le passif et l''actif, l''utilisation des postes comptables...=
' where me_code=3D'VERIFBIL' ;
- update menu_ref set me_description_etendue=3D'Ecriture d''ouverture ou =
=C3=A9criture =C3=A0 nouveau, reporte les soldes des comptes de l''ann=C3=
=A9e pass=C3=A9 du poste comptable 0xxx =C3=A0 5xxxx sur l''ann=C3=A9e co=
urante' where me_code=3D'OPEN' ;
- update menu_ref set me_description_etendue=3D'Chargement de mod=C3=A8le=
s de documents qui seront g=C3=A9n=C3=A9r=C3=A9s par PhpCompta, les forma=
ts utilisables sont libreoffice, html, text et rtf' where me_code=3D'CFGD=
OC' ;
- update menu_ref set me_description_etendue=3D'Cr=C3=A9ation et modifica=
tion des journaux, pr=C3=A9fixe des pi=C3=A8ces justificatives, num=C3=A9=
rotation, cat=C3=A9gories de fiches accessibles =C3=A0 ce journal' where =
me_code=3D'CFGLED' ;
- update menu_ref set me_description_etendue=3D'Configuration de la s=C3=A9=
curit=C3=A9, vous permet de donner un profil =C3=A0 vos utilisateurs, cel=
a leur permettra d''utiliser ce que vous souhaitez qu''ils puissent utili=
ser' where me_code=3D'CFGSEC' ;
- update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
eaux attributs que vous pourrez par la suite ajouter =C3=A0 des cat=C3=A9=
gories de fiches' where me_code=3D'CFGATCARD' ;
- update menu_ref set me_description_etendue=3D'Etat des stock de l''exer=
cice indiqu=C3=A9' where me_code=3D'STOCK_STATE' ;
- update menu_ref set me_description_etendue=3D'Modification des stocks, =
menu utilis=C3=A9 pour l''inventaire' where me_code=3D'STOCK_INV' ;
- update menu_ref set me_description_etendue=3D'Liste des changements man=
uels des stocks, inventaire, transfert de marchandises entre d=C3=A9p=C3=B4=
ts...' where me_code=3D'STOCK_INVHISTO' ;
- update menu_ref set me_description_etendue=3D'Le navigateur vous pr=C3=A9=
sente une liste de menu auquel vous avez acc=C3=A8s et vous permet d''acc=
=C3=A8der plus rapidement au menu que vous souhaitez' where me_code=3D'NA=
VI' ;
- update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans tous  les journaux auquels vous avez acc=C3=A8s, vou=
s permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9r=
esse sur base de la date, du poste comptable, des montants...' where me_c=
ode=3D'SEARCH' ;
- update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations un menu de recherche, vous permettra de retrouver rapidem=
ent l''op=C3=A9ration qui vous int=C3=A9resse' where me_code=3D'HIST' ;
- update menu_ref set me_description_etendue=3D'Permet de faire correspon=
dre vos extraits bancaires avec les op=C3=A9rations de vente ou d''achat,=
 le lettrage se fait automatiquement' where me_code=3D'FREC' ;
- update menu_ref set me_description_etendue=3D'Solde des journaux de tr=C3=
=A9sorerie cela concerne les comptes en banques, caisse , les ch=C3=A8que=
s... ' where me_code=3D'FSALDO' ;
- update menu_ref set me_description_etendue=3D'lettrage par poste compta=
ble' where me_code=3D'LETACC' ;
- update menu_ref set me_description_etendue=3D'Balance par cat=C3=A9gori=
e de fiche ou pour toutes les fiches ayant un poste comptable' where me_c=
ode=3D'CARDBAL' ;
- update menu_ref set me_description_etendue=3D'Modification de votre pla=
n comptable, parfois il est plus rapide d''utiliser le plugin "Poste Comp=
table"' where me_code=3D'CFGPCMN' ;
- update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux de vente un menu de recherche, vous per=
mettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=A9resse'=
 where me_code=3D'VEHISTO' ;
- update menu_ref set me_description_etendue=3D'Historique de toutes vos =
op=C3=A9rations dans les journaux de tr=C3=A9sorerie un menu de recherche=
, vous permettra de retrouver rapidement l''op=C3=A9ration qui vous int=C3=
=A9resse' where me_code=3D'FIHISTO' ;
- update menu_ref set me_description_etendue=3D'Impression des rapprochem=
ents : op=C3=A9rations non rapproch=C3=A9es ou avec des montants diff=C3=A9=
rents' where me_code=3D'PRINTREC' ;
- update menu_ref set me_description_etendue=3D'Impression de bilan, ce m=
odule est basique, il est plus int=C3=A9ressant d''utiliser le plugin "ra=
pport avanc=C3=A9s"' where me_code=3D'PRINTBILAN' ;
- update menu_ref set me_description_etendue=3D'Configuration des entrepo=
ts de d=C3=A9p=C3=B4ts' where me_code=3D'CFGSTOCK' ;
- update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
elles cat=C3=A9gorie de fiche, d''ajouter des attributs =C3=A0 ces cat=C3=
=A9gories (num=C3=A9ro de t=C3=A9l=C3=A9phone, gsm, email...)' where me_c=
ode=3D'STOCK' ;
- update menu_ref set me_description_etendue=3D'Permet de changer le post=
e comptable de base des cat=C3=A9gories de fiches' where me_code=3D'CFGCA=
RDCAT' ;
- update menu_ref set me_description_etendue=3D'Permet d''ajouter de nouv=
elles cat=C3=A9gorie de fiche, d''ajouter des attributs =C3=A0 ces cat=C3=
=A9gories (num=C3=A9ro de t=C3=A9l=C3=A9phone, gsm, email...)' where me_c=
ode=3D'CFGCARD' ;
- update menu_ref set me_description_etendue=3D'Permet d''ajouter des =C3=
=A9tat pour les documents utilis=C3=A9s dans le suivi (=C3=A0 faire, =C3=A0=
 suivre...)' where me_code=3D'CFGDOCST' ;
- update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us d''op=C3=A9rations diverses (nouvelle op=C3=A9ration, historique...)' =
where me_code=3D'MENUODS' ;
- update menu_ref set me_description_etendue=3D'Impression des journaux a=
vec les d=C3=A9tails pour les parties priv=C3=A9s, la TVA et ce qui est n=
on d=C3=A9ductibles en ce qui concerne les journaux de vente et d''achat'=
 where me_code=3D'PRINTJRN' ;
- update menu_ref set me_description_etendue=3D'Regroupement des menus ve=
ntes et recettes' where me_code=3D'VENMENU' ;
- update menu_ref set me_description_etendue=3D'Impression compta. analyt=
ique' where me_code=3D'ANCIMP' ;
- update menu_ref set me_description_etendue=3D'Module comptabilit=C3=A9 =
analytique' where me_code=3D'ANC' ;
- update menu_ref set me_description_etendue=3D'Tableau de suivi, vous pe=
rmet de voir en un coup d''oeil vos derni=C3=A8res op=C3=A9rations, un pe=
tit calendrier, une liste de chose =C3=A0 faire...' where me_code=3D'DASH=
BOARD' ;
- update menu_ref set me_description_etendue=3D'Menu regroupant la cr=C3=A9=
ation de rapport, la v=C3=A9rification de la comptabilit=C3=A9...' where =
me_code=3D'ADV' ;
- update menu_ref set me_description_etendue=3D'Ce menu vous pr=C3=A9sent=
e  un menu rapide de vos menus pr=C3=A9f=C3=A9r=C3=A9s' where me_code=3D'=
BOOKMARK' ;
- update menu_ref set me_description_etendue=3D'Regroupement pour les men=
us de tr=C3=A9sorerie (nouvelle op=C3=A9ration, historique...)' where me_=
code=3D'MENUFIN' ;
- update menu_ref set me_description_etendue=3D'Liste de vos suivis, en f=
ait de tous les documents, r=C3=A9unions ... dont vous avez besoin afin d=
e suivre vos clients, fournisseurs ou administrations. Il permet la g=C3=A9=
n=C3=A9ration de documents comme les devis, les bordereau de livraison...=
' where me_code=3D'FOLLOW' ;
- update menu_ref set me_description_etendue=3D'Configuration des moyens =
de paiements que vous voulez utiliser dans les journaux de type VEN ou AC=
H, les moyens de paiement permettent de g=C3=A9n=C3=A9rer l''op=C3=A9rati=
on de tr=C3=A9sorerie en m=C3=AAme temps que l''achat, la note de frais o=
u la vente' where me_code=3D'CFGPAY' ;
- update menu_ref set me_description_etendue=3D'Suivi des administrations=
 : courrrier, d=C3=A9clarations.' where me_code=3D'ADM' ;
- update menu_ref set me_description_etendue=3D'Pr=C3=A9vision de vos ach=
ats, revenus, permet de suivre l''=C3=A9volution de votre soci=C3=A9t=C3=A9=
. Vos pr=C3=A9visions sont des formules sur les postes comptables et vous=
 permettent aussi vos marges brutes.' where me_code=3D'FORECAST' ;
-
-CREATE OR REPLACE VIEW v_detail_sale AS=20
-with m as=20
-	(select sum(qs_price) as htva, sum(qs_vat) as tot_vat,jr_id from quant_=
sold join jrnx using (j_id) join jrn on (j_grpt=3Djr_grpt_id) group by jr=
_id)
- SELECT jrn.jr_id,=20
-	jrn.jr_date,=20
-	jrn.jr_tech_per,=20
-	jrn.jr_comment,=20
-	jrn.jr_pj_number,=20
-	jrn.jr_internal,=20
-	jrn.jr_def_id,=20
-	jrnx.j_poste,=20
-	jrnx.j_text,=20
-	jrnx.j_qcode,=20
-	quant_sold.qs_fiche as item_card,=20
-	a.name AS item_name,=20
-	quant_sold.qs_client,=20
-	b.vw_name AS tiers_name,=20
-	b.quick_code,=20
-	tva_rate.tva_label,=20
-	tva_rate.tva_comment,=20
-	tva_rate.tva_both_side,=20
-	quant_sold.qs_vat_sided as vat_sided,=20
-	quant_sold.qs_vat_code as vat_code,=20
-	quant_sold.qs_vat as vat,=20
-	quant_sold.qs_price as price,=20
-	quant_sold.qs_quantite as quantity,=20
-	quant_sold.qs_price / quant_sold.qs_quantite AS price_per_unit
-	, htva
-	,tot_vat
-   FROM jrn
-   JOIN jrnx ON jrn.jr_grpt_id =3D jrnx.j_grpt
-   JOIN quant_sold USING (j_id)
-   JOIN vw_fiche_name a ON quant_sold.qs_fiche =3D a.f_id
-   JOIN vw_fiche_attr b ON quant_sold.qs_client =3D b.f_id
-   JOIN tva_rate ON quant_sold.qs_vat_code =3D tva_rate.tva_id
-   join m on (m.jr_id=3Djrn.jr_id)
-   ;
-
-CREATE OR REPLACE VIEW v_detail_purchase AS=20
- WITH m AS (
-         SELECT sum(quant_purchase.qp_price) AS htva, sum(quant_purchase=
.qp_vat) AS tot_vat, jrn.jr_id
-           FROM quant_purchase
-      JOIN jrnx USING (j_id)
-   JOIN jrn ON jrnx.j_grpt =3D jrn.jr_grpt_id
-  GROUP BY jrn.jr_id
-        )
- SELECT jrn.jr_id,=20
-            jrn.jr_date
-        , jrn.jr_tech_per
-        , jrn.jr_comment
-        , jrn.jr_pj_number
-        , jrn.jr_internal
-        , jrn.jr_def_id
-        , jrnx.j_poste
-        , jrnx.j_text
-        , jrnx.j_qcode
-        , quant_purchase.qp_fiche AS item_card
-        , a.name AS item_name
-        , quant_purchase.qp_supplier
-        , b.vw_name AS tiers_name
-        , b.quick_code
-        , tva_rate.tva_label
-        , tva_rate.tva_comment
-        , tva_rate.tva_both_side
-        , quant_purchase.qp_vat_sided AS vat_sided
-        , quant_purchase.qp_vat_code AS vat_code
-        , quant_purchase.qp_vat AS vat
-        , quant_purchase.qp_price AS price
-        , quant_purchase.qp_quantite AS quantity
-        , quant_purchase.qp_price / quant_purchase.qp_quantite AS price_=
per_unit
-        , quant_purchase.qp_nd_amount AS non_ded_amount
-        , quant_purchase.qp_nd_tva AS non_ded_tva
-        , quant_purchase.qp_nd_tva_recup AS non_ded_tva_recup
-        , m.htva, m.tot_vat
-   FROM jrn
-   JOIN jrnx ON jrn.jr_grpt_id =3D jrnx.j_grpt
-   JOIN quant_purchase USING (j_id)
-   JOIN vw_fiche_name a ON quant_purchase.qp_fiche =3D a.f_id
-   JOIN vw_fiche_attr b ON quant_purchase.qp_supplier =3D b.f_id
-   JOIN tva_rate ON quant_purchase.qp_vat_code =3D tva_rate.tva_id
-   JOIN m ON m.jr_id =3D jrn.jr_id;



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


From MAILER-DAEMON Wed Oct 23 10:50:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VYzlP-0004k0-H6
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 10:50:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 16:39:57 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79060.1382539823.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5525 - phpcompta/trunk/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 14:50:22 -0000

Author: danydb
Date: 2013-10-23 16:39:56 +0200 (Wed, 23 Oct 2013)
New Revision: 5525

Removed:
   phpcompta/trunk/sql/1-detail-operation-rapprochement.sql
   phpcompta/trunk/sql/2-insert-csv-menu.sql.sql
   phpcompta/trunk/sql/3-stock-col-change.sql
   phpcompta/trunk/sql/4-date-paiement.sql
Log:
make patch upgrade108.sql with them

Deleted: phpcompta/trunk/sql/1-detail-operation-rapprochement.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/1-detail-operation-rapprochement.sql	2013-10-23 1=
4:19:44 UTC (rev 5524)
+++ phpcompta/trunk/sql/1-detail-operation-rapprochement.sql	2013-10-23 1=
4:39:56 UTC (rev 5525)
@@ -1,43 +0,0 @@
---=EF=BB=BFdrop view v_quant_detail;
-create or replace view v_quant_detail as
-with quant as=20
-	(select=20
-		j_id,
-		qp_fiche as fiche_id,
-		qp_supplier as tiers,=20
-		qp_vat as vat_amount,
-		qp_price as price,
-		qp_vat_code as vat_code,
-		qp_dep_priv as dep_priv,
-		qp_nd_tva as nd_tva,
-		qp_nd_tva_recup as nd_tva_recup,
-		qp_nd_amount	as nd_amount,
-		qp_vat_sided as vat_sided
-		from quant_purchase
-	union all=09
-	select=20
-		j_id,
-		qs_fiche,
-		qs_client,
-		qs_vat,
-		qs_price,
-		qs_vat_code,
-		0,
-		0,
-		0,
-		0,
-		qs_vat_sided
-	from=20
-		quant_sold
-)=09
-select=20
-	jr_id,quant.tiers,jrn_def_name,jrn_def_type,name,jr_comment,jr_montant,=
sum(price) as price,vat_code,sum(vat_amount) as vat_amount,sum(dep_priv) =
as dep_priv,sum(nd_tva) as nd_tva,sum(nd_tva_recup) as nd_tva_recup,sum(n=
d_amount) as nd_amount,vat_sided,tva_label
-from=20
-jrn
-join jrnx on (jrnx.j_grpt=3Djrn.jr_grpt_id)
-join quant using (j_id)
-left join vw_fiche_name on (tiers=3Dvw_fiche_name.f_id)
-join jrn_def on (jrn_def_id=3Djr_def_id)
-join tva_rate on (tva_id=3Dvat_code)
-group by
-jr_id,quant.tiers,jr_comment,jr_montant,vat_code,vat_sided,name,jrn_def_=
name,jrn_def_type,tva_label;
\ No newline at end of file

Deleted: phpcompta/trunk/sql/2-insert-csv-menu.sql.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/2-insert-csv-menu.sql.sql	2013-10-23 14:19:44 UTC=
 (rev 5524)
+++ phpcompta/trunk/sql/2-insert-csv-menu.sql.sql	2013-10-23 14:39:56 UTC=
 (rev 5525)
@@ -1,7 +0,0 @@
-insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_p=
arameter,me_javascript,me_type,me_description_etendue)
-values
-('CSV:Reconciliation','Export op=C3=A9rations rapproch=C3=A9es','export_=
rec_csv.php',null,'Export op=C3=A9rations rapproch=C3=A9es en CSV',null,n=
ull,'PR','');
-
-insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_displ=
ay,pm_default)=20
-values
-('CSV:Reconciliation',null,1,0,'P',0), ('CSV:Reconciliation',null,2,null=
,'P',0);

Deleted: phpcompta/trunk/sql/3-stock-col-change.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/3-stock-col-change.sql	2013-10-23 14:19:44 UTC (r=
ev 5524)
+++ phpcompta/trunk/sql/3-stock-col-change.sql	2013-10-23 14:39:56 UTC (r=
ev 5525)
@@ -1 +0,0 @@
-alter table stock_change alter tech_date type time;

Deleted: phpcompta/trunk/sql/4-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
--- phpcompta/trunk/sql/4-date-paiement.sql	2013-10-23 14:19:44 UTC (rev =
5524)
+++ phpcompta/trunk/sql/4-date-paiement.sql	2013-10-23 14:39:56 UTC (rev =
5525)
@@ -1,33 +0,0 @@
-alter table jrn add column jr_date_paid date;
-
- set search_path=3Dpublic,comptaproc;
-
-create or replace function set_paiement_date() returns void
-as
-$body$
-declare=20
-	row_jrn jrn%ROWTYPE;
-	cursor_jrn cursor for select * from jrn where substr(jr_internal,1,1) i=
n ('A','V') and jr_date_paid is null;
-	n_rec jrn_rapt.jr_id%TYPE;
-	nCount integer;
-	jrn_date jrn.jr_date%TYPE;
-begin
-	for row_jrn in cursor_jrn
-	loop
-		select count(*) into nCount from jrn_rapt where jr_id=3Drow_jrn.jr_id =
or jra_concerned=3Drow_jrn.jr_id;
-		if nCount =3D 1 then
-			select jr_id into n_rec from jrn_rapt where  jra_concerned=3Drow_jrn.=
jr_id;
-			if NOT FOUND then
-				select jra_concerned into n_rec from jrn_rapt where  jr_id=3Drow_jrn=
.jr_id;
-			end if;
-			select jr_date into jrn_date from jrn where jr_id=3Dn_rec;
-			update jrn set jr_date_paid =3D jrn_date where current of cursor_jrn;
-		end if;
-
-	end loop;
-
-end;
-$body$
-language plpgsql;
-
-select set_paiement_date();
\ No newline at end of file



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


From MAILER-DAEMON Wed Oct 23 11:04:32 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VYzz6-0006ps-Pk
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 11:04:32 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 16:54:07 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79063.1382540672.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5526 - phpcompta/tags
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 15:04:31 -0000

Author: danydb
Date: 2013-10-23 16:54:07 +0200 (Wed, 23 Oct 2013)
New Revision: 5526

Added:
   phpcompta/tags/rel700/
Log:
new release 7.0



Copied: phpcompta/tags/rel700 (from rev 5525, phpcompta)



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


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

Author: danydb
Date: 2013-10-23 16:55:21 +0200 (Wed, 23 Oct 2013)
New Revision: 5527

Removed:
   phpcompta/tags/rel700/
Log:
remove tags




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


From MAILER-DAEMON Wed Oct 23 11:06:34 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZ014-00077W-CL
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 11:06:34 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 16:56:09 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79067.1382540793.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5528 - 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: Wed, 23 Oct 2013 15:06:32 -0000

Author: danydb
Date: 2013-10-23 16:56:09 +0200 (Wed, 23 Oct 2013)
New Revision: 5528

Modified:
   phpcompta/trunk/html/index.php
Log:
Put new version

Modified: phpcompta/trunk/html/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/index.php	2013-10-23 14:55:21 UTC (rev 5527)
+++ phpcompta/trunk/html/index.php	2013-10-23 14:56:09 UTC (rev 5528)
@@ -189,7 +189,7 @@
=20
 echo '
 <span style=3D"background-color:#879ed4;color:white;padding-left:4px;pad=
ding-right:4px;">
-version  6.7pre-release SVNINFO - '.$my_domain.'
+version  7.0 SVNINFO - '.$my_domain.'
 </span>
 <BR>
 <BR>



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


From MAILER-DAEMON Wed Oct 23 14:18:30 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZ30o-0002U6-6U
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 14:18:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 20:08:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79407.1382552309.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r541 - 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, 23 Oct 2013 18:18:29 -0000

Author: danydb
Date: 2013-10-23 20:08:02 +0200 (Wed, 23 Oct 2013)
New Revision: 541

Added:
   trunk/rapport_avance/doc/rapav-list.dia
   trunk/rapport_avance/doc/rapav-listing-code.odt
   trunk/rapport_avance/include/liste.inc.php
   trunk/rapport_avance/sql/2-date-paiement.sql
Modified:
   trunk/rapport_avance/ajax_save_param_detail.php
   trunk/rapport_avance/doc/
   trunk/rapport_avance/include/class_formulaire_param.php
   trunk/rapport_avance/include/class_formulaire_param_detail.php
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/include/class_rapport_avance_sql.php
   trunk/rapport_avance/include/template/param_detail_new.php
   trunk/rapport_avance/index.php
   trunk/rapport_avance/sql/1-ajout-col-formulaire-param-detail.sql
Log:
Ajout date paiement + journal

Modified: trunk/rapport_avance/ajax_save_param_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_save_param_detail.php	2013-10-17 23:36:36 U=
TC (rev 540)
+++ trunk/rapport_avance/ajax_save_param_detail.php	2013-10-23 18:08:02 U=
TC (rev 541)
@@ -34,155 +34,153 @@
 $fp_id =3D 0;
 switch ($tab)
 {
-	case 'account_tva':
-		$acc_tva =3D new RAPAV_Account_Tva();
-		$acc_tva->tva_id =3D $code_tva;
-		$acc_tva->tmp_val =3D $formtva;
-		$acc_tva->jrn_def_type =3D $code_jrn;
-		$acc_tva->p_id =3D $p_id;
-		$acc_tva->type_detail =3D 2;
-		$acc_tva->tt_id =3D $code_base;
-                $acc_tva->jrn_def_id=3D$p_ledger;
-		if ($acc_tva->verify() =3D=3D 1)
-		{
-			$code =3D 'nok';
-			$html =3D "Erreur dans la formule " . $acc_tva->errcode;
-		}
-		else
-		{
-			$acc_tva->insert();
-			$code =3D 'ok';
-			$fp_id =3D $acc_tva->fp_id;
-			$html =3D '<td>';
-			ob_start();
-			$acc_tva->display_row();
-			$html.=3Dob_get_contents();
-			ob_end_clean();
-			$html.=3D '</td>';
-			$html.=3D'<td id=3D"del_' . $acc_tva->fp_id . '">';
-			$html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D\"delete=
_param_detail('%s','%s','%s','%s')\""
-									, $_REQUEST['plugin_code'], $_REQUEST['ac'], $_REQUEST['gDossie=
r'], $acc_tva->fp_id));
-			$html.=3D '</td>';
-		}
-		break;
-	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;
-		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'], $_REQUEST['ac'], $_REQUEST['gDossie=
r'], $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=3Dnull;
-		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'], $_REQUEST['ac'], $_REQUEST['gDossie=
r'], $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;
-		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'], $_REQUEST['ac'], $_REQUEST['gDossie=
r'], $acc_account->fp_id));
-			$html.=3D'</td>';
-		}
-		break;
+    case 'account_tva':
+        $acc_tva =3D new RAPAV_Account_Tva();
+        $acc_tva->tva_id =3D $code_tva;
+        $acc_tva->tmp_val =3D $formtva;
+        $acc_tva->jrn_def_type =3D $code_jrn;
+        $acc_tva->p_id =3D $p_id;
+        $acc_tva->type_detail =3D 2;
+        $acc_tva->tt_id =3D $code_base;
+        $acc_tva->jrn_def_id =3D $p_ledger;
+        $acc_tva->date_paid=3D(isset($p_paid))?1:0;
+        if ($acc_tva->verify() =3D=3D 1)
+        {
+            $code =3D 'nok';
+            $html =3D "Erreur dans la formule " . $acc_tva->errcode;
+        } else
+        {
+            $acc_tva->insert();
+            $code =3D 'ok';
+            $fp_id =3D $acc_tva->fp_id;
+            $html =3D '<td>';
+            ob_start();
+            $acc_tva->display_row();
+            $html.=3Dob_get_contents();
+            ob_end_clean();
+            $html.=3D '</td>';
+            $html.=3D'<td id=3D"del_' . $acc_tva->fp_id . '">';
+            $html.=3DHtmlInput::anchor("Effacer", "", sprintf("onclick=3D=
\"delete_param_detail('%s','%s','%s','%s')\""
+                                    , $_REQUEST['plugin_code'], $_REQUES=
T['ac'], $_REQUEST['gDossier'], $acc_tva->fp_id));
+            $html.=3D '</td>';
+        }
+        break;
+    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;
=20
-		case 'new_reconcile_id':
-		$acc_account =3D new RAPAV_Reconcile();
-		$acc_account->tmp_val =3D $acrec_first;
-		$acc_account->with_tmp_val =3D $acrec_second;
-		$acc_account->operation_pcm_val =3D $acrec_third;
-		$acc_account->p_id =3D $p_id;
-		$acc_account->type_detail =3D 5;
-		$acc_account->type_sum_account=3D $account_sum_type;
-                $acc_account->jrn_def_id=3D$p_ledger;
-		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'], $_REQUEST['ac'], $_REQUEST['gDossie=
r'], $acc_account->fp_id));
-			$html.=3D'</td>';
-		}
-		break;
+    case 'new_reconcile_id':
+        $acc_account =3D new RAPAV_Reconcile();
+        $acc_account->tmp_val =3D $acrec_first;
+        $acc_account->with_tmp_val =3D $acrec_second;
+        $acc_account->operation_pcm_val =3D $acrec_third;
+        $acc_account->p_id =3D $p_id;
+        $acc_account->type_detail =3D 5;
+        $acc_account->type_sum_account =3D $account_sum_type;
+        $acc_account->jrn_def_id =3D $p_ledger;
+        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;
 }
 //echo $html;exit();
 $html =3D escape_xml($html);


Property changes on: trunk/rapport_avance/doc
___________________________________________________________________
Name: svn:ignore
   - .~lock.rapav.odt#

   + .~lock.rapav.odt#
.~lock.rapav-listing-code.odt#


Added: trunk/rapport_avance/doc/rapav-list.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/rapav-list.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 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)


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

Modified: trunk/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_formulaire_param.php	2013-10-17 23=
:36:36 UTC (rev 540)
+++ trunk/rapport_avance/include/class_formulaire_param.php	2013-10-23 18=
:08:02 UTC (rev 541)
@@ -76,7 +76,7 @@
 		header('Pragma: public');
 		header('Content-type: application/bin');
 		header('Content-Disposition: attachment;filename=3D"' . $title . '.bin=
"', FALSE);
-		fputcsv($out, array("RAPAV", '3'), ";");
+		fputcsv($out, array("RAPAV", '4'), ";");
 		fputcsv($out, array($form->f_title, $form->f_description), ";");
 		$array =3D $cn->get_array("select p_id,p_code, p_libelle, p_type, p_or=
der, f_id,  t_id
 			from rapport_advanced.formulaire_param where f_id=3D$1", array($p_id)=
);
@@ -87,7 +87,7 @@
 		fputcsv($out, array('RAPAV_DETAIL'), ";");
 		$array =3D $cn->get_array("select
 			fp_id, p_id, tmp_val, tva_id, fp_formula, fp_signed, jrn_def_type,
-			tt_id, type_detail, with_tmp_val, type_sum_account, operation_pcm_val
+			tt_id, type_detail, with_tmp_val, type_sum_account, operation_pcm_val=
,date_paid
 			from rapport_advanced.formulaire_param_detail where p_id in (select p=
_id from rapport_advanced.formulaire_param where f_id=3D$1)", array($p_id=
));
 		for ($i =3D 0; $i < count($array); $i++)
 		{
@@ -143,10 +143,14 @@
 						$t[$o] =3D $csv[$o];
 					}
 				}
-				$cn->get_array("INSERT INTO rapport_advanced.restore_formulaire_para=
m_detail(
-            fp_id, p_id, tmp_val, tva_id, fp_formula, fp_signed, jrn_def=
_type,
-            tt_id, type_detail, with_tmp_val, type_sum_account, operatio=
n_pcm_val)
-				VALUES ($1, $2, $3, $4, $5, $6, $7,$8, $9, $10, $11, $12)", $t);
+                                if ($rapav_version < 4 )
+                                {
+                                    $t[12]=3D0;
+                                }
+                                $cn->get_array("INSERT INTO rapport_adva=
nced.restore_formulaire_param_detail(
+        fp_id, p_id, tmp_val, tva_id, fp_formula, fp_signed, jrn_def_typ=
e,
+        tt_id, type_detail, with_tmp_val, type_sum_account, operation_pc=
m_val,date_paid)
+                            VALUES ($1, $2, $3, $4, $5, $6, $7,$8, $9, $=
10, $11, $12,$13)", $t);
 			}
 			/// Update now the table  rapport_advanced.restore_formulaire_param a=
nd set the correct pk
 			/// $cn->exec_sql("update rapport_advanced.restore_formulaire_param s=
et p_id=3Dnextval('rapport_advanced.formulaire_param_p_id_seq')");
@@ -154,7 +158,7 @@
                         // Insert row by row + detail=20
                         $array=3D$cn->get_array("select p_id,p_code,p_li=
belle,p_order,f_id,t_id from rapport_advanced.restore_formulaire_param wh=
ere f_id=3D$1",array($form->f_id));
                         // Prepare stmt for the details
-                        $cn->prepare('detail','select p_id,tmp_val,tva_i=
d,fp_formula,fp_signed, jrn_def_type,tt_id,type_detail,with_tmp_val,type_=
sum_account,operation_pcm_val=20
+                        $cn->prepare('detail','select p_id,tmp_val,tva_i=
d,fp_formula,fp_signed, jrn_def_type,tt_id,type_detail,with_tmp_val,type_=
sum_account,operation_pcm_val,date_paid=20
                                     from  rapport_advanced.restore_formu=
laire_param_detail where p_id=3D$1');
                         $nb=3Dcount($array);
                         for ($e=3D0;$e<$nb;$e++)
@@ -164,8 +168,39 @@
                                    select   p_code, p_libelle, p_type, p=
_order, f_id, t_id
 				from rapport_advanced.restore_formulaire_param where p_id=3D$1 retur=
ning p_id",array($array[$e]['p_id']));
                             // Insert detail=20
-                                $cn->exec_sql("insert into rapport_advan=
ced.formulaire_param_detail select nextval('rapport_advanced.formulaire_p=
aram_detail_fp_id_seq'), $new_pid, tmp_val, tva_id, fp_formula, fp_signed=
, jrn_def_type,
-                    tt_id, type_detail, with_tmp_val, type_sum_account, =
operation_pcm_val from  rapport_advanced.restore_formulaire_param_detail =
where p_id =3D$1
+                                $cn->exec_sql("insert into rapport_advan=
ced.formulaire_param_detail
+                                        (fp_id,
+                                        p_id,
+                                        tmp_val,
+                                        tva_id,
+                                        fp_formula,
+                                        fp_signed,
+                                        jrn_def_type,
+                                        tt_id,
+                                        type_detail,
+                                        with_tmp_val,
+                                        type_sum_account,
+                                        operation_pcm_val,
+                                        jrn_def_id,
+                                        date_paid
+                                        )=20
+                                        select=20
+                                        nextval('rapport_advanced.formul=
aire_param_detail_fp_id_seq'),=20
+                                        $new_pid,=20
+                                            tmp_val,=20
+                                            tva_id,=20
+                                            fp_formula,=20
+                                            fp_signed,=20
+                                            jrn_def_type,
+                                            tt_id,=20
+                                            type_detail,=20
+                                            with_tmp_val,=20
+                                            type_sum_account,=20
+                                            operation_pcm_val,
+                                            -1,
+                                            date_paid=20
+                                            from =20
+                                            rapport_advanced.restore_for=
mulaire_param_detail where p_id =3D$1
                                 ",array($array[$e]['p_id']));
                         }
=20

Modified: trunk/rapport_avance/include/class_formulaire_param_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_formulaire_param_detail.php	2013-1=
0-17 23:36:36 UTC (rev 540)
+++ trunk/rapport_avance/include/class_formulaire_param_detail.php	2013-1=
0-23 18:08:02 UTC (rev 541)
@@ -38,10 +38,7 @@
         $parent =3D new Formulaire_Param($p_id);
         echo HtmlInput::title_box('Formule', 'param_detail_div');
         echo '<h2>' . $parent->p_code . " " . $parent->p_libelle . '</h2=
>';
-        $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;
+
         require_once 'template/param_detail_new.php';
     }
=20
@@ -49,7 +46,7 @@
     {
         global $cn;
         $ledger =3D "";
-        if ($this->jrn_def_id =3D=3D null || $this->jrn_def_id=3D=3D-1)
+        if ($this->jrn_def_id =3D=3D null || $this->jrn_def_id =3D=3D -1=
)
         {
             $ledger =3D " tous les journaux";
         } else
@@ -60,6 +57,26 @@
         return $ledger;
     }
=20
+    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>';
+    }
+
 }
=20
 class RAPAV_Formula extends Formulaire_Param_Detail
@@ -68,7 +85,8 @@
     function display_row()
     {
         $ledger =3D $this->get_ledger_name();
-        printf("R=C3=A9sultat de la formule %s utilisant $ledger", $this=
->fp_formula);
+        $paid =3D ( $this->date_paid !=3D 0 ) ? "la date concerne la dat=
e de paiement, la recherche sera limit=C3=A9e au journaux de type ACH & V=
EN" : "";
+        printf("R=C3=A9sultat de la formule %s utilisant $ledger %s", $t=
his->fp_formula, $paid);
     }
=20
     static function new_row()
@@ -82,6 +100,8 @@
         $account->set_attribute('noquery', 1);
         $account->set_attribute('account', $account->id);
         echo $account->input();
+        Formulaire_Param_Detail::input_date_paiement();
+        Formulaire_Param_Detail::input_ledger();
     }
=20
     function verify()
@@ -109,7 +129,8 @@
         global $cn;
         $ledger =3D $this->get_ledger_name();
         $type_total =3D $cn->get_value("select tt_label from rapport_adv=
anced.total_type where tt_id=3D$1", array($this->tt_id));
-        printf("Poste comptable %s avec le code tva %s (%s) dans le jour=
nal de type %s [ %s ] $ledger", $this->tmp_val, $this->tva_id, $this->tva=
_id, $this->jrn_def_type, $type_total);
+        $paid =3D ( $this->date_paid !=3D 0 ) ? "la date concerne la dat=
e de paiement, la recherche sera limit=C3=A9e au journaux de type ACH & V=
EN" : "";
+        printf("Poste comptable %s avec le code tva %s (%s) dans le jour=
nal de type %s [ %s ] $ledger %s", $this->tmp_val, $this->tva_id, $this->=
tva_id, $this->jrn_def_type, $type_total, $paid);
     }
=20
     static function new_row()
@@ -147,6 +168,8 @@
         echo td($code_base->input());
         echo '</tr>';
         echo '</table>';
+        Formulaire_Param_Detail::input_date_paiement();
+        Formulaire_Param_Detail::input_ledger();
     }
=20
     function verify()
@@ -225,8 +248,9 @@
     {
         global $cn;
         $ledger =3D $this->get_ledger_name();
+        $paid =3D ( $this->date_paid !=3D 0 ) ? "la date concerne la dat=
e de paiement, la recherche sera limit=C3=A9e au journaux de type ACH & V=
EN" : "";
         $total_type_account =3D $cn->get_value('select tt_label from rap=
port_advanced.total_type_account where tt_id=3D$1', array($this->type_sum=
_account));
-        printf("Total %s poste comptable %s utilis=C3=A9 avec le poste c=
omptable %s utilisant $ledger", $total_type_account, $this->tmp_val, $thi=
s->with_tmp_val);
+        printf("Total %s poste comptable %s utilis=C3=A9 avec le poste c=
omptable %s utilisant $ledger %s", $total_type_account, $this->tmp_val, $=
this->with_tmp_val, $paid);
     }
=20
     static function new_row($p_id)
@@ -258,6 +282,8 @@
         echo ' utilis=C3=A9 avec le poste comptable ' . HtmlInput::infob=
ulle(203);
         echo $account_second->input();
         echo '</p>';
+        Formulaire_Param_Detail::input_date_paiement();
+        Formulaire_Param_Detail::input_ledger();
     }
=20
     function verify()
@@ -328,6 +354,7 @@
         echo $account_third->input();
=20
         echo '</p>';
+        Formulaire_Param_Detail::input_ledger();
     }
=20
     function verify()

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-10-17 2=
3:36:36 UTC (rev 540)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-10-23 1=
8:08:02 UTC (rev 541)
@@ -222,7 +222,7 @@
         {
             echo _('Ne peut pas sauver ' . $oname . ' vers ' . $p_dir . =
'/' . $p_filename . ' code d\'erreur =3D' . $ret);
         }
-       unlink ($oname);
+        unlink($oname);
     }
=20
     function special_tag($p_dir, $p_filename, $p_type)
@@ -294,7 +294,7 @@
         {
             echo _('Ne peut pas sauver ' . $oname . ' vers ' . $p_dir . =
'/' . $p_filename . ' code d\'erreur =3D' . $ret);
         }
-        unlink ($oname);
+        unlink($oname);
     }
=20
     function load_document($p_file)
@@ -601,7 +601,7 @@
         $this->amount =3D "0";
=20
         $array =3D $cn->get_array("select fp_id,p_id,tmp_val,tva_id,fp_f=
ormula,fp_signed,jrn_def_type,tt_id,type_detail,
-			with_tmp_val,type_sum_account,operation_pcm_val,jrn_def_id
+			with_tmp_val,type_sum_account,operation_pcm_val,jrn_def_id,date_paid
 			from rapport_advanced.formulaire_param_detail where p_id=3D$1", array=
($this->param->p_id));
         $this->compute_date($p_start, $p_end);
         for ($e =3D 0; $e < count($array); $e++)
@@ -665,7 +665,7 @@
     function from_array($p_array)
     {
         $this->form =3D new Formulaire_Param_Detail();
-        $attribute =3D explode(',', 'fp_id,p_id,tmp_val,tva_id,fp_formul=
a,fp_signed,jrn_def_type,tt_id,type_detail,with_tmp_val,type_sum_account,=
operation_pcm_val,jrn_def_id');
+        $attribute =3D explode(',', 'fp_id,p_id,tmp_val,tva_id,fp_formul=
a,fp_signed,jrn_def_type,tt_id,type_detail,with_tmp_val,type_sum_account,=
operation_pcm_val,jrn_def_id,date_paid');
         foreach ($attribute as $e)
         {
             $this->form->$e =3D $p_array[$e];
@@ -692,12 +692,18 @@
     function compute($p_start, $p_end)
     {
         global $cn;
-        $sql=3D"";
-        if ($this->form->jrn_def_id !=3Dnull )=20
+        $sql =3D "";
+        if ($this->form->jrn_def_id !=3D null)
         {
-            $sql=3D' and j_jrn_def =3D'.$this->form->jrn_def_id;
+            $sql =3D ' and j_jrn_def =3D' . $this->form->jrn_def_id;
         }
-        $amount =3D Impress::parse_formula($cn, "", $this->form->fp_form=
ula, $p_start, $p_end, true, 1,$sql);
+        if ($this->form->date =3D=3D 1)
+        {
+            $sql.=3Dsprintf(" and jr_date_paid >=3D to_date('%s','DD.MM.=
YYYY') and jr_date_paid <=3D to_date ('%s','DD.MM.YYYY')", $p_start, $p_e=
nd);
+            $p_start =3D '01.01.1900';
+            $p_end =3D '01.01.2100';
+        }
+        $amount =3D Impress::parse_formula($cn, "", $this->form->fp_form=
ula, $p_start, $p_end, true, 1, $sql);
         return $amount['montant'];
     }
=20
@@ -776,13 +782,28 @@
         {
             $filter_ledger =3D " and j_jrn_def =3D " . sql_string($this-=
>form->jrn_def_id);
         }
+        if ($this->form->date_paid =3D=3D 1)
+        {
+            $sql_date=3D" and j_id in=20
+                (select j_id from jrnx join jrn on (j_grpt =3D jr_grpt_i=
d)
+                    where
+                    coalesce(jr_date_paid,to_date('01.01.1900','DD.MM.YY=
YY')) >=3D to_date($2,'DD.MM.YYYY')
+                    and coalesce(jr_date_paid,to_date('01.01.1900','DD.M=
M.YYYY')) <=3D to_date($3,'DD.MM.YYYY')
+                 )
+                    ";
+                   =20
+        }
+        else
+        {
+            $sql_date=3D"and (j_date >=3D to_date($2,'DD.MM.YYYY') and j=
_date <=3D to_date($3,'DD.MM.YYYY'))";
+        }
         if ($this->form->jrn_def_type =3D=3D 'ACH')
         {
=20
             $sql =3D "select coalesce(sum(qp_vat),0) as amount
 						from quant_purchase join jrnx using (j_id)
 						where qp_vat_code=3D$1
-						and (j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date(=
$3,'DD.MM.YYYY'))
+						$sql_date
 						and j_poste::text like ($4) $filter_ledger";
             $amount =3D $this->cn->get_value($sql, array($this->form->tv=
a_id,
                 $p_start,
@@ -795,7 +816,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
-						(j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date($3,'=
DD.MM.YYYY'))
+						$sql_date
 						and j_poste::text like ($4)  $filter_ledger";
=20
             $amount =3D $this->cn->get_value($sql, array($this->form->tv=
a_id,
@@ -821,15 +842,30 @@
      */
     private function compute_amount($p_start, $p_end)
     {
-         $filter_ledger =3D "";
+        $filter_ledger =3D "";
         if ($this->form->jrn_def_id !=3D "")
         {
             $filter_ledger =3D " and j_jrn_def =3D " . sql_string($this-=
>form->jrn_def_id);
         }
+        if ($this->form->date_paid =3D=3D 1)
+        {
+            $sql_date=3D" and j_id in=20
+                (select j_id from jrnx join jrn on (j_grpt =3D jr_grpt_i=
d)
+                    where
+                    coalesce(jr_date_paid,to_date('01.01.1900','DD.MM.YY=
YY')) >=3D to_date($2,'DD.MM.YYYY')
+                    and coalesce(jr_date_paid,to_date('01.01.1900','DD.M=
M.YYYY')) <=3D to_date($3,'DD.MM.YYYY')
+                 )
+                    ";
+                   =20
+        }
+        else
+        {
+            $sql_date=3D"and (j_date >=3D to_date($2,'DD.MM.YYYY') and j=
_date <=3D to_date($3,'DD.MM.YYYY'))";
+        }
         if ($this->form->jrn_def_type =3D=3D 'ACH')
         {
             $sql =3D "select coalesce(sum(qp_price),0) as amount from qu=
ant_purchase join jrnx using (j_id)
-					where qp_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
+					where qp_vat_code=3D$1 $sql_date
 					and j_poste::text like ($4) $filter_ledger";
=20
             $amount =3D $this->cn->get_value($sql, array($this->form->tv=
a_id,
@@ -842,7 +878,7 @@
         {
             $sql =3D "select coalesce(sum(qs_price),0) as amount from qu=
ant_sold
 					join jrnx using (j_id)
-					where qs_vat_code=3D$1 and (j_date >=3D to_date($2,'DD.MM.YYYY') an=
d j_date <=3D to_date($3,'DD.MM.YYYY'))
+					where qs_vat_code=3D$1 $sql_date
 					and j_poste::text like ($4) $filter_ledger";
             $amount =3D $this->cn->get_value($sql, array($this->form->tv=
a_id,
                 $p_start,
@@ -918,6 +954,22 @@
         {
             $filter_ledger =3D " and jrn1.j_jrn_def =3D " . sql_string($=
this->form->jrn_def_id);
         }
+       =20
+        if ($this->form->date_paid =3D=3D 1)
+        {
+            $sql_date=3D" and j_id in=20
+                (select j_id from jrnx join jrn on (j_grpt =3D jr_grpt_i=
d)
+                    where
+                    coalesce(jr_date_paid,to_date('01.01.1900','DD.MM.YY=
YY')) >=3D to_date($3,'DD.MM.YYYY')
+                    and coalesce(jr_date_paid,to_date('01.01.1900','DD.M=
M.YYYY')) <=3D to_date($4,'DD.MM.YYYY')
+                 )
+                    ";
+                   =20
+        }
+        else
+        {
+            $sql_date=3D"and (jrn1.j_date >=3D to_date($3,'DD.MM.YYYY') =
and jrn1.j_date <=3D to_date($4,'DD.MM.YYYY'))";
+        }
         bcscale(2);
         switch ($this->form->type_sum_account)
         {
@@ -935,7 +987,7 @@
                                 jrn1.j_poste like $1
                                 and
                                 jrn2.j_poste like $2
-                                and (jrn1.j_date >=3D to_date($3,'DD.MM.=
YYYY') and jrn1.j_date <=3D to_date($4,'DD.MM.YYYY'))
+                                $sql_date
                                 $filter_ledger
                                 ) as tv_amount
 							 ";
@@ -963,8 +1015,7 @@
                                 jrn2.j_poste like $2
                                 and
                                 jrn1.j_debit=3D't'
-                                and
-                                (jrn1.j_date >=3D to_date($3,'DD.MM.YYYY=
') and jrn1.j_date <=3D to_date($4,'DD.MM.YYYY'))
+                                $sql_date
                                 $filter_ledger
                                 ) as tv_amount
 							 ";
@@ -989,8 +1040,7 @@
                                 jrn2.j_poste like $2
                                 and
                                 jrn1.j_debit=3D'f'
-                                and
-                                (jrn1.j_date >=3D to_date($3,'DD.MM.YYYY=
') and jrn1.j_date <=3D to_date($4,'DD.MM.YYYY'))
+                                $sql_date
                                 $filter_ledger
                                 ) as tv_amount
 							 ";

Modified: trunk/rapport_avance/include/class_rapport_avance_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-10-17 =
23:36:36 UTC (rev 540)
+++ trunk/rapport_avance/include/class_rapport_avance_sql.php	2013-10-23 =
18:08:02 UTC (rev 541)
@@ -128,7 +128,8 @@
 			"with_tmp_val"=3D>"with_tmp_val",
 			"type_sum_account"=3D>"type_sum_account",
 			"operation_pcm_val"=3D>"operation_pcm_val",
-                        "jrn_def_id"=3D>"jrn_def_id"
+                        "jrn_def_id"=3D>"jrn_def_id",
+                        "date_paid"=3D>"date_paid"
 		);
=20
 		$this->type =3D array(
@@ -144,7 +145,8 @@
 			"with_tmp_val"=3D>"text",
 			"type_sum_account"=3D>"numeric",
 			"operation_pcm_val"=3D>"text",
-                         "jrn_def_id"=3D>"numeric"
+                         "jrn_def_id"=3D>"numeric",
+                         "date_paid"=3D>"numeric"
=20
 		);
=20

Added: 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	                        (r=
ev 0)
+++ trunk/rapport_avance/include/liste.inc.php	2013-10-23 18:08:02 UTC (r=
ev 541)
@@ -0,0 +1,3 @@
+<?php
+
+?>

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-10-17=
 23:36:36 UTC (rev 540)
+++ trunk/rapport_avance/include/template/param_detail_new.php	2013-10-23=
 18:08:02 UTC (rev 541)
@@ -77,7 +77,7 @@
 	<?php echo HtmlInput::hidden('tab','formula')?>
 		<?php echo RAPAV_Formula::new_row()?>
 	</p>
-        <p> Filtrage par journal <?php echo $select->input(); ?> </p>
+      =20
 <?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
@@ -91,7 +91,7 @@
=20
 	<?php echo HtmlInput::hidden('tab','account_tva')?>
 		<?php echo RAPAV_Account_Tva::new_row()?>
-    <p> Filtrage par journal <?php echo $select->input(); ?> </p>
+=20
 <?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
@@ -117,8 +117,8 @@
 	<?php echo HtmlInput::request_to_hidden(array('gDossier','ac','plugin_c=
ode','p_id'))?>
=20
 	<?php echo HtmlInput::hidden('tab','new_account_id')?>
-		<?php echo RAPAV_Account::new_row($p_id)?>
-    <p> Filtrage par journal <?php echo $select->input(); ?> </p>
+	<?php echo RAPAV_Account::new_row($p_id)?>
+       =20
 <?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>
@@ -130,7 +130,7 @@
=20
 	<?php echo HtmlInput::hidden('tab','new_reconcile_id')?>
 		<?php echo RAPAV_Reconcile::new_row($p_id)?>
-    <p> Filtrage par journal <?php echo $select->input(); ?> </p>
+ =20
 <?php echo HtmlInput::submit('save','Sauve')?>
=20
 </form>

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-10-17 23:36:36 UTC (rev 540)
+++ trunk/rapport_avance/index.php	2013-10-23 18:08:02 UTC (rev 541)
@@ -57,7 +57,7 @@
 $array =3D array(
 	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', _('D=C3=A9claration'), _('D=C3=A9claration TVA=
 calcul=C3=A9e'), 2),
+	array($url . '&sa=3Dde', _('G=C3=A9n=C3=A9ration D=C3=A9claration / lis=
ting'), _('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/sql/1-ajout-col-formulaire-param-detail.sq=
l
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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=
-10-17 23:36:36 UTC (rev 540)
+++ trunk/rapport_avance/sql/1-ajout-col-formulaire-param-detail.sql	2013=
-10-23 18:08:02 UTC (rev 541)
@@ -1,18 +1,24 @@
-ALTER TABLE rapport_advanced.formulaire_param_detail
-   ADD COLUMN jrn_def_id bigint;
+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';
-ALTER TABLE rapport_advanced.formulaire_param_detail
-  ADD CONSTRAINT formulaire_param_detail_jrn_def_id_fkey FOREIGN KEY (jr=
n_def_id)
-      REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE
-      ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED=
;
-ALTER TABLE rapport_advanced.formulaire_param_detail
-  ADD CONSTRAINT formulaire_param_detail_jrn_def_id_fkey FOREIGN KEY (jr=
n_def_id)
-      REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE
-      ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED=
;
-CREATE TRIGGER formulaire_param_detail_trg
-  BEFORE INSERT OR UPDATE OF jrn_def_id
-  ON rapport_advanced.formulaire_param_detail
-  FOR EACH ROW
-  EXECUTE PROCEDURE rapport_advanced.formulaire_param_detail_jrn_def_id_=
ins_upd();
=20
+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;
=20
+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;
+
+
+

Added: 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	                        =
(rev 0)
+++ trunk/rapport_avance/sql/2-date-paiement.sql	2013-10-23 18:08:02 UTC =
(rev 541)
@@ -0,0 +1,2 @@
+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 Wed Oct 23 15:16:32 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZ3uy-00077i-MB
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 15:16:32 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 21:06:06 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79462.1382555792.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r542 - in 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, 23 Oct 2013 19:16:32 -0000

Author: danydb
Date: 2013-10-23 21:06:06 +0200 (Wed, 23 Oct 2013)
New Revision: 542

Added:
   trunk/rapport_avance/doc/rapav-analyse.dia
Modified:
   trunk/rapport_avance/doc/rapav-list.dia
   trunk/rapport_avance/doc/rapav-listing-code.odt
   trunk/rapport_avance/index.php
Log:
Add journaux + date

Added: 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)


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

Modified: trunk/rapport_avance/doc/rapav-list.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/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-10-23 18:08:02 UTC (rev 541)
+++ trunk/rapport_avance/index.php	2013-10-23 19:06:06 UTC (rev 542)
@@ -55,9 +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, Pa=
ram=C3=A8tre de listes, mailing list'), 0),
+//	array($url . '&sa=3Dli', _('Liste'), _('Cr=C3=A9ation, modification, =
Param=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 / lis=
ting'), _('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 / =
listing'), _('G=C3=A9n=C3=A9ration D=C3=A9claration / listing'), 2),
 	array($url . '&sa=3Dhi', _('Historique'), _('Historique des d=C3=A9clar=
ations faites'), 3)
 );
=20



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


From MAILER-DAEMON Wed Oct 23 15:20:07 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZ3yR-0007oi-Pi
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 15:20:07 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 21:09:43 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79465.1382556007.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r543 - tag
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 19:20:06 -0000

Author: danydb
Date: 2013-10-23 21:09:42 +0200 (Wed, 23 Oct 2013)
New Revision: 543

Added:
   tag/rel700/
Log:
New branch : rapav is really modified


Copied: tag/rel700 (from rev 542, trunk)



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


From MAILER-DAEMON Wed Oct 23 15:20:41 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZ3yy-0007sp-Uw
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 15:20:40 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 21:10:15 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79466.1382556040.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r544 - 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: Wed, 23 Oct 2013 19:20:39 -0000

Author: danydb
Date: 2013-10-23 21:10:14 +0200 (Wed, 23 Oct 2013)
New Revision: 544

Modified:
   trunk/
Log:
Removed merge tracking for "svnmerge" for=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel660



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel660:1-530



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


From MAILER-DAEMON Wed Oct 23 15:21:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZ3zf-00085l-Ks
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 15:21:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 21:10:59 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79467.1382556083.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r545 - 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: Wed, 23 Oct 2013 19:21:23 -0000

Author: danydb
Date: 2013-10-23 21:10:59 +0200 (Wed, 23 Oct 2013)
New Revision: 545

Modified:
   trunk/
Log:
Initialized merge tracking via "svnmerge" with revisions "1-544" from=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel700



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   + /tag/rel700:1-544



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


From MAILER-DAEMON Wed Oct 23 15:24:29 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZ42f-0008Mo-U5
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Oct 2013 15:24:29 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Oct 2013 21:14:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.79470.1382556268.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r546 - in tag/rel700/rapport_avance: . sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 19:24:27 -0000

Author: danydb
Date: 2013-10-23 21:14:03 +0200 (Wed, 23 Oct 2013)
New Revision: 546

Added:
   tag/rel700/rapport_avance/sql/upgrade4.sql
Modified:
   tag/rel700/rapport_avance/rapav_constant.php
Log:
Upgrade RAPAV version 4

Modified: tag/rel700/rapport_avance/rapav_constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel700/rapport_avance/rapav_constant.php	2013-10-23 19:10:59 UTC =
(rev 545)
+++ tag/rel700/rapport_avance/rapav_constant.php	2013-10-23 19:14:03 UTC =
(rev 546)
@@ -11,5 +11,5 @@
=20
 global $cn,$rapav_version;
 $cn=3Dnew Database (dossier::id());
-$rapav_version=3D3;
-?>
\ No newline at end of file
+$rapav_version=3D4;
+?>

Added: tag/rel700/rapport_avance/sql/upgrade4.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
--- tag/rel700/rapport_avance/sql/upgrade4.sql	                        (r=
ev 0)
+++ tag/rel700/rapport_avance/sql/upgrade4.sql	2013-10-23 19:14:03 UTC (r=
ev 546)
@@ -0,0 +1,32 @@
+begin;
+
+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;
+
+
+
+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;
+
+insert into rapport_advanced.version(version_id,version_note) values (4,=
'Ajout date et journaux dans les formules');
+
+commit;



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


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

Author: danydb
Date: 2013-10-23 21:14:48 +0200 (Wed, 23 Oct 2013)
New Revision: 547

Added:
   trunk/rapport_avance/sql/upgrade4.sql
Modified:
   trunk/
   trunk/rapport_avance/rapav_constant.php
Log:
Merged revisions 546 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel700

........
  r546 | danydb | 2013-10-23 21:14:03 +0200 (mer., 23 oct. 2013) | 1 line
 =20
  Upgrade RAPAV version 4
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel700:1-544
   + /tag/rel700:1-546

Modified: trunk/rapport_avance/rapav_constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/rapav_constant.php	2013-10-23 19:14:03 UTC (rev =
546)
+++ trunk/rapport_avance/rapav_constant.php	2013-10-23 19:14:48 UTC (rev =
547)
@@ -11,5 +11,5 @@
=20
 global $cn,$rapav_version;
 $cn=3Dnew Database (dossier::id());
-$rapav_version=3D3;
-?>
\ No newline at end of file
+$rapav_version=3D4;
+?>

Copied: trunk/rapport_avance/sql/upgrade4.sql (from rev 546, tag/rel700/r=
apport_avance/sql/upgrade4.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/upgrade4.sql	                        (rev 0)
+++ trunk/rapport_avance/sql/upgrade4.sql	2013-10-23 19:14:48 UTC (rev 54=
7)
@@ -0,0 +1,32 @@
+begin;
+
+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;
+
+
+
+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;
+
+insert into rapport_advanced.version(version_id,version_note) values (4,=
'Ajout date et journaux dans les formules');
+
+commit;



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


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

Author: danydb
Date: 2013-10-23 21:19:05 +0200 (Wed, 23 Oct 2013)
New Revision: 548

Modified:
   tag/rel700/rapport_avance/sql/upgrade4.sql
Log:
rapav: Correct script upgrade=20


Modified: tag/rel700/rapport_avance/sql/upgrade4.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
--- tag/rel700/rapport_avance/sql/upgrade4.sql	2013-10-23 19:14:48 UTC (r=
ev 547)
+++ tag/rel700/rapport_avance/sql/upgrade4.sql	2013-10-23 19:19:05 UTC (r=
ev 548)
@@ -3,7 +3,7 @@
 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';
=20
-CREATE FUNCTION formulaire_param_detail_jrn_def_id_ins_upd() RETURNS tri=
gger
+CREATE FUNCTION rapport_advanced.formulaire_param_detail_jrn_def_id_ins_=
upd() RETURNS trigger
     AS $$
 declare
 	jrn_def_id integer;
@@ -13,7 +13,8 @@
 		NEW.jrn_def_id :=3D jrn_def_id;
 	end if;
 	return NEW;
-end;$$;
+end;
+$$
 language plpgsql;
=20
 CREATE INDEX fki_jrn_def_id ON rapport_advanced.formulaire_param_detail =
USING btree (jrn_def_id);



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


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

Author: danydb
Date: 2013-10-23 21:19:57 +0200 (Wed, 23 Oct 2013)
New Revision: 549

Modified:
   trunk/
   trunk/rapport_avance/sql/upgrade4.sql
Log:
Merged revisions 548 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel700

........
  r548 | danydb | 2013-10-23 21:19:05 +0200 (mer., 23 oct. 2013) | 2 line=
s
 =20
  rapav: Correct script upgrade=20
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel700:1-546
   + /tag/rel700:1-548

Modified: trunk/rapport_avance/sql/upgrade4.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/upgrade4.sql	2013-10-23 19:19:05 UTC (rev 54=
8)
+++ trunk/rapport_avance/sql/upgrade4.sql	2013-10-23 19:19:57 UTC (rev 54=
9)
@@ -3,7 +3,7 @@
 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';
=20
-CREATE FUNCTION formulaire_param_detail_jrn_def_id_ins_upd() RETURNS tri=
gger
+CREATE FUNCTION rapport_advanced.formulaire_param_detail_jrn_def_id_ins_=
upd() RETURNS trigger
     AS $$
 declare
 	jrn_def_id integer;
@@ -13,7 +13,8 @@
 		NEW.jrn_def_id :=3D jrn_def_id;
 	end if;
 	return NEW;
-end;$$;
+end;
+$$
 language plpgsql;
=20
 CREATE INDEX fki_jrn_def_id ON rapport_advanced.formulaire_param_detail =
USING btree (jrn_def_id);



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


From MAILER-DAEMON Thu Oct 24 06:50:32 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZIUq-0007ck-9U
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Oct 2013 06:50:32 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Oct 2013 12:40:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.80045.1382611831.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5529 - 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, 24 Oct 2013 10:50:31 -0000

Author: danydb
Date: 2013-10-24 12:40:02 +0200 (Thu, 24 Oct 2013)
New Revision: 5529

Modified:
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/fiche.inc.php
Log:
Bug lettering different

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-10-23 14:56:09 UTC =
(rev 5528)
+++ phpcompta/trunk/include/class_html_input.php	2013-10-24 10:40:02 UTC =
(rev 5529)
@@ -745,9 +745,9 @@
 		return $r;
 	}
=20
-	static function show_reconcile($p_div, $let)
+	static function show_reconcile($p_div, $let,$span=3D"")
 	{
-		$r =3D '<A  style=3D"color:red;text-decoration:underline" href=3D"java=
script:void(0)" onclick=3D"show_reconcile(\'' . $p_div . '\',\'' . $let .=
 '\')">' . $let . '</A>';
+		$r =3D '<A  style=3D"color:red;text-decoration:underline" href=3D"java=
script:void(0)" onclick=3D"show_reconcile(\'' . $p_div . '\',\'' . $let .=
 '\')">' . $let.$span . '</A>';
 		return $r;
 	}
         /**

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-10-23 14:56:09 UTC (rev 55=
28)
+++ phpcompta/trunk/include/fiche.inc.php	2013-10-24 10:40:02 UTC (rev 55=
29)
@@ -482,7 +482,7 @@
                             $span_error =3D "";
 				if ($row['letter_diff'] !=3D 0)
 					$span_error =3D $g_failed;
-                                echo '<td>'.HtmlInput::show_reconcile(""=
, $html_letter.$span_error).'</td>';
+                                echo '<td>'.HtmlInput::show_reconcile(""=
, $html_letter,$span_error).'</td>';
                         }
 			else
 				echo td('');



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


From MAILER-DAEMON Thu Oct 24 06:53:31 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZIXi-0007uj-W7
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Oct 2013 06:53:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Oct 2013 12:43:03 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.80048.1382612010.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5530 - 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, 24 Oct 2013 10:53:30 -0000

Author: danydb
Date: 2013-10-24 12:43:03 +0200 (Thu, 24 Oct 2013)
New Revision: 5530

Modified:
   phpcompta/trunk/html/index.php
Log:
update version

Modified: phpcompta/trunk/html/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/index.php	2013-10-24 10:40:02 UTC (rev 5529)
+++ phpcompta/trunk/html/index.php	2013-10-24 10:43:03 UTC (rev 5530)
@@ -189,7 +189,7 @@
=20
 echo '
 <span style=3D"background-color:#879ed4;color:white;padding-left:4px;pad=
ding-right:4px;">
-version  7.0 SVNINFO - '.$my_domain.'
+version  6.7 SVNINFO - '.$my_domain.'
 </span>
 <BR>
 <BR>



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


From MAILER-DAEMON Fri Oct 25 06:34:14 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZeic-0003nl-DU
	for mharc-phpcompta-dev@gnu.org; Fri, 25 Oct 2013 06:34:14 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Oct 2013 12:23:45 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.81074.1382697254.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r550 - in trunk/rapport_avance: doc include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Oct 2013 10:34:13 -0000

Author: danydb
Date: 2013-10-25 12:23:44 +0200 (Fri, 25 Oct 2013)
New Revision: 550

Modified:
   trunk/rapport_avance/doc/rapav-listing-code.odt
   trunk/rapport_avance/include/class_rapav_declaration.php
Log:
type form->date instead of form->date_paid

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_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-10-23 1=
9:19:57 UTC (rev 549)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-10-25 1=
0:23:44 UTC (rev 550)
@@ -697,7 +697,7 @@
         {
             $sql =3D ' and j_jrn_def =3D' . $this->form->jrn_def_id;
         }
-        if ($this->form->date =3D=3D 1)
+        if ($this->form->date_paid =3D=3D 1)
         {
             $sql.=3Dsprintf(" and jr_date_paid >=3D to_date('%s','DD.MM.=
YYYY') and jr_date_paid <=3D to_date ('%s','DD.MM.YYYY')", $p_start, $p_e=
nd);
             $p_start =3D '01.01.1900';



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


From MAILER-DAEMON Fri Oct 25 07:05:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZfCd-000889-4I
	for mharc-phpcompta-dev@gnu.org; Fri, 25 Oct 2013 07:05:15 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Oct 2013 12:54:46 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.81105.1382699114.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r551 - 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, 25 Oct 2013 11:05:13 -0000

Author: danydb
Date: 2013-10-25 12:54:46 +0200 (Fri, 25 Oct 2013)
New Revision: 551

Modified:
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/raw.php
Log:
RAPAV : CSV oriented as table if step is asked

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-10-25 1=
0:23:44 UTC (rev 550)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2013-10-25 1=
0:54:46 UTC (rev 551)
@@ -42,26 +42,29 @@
         $this->form =3D new RAPAV_Formulaire();
         parent::__construct();
     }
-
+    function load_formulaire() {
+        $this->form->load();
+    }
     /**
      * @brief export a declaration to CSV
      * @global $cn database conx
      * @param $p_id pk of rapav_declaration
+     * @param $p_orient
+     *        value :=20
+     *           - list : for a list
+     *           - table : to have a table (if using step)
      */
-    static function to_csv($p_id)
+    static function to_csv($p_id,$p_orient=3D"list")
     {
         global $cn;
-        $a_row =3D $cn->get_array('select dr_code,dr_libelle,dr_amount,d=
r_start,dr_end
-			from rapport_advanced.declaration_row
-			where d_id=3D$1 order by dr_order,dr_start', array($p_id));
-
+       =20
         $a_title =3D $cn->get_array("select d_title
 			,to_char(d_start,'DD.MM.YYYY') as start
 			,to_char(d_end,'DD.MM.YYYY') as end
 			from
 			rapport_advanced.declaration
 			where
-			d_id=3D$1", array($p_id));
+			d_id=3D$1 ", array($p_id));
         $title =3D $a_title[0]['d_title'] . "-" . $a_title[0]['start'] .=
 "-" . $a_title[0]['end'];
         $title =3D mb_strtolower($title, 'UTF-8');
         $title =3D str_replace(array('/', '*', '<', '>', '*', '.', '+', =
':', '?', '!', " ", ";"), "_", $title);
@@ -70,12 +73,52 @@
         header('Pragma: public');
         header('Content-type: application/csv');
         header('Content-Disposition: attachment;filename=3D"' . $title .=
 '.csv"', FALSE);
-        fputcsv($out, $a_title[0], ";");
+        if ($p_orient =3D=3D "list")
+        {
+            fputcsv($out, $a_title[0], ";");
+           =20
+            $a_row =3D $cn->get_array('select dr_code,dr_libelle,dr_amou=
nt,dr_start,dr_end
+			from rapport_advanced.declaration_row
+			where d_id=3D$1 order by dr_order,dr_start', array($p_id));
=20
-        for ($i =3D 0; $i < count($a_row); $i++)
+            for ($i =3D 0; $i < count($a_row); $i++)
+            {
+                printf('"%s";"%s";%s;"%s";"%s"' . "\r\n", $a_row[$i]['dr=
_code'], $a_row[$i]['dr_libelle'], nb($a_row[$i]['dr_amount']), format_da=
te($a_row[$i]['dr_start']), format_date($a_row[$i]['dr_end'])
+                );
+            }
+        }
+        elseif ($p_orient=3D=3D"table")
         {
-            printf('"%s";"%s";%s;"%s";"%s"' . "\r\n", $a_row[$i]['dr_cod=
e'], $a_row[$i]['dr_libelle'], nb($a_row[$i]['dr_amount']), format_date($=
a_row[$i]['dr_start']), format_date($a_row[$i]['dr_end'])
-            );
+             fputcsv($out, $a_title[0], ";");
+             // Only the period
+             $a_periode =3D $cn->get_array('select distinct dr_start,dr_=
end
+			from rapport_advanced.declaration_row
+			where d_id=3D$1 order by dr_start', array($p_id));
+
+             // 2 blank columns
+             printf(';');
+            for ($i =3D 0; $i < count($a_periode); $i++)
+            {
+                printf(';"%s-%s"', format_date($a_periode[$i]['dr_start'=
]), format_date($a_periode[$i]['dr_end']));
+            }
+            printf("\r\n");
+           =20
+            // print each code on one line
+             $a_row =3D $cn->get_array('select dr_code,dr_libelle,dr_amo=
unt,dr_start,dr_end
+			from rapport_advanced.declaration_row
+			where d_id=3D$1 order by dr_order,dr_start', array($p_id));
+            $last_code=3D"";
+            for ($i =3D 0; $i < count($a_row); $i++)
+            {
+                if ( $last_code !=3D $a_row[$i]['dr_code'])
+                {
+                    if ($last_code!=3D""){ printf("\r\n"); }
+                    printf('"%s";"%s"', $a_row[$i]['dr_code'],$a_row[$i]=
['dr_libelle']);
+                    $last_code=3D$a_row[$i]['dr_code'];
+                }
+                printf(';%s',nb($a_row[$i]['dr_amount']));
+            }
+             printf("\r\n");
         }
     }
=20

Modified: trunk/rapport_avance/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/raw.php	2013-10-25 10:23:44 UTC (rev 550)
+++ trunk/rapport_avance/raw.php	2013-10-25 10:54:46 UTC (rev 551)
@@ -34,7 +34,11 @@
 }
 if ($act =3D=3D 'export_decla_csv')
 {
-	Rapav_Declaration::to_csv($d_id);
+        $decl=3D  new Rapav_Declaration();
+        $decl->d_id=3D$d_id;
+        $decl->load();
+        $orient=3D($decl->d_step=3D=3D0)?"list":"table";
+	Rapav_Declaration::to_csv($d_id,$orient);
 	exit();
 }
 if ($act =3D=3D 'export_decla_document')



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


From MAILER-DAEMON Fri Oct 25 07:07:28 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VZfEm-0008F2-E9
	for mharc-phpcompta-dev@gnu.org; Fri, 25 Oct 2013 07:07:28 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Oct 2013 12:57:01 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.81110.1382699248.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r552 - tag
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Oct 2013 11:07:27 -0000

Author: danydb
Date: 2013-10-25 12:57:01 +0200 (Fri, 25 Oct 2013)
New Revision: 552

Removed:
   tag/rel700/
Log:
Remove tag




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


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

Author: danydb
Date: 2013-10-26 15:21:00 +0200 (Sat, 26 Oct 2013)
New Revision: 5531

Modified:
   phpcompta/trunk/include/ajax_tag_list.php
Log:
Add a tag from an action

Modified: phpcompta/trunk/include/ajax_tag_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/ajax_tag_list.php	2013-10-24 10:43:03 UTC (re=
v 5530)
+++ phpcompta/trunk/include/ajax_tag_list.php	2013-10-26 13:21:00 UTC (re=
v 5531)
@@ -25,6 +25,11 @@
 $tag=3Dnew Tag($cn);
 $tag->select();
=20
+//------------------- Propose to add a tag
+
+$js=3Dsprintf("onclick=3D\"show_tag('%s','%s','%s','j')\"",Dossier::id()=
,'','-1');
+echo HtmlInput::button("tag_add", "Ajout d'un tag", $js);
+
 $response=3D  ob_get_clean();
 ob_end_clean();
 $html=3Descape_xml($response);



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


From MAILER-DAEMON Sat Oct 26 09:33:13 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Va3zN-0005wL-Sn
	for mharc-phpcompta-dev@gnu.org; Sat, 26 Oct 2013 09:33:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 26 Oct 2013 15:22:45 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.81835.1382794393.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5532 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Oct 2013 13:33:12 -0000

Author: danydb
Date: 2013-10-26 15:22:44 +0200 (Sat, 26 Oct 2013)
New Revision: 5532

Modified:
   phpcompta/trunk/include/class_follow_up.php
Log:
Cosmetic

Modified: phpcompta/trunk/include/class_follow_up.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_follow_up.php	2013-10-26 13:21:00 UTC (=
rev 5531)
+++ phpcompta/trunk/include/class_follow_up.php	2013-10-26 13:22:44 UTC (=
rev 5532)
@@ -728,7 +728,7 @@
 		$a_row =3D Database::fetch_all($Res);
=20
 		$r =3D "";
-		$r.=3D$bar;
+		$r.=3D'<p>'.$bar.'</p>';
 		$r.=3D'<table class=3D"document">';
 		$r.=3D"<tr>";
                 $r.=3D'<th name=3D"ag_id_td" style=3D"display:none" >'. =
ICheckBox::toggle_checkbox('ag','list_ag_frm').'</th>';
@@ -825,7 +825,7 @@
=20
 		$r.=3D"</table>";
=20
-		$r.=3D$bar;
+		$r.=3D'<p>'.$bar.'</p>';
 		return $r;
 	}
=20



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


From MAILER-DAEMON Sat Oct 26 10:05:05 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Va4UD-0003Yb-8x
	for mharc-phpcompta-dev@gnu.org; Sat, 26 Oct 2013 10:05:05 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 26 Oct 2013 15:54:34 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.81846.1382796304.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5533 - in phpcompta/trunk: . doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Oct 2013 14:05:03 -0000

Author: danydb
Date: 2013-10-26 15:54:34 +0200 (Sat, 26 Oct 2013)
New Revision: 5533

Modified:
   phpcompta/trunk/doc/manuel-fr.odt
   phpcompta/trunk/doc/manuel-fr.pdf
   phpcompta/trunk/release-note
Log:
Documentation=20

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

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

Modified: phpcompta/trunk/release-note
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/release-note	2013-10-26 13:22:44 UTC (rev 5532)
+++ phpcompta/trunk/release-note	2013-10-26 13:54:34 UTC (rev 5533)
@@ -1,15 +1,18 @@
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 || Done
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+
 Favori
 =3D=3D=3D=3D=3D=3D
-Dans fenetre interne
+Permet d'avoir une liste qui appara=C3=AEt dans une fen=C3=AAtre interne=
 avec
+les menus que vous utilisez le plus
=20
 Navigateur
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-Dans fenetre interne
+Permet d'acc=C3=A8der rapidement au menu n=C3=A9cessaire, il y a plus
+d'explication sur les menu
=20
-Impression journaux=20
+Impression journaux
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 Anciennement appel=C3=A9 impression - historique -> changer dans menu_re=
f
 Permet impression des journaux vente et achat avec d=C3=A9tail pour la T=
VA, la partie
@@ -17,8 +20,16 @@
=20
 Mod=C3=A9le d'op=C3=A9ration
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-Fen=C3=AAtre interne avec recherche
+Am=C3=A9lioration : Fen=C3=AAtre interne avec filtrage et une descriptio=
n des
+mod=C3=A8les, la limite est plus =C3=A9lev=C3=A9e aussi
=20
+Impression journaux=20
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+Anciennement appel=C3=A9 impression - historique -> changer dans menu_re=
f
+Permet impression des journaux vente et achat avec d=C3=A9tail pour la T=
VA, la partie
+non d=C3=A9ductible et la partie priv=C3=A9e
+
+
 Protection fichier include
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
 Ajout d'une s=C3=A9curit=C3=A9 suppl=C3=A9mentaire
@@ -45,7 +56,7 @@
=20
 Fiche
 =3D=3D=3D=3D=3D
-Si aucun quickcode donn=C3=A9, un calcul=C3=A9 un en se basant sur le no=
m de la fiche (5i=C3=A8re lettre) + n=C2=B0 si duplicate
+Si aucun quickcode n'est donn=C3=A9, il en sera calcul=C3=A9 un en se ba=
sant sur le nom de la fiche (5i=C3=A8re lettre) + n=C2=B0 si duplicate
 code php=20
 fiche_def.inc.php
=20
@@ -59,11 +70,6 @@
 Possibilit=C3=A9 d'avoir une impression web de plusieurs documents
 Possibilit=C3=A9 de changer l'=C3=A9tat de plusieurs documents
=20
-
-Stock
-=3D=3D=3D=3D=3D
-Inventaire annuel
-
 Date de paiement
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 Lors de rapprochement



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


From MAILER-DAEMON Tue Oct 29 08:51:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vb8lQ-00043t-Sj
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Oct 2013 08:51:16 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Oct 2013 13:40:41 +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.84069.1383051075.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5534 - 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: Tue, 29 Oct 2013 12:51:14 -0000

Author: danydb
Date: 2013-10-29 13:40:41 +0100 (Tue, 29 Oct 2013)
New Revision: 5534

Modified:
   phpcompta/trunk/
Log:
Removed merge tracking for "svnmerge" for=20
svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel660



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel660:1-5348



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


From MAILER-DAEMON Tue Oct 29 08:51:55 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vb8m3-00046W-3z
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Oct 2013 08:51:55 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Oct 2013 13:41:22 +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.84070.1383051114.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5535 - phpcompta/tags
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Oct 2013 12:51:53 -0000

Author: danydb
Date: 2013-10-29 13:41:21 +0100 (Tue, 29 Oct 2013)
New Revision: 5535

Added:
   phpcompta/tags/rel670/
Log:
Stable - release 6.7


Copied: phpcompta/tags/rel670 (from rev 5534, phpcompta/trunk)



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


From MAILER-DAEMON Tue Oct 29 09:09:30 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vb934-0007PJ-Ar
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Oct 2013 09:09:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Oct 2013 13:58: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.84094.1383052169.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5536 - 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: Tue, 29 Oct 2013 13:09:28 -0000

Author: danydb
Date: 2013-10-29 13:58:56 +0100 (Tue, 29 Oct 2013)
New Revision: 5536

Modified:
   phpcompta/trunk/
Log:
Initialized merge tracking via "svnmerge" with revisions "1-5535" from=20
svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel670



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



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


From MAILER-DAEMON Tue Oct 29 09:10:46 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vb94H-0000tI-8Z
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Oct 2013 09:10:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Oct 2013 14:00:10 +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.84099.1383052243.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r553 - 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: Tue, 29 Oct 2013 13:10:42 -0000

Author: danydb
Date: 2013-10-29 14:00:10 +0100 (Tue, 29 Oct 2013)
New Revision: 553

Modified:
   trunk/
Log:
Removed merge tracking for "svnmerge" for=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel700



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel700:1-548



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


From MAILER-DAEMON Tue Oct 29 09:11:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vb94l-0001OM-HX
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Oct 2013 09:11:15 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Oct 2013 14:00:41 +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.84100.1383052274.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r554 - tag
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Oct 2013 13:11:13 -0000

Author: danydb
Date: 2013-10-29 14:00:41 +0100 (Tue, 29 Oct 2013)
New Revision: 554

Added:
   tag/rel670/
Log:
New version


Copied: tag/rel670 (from rev 553, trunk)



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


From MAILER-DAEMON Tue Oct 29 09:11:45 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vb95F-0002Il-Ss
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Oct 2013 09:11:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Oct 2013 14:01: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.84108.1383052304.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r555 - 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: Tue, 29 Oct 2013 13:11:44 -0000

Author: danydb
Date: 2013-10-29 14:01:12 +0100 (Tue, 29 Oct 2013)
New Revision: 555

Modified:
   trunk/
Log:
Initialized merge tracking via "svnmerge" with revisions "1-554" from=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel670



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



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


From MAILER-DAEMON Tue Oct 29 09:17:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vb9At-0001xB-LO
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Oct 2013 09:17:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Oct 2013 14:07:01 +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.84118.1383052654.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r556 - tag/rel670/tva
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Oct 2013 13:17:33 -0000

Author: danydb
Date: 2013-10-29 14:07:01 +0100 (Tue, 29 Oct 2013)
New Revision: 556

Modified:
   tag/rel670/tva/list_assujetti.inc.php
Log:
remove debug info

Modified: tag/rel670/tva/list_assujetti.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
--- tag/rel670/tva/list_assujetti.inc.php	2013-10-29 13:01:12 UTC (rev 55=
5)
+++ tag/rel670/tva/list_assujetti.inc.php	2013-10-29 13:07:01 UTC (rev 55=
6)
@@ -68,7 +68,6 @@
 $tva->blank($_REQUEST['year'],1,3);
=20
=20
-// xdebug_disable();
 try {
   $r=3D$tva->compute();
 } catch (Exception $e) {



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


From MAILER-DAEMON Tue Oct 29 09:18:18 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vb9Ba-0002wl-Tu
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Oct 2013 09:18:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Oct 2013 14:07: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.84119.1383052698.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r557 - in trunk: . tva
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Oct 2013 13:18:17 -0000

Author: danydb
Date: 2013-10-29 14:07:43 +0100 (Tue, 29 Oct 2013)
New Revision: 557

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

........
  r556 | danydb | 2013-10-29 14:07:01 +0100 (mar., 29 oct. 2013) | 1 line
 =20
  remove debug info
........



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

Modified: trunk/tva/list_assujetti.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/list_assujetti.inc.php	2013-10-29 13:07:01 UTC (rev 556)
+++ trunk/tva/list_assujetti.inc.php	2013-10-29 13:07:43 UTC (rev 557)
@@ -68,7 +68,6 @@
 $tva->blank($_REQUEST['year'],1,3);
=20
=20
-// xdebug_disable();
 try {
   $r=3D$tva->compute();
 } catch (Exception $e) {



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


From MAILER-DAEMON Thu Oct 31 12:16:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vbuum-00056R-U1
	for mharc-phpcompta-dev@gnu.org; Thu, 31 Oct 2013 12:16:08 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 31 Oct 2013 17:05: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.86143.1383236167.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r558 - in trunk/coprop: . 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, 31 Oct 2013 16:16:07 -0000

Author: danydb
Date: 2013-10-31 17:05:29 +0100 (Thu, 31 Oct 2013)
New Revision: 558

Modified:
   trunk/coprop/include/class_install_plugin.php
   trunk/coprop/index.php
Log:
adapt coprop to release 6.7

Modified: trunk/coprop/include/class_install_plugin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_install_plugin.php	2013-10-29 13:07:43 UTC=
 (rev 557)
+++ trunk/coprop/include/class_install_plugin.php	2013-10-31 16:05:29 UTC=
 (rev 558)
@@ -24,6 +24,8 @@
 /**\file
  * \brief this class manages the installation and the patch of the plugi=
n
  */
+define ('ATTR_IMMEUBLE',5000);
+define ('ATTR_COPROP',5001);
=20
 class Install_Plugin
 {
@@ -69,6 +71,7 @@
 		$fiche_def->add(array(
 			'FICHE_REF' =3D> 9,
 			'nom_mod' =3D> 'Copropri=C3=A9taires - plugin',
+                        'fd_description'=3D>'Liste des copropri=C3=A9tai=
res, cat=C3=A9gorie cr=C3=A9=C3=A9e par le plugin copropri=C3=A9t=C3=A9',
 			'class_base' =3D> null)
 		);
 		$copro =3D $fiche_def->id;
@@ -77,7 +80,8 @@
 		$lot_def->add(array(
 			'FICHE_REF' =3D> 15,
 			'nom_mod' =3D> 'Lots - plugin',
-			'class_base' =3D> '')
+                        'fd_description'=3D>'Liste des lots, cat=C3=A9go=
rie cr=C3=A9=C3=A9e par le plugin copropri=C3=A9t=C3=A9',
+			'class_base' =3D> null)
 		);
 		$lot =3D $lot_def->id;
=20
@@ -85,18 +89,19 @@
 		$imm_def->add(array(
 			'FICHE_REF' =3D> 15,
 			'nom_mod' =3D> 'immeuble - plugin',
-			'class_base' =3D> '')
+                        'fd_description'=3D>'Liste des immeubles, cat=C3=
=A9gorie cr=C3=A9=C3=A9e par le plugin copropri=C3=A9t=C3=A9',
+			'class_base' =3D> null)
 		);
 		$immeuble =3D $imm_def->id;
=20
 		// creation attribut
 		$this->cn->exec_sql("insert into attr_def (ad_id,ad_text,ad_type,ad_si=
ze,ad_extra)
-		values  ('71','Copropri=C3=A9taire','select','22','select f_id,vw_name=
 from vw_fiche_attr where fd_id =3D $copro ')");
+		values  (".ATTR_COPROP.",'Copropri=C3=A9taire','select','22','select f=
_id,vw_name from vw_fiche_attr where fd_id =3D $copro ')");
 		$this->cn->exec_sql("insert into attr_def (ad_id,ad_text,ad_type,ad_si=
ze,ad_extra) values
-		('70','Immeuble','select','22','select f_id,vw_name from vw_fiche_attr=
 where fd_id =3D $immeuble ');");
+		(".ATTR_IMMEUBLE.",'Immeuble','select','22','select f_id,vw_name from =
vw_fiche_attr where fd_id =3D $immeuble ');");
=20
-		$lot_def->InsertAttribut(71); // lien vers coprop
-		$lot_def->InsertAttribut(70);// lien vers immeuble
+		$lot_def->InsertAttribut(ATTR_COPROP); // lien vers coprop
+		$lot_def->InsertAttribut(ATTR_IMMEUBLE);// lien vers immeuble
=20
 		$imm_def->InsertAttribut(14); // adresse
 		$imm_def->InsertAttribut(15); // code postale
@@ -115,10 +120,10 @@
 				JOIN fiche f1 ON f1.f_id =3D a.f_id
 				JOIN ( SELECT fd1.f_id, fd1.ad_value
 					FROM fiche_detail fd1
-					WHERE fd1.ad_id =3D 70) m ON m.f_id =3D a.f_id
+					WHERE fd1.ad_id =3D ".ATTR_IMMEUBLE.") m ON m.f_id =3D a.f_id
 				JOIN ( SELECT fd1.f_id, fd1.ad_value
 				FROM fiche_detail fd1
-				WHERE fd1.ad_id =3D 71) c ON c.f_id =3D a.f_id
+				WHERE fd1.ad_id =3D ".ATTR_COPROP.") c ON c.f_id =3D a.f_id
 				WHERE f1.fd_id =3D ".$lot." AND a.ad_id =3D 1");
 		$this->lot_id=3D$lot;
 		$this->immeuble_id=3D$immeuble;

Modified: trunk/coprop/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/coprop/index.php	2013-10-29 13:07:43 UTC (rev 557)
+++ trunk/coprop/index.php	2013-10-31 16:05:29 UTC (rev 558)
@@ -99,7 +99,7 @@
 '<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
=20
-echo ShowItem($array,'H','mtitle ','mtitle ',$def,' class=3D"topmenu"');
+echo ShowItem($array,'H','mtitle',' ',$def,' style=3D"width:98%" class=3D=
"topmenu"');
=20
 // include the right file
 /*



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


