From MAILER-DAEMON Wed Nov 02 14:50:38 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLftW-0007kT-FC
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 14:50:38 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 19:57:03 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57370.1320259836.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4285 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Nov 2011 18:50:35 -0000

Author: danydb
Date: 2011-11-02 19:57:01 +0100 (Wed, 02 Nov 2011)
New Revision: 4285

Modified:
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/include/class_anc_operation.php
Log:
433: am?\195?\169lioration Compta Analytique : montant v?\195?\169rifi?\1=
95?\169

Modified: phpcompta/trunk/html/js/anc_script.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/anc_script.js	2011-11-01 03:57:17 UTC (rev 42=
84)
+++ phpcompta/trunk/html/js/anc_script.js	2011-11-02 18:57:01 UTC (rev 42=
85)
@@ -62,11 +62,13 @@
     }
 	var col=3Ddocument.getElementsByName("val["+p_seq+"][]");
 	col[col.length-1].value=3Dmax-amount;
-
+	anc_refresh_remain(p_table,p_seq);
 }
 /**
- *@bug cannot compute total for ANC_TABLE
- *@todo fix this bug
+ *Compute total of a form from Anc_Operation::display_form_plan
+ *@param p_table table id
+ *@param seq sequence of the line
+ *@see Anc_Operation::display_form_plan
  */
 function compute_total_table(p_table,seq)
 {
@@ -87,6 +89,25 @@
 		alert(e.message);
 	}
 }
+/**
+ * Refresh remain of account. analytic
+ *@param p_table table id
+ *@param p_seq sequence of the line
+ *@see Anc_Operation::display_form_plan
+ */
+function anc_refresh_remain(p_table,p_seq)
+{
+	try
+	{
+		var tot_line=3DparseFloat(g('amount_t'+p_seq).value);
+		var tot_table=3Dcompute_total_table(p_table,p_seq);
+		var remain =3D tot_line-tot_table;
+		$('remain'+p_table).innerHTML=3Dremain;
+	}catch (a)
+	{
+		alert(a.message);
+	}
+}
 /*!
  * \brief Check the amount of the CA
  * \param p_style : error or ok, if ok show a ok box if the amount are e=
qual

Modified: phpcompta/trunk/include/class_anc_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_anc_operation.php	2011-11-01 03:57:17 U=
TC (rev 4284)
+++ phpcompta/trunk/include/class_anc_operation.php	2011-11-02 18:57:01 U=
TC (rev 4285)
@@ -135,7 +135,7 @@
         if ( isset ( $this->pa_id) && $this->pa_id !=3D'')
             $pa_id_cond=3D "pa_id=3D".$this->pa_id." and";
 	$sql=3D"
-	select oa_id,=09
+	select oa_id,
 	po_name,
 	oa_description,
 	po_description,
@@ -143,14 +143,14 @@
 	to_char(jr_date,'DD.MM.YYYY') as oa_date,
 	oa_amount,
 	oa_group,
-	j_id ,=20
-	jr_internal, =20
-	jr_id,=20
+	j_id ,
+	jr_internal,
+	jr_id,
 	jr_comment,
 	j_poste,
 	jrnx.f_id,
 	( select ad_value from fiche_Detail where f_id=3Djrnx.f_id and ad_id=3D=
23) as qcode
-	from operation_analytique as B join poste_analytique using(po_id)=20
+	from operation_analytique as B join poste_analytique using(po_id)
 	left join jrnx using (j_id)
 	left join jrn on  (j_grpt=3Djr_grpt_id)
              where $pa_id_cond oa_amount <> 0.0 $cond $cond_poste
@@ -403,29 +403,29 @@
      * \param $p_id operation is detailled in a HTML popup, if several
      *  are opened, the tableid MUST be different. So we need to use a n=
ew parameter
      * \see save_form_plan
-    @note=20
-    - op is an array containing the line number=20
+    @note
+    - op is an array containing the line number
     - pa_id is an array of the existing array
     - hplan is an array of the POSTE ANALYTIQUE id used, the size of hpl=
an from 0 to x,
     x can be bigger than the number of plan id
     - val contains the amount by row inside the table. One operation (j_=
id) you can have several rows
     @code
-    0 =3D>=20
+    0 =3D>
       array
         'op' =3D> int 200
-    'pa_id' =3D>=20
+    'pa_id' =3D>
       array
         0 =3D> string '14' (length=3D2)
         1 =3D> string '15' (length=3D2)
-    'hplan' =3D>=20
+    'hplan' =3D>
       array
-        1 =3D>=20
+        1 =3D>
           array
             0 =3D> string '25' (length=3D2)
             1 =3D> string '26' (length=3D2)
-    'val' =3D>=20
+    'val' =3D>
       array
-        1 =3D>=20
+        1 =3D>
           array
             0 =3D> string '100.0000' (length=3D8)
=20
@@ -442,6 +442,7 @@
         $table_id=3D"t".$p_seq;
         $hidden=3Dnew IHidden();
=20
+		$readonly=3D($p_mode=3D=3D1)?false:true;
=20
         $result.=3D$hidden->input('amount_'.$table_id,$p_amount);
         if ( $p_mode=3D=3D1 )
@@ -454,6 +455,9 @@
         $nb_row=3D(isset($val[$p_seq]))?count($val[$p_seq]):1;
         $count=3D0;
=20
+		$remain=3D$p_amount;
+		$ctrl_remain=3D"remain".$table_id;
+
         for ( $i=3D0; $i < $nb_row;$i++)
         {
             $result.=3D'<tr>';
@@ -475,12 +479,16 @@
                     $select->readonly=3Dfalse;
                     if ( isset($hplan) && isset($hplan[$p_seq][$count]) =
){
                         $select->selected=3D$hplan[$p_seq][$count];
-		    }
+
+					}
                 }
                 else
                 {
+					if ( isset($hplan) && isset($hplan[$p_seq][$count]) ){
+                        $select->selected=3D$hplan[$p_seq][$count];
+					}
                     // view only
-                    $select->readonly=3Dtrue;
+                    $select->readOnly=3Dtrue;
                 }
                 if ($p_mode=3D=3D1)
                     $result.=3D'<td>'.$select->input().'</td>';
@@ -491,24 +499,29 @@
=20
             }
             $value=3Dnew INum();
+			$value->javascript=3D'onchange=3D"format_number(this);anc_refresh_rem=
ain(\''.$table_id.'\',\''.$p_seq.'\')"';
             $value->name=3D"val[".$p_seq."][]";
             $value->size=3D6;
             $value->value=3Dabs((isset($val[$p_seq][$i]))?$val[$p_seq][$=
i]:$p_amount);
-            $value->readonly=3D($p_mode=3D=3D1)?false:true;
-
+            $value->readOnly=3D($p_mode=3D=3D1)?false:true;
+			$remain=3Dbcsub($remain,$value->value);
             $result.=3D'<td>'.$value->input().'</td>';
=20
             $result.=3D"</tr>";
         }
=20
         $result.=3D"</table>";
+		$result.=3D" Reste =C3=A0 imputer ".
+				'<span style=3D"info" id=3D"'.$ctrl_remain.'">'.
+				$remain.'</span>';
+
         // add a button to add a row
         $button=3Dnew IButton();
         $button->javascript=3D"add_row('".$p_id."$table_id',$p_seq);";
         $button->name=3D"js".$p_id.$p_seq;
         $button->label=3D"Nouvelle ligne";
         if ( $p_mode =3D=3D 1 )
-            $result.=3D$button->input();
+            $result.=3D"<br>".$button->input();
=20
         return $result;
     }
@@ -654,7 +667,7 @@
         $this->db->exec_sql($sql);
     }
     /*\brief Display a table with analytic accounting in
-     *       detail of operation=20
+     *       detail of operation
      *@note $this->j_id must be set
      *\param $p_mode 0 =3D readonly or 1=3Dwritable
      *\param $p_amount amount



From MAILER-DAEMON Wed Nov 02 14:51:21 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLfuD-0007kz-I6
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 14:51:21 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 19:57:54 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57371.1320259880.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4286 - 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, 02 Nov 2011 18:51:19 -0000

Author: danydb
Date: 2011-11-02 19:57:52 +0100 (Wed, 02 Nov 2011)
New Revision: 4286

Modified:
   phpcompta/trunk/html/popup.php
Log:
fix bug upgrade due to upgrade of prototype

Modified: phpcompta/trunk/html/popup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/popup.php	2011-11-02 18:57:01 UTC (rev 4285)
+++ phpcompta/trunk/html/popup.php	2011-11-02 18:57:52 UTC (rev 4286)
@@ -39,13 +39,13 @@
=20
 	  }
       }
-   =20
+
     if (isset($_GET['pcm_val']) )
       {
 	$href_csv=3D"export.php?".$href.'&poste_id=3D'.$_GET['pcm_val'].'&ople=3D=
0&type=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DCSV/postedetail";
 	$href_pdf=3D"export.php?".$href.'&poste_id=3D'.$_GET['pcm_val'].'&ople=3D=
0&type=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DPDF/postedetail";;
       }
-    else=20
+    else
       {
 	$href_csv=3D"export.php?".$href.'&f_id=3D'.$_GET['f_id'].'&ople=3D0&typ=
e=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DCSV/fichedetail";
 	$href_pdf=3D"export.php?".$href.'&f_id=3D'.$_GET['f_id'].'&ople=3D0&typ=
e=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DPDF/fichedetail";
@@ -58,7 +58,7 @@
 echo HtmlInput::hidden('inpopup',1);
 load_all_script();
=20
-$str=3D"?".$_SERVER['QUERY_STRING']."&div=3Dpopup";
+$str=3D$_SERVER['QUERY_STRING']."&div=3Dpopup";
 $script=3D"
         var obj=3D{'id':'popup','fixed':1,'class':'content',style:'width=
:auto','html':loading(),'qs':'$str',js_success:'success_box','js_error':n=
ull,'callback':'".$_GET['ajax']."'};
         show_box(obj);



From MAILER-DAEMON Wed Nov 02 14:53:20 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLfw8-0000Ha-1K
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 14:53:20 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 19:59:53 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57374.1320259999.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4287 - 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, 02 Nov 2011 18:53:19 -0000

Author: danydb
Date: 2011-11-02 19:59:52 +0100 (Wed, 02 Nov 2011)
New Revision: 4287

Modified:
   phpcompta/trunk/include/class_iconcerned.php
Log:
iconcerned add doc

Modified: phpcompta/trunk/include/class_iconcerned.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iconcerned.php	2011-11-02 18:57:52 UTC =
(rev 4286)
+++ phpcompta/trunk/include/class_iconcerned.php	2011-11-02 18:59:52 UTC =
(rev 4287)
@@ -21,7 +21,10 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 /*!\file
- * \brief Html Input=20
+ * \brief Html Input
+ *  - name is the name and id of the input
+ *  - extra amount of the operation to reconcile
+ *  - extra2 ledger (all, ods,...)
  */
 require_once('class_html_input.php');
 class IConcerned extends HtmlInput



From MAILER-DAEMON Wed Nov 02 14:53:47 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLfwZ-00013C-6s
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 14:53:47 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 20:00:21 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57377.1320260026.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4288 - 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, 02 Nov 2011 18:53:45 -0000

Author: danydb
Date: 2011-11-02 20:00:19 +0100 (Wed, 02 Nov 2011)
New Revision: 4288

Modified:
   phpcompta/trunk/include/class_iselect.php
Log:
ISelect : add table prop

Modified: phpcompta/trunk/include/class_iselect.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iselect.php	2011-11-02 18:59:52 UTC (re=
v 4287)
+++ phpcompta/trunk/include/class_iselect.php	2011-11-02 19:00:19 UTC (re=
v 4288)
@@ -67,6 +67,7 @@
=20
             }
         }
+		if ( $this->table =3D=3D 1 )		  $a=3D'<td>'.$r.'</td>';
         return $r;
     }
=20



From MAILER-DAEMON Wed Nov 02 14:54:26 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLfxC-000146-9j
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 14:54:26 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 20:01:00 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57378.1320260065.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4289 - 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, 02 Nov 2011 18:54:25 -0000

Author: danydb
Date: 2011-11-02 20:00:59 +0100 (Wed, 02 Nov 2011)
New Revision: 4289

Modified:
   phpcompta/trunk/include/class_pre_operation.php
Log:
class_pre_operation remove useless hidden

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	2011-11-02 19:00:19 U=
TC (rev 4288)
+++ phpcompta/trunk/include/class_pre_operation.php	2011-11-02 19:00:59 U=
TC (rev 4289)
@@ -195,9 +195,6 @@
=20
         $hid=3Dnew IHidden();
         $r=3D$hid->input("action","use_opd");
-	echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-        $r.=3Ddossier::hidden();
-        $r.=3D$hid->input("p_jrn",$this->get("ledger"));
         $r.=3D$hid->input("jrn_type",$this->get("ledger_type"));
         if ($this->count() !=3D 0 )
         {



From MAILER-DAEMON Wed Nov 02 14:55:57 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLfyf-0001BG-JO
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 14:55:57 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 20:02:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57385.1320260157.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4290 - 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, 02 Nov 2011 18:55:56 -0000

Author: danydb
Date: 2011-11-02 20:02:27 +0100 (Wed, 02 Nov 2011)
New Revision: 4290

Modified:
   phpcompta/trunk/include/template/ledger_detail_misc.php
Log:
Missing tag for ANC

Modified: phpcompta/trunk/include/template/ledger_detail_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_misc.php	2011-11-02 19=
:00:59 UTC (rev 4289)
+++ phpcompta/trunk/include/template/ledger_detail_misc.php	2011-11-02 19=
:02:27 UTC (rev 4290)
@@ -1,11 +1,11 @@
-<?=20
-require_once('template/ledger_detail_top.php');=20
+<?
+require_once('template/ledger_detail_top.php');
 require_once('class_anc_operation.php');
 require_once('class_anc_plan.php');
=20
 ?>
-<?=20
-require_once('class_own.php');=20
+<?
+require_once('class_own.php');
 require_once ('class_anc_plan.php');
 ?>
 <div class=3D"content" style=3D"padding:0">
@@ -22,31 +22,31 @@
 								$date=3Dnew IDate('p_date');
 								$date->value=3Dformat_date($obj->det->jr_date);
 								 echo td('Date').td($date->input());
-								=20
+
 								 ?>
 								</td>
 								</tr>
-							=09
+
 								<tr><td>
-								<?=20
+								<?
 								  $itext=3Dnew IText('lib');
 								  $itext->value=3D$obj->det->jr_comment;
 								  $itext->size=3D40;
 								  echo td(_('Libell=C3=A9')).td($itext->input());
-							=09
-							=09
+
+
 								?>
 								</td></tr>
 								<tr><td>
 								<? echo td('montant').td(nbm($obj->det->jr_montant),' class=3D"i=
num"');?>
 								</td></tr>
 								<tr><td>
-								<?=20
+								<?
 								$itext=3Dnew IText('npj');
 								$itext->value=3D$obj->det->jr_pj_number;
 								echo td(_('Pi=C3=A8ce')).td($itext->input());
 								?>
-							=09
+
 								</td></tr>
 			</table>
 			</td><td>
@@ -64,7 +64,7 @@
 						$inote->value=3D$obj->det->note;
 						echo $inote->input();
 						?>
-					=09
+
 						</td>
 						</tr>
 						</table>
@@ -98,7 +98,7 @@
       /* add hidden variables pa[] to hold the value of pa_id */
       echo Anc_Plan::hidden($a_anc);
     }
-echo '</tr>'; =20
+echo '</tr>';
   for ($e=3D0;$e<count($obj->det->array);$e++) {
     $row=3D''; $q=3D$obj->det->array;
     $view_history=3D sprintf('<A class=3D"detail" style=3D"text-decorati=
on:underline" HREF=3D"javascript:view_history_account(\'%s\',\'%s\')" >%s=
</A>',
@@ -116,7 +116,7 @@
     $row.=3Dtd($view_history);
=20
     if ( $q[$e]['j_qcode'] !=3D'') {
-      // nom de la fiche=20
+      // nom de la fiche
       $ff=3Dnew Fiche($cn);
       $ff->get_by_qcode( $q[$e]['j_qcode']);
       $row.=3Dtd(h($ff->strAttribut(ATTR_DEF_NAME)));
@@ -131,13 +131,13 @@
     /* Analytic accountancy */
     if ( $owner->MY_ANALYTIC !=3D "nu" && $div=3D=3D'popup'){
       if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) {
-=09
=20
+echo HtmlInput::hidden("amount_t".$e,$montant);
 	$anc_op=3Dnew Anc_Operation($cn);
 	$anc_op->j_id=3D$q[$e]['j_id'];
 	echo HtmlInput::hidden('op[]',$anc_op->j_id);
 	$row.=3D$anc_op->display_table(1,$q[$e]['j_montant'],$div);
-=09
+
       }  else {
 	$row.=3Dtd('');
       }



From MAILER-DAEMON Wed Nov 02 14:57:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLg0a-0001KL-PL
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 14:57:56 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 20:04:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57386.1320260276.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4291 - in phpcompta/trunk: html html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Nov 2011 18:57:55 -0000

Author: danydb
Date: 2011-11-02 20:04:26 +0100 (Wed, 02 Nov 2011)
New Revision: 4291

Modified:
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/compta_ods.inc.php
Log:
412: r?\195?\169?\195?\169criture ODS

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	2011-11-02 19:02:27 UTC (rev 42=
90)
+++ phpcompta/trunk/html/js/acc_ledger.js	2011-11-02 19:04:26 UTC (rev 42=
91)
@@ -45,6 +45,13 @@
                );
 }
 /**
+ *@brief update ctl id =3Djrn_name with the value of p_jrn
+ */
+function update_name()
+{
+	$('jrn_name').innerHTML=3D$('p_jrn').options[$('p_jrn').selectedIndex].=
innerHTML;
+}
+/**
  * @brief update the field predef
  */
 function success_get_predef(request,json)

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	2011-11-02 19:02:27 UTC (rev 429=
0)
+++ phpcompta/trunk/html/style-color.css	2011-11-02 19:04:26 UTC (rev 429=
1)
@@ -921,3 +921,27 @@
     padding-left:5px;
     padding-right:5px;
 }
+table.info_op
+{
+	margin-left: 30%;
+	margin-right: 30%;
+	width:20%;
+=09
+}
+table.info_op tr
+{
+font-size:14;
+background:white;
+width:5%
+}
+h2#jrn_name
+{
+	margin-left:30%;
+=09
+}
+tr.footer{
+	font-size:14;
+	font-style: italic;
+	font-weight: bold;
+=09
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-02 19:02:27 UTC (rev 429=
0)
+++ phpcompta/trunk/html/style-light.css	2011-11-02 19:04:26 UTC (rev 429=
1)
@@ -184,10 +184,11 @@
 div.content{ 	=20
          float:left; 	=20
 		padding-top:7px;
-         width:100%; 	 	=20
+         width:96%; 	 	=20
          font-family:helvetica,arial,sans-serif; =09
          clear:both;
-         =20
+         margin-left:2%;
+        =20
=20
 }
 div.content30{ 	=20
@@ -955,3 +956,30 @@
 	padding-left:5px;
 	padding-right:5px;
 }
+table.info_op
+{
+	margin-left: 30%;
+	margin-right: 30%;
+	width:20%;
+=09
+}
+table.info_op tr
+{
+font-size:14;
+background:white;
+width:5%
+}
+h2#jrn_name
+{
+	margin-right:50%;
+	float:right;
+	font-size:18;
+	display: inline;
+	color:#15158e;
+}
+tr.footer{
+	font-size:14;
+	font-style: italic;
+	font-weight: bold;
+=09
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2011-11-02 19:02:27 UTC (rev 4290)
+++ phpcompta/trunk/html/style.css	2011-11-02 19:04:26 UTC (rev 4291)
@@ -951,3 +951,27 @@
 	padding-left:5px;
 	padding-right:5px;
 }
+table.info_op
+{
+	font-size:18;
+	margin-right:30%;
+	width:20%;
+=09
+}
+table.info_op tr
+{
+font-size:14;
+background:white;
+}
+h2#jrn_name
+{
+	margin-left:30%;
+	float: right;
+=09
+}
+tr.footer{
+	font-size:14;
+	font-style: italic;
+	font-weight: bold;
+=09
+}
\ No newline at end of file

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2011-11-02 19:02:27 UTC =
(rev 4290)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-02 19:04:26 UTC =
(rev 4291)
@@ -1207,7 +1207,7 @@
      * \param $p_array array from the form
      * \return string
      */
-    function show_summary($p_array)
+    function confirm($p_array,$p_readonly=3Dfalse)
     {
         $this->id=3D$p_array['p_jrn'];
         if ( empty($p_array)) return 'Aucun r&eacute;sultat';
@@ -1223,22 +1223,25 @@
             $lPeriode->find_periode($e_date);
         }
         $owner=3Dnew own($this->db);
+		$total=3D0;
+		bcscale(2);
=20
         $ret=3D"";
-        $ret.=3D"<table>";
+        $ret.=3D"<table >";
         $ret.=3D"<tr><td>"._('Date')." : </td><td>$e_date</td></tr>";
         /* display periode */
         $date_limit=3D$lPeriode->get_date_limit();
-        $ret.=3D'<tr><td> '._('P=C3=A9riode Comptable').' '.$date_limit[=
'p_start'].'-'.$date_limit['p_end'].'</td></tr>';
+        $ret.=3D'<tr> '.td(_('P=C3=A9riode Comptable')).td($date_limit['=
p_start'].'-'.$date_limit['p_end']).'</tr>';
         $ret.=3D"<tr><td>"._('Libell=C3=A9')." </td><td>".h($desc)."</td=
></tr>";
         $ret.=3D"<tr><td>"._('PJ Num')." </td><td>".h($e_pj)."</td></tr>=
";
         $ret.=3D'</table>';
-        $ret.=3D"<table>";
+        $ret.=3D"<table class=3D\"result\">";
         $ret.=3D"<tr>";
-        $ret.=3D"<th>"._('Quick Code ou');
+        $ret.=3D"<th>"._('Quick Code ou ');
         $ret.=3D_("Poste")." </th>";
-        $ret.=3D"<th style=3D\"text-align:right\"> "._("Montant")." </th=
>";
-        $ret.=3D"<th>"._("D=C3=A9bit")."</th>";
+        $ret.=3D"<th style=3D\"text-align:left\"> "._("Libell=C3=A9")." =
</th>";
+        $ret.=3D"<th style=3D\"text-align:right\">"._("D=C3=A9bit")."</t=
h>";
+        $ret.=3D"<th style=3D\"text-align:right\">"._("Cr=C3=A9dit")."</=
th>";
         /* if we use the AC */
         if ($owner->MY_ANALYTIC!=3D'nu')
         {
@@ -1246,7 +1249,7 @@
             $a_anc=3D$anc->get_list();
             $x=3Dcount($a_anc);
             /* set the width of the col */
-            $ret.=3D'<th colspan=3D"'.$x.'">'._('Compt. Analytique').'</=
th>';
+            $ret.=3D'<th colspan=3D"'.$x.'" style=3D"width:auto;text-ali=
gn:center" >'._('Compt. Analytique').'</th>';
=20
             /* add hidden variables pa[] to hold the value of pa_id */
             $ret.=3DAnc_Plan::hidden($a_anc);
@@ -1273,6 +1276,12 @@
         $count=3D0;
         for ($i=3D0;$i<$nb_item;$i++)
         {
+			if ( $p_readonly =3D=3D true )
+			{
+				if ( ! isset (${'qc_'.$i})) ${'qc_'.$i}=3D'';
+				if ( ! isset (${'poste'.$i})) ${'poste'.$i}=3D'';
+				if ( ! isset (${'amount'.$i})) ${'amount'.$i}=3D'';
+			}
             $ret.=3D"<tr>";
             if ( trim(${'qc_'.$i})!=3D"")
             {
@@ -1298,9 +1307,12 @@
             if ( trim(${'qc_'.$i})=3D=3D"" && trim(${'poste'.$i}) =3D=3D=
 "")
                 continue;
             $ret.=3D"<td>".h(${"ld".$i}).HtmlInput::hidden('ld'.$i,${'ld=
'.$i})."</td>";
-            $ret.=3D"<td>".${"amount".$i}.HtmlInput::hidden('amount'.$i,=
${'amount'.$i})."</td>";
+            if ( isset(${"ck$i"}))
+				$ret.=3D"<td class=3D\"num\">".${"amount".$i}.HtmlInput::hidden('amo=
unt'.$i,${'amount'.$i})."</td>".td("");
+			else
+				$ret.=3Dtd("")."<td class=3D\"num\">".${"amount".$i}.HtmlInput::hidd=
en('amount'.$i,${'amount'.$i})."</td>";
+			$total=3Dbcadd($total,${"amount".$i});
             $ret.=3D"<td>";
-            $ret.=3D(isset(${"ck$i"}))?"D":"C";
             $ret.=3D(isset(${"ck$i"}))?HtmlInput::hidden('ck'.$i,${'ck'.=
$i}):"";
             $ret.=3D"</td>";
             // CA
@@ -1316,8 +1328,9 @@
                     /* op is the operation it contains either a sequence=
 or a jrnx.j_id */
                     $ret.=3DHtmlInput::hidden('op[]=3D',$i);
=20
-                    $ret.=3D'<td>';
-                    $ret.=3D$op->display_form_plan($p_array,$null,1,$cou=
nt,round(${'amount'.$i},2));
+                    $ret.=3D'<td style=3D"text-align:center">';
+					$read=3D($p_readonly=3D=3Dtrue)?0:1;
+                    $ret.=3D$op->display_form_plan($p_array,$null,$read,=
$count,round(${'amount'.$i},2));
                     $ret.=3D'</td>';
                     $count++;
                 }
@@ -1329,8 +1342,10 @@
=20
             $ret.=3D"</tr>";
         }
+		$ret.=3Dtr(td('').td(_('Totaux')).td($total,'class=3D"num"').td($total=
,'class=3D"num"'),'class=3D"footer"');
         $ret.=3D"</table>";
-	if ( $owner->MY_ANALYTIC!=3D'nu' )          $ret.=3D'<input type=3D"but=
ton" class=3D"button" value=3D"'._('verifie CA').'" onClick=3D"verify_ca(=
\'\');">';
+		if ( $owner->MY_ANALYTIC!=3D'nu'  && $p_readonly=3D=3Dfalse)
+			$ret.=3D'<input type=3D"button" class=3D"button" value=3D"'._('verifi=
e Imputation Analytique').'" onClick=3D"verify_ca(\'\');">';
         return $ret;
     }
=20
@@ -1341,7 +1356,7 @@
      *
      * \return a string containing the form
      */
-    function show_form($p_array=3Dnull,$p_readonly=3D0)
+    function input($p_array=3Dnull,$p_readonly=3D0)
     {
         $user =3D new User($this->db);
         $owner=3Dnew Own($this->db);
@@ -1351,6 +1366,12 @@
=20
         if ( $p_array !=3D null )
             extract($p_array);
+        $add_js=3D"";
+        if ( $owner->MY_PJ_SUGGEST=3D=3D'Y')
+        {
+            $add_js=3D"update_pj();";
+        }
+        $add_js.=3D'get_last_date();';
=20
         $ret=3D"";
         /* Add button */
@@ -1359,8 +1380,16 @@
         $f_add_button->set_attribute('ipopup','ipop_newcard');
         $f_add_button->set_attribute('jrn',$this->id);
         $f_add_button->javascript=3D" this.jrn=3D\$('p_jrn').value;selec=
t_card_type(this);";
-        $ret.=3D$f_add_button->input();
+        $f_add_button->input();
=20
+		$wLedger=3D$this->select_ledger('ODS',2);
+        if ($wLedger =3D=3D null) exit (_('Pas de journal disponible'));
+        $wLedger->javascript=3D"onChange=3D'update_name();update_predef(=
\"ods\",\"t\");$add_js'";
+        $label=3D" Journal ".HtmlInput::infobulle(2) ;
+
+        $ret.=3D$label.$wLedger->input();
+
+
         // Load the javascript
         //
         $ret.=3D"<table>";
@@ -1435,12 +1464,12 @@
         $ret.=3DHtmlInput::hidden('nb_item',$nb_row);
         $ret.=3Ddossier::hidden();
=20
-        $ret.=3DHtmlInput::hidden('p_jrn',$this->id);
         $ret.=3Ddossier::hidden();
=20
         $ret.=3DHtmlInput::hidden('jrn_type',$this->get_type());
         $info=3D HtmlInput::infobulle(0);
         $info_poste=3DHtmlInput::infobulle(9);
+		$ret.=3D$f_add_button->input();
         $ret.=3D'<table id=3D"quick_item" style=3D"width:100%">';
         $ret.=3D'<tr>'.
               '<th >Quickcode'.$info.'</th>'.
@@ -2893,4 +2922,6 @@
       $first_name=3D$this->db->get_value('select ad_value from fiche_det=
ail where ad_id=3D32 and f_id=3D$1',array($tiers));
       return $name.' '.$first_name;
     }
+
+
 }

Modified: phpcompta/trunk/include/compta_ods.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ods.inc.php	2011-11-02 19:02:27 UTC (r=
ev 4290)
+++ phpcompta/trunk/include/compta_ods.inc.php	2011-11-02 19:04:26 UTC (r=
ev 4291)
@@ -20,7 +20,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/*!\file
+/* !\file
  *
  *
  * \brief to write directly into the ledgers,the stock and the tables
@@ -35,118 +35,81 @@
 require_once('function_javascript.php');
 require_once('class_ipopup.php');
=20
+global $g_user;
=20
+$cn =3D new Database(dossier::id());
=20
-$cn=3Dnew Database(dossier::id());
-$id=3D(isset ($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1;
-/*!\brief show a form for quick_writing */
-function show_qw_menu($def=3D0)
-{
-    echo '<div class=3D"lmenu">';
-    $id=3D(isset ($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1;
-    echo ShowItem(
-		  array(
-			array('?p_action=3D'.$_REQUEST['p_action'].'&'.dossier::get().'&p_jrn=
=3D'.$id.'&show_form',_('Encoder une Operation'),
-			      _('Encoder une operation dans  ce journal'),0),
-			array('?p_action=3D'.$_REQUEST['p_action'].'&'.dossier::get().'&p_jrn=
=3D'.$id.'&sa=3Dl',_('Voir Operation'),
-			      _('Voir les operations de ce journal'),1),
-			array('?p_action=3D'.$_REQUEST['p_action'].'&'.dossier::get(),
-                              _('Autre journal'),
-                              _('Choisir un autre journal')
-			      )),
-                    'H',"mtitle","mtitle",$def,' style=3D"width:80%;marg=
in-left:5;"'
-                );
+$id =3D (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : -1;
+$ledger =3D new Acc_Ledger($cn, $id);
+$first_ledger =3D $ledger->get_first('ODS');
+$ledger->id =3D ($ledger->id =3D=3D -1) ? $first_ledger['jrn_def_id'] : =
$id;
=20
-    echo '</div>';
-}
-/*!\brief show a form for quick_writing */
-function show_direct_form($cn,$ledger,$p_array)
-{
-    echo '<div class=3D"content">';
+/* !\brief show a form for quick_writing */
+$id =3D (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : -1;
+$def =3D -1;
+$ledger->with_concerned =3D true;
=20
-    $id=3D(isset ($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1;
=20
-    // Show the predef operation
-    // Don't forget the p_jrn
-    echo '<form method=3D"get">';
-    echo HtmlInput::hidden('p_action',$_REQUEST['p_action']);
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_jrn',$_REQUEST['p_jrn']);
-    $op=3Dnew Pre_operation($cn);
-    $op->p_jrn=3D$_REQUEST['p_jrn'];
-    $op->od_direct=3D't';
-    if ( $op->count() > 0 )
-    {
-        echo _("Utilisez une operation ");
-        echo $op->show_button();
-        echo HtmlInput::submit('use_opd',_('Utilisez une operation'));
-    }
-    echo '</form>';
=20
=20
+if ($g_user->check_jrn($id) =3D=3D 'X')
+{
+	NoAccess();
+	exit - 1;
+}
+if (!isset($_POST['summary']) && !isset($_POST['save']))
+{
+	require('operation_ods_new.inc.php');
+	exit();
+}
+elseif (isset($_POST['summary']))
+{
+	require_once 'operation_ods_confirm.inc.php';
+	exit();
+}
+elseif (isset($_POST['save']))
+{
+	$array =3D $_POST;
=20
-    echo '<form method=3D"post" action=3D"?" class=3D"print">';
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_action',$_REQUEST['p_action']);
+	try
+	{
+		$ledger->save($array);
+		$jr_id =3D $cn->get_value('select jr_id from jrn where jr_internal=3D$=
1', array($ledger->internal));
=20
-    echo $ledger->show_form($p_array);
+		echo '<h2> Op&eacute;ration enregistr&eacute;e  Piece ' . h($ledger->p=
j) . '</h2>';
+		if (strcmp($ledger->pj, $_POST['e_pj']) !=3D 0)
+		{
+			echo '<h3 class=3D"notice">' . _('Attention num=C3=A9ro pi=C3=A8ce ex=
istante, elle a du =C3=AAtre adapt=C3=A9e') . '</h3>';
+		}
+		printf('<a class=3D"detail" style=3D"display:inline" href=3D"javascrip=
t:modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), $ledger->in=
ternal);
=20
-
-    echo HtmlInput::button('add',_('Ajout d\'une ligne'),'onClick=3D"qui=
ck_writing_add_row()"');
-
-    echo HtmlInput::submit('summary',_('Sauvez'));
-    echo '<div class=3D"info">'.
-    _('D=C3=A9bit').' =3D <span id=3D"totalDeb"></span>'.
-    _('Cr=C3=A9dit').' =3D <span id=3D"totalCred"></span>'.
-    _('Difference').' =3D <span id=3D"totalDiff"></span></div> ';
-
-
-    echo '</form>';
-
-    echo "<script>checkTotalDirect();</script>";
-
-    echo create_script(" get_last_date()");
-
-    echo '</div>';
-
+		// show feedback
+		echo $ledger->confirm($_POST, true);
+	}
+	catch (Exception $e)
+	{
+		require('operation_ods_new.inc.php');
+		alert($e->getMessage());
+	}
+	exit();
 }
+exit();
=20
-$ledger=3Dnew Acc_Ledger($cn,$id);
=20
-$ledger->with_concerned=3Dtrue;
-// no ledger selected, propose one
-// Only ODS
-if ($id =3D=3D -1 )
-{
-    echo '<div class=3D"content">';
=20
-    // Vide
-    echo '<FORM method=3D"get" action=3D"?">';
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_action',$_REQUEST['p_action']);
-    echo $ledger->select_ledger('ODS',3)->input();
-    echo HtmlInput::submit('show_form',_('Choix du journal'));
-    echo '</form>';
-    echo '</div>';
-    exit();
-}
-if ( $User->check_jrn($id) =3D=3D 'X' )
+if ( $g_user->check_jrn($id) =3D=3D 'X' )
 {
     alert(_("L'acces a ce journal est interdit, \n contactez votre respo=
nsable"));
     exit();
 }
-echo '<div class=3D"content">';
-echo '<div style=3D"float:right;margin-right:30">';
-echo '<h2 class=3D"info"> '._('Journal').' : '.$ledger->get_name().'</h2=
>';
-echo '</div>';
-$sa=3D( isset ($_REQUEST['sa']))?$_REQUEST['sa']:'';
+
 //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 // See the ledger listing
 if ($sa =3D=3D 'l' && $id !=3D -1)
 {
 // Check privilege
=20
-    if (  $User->check_jrn($id) =3D=3D 'X')
+    if (  $g_user->check_jrn($id) =3D=3D 'X')
     {
         NoAccess();
         exit -1;
@@ -154,19 +117,19 @@
     show_qw_menu(1);
     echo '<div class=3D"content">';
     $Ledger=3Dnew Acc_Ledger($cn,$id);
-   =20
+
     $type=3D$Ledger->get_type();
     $href=3Dbasename($_SERVER['PHP_SELF']);
=20
     echo '<form method=3D"GET" action=3D"'.$href.'">';
     echo HtmlInput::hidden("sa","l");
     echo HtmlInput::hidden("p_jrn",$id);
-    echo HtmlInput::hidden("p_action","quick_writing");
+    echo HtmlInput::hidden("ac",$_REQUEST['sa']);
     echo dossier::hidden();
     echo $Ledger->search_form($type,0);
     echo HtmlInput::submit("qwlist",_("Recherche"));
     echo '</form>';
-   =20
+
     $array=3D$_GET;
     list($sql,$where)=3D$Ledger->build_search_sql($array);
=20
@@ -185,7 +148,7 @@
    /*
      * Export to csv
      */
-    $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des=
c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le=
dger_type','p_action'));
+    $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des=
c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le=
dger_type','ac'));
     if (isset($_GET['r_jrn'])) {
       foreach ($_GET['r_jrn'] as $k=3D>$v)
 	$r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
@@ -205,27 +168,20 @@
 // User can write ?
 // Write into the ledger
=20
-if ( $User->check_jrn($id) =3D=3D 'X' )
+if ( $g_user->check_jrn($id) =3D=3D 'X' )
 {
     alert(_("Vous ne pouvez pas acc=C3=A8der =C3=A0 ce journal, contacte=
z votre responsable"));
     exit -1;
 }
=20
-if ( $User->check_jrn($id)=3D=3D'W' )
+if ( $g_user->check_jrn($id)=3D=3D'W' )
 {
-    if ( isset($_GET['show_form']) || isset($_POST['correct_it']) )
+    if ( ($sa=3D=3D'n' || isset($_POST['correct_it'])) && ! isset($_POST=
['summary']))
     {
         $array=3D$_POST;
-        $default_periode=3D$User->get_periode();
+        $default_periode=3D$g_user->get_periode();
         /* check if the ledger is closed */
-        if ( $ledger->is_closed($default_periode)=3D=3D1)
-        {
-            echo '<h2 class=3D"error">'._('D=C3=A9sol=C3=A9 mais cette p=
eriode est fermee pour ce journal').'</h2>';
-            exit();
-        }
-        $periode=3Dnew Periode($cn);
-        list($date,$devnull)=3D$periode->first_day($default_periode);
-        $array['date']=3D$date;
+
         show_qw_menu();
         show_direct_form($cn,$ledger,$array);
         exit();
@@ -250,42 +206,7 @@
         exit();
=20
     }
-    if ( isset($_POST['summary']))
-    {
-        try
-        {
-            $ledger->verify($_POST );
-        }
-        catch (Exception $e)
-        {
-            alert($e->getMessage());
-            show_qw_menu();
-            show_direct_form($cn,$ledger,$_POST);
-            exit();
-        }
=20
-        echo '<form method=3D"post"  action=3D"?">';
-        echo $ledger->show_form($_POST,1);
-        echo dossier::hidden();
-        echo HtmlInput::hidden('p_action',$_REQUEST['p_action']);
-
-	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 '<br/>';
-        echo HtmlInput::submit('save_it',"Sauver",'onClick=3D"return ver=
ify_ca();"');
-        echo HtmlInput::submit('correct_it','Corriger');
-
-        echo '</form>';
-        exit();
-
-    }
     if ( isset($_POST['save_it' ]))
     {
         $array=3D$_POST;



From MAILER-DAEMON Wed Nov 02 14:58:18 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLg0w-0001LT-RO
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 14:58:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 20:04:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57389.1320260297.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4292 - 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, 02 Nov 2011 18:58:16 -0000

Author: danydb
Date: 2011-11-02 20:04:50 +0100 (Wed, 02 Nov 2011)
New Revision: 4292

Added:
   phpcompta/trunk/include/operation_ods_confirm.inc.php
   phpcompta/trunk/include/operation_ods_new.inc.php
Log:
412: r?\195?\169?\195?\169criture ODS

Added: 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	               =
         (rev 0)
+++ phpcompta/trunk/include/operation_ods_confirm.inc.php	2011-11-02 19:0=
4:50 UTC (rev 4292)
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/* !\file
+ *
+ *
+ * \brief confirm ODS operation
+ *
+ */
+
+echo '<div class=3D"content">';
+echo h2("Confirmation",'class=3D"info"');
+
+
+echo '<h2 id=3D"jrn_name">'.$ledger->get_name().'</h2>';
+echo '<FORM METHOD=3D"POST">';
+echo $ledger->confirm($_POST,false);
+
+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 '<hr>';
+echo HtmlInput::submit("save","Confirmer");
+echo HtmlInput::submit("correct","Corriger");
+
+echo '</FORM>';
+?>

Added: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	                   =
     (rev 0)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-02 19:04:50=
 UTC (rev 4292)
@@ -0,0 +1,109 @@
+<?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: 4267 $ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ *
+ *
+ * \brief to write into the ledgers ODS a new operation
+ */
+require_once 'class_pre_op_ods.php';
+require_once 'class_iconcerned.php';
+
+global $g_user;
+$cn=3Dnew Database(dossier::id());
+
+$id=3D(isset ($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1;
+$ledger=3Dnew Acc_Ledger($cn,$id);
+$first_ledger=3D$ledger->get_first('ODS');
+$ledger->id=3D($ledger->id=3D=3D-1)?$first_ledger['jrn_def_id']:$id;
+
+// check if we can write in the ledger
+if ( $g_user->check_jrn($ledger->id)=3D=3D'X')
+{
+	alert("Vous ne pouvez pas =C3=A9crire dans ce journal, contacter votre =
administrateur");
+	exit();
+}
+echo '<div class=3D"content">';
+echo '<form method=3D"GET" action=3D"do.php">';
+echo HtmlInput::hidden("sa", "n");
+echo HtmlInput::hidden("action", "use_opd");
+echo HtmlInput::hidden("ac",$_REQUEST['ac']);
+echo dossier::hidden();
+echo HtmlInput::hidden('p_jrn_predef', $ledger->id);
+$op =3D new Pre_op_ods($cn);
+$op->set('ledger', $ledger->id);
+$op->set('ledger_type', "ODS");
+$op->set('direct', 't');
+echo $op->form_get();
+echo '<h2 id=3D"jrn_name">'.$ledger->get_name().'</h2>';
+echo '</form>';
+
+
+
+// Show the predef operation
+// Don't forget the p_jrn
+$p_post=3D$_POST;
+if ( isset ($_GET['action']) && ! isset($_POST['correct']))
+{
+	if ( $_GET['action']=3D=3D'use_opd')
+	{
+		// get data from predef. operation
+		$op=3Dnew Pre_op_advanced($cn);
+        $p_post=3Dnull;
+        if ( isset($_REQUEST['pre_def']) && $_REQUEST['pre_def'] !=3D ''=
)
+        {
+            $op->set_od_id($_REQUEST['pre_def']);
+            $p_post=3D$op->compute_array();
+        }
+	}
+}
+
+
+echo '<form method=3D"post"  class=3D"print">';
+echo dossier::hidden();
+echo HtmlInput::request_to_hidden(array('ac'));
+
+echo $ledger->input($p_post);
+
+
+echo HtmlInput::button('add', _('Ajout d\'une ligne'), 'onClick=3D"quick=
_writing_add_row()"');
+
+echo HtmlInput::submit('summary', _('Sauvez'));
+
+echo '<table class=3D"info_op">'.
+ '<tr>'.td(_('D=C3=A9bit')) . '<td id=3D"totalDeb"></td>' .
+ td(_('Cr=C3=A9dit')) . ' <td id=3D"totalCred"></td>' .
+ td(_('Difference')) . ' <td id=3D"totalDiff"></td>';
+echo '</table>';
+
+$iconcerned=3Dnew IConcerned('jrn_concerned');
+$iconcerned->extra=3D0;
+echo "Op=C3=A9ration rapproch=C3=A9e : ".$iconcerned->input();
+echo '</form>';
+
+echo "<script>checkTotalDirect();</script>";
+
+echo create_script(" get_last_date()");
+
+echo '</div>';
+
+?>



From MAILER-DAEMON Wed Nov 02 15:14:57 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLgH3-0004cS-Gd
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 15:14:57 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 20:21:31 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57409.1320261297.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4293 - 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, 02 Nov 2011 19:14:56 -0000

Author: danydb
Date: 2011-11-02 20:21:29 +0100 (Wed, 02 Nov 2011)
New Revision: 4293

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
Log:
412: r?\195?\169?\195?\169criture ODS : format preperly number

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	2011-11-02 19:04:50 UTC =
(rev 4292)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-02 19:21:29 UTC =
(rev 4293)
@@ -1308,9 +1308,9 @@
                 continue;
             $ret.=3D"<td>".h(${"ld".$i}).HtmlInput::hidden('ld'.$i,${'ld=
'.$i})."</td>";
             if ( isset(${"ck$i"}))
-				$ret.=3D"<td class=3D\"num\">".${"amount".$i}.HtmlInput::hidden('amo=
unt'.$i,${'amount'.$i})."</td>".td("");
+				$ret.=3D"<td class=3D\"num\">".nbm(${"amount".$i}).HtmlInput::hidden=
('amount'.$i,${'amount'.$i})."</td>".td("");
 			else
-				$ret.=3Dtd("")."<td class=3D\"num\">".${"amount".$i}.HtmlInput::hidd=
en('amount'.$i,${'amount'.$i})."</td>";
+				$ret.=3Dtd("")."<td class=3D\"num\">".nbm(${"amount".$i}).HtmlInput:=
:hidden('amount'.$i,${'amount'.$i})."</td>";
 			$total=3Dbcadd($total,${"amount".$i});
             $ret.=3D"<td>";
             $ret.=3D(isset(${"ck$i"}))?HtmlInput::hidden('ck'.$i,${'ck'.=
$i}):"";



From MAILER-DAEMON Wed Nov 02 15:15:11 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLgHH-0004hd-IO
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 15:15:11 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 20:21:46 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57410.1320261311.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4294 - 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, 02 Nov 2011 19:15:11 -0000

Author: danydb
Date: 2011-11-02 20:21:45 +0100 (Wed, 02 Nov 2011)
New Revision: 4294

Modified:
   phpcompta/trunk/include/class_anc_operation.php
Log:
433: am?\195?\169lioration Compta Analytique : montant v?\195?\169rifi?\1=
95?\169

Modified: phpcompta/trunk/include/class_anc_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_anc_operation.php	2011-11-02 19:21:29 U=
TC (rev 4293)
+++ phpcompta/trunk/include/class_anc_operation.php	2011-11-02 19:21:45 U=
TC (rev 4294)
@@ -511,8 +511,9 @@
         }
=20
         $result.=3D"</table>";
-		$result.=3D" Reste =C3=A0 imputer ".
-				'<span style=3D"info" id=3D"'.$ctrl_remain.'">'.
+		$style_remain=3D($remain=3D=3D0)?'style=3D"color:green"':' style=3D"co=
lor:red"';
+		$result.=3D" Reste =C3=A0 imputer =3D  ".
+				'<span class=3D"remain" '.$style_remain.' id=3D"'.$ctrl_remain.'">'.
 				$remain.'</span>';
=20
         // add a button to add a row



From MAILER-DAEMON Wed Nov 02 16:13:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLhBu-0006he-4L
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 16:13:42 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 21:20:10 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57615.1320264821.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4295 - 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: Wed, 02 Nov 2011 20:13:40 -0000

Author: danydb
Date: 2011-11-02 21:20:08 +0100 (Wed, 02 Nov 2011)
New Revision: 4295

Modified:
   phpcompta/trunk/html/js/anc_script.js
Log:
433: am?\195?\169lioration Compta Analytique : arrondi remaining

Modified: phpcompta/trunk/html/js/anc_script.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/anc_script.js	2011-11-02 19:21:45 UTC (rev 42=
94)
+++ phpcompta/trunk/html/js/anc_script.js	2011-11-02 20:20:08 UTC (rev 42=
95)
@@ -102,7 +102,12 @@
 		var tot_line=3DparseFloat(g('amount_t'+p_seq).value);
 		var tot_table=3Dcompute_total_table(p_table,p_seq);
 		var remain =3D tot_line-tot_table;
+		remain=3DMath.round(remain *100)/100;
 		$('remain'+p_table).innerHTML=3Dremain;
+		if (remain =3D=3D 0)
+			{$('remain'+p_table).style.color=3D"green"}
+			else
+			{$('remain'+p_table).style.color=3D"red"}
 	}catch (a)
 	{
 		alert(a.message);



From MAILER-DAEMON Wed Nov 02 16:14:58 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLhD8-0006jb-8b
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 16:14:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 21:21:32 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57616.1320264897.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4296 - 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, 02 Nov 2011 20:14:57 -0000

Author: danydb
Date: 2011-11-02 21:21:31 +0100 (Wed, 02 Nov 2011)
New Revision: 4296

Modified:
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
Log:
433: ANC default style for remain amount=20

Modified: phpcompta/trunk/html/style-color.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-color.css	2011-11-02 20:20:08 UTC (rev 429=
5)
+++ phpcompta/trunk/html/style-color.css	2011-11-02 20:21:31 UTC (rev 429=
6)
@@ -944,4 +944,8 @@
 	font-style: italic;
 	font-weight: bold;
 =09
-}
\ No newline at end of file
+}
+span.remain {
+	font-weight: bold;
+	color:black;
+	}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-02 20:20:08 UTC (rev 429=
5)
+++ phpcompta/trunk/html/style-light.css	2011-11-02 20:21:31 UTC (rev 429=
6)
@@ -982,4 +982,8 @@
 	font-style: italic;
 	font-weight: bold;
 =09
-}
\ No newline at end of file
+}
+span.remain {
+	font-weight: bold;
+	color:black;
+	}
\ No newline at end of file

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2011-11-02 20:20:08 UTC (rev 4295)
+++ phpcompta/trunk/html/style.css	2011-11-02 20:21:31 UTC (rev 4296)
@@ -974,4 +974,8 @@
 	font-style: italic;
 	font-weight: bold;
 =09
-}
\ No newline at end of file
+}
+span.remain {
+	font-weight: bold;
+	color:black;
+	}
\ No newline at end of file



From MAILER-DAEMON Wed Nov 02 16:15:23 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLhDX-0006sY-02
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 16:15:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 21:21:56 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57619.1320264921.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4297 - 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, 02 Nov 2011 20:15:20 -0000

Author: danydb
Date: 2011-11-02 21:21:55 +0100 (Wed, 02 Nov 2011)
New Revision: 4297

Modified:
   phpcompta/trunk/include/operation_ods_new.inc.php
Log:
remove useless tag

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-02 20:21:31=
 UTC (rev 4296)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-02 20:21:55=
 UTC (rev 4297)
@@ -44,7 +44,6 @@
 }
 echo '<div class=3D"content">';
 echo '<form method=3D"GET" action=3D"do.php">';
-echo HtmlInput::hidden("sa", "n");
 echo HtmlInput::hidden("action", "use_opd");
 echo HtmlInput::hidden("ac",$_REQUEST['ac']);
 echo dossier::hidden();



From MAILER-DAEMON Wed Nov 02 17:38:45 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLiWD-00064A-CL
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 17:38:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 22:45:12 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57770.1320269923.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4298 - 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, 02 Nov 2011 21:38:43 -0000

Author: danydb
Date: 2011-11-02 22:45:11 +0100 (Wed, 02 Nov 2011)
New Revision: 4298

Added:
   phpcompta/trunk/include/history_operation.inc.php
Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/template/ledger_detail_ach.php
Log:
Finish rewriting for ACH and ODS

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	2011-11-02 20:21:55 UTC =
(rev 4297)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-02 21:45:11 UTC =
(rev 4298)
@@ -2358,7 +2358,7 @@
=20
         $and=3D'';
         $user=3Dnew User($this->db);
-	$p_action=3D$ledger_type;
+		$p_action=3D$ledger_type;
         if ( $r_jrn =3D=3D -1 )
         {
=20

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-02 20:2=
1:55 UTC (rev 4297)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-02 21:4=
5:11 UTC (rev 4298)
@@ -181,11 +181,11 @@
 		 */
 		$a_poste=3Dsplit(',',$tva_rate->tva_poste);
=20
-		if (=20
+		if (
 		    $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=3D=
$1',array($a_poste[0])) =3D=3D 0 ||
 		    $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=3D=
$1',array($a_poste[1])) =3D=3D 0 )
 		  throw new Exception(_(" La TVA ".$tva_rate->tva_label." utilise des =
postes comptables inexistants"));
-		   =20
+
             }
             /* check if all card has a ATTR_DEF_ACCOUNT*/
             $fiche=3Dnew Fiche($this->db);
@@ -235,12 +235,12 @@
                     $a=3Dnew Acc_Parm_Code($this->db,$key[1]);
                     if ( $this->db->count_sql('select pcm_val from tmp_p=
cmn where pcm_val=3D$1',array($a->p_value))=3D=3D0)
 		      throw new Exception ($key[1]._("ce code n'a pas de poste comptab=
le, cr=C3=A9ez ce poste : [".$a->p_value."]"));
-		  }=20
+		  }
 		if ( ! $fiche->empty_attribute($key[0]) &&  ! $fiche->empty_attribute(=
$key[2]))
 		  {
 		    $nd_str=3D$fiche->strAttribut($key[2]);
 		    if ( $nd_str !=3D '')
-		      {=09
+		      {
 			$poste_nd=3Dnew Acc_Account_Ledger($this->db,$nd_str);
 			if ( $poste_nd->load() =3D=3D false)
 			  {
@@ -548,7 +548,7 @@
             if ( $tot_nd !=3D 0)
             {
 		  $dna_default=3Dnew Acc_Parm_Code($this->db,'DNA');
-		 =20
+
                 /* save op. */
 	      if ( ! $fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND))
 		{
@@ -610,7 +610,7 @@
 		  $dna=3D$dna_default->p_value;
 		}
 	      $dna=3D($dna=3D=3D'')?$dna_default->p_value:$dna;
-	     =20
+
                 $acc_operation->amount=3D$tot_tva_nd;
                 $acc_operation->poste=3D$dna;
                 if ( $tot_tva_nd > 0 ) $tot_debit=3Dbcadd($tot_debit,$to=
t_tva_nd);
@@ -800,18 +800,18 @@
 		/*
 		 * save also into quant_fin
 		 */
-	=09
+
 		/* get ledger property */
 		$ledger=3Dnew Acc_Ledger_Fin($this->db,$acc_pay->jrn);
 		$prop=3D$ledger->get_propertie();
-	=09
+
 		/* if ledger is FIN then insert into quant_fin */
 		if ( $prop['jrn_def_type'] =3D=3D 'FIN' )
 		  {
 		    $ledger->insert_quant_fin($acfiche->id,$mp_jr_id,$cust->id,bcmul($=
cust_amount,-1));
 		  }
-	=09
-	=09
+
+
             }
         }//end try
         catch (Exception $e)
@@ -967,7 +967,7 @@
             $add_js=3D"update_pj();";
         }
         $add_js.=3D'get_last_date();';
-
+		$add_js.=3D'update_name();';
         $wLedger=3D$this->select_ledger('ACH',2);
         if ($wLedger =3D=3D null) exit (_('Pas de journal disponible'));
         $wLedger->javascript=3D"onChange=3D'update_predef(\"ach\",\"f\")=
;$add_js'";
@@ -1222,16 +1222,21 @@
         return $r;
     }
=20
-    /*!\brief show the summary of the operation and propose to save it
-     *\param array contains normally $_POST. It proposes also to save
+    /*!@brief show the summary of the operation and propose to save it
+     *@param array contains normally $_POST. It proposes also to save
      * the Analytic accountancy
-     *\return string
+	 * @param $p_summary true to confirm false, show only the result in RO
+     *@return string
      */
-    function confirm($p_array)
+    function confirm($p_array,$p_summary=3Dfalse)
     {
         extract ($p_array);
-        $this->verify($p_array) ;
-        $anc=3Dnull;
+
+		// we don't need to verify if we need only a feedback
+        if ( ! $p_summary )
+			$this->verify($p_array) ;
+
+		$anc=3Dnull;
         // to show a select list for the analytic
         // if analytic is op (optionnel) there is a blank line
         $owner =3D new Own($this->db);
@@ -1286,6 +1291,7 @@
             $r.=3D"<th>tva</th>";
             $r.=3D'<th> '._('Montant TVA').'</th>';
             $r.=3D'<th>'._('Montant HTVA').'</th>';
+            $r.=3D'<th>'._('Totaux').'</th>';
         }
         else
         {
@@ -1314,6 +1320,7 @@
         //--
         for ($i =3D 0; $i < $nb_item;$i++)
         {
+			$tot_row=3D0;
             if ( strlen(trim(${"e_march".$i})) =3D=3D 0 ) continue;
=20
             /* retrieve information for card */
@@ -1353,9 +1360,10 @@
                 else
                     $tva[$idx_tva]=3D$tva_item;
                 $tot_tva=3Dround(bcadd($tva_item,$tot_tva),2);
+				$tot_row=3Dbcadd($tot_row,$tva_item);
             }
             $tot_amount=3Dround(bcadd($tot_amount,$amount),2);
-
+			$tot_row=3Dbcadd($tot_row,$amount);
             $r.=3D'<tr>';
             $r.=3D'<td>';
             $r.=3D${"e_march".$i};
@@ -1367,7 +1375,7 @@
             $r.=3Dnbm(${"e_march".$i."_price"});
             $r.=3D'</td>';
             $r.=3D'<td align=3D"right">';
-            $r.=3D${"e_quant".$i};
+            $r.=3Dnbm(${"e_quant".$i});
             $r.=3D'</td>';
             if ($owner->MY_TVA_USE =3D=3D 'Y')
             {
@@ -1377,11 +1385,13 @@
                 $r.=3D'<td align=3D"right">';
                 $r.=3Dnbm($tva_item);
                 $r.=3D'</td>';
+				$r.=3D'<td align=3D"right">';
+				$r.=3Dnbm(round($amount,2));
+				$r.=3D'</td>';
             }
-            $r.=3D'<td align=3D"right">';
-            $r.=3Dnbm(round($amount,2));
+			$r.=3D'<td align=3D"right">';
+            $r.=3Dnbm(round($tot_row,2));
             $r.=3D'</td>';
-
             // encode the pa
             if ( $owner->MY_ANALYTIC!=3D'nu') // use of AA
             {
@@ -1389,7 +1399,7 @@
                 $anc_op=3Dnew Anc_Operation($this->db);
                 $null=3D($owner->MY_ANALYTIC=3D=3D'op')?1:0;
                 $r.=3D'<td>';
-                $p_mode=3D1;
+                $p_mode=3D($p_summary=3D=3Dfalse)?1:0;
                 $p_array['pa_id']=3D$a_anc;
                 /* op is the operation it contains either a sequence or =
a jrnx.j_id */
                 $r.=3DHtmlInput::hidden('op[]=3D',$i);
@@ -1404,12 +1414,14 @@
=20
=20
         $r.=3D'</table>';
-        if ( $owner->MY_ANALYTIC!=3D'nu') // use of AA
-            $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'verifie CA').'" onClick=3D"verify_ca(\'\');">';
+        if ( $owner->MY_ANALYTIC!=3D'nu' && !$p_summary) // use of AA
+            $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'V=C3=A9rifiez imputation analytique').'" onClick=3D"verify_ca(\'\');">';
         $r.=3D'</fieldset>';
=20
-        $r.=3D'<div style=3D"width:40%;position:float;float:right;text-a=
lign:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;fo=
nt-weight:bold">';
-
+		if ( ! $p_summary )
+				$r.=3D'<div style=3D"width:40%;position:float;float:right;text-align=
:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-w=
eight:bold">';
+			else
+				$r.=3D'<div style=3D"width:60%;position:float;float:left;text-align:=
right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-we=
ight:bold">';
         $r.=3D'<fieldset> <legend>Totaux</legend>';
         $tot=3Dround(bcadd($tot_amount,$tot_tva),2);
         $r.=3D'<div style=3D"position:float;float:left;text-align:right;=
padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-weight:b=
old">';
@@ -1492,7 +1504,7 @@
=20
         }
         // check for upload piece
-        $r.=3D$this->extra_info();
+        if ( ! $p_summary ) $r.=3D$this->extra_info();
=20
         return $r;
     }

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	2011-11-02 20:21:55 UTC (r=
ev 4297)
+++ phpcompta/trunk/include/compta_ach.inc.php	2011-11-02 21:45:11 UTC (r=
ev 4298)
@@ -29,48 +29,11 @@
 require_once('class_ipopup.php');
 $gDossier=3Ddossier::id();
=20
-$p_action=3D(isset($_REQUEST['p_action']))?$_REQUEST['p_action']:'';
-
 $cn=3Dnew Database(dossier::id());
 //menu =3D show a list of ledger
 $str_dossier=3Ddossier::get();
 $ac=3D"ac=3D".$_REQUEST['ac'];
-$array=3Darray(
-           array('?ledger_type=3DACH&sa=3Dn&'.$str_dossier."&$ac",_('Nou=
velle d=C3=A9pense'),_('Nouvel achat ou d=C3=A9pense'),1),
-           array('?ledger_type=3DACH&sa=3Dl&'.$str_dossier."&$ac",_('Lis=
te achat'),_('Liste des achats'),2),
-           array('?ledger_type=3DACH&sa=3Dlnp&'.$str_dossier."&$ac",_('L=
iste d=C3=A9penses non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'=
),3)
-       );
=20
-$sa=3D(isset ($_REQUEST['sa']))?$_REQUEST['sa']:-1;
-$def=3D1;
-switch ($sa)
-{
-case 'n':
-    $def=3D1;
-    $use_predef=3D0;
-    break;
-case 'p':
-    $def=3D1;
-    $use_predef=3D1;
-    break;
-case 'l':
-    $def=3D2;
-    break;
-case 'lnp':
-    $def=3D3;
-    break;
-}
-//if ( $_REQUEST['p_action'] =3D=3D 'fournisseur') $def=3D5;
-echo '<div class=3D"lmenu">';
-echo ShowItem($array,'H','mtitle','mtitle',$def);
-echo '</div>';
-$href=3Dbasename($_SERVER['PHP_SELF'])."?$ac&$str_dossier";
-//----------------------------------------------------------------------
-// Encode a new invoice
-// empty form for encoding
-//----------------------------------------------------------------------
-if ( $def=3D=3D1 || $def =3D=3D 4 )
-{
 // Check privilege
     if ( isset($_REQUEST['p_jrn']))
         if (     $g_user->check_jrn($_REQUEST['p_jrn']) !=3D 'W' )
@@ -96,13 +59,14 @@
         if ( ! isset($correct))
         {
             echo '<div class=3D"content">';
+			echo h2info('Confirmation');
+			echo '<h2 id=3D"jrn_name">'.$Ledger->get_name().'</h2>';
=20
-            echo '<form action=3D"'.$href.'"  enctype=3D"multipart/form-=
data" method=3D"post">';
-            echo HtmlInput::hidden('sa','n');
-            echo HtmlInput::hidden('p_action','ach');
+            echo '<form enctype=3D"multipart/form-data" method=3D"post">=
';
             echo dossier::hidden();
+
             echo $Ledger->confirm($_POST );
-	    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
+			echo HtmlInput::hidden('ac',$_REQUEST['ac']);
             $chk=3Dnew ICheckBox();
             $chk->selected=3Dfalse;
 	    echo '<div style=3D"float:left;clear:both">';
@@ -139,9 +103,13 @@
             alert($e->getMessage());
             $correct=3D1;
         }
+		// record the invoice
         if ( ! isset($correct))
         {
             echo '<div class=3D"content">';
+
+			echo '<h2 id=3D"jrn_name">'.$Ledger->get_name().'</h2>';
+
             $Ledger=3Dnew Acc_Ledger_Purchase($cn,$_POST['p_jrn']);
             $internal=3D$Ledger->insert($_POST);
=20
@@ -157,7 +125,7 @@
             /* Show button  */
             $jr_id=3D$cn->get_value('select jr_id from jrn where jr_inte=
rnal=3D$1',array($internal));
=20
-            echo '<h2 class=3D"info"  style=3D"margin-left:20%;width:60%=
;margin-right:20%;">'.$Ledger->get_name().'</h2>';
+            echo '<h2 class=3D"info"> Enregistrement </h2>';
             echo "<h2 >"._('Op=C3=A9ration sauv=C3=A9e')." $internal ";
             if ( $Ledger->pj !=3D '') echo ' Piece : '.h($Ledger->pj);
             echo "</h2>";
@@ -174,7 +142,8 @@
             $obj->save_extra($Ledger->jr_id,$_POST);
             printf ('<a class=3D"detail" style=3D"display:inline" href=3D=
"javascript:modifyOperation(%d,%d)">%s</a><hr>',
                     $jr_id,dossier::id(),$internal);
-            echo HtmlInput::button_anchor(_('Nouvelle d=C3=A9pense'),$hr=
ef.'?p_action=3Dach&sa=3Dn&'.dossier::get());
+			// Feedback
+			echo $Ledger->confirm($_POST,true);
             echo '</div>';
             exit();
         }
@@ -185,14 +154,13 @@
     //  ------------------------------
=20
     echo '<div class=3D"content">';
-    echo "<FORM class=3D\"print\"NAME=3D\"form_detail\" METHOD=3D\"POST\=
" >";
+	//
=20
+
     $array=3D(isset($_POST['correct'])||isset ($correct))?$_POST:null;
     $Ledger=3Dnew Acc_Ledger_Purchase($cn,0);
-//
-// pre defined operation
-//
=20
+
     if ( !isset($_REQUEST ['p_jrn']))
     {
         $def_ledger=3D$Ledger->get_first('ach');
@@ -201,9 +169,23 @@
     else
         $Ledger->id=3D$_REQUEST ['p_jrn'];
=20
+	echo '<h2 id=3D"jrn_name">'.$Ledger->get_name().'</h2>';
+// pre defined operation
+//
+    echo '<form method=3D"GET" action=3D"do.php">';
+    echo dossier::hidden();
+    echo HtmlInput::hidden('p_jrn_predef',$Ledger->id);
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
+    $op=3Dnew Pre_op_ach($cn);
+    $op->set('ledger',$Ledger->id);
+    $op->set('ledger_type',"ACH");
+    $op->set('direct','f');
+    echo $op->form_get();
=20
+    echo '</form>';
+    echo "<FORM class=3D\"print\"NAME=3D\"form_detail\" METHOD=3D\"POST\=
" >";
     /* request for a predefined operation */
-    if ( isset($use_predef) && $use_predef =3D=3D 1 && isset($_REQUEST['=
pre_def']) )
+    if ( isset($_GET['use_opd']) && isset($_REQUEST['pre_def']) && ! iss=
et($_POST['correct']))
     {
         // used a predefined operation
         //
@@ -240,112 +222,22 @@
     echo '</div>';
     echo "</FORM>";
=20
-    echo '<form method=3D"GET" action=3D"'.$href.'">';
-    echo HtmlInput::hidden("sa","p");
-    echo HtmlInput::hidden("p_action","ach");
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_jrn_predef',$Ledger->id);
-    $op=3Dnew Pre_op_ach($cn);
-    $op->set('ledger',$Ledger->id);
-    $op->set('ledger_type',"ACH");
-    $op->set('direct','f');
-    echo $op->form_get();
+    if ( ! isset ($_POST['e_date'])) echo create_script(" get_last_date(=
)");
=20
-    echo '</form>';
-    echo create_script(" get_last_date()");
-
     echo '</div>';
=20
=20
     exit();
-}
+// end record invoice
+
+
 //----------------------------------------------------------------------=
---------
 // Listing
 //----------------------------------------------------------------------=
----------
 if ( $def =3D=3D 2 )
 {
-    echo '<div class=3D"content">';
-// Check privilege
-    if ( isset($_REQUEST['p_jrn']) &&
-            $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X')
-    {
=20
-        NoAccess();
-        exit -1;
-    }
=20
-    $Ledger=3Dnew Acc_Ledger_Purchase($cn,0);
-    if ( !isset($_REQUEST['p_jrn']))
-    {
-        $Ledger->id=3D-1;
-    }
-    else
-        $Ledger->id=3D$_REQUEST['p_jrn'];
-    echo $Ledger->display_search_form();
-    //------------------------------
-    // UPdate the payment
-    //------------------------------
-    if ( isset ( $_GET ['paid']))
-    {
-        $Ledger->update_paid($_GET);
-    }
-    $p_array=3D$_GET;
-    /* by default we should the default period */
-    if ( ! isset($p_array['date_start']))
-    {
-        $period=3D$g_user->get_periode();
-        $per=3Dnew Periode($cn,$period);
-        list($date_start,$date_end)=3D$per->get_date_limit();
-        $p_array['date_start']=3D$date_start;
-        $p_array['date_end']=3D$date_end;
-    }
-    /*  compute the sql stmt */
-    list($sql,$where)=3D$Ledger->build_search_sql($p_array);
-
-    $max_line=3D$cn->count_sql($sql);
-
-    $step=3D$_SESSION['g_pagesize'];
-    $page=3D(isset($_GET['offset']))?$_GET['page']:1;
-    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
-    $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page);
-
-
-    echo '<form method=3D"GET" id=3D"fpaida" class=3D"print" action=3D"'=
.$href.'">';
-    echo HtmlInput::hidden("sa","l");
-    echo HtmlInput::hidden("p_action","ach");
-    echo dossier::hidden();
-    echo $bar;
-    list($count,$html)=3D $Ledger->list_operation($sql,$offset,1);
-    echo $html;
-    echo $bar;
-    $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des=
c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le=
dger_type','p_action'));
-    if (isset($_GET['r_jrn'])) {
-      foreach ($_GET['r_jrn'] as $k=3D>$v)
-	$r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
-    }
-    echo $r;
-
-    echo '<p>'.HtmlInput::submit('paid',_('Mise =C3=A0 jour paiement')).=
IButton::select_checkbox('fpaida').IButton::unselect_checkbox('fpaida').'=
</p>';
-
-    echo '</form>';
-   /*
-     * Export to csv
-     */
-    $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des=
c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le=
dger_type','p_action'));
-    if (isset($_GET['r_jrn'])) {
-      foreach ($_GET['r_jrn'] as $k=3D>$v)
-	$r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
-    }
-    echo '<form action=3D"export.php" method=3D"get">';
-    echo $r;
-    echo HtmlInput::hidden('act','CSV/histo');
-    echo HtmlInput::submit('viewsearch','Export vers CSV');
-
-    echo '</form>';
-
-    echo '</div>';
-    exit();
-
 }
 //----------------------------------------------------------------------=
-----
 // Listing unpaid

Added: 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	                   =
     (rev 0)
+++ phpcompta/trunk/include/history_operation.inc.php	2011-11-02 21:45:11=
 UTC (rev 4298)
@@ -0,0 +1,137 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/* !\file
+ *
+ *
+ * \brief
+ *
+ */
+require_once 'class_acc_ledger_purchase.php';
+require_once 'class_acc_ledger_fin.php';
+require_once 'class_acc_ledger_sold.php';
+require_once 'class_acc_ledger.php';
+global $g_user,$cn;
+
+if ( isset ($_GET['ledger_type']))
+{
+	$ledger_type=3D$_GET['ledger_type'];
+	switch($ledger_type)
+	{
+		case 'ACH':
+			$Ledger =3D new Acc_Ledger_Purchase($cn, 0);
+			break;
+		case 'ODS':
+			$Ledger=3Dnew Acc_Ledger($cn,0);
+			break;
+		case 'VEN':
+			$Ledger=3Dnew Acc_Ledger_Sold($cn,0);
+			break;
+
+	}
+}
+echo '<div class=3D"content">';
+// Check privilege
+if (isset($_REQUEST['p_jrn']) &&
+		$g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X')
+{
+
+	NoAccess();
+	exit - 1;
+}
+
+
+if (!isset($_REQUEST['p_jrn']))
+{
+	$Ledger->id =3D -1;
+}
+else
+	$Ledger->id =3D $_REQUEST['p_jrn'];
+echo $Ledger->display_search_form();
+//------------------------------
+// UPdate the payment
+//------------------------------
+if (isset($_GET ['paid']))
+{
+	$Ledger->update_paid($_GET);
+}
+$p_array =3D $_GET;
+
+/* by default we should the default period */
+if (!isset($p_array['date_start']))
+{
+	$period =3D $g_user->get_periode();
+	$per =3D new Periode($cn, $period);
+	list($date_start, $date_end) =3D $per->get_date_limit();
+	$p_array['date_start'] =3D $date_start;
+	$p_array['date_end'] =3D $date_end;
+}
+/*  compute the sql stmt */
+list($sql, $where) =3D $Ledger->build_search_sql($p_array);
+
+$max_line =3D $cn->count_sql($sql);
+
+$step =3D $_SESSION['g_pagesize'];
+$page =3D (isset($_GET['offset'])) ? $_GET['page'] : 1;
+$offset =3D (isset($_GET['offset'])) ? $_GET['offset'] : 0;
+$bar =3D jrn_navigation_bar($offset, $max_line, $step, $page);
+
+
+echo '<form method=3D"GET" id=3D"fpaida" class=3D"print">';
+echo HtmlInput::hidden("ledger_type", "ACH");
+echo HtmlInput::hidden("ac", $_REQUEST['ac']);
+echo dossier::hidden();
+echo $bar;
+list($count, $html) =3D $Ledger->list_operation($sql, $offset, 1);
+echo $html;
+echo $bar;
+$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'));
+if (isset($_GET['r_jrn']))
+{
+	foreach ($_GET['r_jrn'] as $k =3D> $v)
+		$r.=3DHtmlInput::hidden('r_jrn[' . $k . ']', $v);
+}
+echo $r;
+
+echo '<p>' . HtmlInput::submit('paid', _('Mise =C3=A0 jour paiement')) .=
 IButton::select_checkbox('fpaida') . IButton::unselect_checkbox('fpaida'=
) . '</p>';
+
+echo '</form>';
+/*
+ * 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'));
+if (isset($_GET['r_jrn']))
+{
+	foreach ($_GET['r_jrn'] as $k =3D> $v)
+		$r.=3DHtmlInput::hidden('r_jrn[' . $k . ']', $v);
+}
+echo '<form action=3D"export.php" method=3D"get">';
+echo $r;
+echo HtmlInput::hidden('act', 'CSV/histo');
+echo HtmlInput::submit('viewsearch', 'Export vers CSV');
+
+echo '</form>';
+
+echo '</div>';
+exit();
+?>

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	2011-11-02 20:=
21:55 UTC (rev 4297)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php	2011-11-02 21:=
45:11 UTC (rev 4298)
@@ -18,7 +18,7 @@
 							$date=3Dnew IDate('p_date');
 							$date->value=3Dformat_date($obj->det->jr_date);
 							 echo td('Date').td($date->input());
-							=20
+
 							 ?>
 							</td>
 							<tr>
@@ -27,16 +27,16 @@
 							$date_ech=3Dnew IDate('p_ech');
 							$date_ech->value=3Dformat_date($obj->det->jr_ech);
 							 echo td('Echeance').td($date_ech->input());
-							=20
+
 							 ?>
 							</td>
 							</tr>
-						=09
+
 							<tr><td>
 							<?
 							$bk=3Dnew Fiche($cn,$obj->det->array[0]['qp_supplier']);
 							echo td(_('Client'));
-						=09
+
 							$view_history=3D sprintf('<A class=3D"detail" HREF=3D"javascript:=
view_history_card(\'%s\',\'%s\')" >%s</A>',
 											$bk->id, $gDossier, $bk->get_quick_code());
 							echo td(h($bk->getName())).td($view_history);;
@@ -45,21 +45,21 @@
 							</tr>
 							<tr>
 							<td>
-							<?=20
+							<?
 							$itext=3Dnew IText('npj');
 							$itext->value=3D$obj->det->jr_pj_number;
 							echo td(_('Pi=C3=A8ce')).td($itext->input());
 							?>
-							</td>						=09
+							</td>
 							<tr>
 							<td>
-							<?=20
+							<?
 							  $itext=3Dnew IText('lib');
 							  $itext->value=3D$obj->det->jr_comment;
 							  $itext->size=3D40;
 							echo td(_('Libell=C3=A9')).td($itext->input(),' colspan=3D"2" ');
-						=09
-						=09
+
+
 							?>
 							</td>
 							</tr>
@@ -79,7 +79,7 @@
 				$inote->value=3D$obj->det->note;
 				echo $inote->input();
 				?>
-			=09
+
 				</td>
 				</tr>
 				</table>
@@ -106,7 +106,7 @@
   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=20
+}else
   echo th(_('Total'), 'style=3D"text-align:right"');
=20
     if ($owner->MY_ANALYTIC !=3D 'nu' && $div=3D=3D'popup'){
@@ -119,9 +119,9 @@
       /* add hidden variables pa[] to hold the value of pa_id */
       echo Anc_Plan::hidden($a_anc);
     }
-echo '</tr>'; =20
+echo '</tr>';
   for ($e=3D0;$e<count($obj->det->array);$e++) {
-    $row=3D'';=20
+    $row=3D'';
     $q=3D$obj->det->array[$e];
     $fiche=3Dnew Fiche($cn,$q['qp_fiche']);
    $view_history=3D sprintf('<A class=3D"detail" style=3D"text-decoratio=
n:underline" HREF=3D"javascript:view_history_card(\'%s\',\'%s\')" >%s</A>=
',
@@ -130,7 +130,7 @@
    $row=3Dtd($view_history);
    $sym_tva=3D'';
=20
-   if ( $owner->MY_TVA_USE=3D=3D'Y') {
+   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();
@@ -169,9 +169,9 @@
 	echo HtmlInput::hidden('op[]',$anc_op->j_id);
 	/* compute total price */
 	bcscale(2);
-=09
+
 	$row.=3D$anc_op->display_table(1,$htva,$div);
-=09
+
       }  else {
 	$row.=3Dtd('');
       }
@@ -194,7 +194,7 @@
 <?=3D_('Ecritures comptables')?>
 </legend>
=20
-<?=20
+<?
   /* if it is not in a popup, the details are hidden */
   if ( $div !=3D 'popup') {
     $ib=3Dnew IButton ("a".$div);
@@ -206,7 +206,7 @@
     $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=20
+  } else
     echo '<div class=3D"content">';
 $detail=3Dnew Acc_Misc($cn,$obj->jr_id);
 $detail->get();
@@ -238,7 +238,7 @@
     /* $row=3Dtd($q[$e]['j_poste']); */
     /* $row.=3Dtd($q[$e]['j_qcode']); */
     if ( $q[$e]['j_qcode'] !=3D'') {
-      // nom de la fiche=20
+      // nom de la fiche
       $ff=3Dnew Fiche($cn);
       $ff->get_by_qcode( $q[$e]['j_qcode']);
       $row.=3Dtd($ff->strAttribut(h(ATTR_DEF_NAME)));



From MAILER-DAEMON Wed Nov 02 17:39:51 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLiXH-00065z-G9
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 17:39:51 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  2 Nov 2011 22:46:22 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57773.1320269990.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4299 - 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, 02 Nov 2011 21:39:49 -0000

Author: danydb
Date: 2011-11-02 22:46:21 +0100 (Wed, 02 Nov 2011)
New Revision: 4299

Modified:
   phpcompta/trunk/include/compta_ach.inc.php
Log:
Finish rewriting for ACH remove dead code

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	2011-11-02 21:45:11 UTC (r=
ev 4298)
+++ phpcompta/trunk/include/compta_ach.inc.php	2011-11-02 21:46:21 UTC (r=
ev 4299)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,293 +16,217 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/*!\file
+/* !\file
  * \brief file included to manage all the sold operation
  */
 require_once("class_icheckbox.php");
 require_once("class_acc_ledger_purchase.php");
 require_once ('class_pre_op_ach.php');
 require_once('class_ipopup.php');
-$gDossier=3Ddossier::id();
+$gDossier =3D dossier::id();
=20
-$cn=3Dnew Database(dossier::id());
+$cn =3D new Database(dossier::id());
 //menu =3D show a list of ledger
-$str_dossier=3Ddossier::get();
-$ac=3D"ac=3D".$_REQUEST['ac'];
+$str_dossier =3D dossier::get();
+$ac =3D "ac=3D" . $_REQUEST['ac'];
=20
 // Check privilege
-    if ( isset($_REQUEST['p_jrn']))
-        if (     $g_user->check_jrn($_REQUEST['p_jrn']) !=3D 'W' )
-        {
-            NoAccess();
-            exit -1;
-        }
+if (isset($_REQUEST['p_jrn']))
+	if ($g_user->check_jrn($_REQUEST['p_jrn']) !=3D 'W')
+	{
+		NoAccess();
+		exit - 1;
+	}
=20
-    /* if a new invoice is encoded, we display a form for confirmation *=
/
-    if ( isset ($_POST['view_invoice'] ) )
-    {
-        $Ledger=3Dnew Acc_Ledger_Purchase($cn,$_POST['p_jrn']);
-        try
-        {
-            $Ledger->verify($_POST);
-        }
-        catch (Exception $e)
-        {
-            alert($e->getMessage());
-            $correct=3D1;
-        }
-        // if correct is not set it means it is correct
-        if ( ! isset($correct))
-        {
-            echo '<div class=3D"content">';
-			echo h2info('Confirmation');
-			echo '<h2 id=3D"jrn_name">'.$Ledger->get_name().'</h2>';
+/* if a new invoice is encoded, we display a form for confirmation */
+if (isset($_POST['view_invoice']))
+{
+	$Ledger =3D new Acc_Ledger_Purchase($cn, $_POST['p_jrn']);
+	try
+	{
+		$Ledger->verify($_POST);
+	}
+	catch (Exception $e)
+	{
+		alert($e->getMessage());
+		$correct =3D 1;
+	}
+	// if correct is not set it means it is correct
+	if (!isset($correct))
+	{
+		echo '<div class=3D"content">';
+		echo h2info('Confirmation');
+		echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
=20
-            echo '<form enctype=3D"multipart/form-data" method=3D"post">=
';
-            echo dossier::hidden();
+		echo '<form enctype=3D"multipart/form-data" method=3D"post">';
+		echo dossier::hidden();
=20
-            echo $Ledger->confirm($_POST );
-			echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-            $chk=3Dnew ICheckBox();
-            $chk->selected=3Dfalse;
-	    echo '<div style=3D"float:left;clear:both">';
+		echo $Ledger->confirm($_POST);
+		echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+		$chk =3D new ICheckBox();
+		$chk->selected =3D false;
+		echo '<div style=3D"float:left;clear:both">';
=20
-            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 $chk->input('opd_save');
+		echo "Sauvez cette op&eacute;ration comme mod=C3=A8le d'op=C3=A9ration=
 ?";
+		echo '<br/>';
+		$opd_name =3D new IText('opd_name');
+		echo "Nom du mod=C3=A8le " . $opd_name->input();
=20
-            echo '<hr>';
-            echo HtmlInput::submit("record",_("Enregistrement"),'onClick=
=3D"return verify_ca(\'\');"');
-            echo HtmlInput::submit('correct',_("Corriger"));
-            echo '</form>';
-	    echo '</div>';
-            echo '</div>';
+		echo '<hr>';
+		echo HtmlInput::submit("record", _("Enregistrement"), 'onClick=3D"retu=
rn verify_ca(\'\');"');
+		echo HtmlInput::submit('correct', _("Corriger"));
+		echo '</form>';
+		echo '</div>';
+		echo '</div>';
=20
-            exit();
-        }
-    }
-    //------------------------------
-    /* Record the invoice */
-    //------------------------------
+		exit();
+	}
+}
+//------------------------------
+/* Record the invoice */
+//------------------------------
=20
-    if ( isset($_POST['record']) )
-    {
-        $Ledger=3Dnew Acc_Ledger_Purchase($cn,$_POST['p_jrn']);
-        try
-        {
-            $Ledger->verify($_POST);
-        }
-        catch (Exception $e)
-        {
-            alert($e->getMessage());
-            $correct=3D1;
-        }
-		// record the invoice
-        if ( ! isset($correct))
-        {
-            echo '<div class=3D"content">';
+if (isset($_POST['record']))
+{
+	$Ledger =3D new Acc_Ledger_Purchase($cn, $_POST['p_jrn']);
+	try
+	{
+		$Ledger->verify($_POST);
+	}
+	catch (Exception $e)
+	{
+		alert($e->getMessage());
+		$correct =3D 1;
+	}
+	// record the invoice
+	if (!isset($correct))
+	{
+		echo '<div class=3D"content">';
=20
-			echo '<h2 id=3D"jrn_name">'.$Ledger->get_name().'</h2>';
+		echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
=20
-            $Ledger=3Dnew Acc_Ledger_Purchase($cn,$_POST['p_jrn']);
-            $internal=3D$Ledger->insert($_POST);
+		$Ledger =3D new Acc_Ledger_Purchase($cn, $_POST['p_jrn']);
+		$internal =3D $Ledger->insert($_POST);
=20
=20
-            /* Save the predefined operation */
-            if ( isset($_POST['opd_save']) && $g_user->check_action(PARP=
REDE)=3D=3D1)
-            {
-                $opd=3Dnew Pre_op_ach($cn);
-                $opd->get_post();
-                $opd->save();
-            }
+		/* Save the predefined operation */
+		if (isset($_POST['opd_save']) && $g_user->check_action(PARPREDE) =3D=3D=
 1)
+		{
+			$opd =3D new Pre_op_ach($cn);
+			$opd->get_post();
+			$opd->save();
+		}
=20
-            /* Show button  */
-            $jr_id=3D$cn->get_value('select jr_id from jrn where jr_inte=
rnal=3D$1',array($internal));
+		/* Show button  */
+		$jr_id =3D $cn->get_value('select jr_id from jrn where jr_internal=3D$=
1', array($internal));
=20
-            echo '<h2 class=3D"info"> Enregistrement </h2>';
-            echo "<h2 >"._('Op=C3=A9ration sauv=C3=A9e')." $internal ";
-            if ( $Ledger->pj !=3D '') echo ' Piece : '.h($Ledger->pj);
-            echo "</h2>";
-            if ( strcmp($Ledger->pj,$_POST['e_pj']) !=3D 0 )
-            {
-                echo '<h3 class=3D"notice"> '._('Attention num=C3=A9ro p=
i=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</h3>';
-            }
-            if (isset($Ledger->doc))
-            {
-                echo $Ledger->doc.'<hr>';
-            }
-            /* Save the additional information into jrn_info */
-            $obj=3Dnew Acc_Ledger_Info($cn);
-            $obj->save_extra($Ledger->jr_id,$_POST);
-            printf ('<a class=3D"detail" style=3D"display:inline" href=3D=
"javascript:modifyOperation(%d,%d)">%s</a><hr>',
-                    $jr_id,dossier::id(),$internal);
-			// Feedback
-			echo $Ledger->confirm($_POST,true);
-            echo '</div>';
-            exit();
-        }
-    }
-    //  ------------------------------
-    /* Display a blank form or a form with predef operation */
-    /* or a form for correcting */
-    //  ------------------------------
+		echo '<h2 class=3D"info"> Enregistrement </h2>';
+		echo "<h2 >" . _('Op=C3=A9ration sauv=C3=A9e') . " $internal ";
+		if ($Ledger->pj !=3D '')
+			echo ' Piece : ' . h($Ledger->pj);
+		echo "</h2>";
+		if (strcmp($Ledger->pj, $_POST['e_pj']) !=3D 0)
+		{
+			echo '<h3 class=3D"notice"> ' . _('Attention num=C3=A9ro pi=C3=A8ce e=
xistante, elle a du =C3=AAtre adapt=C3=A9e') . '</h3>';
+		}
+		if (isset($Ledger->doc))
+		{
+			echo $Ledger->doc . '<hr>';
+		}
+		/* Save the additional information into jrn_info */
+		$obj =3D new Acc_Ledger_Info($cn);
+		$obj->save_extra($Ledger->jr_id, $_POST);
+		printf('<a class=3D"detail" style=3D"display:inline" href=3D"javascrip=
t:modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), $internal);
+		// Feedback
+		echo $Ledger->confirm($_POST, true);
+		echo '</div>';
+		exit();
+	}
+}
+//  ------------------------------
+/* Display a blank form or a form with predef operation */
+/* or a form for correcting */
+//  ------------------------------
=20
-    echo '<div class=3D"content">';
-	//
+echo '<div class=3D"content">';
+//
=20
=20
-    $array=3D(isset($_POST['correct'])||isset ($correct))?$_POST:null;
-    $Ledger=3Dnew Acc_Ledger_Purchase($cn,0);
+$array =3D (isset($_POST['correct']) || isset($correct)) ? $_POST : null=
;
+$Ledger =3D new Acc_Ledger_Purchase($cn, 0);
=20
=20
-    if ( !isset($_REQUEST ['p_jrn']))
-    {
-        $def_ledger=3D$Ledger->get_first('ach');
-        $Ledger->id=3D$def_ledger['jrn_def_id'];
-    }
-    else
-        $Ledger->id=3D$_REQUEST ['p_jrn'];
+if (!isset($_REQUEST ['p_jrn']))
+{
+	$def_ledger =3D $Ledger->get_first('ach');
+	$Ledger->id =3D $def_ledger['jrn_def_id'];
+}
+else
+	$Ledger->id =3D $_REQUEST ['p_jrn'];
=20
-	echo '<h2 id=3D"jrn_name">'.$Ledger->get_name().'</h2>';
+echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
 // pre defined operation
 //
-    echo '<form method=3D"GET" action=3D"do.php">';
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_jrn_predef',$Ledger->id);
-    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-    $op=3Dnew Pre_op_ach($cn);
-    $op->set('ledger',$Ledger->id);
-    $op->set('ledger_type',"ACH");
-    $op->set('direct','f');
-    echo $op->form_get();
+echo '<form method=3D"GET" action=3D"do.php">';
+echo dossier::hidden();
+echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
+echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+$op =3D new Pre_op_ach($cn);
+$op->set('ledger', $Ledger->id);
+$op->set('ledger_type', "ACH");
+$op->set('direct', 'f');
+echo $op->form_get();
=20
-    echo '</form>';
-    echo "<FORM class=3D\"print\"NAME=3D\"form_detail\" METHOD=3D\"POST\=
" >";
-    /* request for a predefined operation */
-    if ( isset($_GET['use_opd']) && isset($_REQUEST['pre_def']) && ! iss=
et($_POST['correct']))
-    {
-        // used a predefined operation
-        //
-        $op=3Dnew Pre_op_ach($cn);
-        $op->set_od_id($_REQUEST['pre_def']);
-        $p_post=3D$op->compute_array();
-        $Ledger->id=3D$_REQUEST ['p_jrn_predef'];
-        $p_post['p_jrn']=3D$Ledger->id;
-        echo $Ledger->input($p_post);
-        echo '<div class=3D"content">';
-        echo $Ledger->input_paid();
-        echo '</div>';
-        echo '<script>';
-        echo 'compute_all_ledger();';
-        echo '</script>';
-    }
-    else
-    {
-        echo $Ledger->input($array);
-        echo HtmlInput::hidden("p_action","ach");
-        echo HtmlInput::hidden("sa","p");
-        echo '<div class=3D"content">';
-        echo $Ledger->input_paid();
-        echo '</div>';
-        echo '<script>';
-        echo 'compute_all_ledger();';
-        echo '</script>';
-
-    }
-    echo '<div class=3D"content">';
-    echo HtmlInput::button('act',_('Actualiser'),'onClick=3D"compute_all=
_ledger();"');
-    echo HtmlInput::submit("view_invoice",_("Enregistrer"));
-    echo HtmlInput::reset(_('Effacer '));
-    echo '</div>';
-    echo "</FORM>";
-
-    if ( ! isset ($_POST['e_date'])) echo create_script(" get_last_date(=
)");
-
-    echo '</div>';
-
-
-    exit();
-// end record invoice
-
-
-//----------------------------------------------------------------------=
---------
-// Listing
-//----------------------------------------------------------------------=
----------
-if ( $def =3D=3D 2 )
+echo '</form>';
+echo "<FORM class=3D\"print\"NAME=3D\"form_detail\" METHOD=3D\"POST\" >"=
;
+/* request for a predefined operation */
+if (isset($_GET['use_opd']) && isset($_REQUEST['pre_def']) && !isset($_P=
OST['correct']))
 {
-
-
+	// used a predefined operation
+	//
+        $op =3D new Pre_op_ach($cn);
+	$op->set_od_id($_REQUEST['pre_def']);
+	$p_post =3D $op->compute_array();
+	$Ledger->id =3D $_REQUEST ['p_jrn_predef'];
+	$p_post['p_jrn'] =3D $Ledger->id;
+	echo $Ledger->input($p_post);
+	echo '<div class=3D"content">';
+	echo $Ledger->input_paid();
+	echo '</div>';
+	echo '<script>';
+	echo 'compute_all_ledger();';
+	echo '</script>';
 }
-//----------------------------------------------------------------------=
-----
-// Listing unpaid
-//----------------------------------------------------------------------=
-----
-if ( $def=3D=3D3 )
+else
 {
-    echo '<div class=3D"content">';
-// Check privilege
-    if ( isset($_REQUEST['p_jrn']) &&
-            $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X')
-    {
-        NoAccess();
-        exit -1;
-    }
+	echo $Ledger->input($array);
+	echo HtmlInput::hidden("p_action", "ach");
+	echo HtmlInput::hidden("sa", "p");
+	echo '<div class=3D"content">';
+	echo $Ledger->input_paid();
+	echo '</div>';
+	echo '<script>';
+	echo 'compute_all_ledger();';
+	echo '</script>';
+}
+echo '<div class=3D"content">';
+echo HtmlInput::button('act', _('Actualiser'), 'onClick=3D"compute_all_l=
edger();"');
+echo HtmlInput::submit("view_invoice", _("Enregistrer"));
+echo HtmlInput::reset(_('Effacer '));
+echo '</div>';
+echo "</FORM>";
=20
-    $Ledger=3Dnew Acc_Ledger_Purchase($cn,0);
-    if ( !isset($_REQUEST['p_jrn']))
-    {
-        $Ledger->id=3D-1;
-    }
-    else
-        $Ledger->id=3D$_REQUEST['p_jrn'];
-    echo $Ledger->display_search_form();
-    //------------------------------
-    // UPdate the payment
-    //------------------------------
-    if ( isset ( $_GET ['paid']))
-    {
-        $Ledger->update_paid($_GET);
-    }
-    /*  compute the sql stmt */
-    list($sql,$where)=3D$Ledger->build_search_sql($_GET);
-    if ( trim($where) !=3D '')
-        $sql .=3D ' and '.SQL_LIST_UNPAID_INVOICE;
-    else
-        $sql .=3D ' where '.SQL_LIST_UNPAID_INVOICE;
+if (!isset($_POST['e_date']))
+	echo create_script(" get_last_date()");
=20
-    $max_line=3D$cn->count_sql($sql);
+echo '</div>';
=20
-    $step=3D$_SESSION['g_pagesize'];
-    $page=3D(isset($_GET['offset']))?$_GET['page']:1;
-    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
-    $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page);
=20
-
-    echo '<form method=3D"GET" id=3D"fpaida" class=3D"print" action=3D"'=
.$href.'">';
-    echo HtmlInput::hidden("sa","lnp");
-    echo HtmlInput::hidden("p_action","ach");
-    echo dossier::hidden();
-    echo $bar;
-    list($count,$html)=3D $Ledger->list_operation($sql,$offset,1);
-    echo $html;
-    echo $bar;
-
-    $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des=
c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le=
dger_type','p_action'));
-    if (isset($_GET['r_jrn'])) {
-      foreach ($_GET['r_jrn'] as $k=3D>$v)
-	$r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
-    }
-    echo $r;
-
-    echo '<p>'.HtmlInput::submit('paid',_('Mise =C3=A0 jour paiement')).=
IButton::select_checkbox('fpaida').IButton::unselect_checkbox('fpaida').'=
</p>';
-    echo '</form>';
-
-    echo '</div>';
-    exit();
-}
+exit();
+// end record invoice
\ No newline at end of file



From MAILER-DAEMON Wed Nov 02 18:57:19 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLjkF-000126-L1
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 18:57:19 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Nov 2011 00:03:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57854.1320274638.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4300 - 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, 02 Nov 2011 22:57:18 -0000

Author: danydb
Date: 2011-11-03 00:03:49 +0100 (Thu, 03 Nov 2011)
New Revision: 4300

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/compta_ods.inc.php
Log:
ODS : add a verify before screen to confirm

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	2011-11-02 21:46:21 UTC =
(rev 4299)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-02 23:03:49 UTC =
(rev 4300)
@@ -1209,7 +1209,8 @@
      */
     function confirm($p_array,$p_readonly=3Dfalse)
     {
-        $this->id=3D$p_array['p_jrn'];
+		if (! $p_readonly ) $this->verify($p_array);
+		$this->id=3D$p_array['p_jrn'];
         if ( empty($p_array)) return 'Aucun r&eacute;sultat';
         $anc=3Dnull;
         extract($p_array);

Modified: phpcompta/trunk/include/compta_ods.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ods.inc.php	2011-11-02 21:46:21 UTC (r=
ev 4299)
+++ phpcompta/trunk/include/compta_ods.inc.php	2011-11-02 23:03:49 UTC (r=
ev 4300)
@@ -64,7 +64,15 @@
 }
 elseif (isset($_POST['summary']))
 {
-	require_once 'operation_ods_confirm.inc.php';
+	try {
+			$ledger->verify($_POST);
+			require_once 'operation_ods_confirm.inc.php';
+	} catch (Exception $e)
+	{
+		echo alert($e->getMessage());
+		require('operation_ods_new.inc.php');
+
+	}
 	exit();
 }
 elseif (isset($_POST['save']))
@@ -95,152 +103,3 @@
 }
 exit();
=20
-
-
-if ( $g_user->check_jrn($id) =3D=3D 'X' )
-{
-    alert(_("L'acces a ce journal est interdit, \n contactez votre respo=
nsable"));
-    exit();
-}
-
-//=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-// See the ledger listing
-if ($sa =3D=3D 'l' && $id !=3D -1)
-{
-// Check privilege
-
-    if (  $g_user->check_jrn($id) =3D=3D 'X')
-    {
-        NoAccess();
-        exit -1;
-    }
-    show_qw_menu(1);
-    echo '<div class=3D"content">';
-    $Ledger=3Dnew Acc_Ledger($cn,$id);
-
-    $type=3D$Ledger->get_type();
-    $href=3Dbasename($_SERVER['PHP_SELF']);
-
-    echo '<form method=3D"GET" action=3D"'.$href.'">';
-    echo HtmlInput::hidden("sa","l");
-    echo HtmlInput::hidden("p_jrn",$id);
-    echo HtmlInput::hidden("ac",$_REQUEST['sa']);
-    echo dossier::hidden();
-    echo $Ledger->search_form($type,0);
-    echo HtmlInput::submit("qwlist",_("Recherche"));
-    echo '</form>';
-
-    $array=3D$_GET;
-    list($sql,$where)=3D$Ledger->build_search_sql($array);
-
-    $max_line=3D$cn->count_sql($sql);
-
-    $step=3D$_SESSION['g_pagesize'];
-    $page=3D(isset($_GET['offset']))?$_GET['page']:1;
-    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
-    $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page);
-
-
-    echo $bar;
-    list($count,$html)=3D $Ledger->list_operation($sql,$offset,0);
-    echo $html;
-    echo $bar;
-   /*
-     * Export to csv
-     */
-    $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des=
c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le=
dger_type','ac'));
-    if (isset($_GET['r_jrn'])) {
-      foreach ($_GET['r_jrn'] as $k=3D>$v)
-	$r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
-    }
-    echo '<form action=3D"export.php" method=3D"get">';
-    echo $r;
-    echo HtmlInput::hidden('act','CSV/histo');
-    echo HtmlInput::submit('viewsearch','Export vers CSV');
-
-    echo '</form>';
-
-    echo '</div>';
-    exit();
-}
-
-//=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-// User can write ?
-// Write into the ledger
-
-if ( $g_user->check_jrn($id) =3D=3D 'X' )
-{
-    alert(_("Vous ne pouvez pas acc=C3=A8der =C3=A0 ce journal, contacte=
z votre responsable"));
-    exit -1;
-}
-
-if ( $g_user->check_jrn($id)=3D=3D'W' )
-{
-    if ( ($sa=3D=3D'n' || isset($_POST['correct_it'])) && ! isset($_POST=
['summary']))
-    {
-        $array=3D$_POST;
-        $default_periode=3D$g_user->get_periode();
-        /* check if the ledger is closed */
-
-        show_qw_menu();
-        show_direct_form($cn,$ledger,$array);
-        exit();
-    }
-
-// reload with a predefined operation
-//
-    if ( isset ($_GET['use_opd']))
-    {
-        $op=3Dnew Pre_op_advanced($cn);
-        $p_post=3Dnull;
-        if ( isset($_REQUEST['pre_def']) && $_REQUEST['pre_def'] !=3D ''=
)
-        {
-            $op->set_od_id($_REQUEST['pre_def']);
-            //$op->p_jrn=3D$id;
-
-            $p_post=3D$op->compute_array();
-        }
-        show_qw_menu();
-        show_direct_form($cn,$ledger,$p_post);
-
-        exit();
-
-    }
-
-    if ( isset($_POST['save_it' ]))
-    {
-        $array=3D$_POST;
-
-        try
-        {
-            $ledger->save($array);
-            $jr_id=3D$cn->get_value('select jr_id from jrn where jr_inte=
rnal=3D$1',array($ledger->internal));
-
-            echo '<h2> Op&eacute;ration enregistr&eacute;e  Piece '.h($l=
edger->pj).'</h2>';
-            if ( strcmp($ledger->pj,$_POST['e_pj']) !=3D 0 )
-            {
-                echo '<h3 class=3D"notice">'._('Attention num=C3=A9ro pi=
=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</h3>';
-            }
-            printf ('<a class=3D"detail" style=3D"display:inline" href=3D=
"javascript:modifyOperation(%d,%d)">%s</a><hr>',
-                    $jr_id,dossier::id(),$ledger->internal);
-
-            echo HtmlInput::button_anchor(_('Autre op=C3=A9ration dans c=
e journal'),
-                                          "?".dossier::get().
-                                              '&show_form'.
-                                              '&p_action=3Dquick_writing=
&p_jrn=3D'.
-                                              $_REQUEST['p_jrn']);
-
-        }
-        catch (Exception $e)
-        {
-            alert ($e->getMessage());
-            show_qw_menu();
-            show_direct_form($cn,$ledger,$_POST);
-        }
-        exit();
-    }
-} // if check_jrn=3D=3D'W'
-else
-{
-    show_qw_menu();
-}



From MAILER-DAEMON Wed Nov 02 18:58:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLjlS-0001eR-Lf
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 18:58:34 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Nov 2011 00:05:04 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57855.1320274713.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4301 - 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, 02 Nov 2011 22:58:33 -0000

Author: danydb
Date: 2011-11-03 00:05:03 +0100 (Thu, 03 Nov 2011)
New Revision: 4301

Removed:
   phpcompta/trunk/include/user_action_gl.php
Modified:
   phpcompta/trunk/include/history_operation.inc.php
   phpcompta/trunk/include/operation_adm.inc.php
   phpcompta/trunk/include/operation_client.inc.php
   phpcompta/trunk/include/operation_supplier.inc.php
Log:
412 : code cleaning
Remove user_action_gl.php (replace by history_action.inc.php)
Callable from menu

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	2011-11-02 23:03:49=
 UTC (rev 4300)
+++ phpcompta/trunk/include/history_operation.inc.php	2011-11-02 23:05:03=
 UTC (rev 4301)
@@ -40,12 +40,16 @@
 	{
 		case 'ACH':
 			$Ledger =3D new Acc_Ledger_Purchase($cn, 0);
+			$ask_pay=3D1;
 			break;
 		case 'ODS':
+		case 'ALL':
 			$Ledger=3Dnew Acc_Ledger($cn,0);
+			$ask_pay=3D0;
 			break;
 		case 'VEN':
 			$Ledger=3Dnew Acc_Ledger_Sold($cn,0);
+			$ask_pay=3D1;
 			break;
=20
 	}
@@ -98,11 +102,12 @@
=20
=20
 echo '<form method=3D"GET" id=3D"fpaida" class=3D"print">';
-echo HtmlInput::hidden("ledger_type", "ACH");
 echo HtmlInput::hidden("ac", $_REQUEST['ac']);
+echo HtmlInput::hidden('ledger_type',$_REQUEST['ledger_type']);
 echo dossier::hidden();
 echo $bar;
-list($count, $html) =3D $Ledger->list_operation($sql, $offset, 1);
+
+list($count, $html) =3D $Ledger->list_operation($sql, $offset, $ask_pay)=
;
 echo $html;
 echo $bar;
 $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'));
@@ -113,7 +118,8 @@
 }
 echo $r;
=20
-echo '<p>' . HtmlInput::submit('paid', _('Mise =C3=A0 jour paiement')) .=
 IButton::select_checkbox('fpaida') . IButton::unselect_checkbox('fpaida'=
) . '</p>';
+if ($ask_pay)
+	echo '<p>' . HtmlInput::submit('paid', _('Mise =C3=A0 jour paiement')) =
. IButton::select_checkbox('fpaida') . IButton::unselect_checkbox('fpaida=
') . '</p>';
=20
 echo '</form>';
 /*

Modified: phpcompta/trunk/include/operation_adm.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_adm.inc.php	2011-11-02 23:03:49 UTC=
 (rev 4300)
+++ phpcompta/trunk/include/operation_adm.inc.php	2011-11-02 23:05:03 UTC=
 (rev 4301)
@@ -34,5 +34,8 @@
 $qcode=3D$f->get_quick_code();
 $_GET['qcode']=3D$qcode;
 $_REQUEST['qcode']=3D$qcode;
-require_once ('user_action_gl.php');
=20
+$var_array=3Dcompute_variable('ledger_type=3DALL');
+put_global($var_array);
+require_once ('history_operation.inc.php');
+

Modified: phpcompta/trunk/include/operation_client.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_client.inc.php	2011-11-02 23:03:49 =
UTC (rev 4300)
+++ phpcompta/trunk/include/operation_client.inc.php	2011-11-02 23:05:03 =
UTC (rev 4301)
@@ -34,5 +34,8 @@
 $qcode=3D$f->get_quick_code();
 $_GET['qcode']=3D$qcode;
 $_REQUEST['qcode']=3D$qcode;
-require_once ('user_action_gl.php');
+$var_array=3Dcompute_variable('ledger_type=3DALL');
+put_global($var_array);
+require_once ('history_operation.inc.php');
=20
+

Modified: phpcompta/trunk/include/operation_supplier.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_supplier.inc.php	2011-11-02 23:03:4=
9 UTC (rev 4300)
+++ phpcompta/trunk/include/operation_supplier.inc.php	2011-11-02 23:05:0=
3 UTC (rev 4301)
@@ -34,5 +34,7 @@
 $qcode=3D$f->get_quick_code();
 $_GET['qcode']=3D$qcode;
 $_REQUEST['qcode']=3D$qcode;
-require_once ('user_action_gl.php');
+$var_array=3Dcompute_variable('ledger_type=3DALL');
+put_global($var_array);
+require_once ('history_operation.inc.php');
=20

Deleted: phpcompta/trunk/include/user_action_gl.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_action_gl.php	2011-11-02 23:03:49 UTC (r=
ev 4300)
+++ phpcompta/trunk/include/user_action_gl.php	2011-11-02 23:05:03 UTC (r=
ev 4301)
@@ -1,88 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* $Revision$ */
-
-/*! \file
- * \brief included file for the great ledger
- */
-
-include_once ("user_common.php");
-include_once("class_user.php");
-require_once("class_iselect.php");
-require_once('class_acc_ledger.php');
-$gDossier=3DDossier::id();
-$cn=3Dnew Database($gDossier);
-
-require_once('class_iposte.php');
-require_once('class_ipopup.php');
-
-echo '<div class=3D"content">';
-
-$Ledger=3Dnew Acc_Ledger($cn,0);
-if ( !isset($_REQUEST['p_jrn']))
-{
-    $Ledger->id=3D-1;
-}
-else
-    $Ledger->id=3D$_REQUEST['p_jrn'];
-/*
- * @todo usefull ?
- */
-$_GET['ledger_type']=3D'ALL';
-echo $Ledger->display_search_form();
-echo '<hr>';
-/*  compute the sql stmt */
-list($sql,$where)=3D$Ledger->build_search_sql($_GET);
-
-$max_line=3D$cn->count_sql($sql);
-
-$step=3D$_SESSION['g_pagesize'];
-$page=3D(isset($_GET['offset']))?$_GET['page']:1;
-$offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
-$bar=3Djrn_navigation_bar($offset,$max_line,$step,$page);
-
-
-echo HtmlInput::request_to_hidden(array('sa','sb','sc','f_id','ac'));
-
-echo dossier::hidden();
-echo $bar;
-list($count,$html)=3D $Ledger->list_operation($sql,$offset);
-echo $html;
-echo $bar;
-
-/*
- * Export to csv
- */
-$r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','desc','=
amount_min','amount_max','qcode','accounting','unpaid','gDossier','ledger=
_type'));
-if (isset($_GET['r_jrn'])) {
-  foreach ($_GET['r_jrn'] as $k=3D>$v)
-    $r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
-}
-echo '<form action=3D"export.php" method=3D"get">';
-echo $r;
-echo HtmlInput::hidden('act','CSV/histo');
-echo HtmlInput::submit('viewsearch','Export vers CSV');
-echo HtmlInput::hidden('p_action','ALL');
-echo '</form>';
-
-
-?>
-
-</div>



From MAILER-DAEMON Wed Nov 02 18:59:22 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLjmE-0001fr-Dt
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 18:59:22 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Nov 2011 00:05:53 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57860.1320274760.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4302 - 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, 02 Nov 2011 22:59:19 -0000

Author: danydb
Date: 2011-11-03 00:05:52 +0100 (Thu, 03 Nov 2011)
New Revision: 4302

Modified:
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/compta_ven.inc.php
Log:
412: r?\195?\169?\195?\169criture ACH + VEN

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	2011-11-02 23:05:03=
 UTC (rev 4301)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-02 23:05:52=
 UTC (rev 4302)
@@ -608,15 +608,17 @@
         echo "<h2> Acc_Ledger_Sold::delete Not implemented</h2>";
     }
=20
-    /*!\brief show the summary of the operation and propose to save it
-     *\param array contains normally $_POST. It proposes also to save
+    /*!@brief show the summary of the operation and propose to save it
+     *@param array contains normally $_POST. It proposes also to save
      * the Analytic accountancy
-     *\return string
+     *@return string
      */
-    function confirm($p_array)
+    function confirm($p_array,$p_summary=3Dfalse)
     {
         extract ($p_array);
-        $this->verify($p_array) ;
+
+		// don't need to verify for a summary
+        if ( ! $p_summary ) $this->verify($p_array) ;
         $anc=3Dnull;
         // to show a select list for the analytic & VAT USE
         // if analytic is op (optionnel) there is a blank line
@@ -761,7 +763,7 @@
                 $anc_op=3Dnew Anc_Operation($this->db);
                 $null=3D($owner->MY_ANALYTIC=3D=3D'op')?1:0;
                 $r.=3D'<td>';
-                $p_mode=3D1;
+                $p_mode=3D($p_summary=3D=3Dfalse)?1:0;
                 $p_array['pa_id']=3D$a_anc;
                 /* op is the operation it contains either a sequence or =
a jrnx.j_id */
                 $r.=3DHtmlInput::hidden('op[]=3D',$i);
@@ -777,12 +779,15 @@
=20
         $r.=3D'</table>';
         if ( $owner->MY_ANALYTIC!=3D'nu') // use of AA
-            $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'verifie CA').'" onClick=3D"verify_ca(\'\');">';
+            $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'V=C3=A9rifiez Imputation Analytique').'" onClick=3D"verify_ca(\'\');">';
         $r.=3D'</fieldset>';
-        $r.=3D$this->extra_info();
-
-
-        $r.=3D'<div style=3D"width:40%;position:float;float:right;text-a=
lign:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;fo=
nt-weight:bold">';
+        if (! $p_summary )
+		{
+			$r.=3D$this->extra_info();
+	        $r.=3D'<div style=3D"width:40%;position:float;float:right;text-=
align:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;f=
ont-weight:bold">';
+		}
+		else
+			$r.=3D'<div style=3D"width:60%;position:float;float:left;text-align:r=
ight;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-wei=
ght:bold">';
         $r.=3D'<fieldset> <legend>Totaux</legend>';
         $tot=3Dround(bcadd($tot_amount,$tot_tva),2);
         $r.=3D'<div style=3D"width:40%;position:float;float:left;text-al=
ign:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;fon=
t-weight:bold">';
@@ -1039,6 +1044,7 @@
             $add_js=3D"update_pj();";
         }
         $add_js.=3D'get_last_date();';
+		$add_js.=3D'update_name();';
=20
         $wLedger=3D$this->select_ledger('VEN',2);
         if ( $wLedger =3D=3D null )

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	2011-11-02 23:05:03 UTC (r=
ev 4301)
+++ phpcompta/trunk/include/compta_ach.inc.php	2011-11-02 23:05:52 UTC (r=
ev 4302)
@@ -184,6 +184,8 @@
 echo $op->form_get();
=20
 echo '</form>';
+echo '</div>';
+echo '<div class=3D"content">';
 echo "<FORM class=3D\"print\"NAME=3D\"form_detail\" METHOD=3D\"POST\" >"=
;
 /* request for a predefined operation */
 if (isset($_GET['use_opd']) && isset($_REQUEST['pre_def']) && !isset($_P=
OST['correct']))

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	2011-11-02 23:05:03 UTC (r=
ev 4301)
+++ phpcompta/trunk/include/compta_ven.inc.php	2011-11-02 23:05:52 UTC (r=
ev 4302)
@@ -30,50 +30,18 @@
 require_once ('class_acc_ledger_info.php');
 require_once('class_ipopup.php');
=20
-$p_action=3D(isset($_REQUEST['p_action']))?$_REQUEST['p_action']:'';
 $gDossier=3Ddossier::id();
 $cn=3Dnew Database(dossier::id());
 //menu =3D show a list of ledger
 $str_dossier=3Ddossier::get();
 $ac=3D"ac=3D".$_REQUEST['ac'];
-$array=3Darray(
-           array('?ledger_type=3Dven&sa=3Dn&'.$str_dossier."&$ac",_('Nou=
velle vente'),_('Nouvelle vente'),1),
-           array('?ledger_type=3Dven&sa=3Dl&'.$str_dossier."&$ac",_('Lis=
te ventes'),_('Liste des ventes'),2),
-           array('?ledger_type=3Dven&sa=3Dlnp&'.$str_dossier."&$ac",_('L=
iste vente non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'),3)
-       );
=20
-$sa=3D(isset ($_REQUEST['sa']))?$_REQUEST['sa']:-1;
-$def=3D1;
-switch ($sa)
-{
-case 'n':
-    $def=3D1;
-    $use_predef=3D0;
-    break;
-case 'p':
-    $def=3D1;
-    $use_predef=3D1;
-    break;
-case 'l':
-    $def=3D2;
-    break;
-case 'lnp':
-    $def=3D3;
-    break;
-}
=20
-echo '<div class=3D"lmenu">';
-echo ShowItem($array,'H','mtitle','mtitle',$def);
-echo '</div>';
-$href=3Dbasename($_SERVER['PHP_SELF'])."?$ac&$str_dossier";
-
-
 //----------------------------------------------------------------------
 // Encode a new invoice
 // empty form for encoding
 //----------------------------------------------------------------------
-if ( $def=3D=3D1 || $def =3D=3D 4 )
-{
+
     $Ledger=3Dnew Acc_Ledger_Sold($cn,0);
=20
     // Check privilege
@@ -102,13 +70,13 @@
         if ( ! isset($correct))
         {
             echo '<div class=3D"content">';
-
-            echo '<form class=3D"print" action=3D"'.$href.'"  enctype=3D=
"multipart/form-data" method=3D"post">';
-            echo HtmlInput::hidden('sa','n');
-            echo HtmlInput::hidden('p_action','ven');
+			echo h2info('Confirmation');
+			echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $Ledger->get_n=
ame() . '</h2>';
+			echo '<div class=3D"content">';
+            echo '<form class=3D"print" enctype=3D"multipart/form-data" =
method=3D"post">';
             echo dossier::hidden();
             echo $Ledger->confirm($_POST );
-
+			echo HtmlInput::hidden('ac',$_REQUEST['ac']);
             $chk=3Dnew ICheckBox();
             $chk->selected=3Dfalse;
 	    echo '<div style=3D"clear:both">';
@@ -125,6 +93,7 @@
             echo '</form>';
=20
             echo '</div>';
+            echo '</div>';
             exit();
         }
     }
@@ -156,6 +125,7 @@
         if ( ! isset($correct))
         {
             echo '<div class=3D"content">';
+			echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
             $Ledger=3Dnew Acc_Ledger_Sold($cn,$_POST['p_jrn']);
             $internal=3D$Ledger->insert($_POST);
=20
@@ -168,7 +138,7 @@
             }
=20
             /* Show button  */
-            echo '<h2 class=3D"info" style=3D"margin-left:20%;width:60%;=
margin-right:20%;">'.$Ledger->get_name().'</h2>';
+            echo '<h2 class=3D"info" Enregistrement </h2>';
             $jr_id=3D$cn->get_value('select jr_id from jrn where jr_inte=
rnal=3D$1',array($internal));
=20
             echo "<h2 >"._('Op=C3=A9ration sauv=C3=A9e');
@@ -181,11 +151,11 @@
=20
             printf ('<a class=3D"detail" style=3D"display:inline" href=3D=
"javascript:modifyOperation(%d,%d)">%s</a><hr>',
                     $jr_id,dossier::id(),$internal);
+			echo $Ledger->confirm($_POST,true);
             /* Show link for Invoice */
             if (isset ($Ledger->doc) )
             {
                 echo $Ledger->doc;
-                echo '<hr>';
             }
=20
=20
@@ -194,7 +164,6 @@
             $obj->save_extra($Ledger->jr_id,$_POST);
=20
=20
-            echo HtmlInput::button_anchor(_('Nouvelle vente'),$href.'?p_=
action=3Dven&sa=3Dn&'.dossier::get());
             echo '</div>';
             exit();
         }
@@ -203,9 +172,6 @@
     /* Display a blank form or a form with predef operation */
     //  ------------------------------
=20
-    echo '<div class=3D"content">';
-    echo "<FORM class=3D\"print\" NAME=3D\"form_detail\" METHOD=3D\"POST=
\" >";
-
     $array=3D(isset($_POST['correct'])||isset ($correct))?$_POST:null;
     $Ledger=3Dnew Acc_Ledger_Sold($cn,0);
 //
@@ -220,11 +186,24 @@
     else
         $Ledger->id=3D$_REQUEST ['p_jrn'];
=20
+   echo '<div class=3D"u_redcontent">';
+   echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
+    echo '<form style=3D"display:inline" method=3D"GET" >';
+	echo HtmlInput::hidden('ac',$_REQUEST['ac']);
+    echo dossier::hidden();
+    echo HtmlInput::hidden('p_jrn_predef',$Ledger->id);
+    $op=3Dnew Pre_op_ven($cn);
+    $op->set('ledger',$Ledger->id);
+    $op->set('ledger_type',"VEN");
+    $op->set('direct','f');
+    echo $op->form_get();
+    echo '</form>';
+    echo '</div>';
=20
-
-
+   echo '<div class=3D"content">';
+ echo "<FORM class=3D\"print\" NAME=3D\"form_detail\" METHOD=3D\"POST\" =
>";
     /* request for a predefined operation */
-    if ( isset($use_predef) && $use_predef =3D=3D 1 && isset($_REQUEST['=
pre_def']) )
+    if (  isset($_REQUEST['pre_def']) && ! isset($_POST['correct']) )
     {
         // used a predefined operation
         //
@@ -260,29 +239,19 @@
     echo HtmlInput::reset(_('Effacer '));
     echo '</div>';
     echo "</FORM>";
-    echo '<div class=3D"content">';
-    echo '<form method=3D"GET" action=3D"'.$href.'">';
-    echo HtmlInput::hidden("sa","p");
-    echo HtmlInput::hidden("p_action","ven");
=20
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_jrn_predef',$Ledger->id);
-    $op=3Dnew Pre_op_ven($cn);
-    $op->set('ledger',$Ledger->id);
-    $op->set('ledger_type',"VEN");
-    $op->set('direct','f');
-    echo $op->form_get();
-    echo '</div>';
     $own=3Dnew Own($cn);
     /* if we suggest the pj n# the run the script */
     if ( $own->MY_PJ_SUGGEST=3D=3D'Y')
     {
         echo '<script> update_pj();get_last_date()</script>';
     }
-    echo '</form>';
-    echo '</div>';
     exit();
-}
+
+
+
+exit();
+
 //----------------------------------------------------------------------=
---------
 // Listing
 //----------------------------------------------------------------------=
----------



From MAILER-DAEMON Wed Nov 02 18:59:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLjmY-0001gP-G2
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 18:59:42 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Nov 2011 00:06:16 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57861.1320274781.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4303 - 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: Wed, 02 Nov 2011 22:59:41 -0000

Author: danydb
Date: 2011-11-03 00:06:15 +0100 (Thu, 03 Nov 2011)
New Revision: 4303

Modified:
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/compta_fin.inc.php
Log:
improve #jrn_name

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	2011-11-02 23:05:52 UTC (rev 430=
2)
+++ phpcompta/trunk/html/style-color.css	2011-11-02 23:06:15 UTC (rev 430=
3)
@@ -936,7 +936,7 @@
 }
 h2#jrn_name
 {
-	margin-left:30%;
+	margin-right:30%;
 =09
 }
 tr.footer{

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	2011-11-02 23:05:52 UTC (rev 430=
2)
+++ phpcompta/trunk/html/style-light.css	2011-11-02 23:06:15 UTC (rev 430=
3)
@@ -971,7 +971,9 @@
 }
 h2#jrn_name
 {
-	margin-right:50%;
+	padding:0 ;
+	margin:0;
+=09
 	float:right;
 	font-size:18;
 	display: inline;

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	2011-11-02 23:05:52 UTC (rev 4302)
+++ phpcompta/trunk/html/style.css	2011-11-02 23:06:15 UTC (rev 4303)
@@ -965,7 +965,7 @@
 }
 h2#jrn_name
 {
-	margin-left:30%;
+	margin-right:30%;
 	float: right;
 =09
 }

Modified: phpcompta/trunk/include/compta_fin.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin.inc.php	2011-11-02 23:05:52 UTC (r=
ev 4302)
+++ phpcompta/trunk/include/compta_fin.inc.php	2011-11-02 23:06:15 UTC (r=
ev 4303)
@@ -169,6 +169,8 @@
     exit();
=20
 }
+exit();
+
 //----------------------------------------------------------------------=
----------
 // Show the listing
 //----------------------------------------------------------------------=
----------



From MAILER-DAEMON Wed Nov 02 19:05:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RLjrj-0002Ld-Pd
	for mharc-phpcompta-dev@gnu.org; Wed, 02 Nov 2011 19:05:03 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Nov 2011 00:11:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.57864.1320275102.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4304 - 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, 02 Nov 2011 23:05:01 -0000

Author: danydb
Date: 2011-11-03 00:11:34 +0100 (Thu, 03 Nov 2011)
New Revision: 4304

Modified:
   phpcompta/trunk/sql/object-6.0.sql
Log:
update profile

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-02 23:06:15 UTC (rev 4303)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-02 23:11:34 UTC (rev 4304)
@@ -171,7 +171,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 84, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 91, true);
=20
=20
 --
@@ -307,8 +307,7 @@
 INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL=
L, NULL, NULL);
 INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL=
L, NULL);
 INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU=
LL, NULL);
-INSERT INTO menu_ref VALUES ('MISC', 'Op=C3=A9rations Diverses', 'compta=
_ods.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'user_action_gl.php',=
 NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, NULL, 'ledger_type=3DODS');
 INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 NULL, NULL);
 INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL);
 INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', N=
ULL, NULL, NULL);
@@ -317,7 +316,7 @@
 INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DACH');
 INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, NULL, NULL);
 INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, NULL, NULL);
@@ -336,6 +335,7 @@
 INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N=
ULL, NULL);
 INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DVEN');
 INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card=
_attr.inc.php', NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL=
, NULL);
@@ -361,9 +361,15 @@
 INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', =
NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, N=
ULL, NULL);
 INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'ext_inc.php', NU=
LL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, NULL, 'ledger_type=3DALL');
 INSERT INTO menu_ref VALUES ('TVA', 'Tva', 'extension_get.inc.php', NULL=
, NULL, 'plugin_code=3DAMORTIS');
+INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'extension_choice=
.inc.php', NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, NULL, NULL)=
;
+INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, NULL, NULL);
=20
=20
 --
@@ -430,10 +436,7 @@
 INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', NULL);
 INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 6, 'M', NULL);
-INSERT INTO profile_menu VALUES (4, 'VEN', 'COMPTA', 1, 2, 'E', NULL);
-INSERT INTO profile_menu VALUES (3, 'ACH', 'COMPTA', 1, 3, 'E', NULL);
 INSERT INTO profile_menu VALUES (19, 'FIN', 'COMPTA', 1, 4, 'E', NULL);
-INSERT INTO profile_menu VALUES (18, 'MISC', 'COMPTA', 1, 5, 'E', NULL);
 INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E', NULL);
 INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', NULL);
 INSERT INTO profile_menu VALUES (79, 'PREFERENCE', 'ANC', 1, 2, 'M', NUL=
L);
@@ -445,6 +448,15 @@
 INSERT INTO profile_menu VALUES (82, 'EXTENSION', NULL, 1, 100, 'M', NUL=
L);
 INSERT INTO profile_menu VALUES (83, 'TVA', NULL, 1, 101, 'M', NULL);
 INSERT INTO profile_menu VALUES (84, 'TVA', 'PARAM', 1, 102, 'E', NULL);
+INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', NULL=
);
+INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', NULL);
+INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (18, 'MENUODS', 'COMPTA', 1, 5, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (88, 'ODS', 'MENUODS', 1, 1, 'E', NULL);
+INSERT INTO profile_menu VALUES (89, 'ODSIMP', 'MENUODS', 1, 2, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', NULL=
);
+INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', NULL);
+INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', NUL=
L);
=20
=20
 --



From MAILER-DAEMON Thu Nov 03 17:57:38 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RM5I2-0002AA-Uu
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Nov 2011 17:57:38 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Nov 2011 23:03:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.60690.1320357457.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4305 - in phpcompta/trunk: html include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Nov 2011 21:57:37 -0000

Author: danydb
Date: 2011-11-03 23:03:53 +0100 (Thu, 03 Nov 2011)
New Revision: 4305

Added:
   phpcompta/trunk/include/compta_fin_rec.inc.php
   phpcompta/trunk/include/compta_fin_saldo.inc.php
Modified:
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/compta_fin.inc.php
   phpcompta/trunk/include/compta_ods.inc.php
   phpcompta/trunk/include/compta_ven.inc.php
   phpcompta/trunk/include/history_operation.inc.php
   phpcompta/trunk/include/operation_ods_confirm.inc.php
   phpcompta/trunk/include/operation_ods_new.inc.php
   phpcompta/trunk/include/template/form_ledger_detail.php
   phpcompta/trunk/include/template/form_ledger_fin.php
Log:
improve #jrn_name +(div)
improve appearance predefined operation
finish financial ledger


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	2011-11-02 23:11:34 UTC (rev 430=
4)
+++ phpcompta/trunk/html/style-color.css	2011-11-03 22:03:53 UTC (rev 430=
5)
@@ -948,4 +948,11 @@
 span.remain {
 	font-weight: bold;
 	color:black;
-	}
\ No newline at end of file
+	}
+div#jrn_name_div
+{
+	float: right;
+	margin-right:150;
+=09
+=09
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-02 23:11:34 UTC (rev 430=
4)
+++ phpcompta/trunk/html/style-light.css	2011-11-03 22:03:53 UTC (rev 430=
5)
@@ -988,4 +988,16 @@
 span.remain {
 	font-weight: bold;
 	color:black;
-	}
\ No newline at end of file
+	}
+div#jrn_name_div
+{
+	float: right;
+	margin-right:150;
+=09
+=09
+}
+#predef_form {
+	margin-left:20%;
+	width:60%;
+=09
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2011-11-02 23:11:34 UTC (rev 4304)
+++ phpcompta/trunk/html/style.css	2011-11-03 22:03:53 UTC (rev 4305)
@@ -978,4 +978,12 @@
 span.remain {
 	font-weight: bold;
 	color:black;
-	}
\ No newline at end of file
+	}
+=09
+div#jrn_name_div
+{
+	float: right;
+	margin-right:150;
+=09
+=09
+}
\ No newline at end of file

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-02 23:11:34 UTC (rev 43=
04)
+++ phpcompta/trunk/include/ac_common.php	2011-11-03 22:03:53 UTC (rev 43=
05)
@@ -841,25 +841,31 @@
 	 * @todo add security
 	 * check if user can access this module
 	 */
-	$file =3D $cn->get_array("select me_file,me_parameter
-	from menu_ref
-	where
-	me_code=3D$1 and
-	(me_file is not null or trim(me_file) <>'')", array($module[$idx]));
+		$file =3D $cn->get_array("select me_file,me_parameter
+		from menu_ref
+		where
+		me_code=3D$1 and
+		(me_file is not null or trim(me_file) <>'')", array($module[$idx]));
=20
-	if ($file[0]['me_file'] !=3D "")
-	{
-	    if ($file[0]['me_parameter'] !=3D=3D "")
-	    {
-		// if there are paramter put them in superglobal
-		$array=3Dcompute_variable($file[0]['me_parameter']);
-		put_global($array);
-	    }
-	    echo '<div class=3D"content">';
-	    require_once $file[0]['me_file'];
-	    echo '</div>';
-	    exit();
-	}
+		if (count($file)=3D=3D0)
+		{
+			echo "Configuration incorrecte pour ce module ".$module[$idx];
+			exit;
+		}
+
+		if ($file[0]['me_file'] !=3D "")
+		{
+			if ($file[0]['me_parameter'] !=3D=3D "")
+			{
+			// if there are paramter put them in superglobal
+			$array=3Dcompute_variable($file[0]['me_parameter']);
+			put_global($array);
+			}
+			echo '<div class=3D"content">';
+			require_once $file[0]['me_file'];
+			echo '</div>';
+			exit();
+		}
     }
 }
 /**

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	2011-11-02 23:11:34 UTC =
(rev 4304)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-03 22:03:53 UTC =
(rev 4305)
@@ -1394,7 +1394,7 @@
         // Load the javascript
         //
         $ret.=3D"<table>";
-        $ret.=3D '<tr><td>';
+        $ret.=3D '<tr ><td colspan=3D"2" style=3D"width:auto">';
         $wDate=3Dnew IDate('e_date');
         $wDate->readonly=3D$p_readonly;
         $e_date=3D(isset($e_date)&&trim($e_date)!=3D'')?$e_date:'';
@@ -1443,11 +1443,12 @@
             $default_pj=3D$this->guess_pj();
         }
         $wPJ->value=3D(isset($e_pj))?$e_pj:$default_pj;
-
-        $ret.=3D'<td> '._('Pi=C3=A8ce').' : '.$wPJ->input();
+        $ret.=3D '</tr>';
+		$ret.=3D'<tr >';
+        $ret.=3D'<td colspan=3D"2" style=3D"width:auto"> '._('Pi=C3=A8ce=
').' : '.$wPJ->input();
         $ret.=3DHtmlInput::hidden('e_pj_suggest',$default_pj);
+        $ret.=3D '</tr>';
         $ret.=3D '</td>';
-        $ret.=3D '</tr>';
=20
         $ret.=3D '<tr><td >'._('Libell=C3=A9');
         $wDescription=3Dnew IText('desc');

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-02 23:11:34 =
UTC (rev 4304)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-03 22:03:53 =
UTC (rev 4305)
@@ -181,7 +181,7 @@
=20
=20
     /*!\brief
-    *\param $p_array contains the value usually it is $_POST=20
+    *\param $p_array contains the value usually it is $_POST
      *\return string with html code
      *\note the form tag are not  set here
      */
@@ -247,10 +247,10 @@
=20
         // Ledger (p_jrn)
         //--
-=09
-	$add_js=3D'onchange=3D"update_pj();update_bank();get_last_date();ajax_s=
aldo(\'first_sold\')";';
=20
-	if ( $owner->MY_DATE_SUGGEST =3D=3D 'Y')=20
+	$add_js=3D'onchange=3D"update_pj();update_bank();get_last_date();ajax_s=
aldo(\'first_sold\');update_name();"';
+
+	if ( $owner->MY_DATE_SUGGEST =3D=3D 'Y')
 	  $add_js=3D'onchange=3D"update_pj();update_bank();get_last_date();ajax=
_saldo(\'first_sold\')";';
=20
         $wLedger=3D$this->select_ledger('FIN',2);
@@ -381,7 +381,7 @@
     /*!\brief show the summary before inserting into the database, it
      *calls the function for adding a attachment. The function verify
      *should be called before
-     *\param $p_array an array usually is $_POST=20
+     *\param $p_array an array usually is $_POST
      *\return string with code html
      */
     public function confirm($p_array)
@@ -404,6 +404,9 @@
         $exercice=3D$pPeriode->get_exercice();
         $r.=3D'';
         $r.=3D'<fieldset><legend>Banque, caisse </legend>';
+		$r.=3D '<div id=3D"jrn_name_div">';
+		$r.=3D'<h2 id=3D"jrn_name" style=3D"display:inline">' . $this->get_nam=
e() . '</h2>';
+		$r.=3D '</div>';
         $r.=3D'<TABLE  width=3D"100%">';
         //  Date
         //--
@@ -516,7 +519,7 @@
             // Comment
             $r.=3D'<td style=3D"width:40%">'.$tiers_comment.'</td>';
             // amount
-            $r.=3D'<td>'.$tiers_amount.'</td>';
+            $r.=3D'<td class=3D"num">'.nbm($tiers_amount).'</td>';
             // concerned
             $r.=3D'<td>';
             $r.=3D${"e_concerned".$i};
@@ -583,11 +586,12 @@
     }
     /*!\brief save the data into the database, included the attachment,
      *and the reconciliations
-     *\param $p_array usually $_POST=20
+     *\param $p_array usually $_POST
      *\return string with HTML code
      */
     public function insert($p_array)
     {
+		bcscale(2);
         $internal_code=3D"";
         $oid=3D0;
         extract ($p_array);
@@ -646,7 +650,7 @@
                 ${"e_other$i"."_amount"}=3Dround( ${"e_other$i"."_amount=
"},2);
=20
                 // Compute display
-                $row=3Dtd(${"e_other$i"}).td($fPoste->strAttribut(ATTR_D=
EF_NAME)).td(${"e_other".$i."_comment"}).td(${"e_other$i"."_amount"},'cla=
ss=3D"num"');
+                $row=3Dtd(${"e_other$i"}).td($fPoste->strAttribut(ATTR_D=
EF_NAME)).td(${"e_other".$i."_comment"}).td(nbm(${"e_other$i"."_amount"})=
,'class=3D"num"');
=20
                 $ret.=3Dtr($row);
=20
@@ -800,8 +804,8 @@
                     $op->oa_description=3Dsql_string($comment);
                     $op->save_form_plan($_POST,$i,$j_id);
                 }
-               =20
=20
+
                 $this->update_internal_code($internal);
=20
=20
@@ -843,9 +847,9 @@
         }
         $this->db->commit();
         $r=3D"";
-        $r.=3D"<br>Ancien solde ".$solde;
-        $new_solde+=3D$amount;
-        $r.=3D"<br>Nouveau solde ".$new_solde;
+        $r.=3D"<br>Ancien solde ".nbm($solde);
+        $new_solde=3Dbcadd($new_solde,$amount);
+        $r.=3D"<br>Nouveau solde ".nbm($new_solde);
         $ret.=3D$r;
         return $ret;
     }
@@ -1003,7 +1007,7 @@
   {
     $sql=3D"INSERT INTO quant_fin(qf_bank, jr_id, qf_other, qf_amount)
                    VALUES ($1, $2, $3, $4);";
-   =20
+
     $this->db->exec_sql($sql,array($p_bankid,$p_jrid,$p_otherid,round($p=
_amount,2)));
   }
 }

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	2011-11-02 23:1=
1:34 UTC (rev 4304)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-03 22:0=
3:53 UTC (rev 4305)
@@ -1262,6 +1262,9 @@
         $r=3D"";
         $r.=3D"<fieldset>";
         $r.=3D"<legend>"._('En-t=C3=AAte facture fournisseur')."  </lege=
nd>";
+		$r.=3D'<div id=3D"jrn_name_div">';
+		$r.=3D'<h2 id=3D"jrn_name">'.$this->get_name().'</h2>';
+		$r.=3D'</div>';
         $r.=3D'<TABLE  width=3D"100%">';
         $r.=3D'<tr>';
         $r.=3D'<td> '._('Date').' '.$e_date.'</td>';

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	2011-11-02 23:11:34=
 UTC (rev 4304)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-03 22:03:53=
 UTC (rev 4305)
@@ -645,6 +645,9 @@
         $r=3D"";
         $r.=3D"<fieldset>";
         $r.=3D"<legend>"._('En-t=C3=AAte facture client')."  </legend>";
+		$r.=3D'<div id=3D"jrn_name_div">';
+		$r.=3D'<h2 id=3D"jrn_name" style=3D"display:inline">' . $this->get_nam=
e() . '</h2>';
+		$r.=3D '</div>';
         $r.=3D'<TABLE  width=3D"100%">';
         $r.=3D'<tr>';
         $r.=3D'<td> '._('Date').' '.$e_date.'</td>';
@@ -778,7 +781,7 @@
=20
=20
         $r.=3D'</table>';
-        if ( $owner->MY_ANALYTIC!=3D'nu') // use of AA
+        if ( $owner->MY_ANALYTIC!=3D'nu' && $p_summary ) // use of AA
             $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'V=C3=A9rifiez Imputation Analytique').'" onClick=3D"verify_ca(\'\');">';
         $r.=3D'</fieldset>';
         if (! $p_summary )

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	2011-11-02 23:11:34 UTC (r=
ev 4304)
+++ phpcompta/trunk/include/compta_ach.inc.php	2011-11-03 22:03:53 UTC (r=
ev 4305)
@@ -61,7 +61,6 @@
 	{
 		echo '<div class=3D"content">';
 		echo h2info('Confirmation');
-		echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
=20
 		echo '<form enctype=3D"multipart/form-data" method=3D"post">';
 		echo dossier::hidden();
@@ -109,8 +108,6 @@
 	{
 		echo '<div class=3D"content">';
=20
-		echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
-
 		$Ledger =3D new Acc_Ledger_Purchase($cn, $_POST['p_jrn']);
 		$internal =3D $Ledger->insert($_POST);
=20
@@ -170,9 +167,9 @@
 else
 	$Ledger->id =3D $_REQUEST ['p_jrn'];
=20
-echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
 // pre defined operation
 //
+echo '<div id=3D"predef_form">';
 echo '<form method=3D"GET" action=3D"do.php">';
 echo dossier::hidden();
 echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
@@ -182,9 +179,10 @@
 $op->set('ledger_type', "ACH");
 $op->set('direct', 'f');
 echo $op->form_get();
-
 echo '</form>';
 echo '</div>';
+echo '</div>';
+
 echo '<div class=3D"content">';
 echo "<FORM class=3D\"print\"NAME=3D\"form_detail\" METHOD=3D\"POST\" >"=
;
 /* request for a predefined operation */

Modified: phpcompta/trunk/include/compta_fin.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin.inc.php	2011-11-02 23:11:34 UTC (r=
ev 4304)
+++ phpcompta/trunk/include/compta_fin.inc.php	2011-11-03 22:03:53 UTC (r=
ev 4305)
@@ -32,425 +32,114 @@
=20
 $cn=3Dnew Database(dossier::id());
 $menu_action=3D"?ledger_type=3Dfin&ac=3D".$_REQUEST['ac']."&".dossier::g=
et();
-$menu=3Darray(
-          array($menu_action.'&sa=3Dn',_('Nouvel extrait'),_('Encodage d=
\'un nouvel extrait'),1),
-          array($menu_action.'&sa=3Dl',_('Liste'),_('Liste op=C3=A9ratio=
n bancaire'),2),
-          array($menu_action.'&sa=3Ds',_('Solde'),_('Solde des comptes')=
,3),
-          array($menu_action.'&sa=3Dr',_('Rapprochements banquaires'),_(=
'Rapprochements banquaires'),4)
-          );
-$sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:-1;
=20
-switch ($sa)
-{
-case 'n':
-    $def=3D1;
-    break;
-case 'l':
-    $def=3D2;
-    break;
-case 's':
-    $def=3D3;
-    break;
-case 'r':
-    $def=3D4;
-    break;
-default:
-    $def=3D1;
-}
-echo '<div class=3D"lmenu">';
-echo ShowItem($menu,'H','mtitle','mtitle',$def);
-echo '</div>';
-
-$href=3Dbasename($_SERVER['PHP_SELF']);
 $Ledger=3Dnew Acc_Ledger_Fin($cn,0);
=20
 //----------------------------------------------------------------------=
----------
 // Encode a new financial operation
 //----------------------------------------------------------------------=
----------
-if ( $def =3D=3D 1 )
-{
=20
-    if ( isset($_REQUEST['p_jrn']))
-        $Ledger->id=3D$_REQUEST['p_jrn'];
-    else
-    {
-        $def_ledger=3D$Ledger->get_first('fin');
-        $Ledger->id=3D$def_ledger['jrn_def_id'];
-    }
-    $jrn_priv=3D$g_user->get_ledger_access($Ledger->id);
-    // Check privilege
-    if ( isset($_REQUEST['p_jrn']) && ( $jrn_priv =3D=3D 'X'))
-    {
-        NoAccess();
-        exit -1;
-    }
-
-    //----------------------------------------
-    // Confirm the operations
-    //----------------------------------------
-    if ( isset($_POST['save']))
-    {
-        try
-        {
-            $Ledger->verify($_POST);
-        }
-        catch (Exception $e)
-        {
-            alert($e->getMessage());
-            $correct=3D1;
-        }
-        if ( ! isset ($correct ))
-        {
-            echo '<div class=3D"content">';
-            echo '<form name=3D"form_detail" class=3D"print" enctype=3D"=
multipart/form-data" ACTION=3D"'.$href.'" METHOD=3D"POST">';
-            echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-            echo $Ledger->confirm($_POST);
-            echo HtmlInput::submit('confirm',_('Confirmer'));
-            echo HtmlInput::submit('correct',_('Corriger'));
-
-            echo '</form>';
-            echo '</div>';
-            exit();
-        }
-    }
-    //----------------------------------------
-    // Confirm and save  the operations
-    // into the database
-    //----------------------------------------
-    if ( isset($_POST['confirm']))
-    {
-        try
-        {
-            $Ledger->verify($_POST);
-        }
-        catch (Exception $e)
-        {
-            alert($e->getMessage());
-            $correct=3D1;
-        }
-        if ( !isset($correct))
-        {
-            echo '<div class=3D"content">';
-            $a=3D $Ledger->insert($_POST);
-            echo '<h2 class=3D"info"  style=3D"margin-left:20%;width:60%=
;margin-right:20%;">'._('Op=C3=A9ration  sauv=C3=A9e').' </h2>';
-            echo $a;
-            echo '</div>';
-            echo '<div class=3D"content">';
-            echo HtmlInput::button_anchor(_('Nouvel extrait'),$href.'?le=
dger_type=3Dfin&sa=3Dn&'.dossier::get()."&ac=3D".$_REQUEST['ac']);
-            echo '</div>';
-            exit();
-        }
-    }
-    //----------------------------------------
-    // Correct the operations
-    //----------------------------------------
-    if ( isset($_POST['correct']))
-    {
-        $correct=3D1;
-    }
-    //----------------------------------------
-    // Blank form
-    //----------------------------------------
-    echo '<div class=3D"content">';
-
-
-    echo '<form class=3D"print" name=3D"form_detail" enctype=3D"multipar=
t/form-data" ACTION=3D"'.$href.'" METHOD=3D"POST">';
-    echo HtmlInput::hidden('ledger_type','fin');
-    echo HtmlInput::hidden('sa','n');
-      echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-    $array=3D( isset($correct))?$_POST:null;
-    // show select ledger
-    echo $Ledger->input($array);
-    echo HtmlInput::button('add_item',_('Ajout article'),   ' onClick=3D=
"ledger_fin_add_row()"');
-    echo HtmlInput::submit('save',_('Sauve'));
-    echo HtmlInput::reset(_('Effacer'));
-
-    echo create_script(" get_last_date();ajax_saldo('first_sold');");
-    exit();
-
+if ( isset($_REQUEST['p_jrn']))
+	$Ledger->id=3D$_REQUEST['p_jrn'];
+else
+{
+	$def_ledger=3D$Ledger->get_first('fin');
+	$Ledger->id=3D$def_ledger['jrn_def_id'];
 }
-exit();
+$jrn_priv=3D$g_user->get_ledger_access($Ledger->id);
+// Check privilege
+if ( isset($_REQUEST['p_jrn']) && ( $jrn_priv =3D=3D 'X'))
+{
+	NoAccess();
+	exit -1;
+}
=20
-//----------------------------------------------------------------------=
----------
-// Show the listing
-//----------------------------------------------------------------------=
----------
-if ( $def =3D=3D 2)
+//----------------------------------------
+// Confirm the operations
+//----------------------------------------
+if ( isset($_POST['save']))
 {
+	try
+	{
+		$Ledger->verify($_POST);
+	}
+	catch (Exception $e)
+	{
+		alert($e->getMessage());
+		$correct=3D1;
+	}
+	if ( ! isset ($correct ))
+	{
+		echo '<div class=3D"content">';
+		echo '<h2 class=3D"info">'._('Confirmation').' </h2>';
+		echo '<form name=3D"form_detail" class=3D"print" enctype=3D"multipart/=
form-data"  METHOD=3D"POST">';
+		echo HtmlInput::hidden('ac',$_REQUEST['ac']);
+		echo $Ledger->confirm($_POST);
+		echo HtmlInput::submit('confirm',_('Confirmer'));
+		echo HtmlInput::submit('correct',_('Corriger'));
=20
-    $Ledger=3Dnew Acc_Ledger_Fin($cn,0);
-    if ( !isset($_REQUEST['p_jrn']))
-    {
-        $Ledger->id=3D-1;
-    }
-    else
-        $Ledger->id=3D$_REQUEST['p_jrn'];
-    echo '<div class=3D"content">';
-    echo $Ledger->display_search_form();
-    $p_array=3D$_GET;
-    /* by default we should the default period */
-    if ( ! isset($p_array['date_start']))
-    {
-        $period=3D$g_user->get_periode();
-        $per=3Dnew Periode($cn,$period);
-        list($date_start,$date_end)=3D$per->get_date_limit();
-        $p_array['date_start']=3D$date_start;
-        $p_array['date_end']=3D$date_end;
-    }
-    /*  compute the sql stmt */
-    list($sql,$where)=3D$Ledger->build_search_sql($p_array);
-
-    $max_line=3D$cn->count_sql($sql);
-
-    $step=3D$_SESSION['g_pagesize'];
-    $page=3D(isset($_GET['offset']))?$_GET['page']:1;
-    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
-    $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page);
-
-    echo HtmlInput::hidden("sa","lnp");
-    echo dossier::hidden();
-    echo $bar;
-    list($count,$html)=3D $Ledger->list_operation($sql,$offset);
-    echo $html;
-    echo $bar;
-   /*
-     * Export to csv
-     */
-    $r=3DHtmlInput::get_to_hidden(array('l','ac','date_start','date_end'=
,'desc','amount_min','amount_max','qcode','accounting','unpaid','gDossier=
','ledger_type','p_action'));
-    if (isset($_GET['r_jrn'])) {
-      foreach ($_GET['r_jrn'] as $k=3D>$v)
-	$r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
-    }
-    echo '<form action=3D"export.php" method=3D"get">';
-    echo $r;
-    echo HtmlInput::hidden('act','CSV/histo');
-    echo HtmlInput::submit('viewsearch','Export vers CSV');
-
-    echo '</form>';
-
-    echo '</div>';
-    exit();
+		echo '</form>';
+		echo '</div>';
+		exit();
+	}
 }
-//----------------------------------------------------------------------=
----------
-// Show the saldo
-//----------------------------------------------------------------------=
----------
-if ( $def=3D=3D3)
+//----------------------------------------
+// Confirm and save  the operations
+// into the database
+//----------------------------------------
+if ( isset($_POST['confirm']))
 {
-    require_once ('class_acc_parm_code.php');
-    echo '<div class=3D"content">';
-    $fiche=3Dnew Fiche($cn);
+	try
+	{
+		$Ledger->verify($_POST);
+	}
+	catch (Exception $e)
+	{
+		alert($e->getMessage());
+		$correct=3D1;
+	}
+	if ( !isset($correct))
+	{
+		echo '<div id=3D"jrn_name_div">';
+		echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $Ledger->get_na=
me() . '</h2>';
+		echo '</div>';
=20
-    $array=3D$fiche->get_bk_account();
-
-    echo '<div class=3D"content">';
-    echo dossier::hidden();
-    echo '<table style=3D"margin-left:10%;width:60%" class=3D"result">';
-    echo tr(th('Quick Code').th('Compte en banque',' style=3D"text-align=
:left"').th('solde op=C3=A9ration',' style=3D"text-align:right"')
-	    .th('solde extrait/relev=C3=A9',' style=3D"text-align:right"')
-	    .th('diff=C3=A9rence',' style=3D"text-align:right"'));
-    // Filter the saldo
-    //  on the current year
-    $filter_year=3D"  j_tech_per in (select p_id from parm_periode where=
  p_exercice=3D'".$g_user->get_exercice()."')";
-    // for highligting tje line
-    $idx=3D0;
-    bcscale(2);
-    // for each account
-    for ( $i =3D 0; $i < count($array);$i++)
-    {
-        // get the saldo
-        $m=3D$array[$i]->get_solde_detail($filter_year);
-
-        $solde=3D$m['debit']-$m['credit'];
-
-        // print the result if the saldo is not equal to 0
-        if ( $m['debit'] !=3D 0.0 || $m['credit'] !=3D 0.0)
-        {
-            /*  get saldo for not reconcilied operations  */
-            $saldo_not_reconcilied=3D$array[$i]->get_bk_balance($filter_=
year." and (trim(jr_pj_number) =3D'' or jr_pj_number is null)" );
-
-            /*  get saldo for reconcilied operation  */
-
-	    $saldo_reconcilied=3D$array[$i]->get_bk_balance($filter_year." and =
( trim(jr_pj_number) !=3D '' and jr_pj_number is not null)" );
-
-            if ( $idx%2 !=3D 0 )
-                $odd=3D"odd";
-            else
-                $odd=3D"";
-
-            $idx++;
-            echo "<tr class=3D\"$odd\">";
-            echo "<TD >".
-            IButton::history_card($array[$i]->id,$array[$i]->strAttribut=
(ATTR_DEF_QUICKCODE)).
-            "</TD>";
-
-	    $saldo_rec=3Dbcsub($saldo_reconcilied['debit'],$saldo_reconcilied['=
credit']);
-	    $diff=3Dbcsub($saldo_not_reconcilied['debit'],$saldo_not_reconcilie=
d['credit']);
-            echo "<TD >".
-            $array[$i]->strAttribut(ATTR_DEF_NAME).
-            "</TD>".
-            "<TD align=3D\"right\">".
-	      nbm($solde).
-            "</TD>".
-            "<TD align=3D\"right\">".
-	      nbm($saldo_rec).
-            "</TD>".
-            "<TD align=3D\"right\">".
-	      nbm($diff).
-            "</TD>".
-            "</TR>";
-        }
-    }// for
-    echo "</table>";
-    echo "</div>";
-    exit();
+		echo '<div class=3D"content">';
+		$a=3D $Ledger->insert($_POST);
+		echo '<h2 class=3D"info">'._('Enregistrement').' </h2>';
+		echo '<div class=3D"content">';
+		echo $a;
+		echo '</div>';
+		echo '</div>';
+		exit();
+	}
 }
-//--------------------------------------------------
-// Reconcilied
-//--------------------------------------------------
-if ($def=3D=3D4)
+//----------------------------------------
+// Correct the operations
+//----------------------------------------
+if ( isset($_POST['correct']))
 {
-    echo '<div class=3D"content">';
-    $Ledger=3Dnew Acc_Ledger_Fin($cn,0);
-    if ( !isset($_REQUEST['p_jrn']))
-    {
-        $a=3D$Ledger->get_first('fin');
-        $Ledger->id=3D$a['jrn_def_id'];
-    }
-    else
-        $Ledger->id=3D$_REQUEST['p_jrn'];
-    $jrn_priv=3D$g_user->get_ledger_access($Ledger->id);
-    if ( isset($_GET["p_jrn"]) && $jrn_priv=3D=3D"X")
-    {
-        NoAccess();
-        exit();
-    }
-    //-------------------------
-    // save
-    //-------------------------
-    if (isset ($_POST['save']))
-    {
-        if (trim($_POST['ext']) !=3D '' && isset($_POST['op']))
-        {
-            $array=3D$_POST['op'];
-            $tot=3D0;
-            for ($i=3D0;$i<count($array);$i++)
-            {
-                $cn->exec_sql('update jrn set jr_pj_number=3D$1 where jr=
_id=3D$2',
-                              array($_POST['ext'],$array[$i]));
-                $tot=3Dbcadd($tot,$cn->get_value('select qf_amount from =
quant_fin where jr_id=3D$1',array($array[$i])));
-            }
-            $diff=3Dbcsub($_POST['start_extrait'],$_POST['end_extrait'])=
;
-            if ( $diff !=3D 0 && $diff !=3D $tot )
-            {
-                echo_warning("D'apr=C3=A8s l'extrait il y aurait du avoi=
r un montant de $diff =C3=A0 rapprocher alors qu'il n'y a que $tot rappro=
ch=C3=A9s");
-            }
-        }
-    }
-    //-------------------------
-    // show the operation of this ledger
-    // without receipt number
-    //-------------------------
-    echo '<div class=3D"content">';
-    echo '<form method=3D"get">';
-    echo HtmlInput::get_to_hidden(array('gDossier','ledger_type','ac','s=
a'));
-    $wLedger=3D$Ledger->select_ledger('FIN',3);
-    if ($wLedger =3D=3D null ) exit ('Pas de journal disponible');
+	$correct=3D1;
+}
+//----------------------------------------
+// Blank form
+//----------------------------------------
+echo '<div class=3D"content">';
=20
-    $wLedger->javascript=3D"onchange=3D'this.form.submit()';";
-    echo $wLedger->input();
-    echo HtmlInput::submit('ref','Rafra=C3=AEchir');
-    echo '</form>';
=20
-    echo '<form method=3D"post" id=3D"rec1">';
+echo '<form class=3D"print" name=3D"form_detail" enctype=3D"multipart/fo=
rm-data" METHOD=3D"POST">';
+echo HtmlInput::hidden('ledger_type','fin');
+echo HtmlInput::hidden('ac',$_REQUEST['ac']);
+$array=3D( isset($correct))?$_POST:null;
=20
-    echo dossier::hidden();
-    echo HtmlInput::get_to_hidden(array('sa','p_action','p_jrn'));
+// show select ledger
+echo $Ledger->input($array);
+echo HtmlInput::button('add_item',_('Ajout article'),   ' onClick=3D"led=
ger_fin_add_row()"');
+echo HtmlInput::submit('save',_('Sauve'));
+echo HtmlInput::reset(_('Effacer'));
=20
-    $operation=3D$cn->get_array("select jr_id,jr_internal,jr_comment,to_=
char(jr_date,'DD.MM.YYYY') as fmt_date,jr_montant
-                              from jrn where jr_def_id=3D$1 and (jr_pj_n=
umber is null or jr_pj_number=3D'') order by jr_date",
-                              array($Ledger->id));
-    echo '<span id=3D"bkname">'.hb(h($Ledger->get_bank_name())).'</span>=
';
-    echo '<p>';
-    $iextrait=3Dnew IText('ext');
-    $iextrait->value=3D$Ledger->guess_pj();
-    $nstart_extrait=3Dnew INum('start_extrait');
-    $nend_extrait=3Dnew INum('end_extrait');
+echo create_script(" get_last_date();ajax_saldo('first_sold');");
+exit();
=20
-    echo "Extrait / relev=C3=A9 :".$iextrait->input();
-    echo 'solde D=C3=A9but'.$nstart_extrait->input();
-    echo 'solde Fin'.$nend_extrait->input();
-    echo IButton::tooggle_checkbox('rec1');
-    echo '</p>';
=20
-    echo '<table class=3D"result" style=3D"width:80%;margin-left:10%">';
-    $r=3Dth('Date');
-    $r.=3Dth('Libell=C3=A9');
-    $r.=3Dth('N=C2=B0 interne');
-    $r.=3Dth('Montant',' style=3D"text-align:right"');
-    $r.=3Dth('Selection',' style=3D"text-align:center" ');
-    echo tr($r);
-    $iradio=3Dnew ICheckBox('op[]');
-    $tot_not_reconcilied=3D0;
-    $diff=3D0;
-    for ($i=3D0;$i<count($operation);$i++)
-    {
-        $row=3D$operation[$i];
-        $r=3D'';
-        $js=3DHtmlInput::detail_op($row['jr_id'],$row['jr_internal']);
-        $r.=3Dtd($row['fmt_date']);
-        $r.=3Dtd($row['jr_comment']);
-        $r.=3Dtd($js);
-        $r.=3Dtd(sprintf("%.2f",$row['jr_montant']),' class=3D"num" ');
-
-        $tot_not_reconcilied+=3D$row['jr_montant'];
-        $diff+=3D$cn->get_value('select qf_amount from quant_fin where j=
r_id=3D$1',array($row['jr_id']));
-        $iradio->value=3D$row['jr_id'];
-        $r.=3Dtd(HtmlInput::hidden('jrid[]',$row['jr_id']).$iradio->inpu=
t(),' style=3D"text-align:center" ');
-        if ( $i % 2 =3D=3D 0 )
-            echo tr($r,' class=3D"odd" ');
-        else
-            echo tr($r);
-    }
-    echo '</table>';
-    $bk_card=3Dnew Fiche($cn);
-    $bk_card->id=3D$Ledger->get_bank();
-    $filter_year=3D"  j_tech_per in (select p_id from parm_periode where=
  p_exercice=3D'".$g_user->get_exercice()."')";
-
-    /*  get saldo for not reconcilied operations  */
-    $saldo_not_reconcilied=3D$bk_card->get_solde_detail($filter_year." a=
nd j_grpt in (select jr_grpt_id from jrn where trim(jr_pj_number) =3D'' o=
r jr_pj_number is null)" );
-
-    /*  get saldo for reconcilied operation  */
-    $saldo_reconcilied=3D$bk_card->get_solde_detail($filter_year." and j=
_grpt in (select jr_grpt_id from jrn where trim(jr_pj_number) !=3D '' and=
 jr_pj_number is not null)" );
-
-    /* solde compte */
-    $saldo=3D$bk_card->get_solde_detail($filter_year);
-
-    echo '<table>';
-    echo '<tr>';
-    echo td("Solde compte  ");
-    echo td(sprintf('%.2f',($saldo['debit']-$saldo['credit'])),' style=3D=
"text-align:right"');
-    echo '</tr>';
-
-    echo '<tr>';
-    echo td("Solde non rapproch=C3=A9 ");
-    echo td(sprintf('%.2f',($saldo_not_reconcilied['debit']-$saldo_not_r=
econcilied['credit'])),' style=3D"text-align:right"');
-    echo '</tr>';
-
-    echo '<tr>';
-    echo td("Solde  rapproch=C3=A9 ");
-    echo td(sprintf('%.2f',($saldo_reconcilied['debit']-$saldo_reconcili=
ed['credit'])),' style=3D"text-align:right"');
-    echo '</tr>';
-
-
-    echo '<tr>';
-    echo td("Total montant ");
-    echo td(sprintf('%.2f',($tot_not_reconcilied)),' style=3D"text-align=
:right"');
-    echo '</tr>';
-
-    echo '</table>';
-
-    echo HtmlInput::submit('save','Mettre =C3=A0 jour le n=C2=B0 de rele=
v=C3=A9 banquaire');
-    echo '</form>';
-    echo '</div>';
-    exit();
-}
-
+exit();
\ No newline at end of file

Added: phpcompta/trunk/include/compta_fin_rec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin_rec.inc.php	                      =
  (rev 0)
+++ phpcompta/trunk/include/compta_fin_rec.inc.php	2011-11-03 22:03:53 UT=
C (rev 4305)
@@ -0,0 +1,179 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/* !\file
+ *
+ *
+ * \brief reconcile operation
+ *
+ */
+require_once 'class_acc_ledger_fin.php';
+echo '<div class=3D"content">';
+$Ledger =3D new Acc_Ledger_Fin($cn, 0);
+if (!isset($_REQUEST['p_jrn']))
+{
+	$a =3D $Ledger->get_first('fin');
+	$Ledger->id =3D $a['jrn_def_id'];
+}
+else
+	$Ledger->id =3D $_REQUEST['p_jrn'];
+$jrn_priv =3D $g_user->get_ledger_access($Ledger->id);
+if (isset($_GET["p_jrn"]) && $jrn_priv =3D=3D "X")
+{
+	NoAccess();
+	exit();
+}
+//-------------------------
+// save
+//-------------------------
+if (isset($_POST['save']))
+{
+	if (trim($_POST['ext']) !=3D '' && isset($_POST['op']))
+	{
+		$array =3D $_POST['op'];
+		$tot =3D 0;
+		$cn->start();
+		for ($i =3D 0; $i < count($array); $i++)
+		{
+			$cn->exec_sql('update jrn set jr_pj_number=3D$1 where jr_id=3D$2', ar=
ray($_POST['ext'], $array[$i]));
+			$tot =3D bcadd($tot, $cn->get_value('select qf_amount from quant_fin =
where jr_id=3D$1', array($array[$i])));
+		}
+		$diff =3D bcsub($_POST['start_extrait'], $_POST['end_extrait']);
+		if ($diff !=3D 0 && $diff !=3D $tot)
+		{
+			$cn->rollback();
+			alert("D'apr=C3=A8s l'extrait il y aurait du avoir un montant de $dif=
f =C3=A0 rapprocher alors qu'il y a $tot rapproch=C3=A9s, mise =C3=A0 jou=
r annul=C3=A9e");
+		}
+		$cn->commit();
+	}
+}
+//-------------------------
+// show the operation of this ledger
+// without receipt number
+//-------------------------
+echo '<div class=3D"content">';
+echo '<form method=3D"get">';
+echo HtmlInput::get_to_hidden(array('gDossier', 'ledger_type', 'ac', 'sa=
'));
+$wLedger =3D $Ledger->select_ledger('FIN', 3);
+if ($wLedger =3D=3D null)
+	exit('Pas de journal disponible');
+echo '<div id=3D"jrn_name_div">';
+echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $Ledger->get_name=
() . '</h2>';
+echo '</div>';
+$wLedger->javascript =3D "onchange=3D'this.form.submit()';";
+echo $wLedger->input();
+echo HtmlInput::submit('ref', 'Rafra=C3=AEchir');
+echo '</form>';
+
+echo '<form method=3D"post" id=3D"rec1">';
+
+echo dossier::hidden();
+echo HtmlInput::get_to_hidden(array('sa', 'p_action', 'p_jrn'));
+
+$operation =3D $cn->get_array("select jr_id,jr_internal,jr_comment,to_ch=
ar(jr_date,'DD.MM.YYYY') as fmt_date,jr_montant
+                              from jrn where jr_def_id=3D$1 and (jr_pj_n=
umber is null or jr_pj_number=3D'') order by jr_date", array($Ledger->id)=
);
+echo '<span id=3D"bkname">' . hb(h($Ledger->get_bank_name())) . '</span>=
';
+echo '<p>';
+$iextrait =3D new IText('ext');
+$iextrait->value =3D $Ledger->guess_pj();
+$nstart_extrait =3D new INum('start_extrait');
+$nend_extrait =3D new INum('end_extrait');
+
+echo "Extrait / relev=C3=A9 :" . $iextrait->input();
+echo 'solde D=C3=A9but' . $nstart_extrait->input();
+echo 'solde Fin' . $nend_extrait->input();
+echo IButton::tooggle_checkbox('rec1');
+echo '</p>';
+
+echo '<table class=3D"result" style=3D"width:80%;margin-left:10%">';
+$r =3D th('Date');
+$r.=3Dth('Libell=C3=A9');
+$r.=3Dth('N=C2=B0 interne');
+$r.=3Dth('Montant', ' style=3D"text-align:right"');
+$r.=3Dth('Selection', ' style=3D"text-align:center" ');
+echo tr($r);
+$iradio =3D new ICheckBox('op[]');
+$tot_not_reconcilied =3D 0;
+$diff =3D 0;
+for ($i =3D 0; $i < count($operation); $i++)
+{
+	$row =3D $operation[$i];
+	$r =3D '';
+	$js =3D HtmlInput::detail_op($row['jr_id'], $row['jr_internal']);
+	$r.=3Dtd($row['fmt_date']);
+	$r.=3Dtd($row['jr_comment']);
+	$r.=3Dtd($js);
+	$r.=3Dtd(sprintf("%.2f", $row['jr_montant']), ' class=3D"num" ');
+
+	$tot_not_reconcilied+=3D$row['jr_montant'];
+	$diff+=3D$cn->get_value('select qf_amount from quant_fin where jr_id=3D=
$1', array($row['jr_id']));
+	$iradio->value =3D $row['jr_id'];
+	$r.=3Dtd(HtmlInput::hidden('jrid[]', $row['jr_id']) . $iradio->input(),=
 ' style=3D"text-align:center" ');
+	if ($i % 2 =3D=3D 0)
+		echo tr($r, ' class=3D"odd" ');
+	else
+		echo tr($r);
+}
+echo '</table>';
+$bk_card =3D new Fiche($cn);
+$bk_card->id =3D $Ledger->get_bank();
+$filter_year =3D "  j_tech_per in (select p_id from parm_periode where  =
p_exercice=3D'" . $g_user->get_exercice() . "')";
+
+/*  get saldo for not reconcilied operations  */
+$saldo_not_reconcilied =3D $bk_card->get_solde_detail($filter_year . " a=
nd j_grpt in (select jr_grpt_id from jrn where trim(jr_pj_number) =3D'' o=
r jr_pj_number is null)");
+
+/*  get saldo for reconcilied operation  */
+$saldo_reconcilied =3D $bk_card->get_solde_detail($filter_year . " and j=
_grpt in (select jr_grpt_id from jrn where trim(jr_pj_number) !=3D '' and=
 jr_pj_number is not null)");
+
+/* solde compte */
+$saldo =3D $bk_card->get_solde_detail($filter_year);
+
+echo '<table>';
+echo '<tr>';
+echo td("Solde compte  ");
+echo td(sprintf('%.2f', ($saldo['debit'] - $saldo['credit'])), ' style=3D=
"text-align:right"');
+echo '</tr>';
+
+echo '<tr>';
+echo td("Solde non rapproch=C3=A9 ");
+echo td(sprintf('%.2f', ($saldo_not_reconcilied['debit'] - $saldo_not_re=
concilied['credit'])), ' style=3D"text-align:right"');
+echo '</tr>';
+
+echo '<tr>';
+echo td("Solde  rapproch=C3=A9 ");
+echo td(sprintf('%.2f', ($saldo_reconcilied['debit'] - $saldo_reconcilie=
d['credit'])), ' style=3D"text-align:right"');
+echo '</tr>';
+
+
+echo '<tr>';
+echo td("Total montant ");
+echo td(sprintf('%.2f', ($tot_not_reconcilied)), ' style=3D"text-align:r=
ight"');
+echo '</tr>';
+
+echo '</table>';
+
+echo HtmlInput::submit('save', 'Mettre =C3=A0 jour le n=C2=B0 de relev=C3=
=A9 banquaire');
+echo '</form>';
+echo '</div>';
+exit();
+?>

Added: phpcompta/trunk/include/compta_fin_saldo.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin_saldo.inc.php	                    =
    (rev 0)
+++ phpcompta/trunk/include/compta_fin_saldo.inc.php	2011-11-03 22:03:53 =
UTC (rev 4305)
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/* !\file
+ *
+ *
+ * \brief show bank saldo
+ *
+ */
+require_once ('class_acc_parm_code.php');
+    echo '<div class=3D"content">';
+    $fiche=3Dnew Fiche($cn);
+
+    $array=3D$fiche->get_bk_account();
+
+    echo '<div class=3D"content">';
+    echo dossier::hidden();
+    echo '<table style=3D"margin-left:10%;width:60%" class=3D"result">';
+    echo tr(th('Quick Code').th('Compte en banque',' style=3D"text-align=
:left"').th('solde op=C3=A9ration',' style=3D"text-align:right"')
+	    .th('solde extrait/relev=C3=A9',' style=3D"text-align:right"')
+	    .th('diff=C3=A9rence',' style=3D"text-align:right"'));
+    // Filter the saldo
+    //  on the current year
+    $filter_year=3D"  j_tech_per in (select p_id from parm_periode where=
  p_exercice=3D'".$g_user->get_exercice()."')";
+    // for highligting tje line
+    $idx=3D0;
+    bcscale(2);
+    // for each account
+    for ( $i =3D 0; $i < count($array);$i++)
+    {
+        // get the saldo
+        $m=3D$array[$i]->get_solde_detail($filter_year);
+
+        $solde=3D$m['debit']-$m['credit'];
+
+        // print the result if the saldo is not equal to 0
+        if ( $m['debit'] !=3D 0.0 || $m['credit'] !=3D 0.0)
+        {
+            /*  get saldo for not reconcilied operations  */
+            $saldo_not_reconcilied=3D$array[$i]->get_bk_balance($filter_=
year." and (trim(jr_pj_number) =3D'' or jr_pj_number is null)" );
+
+            /*  get saldo for reconcilied operation  */
+
+	    $saldo_reconcilied=3D$array[$i]->get_bk_balance($filter_year." and =
( trim(jr_pj_number) !=3D '' and jr_pj_number is not null)" );
+
+            if ( $idx%2 !=3D 0 )
+                $odd=3D"odd";
+            else
+                $odd=3D"";
+
+            $idx++;
+            echo "<tr class=3D\"$odd\">";
+            echo "<TD >".
+            IButton::history_card($array[$i]->id,$array[$i]->strAttribut=
(ATTR_DEF_QUICKCODE)).
+            "</TD>";
+
+	    $saldo_rec=3Dbcsub($saldo_reconcilied['debit'],$saldo_reconcilied['=
credit']);
+	    $diff=3Dbcsub($saldo_not_reconcilied['debit'],$saldo_not_reconcilie=
d['credit']);
+            echo "<TD >".
+            $array[$i]->strAttribut(ATTR_DEF_NAME).
+            "</TD>".
+            "<TD align=3D\"right\">".
+	      nbm($solde).
+            "</TD>".
+            "<TD align=3D\"right\">".
+	      nbm($saldo_rec).
+            "</TD>".
+            "<TD align=3D\"right\">".
+	      nbm($diff).
+            "</TD>".
+            "</TR>";
+        }
+    }// for
+    echo "</table>";
+    echo "</div>";
+    exit();
+?>

Modified: phpcompta/trunk/include/compta_ods.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ods.inc.php	2011-11-02 23:11:34 UTC (r=
ev 4304)
+++ phpcompta/trunk/include/compta_ods.inc.php	2011-11-03 22:03:53 UTC (r=
ev 4305)
@@ -92,6 +92,7 @@
 		printf('<a class=3D"detail" style=3D"display:inline" href=3D"javascrip=
t:modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), $ledger->in=
ternal);
=20
 		// show feedback
+		echo '<div id=3D"jrn_name_div">'; echo '<h2 id=3D"jrn_name" style=3D"d=
isplay:inline">' . $ledger->get_name() . '</h2>'; echo '</div>';
 		echo $ledger->confirm($_POST, true);
 	}
 	catch (Exception $e)

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2011-11-02 23:11:34 UTC (r=
ev 4304)
+++ phpcompta/trunk/include/compta_ven.inc.php	2011-11-03 22:03:53 UTC (r=
ev 4305)
@@ -71,7 +71,8 @@
         {
             echo '<div class=3D"content">';
 			echo h2info('Confirmation');
-			echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $Ledger->get_n=
ame() . '</h2>';
+
+
 			echo '<div class=3D"content">';
             echo '<form class=3D"print" enctype=3D"multipart/form-data" =
method=3D"post">';
             echo dossier::hidden();
@@ -125,7 +126,6 @@
         if ( ! isset($correct))
         {
             echo '<div class=3D"content">';
-			echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
             $Ledger=3Dnew Acc_Ledger_Sold($cn,$_POST['p_jrn']);
             $internal=3D$Ledger->insert($_POST);
=20
@@ -138,7 +138,7 @@
             }
=20
             /* Show button  */
-            echo '<h2 class=3D"info" Enregistrement </h2>';
+            echo '<h2 class=3D"info"> Enregistrement </h2>';
             $jr_id=3D$cn->get_value('select jr_id from jrn where jr_inte=
rnal=3D$1',array($internal));
=20
             echo "<h2 >"._('Op=C3=A9ration sauv=C3=A9e');
@@ -186,8 +186,7 @@
     else
         $Ledger->id=3D$_REQUEST ['p_jrn'];
=20
-   echo '<div class=3D"u_redcontent">';
-   echo '<h2 id=3D"jrn_name">' . $Ledger->get_name() . '</h2>';
+   echo '<div id=3D"predef_form">';
     echo '<form style=3D"display:inline" method=3D"GET" >';
 	echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo dossier::hidden();

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	2011-11-02 23:11:34=
 UTC (rev 4304)
+++ phpcompta/trunk/include/history_operation.inc.php	2011-11-03 22:03:53=
 UTC (rev 4305)
@@ -51,6 +51,10 @@
 			$Ledger=3Dnew Acc_Ledger_Sold($cn,0);
 			$ask_pay=3D1;
 			break;
+		case 'FIN':
+			$Ledger=3Dnew Acc_Ledger_Fin($cn,0);
+			$ask_pay=3D0;
+			break;
=20
 	}
 }

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	2011-11-02 23:1=
1:34 UTC (rev 4304)
+++ phpcompta/trunk/include/operation_ods_confirm.inc.php	2011-11-03 22:0=
3:53 UTC (rev 4305)
@@ -30,9 +30,10 @@
=20
 echo '<div class=3D"content">';
 echo h2("Confirmation",'class=3D"info"');
+echo '<div id=3D"jrn_name_div">';
+echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $ledger->get_name=
() . '</h2>';
+echo '</div>';
=20
-
-echo '<h2 id=3D"jrn_name">'.$ledger->get_name().'</h2>';
 echo '<FORM METHOD=3D"POST">';
 echo $ledger->confirm($_POST,false);
=20

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-02 23:11:34=
 UTC (rev 4304)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-03 22:03:53=
 UTC (rev 4305)
@@ -43,6 +43,7 @@
 	exit();
 }
 echo '<div class=3D"content">';
+echo '<div id=3D"predef_form">';
 echo '<form method=3D"GET" action=3D"do.php">';
 echo HtmlInput::hidden("action", "use_opd");
 echo HtmlInput::hidden("ac",$_REQUEST['ac']);
@@ -53,11 +54,13 @@
 $op->set('ledger_type', "ODS");
 $op->set('direct', 't');
 echo $op->form_get();
-echo '<h2 id=3D"jrn_name">'.$ledger->get_name().'</h2>';
+
 echo '</form>';
+echo '</div>';
+echo '<div id=3D"jrn_name_div">';
+echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $ledger->get_name=
() . '</h2>';
+echo '</div>';
=20
-
-
 // Show the predef operation
 // Don't forget the p_jrn
 $p_post=3D$_POST;

Modified: phpcompta/trunk/include/template/form_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_detail.php	2011-11-02 23=
:11:34 UTC (rev 4304)
+++ phpcompta/trunk/include/template/form_ledger_detail.php	2011-11-03 22=
:03:53 UTC (rev 4305)
@@ -4,6 +4,9 @@
 <fieldset>
 <legend><?=3D$f_legend ?>
 </legend>
+	<div id=3D"jrn_name_div">
+	<h2 id=3D"jrn_name"> <?=3D$this->get_name()?></h2>
+</div>
       <?=3D_('Date').':'?> <?=3D$f_date ?> <?=3D_('Echeance')?> : <?=3D$=
f_echeance?>
 <?=3D$f_periode?><br>
       <?=3D_('Journal')?> <?=3D$f_jrn?><br><hr>

Modified: phpcompta/trunk/include/template/form_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_fin.php	2011-11-02 23:11=
:34 UTC (rev 4304)
+++ phpcompta/trunk/include/template/form_ledger_fin.php	2011-11-03 22:03=
:53 UTC (rev 4305)
@@ -1,9 +1,13 @@
 <fieldset>
+	<div id=3D"jrn_name_div">
+	<h2 id=3D"jrn_name"> <?=3D$this->get_name()?></h2>
+</div>
 <legend><?=3D$f_legend ?> </legend>
    <?=3D_('Date').' '.$f_date ?>
 <?=3D$f_period?><br>
 <?=3D$f_jrn?><br>
 <?=3D_('Banque')?><?=3D$f_bank ?>
+
 </fieldset>
=20
 <fieldset>



From MAILER-DAEMON Thu Nov 03 18:10:58 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RM5Uw-0004a8-Cl
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Nov 2011 18:10:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Nov 2011 23:17:26 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.60704.1320358257.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4306 - 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, 03 Nov 2011 22:10:56 -0000

Author: danydb
Date: 2011-11-03 23:17:25 +0100 (Thu, 03 Nov 2011)
New Revision: 4306

Modified:
   phpcompta/trunk/html/ajax_card.php
Log:
cosmetic : save card : close button in the top

Modified: phpcompta/trunk/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_card.php	2011-11-03 22:03:53 UTC (rev 4305)
+++ phpcompta/trunk/html/ajax_card.php	2011-11-03 22:17:25 UTC (rev 4306)
@@ -137,13 +137,13 @@
 	  $card=3D$f->Display(false);
 	else
 	  $card=3D$f->Display(true);
-	if ( $card =3D=3D 'FNT' )=20
+	if ( $card =3D=3D 'FNT' )
 	  {
 	    $html.=3D'<h2 class=3D"error">'._('Fiche non trouv=C3=A9e').'</h2>'=
;
 	  }
 	else
 	  {
-	   =20
+
 	    if ($can_modify=3D=3D1)
 	      {
 		$html.=3D'<form method=3D"get" onsubmit=3D"update_card(this);return fa=
lse;">';
@@ -164,7 +164,7 @@
 	      }
 	  }
     }
-    else=20
+    else
       {
       $html.=3D'<h2 class=3D"error">'._('Aucune fiche demand=C3=A9e').'<=
/h2>';
       $html.=3DHtmlInput::button('close_'.$ctl,'Fermer',"onclick=3D\"rem=
oveDiv('$ctl')\"");
@@ -305,7 +305,7 @@
     require_once('class_acc_ledger.php');
     $r=3D'';
     $r.=3D'<div style=3D"float:right;height:10px;display:block;margin-to=
p:2px;margin-right:2px">';
-    $r.=3D '<A style=3D"background-color:blue;color:white;text-decoratio=
n:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\'search_card\')=
;">Fermer</A>';=20
+    $r.=3D '<A style=3D"background-color:blue;color:white;text-decoratio=
n:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\'search_card\')=
;">Fermer</A>';
     $r.=3D'</div>';
     $r.=3D'<div> '.h2info(_('Recherche de fiche')).'</div>';
=20
@@ -468,13 +468,13 @@
     }
     break;
 case 'upc':
-  $html=3DHtmlInput::button_close($ctl);
+  $html=3DHtmlInput::anchor_close($ctl);
   $html.=3Dh2info('D=C3=A9tail fiche');
- =20
+
   if ( $user->check_action(FICADD)=3D=3D0 )
     {
       $html.=3Dalert(_('Action interdite'),true);
-    } =20
+    }
   else
     {
       if ($cn->get_value('select count(*) from fiche where f_id=3D$1',ar=
ray($_GET['f_id'])) =3D=3D '0' )
@@ -484,7 +484,7 @@
=20
       else
 	{
-	  $html=3DHtmlInput::button_close($ctl);
+	  $html=3DHtmlInput::anchor_close($ctl);
 	  $html.=3Dh2info('D=C3=A9tail fiche (sauv=C3=A9e)');
=20
 	  $f=3Dnew Fiche($cn,$_GET['f_id']);



From MAILER-DAEMON Thu Nov 03 18:37:55 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RM5v1-0001mD-9n
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Nov 2011 18:37:55 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  3 Nov 2011 23:44:24 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.60737.1320359874.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4307 - in phpcompta/trunk: html include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Nov 2011 22:37:54 -0000

Author: danydb
Date: 2011-11-03 23:44:23 +0100 (Thu, 03 Nov 2011)
New Revision: 4307

Modified:
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/template/module.php
Log:

0434: Form direct action : add the form

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	2011-11-03 22:17:25 UTC (rev 430=
6)
+++ phpcompta/trunk/html/style-color.css	2011-11-03 22:44:23 UTC (rev 430=
7)
@@ -955,4 +955,21 @@
 	margin-right:150;
 =09
 =09
+}
+#predef_form {
+	margin-left:20%;
+	width:60%;
+=09
+}
+#direct
+{
+	display:inline;
+	float:right;
+=09
+=09
+}
+.direct=20
+{
+		font-size:6px;
+	   border:groove 1px #00ff00;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-03 22:17:25 UTC (rev 430=
6)
+++ phpcompta/trunk/html/style-light.css	2011-11-03 22:44:23 UTC (rev 430=
7)
@@ -1000,4 +1000,18 @@
 	margin-left:20%;
 	width:60%;
 =09
-}
\ No newline at end of file
+}
+#direct
+{
+	display:inline;
+	float:right;
+=09
+=09
+}
+.direct=20
+{
+		font-size:6px;
+	   border:groove 1px #33378d;
+	margin:1px;
+}
+

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	2011-11-03 22:17:25 UTC (rev 4306)
+++ phpcompta/trunk/html/style.css	2011-11-03 22:44:23 UTC (rev 4307)
@@ -986,4 +986,22 @@
 	margin-right:150;
 =09
 =09
+}
+#predef_form {
+	margin-left:20%;
+	width:60%;
+=09
+}
+#direct
+{
+	display:inline;
+	float:right;
+=09
+=09
+}
+.direct=20
+{
+		font-size:6px;
+	   border:groove 1px #000000;
+	margin:1px;
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-03 22:17:25 UTC (rev 43=
06)
+++ phpcompta/trunk/include/ac_common.php	2011-11-03 22:44:23 UTC (rev 43=
07)
@@ -297,14 +297,9 @@
 // language
     if (isset($_SESSION['g_lang']))
     {
-	set_language();
+		set_language();
     }
=20
-    /* If we are on the user_login page */
-    if (basename($_SERVER['PHP_SELF']) =3D=3D 'user_login.php')
-    {
-	return;
-    }
 }
=20
 /* !
@@ -754,6 +749,15 @@
 	require_once('template/module.php');
 	$file =3D $cn->get_array("select me_file,me_parameter from v_all_menu
 	    where me_code=3D$1 and user_name=3D$2", array($selected,$g_user->lo=
gin));
+	if ( count($file ) =3D=3D 0 )
+	{
+		echo '</div>';
+		echo '</div>';
+		echo '<div class=3D"content">';
+		echo_warning("Module inexistant [$selected");
+		echo '</div>';
+		exit();
+	}
 	if ($file[0]['me_file'] !=3D '')
 	{
 	    if ($file[0]['me_parameter'] !=3D=3D "")

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2011-11-03 22:17:25 UTC (=
rev 4306)
+++ phpcompta/trunk/include/template/module.php	2011-11-03 22:44:23 UTC (=
rev 4307)
@@ -3,6 +3,19 @@
=20
 	<H2 class=3D"dossier"> Dossier : <?=3Dh(dossier::name())?></h2>
 	<?=3DIButton::show_calc()?>
+	<div id=3D"direct">
+	<form method=3D"get">
+		<?=3DDossier::hidden()?>
+		<?
+			$direct=3Dnew IText('ac');
+			$direct->style=3D'class=3D"direct"';
+			$direct->value=3DHtmlInput::default_value('ac', '', $_REQUEST);
+			$direct->size=3D(strlen($direct->value)<10)?10:strlen($direct->value)=
;
+			echo $direct->input();
+			echo HtmlInput::submit('go','aller');
+			?>
+	</form>
+	</div>
     </div>
     <div class=3D"acces_direct">
 	<table>



From MAILER-DAEMON Thu Nov 03 19:05:26 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RM6Le-0004mq-Tm
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Nov 2011 19:05:26 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Nov 2011 00:11:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.60768.1320361526.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4308 - 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: Thu, 03 Nov 2011 23:05:25 -0000

Author: danydb
Date: 2011-11-04 00:11:53 +0100 (Fri, 04 Nov 2011)
New Revision: 4308

Modified:
   phpcompta/trunk/sql/object-6.0.sql
Log:

Update menu with FIN + FINSALDO + FINREC , MENUFIN

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-03 22:44:23 UTC (rev 4307)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-03 23:11:53 UTC (rev 4308)
@@ -171,7 +171,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 91, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 95, true);
=20
=20
 --
@@ -310,7 +310,6 @@
 INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, NULL, 'ledger_type=3DODS');
 INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 NULL, NULL);
 INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL);
-INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', N=
ULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, =
NULL, NULL);
 INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi=
nies', 'preod.inc.php', NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, NULL, NULL);
@@ -364,12 +363,17 @@
 INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, N=
ULL, NULL);
 INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, NULL, 'ledger_type=3DALL');
+INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, NULL, N=
ULL);
 INSERT INTO menu_ref VALUES ('TVA', 'Tva', 'extension_get.inc.php', NULL=
, NULL, 'plugin_code=3DAMORTIS');
 INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'extension_choice=
.inc.php', NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, NULL, NULL)=
;
 INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, NULL, NULL);
 INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FINIMP', 'Historique financier', 'history_=
operation.inc.php', NULL, NULL, 'ledger_type=3DFIN');
 INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FINSALDO', 'Soldes', 'compta_fin_saldo.inc=
.php', NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FINREC', 'Rapprochement', 'compta_fin_rec.=
inc.php', NULL, NULL, NULL);
=20
=20
 --
@@ -436,7 +440,8 @@
 INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', NULL);
 INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 6, 'M', NULL);
-INSERT INTO profile_menu VALUES (19, 'FIN', 'COMPTA', 1, 4, 'E', NULL);
+INSERT INTO profile_menu VALUES (94, 'FINSALDO', 'MENUFIN', 1, 3, 'E', N=
ULL);
+INSERT INTO profile_menu VALUES (95, 'FINREC', 'MENUFIN', 1, 4, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E', NULL);
 INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', NULL);
 INSERT INTO profile_menu VALUES (79, 'PREFERENCE', 'ANC', 1, 2, 'M', NUL=
L);
@@ -457,6 +462,9 @@
 INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', NULL);
+INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (93, 'FINIMP', 'MENUFIN', 1, 2, 'E', NUL=
L);
=20
=20
 --



From MAILER-DAEMON Thu Nov 03 19:05:46 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RM6Ly-0004va-QW
	for mharc-phpcompta-dev@gnu.org; Thu, 03 Nov 2011 19:05:46 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Nov 2011 00:12:15 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.60774.1320361546.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4309 - 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, 03 Nov 2011 23:05:45 -0000

Author: danydb
Date: 2011-11-04 00:12:14 +0100 (Fri, 04 Nov 2011)
New Revision: 4309

Modified:
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
Log:

Improve CSS theme

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	2011-11-03 23:11:53 UTC (rev 430=
8)
+++ phpcompta/trunk/html/style-color.css	2011-11-03 23:12:14 UTC (rev 430=
9)
@@ -1,11 +1,13 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-    background-color:#EDF3FF;
+    background-color:#E3FFE0;
     font-size:10;
     font-family:helvetica,arial,sans-serif;
     padding:0;
     margin:0;
+    color:#0E7E0E;
+   =20
 }
 .notice {
     color:red;
@@ -70,7 +72,7 @@
     margin:0px;
 }
 h2.info {
-    background-color:#879ED4;
+    background-color:#0E7E0E;
     color:white;
     font-size:14px;
     text-align:center;
@@ -422,7 +424,7 @@
     font-family:helvetica,arial,sans-serif;
     text-decoration: none;
     display: block;
-    color: blue;
+    color: #0E7E0E;
     padding: 1px ;
=20
 }
@@ -768,7 +770,7 @@
=20
 .button {
     font-size:10;
-    color:white;
+    color:black;
     text-decoration:none;
     font-family: helvetica,arial,sans-serif;
     background-color:#DFDFDF;
@@ -861,7 +863,7 @@
=20
 }
 div.op_detail  {
-    background-color:#e4e7ed;
+    background-color:#ccffcc;
     font-size:10;
     font-family:helvetica,arial,sans-serif;
     padding:0;

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	2011-11-03 23:11:53 UTC (rev 430=
8)
+++ phpcompta/trunk/html/style-light.css	2011-11-03 23:12:14 UTC (rev 430=
9)
@@ -29,14 +29,12 @@
 table.result th {=20
   font-weight:bold;
   font-family:helvetica,arial,sans-serif;
- border-bottom:2px solid #0000ff;=20
+ border-bottom:1px solid black;=20
  border-top:0;
 =20
   color:#25238F;
   text-align: left;
-  	      background-color:#bdbaba;
-  	     =20
-	      font-style: italic;
+  font-style: italic;
 	     =20
 }
=20



From MAILER-DAEMON Fri Nov 04 06:22:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RMGuP-0003bv-Bi
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Nov 2011 06:22:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Nov 2011 11:28:26 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.61912.1320402120.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4310 - in phpcompta/trunk: html html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Nov 2011 10:21:59 -0000

Author: danydb
Date: 2011-11-04 11:28:24 +0100 (Fri, 04 Nov 2011)
New Revision: 4310

Removed:
   phpcompta/trunk/html/remove_op.php
Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/include/class_anc_operation.php
Log:

Ajax : put remove_op.php into ajax_misc.php

Modified: phpcompta/trunk/html/ajax_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_misc.php	2011-11-03 23:12:14 UTC (rev 4309)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-04 10:28:24 UTC (rev 4310)
@@ -63,6 +63,10 @@
 $html=3Dvar_export($_REQUEST,true);
 switch($op)
 {
+	case "remove_anc":
+		if ($user->check_action(CAOD))
+		$cn->exec_sql("delete from operation_analytique where oa_group=3D$1",a=
rray($_GET['oa']));
+		break;
 case "rm_stock":
   require_once('constant.security.php');
   if ( $user->check_action(GESTOCK) =3D=3D 0 )

Modified: phpcompta/trunk/html/js/anc_script.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/anc_script.js	2011-11-03 23:12:14 UTC (rev 43=
09)
+++ phpcompta/trunk/html/js/anc_script.js	2011-11-04 10:28:24 UTC (rev 43=
10)
@@ -251,16 +251,16 @@
  *@param p_dossier is the folder
  *@param p_oa_group is the group of the analytic operation
  */
-function op_remove(p_dossier,p_oa_group)
+function anc_remove_operation(p_dossier,p_oa_group)
 {
     var a=3Dconfirm("Etes-vous sur de vouloir effacer cette operation ?\=
n");
     if ( a =3D=3D false ) return;
 var obj=3D{"oa":
          p_oa_group,"gDossier":
-             p_dossier};
-    queryString=3DencodeJSON(obj);
+             p_dossier,"op":"remove_anc"};
+    var queryString=3DencodeJSON(obj);
     g(p_oa_group).style.display=3D'none';
-    var e=3Dnew Ajax.Request("remove_op.php",
+    var e=3Dnew Ajax.Request("ajax_misc.php",
                        {method:'get',parameters:queryString});
=20
 }

Deleted: phpcompta/trunk/html/remove_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/html/remove_op.php	2011-11-03 23:12:14 UTC (rev 4309)
+++ phpcompta/trunk/html/remove_op.php	2011-11-04 10:28:24 UTC (rev 4310)
@@ -1,41 +0,0 @@
-=EF=BB=BF<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- *
- *
- * \brief from ajax, remove op. CA
- *
- */
-
-require_once('class_database.php');
-require_once ("class_user.php");
-require_once('class_dossier.php');
-require_once ('class_user.php');
-$gDossier=3Ddossier::id();
-
-$cn=3Dnew Database($gDossier);
-$User=3Dnew User($cn);
-$User->Check();
-if ($User->check_action(CAOD))
-    $cn->exec_sql("delete from operation_analytique where oa_group=3D$1"=
,array($_GET['oa']));
-?>

Modified: phpcompta/trunk/include/class_anc_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_anc_operation.php	2011-11-03 23:12:14 U=
TC (rev 4309)
+++ phpcompta/trunk/include/class_anc_operation.php	2011-11-04 10:28:24 U=
TC (rev 4310)
@@ -210,7 +210,7 @@
                 {
=20
                     $efface=3Dnew IButton();
-                    $efface->javascript=3D"op_remove(".$gDossier.",".$ol=
dgroup.")";
+                    $efface->javascript=3D"anc_remove_operation(".$gDoss=
ier.",".$oldgroup.")";
                     $efface->name=3D"Efface";
                     $efface->label=3D"Efface";
                     $ret.=3D"<td>".$efface->input()."</td>";
@@ -268,7 +268,7 @@
=20
=20
         $efface=3Dnew IButton();
-        $efface->javascript=3D"op_remove("."$gDossier,".$oldgroup.")";
+        $efface->javascript=3D"anc_remove_operation("."$gDossier,".$oldg=
roup.")";
         $efface->name=3D"Efface";
         $efface->label=3D"Efface";
         $ret.=3D"<td>".$efface->input()."</td>";



From MAILER-DAEMON Fri Nov 04 17:16:54 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RMR8A-0001kR-4v
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Nov 2011 17:16:54 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Nov 2011 22:23:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64092.1320441413.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4311 - 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 Nov 2011 21:16:53 -0000

Author: danydb
Date: 2011-11-04 22:23:17 +0100 (Fri, 04 Nov 2011)
New Revision: 4311

Modified:
   phpcompta/trunk/include/class_user.php
Log:

Journaux par ordre alphab?\195?\169tique

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2011-11-04 10:28:24 UTC (rev 4=
310)
+++ phpcompta/trunk/include/class_user.php	2011-11-04 21:23:17 UTC (rev 4=
311)
@@ -315,7 +315,7 @@
                  jrn_type_id,jrn_desc,'W' as uj_priv
                  from jrn_def join jrn_type on jrn_def_type=3Djrn_type_i=
d
                  $sql_type
-                 order by jrn_Def_id";
+                 order by jrn_Def_name";
 		}
 		$res =3D $this->db->exec_sql($sql);
 		if (Database::num_row($res) =3D=3D 0)



From MAILER-DAEMON Fri Nov 04 17:20:57 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RMRC5-0001v9-Bt
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Nov 2011 17:20:57 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Nov 2011 22:27:22 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64093.1320441655.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4312 - 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 Nov 2011 21:20:55 -0000

Author: danydb
Date: 2011-11-04 22:27:21 +0100 (Fri, 04 Nov 2011)
New Revision: 4312

Modified:
   phpcompta/trunk/include/ac_common.php
Log:

Modularit?\195?\169 : ajout du javascript

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-04 21:23:17 UTC (rev 43=
11)
+++ phpcompta/trunk/include/ac_common.php	2011-11-04 21:27:21 UTC (rev 43=
12)
@@ -747,7 +747,7 @@
     if ($selected !=3D -1)
     {
 	require_once('template/module.php');
-	$file =3D $cn->get_array("select me_file,me_parameter from v_all_menu
+	$file =3D $cn->get_array("select me_file,me_parameter,me_javascript fro=
m v_all_menu
 	    where me_code=3D$1 and user_name=3D$2", array($selected,$g_user->lo=
gin));
 	if ( count($file ) =3D=3D 0 )
 	{
@@ -769,6 +769,10 @@
 	    require_once $file[0]['me_file'];
 	    exit();
 	}
+	if ( $file[0]['me_javascript'] !=3D '')
+	{
+		create_script($file[0]['me_javascript']);
+	}
     }
     else
     {
@@ -845,11 +849,12 @@
 	 * @todo add security
 	 * check if user can access this module
 	 */
-		$file =3D $cn->get_array("select me_file,me_parameter
+		$file =3D $cn->get_array("select me_file,me_parameter,me_javascript
 		from menu_ref
 		where
-		me_code=3D$1 and
-		(me_file is not null or trim(me_file) <>'')", array($module[$idx]));
+		me_code=3D$1 and=20
+		(me_file is not null or trim(me_file) <>'' or
+		me_javascript is not null or trim (me_javascript) <> '')", array($modu=
le[$idx]));
=20
 		if (count($file)=3D=3D0)
 		{
@@ -870,6 +875,10 @@
 			echo '</div>';
 			exit();
 		}
+		if ( $file[0]['me_javascript'] !=3D '')
+		{
+		echo create_script($file[0]['me_javascript']);
+		}
     }
 }
 /**



From MAILER-DAEMON Fri Nov 04 17:21:32 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RMRCe-0001vv-EZ
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Nov 2011 17:21:32 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Nov 2011 22:27:51 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64096.1320441691.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4313 - in phpcompta/trunk: html html/js include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Nov 2011 21:21:31 -0000

Author: danydb
Date: 2011-11-04 22:27:50 +0100 (Fri, 04 Nov 2011)
New Revision: 4313

Added:
   phpcompta/trunk/include/search.inc.php
   phpcompta/trunk/include/template/search_top.php
Removed:
   phpcompta/trunk/html/jrn_search.php
Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/recherche.php
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_iconcerned.php
   phpcompta/trunk/include/template/ledger_detail_bottom.php
Log:

#317 IConcerne : r?\195?\169?\195?\169criture, ?\195?\160 l'avenir sera d=
ans une fen?\195?\170tre interne

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	2011-11-04 21:27:21 UTC (rev 4312)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-04 21:27:50 UTC (rev 4313)
@@ -460,4 +460,23 @@
 case 'save_predf':
   require_once('save_predf_op.php');
   break;
+case 'search_op':
+	/*put_global(array
+				(array('key'=3D>'ac','value'=3D>'JSSEARCH')),
+				(array('key'=3D>'ledger_type','value'=3D>'ALL'))
+			   );*/
+	ob_start();
+	require_once 'search.inc.php';
+	$content=3Dob_get_contents();
+	ob_clean();
+	$html=3Descape_xml($content);
+	header('Content-type: text/xml; charset=3DUTF-8');
+	echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl>$ctl</ctl>
+<code>$html</code>
+</data>
+EOF;
+	break;
 }

Deleted: phpcompta/trunk/html/jrn_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/html/jrn_search.php	2011-11-04 21:27:21 UTC (rev 4312=
)
+++ phpcompta/trunk/html/jrn_search.php	2011-11-04 21:27:50 UTC (rev 4313=
)
@@ -1,303 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* $Revision$ */
-/*! \file
- * \brief Search a operation from a ledger into a popup window, used for=
 the "rapprochement"
- */
-
-require_once ("ac_common.php");
-require_once('class_database.php');
-require_once("user_common.php");
-/* Admin. Dossier */
-$rep=3Dnew Database();
-include_once ("class_user.php");
-require_once('class_html_input.php');
-require_once('function_javascript.php');
-echo load_all_script();
-$User=3Dnew User($rep);
-$User->Check();
-
-
-html_min_page_start($User->theme,"onLoad=3D'window.focus();'");
-
-require_once('class_dossier.php');
-$gDossier=3Ddossier::id();
-
-// Javascript
-
-if ( isset( $p_jrn ))
-{
-    $p_jrn=3D$p_jrn;
-    $_SESSION[ "p_jrn"]=3D$p_jrn;
-
-}
-if (isset ($_GET['p_ctl'])) $p_ctl=3D$_GET['p_ctl'];
-if (isset($_POST['p_ctl'])) $p_ctl=3D$_POST['p_ctl'];
-$opt=3D'<OPTION VALUE=3D"=3D"> =3D';
-$opt.=3D'<OPTION VALUE=3D"<=3D"> <=3D';
-$opt.=3D'<OPTION VALUE=3D"<"> <';
-$opt.=3D'<OPTION VALUE=3D">"> >';
-$opt.=3D'<OPTION VALUE=3D">=3D"> >=3D';
-$opt_date=3D$opt;
-$opt_montant=3D$opt;
-$c_comment=3D"";
-$c_montant=3D"";
-$c_internal=3D"";
-$c_date=3D"";
-$condition=3D"";
-$part=3D" where ";
-$cn=3Dnew Database($gDossier);
-// if search then build the condition
-if ( isset ($_GET["search"]) )
-{
-    $c1=3D0;
-    foreach( $_GET as $key=3D>$element)
-    {
-        ${"$key"}=3D$element;
-    }
-    $c_comment=3D"";
-    if ( isset ($p_comment) && strlen(trim($p_comment)) !=3D 0 )
-    {
-        $c_comment=3D" $part upper(jr_comment) like upper('%$p_comment%'=
)";
-        $part=3D" and ";
-    }
-    $c_montant=3D"";
-    if ( isset ($p_montant) && strlen($p_montant) !=3D 0 && isNumber($p_=
montant) )
-    {
-        $p_montant=3Dabs($p_montant);
-        $opt_montant.=3D'<OPTION VALUE=3D"'.$p_montant_sel.'" SELECTED>'=
.$p_montant_sel;
-        $part=3D"  and ";
-        /* if the sign is equal then we look into the details */
-        if ( $p_montant_sel !=3D '=3D' )
-        {
-            $c_montant=3Dsprintf(" $part jr_montant %s abs(%s)",$p_monta=
nt_sel,$p_montant);
-        }
-        else
-        {
-            $c_montant=3D$part.'  jr_grpt_id in (select j_grpt from jrnx=
 where j_montant =3D '.$p_montant.')';
-        }
-    }
-    if ( isset ($p_date) && strlen(trim($p_date)) !=3D 0 )
-    {
-        $c_date=3Dsprintf(" $part j_date %s to_date('%s','DD.MM.YYYY')",=
$p_date_sel,$p_date);
-        $part=3D" and ";
-        $opt_date.=3D'<OPTION VALUE=3D"'.$p_date_sel.'" SELECTED>'.$p_da=
te_sel;
-    }
-    $c_internal=3D"";
-    if ( isset($p_internal) &&  strlen(trim($p_internal)) !=3D 0 )
-    {
-        $c_internal=3D$part." jr_internal like  ('%".$p_internal."%')";
-        $part=3D" and ";
-
-    }
-    $c_paid=3D"";
-    if (isset($paid))
-    {
-        $c_paid=3D$part."  (jr_rapt !=3D 'paid' or jr_rapt is null) ";
-        $part=3D" and ";
-    }
-    $condition=3D$c_comment.$c_montant.$c_date.$c_internal.$c_paid;
-}
-$condition=3D$condition." ".$part;
-
-// If the usr is admin he has all right
-if ( $User->admin !=3D 1 && $User->is_local_admin()!=3D1)
-{
-    $condition.=3D"  uj_priv in ('W','R') and uj_login=3D'".$User->login=
."'" ;
-}
-else
-{
-    $condition.=3D" true ";
-}
-?>
-<div style=3D"font-size:11px;">
-           <?php
-           echo '<FORM ACTION=3D"jrn_search.php" METHOD=3D"GET">';
-echo dossier::hidden();
-if (isset($paid))
-    echo '<div class=3D"info"> Uniquement les non op&eacute;rations non =
pay&eacute;es<input type=3D"hidden" name=3D"paid" value=3D"paid"></div>';
-else
-    echo '<div class=3D"info"> Toutes les op&eacute;rations </div>';
-
-echo '<TABLE>';
-echo '<TR>';
-if ( ! isset ($p_date)) $p_date=3D"";
-if ( ! isset ($p_montant)) $p_montant=3D"";
-if ( ! isset ($p_comment)) $p_comment=3D"";
-if ( ! isset ($p_internal)) $p_internal=3D"";
-echo '<input type=3D"hidden" name=3D"p_ctl" value=3D"'.$p_ctl.'">';
-echo '<TD> Date </TD>';
-echo '<TD> <SELECT NAME=3D"p_date_sel">'.$opt_date.' </TD>';
-echo '<TD> <INPUT TYPE=3D"text" name=3D"p_date" VALUE=3D"'.$p_date.'"></=
TD>';
-
-echo '<TD> Montant </TD>';
-echo '<TD> <SELECT NAME=3D"p_montant_sel">'.$opt_montant.' </TD>';
-echo '<TD> <INPUT TYPE=3D"text" name=3D"p_montant" VALUE=3D"'.$p_montant=
.'"></TD>';
-echo '</TR><TR>';
-echo '<TD> Commentaire </TD>';
-echo '<TD> contient </TD>';
-echo '<TD> <INPUT TYPE=3D"text" name=3D"p_comment" VALUE=3D"'.$p_comment=
.'"></TD>';
-?>
-</TR><TR>
-<TD> Code interne </TD><TD>comme </TD>
-<?php
-echo '<TD> <INPUT TYPE=3D"text" name=3D"p_internal" VALUE=3D"'.$p_intern=
al.'"></TD>';
-echo "</TR>";
-
-echo '</TABLE>';
-echo HtmlInput::submit('search','cherche');
-echo '<input type=3D"button" class=3D"button" name=3D"update_concerned" =
value=3D"Mise =C3=A0 jour des r=C3=A9conciliation" onClick=3D"updateJrn(\=
''.$p_ctl.'\')">';
-echo '</FORM>';
-echo '<div class=3D"content">';
-// if a search is asked otherwise don't show all the rows
-if ( isset ($_GET["search"]) )
-{
-// If the usr is admin he has all right
-    if ( $User->admin !=3D 1 && $User->is_local_admin()!=3D1)
-    {
-        $jnt=3D"  inner join user_sec_jrn on uj_jrn_id=3Dj_jrn_def";
-    }
-    else
-    {
-        $jnt=3D"  ";
-    }
-    $sql=3D"select j_id,to_char(j_date,'DD.MM.YYYY') as j_date,
-         j_montant,jr_montant,j_poste,j_debit,j_tech_per,jr_id,jr_commen=
t,j_grpt,pcm_lib,jr_internal,jr_rapt,j_qcode from jrnx inner join
-         jrn on jr_grpt_id=3Dj_grpt inner join tmp_pcmn on j_poste=3Dpcm=
_val ".
-         $jnt.
-         $condition." order by jr_date,jr_id,j_debit desc";
-    $Res=3D$cn->exec_sql($sql);
-
-    $MaxLine=3DDatabase::num_row($Res);
-    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
-    $limit=3D$_SESSION['g_pagesize'];
-    $sql_limit=3D"";
-    $sql_offset=3D"";
-    $bar=3D"";
-    if ( $limit !=3D -1)
-    {
-        $page=3D(isset($_GET['page']))?$_GET['page']:0;
-        $sql_limit=3D" LIMIT $limit ";
-        $sql_offset=3D" OFFSET $offset ";
-        $bar=3Djrn_navigation_bar($offset,$MaxLine,$limit,$page,'onClick=
=3D"return go_next_concerned();"');
-
-    }
-    $sql.=3D$sql_limit.$sql_offset;
-    if ( $MaxLine=3D=3D0)
-    {
-        html_page_stop();
-        return;
-    }
-    $Res=3D$cn->exec_sql($sql);
-    $MaxLine=3DDatabase::num_row($Res);
-
-    $col_vide=3D"<TD></TD>";
-    echo '<form id=3D"form_jrn_concerned">';
-    echo HtmlInput::hidden('nb_item',$MaxLine);
-    echo $bar;
-    echo '<TABLE ALIGN=3D"center" BORDER=3D"0" CELLSPACING=3D"O" width=3D=
"100%">';
-    $l_id=3D"";
-//   if ( $MaxLine > 250 ) {
-//     echo "Trop de lignes red=C3=A9finir la recherche";
-//     html_page_stop();
-//     return;
-//   }
-    for ( $i=3D0; $i < $MaxLine; $i++)
-    {
-        $l_line=3DDatabase::fetch_array($Res,$i);
-        if ( $l_id =3D=3D $l_line['j_grpt'] )
-        {
-            echo $col_vide.$col_vide;
-        }
-        else
-        {
-            echo '<TR style=3D"background-color:lightblue"><TD>';
-            echo '<INPUT TYPE=3D"CHECKBOX" name=3D"jr_concerned'.$l_line=
['jr_id'].'" ID=3D"jr_concerned'.$l_line['jr_id'].'"> '.$l_line['jr_id'];
-            echo "</TD>";
-
-            echo "<TD>";
-            echo $l_line['j_date'];
-            echo "</TD>";
-
-            echo "<TD>";
-            echo $l_line['jr_internal'];
-            echo "</TD>";
-            $l_id=3D$l_line['j_grpt'];
-            if ( $l_line['jr_rapt'] =3D=3D 'paid')
-                $lpay=3D"  (Pay&eacute;) ";
-            else
-                $lpay=3D"";
-
-            echo '<TD COLSPAN=3D"3">'.$l_line['jr_comment'].$lpay.'</TD>=
';
-            echo '<td>'.$l_line['jr_montant'].'</td>';
-            echo '</tr>';
-        }
-        if ( $l_line['j_debit'] =3D=3D 't' )
-        {
-            echo '<TR style=3D"background-color:#E7FBFF;">';
-        }
-        else
-        {
-            echo '<TR style=3D"background-color:#E7FFEB;">';
-        }
-        echo $col_vide;
-        if ( $l_line['j_debit']=3D=3D'f')
-            echo $col_vide;
-
-        echo '<TD>';
-        echo $l_line['j_poste'];
-        echo '</TD>';
-
-        if ( $l_line['j_debit']=3D=3D't')
-            echo $col_vide;
-
-        echo '<TD>';
-        if ( $l_line ['j_qcode'] !=3D "" )
-        {
-            $o=3Dnew Fiche($cn);
-            $o->get_by_qcode($l_line['j_qcode'],false);
-            echo "[ ".$l_line['j_qcode']." ]".
-            $o->strAttribut(ATTR_DEF_NAME);
-        }
-        else
-            echo $l_line['pcm_lib'];
-        echo '</TD>';
-
-        if ( $l_line['j_debit']=3D=3D'f')
-            echo $col_vide;
-
-        echo '<TD>';
-        echo $l_line['j_montant'];
-        echo '</TD>';
-
-        echo "</TR>";
-
-    }
-
-    echo '</TABLE>';
-    echo $bar;
-    echo '</form>';
-    echo '</div>';
-}// if $_POST [search]
-?>
-</div>
-<?php
-html_page_stop();
-?>

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	2011-11-04 21:27:21 UTC (rev 43=
12)
+++ phpcompta/trunk/html/js/acc_ledger.js	2011-11-04 21:27:50 UTC (rev 43=
13)
@@ -496,85 +496,8 @@
 {
     window.location.reload();
 }
-/*! \brief this function search into the ledger
- *  \param p_ctl ctl name
- *  \param p_montant amount to search (if 0 get it from the e_other_amou=
nt
- */
-function SearchJrn(p_dossier,p_ctl,p_montant,p_paid)
-{
-    var url=3D'jrn_search.php?p_ctl=3D'+p_ctl+'&gDossier=3D'+p_dossier+'=
&'+p_paid;
=20
=20
-    if ( p_montant =3D=3D 0 )
-    {
-        // compute amount name replace the number
-        num=3Dp_ctl.replace("e_concerned","");
-
-        /* Get the amount */
-        var ctl_montant_name=3D"e_other"+num+"_amount";
-
-        if ( document.forms[0])
-        {
-
-            for ( i=3D0; i < document.forms[0].length; i++)
-            {
-                var e=3Ddocument.forms[0].elements[i];
-                if ( e.name =3D=3D ctl_montant_name )
-                {
-                    p_montant=3De.value;
-                    break;
-                }
-            }
-        }
-        if ( p_montant =3D=3D 0 && document.forms[1])
-        {
-
-            for ( i=3D0; i < document.forms[1].length; i++)
-            {
-                var e=3Ddocument.forms[1].elements[i];
-                if ( e.name =3D=3D ctl_montant_name )
-                {
-                    p_montant=3De.value;
-                    break;
-                }
-            }
-        }
-
-    }
-
-
-    if ( p_montant =3D=3D 0 )
-    {
-        var win=3Dwindow.open(url,'Cherche','toolbar=3Dno,width=3D600,he=
ight=3D600,scrollbars=3Dyes');
-
-    }
-    else
-    {
-        var win=3Dwindow.open(url+'&search&p_montant=3D'+p_montant+'&p_m=
ontant_sel=3D%3D','Cherche','toolbar=3Dno,width=3D600,height=3D600,scroll=
bars=3Dyes');
-    }
-}
-
-function updateJrn(p_ctl)
-{
-    var form=3Ddocument.forms[1];
-
-    for (var e=3D0;e<form.elements.length;e++)
-    {
-        var elmt=3Dform.elements[e];
-        if ( elmt.type =3D=3D "checkbox")
-        {
-            if (elmt.checked=3D=3Dtrue )
-            {
-                var str_name=3Delmt.name;
-                var nValue=3Dstr_name.replace("jr_concerned","");
-
-                set_inparent(p_ctl,nValue,1);
-            }
-        }
-    }
-    window.close();
-}
-
 function go_next_concerned()
 {
     var form=3Ddocument.forms[1];

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	2011-11-04 21:27:21 UTC (rev 4312)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-04 21:27:50 UTC (rev 4313)
@@ -286,13 +286,10 @@
  *@param p_dossier the dossier where to search
  *@param p_style style of the detail value are E for expert or S for sim=
ple
  */
-function openRecherche(p_dossier,p_style)
+function popup_recherche()
 {
-    if ( p_style =3D=3D 'E' )
-    {
-        p_style=3D"expert";
-    }
-    var w=3Dwindow.open("recherche.php?gDossier=3D"+p_dossier+'&'+p_styl=
e,'','statusbar=3Dno,scrollbars=3Dyes,toolbar=3Dno');
+	p_dossier=3D$('gDossier').value;
+    var w=3Dwindow.open("recherche.php?gDossier=3D"+p_dossier+"&ac=3DSEA=
RCH",'','statusbar=3Dno,scrollbars=3Dyes,toolbar=3Dno');
     w.focus();
 }
 /**
@@ -373,7 +370,7 @@
 {
     var queryString=3D"gDossier=3D"+obj.gDossier+"&op=3Dcal"+"&per=3D"+o=
bj.value;
     var action =3D new Ajax.Request(
-                 "ajax_misc.php" , { method:'get', parameters:queryStrin=
g,onFailure:ajax_misc_failure,onSuccess:success_misc}
+                 "ajax_misc.php" , {method:'get', parameters:queryString=
,onFailure:ajax_misc_failure,onSuccess:success_misc}
                  );
=20
 }
@@ -435,7 +432,7 @@
 {
     var queryString=3D"gDossier=3D"+p_dossier+"&op=3Drem_cat_doc"+"&dt_i=
d=3D"+p_dt_id;
     var action =3D new Ajax.Request(
-                 "ajax_misc.php" , { method:'get', parameters:queryStrin=
g,onFailure:ajax_misc_failure,onSuccess:success_cat_doc_remove}
+                 "ajax_misc.php" , {method:'get', parameters:queryString=
,onFailure:ajax_misc_failure,onSuccess:success_cat_doc_remove}
                  );
 }
 function success_cat_doc_remove(req)
@@ -490,7 +487,7 @@
             queryString+=3D'&compute=3D'+obj.compute;
         var action =3D new Ajax.Request(
                          "ajax_misc.php" ,
-                 { method:'get',
+                 {method:'get',
                    parameters:queryString,
                    onFailure:ajax_misc_failure,
                    onSuccess:success_popup_select_tva
@@ -544,7 +541,7 @@
             queryString+=3D'&code=3D'+obj.jcode;
         var action =3D new Ajax.Request(
                          "ajax_misc.php" ,
-                 { method:'get',
+                 {method:'get',
                    parameters:queryString,
                    onFailure:ajax_misc_failure,
                    onSuccess:success_set_tva_label
@@ -600,6 +597,7 @@
  * - style to add style
  * - id to add an id
  * - class to add a class
+ * - html is the content
  */
 function add_div(obj)
 {
@@ -639,7 +637,7 @@
 new Draggable(obj.id,{starteffect:function()
                                   {
                       new Effect.Highlight(obj.id,{scroll:window,queue:'=
end'});
-                                  } }
+                                  }}
                          );
         }
     }
@@ -660,6 +658,22 @@
     }
 }
 /**
+ *show a box while loading
+ *must be remove when ajax is successfull
+ * the id is wait_box
+ */
+function waiting_box()
+{
+	obj=3D{
+		id:'wait_box',html:loading()
+		};
+	if ($('wait_box')){
+		removeDiv('wait_box');
+		}
+	add_div(obj);
+
+}
+/**
 *@brief call add_div to add a DIV and after call the ajax
 * the queryString, the callback for function for success and error manag=
ement
 * the method is always GET
@@ -755,7 +769,8 @@
 */
 function show_ledger_choice()
 {
-    g('div_jrn').style.visibility=3D'visible';
+   if ($('div_jrn')) g('div_jrn').style.visibility=3D'visible';
+   if ($('div_jrnsearch_op')) $('div_jrnsearch_op').style.display=3D'blo=
ck';
 }
 /**
 * hide the ledger choice
@@ -763,6 +778,7 @@
 function hide_ledger_choice()
 {
     g('div_jrn').style.visibility=3D'hidden';
+	if ($('div_jrnsearch_op')) $('div_jrnsearch_op').style.display=3D'none'=
;
 }
 /**
 * show the cat of ledger choice
@@ -900,7 +916,7 @@
 	}
         var action =3D new Ajax.Request(
             "ajax_misc.php" ,
-            { method:'get',
+            {method:'get',
               parameters:queryString,
               onFailure:ajax_misc_failure,
               onSuccess:success_display_periode
@@ -916,7 +932,7 @@
=20
 }
 function success_display_periode(req)
-{    try
+{try
     {
=20
         var answer=3Dreq.responseXML;
@@ -955,7 +971,7 @@
=20
         var action =3D new Ajax.Request(
             "ajax_misc.php" ,
-            { method:'post',
+            {method:'post',
               parameters:queryString,
               onFailure:ajax_misc_failure,
               onSuccess:success_display_periode
@@ -981,10 +997,14 @@
 function fill_box(req)
 {
     try{
+
+	if ( $('wait_box')){
+			removeDiv('wait_box');
+			}
 	var answer=3Dreq.responseXML;
 	var a=3Danswer.getElementsByTagName('ctl');
 	var html=3Danswer.getElementsByTagName('code');
-	if ( a.length =3D=3D 0 ) { var rec=3Dreq.responseText;alert ('erreur :'=
+rec);}
+	if ( a.length =3D=3D 0 ) {var rec=3Dreq.responseText;alert ('erreur :'+=
rec);}
 	var name_ctl=3Da[0].firstChild.nodeValue;
 	var code_html=3DgetNodeText(html[0]); // Firefox ne prend que les 4096 =
car.
 	code_html=3Dunescape_xml(code_html);
@@ -1047,3 +1067,98 @@
=20
     return false;
 }
+/**
+ *ctl_concern is the widget to update
+ */
+function search_reconcile(dossier,ctl_concern,amount_id,ledger)
+{
+	var dossier=3Dg('gDossier').value;
+	if ( amount_id =3D=3D undefined ) { amount_id=3D0; }
+	  var target=3D"search_op";
+    if ( $(target))
+    {
+	removeDiv(target);
+    }
+    var sx=3D77;
+    var sy=3D99;
+	if ( window.scrollY)
+        {
+            sx=3Dwindow.scrollY+40;
+        }
+        else
+        {
+            sx=3Ddocument.body.scrollTop+40;
+        }
+    var str_style=3D"top:"+sx+";left:"+sy;
+
+    var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load=
ing(),drag:1};
+
+    add_div(div);
+	var target=3D{gDossier:dossier,
+				ctlc:ctl_concern,
+				op:'search_op',
+				ctl:'search_op',
+				ac:'JSSEARCH',
+				amount_id:amount_id,
+				ledger:ledger};
+
+    var qs=3DencodeJSON(target);
+
+    var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+				  {
+				      method:'get',
+				      parameters:qs,
+				      onFailure:null,
+				      onSuccess:fill_box
+				  }
+				);
+}
+/**
+ * search in a popin obj if the object form
+ */
+function search_operation(obj)
+{
+	var dossier=3Dg('gDossier').value;
+	waiting_box();
+	var target=3D"search_op";
+
+    var qs=3Dobj.serialize()+"&op=3Dsearch_op&ctl=3Dsearch_op";
+
+    var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+				  {
+				      method:'get',
+				      parameters:qs,
+				      onFailure:null,
+				      onSuccess:fill_box
+				  }
+				);
+}
+
+function set_reconcile(obj)
+ {
+	 try
+	{
+		var ctlc=3Dobj.elements['ctlc'];
+
+		for (var e=3D0;e<obj.elements.length;e++)
+		{
+
+			var elmt=3Dobj.elements[e];
+			if ( elmt.type =3D=3D "checkbox")
+			{
+				if (elmt.checked=3D=3Dtrue )
+				{
+					var str_name=3Delmt.name;
+					var nValue=3Dstr_name.replace("jr_concerned","");
+					if ( $(ctlc.value).value !=3D '') {	$(ctlc.value).value+=3D',';}
+					$(ctlc.value).value+=3DnValue;
+				}
+			}
+		}
+		removeDiv('search_op');
+	}
+	catch(e)
+	{
+		alert(e.message)
+	}
+ }
\ No newline at end of file

Modified: phpcompta/trunk/html/recherche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/recherche.php	2011-11-04 21:27:21 UTC (rev 4312)
+++ phpcompta/trunk/html/recherche.php	2011-11-04 21:27:50 UTC (rev 4313)
@@ -41,6 +41,7 @@
 $User=3Dnew User($cn);
 $User->Check();
 $act=3D$User->check_dossier($gDossier);
+// AC CODE =3D SEARCH
 if ($act =3D=3D'P')
 {
     redirect("extension.php?".dossier::get(),0);
@@ -54,6 +55,7 @@
 // display a search box
=20
 $ledger=3Dnew Acc_Ledger($cn,0);
+$ledger->type=3D'ALL';
 $search_box=3D$ledger->search_form('ALL',1);
 echo '<div class=3D"content">';
=20

Modified: phpcompta/trunk/html/style-color.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-color.css	2011-11-04 21:27:21 UTC (rev 431=
2)
+++ phpcompta/trunk/html/style-color.css	2011-11-04 21:27:50 UTC (rev 431=
3)
@@ -974,4 +974,35 @@
 {
 		font-size:6px;
 	   border:groove 1px #00ff00;
+}
+div#wait_box
+{
+  background-color:#F1E6E6;
+ font-size:10;
+  font-family:helvetica,arial,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:10;
+ =20
+position:absolute;
+left:30%;
+top:30%;
+
+
+border:1px solid darkblue;=09
+
+}
+#wait_box h2
+{
+color:black;
+text-align:center;
+}
+div#div_jrnsearch_op{=20
+             =20
+              border:1px solid black;
+              display:none;
+              width:50em;
+		      background-color:#EDF3FF;
+		     =20
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-04 21:27:21 UTC (rev 431=
2)
+++ phpcompta/trunk/html/style-light.css	2011-11-04 21:27:50 UTC (rev 431=
3)
@@ -1013,3 +1013,34 @@
 	margin:1px;
 }
=20
+div#wait_box
+{
+  background-color:#F1E6E6;
+ font-size:10;
+  font-family:helvetica,arial,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:10;
+ =20
+position:absolute;
+left:30%;
+top:30%;
+
+
+border:1px solid darkblue;=09
+
+}
+#wait_box h2
+{
+color:black;
+text-align:center;
+}
+div#div_jrnsearch_op{=20
+             =20
+              border:1px solid black;
+              display:none;
+              width:50em;
+		      background-color:#EDF3FF;
+		     =20
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2011-11-04 21:27:21 UTC (rev 4312)
+++ phpcompta/trunk/html/style.css	2011-11-04 21:27:50 UTC (rev 4313)
@@ -1004,4 +1004,35 @@
 		font-size:6px;
 	   border:groove 1px #000000;
 	margin:1px;
+}
+div#wait_box
+{
+  background-color:#F1E6E6;
+ font-size:10;
+  font-family:helvetica,arial,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:10;
+ =20
+position:absolute;
+left:30%;
+top:30%;
+
+
+border:1px solid darkblue;=09
+
+}
+#wait_box h2
+{
+color:black;
+text-align:center;
+}
+div#div_jrnsearch_op{=20
+             =20
+              border:1px solid black;
+              display:none;
+              width:50em;
+		      background-color:#EDF3FF;
+		     =20
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2011-11-04 21:27:21 UTC =
(rev 4312)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-04 21:27:50 UTC =
(rev 4313)
@@ -41,7 +41,7 @@
 require_once('ac_common.php');
 require_once('class_inum.php');
 require_once('class_lettering.php');
-
+require_once 'class_sort_table.php';
 /*!\file
 * \brief Class for jrn,  class acc_ledger for manipulating the ledger
 */
@@ -556,7 +556,178 @@
         $pj_seq=3D$this->get_last_pj()+1;
         return $pj_pref.$pj_seq;
     }
+/*!\brief Show all the operation
+     *\param $sql is the sql stmt, normally created by build_search_sql
+     *\param $offset the offset
+     *\param $p_paid if we want to see info about payment
+    \code
+    // Example
+    // Build the sql
+    list($sql,$where)=3D$Ledger->build_search_sql($_GET);
+    // Count nb of line
+    $max_line=3D$cn->count_sql($sql);
=20
+    $step=3D$_SESSION['g_pagesize'];
+    $page=3D(isset($_GET['offset']))?$_GET['page']:1;
+    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
+    // create the nav. bar
+    $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page);
+    // show a part
+    list($count,$html)=3D $Ledger->list_operation($sql,$offset,0);
+    echo $html;
+    // show nav bar
+    echo $bar;
+
+    \endcode
+     *\see build_search_sql
+     *\see display_search_form
+     *\see search_form
+
+     *\return HTML string
+     */
+    public function list_operation_to_reconcile($sql)
+    {
+        $user=3Dnew User($this->db);
+        $gDossier=3Ddossier::id();
+        $limit=3D" LIMIT 25";
+        // Sort
+        $own=3Dnew Own($this->db);
+
+		// Count
+        $count=3D$this->db->count_sql($sql);
+        // Add the limit
+        $sql.=3D$limit;
+
+        // Execute SQL stmt
+        $Res=3D$this->db->exec_sql($sql);
+
+        //starting from here we can refactor, so that instead of returni=
ng the generated HTML,
+        //this function returns a tree structure.
+
+        $r=3D"";
+
+
+        $Max=3DDatabase::num_row($Res);
+
+        if ($Max=3D=3D0) return array(0,_("Aucun enregistrement trouv=C3=
=A9"));
+
+        $r.=3D'<table class=3D"result">';
+
+
+        $r.=3D"<tr >";
+        $r.=3D"<th>Internal</th>";
+        if ( $this->type=3D=3D'')
+        {
+            $r.=3Dth('Journal');
+        }
+		$r.=3D"<th>Selection</th>";
+        $r.=3D'<th>Date</th>';
+        $r.=3D'<th>Pi=C3=A8ce</td>';
+		$r.=3Dth('tiers');
+        $r.=3D'<th>Description</th>';
+		$r.=3Dth('Notes',' style=3D"width:15%"');
+        $r.=3D'<th>Montant</th>';
+        $r.=3D"<th>"._('Op. Concern=C3=A9e')."</th>";
+        $r.=3D"</tr>";
+        // Total Amount
+        $tot=3D0.0;
+        $gDossier=3Ddossier::id();
+		$str_dossier=3DDossier::id();
+        for ($i=3D0; $i < $Max;$i++)
+        {
+
+
+            $row=3DDatabase::fetch_array($Res,$i);
+
+            if ( $i % 2 =3D=3D 0 ) $tr=3D'<TR class=3D"odd">';
+            else $tr=3D'<TR class=3D"even">';
+            $r.=3D$tr;
+			// Radiobox
+			//
+
+			$r.=3D'<td><INPUT TYPE=3D"CHECKBOX" name=3D"jr_concerned'.$row['jr_id=
'].'" ID=3D"jr_concerned'.$row['jr_id'].'"> </td>';
+            //internal code
+            // button  modify
+            $r.=3D"<TD>";
+            // If url contains
+            //
+
+            $href=3Dbasename($_SERVER['PHP_SELF']);
+
+
+            $r.=3Dsprintf('<A class=3D"detail" style=3D"text-decoration:=
underline" HREF=3D"javascript:modifyOperation(\'%s\',\'%s\')" >%s </A>',
+                        $row['jr_id'], $gDossier, $row['jr_internal']);
+            $r.=3D"</TD>";
+            if ( $this->type=3D=3D'') $r.=3Dtd($row['jrn_def_name']);
+            // date
+            $r.=3D"<TD>";
+            $r.=3D$row['jr_date'];
+            $r.=3D"</TD>";
+
+            // pj
+            $r.=3D"<TD>";
+            $r.=3D$row['jr_pj_number'];
+            $r.=3D"</TD>";
+
+	    // Tiers
+	    $other=3D($row['quick_code']!=3D'')?'['.$row['quick_code'].'] '.$ro=
w['name'].' '.$row['first_name']:'';
+	    $r.=3Dtd($other);
+            // comment
+            $r.=3D"<TD>";
+            $tmp_jr_comment=3Dh($row['jr_comment']);
+            $r.=3D$tmp_jr_comment;
+            $r.=3D"</TD>";
+	    $r.=3Dtd(h($row['n_text']),' style=3D"font-size:6"');
+            // Amount
+            // If the ledger is financial :
+            // the credit must be negative and written in red
+            $positive=3D0;
+
+            // Check ledger type :
+            if (  $row['jrn_def_type'] =3D=3D 'FIN' )
+            {
+                $positive =3D $this->db->get_value("select qf_amount fro=
m quant_fin where jr_id=3D$1",
+                                                 array($row['jr_id']));
+		if ( $this->db->count() !=3D 0)
+		  $positive=3D($positive < 0)?1:0;
+            }
+            $r.=3D"<TD align=3D\"right\">";
+
+            $r.=3D( $positive !=3D 0 )?"<font color=3D\"red\">  - ".nbm(=
$row['jr_montant'])."</font>":nbm($row['jr_montant']);
+            $r.=3D"</TD>";
+
+
+
+            // Rapprochement
+            $rec=3Dnew Acc_Reconciliation($this->db);
+            $rec->set_jr_id($row['jr_id']);
+            $a=3D$rec->get();
+            $r.=3D"<TD>";
+            if ( $a !=3D null )
+            {
+
+                foreach ($a as $key =3D> $element)
+                {
+                    $operation=3Dnew Acc_Operation($this->db);
+                    $operation->jr_id=3D$element;
+                    $l_amount=3D$this->db->get_value("select jr_montant =
from jrn ".
+                                                   " where jr_id=3D$elem=
ent");
+                    $r.=3D "<A class=3D\"detail\" HREF=3D\"javascript:mo=
difyOperation('".$element."',".$gDossier.")\" > ".$operation->get_interna=
l()." [ $l_amount &euro; ]</A>";
+                }//for
+            }// if ( $a !=3D null ) {
+            $r.=3D"</TD>";
+
+            if ( $row['jr_valid'] =3D=3D 'f'  )
+            {
+                $r.=3D"<TD> Op&eacute;ration annul&eacute;e</TD>";
+            }
+            // end row
+            $r.=3D"</tr>";
+
+        }
+		echo '</table>';
+        return array ($count,$r);
+    }
     /*!\brief Show all the operation
      *\param $sql is the sql stmt, normally created by build_search_sql
      *\param $offset the offset
@@ -588,6 +759,7 @@
      */
     public function list_operation($sql,$offset,$p_paid=3D0)
     {
+		$table=3Dnew Sort_Table();
         $user=3Dnew User($this->db);
         $gDossier=3Ddossier::id();
         $amount_paid=3D0.0;
@@ -596,87 +768,24 @@
         $offset=3D($_SESSION['g_pagesize']!=3D-1)?" OFFSET ".Database::e=
scape_string($offset):"";
         $order=3D"  order by jr_date_order asc,jr_internal asc";
         // Sort
-        $url=3DCleanUrl();
+        $url=3D"?".CleanUrl();
         $str_dossier=3Ddossier::get();
-        $image_asc=3D'<IMAGE SRC=3D"image/down.gif" border=3D"0" >';
-        $image_desc=3D'<IMAGE SRC=3D"image/up.gif" border=3D"0">';
-        $image_sel_desc=3D'<IMAGE SRC=3D"image/select1.gif">';
-        $image_sel_asc=3D'<IMAGE SRC=3D"image/select2.gif">';
+		$table->add("Date",$url, 'order by jr_date asc,substring(jr_pj_number,=
\'\\\d+$\')::numeric asc',
+				'order by  jr_date desc,substring(jr_pj_number,\'\\\d+$\')::numeric =
desc', "da", "dd");
+		$table->add('Echeance',$url," order by  jr_ech asc"," order by  jr_ech=
 desc",'ea','ed');
+		$table->add('PJ',$url,' order by  substring(jr_pj_number,\'\\\d+$\')::=
numeric asc ',
+				' order by  substring(jr_pj_number,\'\\\d+$\')::numeric desc ' ,
+				"pja","pjd");
+		$table->add('Montant',$url," order by jr_montant asc"," order by jr_mo=
ntant desc",
+				"ma","md");
+		$table->add("Description",$url,"order by jr_comment asc",
+				"order by jr_comment desc","ca","cd");
=20
-        $sort_date=3D"<th>  <A class=3D\"mtitle\" HREF=3D\"?$url&o=3Dda\=
">$image_asc</A>"._('Date')."<A class=3D\"mtitle\" HREF=3D\"?$url&o=3Ddd\=
">$image_desc</A></th>";
-        $sort_description=3D"<th>  <A class=3D\"mtitle\" HREF=3D\"?$url&=
o=3Dca\">$image_asc</A>"._('Description')."<A class=3D\"mtitle\" HREF=3D\=
"?$url&o=3Dcd\">$image_desc</A></th>";
-        $sort_amount=3D"<th style=3D\"text-align:right\">  <A class=3D\"=
mtitle\" HREF=3D\"?$url&o=3Dma\">$image_asc</A>"._('Montant')." <A class=3D=
\"mtitle\" HREF=3D\"?$url&o=3Dmd\">$image_desc</A></th>";
-        $sort_pj=3D"<th>  <A class=3D\"mtitle\" HREF=3D\"?$url&o=3Dpja\"=
>$image_asc</A>"._('PJ')."<A class=3D\"mtitle\" HREF=3D\"?$url&o=3Dpjd\">=
$image_desc</A></th>";
-        $sort_echeance=3D"<th>  <A class=3D\"mtitle\" HREF=3D\"?$url&o=3D=
ea\">$image_asc</A>"._('Ech')." <A class=3D\"mtitle\" HREF=3D\"?$url&o=3D=
ed\">$image_desc</A> </th>";
-
         $own=3Dnew Own($this->db);
-        // if an order is asked
-        if ( isset ($_GET['o']) )
-        {
-            switch ($_GET['o'])
-            {
-            case 'pja':
-                // pj asc
-                $sort_pj=3D"<th>$image_sel_asc PJ <A class=3D\"mtitle\" =
HREF=3D\"?$url&o=3Dpjd\">$image_desc</A></th>";
-                $order=3D' order by  substring(jr_pj_number,\'\\\d+$\'):=
:numeric asc ';
-                break;
-            case 'pjd':
-                $sort_pj=3D"<th> <A class=3D\"mtitle\" HREF=3D\"?$url&o=3D=
pja\">$image_asc</A> PJ $image_sel_desc</th>";
-                // pj desc
-                $order=3D' order by  substring(jr_pj_number,\'\\\d+$\'):=
:numeric desc ';
-                break;
+		$ord=3D ( ! isset ($_GET['ord']))?'da':$_GET['ord'];
+		$order=3D$table->get_sql_order($ord);
=20
-            case 'da':
-                // date asc
-                $sort_date=3D"<th>$image_sel_asc Date <A class=3D\"mtitl=
e\" HREF=3D\"?$url&o=3Ddd\">$image_desc</A></th>";
-                $order=3D' order by jr_date_order asc,substring(jr_pj_nu=
mber,\'\\\d+$\')::numeric asc  ';
-                break;
-            case 'dd':
-                $sort_date=3D"<th> <A class=3D\"mtitle\" HREF=3D\"?$url&=
o=3Dda\">$image_asc</A> Date $image_sel_desc</th>";
-                // date desc
-                $order=3D' order by jr_date_order desc,substring(jr_pj_n=
umber,\'\\\d+$\')::numeric desc  ';
-                break;
-            case 'ma':
-                // montant asc
-                $sort_amount=3D"<th style=3D\"text-align:right\"> $image=
_sel_asc Montant <A class=3D\"mtitle\" HREF=3D\"?$url&o=3Dmd\">$image_des=
c</A></th>";
-                $order=3D" order by jr_montant asc ";
-                break;
-            case 'md':
-                // montant desc
-                $sort_amount=3D"<th style=3D\"text-align:right\">  <A cl=
ass=3D\"mtitle\"  HREF=3D\"?$url&o=3Dma\">$image_asc</A>Montant $image_se=
l_desc</th>";
-                $order=3D" order by jr_montant desc ";
-                break;
-            case 'ca':
-                // jr_comment asc
-                $sort_description=3D"<th> $image_sel_asc Description <A =
class=3D\"mtitle\" HREF=3D\"?$url&o=3Dcd\">$image_desc</A></th>";
-                $order=3D" order by jr_comment asc ";
-                break;
-            case 'cd':
-                // jr_comment desc
-                $sort_description=3D"<th>  <A class=3D\"mtitle\" HREF=3D=
\"?$url&o=3Dca\">$image_asc</A>Description $image_sel_desc</th>";
-                $order=3D" order by jr_comment desc ";
-                break;
-            case 'ea':
-                // jr_comment asc
-                $sort_echeance=3D"<th> $image_sel_asc Ech. <A class=3D\"=
mtitle\" HREF=3D\"?$url&o=3Ded\">$image_desc</A></th>";
-                $order=3D" order by jr_ech asc ";
-                break;
-            case 'ed':
-                // jr_comment desc
-                $sort_echeance=3D"<th>  <A class=3D\"mtitle\" HREF=3D\"?=
$url&o=3Dea\">$image_asc</A> Ech. $image_sel_desc</th>";
-                $order=3D" order by jr_ech desc ";
-                break;
-
-            }
-        }
-        else
-        {
-            // date asc
-            $sort_date=3D"<th>$image_sel_asc Date <A class=3D\"mtitle\" =
HREF=3D\"?$url&o=3Ddd\">$image_desc</A></th>";
-            $order=3D" order by jr_date_order asc,substring(jr_pj_number=
,'\\d+$')::numeric asc ";
-        }
-
-        // Count
+		// Count
         $count=3D$this->db->count_sql($sql);
         // Add the limit
         $sql.=3D$order.$limit.$offset;
@@ -703,13 +812,13 @@
         {
             $r.=3Dth('Journal');
         }
-        $r.=3D$sort_date;
-        $r.=3D$sort_echeance;
-        $r.=3D$sort_pj;
+        $r.=3D'<th>'.$table->get_header(0).'</th>';
+        $r.=3D'<th>'.$table->get_header(1).'</td>';
+        $r.=3D'<th>'.$table->get_header(2).'</th>';
 	$r.=3Dth('tiers');
-        $r.=3D$sort_description;
+        $r.=3D'<th>'.$table->get_header(4).'</th>';
 	$r.=3Dth('Notes',' style=3D"width:15%"');
-        $r.=3D$sort_amount;
+        $r.=3D'<th>'.$table->get_header(3).'</th>';
         // if $p_paid is not equal to 0 then we have a paid column
         if ( $p_paid !=3D 0 )
         {
@@ -2138,26 +2247,28 @@
         $sql=3D"select nextval('s_jrn_pj".$this->id."')";
         $this->db->exec_sql($sql);
     }
-    /*!\brief return a HTML string with the form for the search
-     *\param $p_type if the type of ledger possible values=3DALL,VEN,ACH=
,ODS,FIN
-     *\param $all_type_ledger
+    /*!@brief return a HTML string with the form for the search
+     *@param $p_type if the type of ledger possible values=3DALL,VEN,ACH=
,ODS,FIN
+     *@param $all_type_ledger
      *       values :
      *         - 1 means all the ledger of this type
      *         - 0 No have the "Tous les journaux" availables
-     *\return a HTML String without the tag FORM or DIV
-     *\see build_search_sql
-     *\see display_search_form
-     *\see list_operation
+	 *@param $div is the div (for reconciliation)
+     *@return a HTML String without the tag FORM or DIV
+	 *
+     *@see build_search_sql
+     *@see display_search_form
+     *@see list_operation
      */
-    function  search_form($p_type,$all_type_ledger=3D1)
+    function  search_form($p_type,$all_type_ledger=3D1,$div=3D"")
     {
         $user=3Dnew User($this->db);
         $r=3D'';
         /* security : filter ledger on user */
         $filter_ledger=3D$user->get_ledger($p_type,3);
=20
-        $selected=3D(isset($_REQUEST['r_jrn']))?$_REQUEST['r_jrn']:null;
-        $f_ledger=3DHtmlInput::select_ledger($filter_ledger,$selected);
+        $selected=3D(isset($_REQUEST['r_jrn'.$div]))?$_REQUEST['r_jrn'.$=
div]:null;
+        $f_ledger=3DHtmlInput::select_ledger($filter_ledger,$selected,$d=
iv);
=20
         /* widget for date_start */
         $f_date_start=3Dnew IDate('date_start');
@@ -2203,7 +2314,7 @@
         $f_amount_max->value=3D(isset($_REQUEST['amount_max']))?$_REQUES=
T['amount_max']:0;
=20
         /* input quick code */
-        $f_qcode=3Dnew ICard('qcode');
+        $f_qcode=3Dnew ICard('qcode'.$div);
=20
         $f_qcode->set_attribute('typecard','all');
 	/*        $f_qcode->set_attribute('p_jrn','0');
@@ -2214,9 +2325,9 @@
 	// Add the callback function to filter the card on the jrn
 	//$f_qcode->set_callback('filter_card');
 	$f_qcode->set_function('fill_data');
-	$f_qcode->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\')=
;" ',
-					$f_qcode->name);
-	$f_qcode->value=3D(isset($_REQUEST['qcode']))?$_REQUEST['qcode']:'';
+	$f_qcode->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(%s);" '=
,
+						$f_qcode->name);
+	$f_qcode->value=3D(isset($_REQUEST['qcode'.$div]))?$_REQUEST['qcode'.$d=
iv]:'';
=20
 	/*        $f_txt_qcode=3Dnew IText('qcode');
         $f_txt_qcode->value=3D(isset($_REQUEST['qcode']))?$_REQUEST['qco=
de']:'';
@@ -2343,6 +2454,7 @@
             }
             $desc=3D'';
             $qcode=3D(isset($qcode))?$qcode:"";
+			if ( isset($qcodesearch_op)) $qcode=3D$qcodesearch_op;
             $accounting=3D(isset($accounting))?$accounting:"";
=20
         }
@@ -2370,6 +2482,7 @@
             if ( $p_action =3D=3D 'client') $p_action=3D'ALL';
             if ( $p_action =3D=3D 'supplier') $p_action=3D'ALL';
             if ( $p_action =3D=3D 'adm') $p_action=3D'ALL';
+            if ( $p_action =3D=3D 'ALL') $p_action=3D'ALL';
=20
             /* from compta.php the p_action is quick_writing instead of =
ODS  */
             if ( $p_action =3D=3D 'quick_writing') $p_action=3D'ODS';
@@ -2459,6 +2572,7 @@
             $and=3D" and ";
         }
         // Quick Code
+		if ( isset ($qcodesearch_op)) $qcode=3D$qcodesearch_op;
         if ( $qcode !=3D null )
         {
             $fil_qcode=3D$and."  jr_grpt_id in ( select j_grpt from

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	2011-11-04 21:27:21 UTC =
(rev 4312)
+++ phpcompta/trunk/include/class_html_input.php	2011-11-04 21:27:50 UTC =
(rev 4313)
@@ -291,7 +291,7 @@
      *@param $selected is an array of checkbox
      *@note the choosen ledger are stored in the array r_jrn (_GET)
      */
-    static function select_ledger($p_array,$p_selected)
+    static function select_ledger($p_array,$p_selected,$div=3D'')
     {
         ob_start();
         $ledger=3Dnew IButton('l');
@@ -300,7 +300,7 @@
         echo $ledger->input();
=20
         /* create a hidden div for the ledger */
-        echo '<div id=3D"div_jrn">';
+        echo '<div id=3D"div_jrn'.$div.'">';
         echo '<h2 class=3D"info">Choix des journaux</h2>';
=20
         echo '<ul>';

Modified: phpcompta/trunk/include/class_iconcerned.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iconcerned.php	2011-11-04 21:27:21 UTC =
(rev 4312)
+++ phpcompta/trunk/include/class_iconcerned.php	2011-11-04 21:27:50 UTC =
(rev 4313)
@@ -29,25 +29,30 @@
 require_once('class_html_input.php');
 class IConcerned extends HtmlInput
 {
+
+	public function __construct($p_name=3D'',$p_value=3D'')
+	{
+		$this->name=3D$p_name;
+		$this->value=3D$p_value;
+		$this->amount_id=3Dnull;
+		$this->ledger=3D'ALL';
+	}
     /*!\brief show the html  input of the widget*/
     public function input($p_name=3Dnull,$p_value=3Dnull)
     {
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
-        $td=3D"";
-        $etd=3D"";
=20
=20
=20
-        $r=3Dsprintf("$td
-                   <INPUT TYPE=3D\"button\" onClick=3DSearchJrn(".dossie=
r::id().",'%s',%s,'%s') value=3D\"?\">
-                   $etd  $td
+        $r=3Dsprintf("
+                   <INPUT TYPE=3D\"button\" onClick=3Dsearch_reconcile("=
.dossier::id().",'%s','%s','%s') value=3D\"?\">
                    <INPUT TYPE=3D\"text\"  style=3D\"color:black;backgro=
und:lightyellow;border:solid 1px grey;\"  NAME=3D\"%s\" ID=3D\"%s\" VALUE=
=3D\"%s\" SIZE=3D\"8\" readonly>
-                   $etd",
+                   ",
                    $this->name,
-                   $this->extra,
-                   $this->extra2,
+                   $this->amount_id,
+                   $this->ledger,
                    $this->name,
                    $this->name,
                    $this->value

Added: phpcompta/trunk/include/search.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/search.inc.php	                        (rev 0=
)
+++ phpcompta/trunk/include/search.inc.php	2011-11-04 21:27:50 UTC (rev 4=
313)
@@ -0,0 +1,141 @@
+<?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: 4215 $ */
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+/*! \file
+ * \brief Search module
+ */
+require_once('class_dossier.php');
+include_once("ac_common.php");
+require_once('class_acc_ledger.php');
+
+
+$gDossier=3Ddossier::id();
+
+require_once('class_database.php');
+/* Admin. Dossier */
+
+$cn=3Dnew Database($gDossier);
+include_once ('class_user.php');
+$User=3Dnew User($cn);
+$User->Check();
+$act=3D$User->check_dossier($gDossier);
+// display a search box
+
+
+/**
+ * @todo si ajax alors pas de form GET mais plutot une fonction
+ * javascript pour chercher
+ */
+$base=3Dbasename($_SERVER['SCRIPT_NAME']);
+$inside=3Dfalse;
+$ledger=3Dnew Acc_Ledger($cn,0);
+$ledger->type=3D'ALL';
+if (isset($_GET['amount_id']))
+{
+	put_global(array(
+				array("key"=3D>'amount_min','value'=3D>$_GET['amount_id']),
+				array("key"=3D>'amount_max','value'=3D>$_GET['amount_id'])
+				));
+}
+
+$search_box=3D$ledger->search_form('ALL',1,'search_op');
+
+if ($base =3D=3D 'recherche.php' || $base =3D=3D 'do.php')
+	{
+	echo '<div class=3D"content" >';
+	echo	 '<form method=3D"GET">';
+	}
+	else
+	{
+		$div=3D'search_op';
+		$action=3D"";
+		$callback=3D"";
+		require 'template/search_top.php';
+		echo '<form onsubmit=3D"search_operation(this);return false">';
+		echo HtmlInput::get_to_hidden(array('ctlc','ledger'));
+		$inside=3Dtrue;
+	}
+
+echo $search_box;
+echo HtmlInput::submit("viewsearch",_("Recherche"));
+echo HtmlInput::button_close('search_op');
+echo '</form>';
+
+if ( isset ($_GET['amount_min'])&& isset($_GET['amount_max'])&& ($_GET['=
amount_max']!=3D0 ||$_GET['amount_min']!=3D0 ))
+{
+	$_GET['viewsearch']=3D1;
+	put_global(
+			array
+				(
+				array('key'=3D>'ledger_type','value'=3D>'ALL'),
+				array('key'=3D>'date_start','value'=3D>'ALL'),
+				array('key'=3D>'date_end','value'=3D>'ALL'),
+				array('key'=3D>'desc','value'=3D>''),
+				array('key'=3D>'qcode','value'=3D>''),
+				array('key'=3D>'accounting','value'=3D>'')
+				)
+
+			);
+
+}
+//-----------------------------------------------------
+// Display search result
+//-----------------------------------------------------
+if ( isset ($_GET['viewsearch']) )
+{
+
+    // Navigation bar
+    $step=3D25;
+    $page=3D(isset($_GET['offset']))?$_GET['page']:1;
+    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
+    if (count ($_GET) =3D=3D 0)
+        $array=3Dnull;
+    else
+        $array=3D$_GET;
+    $array['p_action']=3D'ALL';
+    list($sql,$where)=3D$ledger->build_search_sql($array);
+    // Count nb of line
+    $max_line=3D$cn->count_sql($sql);
+    list($count,$content)=3D$ledger->list_operation_to_reconcile($sql);
+    $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page);
+
+   if (! $inside ) {
+	   echo $bar;
+
+   }   else
+   {
+	    if ($step<$max_line ) echo '<span class=3D"notice">Nombre d\'enregi=
strements trouv=C3=A9s =3D' .$max_line.' limite =3D  '.$step.'</SPAN>';
+   }
+	echo '<form method=3D"get" onsubmit=3D"set_reconcile(this);return false=
">';
+
+    echo $content;
+	echo HtmlInput::submit("upd_rec","Mettre =C3=A0 jour");
+	echo '</form>';
+    if (! $inside )echo $bar;
+
+	echo HtmlInput::get_to_hidden(array('ctlc','amount_id','ledger'));
+	echo HtmlInput::get_to_hidden(array('l','date_start','date_end','desc',=
'amount_min','amount_max','qcodesearch_op','accounting','unpaid','gDossie=
r','ledger_type'));
+    if (isset($_GET['r_jrn'])) {
+      foreach ($_GET['r_jrn'] as $k=3D>$v)
+		echo HtmlInput::hidden('r_jrn['.$k.']',$v);
+    }
+}
+echo '</div>';
+?>

Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_bottom.php	2011-11-04 =
21:27:21 UTC (rev 4312)
+++ phpcompta/trunk/include/template/ledger_detail_bottom.php	2011-11-04 =
21:27:50 UTC (rev 4313)
@@ -25,9 +25,9 @@
 					   $aRap[$e],
 					   $tableid
 					  );
-    if ( $access=3D=3D'W')=20
+    if ( $access=3D=3D'W')
       $remove=3D$rmReconciliation->input();
-    else=20
+    else
       $remove=3D'';
     echo tr (td('<a href=3D"javascript:void(0)" onclick=3D"'.$str.'" >'.=
$internal.'</A>').td($amount).td($array_jr[0]['jr_comment']).td($remove))=
;
   }
@@ -37,7 +37,7 @@
 </legend>
 <?
 if ( $access=3D=3D'W') {
-  $search=3D'<INPUT TYPE=3D"BUTTON" class=3D"button" VALUE=3D"Cherche" O=
nClick=3D"SearchJrn('.$gDossier.",'rapt".$div."','".$obj->det->jr_montant=
."')\">";
+  $search=3D'<INPUT TYPE=3D"BUTTON" class=3D"button" VALUE=3D"Cherche" O=
nClick=3D"search_reconcile('.$gDossier.",'rapt".$div."','".$obj->det->jr_=
montant."')\">";
   $rapt=3Dnew IText('rapt'.$div);
   echo $rapt->input().$search;
 }
@@ -46,10 +46,10 @@
 </fieldset>
 <?
=20
-require_once('template/ledger_detail_file.php');=20
+require_once('template/ledger_detail_file.php');
 ?>
 <hr>
-<?=20
+<?
=20
 if ( $div !=3D 'popup' ) {
   $a=3Dnew IButton('Fermer','Fermer');
@@ -59,8 +59,8 @@
 }
=20
 ?>
-<?if ( $access=3D=3D'W') {=20
-  echo HtmlInput::submit('save',_('Sauver'),'onClick=3D"return verify_ca=
(\'popup\');"');=20
+<?if ( $access=3D=3D'W') {
+  echo HtmlInput::submit('save',_('Sauver'),'onClick=3D"return verify_ca=
(\'popup\');"');
   $owner=3Dnew Own($cn);
   if ($owner->MY_ANALYTIC !=3D 'nu' && $div=3D=3D'popup'){
     echo '<input type=3D"button" class=3D"button" value=3D"'._('verifie =
CA').'" onClick=3D"verify_ca(\'popup\');">';
@@ -78,9 +78,9 @@
   $reverse->label=3D_('Extourner');
   $reverse->javascript=3D"g('ext".$div."').style.display=3D'block'";
   echo $reverse->input();
- =20
+
 echo '</form>';
- =20
+
   echo '<div id=3D"ext'.$div.'" style=3D"display:none">';
   $date=3Dnew IDate('ext_date');
   $r=3D"<form id=3D\"form_".$div."\" onsubmit=3D\"this.divname=3D'$div';=
return reverseOperation(this);\">";

Added: phpcompta/trunk/include/template/search_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/search_top.php	                     =
   (rev 0)
+++ phpcompta/trunk/include/template/search_top.php	2011-11-04 21:27:50 U=
TC (rev 4313)
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/* !\file
+ *
+ *
+ * \brief
+ *
+ */
+?>
+<div style=3D"float:right;height:10px;display:block;margin-top:2px;margi=
n-right:2px">
+<?
+   if ($div =3D=3D "search_op") {
+     $callback=3D$_SERVER['PHP_SELF'];
+     $str=3D"recherche.php?".Dossier::get().'&ac=3DSEARCH';
+     echo '<A style=3D"background-color:blue;color:white;text-decoration=
:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$div.'\');">F=
ermer</A>';
+   }
+?>
+</div>
+<div>
+	<? echo h2info('Recherche')?>
+</div>
\ No newline at end of file



From MAILER-DAEMON Fri Nov 04 17:40:23 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RMRUt-00051U-39
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Nov 2011 17:40:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  4 Nov 2011 22:46:47 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64115.1320442822.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4314 - 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 Nov 2011 21:40:21 -0000

Author: danydb
Date: 2011-11-04 22:46:45 +0100 (Fri, 04 Nov 2011)
New Revision: 4314

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

381: R?\195?\169?\195?\169criture des tri pour toutes les tables

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	2011-11-04 21:27:50 UTC (=
rev 4313)
+++ phpcompta/trunk/include/class_follow_up.php	2011-11-04 21:46:45 UTC (=
rev 4314)
@@ -34,6 +34,7 @@
 require_once("user_common.php");
 require_once('class_follow_up_detail.php');
 require_once('class_inum.php');
+require_once 'class_sort_table.php';
=20
 /*!\file
  * \brief class_action for manipulating actions
@@ -652,123 +653,19 @@
     {
         $str_dossier=3Ddossier::get();
         // for the sort
-        $sort=3D"";
-        $image_asc=3D'<IMAGE SRC=3D"image/down.gif" border=3D"0" >';
-        $image_desc=3D'<IMAGE SRC=3D"image/up.gif" border=3D"0" >';
-        $image_sel_desc=3D'<IMAGE SRC=3D"image/select1.gif" border=3D"0"=
 >';
-        $image_sel_asc=3D'<IMAGE SRC=3D"image/select2.gif" border=3D"0" =
>';
-        $url=3DCleanUrl();
-        $url=3D$str_dossier.'&'.$p_base;
+        $url=3D"?".$str_dossier.'&'.$p_base;
=20
-        $sort_date=3D'<th><A class=3D"mtitle" href=3D"?'.$url.'&s=3Ddate=
_a">'.$image_asc.'</A>'.
-                   'Date'.
-                   '<A class=3D"mtitle"  href=3D"?'.$url.'&s=3Ddate_d&'.=
$str_dossier.'">'.$image_desc.'</A></th>';
-        $sort_exp=3D'<th><A  class=3D"mtitle"  href=3D"?'.$url.'&s=3Dexp=
&'.$str_dossier.'">'.$image_asc.'</A>'.
-                  'Exp=C3=A9diteur'.
-                  '<A  class=3D"mtitle"  href=3D"?'.$url.'&s=3Dexp_d&'.$=
str_dossier.'">'.$image_desc.'</A></th>';
-        $sort_titre=3D'<th><A  class=3D"mtitle"  href=3D"?'.$url.'&s=3Dt=
i&'.$str_dossier.'">'.$image_asc.'</A>'.
-                    'Titre'.
-                    '<A  class=3D"mtitle"  href=3D"?'.$url.'&s=3Dti_d&'.=
$str_dossier.'">'.$image_desc.'</A></th>';
-        $sort_concerne=3D'<th><A  class=3D"mtitle"  href=3D"?'.$url.'&s=3D=
conc&'.$str_dossier.'">'.$image_asc.'</A>'.
-                       'Concerne'.
-                       '<A class=3D"mtitle"  href=3D"?'.$url.'&s=3Dconc_=
d&'.$str_dossier.'">'.$image_desc.'</A></th>';
-        $sort_reference=3D'<th><A class=3D"mtitle"  href=3D"?'.$url.'&s=3D=
ref&'.$str_dossier.'">'.$image_asc.'</A>'.
-                        'R=C3=A9f=C3=A9rence'.
-                        '<A  class=3D"mtitle"  href=3D"?'.$url.'&s=3Dref=
_d&'.$str_dossier.'">'.$image_desc.'</A></th>';
=20
-        if ( isset($_GET['s']))
-        {
-            switch ($_GET['s'])
-            {
-            case "date_a":
-                $sort=3D" ag_timestamp asc";
-                $sort_date=3D'<th>'.$image_sel_asc.'</A>'.
-                           'Date'.
-                           '<A  class=3D"mtitle"  href=3D"?'.$url.'&s=3D=
date_d">'.$image_desc.'</A></th>';
-                break;
+		$table=3Dnew Sort_Table();
+		$table->add('Date',$url,'order by ag_timestamp asc','order by ag_times=
tamp desc','da','dd');
+		$table->add('Exp=C3=A9diteur',$url,'order by name asc','order by name =
desc','ea','ed');
+		$table->add('Titre',$url,'order by ag_title asc','order by ag_title de=
sc','ta','td');
+		$table->add('Concerne',$url,'order by ag_ref_ag_id asc','order by ag_r=
ef_ag_id desc','ca','cd');
+		$table->add('R=C3=A9f.',$url,'order by ag_ref asc','order by ag_ref de=
sc','ra','rd');
=20
-            case "date_d":
-                $sort=3D" ag_timestamp desc";
-                $sort_date=3D'<th><A class=3D"mtitle"  href=3D"?'.$url.'=
&s=3Ddate_a">'.$image_asc.'</A>'.
-                           'Date'.
-                           $image_sel_desc.'</th>';
-                break;
+		$ord=3D(! isset($_GET['ord']))?"dd":$_GET['ord'];
+		$sort=3D$table->get_sql_order($ord);
=20
-            case "exp":
-                $sort_exp=3D'<th>'.$image_sel_asc.'</A>'.
-                          'Exp=C3=A9diteur'.
-                          '<A  class=3D"mtitle"  href=3D"?'.$url.'&s=3De=
xp_d">'.$image_asc.'</A></th>';
-                $sort=3D" f_id_dest asc";
-                break;
-
-            case "exp_d":
-                $sort_exp=3D'<th><A  class=3D"mtitle"  href=3D"?'.$url.'=
&s=3Dexp">'.$image_asc.'</A>'.
-                          'Exp=C3=A9diteur'.
-                          $image_sel_desc.'</th>';
-
-                $sort=3D" f_id_dest desc";
-                break;
-
-            case "ti":
-                $sort_titre=3D'<th>'.$image_sel_asc.
-                            'Titre'.
-                            '<A class=3D"mtitle"  href=3D"?'.$url.'&s=3D=
ti_d">'.$image_desc.'</A></th>';
-
-                $sort=3D" ag_title  asc";
-                break;
-            case "ti_d":
-                $sort_titre=3D'<th><A  class=3D"mtitle" href=3D"?'.$url.=
'&s=3Dti">'.$image_asc.'</A>'.
-                            'Titre'.
-                            $image_sel_desc.'</th>';
-
-                $sort=3D" ag_title desc";
-                break;
-
-            case "conc":
-                $sort_concerne=3D'<th>'.$image_sel_asc.
-                               'Concerne'.
-                               '<A  class=3D"mtitle" href=3D"?'.$url.'&s=
=3Dconc_d">'.$image_desc.'</A></th>';
-
-                $sort=3D" ag_ref_ag_id asc";
-                break;
-            case "conc_d":
-                $sort_concerne=3D'<th><A  class=3D"mtitle"  href=3D"?'.$=
url.'&s=3Dconc">'.$image_asc.'</A>'.
-                               'Concerne'.
-                               $image_sel_desc.'</th>';
-
-                $sort=3D" ag_ref_ag_id desc";
-                break;
-
-            case "ref":
-                $sort_reference=3D'<th>'.$image_sel_asc.
-                                'R=C3=A9f=C3=A9rence'.
-                                '<A  class=3D"mtitle"  href=3D"?'.$url.'=
&s=3Dref_d">'.$image_desc.'</A></th>';
-
-                $sort=3D" ag_ref ";
-                break;
-
-            case "ref_d":
-                $sort_reference=3D'<th><A class=3D"mtitle"  href=3D"?'.$=
url.'&s=3Dref">'.$image_asc.'</A>'.
-                                'R=C3=A9f=C3=A9rence'.
-                                $image_sel_desc.'</th>';
-
-                $sort=3D" ag_ref desc";
-                break;
-
-
-            }
-
-        }
-        else
-        {
-            $sort=3D" ag_timestamp desc";
-            $sort_date=3D'<th><A class=3D"mtitle"  href=3D"?'.$url.'&s=3D=
date_a">'.$image_asc.'</A>'.
-                       'Date'.
-                       $image_sel_desc.'</th>';
-        }
-
-        $sort=3D" order by ".$sort;
-
         if ( strlen(trim($p_filter)) !=3D 0 )
             $p_filter_doc=3D" dt_id in ( $p_filter )";
         else
@@ -776,7 +673,8 @@
=20
         $sql=3D"
              select ag_id,to_char(ag_timestamp,'DD.MM.YYYY') as my_date,=
ag_ref_ag_id,f_id_dest".
-             ",ag_title,md_type,dt_value,ag_ref, ag_priority,ag_state
+             ",ag_title,md_type,dt_value,ag_ref, ag_priority,ag_state,
+				(select ad_value from fiche_Detail where f_id=3Daction_gestion.f_id_=
dest and ad_id=3D1) as name
              from action_gestion
              left outer join document_modele on (ag_type=3Dmd_type)
              join document_type on (ag_type=3Ddt_id)
@@ -796,14 +694,14 @@
         $r.=3D$bar;
         $r.=3D'<table class=3D"document">';
         $r.=3D"<tr>";
-        $r.=3D$sort_date;
-        $r.=3D$sort_exp;
-        $r.=3D$sort_titre;
+        $r.=3D'<th>'.$table->get_header(0).'</th>';
+        $r.=3D'<th>'.$table->get_header(1).'</th>';
+        $r.=3D'<th>'.$table->get_header(2).'</th>';
         $r.=3D'<th>type</th>';
-	$r.=3Dth('Etat');
-	$r.=3Dth('Priorit=C3=A9');
-        $r.=3D$sort_reference;
-        $r.=3D$sort_concerne;
+		$r.=3Dth('Etat');
+		$r.=3Dth('Priorit=C3=A9');
+        $r.=3D'<th>'.$table->get_header(4).'</th>';
+        $r.=3D'<th>'.$table->get_header(3).'</th>';
         $r.=3D"</tr>";
=20
=20



From MAILER-DAEMON Fri Nov 04 19:36:10 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RMTIw-00087M-Qm
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Nov 2011 19:36:10 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  5 Nov 2011 00:42:32 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64277.1320449769.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4315 - in phpcompta/trunk: html html/js include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Nov 2011 23:36:09 -0000

Author: danydb
Date: 2011-11-05 00:42:31 +0100 (Sat, 05 Nov 2011)
New Revision: 4315

Modified:
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/html/js/card.js
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/adm.inc.php
   phpcompta/trunk/include/client.inc.php
   phpcompta/trunk/include/template/category_of_card.php
Log:

Improve Cat. of customer, adm...

Modified: phpcompta/trunk/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_card.php	2011-11-04 21:46:45 UTC (rev 4314)
+++ phpcompta/trunk/html/ajax_card.php	2011-11-04 23:42:31 UTC (rev 4315)
@@ -398,13 +398,8 @@
         }
=20
         $html=3D'';
-        $html.=3D"<h2>"._("Ajout d'une cat=C3=A9gorie")."  ".$msg."</h2>=
";
         /*  show the form */
-        $html.=3D '<div class=3D"u_content">';
-        $html.=3D$ctl;
-        $html.=3D '<form id=3D"newcat" name=3D"newcat" method=3D"post" o=
nsubmit=3D"this.ipopup=3D\''.$ipopup.'\';save_card_category(this);return =
false;">';
-        $html.=3D dossier::hidden();
-        $html.=3DHtmlInput::hidden('cat',$cat);
+
         $search=3Dnew IPoste("class_base");
         $search->size=3D40;
         $search->value=3D$base;
@@ -413,17 +408,14 @@
         $search->set_attribute('account',$search->name);
         $search->set_attribute('ipopup','ipop_account');
=20
+		$nom_mod=3Dnew IText("nom_mod");
         $str_poste=3D$search->input();
+        $submit=3DHtmlInput::submit('save',_('Sauve'));
         ob_start();
         require('template/category_of_card.php');
         $html.=3Dob_get_contents();
         ob_clean();
-        $submit=3DHtmlInput::submit('save',_('Sauve'));
-        $html.=3D '<p>';
-        $html.=3D $submit;
-        $html.=3D '</p>';
-        $html.=3D '</form>';
-        $html.=3D '</div>';
+
     }
     else
     {
@@ -438,29 +430,29 @@
     $html=3D'';
     if ( $user->check_action(FICCAT) =3D=3D 1 )
     {
-        if ( strlen(trim($_POST['nom_mod'])) !=3D 0 &&
-                strlen(trim($_POST['class_base'])) !=3D 0 )
+		$script=3Dcreate_script("removeDiv('$ctl')");
+		$html.=3D$script;
+        if ( strlen(trim($_GET['nom_mod'])) !=3D 0 &&
+                strlen(trim($_GET['class_base'])) !=3D 0 )
         {
             $array=3Darray("FICHE_REF"=3D>$cat,
-                         "nom_mod"=3D>$_POST['nom_mod'],
-                         "class_base"=3D>$_POST['class_base']);
+                         "nom_mod"=3D>$_GET['nom_mod'],
+                         "class_base"=3D>$_GET['class_base']);
             if ( isset ($_POST['create'])) $array['create']=3D1;
             $catcard=3Dnew Fiche_Def($cn);
             if ( $catcard->Add($array) =3D=3D -1)
-                $html.=3D"alert('"._('Cat=C3=A9gorie existe d=C3=A9j=C3=A0=
')."')";
+                $script=3D"alert('"._('Cat=C3=A9gorie existe d=C3=A9j=C3=
=A0')."')";
             else
-                $html.=3D"alert('"._('Cat=C3=A9gorie sauv=C3=A9e')."')";
-            $html.=3Dcreate_script($html);
+                $script=3D"alert('"._('Cat=C3=A9gorie sauv=C3=A9e')."')"=
;
+            $html.=3Dcreate_script($script);
         }
         else
         {
-            $html.=3D"alert('"._("Le nom et la classe base ne peuvent =C3=
=AAtre vide")."')";
-            $html.=3Dcreate_script($html);
+            $script=3D"alert('"._("Le nom et la classe base ne peuvent =C3=
=AAtre vide")."')";
+            $html.=3Dcreate_script($script);
=20
             $invalid=3D1;
         }
-        $ipop=3Dstr_replace('_content','',$ctl);
-        $html.=3Dcreate_script('hideIPopup(\''.$ipop.'\');');
     }
     else
     {

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2011-11-04 21:46:45 UTC (rev 4314)
+++ phpcompta/trunk/html/js/card.js	2011-11-04 23:42:31 UTC (rev 4315)
@@ -397,7 +397,7 @@
         filter=3D-1;
     }
     var content=3D"select_card_div";
-    if ( $(content)){ removeDiv(content);}
+    if ( $(content)){removeDiv(content);}
     var sx=3D0;
     if ( window.scrollY)
     {
@@ -529,12 +529,29 @@
  */
 function add_category(obj)
 {
+    var sx=3D0;
+	if ( window.scrollY)
+	{
+            sx=3Dwindow.scrollY+120;
+	}
+	else
+	{
+            sx=3Ddocument.body.scrollTop+120;
+	}
+
+	var div_style=3D"top:"+sx+";width:60%;heigth:80%";
     // show ipopup
-    showIPopup(obj.ipopup);
+	var div=3D{id:obj.ipopup,
+			cssclass:"op_detail",drag:1,style:div_style};
+	if ( $(div) ) {
+		removeDiv(div);
+	}
+	add_div(div);
+	waiting_box();
     var dossier=3D$('gDossier').value;
     var queryString=3D'gDossier=3D'+dossier;
     queryString+=3D'&op=3Dac';
-    queryString+=3D'&ctl=3D'+obj.ipopup+'_content';
+    queryString+=3D'&ctl=3D'+obj.ipopup;
     if ( obj.type_cat)
     {
         queryString+=3D'&cat=3D'+obj.type_cat;
@@ -544,7 +561,7 @@
                                   method:'get',
                                   parameters:queryString,
                                   onFailure:errorFid,
-                                  onSuccess:successFill_ipopcard
+                                  onSuccess:fill_box
                                   }
                                 );
=20
@@ -560,25 +577,29 @@
         alert('Erreur pas d\' attribut ipopup '+obj.id);
         return;
     };
-    var content=3D$(obj).ipopup+'_content';
-    // Data must be taken here
+	try {
+		// Data must be taken here
+
     data=3D$('newcat').serialize(false);
-    $(content).innerHTML=3Dloading();
-    showIPopup($(obj).ipopup);
     var dossier=3D$('gDossier').value;
-    var queryString=3D'?';
-    queryString+=3D'&ctl=3D'+content+'&';
+    queryString=3D'ctl=3D'+obj.ipopup+'&';
     queryString+=3Ddata;
     queryString+=3D'&op=3Dscc'; 	// sc for save card
=20
     var action=3Dnew Ajax.Request ( 'ajax_card.php',
                                   {
-                                  method:'post',
+                                  method:'get',
                                   parameters:queryString,
                                   onFailure:errorFid,
-                                  onSuccess:successFill_ipopcard
+                                  onSuccess:fill_box
                                   }
                                 );
+	} catch(e)
+	{
+		alert(e.message);
+		return false;
+	}
+	return false;
 }
 /**
  *@brief Remove a definition of an  attribut

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	2011-11-04 21:46:45 UTC (rev 4314)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-04 23:42:31 UTC (rev 4315)
@@ -293,47 +293,6 @@
     w.focus();
 }
 /**
- *@brief show the popup. The top property is adapted if you've scrolled =
the window
- *@param name of the object PHP IPopup
- */
-function showIPopup(p_name)
-{
-    var sx=3D0;
-    if ( window.scrollY)
-    {
-        sx=3Dwindow.scrollY+40;
-    }
-    else
-    {
-        sx=3Ddocument.body.scrollTop+40;
-    }
-    $(p_name+'_border').style.top=3Dsx;
-    if ( g(p_name+'_fond') )
-    {
-        show(p_name+'_fond');
-    }
-    show(p_name+'_border');
-    show(p_name+'_content');
-}
-/**
- *@brief hide the popup
- *@param name of the object PHP IPopup
- */
-function hideIPopup(p_name)
-{
-    g(p_name+'_content').innerHTML=3Dloading();
-    if (g(p_name+'_fond'))
-    {
-        hide(p_name+'_fond');
-    }
-    if (g(p_name+'_border'))
-    {
-        hide(p_name+'_border');
-    }
-    hide(p_name+'_content');
-
-}
-/**
  *@brief replace the special characters (><'") by their HTML representat=
ion
  *@return a string without the offending char.
  */

Modified: phpcompta/trunk/include/adm.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/adm.inc.php	2011-11-04 21:46:45 UTC (rev 4314=
)
+++ phpcompta/trunk/include/adm.inc.php	2011-11-04 23:42:31 UTC (rev 4315=
)
@@ -80,9 +80,10 @@
     $a=3D(isset($_GET['query']))?$_GET['query']:"";
     printf (_('Recherche').' <input class=3D"input_text" type=3D"text" n=
ame=3D"query" value=3D"%s">',
             $a);
+	echo HtmlInput::request_to_hidden(array('ac'));
     $sel_card=3Dnew ISelect('cat');
     $sel_card->value=3D$cn->make_array('select fd_id, fd_label from fich=
e_def '.
-                                     ' where  frd_id=3D'.FICHE_TYPE_ADM_=
TAX.
+                                     ' where  frd_id=3D'.FICHE_TYPE_ADM_=
TAX.' or frd_id =3D'.FICHE_TYPE_FIN.
                                      ' order by fd_label ',1);
     $sel_card->selected=3D(isset($_GET['cat']))?$_GET['cat']:-1;
     $sel_card->javascript=3D' onchange=3D"submit(this);"';
@@ -90,7 +91,7 @@
=20
     ?>
     <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D_('recherche')?>">
-                                           <input type=3D"hidden" name=3D=
"p_action" value=3D"adm">
+	 <input type=3D"hidden" name=3D"p_action" value=3D"adm">
                                                                      </f=
orm>
                                                                      </s=
pan>
                                                                      <?p=
hp
@@ -98,7 +99,7 @@
     $search=3D(isset($_GET['query']))?$_GET['query']:"";
     $sql=3D"";
     if ( isset($_GET['cat']))
-{
+	{
         if ( $_GET['cat'] !=3D -1) $sql=3Dsprintf(" and fd_id =3D %d",$_=
GET['cat']);
     }
=20

Modified: phpcompta/trunk/include/client.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/client.inc.php	2011-11-04 21:46:45 UTC (rev 4=
314)
+++ phpcompta/trunk/include/client.inc.php	2011-11-04 23:42:31 UTC (rev 4=
315)
@@ -31,18 +31,8 @@
 require_once('class_fiche_def.php');
 require_once('class_ipopup.php');
=20
-echo ICard::ipopup('ipop_newcard');
-$ip_cat =3D new IPopup('ipop_cat');
-$ip_cat->title =3D _('Ajout d\'une cat=C3=A9gorie');
-$ip_cat->value =3D '';
-echo $ip_cat->input();
-echo IPoste::ipopup('ipop_account');
-$search_card =3D new IPopup('ipop_card');
-$search_card->title =3D _('Recherche de fiche');
-$search_card->value =3D '';
-echo $search_card->input();
-echo ICard::ipopup('ipopcard');
=20
+
 $low_action =3D (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list";
 /* ! \file
  * \brief Called from the module "Gestion" to manage the customer
@@ -134,14 +124,15 @@
     $f_cat_button->label=3D_('Ajout d\'une cat=C3=A9gorie');
     $f_cat_button->javascript=3D'add_category(this)';
     echo $f_cat_button->input();
+
+	echo '</div>';
     echo '</div>';
-    echo '</div>';
=20
=20
 }
 /*----------------------------------------------------------------------
  * Detail for a card, Suivi, Contact, Operation,... *
- * cc stands for customer card=20
+ * cc stands for customer card
  *----------------------------------------------------------------------=
*/
 if ( $low_action =3D=3D 'detail')
 {

Modified: phpcompta/trunk/include/template/category_of_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/category_of_card.php	2011-11-04 21:4=
6:45 UTC (rev 4314)
+++ phpcompta/trunk/include/template/category_of_card.php	2011-11-04 23:4=
2:31 UTC (rev 4315)
@@ -1,7 +1,20 @@
-<TABLE BORDER=3D"0" CELLSPACING=3D"0">
+<div style=3D"float:right;height:10px;display:block;margin-top:2px;margi=
n-right:2px">
+<?
+     echo '<A style=3D"background-color:blue;color:white;text-decoration=
:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$ctl.'\');">F=
ermer</A>';
+?>
+</div>
+   <? echo h2info(_("Ajout d'une cat=C3=A9gorie").$msg); ?>
+
+<div class=3D"content">
+<form id=3D"newcat" name=3D"newcat" method=3D"get" onsubmit=3D"this.ipop=
up=3D'<?=3D$ipopup?>';save_card_category(this);return false;">
+<?
+ echo HtmlInput::get_to_hidden(array('gDossier','cat'));
+ ?>
+
+	<TABLE BORDER=3D"0" CELLSPACING=3D"0">
 <TR>
    <TD><?=3D_('Nom de la cat=C3=A9gorie de fiche')?> </TD>
-<TD><INPUT TYPE=3D"INPUT" NAME=3D"nom_mod"></TD>
+<TD><?=3D$nom_mod->input()?></TD>
 </TR>
 <TR>
    <TD> <?=3D_('Classe de base')?> </TD>
@@ -23,3 +36,9 @@
 <p class=3D"info">
 <?=3D_(' A moins qu\'en cr=C3=A9ant la fiche, vous forcez un autre poste=
 comptable')?>
 </p>
+
+<p>
+<?=3D$submit?> <?=3DHtmlInput::button_close($ipopup)?>
+</p>
+</form>
+</div>
\ No newline at end of file



From MAILER-DAEMON Fri Nov 04 19:39:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RMTMB-0008Eo-BA
	for mharc-phpcompta-dev@gnu.org; Fri, 04 Nov 2011 19:39:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  5 Nov 2011 00:45:52 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64282.1320449969.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4316 - in phpcompta/trunk: html 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 Nov 2011 23:39:28 -0000

Author: danydb
Date: 2011-11-05 00:45:50 +0100 (Sat, 05 Nov 2011)
New Revision: 4316

Modified:
   phpcompta/trunk/html/
   phpcompta/trunk/sql/object-6.0.sql
Log:
ajout impression dans menu_ref et profile_menu


Property changes on: phpcompta/trunk/html
___________________________________________________________________
Name: svn:ignore
   - *.log
ajax
.user_login.php.swp

   + *.log
ajax
.user_login.php.swp
.~lock.a.csv#
.~lock.a.ods#
.a.csv.swp


Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-04 23:42:31 UTC (rev 4315)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-04 23:45:50 UTC (rev 4316)
@@ -25,7 +25,8 @@
     me_file text,
     me_url text,
     me_description text,
-    me_parameter text
+    me_parameter text,
+    me_javascript text
 );
=20
=20
@@ -171,7 +172,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 95, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 153, true);
=20
=20
 --
@@ -269,7 +270,7 @@
 --
=20
 CREATE VIEW v_all_menu AS
-    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter FROM (((profile_menu pm JOIN profile_user p=
u ON ((pu.p_id =3D pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) J=
OIN menu_ref mr USING (me_code)) ORDER BY pm.p_order;
+    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript FROM (((profile_menu pm J=
OIN profile_user pu ON ((pu.p_id =3D pm.p_id))) JOIN profile p ON ((p.p_i=
d =3D pm.p_id))) JOIN menu_ref mr USING (me_code)) ORDER BY pm.p_order;
=20
=20
 ALTER TABLE public.v_all_menu OWNER TO dany;
@@ -299,81 +300,110 @@
 -- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan=
y
 --
=20
-INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL);
-INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL);
-INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, NULL, NULL=
);
-INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment=
_middle.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, NULL,=
 NULL);
-INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL=
L, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL=
L, NULL);
-INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU=
LL, NULL);
-INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, NULL, 'ledger_type=3DODS');
-INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 NULL, NULL);
-INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL);
-INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, =
NULL, NULL);
-INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi=
nies', 'preod.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DACH');
-INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph=
p', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc=
.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php=
', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in=
c.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php=
', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes=
.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', NUL=
L, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp=
ress_fiche.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'=
, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph=
p', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie=
nt.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N=
ULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DVEN');
-INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card=
_attr.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL=
, NULL);
-INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL, NUL=
L);
-INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU=
LL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc=
.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
NULL, NULL);
-INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL=
L, NULL);
-INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, NULL, NULL, NULL=
);
-INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL, NUL=
L);
-INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param=
_sec.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card=
.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou=
nt.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, NULL, NUL=
L);
-INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NUL=
L, NULL);
-INSERT INTO menu_ref VALUES ('CFGDOCUMENT', 'Document', 'document_modele=
.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'=
, NULL, NULL);
-INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in=
c.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', NULL, NULL, NULL, =
NULL);
-INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', =
NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, N=
ULL, NULL);
-INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, NULL, 'ledger_type=3DALL');
-INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, NULL, N=
ULL);
-INSERT INTO menu_ref VALUES ('TVA', 'Tva', 'extension_get.inc.php', NULL=
, NULL, 'plugin_code=3DAMORTIS');
-INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'extension_choice=
.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, NULL, NULL)=
;
-INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FINIMP', 'Historique financier', 'history_=
operation.inc.php', NULL, NULL, 'ledger_type=3DFIN');
-INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FINSALDO', 'Soldes', 'compta_fin_saldo.inc=
.php', NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FINREC', 'Rapprochement', 'compta_fin_rec.=
inc.php', NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, NULL, NU=
LL, 'popup_recherche()');
+INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL);
+INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL);
+INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, NULL, NULL=
, NULL);
+INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment=
_middle.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, NULL,=
 NULL, NULL);
+INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL=
L, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL=
L, NULL, NULL);
+INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU=
LL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, NULL, 'ledger_type=3DODS', NULL)=
;
+INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, =
NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi=
nies', 'preod.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DACH', NULL);
+INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph=
p', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, NULL, =
NULL, 'search_reconcile()');
+INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc=
.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php=
', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in=
c.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php=
', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes=
.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', NUL=
L, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp=
ress_fiche.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'=
, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph=
p', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie=
nt.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N=
ULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DVEN', NULL);
+INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card=
_attr.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL=
, NULL, NULL);
+INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL, NUL=
L, NULL);
+INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU=
LL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc=
.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL=
L, NULL, NULL);
+INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, NULL, NULL, NULL=
, NULL);
+INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL, NUL=
L, NULL);
+INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param=
_sec.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card=
.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou=
nt.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, NULL, NUL=
L, NULL);
+INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NUL=
L, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CFGDOCUMENT', 'Document', 'document_modele=
.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'=
, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in=
c.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', NULL, NULL, NULL, =
NULL, NULL);
+INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', =
NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, N=
ULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, NULL, 'ledger_type=3DALL', NULL);
+INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, NULL, N=
ULL, NULL);
+INSERT INTO menu_ref VALUES ('TVA', 'Tva', 'extension_get.inc.php', NULL=
, NULL, 'plugin_code=3DAMORTIS', NULL);
+INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'extension_choice=
.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, NULL, NULL,=
 NULL);
+INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FINIMP', 'Historique financier', 'history_=
operation.inc.php', NULL, NULL, 'ledger_type=3DFIN', NULL);
+INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FINSALDO', 'Soldes', 'compta_fin_saldo.inc=
.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('FINREC', 'Rapprochement', 'compta_fin_rec.=
inc.php', NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/histo', 'Export Historique', NULL, NUL=
L, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/report', 'Export report', NULL, NULL, =
NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/report', 'Export report', NULL, NULL, =
NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/sec', 'Export S=C3=A9curit=C3=A9', NUL=
L, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/AncList', 'Export Comptabilit=C3=A9 an=
alytique', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique balance simple', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('PDF/balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('CSV/AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('OTH/Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL);
=20
=20
 --
@@ -465,6 +495,35 @@
 INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (93, 'FINIMP', 'MENUFIN', 1, 2, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (123, 'CSV/histo', NULL, 1, NULL, 'P', N=
ULL);
+INSERT INTO profile_menu VALUES (124, 'CSV/ledger', NULL, 1, NULL, 'P', =
NULL);
+INSERT INTO profile_menu VALUES (125, 'PDF/ledger', NULL, 1, NULL, 'P', =
NULL);
+INSERT INTO profile_menu VALUES (126, 'CSV/postedetail', NULL, 1, NULL, =
'P', NULL);
+INSERT INTO profile_menu VALUES (127, 'PDF/postedetail', NULL, 1, NULL, =
'P', NULL);
+INSERT INTO profile_menu VALUES (128, 'CSV/fichedetail', NULL, 1, NULL, =
'P', NULL);
+INSERT INTO profile_menu VALUES (129, 'PDF/fichedetail', NULL, 1, NULL, =
'P', NULL);
+INSERT INTO profile_menu VALUES (130, 'CSV/fiche_balance', NULL, 1, NULL=
, 'P', NULL);
+INSERT INTO profile_menu VALUES (131, 'PDF/fiche_balance', NULL, 1, NULL=
, 'P', NULL);
+INSERT INTO profile_menu VALUES (132, 'CSV/report', NULL, 1, NULL, 'P', =
NULL);
+INSERT INTO profile_menu VALUES (133, 'PDF/report', NULL, 1, NULL, 'P', =
NULL);
+INSERT INTO profile_menu VALUES (134, 'CSV/fiche', NULL, 1, NULL, 'P', N=
ULL);
+INSERT INTO profile_menu VALUES (135, 'PDF/fiche', NULL, 1, NULL, 'P', N=
ULL);
+INSERT INTO profile_menu VALUES (136, 'CSV/glcompte', NULL, 1, NULL, 'P'=
, NULL);
+INSERT INTO profile_menu VALUES (137, 'PDF/glcompte', NULL, 1, NULL, 'P'=
, NULL);
+INSERT INTO profile_menu VALUES (138, 'PDF/sec', NULL, 1, NULL, 'P', NUL=
L);
+INSERT INTO profile_menu VALUES (139, 'CSV/AncList', NULL, 1, NULL, 'P',=
 NULL);
+INSERT INTO profile_menu VALUES (140, 'CSV/AncBalSimple', NULL, 1, NULL,=
 'P', NULL);
+INSERT INTO profile_menu VALUES (141, 'PDF/AncBalSimple', NULL, 1, NULL,=
 'P', NULL);
+INSERT INTO profile_menu VALUES (142, 'CSV/AncBalDouble', NULL, 1, NULL,=
 'P', NULL);
+INSERT INTO profile_menu VALUES (143, 'PDF/AncBalDouble', NULL, 1, NULL,=
 'P', NULL);
+INSERT INTO profile_menu VALUES (144, 'CSV/balance', NULL, 1, NULL, 'P',=
 NULL);
+INSERT INTO profile_menu VALUES (145, 'PDF/balance', NULL, 1, NULL, 'P',=
 NULL);
+INSERT INTO profile_menu VALUES (146, 'CSV/AncTable', NULL, 1, NULL, 'P'=
, NULL);
+INSERT INTO profile_menu VALUES (147, 'CSV/AncAccList', NULL, 1, NULL, '=
P', NULL);
+INSERT INTO profile_menu VALUES (148, 'CSV/AncBalGroup', NULL, 1, NULL, =
'P', NULL);
+INSERT INTO profile_menu VALUES (149, 'OTH/Bilan', NULL, 1, NULL, 'P', N=
ULL);
+INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, NULL, 'M', NULL=
);
+INSERT INTO profile_menu VALUES (153, 'JSSEARCH', NULL, 1, NULL, 'M', NU=
LL);
=20
=20
 --



From MAILER-DAEMON Sat Nov 05 19:33:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RMpk7-0003ui-Nj
	for mharc-phpcompta-dev@gnu.org; Sat, 05 Nov 2011 19:33:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun,  6 Nov 2011 00:39:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.66473.1320536022.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4317 - 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, 05 Nov 2011 23:33:41 -0000

Author: danydb
Date: 2011-11-06 00:39:54 +0100 (Sun, 06 Nov 2011)
New Revision: 4317

Added:
   phpcompta/trunk/include/class_jrn_def_sql.php
Removed:
   phpcompta/trunk/include/param_jrn.inc.php
   phpcompta/trunk/include/param_jrn_add.inc.php
   phpcompta/trunk/include/param_jrn_detail.inc.php
Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/template/param_jrn.php
   phpcompta/trunk/include/user_menu.php
Log:

#419 : r?\195?\169?\195?\169criture param?\195?\168trage journaux

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	2011-11-04 23:45:50 UTC =
(rev 4316)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-05 23:39:54 UTC =
(rev 4317)
@@ -42,6 +42,7 @@
 require_once('class_inum.php');
 require_once('class_lettering.php');
 require_once 'class_sort_table.php';
+require_once 'class_jrn_def_sql.php';
 /*!\file
 * \brief Class for jrn,  class acc_ledger for manipulating the ledger
 */
@@ -49,7 +50,7 @@
 /*!\brief Class for jrn,  class acc_ledger for manipulating the ledger
 *
 */
-class Acc_Ledger
+class Acc_Ledger extends jrn_def_sql
 {
     var $id;			/*!< jrn_def.jrn_def_id */
     var $name;			/*!< jrn_def.jrn_def_name */
@@ -66,10 +67,13 @@
     function __construct ($p_cn,$p_id)
     {
         $this->id=3D$p_id;
+		$this->name=3D&$this->jrn_def_name;
+        $this->jrn_def_id=3D&$this->id;
         $this->db=3D$p_cn;
         $this->row=3Dnull;
         $this->nb=3D10;
     }
+
     function get_last_pj()
     {
         if ( $this->db->exist_sequence("s_jrn_pj".$this->id) )
@@ -313,8 +317,8 @@
         }
=20
         $Res=3D$this->db->exec_sql("select jrn_def_name from ".
-                                 " jrn_def where jrn_def_id=3D".
-                                 $this->id);
+                                 " jrn_def where jrn_def_id=3D$1",
+                                 array($this->id));
         $Max=3DDatabase::num_row($Res);
         if ($Max=3D=3D0) return null;
         $ret=3DDatabase::fetch_array($Res,0);
@@ -565,7 +569,7 @@
     // Build the sql
     list($sql,$where)=3D$Ledger->build_search_sql($_GET);
     // Count nb of line
-    $max_line=3D$cn->count_sql($sql);
+    $max_line=3D$this->db->count_sql($sql);
=20
     $step=3D$_SESSION['g_pagesize'];
     $page=3D(isset($_GET['offset']))?$_GET['page']:1;
@@ -3038,6 +3042,297 @@
       $first_name=3D$this->db->get_value('select ad_value from fiche_det=
ail where ad_id=3D32 and f_id=3D$1',array($tiers));
       return $name.' '.$first_name;
     }
+	/**
+	 * @brief listing of all ledgers
+	 * @return HTML string
+	 */
+	function listing()
+	{
+		$str_dossier =3D dossier::get();
+		$base_url=3D"?".dossier::get()."&ac=3D".$_REQUEST['ac'];
=20
+		$r=3D"";
+		$r.=3D'<TABLE>';
+		$r.=3D'<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"'.$base_ur=
l.'&sa=3Dadd">' . _('Cr=C3=A9ation') . ' </A></TD></TR>';
+		$ret =3D $this->db->exec_sql("select jrn_def_id,jrn_def_name,
+                       jrn_def_class_deb,jrn_def_class_cred,jrn_type_id,=
jrn_desc
+                       from jrn_def join jrn_type on jrn_def_type=3Djrn_=
type_id order by jrn_def_name");
+		$Max =3D Database::num_row($ret);
=20
-}
+
+		for ($i =3D 0; $i < $Max; $i++)
+		{
+			$l_line =3D Database::fetch_array($ret, $i);
+			$url=3D$base_url."&sa=3Ddetail&p_jrn=3D".$l_line['jrn_def_id'];
+			$r.=3Dsprintf('<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"%=
s">%s</A></TD></TR>', $url, h($l_line['jrn_def_name']));
+		}
+		$r.=3D "</TABLE>";
+		return $r;
+	}
+	/**
+	 * display detail of a ledger
+	 *
+	 */
+	function display_ledger()
+	{
+		if ( $this->load() =3D=3D -1 ) {
+			throw new Exception(_("Journal n'existe pas"),-1);
+		}
+		$type=3D$this->jrn_def_type;
+		$name=3D$this->jrn_def_name;
+		$code=3D$this->jrn_def_code;
+
+				/* widget for searching an account */
+		$wSearch=3Dnew IPoste();
+		$wSearch->set_attribute('ipopup','ipop_account');
+		$wSearch->set_attribute('account','p_jrn_class_deb');
+		$wSearch->set_attribute('no_overwrite','1');
+		$wSearch->set_attribute('noquery','1');
+		$wSearch->table=3D3;
+		$wSearch->name=3D"p_jrn_class_deb";
+		$wSearch->size=3D20;
+		$wSearch->value=3D$this->jrn_def_class_deb;
+		$search=3D$wSearch->input();
+
+		$wPjPref=3Dnew IText();
+		$wPjPref->name=3D'jrn_def_pj_pref';
+		$wPjPref->value=3D$this->jrn_def_pj_pref;
+		$pj_pref=3D$wPjPref->input();
+
+		$wPjSeq=3Dnew INum();
+		$wPjSeq->value=3D0;
+		$wPjSeq->name=3D'jrn_def_pj_seq';
+		$pj_seq=3D$wPjSeq->input();
+		$last_seq=3D$this->get_last_pj();
+		$name=3D$this->jrn_def_name;
+
+		$hidden=3D HtmlInput::hidden('p_jrn',$this->id);
+		$hidden.=3D HtmlInput::hidden('sa','detail');
+		$hidden.=3D dossier::hidden();
+		$hidden.=3DHtmlInput::hidden('p_jrn_deb_max_line',10);
+		$hidden.=3DHtmlInput::hidden('p_ech_lib','echeance');
+		$hidden.=3DHtmlInput::hidden('p_jrn_type',$type);
+
+				/* Load the card */
+		$card=3D$this->get_fiche_def();
+		$rdeb=3Dexplode(',',$card['deb']);
+		$rcred=3Dexplode(',',$card['cred']);
+		/* Numbering (only FIN) */
+		$num_op=3Dnew ICheckBox('numb_operation');
+		if ( $this->jrn_def_num_op=3D=3D1) $num_op->selected=3Dtrue;
+		/* bank card */
+		$qcode_bank=3D'';
+		if ( $type=3D=3D'FIN')
+		{
+			$f_id=3D$this->jrn_def_bank;
+			if ( isNumber($f_id)=3D=3D1)
+			{
+				$fBank=3Dnew Fiche($this->db,$f_id);
+				$qcode_bank=3D$fBank->get_quick_code();
+			}
+		}
+		$new=3Dfalse;
+		$cn=3D$this->db;
+		echo $hidden;
+		require_once('template/param_jrn.php');
+
+	}
+	/**
+	 * Verify before update
+	 *
+	 * @param type $array
+	 *   'p_jrn' =3D> string '3' (length=3D1)
+		  'sa' =3D> string 'detail' (length=3D6)
+		  'gDossier' =3D> string '82' (length=3D2)
+		  'p_jrn_deb_max_line' =3D> string '10' (length=3D2)
+		  'p_ech_lib' =3D> string 'echeance' (length=3D8)
+		  'p_jrn_type' =3D> string 'ACH' (length=3D3)
+		  'p_jrn_name' =3D> string 'Achat' (length=3D5)
+		  'jrn_def_pj_pref' =3D> string 'ACH' (length=3D3)
+		  'jrn_def_pj_seq' =3D> string '0' (length=3D1)
+		  'FICHECRED' =3D>
+			array
+			  0 =3D> string '4' (length=3D1)
+		  'FICHEDEB' =3D>
+			array
+			  0 =3D> string '7' (length=3D1)
+			  1 =3D> string '5' (length=3D1)
+			  2 =3D> string '13' (length=3D2)
+		  'update' =3D> string 'Sauve' (length=3D5
+	 *@exception is throw is test are not valid
+	 */
+	function verify_ledger($array)
+	{
+		extract ($array);
+		try
+		{
+			if (isNumber($p_jrn ) =3D=3D 0)			throw new Exception("Id invalide");
+			if (isNumber($p_jrn_deb_max_line) =3D=3D 0) throw new Exception ("Nom=
bre de ligne incorrect");
+			if (trim($p_jrn_name) =3D=3D "") throw new Exception ("Nom de journal=
 invalide");
+			if ($this->db->get_value("select count(*) from jrn_def where jrn_def_=
name=3D$1 and jrn_Def_id<>$2",
+					array($p_jrn_name,$p_jrn)) > 0) throw new Exception ("Un journal av=
ec ce nom existe d=C3=A9j=C3=A0");
+			if ($p_jrn_type=3D=3D'FIN')
+			{
+				$a=3Dnew Fiche($this->db);
+				$result=3D$a->get_by_qcode(trim(strtoupper($_POST['bank'])),false);
+				if	 ( $result=3D=3D1)throw new Exception ("Aucun compte en banque n'=
est donn=C3=A9");
+			}
+
+		} catch(Exception $e)
+		{
+			throw $e;
+		}
+	}
+	/**
+	 * update a ledger
+	 * @param type $array  normally post
+	 * @see verify_ledger
+	 */
+	function update($array)
+	{
+		extract ($array);
+		$this->jrn_def_id=3D$p_jrn;
+		$this->jrn_def_name=3D$p_jrn_name;
+		$this->jrn_def_ech_lib=3D$p_ech_lib;
+		$this->jrn_def_max_line_deb=3D$p_jrn_deb_max_line;
+		$this->jrn_def_type=3D$p_jrn_type;
+		$this->jrn_def_pj_pref=3D$jrn_def_pj_pref;
+		$this->jrn_def_fiche_deb=3D(isset($FICHEDEB))?join($FICHEDEB,','):"";
+		switch($this->jrn_def_type)
+		{
+			case 'ACH':
+			case 'VEN':
+				$this->jrn_def_fiche_cred=3D(isset($FICHECRED))?join($FICHECRED,',')=
:'';
+				break;
+			case 'ODS':
+				$this->jrn_def_class_deb=3D$p_jrn_class_deb;
+				break;
+			case 'FIN':
+				$a=3Dnew Fiche($this->db);
+				$result=3D$a->get_by_qcode(trim(strtoupper($_POST['bank'])),false);
+				$bank=3D$a->id;
+				$this->jrn_def_bank=3D$bank;
+				if ( $result=3D=3D-1)throw new Exception ("Aucun compte en banque n'=
est donn=C3=A9");
+				$this->jrn_def_num_op=3D(isset($numb_operation))?1:0;
+				break;
+		}
+
+		parent::update();
+		//Reset sequence if needed
+		if ($jrn_def_pj_seq !=3D 0)
+		{
+			$Res=3D$this->db->alter_seq("s_jrn_pj".$p_jrn,$jrn_def_pj_seq);
+		}
+	}
+	/**
+	 * display screen to enter a new ledger
+	 */
+	function input_new()
+	{
+			$wSearch=3Dnew IPoste();
+			$wSearch->table=3D3;
+			$wSearch->set_attribute('ipopup','ipop_account');
+			$wSearch->set_attribute('account','p_jrn_class_deb');
+			$wSearch->set_attribute('no_overwrite','1');
+			$wSearch->set_attribute('noquery','1');
+
+			$wSearch->name=3D"p_jrn_class_deb";
+			$wSearch->size=3D20;
+
+			$search=3D$wSearch->input();
+
+			/* construct all the hidden */
+			$hidden=3D HtmlInput::hidden('p_jrn',-1);
+			$hidden.=3D HtmlInput::hidden('p_action','jrn');
+			$hidden.=3D HtmlInput::hidden('sa','add');
+			$hidden.=3D dossier::hidden();
+			$hidden.=3DHtmlInput::hidden('p_jrn_deb_max_line',10);
+			$hidden.=3DHtmlInput::hidden('p_ech_lib','echeance');
+
+			/* properties of the ledger */
+			$name=3D"";
+			$code=3D"";
+			$wType=3Dnew ISelect();
+			$wType->value=3D$this->db->make_array('select jrn_type_id,jrn_desc fr=
om jrn_type');
+			$wType->name=3D"p_jrn_type";
+			$type=3D$wType->input();
+			$rcred=3D$rdeb=3Darray();
+			$wPjPref=3Dnew IText();
+			$wPjPref->name=3D'jrn_def_pj_pref';
+			$pj_pref=3D$wPjPref->input();
+			$pj_seq=3D'';
+			$last_seq=3D0;
+			$new=3Dtrue;
+			/* bank card */
+			$qcode_bank=3D'';
+			/* Numbering (only FIN) */
+			$num_op=3Dnew ICheckBox('numb_operation');
+			echo dossier::hidden();
+			echo HtmlInput::hidden('ac',$_REQUEST['ac']);
+			echo HtmlInput::hidden('p_jrn',-1);
+			echo HtmlInput::hidden('sa','add');
+
+			$cn=3D$this->db;
+
+			require_once('template/param_jrn.php');
+
+	}
+	/**
+	 * Insert a new ledger
+	 * @param type $array normally $_POST
+	 * @see verify_ledger
+	 */
+	function save_new($array)
+	{
+		$this->load();
+		extract ($array);
+		$this->jrn_def_id=3D-1;
+		$this->jrn_def_name=3D$p_jrn_name;
+		$this->jrn_def_ech_lib=3D$p_ech_lib;
+		$this->jrn_def_max_line_deb=3D$p_jrn_deb_max_line;
+		$this->jrn_def_type=3D$p_jrn_type;
+		$this->jrn_def_pj_pref=3D$jrn_def_pj_pref;
+		$this->jrn_def_fiche_deb=3D(isset($FICHEDEB))?join($FICHEDEB,','):"";
+		$this->jrn_def_code=3Dsprintf("%s%02d",trim(substr($this->jrn_def_type=
,0,1)),Acc_Ledger::next_number($this->db,$this->jrn_def_type));
+
+		switch($this->jrn_def_type)
+		{
+			case 'ACH':
+			case 'VEN':
+				$this->jrn_def_fiche_cred=3D(isset($FICHECRED))?join($FICHECRED,',')=
:'';
+
+				break;
+			case 'ODS':
+				$this->jrn_def_class_deb=3D$p_jrn_class_deb;
+				break;
+			case 'FIN':
+				$a=3Dnew Fiche($this->db);
+				$result=3D$a->get_by_qcode(trim(strtoupper($_POST['bank'])),false);
+				$bank=3D$a->id;
+				$this->jrn_def_bank=3D$bank;
+				if ( $result=3D=3D-1)throw new Exception ("Aucun compte en banque n'=
est donn=C3=A9");
+				$this->jrn_def_num_op=3D(isset($numb_operation))?1:0;
+				break;
+		}
+
+		parent::insert();
+	}
+	/**
+	 * delete a ledger IF is not already used
+	 * @exeption : cannot delete
+	 */
+	function delete_ledger()
+	{
+		try
+		{
+			if ( $this->db->get_value("select count(jr_id) from jrn where jr_def_=
id=3D$1",array($this->jrn_def_id))>0)
+					throw new Exception("Impossible d'effacer un journal qui contient d=
es op=C3=A9rations");
+			parent::delete();
+		}
+		catch(Exception $e)
+		{
+			throw $e;
+		}
+	}
+
+	}

Added: phpcompta/trunk/include/class_jrn_def_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_jrn_def_sql.php	                       =
 (rev 0)
+++ phpcompta/trunk/include/class_jrn_def_sql.php	2011-11-05 23:39:54 UTC=
 (rev 4317)
@@ -0,0 +1,380 @@
+<?php
+
+/**
+ * @file
+ * @brief Manage the table public.jrn_def
+ *
+ *
+  Example
+  @code
+
+  @endcode
+ */
+require_once('class_database.php');
+require_once('ac_common.php');
+
+/**
+ * @brief Manage the table public.jrn_def
+ */
+class Jrn_Def_sql
+{
+	/* example private $variable=3Darray("easy_name"=3D>column_name,"email"=
=3D>"column_name_email","val3"=3D>0); */
+
+	protected $variable =3D array(
+		"jrn_def_id" =3D> "jrn_def_id",
+		"jrn_def_name" =3D> "jrn_def_name"
+		, "jrn_def_class_deb" =3D> "jrn_def_class_deb"
+		, "jrn_def_class_cred" =3D> "jrn_def_class_cred"
+		, "jrn_def_fiche_deb" =3D> "jrn_def_fiche_deb"
+		, "jrn_def_fiche_cred" =3D> "jrn_def_fiche_cred"
+		, "jrn_deb_max_line" =3D> "jrn_deb_max_line"
+		, "jrn_cred_max_line" =3D> "jrn_cred_max_line"
+		, "jrn_def_ech" =3D> "jrn_def_ech"
+		, "jrn_def_ech_lib" =3D> "jrn_def_ech_lib"
+		, "jrn_def_type" =3D> "jrn_def_type"
+		, "jrn_def_code" =3D> "jrn_def_code"
+		, "jrn_def_pj_pref" =3D> "jrn_def_pj_pref"
+		, "jrn_def_bank" =3D> "jrn_def_bank"
+		, "jrn_def_num_op" =3D> "jrn_def_num_op"
+	);
+
+	function __construct(& $p_cn, $p_id=3D-1)
+	{
+		$this->db =3D $p_cn;
+		$this->jrn_def_id =3D $p_id;
+
+		if ($p_id =3D=3D -1)
+		{
+			/* Initialize an empty object */
+			foreach ($this->variable as $key =3D> $value)
+				$this->$value =3D null;
+			$this->jrn_def_id =3D $p_id;
+		}
+		else
+		{
+			/* load it */
+
+			$this->load();
+		}
+	}
+
+	public function get_parameter($p_string)
+	{
+		if (array_key_exists($p_string, $this->variable))
+		{
+			$idx =3D $this->variable[$p_string];
+			return $this->$idx;
+		}
+		else
+			throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . 'Erreur a=
ttribut inexistant');
+	}
+
+	public function set_parameter($p_string, $p_value)
+	{
+		if (array_key_exists($p_string, $this->variable))
+		{
+			$idx =3D $this->variable[$p_string];
+			$this->$idx =3D $p_value;
+		}
+		else
+			throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . 'Erreur a=
ttribut inexistant');
+	}
+
+	public function get_info()
+	{
+		return var_export($this, true);
+	}
+
+	public function verify_sql()
+	{
+		// Verify that the elt we want to add is correct
+		/* verify only the datatype */
+		if (trim($this->jrn_def_name) =3D=3D '')
+			$this->jrn_def_name =3D null;
+		if (trim($this->jrn_def_class_deb) =3D=3D '')
+			$this->jrn_def_class_deb =3D null;
+		if (trim($this->jrn_def_class_cred) =3D=3D '')
+			$this->jrn_def_class_cred =3D null;
+		if (trim($this->jrn_def_fiche_deb) =3D=3D '')
+			$this->jrn_def_fiche_deb =3D null;
+		if (trim($this->jrn_def_fiche_cred) =3D=3D '')
+			$this->jrn_def_fiche_cred =3D null;
+		if (trim($this->jrn_deb_max_line) =3D=3D '')
+			$this->jrn_deb_max_line =3D null;
+		if ($this->jrn_deb_max_line !=3D=3D null && settype($this->jrn_deb_max=
_line, 'float') =3D=3D false)
+			throw new Exception('DATATYPE jrn_deb_max_line $this->jrn_deb_max_lin=
e non numerique');
+		if (trim($this->jrn_cred_max_line) =3D=3D '')
+			$this->jrn_cred_max_line =3D null;
+		if ($this->jrn_cred_max_line !=3D=3D null && settype($this->jrn_cred_m=
ax_line, 'float') =3D=3D false)
+			throw new Exception('DATATYPE jrn_cred_max_line $this->jrn_cred_max_l=
ine non numerique');
+		if (trim($this->jrn_def_ech) =3D=3D '')
+			$this->jrn_def_ech =3D null;
+		if (trim($this->jrn_def_ech_lib) =3D=3D '')
+			$this->jrn_def_ech_lib =3D null;
+		if (trim($this->jrn_def_type) =3D=3D '')
+			$this->jrn_def_type =3D null;
+		if (trim($this->jrn_def_code) =3D=3D '')
+			$this->jrn_def_code =3D null;
+		if (trim($this->jrn_def_pj_pref) =3D=3D '')
+			$this->jrn_def_pj_pref =3D null;
+		if (trim($this->jrn_def_bank) =3D=3D '')
+			$this->jrn_def_bank =3D null;
+		if ($this->jrn_def_bank !=3D=3D null && settype($this->jrn_def_bank, '=
float') =3D=3D false)
+			throw new Exception('DATATYPE jrn_def_bank $this->jrn_def_bank non nu=
merique');
+		if (trim($this->jrn_def_num_op) =3D=3D '')
+			$this->jrn_def_num_op =3D null;
+		if ($this->jrn_def_num_op !=3D=3D null && settype($this->jrn_def_num_o=
p, 'float') =3D=3D false)
+			throw new Exception('DATATYPE jrn_def_num_op $this->jrn_def_num_op no=
n numerique');
+	}
+
+	public function save()
+	{
+		/* please adapt */
+		if ($this->jrn_def_id =3D=3D -1)
+			$this->insert();
+		else
+			$this->update();
+	}
+
+	/**
+	 * @brief retrieve array of object thanks a condition
+	 * @param $cond condition (where clause) (optional by default all the r=
ows are fetched)
+	 * you can use this parameter for the order or subselect
+	 * @param $p_array array for the SQL stmt
+	 * @see Database::exec_sql get_object  Database::num_row
+	 * @return the return value of exec_sql
+	 */
+	public function seek($cond=3D'', $p_array=3Dnull)
+	{
+		$sql =3D "select * from public.jrn_def  $cond";
+		$aobj =3D array();
+		$ret =3D $this->db->exec_sql($sql, $p_array);
+		return $ret;
+	}
+
+	/**
+	 * get_seek return the next object, the return of the query must have a=
ll the column
+	 * of the object
+	 * @param $p_ret is the return value of an exec_sql
+	 * @param $idx is the index
+	 * @see seek
+	 * @return object
+	 */
+	public function get_object($p_ret, $idx)
+	{
+		// map each row in a object
+		$oobj =3D new Jrn_Def_sql($this->db);
+		$array =3D Database::fetch_array($p_ret, $idx);
+		foreach ($array as $idx =3D> $value)
+		{
+			$oobj->$idx =3D $value;
+		}
+		return $oobj;
+	}
+
+	public function insert()
+	{
+		if ($this->verify_sql() !=3D 0)
+			return;
+		if ($this->jrn_def_id =3D=3D -1)
+		{
+			/*  please adapt */
+			$sql =3D "insert into public.jrn_def(jrn_def_name
+,jrn_def_class_deb
+,jrn_def_class_cred
+,jrn_def_fiche_deb
+,jrn_def_fiche_cred
+,jrn_deb_max_line
+,jrn_cred_max_line
+,jrn_def_ech
+,jrn_def_ech_lib
+,jrn_def_type
+,jrn_def_code
+,jrn_def_pj_pref
+,jrn_def_bank
+,jrn_def_num_op
+) values ($1
+,$2
+,$3
+,$4
+,$5
+,$6
+,$7
+,$8
+,$9
+,$10
+,$11
+,$12
+,$13
+,$14
+) returning jrn_def_id";
+
+			$this->jrn_def_id =3D $this->db->get_value(
+					$sql, array($this->jrn_def_name
+				, $this->jrn_def_class_deb
+				, $this->jrn_def_class_cred
+				, $this->jrn_def_fiche_deb
+				, $this->jrn_def_fiche_cred
+				, $this->jrn_deb_max_line
+				, $this->jrn_cred_max_line
+				, $this->jrn_def_ech
+				, $this->jrn_def_ech_lib
+				, $this->jrn_def_type
+				, $this->jrn_def_code
+				, $this->jrn_def_pj_pref
+				, $this->jrn_def_bank
+				, $this->jrn_def_num_op
+					)
+			);
+		}
+		else
+		{
+			$sql =3D "insert into public.jrn_def(jrn_def_name
+,jrn_def_class_deb
+,jrn_def_class_cred
+,jrn_def_fiche_deb
+,jrn_def_fiche_cred
+,jrn_deb_max_line
+,jrn_cred_max_line
+,jrn_def_ech
+,jrn_def_ech_lib
+,jrn_def_type
+,jrn_def_code
+,jrn_def_pj_pref
+,jrn_def_bank
+,jrn_def_num_op
+,jrn_def_id) values ($1
+,$2
+,$3
+,$4
+,$5
+,$6
+,$7
+,$8
+,$9
+,$10
+,$11
+,$12
+,$13
+,$14
+,$15
+) returning jrn_def_id";
+
+			$this->jrn_def_id =3D $this->db->get_value(
+					$sql, array($this->jrn_def_name
+				, $this->jrn_def_class_deb
+				, $this->jrn_def_class_cred
+				, $this->jrn_def_fiche_deb
+				, $this->jrn_def_fiche_cred
+				, $this->jrn_deb_max_line
+				, $this->jrn_cred_max_line
+				, $this->jrn_def_ech
+				, $this->jrn_def_ech_lib
+				, $this->jrn_def_type
+				, $this->jrn_def_code
+				, $this->jrn_def_pj_pref
+				, $this->jrn_def_bank
+				, $this->jrn_def_num_op
+				, $this->jrn_def_id)
+			);
+		}
+	}
+
+	public function update()
+	{
+		if ($this->verify_sql() !=3D 0)
+			return;
+		/*   please adapt */
+		$sql =3D " update public.jrn_def set jrn_def_name =3D $1
+,jrn_def_class_deb =3D $2
+,jrn_def_class_cred =3D $3
+,jrn_def_fiche_deb =3D $4
+,jrn_def_fiche_cred =3D $5
+,jrn_deb_max_line =3D $6
+,jrn_cred_max_line =3D $7
+,jrn_def_ech =3D $8
+,jrn_def_ech_lib =3D $9
+,jrn_def_type =3D $10
+,jrn_def_code =3D $11
+,jrn_def_pj_pref =3D $12
+,jrn_def_bank =3D $13
+,jrn_def_num_op =3D $14
+ where jrn_def_id=3D $15";
+		$res =3D $this->db->exec_sql(
+				$sql, array($this->jrn_def_name
+			, $this->jrn_def_class_deb
+			, $this->jrn_def_class_cred
+			, $this->jrn_def_fiche_deb
+			, $this->jrn_def_fiche_cred
+			, $this->jrn_deb_max_line
+			, $this->jrn_cred_max_line
+			, $this->jrn_def_ech
+			, $this->jrn_def_ech_lib
+			, $this->jrn_def_type
+			, $this->jrn_def_code
+			, $this->jrn_def_pj_pref
+			, $this->jrn_def_bank
+			, $this->jrn_def_num_op
+			, $this->jrn_def_id)
+		);
+	}
+
+	/**
+	 * @brief load a object
+	 * @return 0 on success -1 the object is not found
+	 */
+	public function load()
+	{
+
+		$sql =3D "select jrn_def_name
+,jrn_def_class_deb
+,jrn_def_class_cred
+,jrn_def_fiche_deb
+,jrn_def_fiche_cred
+,jrn_deb_max_line
+,jrn_cred_max_line
+,jrn_def_ech
+,jrn_def_ech_lib
+,jrn_def_type
+,jrn_def_code
+,jrn_def_pj_pref
+,jrn_def_bank
+,jrn_def_num_op
+ from public.jrn_def where jrn_def_id=3D$1";
+		/* please adapt */
+		$res =3D $this->db->get_array(
+				$sql, array($this->jrn_def_id)
+		);
+
+		if (count($res) =3D=3D 0)
+		{
+			/* Initialize an empty object */
+			foreach ($this->variable as $key =3D> $value)
+				$this->$key =3D '';
+
+			return -1;
+		}
+		foreach ($res[0] as $idx =3D> $value)
+		{
+			$this->$idx =3D $value;
+		}
+		return 0;
+	}
+
+	public function delete()
+	{
+		$sql =3D "delete from public.jrn_def where jrn_def_id=3D$1";
+		$res =3D $this->db->exec_sql($sql, array($this->jrn_def_id));
+	}
+
+	/**
+	 * Unit test for the class
+	 */
+	static function test_me()
+	{
+	}
+
+}
+
+// Jrn_Def_sql::test_me();
+?>

Deleted: phpcompta/trunk/include/param_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/param_jrn.inc.php	2011-11-04 23:45:50 UTC (re=
v 4316)
+++ phpcompta/trunk/include/param_jrn.inc.php	2011-11-05 23:39:54 UTC (re=
v 4317)
@@ -1,46 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* $Revision$ */
-/*! \file
- * \brief create, modify parameter ledger
- */
-require_once('class_dossier.php');
-$gDossier=3Ddossier::id();
-
-include_once ("ac_common.php");
-
-require_once('class_database.php');
-include_once ("class_user.php");
-$cn=3Dnew Database($gDossier);
-$User=3Dnew User($cn);
-$User->Check();
-$User->check_dossier($gDossier);
-
-include_once ("user_menu.php");
-
-
-$User->can_request(PARJRN);
-
-
-echo '<div class=3D"lmenu">';
-MenuJrn($gDossier);
-echo '</div>';
-html_page_stop();
-?>

Deleted: phpcompta/trunk/include/param_jrn_add.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_jrn_add.inc.php	2011-11-04 23:45:50 UTC=
 (rev 4316)
+++ phpcompta/trunk/include/param_jrn_add.inc.php	2011-11-05 23:39:54 UTC=
 (rev 4317)
@@ -1,198 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* $Revision$ */
-/*! \file
- * \brief To add a ledger
- */
-
-include_once ("ac_common.php");
-require_once("class_itext.php");
-require_once("class_iselect.php");
-require_once ('class_acc_ledger.php');
-
-/* ipopup for search poste */
-echo IPoste::ipopup('ipop_account');
-/* search card */
-$search_card=3Dnew IPopup('ipop_card');
-$search_card->title=3D_('Recherche de fiche');
-echo $search_card->input();
-
-html_page_start($_SESSION['g_theme']);
-require_once('class_dossier.php');
-$gDossier=3Ddossier::id();
-
-require_once('class_database.php');
-/* Admin. Dossier */
-
-include_once ("class_user.php");
-$cn=3Dnew Database($gDossier);
-$User=3Dnew User($cn);
-$User->Check();
-$User->check_dossier($gDossier);
-include_once ("user_menu.php");
-
-$User->can_request(PARJRN);
-
-if ( isset ($_POST["add"]) )
-{
-    if (  !isset($_POST["p_jrn_name"]) || ! isset($_POST["p_jrn_type"] )=
)
-    {
-        echo '<H2 CLASS=3D"error">'._('Un param=C3=A8tre manque').'</H2>=
';
-    }
-    else
-    {
-        /*  if name already use we stop */
-        if ( $cn->count_sql("select * from jrn_def where upper(jrn_def_n=
ame)=3Dupper($1)",array($_POST['p_jrn_name'])) >0 )
-        {
-
-            alert (_('Un journal de ce nom existe d=C3=A9j=C3=A0'));
-        }
-        else
-        {
-
-            if (strlen(trim($_POST['p_jrn_deb_max_line'])) =3D=3D 0 ||
-                    (string) (int)$_POST['p_jrn_deb_max_line'] !=3D (str=
ing)$_POST['p_jrn_deb_max_line'] )
-                $l_deb_max_line=3D1;
-            else
-                $l_deb_max_line=3D$_POST['p_jrn_deb_max_line'];
-
-
-            $p_jrn_name=3D$_POST["p_jrn_name"];
-            $p_jrn_class_deb=3Dsql_string($_POST["p_jrn_class_deb"]);
-            if (strlen(trim($p_jrn_name))=3D=3D0) return;
-            // compute the jrn_def.jrn_def_code
-            $p_code=3Dsprintf("%s%02d",trim(substr($_POST['p_jrn_type'],=
0,1)),Acc_Ledger::next_number($cn,$_POST['p_jrn_type']));
-            $p_jrn_fiche_deb=3D"";
-            $p_jrn_fiche_cred=3D"";
-
-            if ( isset    ($_POST["FICHEDEB"]))
-            {
-                $p_jrn_fiche_deb=3Djoin(",",$_POST["FICHEDEB"]);
-            }
-            if ( isset    ($_POST["FICHECRED"]))
-            {
-                $p_jrn_fiche_cred=3Djoin(",",$_POST["FICHECRED"]);
-            }
-            $l_cred_max_line=3D$l_deb_max_line;
-            $cn->start();
-            $bank=3Dnull;
-            if (isset($_POST['bank']))
-            {
-                $a=3Dnew Fiche($cn);
-                $a->get_by_qcode(trim(strtoupper($_POST['bank'])),false)=
;
-                $bank=3D$a->id;
-                if ($bank=3D=3D0) $bank=3Dnull;
-            }
-            $nop=3D0;
-            if (isset($_POST['numb_operation']))
-            {
-                $nop=3D1;
-            }
-
-            if ($_POST['p_jrn_type']=3D=3D'FIN' && $bank=3D=3Dnull)
-            {
-                alert("Vous devez donner un compte en banque");
-            }
-            else
-            {
-
-                $Sql=3D"insert into jrn_def(jrn_def_name,jrn_def_class_d=
eb,jrn_def_class_cred,jrn_deb_max_line,jrn_cred_max_line,
-                     jrn_def_type,jrn_def_fiche_deb,jrn_def_fiche_cred,j=
rn_def_code,jrn_def_pj_pref,jrn_def_bank,jrn_def_num_op)
-                     values ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12)";
-                $sql_array=3Darray(
-                               $p_jrn_name,$p_jrn_class_deb,$p_jrn_class=
_deb,
-                               $l_deb_max_line,$l_cred_max_line,$_POST['=
p_jrn_type'],
-                               $p_jrn_fiche_deb,$p_jrn_fiche_cred,
-                               $p_code,$_POST['jrn_def_pj_pref'],
-                               $bank,$nop);
-                $Res=3D$cn->exec_sql($Sql,$sql_array);
-                $ledger_id=3D$cn->get_current_seq('s_jrn_def');
-                $Res=3D$cn->create_sequence('s_jrn_pj'.$ledger_id);
-                $cn->commit();
-            }
-        }
-    }
-    echo '<div class=3D"lmenu">';
-    MenuJrn();
-    echo '</div>';
-    exit();
-}
-
-echo '<div class=3D"lmenu">';
-MenuJrn();
-echo '</div>';
-
-
-
-echo '<DIV CLASS=3D"u_redcontent">';
-/* widget for searching an account */
-$wSearch=3Dnew IPoste();
-$wSearch->table=3D3;
-$wSearch->set_attribute('ipopup','ipop_account');
-$wSearch->set_attribute('account','p_jrn_class_deb');
-$wSearch->set_attribute('no_overwrite','1');
-$wSearch->set_attribute('noquery','1');
-
-$wSearch->name=3D"p_jrn_class_deb";
-$wSearch->size=3D20;
-
-$search=3D$wSearch->input();
-
-/* construct all the hidden */
-$hidden=3D HtmlInput::hidden('p_jrn',0);
-$hidden.=3D HtmlInput::hidden('p_action','jrn');
-$hidden.=3D HtmlInput::hidden('sa','add');
-$hidden.=3D dossier::hidden();
-$hidden.=3DHtmlInput::hidden('p_jrn_deb_max_line',10);
-$hidden.=3DHtmlInput::hidden('p_ech_lib','echeance');
-
-/* properties of the ledger */
-$name=3D"";
-$code=3D"";
-$wType=3Dnew ISelect();
-$wType->value=3D$cn->make_array('select jrn_type_id,jrn_desc from jrn_ty=
pe');
-$wType->name=3D"p_jrn_type";
-$type=3D$wType->input();
-$rcred=3D$rdeb=3Darray();
-$wPjPref=3Dnew IText();
-$wPjPref->name=3D'jrn_def_pj_pref';
-$pj_pref=3D$wPjPref->input();
-$pj_seq=3D'';
-$last_seq=3D0;
-$new=3Dtrue;
-/* bank card */
-$qcode_bank=3D'';
-/* Numbering (only FIN) */
-$num_op=3Dnew ICheckBox('numb_operation');
-
-
-echo '<FORM METHOD=3D"POST">';
-echo dossier::hidden();
-echo HtmlInput::hidden('p_action','jrn');
-echo HtmlInput::hidden('p_jrn',-1);
-echo HtmlInput::hidden('sa','add');
-require_once('template/param_jrn.php');
-echo HtmlInput::submit('add','Sauver');
-echo '<INPUT TYPE=3D"RESET" class=3D"button" VALUE=3D"Reset">';
-echo '</FORM>';
-echo "</DIV>";
-html_page_stop();
-?>

Deleted: phpcompta/trunk/include/param_jrn_detail.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_jrn_detail.inc.php	2011-11-04 23:45:50 =
UTC (rev 4316)
+++ phpcompta/trunk/include/param_jrn_detail.inc.php	2011-11-05 23:39:54 =
UTC (rev 4317)
@@ -1,256 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* $Revision$ */
-/*! \file
- * \brief Show and let modify ledger parameter
- */
-require_once("class_itext.php");
-require_once('class_dossier.php');
-require_once('class_acc_ledger.php');
-/* javascript for the search poste */
-require_once('class_ipopup.php');
-
-/* ipopup for search poste */
-echo IPoste::ipopup('ipop_account');
-/* search card */
-$search_card=3Dnew IPopup('ipop_card');
-$search_card->title=3D_('Recherche de fiche');
-echo $search_card->input();
-$gDossier=3Ddossier::id();
-
-include_once ("ac_common.php");
-html_page_start($_SESSION['g_theme']);
-require_once('class_database.php');
-/* Admin. Dossier */
-$cn=3Dnew Database($gDossier);
-include_once ("class_user.php");
-$User=3Dnew User($cn);
-$User->Check();
-$User->check_dossier($gDossier);
-
-
-$User->can_request(PARJRN);
-
-if ( isset( $_REQUEST['p_jrn'] ))
-{
-    $p_jrn=3D$_REQUEST['p_jrn'];
-}
-else
-{
-    echo '<h2 class=3D"error">'._('Journal inexistant').'</h2>';
-    exit();
-}
-//--------------------------------------------------
-// remove ledger
-//--------------------------------------------------
-if ( isset($_POST["efface"]))
-{
-    if ( isNumber($_POST['p_jrn'])=3D=3D0)
-    {
-        alert(_("Impossible d\'effacer ce journal.\n Il est utilis=C3=A9=
\n"));
-    }
-    else if ( $cn->get_value("select count(*) from jrn where jr_def_id=3D=
$1",array($_POST['p_jrn'])) =3D=3D 0 )
-    {
-        $cn->exec_sql("delete from jrn_def where jrn_def_id=3D$1",array(=
$_POST['p_jrn']));
-    }
-    else
-    {
-        alert(_("Impossible d\'effacer ce journal.\n Il est utilis=C3=A9=
\n"));
-    }
-}
-
-
-//--------------------------------------------------
-// Update ledger
-If ( isset ($_POST["update"] ))
-{
-    if (  !isset($_POST["p_jrn_name"])  )
-    {
-        echo '<H2 CLASS=3D"error">'._('Un param=C3=A8tre manque').'</H2>=
';
-    }
-    else
-    {
-        if ( isset ($_POST['p_ech']) && $_POST['p_ech'] =3D=3D 'no' )
-        {
-            $p_ech=3D'false';
-            $p_ech_lib=3D'null';
-        }
-        else
-        {
-            $p_ech=3D'true';
-            $p_ech_lib=3D"'".$_POST['p_ech_lib']."'";
-        }
-        $nop=3D0;
-        if (isset($_POST['numb_operation']))
-        {
-            $nop=3D1;
-        }
-        if ( strlen(trim($_POST['p_jrn_deb_max_line'])) =3D=3D 0 ||
-                (string) (int)$_POST['p_jrn_deb_max_line'] !=3D (string)=
$_POST['p_jrn_deb_max_line'] ||
-                $_POST['p_jrn_deb_max_line'] <=3D 0
-           )
-            $l_deb_max_line=3D1;
-        else
-            $l_deb_max_line=3D$_POST['p_jrn_deb_max_line'];
-
-        $l_cred_max_line=3D$l_deb_max_line;
-
-        $p_jrn_name=3D$_POST['p_jrn_name'];
-        if (strlen(trim($p_jrn_name))=3D=3D0) return;
-        $p_jrn_name=3Dsql_string($p_jrn_name);
-        $p_jrn_fiche_deb=3D"";
-        $p_jrn_fiche_cred=3D"";
-        $bank=3Dnull;
-        if (isset($_POST['bank']))
-        {
-            $a=3Dnew Fiche($cn);
-            $a->get_by_qcode(trim(strtoupper($_POST['bank'])),false);
-            $bank=3D$a->id;
-            if ($bank=3D=3D0) $bank=3Dnull;
-        }
-        $err=3D0;
-        if ($_POST['p_jrn_type']=3D=3D'FIN' && $bank=3D=3Dnull)
-        {
-            alert("Vous devez donner un compte en banque");
-            $err=3D1;
-        }
-        if ( isset    ($_POST["FICHEDEB"]))
-        {
-            $p_jrn_fiche_deb=3Djoin(",",$_POST["FICHEDEB"]);
-        }
-        if ( isset    ($_POST["FICHECRED"]))
-        {
-            $p_jrn_fiche_cred=3Djoin(",",$_POST["FICHECRED"]);
-        }
-        if ($err=3D=3D0)
-        {
-            $p_jrn_class_deb=3D(isset($_POST['p_jrn_class_deb']))?$_POST=
['p_jrn_class_deb']:'';
-            $Sql=3D"update jrn_def set jrn_def_name=3D$1,jrn_def_class_d=
eb=3D$2,jrn_def_class_cred=3D$3,
-                 jrn_deb_max_line=3D$4,jrn_cred_max_line=3D$5,jrn_def_ec=
h=3D$6,jrn_def_ech_lib=3D$7,jrn_def_fiche_deb=3D$8,
-                 jrn_def_fiche_cred=3D$9, jrn_def_pj_pref=3Dupper($10), =
jrn_def_bank=3D$12,jrn_def_num_op=3D$13
-                 where jrn_def_id=3D$11";
-            $sql_array=3Darray(
-                           $p_jrn_name,$p_jrn_class_deb,$p_jrn_class_deb=
,
-                           $l_deb_max_line,$l_cred_max_line,
-                           $p_ech,$p_ech_lib,
-                           $p_jrn_fiche_deb,$p_jrn_fiche_cred,
-                           $_POST['jrn_def_pj_pref'],
-                           $_GET['p_jrn'],
-                           $bank,
-                           $nop
-                       );
-            $Res=3D$cn->exec_sql($Sql,$sql_array);
-            if ( isNumber($_POST['jrn_def_pj_seq']) =3D=3D 1 && $_POST['=
jrn_def_pj_seq']!=3D0)
-                $Res=3D$cn->alter_seq("s_jrn_pj".$_GET['p_jrn'],$_POST['=
jrn_def_pj_seq']);
-        }
-    }
-}
-echo '<div class=3D"lmenu">';
-MenuJrn();
-echo '</div>';
-?>
-<script language=3D"javascript">
-                 function m_confirm()
-                 {
-                     return confirm ("Etes-vous sur de vouloir effacer c=
e journal ?");
-                 }
-                 </script>
-
-                 <?php
-                 $Res=3D$cn->exec_sql("select jrn_def_name,jrn_def_class=
_deb,jrn_def_class_cred,".
-                                    "jrn_deb_max_line,jrn_cred_max_line,=
jrn_def_code".
-                                    ",jrn_def_type,jrn_def_ech, jrn_def_=
ech_lib,jrn_def_fiche_deb,jrn_def_fiche_cred".
-                                    ",jrn_def_bank,jrn_def_num_op".
-                                    " from jrn_def where".
-                                    " jrn_def_id=3D".$_REQUEST['p_jrn'])=
;
-if ( Database::num_row($Res) =3D=3D 0 ) exit();
-
-
-$l_line=3DDatabase::fetch_array($Res,0);
-
-/* Load all the properties of the ledger */
-$Ledger=3Dnew Acc_Ledger($cn,$_REQUEST['p_jrn']);
-$prop=3D$Ledger->get_propertie();
-$type=3D$prop['jrn_def_type'];
-$name=3D$prop['jrn_def_name'];
-$code=3D$prop['jrn_def_code'];
-/* widget for searching an account */
-$wSearch=3Dnew IPoste();
-$wSearch->set_attribute('ipopup','ipop_account');
-$wSearch->set_attribute('account','p_jrn_class_deb');
-$wSearch->set_attribute('no_overwrite','1');
-$wSearch->set_attribute('noquery','1');
-$wSearch->table=3D3;
-$wSearch->name=3D"p_jrn_class_deb";
-$wSearch->size=3D20;
-$wSearch->value=3D$prop['jrn_def_class_deb'];
-$search=3D$wSearch->input();
-$new=3Dfalse;
-
-$wPjPref=3Dnew IText();
-$wPjPref->name=3D'jrn_def_pj_pref';
-$wPjPref->value=3D$prop['jrn_def_pj_pref'];
-$pj_pref=3D$wPjPref->input();
-$wPjSeq=3Dnew INum();
-$wPjSeq->value=3D0;
-$wPjSeq->name=3D'jrn_def_pj_seq';
-$pj_seq=3D$wPjSeq->input();
-$last_seq=3D$Ledger->get_last_pj();
-$name=3D$l_line['jrn_def_name'];
-
-/* construct all the hidden */
-$hidden=3D HtmlInput::hidden('p_jrn',$_GET['p_jrn']);
-$hidden.=3D HtmlInput::hidden('p_action','jrn');
-$hidden.=3D HtmlInput::hidden('sa','detail');
-$hidden.=3D dossier::hidden();
-$hidden.=3DHtmlInput::hidden('p_jrn_deb_max_line',10);
-$hidden.=3DHtmlInput::hidden('p_ech_lib','echeance');
-$hidden.=3DHtmlInput::hidden('p_jrn_type',$type);
-
-/* Load the card */
-$card=3D$Ledger->get_fiche_def();
-$rdeb=3Dexplode(',',$card['deb']);
-$rcred=3Dexplode(',',$card['cred']);
-/* Numbering (only FIN) */
-$num_op=3Dnew ICheckBox('numb_operation');
-if ( $l_line['jrn_def_num_op']=3D=3D1) $num_op->selected=3Dtrue;
-/* bank card */
-$qcode_bank=3D'';
-if ( $type=3D=3D'FIN')
-{
-    $f_id=3D$l_line['jrn_def_bank'];
-    if ( isNumber($f_id)=3D=3D1)
-    {
-        $fBank=3Dnew Fiche($cn,$f_id);
-        $qcode_bank=3D$fBank->get_quick_code();
-    }
-}
-echo '<div class=3D"u_redcontent">';
-echo '<form method=3D"POST">';
-echo $hidden;
-require_once('template/param_jrn.php');
-echo '<INPUT TYPE=3D"SUBMIT" class=3D"button" VALUE=3D"Sauve" name=3D"up=
date">
-<INPUT TYPE=3D"RESET" class=3D"button" VALUE=3D"Reset">
-<INPUT TYPE=3D"submit" class=3D"button"  name=3D"efface" value=3D"Efface=
" onClick=3D"return m_confirm();">';
-
-echo '</FORM>';
-echo "</DIV>";
-html_page_stop();
-?>

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	2011-11-04 23:45:50 UT=
C (rev 4316)
+++ phpcompta/trunk/include/template/param_jrn.php	2011-11-05 23:39:54 UT=
C (rev 4317)
@@ -14,7 +14,8 @@
 <?php echo $search;?>
 </TD>
 <TD CLASS=3D"notice">
-<?=3D_("Uniquement pour les journaux d'Op=C3=A9rations Diverses")?>
+<?=3D_("Uniquement pour les journaux d'Op=C3=A9rations Diverses, les val=
eurs sont s=C3=A9par=C3=A9es par des espaces, on peut aussi
+	utiliser le * pour indiquer 'tous les postes qui en d=C3=A9pendent' exe=
mple: 4*")?>
 </TD>
 </TR>
 <?
@@ -84,7 +85,7 @@
 <?php echo $pj_pref; ?>
 </TD>
 <TD>
-<span class=3D"notice"><?=3D_('Le pr=C3=A9fixe des pi=C3=A8ces peut =C3=AA=
tre diff=C3=A9rent pour chaque journal')?></span><br>
+<span class=3D"notice"><?=3D_('Le pr=C3=A9fixe des pi=C3=A8ces doit =C3=AA=
tre diff=C3=A9rent pour chaque journal, on peut aussi utiliser l\'ann=C3=A9=
e')?></span><br>
 <span class=3D"notice"><?=3D_('Uniquement des chiffres')?></span>
 </TD>
=20

Modified: phpcompta/trunk/include/user_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user_menu.php	2011-11-04 23:45:50 UTC (rev 43=
16)
+++ phpcompta/trunk/include/user_menu.php	2011-11-05 23:39:54 UTC (rev 43=
17)
@@ -32,118 +32,6 @@
=20
=20
 /*!
- * \brief show the top menu for the user profile
- *        and highight the selected one
- * \param  p_high what to hightlight, by default it is autodetected
- *         but sometimes it must be given. Default value=3D""
- *
- * \return string
- *
- */
-function ShowMenuCompta_deprecated($p_high=3D"")
-{
-    require_once('class_database.php');
-
-    // find our current menu
-    $default=3Dbasename($_SERVER['PHP_SELF']);
-
-    switch ($default)
-{
-    case "user_jrn.php":
-        $default.=3D"?show&".dossier::get();
-        break;
-    }
-
-    if ( $p_high !=3D=3D "" ) $default=3D$p_high;
-    $default=3D-1;
-    if  ( isset($_REQUEST['p_action']))
-    {
-        switch ($_REQUEST['p_action'] )
-        {
-        case 'impress':
-            $default=3D5;
-            break;
-        case 'fiche':
-            $default=3D6;
-            break;
-        case 'quick_writing':
-            $default=3D4;
-            break;
-        case 'gl':
-            $default=3D0;
-            break;
-        case 'ven':
-            $default=3D1;
-            break;
-        case 'client':
-            $default=3D1;
-            break;
-        case 'ach':
-        case 'fournisseur':
-            $default=3D2;
-            break;
-        case 'fin':
-            $default=3D3;
-            break;
-        case 'let':
-            $default=3D10;
-            break;
-        }
-    }
-
-    $str_dossier=3Ddossier::get();
-    $p_array=3Darray(
-                 array("compta.php?p_action=3Dgl&".$str_dossier ,_("Hist=
orique"),_("Historique : toutes les op=C3=A9rations"),0),
-                 array("compta.php?p_action=3Dven&".$str_dossier ,_("Rec=
ette"),_("Journal de vente, produit et recette"),1),
-                 array("compta.php?p_action=3Dach&".$str_dossier,_("D=C3=
=A9pense"),_("Journaux de d=C3=A9pense, d'achat"),2 ),
-                 array("compta.php?p_action=3Dfin&".$str_dossier,_("Fina=
ncier"),_("Journaux financiers: les banques, la caisse"),3),
-                 array('compta.php?p_action=3Dquick_writing&'.$str_dossi=
er,_('Op=C3=A9ration Diverses'),_('Journaux d\'OD: salaires, d=C3=A9clara=
tions TVA,...'),4),
-
-                 array("compta.php?p_action=3Dimpress&".$str_dossier,_("=
Impression"),_("Impression"),5),
-                 array("compta.php?p_action=3Dfiche&".$str_dossier,_("Fi=
che"),_("Ajouter, modifier ou effacer des fiches"),6),
-                 array("compta.php?p_action=3Dlet&".$str_dossier,_("Lett=
rage"),_("Ajouter, modifier ou effacer des lettrage"),10),
-                 array("user_advanced.php?".$str_dossier,_("Avanc=C3=A9"=
),_("Op=C3=A9rations d=C3=A9licates"),7),
-             );
-
-    $result=3DShowItem($p_array,'H',"mtitle","mtitle",$default,' style=3D=
"width:100%;"');
-    $str_dossier=3Ddossier::get();
-    $r=3D"";
-    $r.=3Dmenu_tool("compta.php");
-    $r.=3D'<div class=3D"topmenu">';
-    $r.=3D$result;
-    $r.=3D'</div>';
-
-    return $r;
-}
-
-
-/*!
- **************************************************
- * \brief   build the menu of user_advanced.php
- *
- * \param $default
- *
- * \return the menu
- */
-function ShowMenuAdvanced_deprecated($default=3D"")
-{
-    $str_dossier=3Ddossier::get();
-    // Show the left menu
-    $left_menu=3DShowItem(array(
-                            //('rapprt.php','Rapprochement'),
-
-                            array('user_advanced.php?'.$str_dossier.'&p_=
action=3Dpreod',_('Ecritures definies'),"",9),
-
-                            array('compta.php?p_action=3Dstock&'.$str_do=
ssier,'Stock',_("Gestion des stocks"),5),
-                            array('user_advanced.php?p_action=3Ddefrepor=
t&'.$str_dossier,_('Rapport'),_("Rapport"),6),
-                            array('user_advanced.php?p_action=3Douv&'.$s=
tr_dossier,_('Ecriture ouverture'),"",8),
-                            array('user_advanced.php?p_action=3Dverif&'.=
$str_dossier,_('V=C3=A9rification'),"",10)
-                        ),
-                        'H',"mtitle","mtitle",$default);
-    $r=3D'<div class=3D"u_subtmenu">'.$left_menu."</div>";
-    return $r;
-}
-/*!
  * \brief  Show the menu for the card management
  *
  * \param $p_dossier dossier 1
@@ -229,67 +117,8 @@
     $menu=3DShowItem($item,'H',"mtitle","mtitle",$def,' style=3D"width:8=
0%;margin-left:10%" ');
     return $menu;
 }
-/*!
- * \brief  Show the parameter menu
- *
- * \param $p_action the last action choosed
- *
- *
- *
- * \return HTML Code
- *
- *
- */
-function ShowMenuParam($p_action=3D"")
-{
-    $s=3Ddossier::get();
-    $sub_menu=3DShowItem(array(
=20
-                           array('parametre.php?p_action=3Dcompany&'.$s,=
_('Soci=C3=A9t=C3=A9s'),_('Parametre societe'),1),
-			   array('parametre.php?p_action=3Dperiode&'.$s,_('Periode'),_("Gesti=
on des periodes"),25),
-                           array('parametre.php?p_action=3Ddivers&'.$s,_=
('Divers'),_('Devise, moyen de paiement'),2),
-                           array('parametre.php?p_action=3Dpcmn&'.$s,_('=
Plan Comptable'),_('Modification du plan comptable'),11),
-                           array('parametre.php?p_action=3Dext&'.$s,_('E=
xtension'),_('Extension'),3),
-                           array('parametre.php?p_action=3Dsec&'.$s,_('S=
=C3=A9curit=C3=A9'),_('securite'),8),
-                           array('parametre.php?p_action=3Dpreod&'.$s,_(=
'Ecritures d=C3=A9finies'),_('Ecritures d=C3=A9finies'),12),
-                           array('parametre.php?p_action=3Ddocument&'.$s=
,_('Document'),_('Facture, lettre de rappel, proposition...'),7),
-                           array('parametre.php?p_action=3Djrn&'.$s,_('J=
ournaux'),_('Creation et modification de journaux'),10)
-
-                       ),
-                       'H',"mtitle","mtitle",$p_action,' width=3D"100%"'=
);
-    return $sub_menu;
-
-}
 /*!
- * \brief  display the html the menu in the jrn page
- *
- * \return nothing
- *
- *
- */
-
-function MenuJrn()
-{
-    $str_dossier=3Ddossier::get();
-    echo '<TABLE>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"?p_action=
=3Djrn&sa=3Dadd&'.$str_dossier.'">'._('Cr=C3=A9ation').' </A></TD></TR>';
-    require_once('class_database.php');
-    $Cn=3Dnew Database(dossier::id());
-    $Ret=3D$Cn->exec_sql("select jrn_def_id,jrn_def_name,
-                       jrn_def_class_deb,jrn_def_class_cred,jrn_type_id,=
jrn_desc
-                       from jrn_def join jrn_type on jrn_def_type=3Djrn_=
type_id order by jrn_def_name");
-    $Max=3DDatabase::num_row($Ret);
-
-    for ($i=3D0;$i<$Max;$i++)
-    {
-        $l_line=3DDatabase::fetch_array($Ret,$i);
-        printf ('<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"?p=
_action=3Djrn&sa=3Ddetail&p_jrn=3D%s&'.$str_dossier.'">%s</A></TD></TR>',
-                $l_line['jrn_def_id'],$l_line['jrn_def_name']);
-
-    }
-    echo "</TABLE>";
-}
-/*!
  * \brief  Show the menu from the pcmn page
  *
  * \param $p_start class start default=3D1
@@ -319,96 +148,3 @@
     echo "</TABLE>";
 }
=20
-
-/*!
- * \brief Show the menu for importing, verify and transfert Bank CSV
- *
- * \return nothing
- */
-function ShowMenuImport()
-{
-    $str_dossier=3Ddossier::get();
-
-    echo '<TABLE>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"import.ph=
p?action=3Dimport&'.$str_dossier.'">'._('Importer CSV').'</A></TD></TR>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"import.ph=
p?action=3Dverif&'.$str_dossier.'">'._('Verif CSV').'</A></TD></TR>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"import.ph=
p?action=3Dtransfer&'.$str_dossier.'">'._('Transfert CSV').'</A></TD></TR=
>';
-    echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"import.ph=
p?action=3Dpurge&'.$str_dossier.'">'._('Purge CSV').'</A></TD></TR>';
-
-    echo "</TABLE>";
-}
-/*!\brief show the top menu to access the different modules in top
- * \param $p_from from which module this function is called
- * \note must include javascript : acc_ledger.js
- * \return string
-*/
-function menu_tool_deprecated($p_from)
-{
-
-    if ( ! isset ($_REQUEST['gDossier']))
-        return "" ;
-    $r=3D"";
-
-    $r.=3D '<div class=3D"u_tool">';
-    $r.=3D '<div class=3D"name">';
-    $r.=3D "<H2 class=3D\"dossier\"> Dossier : ".h(dossier::name())."</h=
2> ";
-    $r.=3DIButton::show_calc();
-
-    $r.=3D '</div>';
-    $r.=3D '<div class=3D"acces_direct">';
-    if ( $p_from =3D=3D 'compta') $view=3D'E';
-    else $view=3D'S';
-    $agent=3D$_SERVER['HTTP_USER_AGENT'];
-
-    $amodule=3Darray(
-                 array('value'=3D>'access.php','label'=3D>_('Tableau de =
bord')),
-                 array('value'=3D>'user_pref.php','label'=3D>_('Preferen=
ce')),
-                 array('value'=3D>'parametre.php','label'=3D>_('Param=C3=
=A8tre')),
-                 array('value'=3D>'user_login.php','label'=3D>_('Autre D=
ossier')),
-                 array('value'=3D>'logout.php','label'=3D>_('Deconnexion=
')),
-                 array('value'=3D>'new_line'),
-                 array('value'=3D>'compta.php','label'=3D>_('Compta G=C3=
=A9n=C3=A9rale')),
-                 array('value'=3D>'commercial.php','label'=3D>_('Gestion=
')),
-                 array('value'=3D>'comptanalytic.php','label'=3D>_('Comp=
t. Analytique')),
-                 array('value'=3D>'extension.php','label'=3D>_('Extensio=
n'))
-             ) ;
-
-    $gDossier=3Ddossier::id();
-
-    $r.=3D '<table>';
-    $r.=3D'<tr>';
-    foreach($amodule as $col )
-    {
-        $url=3D$col['value'].'?'.dossier::get();
-        if ( $p_from=3D=3D$col['value'])
-        {
-            $r.=3D '<td style=3D"background-color:red">'.
-                 '<a class=3D"mtitle" href=3D"'.$url.'" >'.$col['label']=
.'</a>'.
-                 '</td>';
-
-        }
-        else
-        {
-            if ( $col['value']=3D=3D'new_line')
-            {
-                $r.=3D'</tr><tr>';
-                continue;
-            }
-            $r.=3D '<td class=3D"tool">'.
-                 '<a class=3D"cell" href=3D"'.$url.'" >'.$col['label'].'=
</a>'.
-                 '</td>';
-        }
-
-    }
-    $r.=3D'<td class=3D"tool">';
-    $r.=3D '<A class=3D"cell" HREF=3D"javascript:openRecherche('.$gDossi=
er.')">'.
-         _('Recherche').'</a></td>';
-    $r.=3D'</tr>';
-
-    $r.=3D '</table>';
-    $r.=3D '</div>';
-    $r.=3D '</div>';
-
-    $r.=3D '</div>';
-    return $r;
-}



From MAILER-DAEMON Mon Nov 07 16:10:49 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RNWSv-0006IG-QN
	for mharc-phpcompta-dev@gnu.org; Mon, 07 Nov 2011 16:10:49 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon,  7 Nov 2011 22:16:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.70681.1320700248.15867.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4318 - in phpcompta/trunk: html 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: Mon, 07 Nov 2011 21:10:47 -0000

Author: danydb
Date: 2011-11-07 22:16:45 +0100 (Mon, 07 Nov 2011)
New Revision: 4318

Modified:
   phpcompta/trunk/html/export.php
   phpcompta/trunk/html/popup.php
   phpcompta/trunk/html/recherche.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/balance.inc.php
   phpcompta/trunk/include/class_acc_account_ledger.php
   phpcompta/trunk/include/class_anc_acc_list.php
   phpcompta/trunk/include/class_anc_balance_double.php
   phpcompta/trunk/include/class_anc_balance_simple.php
   phpcompta/trunk/include/class_anc_group.php
   phpcompta/trunk/include/class_anc_listing.php
   phpcompta/trunk/include/class_anc_table.php
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/class_user.php
   phpcompta/trunk/include/compta_ven.inc.php
   phpcompta/trunk/include/history_operation.inc.php
   phpcompta/trunk/include/impress_bilan.inc.php
   phpcompta/trunk/include/impress_fiche.inc.php
   phpcompta/trunk/include/impress_jrn.inc.php
   phpcompta/trunk/include/impress_rapport.inc.php
   phpcompta/trunk/include/param_sec.inc.php
   phpcompta/trunk/include/template/menu.php
   phpcompta/trunk/include/template/module.php
   phpcompta/trunk/sql/object-6.0.sql
   phpcompta/trunk/sql/upgrade.sql
Log:
432: Modularit?\195?\169: impact sur la s?\195?\169curit?\195?\169 des im=
pressions et export CSV

Add new_line for menu & module=20
Improve javascript support (module + menu)


Modified: phpcompta/trunk/html/export.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/export.php	2011-11-05 23:39:54 UTC (rev 4317)
+++ phpcompta/trunk/html/export.php	2011-11-07 21:16:45 UTC (rev 4318)
@@ -32,144 +32,127 @@
 $gDossier=3Ddossier::id();
 $cn=3Dnew Database($gDossier);
=20
-/**
- *@todo check the security here
- */
-
 $user=3Dnew User($cn);
 $user->Check();
 $act=3D$user->check_dossier($gDossier);
=20
-if ( $act=3D=3D'X' || ! isset($_GET['act']) )
+if ( $act=3D=3D'X' || ! isset($_GET['act']) || $user->check_print($_GET[=
'act'])=3D=3D0 )
   {
     echo alert('Acc=C3=A8s interdit');
+	redirect("do.php?".dossier::get());
     exit();
   }
=20
-switch( $_GET['act'])
+
+  switch( $_GET['act'])
   {
-  case 'CSV/histo':
-    $user->can_request(IMPJRN,0);
+  case 'CSV:histo':
     require_once('export_histo_csv.php');
     exit();
     break;
-  case 'CSV/ledger':
-    $user->can_request(IMPJRN,0);
+  case 'CSV:ledger':
     require_once('export_ledger_csv.php');
     exit();
     break;
-  case 'PDF/ledger':
-    $user->can_request(IMPJRN,0);
+  case 'PDF:ledger':
     require_once('export_ledger_pdf.php');
     exit();
     break;
=20
-  case 'CSV/postedetail':
-    $user->can_request(IMPPOSTE,0);
+  case 'CSV:postedetail':
     require_once('export_poste_detail_csv.php');
     exit();
     break;
-  case 'PDF/postedetail':
-    $user->can_request(IMPPOSTE,0);
+  case 'PDF:postedetail':
     require_once('export_poste_detail_pdf.php');
     exit();
     break;
-  case 'CSV/fichedetail':
-    $user->can_request(IMPPOSTE,0);
+  case 'CSV:fichedetail':
     require_once('export_fiche_detail_csv.php');
     exit();
     break;
-  case 'PDF/fichedetail':
-    $user->can_request(IMPPOSTE,0);
+  case 'PDF:fichedetail':
     require_once('export_fiche_detail_pdf.php');
     exit();
     break;
=20
-  case 'CSV/fiche_balance':
-    $user->can_request(IMPFIC,0);
+  case 'CSV:fiche_balance':
     require_once('export_fiche_balance_csv.php');
     exit();
     break;
-  case 'PDF/fiche_balance':
-    $user->can_request(IMPFIC,0);
+  case 'PDF:fiche_balance':
     require_once('export_fiche_balance_pdf.php');
     exit();
     break;
-  case 'CSV/report':
+  case 'CSV:report':
     require_once('export_form_csv.php');
     exit();
     break;
-  case 'PDF/report':
+  case 'PDF:report':
     require_once('export_form_pdf.php');
     exit();
     break;
-  case 'CSV/fiche':
-    $user->can_request(IMPFIC,0);
+  case 'CSV:fiche':
     require_once('export_fiche_csv.php');
     exit();
     break;
-  case 'PDF/fiche':
-    $user->can_request(IMPFIC,0);
+  case 'PDF:fiche':
     require_once('export_fiche_pdf.php');
     exit();
     break;
-  case 'CSV/glcompte':
-    $user->can_request(IMPBIL,0);
+  case 'CSV:glcompte':
     require_once('export_gl_csv.php');
     exit();
     break;
-  case 'PDF/glcompte':
-    $user->can_request(IMPBIL,0);
+  case 'PDF:glcompte':
     require_once('export_gl_pdf.php');
     exit();
     break;
-  case 'PDF/sec':
-    $user->can_request(PARSEC,1);
+  case 'PDF:sec':
     require_once('export_security_pdf.php');
     exit();
     break;
-  case 'CSV/AncList':
+  case 'CSV:AncList':
     require_once('export_anc_list_csv.php');
     exit();
     break;
-  case 'CSV/AncBalSimple':
+  case 'CSV:AncBalSimple':
     require_once('export_anc_balance_simple_csv.php');
     exit();
     break;
-  case 'PDF/AncBalSimple':
+  case 'PDF:AncBalSimple':
     require_once('export_anc_balance_simple_pdf.php');
     exit();
     break;
-  case 'CSV/AncBalDouble':
+  case 'CSV:AncBalDouble':
     require_once('export_anc_balance_double_csv.php');
     exit();
     break;
-  case 'PDF/AncBalDouble':
+  case 'PDF:AncBalDouble':
     require_once('export_anc_balance_double_pdf.php');
     exit();
     break;
-  case 'CSV/balance':
+  case 'CSV:balance':
     require_once('export_balance_csv.php');
     exit();
     break;
-  case 'PDF/balance':
+  case 'PDF:balance':
     require_once('export_balance_pdf.php');
     exit();
     break;
-  case 'CSV/AncTable':
+  case 'CSV:AncTable':
     require_once('export_anc_table_csv.php');
     exit();
     break;
-  case 'CSV/AncAccList':
+  case 'CSV:AncAccList':
     require_once('export_anc_acc_list_csv.php');
     exit();
     break;
-  case 'CSV/AncBalGroup':
+  case 'CSV:AncBalGroup':
     require_once('export_anc_balance_group_csv.php');
     exit();
     break;
-  case 'OTH/Bilan':
-      $user->can_request(IMPBIL);
+  case 'OTH:Bilan':
       require_once 'export_bilan_oth.php';
       exit();
       break;

Modified: phpcompta/trunk/html/popup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/popup.php	2011-11-05 23:39:54 UTC (rev 4317)
+++ phpcompta/trunk/html/popup.php	2011-11-07 21:16:45 UTC (rev 4318)
@@ -42,13 +42,13 @@
=20
     if (isset($_GET['pcm_val']) )
       {
-	$href_csv=3D"export.php?".$href.'&poste_id=3D'.$_GET['pcm_val'].'&ople=3D=
0&type=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DCSV/postedetail";
-	$href_pdf=3D"export.php?".$href.'&poste_id=3D'.$_GET['pcm_val'].'&ople=3D=
0&type=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DPDF/postedetail";;
+	$href_csv=3D"export.php?".$href.'&poste_id=3D'.$_GET['pcm_val'].'&ople=3D=
0&type=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DCSV:postedetail";
+	$href_pdf=3D"export.php?".$href.'&poste_id=3D'.$_GET['pcm_val'].'&ople=3D=
0&type=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DPDF:postedetail";;
       }
     else
       {
-	$href_csv=3D"export.php?".$href.'&f_id=3D'.$_GET['f_id'].'&ople=3D0&typ=
e=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DCSV/fichedetail";
-	$href_pdf=3D"export.php?".$href.'&f_id=3D'.$_GET['f_id'].'&ople=3D0&typ=
e=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DPDF/fichedetail";
+	$href_csv=3D"export.php?".$href.'&f_id=3D'.$_GET['f_id'].'&ople=3D0&typ=
e=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DCSV:fichedetail";
+	$href_pdf=3D"export.php?".$href.'&f_id=3D'.$_GET['f_id'].'&ople=3D0&typ=
e=3Dposte&'.$from_periode.'&'.$to_periode."&act=3DPDF:fichedetail";
       }
=20
     echo '<a class=3D"button"  href=3D"'.$href_csv.'">Export CSV</a>';

Modified: phpcompta/trunk/html/recherche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/recherche.php	2011-11-05 23:39:54 UTC (rev 4317)
+++ phpcompta/trunk/html/recherche.php	2011-11-07 21:16:45 UTC (rev 4318)
@@ -99,7 +99,7 @@
     }
     echo '<form action=3D"export.php" method=3D"get">';
     echo $r;
-    echo HtmlInput::hidden('act','CSV/histo');
+    echo HtmlInput::hidden('act','CSV:histo');
     echo HtmlInput::submit('viewsearch','Export vers CSV');
     echo HtmlInput::hidden('p_action','ALL');
     echo '</form>';

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-05 23:39:54 UTC (rev 43=
17)
+++ phpcompta/trunk/include/ac_common.php	2011-11-07 21:16:45 UTC (rev 43=
18)
@@ -737,7 +737,7 @@
     global $g_user;
     $cn =3D Dossier::connect();
     $amodule =3D $cn->get_array("select
-	me_code,me_menu,me_url
+	me_code,me_menu,me_url,me_javascript,p_order
 	from v_all_menu
 	where
 	user_name=3D$1
@@ -826,7 +826,7 @@
     global $g_user;
     $cn =3D Dossier::connect();
     $amenu =3D $cn->get_array("select
-	me_menu,me_code
+	me_menu,me_code,me_url,me_javascript
 	from v_all_menu
 	where
 	me_code_dep=3D$1 and user_name=3D$2 order by p_order", array($module[$i=
dx], $g_user->login));
@@ -852,7 +852,7 @@
 		$file =3D $cn->get_array("select me_file,me_parameter,me_javascript
 		from menu_ref
 		where
-		me_code=3D$1 and=20
+		me_code=3D$1 and
 		(me_file is not null or trim(me_file) <>'' or
 		me_javascript is not null or trim (me_javascript) <> '')", array($modu=
le[$idx]));
=20

Modified: phpcompta/trunk/include/balance.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/balance.inc.php	2011-11-05 23:39:54 UTC (rev =
4317)
+++ phpcompta/trunk/include/balance.inc.php	2011-11-07 21:16:45 UTC (rev =
4318)
@@ -179,7 +179,7 @@
     dossier::hidden().
     HtmlInput::submit('bt_pdf',"Export PDF").
     HtmlInput::hidden("ac",$_REQUEST['ac']).
-    HtmlInput::hidden("act","PDF/balance").
+    HtmlInput::hidden("act","PDF:balance").
=20
     HtmlInput::hidden("from_periode",$_GET['from_periode']).
     HtmlInput::hidden("to_periode",$_GET['to_periode']);
@@ -200,7 +200,7 @@
     echo '<TD><form method=3D"GET" ACTION=3D"export.php">'.
     HtmlInput::submit('bt_csv',"Export CSV").
     dossier::hidden().
-    HtmlInput::hidden("act","CSV/balance").
+    HtmlInput::hidden("act","CSV:balance").
     HtmlInput::hidden("from_periode",$_GET['from_periode']).
     HtmlInput::hidden("to_periode",$_GET['to_periode']);
     echo HtmlInput::get_to_hidden(array('ac'));

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	2011-11-05 23:39=
:54 UTC (rev 4317)
+++ phpcompta/trunk/include/class_acc_account_ledger.php	2011-11-07 21:16=
:45 UTC (rev 4318)
@@ -429,12 +429,12 @@
       switch($actiontarget)
 	{
 	case 'poste':
-	  $action_csv=3D'CSV/postedetail';
-	  $action_pdf=3D'PDF/postedetail';
+	  $action_csv=3D'CSV:postedetail';
+	  $action_pdf=3D'PDF:postedetail';
 	  break;
 	case 'gl_comptes':
-	  $action_csv=3D'CSV/glcompte';
-	  $action_pdf=3D'PDF/glcompte';
+	  $action_csv=3D'CSV:glcompte';
+	  $action_pdf=3D'PDF:glcompte';
 	  break;
 	default:
 	  throw new Exception(" Fonction HtmlTableHeader argument actiontarget =
invalid");

Modified: phpcompta/trunk/include/class_anc_acc_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_anc_acc_list.php	2011-11-05 23:39:54 UT=
C (rev 4317)
+++ phpcompta/trunk/include/class_anc_acc_list.php	2011-11-07 21:16:45 UT=
C (rev 4318)
@@ -189,7 +189,7 @@
   {
     $r=3D"";
     $r.=3D '<form method=3D"GET" action=3D"export.php"  style=3D"display=
:inline">';
-    $r.=3D HtmlInput::hidden("act","CSV/AncAccList");
+    $r.=3D HtmlInput::hidden("act","CSV:AncAccList");
     $r.=3D HtmlInput::hidden("to",$this->to);
     $r.=3D HtmlInput::hidden("from",$this->from);
     $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);

Modified: phpcompta/trunk/include/class_anc_balance_double.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_balance_double.php	2011-11-05 23:39=
:54 UTC (rev 4317)
+++ phpcompta/trunk/include/class_anc_balance_double.php	2011-11-07 21:16=
:45 UTC (rev 4318)
@@ -354,7 +354,7 @@
         $r.=3D '<form method=3D"GET" action=3D"export.php" style=3D"disp=
lay:inline">';
         $r.=3D $p_string;
         $r.=3D HtmlInput::hidden("to",$this->to);
-        $r.=3D HtmlInput::hidden("act","PDF/AncBalDouble");
+        $r.=3D HtmlInput::hidden("act","PDF:AncBalDouble");
         $r.=3D HtmlInput::hidden("from",$this->from);
         $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);
         $r.=3D HtmlInput::hidden("from_poste",$this->from_poste);
@@ -368,7 +368,7 @@
=20
         $r.=3D '<form method=3D"GET" action=3D"export.php"  style=3D"dis=
play:inline">';
         $r.=3D HtmlInput::hidden("to",$this->to);
-        $r.=3D HtmlInput::hidden("act","CSV/AncBalDouble");
+        $r.=3D HtmlInput::hidden("act","CSV:AncBalDouble");
         $r.=3D HtmlInput::hidden("from",$this->from);
         $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);
         $r.=3D HtmlInput::hidden("from_poste",$this->from_poste);

Modified: phpcompta/trunk/include/class_anc_balance_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_anc_balance_simple.php	2011-11-05 23:39=
:54 UTC (rev 4317)
+++ phpcompta/trunk/include/class_anc_balance_simple.php	2011-11-07 21:16=
:45 UTC (rev 4318)
@@ -246,7 +246,7 @@
         $r.=3D $p_string;
         $r.=3D dossier::hidden();
         $r.=3D HtmlInput::hidden("to",$this->to);
-        $r.=3D HtmlInput::hidden("act","PDF/AncBalSimple");
+        $r.=3D HtmlInput::hidden("act","PDF:AncBalSimple");
=20
         $r.=3D HtmlInput::hidden("from",$this->from);
         $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);
@@ -256,7 +256,7 @@
         $r.=3D '</form>';
=20
         $r.=3D '<form method=3D"GET" action=3D"export.php"  style=3D"dis=
play:inline">';
-        $r.=3D HtmlInput::hidden("act","CSV/AncBalSimple");
+        $r.=3D HtmlInput::hidden("act","CSV:AncBalSimple");
         $r.=3D HtmlInput::hidden("to",$this->to);
         $r.=3D HtmlInput::hidden("from",$this->from);
         $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);

Modified: phpcompta/trunk/include/class_anc_group.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_group.php	2011-11-05 23:39:54 UTC (=
rev 4317)
+++ phpcompta/trunk/include/class_anc_group.php	2011-11-07 21:16:45 UTC (=
rev 4318)
@@ -205,7 +205,7 @@
   {
     $r=3D"";
     $r.=3D '<form method=3D"GET" action=3D"export.php"  style=3D"display=
:inline">';
-    $r.=3D HtmlInput::hidden("act","CSV/AncBalGroup");
+    $r.=3D HtmlInput::hidden("act","CSV:AncBalGroup");
     $r.=3D HtmlInput::hidden("to",$this->to);
     $r.=3D HtmlInput::hidden("from",$this->from);
     $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);

Modified: phpcompta/trunk/include/class_anc_listing.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_anc_listing.php	2011-11-05 23:39:54 UTC=
 (rev 4317)
+++ phpcompta/trunk/include/class_anc_listing.php	2011-11-07 21:16:45 UTC=
 (rev 4318)
@@ -189,7 +189,7 @@
         $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);
         $r.=3D HtmlInput::hidden("from_poste",$this->from_poste);
         $r.=3D HtmlInput::hidden("to_poste",$this->to_poste);
-	$r.=3DHtmlInput::hidden('act','CSV/AncList');
+	$r.=3DHtmlInput::hidden('act','CSV:AncList');
         $r.=3D $p_string;
         $r.=3D dossier::hidden();
         $r.=3DHtmlInput::submit('bt_csv',"Export en CSV");

Modified: phpcompta/trunk/include/class_anc_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/class_anc_table.php	2011-11-05 23:39:54 UTC (=
rev 4317)
+++ phpcompta/trunk/include/class_anc_table.php	2011-11-07 21:16:45 UTC (=
rev 4318)
@@ -103,7 +103,7 @@
   {
     $r=3D"";
     $r.=3D '<form method=3D"GET" action=3D"export.php"  style=3D"display=
:inline">';
-    $r.=3D HtmlInput::hidden("act","CSV/AncTable");
+    $r.=3D HtmlInput::hidden("act","CSV:AncTable");
     $r.=3D HtmlInput::hidden("to",$this->to);
     $r.=3D HtmlInput::hidden("from",$this->from);
     $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2011-11-05 23:39:54 UTC (rev =
4317)
+++ phpcompta/trunk/include/class_fiche.php	2011-11-07 21:16:45 UTC (rev =
4318)
@@ -1386,7 +1386,7 @@
         echo '<TD><form method=3D"GET" ACTION=3D"export.php">'.
         HtmlInput::submit('bt_pdf',"Export PDF").
         dossier::hidden().$str_ople.
-	  HtmlInput::hidden('act','PDF/fichedetail').
+	  HtmlInput::hidden('act','PDF:fichedetail').
         $hid->input("type","poste").
         $hid->input('p_action','impress').
         $hid->input("f_id",$this->id).
@@ -1400,7 +1400,7 @@
=20
         echo '<TD><form method=3D"GET" ACTION=3D"export.php">'.
         HtmlInput::submit('bt_csv',"Export CSV").
-	  HtmlInput::hidden('act','PDF/fichedetail').
+	  HtmlInput::hidden('act','PDF:fichedetail').
         dossier::hidden().$str_ople.
         $hid->input("type","poste").
         $hid->input('p_action','impress').

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2011-11-05 23:39:54 UTC (rev 4=
317)
+++ phpcompta/trunk/include/class_user.php	2011-11-07 21:16:45 UTC (rev 4=
318)
@@ -688,6 +688,51 @@
 		}
 	}
=20
+	/**
+	 *  !\brief Check if the user can print (in menu_ref p_type_display=3Dp=
)
+	 * 	otherwise warn and exit
+	 * \param $p_action requested action
+	 * \return nothing the program exits automatically
+	 */
+	function check_print($p_action)
+	{
+		global $audit,$cn;
+		if ($this->Admin() =3D=3D 1)
+			return 1;
+		if ($this->is_local_admin(dossier::id()) =3D=3D 1)
+			return 1;
+		$res=3D$cn->get_value("select count(*) from profile_menu
+			join profile_user using (p_id)
+			where user_name=3D$1 and me_code=3D$2 ",
+				array($this->login,$p_action));
+		return $res;
+
+	}
+	/* !\brief Check if the user can print (in menu_ref p_type_display=3Dp)
+	 * otherwise warn and exit
+	 * \param $p_action requested action
+	 * \return nothing the program exits automatically
+	 */
+
+	function can_print($p_action, $p_js=3D0)
+	{
+		if ($this->check_print($p_action) =3D=3D 0)
+		{
+			if ($p_js =3D=3D 1)
+			{
+				echo "<script>";
+				echo "alert ('Cette action ne vous est pas autoris=C3=A9e. Contactez=
 votre responsable');";
+				echo "</script>";
+			}
+			else
+			{
+				echo '<div class=3D"u_redcontent">';
+				echo '<h2 class=3D"error"> Cette action ne vous est pas autoris=C3=A9=
e Contactez votre responsable</h2>';
+				echo '</div>';
+			}
+			exit(-1);
+		}
+	}
 	/* !
 	 * \brief  Check if an user is an local administrator
 	 *

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	2011-11-05 23:39:54 UTC (r=
ev 4317)
+++ phpcompta/trunk/include/compta_ven.inc.php	2011-11-07 21:16:45 UTC (r=
ev 4318)
@@ -332,7 +332,7 @@
     }
     echo '<form action=3D"export.php" method=3D"get">';
     echo $r;
-    echo HtmlInput::hidden('act','CSV/histo');
+    echo HtmlInput::hidden('act','CSV:histo');
     echo HtmlInput::submit('viewsearch','Export vers CSV');
=20
     echo '</form>';

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	2011-11-05 23:39:54=
 UTC (rev 4317)
+++ phpcompta/trunk/include/history_operation.inc.php	2011-11-07 21:16:45=
 UTC (rev 4318)
@@ -137,7 +137,7 @@
 }
 echo '<form action=3D"export.php" method=3D"get">';
 echo $r;
-echo HtmlInput::hidden('act', 'CSV/histo');
+echo HtmlInput::hidden('act', 'CSV:histo');
 echo HtmlInput::submit('viewsearch', 'Export vers CSV');
=20
 echo '</form>';

Modified: phpcompta/trunk/include/impress_bilan.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_bilan.inc.php	2011-11-05 23:39:54 UTC=
 (rev 4317)
+++ phpcompta/trunk/include/impress_bilan.inc.php	2011-11-07 21:16:45 UTC=
 (rev 4318)
@@ -78,7 +78,7 @@
     echo dossier::hidden();
     echo HtmlInput::get_to_hidden(array('exercice'));
     echo HtmlInput::hidden('b_id',$_GET['b_id']);
-    echo HtmlInput::hidden('act','OTH/Bilan');
+    echo HtmlInput::hidden('act','OTH:Bilan');
=20
     echo HtmlInput::hidden('from_periode',$bilan->from);
     echo HtmlInput::hidden('to_periode',$bilan->to);

Modified: phpcompta/trunk/include/impress_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/impress_fiche.inc.php	2011-11-05 23:39:54 UTC=
 (rev 4317)
+++ phpcompta/trunk/include/impress_fiche.inc.php	2011-11-07 21:16:45 UTC=
 (rev 4318)
@@ -105,7 +105,7 @@
     $hid=3Dnew IHidden();
     echo '<form method=3D"GET" ACTION=3D"export.php">'.dossier::hidden()=
.
     HtmlInput::submit('bt_csv',"Export CSV").
-    HtmlInput::hidden('act',"CSV/fiche").
+    HtmlInput::hidden('act',"CSV:fiche").
     $hid->input("type","fiche").
     $hid->input("ac",$_REQUEST['ac']).
     $hid->input("fd_id",$_REQUEST['cat']);
@@ -115,7 +115,7 @@
 }
 $export_pdf=3D'<FORM METHOD=3D"get" ACTION=3D"export.php" style=3D"displ=
ay:inline">';
 $export_pdf.=3DHtmlInput::hidden('cat',$_GET['cat']);
-$export_pdf.=3DHtmlInput::hidden('act',"PDF/fiche_balance").
+$export_pdf.=3DHtmlInput::hidden('act',"PDF:fiche_balance").
 $export_pdf.=3DHtmlInput::hidden('start',$_GET['start']);
 $export_pdf.=3DHtmlInput::hidden('end',$_GET['end']);
 $export_pdf.=3DHtmlInput::hidden('histo',$_GET['histo']);
@@ -125,7 +125,7 @@
 $export_csv=3D'<FORM METHOD=3D"get" ACTION=3D"export.php" style=3D"displ=
ay:inline">';
=20
 $export_csv.=3DHtmlInput::hidden('cat',$_GET['cat']);
-$export_csv.=3DHtmlInput::hidden('act','CSV/fiche_balance');
+$export_csv.=3DHtmlInput::hidden('act','CSV:fiche_balance');
 $export_csv.=3DHtmlInput::hidden('start',$_GET['start']);
 $export_csv.=3DHtmlInput::hidden('end',$_GET['end']);
 $export_csv.=3DHtmlInput::hidden('histo',$_GET['histo']);

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	2011-11-05 23:39:54 UTC (=
rev 4317)
+++ phpcompta/trunk/include/impress_jrn.inc.php	2011-11-07 21:16:45 UTC (=
rev 4318)
@@ -170,7 +170,7 @@
=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').
+      HtmlInput::hidden('act','PDF:ledger').
     $hid->input("type","jrn").
     $hid->input("jrn_id",$Jrn->id).
     $hid->input("from_periode",$_GET['from_periode']).
@@ -181,7 +181,7 @@
=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').
+      HtmlInput::hidden('act','CSV:ledger').
     $hid->input("type","jrn").
     $hid->input("jrn_id",$Jrn->id).
     $hid->input("from_periode",$_GET['from_periode']).

Modified: phpcompta/trunk/include/impress_rapport.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_rapport.inc.php	2011-11-05 23:39:54 U=
TC (rev 4317)
+++ phpcompta/trunk/include/impress_rapport.inc.php	2011-11-07 21:16:45 U=
TC (rev 4318)
@@ -94,7 +94,7 @@
=20
     echo '<TD><form method=3D"GET" ACTION=3D"export.php">'.
     HtmlInput::submit('bt_pdf',"Export PDF").
-      HtmlInput::hidden('act','PDF/report').
+      HtmlInput::hidden('act','PDF:report').
     dossier::hidden().
     $hid->input("type","rapport").
     $hid->input("ac",$_GET['ac']).
@@ -111,7 +111,7 @@
=20
     echo "</form></TD>";
     echo '<TD><form method=3D"GET" ACTION=3D"export.php">'.
-      HtmlInput::hidden('act','CSV/report').
+      HtmlInput::hidden('act','CSV:report').
     HtmlInput::submit('bt_csv',"Export CSV").
     dossier::hidden().
     $hid->input("type","form").

Modified: phpcompta/trunk/include/param_sec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_sec.inc.php	2011-11-05 23:39:54 UTC (re=
v 4317)
+++ phpcompta/trunk/include/param_sec.inc.php	2011-11-07 21:16:45 UTC (re=
v 4318)
@@ -208,7 +208,7 @@
     $sec_User=3Dnew User($cn_dossier,$_GET['user_id']);
=20
     echo '<form method=3D"post">';
-    $sHref=3Dsprintf ('export.php?p_action=3Dsec&act=3DPDF/sec&user_id=3D=
%s&'.$str_dossier ,
+    $sHref=3Dsprintf ('export.php?p_action=3Dsec&act=3DPDF:sec&user_id=3D=
%s&'.$str_dossier ,
                     $_GET ['user_id']
                    );
=20

Modified: phpcompta/trunk/include/template/menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu.php	2011-11-05 23:39:54 UTC (re=
v 4317)
+++ phpcompta/trunk/include/template/menu.php	2011-11-07 21:16:45 UTC (re=
v 4318)
@@ -26,14 +26,27 @@
 	    else:
 		$class=3D"mtitle";
 	    $url=3D"";$pt=3D"";
-
+		$js=3D"";
 	    for ($e=3D0;$e <=3D $idx;$e++):
-		$url.=3D$pt.$module[$e];
-		$pt=3D"/";
+			$url.=3D$pt.$module[$e];
+			$pt=3D"/";
 	    endfor;
-	    $url.=3D$pt.$amenu[$i]['me_code'];
+		if ( $amenu[$i]['me_url']!=3D'')
+		{
+			$url=3D$row['me_url'];
+		}
+		elseif ($amenu[$i]['me_javascript'] !=3D '')
+		{
+			$url=3D"javascript:void(0)";
+			$js=3Dsprintf(' onclick=3D"%s"',$amenu[$i]['me_javascript']);
+		}
+		else
+		{
+			$url.=3D$pt.$amenu[$i]['me_code'];
+		}
+
 ?>	<td class=3D"<?=3D$class?>">
-	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$url?>">
+	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$url?>" <?=3D$js?> >
 	    <?=3D$amenu[$i]['me_menu']?>
 	    </a>
 	</td>

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2011-11-05 23:39:54 UTC (=
rev 4317)
+++ phpcompta/trunk/include/template/module.php	2011-11-07 21:16:45 UTC (=
rev 4318)
@@ -22,9 +22,9 @@
 	    <tr>
 		<?php
 		foreach ($amodule as $row):
-
+			$js=3D"";
 		    $style=3D"background:white";
-		    if ( $row['me_menu']=3D=3D'new_line')
+		    if ( $row['me_code']=3D=3D'new_line')
 		    {
 			echo "</tr><tr>";
 			continue;
@@ -37,12 +37,17 @@
 		    {
 			$url=3D$row['me_url'];
 		    }
-		    else
+		    elseif ($row['me_javascript'] !=3D '')
+			{
+				$url=3D"javascript:void(0)";
+				$js=3Dsprintf(' onclick=3D"%s"',$row['me_javascript']);
+			}
+			else
 		    {
-			$url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['me_code'];
+				$url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['me_code'];
 		    }
 		    ?>
-		<td class=3D"tool" style=3D"<?=3D$style?>"><a class=3D"mtitle" href=3D=
"<?=3D$url?>"><?=3D$row['me_menu']?></td>
+		<td class=3D"tool" style=3D"<?=3D$style?>"><a class=3D"mtitle" href=3D=
"<?=3D$url?>" <?=3D$js?> ><?=3D$row['me_menu']?></td>
 		<?
 		    endforeach;
 		?>

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-05 23:39:54 UTC (rev 4317)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-07 21:16:45 UTC (rev 4318)
@@ -26,7 +26,8 @@
     me_url text,
     me_description text,
     me_parameter text,
-    me_javascript text
+    me_javascript text,
+    me_type character varying(2)
 );
=20
=20
@@ -61,6 +62,16 @@
=20
=20
 --
+-- Name: COLUMN menu_ref.me_type; Type: COMMENT; Schema: public; Owner: =
dany
+--
+
+COMMENT ON COLUMN menu_ref.me_type IS 'ME for menu
+PR for Printing
+SP for special meaning (ex: return to line)
+PL for plugin';
+
+
+--
 -- Name: profile; Type: TABLE; Schema: public; Owner: dany; Tablespace:=20
 --
=20
@@ -172,7 +183,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 153, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 156, true);
=20
=20
 --
@@ -300,110 +311,111 @@
 -- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan=
y
 --
=20
-INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, NULL, NU=
LL, 'popup_recherche()');
-INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL);
-INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL);
-INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, NULL, NULL=
, NULL);
-INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment=
_middle.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, NULL,=
 NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL=
L, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL=
L, NULL, NULL);
-INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU=
LL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, NULL, 'ledger_type=3DODS', NULL)=
;
-INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, =
NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi=
nies', 'preod.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DACH', NULL);
-INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph=
p', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, NULL, =
NULL, 'search_reconcile()');
-INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc=
.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php=
', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in=
c.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php=
', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes=
.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', NUL=
L, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp=
ress_fiche.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'=
, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph=
p', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie=
nt.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N=
ULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DVEN', NULL);
-INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card=
_attr.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL=
, NULL, NULL);
-INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL, NUL=
L, NULL);
-INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU=
LL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc=
.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL=
L, NULL, NULL);
-INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, NULL, NULL, NULL=
, NULL);
-INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL, NUL=
L, NULL);
-INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param=
_sec.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card=
.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou=
nt.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, NULL, NUL=
L, NULL);
-INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NUL=
L, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGDOCUMENT', 'Document', 'document_modele=
.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'=
, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in=
c.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', NULL, NULL, NULL, =
NULL, NULL);
-INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', =
NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, N=
ULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, NULL, 'ledger_type=3DALL', NULL);
-INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, NULL, N=
ULL, NULL);
-INSERT INTO menu_ref VALUES ('TVA', 'Tva', 'extension_get.inc.php', NULL=
, NULL, 'plugin_code=3DAMORTIS', NULL);
-INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'extension_choice=
.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, NULL, NULL,=
 NULL);
-INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FINIMP', 'Historique financier', 'history_=
operation.inc.php', NULL, NULL, 'ledger_type=3DFIN', NULL);
-INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FINSALDO', 'Soldes', 'compta_fin_saldo.inc=
.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('FINREC', 'Rapprochement', 'compta_fin_rec.=
inc.php', NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/histo', 'Export Historique', NULL, NUL=
L, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/report', 'Export report', NULL, NULL, =
NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/report', 'Export report', NULL, NULL, =
NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/sec', 'Export S=C3=A9curit=C3=A9', NUL=
L, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/AncList', 'Export Comptabilit=C3=A9 an=
alytique', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique balance simple', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('PDF/balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('CSV/AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO menu_ref VALUES ('OTH/Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL);
+INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, NULL, NU=
LL, 'popup_recherche()', 'ME');
+INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, NULL, NULL=
, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment=
_middle.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, NULL,=
 NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL=
L, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL=
L, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU=
LL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PDF:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, NULL, 'ledger_type=3DODS', NULL,=
 'ME');
+INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, =
NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi=
nies', 'preod.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DACH', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph=
p', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL, NUL=
L, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param=
_sec.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou=
nt.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, NULL, NUL=
L, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NUL=
L, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGDOCUMENT', 'Document', 'document_modele=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in=
c.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', =
NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, N=
ULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, NULL, 'ledger_type=3DALL', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, NULL, N=
ULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('TVA', 'Tva', 'extension_get.inc.php', NULL=
, NULL, 'plugin_code=3DAMORTIS', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'extension_choice=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, NULL, NULL,=
 NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FINIMP', 'Historique financier', 'history_=
operation.inc.php', NULL, NULL, 'ledger_type=3DFIN', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FINSALDO', 'Soldes', 'compta_fin_saldo.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FINREC', 'Rapprochement', 'compta_fin_rec.=
inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'=
, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, NULL, =
NULL, 'search_reconcile()', 'ME');
+INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', 'cfgledger.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in=
c.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', NUL=
L, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp=
ress_fiche.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'=
, NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph=
p', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie=
nt.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N=
ULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DVEN', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card=
_attr.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL=
, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL, NUL=
L, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU=
LL, NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL=
L, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, NULL, NULL, NULL=
, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PDF:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:sec', 'Export S=C3=A9curit=C3=A9', NUL=
L, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncList', 'Export Comptabilit=C3=A9 an=
alytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique balance simple', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:histo', 'Export Historique', NULL, NUL=
L, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('new_line', NULL, NULL, NULL, 'Saut de lign=
e', NULL, NULL, 'SP');
=20
=20
 --
@@ -419,10 +431,8 @@
 -- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 dany
 --
=20
-INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 2, 'M', NULL);
 INSERT INTO profile_menu VALUES (51, 'COMPTA', NULL, 3, 1, 'M', NULL);
 INSERT INTO profile_menu VALUES (52, 'VEN', 'COMPTA', 3, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 18, 'M', NULL);
 INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', NULL=
);
@@ -438,7 +448,6 @@
 INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '=
E', NULL);
 INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E',=
 NULL);
-INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 19, 'M', NULL);
 INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E', =
NULL);
 INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', NULL)=
;
 INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E', =
NULL);
@@ -469,61 +478,63 @@
 INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E', NULL);
 INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', NULL);
 INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 6, 'M', NULL);
 INSERT INTO profile_menu VALUES (94, 'FINSALDO', 'MENUFIN', 1, 3, 'E', N=
ULL);
 INSERT INTO profile_menu VALUES (95, 'FINREC', 'MENUFIN', 1, 4, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', NUL=
L);
 INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E', NULL);
 INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', NULL);
-INSERT INTO profile_menu VALUES (79, 'PREFERENCE', 'ANC', 1, 2, 'M', NUL=
L);
-INSERT INTO profile_menu VALUES (44, 'DASHBOARD', NULL, 1, 1, 'M', 0);
-INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 5, 'M', 0);
-INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 7, 'M', 1);
+INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', NULL);
+INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 25, 'M', NULL);
+INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', N=
ULL);
+INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', NULL);
+INSERT INTO profile_menu VALUES (44, 'DASHBOARD', NULL, 1, 10, 'M', 1);
+INSERT INTO profile_menu VALUES (156, 'new_line', NULL, 1, 35, 'M', NULL=
);
+INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', =
NULL);
 INSERT INTO profile_menu VALUES (80, 'PLANANC', 'ANC', 2, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (50, 'ANC', NULL, 2, 1, 'M', 1);
-INSERT INTO profile_menu VALUES (82, 'EXTENSION', NULL, 1, 100, 'M', NUL=
L);
-INSERT INTO profile_menu VALUES (83, 'TVA', NULL, 1, 101, 'M', NULL);
+INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
NULL);
+INSERT INTO profile_menu VALUES (126, 'CSV:postedetail', NULL, 1, NULL, =
'P', NULL);
 INSERT INTO profile_menu VALUES (84, 'TVA', 'PARAM', 1, 102, 'E', NULL);
+INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 40, 'M', 0);
 INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 45, 'M', NULL);
 INSERT INTO profile_menu VALUES (18, 'MENUODS', 'COMPTA', 1, 5, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (88, 'ODS', 'MENUODS', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (89, 'ODSIMP', 'MENUODS', 1, 2, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 50, 'M', 0);
 INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (82, 'EXTENSION', NULL, 1, 55, 'M', NULL=
);
 INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (93, 'FINIMP', 'MENUFIN', 1, 2, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (123, 'CSV/histo', NULL, 1, NULL, 'P', N=
ULL);
-INSERT INTO profile_menu VALUES (124, 'CSV/ledger', NULL, 1, NULL, 'P', =
NULL);
-INSERT INTO profile_menu VALUES (125, 'PDF/ledger', NULL, 1, NULL, 'P', =
NULL);
-INSERT INTO profile_menu VALUES (126, 'CSV/postedetail', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (127, 'PDF/postedetail', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (128, 'CSV/fichedetail', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (129, 'PDF/fichedetail', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (130, 'CSV/fiche_balance', NULL, 1, NULL=
, 'P', NULL);
-INSERT INTO profile_menu VALUES (131, 'PDF/fiche_balance', NULL, 1, NULL=
, 'P', NULL);
-INSERT INTO profile_menu VALUES (132, 'CSV/report', NULL, 1, NULL, 'P', =
NULL);
-INSERT INTO profile_menu VALUES (133, 'PDF/report', NULL, 1, NULL, 'P', =
NULL);
-INSERT INTO profile_menu VALUES (134, 'CSV/fiche', NULL, 1, NULL, 'P', N=
ULL);
-INSERT INTO profile_menu VALUES (135, 'PDF/fiche', NULL, 1, NULL, 'P', N=
ULL);
-INSERT INTO profile_menu VALUES (136, 'CSV/glcompte', NULL, 1, NULL, 'P'=
, NULL);
-INSERT INTO profile_menu VALUES (137, 'PDF/glcompte', NULL, 1, NULL, 'P'=
, NULL);
-INSERT INTO profile_menu VALUES (138, 'PDF/sec', NULL, 1, NULL, 'P', NUL=
L);
-INSERT INTO profile_menu VALUES (139, 'CSV/AncList', NULL, 1, NULL, 'P',=
 NULL);
-INSERT INTO profile_menu VALUES (140, 'CSV/AncBalSimple', NULL, 1, NULL,=
 'P', NULL);
-INSERT INTO profile_menu VALUES (141, 'PDF/AncBalSimple', NULL, 1, NULL,=
 'P', NULL);
-INSERT INTO profile_menu VALUES (142, 'CSV/AncBalDouble', NULL, 1, NULL,=
 'P', NULL);
-INSERT INTO profile_menu VALUES (143, 'PDF/AncBalDouble', NULL, 1, NULL,=
 'P', NULL);
-INSERT INTO profile_menu VALUES (144, 'CSV/balance', NULL, 1, NULL, 'P',=
 NULL);
-INSERT INTO profile_menu VALUES (145, 'PDF/balance', NULL, 1, NULL, 'P',=
 NULL);
-INSERT INTO profile_menu VALUES (146, 'CSV/AncTable', NULL, 1, NULL, 'P'=
, NULL);
-INSERT INTO profile_menu VALUES (147, 'CSV/AncAccList', NULL, 1, NULL, '=
P', NULL);
-INSERT INTO profile_menu VALUES (148, 'CSV/AncBalGroup', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (149, 'OTH/Bilan', NULL, 1, NULL, 'P', N=
ULL);
-INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, NULL, 'M', NULL=
);
-INSERT INTO profile_menu VALUES (153, 'JSSEARCH', NULL, 1, NULL, 'M', NU=
LL);
+INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', NULL);
+INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', NULL);
+INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', NULL);
+INSERT INTO profile_menu VALUES (50, 'ANC', NULL, 2, 1, 'M', 0);
+INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', NULL);
+INSERT INTO profile_menu VALUES (129, 'PDF:fichedetail', NULL, 1, NULL, =
'P', NULL);
+INSERT INTO profile_menu VALUES (130, 'CSV:fiche_balance', NULL, 1, NULL=
, 'P', NULL);
+INSERT INTO profile_menu VALUES (131, 'PDF:fiche_balance', NULL, 1, NULL=
, 'P', NULL);
+INSERT INTO profile_menu VALUES (132, 'CSV:report', NULL, 1, NULL, 'P', =
NULL);
+INSERT INTO profile_menu VALUES (133, 'PDF:report', NULL, 1, NULL, 'P', =
NULL);
+INSERT INTO profile_menu VALUES (134, 'CSV:fiche', NULL, 1, NULL, 'P', N=
ULL);
+INSERT INTO profile_menu VALUES (135, 'PDF:fiche', NULL, 1, NULL, 'P', N=
ULL);
+INSERT INTO profile_menu VALUES (136, 'CSV:glcompte', NULL, 1, NULL, 'P'=
, NULL);
+INSERT INTO profile_menu VALUES (137, 'PDF:glcompte', NULL, 1, NULL, 'P'=
, NULL);
+INSERT INTO profile_menu VALUES (138, 'PDF:sec', NULL, 1, NULL, 'P', NUL=
L);
+INSERT INTO profile_menu VALUES (139, 'CSV:AncList', NULL, 1, NULL, 'P',=
 NULL);
+INSERT INTO profile_menu VALUES (140, 'CSV:AncBalSimple', NULL, 1, NULL,=
 'P', NULL);
+INSERT INTO profile_menu VALUES (141, 'PDF:AncBalSimple', NULL, 1, NULL,=
 'P', NULL);
+INSERT INTO profile_menu VALUES (142, 'CSV:AncBalDouble', NULL, 1, NULL,=
 'P', NULL);
+INSERT INTO profile_menu VALUES (143, 'PDF:AncBalDouble', NULL, 1, NULL,=
 'P', NULL);
+INSERT INTO profile_menu VALUES (144, 'CSV:balance', NULL, 1, NULL, 'P',=
 NULL);
+INSERT INTO profile_menu VALUES (145, 'PDF:balance', NULL, 1, NULL, 'P',=
 NULL);
+INSERT INTO profile_menu VALUES (146, 'CSV:AncTable', NULL, 1, NULL, 'P'=
, NULL);
+INSERT INTO profile_menu VALUES (147, 'CSV:AncAccList', NULL, 1, NULL, '=
P', NULL);
+INSERT INTO profile_menu VALUES (148, 'CSV:AncBalGroup', NULL, 1, NULL, =
'P', NULL);
+INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', N=
ULL);
=20
=20
 --
@@ -574,10 +585,10 @@
=20
=20
 --
--- Name: fki_profile_menu_menu_ref; Type: INDEX; Schema: public; Owner: =
dany; Tablespace:=20
+-- Name: fki_profile_menu_me_code; Type: INDEX; Schema: public; Owner: d=
any; Tablespace:=20
 --
=20
-CREATE INDEX fki_profile_menu_menu_ref ON profile_menu USING btree (me_c=
ode);
+CREATE INDEX fki_profile_menu_me_code ON profile_menu USING btree (me_co=
de);
=20
=20
 --
@@ -592,7 +603,7 @@
 --
=20
 ALTER TABLE ONLY profile_menu
-    ADD CONSTRAINT profile_menu_me_code_fkey FOREIGN KEY (me_code) REFER=
ENCES menu_ref(me_code);
+    ADD CONSTRAINT profile_menu_me_code_fkey FOREIGN KEY (me_code) REFER=
ENCES menu_ref(me_code) ON UPDATE CASCADE ON DELETE CASCADE;
=20
=20
 --

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	2011-11-05 23:39:54 UTC (rev 4317)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-07 21:16:45 UTC (rev 4318)
@@ -15,5 +15,6 @@
 trigger.tmp_pcmn.sql
 account_add.sql
 object-6.0.sql
+epad-style.css
 */
 create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;



From MAILER-DAEMON Tue Nov 08 14:12:09 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RNr5d-0002ql-Ma
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Nov 2011 14:12:09 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  8 Nov 2011 20:18:16 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.141.1320779528.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4319 - in 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 Nov 2011 19:12:07 -0000

Author: danydb
Date: 2011-11-08 20:18:14 +0100 (Tue, 08 Nov 2011)
New Revision: 4319

Modified:
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/js/accounting_item.js
   phpcompta/trunk/html/js/card.js
   phpcompta/trunk/html/js/modele_document.js
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
Log:

change op_detail by inner_box

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	2011-11-07 21:16:45 UTC (rev 43=
18)
+++ phpcompta/trunk/html/js/acc_ledger.js	2011-11-08 19:18:14 UTC (rev 43=
19)
@@ -519,7 +519,7 @@
 {
     layer++;
     id=3D'det'+layer;
-    var popup=3D{'id':  id,'cssclass':'op_detail','html':loading(),'drag=
':true};
+    var popup=3D{'id':  id,'cssclass':'inner_box','html':loading(),'drag=
':true};
=20
     querystring=3D'gDossier=3D'+dossier+'&act=3Dde&pcm_val=3D'+p_value+'=
&div=3D'+id;
     add_div(popup);
@@ -565,7 +565,7 @@
     layer++;
     id=3D'det'+layer;
 var popup=3D{'id':
-           id,'cssclass':'op_detail'
+           id,'cssclass':'inner_box'
            ,'html':
            loading(),'drag':
                true};
@@ -656,7 +656,7 @@
     layer++;
     id=3D'det'+layer;
     var popup=3D{'id':
-           id,'cssclass':'op_detail'
+           id,'cssclass':'inner_box'
            ,'html':
            loading(),'drag':
                true};

Modified: phpcompta/trunk/html/js/accounting_item.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/accounting_item.js	2011-11-07 21:16:45 UTC (r=
ev 4318)
+++ phpcompta/trunk/html/js/accounting_item.js	2011-11-08 19:18:14 UTC (r=
ev 4319)
@@ -76,7 +76,7 @@
 	}
=20
 	var div_style=3D"z-index:15;top:"+sx;
-	add_div({id:'search_account',cssclass:'op_detail',html:loading(),style:=
div_style,drag:true});
+	add_div({id:'search_account',cssclass:'inner_box',html:loading(),style:=
div_style,drag:true});
=20
     var dossier=3D$('gDossier').value;
=20

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2011-11-07 21:16:45 UTC (rev 4318)
+++ phpcompta/trunk/html/js/card.js	2011-11-08 19:18:14 UTC (rev 4319)
@@ -75,7 +75,7 @@
 	}
=20
 	var div_style=3D"top:"+sx+";width:60%;heigth:80%";
-	add_div({id:'search_card',cssclass:'op_detail',html:loading(),style:div=
_style,drag:true});
+	add_div({id:'search_card',cssclass:'inner_box',html:loading(),style:div=
_style,drag:true});
=20
         var action=3Dnew Ajax.Request ( 'ajax_card.php',
                                       {
@@ -300,7 +300,7 @@
     var nLeft=3DposX-20;
     var str_style=3D"top:"+nTop+";left:"+nLeft+";width:40em;height:auto"=
;
=20
-    var popup=3D{'id':  content,'cssclass':'op_detail','style':str_style=
,'html':loading(),'drag':true};
+    var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};
=20
     add_div(popup);
     var dossier=3D$('gDossier').value;
@@ -410,7 +410,7 @@
=20
     var str_style=3D"top:"+sx+";left:25%;width:50%;height:auto";
=20
-    var popup=3D{'id':  content,'cssclass':'op_detail','style':str_style=
,'html':loading(),'drag':true};
+    var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};
=20
     add_div(popup);
=20
@@ -471,7 +471,7 @@
     var nLeft=3DposX-20;
     var str_style=3D"top:"+nTop+";left:"+nLeft+";width:70em;height:auto"=
;
=20
-    var popup=3D{'id':  content,'cssclass':'op_detail','style':str_style=
,'html':loading(),'drag':true};
+    var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};
     if ( $(content)) {removeDiv(content);}
     add_div(popup);
=20
@@ -542,7 +542,7 @@
 	var div_style=3D"top:"+sx+";width:60%;heigth:80%";
     // show ipopup
 	var div=3D{id:obj.ipopup,
-			cssclass:"op_detail",drag:1,style:div_style};
+			cssclass:"inner_box",drag:1,style:div_style};
 	if ( $(div) ) {
 		removeDiv(div);
 	}

Modified: phpcompta/trunk/html/js/modele_document.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/modele_document.js	2011-11-07 21:16:45 UTC (r=
ev 4318)
+++ phpcompta/trunk/html/js/modele_document.js	2011-11-08 19:18:14 UTC (r=
ev 4319)
@@ -9,7 +9,7 @@
     var pos_x=3DposX+offsetX+40;
     var style=3D"position:absolute;top:"+pos_y+";left:"+pos_x;
     var popup=3D{'id':'mod_doc',
-	       'cssclass':'op_detail',
+	       'cssclass':'inner_box',
                'html': loading(),
 	       'drag':false,
 	       'style':style

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	2011-11-07 21:16:45 UTC (rev 4318)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-08 19:18:14 UTC (rev 4319)
@@ -437,7 +437,7 @@
 	var nLeft=3D"35%";
 	var str_style=3D"top:"+nTop+";left:"+nLeft+";width:50em;height:auto";
=20
-	var popup=3D{'id': 'tva_select','cssclass':'op_detail','style':str_styl=
e,'html':loading(),'drag':true};
+	var popup=3D{'id': 'tva_select','cssclass':'inner_box','style':str_styl=
e,'html':loading(),'drag':true};
 	add_div(popup);
         var queryString=3D"gDossier=3D"+obj.gDossier+"&op=3Ddsp_tva"+"&c=
tl=3D"+obj.ctl+'&popup=3D'+'tva_select';
         if ( obj.jcode )
@@ -869,7 +869,7 @@
      try
     {
         var queryString=3D"gDossier=3D"+p_dossier+"&op=3Dinput_per"+"&p_=
id=3D"+p_id;
-	var popup=3D{'id': 'mod_periode','cssclass':'op_detail','html':loading(=
),'style':'width:30em','drag':true};
+	var popup=3D{'id': 'mod_periode','cssclass':'inner_box','html':loading(=
),'style':'width:30em','drag':true};
 	if ( ! $('mod_periode') ) {
 	    add_div(popup);
 	}
@@ -994,7 +994,7 @@
     var sy=3DposX;
     var str_style=3D"top:"+sx+";left:"+sy;
=20
-    var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load=
ing(),drag:1};
+    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20
     add_div(div);
=20
@@ -1050,7 +1050,7 @@
         }
     var str_style=3D"top:"+sx+";left:"+sy;
=20
-    var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load=
ing(),drag:1};
+    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20
     add_div(div);
 	var target=3D{gDossier:dossier,

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	2011-11-07 21:16:45 UTC (rev 431=
8)
+++ phpcompta/trunk/html/style-color.css	2011-11-08 19:18:14 UTC (rev 431=
9)
@@ -862,7 +862,7 @@
=20
=20
 }
-div.op_detail  {
+div.inner_box  {
     background-color:#ccffcc;
     font-size:10;
     font-family:helvetica,arial,sans-serif;

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	2011-11-07 21:16:45 UTC (rev 431=
8)
+++ phpcompta/trunk/html/style-light.css	2011-11-08 19:18:14 UTC (rev 431=
9)
@@ -891,7 +891,7 @@
  =20
  =20
 }
-div.op_detail  {
+div.inner_box  {
   background-color:#e4e7ed;
  font-size:10;
   font-family:helvetica,arial,sans-serif;

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	2011-11-07 21:16:45 UTC (rev 4318)
+++ phpcompta/trunk/html/style.css	2011-11-08 19:18:14 UTC (rev 4319)
@@ -888,7 +888,7 @@
  =20
  =20
 }
-div.op_detail  {
+div.inner_box  {
   background-color:#e4e7ed;
  font-size:10;
   font-family:helvetica,sans-serif;



From MAILER-DAEMON Tue Nov 08 14:39:02 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RNrVe-0001mf-4I
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Nov 2011 14:39:02 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  8 Nov 2011 20:45:09 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.210.1320781141.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4320 - 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: Tue, 08 Nov 2011 19:39:00 -0000

Author: danydb
Date: 2011-11-08 20:45:07 +0100 (Tue, 08 Nov 2011)
New Revision: 4320

Removed:
   phpcompta/trunk/include/impress.inc.php
Modified:
   phpcompta/trunk/html/ajax_report.php
   phpcompta/trunk/html/show_document.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/action.inc.php
   phpcompta/trunk/include/adm.inc.php
   phpcompta/trunk/include/balance.inc.php
   phpcompta/trunk/include/company.inc.php
   phpcompta/trunk/include/export_balance_pdf.php
   phpcompta/trunk/include/export_fiche_balance_pdf.php
   phpcompta/trunk/include/export_fiche_pdf.php
   phpcompta/trunk/include/export_gl_pdf.php
   phpcompta/trunk/include/export_ledger_csv.php
   phpcompta/trunk/include/export_ledger_pdf.php
   phpcompta/trunk/include/export_poste_detail.php
   phpcompta/trunk/include/export_security_pdf.php
   phpcompta/trunk/include/opening.inc.php
   phpcompta/trunk/include/param_pcmn.inc.php
   phpcompta/trunk/include/preod.inc.php
   phpcompta/trunk/include/report.inc.php
   phpcompta/trunk/include/suivi_adm.inc.php
   phpcompta/trunk/include/suivi_supplier.inc.php
   phpcompta/trunk/include/supplier.inc.php
Log:
Security remove all $user->can_request except for extension

Modified: phpcompta/trunk/html/ajax_report.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_report.php	2011-11-08 19:18:14 UTC (rev 431=
9)
+++ phpcompta/trunk/html/ajax_report.php	2011-11-08 19:45:07 UTC (rev 432=
0)
@@ -44,7 +44,6 @@
 $User=3Dnew User($cn);
 $User->Check();
 $User->check_dossier(dossier::id());
-$User->can_request('PARRAP',0);
=20
=20
=20

Modified: phpcompta/trunk/html/show_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_document.php	2011-11-08 19:18:14 UTC (rev 4=
319)
+++ phpcompta/trunk/html/show_document.php	2011-11-08 19:45:07 UTC (rev 4=
320)
@@ -35,7 +35,6 @@
 $User=3Dnew User(new Database());
 $User->Check();
 $User->check_dossier($gDossier);
-$User->can_request(GECOUR);
 /* Show the document */
 if ( $action =3D=3D 'sh')
 {

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-08 19:18:14 UTC (rev 43=
19)
+++ phpcompta/trunk/include/ac_common.php	2011-11-08 19:45:07 UTC (rev 43=
20)
@@ -766,7 +766,10 @@
 		$array=3Dcompute_variable($file[0]['me_parameter']);
 		put_global($array);
 	    }
-	    require_once $file[0]['me_file'];
+		if ( $file[0]['me_type'] !=3D 'PL')
+			require_once $file[0]['me_file'];
+		else
+			require 'extension_get.inc.php';
 	    exit();
 	}
 	if ( $file[0]['me_javascript'] !=3D '')

Modified: phpcompta/trunk/include/action.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/action.inc.php	2011-11-08 19:18:14 UTC (rev 4=
319)
+++ phpcompta/trunk/include/action.inc.php	2011-11-08 19:45:07 UTC (rev 4=
320)
@@ -23,7 +23,6 @@
  */
 require_once('class_ipopup.php');
 global $g_user;
-$g_user->can_request(GECOUR);
=20
 $retour=3DHtmlInput::button_anchor(_('Retour'),'?ac=3D'.$_REQUEST['ac'].=
'&my_action&'.dossier::get());
 //-----------------------------------------------------

Modified: phpcompta/trunk/include/adm.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/adm.inc.php	2011-11-08 19:18:14 UTC (rev 4319=
)
+++ phpcompta/trunk/include/adm.inc.php	2011-11-08 19:45:07 UTC (rev 4320=
)
@@ -38,7 +38,6 @@
 /*! \file
  * \brief Called from the module "Gestion" to manage the customer
  */
-$g_user->can_request(GECUST);
 $href=3Dbasename($_SERVER['PHP_SELF']);
=20
 // by default open liste

Modified: phpcompta/trunk/include/balance.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/balance.inc.php	2011-11-08 19:18:14 UTC (rev =
4319)
+++ phpcompta/trunk/include/balance.inc.php	2011-11-08 19:45:07 UTC (rev =
4320)
@@ -36,7 +36,6 @@
 require_once('class_exercice.php');
 global $g_user;
 $gDossier=3Ddossier::id();
-$g_user->can_request(IMPBAL);
 $exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex=
ercice();
=20
=20

Modified: phpcompta/trunk/include/company.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/company.inc.php	2011-11-08 19:18:14 UTC (rev =
4319)
+++ phpcompta/trunk/include/company.inc.php	2011-11-08 19:45:07 UTC (rev =
4320)
@@ -1,6 +1,5 @@
 <?php
 global $g_user;
- $g_user->can_request(PARCOORD,1);
     echo '<div class=3D"content">';
     require_once("class_own.php");
     if ( isset ($_POST['record_company'] ))

Modified: phpcompta/trunk/include/export_balance_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_balance_pdf.php	2011-11-08 19:18:14 UT=
C (rev 4319)
+++ phpcompta/trunk/include/export_balance_pdf.php	2011-11-08 19:45:07 UT=
C (rev 4320)
@@ -46,7 +46,6 @@
 $User->Check();
=20
 $bal=3Dnew Acc_Balance($cn);
-$User->can_request(IMPBAL,1);
=20
 extract ($_GET);
 $bal->jrn=3Dnull;
@@ -126,12 +125,12 @@
 	/*
 	 * level x
 	 */
-	if ( $value['poste']=3D=3D'') continue;=09
+	if ( $value['poste']=3D=3D'') continue;
 	foreach (array(3,2,1) as $ind)
-	  {=09
+	  {
 	    $r=3D$value;
 	    if ( ! isset($_GET['lvl'.$ind]))continue;
-	   =20
+
 	    if (${'lvl'.$ind.'_old'} =3D=3D '')	  ${'lvl'.$ind.'_old'}=3Dsubstr=
($r['poste'],0,$ind);
 	    if ( ${'lvl'.$ind.'_old'} !=3D substr($r['poste'],0,$ind))
 	      {
@@ -157,7 +156,7 @@
 	    $nlvl2[$a]=3Dbcadd($nlvl2[$a],$r[$a]);
 	    $nlvl3[$a]=3Dbcadd($nlvl3[$a],$r[$a]);
 	  }
-=09
+
 	if ( $i % 2 =3D=3D 0 )
 	  {
 	    $pdf->SetFillColor(220,221,255);
@@ -168,7 +167,7 @@
 	    $pdf->SetFillColor(0,0,0);
 	    $fill=3D0;
 	  }
-=09
+
 	$pdf->Cell(30,6,$value['poste'],0,0,'L',$fill);
 	$pdf->Cell(80,6,$value['label'],0,0,'L',$fill);
 	$pdf->Cell(20,6,nbm($value['sum_deb']),0,0,'R',$fill);
@@ -183,10 +182,10 @@
=20
       }
     foreach (array(3,2,1) as $ind)
-      {=09
+      {
 	$r=3D$value;
 	if ( ! isset($_GET['lvl'.$ind]))continue;
-=09
+
 	if (${'lvl'.$ind.'_old'} =3D=3D '')	  ${'lvl'.$ind.'_old'}=3Dsubstr($r[=
'poste'],0,$ind);
 	if ( ${'lvl'.$ind.'_old'} !=3D substr($r['poste'],0,$ind))
 	  {
@@ -206,7 +205,7 @@
 	      }
 	  }
       }
-   =20
+
     // Totaux
     $pdf->SetFont('DejaVuCond','B',8);
     $pdf->Cell(110,6,'Totaux');

Modified: phpcompta/trunk/include/export_fiche_balance_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_balance_pdf.php	2011-11-08 19:18=
:14 UTC (rev 4319)
+++ phpcompta/trunk/include/export_fiche_balance_pdf.php	2011-11-08 19:45=
:07 UTC (rev 4320)
@@ -39,7 +39,6 @@
 $User=3Dnew User($cn);
 $User->Check();
 $User->check_dossier($gDossier);
-$User->can_request(IMPFIC,0);
=20
 $pdf=3Dnew PDF($cn);
 $pdf->setDossierInfo("  Periode : ".$_GET['start']." - ".$_GET['end']);

Modified: phpcompta/trunk/include/export_fiche_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_pdf.php	2011-11-08 19:18:14 UTC =
(rev 4319)
+++ phpcompta/trunk/include/export_fiche_pdf.php	2011-11-08 19:45:07 UTC =
(rev 4320)
@@ -39,7 +39,6 @@
 $User=3Dnew User($cn);
 $User->Check();
 $User->check_dossier($gDossier);
-$User->can_request(IMPFIC,0);
=20
 $pdf=3Dnew PDF($cn);
 $pdf->setDossierInfo("  Periode : ".$_GET['start']." - ".$_GET['end']);

Modified: phpcompta/trunk/include/export_gl_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_gl_pdf.php	2011-11-08 19:18:14 UTC (re=
v 4319)
+++ phpcompta/trunk/include/export_gl_pdf.php	2011-11-08 19:45:07 UTC (re=
v 4320)
@@ -41,13 +41,12 @@
 $User=3Dnew User($cn);
 $User->Check();
 $User->check_dossier($gDossier);
-$User->can_request(IMPBIL,0);
=20
 $sql=3D"select pcm_val from tmp_pcmn ";
=20
 extract($_GET);
 $cond_poste=3D"";
-if ($from_poste !=3D '')=20
+if ($from_poste !=3D '')
   {
     $cond_poste =3D '  where ';
     $cond_poste .=3D' pcm_val >=3D upper (\''.Database::escape_string($f=
rom_poste).'\')';
@@ -55,7 +54,7 @@
=20
 if ( $to_poste !=3D '')
   {
-    if  ( $cond_poste =3D=3D '')=20
+    if  ( $cond_poste =3D=3D '')
       {
 	$cond_poste =3D  ' where pcm_val <=3D upper (\''.Database::escape_strin=
g($to_poste).'\')';
       }

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	2011-11-08 19:18:14 UTC=
 (rev 4319)
+++ phpcompta/trunk/include/export_ledger_csv.php	2011-11-08 19:45:07 UTC=
 (rev 4320)
@@ -39,7 +39,6 @@
 require_once ('class_user.php');
 $User=3Dnew User($cn);
 $User->Check();
-$User->can_request(IMPJRN,0);
 $User->check_dossier($gDossier);
=20
 if ($_GET['jrn_id']!=3D0 &&  $User->check_jrn($_GET['jrn_id']) =3D=3D'X'=
)

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	2011-11-08 19:18:14 UTC=
 (rev 4319)
+++ phpcompta/trunk/include/export_ledger_pdf.php	2011-11-08 19:45:07 UTC=
 (rev 4320)
@@ -55,7 +55,6 @@
 $User=3Dnew User($cn);
 $User->Check();
 $User->check_dossier($gDossier);
-$User->can_request(IMPJRN,0);
=20
 // Security
 if ( $_GET['jrn_id']!=3D0 &&  $User->check_jrn($_GET['jrn_id']) =3D=3D '=
X' )

Modified: phpcompta/trunk/include/export_poste_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/export_poste_detail.php	2011-11-08 19:18:14 U=
TC (rev 4319)
+++ phpcompta/trunk/include/export_poste_detail.php	2011-11-08 19:45:07 U=
TC (rev 4320)
@@ -40,7 +40,6 @@
 $User=3Dnew User($cn);
 $User->Check();
 $User->check_dossier($gDossier);
-$User->can_request(IMPPOSTE,0);
=20
 if ( isset ( $_REQUEST['poste_fille']) )
 { //choisit de voir tous les postes

Modified: phpcompta/trunk/include/export_security_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_security_pdf.php	2011-11-08 19:18:14 U=
TC (rev 4319)
+++ phpcompta/trunk/include/export_security_pdf.php	2011-11-08 19:45:07 U=
TC (rev 4320)
@@ -36,8 +36,6 @@
 $rep=3Dnew Database();
 include_once ("class_user.php");
 $User=3Dnew User($rep);
-// Check Priv
-$User->can_request(PARSEC,1);
=20
 //-----------------------------------------------------
 // Get User's info
@@ -128,7 +126,7 @@
         break;
     case 'O':
         /**
-         *non implemente=20
+         *non implemente
          */
         $pdf->Cell(30,6,"Op=C3=A9rations pr=C3=A9d=C3=A9finies uniquemen=
t");
         break;

Deleted: phpcompta/trunk/include/impress.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.inc.php	2011-11-08 19:18:14 UTC (rev =
4319)
+++ phpcompta/trunk/include/impress.inc.php	2011-11-08 19:45:07 UTC (rev =
4320)
@@ -1,94 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/* $Revision$ */
-
-/*! \file
- * \brief Main page for the printing
- */
-$str_dossier=3Ddossier::get();
-// show sub menu
-
-echo "<DIV class=3D\"lmenu\">";
-
-$p_array=3Darray(array ("?p_action=3Dimpress&type=3Djrn&".$str_dossier,_=
("Historique")),
-               array("?p_action=3Dimpress&type=3Dgl_comptes&".$str_dossi=
er,_("Grand Livre")), /* AG */
-               array("?p_action=3Dimpress&type=3Dposte&".$str_dossier,_(=
"Poste")),
-               array("?p_action=3Dimpress&type=3Dfiche&".$str_dossier,_(=
"Cat=C3=A9gorie de fiche")),
-               array("?p_action=3Dimpress&type=3Drapport&".$str_dossier,=
_("Rapport")),
-               array("?p_action=3Dimpress&type=3Drec&".$str_dossier,_("R=
approchement")),
-               array('?p_action=3Dimpress&type=3Dbal&'.$str_dossier,_('B=
alance des comptes')),
-               array("?p_action=3Dimpress&type=3Dbilan&".$str_dossier,_(=
"Bilan"))
-              );
-$default=3D( isset ($_GET['type']))?"?p_action=3Dimpress&type=3D".$_GET[=
'type']."&$str_dossier":"";
-
-
-$result=3DShowItem($p_array,'H',"mtitle","mtitle",$default,' ');
-echo $result;
-
-echo "</DIV>";
-$cn=3Dnew Database($gDossier);
-
-
-include_once("impress_inc.php");
-
-
-// something is choosen
-$default=3D( isset ($_REQUEST['type']))?$_REQUEST['type']:"";
-switch ($default)
-{
-case 'rec':
-    $User->can_request(IMPJRN,1);
-    require_once ("impress_rec.inc.php");
-    break;
-case "jrn":
-    $User->can_request(IMPJRN,1);
-    require_once ("impress_jrn.inc.php");
-    break;
-case "poste":
-    $User->can_request(IMPPOSTE,1);
-    require_once ("impress_poste.inc.php");
-    break;
-case "rapport":
-    $User->can_request(IMPRAP,1);
-    require_once ("impress_rapport.inc.php");
-    break;
-case "bilan":
-    $User->can_request(IMPBIL,1);
-    require_once ("impress_bilan.inc.php");
-    break;
-case "gl_comptes": /* AG */
-    $User->can_request(IMPBIL,1);
-    require_once ("impress_gl_comptes.inc.php");
-    break;
-
-case "bal":
-    $User->can_request(IMPBAL,1);
-    require_once ("balance.inc.php");
-    break;
-case "fiche":
-    $User->can_request(IMPFIC,1);
-    require_once ("impress_fiche.inc.php");
-    break;
-
-}
-
-html_page_stop();
-?>

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	2011-11-08 19:18:14 UTC (rev =
4319)
+++ phpcompta/trunk/include/opening.inc.php	2011-11-08 19:45:07 UTC (rev =
4320)
@@ -28,7 +28,6 @@
 $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:'';
 $User=3Dnew User(new Database(dossier::id()));
 $User->Check();
-$User->can_request(PAREO,1);
 require_once("class_iselect.php");
 require_once('class_acc_ledger.php');
 /* --------------------------------------------------

Modified: phpcompta/trunk/include/param_pcmn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_pcmn.inc.php	2011-11-08 19:18:14 UTC (r=
ev 4319)
+++ phpcompta/trunk/include/param_pcmn.inc.php	2011-11-08 19:45:07 UTC (r=
ev 4320)
@@ -84,7 +84,6 @@
 echo '<div class=3D"u_subtmenu">';
=20
 echo '</div>';
-$User->can_request(PARPCMN);
=20
=20
 echo '<div class=3D"lmenu">';

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	2011-11-08 19:18:14 UTC (rev 43=
19)
+++ phpcompta/trunk/include/preod.inc.php	2011-11-08 19:45:07 UTC (rev 43=
20)
@@ -30,7 +30,6 @@
 require_once('ac_common.php');
 require_once('class_pre_operation.php');
 $user=3Dnew User(new Database(dossier::id()));
-$user->can_request(PARPREDE,1);
 echo '<div class=3D"content">';
 echo '<form method=3D"GET">';
 $sel=3Dnew ISelect();

Modified: phpcompta/trunk/include/report.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/report.inc.php	2011-11-08 19:18:14 UTC (rev 4=
319)
+++ phpcompta/trunk/include/report.inc.php	2011-11-08 19:45:07 UTC (rev 4=
320)
@@ -14,7 +14,7 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
-=20
+
 */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
@@ -51,7 +51,6 @@
=20
 $User=3Dnew User($rep);
 $User->Check();
-$User->can_request(PARRAP,1);
=20
=20
 $cn=3Dnew Database($gDossier);

Modified: phpcompta/trunk/include/suivi_adm.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/suivi_adm.inc.php	2011-11-08 19:18:14 UTC (re=
v 4319)
+++ phpcompta/trunk/include/suivi_adm.inc.php	2011-11-08 19:45:07 UTC (re=
v 4320)
@@ -28,7 +28,6 @@
  *  - $cn =3D database connection
  */
 require_once('class_follow_up.php');
-$g_user->can_request(GECOUR);
=20
 /**
  *\note fix problem with ShowActionList, this function is local

Modified: phpcompta/trunk/include/suivi_supplier.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/suivi_supplier.inc.php	2011-11-08 19:18:14 UT=
C (rev 4319)
+++ phpcompta/trunk/include/suivi_supplier.inc.php	2011-11-08 19:45:07 UT=
C (rev 4320)
@@ -28,7 +28,6 @@
  *  - $cn =3D database connection
  */
 require_once('class_follow_up.php');
-$g_user->can_request(GECOUR);
=20
 /**
  *\note problem with ShowActionList, this function is local

Modified: phpcompta/trunk/include/supplier.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/supplier.inc.php	2011-11-08 19:18:14 UTC (rev=
 4319)
+++ phpcompta/trunk/include/supplier.inc.php	2011-11-08 19:45:07 UTC (rev=
 4320)
@@ -36,7 +36,6 @@
 /*! \file
  * \brief Called from the module "Gestion" to manage the supplier
  */
-$g_user->can_request(GECUST);
 $href=3Dbasename($_SERVER['PHP_SELF']);
=20
 // by default open liste



From MAILER-DAEMON Tue Nov 08 17:58:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RNud6-0008BJ-Dk
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Nov 2011 17:58:56 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  9 Nov 2011 00:04:58 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.555.1320793135.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4321 - in phpcompta/trunk: html 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: Tue, 08 Nov 2011 22:58:55 -0000

Author: danydb
Date: 2011-11-09 00:04:55 +0100 (Wed, 09 Nov 2011)
New Revision: 4321

Added:
   phpcompta/trunk/sql/extension.sql
Modified:
   phpcompta/trunk/html/ajax.php
   phpcompta/trunk/html/do.php
   phpcompta/trunk/html/extension.raw.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/class_extension.php
   phpcompta/trunk/include/extension_choice.inc.php
   phpcompta/trunk/include/extension_get.inc.php
   phpcompta/trunk/include/template/module.php
   phpcompta/trunk/sql/object-6.0.sql
   phpcompta/trunk/sql/upgrade.sql
Log:
Extension : change for security, now based on MENU_REF
Update the script to put the extension into menu_ref + profile_menu

Modified: phpcompta/trunk/html/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax.php	2011-11-08 19:45:07 UTC (rev 4320)
+++ phpcompta/trunk/html/ajax.php	2011-11-08 23:04:55 UTC (rev 4321)
@@ -21,8 +21,8 @@
 {
=20
     $ext=3Dnew Extension($cn);
-    $ext->search('code',$_REQUEST['plugin_code']);
-    if ( $ext->get_parameter('id') !=3D 0 )
+
+    if ( $ext->search($_REQUEST['plugin_code']) !=3D -1)
     {
         /* security */
         if ( !isset ($_SESSION['g_user']) || $ext->can_request($_SESSION=
['g_user']) =3D=3D 0 )
@@ -30,7 +30,7 @@
             exit();
         }
         /* call the ajax script */
-        require_once('ext'.DIRECTORY_SEPARATOR.dirname(trim($ext->get_pa=
rameter('filepath'))).DIRECTORY_SEPARATOR.'ajax.php');
+        require_once('ext'.DIRECTORY_SEPARATOR.dirname(trim($ext->get_pa=
rameter('me_file'))).DIRECTORY_SEPARATOR.'ajax.php');
     }
     else
     {

Modified: phpcompta/trunk/html/do.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/do.php	2011-11-08 19:45:07 UTC (rev 4320)
+++ phpcompta/trunk/html/do.php	2011-11-08 23:04:55 UTC (rev 4321)
@@ -127,6 +127,17 @@
 	show_menu($all, $i);
     }
 }
+elseif (isset($_REQUEST['plugin_code']))
+{
+	$default =3D find_default_module();
+    $_GET['ac']=3D$default;
+    $_POST['ac']=3D$default;
+    $_REQUEST['ac']=3D$default;
+    show_module('EXTENSION');
+    $all[0] =3D $default;
+    show_menu($all, 0);
+	require_once 'extension_choice.inc.php';
+}
 else
 {
     $default =3D find_default_module();

Modified: phpcompta/trunk/html/extension.raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/extension.raw.php	2011-11-08 19:45:07 UTC (rev 4=
320)
+++ phpcompta/trunk/html/extension.raw.php	2011-11-08 23:04:55 UTC (rev 4=
321)
@@ -41,16 +41,16 @@
 $only_plugin=3D$user->check_dossier(dossier::id());
=20
 $ext=3Dnew Extension($cn);
-$ext->search('code',$_REQUEST['plugin_code']);
-if ( $ext->get_parameter('id') !=3D 0 )
+
+if ( $ext->search($_REQUEST['plugin_code']) !=3D -1 )
   {
     /* security */
     if ( !isset ($_SESSION['g_user']) || $ext->can_request($_SESSION['g_=
user']) =3D=3D 0 )
       {
-	exit();
+		exit();
       }
     /* call the ajax script */
-    require_once('ext'.DIRECTORY_SEPARATOR.dirname(trim($ext->get_parame=
ter('filepath'))).DIRECTORY_SEPARATOR.'raw.php');
+    require_once('ext'.DIRECTORY_SEPARATOR.dirname(trim($ext->get_parame=
ter('me_file'))).DIRECTORY_SEPARATOR.'raw.php');
   }
 else
   {

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-08 19:45:07 UTC (rev 43=
20)
+++ phpcompta/trunk/include/ac_common.php	2011-11-08 23:04:55 UTC (rev 43=
21)
@@ -737,7 +737,7 @@
     global $g_user;
     $cn =3D Dossier::connect();
     $amodule =3D $cn->get_array("select
-	me_code,me_menu,me_url,me_javascript,p_order
+	me_code,me_menu,me_url,me_javascript,p_order,me_type
 	from v_all_menu
 	where
 	user_name=3D$1
@@ -747,7 +747,7 @@
     if ($selected !=3D -1)
     {
 	require_once('template/module.php');
-	$file =3D $cn->get_array("select me_file,me_parameter,me_javascript fro=
m v_all_menu
+	$file =3D $cn->get_array("select me_file,me_parameter,me_javascript,me_=
type from v_all_menu
 	    where me_code=3D$1 and user_name=3D$2", array($selected,$g_user->lo=
gin));
 	if ( count($file ) =3D=3D 0 )
 	{
@@ -766,6 +766,9 @@
 		$array=3Dcompute_variable($file[0]['me_parameter']);
 		put_global($array);
 	    }
+
+		// if file is not a plugin, include the file, otherwise
+		// include the plugin launcher
 		if ( $file[0]['me_type'] !=3D 'PL')
 			require_once $file[0]['me_file'];
 		else
@@ -810,7 +813,7 @@
=20
     if (count($default_module) > 1)
     {
-	echo_error("Plusieurs modules sont le module par d=C3=A9faut", __LINE__=
, __FILE__);
+		echo_error("Plusieurs modules sont le module par d=C3=A9faut", __LINE_=
_, __FILE__);
     }
     elseif (count($default_module) =3D=3D 1)
     {
@@ -829,21 +832,21 @@
     global $g_user;
     $cn =3D Dossier::connect();
     $amenu =3D $cn->get_array("select
-	me_menu,me_code,me_url,me_javascript
+	me_menu,me_code,me_url,me_javascript,me_type
 	from v_all_menu
 	where
 	me_code_dep=3D$1 and user_name=3D$2 order by p_order", array($module[$i=
dx], $g_user->login));
=20
     if (!empty($amenu) && count($amenu) > 1)
     {
-	require 'template/menu.php';
+		require 'template/menu.php';
     }
     elseif (count($amenu) =3D=3D 1)
     {
-	echo '<div class=3D"topmenu">';
-	echo h2info($amenu[0]['me_menu']);
-	echo '</div>';
-	$module[$idx] =3D $amenu[0]['me_code'];
+		echo '<div class=3D"topmenu">';
+		echo h2info($amenu[0]['me_menu']);
+		echo '</div>';
+		$module[$idx] =3D $amenu[0]['me_code'];
     }
=20
     if (empty($amenu) || count($amenu) =3D=3D 1)
@@ -852,7 +855,7 @@
 	 * @todo add security
 	 * check if user can access this module
 	 */
-		$file =3D $cn->get_array("select me_file,me_parameter,me_javascript
+		$file =3D $cn->get_array("select me_file,me_parameter,me_javascript,me=
_type
 		from menu_ref
 		where
 		me_code=3D$1 and
@@ -869,24 +872,29 @@
 		{
 			if ($file[0]['me_parameter'] !=3D=3D "")
 			{
-			// if there are paramter put them in superglobal
-			$array=3Dcompute_variable($file[0]['me_parameter']);
-			put_global($array);
+				// if there are paramter put them in superglobal
+				$array=3Dcompute_variable($file[0]['me_parameter']);
+				put_global($array);
 			}
-			echo '<div class=3D"content">';
-			require_once $file[0]['me_file'];
-			echo '</div>';
+
+			// if file is not a plugin, include the file, otherwise
+			// include the plugin launcher
+			if ( $file[0]['me_type'] !=3D 'PL')
+				require_once $file[0]['me_file'];
+			else
+				require 'extension_get.inc.php';
+
 			exit();
 		}
 		if ( $file[0]['me_javascript'] !=3D '')
 		{
-		echo create_script($file[0]['me_javascript']);
+			echo create_script($file[0]['me_javascript']);
 		}
     }
 }
 /**
  * Put in superglobal (get,post,request) the value contained in
- * the superglobal
+ * the parameter field (me_parameter)
  * @param $array [key] [value]
  */
 function put_global($array)

Modified: phpcompta/trunk/include/class_extension.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_extension.php	2011-11-08 19:45:07 UTC (=
rev 4320)
+++ phpcompta/trunk/include/class_extension.php	2011-11-08 23:04:55 UTC (=
rev 4321)
@@ -25,8 +25,8 @@
  * the inclusion...
  */
 /*!\brief manage the extension, it involves the table extension
- *=20
- * Data member=20
+ *
+ * Data member
  * - $cn database connection
  * - $variable :
  *    -  id (extension.ex_id)
@@ -36,136 +36,22 @@
  *    - enable (extension.ex_enable)
  *    - filepath (extension.ex_file)
  */
-class Extension
-{
-    private static $variable=3Darray('id'=3D>'ex_id',
-                                   'name'=3D>'ex_name',
-                                   'code'=3D>'ex_code',
-                                   'desc'=3D>'ex_desc',
-                                   'enable'=3D>'ex_enable',
-                                   'filepath'=3D>'ex_file');
-    /*!\brief constructor
-     *\param a database connextion
-     */
-    function __construct ($p_init)
-    {
-        $this->cn=3D$p_init;
-        $this->ex_id=3D0;
-    }
-    public function get_parameter($p_string)
-    {
-        if ( array_key_exists($p_string,self::$variable) )
-        {
-            $idx=3Dself::$variable[$p_string];
-            return $this->$idx;
-        }
-        else
-            exit (__FILE__.":".__LINE__.'Erreur attribut inexistant'.$p_=
string);
-    }
-    public function set_parameter($p_string,$p_value)
-    {
-        if ( array_key_exists($p_string,self::$variable) )
-        {
-            $idx=3Dself::$variable[$p_string];
-            $this->$idx=3D$p_value;
-        }
-        else
-            exit (__FILE__.":".__LINE__.'Erreur attribut inexistant '.$p=
_string);
+require_once 'class_menu_ref_sql.php';
=20
-
-    }
-    public function get_info()
-    {
-        return var_export(self::$variable,true);
-    }
+class Extension extends Menu_Ref_sql
+{
+	/**
+	 * @todo to be rewritten
+	 */
     public function verify()
     {
         // Verify that the elt we want to add is correct
-        if (trim($this->ex_code)=3D=3D"") throw new Exception('Le code n=
e peut pas =C3=AAtre vide');
-        if (trim($this->ex_name)=3D=3D"") throw new Exception('Le nom ne=
 peut pas =C3=AAtre vide');
-        if (trim($this->ex_file)=3D=3D"") throw new Exception('Chemin in=
correct');
-        if (file_exists('..'.DIRECTORY_SEPARATOR.'include'.DIRECTORY_SEP=
ARATOR.'ext'.DIRECTORY_SEPARATOR.$this->ex_file) =3D=3D false)
+        if (trim($this->me_code)=3D=3D"") throw new Exception('Le code n=
e peut pas =C3=AAtre vide');
+        if (trim($this->me_name)=3D=3D"") throw new Exception('Le nom ne=
 peut pas =C3=AAtre vide');
+        if (trim($this->me_file)=3D=3D"") throw new Exception('Chemin in=
correct');
+        if (file_exists('..'.DIRECTORY_SEPARATOR.'include'.DIRECTORY_SEP=
ARATOR.'ext'.DIRECTORY_SEPARATOR.$this->me_file) =3D=3D false)
             throw new Exception ('Extension non trouv=C3=A9e, le chemin =
est-il correct?');
     }
-    /*!\brief call insert for a new plugin or update if the plugin exist=
 */
-    public function save()
-    {
-        if (  $this->get_parameter("id") =3D=3D 0 )
-            $this->insert();
-        else
-            $this->update();
-    }
-    /*!\brief insert a plugin
-    * \return error =3D -1 otherwiser the id */
-    public function insert()
-    {
-        if ( $this->verify() !=3D 0 ) return -1;
-        if ( $this->cn->count_sql('select * from extension where upper(e=
x_code)=3Dupper($1)',
-                                  array($this->ex_code)) > 0)
-            throw new Exception ('Ce code existe d=C3=A9j=C3=A0');
-        if ( $this->cn->count_sql('select * from extension where upper(e=
x_name)=3Dupper($1)',
-                                  array($this->ex_name)) > 0)
-            throw new Exception ('Ce nom existe d=C3=A9j=C3=A0');
-
-        $sql=3D'INSERT INTO extension( ex_code, ex_desc, ex_file, ex_ena=
ble,ex_name) '.
-             ' VALUES ($1, $2, $3,$4,$5) returning ex_id';
-        $res=3D$this->cn->exec_sql(
-                 $sql,
-                 array($this->ex_code,
-                       $this->ex_desc,
-                       $this->ex_file,
-                       $this->ex_enable,
-                       $this->ex_name)
-             );
-        $this->ex_id=3DDatabase::fetch_result($res,0,0);
-    }
-    /*!\brief update a plugin
-    * \return error =3D -1 otherwiser 0 */
-    public function update()
-    {
-        if ( $this->verify() !=3D 0 ) return -1;
-        $sql=3D'UPDATE extension '.
-             'SET ex_code=3D$1, ex_desc=3D$2, ex_file=3D$3, ex_enable=3D=
$4,ex_name=3D$5 '.
-             ' WHERE ex_id=3D$6 ';
-        $this->cn->exec_sql($sql,
-                            array($this->ex_code,
-                                  $this->ex_desc,
-                                  $this->ex_file,
-                                  $this->ex_enable,
-                                  $this->ex_name,
-                                  $this->ex_id)
-                           );
-        return 0;
-    }
-    /*!\brief load a plugin */
-    public function load()
-    {
-        $sql=3D'SELECT ex_id, ex_name,ex_code, ex_desc, ex_file, ex_enab=
le '.
-             '  FROM extension where ex_id=3D$1';
-        $res=3D$this->cn->exec_sql($sql,array($this->ex_id));
-        if ( Database::num_row($res) =3D=3D 0 ) return -1;
-        $row=3DDatabase::fetch_array($res,0);
-        foreach ($row as $idx=3D>$value)
-        {
-            $this->$idx=3D$value;
-        }
-        return 0;
-    }
-    /*!\brief delete a plugin */
-    public function delete()
-    {
-        $sql=3D"delete from extension where ex_id=3D$1";
-        $res=3D$this->cn->exec_sql($sql,array($this->ex_id));
-    }
-    /*!\brief load all the plugin and returns an array
-     *\param $p_cn database connx=20
-     */
-    static public function listing($p_cn)
-    {
-        $sql=3D"SELECT ex_id, ex_name,ex_code, ex_desc, ex_file, ex_enab=
le  FROM extension order by ex_code";
-        $array=3D$p_cn->get_array($sql);
-        return $array;
-    }
     /*!\brief transform an array into a valid object
      *\param $array with the value
      *\verbatim
@@ -180,98 +66,46 @@
      */
     function fromArray($p_array)
     {
-        $this->ex_id=3D$p_array['ex_id'];
-        $this->ex_name=3D$p_array['name'];
-        $this->ex_code=3D$p_array['code'];
-        $this->ex_desc=3D$p_array['desc'];
-        $this->ex_enable=3D$p_array['enable'];
-        $this->ex_file=3D$p_array['file'];
-
+        $this->me_menu=3D$p_array['name'];
+        $this->me_code=3D$p_array['code'];
+        $this->me_desc=3D$p_array['desc'];
+        $this->me_file=3D$p_array['file'];
+		$this->me_type=3D'PL';
     }
     /*!@brief search a extension, the what is the column (extends_code *=
/
-    function search($p_what,$p_value)
+    function search($p_what)
     {
-        switch($p_what)
-        {
-        case 'code':
-                $cond=3D" where ex_code =3D upper($1) ";
-            break;
-        default:
-            return -1;
-        }
-
-        $sql=3D"select ex_id from extension $cond";
-        $res=3D$this->cn->get_value($sql, array($p_value));
-        if ( $res=3D=3D"") return -1;
-
-        $this->ex_id=3D$res;
-        $this->load();
-
+		$this->me_code=3D$p_what;
+		if ( $this->load() =3D=3D -1) return null;
+		return 1;
     }
     /*!\brief return 1 if the user given in parameter can access this ex=
tension
      * otherwise returns 0
      *\param $p_login the user login
-     *\return 1 has access, 0 has no access=20
+     *\return 1 has access, 0 has no access
      */
     function can_request($p_login)
     {
-        $sql=3D"select use_access from user_sec_extension where ".
-             "upper(use_login ) =3D upper($1) and ex_id=3D$2";
-        $ret=3D$this->cn->get_value($sql,array($p_login,$this->ex_id));
-        if ( $this->cn->count() =3D=3D 0 ) return 0;
-        if ( $ret=3D=3D'Y') return 1;
-        return 0;
+		$cnt=3D$this->cn->get_value("select count(*) from menu_ref
+										join profile_menu using (me_code)
+										join profile_user using (p_id)
+										where
+										me_code=3D$1
+										and user_name=3D$2",
+								array($this->me_code,$p_login));
+		if ( $cnt > 0)        return 1;
+		return 0;
     }
-    /*!@brief save the security in the table
-     *@param $p_array is an array of value=20
-     * indices are :
-     * - "is_" + login=20
-     * - value is Y or N
-     * you must add the value of gDossier
-    \code
-    [is_phpcompta]=3D>N
-    [gDossier]=3D>xx
-    \endcode
-     */
-    function save_security($p_array)
-    {
-        $d=3D$p_array['gDossier'];
-        $cn=3Dnew Database($d);
-        $list_user=3DUser::get_list($d);
-        for ($i=3D0;$i<sizeof($list_user);$i++)
-        {
-            $ix=3D"is_".$list_user[$i]['use_login'];
-            /* if exist */
-            if ( isset($p_array[$ix] ))
-            {
-                if (	   $cn->count_sql("select ex_id from user_sec_exten=
sion where use_login=3D$1 and ex_id=3D$2"
-                                       ,array($list_user[$i]['use_login'=
],$this->ex_id)) =3D=3D 0 )
-                {
-                    /* insert */
-                    $sql=3D"INSERT INTO user_sec_extension(
-                         ex_id, use_login, use_access)  VALUES ($1,$2,$3=
)";
-                    $cn->exec_sql($sql,array($this->ex_id,$list_user[$i]=
['use_login'],$p_array[$ix]));
-
-                }
-                else
-                {
-                    /* update */
-                    $sql=3D"update user_sec_extension set use_access=3D$=
1 where ex_id=3D$2 and use_login=3D$3";
-                    $cn->exec_sql($sql,array($p_array[$ix],$this->ex_id,=
$list_user[$i]['use_login']));
-                }
-            }
-
-        }
-    }
     /*!@brief make an array of the available plugin for the current user
      * @return  an array
      *@see ISelect
      */
     static function make_array($cn)
     {
-        $sql=3D"select ex_code as value, ex_name as label from user_sec_=
extension ".
-             " join extension using (ex_id) where ex_enable=3D'Y' and us=
e_access=3D'Y' ".
-             " and use_login=3D$1";
+        $sql=3D"select me_code as value, me_menu as label from ".
+             " menu_ref join profile_menu using (me_code)
+				 join profile_user using (p_id) where ".
+             " user_name=3D$1 and me_type=3D'PL' and me_code_dep=3D'EXTE=
NSION'";
         $a=3D$cn->get_array($sql,array($_SESSION['g_user']));
         return $a;
     }
@@ -285,31 +119,5 @@
             exit();
         }
     }
-    /*!\brief test this class
-     */
-    static function test_me()
-    {
-        $cn=3Dnew Database(dossier::id());
-        print '<h1>Save</h1>';
-        $ext=3Dnew Extension($cn);
-        /* create a plugin */
-        $ext->set_parameter('code','test');
-        $ext->set_parameter('enable','Y');
-        $ext->set_parameter('desc','plugin de test');
-        $ext->set_parameter('filepath','test.php');
-        $ext->save();
-        print '<h1>Show</h1>';
-        /* show plugins */
-        $res=3D$cn->get_array('select * from extension');
-        print_r($res);
-        /* delete plugin */
-        print '<h1>Load</h1>';
-        $ext->load();
-        print_r($ext);
-        print '<h1>Delete</h1>';
-        $ext->delete();
-    }
-
 }
=20
-/* test::test_me(); */

Modified: phpcompta/trunk/include/extension_choice.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/extension_choice.inc.php	2011-11-08 19:45:07 =
UTC (rev 4320)
+++ phpcompta/trunk/include/extension_choice.inc.php	2011-11-08 23:04:55 =
UTC (rev 4321)
@@ -47,6 +47,8 @@
     echo '</form>';
     echo '<hr>';
 }
-require_once 'extension_get.inc.php';
=20
+if ( isset($_REQUEST['plugin_code']))
+	require_once 'extension_get.inc.php';
+
 ?>

Modified: phpcompta/trunk/include/extension_get.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/extension_get.inc.php	2011-11-08 19:45:07 UTC=
 (rev 4320)
+++ phpcompta/trunk/include/extension_get.inc.php	2011-11-08 23:04:55 UTC=
 (rev 4321)
@@ -10,33 +10,32 @@
 require_once ('constant.security.php');
 require_once ('class_user.php');
=20
-/* if a code has been asked */
-if (isset($_REQUEST['plugin_code']) )
-{
-    $cn=3Dnew Database(dossier::id());
-    $ext=3Dnew Extension($cn);
-    $ext->search('code',$_REQUEST['plugin_code']);
-    if ( $ext->get_parameter('id') !=3D 0 )
-    {
-        /* security */
-        if ( $ext->can_request($_SESSION['g_user']) =3D=3D 0 )
-        {
-            alert(j(_("Vous ne pouvez pas utiliser cette extension. Cont=
actez votre responsable")));
-            exit();
-        }
+/**
+ * included from do.php + extension_choice.inc.php
+ */
=20
-        if ( ! file_exists('../include/ext'.DIRECTORY_SEPARATOR.trim($ex=
t->get_parameter('filepath'))))
-        {
-            alert(j(_("Ce fichier n'existe pas ")));
-            exit();
-        }
-        require_once('ext'.DIRECTORY_SEPARATOR.trim($ext->get_parameter(=
'filepath')));
-    }
-    else
-    {
-        alert(j(_("Cette extension n'existe pas ")));
-        exit();
-    }
+// find file and check security
+global $cn,$g_user;
=20
+$ext=3Dnew Extension($cn);
+;
+if ($ext->search($_REQUEST['plugin_code']) =3D=3D -1)
+	{
+		echo_warning("plugin non trouv=C3=A9");
+		exit();
 }
+if ($ext->can_request($g_user->login)=3D=3D-1)
+{
+	alert("Plugin non authoris=C3=A9");
+	exit();
+}
+if ( ! file_exists('../include/ext'.DIRECTORY_SEPARATOR.trim($ext->me_fi=
le)))
+	{
+		alert(j(_("Ce fichier n'existe pas ")));
+		exit();
+	}
+echo '<div class=3D"content">';
+require_once('ext'.DIRECTORY_SEPARATOR.trim($ext->me_file));
+
+
 ?>

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2011-11-08 19:45:07 UTC (=
rev 4320)
+++ phpcompta/trunk/include/template/module.php	2011-11-08 23:04:55 UTC (=
rev 4321)
@@ -2,20 +2,33 @@
     <div class=3D"name">
=20
 	<H2 class=3D"dossier"> Dossier : <?=3Dh(dossier::name())?></h2>
-	<?=3DIButton::show_calc()?>
+<?php
+
+if ( $cn->get_value("select count(*) from profile join profile_user usin=
g (p_id)
+		where user_name=3D$1 and with_calc=3Dtrue",array($_SESSION['g_user']))=
 =3D=3D1):
+	echo IButton::show_calc();
+endif;
+
+if ( $cn->get_value("select count(*) from profile join profile_user usin=
g (p_id)
+		where user_name=3D$1 and with_direct_form=3Dtrue",array($_SESSION['g_u=
ser'])) =3D=3D1):
+?>
 	<div id=3D"direct">
 	<form method=3D"get">
+		<?=3DHtmlInput::default_value('ac', '', $_REQUEST)?>
 		<?=3DDossier::hidden()?>
 		<?
 			$direct=3Dnew IText('ac');
 			$direct->style=3D'class=3D"direct"';
-			$direct->value=3DHtmlInput::default_value('ac', '', $_REQUEST);
+			$direct->value=3D'';
 			$direct->size=3D(strlen($direct->value)<10)?10:strlen($direct->value)=
;
 			echo $direct->input();
 			echo HtmlInput::submit('go','aller');
 			?>
 	</form>
 	</div>
+<?
+endif;
+?>
     </div>
     <div class=3D"acces_direct">
 	<table>

Added: phpcompta/trunk/sql/extension.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/extension.sql	                        (rev 0)
+++ phpcompta/trunk/sql/extension.sql	2011-11-08 23:04:55 UTC (rev 4321)
@@ -0,0 +1,4 @@
+insert into menu_ref(me_code,me_menu,me_file,me_description,me_type,me_p=
arameter) select ex_code,ex_name,ex_file,ex_desC,'PL','plugin_code=3D'||e=
x_code from extension;
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_type_display) selec=
t me_code,'EXTENSION',1,'S' from menu_ref where me_type=3D'PL';
+

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-08 19:45:07 UTC (rev 4320)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-08 23:04:55 UTC (rev 4321)
@@ -78,7 +78,9 @@
 CREATE TABLE profile (
     p_name text NOT NULL,
     p_id integer NOT NULL,
-    p_desc text
+    p_desc text,
+    with_calc boolean DEFAULT true,
+    with_direct_form boolean DEFAULT true
 );
=20
=20
@@ -106,6 +108,20 @@
=20
=20
 --
+-- Name: COLUMN profile.with_calc; Type: COMMENT; Schema: public; Owner:=
 dany
+--
+
+COMMENT ON COLUMN profile.with_calc IS 'show the calculator';
+
+
+--
+-- Name: COLUMN profile.with_direct_form; Type: COMMENT; Schema: public;=
 Owner: dany
+--
+
+COMMENT ON COLUMN profile.with_direct_form IS 'show the direct form';
+
+
+--
 -- Name: profile_menu; Type: TABLE; Schema: public; Owner: dany; Tablesp=
ace:=20
 --
=20
@@ -155,7 +171,8 @@
 --
=20
 COMMENT ON COLUMN profile_menu.p_type_display IS 'M is a module
-E is a menu';
+E is a menu
+S is a select (for plugin)';
=20
=20
 --
@@ -183,7 +200,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 156, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 172, true);
=20
=20
 --
@@ -281,7 +298,7 @@
 --
=20
 CREATE VIEW v_all_menu AS
-    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript FROM (((profile_menu pm J=
OIN profile_user pu ON ((pu.p_id =3D pm.p_id))) JOIN profile p ON ((p.p_i=
d =3D pm.p_id))) JOIN menu_ref mr USING (me_code)) ORDER BY pm.p_order;
+    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript, mr.me_type FROM (((profi=
le_menu pm JOIN profile_user pu ON ((pu.p_id =3D pm.p_id))) JOIN profile =
p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr USING (me_code)) ORDER BY p=
m.p_order;
=20
=20
 ALTER TABLE public.v_all_menu OWNER TO dany;
@@ -311,6 +328,13 @@
 -- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan=
y
 --
=20
+INSERT INTO menu_ref VALUES ('MODOP', 'Correction Op=C3=A9ration', 'modo=
p/index.php', NULL, 'Correction d''=C3=A9critures comptables', 'plugin_co=
de=3DMODOP', NULL, 'PL');
+INSERT INTO menu_ref VALUES ('IMPCARD', 'Import Fiche', 'import_card/ind=
ex.php', NULL, 'Importation de fiches', 'plugin_code=3DIMPCARD', NULL, 'P=
L');
+INSERT INTO menu_ref VALUES ('AMORTIS', 'Amortissement', 'amortis/index.=
php', NULL, 'Amortissement', 'plugin_code=3DAMORTIS', NULL, 'PL');
+INSERT INTO menu_ref VALUES ('TOOLPLAN', 'Import/export plan', 'tool_pcm=
n/index.php', NULL, 'Importation /export de plan comptable', 'plugin_code=
=3DTOOLPLAN', NULL, 'PL');
+INSERT INTO menu_ref VALUES ('IMPORTBANK', 'Importation banque', 'import=
bank/index.php', NULL, 'Import. fichier CVS de la banque', 'plugin_code=3D=
IMPORTBANK', NULL, 'PL');
+INSERT INTO menu_ref VALUES ('TOOL', 'Outil comptable', 'tools/index.php=
', NULL, 'Outil comptable', 'plugin_code=3DTOOL', NULL, 'PL');
+INSERT INTO menu_ref VALUES ('TVA', 'Module de TVA', 'tva/index.php', NU=
LL, 'Cette extension permet de faire les listings et declarations TVA', '=
plugin_code=3DTVA', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
@@ -318,6 +342,9 @@
 INSERT INTO menu_ref VALUES ('CSV:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MODULARITY', 'Menu et profile', NULL, NULL=
, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPROFILE', 'Profile', 'profile.inc.php',=
 NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, NULL, NU=
LL, 'popup_recherche()', 'ME');
 INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
@@ -340,7 +367,6 @@
 INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph=
p', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL, NUL=
L, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param=
_sec.inc.php', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
@@ -358,7 +384,6 @@
 INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, NULL, 'ledger_type=3DALL', NULL, 'ME');
 INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, NULL, N=
ULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('TVA', 'Tva', 'extension_get.inc.php', NULL=
, NULL, 'plugin_code=3DAMORTIS', NULL, 'ME');
 INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'extension_choice=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, NULL, NULL,=
 NULL, 'ME');
 INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, NULL, NULL, NULL, 'ME');
@@ -371,13 +396,6 @@
 INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'=
, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, NULL, =
NULL, 'search_reconcile()', 'ME');
 INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', 'cfgledger.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in=
c.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', NUL=
L, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp=
ress_fiche.inc.php', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'=
, NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph=
p', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie=
nt.inc.php', NULL, NULL, NULL, NULL, 'ME');
@@ -395,7 +413,6 @@
 INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL=
L, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, NULL, NULL, NULL=
, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PDF:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
@@ -416,15 +433,24 @@
 INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('new_line', NULL, NULL, NULL, 'Saut de lign=
e', NULL, NULL, 'SP');
+INSERT INTO menu_ref VALUES ('PRINTJRN', 'Historique', 'impress_jrn.inc.=
php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREC', 'Rapprochement', 'impress_rec.i=
nc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTPOSTE', 'Poste', 'impress_poste.inc.p=
hp', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREPORT', 'Rapport', 'impress_rapport.=
inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBILAN', 'Bilan', 'impress_bilan.inc.p=
hp', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTGL', 'Grand Livre', 'impress_gl_compt=
es.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBAL', 'Balance', 'balance.inc.php', N=
ULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, NULL, NU=
LL, NULL, 'ME');
=20
=20
 --
 -- Data for Name: profile; Type: TABLE DATA; Schema: public; Owner: dany
 --
=20
-INSERT INTO profile VALUES ('default', 1, 'Profil par d=C3=A9faut');
-INSERT INTO profile VALUES ('Analytique', 2, 'Uniquement comptabilit=C3=A9=
 analytique');
-INSERT INTO profile VALUES ('Vente', 3, 'Uniquement vente');
+INSERT INTO profile VALUES ('Analytique', 2, 'Uniquement comptabilit=C3=A9=
 analytique', true, true);
+INSERT INTO profile VALUES ('Vente', 3, 'Uniquement vente', true, true);
+INSERT INTO profile VALUES ('default', 1, 'Profil par d=C3=A9faut', true=
, true);
=20
=20
 --
@@ -440,11 +466,6 @@
 INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E',=
 NULL);
 INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
NULL);
-INSERT INTO profile_menu VALUES (13, 'IMPBILAN', 'IMP', 1, 11, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (14, 'IMPCARD', 'IMP', 1, 12, 'E', NULL)=
;
-INSERT INTO profile_menu VALUES (15, 'IMPGL', 'IMP', 1, 13, 'E', NULL);
-INSERT INTO profile_menu VALUES (16, 'IMPJRN', 'IMP', 1, 14, 'E', NULL);
-INSERT INTO profile_menu VALUES (17, 'IMPBAL', 'IMP', 1, 15, 'E', NULL);
 INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '=
E', NULL);
 INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E',=
 NULL);
@@ -454,9 +475,6 @@
 INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E', NU=
LL);
 INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 NULL);
-INSERT INTO profile_menu VALUES (9, 'IMPPOSTE', 'IMP', 1, 8, 'E', NULL);
-INSERT INTO profile_menu VALUES (10, 'IMPREC', 'IMP', 1, 9, 'E', NULL);
-INSERT INTO profile_menu VALUES (11, 'IMPREPORT', 'IMP', 1, 10, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', NULL);
 INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', NULL)=
;
 INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', NULL);
@@ -466,7 +484,6 @@
 INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', NULL)=
;
 INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E', NULL);
-INSERT INTO profile_menu VALUES (35, 'IMP', 'GESTION', 1, 4, 'E', NULL);
 INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E', NULL)=
;
 INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E', N=
ULL);
@@ -481,20 +498,21 @@
 INSERT INTO profile_menu VALUES (94, 'FINSALDO', 'MENUFIN', 1, 3, 'E', N=
ULL);
 INSERT INTO profile_menu VALUES (95, 'FINREC', 'MENUFIN', 1, 4, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', NUL=
L);
-INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E', NULL);
 INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', NULL);
 INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', NULL);
 INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 25, 'M', NULL);
 INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', N=
ULL);
 INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', NULL);
 INSERT INTO profile_menu VALUES (44, 'DASHBOARD', NULL, 1, 10, 'M', 1);
+INSERT INTO profile_menu VALUES (35, 'PRINT', 'GESTION', 1, 4, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (156, 'new_line', NULL, 1, 35, 'M', NULL=
);
 INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', =
NULL);
 INSERT INTO profile_menu VALUES (80, 'PLANANC', 'ANC', 2, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
NULL);
+INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', NULL);
 INSERT INTO profile_menu VALUES (126, 'CSV:postedetail', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (84, 'TVA', 'PARAM', 1, 102, 'E', NULL);
 INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 40, 'M', 0);
+INSERT INTO profile_menu VALUES (164, 'TVA', 'EXTENSION', 1, NULL, 'S', =
NULL);
 INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 45, 'M', NULL);
@@ -502,6 +520,8 @@
 INSERT INTO profile_menu VALUES (88, 'ODS', 'MENUODS', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (89, 'ODSIMP', 'MENUODS', 1, 2, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (157, 'AMORTIS', 'MENUACH', 1, 10, 'M', =
NULL);
+INSERT INTO profile_menu VALUES (158, 'MODOP', 'EXTENSION', 1, NULL, 'S'=
, NULL);
 INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', NULL=
);
 INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', NUL=
L);
@@ -509,8 +529,24 @@
 INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', NULL);
 INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', NUL=
L);
 INSERT INTO profile_menu VALUES (93, 'FINIMP', 'MENUFIN', 1, 2, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (159, 'IMPCARD', 'EXTENSION', 1, NULL, '=
S', NULL);
+INSERT INTO profile_menu VALUES (160, 'AMORTIS', 'EXTENSION', 1, NULL, '=
S', NULL);
+INSERT INTO profile_menu VALUES (161, 'TOOLPLAN', 'EXTENSION', 1, NULL, =
'S', NULL);
 INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', NULL);
 INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', NULL);
+INSERT INTO profile_menu VALUES (16, 'PRINTJRN', 'IMP', 1, 14, 'E', NULL=
);
+INSERT INTO profile_menu VALUES (10, 'PRINTREC', 'IMP', 1, 9, 'E', NULL)=
;
+INSERT INTO profile_menu VALUES (9, 'PRINTPOSTE', 'IMP', 1, 8, 'E', NULL=
);
+INSERT INTO profile_menu VALUES (11, 'PRINTREPORT', 'IMP', 1, 10, 'E', N=
ULL);
+INSERT INTO profile_menu VALUES (13, 'PRINTBILAN', 'IMP', 1, 11, 'E', NU=
LL);
+INSERT INTO profile_menu VALUES (15, 'PRINTGL', 'IMP', 1, 13, 'E', NULL)=
;
+INSERT INTO profile_menu VALUES (17, 'PRINTBAL', 'IMP', 1, 15, 'E', NULL=
);
+INSERT INTO profile_menu VALUES (14, 'PRINTCARD', 'IMP', 1, 12, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (162, 'IMPORTBANK', 'EXTENSION', 1, NULL=
, 'S', NULL);
+INSERT INTO profile_menu VALUES (163, 'TOOL', 'EXTENSION', 1, NULL, 'S',=
 NULL);
+INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MODULARITY', 1, NULL, =
'M', NULL);
+INSERT INTO profile_menu VALUES (167, 'MODULARITY', 'PARAM', 1, 1, 'M', =
NULL);
+INSERT INTO profile_menu VALUES (172, 'CFGPROFILE', 'MODULARITY', 1, NUL=
L, 'M', NULL);
 INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', NULL);
 INSERT INTO profile_menu VALUES (50, 'ANC', NULL, 2, 1, 'M', 0);
 INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', NULL);

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	2011-11-08 19:45:07 UTC (rev 4320)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-08 23:04:55 UTC (rev 4321)
@@ -15,6 +15,8 @@
 trigger.tmp_pcmn.sql
 account_add.sql
 object-6.0.sql
-epad-style.css
+epad-style.sql
+extension.sql
+
 */
 create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;



From MAILER-DAEMON Tue Nov 08 17:59:41 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RNudp-0008Ch-GZ
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Nov 2011 17:59:41 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  9 Nov 2011 00:05:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.558.1320793180.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4322 - 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 Nov 2011 22:59:39 -0000

Author: danydb
Date: 2011-11-09 00:05:47 +0100 (Wed, 09 Nov 2011)
New Revision: 4322

Added:
   phpcompta/trunk/include/class_menu_ref_sql.php
   phpcompta/trunk/include/class_profile_sql.php
   phpcompta/trunk/include/menu.inc.php
   phpcompta/trunk/include/profile.inc.php
Log:
Modularity : start to develop screen to modify Menu and profile

Added: phpcompta/trunk/include/class_menu_ref_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_menu_ref_sql.php	                      =
  (rev 0)
+++ phpcompta/trunk/include/class_menu_ref_sql.php	2011-11-08 23:05:47 UT=
C (rev 4322)
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * @file
+ * @brief Manage the table public.menu_ref
+ *
+ *
+  Example
+  @code
+
+  @endcode
+ */
+require_once('class_database.php');
+require_once('ac_common.php');
+
+/**
+ * @brief Manage the table public.menu_ref
+ */
+class Menu_Ref_sql
+{
+	/* example private $variable=3Darray("easy_name"=3D>column_name,"email"=
=3D>"column_name_email","val3"=3D>0); */
+
+	protected $variable =3D array(
+		"me_code" =3D> "me_code"
+		, "me_menu" =3D> "me_menu"
+		, "me_file" =3D> "me_file"
+		, "me_url" =3D> "me_url"
+		, "me_description" =3D> "me_description"
+		, "me_parameter" =3D> "me_parameter"
+		, "me_javascript" =3D> "me_javascript"
+		, "me_type" =3D> "me_type"
+	);
+
+	function __construct(& $p_cn, $p_id=3D-1)
+	{
+		$this->cn =3D $p_cn;
+		$this->me_code =3D $p_id;
+
+		if ($p_id =3D=3D -1)
+		{
+			/* Initialize an empty object */
+			foreach ($this->variable as $key =3D> $value)
+				$this->$value =3D null;
+			$this->me_code =3D $p_id;
+		}
+		else
+		{
+			/* load it */
+
+			$this->load();
+		}
+	}
+
+	public function get_parameter($p_string)
+	{
+		if (array_key_exists($p_string, $this->variable))
+		{
+			$idx =3D $this->variable[$p_string];
+			return $this->$idx;
+		}
+		else
+			throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . 'Erreur a=
ttribut inexistant');
+	}
+
+	public function set_parameter($p_string, $p_value)
+	{
+		if (array_key_exists($p_string, $this->variable))
+		{
+			$idx =3D $this->variable[$p_string];
+			$this->$idx =3D $p_value;
+		}
+		else
+			throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . 'Erreur a=
ttribut inexistant');
+	}
+
+	public function get_info()
+	{
+		return var_export($this, true);
+	}
+
+	public function verify()
+	{
+		// Verify that the elt we want to add is correct
+		/* verify only the datatype */
+		if (trim($this->me_menu) =3D=3D '')
+			$this->me_menu =3D null;
+		if (trim($this->me_file) =3D=3D '')
+			$this->me_file =3D null;
+		if (trim($this->me_url) =3D=3D '')
+			$this->me_url =3D null;
+		if (trim($this->me_description) =3D=3D '')
+			$this->me_description =3D null;
+		if (trim($this->me_parameter) =3D=3D '')
+			$this->me_parameter =3D null;
+		if (trim($this->me_javascript) =3D=3D '')
+			$this->me_javascript =3D null;
+		if (trim($this->me_type) =3D=3D '')
+			$this->me_type =3D null;
+	}
+
+	/**
+	 * @brief retrieve array of object thanks a condition
+	 * @param $cond condition (where clause) (optional by default all the r=
ows are fetched)
+	 * you can use this parameter for the order or subselect
+	 * @param $p_array array for the SQL stmt
+	 * @see Database::exec_sql get_object  Database::num_row
+	 * @return the return value of exec_sql
+	 */
+	public function seek($cond=3D'', $p_array=3Dnull)
+	{
+		$sql =3D "select * from public.menu_ref  $cond";
+		$aobj =3D array();
+		$ret =3D $this->cn->exec_sql($sql, $p_array);
+		return $ret;
+	}
+
+	/**
+	 * get_seek return the next object, the return of the query must have a=
ll the column
+	 * of the object
+	 * @param $p_ret is the return value of an exec_sql
+	 * @param $idx is the index
+	 * @see seek
+	 * @return object
+	 */
+	public function get_object($p_ret, $idx)
+	{
+		// map each row in a object
+		$oobj =3D new Menu_Ref_sql($this->cn);
+		$array =3D Database::fetch_array($p_ret, $idx);
+		foreach ($array as $idx =3D> $value)
+		{
+			$oobj->$idx =3D $value;
+		}
+		return $oobj;
+	}
+
+	public function insert()
+	{
+		if ($this->verify() !=3D 0)
+			return;
+
+			$sql =3D "insert into public.menu_ref(me_menu
+					,me_file
+					,me_url
+					,me_description
+					,me_parameter
+					,me_javascript
+					,me_type
+					,me_code) values ($1
+					,$2
+					,$3
+					,$4
+					,$5
+					,$6
+					,$7
+					,$8
+					) returning me_code";
+
+			$this->me_code =3D $this->cn->get_value(
+					$sql, array($this->me_menu
+				, $this->me_file
+				, $this->me_url
+				, $this->me_description
+				, $this->me_parameter
+				, $this->me_javascript
+				, $this->me_type
+				, $this->me_code)
+			);
+
+	}
+
+	public function update()
+	{
+		if ($this->verify() !=3D 0)
+			return;
+		/*   please adapt */
+		$sql =3D " update public.menu_ref set me_menu =3D $1
+					,me_file =3D $2
+					,me_url =3D $3
+					,me_description =3D $4
+					,me_parameter =3D $5
+					,me_javascript =3D $6
+					,me_type =3D $7
+					 where me_code=3D $8";
+		$res =3D $this->cn->exec_sql(
+				$sql, array($this->me_menu
+			, $this->me_file
+			, $this->me_url
+			, $this->me_description
+			, $this->me_parameter
+			, $this->me_javascript
+			, $this->me_type
+			, $this->me_code)
+		);
+	}
+
+	/**
+	 * @brief load a object
+	 * @return 0 on success -1 the object is not found
+	 */
+	public function load()
+	{
+
+		$sql =3D "select me_menu
+						,me_file
+						,me_url
+						,me_description
+						,me_parameter
+						,me_javascript
+						,me_type
+						 from public.menu_ref where me_code=3D$1";
+		/* please adapt */
+		$res =3D $this->cn->get_array(
+				$sql, array($this->me_code)
+		);
+
+		if (count($res) =3D=3D 0)
+		{
+			/* Initialize an empty object */
+			foreach ($this->variable as $key =3D> $value)
+				$this->$key =3D '';
+
+			return -1;
+		}
+		foreach ($res[0] as $idx =3D> $value)
+		{
+			$this->$idx =3D $value;
+		}
+		return 0;
+	}
+
+	public function delete()
+	{
+		$sql =3D "delete from public.menu_ref where me_code=3D$1";
+		$res =3D $this->cn->exec_sql($sql, array($this->me_code));
+	}
+
+	/**
+	 * Unit test for the class
+	 */
+	static function test_me()
+	{
+	}
+
+}
+
+// Menu_Ref_sql::test_me();
+?>

Added: phpcompta/trunk/include/class_profile_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_profile_sql.php	                       =
 (rev 0)
+++ phpcompta/trunk/include/class_profile_sql.php	2011-11-08 23:05:47 UTC=
 (rev 4322)
@@ -0,0 +1,240 @@
+<?php
+/**
+ *@file
+ *@brief Manage the table public.profile
+ *
+ *
+Example
+@code
+
+@endcode
+ */
+require_once('class_database.php');
+require_once('ac_common.php');
+
+
+/**
+ *@brief Manage the table public.profile
+*/
+class Profile_sql =20
+{
+  /* example private $variable=3Darray("easy_name"=3D>column_name,"email=
"=3D>"column_name_email","val3"=3D>0); */
+ =20
+  protected $variable=3Darray("p_id"=3D>"p_id","p_name"=3D>"p_name"
+,"p_desc"=3D>"p_desc"
+,"with_calc"=3D>"with_calc"
+,"with_direct_form"=3D>"with_direct_form"
+);
+  function __construct ( & $p_cn,$p_id=3D-1) {
+        $this->cn=3D$p_cn;
+        $this->p_id=3D$p_id;
+       =20
+        if ( $p_id =3D=3D -1 ) {
+        /* Initialize an empty object */
+            foreach ($this->variable as $key=3D>$value) $this->$value=3D=
null;
+            $this->p_id=3D$p_id;
+        } else {
+         /* load it */
+
+         $this->load();
+      }
+  }
+  public function get_parameter($p_string) {
+    if ( array_key_exists($p_string,$this->variable) ) {
+      $idx=3D$this->variable[$p_string];
+      return $this->$idx;
+    }
+    else=20
+      throw new Exception (__FILE__.":".__LINE__.$p_string.'Erreur attri=
but inexistant');
+  }
+  public function set_parameter($p_string,$p_value) {
+    if ( array_key_exists($p_string,$this->variable) ) {
+      $idx=3D$this->variable[$p_string];
+      $this->$idx=3D$p_value;
+    }
+    else=20
+      throw new Exception (__FILE__.":".__LINE__.$p_string.'Erreur attri=
but inexistant');
+  }
+  public function get_info() {    return var_export($this,true);  }
+  public function verify() {
+    // Verify that the elt we want to add is correct
+    /* verify only the datatype */
+     if ( trim($this->p_name) =3D=3D '') $this->p_name=3Dnull;
+ if ( trim($this->p_desc) =3D=3D '') $this->p_desc=3Dnull;
+ if ( trim($this->with_calc) =3D=3D '') $this->with_calc=3Dnull;
+ if ( trim($this->with_direct_form) =3D=3D '') $this->with_direct_form=3D=
null;
+
+   =20
+  }
+  public function save() {
+  /* please adapt */
+    if (  $this->p_id =3D=3D -1 )=20
+      $this->insert();
+    else
+      $this->update();
+  }
+  /**
+   *@brief retrieve array of object thanks a condition
+   *@param $cond condition (where clause) (optional by default all the r=
ows are fetched)
+   * you can use this parameter for the order or subselect
+   *@param $p_array array for the SQL stmt
+   *@see Database::exec_sql get_object  Database::num_row
+   *@return the return value of exec_sql
+   */
+   public function seek($cond=3D'',$p_array=3Dnull)=20
+   {
+     $sql=3D"select * from public.profile  $cond";
+     $aobj=3Darray();
+     $ret=3D $this->cn->exec_sql($sql,$p_array);
+     return $ret;
+   }
+   /**
+    *get_seek return the next object, the return of the query must have =
all the column
+    * of the object
+    *@param $p_ret is the return value of an exec_sql
+    *@param $idx is the index
+    *@see seek
+    *@return object=20
+    */
+   public function get_object($p_ret,$idx)
+    {
+     // map each row in a object
+     $oobj=3Dnew Profile_sql ($this->cn);
+     $array=3DDatabase::fetch_array($p_ret,$idx);
+     foreach ($array as $idx=3D>$value) { $oobj->$idx=3D$value; }
+     return $oobj;
+   }
+  public function insert() {
+    if ( $this->verify() !=3D 0 ) return;
+      if( $this->p_id=3D=3D-1 ){
+    /*  please adapt */
+    $sql=3D"insert into public.profile(p_name
+,p_desc
+,with_calc
+,with_direct_form
+) values ($1
+,$2
+,$3
+,$4
+) returning p_id";
+   =20
+    $this->p_id=3D$this->cn->get_value(
+		 $sql,
+		 array( $this->p_name
+,$this->p_desc
+,$this->with_calc
+,$this->with_direct_form
+)
+		 );
+          } else {
+              $sql=3D"insert into public.profile(p_name
+,p_desc
+,with_calc
+,with_direct_form
+,p_id) values ($1
+,$2
+,$3
+,$4
+,$5
+) returning p_id";
+   =20
+    $this->p_id=3D$this->cn->get_value(
+		 $sql,
+		 array( $this->p_name
+,$this->p_desc
+,$this->with_calc
+,$this->with_direct_form
+,$this->p_id)
+		 );
+
+          }
+  =20
+  }
+
+  public function update() {
+    if ( $this->verify() !=3D 0 ) return;
+    /*   please adapt */
+    $sql=3D" update public.profile set p_name =3D $1
+,p_desc =3D $2
+,with_calc =3D $3
+,with_direct_form =3D $4
+ where p_id=3D $5";
+    $res=3D$this->cn->exec_sql(
+		 $sql,
+		 array($this->p_name
+,$this->p_desc
+,$this->with_calc
+,$this->with_direct_form
+,$this->p_id)
+		 );
+		=20
+  }
+/**
+ *@brief load a object
+ *@return 0 on success -1 the object is not found
+ */
+  public function load() {
+
+   $sql=3D"select p_name
+,p_desc
+,with_calc
+,with_direct_form
+ from public.profile where p_id=3D$1";=20
+    /* please adapt */
+    $res=3D$this->cn->get_array(
+		 $sql,
+		 array($this->p_id)
+		 );
+		=20
+    if ( count($res) =3D=3D 0 ) {
+          /* Initialize an empty object */
+          foreach ($this->variable as $key=3D>$value) $this->$key=3D'';
+
+          return -1;
+          }
+    foreach ($res[0] as $idx=3D>$value) { $this->$idx=3D$value; }
+    return 0;
+  }
+
+  public function delete() {
+    $sql=3D"delete from public.profile where p_id=3D$1";=20
+    $res=3D$this->cn->exec_sql($sql,array($this->p_id));
+  }
+  /**
+   * Unit test for the class
+   */=09
+  static function test_me() {
+      $cn=3Dnew Database(25);
+$cn->start();
+    echo h2info('Test object vide');
+    $obj=3Dnew Profile_sql($cn);
+    var_dump($obj);
+
+    echo h2info('Test object NON vide');
+    $obj->set_parameter('j_id',3);
+    $obj->load();
+    var_dump($obj);
+
+    echo h2info('Update');
+    $obj->set_parameter('j_qcode','NOUVEAU CODE');
+    $obj->save();
+    $obj->load();
+    var_dump($obj);
+
+    echo h2info('Insert');
+    $obj->set_parameter('j_id',0);
+    $obj->save();
+    $obj->load();
+    var_dump($obj);
+
+    echo h2info('Delete');
+    $obj->delete();
+    echo (($obj->load()=3D=3D0)?'Trouve':'non trouve');
+    var_dump($obj);
+$cn->rollback();
+
+  }
+ =20
+}
+// Profile_sql::test_me();
+?>

Added: phpcompta/trunk/include/menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/menu.inc.php	                        (rev 0)
+++ phpcompta/trunk/include/menu.inc.php	2011-11-08 23:05:47 UTC (rev 432=
2)
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/* !\file
+ *
+ *
+ * \brief Show the table menu and let you add your own
+ *
+ */
+require_once 'class_menu_ref_sql.php';
+require_once 'class_sort_table.php';
+echo '<div class=3D"content">';
+/**
+ * if post save then we save a new one
+ */
+
+/**
+ * if post update then we update
+ */
+
+/**
+ * if delete then delete
+ */
+
+////////////////////////////////////////////////////////////////////////=
//////
+// Show the list of menu
+////////////////////////////////////////////////////////////////////////=
//////
+global $cn;
+
+$table=3Dnew Sort_Table();
+$url=3D$_SERVER['REQUEST_URI'];
+
+$table->add('Code',$url,"order by me_code asc","order by me_code desc","=
codea","coded");
+$table->add('Menu',$url,"order by me_menu asc","order by me_menu desc","=
menua","menud");
+$table->add('Description',$url,"order by me_description asc","order by m=
e_description desc","desa","desd");
+$table->add('URL',$url,"order by me_url asc","order by me_url desc","url=
a","urld");
+$table->add('Param=C3=A8tre',$url,"order by me_parametere asc","order by=
 me_parameter desc","paa","pad");
+$table->add('Javascript',$url,"order by me_javascript asc","order by me_=
javascript desc","jsa","jsd");
+$table->add('Type',$url,"order by me_type asc","order by me_type desc","=
ta","td");
+
+$ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'codea';
+
+$order=3D$table->get_sql_order($ord);
+
+$menu=3Dnew Menu_Ref_sql($cn);
+$ret=3D$menu->seek($order);
+echo '<p class=3D"info"> le type vaut :
+	<ul>
+	<li> ME pour Menu</li>
+	<li> PR pour les impressions </li>
+	<li> PL pour les plugins</li>
+	<li> SP pour des valeurs sp=C3=A9ciales</li>
+	</p>';
+echo '<table class=3D"result">';
+echo '<tr>';
+echo '<th>'.$table->get_header(0).'</th>';
+echo '<th>'.$table->get_header(1).'</th>';
+echo '<th>'.$table->get_header(2).'</th>';
+echo '<th>'.$table->get_header(3).'</th>';
+echo '<th>'.$table->get_header(4).'</th>';
+echo '<th>'.$table->get_header(5).'</th>';
+echo '<th>'.$table->get_header(6).'</th>';
+echo '</tr>';
+
+for ($i=3D0;$i<Database::num_row($ret);$i++)
+{
+	$row=3D$menu->get_object($ret, $i);
+	echo '<tr>';
+	echo td($row->me_code);
+	echo td($row->me_menu);
+	echo td($row->me_description);
+	echo td($row->me_url);
+	echo td($row->me_parameter);
+	echo td($row->me_javascript);
+	echo td($row->me_type);
+	echo '</tr>';
+}
+echo '</table>';
+
+?>

Added: phpcompta/trunk/include/profile.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/profile.inc.php	                        (rev =
0)
+++ phpcompta/trunk/include/profile.inc.php	2011-11-08 23:05:47 UTC (rev =
4322)
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+require_once 'class_profile_sql.php';
+global $cn;
+echo '<div class=3D"content">';
+$table=3Dnew Sort_Table();
+$url=3D$_SERVER['REQUEST_URI'];
+
+$table->add('Nom',$url,"order by p_name asc","order by p_name desc","na"=
,"nd");
+$table->add('Description',$url,"order by p_desc asc","order by p_desc de=
sc","da","dd");
+$table->add('Calculatrice visible',$url,"order by with_calc asc","order =
by with_calc desc","ca","cd");
+$table->add('Form Direct visible',$url,"order by with_direct_form asc","=
order by with_direct_form desc","fa","fd");
+
+$ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'na';
+
+$order=3D$table->get_sql_order($ord);
+
+$menu=3Dnew Profile_sql($cn);
+$ret=3D$menu->seek($order);
+echo '<table class=3D"result">';
+echo '<tr>';
+echo '<th>'.$table->get_header(0).'</th>';
+echo '<th>'.$table->get_header(1).'</th>';
+echo '<th>'.$table->get_header(2).'</th>';
+echo '<th>'.$table->get_header(3).'</th>';
+echo '</tr>';
+
+for ($i=3D0;$i<Database::num_row($ret);$i++)
+{
+	$row=3D$menu->get_object($ret, $i);
+	echo '<tr>';
+	echo td($row->p_name);
+	echo td($row->p_desc);
+	echo td($row->with_calc);
+	echo td($row->with_direct_form);
+	echo '</tr>';
+}
+echo '</table>';
+echo '</div>';
+
+?>



From MAILER-DAEMON Tue Nov 08 18:00:11 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RNueJ-0008Hy-Il
	for mharc-phpcompta-dev@gnu.org; Tue, 08 Nov 2011 18:00:11 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  9 Nov 2011 00:06:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.559.1320793210.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4323 - 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 Nov 2011 23:00:09 -0000

Author: danydb
Date: 2011-11-09 00:06:19 +0100 (Wed, 09 Nov 2011)
New Revision: 4323

Added:
   phpcompta/trunk/include/cfgledger.inc.php
Log:
Modularity ; Configure ledger

Added: phpcompta/trunk/include/cfgledger.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/cfgledger.inc.php	                        (re=
v 0)
+++ phpcompta/trunk/include/cfgledger.inc.php	2011-11-08 23:06:19 UTC (re=
v 4323)
@@ -0,0 +1,151 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ *
+ * @brief Create, update and delete ledgers
+ *
+ */
+require_once('class_dossier.php');
+require_once ("ac_common.php");
+require_once('class_database.php');
+require_once ("class_user.php");
+require_once ("user_menu.php");
+require_once 'class_acc_ledger.php';
+
+$gDossier=3Ddossier::id();
+$cn=3Dnew Database($gDossier);
+
+$ledger=3Dnew Acc_Ledger($cn,-1);
+$sa=3DHtmlInput::default_value("sa","",$_REQUEST);
+////////////////////////////////////////////////////////////////////////=
//
+// Perform request action : update
+////////////////////////////////////////////////////////////////////////=
//
+if (isset($_POST['update']))
+{
+	try
+	{
+		$ledger->id=3D$_POST['p_jrn'];
+		if ( $ledger->load() =3D=3D -1) throw new Exception ('Journal inexista=
nt');
+		$ledger->verify_ledger($_POST);
+		$ledger->update($_POST);
+	} catch (Exception $e)
+	{
+		alert($e->getMessage());
+	}
+}
+
+////////////////////////////////////////////////////////////////////////=
//
+// Perform request action : delete
+////////////////////////////////////////////////////////////////////////=
//
+if (isset($_POST['efface']))
+{
+	$ledger->jrn_def_id=3D$_POST['p_jrn'];
+	$ledger->id=3D$_POST['p_jrn'];
+	$ledger->load();
+	$name=3D$ledger->get_name();
+	try {
+		$ledger->delete_ledger();
+		$sa=3D"";
+		echo '<div id=3D"jrn_name_div">';
+		echo '<h2 id=3D"jrn_name">'.h($name). "  est effac=C3=A9"."</h2>";
+		echo '</div>';
+	}
+	catch (Exception $e)
+	{
+		alert ($e->getMessage());
+	}
+
+}
+
+////////////////////////////////////////////////////////////////////////=
//
+// Perform request action : add
+////////////////////////////////////////////////////////////////////////=
//
+if (isset($_POST['add']))
+{
+	try
+	{
+		$ledger->verify_ledger($_POST);
+		$ledger->save_new($_POST);
+		$sa=3D"detail";
+		$_REQUEST['p_jrn']=3D$ledger->jrn_def_id;
+	}
+	catch (Exception $e)
+	{
+		alert($e->getMessage());
+	}
+}
+
+////////////////////////////////////////////////////////////////////////=
//
+// Display list of ledgers
+////////////////////////////////////////////////////////////////////////=
//
+echo '<div class=3D"lmenu">';
+echo $ledger->listing();
+echo '</div>';
+
+
+
+////////////////////////////////////////////////////////////////////////=
//
+//Display detail of ledger
+////////////////////////////////////////////////////////////////////////=
//
+
+switch ($sa)
+{
+	case 'detail': /* detail of a ledger */
+		try
+		{
+			$ledger->id=3D$_REQUEST['p_jrn'];
+			echo '<div class=3D"u_redcontent">';
+			echo '<form method=3D"POST">';
+			echo $ledger->display_ledger();
+			echo '<INPUT TYPE=3D"SUBMIT" class=3D"button" VALUE=3D"Sauve" name=3D=
"update">
+			<INPUT TYPE=3D"RESET" class=3D"button" VALUE=3D"Reset">
+			<INPUT TYPE=3D"submit" class=3D"button"  name=3D"efface" value=3D"Eff=
ace" onClick=3D"return confirm(\'Vous effacez ce journal ?\')">';
+			echo '</FORM>';
+			echo "</div>";
+		}
+		catch (Exception $e)
+		{
+			alert($e->getMessage());
+		}
+		break;
+	case 'add': /* Add a new ledger */
+		echo '<div class=3D"u_redcontent">';
+		echo '<FORM METHOD=3D"POST">';
+		$ledger->input_new();
+		echo HtmlInput::submit('add','Sauver');
+		echo '<INPUT TYPE=3D"RESET" class=3D"button" VALUE=3D"Reset">';
+		echo '</FORM>';
+		echo "</DIV>";
+}
+
+
+
+
+
+html_page_stop();
+
+
+
+?>



From MAILER-DAEMON Wed Nov 09 21:24:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROKJ7-0007ek-Of
	for mharc-phpcompta-dev@gnu.org; Wed, 09 Nov 2011 21:24:01 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 03:29:59 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.4714.1320891841.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4324 - 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, 10 Nov 2011 02:24:00 -0000

Author: danydb
Date: 2011-11-10 03:29:58 +0100 (Thu, 10 Nov 2011)
New Revision: 4324

Modified:
   phpcompta/trunk/include/class_iconcerned.php
Log:
306 Efface le iconcerned

Modified: phpcompta/trunk/include/class_iconcerned.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iconcerned.php	2011-11-08 23:06:19 UTC =
(rev 4323)
+++ phpcompta/trunk/include/class_iconcerned.php	2011-11-10 02:29:58 UTC =
(rev 4324)
@@ -24,7 +24,7 @@
  * \brief Html Input
  *  - name is the name and id of the input
  *  - extra amount of the operation to reconcile
- *  - extra2 ledger (all, ods,...)
+ *  - extra2 ledger paid
  */
 require_once('class_html_input.php');
 class IConcerned extends HtmlInput
@@ -35,7 +35,7 @@
 		$this->name=3D$p_name;
 		$this->value=3D$p_value;
 		$this->amount_id=3Dnull;
-		$this->ledger=3D'ALL';
+		$this->paid=3D'';
 	}
     /*!\brief show the html  input of the widget*/
     public function input($p_name=3Dnull,$p_value=3Dnull)
@@ -47,15 +47,18 @@
=20
=20
         $r=3Dsprintf("
-                   <INPUT TYPE=3D\"button\" onClick=3Dsearch_reconcile("=
.dossier::id().",'%s','%s','%s') value=3D\"?\">
+                   <INPUT TYPE=3D\"button\" onClick=3D\"search_reconcile=
(".dossier::id().",'%s','%s','%s')\" value=3D\"?\">
                    <INPUT TYPE=3D\"text\"  style=3D\"color:black;backgro=
und:lightyellow;border:solid 1px grey;\"  NAME=3D\"%s\" ID=3D\"%s\" VALUE=
=3D\"%s\" SIZE=3D\"8\" readonly>
+				   <INPUT TYPE=3D\"button\" onClick=3D\"$('%s').value=3D''\" value=3D=
\"X\">
+
                    ",
                    $this->name,
                    $this->amount_id,
-                   $this->ledger,
+                   $this->paid,
                    $this->name,
                    $this->name,
-                   $this->value
+                   $this->value,
+                   $this->name
                   );
         return $r;
     }



From MAILER-DAEMON Thu Nov 10 07:52:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROU74-00029L-I0
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 07:52:14 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 13:58:11 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.5825.1320929533.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4325 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Nov 2011 12:52:13 -0000

Author: danydb
Date: 2011-11-10 13:58:09 +0100 (Thu, 10 Nov 2011)
New Revision: 4325

Modified:
   phpcompta/trunk/include/template/ledger_detail_ach.php
Log:
Client au lieu de fournisseur

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	2011-11-10 02:=
29:58 UTC (rev 4324)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php	2011-11-10 12:=
58:09 UTC (rev 4325)
@@ -35,7 +35,7 @@
 							<tr><td>
 							<?
 							$bk=3Dnew Fiche($cn,$obj->det->array[0]['qp_supplier']);
-							echo td(_('Client'));
+							echo td(_('Fournisseur'));
=20
 							$view_history=3D sprintf('<A class=3D"detail" HREF=3D"javascript:=
view_history_card(\'%s\',\'%s\')" >%s</A>',
 											$bk->id, $gDossier, $bk->get_quick_code());



From MAILER-DAEMON Thu Nov 10 10:44:21 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROWnd-0003rN-GQ
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 10:44:21 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 16:49:59 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.6188.1320939860.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4326 - in phpcompta/trunk:
	dev/manage-code/create-file html 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: Thu, 10 Nov 2011 15:44:19 -0000

Author: danydb
Date: 2011-11-10 16:49:57 +0100 (Thu, 10 Nov 2011)
New Revision: 4326

Added:
   phpcompta/trunk/html/style-epad.css
   phpcompta/trunk/include/class_profile_menu.php
   phpcompta/trunk/include/class_profile_menu_sql.php
   phpcompta/trunk/include/detail_menu.inc.php
   phpcompta/trunk/include/show_profile.inc.php
   phpcompta/trunk/include/template/add_menu.php
   phpcompta/trunk/include/template/plugin_detail.php
   phpcompta/trunk/include/template/profile.php
   phpcompta/trunk/include/template/profile_menu.php
   phpcompta/trunk/sql/change_account_repo.sql
   phpcompta/trunk/sql/style-epad.sql
   phpcompta/trunk/sql/tmp_pcmn_ins.sql
Modified:
   phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/do.php
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style-print.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/anc_od.inc.php
   phpcompta/trunk/include/anc_pa.inc.php
   phpcompta/trunk/include/cfgledger.inc.php
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_extension.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_menu_ref_sql.php
   phpcompta/trunk/include/class_user.php
   phpcompta/trunk/include/contact.inc.php
   phpcompta/trunk/include/fiche.inc.php
   phpcompta/trunk/include/menu.inc.php
   phpcompta/trunk/include/operation_ods_new.inc.php
   phpcompta/trunk/include/param_pcmn.inc.php
   phpcompta/trunk/include/profile.inc.php
   phpcompta/trunk/include/report.inc.php
   phpcompta/trunk/include/stock.inc.php
   phpcompta/trunk/sql/backup-new-object.sh
   phpcompta/trunk/sql/object-6.0.sql
   phpcompta/trunk/sql/upgrade.sql
Log:
0000390 	r?\195?\169?\195?\169criture de include/extension.inc.php
0000424 	Plugin trait?\195?\169 comme des modules ou des menus
0000240 	S?\195?\169curit?\195?\169 par profile
0000438 	Modularit?\195?\169 : avoir les ?\195?\169crans pour g?\195?\169=
rer les menus, profiles et les liaisons
0000435 	Form direct action : am?\195?\169liorer apparence

Modified: phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py	2011-1=
1-10 12:58:09 UTC (rev 4325)
+++ phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py	2011-1=
1-10 15:49:57 UTC (rev 4326)
@@ -22,6 +22,7 @@
                -f input file containing the structure
                -c create the code for a child class
                -v create the code for a view (so only load and seek)
+               -n the PK is not serial
     The input file contains :
     first  line class name : mother class separator : (optionnal)
     second line table name
@@ -31,7 +32,7 @@
     """
 def main():
     try:
-        opts,args=3Dgetopt.getopt(sys.argv[1:],'cf:hv',['child','file','=
help','view'])
+        opts,args=3Dgetopt.getopt(sys.argv[1:],'cf:hv',['child','file','=
help','view','pk-not-serial'])
     except getopt.GetOptError, err:
         print str(err)
         help()
@@ -47,6 +48,8 @@
             child=3DTrue
         elif option in ('-v','--view'):
             view=3DTrue
+        elif option in ('-n','--pk-not-serial'):
+	    nopk=3DTrue
     if filein=3D=3D'' :
         help()
         sys.exit(-2)
@@ -451,7 +454,7 @@
      $oobj=3Dnew @class_name@ ($this->cn);
      $array=3DDatabase::fetch_array($p_ret,$idx);
      foreach ($array as $idx=3D>$value) { $oobj->$idx=3D$value; }
-     $aobj[]=3Dclone $oobj;
+     $aobj=3Dclone $oobj;
=20
      return $aobj;
    }

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	2011-11-10 12:58:09 UTC (rev 4325)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-10 15:49:57 UTC (rev 4326)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,12 +16,12 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/*!\file
+/* !\file
  * \brief this file respond to an ajax request
  * The parameters are
  * - gDossier
@@ -29,9 +30,9 @@
  * dsp_tva fill a ipopup with a choice of possible VAT
  *     - if code is set then fill the field code
  *     - if compute is set then add event to call clean_tva and compute_=
ledger
-@see Acc_Ledger_Sold::input
-* Part 2
-* dl : display form to modify, add and delete lettering for a given oper=
ation
+  @see Acc_Ledger_Sold::input
+ * Part 2
+ * dl : display form to modify, add and delete lettering for a given ope=
ration
  *
  */
 require_once('class_database.php');
@@ -41,54 +42,54 @@
 require_once('ac_common.php');
 require_once ('class_user.php');
=20
-$var=3Darray('gDossier','op');
-$cont=3D0;
+$var =3D array('gDossier', 'op');
+$cont =3D 0;
 /*  check if mandatory parameters are given */
 foreach ($var as $v)
 {
-    if ( ! isset ($_REQUEST [$v] ) )
-    {
-        echo "$v is not set ";
-        $cont=3D1;
-    }
+	if (!isset($_REQUEST [$v]))
+	{
+		echo "$v is not set ";
+		$cont =3D 1;
+	}
 }
-if ( $cont !=3D 0 ) exit();
-extract($_REQUEST );
+if ($cont !=3D 0)
+	exit();
+extract($_REQUEST);
 set_language();
=20
-$cn=3Dnew Database($gDossier);
-$user=3Dnew User($cn);
+$cn =3D new Database($gDossier);
+$user =3D new User($cn);
 $user->check(true);
-$user->check_dossier($gDossier,true);
-$html=3Dvar_export($_REQUEST,true);
-switch($op)
+$user->check_dossier($gDossier, true);
+$html =3D var_export($_REQUEST, true);
+switch ($op)
 {
 	case "remove_anc":
 		if ($user->check_action(CAOD))
-		$cn->exec_sql("delete from operation_analytique where oa_group=3D$1",a=
rray($_GET['oa']));
+			$cn->exec_sql("delete from operation_analytique where oa_group=3D$1",=
 array($_GET['oa']));
 		break;
-case "rm_stock":
-  require_once('constant.security.php');
-  if ( $user->check_action(GESTOCK) =3D=3D 0 )
-    {
-      exit();
-    }
-  $cn->exec_sql('delete from stock_goods where sg_id=3D$1',
-		array($s_id));
-  $html=3Descape_xml($s_id);
-  header('Content-type: text/xml; charset=3DUTF-8');
-  printf('{"d_id":"%s"}',$s_id);
-  exit();
-  break;
-    //--------------------------------------------------
-    // get the last date of a ledger
-case 'lastdate':
-    require_once('class_acc_ledger_fin.php');
-    $ledger=3Dnew Acc_Ledger_Fin($cn,$_GET['p_jrn']);
-    $html=3D$ledger->get_last_date();
-    $html=3Descape_xml($html);
-    header('Content-type: text/xml; charset=3DUTF-8');
-    echo <<<EOF
+	case "rm_stock":
+		require_once('constant.security.php');
+		if ($user->check_action(GESTOCK) =3D=3D 0)
+		{
+			exit();
+		}
+		$cn->exec_sql('delete from stock_goods where sg_id=3D$1', array($s_id)=
);
+		$html =3D escape_xml($s_id);
+		header('Content-type: text/xml; charset=3DUTF-8');
+		printf('{"d_id":"%s"}', $s_id);
+		exit();
+		break;
+	//--------------------------------------------------
+	// get the last date of a ledger
+	case 'lastdate':
+		require_once('class_acc_ledger_fin.php');
+		$ledger =3D new Acc_Ledger_Fin($cn, $_GET['p_jrn']);
+		$html =3D $ledger->get_last_date();
+		$html =3D escape_xml($html);
+		header('Content-type: text/xml; charset=3DUTF-8');
+		echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <data>
 <code>e_date</code>
@@ -96,159 +97,158 @@
 </data>
 EOF;
=20
-    break;
-case 'bkname':
-    require_once('class_acc_ledger_fin.php');
-    $ledger=3Dnew Acc_Ledger_Fin($cn,$_GET['p_jrn']);
-    $html=3D$ledger->get_bank_name();
-    $html=3Descape_xml($html);
-    header('Content-type: text/xml; charset=3DUTF-8');
-    echo <<<EOF
+		break;
+	case 'bkname':
+		require_once('class_acc_ledger_fin.php');
+		$ledger =3D new Acc_Ledger_Fin($cn, $_GET['p_jrn']);
+		$html =3D $ledger->get_bank_name();
+		$html =3D escape_xml($html);
+		header('Content-type: text/xml; charset=3DUTF-8');
+		echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <data>
 <code>bkname</code>
 <value>$html</value>
 </data>
 EOF;
-    break;
-    // display new calendar
-case 'cal':
-        require_once('class_calendar.php');
-    /* others report */
-    $cal=3Dnew Calendar();
-    $cal->set_periode($per);
+		break;
+	// display new calendar
+	case 'cal':
+		require_once('class_calendar.php');
+		/* others report */
+		$cal =3D new Calendar();
+		$cal->set_periode($per);
=20
-    $html=3D"";
-    $html=3D$cal->display();
-    $html=3Descape_xml($html);
-    header('Content-type: text/xml; charset=3DUTF-8');
-    echo <<<EOF
+		$html =3D "";
+		$html =3D $cal->display();
+		$html =3D escape_xml($html);
+		header('Content-type: text/xml; charset=3DUTF-8');
+		echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <data>
 <code>$html</code>
 </data>
 EOF;
-    break;
-    /* remove a cat of document */
-case 'rem_cat_doc':
-        require_once('class_document_type.php');
-    // if user can not return error message
-    if(     $user->check_action(PARCATDOC)=3D=3D0 )
-    {
-        $html=3D"nok";
-        header('Content-type: text/xml; charset=3DUTF-8');
-        echo <<<EOF
+		break;
+	/* remove a cat of document */
+	case 'rem_cat_doc':
+		require_once('class_document_type.php');
+		// if user can not return error message
+		if ($user->check_action(PARCATDOC) =3D=3D 0)
+		{
+			$html =3D "nok";
+			header('Content-type: text/xml; charset=3DUTF-8');
+			echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <data>
 <dtid>$html</dtid>
 </data>
 EOF;
-        return;
-    }
-    // remove the cat if no action
-    $count_md=3D$cn->get_value('select count(*) from document_modele whe=
re md_type=3D$1',array($dt_id));
-    $count_a=3D$cn->get_value('select count(*) from action_gestion where=
 ag_type=3D$1',array($dt_id));
+			return;
+		}
+		// remove the cat if no action
+		$count_md =3D $cn->get_value('select count(*) from document_modele whe=
re md_type=3D$1', array($dt_id));
+		$count_a =3D $cn->get_value('select count(*) from action_gestion where=
 ag_type=3D$1', array($dt_id));
=20
-    if ( $count_md !=3D 0 || $count_a !=3D 0 )
-    {
-        $html=3D"nok";
-        header('Content-type: text/xml; charset=3DUTF-8');
-        echo <<<EOF
+		if ($count_md !=3D 0 || $count_a !=3D 0)
+		{
+			$html =3D "nok";
+			header('Content-type: text/xml; charset=3DUTF-8');
+			echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <data>
 <dtid>$html</dtid>
 </data>
 EOF;
-        exit;
-    }
-    $cn->exec_sql('delete from document_type where dt_id=3D$1',array($dt=
_id));
-    $html=3D$dt_id;
-    header('Content-type: text/xml; charset=3DUTF-8');
-    echo <<<EOF
+			exit;
+		}
+		$cn->exec_sql('delete from document_type where dt_id=3D$1', array($dt_=
id));
+		$html =3D $dt_id;
+		header('Content-type: text/xml; charset=3DUTF-8');
+		echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
                                  <data>
                                  <dtid>$html</dtid>
                                  </data>
 EOF;
-    return;
-    break;
-case 'dsp_tva':
-  $cn=3Dnew Database($gDossier);
-    $Res=3D$cn->exec_sql("select * from tva_rate order by tva_rate desc"=
);
-    $Max=3DDatabase::num_row($Res);
-    $r=3D"";
-    $r=3DHtmlInput::anchor_close('tva_select');
-    $r.=3Dh2info('Choississez la TVA ');
-    $r.=3D'<div >';
-    $r.=3D '<TABLE style=3D"padding-left:10%;padding-right:10%;width:80%=
">';
-    $r.=3Dth('');
-    $r.=3Dth(_('code'));
-    $r.=3Dth(_('Taux'));
-    $r.=3Dth(_('Symbole'));
-    $r.=3Dth(_('Explication'));
+		return;
+		break;
+	case 'dsp_tva':
+		$cn =3D new Database($gDossier);
+		$Res =3D $cn->exec_sql("select * from tva_rate order by tva_rate desc"=
);
+		$Max =3D Database::num_row($Res);
+		$r =3D "";
+		$r =3D HtmlInput::anchor_close('tva_select');
+		$r.=3Dh2info('Choississez la TVA ');
+		$r.=3D'<div >';
+		$r.=3D '<TABLE style=3D"padding-left:10%;padding-right:10%;width:80%">=
';
+		$r.=3Dth('');
+		$r.=3Dth(_('code'));
+		$r.=3Dth(_('Taux'));
+		$r.=3Dth(_('Symbole'));
+		$r.=3Dth(_('Explication'));
=20
-    for ($i=3D0;$i<$Max;$i++)
-    {
-        $row=3DDatabase::fetch_array($Res,$i);
-        if ( ! isset($compute))
-        {
-            if ( ! isset($code) )
-            {
-                $script=3D"onclick=3D\"$('$ctl').value=3D'".$row['tva_id=
']."';removeDiv('tva_select');\"";
-            }
-            else
-            {
-                $script=3D"onclick=3D\"$('$ctl').value=3D'".$row['tva_id=
']."';set_value('$code','".$row['tva_label']."');removeDiv('tva_select');=
\"";
-            }
-        }
-        else
-        {
-            if ( ! isset($code) )
-            {
-                $script=3D"onclick=3D\"$('$ctl').value=3D'".$row['tva_id=
']."';removeDiv('tva_select');clean_tva('$compute');compute_ledger('$comp=
ute');\"";
-            }
-            else
-            {
-                $script=3D"onclick=3D\"$('$ctl').value=3D'".$row['tva_id=
']."';set_value('$code','".$row['tva_label']."');removeDiv('tva_select');=
clean_tva('$compute');compute_ledger('$compute');\"";
-            }
+		for ($i =3D 0; $i < $Max; $i++)
+		{
+			$row =3D Database::fetch_array($Res, $i);
+			if (!isset($compute))
+			{
+				if (!isset($code))
+				{
+					$script =3D "onclick=3D\"$('$ctl').value=3D'" . $row['tva_id'] . "'=
;removeDiv('tva_select');\"";
+				}
+				else
+				{
+					$script =3D "onclick=3D\"$('$ctl').value=3D'" . $row['tva_id'] . "'=
;set_value('$code','" . $row['tva_label'] . "');removeDiv('tva_select');\=
"";
+				}
+			}
+			else
+			{
+				if (!isset($code))
+				{
+					$script =3D "onclick=3D\"$('$ctl').value=3D'" . $row['tva_id'] . "'=
;removeDiv('tva_select');clean_tva('$compute');compute_ledger('$compute')=
;\"";
+				}
+				else
+				{
+					$script =3D "onclick=3D\"$('$ctl').value=3D'" . $row['tva_id'] . "'=
;set_value('$code','" . $row['tva_label'] . "');removeDiv('tva_select');c=
lean_tva('$compute');compute_ledger('$compute');\"";
+				}
+			}
+			$set =3D '<INPUT TYPE=3D"BUTTON" class=3D"button" Value=3D"select" ' =
. $script . '>';
+			$r.=3D'<tr>';
+			$r.=3Dtd($set);
+			$r.=3Dtd($row['tva_id']);
+			$r.=3Dtd($row['tva_rate']);
+			$r.=3Dtd($row['tva_label']);
+			$r.=3Dtd($row['tva_comment']);
+			$r.=3D'</tr>';
+		}
+		$r.=3D'</TABLE>';
+		$r.=3D'</div>';
+		$html =3D escape_xml($r);
=20
-        }
-        $set=3D '<INPUT TYPE=3D"BUTTON" class=3D"button" Value=3D"select=
" '.$script.'>';
-        $r.=3D'<tr>';
-        $r.=3Dtd($set);
-        $r.=3Dtd($row['tva_id']);
-        $r.=3Dtd($row['tva_rate']);
-        $r.=3Dtd($row['tva_label']);
-        $r.=3Dtd($row['tva_comment']);
-        $r.=3D'</tr>';
-    }
-    $r.=3D'</TABLE>';
-    $r.=3D'</div>';
-    $html=3Descape_xml($r);
-
-    header('Content-type: text/xml; charset=3DUTF-8');
-    echo <<<EOF
+		header('Content-type: text/xml; charset=3DUTF-8');
+		echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <data>
 <code>$html</code>
 <popup>$popup</popup>
 </data>
 EOF;
-    break;
-case 'label_tva':
-        $cn=3Dnew Database($gDossier);
-    if ( isNumber($id) =3D=3D 0 )
-        $value =3D _('tva inconnue');
-    else
-    {
-        $Res=3D$cn->get_array("select * from tva_rate where tva_id =3D $=
1",array($id));
-        if ( count($Res) =3D=3D 0 )
-            $value=3D_('tva inconnue');
-        else
-            $value=3D$Res[0]['tva_label'];
-    }
-    header('Content-type: text/xml; charset=3DUTF-8');
-echo <<<EOF
+		break;
+	case 'label_tva':
+		$cn =3D new Database($gDossier);
+		if (isNumber($id) =3D=3D 0)
+			$value =3D _('tva inconnue');
+		else
+		{
+			$Res =3D $cn->get_array("select * from tva_rate where tva_id =3D $1",=
 array($id));
+			if (count($Res) =3D=3D 0)
+				$value =3D _('tva inconnue');
+			else
+				$value =3D $Res[0]['tva_label'];
+		}
+		header('Content-type: text/xml; charset=3DUTF-8');
+		echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <data>
 <code>$code</code>
@@ -256,227 +256,269 @@
 </data>
 EOF;
=20
-    break;
-    /**
-     *display the lettering
-     */
-case 'dl':
-        require_once('class_lettering.php');
-    $exercice=3D$user->get_exercice();
-    $periode=3Dnew Periode($cn);
-    list($first_per,$last_per)=3D$periode->get_limit($exercice);
+		break;
+	/**
+	 * display the lettering
+	 */
+	case 'dl':
+		require_once('class_lettering.php');
+		$exercice =3D $user->get_exercice();
+		$periode =3D new Periode($cn);
+		list($first_per, $last_per) =3D $periode->get_limit($exercice);
=20
-    $ret=3Dnew IButton('return');
-    $ret->label=3D_('Retour');
-    $ret->javascript=3D"$('detail').hide();$('list').show();$('search').=
show();";
+		$ret =3D new IButton('return');
+		$ret->label =3D _('Retour');
+		$ret->javascript =3D "$('detail').hide();$('list').show();$('search').=
show();";
=20
-    // retrieve info for the given j_id (date, amount,side and comment)
-    $sql=3D"select j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,J_P=
OSTE,j_qcode,jr_id,
+		// retrieve info for the given j_id (date, amount,side and comment)
+		$sql =3D "select j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,J_P=
OSTE,j_qcode,jr_id,
          jr_comment,j_montant, j_debit,jr_internal from jrnx join jrn on=
 (j_grpt=3Djr_grpt_id)
          where j_id=3D$1";
-    $arow=3D$cn->get_array($sql,array($j_id));
-    $row=3D$arow[0];
-    $r=3D'';
-    $r.=3D'<fieldset><legend>'._('Lettrage').'</legend>';
-    $r.=3D'Poste '.$row['j_poste'].'  '.$row['j_qcode'].'<br>';
+		$arow =3D $cn->get_array($sql, array($j_id));
+		$row =3D $arow[0];
+		$r =3D '';
+		$r.=3D'<fieldset><legend>' . _('Lettrage') . '</legend>';
+		$r.=3D'Poste ' . $row['j_poste'] . '  ' . $row['j_qcode'] . '<br>';
=20
-    $detail=3D"<A class=3D\"detail\" style=3D\"display:inline\" HREF=3D\=
"javascript:modifyOperation('".$row['jr_id']."',".$gDossier.")\" > ".$row=
['jr_internal']."</A>";
+		$detail =3D "<A class=3D\"detail\" style=3D\"display:inline\" HREF=3D\=
"javascript:modifyOperation('" . $row['jr_id'] . "'," . $gDossier . ")\" =
> " . $row['jr_internal'] . "</A>";
=20
-    $r.=3D'Date : '.$row['j_date_fmt'].' ref :'.$detail.' <br>  ';
-    $r.=3Dh($row['jr_comment'])." montant: ".($row['j_montant'])." ".(($=
row['j_debit']=3D=3D't')?'D':'C');
-    $r.=3D'</fieldset>';
-    $r.=3D'<div id=3D"filtre" style=3D"float:left;display:block">';
-    $r.=3D'<form method=3D"get" id=3D"search_form" onsubmit=3D"search_le=
tter(this);return false">';
-    $r.=3D'<div style=3D"float:left;">';
-    // needed hidden var
-    $r.=3Ddossier::hidden();
-    if ( isset($_REQUEST['ac']))       $r.=3DHtmlInput::hidden('ac',$_RE=
QUEST['ac']);
-    if ( isset($_REQUEST['sa']))       $r.=3DHtmlInput::hidden('sa',$_RE=
QUEST['sa']);
-    if ( isset($_REQUEST['acc']))       $r.=3DHtmlInput::hidden('acc',$_=
REQUEST['acc']);
-    $r.=3DHtmlInput::hidden('j_id',$j_id);
-    $r.=3DHtmlInput::hidden('op',$op);
-    $r.=3DHtmlInput::hidden('ot',$ot);
+		$r.=3D'Date : ' . $row['j_date_fmt'] . ' ref :' . $detail . ' <br>  ';
+		$r.=3Dh($row['jr_comment']) . " montant: " . ($row['j_montant']) . " "=
 . (($row['j_debit'] =3D=3D 't') ? 'D' : 'C');
+		$r.=3D'</fieldset>';
+		$r.=3D'<div id=3D"filtre" style=3D"float:left;display:block">';
+		$r.=3D'<form method=3D"get" id=3D"search_form" onsubmit=3D"search_lett=
er(this);return false">';
+		$r.=3D'<div style=3D"float:left;">';
+		// needed hidden var
+		$r.=3Ddossier::hidden();
+		if (isset($_REQUEST['ac']))
+			$r.=3DHtmlInput::hidden('ac', $_REQUEST['ac']);
+		if (isset($_REQUEST['sa']))
+			$r.=3DHtmlInput::hidden('sa', $_REQUEST['sa']);
+		if (isset($_REQUEST['acc']))
+			$r.=3DHtmlInput::hidden('acc', $_REQUEST['acc']);
+		$r.=3DHtmlInput::hidden('j_id', $j_id);
+		$r.=3DHtmlInput::hidden('op', $op);
+		$r.=3DHtmlInput::hidden('ot', $ot);
=20
-    $r.=3D'<table>';
-    //min amount
-    $line=3Dtd(_('Montant min. '));
-    $min=3Dnew INum('min_amount');
-    $min->value=3D(isset($min_amount))?$min_amount:$row['j_montant'];
-    $min_amount=3D(isset($min_amount))?$min_amount:$row['j_montant'];
+		$r.=3D'<table>';
+		//min amount
+		$line =3D td(_('Montant min. '));
+		$min =3D new INum('min_amount');
+		$min->value =3D (isset($min_amount)) ? $min_amount : $row['j_montant']=
;
+		$min_amount =3D (isset($min_amount)) ? $min_amount : $row['j_montant']=
;
=20
-    $line.=3Dtd($min->input());
-    // max amount
-    $line.=3Dtd(_('Montant max. '));
-    $max=3Dnew INum('max_amount');
-    $max->value=3D(isset($max_amount))?$max_amount:$row['j_montant'];
-    $max_amount=3D(isset($max_amount))?$max_amount:$row['j_montant'];
-    $line.=3Dtd($max->input());
-    $r.=3Dtr($line);
+		$line.=3Dtd($min->input());
+		// max amount
+		$line.=3Dtd(_('Montant max. '));
+		$max =3D new INum('max_amount');
+		$max->value =3D (isset($max_amount)) ? $max_amount : $row['j_montant']=
;
+		$max_amount =3D (isset($max_amount)) ? $max_amount : $row['j_montant']=
;
+		$line.=3Dtd($max->input());
+		$r.=3Dtr($line);
=20
-    // start date
-    $start=3Dnew IDate('search_start');
-    $start->value=3D(isset($search_start))?$search_start:$first_per->fir=
st_day();
+		// start date
+		$start =3D new IDate('search_start');
+		$start->value =3D (isset($search_start)) ? $search_start : $first_per-=
>first_day();
=20
=20
-    $line=3Dtd('Date Debut').td($start->input());
-    // end date
-    $end=3Dnew IDate('search_end');
-    $end->value=3D(isset($search_end))?$search_end:$last_per->last_day()=
;
-    $line.=3Dtd('Date Fin').td($end->input());
-    $r.=3Dtr($line);
-    // Side
-    $line=3Dtd('Debit / Credit');
-    $iside=3Dnew ISelect('side');
-    $iside->value=3Darray(
-                      array('label'=3D>_('Debit'),'value'=3D>0),
-                      array('label'=3D>_('Credit'),'value'=3D>1),
-                      array('label'=3D>_('Les 2'),'value'=3D>3)
-                  );
-    /**
-     *
-     * if $side is not then
-     * - if jl_id exist and is > 0 show by default all the operation (=3D=
3)
-     * - if jl_id does not exist or is < 0 then show by default the oppo=
site
-     *  side
-     */
-    if ( ! isset ($side ))
-    {
-        // find the jl_id of the j_id
-        $jl_id=3D$cn->get_value('select comptaproc.get_letter_jnt($1)',a=
rray($j_id));
-        if ($jl_id =3D=3D null )
-        {
-            // get the other side
-            $iside->selected=3D(isset($side))?$side:(($row['j_debit']=3D=
=3D't')?1:0);
-            $side=3D(isset($side))?$side:(($row['j_debit']=3D=3D't')?1:0=
);
-        }
-        else
-        {
-            // show everything
-            $iside->selected=3D3;
-            $side=3D3;
-        }
-    }
-    else
-    {
-        $iside->selected=3D$side;
-    }
+		$line =3D td('Date Debut') . td($start->input());
+		// end date
+		$end =3D new IDate('search_end');
+		$end->value =3D (isset($search_end)) ? $search_end : $last_per->last_d=
ay();
+		$line.=3Dtd('Date Fin') . td($end->input());
+		$r.=3Dtr($line);
+		// Side
+		$line =3D td('Debit / Credit');
+		$iside =3D new ISelect('side');
+		$iside->value =3D array(
+			array('label' =3D> _('Debit'), 'value' =3D> 0),
+			array('label' =3D> _('Credit'), 'value' =3D> 1),
+			array('label' =3D> _('Les 2'), 'value' =3D> 3)
+		);
+		/**
+		 *
+		 * if $side is not then
+		 * - if jl_id exist and is > 0 show by default all the operation (=3D3=
)
+		 * - if jl_id does not exist or is < 0 then show by default the opposi=
te
+		 *  side
+		 */
+		if (!isset($side))
+		{
+			// find the jl_id of the j_id
+			$jl_id =3D $cn->get_value('select comptaproc.get_letter_jnt($1)', arr=
ay($j_id));
+			if ($jl_id =3D=3D null)
+			{
+				// get the other side
+				$iside->selected =3D (isset($side)) ? $side : (($row['j_debit'] =3D=3D=
 't') ? 1 : 0);
+				$side =3D (isset($side)) ? $side : (($row['j_debit'] =3D=3D 't') ? 1=
 : 0);
+			}
+			else
+			{
+				// show everything
+				$iside->selected =3D 3;
+				$side =3D 3;
+			}
+		}
+		else
+		{
+			$iside->selected =3D $side;
+		}
=20
-    $r.=3Dtr($line.td($iside->input()));
-    $r.=3D'</table>';
-    $r.=3D'</div>';
-    $r.=3D'<div style=3D"float:left;padding-left:100">';
-    $r.=3DHtmlInput::submit('search','Rechercher');
-    $r.=3D'</div>';
-    $r.=3D'</form>';
-    $r.=3D'</div>';
+		$r.=3Dtr($line . td($iside->input()));
+		$r.=3D'</table>';
+		$r.=3D'</div>';
+		$r.=3D'<div style=3D"float:left;padding-left:100">';
+		$r.=3DHtmlInput::submit('search', 'Rechercher');
+		$r.=3D'</div>';
+		$r.=3D'</form>';
+		$r.=3D'</div>';
=20
-    $form=3D'<div id=3D"result" style=3D"float:top;clear:both">';
+		$form =3D '<div id=3D"result" style=3D"float:top;clear:both">';
=20
-    $form.=3D'<FORM id=3D"letter_form" METHOD=3D"post">';
-    $form.=3Ddossier::hidden();
-    if ( isset($_REQUEST['p_action']))       $form.=3DHtmlInput::hidden(=
'p_action',$_REQUEST['p_action']);
-    if ( isset($_REQUEST['sa']))       $form.=3DHtmlInput::hidden('sa',$=
_REQUEST['sa']);
-    if ( isset($_REQUEST['acc']))       $form.=3DHtmlInput::hidden('acc'=
,$_REQUEST['acc']);
-    if ( isset($_REQUEST['sc']))       $form.=3DHtmlInput::hidden('sc',$=
_REQUEST['sc']);
-    if ( isset($_REQUEST['sb']))       $form.=3DHtmlInput::hidden('sb',$=
_REQUEST['sb']);
-    if ( isset($_REQUEST['f_id']))       $form.=3DHtmlInput::hidden('f_i=
d',$_REQUEST['f_id']);
-    /*  check if date are valid */
-    if ( (isset($search_end) && isDate($search_end) =3D=3D null) ||
-            (isset($search_start) && isDate ($search_start) =3D=3D null)=
)
-    {
-        ob_start();
-        alert(_('Date malform=C3=A9e, d=C3=A9sol=C3=A9'));
-        $html=3Dob_get_contents();
-        ob_clean();
+		$form.=3D'<FORM id=3D"letter_form" METHOD=3D"post">';
+		$form.=3Ddossier::hidden();
+		if (isset($_REQUEST['p_action']))
+			$form.=3DHtmlInput::hidden('p_action', $_REQUEST['p_action']);
+		if (isset($_REQUEST['sa']))
+			$form.=3DHtmlInput::hidden('sa', $_REQUEST['sa']);
+		if (isset($_REQUEST['acc']))
+			$form.=3DHtmlInput::hidden('acc', $_REQUEST['acc']);
+		if (isset($_REQUEST['sc']))
+			$form.=3DHtmlInput::hidden('sc', $_REQUEST['sc']);
+		if (isset($_REQUEST['sb']))
+			$form.=3DHtmlInput::hidden('sb', $_REQUEST['sb']);
+		if (isset($_REQUEST['f_id']))
+			$form.=3DHtmlInput::hidden('f_id', $_REQUEST['f_id']);
+		/*  check if date are valid */
+		if ((isset($search_end) && isDate($search_end) =3D=3D null) ||
+				(isset($search_start) && isDate($search_start) =3D=3D null))
+		{
+			ob_start();
+			alert(_('Date malform=C3=A9e, d=C3=A9sol=C3=A9'));
+			$html =3D ob_get_contents();
+			ob_clean();
=20
-        $html=3Descape_xml($html);
+			$html =3D escape_xml($html);
=20
-        header('Content-type: text/xml; charset=3DUTF-8');
-        echo <<<EOF
+			header('Content-type: text/xml; charset=3DUTF-8');
+			echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <data>
 <code>detail</code>
 <value>$html</value>
 </data>
 EOF;
-        exit();
-    }
+			exit();
+		}
=20
-    // display a list of operation from the other side + box button
-    if ( $ot =3D=3D 'account')
-    {
-        $obj=3Dnew Lettering_Account($cn,$row['j_poste']);
-        if ( isset($search_start))	 $obj->start=3D$search_start;
-        if ( isset ($search_end)) $obj->end=3D$search_end;
-        if ( isset ($max_amount)) $obj->fil_amount_max=3D$max_amount;
-        if ( isset ($min_amount)) $obj->fil_amount_min=3D$min_amount;
-        if ( isset ($side)) $obj->fil_deb=3D$side;
+		// display a list of operation from the other side + box button
+		if ($ot =3D=3D 'account')
+		{
+			$obj =3D new Lettering_Account($cn, $row['j_poste']);
+			if (isset($search_start))
+				$obj->start =3D $search_start;
+			if (isset($search_end))
+				$obj->end =3D $search_end;
+			if (isset($max_amount))
+				$obj->fil_amount_max =3D $max_amount;
+			if (isset($min_amount))
+				$obj->fil_amount_min =3D $min_amount;
+			if (isset($side))
+				$obj->fil_deb =3D $side;
=20
-        $form.=3D$obj->show_letter($j_id);
-    }
-    else if ($ot=3D=3D'card')
-    {
-        $obj=3Dnew Lettering_Card($cn,$row['j_qcode']);
-        if ( isset($search_start))	 $obj->start=3D$search_start;
-        if ( isset ($search_end)) $obj->end=3D$search_end;
-        if ( isset ($max_amount)) $obj->fil_amount_max=3D$max_amount;
-        if ( isset ($min_amount)) $obj->fil_amount_min=3D$min_amount;
-        if ( isset ($side)) $obj->fil_deb=3D$side;
-        $form.=3D$obj->show_letter($j_id);
-    }
-    else
-    {
-        $form.=3D'Mauvais type objet';
-    }
+			$form.=3D$obj->show_letter($j_id);
+		}
+		else if ($ot =3D=3D 'card')
+		{
+			$obj =3D new Lettering_Card($cn, $row['j_qcode']);
+			if (isset($search_start))
+				$obj->start =3D $search_start;
+			if (isset($search_end))
+				$obj->end =3D $search_end;
+			if (isset($max_amount))
+				$obj->fil_amount_max =3D $max_amount;
+			if (isset($min_amount))
+				$obj->fil_amount_min =3D $min_amount;
+			if (isset($side))
+				$obj->fil_deb =3D $side;
+			$form.=3D$obj->show_letter($j_id);
+		}
+		else
+		{
+			$form.=3D'Mauvais type objet';
+		}
=20
-    $form.=3DHtmlInput::submit('record',_('Sauver')).$ret->input();
-    $form.=3D'</FORM>';
-    $form.=3D'</div>';
-    $html=3D$r.$form;
-    //       echo $html;exit;
-    $html=3Descape_xml($html);
+		$form.=3DHtmlInput::submit('record', _('Sauver')) . $ret->input();
+		$form.=3D'</FORM>';
+		$form.=3D'</div>';
+		$html =3D $r . $form;
+		//       echo $html;exit;
+		$html =3D escape_xml($html);
=20
-    header('Content-type: text/xml; charset=3DUTF-8');
-echo <<<EOF
+		header('Content-type: text/xml; charset=3DUTF-8');
+		echo <<<EOF
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <data>
 <code>detail</code>
 <value>$html</value>
 </data>
 EOF;
-    break;
-case 'mod_doc':
-  require_once('modify_mod_document.inc.php');
-  break;
-case 'input_per':
-  require_once('modify_periode.inc.php');
-  break;
-case 'save_per':
-  require_once('modify_periode.inc.php');
-  break;
-case 'mod_predf':
-  require_once('modify_predf_op.php');
-  break;
-case 'save_predf':
-  require_once('save_predf_op.php');
-  break;
-case 'search_op':
-	/*put_global(array
-				(array('key'=3D>'ac','value'=3D>'JSSEARCH')),
-				(array('key'=3D>'ledger_type','value'=3D>'ALL'))
-			   );*/
-	ob_start();
-	require_once 'search.inc.php';
-	$content=3Dob_get_contents();
-	ob_clean();
-	$html=3Descape_xml($content);
-	header('Content-type: text/xml; charset=3DUTF-8');
-	echo <<<EOF
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<data>
-<ctl>$ctl</ctl>
-<code>$html</code>
-</data>
-EOF;
-	break;
+		break;
+	case 'mod_doc':
+		require_once('modify_mod_document.inc.php');
+		break;
+	case 'input_per':
+		require_once('modify_periode.inc.php');
+		break;
+	case 'save_per':
+		require_once('modify_periode.inc.php');
+		break;
+	case 'mod_predf':
+		require_once('modify_predf_op.php');
+		break;
+	case 'save_predf':
+		require_once('save_predf_op.php');
+		break;
+	case 'search_op':
+		/* put_global(array
+		  (array('key'=3D>'ac','value'=3D>'JSSEARCH')),
+		  (array('key'=3D>'ledger_type','value'=3D>'ALL'))
+		  ); */
+		require_once 'search.inc.php';
+		break;
+	case 'display_profile':
+		require_once("show_profile.inc.php");
+		break;
+	case 'det_menu':
+		require_once("detail_menu.inc.php");
+		break;
+	case 'add_menu':
+		require_once 'template/add_menu.php';
+		break;
+	case 'add_plugin':
+		$me_code=3Dnew IText('me_code');
+		$me_file=3Dnew IText('me_file');
+		$me_menu=3Dnew IText('me_menu');
+		$me_description=3Dnew IText("me_description");
+		$me_parameter=3Dnew IText("me_parameter");
+		$new=3Dtrue;
+		require_once 'template/plugin_detail.php';
+		break;
+	case 'mod_plugin':
+		$m=3D$cn->get_array("select me_code,me_file,me_menu,me_description,me_=
parameter
+			from menu_ref where me_code=3D$1",array($me_code));
+		if ( empty($m))
+		{
+			echo HtmlInput::title_box("Ce plugin n'existe pas ", $ctl);
+			echo "<p>Il y a une erreur, ce plugin n'existe pas";
+			exit;
+		}
+		$me_code=3Dnew IText('me_code',$m[0] ['me_code']);
+		$me_file=3Dnew IText('me_file',$m[0] ['me_file']);
+		$me_menu=3Dnew IText('me_menu',$m[0] ['me_menu']);
+		$me_description=3Dnew IText("me_description",$m[0] ['me_description'])=
;
+		$me_parameter=3Dnew IText("me_parameter",$m[0] ['me_parameter']);
+		$new=3Dfalse;
+		require_once 'template/plugin_detail.php';
+		break;
 }

Modified: phpcompta/trunk/html/do.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/do.php	2011-11-10 12:58:09 UTC (rev 4325)
+++ phpcompta/trunk/html/do.php	2011-11-10 15:49:57 UTC (rev 4326)
@@ -29,6 +29,8 @@
 require_once('user_common.php');
 require_once('ac_common.php');
 require_once 'function_javascript.php';
+require_once 'constant.security.php';
+
 if (isset ($_POST["style_user"])){$_SESSION['g_theme']=3D$_POST['style_u=
ser'];}
=20
 html_page_start($_SESSION['g_theme']);
@@ -119,12 +121,12 @@
 {
     $all =3D explode('/', $_REQUEST['ac']);
     $module_selected =3D $all[0];
-
+	$g_user->audit();
 // Show module and highligt selected one
     show_module($module_selected);
     for ($i =3D 0; $i !=3D count($all); $i++)
     {   // show the menu
-	show_menu($all, $i);
+		show_menu($all, $i);
     }
 }
 elseif (isset($_REQUEST['plugin_code']))

Modified: phpcompta/trunk/html/js/anc_script.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/anc_script.js	2011-11-10 12:58:09 UTC (rev 43=
25)
+++ phpcompta/trunk/html/js/anc_script.js	2011-11-10 15:49:57 UTC (rev 43=
26)
@@ -103,6 +103,8 @@
 		var tot_table=3Dcompute_total_table(p_table,p_seq);
 		var remain =3D tot_line-tot_table;
 		remain=3DMath.round(remain *100)/100;
+		var popup_table=3Dp_table.toString();
+		p_table=3Dpopup_table.replace("popup","");
 		$('remain'+p_table).innerHTML=3Dremain;
 		if (remain =3D=3D 0)
 			{$('remain'+p_table).style.color=3D"green"}

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	2011-11-10 12:58:09 UTC (rev 4325)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-10 15:49:57 UTC (rev 4326)
@@ -736,7 +736,7 @@
 */
 function hide_ledger_choice()
 {
-    g('div_jrn').style.visibility=3D'hidden';
+    if ($('div_jrn')) g('div_jrn').style.visibility=3D'hidden';
 	if ($('div_jrnsearch_op')) $('div_jrnsearch_op').style.display=3D'none'=
;
 }
 /**
@@ -957,9 +957,8 @@
 {
     try{
=20
-	if ( $('wait_box')){
-			removeDiv('wait_box');
-			}
+	remove_waiting_box();
+
 	var answer=3Dreq.responseXML;
 	var a=3Danswer.getElementsByTagName('ctl');
 	var html=3Danswer.getElementsByTagName('code');
@@ -986,10 +985,7 @@
 function mod_predf_op(dossier_id,od_id)
 {
     var target=3D"mod_predf_op";
-    if ( $(target))
-    {
 	removeDiv(target);
-    }
     var sx=3DposY;
     var sy=3DposX;
     var str_style=3D"top:"+sx+";left:"+sy;
@@ -1032,23 +1028,16 @@
 function search_reconcile(dossier,ctl_concern,amount_id,ledger)
 {
 	var dossier=3Dg('gDossier').value;
-	if ( amount_id =3D=3D undefined ) { amount_id=3D0; }
-	  var target=3D"search_op";
-    if ( $(target))
-    {
+	if ( amount_id =3D=3D undefined )
+		{amount_id=3D0;}
+	else if ($(amount_id))
+		{
+			if ($(amount_id).value) {amount_id=3D$(amount_id).value;}
+			else if ($(amount_id).innerHTML) {amount_id=3D$(amount_id).innerHTML;=
}
+		}
+	var target=3D"search_op";
 	removeDiv(target);
-    }
-    var sx=3D77;
-    var sy=3D99;
-	if ( window.scrollY)
-        {
-            sx=3Dwindow.scrollY+40;
-        }
-        else
-        {
-            sx=3Ddocument.body.scrollTop+40;
-        }
-    var str_style=3D"top:"+sx+";left:"+sy;
+	var str_style=3Dfixed_position(77, 99)
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20
@@ -1056,7 +1045,7 @@
 	var target=3D{gDossier:dossier,
 				ctlc:ctl_concern,
 				op:'search_op',
-				ctl:'search_op',
+				ctl:target,
 				ac:'JSSEARCH',
 				amount_id:amount_id,
 				ledger:ledger};
@@ -1068,7 +1057,11 @@
 				      method:'get',
 				      parameters:qs,
 				      onFailure:null,
-				      onSuccess:fill_box
+				      onSuccess:function (req){
+						  remove_waiting_box();
+						  $('search_op').innerHTML=3Dreq.responseText;
+						  req.responseText.evalScripts();
+					  }
 				  }
 				);
 }
@@ -1088,13 +1081,18 @@
 				      method:'get',
 				      parameters:qs,
 				      onFailure:null,
-				      onSuccess:fill_box
+				      onSuccess:function (req){
+						  remove_waiting_box();
+						  $('search_op').innerHTML=3Dreq.responseText;
+						  req.responseText.evalScripts();
+					  }
 				  }
 				);
 }
=20
 function set_reconcile(obj)
  {
+
 	 try
 	{
 		var ctlc=3Dobj.elements['ctlc'];
@@ -1109,7 +1107,7 @@
 				{
 					var str_name=3Delmt.name;
 					var nValue=3Dstr_name.replace("jr_concerned","");
-					if ( $(ctlc.value).value !=3D '') {	$(ctlc.value).value+=3D',';}
+					if ( $(ctlc.value).value !=3D '') {$(ctlc.value).value+=3D',';}
 					$(ctlc.value).value+=3DnValue;
 				}
 			}
@@ -1120,4 +1118,147 @@
 	{
 		alert(e.message)
 	}
- }
\ No newline at end of file
+ }
+function remove_waiting_box()
+{
+			removeDiv('wait_box');
+}
+function get_profile_detail(gDossier,profile_id)
+{
+	waiting_box();
+	var qs=3D"op=3Ddisplay_profile&gDossier=3D"+gDossier+"&p_id=3D"+profile=
_id+"&ctl=3Ddetail_profile";
+	var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+				  {
+				      method:'get',
+				      parameters:qs,
+				      onFailure:null,
+				      onSuccess:function(req){
+						  remove_waiting_box();
+						  $('detail_profile').innerHTML=3Dreq.responseText;
+						  req.responseText.evalScripts();
+						  $('detail_profile').show();
+					  }
+				  }
+				);
+}
+function get_profile_detail_success(xml)
+{
+	remove_waiting_box();
+
+}
+/**
+ * @brief compute the string to position a div in a fixed way
+ * @return string
+ */
+function fixed_position(p_sx,p_sy)
+{
+	var sx=3Dp_sx;
+	var sy=3Dcalcy(p_sy);
+
+    var str_style=3D"top:"+sy+";left:"+sx+"position:absolute";
+	return str_style;
+
+}
+function calcy(p_sy)
+{
+	var sy=3Dp_sy;
+	if ( window.scrollY)
+        {
+            sy=3Dwindow.scrollY+p_sy;
+        }
+        else
+        {
+            sy=3Ddocument.body.scrollTop+p_sy;
+        }
+	return sy;
+
+}
+function mod_menu(gdossier,pm_id)
+{
+	waiting_box();
+	removeDiv('divdm'+pm_id);
+	var qs=3D"op=3Ddet_menu&gDossier=3D"+gdossier+"&pm_id=3D"+pm_id+"&ctl=3D=
divdm"+pm_id;
+	var pos=3Dfixed_position(250,150);
+	var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+				  {
+				      method:'get',
+				      parameters:qs,
+				      onFailure:null,
+				      onSuccess:function(req){
+						  try{
+							  remove_waiting_box();
+							  add_div({id:"divdm"+pm_id,drag:1,cssclass:"inner_box",style:pos=
});
+							  $('divdm'+pm_id).innerHTML=3Dreq.responseText;
+						  } catch(e){alert(e.message);}
+					  }
+				  }
+				);
+}
+function add_menu(obj)
+{
+	pdossier=3Dobj.dossier;
+	p_id=3Dobj.p_id
+	waiting_box();
+	removeDiv('divdm'+p_id);
+	var qs=3D"op=3Dadd_menu&gDossier=3D"+pdossier+"&p_id=3D"+p_id+"&ctl=3Dd=
ivdm"+p_id;
+	var pos=3Dfixed_position(250,150);
+	var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+				  {
+				      method:'get',
+				      parameters:qs,
+				      onFailure:null,
+				      onSuccess:function(req){
+						  try{
+							  remove_waiting_box();
+							  add_div({id:"divdm"+p_id,drag:1,cssclass:"inner_box",style:pos}=
);
+							  $('divdm'+p_id).innerHTML=3Dreq.responseText;
+						  } catch(e){alert(e.message);}
+					  }
+				  }
+				);
+}
+function add_plugin(p_dossier)
+{
+	waiting_box();
+	removeDiv('divplugin');
+	var qs=3D"op=3Dadd_plugin&gDossier=3D"+p_dossier+"&ctl=3Ddivplugin";
+
+	var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+				  {
+				      method:'get',
+				      parameters:qs,
+				      onFailure:null,
+				      onSuccess:function(req){
+						  try{
+							  remove_waiting_box();
+							  var pos=3Dfixed_position(250,150)+";width:30%";;
+							add_div({id:"divplugin",drag:1,cssclass:"inner_box",style:pos});
+							  $('divplugin').innerHTML=3Dreq.responseText;
+						  } catch(e){alert(e.message);}
+					  }
+				  }
+				);
+}
+function mod_plugin(p_dossier,me_code)
+{
+	waiting_box();
+	removeDiv('divplugin');
+	var qs=3D"op=3Dmod_plugin&gDossier=3D"+p_dossier+"&ctl=3Ddivplugin&me_c=
ode=3D"+me_code;
+
+	var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+				  {
+				      method:'get',
+				      parameters:qs,
+				      onFailure:null,
+				      onSuccess:function(req){
+						  try{
+							  remove_waiting_box();
+							  var pos=3Dfixed_position(250,150)+";width:30%";
+							  add_div({id:"divplugin",drag:1,cssclass:"inner_box",style:pos})=
;
+							  $('divplugin').innerHTML=3Dreq.responseText;
+
+						  } catch(e){alert(e.message);}
+					  }
+				  }
+				);
+}
\ 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	2011-11-10 12:58:09 UTC (rev 432=
5)
+++ phpcompta/trunk/html/style-color.css	2011-11-10 15:49:57 UTC (rev 432=
6)
@@ -63,7 +63,7 @@
     padding:0px;
     margin:0px;
 }
-u_redcontent h2.info {
+redcontent h2.info {
     background:#879ed4;
     color:white;
     font-size:14pt;
@@ -177,7 +177,7 @@
     border-width:1px;
=20
 }
-div.u_redcontent{ 	=20
+div.redcontent{ 	=20
=20
     float:left; 	=20
     padding-top:7px;
@@ -404,7 +404,7 @@
     display:inline;
     padding:1em 1em;
 }
-div.u_redcontent a {
+div.redcontent a {
     font-family:helvetica,arial,sans-serif;
     text-decoration: none;
     display: block;
@@ -412,7 +412,7 @@
=20
 }
=20
-div.u_redcontent a:hover {
+div.redcontent a:hover {
     font-family:helvetica,arial,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
@@ -439,7 +439,7 @@
=20
 }
=20
-div.u_redcontent a.mtitle {
+div.redcontent a.mtitle {
     text-decoration:none;
     display:inline;
=20
@@ -448,7 +448,7 @@
=20
 }
=20
-div.u_redcontent a.mtitle:hover {
+div.redcontent a.mtitle:hover {
     text-decoration:none;
     display:inline;
     color:white;
@@ -474,7 +474,7 @@
=20
=20
 }
-div.u_redcontent input.text {
+div.redcontent input.text {
     font-family:helvetica,arial,sans-serif;
     font-weight:normal;
     border-color:336699;
@@ -495,13 +495,13 @@
=20
=20
=20
-div.u_redcontent input:focus {
+div.redcontent input:focus {
     background-color:orange;
 }
 div.content input:focus {
     background-color:orange;
 }
-div.u_redcontent textarea:focus {
+div.redcontent textarea:focus {
     background-color: orange;
 }
 .document {

Added: 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	                        (rev 0)
+++ phpcompta/trunk/html/style-epad.css	2011-11-10 15:49:57 UTC (rev 4326=
)
@@ -0,0 +1,1038 @@
+/* <style type=3D"text/css"> */
+
+BODY {
+  background-color:#EDF3FF;
+ font-size:14;
+  font-family:helvetica,sans-serif;
+  padding: 0px 10px 0px 10px ;
+  margin:0;
+}
+.notice {
+		color:red;
+        font-style: italic;
+        }
+
+table.result  ,table.resultfooter {
+  color:blue;
+  /* border:blue solid 1px; */
+  width:100%;
+   border-spacing:  0px;
+   border-collapse:collapse;
+  =20
+}
+table.resultfooter tfoot {
+	font-size:110%;
+	font-weight: bold;
+=09
+=09
+}
+table.result th {=20
+  font-weight:bold;
+  font-family:helvetica,sans-serif;
+ border-bottom:2px solid blue;=20
+ border-top:0;
+=20
+  color:#25238F;
+  text-align: left;
+  	     // background-color:#EDF3FF;
+  	     =20
+	      font-style: italic;
+	     =20
+}
+
+h2 {
+  font-family:helvetica,sans-serif;
+  font-size:14px;
+  color:grey;
+}
+div.info {
+	background:#879ed4;
+	color:white;
+	font-size:120%;
+  text-align:center;
+}
+
+content h2.info {
+	background:#879ed4;
+  color:black;
+  font-size:14pt;
+  text-align:center;
+  padding:0px;
+  margin:0px;
+}
+redcontent h2.info {
+  background:#879ed4;
+  color:white;
+  font-size:14pt;
+  text-align:center;
+  padding:0px;
+  margin:0px;
+}
+h2.info {
+  background-color:#879ED4;
+	color:white;
+	font-size:14px;
+  text-align:center;
+  padding:0px;
+  margin:0px;
+  border:1px solid grey;
+ =20
+}
+
+h3.info {
+  background:#879ed4;
+  color:white;
+  font-size:14px;
+  text-align:center;
+}
+
+h2.info2 {
+  color:blue;
+  font-size:14px;
+  text-align:center;
+
+}
+
+
+h2.error {
+	background:red;
+	color:white;
+	font-size:14px;
+}
+
+h1.title {
+	color: blue;
+	font-size:25px;
+}
+
+div.u_tmenu {
+  margin-top:0px;
+  width:100%;=09
+ /* background-color:#879ED4; */
+ =20
+ =20
+}
+div.u_subtmenu {
+  background-color:white	;
+  float:left;
+  clear:both;
+  left:10px;
+
+}
+div.u_tmenu div.u_tool {
+	   float:left;
+	  =20
+}
+div.u_tool {
+	float:left;
+	width:  100%;
+	}
+div.u_tool div.name {
+       float:left;
+       margin-left:10px;
+}
+div.u_tool div.acces_direct{
+	float:right;
+	margin-right:10px;
+	text-align:right;
+=09
+}
+
+div.u_subt2menu {
+background-color:lightgrey;
+  left:1%;=09
+
+}
+div.lmenu {
+	 float:left;
+	 clear:left;
+	font-size:14px;
+
+}
+div.lextmenu {
+
+	float:left;
+	font-family:helvetica,sans-serif;
+	font-size:14px;
+
+}
+div.searchmenu {
+  left:30px;
+  width:95px;
+  top:100px;
+  position:absolute;
+
+}
+
+div.recherche_form{
+	width:700px;
+	font-size:14px;
+	font-family:helvetica,sans-serif;
+  border-style:outset;
+  border-width:1px;
+
+}
+div.redcontent{ 	=20
+  =20
+         float:left; 	=20
+	 padding-top:7px;
+	 padding-left:8px;
+         font-size:9px; 	=20
+         font-family:helvetica,sans-serif; 	=20
+	 width:75%;
+
+}
+div.content{ 	=20
+
+         float:left; 	=20
+		padding-top:7px;
+         width:100%; 	 	=20
+         font-family:helvetica,sans-serif; =09
+         clear:both;
+         =20
+
+}
+div.content30{ 	=20
+   	=20
+         float:left; 	=20
+	 padding-top:7px;
+         width:35%; 	 =20
+         font-family:helvetica,sans-serif; 	=20
+
+}
+div.no span{
+	position:static;
+	font-family:helvetica,sans-serif;=09
+	font-weight:bold;
+	color:red;=09
+=09
+}
+
+table.document {
+   color:blue;
+   width:100%;
+   border-spacing:  0px;
+   border-collapse:collapse;
+
+}
+table.document th{
+  font-weight:bold;
+  font-family:helvetica,sans-serif;
+  border-bottom:2px solid blue;
+  border-top:0;
+  color:#25238F;
+  text-align: left;
+  background-color:#EDF3FF;
+  font-style: italic;
+}
+.error {
+width:60%;
+margin-left:20%;
+text-align: center;
+
+color:white; =20
+background-color:red;
+font-weight: bolder;
+font-size:120%;
+}
+
+table.mtitle {
+	border:0;
+	text-align:center
+}
+td.mshort {=20
+  height:15px;
+  width:60px;
+  text-align:center;
+  border:  1px solid;
+  color:#5D90CD ;
+  background-color:#DDE6FF;
+}
+td.mtitle {
+	text-align:center;
+	width:95px;
+        height :30px;=20
+	font-size:10px;
+    background-color:#DDE6FF;
+    border:1px solid #99B1DF;
+}
+td.msubtitle {
+	text-align:center;
+	height:20px;
+	font-size:10px;
+    background-color:#DDE6FF;
+}
+span.mtitle {
+	color:gray;
+	background-color:blue;
+	font-size:10px;
+	border-style:groove
+}
+span.odd {=20
+  background-color:#ECF3FF;
+  display:block;
+ }
+span.even {=20
+  background-color:#DDE6FF;
+  display:block;
+ }
+
+tr.odd {
+	background-color:#DDE6FF;
+	font-size:10px;
+}
+tr {
+	font-size:10px;
+}
+td.odd{
+	background-color:#DDE6FF ;
+	font-size:10px;
+}
+td.even{
+	border:0px;
+	font-size:10px;
+}
+td.cell{
+	    height:32px;
+	     padding: 1px;
+}
+td.selectedcell{
+	border-style:inset;
+        border-color:blue;
+	border-width:1pt ;
+	font-size:10px;
+        background:#5D90CD ;
+        color:white;
+        text-align:center;
+	     width:120px;
+}
+a.mtitle {
+  font-size:10px;
+  text-decoration:none;
+  display:inline;
+ color: blue;
+=09
+}
+a.mtitle:hover {
+  font-size:10px;
+  text-decoration:none;
+  display:inline;
+ =20
+ color: darkblue;
+background-color:#5D90CD;
+=09
+}
+td.selectedcell a.mtitle {
+ font-size:1em;
+ text-decoration:none;
+ display:block;
+ color:white;
+}
+a.dossier {
+  font-size:10px;
+  text-decoration:none;
+  display:block;
+   color: #202267;
+=09
+}
+tr.odd:hover td
+{
+  text-decoration:none;
+  background-color: #a9d6e4;
+  color:white;
+}
+tr.even:hover td=20
+{
+  text-decoration:none;
+  background-color: #a9d6e4;
+  color:white;
+}
+td.mtitle:hover,td.mtitle:hover a
+{
+  background-color:#a9d6e4;
+  color:white;
+}
+td.msubtitle:hover,td.msubtitle:hover a
+{
+  background-color:#a9d6e4;
+  color:white;
+}
+a.cell {
+  text-decoration:none;
+  display:block;
+  color:blue;
+  background-color:white;
+  font-size:12px;
+}
+
+a.cell:hover {
+  font-size:12px;
+  color:white;
+  background-color:#5D90CD;
+  text-decoration:none;
+  display:block;
+	}
+
+
+a.one:link {
+	text-decoration:none;
+	color:#3010FF
+}
+a.one:visited {
+	text-decoration:none;
+	color:#3010FF
+	}
+
+a.one:active {
+	background: #0000FF;
+	}
+
+a.one:hover {
+	    text-decoration:underline;
+	background:#3010FF;
+	color:#FFFFFF;
+	}
+
+
+a.detail
+{
+  font-size:9px;
+  font-family:helvetica,sans-serif;
+    text-decoration: none;
+    display: block;
+    color: blue;
+}
+
+a.detail:hover  =20
+{
+  font-size:12px;
+  font-family:helvetica,sans-serif;
+    color: white;
+    background-color: rgb(93, 144, 205);
+    text-decoration: none;
+    display: block;
+}
+
+li.menuv,ol.menuv {
+	 display:inline;
+	 padding:1em 1em;
+}
+div.redcontent a {
+  font-family:helvetica,sans-serif;
+  text-decoration: none;
+  display: block;
+  color: blue;
+
+}
+
+div.redcontent a:hover {
+  font-family:helvetica,sans-serif;
+    color: white;
+    background-color: rgb(93, 144, 205);
+    text-decoration: none;
+    display: block;
+
+}
+div.content a {
+  font-family:helvetica,sans-serif;
+  text-decoration: none;
+  display: block;
+  color: blue;
+padding: 1px ;
+=09
+}
+
+
+div.content a:hover {
+  font-family:helvetica,sans-serif;
+    color: white;
+    background-color: rgb(93, 144, 205);
+    text-decoration: none;
+    display: block;
+
+}
+
+div.redcontent a.mtitle {
+  text-decoration:none;
+  display:inline;
+
+ =20
+  color:black;
+
+}
+
+div.redcontent a.mtitle:hover {
+  text-decoration:none;
+  display:inline;
+  color:white;
+  background-color:darkblue;
+
+
+}
+div.content a.mtitle {
+  font-size:10px;
+  text-decoration:none;
+  display:inline;
+  color:blue;
+   =20
+
+
+}
+
+div.content a.mtitle:hover {
+  text-decoration:none;
+  display:inline;
+  background-color:darkblue;
+  color:white;
+=20
+
+}
+div.redcontent input.text {
+   font-family:helvetica,sans-serif;
+  font-weight:normal;
+  border-color:336699;
+  border-style:solid;
+  background-color:orange; =20
+  border-width:1px;
+  color:blue;=20
+}
+div.content input.text {
+   font-family:helvetica,sans-serif;
+  font-weight:normal;
+  border-color:336699;
+  border-style:solid;
+  border-width:1px;
+  background-color:orange;
+  color:blue;=20
+}
+
+
+
+div.redcontent input:focus {
+  background-color:orange;
+}
+div.content input:focus {
+  background-color:orange;
+}
+div.redcontent textarea:focus {
+background-color: orange;
+}
+.document {
+color: #1a207d;
+border-collapse:collapse;
+}
+a.document{
+  font-size:12px;
+  text-decoration:none;
+  display:block;
+}
+a.document:hover {
+  text-decoration:none;
+  display:block;
+
+
+}
+.input_text {
+	   border:groove 1px blue;
+	margin:1px;
+}
+legend {
+font-weight: bold;
+font-style: italic;
+font-size: 120% ;
+=09
+}
+fieldset fieldset legend {=20
+	 font-size:110%;
+	 color:grey;
+	 }=09
+select {
+border: 1px solid blue;
+margin:2px;
+background-color:white;
+
+
+}
+
+
+
+.infobulle {
+	   position:absolute;
+	   border:1px solid black;
+	   background-color:yellow;
+	   top:0;left:0;
+	   visibility:hidden;
+	   z-index:2;
+	   width:25em;
+      =20
+}
+
+span.action {
+	height:3em;
+=09
+}
+td.num {
+	text-align:right;
+}
+tr.priority1 {
+	background-color:red;
+	}
+span.action a.action {
+  border:2px outset ;
+  padding-left: 3px;
+  padding-right:3px;
+  text-decoration:none;
+  font-size:14px;
+ =20
+  display:inline;
+  color:black;
+  background-color:lightgrey;
+}
+
+span.action a.action:hover {
+  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;*/
+=09
+	display:none;=09
+}
+
+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: helvetica,sans-serif;
+	font-style: italic;
+	font-weight: bolder;
+	text-align:center;
+	/*border-bottom: 2px solid #201e87;*/=09
+	color: white;
+	display:none;
+	/*opacity:1;
+	filter:alpha(opacity=3D100);*/
+=09
+	}
+div.popup_border_notitle {
+	position:absolute;
+	top:20%;
+	left:20%;
+	width:60%;
+	height:80% ;=20
+	/*background:lightgrey;*/
+	z-index:10;
+	/*border:dotted 1px black;*/
+	border: 3px outset #201e87;
+	background-color: #879ED4;
+	font-family: helvetica,sans-serif;
+	font-style: italic;
+	font-weight: bolder;
+	text-align:center;
+	display:none;
+	color: white;
+	/*opacity:0.7;
+	filter:alpha(opacity=3D70);
+	*/
+	}
+
+div.popup_content {
+	position:absolute;
+	top:16;
+	bottom:0;
+	left:0;
+	right:0;
+	width:100%;
+	height:96%;
+	overflow: auto;
+	background-color:#DFE7FF;=09
+	font-size:12px ;
+	font-family: 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);*/
+}
+div.autocomplete {
+  position:relative;
+  background-color:white;
+  border:1px solid #888;
+  margin:0;
+  padding:0;
+  text-align:left;
+  font-size:12px;
+ =20
+}
+div.autocomplete em {
+	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;
+}
+div.autocomplete ul li.selected { background-color: lightblue;}
+
+div.autocomplete ul li {
+  list-style-type:none;
+  display:block;
+  margin:0;
+  padding:0px;
+  /*height:32px;*/
+  cursor:pointer;
+}
+span.informal{ font-size:12; }
+
+ul.select_table  {
+	/*padding:5px;*/
+	overflow:hidden;
+	}
+ul.select_table a{
+	width:100%;
+	display:block;
+	background-color:inherit;
+	color: black;
+	text-decoration:none;
+	}
+ul.select_table a:hover{
+	background-color:white;
+	color:black;
+	/*text-decoration:underline;*/
+	}
+ul.select_table li {
+	display:table-row;
+	list-style-type: none;
+	}
+ul.select_table li span {
+	display:table-cell;
+	width:25em;
+	margin: 0px;
+	padding:  0px;
+}
+=09
+div.pc_calendar{
+		border:1px groove grey;
+		float:left;
+	=09
+		}
+div.pc_calendar table {
+	text-align:center;
+	=09
+}
+div.pc_calendar tr{
+	height:40;
+=09
+=09
+}
+div.pc_calendar td{
+	width:10em;
+}
+
+div.pc_calendar td.weekend {
+	background-color:#cce0e6;
+=09
+}
+div.pc_calendar td.workday{
+	background-color:inherit;
+=09
+=09
+}
+div.pc_calendar span.day{
+	font-weight: bold;
+	display:block;
+=09
+}
+div.pc_calendar span.event{
+	font-weight: bolder;
+=09
+}
+span.todo  {
+	text-align: left;
+	background-color:yellow;
+=09
+}
+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;
+}
+
+.button {
+	font-size:10;
+	color:white;
+	font-weight: bold;
+=09
+	text-decoration:none;
+	font-family: helvetica,sans-serif;
+	background-image: url("image/bg-submit2.gif");
+	background-repeat: repeat-x;
+	background-position: left;
+=09
+	border-style:  outset ;
+	border-color:  blue ;
+	border-width:0;
+	padding:2 4 2 4;
+	cursor:pointer;
+	margin:1 2 1 2;
+	-moz-border-radius:2 2;
+=09
+}
+.button:hover {
+	cursor:pointer;
+	background-color:white;
+	border-style:  inset ;
+	color:blue;
+	margin:1 2 1 2;
+	}
+	td.tool {
+	border: solid 1px gray;
+=09
+	}
+div.topmenu {
+	float:left;
+	width:100%;
+=09
+}
+
+h2.dossier {
+	color:darkblue;
+	font-style: italic;
+=09
+font-size:20px;
+margin:0;
+padding:0;
+text-align:center;
+}
+a#anchorbutton {
+	font-size:10;
+	color:white;
+	font-weight: bold;
+=09
+	text-decoration:none;
+	font-family: helvetica,sans-serif;
+	background-image: url("image/bg-submit3.gif");
+	background-repeat: repeat-x;
+	background-position: left;
+=09
+	border-style:  outset ;
+	border-color:  blue ;
+	border-width:1;
+	padding:2 4 2 4;
+	cursor:pointer;
+	margin:1 2 1 2;
+	-moz-border-radius:2 2;
+=09
+}
+a#anchorbutton:hover {
+	cursor:pointer;
+	background-color:white;
+	border-style:  inset ;
+	color:blue;
+	margin:1 2 1 2;
+	}
+/* </style> */
+div.add_todo_list {=20
+                    border:1px solid blue;
+                    display:none;
+                    background-color:#BFD0FF;
+                    padding:3;
+                    position:absolute;
+                    text-align:left;
+                    line-height:3em;
+                    z-index:1}
+div.welcome {
+
+}
+div.gest_name {
+	float:right;
+	margin-right: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;
+}
+div.op_detail_frame  {
+  background-color:#e4e7ed;=20
+  height:100%; width:100%;
+ =20
+ =20
+}
+div.inner_box  {
+  background-color:#e4e7ed;
+ font-size:10;
+  font-family:helvetica,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:3;
+ =20
+position:absolute;
+left:10%;
+
+
+border:1px solid darkblue;=09
+
+}
+div.op_detail_title {
+	background-color:grey;
+/*	width:500;*/
+=09
+=09
+}
+div#div_jrn{=20
+              position:absolute;
+              border:1px solid black;
+               top:15%;left:100;
+              visibility:hidden;
+              z-index:2;
+              width:50em;
+		      background-color:#EDF3FF;
+		     =20
+}
+ div#div_cat{=20
+              position:absolute;
+              border:1px solid black;
+               top:15%;left:100;
+              visibility:hidden;
+              z-index:2;
+              width:50em;
+             background-color:#EDF3FF;
+		     =20
+}
+=20
+div.divinfo
+{  color:red;text-align:right;display:block;width:30em;height:13;font-we=
ight:bold}
+
+div#search_form
+{=20
+              position:absolute;
+              border:1px solid black;
+              top:15%;left:100;
+              margin-left:25%
+              z-index:2;
+              width:50%;
+              display:none;
+	      background-color:#e4e7ed;
+}
+
+table.result td=20
+{
+	padding-left:5px;
+	padding-right:5px;
+}
+table.info_op
+{
+	font-size:18;
+	margin-right:30%;
+	width:20%;
+=09
+}
+table.info_op tr
+{
+font-size:14;
+background:white;
+}
+h2#jrn_name
+{
+	margin-right:30%;
+	float: right;
+=09
+}
+tr.footer{
+	font-size:14;
+	font-style: italic;
+	font-weight: bold;
+=09
+}
+span.remain {
+	font-weight: bold;
+	color:black;
+	}
+=09
+div#jrn_name_div
+{
+	float: right;
+	margin-right:150;
+=09
+=09
+}
+#predef_form {
+	margin-left:20%;
+	width:60%;
+=09
+}
+#direct
+{
+	display:inline;
+	float:right;
+=09
+=09
+}
+.direct=20
+{
+		font-size:10px;
+	   border:groove 1px #000000;
+	margin:1px;
+}
+div#wait_box
+{
+  background-color:#F1E6E6;
+ font-size:10;
+  font-family:helvetica,arial,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:10;
+ =20
+position:absolute;
+left:30%;
+top:30%;
+
+
+border:1px solid darkblue;=09
+
+}
+#wait_box h2
+{
+color:black;
+text-align:center;
+}
+div#div_jrnsearch_op{=20
+             =20
+              border:1px solid black;
+              display:none;
+              width:50em;
+		      background-color:#EDF3FF;
+		     =20
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-10 12:58:09 UTC (rev 432=
5)
+++ phpcompta/trunk/html/style-light.css	2011-11-10 15:49:57 UTC (rev 432=
6)
@@ -3,6 +3,7 @@
 BODY {
   background-color:#EDF3FF;
  font-size:10;
+ color:blue;
   font-family:helvetica,arial,sans-serif;
   padding: 0px 10px 0px 10px ;
   margin:0;
@@ -18,24 +19,24 @@
   width:100%;
    border-spacing:  0px;
    border-collapse:collapse;
-  =20
+
 }
 table.resultfooter tfoot {
 	font-size:110%;
 	font-weight: bold;
-=09
-=09
+
+
 }
-table.result th {=20
+table.result th {
   font-weight:bold;
   font-family:helvetica,arial,sans-serif;
- border-bottom:1px solid black;=20
+ border-bottom:1px solid black;
  border-top:0;
-=20
+
   color:#25238F;
   text-align: left;
   font-style: italic;
-	     =20
+
 }
=20
 h2 {
@@ -58,7 +59,7 @@
   padding:0px;
   margin:0px;
 }
-u_redcontent h2.info {
+redcontent h2.info {
   background:#879ed4;
   color:white;
   font-size:14pt;
@@ -74,7 +75,7 @@
   padding:0px;
   margin:0px;
   border:1px solid grey;
- =20
+
 }
=20
 h3.info {
@@ -105,10 +106,10 @@
=20
 div.u_tmenu {
   margin-top:0px;
-  width:100%;=09
+  width:100%;
  /* background-color:#879ED4; */
- =20
- =20
+
+
 }
 div.u_subtmenu {
   background-color:white	;
@@ -119,12 +120,12 @@
 }
 div.u_tmenu div.u_tool {
 	   float:left;
-	  =20
+
 }
 div.u_tool {
 	float:left;
 	width:  100%;
-=09
+
 	}
 div.u_tool div.name {
        float:left;
@@ -134,12 +135,12 @@
 	float:right;
 	margin-right:10px;
 	text-align:right;
-=09
+
 }
=20
 div.u_subt2menu {
 background-color:lightgrey;
-  left:1%;=09
+  left:1%;
=20
 }
 div.lmenu {
@@ -170,38 +171,38 @@
   border-width:1px;
=20
 }
-div.u_redcontent{ 	 	=20
-         float:left; 	=20
+div.redcontent{
+         float:left;
 	 padding-top:7px;
 	 padding-left:8px;
-         font-size:9px; 	=20
-         font-family:helvetica,arial,sans-serif; 	=20
+         font-size:9px;
+         font-family:helvetica,arial,sans-serif;
 	 width:75%;
=20
 }
-div.content{ 	=20
-         float:left; 	=20
+div.content{
+         float:left;
 		padding-top:7px;
-         width:96%; 	 	=20
-         font-family:helvetica,arial,sans-serif; =09
+         width:96%;
+         font-family:helvetica,arial,sans-serif;
          clear:both;
          margin-left:2%;
-        =20
=20
+
 }
-div.content30{ 	=20
-         float:left; 	=20
+div.content30{
+         float:left;
 	 padding-top:7px;
-         width:35%; 	 =20
-         font-family:helvetica,arial,sans-serif; 	=20
+         width:35%;
+         font-family:helvetica,arial,sans-serif;
=20
 }
 div.no span{
 	position:static;
-	font-family:helvetica,arial,sans-serif;=09
+	font-family:helvetica,arial,sans-serif;
 	font-weight:bold;
-	color:red;=09
-=09
+	color:red;
+
 }
=20
 table.document {
@@ -224,7 +225,7 @@
 .error {
 width:60%;
 margin-left:20%;
-color:white; =20
+color:white;
 background-color:red;
 text-align: center;
 font-weight: bolder;
@@ -235,7 +236,7 @@
 	border:0;
 	text-align:center
 }
-td.mshort {=20
+td.mshort {
   height:15px;
   width:60px;
   text-align:center;
@@ -246,7 +247,7 @@
 td.mtitle {
 	text-align:center;
 	width:95px;
-        height :30px;=20
+        height :30px;
 	font-size:10px;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
@@ -263,11 +264,11 @@
 	font-size:10px;
 	border-style:groove
 }
-span.odd {=20
+span.odd {
   background-color:#ECF3FF;
   display:block;
  }
-span.even {=20
+span.even {
   background-color:#DDE6FF;
   display:block;
  }
@@ -275,7 +276,7 @@
 tr.odd {
 	background-color:#DDE6FF;
 	font-size:10px;
-  border-width:0px;	=09
+  border-width:0px;
 }
 tr {
 	font-size:10px;
@@ -308,16 +309,16 @@
   text-decoration:none;
   display:inline;
  color: #0000ff;
-=09
+
 }
 a.mtitle:hover {
   font-size:10px;
   text-decoration:none;
   display:inline;
- =20
+
  color: darkblue;
 background-color:#5D90CD;
-=09
+
 }
 td.selectedcell a.mtitle {
  font-size:1em;
@@ -330,7 +331,7 @@
   text-decoration:none;
   display:block;
    color: #202267;
-=09
+
 }
 tr.odd:hover td
 {
@@ -338,7 +339,7 @@
   background-color: #a9d6e4;
   color:white;
 }
-tr.even:hover td=20
+tr.even:hover td
 {
   text-decoration:none;
   background-color: #a9d6e4;
@@ -400,7 +401,7 @@
     color: #0000ff;
 }
=20
-a.detail:hover  =20
+a.detail:hover
 {
   font-size:9px;
   font-family:helvetica,arial,sans-serif;
@@ -414,7 +415,7 @@
 	 display:inline;
 	 padding:1em 1em;
 }
-div.u_redcontent a {
+div.redcontent a {
   font-family:helvetica,arial,sans-serif;
   text-decoration: none;
   display: block;
@@ -422,7 +423,7 @@
=20
 }
=20
-div.u_redcontent a:hover {
+div.redcontent a:hover {
   font-family:helvetica,arial,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
@@ -436,7 +437,7 @@
   display: block;
   color: #0000ff;
 padding: 1px ;
-=09
+
 }
=20
=20
@@ -449,16 +450,16 @@
=20
 }
=20
-div.u_redcontent a.mtitle {
+div.redcontent a.mtitle {
   text-decoration:none;
   display:inline;
=20
- =20
+
   color:black;
=20
 }
=20
-div.u_redcontent a.mtitle:hover {
+div.redcontent a.mtitle:hover {
   text-decoration:none;
   display:inline;
   color:white;
@@ -471,9 +472,9 @@
   text-decoration:none;
   display:inline;
   color:#0000ff;
-   =20
=20
=20
+
 }
=20
 div.content a.mtitle:hover {
@@ -481,17 +482,17 @@
   display:inline;
   background-color:darkblue;
   color:white;
-=20
=20
+
 }
-div.u_redcontent input.text {
+div.redcontent input.text {
    font-family:helvetica,arial,sans-serif;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
-  background-color:orange; =20
+  background-color:orange;
   border-width:1px;
-  color:#0000ff;=20
+  color:#0000ff;
 }
 div.content input.text {
    font-family:helvetica,arial,sans-serif;
@@ -500,18 +501,18 @@
   border-style:solid;
   border-width:1px;
   background-color:orange;
-  color:#0000ff;=20
+  color:#0000ff;
 }
=20
=20
=20
-div.u_redcontent input:focus {
+div.redcontent input:focus {
   background-color:orange;
 }
 div.content input:focus {
   background-color:orange;
 }
-div.u_redcontent textarea:focus {
+div.redcontent textarea:focus {
 background-color: orange;
 }
 .document {
@@ -533,16 +534,19 @@
 	   border:groove 1px #0000ff;
 	margin:1px;
 }
+.input_text:hover {
+	background-color: yellow;
+}
 legend {
 font-weight: bold;
 font-style: italic;
 font-size: 120% ;
-=09
+
 }
-fieldset fieldset legend {=20
+fieldset fieldset legend {
 	 font-size:110%;
 	 color:grey;
-	 }=09
+	 }
 select {
 border: 1px solid #0000ff;
 margin:2px;
@@ -561,12 +565,12 @@
 	   visibility:hidden;
 	   z-index:2;
 	   width:25em;
-      =20
+
 }
=20
 span.action {
 	height:3em;
-=09
+
 }
 td.num {
 	text-align:right;
@@ -580,7 +584,7 @@
   padding-right:3px;
   text-decoration:none;
   font-size:14px;
- =20
+
   display:inline;
   color:black;
   background-color:lightgrey;
@@ -602,7 +606,7 @@
 	z-index:1;
 	/*background-color:lightgrey;*/
 	/*background-color: rgba(203, 203,203, 0.2);*/
-	display:none;=09
+	display:none;
 }
=20
 div.popup_border_title {
@@ -610,7 +614,7 @@
 	top:20%;
 	left:10%;
 	width:60%;
-	height:80%;=20
+	height:80%;
 	/*background:lightgrey;*/
 	z-index:10;
 	/*border:dotted 1px black;*/
@@ -621,19 +625,19 @@
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/=09
+	/*border-bottom: 2px solid #201e87;*/
 	color: white;
 	display:none;
 	/*opacity:1;
 	filter:alpha(opacity=3D100);*/
-=09
+
 	}
 div.popup_border_notitle {
 	position:absolute;
 	top:20%;
 	left:20%;
 	width:60%;
-	height:80% ;=20
+	height:80% ;
 	/*background:lightgrey;*/
 	z-index:10;
 	/*border:dotted 1px black;*/
@@ -657,9 +661,9 @@
 	left:0;
 	right:0;
 	width:100%;
-	height:96%;=20
+	height:96%;
 	overflow: auto;
-  background-color:#e4e7ed;=09
+  background-color:#e4e7ed;
 	font-size:10px ;
 	font-family: helvetica,arial,sans-serif;
 	font-style: normal;
@@ -678,11 +682,11 @@
   padding:0;
   text-align:left;
   font-size:12px;
- =20
+
 }
 span.informal {
     font-size:12px;
-   =20
+
  }
 div.autocomplete em {
 	color:#0000ff;
@@ -706,7 +710,7 @@
   padding:0px;
   /*height:32px;*/
   border:1px dotted  #e6e6fa;
- =20
+
   cursor:pointer;
 }
=20
@@ -736,20 +740,20 @@
 	margin: 0px;
 	padding:  0px;
 }
-=09
+
 div.pc_calendar{
 		border:1px groove grey;
 		float:left;
-	=09
+
 		}
 div.pc_calendar table {
 	text-align:center;
-	=09
+
 }
 div.pc_calendar tr{
 	height:40;
-=09
-=09
+
+
 }
 div.pc_calendar td{
 	width:10em;
@@ -757,26 +761,26 @@
=20
 div.pc_calendar td.weekend {
 	background-color:#cce0e6;
-=09
+
 }
 div.pc_calendar td.workday{
 	background-color:inherit;
-=09
-=09
+
+
 }
 div.pc_calendar span.day{
 	font-weight: bold;
 	display:block;
-=09
+
 }
 div.pc_calendar span.event{
 	font-weight: bolder;
-=09
+
 }
 span.todo  {
 	text-align: left;
 	background-color:yellow;
-=09
+
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
 -moz-user-focus:ignore;
@@ -786,17 +790,17 @@
 cursor:inherit;
 }
=20
-.button {
+.button , a.button,div.content a.button {
 	font-size:10;
 	color:white;
 	font-weight: bold;
-=09
+
 	text-decoration:none;
 	font-family: helvetica,arial,sans-serif;
 	background-image: url("image/bg-submit3.gif");
 	background-repeat: repeat-x;
 	background-position: left;
-=09
+
 	border-style:  outset ;
 	border-color:  #0000ff ;
 	border-width:0;
@@ -804,9 +808,9 @@
 	cursor:pointer;
 	margin:1 2 1 2;
 	-moz-border-radius:2 2;
-=09
+
 }
-.button:hover {
+.button:hover, a.button:hover,div.content a.button:hover  {
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
@@ -815,18 +819,18 @@
 	}
 	td.tool {
 	border: solid 1px gray;
-=09
+
 	}
 div.topmenu {
 	float:left;
 	width:100%;
-=09
+
 }
=20
 h2.dossier {
 	color:darkblue;
 	font-style: italic;
-=09
+
 font-size:20px;
 margin:0;
 padding:0;
@@ -836,13 +840,13 @@
 	font-size:10;
 	color:white;
 	font-weight: bold;
-=09
+
 	text-decoration:none;
 	font-family: helvetica,arial,sans-serif;
 	background-image: url("image/bg-submit3.gif");
 	background-repeat: repeat-x;
 	background-position: left;
-=09
+
 	border-style:  outset ;
 	border-color:  #0000ff ;
 	border-width:1;
@@ -850,18 +854,18 @@
 	cursor:pointer;
 	margin:1 2 1 2;
 	-moz-border-radius:2 2;
-=09
+
 }
 a#anchorbutton:hover {
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
 	color:#0000ff;
-=09
+
 	margin:1 2 1 2;
 	}
 /* </style> */
-div.add_todo_list {=20
+div.add_todo_list {
                     border:1px solid #0000ff;
                     display:none;
                     background-color:#BFD0FF;
@@ -886,10 +890,10 @@
 	padding: 5px;
 }
 div.op_detail_frame  {
-  background-color:#e4e7ed;=20
+  background-color:#e4e7ed;
   height:100%; width:100%;
- =20
- =20
+
+
 }
 div.inner_box  {
   background-color:#e4e7ed;
@@ -899,21 +903,21 @@
   margin:0;
   overflow:hidden;
   z-index:3;
- =20
+
 position:absolute;
 left:10%;
=20
=20
-border:1px solid darkblue;=09
+border:1px solid darkblue;
=20
 }
 div.op_detail_title {
 	background-color:grey;
 /*	width:500;*/
-=09
-=09
+
+
 }
-div#div_jrn{=20
+div#div_jrn{
               position:absolute;
               border:1px solid black;
                top:15%;left:100;
@@ -921,9 +925,9 @@
               z-index:2;
               width:50em;
 		      background-color:#EDF3FF;
-		     =20
+
 }
- div#div_cat{=20
+ div#div_cat{
               position:absolute;
               border:1px solid black;
                top:15%;left:100;
@@ -931,15 +935,15 @@
               z-index:2;
               width:50em;
              background-color:#EDF3FF;
-		     =20
+
 }
-=20
+
 div.divinfo
 {  color:red;text-align:right;display:block;width:30em;height:13;font-we=
ight:bold}
=20
=20
 div#search_form
-{=20
+{
               position:absolute;
               border:1px solid black;
               top:15%;left:100;
@@ -949,7 +953,7 @@
               display:none;
 	      background-color:#e4e7ed;
 }
-table.result td=20
+table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -959,7 +963,7 @@
 	margin-left: 30%;
 	margin-right: 30%;
 	width:20%;
-=09
+
 }
 table.info_op tr
 {
@@ -971,7 +975,7 @@
 {
 	padding:0 ;
 	margin:0;
-=09
+
 	float:right;
 	font-size:18;
 	display: inline;
@@ -981,7 +985,7 @@
 	font-size:14;
 	font-style: italic;
 	font-weight: bold;
-=09
+
 }
 span.remain {
 	font-weight: bold;
@@ -991,22 +995,22 @@
 {
 	float: right;
 	margin-right:150;
-=09
-=09
+
+
 }
 #predef_form {
 	margin-left:20%;
 	width:60%;
-=09
+
 }
 #direct
 {
 	display:inline;
 	float:right;
-=09
-=09
+
+
 }
-.direct=20
+.direct
 {
 		font-size:6px;
 	   border:groove 1px #33378d;
@@ -1022,13 +1026,13 @@
   margin:0;
   overflow:hidden;
   z-index:10;
- =20
+
 position:absolute;
 left:30%;
 top:30%;
=20
=20
-border:1px solid darkblue;=09
+border:1px solid darkblue;
=20
 }
 #wait_box h2
@@ -1036,11 +1040,14 @@
 color:black;
 text-align:center;
 }
-div#div_jrnsearch_op{=20
-             =20
+div#div_jrnsearch_op{
+
               border:1px solid black;
               display:none;
               width:50em;
 		      background-color:#EDF3FF;
-		     =20
-}
\ No newline at end of file
+
+}
+ul {
+	padding-left: 100px;
+}

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	2011-11-10 12:58:09 UTC (rev 432=
5)
+++ phpcompta/trunk/html/style-print.css	2011-11-10 15:49:57 UTC (rev 432=
6)
@@ -97,7 +97,7 @@
 	font-family:sans-serif;
=20
 }
-div.u_redcontent{ 	=20
+div.redcontent{ 	=20
 	font-size:7pt;
 	font-family:sans-serif;
 }

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	2011-11-10 12:58:09 UTC (rev 4325)
+++ phpcompta/trunk/html/style.css	2011-11-10 15:49:57 UTC (rev 4326)
@@ -6,6 +6,7 @@
   font-family:helvetica,sans-serif;
   padding: 0px 10px 0px 10px ;
   margin:0;
+  color:blue;
 }
 .notice {
 		color:red;
@@ -18,26 +19,26 @@
   width:100%;
    border-spacing:  0px;
    border-collapse:collapse;
-  =20
+
 }
 table.resultfooter tfoot {
 	font-size:110%;
 	font-weight: bold;
-=09
-=09
+
+
 }
-table.result th {=20
+table.result th {
   font-weight:bold;
   font-family:helvetica,sans-serif;
- border-bottom:2px solid blue;=20
+ border-bottom:2px solid blue;
  border-top:0;
-=20
+
   color:#25238F;
   text-align: left;
   	     // background-color:#EDF3FF;
-  	     =20
+
 	      font-style: italic;
-	     =20
+
 }
=20
 h2 {
@@ -60,7 +61,7 @@
   padding:0px;
   margin:0px;
 }
-u_redcontent h2.info {
+redcontent h2.info {
   background:#879ed4;
   color:white;
   font-size:14pt;
@@ -76,7 +77,7 @@
   padding:0px;
   margin:0px;
   border:1px solid grey;
- =20
+
 }
=20
 h3.info {
@@ -107,10 +108,10 @@
=20
 div.u_tmenu {
   margin-top:0px;
-  width:100%;=09
+  width:100%;
  /* background-color:#879ED4; */
- =20
- =20
+
+
 }
 div.u_subtmenu {
   background-color:white	;
@@ -121,7 +122,7 @@
 }
 div.u_tmenu div.u_tool {
 	   float:left;
-	  =20
+
 }
 div.u_tool {
 	float:left;
@@ -135,12 +136,12 @@
 	float:right;
 	margin-right:10px;
 	text-align:right;
-=09
+
 }
=20
 div.u_subt2menu {
 background-color:lightgrey;
-  left:1%;=09
+  left:1%;
=20
 }
 div.lmenu {
@@ -172,40 +173,40 @@
   border-width:1px;
=20
 }
-div.u_redcontent{ 	=20
-  =20
-         float:left; 	=20
+div.redcontent{
+
+         float:left;
 	 padding-top:7px;
 	 padding-left:8px;
-         font-size:9px; 	=20
-         font-family:helvetica,sans-serif; 	=20
+         font-size:9px;
+         font-family:helvetica,sans-serif;
 	 width:75%;
=20
 }
-div.content{ 	=20
+div.content{
=20
-         float:left; 	=20
+         float:left;
 		padding-top:7px;
-         width:100%; 	 	=20
-         font-family:helvetica,sans-serif; =09
+         width:100%;
+         font-family:helvetica,sans-serif;
          clear:both;
-         =20
=20
+
 }
-div.content30{ 	=20
-   	=20
-         float:left; 	=20
+div.content30{
+
+         float:left;
 	 padding-top:7px;
-         width:35%; 	 =20
-         font-family:helvetica,sans-serif; 	=20
+         width:35%;
+         font-family:helvetica,sans-serif;
=20
 }
 div.no span{
 	position:static;
-	font-family:helvetica,sans-serif;=09
+	font-family:helvetica,sans-serif;
 	font-weight:bold;
-	color:red;=09
-=09
+	color:red;
+
 }
=20
 table.document {
@@ -230,7 +231,7 @@
 margin-left:20%;
 text-align: center;
=20
-color:white; =20
+color:white;
 background-color:red;
 font-weight: bolder;
 font-size:120%;
@@ -240,7 +241,7 @@
 	border:0;
 	text-align:center
 }
-td.mshort {=20
+td.mshort {
   height:15px;
   width:60px;
   text-align:center;
@@ -251,7 +252,7 @@
 td.mtitle {
 	text-align:center;
 	width:95px;
-        height :30px;=20
+        height :30px;
 	font-size:10px;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
@@ -268,11 +269,11 @@
 	font-size:10px;
 	border-style:groove
 }
-span.odd {=20
+span.odd {
   background-color:#ECF3FF;
   display:block;
  }
-span.even {=20
+span.even {
   background-color:#DDE6FF;
   display:block;
  }
@@ -311,16 +312,16 @@
   text-decoration:none;
   display:inline;
  color: blue;
-=09
+
 }
 a.mtitle:hover {
   font-size:10px;
   text-decoration:none;
   display:inline;
- =20
+
  color: darkblue;
 background-color:#5D90CD;
-=09
+
 }
 td.selectedcell a.mtitle {
  font-size:1em;
@@ -333,7 +334,7 @@
   text-decoration:none;
   display:block;
    color: #202267;
-=09
+
 }
 tr.odd:hover td
 {
@@ -341,7 +342,7 @@
   background-color: #a9d6e4;
   color:white;
 }
-tr.even:hover td=20
+tr.even:hover td
 {
   text-decoration:none;
   background-color: #a9d6e4;
@@ -403,7 +404,7 @@
     color: blue;
 }
=20
-a.detail:hover  =20
+a.detail:hover
 {
   font-size:9px;
   font-family:helvetica,sans-serif;
@@ -417,7 +418,7 @@
 	 display:inline;
 	 padding:1em 1em;
 }
-div.u_redcontent a {
+div.redcontent a {
   font-family:helvetica,sans-serif;
   text-decoration: none;
   display: block;
@@ -425,7 +426,7 @@
=20
 }
=20
-div.u_redcontent a:hover {
+div.redcontent a:hover {
   font-family:helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
@@ -439,7 +440,7 @@
   display: block;
   color: blue;
 padding: 1px ;
-=09
+
 }
=20
=20
@@ -452,16 +453,16 @@
=20
 }
=20
-div.u_redcontent a.mtitle {
+div.redcontent a.mtitle {
   text-decoration:none;
   display:inline;
=20
- =20
+
   color:black;
=20
 }
=20
-div.u_redcontent a.mtitle:hover {
+div.redcontent a.mtitle:hover {
   text-decoration:none;
   display:inline;
   color:white;
@@ -474,9 +475,9 @@
   text-decoration:none;
   display:inline;
   color:blue;
-   =20
=20
=20
+
 }
=20
 div.content a.mtitle:hover {
@@ -484,17 +485,17 @@
   display:inline;
   background-color:darkblue;
   color:white;
-=20
=20
+
 }
-div.u_redcontent input.text {
+div.redcontent input.text {
    font-family:helvetica,sans-serif;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
-  background-color:orange; =20
+  background-color:orange;
   border-width:1px;
-  color:blue;=20
+  color:blue;
 }
 div.content input.text {
    font-family:helvetica,sans-serif;
@@ -503,18 +504,18 @@
   border-style:solid;
   border-width:1px;
   background-color:orange;
-  color:blue;=20
+  color:blue;
 }
=20
=20
=20
-div.u_redcontent input:focus {
+div.redcontent input:focus {
   background-color:orange;
 }
 div.content input:focus {
   background-color:orange;
 }
-div.u_redcontent textarea:focus {
+div.redcontent textarea:focus {
 background-color: orange;
 }
 .document {
@@ -536,16 +537,21 @@
 	   border:groove 1px blue;
 	margin:1px;
 }
+.input_text:hover {
+	border:groove 1px blue;
+	margin:1px;
+	background-color: orange;
+}
 legend {
 font-weight: bold;
 font-style: italic;
 font-size: 120% ;
-=09
+
 }
-fieldset fieldset legend {=20
+fieldset fieldset legend {
 	 font-size:110%;
 	 color:grey;
-	 }=09
+	 }
 select {
 border: 1px solid blue;
 margin:2px;
@@ -564,12 +570,12 @@
 	   visibility:hidden;
 	   z-index:2;
 	   width:25em;
-      =20
+
 }
=20
 span.action {
 	height:3em;
-=09
+
 }
 td.num {
 	text-align:right;
@@ -583,7 +589,7 @@
   padding-right:3px;
   text-decoration:none;
   font-size:14px;
- =20
+
   display:inline;
   color:black;
   background-color:lightgrey;
@@ -604,8 +610,8 @@
 	height:100%;
 	z-index:1;
 	/*background-color:lightgrey;*/
-=09
-	display:none;=09
+
+	display:none;
 }
=20
 div.popup_border_title {
@@ -624,19 +630,19 @@
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/=09
+	/*border-bottom: 2px solid #201e87;*/
 	color: white;
 	display:none;
 	/*opacity:1;
 	filter:alpha(opacity=3D100);*/
-=09
+
 	}
 div.popup_border_notitle {
 	position:absolute;
 	top:20%;
 	left:20%;
 	width:60%;
-	height:80% ;=20
+	height:80% ;
 	/*background:lightgrey;*/
 	z-index:10;
 	/*border:dotted 1px black;*/
@@ -662,7 +668,7 @@
 	width:100%;
 	height:96%;
 	overflow: auto;
-	background-color:#DFE7FF;=09
+	background-color:#DFE7FF;
 	font-size:10px ;
 	font-family: helvetica,sans-serif;
 	font-style: normal;
@@ -682,7 +688,7 @@
   padding:0;
   text-align:left;
   font-size:12px;
- =20
+
 }
 div.autocomplete em {
 	color:blue;
@@ -734,20 +740,20 @@
 	margin: 0px;
 	padding:  0px;
 }
-=09
+
 div.pc_calendar{
 		border:1px groove grey;
 		float:left;
-	=09
+
 		}
 div.pc_calendar table {
 	text-align:center;
-	=09
+
 }
 div.pc_calendar tr{
 	height:40;
-=09
-=09
+
+
 }
 div.pc_calendar td{
 	width:10em;
@@ -755,26 +761,26 @@
=20
 div.pc_calendar td.weekend {
 	background-color:#cce0e6;
-=09
+
 }
 div.pc_calendar td.workday{
 	background-color:inherit;
-=09
-=09
+
+
 }
 div.pc_calendar span.day{
 	font-weight: bold;
 	display:block;
-=09
+
 }
 div.pc_calendar span.event{
 	font-weight: bolder;
-=09
+
 }
 span.todo  {
 	text-align: left;
 	background-color:yellow;
-=09
+
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
 -moz-user-focus:ignore;
@@ -784,17 +790,17 @@
 cursor:inherit;
 }
=20
-.button {
+.button, a.button,div.content a.button {
 	font-size:10;
 	color:white;
 	font-weight: bold;
-=09
+
 	text-decoration:none;
 	font-family: helvetica,sans-serif;
 	background-image: url("image/bg-submit2.gif");
 	background-repeat: repeat-x;
 	background-position: left;
-=09
+
 	border-style:  outset ;
 	border-color:  blue ;
 	border-width:0;
@@ -802,9 +808,9 @@
 	cursor:pointer;
 	margin:1 2 1 2;
 	-moz-border-radius:2 2;
-=09
+
 }
-.button:hover {
+.button:hover,a.button:hover,div.content a.button:hover  {
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
@@ -813,18 +819,18 @@
 	}
 	td.tool {
 	border: solid 1px gray;
-=09
+
 	}
 div.topmenu {
 	float:left;
 	width:100%;
-=09
+
 }
=20
 h2.dossier {
 	color:darkblue;
 	font-style: italic;
-=09
+
 font-size:20px;
 margin:0;
 padding:0;
@@ -834,13 +840,13 @@
 	font-size:10;
 	color:white;
 	font-weight: bold;
-=09
+
 	text-decoration:none;
 	font-family: helvetica,sans-serif;
 	background-image: url("image/bg-submit3.gif");
 	background-repeat: repeat-x;
 	background-position: left;
-=09
+
 	border-style:  outset ;
 	border-color:  blue ;
 	border-width:1;
@@ -848,7 +854,7 @@
 	cursor:pointer;
 	margin:1 2 1 2;
 	-moz-border-radius:2 2;
-=09
+
 }
 a#anchorbutton:hover {
 	cursor:pointer;
@@ -858,7 +864,7 @@
 	margin:1 2 1 2;
 	}
 /* </style> */
-div.add_todo_list {=20
+div.add_todo_list {
                     border:1px solid blue;
                     display:none;
                     background-color:#BFD0FF;
@@ -883,10 +889,10 @@
 	padding: 5px;
 }
 div.op_detail_frame  {
-  background-color:#e4e7ed;=20
+  background-color:#e4e7ed;
   height:100%; width:100%;
- =20
- =20
+
+
 }
 div.inner_box  {
   background-color:#e4e7ed;
@@ -896,21 +902,21 @@
   margin:0;
   overflow:hidden;
   z-index:3;
- =20
+
 position:absolute;
 left:10%;
=20
=20
-border:1px solid darkblue;=09
+border:1px solid darkblue;
=20
 }
 div.op_detail_title {
 	background-color:grey;
 /*	width:500;*/
-=09
-=09
+
+
 }
-div#div_jrn{=20
+div#div_jrn{
               position:absolute;
               border:1px solid black;
                top:15%;left:100;
@@ -918,9 +924,9 @@
               z-index:2;
               width:50em;
 		      background-color:#EDF3FF;
-		     =20
+
 }
- div#div_cat{=20
+ div#div_cat{
               position:absolute;
               border:1px solid black;
                top:15%;left:100;
@@ -928,14 +934,14 @@
               z-index:2;
               width:50em;
              background-color:#EDF3FF;
-		     =20
+
 }
-=20
+
 div.divinfo
 {  color:red;text-align:right;display:block;width:30em;height:13;font-we=
ight:bold}
=20
 div#search_form
-{=20
+{
               position:absolute;
               border:1px solid black;
               top:15%;left:100;
@@ -946,7 +952,7 @@
 	      background-color:#e4e7ed;
 }
=20
-table.result td=20
+table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -956,7 +962,7 @@
 	font-size:18;
 	margin-right:30%;
 	width:20%;
-=09
+
 }
 table.info_op tr
 {
@@ -967,39 +973,39 @@
 {
 	margin-right:30%;
 	float: right;
-=09
+
 }
 tr.footer{
 	font-size:14;
 	font-style: italic;
 	font-weight: bold;
-=09
+
 }
 span.remain {
 	font-weight: bold;
 	color:black;
 	}
-=09
+
 div#jrn_name_div
 {
 	float: right;
 	margin-right:150;
-=09
-=09
+
+
 }
 #predef_form {
 	margin-left:20%;
 	width:60%;
-=09
+
 }
 #direct
 {
 	display:inline;
 	float:right;
-=09
-=09
+
+
 }
-.direct=20
+.direct
 {
 		font-size:6px;
 	   border:groove 1px #000000;
@@ -1014,13 +1020,13 @@
   margin:0;
   overflow:hidden;
   z-index:10;
- =20
+
 position:absolute;
 left:30%;
 top:30%;
=20
=20
-border:1px solid darkblue;=09
+border:1px solid darkblue;
=20
 }
 #wait_box h2
@@ -1028,11 +1034,29 @@
 color:black;
 text-align:center;
 }
-div#div_jrnsearch_op{=20
-             =20
+div#div_jrnsearch_op{
+
               border:1px solid black;
               display:none;
               width:50em;
 		      background-color:#EDF3FF;
-		     =20
+
+}
+ul {
+	padding-left: 110px;
+}
+a.line,div.content a.line
+{
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+ color: #0000ff;
+}
+a.line:hover,div_content a.line
+{
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+  color: #0000ff;
+     background-color: rgb(93, 144, 205);
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-10 12:58:09 UTC (rev 43=
25)
+++ phpcompta/trunk/include/ac_common.php	2011-11-10 15:49:57 UTC (rev 43=
26)
@@ -384,7 +384,7 @@
     }
     else
     {
-	echo '<div class=3D"u_redcontent">';
+	echo '<div class=3D"redcontent">';
 	echo '<h2 class=3D"error">' . _(' Cette action ne vous est pas autoris=C3=
=A9e Contactez votre responsable') . '</h2>';
 	echo '</div>';
     }
@@ -754,7 +754,7 @@
 		echo '</div>';
 		echo '</div>';
 		echo '<div class=3D"content">';
-		echo_warning("Module inexistant [$selected");
+		echo_warning("Module inexistant [$selected ] ");
 		echo '</div>';
 		exit();
 	}
@@ -857,10 +857,13 @@
 	 */
 		$file =3D $cn->get_array("select me_file,me_parameter,me_javascript,me=
_type
 		from menu_ref
+		join profile_menu using (me_code)
+		join profile_user using (p_id)
 		where
 		me_code=3D$1 and
+		user_name=3D$2 and
 		(me_file is not null or trim(me_file) <>'' or
-		me_javascript is not null or trim (me_javascript) <> '')", array($modu=
le[$idx]));
+		me_javascript is not null or trim (me_javascript) <> '')", array($modu=
le[$idx],$g_user->login));
=20
 		if (count($file)=3D=3D0)
 		{

Modified: phpcompta/trunk/include/anc_od.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/anc_od.inc.php	2011-11-10 12:58:09 UTC (rev 4=
325)
+++ phpcompta/trunk/include/anc_od.inc.php	2011-11-10 15:49:57 UTC (rev 4=
326)
@@ -80,7 +80,7 @@
     $a=3Dnew Anc_Operation($cn);
=20
     echo '
-    <div class=3D"u_redcontent"  style=3D"margin-left:12%">
+    <div class=3D"redcontent"  style=3D"margin-left:12%">
     <form method=3D "get">
     ';
=20
@@ -108,7 +108,7 @@
     echo $w->input();
     echo 'P&eacute;riode  '.HtmlInput::submit('gl_submit','Valider').'</=
form>';
=20
-    echo '<div class=3D"u_redcontent"  style=3D"margin-left:12%">';
+    echo '<div class=3D"redcontent"  style=3D"margin-left:12%">';
     echo $a->html_table($current);
     echo '</div>';
     exit();
@@ -118,7 +118,7 @@
     // record the operation and exit
     // and exit
     //-----------------------------
-    echo '<div class=3D"u_redcontent" style=3D"margin-left:12%">'.
+    echo '<div class=3D"redcontent" style=3D"margin-left:12%">'.
     _('Op=C3=A9ration sauv=C3=A9e');
     $a=3Dnew Anc_Group_Operation($cn);
=20
@@ -138,7 +138,7 @@
=20
     $wSubmit=3Dnew IHidden("p_action","ca_od");
     $wSubmit->table=3D0;
-    echo '<div class=3D"u_redcontent"  style=3D"margin-left:12%">';
+    echo '<div class=3D"redcontent"  style=3D"margin-left:12%">';
     echo '<form method=3D"post">';
     echo dossier::hidden();
     echo $wSubmit->input();
@@ -157,4 +157,4 @@
 }
=20
 ?>
-<div class=3D"u_redcontent">
+<div class=3D"redcontent">

Modified: phpcompta/trunk/include/anc_pa.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/anc_pa.inc.php	2011-11-10 12:58:09 UTC (rev 4=
325)
+++ phpcompta/trunk/include/anc_pa.inc.php	2011-11-10 15:49:57 UTC (rev 4=
326)
@@ -31,7 +31,7 @@
 $str_dossier=3DDossier::get();
 //----------------------------------------------------------------------=
-----
 // action
-// Compute the u_redcontent div
+// Compute the redcontent div
 //----------------------------------------------------------------------=
-----
 if ( isset($_REQUEST['sa']))
 {
@@ -43,7 +43,7 @@
         $new=3Dnew Anc_Plan($cn);
         if ( $new->isAppend() =3D=3D true)
         {
-            $ret.=3D '<div class=3D"u_redcontent">';
+            $ret.=3D '<div class=3D"redcontent">';
             $ret.=3D '<h2 class=3D"info">Nouveau plan</h2>';
             $ret.=3D '<form method=3D"post">';
             $ret.=3Ddossier::hidden();
@@ -55,7 +55,7 @@
         }
         else
         {
-            $ret.=3D '<div class=3D"u_redcontent">'.
+            $ret.=3D '<div class=3D"redcontent">'.
                    '<h2 class=3D"info">'.
                    "Maximum de plan analytique est atteint".
                    "</h2></div>";
@@ -89,7 +89,7 @@
=20
         $new->get();
=20
-        $ret.=3D '<div class=3D"u_redcontent">';
+        $ret.=3D '<div class=3D"redcontent">';
         $ret.=3D '<h2 class=3D"info">Mise &agrave; jour</h2>';
         $ret.=3D '<form method=3D"post">';
         $ret.=3Ddossier::hidden();
@@ -109,7 +109,7 @@
         $new->name=3D$_POST['pa_name'];
         $new->description=3D$_POST['pa_description'];
         $new->update();
-        $ret=3D'<div class=3D"u_redcontent">';
+        $ret=3D'<div class=3D"redcontent">';
         $ret.=3D'<h2 class=3D"info">Mis &agrave; jour</h2>';
         $ret.=3D"</div>";
     }
@@ -119,7 +119,7 @@
         $po=3Dnew Anc_Account($cn);
         $po->pa_id=3D$_REQUEST['pa_id'];
         $wSa=3DHtmlInput::hidden("sa","po_write");
-        $ret.=3D'<div class=3D"u_redcontent">';
+        $ret.=3D'<div class=3D"redcontent">';
         $ret.=3D'<form method=3D"post">';
         $ret.=3Ddossier::hidden();
         $ret.=3D$po->form();
@@ -151,7 +151,7 @@
     {
         $po=3Dnew Anc_Account($cn,$_GET['po_id']);
         $po->get_by_id();
-        $ret.=3D'<div class=3D"u_redcontent">';
+        $ret.=3D'<div class=3D"redcontent">';
         $ret.=3D'<form method=3D"post">';
         $ret.=3Ddossier::hidden();
=20
@@ -188,7 +188,7 @@
         $new=3Dnew Anc_Plan($cn,$_REQUEST['pa_id']);
         $new->get();
         $array=3D$new->get_poste_analytique(" order by po_name");
-        $ret.=3D'<div class=3D"u_redcontent">';
+        $ret.=3D'<div class=3D"redcontent">';
         $ret.=3D'<table style=3D"width:100%;border:solid blue 2px ;borde=
r-style:outset;">';
         $ret.=3D"<tr>";
         $ret.=3D"<th> Nom </td>";
@@ -289,7 +289,7 @@
     echo '</div>';
 }
 //----------------------------------------------------------------------=
-----
-// show the u_redcontent part
+// show the redcontent part
 //
 //
 //----------------------------------------------------------------------=
-----

Modified: phpcompta/trunk/include/cfgledger.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/cfgledger.inc.php	2011-11-10 12:58:09 UTC (re=
v 4325)
+++ phpcompta/trunk/include/cfgledger.inc.php	2011-11-10 15:49:57 UTC (re=
v 4326)
@@ -116,7 +116,7 @@
 		try
 		{
 			$ledger->id=3D$_REQUEST['p_jrn'];
-			echo '<div class=3D"u_redcontent">';
+			echo '<div class=3D"redcontent">';
 			echo '<form method=3D"POST">';
 			echo $ledger->display_ledger();
 			echo '<INPUT TYPE=3D"SUBMIT" class=3D"button" VALUE=3D"Sauve" name=3D=
"update">
@@ -131,7 +131,7 @@
 		}
 		break;
 	case 'add': /* Add a new ledger */
-		echo '<div class=3D"u_redcontent">';
+		echo '<div class=3D"redcontent">';
 		echo '<FORM METHOD=3D"POST">';
 		$ledger->input_new();
 		echo HtmlInput::submit('add','Sauver');

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-10 12:58:09 =
UTC (rev 4325)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-10 15:49:57 =
UTC (rev 4326)
@@ -363,9 +363,9 @@
                                 ;
             $wConcerned=3Dnew IConcerned("e_concerned".$i,${"e_concerned=
".$i});
             $wConcerned->setReadOnly($pview_only);
-            $wConcerned->extra=3D0;
+            $wConcerned->amount_id=3D"e_other".$i."_amount";
=20
-            $wConcerned->extra2=3D'paid';
+            $wConcerned->paid=3D'paid';
             $array[$i]['concerned']=3D$wConcerned->input();
         }
=20

Modified: phpcompta/trunk/include/class_extension.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_extension.php	2011-11-10 12:58:09 UTC (=
rev 4325)
+++ phpcompta/trunk/include/class_extension.php	2011-11-10 15:49:57 UTC (=
rev 4326)
@@ -47,31 +47,11 @@
     {
         // Verify that the elt we want to add is correct
         if (trim($this->me_code)=3D=3D"") throw new Exception('Le code n=
e peut pas =C3=AAtre vide');
-        if (trim($this->me_name)=3D=3D"") throw new Exception('Le nom ne=
 peut pas =C3=AAtre vide');
+        if (trim($this->me_menu)=3D=3D"") throw new Exception('Le nom ne=
 peut pas =C3=AAtre vide');
         if (trim($this->me_file)=3D=3D"") throw new Exception('Chemin in=
correct');
         if (file_exists('..'.DIRECTORY_SEPARATOR.'include'.DIRECTORY_SEP=
ARATOR.'ext'.DIRECTORY_SEPARATOR.$this->me_file) =3D=3D false)
             throw new Exception ('Extension non trouv=C3=A9e, le chemin =
est-il correct?');
     }
-    /*!\brief transform an array into a valid object
-     *\param $array with the value
-     *\verbatim
-    code =3D> ''
-    desc =3D>''
-    enable=3D>''
-    file=3D>''
-    actif=3D>''
-    ex_id=3D>''
-    \endverbatim
-     *\see ajax_extension.php
-     */
-    function fromArray($p_array)
-    {
-        $this->me_menu=3D$p_array['name'];
-        $this->me_code=3D$p_array['code'];
-        $this->me_desc=3D$p_array['desc'];
-        $this->me_file=3D$p_array['file'];
-		$this->me_type=3D'PL';
-    }
     /*!@brief search a extension, the what is the column (extends_code *=
/
     function search($p_what)
     {
@@ -119,5 +99,61 @@
             exit();
         }
     }
+	function insert_plugin()
+	{
+		try
+		{
+			$this->cn->start();
+			$this->verify();
+			// check if duplicate
+			$this->me_code =3D strtoupper($this->me_code);
+			$count =3D $this->cn->get_value("select count(*) from menu_ref where =
me_code=3D$1", array($this->me_code));
+			if ($count !=3D 0)
+				throw new Exception("Doublon");
+			$this->me_type =3D 'PL';
+			$this->insert();
+			/**
+			 * insert into default profile
+			 */
+			$this->cn->exec_sql("insert into profile_menu(me_code,me_code_dep,p_t=
ype_display,p_id)
+					values ($1,$2,$3,$4)",array($this->me_code,'EXTENSION','S',1));
+			$this->cn->commit();
+		}
+		catch (Exception $exc)
+		{
+			echo alert($exc->getMessage());
+			echo $exc->getTraceAsString();
+		}
+	}
+	function update_plugin()
+	{
+		try
+		{
+			$this->cn->start();
+			$this->verify();
+			$this->me_type =3D 'PL';
+			$this->update();
+			$this->cn->commit();
+		}
+		catch (Exception $exc)
+		{
+			echo alert($exc->getMessage());
+			echo $exc->getTraceAsString();
+		}
+	}
+	function remove_plugin()
+	{
+		try
+		{
+			$this->cn->start();
+			$this->delete();
+			$this->cn->commit();
+		}
+		catch (Exception $exc)
+		{
+			echo alert($exc->getMessage());
+			echo $exc->getTraceAsString();
+		}
+	}
 }
=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	2011-11-10 12:58:09 UTC =
(rev 4325)
+++ phpcompta/trunk/include/class_html_input.php	2011-11-10 15:49:57 UTC =
(rev 4326)
@@ -88,7 +88,7 @@
     }
     function setReadOnly($p_read)
     {
-        $this->readonly=3D$p_read;
+        $this->readOnly=3D$p_read;
     }
     /*!\brief set the extra javascript property for the INPUT field
      *\param $p_name name of the parameter
@@ -589,4 +589,10 @@
 	}
       return $array[$ind];
     }
+	static function title_box($name,$div)
+	{
+		$r=3DHtmlInput::anchor_close($div);
+		$r.=3Dh2info($name);
+		return $r;
+	}
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/class_menu_ref_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_menu_ref_sql.php	2011-11-10 12:58:09 UT=
C (rev 4325)
+++ phpcompta/trunk/include/class_menu_ref_sql.php	2011-11-10 15:49:57 UT=
C (rev 4326)
@@ -5,10 +5,6 @@
  * @brief Manage the table public.menu_ref
  *
  *
-  Example
-  @code
-
-  @endcode
  */
 require_once('class_database.php');
 require_once('ac_common.php');

Added: phpcompta/trunk/include/class_profile_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_profile_menu.php	                      =
  (rev 0)
+++ phpcompta/trunk/include/class_profile_menu.php	2011-11-10 15:49:57 UT=
C (rev 4326)
@@ -0,0 +1,212 @@
+<?php
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+require_once 'class_profile_menu_sql.php';
+
+/**
+ * Manage the menu of a profile
+ *
+ * @author dany
+ */
+class Profile_Menu
+{
+
+	function __construct($p_cn)
+	{
+		$this->cn =3D $p_cn;
+	}
+
+	function sub_menu($resource, $p_id)
+	{
+		if (Database::num_row($resource) !=3D 0)
+		{
+			$gDossier =3D dossier::id();
+			echo '<ul style=3D"list-style-type:none">';
+			for ($e =3D 0; $e < Database::num_row($resource); $e++)
+			{
+				$menu =3D Database::fetch_array($resource, $e);
+				$me_code =3D $menu['me_code'];
+
+				$me_code_dep =3D $menu['me_code_dep'];
+
+				$mp_type =3D $menu['p_type_display'];
+
+				$me_menu =3D $menu['me_menu'];
+				$me_desc =3D $menu['me_description'];
+				$js =3D sprintf(
+						'<a class=3D"line" href=3D"javascript:void(0)" onclick=3D"mod_menu=
(\'%s\',\'%s\')">%s</A>', $gDossier, $menu['pm_id'], $me_code);
+				?>
+				<li>
+					<?=3D $me_menu?>
+					( <?=3D $js?> )
+					<?=3D $me_desc?>
+					<?
+					$ret2 =3D $this->cn->exec_sql("
+									SELECT pm_id,
+										pm.me_code,
+										me_code_dep,
+										p_id,
+										p_order,
+										p_type_display,
+										pm_default,
+										pm_desc,
+										me_menu,
+										me_description
+										FROM profile_menu as pm
+											join profile_menu_type on (p_type_display=3Dpm_type)
+											join menu_ref as mr on (mr.me_code=3Dpm.me_code)
+										where
+										p_id=3D$1 and me_code_dep=3D$2
+										order by p_order asc
+							", array($p_id, $me_code));
+					$this->sub_menu($ret2, $p_id);
+					echo "</li>";
+				} //end loop e
+				echo '</ul>';
+			} // end if
+		}
+
+		/**
+		 * Show a table with all the menu and the type
+		 * @param type $p_id profile.p_id
+		 */
+		function listing_profile($p_id)
+		{
+			$array =3D $this->cn->get_array("
+			SELECT pm_id,
+					pm.me_code,
+					me_code_dep,
+					p_id,
+					p_order,
+					p_type_display,
+					pm_default,
+					pm_desc,
+					me_menu,
+					me_description
+			FROM profile_menu as pm join profile_menu_type on (p_type_display=3Dp=
m_type)
+			join menu_ref as mr on (mr.me_code=3Dpm.me_code)
+			where
+			p_id=3D$1 and p_type_display=3D'M'
+			order by p_order asc
+			", array($p_id));
+			if (count($array) =3D=3D 0)
+			{
+				// if not module show only menu
+				$ret =3D $this->cn->exec_sql("
+										SELECT pm_id,
+										pm.me_code,
+										me_code_dep,
+										p_id,
+										p_order,
+										p_type_display,
+										pm_default,
+										pm_desc,
+										me_menu,
+										me_description
+										FROM profile_menu as pm
+											join profile_menu_type on (p_type_display=3Dpm_type)
+											join menu_ref as mr on (mr.me_code=3Dpm.me_code)
+					where
+					p_id=3D$1 and p_type_display=3D'E'
+					order by p_order asc
+							", array($p_id));
+				echo '<ul style=3D"list-style-type:none">';
+
+				$this->sub_menu($ret, $p_id);
+				// $this->listing_profile($p_id,$ret, $array[$i]['me_code']);
+
+				echo "</li>";
+				echo '</ul>';
+			}
+			else
+			{
+				$this->cn->prepare("menu", "
+				SELECT pm_id,
+										pm.me_code,
+										me_code_dep,
+										p_id,
+										p_order,
+										p_type_display,
+										pm_default,
+										pm_desc,
+										me_menu,
+										me_description
+										FROM profile_menu as pm
+											join profile_menu_type on (p_type_display=3Dpm_type)
+											join menu_ref as mr on (mr.me_code=3Dpm.me_code)
+					where
+					p_id=3D$1 and me_code_dep=3D$2 and p_type_display in ('E','S')
+					order by p_order asc
+							");
+				echo '<ul style=3D"list-style-type:none">';
+				// Menu by module
+				$gDossier =3D Dossier::id();
+				for ($i =3D 0; $i < count($array); $i++)
+				{
+					$js =3D sprintf('<a class=3D"line" style=3D"display:inline;text-dec=
oration:underline"
+						href=3D"javascript:void(0)" onclick=3D"mod_menu(\'%s\',\'%s\')">%s=
</A>', $gDossier, $array[$i]['pm_id'], $array[$i]['me_code']);
+					echo "<li>" . $array[$i]['me_menu'] . " (" . $js . ")" . $array[$i]=
['me_description'];
+
+					$ret =3D $this->cn->execute("menu", array($p_id, $array[$i]['me_cod=
e']));
+					$this->sub_menu($ret, $p_id);
+
+					echo "</li>";
+				}// end loop i
+				echo '</ul>';
+				//*******************************************
+				// show also menu without a module
+				//*******************************************
+				$ret =3D $this->cn->exec_sql("
+										SELECT pm_id,
+										pm.me_code,
+										me_code_dep,
+										p_id,
+										p_order,
+										p_type_display,
+										pm_default,
+										pm_desc,
+										me_menu,
+										me_description
+										FROM profile_menu as pm
+											join profile_menu_type on (p_type_display=3Dpm_type)
+											join menu_ref as mr on (mr.me_code=3Dpm.me_code)
+					where
+					p_id=3D$1 and p_type_display=3D'E' and me_code_dep is null
+					order by p_order asc
+							", array($p_id));
+
+				$this->sub_menu($ret, $p_id);
+			}
+		}
+
+		function printing($p_id)
+		{
+			$ret =3D $this->cn->exec_sql("
+				SELECT pm_id,
+										pm.me_code,
+										me_code_dep,
+										p_id,
+										p_order,
+										p_type_display,
+										pm_default,
+										pm_desc,
+										me_menu,
+										me_description
+										FROM profile_menu as pm
+											join profile_menu_type on (p_type_display=3Dpm_type)
+											join menu_ref as mr on (mr.me_code=3Dpm.me_code)
+					where
+					p_id=3D$1 and me_type=3D'PR'
+					order by p_order asc
+							", array($p_id));
+			// Menu by module
+			$gDossier =3D Dossier::id();
+			$this->sub_menu($ret, $p_id);
+		}
+
+	}
+
+	//end class
+	?>
\ No newline at end of file

Added: phpcompta/trunk/include/class_profile_menu_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_profile_menu_sql.php	                  =
      (rev 0)
+++ phpcompta/trunk/include/class_profile_menu_sql.php	2011-11-10 15:49:5=
7 UTC (rev 4326)
@@ -0,0 +1,268 @@
+<?php
+/**
+ *@file
+ *@brief Manage the table public.profile_menu
+ *
+ *
+Example
+@code
+
+@endcode
+ */
+require_once('class_database.php');
+require_once('ac_common.php');
+
+
+/**
+ *@brief Manage the table public.profile_menu
+*/
+class Profile_Menu_sql =20
+{
+  /* example private $variable=3Darray("easy_name"=3D>column_name,"email=
"=3D>"column_name_email","val3"=3D>0); */
+ =20
+  protected $variable=3Darray("pm_id"=3D>"pm_id","me_code"=3D>"me_code"
+,"me_code_dep"=3D>"me_code_dep"
+,"p_id"=3D>"p_id"
+,"p_order"=3D>"p_order"
+,"p_type_display"=3D>"p_type_display"
+,"pm_default"=3D>"pm_default"
+);
+  function __construct ( & $p_cn,$p_id=3D-1) {
+        $this->cn=3D$p_cn;
+        $this->pm_id=3D$p_id;
+       =20
+        if ( $p_id =3D=3D -1 ) {
+        /* Initialize an empty object */
+            foreach ($this->variable as $key=3D>$value) $this->$value=3D=
null;
+            $this->pm_id=3D$p_id;
+        } else {
+         /* load it */
+
+         $this->load();
+      }
+  }
+  public function get_parameter($p_string) {
+    if ( array_key_exists($p_string,$this->variable) ) {
+      $idx=3D$this->variable[$p_string];
+      return $this->$idx;
+    }
+    else=20
+      throw new Exception (__FILE__.":".__LINE__.$p_string.'Erreur attri=
but inexistant');
+  }
+  public function set_parameter($p_string,$p_value) {
+    if ( array_key_exists($p_string,$this->variable) ) {
+      $idx=3D$this->variable[$p_string];
+      $this->$idx=3D$p_value;
+    }
+    else=20
+      throw new Exception (__FILE__.":".__LINE__.$p_string.'Erreur attri=
but inexistant');
+  }
+  public function get_info() {    return var_export($this,true);  }
+  public function verify() {
+    // Verify that the elt we want to add is correct
+    /* verify only the datatype */
+     if ( trim($this->me_code) =3D=3D '') $this->me_code=3Dnull;
+ if ( trim($this->me_code_dep) =3D=3D '') $this->me_code_dep=3Dnull;
+ if ( trim($this->p_id) =3D=3D '') $this->p_id=3Dnull;
+if ( $this->p_id!=3D=3D null && settype($this->p_id,'float') =3D=3D fals=
e )
+             throw new Exception('DATATYPE p_id $this->p_id non numeriqu=
e');
+ if ( trim($this->p_order) =3D=3D '') $this->p_order=3Dnull;
+if ( $this->p_order!=3D=3D null && settype($this->p_order,'float') =3D=3D=
 false )
+             throw new Exception('DATATYPE p_order $this->p_order non nu=
merique');
+ if ( trim($this->p_type_display) =3D=3D '') $this->p_type_display=3Dnul=
l;
+ if ( trim($this->pm_default) =3D=3D '') $this->pm_default=3Dnull;
+if ( $this->pm_default!=3D=3D null && settype($this->pm_default,'float')=
 =3D=3D false )
+             throw new Exception('DATATYPE pm_default $this->pm_default =
non numerique');
+
+   =20
+  }
+  public function save() {
+  /* please adapt */
+    if (  $this->pm_id =3D=3D -1 )=20
+      $this->insert();
+    else
+      $this->update();
+  }
+  /**
+   *@brief retrieve array of object thanks a condition
+   *@param $cond condition (where clause) (optional by default all the r=
ows are fetched)
+   * you can use this parameter for the order or subselect
+   *@param $p_array array for the SQL stmt
+   *@see Database::exec_sql get_object  Database::num_row
+   *@return the return value of exec_sql
+   */
+   public function seek($cond=3D'',$p_array=3Dnull)=20
+   {
+     $sql=3D"select * from public.profile_menu  $cond";
+     $aobj=3Darray();
+     $ret=3D $this->cn->exec_sql($sql,$p_array);
+     return $ret;
+   }
+   /**
+    *get_seek return the next object, the return of the query must have =
all the column
+    * of the object
+    *@param $p_ret is the return value of an exec_sql
+    *@param $idx is the index
+    *@see seek
+    *@return object=20
+    */
+   public function get_object($p_ret,$idx)
+    {
+     // map each row in a object
+     $oobj=3Dnew Profile_Menu_sql ($this->cn);
+     $array=3DDatabase::fetch_array($p_ret,$idx);
+     foreach ($array as $idx=3D>$value) { $oobj->$idx=3D$value; }
+     return $oobj;
+   }
+  public function insert() {
+    if ( $this->verify() !=3D 0 ) return;
+      if( $this->pm_id=3D=3D-1 ){
+    /*  please adapt */
+    $sql=3D"insert into public.profile_menu(me_code
+,me_code_dep
+,p_id
+,p_order
+,p_type_display
+,pm_default
+) values ($1
+,$2
+,$3
+,$4
+,$5
+,$6
+) returning pm_id";
+   =20
+    $this->pm_id=3D$this->cn->get_value(
+		 $sql,
+		 array( $this->me_code
+,$this->me_code_dep
+,$this->p_id
+,$this->p_order
+,$this->p_type_display
+,$this->pm_default
+)
+		 );
+          } else {
+              $sql=3D"insert into public.profile_menu(me_code
+,me_code_dep
+,p_id
+,p_order
+,p_type_display
+,pm_default
+,pm_id) values ($1
+,$2
+,$3
+,$4
+,$5
+,$6
+,$7
+) returning pm_id";
+   =20
+    $this->pm_id=3D$this->cn->get_value(
+		 $sql,
+		 array( $this->me_code
+,$this->me_code_dep
+,$this->p_id
+,$this->p_order
+,$this->p_type_display
+,$this->pm_default
+,$this->pm_id)
+		 );
+
+          }
+  =20
+  }
+
+  public function update() {
+    if ( $this->verify() !=3D 0 ) return;
+    /*   please adapt */
+    $sql=3D" update public.profile_menu set me_code =3D $1
+,me_code_dep =3D $2
+,p_id =3D $3
+,p_order =3D $4
+,p_type_display =3D $5
+,pm_default =3D $6
+ where pm_id=3D $7";
+    $res=3D$this->cn->exec_sql(
+		 $sql,
+		 array($this->me_code
+,$this->me_code_dep
+,$this->p_id
+,$this->p_order
+,$this->p_type_display
+,$this->pm_default
+,$this->pm_id)
+		 );
+		=20
+  }
+/**
+ *@brief load a object
+ *@return 0 on success -1 the object is not found
+ */
+  public function load() {
+
+   $sql=3D"select me_code
+,me_code_dep
+,p_id
+,p_order
+,p_type_display
+,pm_default
+ from public.profile_menu where pm_id=3D$1";=20
+    /* please adapt */
+    $res=3D$this->cn->get_array(
+		 $sql,
+		 array($this->pm_id)
+		 );
+		=20
+    if ( count($res) =3D=3D 0 ) {
+          /* Initialize an empty object */
+          foreach ($this->variable as $key=3D>$value) $this->$key=3D'';
+
+          return -1;
+          }
+    foreach ($res[0] as $idx=3D>$value) { $this->$idx=3D$value; }
+    return 0;
+  }
+
+  public function delete() {
+    $sql=3D"delete from public.profile_menu where pm_id=3D$1";=20
+    $res=3D$this->cn->exec_sql($sql,array($this->pm_id));
+  }
+  /**
+   * Unit test for the class
+   */=09
+  static function test_me() {
+      $cn=3Dnew Database(25);
+$cn->start();
+    echo h2info('Test object vide');
+    $obj=3Dnew Profile_Menu_sql($cn);
+    var_dump($obj);
+
+    echo h2info('Test object NON vide');
+    $obj->set_parameter('j_id',3);
+    $obj->load();
+    var_dump($obj);
+
+    echo h2info('Update');
+    $obj->set_parameter('j_qcode','NOUVEAU CODE');
+    $obj->save();
+    $obj->load();
+    var_dump($obj);
+
+    echo h2info('Insert');
+    $obj->set_parameter('j_id',0);
+    $obj->save();
+    $obj->load();
+    var_dump($obj);
+
+    echo h2info('Delete');
+    $obj->delete();
+    echo (($obj->load()=3D=3D0)?'Trouve':'non trouve');
+    var_dump($obj);
+$cn->rollback();
+
+  }
+ =20
+}
+// Profile_Menu_sql::test_me();
+?>

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2011-11-10 12:58:09 UTC (rev 4=
325)
+++ phpcompta/trunk/include/class_user.php	2011-11-10 15:49:57 UTC (rev 4=
326)
@@ -680,7 +680,7 @@
 			}
 			else
 			{
-				echo '<div class=3D"u_redcontent">';
+				echo '<div class=3D"redcontent">';
 				echo '<h2 class=3D"error"> Cette action ne vous est pas autoris=C3=A9=
e Contactez votre responsable</h2>';
 				echo '</div>';
 			}
@@ -726,7 +726,7 @@
 			}
 			else
 			{
-				echo '<div class=3D"u_redcontent">';
+				echo '<div class=3D"redcontent">';
 				echo '<h2 class=3D"error"> Cette action ne vous est pas autoris=C3=A9=
e Contactez votre responsable</h2>';
 				echo '</div>';
 			}
@@ -964,6 +964,16 @@
 		}
 		return $array;
 	}
+	function audit()
+	{
+		global $audit;
+		$cn =3D new Database();
+		$sql =3D "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac=
_state) values ($1,$2,$3,$4,$5)";
+		if ($audit)
+		{
+				$cn->exec_sql($sql, array($_SESSION['g_user'], $_SERVER["REMOTE_ADDR=
"], $_REQUEST['ac'], $_SERVER['REQUEST_URI'], 'AUDIT'));
+		}
+	}
=20
 }
=20

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	2011-11-10 12:58:09 UTC (rev =
4325)
+++ phpcompta/trunk/include/contact.inc.php	2011-11-10 15:49:57 UTC (rev =
4326)
@@ -92,7 +92,7 @@
 {
     $retour_action=3DHtmlInput::button_anchor('Retour', "commercial.php?=
p_action=3Dcontact&$str_dossier");
=20
-    echo '<div class=3D"u_redcontent">';
+    echo '<div class=3D"redcontent">';
=20
     echo $retour_action;
     $c=3Dnew contact($cn);
@@ -191,7 +191,7 @@
         $contact->company=3D$qcode;
     }
     echo $retour;
-    echo '<div class=3D"u_redcontent">';
+    echo '<div class=3D"redcontent">';
     echo $contact->Summary($search);
     echo '</div>';
     echo $retour;
@@ -203,7 +203,7 @@
 if ( $sub_action =3D=3D 'detail' )
 {
     $f_id=3D$_REQUEST['f_id'];
-    echo '<div class=3D"u_redcontent">';
+    echo '<div class=3D"redcontent">';
     $contact=3Dnew contact($cn,$f_id);
     echo $retour;
     echo '<form action=3D"'.$_SERVER['REQUEST_URI'].'" method=3D"post">'=
;

Added: phpcompta/trunk/include/detail_menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/detail_menu.inc.php	                        (=
rev 0)
+++ phpcompta/trunk/include/detail_menu.inc.php	2011-11-10 15:49:57 UTC (=
rev 4326)
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief
+ *
+ */
+// retrieve data
+$profile=3D$cn->get_value("select p_id from profile_menu where pm_id=3D$=
1",array($pm_id));
+$a_value=3D$cn->make_array("select me_code,me_code||' '||me_menu||' '||c=
oalesce(me_description,'') from menu_ref",0);
+$a_value_null=3D$cn->make_array("select me_code,me_code||' '||me_menu||'=
 '||coalesce(me_description,'') from menu_ref
+	where
+	me_code in (select me_code from profile_menu where p_id=3D$profile and =
p_type_display<>'P' and pm_id <> $pm_id)
+		UNION ALL
+		select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')=
 from menu_ref
+	where
+		me_code=3D'EXTENSION'",1);
+$a_type=3D$cn->make_array("select pm_type,pm_desc from profile_menu_type=
",1);
+
+$array=3D$cn->get_array("select p_id,pm_id,me_code,me_code_dep,p_order,p=
_type_display,pm_default
+	from profile_menu
+	where pm_id=3D$1",array($pm_id));
+if ( empty($array)) {
+		alert("Code invalide");
+		exit();
+}
+
+
+echo HtmlInput::title_box($array[0]['me_code'],'divdm'.$pm_id);
+
+$me_code=3Dnew ISelect('me_code');
+$me_code->value=3D$a_value;
+$me_code->selected=3D$array[0]['me_code'];
+
+$me_code_dep=3Dnew ISelect('me_code_dep');
+$me_code_dep->value=3D$a_value_null;
+$me_code_dep->selected=3D$array[0]['me_code_dep'];
+
+$p_order=3Dnew Inum('p_order',$array[0]['p_order']);
+$pm_default=3Dnew ICheckBox('pm_default','1');
+$pm_default->set_check($array[0]['pm_default']);
+
+?>
+<form method=3D"POST">
+	<?=3DHtmlInput::hidden('pm_id',$array[0]['pm_id'])?>
+	<?=3DHtmlInput::hidden('p_id',$array[0]['p_id'])?>
+<table>
+<tr>
+	<td>Code</td>
+	<td><?=3D$me_code->input()?></td>
+</tr>
+<?
+if ($array[0]['p_type_display']!=3D'P'):
+?>
+<tr>
+	<td>D=C3=A9pendant de </td>
+	<td><?=3D$me_code_dep->input()?></td>
+</tr>
+
+<tr>
+	<td>Ordre d'apparition</td>
+	<td><?=3D$p_order->input()?></td>
+</tr>
+<tr>
+	<td>Menu par d=C3=A9faut</td>
+	<td><?=3D$pm_default->input()?></td>
+</tr>
+<? endif;?>
+</table>
+	<p>
+Cochez cette case si vous souhaitez effacer ce menu ainsi que ceux qui e=
n d=C3=A9pendent
+<?
+$delete=3Dnew ICheckBox('delete',"1");
+echo $delete->input();
+?>
+</p>
+<?
+echo HtmlInput::submit('mod',"Valider");
+echo '</form>';
+
+
+?>

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	2011-11-10 12:58:09 UTC (rev 43=
25)
+++ phpcompta/trunk/include/fiche.inc.php	2011-11-10 15:49:57 UTC (rev 43=
26)
@@ -156,7 +156,7 @@
 {
     $g_user->can_request(FIC);
=20
-    $r=3D '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+    $r=3D '<DIV class=3D"redcontent" style=3D"width:auto">';
     if ( $write =3D=3D0)
         $r.=3D "<h2 class=3D\"error\"> Pas d'acc=C3=A8s </h2>";
     else
@@ -180,7 +180,7 @@
     $g_user->can_request(FICCAT);
     $fiche_def=3Dnew Fiche_Def($cn,$_REQUEST['fd_id']);
     $fiche_def->save_order($_POST);
-    $r=3D '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+    $r=3D '<DIV class=3D"redcontent" style=3D"width:auto">';
     if ( $write =3D=3D0)
         $r.=3D "<h2 class=3D\"error\"> Pas d'acc=C3=A8s </h2>";
     else
@@ -198,7 +198,7 @@
 if ( isset ($_POST['remove_line'])   )
 {
     $g_user->can_request(FICCAT);
-    $r=3D '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+    $r=3D '<DIV class=3D"redcontent" style=3D"width:auto">';
     if ( $write =3D=3D0)
         $r.=3D "<h2 class=3D\"error\"> Pas d'acc=C3=A8s </h2>";
     else
@@ -221,7 +221,7 @@
 if ( isset ($_POST["change_name"] )   )
 {
     $g_user->can_request(FICCAT);
-    $r=3D '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+    $r=3D '<DIV class=3D"redcontent" style=3D"width:auto">';
     if ( $write =3D=3D0)
         $r.=3D "<h2 class=3D\"error\"> "._("Pas d'acc=C3=A8s")." </h2>";
     else
@@ -253,7 +253,7 @@
     {
         $g_user->can_request(FICADD);
=20
-        echo '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+        echo '<DIV class=3D"redcontent" style=3D"width:auto">';
         $fiche_def=3Dnew Fiche_Def($cn,$_GET['fiche']);
         $fiche_def->myList();
=20
@@ -265,7 +265,7 @@
     // Display the detail of a card
     if ($action=3D=3D "detail" )
     {
-        echo '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+        echo '<DIV class=3D"redcontent" style=3D"width:auto">';
         $t=3Dfalse;
         if ( $g_user->check_action(FICADD)=3D=3D0)
         {
@@ -325,7 +325,7 @@
     if ($action =3D=3D "add_modele" )
     {
         $g_user->can_request(FICCAT);
-        echo '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+        echo '<DIV class=3D"redcontent" style=3D"width:auto">';
         echo '<form method=3D"post">';
 	echo HtmlInput::hidden('ac',$_REQUEST['ac']);
         $oFiche_Def=3Dnew Fiche_Def($cn);
@@ -343,7 +343,7 @@
     if ($action =3D=3D "modifier" )
     {
         $g_user->can_request(FICCAT);
-        echo '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+        echo '<DIV class=3D"redcontent" style=3D"width:auto">';
         $fiche_def=3Dnew Fiche_Def($cn,$_GET['fiche']);
=20
         echo ShowFicheDefInput($fiche_def);
@@ -354,7 +354,7 @@
     // Search a card
     if ( $action =3D=3D "search" )
     {
-        echo '<DIV class=3D"u_redcontent" style=3D"float:top;width:auto;=
">';
+        echo '<DIV class=3D"redcontent" style=3D"float:top;width:auto;">=
';
         ShowRecherche();
         $sql=3D"select distinct f_id,fd_id from fiche join fiche_detail =
using (f_id)
                  where
@@ -377,7 +377,7 @@
         }
         else
         {
-            echo '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+            echo '<DIV class=3D"redcontent" style=3D"width:auto">';
             echo "Aucun r=C3=A9sultat trouv=C3=A9";
=20
         }
@@ -392,7 +392,7 @@
 {
     $g_user->can_request(FICADD);
=20
-    echo '<DIV class=3D"u_redcontent" style=3D"width:auto">';
+    echo '<DIV class=3D"redcontent" style=3D"width:auto">';
     if ( $write =3D=3D0)
         echo "<h2 class=3D\"error\"> Pas d'acc=C3=A8s </h2>";
     else
@@ -423,7 +423,7 @@
 {
     $g_user->can_request(FIC);
     ShowRecherche();
-    echo '<DIV class=3D"u_redcontent">';
+    echo '<DIV class=3D"redcontent">';
     if ( $write =3D=3D0)
         echo "<h2 class=3D\"error\"> Pas d'acc=C3=A8s </h2>";
     else
@@ -444,13 +444,13 @@
     $g_user->can_request(FICADD);
     if ( $write =3D=3D0)
     {
-        echo '<DIV class=3D"u_redcontent">';
+        echo '<DIV class=3D"redcontent">';
         echo "<h2 class=3D\"error\"> Pas d'acc=C3=A8s </h2>";
     }
     else
     {
         ShowRecherche();
-        echo '<DIV class=3D"u_redcontent">';
+        echo '<DIV class=3D"redcontent">';
         $fiche=3Dnew Fiche($cn);
         $fiche->Save($_REQUEST['fiche']);
         $fiche_def=3Dnew Fiche_Def($cn,$_GET['fiche']);
@@ -466,7 +466,7 @@
 if ( isset ($_POST["update_fiche"])  )
 {
     $g_user->can_request(FIC);
-    echo '<DIV class=3D"u_redcontent">';
+    echo '<DIV class=3D"redcontent">';
     if ( $write =3D=3D0)
         echo "<h2 class=3D\"error\"> Pas d'acc=C3=A8s </h2>";
     else
@@ -489,7 +489,7 @@
 // Move a card to a new category
 if ( isset($_POST['move']))
 {
-    echo '<DIV class=3D"u_redcontent">';
+    echo '<DIV class=3D"redcontent">';
     $fiche=3Dnew Fiche($cn,$_POST['f_id']);
     $fiche->move_to($_POST['move_to']);
     $fiche_def=3Dnew Fiche_Def($cn,$_GET['fiche']);

Modified: phpcompta/trunk/include/menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/menu.inc.php	2011-11-10 12:58:09 UTC (rev 432=
5)
+++ phpcompta/trunk/include/menu.inc.php	2011-11-10 15:49:57 UTC (rev 432=
6)
@@ -29,15 +29,45 @@
  */
 require_once 'class_menu_ref_sql.php';
 require_once 'class_sort_table.php';
+require_once 'class_extension.php';
+
+
 echo '<div class=3D"content">';
 /**
  * if post save then we save a new one
  */
-
+if ( isset($_POST['save_plugin']))
+{
+	extract($_POST);
+	$plugin=3Dnew Extension($cn);
+	$plugin->me_code=3D$me_code;
+	$plugin->me_menu=3D$me_menu;
+	$plugin->me_file=3D$me_file;
+	$plugin->me_description=3D$me_description;
+	$plugin->me_parameter=3D'plugin_code=3D'.$me_code;
+	$plugin->insert_plugin();
+}
 /**
  * if post update then we update
  */
-
+if (isset($_POST['mod_plugin']))
+{
+	extract ($_POST);
+	$plugin=3Dnew Extension($cn);
+	$plugin->me_code=3D$me_code;
+	$plugin->me_menu=3D$me_menu;
+	$plugin->me_file=3D$me_file;
+	$plugin->me_description=3D$me_description;
+	$plugin->me_parameter=3D'plugin_code=3D'.$me_code;
+	if ( !isset ($delete_pl))
+	{
+		$plugin->update_plugin();
+	}
+	else
+	{
+		$plugin->remove_plugin();
+	}
+}
 /**
  * if delete then delete
  */
@@ -70,7 +100,11 @@
 	<li> PR pour les impressions </li>
 	<li> PL pour les plugins</li>
 	<li> SP pour des valeurs sp=C3=A9ciales</li>
+	</ul>
+
 	</p>';
+$gDossier=3DDossier::id();
+echo HtmlInput::button("Add_plugin", "Ajout d'un plugin", "onclick=3Dadd=
_plugin($gDossier)");
 echo '<table class=3D"result">';
 echo '<tr>';
 echo '<th>'.$table->get_header(0).'</th>';
@@ -85,8 +119,17 @@
 for ($i=3D0;$i<Database::num_row($ret);$i++)
 {
 	$row=3D$menu->get_object($ret, $i);
+	$js=3D$row->me_code;
+	switch ($row->me_type)
+	{
+		case 'PL':
+			$js=3Dsprintf('<A class=3D"line" href=3D"javascript:void(0)"  onclick=
=3D"mod_plugin(\'%s\',\'%s\')">%s</A>',
+					$gDossier,$row->me_code,$row->me_code);
+			break;
+
+	}
 	echo '<tr>';
-	echo td($row->me_code);
+	echo td($js);
 	echo td($row->me_menu);
 	echo td($row->me_description);
 	echo td($row->me_url);

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-10 12:58:09=
 UTC (rev 4325)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-10 15:49:57=
 UTC (rev 4326)
@@ -91,14 +91,16 @@
=20
 echo HtmlInput::submit('summary', _('Sauvez'));
=20
+echo '<div style=3D"position:absolute;right:20px">';
 echo '<table class=3D"info_op">'.
  '<tr>'.td(_('D=C3=A9bit')) . '<td id=3D"totalDeb"></td>' .
  td(_('Cr=C3=A9dit')) . ' <td id=3D"totalCred"></td>' .
  td(_('Difference')) . ' <td id=3D"totalDiff"></td>';
 echo '</table>';
+echo '</div>';
=20
 $iconcerned=3Dnew IConcerned('jrn_concerned');
-$iconcerned->extra=3D0;
+$iconcerned->amount_id=3D"totalDeb";
 echo "Op=C3=A9ration rapproch=C3=A9e : ".$iconcerned->input();
 echo '</form>';
=20

Modified: phpcompta/trunk/include/param_pcmn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_pcmn.inc.php	2011-11-10 12:58:09 UTC (r=
ev 4325)
+++ phpcompta/trunk/include/param_pcmn.inc.php	2011-11-10 15:49:57 UTC (r=
ev 4326)
@@ -89,7 +89,7 @@
 echo '<div class=3D"lmenu">';
 menu_acc_plan($_SESSION['g_start']);
 echo '</div>';
-echo '<DIV CLASS=3D"u_redcontent">';
+echo '<DIV CLASS=3D"redcontent">';
 /* Analyse ce qui est demand=C3=A9 */
 /* Effacement d'une ligne */
 if (isset ($_GET['action']))

Modified: phpcompta/trunk/include/profile.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/profile.inc.php	2011-11-10 12:58:09 UTC (rev =
4325)
+++ phpcompta/trunk/include/profile.inc.php	2011-11-10 15:49:57 UTC (rev =
4326)
@@ -18,44 +18,264 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
  */
 /* $Revision$ */
-
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 require_once 'class_profile_sql.php';
 global $cn;
-echo '<div class=3D"content">';
-$table=3Dnew Sort_Table();
-$url=3D$_SERVER['REQUEST_URI'];
=20
-$table->add('Nom',$url,"order by p_name asc","order by p_name desc","na"=
,"nd");
-$table->add('Description',$url,"order by p_desc asc","order by p_desc de=
sc","da","dd");
-$table->add('Calculatrice visible',$url,"order by with_calc asc","order =
by with_calc desc","ca","cd");
-$table->add('Form Direct visible',$url,"order by with_direct_form asc","=
order by with_direct_form desc","fa","fd");
+//**********************************************
+// Save_name
+// *********************************************
=20
-$ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'na';
+if ( isset($_POST['save_name']))
+{
=20
-$order=3D$table->get_sql_order($ord);
+	extract ($_POST);
+	try{
+			if (strlen(trim($p_name))=3D=3D0) throw new Exception("Nom ne peut =C3=
=AAtre vide");
+			if (isNumber($p_id)=3D=3D0) throw new Exception("profile Invalide");
+			$wc=3D(isset($with_calc))?1:0;
+			$wd=3D(isset($with_direct_form))?1:0;
+			$p_desc=3D(strlen(trim($p_desc))=3D=3D0)?null:trim($p_desc);
+		if ($p_id !=3D -1)
+		{
+			$cn->exec_sql("update profile set p_name=3D$1,p_desc=3D$2,
+					with_calc=3D$3, with_direct_form=3D$4 where p_id=3D$5",array($p_nam=
e,
+						$p_desc,$wc,$wd,$p_id));
+		}
+		else
+		{
+			$p_id=3D$cn->get_value ("insert into profile (p_name,
+				p_desc,with_calc,with_direct_form) values
+				($1,$2,$3,$4) returning p_id",array(
+					$p_name,$p_desc,$wc,$wd
+				));
+		}
+	}
+	catch (Exception $e)
+	{
+		alert($e->getMessage());
+	}
=20
-$menu=3Dnew Profile_sql($cn);
-$ret=3D$menu->seek($order);
+}
+//************************************
+// Clone
+//************************************
+if ( isset($_POST['clone']))
+{
+	extract ($_POST);
+	try
+	{
+		$cn->start();
+		$new_id=3D$cn->get_value("insert into profile(p_name,p_desc,with_calc,
+			with_direct_form)
+			select 'copie de '||p_name,p_desc,with_calc,
+			with_direct_form from profile where p_id=3D$1 returning p_id",array($=
p_id));
+		$cn->exec_sql("
+				insert into profile_menu (p_id,me_code,me_code_dep,p_order,p_type_di=
splay,pm_default)
+				select $1,me_code,me_code_dep,p_order,p_type_display,pm_default from=
 profile_menu
+				where p_id=3D$2
+			",array($new_id,$p_id));
+		$cn->commit();
+
+	}
+	catch (Exception $exc)
+	{
+		echo $exc->getTraceAsString();
+		$cn->rollback();
+	}
+
+}
+//************************************
+// Delete
+//************************************
+if ( isset($_POST['delete_profil']))
+{
+	extract ($_POST);
+	try
+	{
+		$cn->start();
+		if ( $p_id=3D=3D1 ) { throw new Exception('On ne peut effacer le profi=
l par d=C3=A9faut');}
+		$new_id=3D$cn->get_value("delete from profile
+			where p_id=3D$1 ",array($p_id));
+		$cn->commit();
+	}
+	catch (Exception $exc)
+	{
+		echo alert($exc->getMessage());;
+		$cn->rollback();
+	}
+
+}
+//************************************
+// Modify the menu or delete it
+//************************************
+if (isset($_POST['mod']))
+{
+	extract($_POST);
+	if (isset($delete))
+	{
+		try
+		{
+			$cn->start();
+			$me_code_dep=3D$cn->get_value("select me_code from profile_menu where
+				pm_id=3D$1",array($pm_id));
+			$cn->exec_sql("delete from profile_menu where pm_id in
+				(select pm_id from profile_menu where me_code_dep=3D$1 and p_id=3D$2=
)",
+					array($me_code_dep,$p_id));
+			$cn->exec_sql("delete from profile_menu where pm_id=3D$1",
+					array($pm_id));
+			$cn->commit();
+		}
+		catch (Exception $exc)
+		{
+			echo $exc->getMessage();
+			$cn->rollback();
+		}
+		}
+	else
+		try
+		{
+		/**
+			 * Printing cannot be a menu and do not depend of anything
+			 */
+			$menu_type =3D $cn->get_value("select me_type from menu_ref
+			where me_code=3D$1", array($me_code));
+
+			if ($menu_type =3D=3D 'PR')
+			{
+				$p_type =3D 'P';
+				$me_code_dep =3D -1;
+			}
+
+			$cn->start();
+			$me_code_dep =3D ($me_code_dep =3D=3D -1) ? null : $me_code_dep;
+			$pm_default =3D (isset($pm_default)) ? 1 : 0;
+			$p_order =3D (strlen(trim($p_order)) =3D=3D 0) ? "0" : $p_order;
+			if ($pm_default =3D=3D 1)
+			{
+				$cn->exec_sql("update profile_menu set pm_default=3D0
+				where p_id=3D(select p_id from profile_menu
+								where
+								pm_id=3D$1)", array($pm_id));
+			}
+			$cn->exec_sql("update profile_menu set me_code=3D$1,me_code_dep=3D$2,=
p_order=3D$3,pm_default=3D$4
+			where pm_id=3D$5", array($me_code, $me_code_dep, $p_order, $pm_defaul=
t, $pm_id));
+			$cn->commit();
+		}
+		catch (Exception $e)
+		{
+			$cn->rollback();
+			alert($e->getMessage());
+		}
+}
+
+//****************************************************
+// Add a menu, module, submenu,plugin...
+//****************************************************
+if ( isset ($_POST['add_menu']))
+{
+	extract ($_POST);
+	try
+	{
+		$cn->start();
+
+		/**
+		 * Printing cannot be a menu and do not depend of anything
+		 */
+		$menu_type=3D$cn->get_value("select me_type from menu_ref
+			where me_code=3D$1",array($me_code));
+
+		if ($menu_type=3D=3D'PR')
+		{
+			$p_type=3D'P';
+			$me_code_dep=3D-1;
+		}
+
+		// Module never depends of anything
+		if ($p_type=3D=3D'M')
+		{
+			$me_code_dep=3D-1;
+		}
+		/**
+		 * Check for infinite loop
+		 */
+		$inf=3D$cn->get_value("select count(*) from profile_menu
+			where p_id=3D$1 and me_code_dep=3D$2 and me_code=3D$3",
+				array($p_id,$me_code,$me_code_dep));
+		if ( $inf > 0 )			throw new Exception("Boucle infinie");
+			/**
+		 * if me_code_dep =3D=3D -1, it means it is null
+		 */
+		$me_code_dep=3D($me_code_dep=3D=3D-1)?null:$me_code_dep;
+
+		$pm_default=3D(isset($pm_default))?1:0;
+		$cn->exec_sql("
+				insert into profile_menu (me_code,me_code_dep,p_id,p_order,pm_defaul=
t,p_type_display)
+				values ($1,$2,$3,$4,$5,$6)
+				",array($me_code,$me_code_dep,$p_id,$p_order,$pm_default,$p_type));
+
+		$cn->commit();
+
+	}
+	catch (Exception $exc)
+	{
+		echo $exc->getTraceAsString();
+		alert($exc->getMessage());
+	}
+
+
+}
+
+echo '<div id=3D"list_profile" class=3D"content">';
+$table =3D new Sort_Table();
+$url =3D $_SERVER['REQUEST_URI'];
+
+$table->add('Nom', $url, "order by p_name asc", "order by p_name desc", =
"na", "nd");
+$table->add('Description', $url, "order by p_desc asc", "order by p_desc=
 desc", "da", "dd");
+$table->add('Calculatrice visible', $url, "order by with_calc asc", "ord=
er by with_calc desc", "ca", "cd");
+$table->add('Form Direct visible', $url, "order by with_direct_form asc"=
, "order by with_direct_form desc", "fa", "fd");
+
+$ord =3D (isset($_REQUEST['ord'])) ? $_REQUEST['ord'] : 'na';
+
+$order =3D $table->get_sql_order($ord);
+
+$menu =3D new Profile_sql($cn);
+$ret =3D $menu->seek($order);
 echo '<table class=3D"result">';
 echo '<tr>';
-echo '<th>'.$table->get_header(0).'</th>';
-echo '<th>'.$table->get_header(1).'</th>';
-echo '<th>'.$table->get_header(2).'</th>';
-echo '<th>'.$table->get_header(3).'</th>';
+echo '<th>' . $table->get_header(0) . '</th>';
+echo '<th>' . $table->get_header(1) . '</th>';
+echo '<th>' . $table->get_header(2) . '</th>';
+echo '<th>' . $table->get_header(3) . '</th>';
 echo '</tr>';
+$gDossier =3D Dossier::id();
+for ($i =3D 0; $i < Database::num_row($ret); $i++)
+{
+	$row =3D $menu->get_object($ret, $i);
=20
-for ($i=3D0;$i<Database::num_row($ret);$i++)
-{
-	$row=3D$menu->get_object($ret, $i);
+	$js =3D sprintf('<a href=3D"javascript:void(0)" style=3D"text-decoratio=
n:underline" onclick=3D"get_profile_detail(\'%s\',\'%s\')">', $gDossier, =
$row->p_id);
 	echo '<tr>';
-	echo td($row->p_name);
+	echo "<td>" . $js . $row->p_name . '</a>' . '</td>';
 	echo td($row->p_desc);
 	echo td($row->with_calc);
 	echo td($row->with_direct_form);
 	echo '</tr>';
 }
+$js =3D sprintf('<a href=3D"javascript:void(0)"  class=3D"button" onclic=
k=3D"get_profile_detail(\'%s\',\'%s\')">', $gDossier, -1);
+echo '<tr>';
+echo "<td>".$js."Ajouter un profil </td>";
+echo '</tr>';
 echo '</table>';
 echo '</div>';
=20
+
+//*******************************************************
+// Show details of the selected profile
+//*******************************************************
+echo '<div id=3D"detail_profile" class=3D"content">';
+if (isset($_POST['p_id']))
+{
+	require_once 'show_profile.inc.php';
+}
+echo '</div>';
 ?>

Modified: phpcompta/trunk/include/report.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/report.inc.php	2011-11-10 12:58:09 UTC (rev 4=
325)
+++ phpcompta/trunk/include/report.inc.php	2011-11-10 15:49:57 UTC (rev 4=
326)
@@ -105,7 +105,7 @@
     if ($action =3D=3D "add" && ! isset($_REQUEST['fr_id']))
     {
=20
-        echo '<DIV class=3D"u_redcontent">';
+        echo '<DIV class=3D"redcontent">';
         echo '<h1>'._('D=C3=A9finition').'</h1>';
         echo '<form method=3D"post" >';
         echo dossier::hidden();
@@ -116,7 +116,7 @@
         echo '</form>';
         echo '<span class=3D"notice">'._("Les lignes vides seront effac=C3=
=A9es").'</span>';
         echo "</DIV>";
-        echo '<DIV class=3D"u_redcontent">';
+        echo '<DIV class=3D"redcontent">';
=20
         echo '<form method=3D"post" enctype=3D"multipart/form-data">';
         echo '<h1> Importation</h1>';
@@ -135,7 +135,7 @@
     }
     if ($action=3D=3D"view"      )
     {
-        echo '<DIV class=3D"u_redcontent">';
+        echo '<DIV class=3D"redcontent">';
         $rap->id=3D$_REQUEST ['fr_id'];
         echo '<form method=3D"post">';
         $rap->load();

Added: phpcompta/trunk/include/show_profile.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/show_profile.inc.php	                        =
(rev 0)
+++ phpcompta/trunk/include/show_profile.inc.php	2011-11-10 15:49:57 UTC =
(rev 4326)
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show the profile detail, included from ajax_misc.php
+ * @see ajax_misc.php scripts.js profile.inc.php
+ *
+ */
+require_once 'class_profile_sql.php';
+require_once 'class_profile_menu.php';
+$profile=3Dnew Profile_sql($cn,$p_id);
+$gDossier=3DDossier::id();
+$add_one=3DHtmlInput::button("add", "Ajout Menu","onclick=3D\"add_menu({=
dossier:$gDossier,p_id:$p_id})\"")
+?>
+<hr>
+<h1>Profile <?=3D$profile->p_name?></h1>
+
+<?
+$id=3DHtmlInput::hidden('p_id',$profile->p_id);
+$name=3Dnew IText("p_name",$profile->p_name);
+$desc=3Dnew IText("p_desc",$profile->p_desc);
+$with_calc=3Dnew ICheckBox("with_calc","t");
+$with_calc->set_check($profile->with_calc);
+
+$with_direct_form=3Dnew ICheckBox("with_direct_form","t");
+$with_direct_form->set_check($profile->with_direct_form);
+
+echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
+echo HtmlInput::hidden('p_id',$profile->p_id);
+require_once("template/profile.php");
+echo HtmlInput::submit("save_name","Modifier");
+echo '</form>';
+
+echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
+
+echo '
+Vous pouvez aussi copier ce profil et puis le corriger';
+
+echo HtmlInput::hidden('p_id',$profile->p_id);
+echo HtmlInput::submit("clone","Copier");
+echo '</form>';
+
+echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
+
+echo '
+Effacer ce profil';
+
+echo HtmlInput::hidden('p_id',$profile->p_id);
+echo HtmlInput::submit("delete_profil","Effacer ce profil");
+echo '</form>';
+//Menu / Module /plugin in this profile
+echo "<h1> D=C3=A9tail du profile</h1>";
+echo "<h2>Menu</h2>";
+echo $add_one;
+$profile_menu=3Dnew Profile_Menu($cn);
+$profile_menu->listing_profile($p_id);
+echo "<h2>Impression</h2>";
+$profile_menu->printing($p_id);
+?>
+<?=3D$add_one?>

Modified: phpcompta/trunk/include/stock.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.inc.php	2011-11-10 12:58:09 UTC (rev 43=
25)
+++ phpcompta/trunk/include/stock.inc.php	2011-11-10 15:49:57 UTC (rev 43=
26)
@@ -137,7 +137,7 @@
     $b=3D"";
=20
=20
-    echo '<div class=3D"u_redcontent" style=3D"margin-left:10%">' ;
+    echo '<div class=3D"redcontent" style=3D"margin-left:10%">' ;
     echo $a;
     echo '<div style=3D"float:left;clear:both">';
=20
@@ -180,7 +180,7 @@
=20
=20
 // Show the current stock
-echo '<div class=3D"u_redcontent">';
+echo '<div class=3D"redcontent">';
 echo $r;
 $a=3DViewStock($cn,$year);
 if ( $a !=3D null )

Added: phpcompta/trunk/include/template/add_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/add_menu.php	                       =
 (rev 0)
+++ phpcompta/trunk/include/template/add_menu.php	2011-11-10 15:49:57 UTC=
 (rev 4326)
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show the form to add a menu
+ */
+$ame_code_dep=3D$cn->make_array("
+	select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') =
from
+	menu_ref
+	where
+	me_file is null and me_javascript is null and me_type<>'PR'
+		UNION ALL
+		select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')=
 from menu_ref
+	where
+		me_code=3D'EXTENSION'
+	order by 1
+	",1);
+$ame_code=3D$cn->make_array("
+	select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') =
from
+	menu_ref
+	order by 1
+	");
+$p_order=3Dnew INum("p_order","10");
+$atype=3D$cn->make_array("select pm_type,pm_desc from profile_menu_type =
order by 1");
+
+$me_code=3Dnew ISelect('me_code');
+$me_code->value=3D$ame_code;
+
+$me_code_dep=3Dnew ISelect('me_code_dep');
+$me_code_dep->value=3D$ame_code_dep;
+
+$p_type=3Dnew ISelect('p_type');
+$p_type->value=3D$atype;
+$pm_default=3Dnew ICheckBox('pm_default');
+echo HtmlInput::title_box("Nouveau menu", $ctl);
+?>
+<form method=3D"POST">
+	<?=3DHtmlInput::hidden('p_id',$p_id)?>
+<table>
+<tr>
+	<td>Code</td>
+	<td><?=3D$me_code->input()?></td>
+</tr>
+<tr>
+	<td>D=C3=A9pendant de </td>
+	<td><?=3D$me_code_dep->input()?></td>
+</tr>
+
+<tr>
+	<td>Ordre d'apparition</td>
+	<td><?=3D$p_order->input()?></td>
+</tr>
+<tr>
+	<td>Menu par d=C3=A9faut</td>
+	<td><?=3D$pm_default->input()?></td>
+</tr>
+<tr>
+	<td>Type de menu</td>
+	<td><?=3D$p_type->input()?></td>
+</tr>
+</table>
+<?
+echo HtmlInput::submit('add_menu',"Valider");
+echo '</form>';
+?>

Added: phpcompta/trunk/include/template/plugin_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/plugin_detail.php	                  =
      (rev 0)
+++ phpcompta/trunk/include/template/plugin_detail.php	2011-11-10 15:49:5=
7 UTC (rev 4326)
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief add, modify or delete plugin
+ *
+ */
+$msg=3D($new=3D=3D1)?"Nouvelle extension":"Modification ".$me_menu->valu=
e;
+echo HtmlInput::title_box($msg, $ctl);
+?>
+<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez')">
+<table>
+	<tr>
+		<TD>Label</td>
+		<td><?=3D$me_menu->input();?></td>
+	</tr>
+	<tr>
+		<TD>Code</td>
+		<td><?=3D$me_code->input();?></td>
+	</tr>
+	<tr>
+		<TD>Description</td>
+		<td><?=3D$me_description->input();?></td>
+	</tr>
+	<tr>
+		<TD>Fichier</td>
+		<td><?=3D$me_file->input();?></td>
+	</tr>
+</table>
+	<?
+	if ($new =3D=3D1 )
+	{
+		echo HtmlInput::submit("save_plugin","Ajouter ce plugin");
+	} else {
+		$delete=3Dnew ICheckBox('delete_pl');
+		echo "<p>Voulez-vous effacer ce plugin ? ".$delete->input()."</p>";
+		echo HtmlInput::submit("mod_plugin","Modifier ce plugin");
+
+	}
+	?>
+</form>
\ No newline at end of file

Added: phpcompta/trunk/include/template/profile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/profile.php	                        =
(rev 0)
+++ phpcompta/trunk/include/template/profile.php	2011-11-10 15:49:57 UTC =
(rev 4326)
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show a profile
+ *
+ */
+
+?>
+<table>
+<tr>
+	<td>Nom</td>
+	<td><?=3D$name->input();?></td>
+</tr>
+<tr>
+	<td>Description</td>
+	<td><?=3D$desc->input()?></td>
+</tr>
+<tr>
+	<td>Avec Calculatrice</td>
+	<td><?=3D$with_calc->input()?></td>
+</tr>
+<tr>
+	<td>Avec Direct Form</td>
+	<td><?=3D$with_direct_form->input()?></td>
+</tr>
+</table>
\ No newline at end of file

Added: phpcompta/trunk/include/template/profile_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/profile_menu.php	                   =
     (rev 0)
+++ phpcompta/trunk/include/template/profile_menu.php	2011-11-10 15:49:57=
 UTC (rev 4326)
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show all the menu and submenu of this profile
+ *
+ */
+
+?>

Modified: phpcompta/trunk/sql/backup-new-object.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/backup-new-object.sh	2011-11-10 12:58:09 UTC (rev=
 4325)
+++ phpcompta/trunk/sql/backup-new-object.sh	2011-11-10 15:49:57 UTC (rev=
 4326)
@@ -1 +1 @@
-pg_dump testdossier82 --inserts -t profile -t menu_ref -t profile_menu -=
t profile_user -t v_all_menu > object-6.0.sql
+pg_dump testdossier82 --inserts -t profile -t menu_ref -t profile_menu -=
t profile_user -t profile_menu_type -t v_all_menu > object-6.0.sql

Added: phpcompta/trunk/sql/change_account_repo.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/change_account_repo.sql	                        (=
rev 0)
+++ phpcompta/trunk/sql/change_account_repo.sql	2011-11-10 15:49:57 UTC (=
rev 4326)
@@ -0,0 +1,5 @@
+-- Check: valid_state
+ ALTER TABLE audit_connect DROP CONSTRAINT valid_state;
+
+ALTER TABLE audit_connect
+  ADD CONSTRAINT valid_state CHECK (ac_state =3D 'FAIL'::text OR ac_stat=
e =3D 'SUCCESS'::text or ac_state=3D'AUDIT');

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-10 12:58:09 UTC (rev 4325)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-10 15:49:57 UTC (rev 4326)
@@ -200,10 +200,22 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 172, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 302, true);
=20
=20
 --
+-- Name: profile_menu_type; Type: TABLE; Schema: public; Owner: dany; Ta=
blespace:=20
+--
+
+CREATE TABLE profile_menu_type (
+    pm_type text NOT NULL,
+    pm_desc text
+);
+
+
+ALTER TABLE public.profile_menu_type OWNER TO dany;
+
+--
 -- Name: profile_p_id_seq; Type: SEQUENCE; Schema: public; Owner: dany
 --
=20
@@ -228,7 +240,7 @@
 -- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: da=
ny
 --
=20
-SELECT pg_catalog.setval('profile_p_id_seq', 1, true);
+SELECT pg_catalog.setval('profile_p_id_seq', 7, true);
=20
=20
 --
@@ -328,13 +340,13 @@
 -- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan=
y
 --
=20
-INSERT INTO menu_ref VALUES ('MODOP', 'Correction Op=C3=A9ration', 'modo=
p/index.php', NULL, 'Correction d''=C3=A9critures comptables', 'plugin_co=
de=3DMODOP', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('IMPCARD', 'Import Fiche', 'import_card/ind=
ex.php', NULL, 'Importation de fiches', 'plugin_code=3DIMPCARD', NULL, 'P=
L');
 INSERT INTO menu_ref VALUES ('AMORTIS', 'Amortissement', 'amortis/index.=
php', NULL, 'Amortissement', 'plugin_code=3DAMORTIS', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('TOOLPLAN', 'Import/export plan', 'tool_pcm=
n/index.php', NULL, 'Importation /export de plan comptable', 'plugin_code=
=3DTOOLPLAN', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('IMPORTBANK', 'Importation banque', 'import=
bank/index.php', NULL, 'Import. fichier CVS de la banque', 'plugin_code=3D=
IMPORTBANK', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('TOOL', 'Outil comptable', 'tools/index.php=
', NULL, 'Outil comptable', 'plugin_code=3DTOOL', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('TVA', 'Module de TVA', 'tva/index.php', NU=
LL, 'Cette extension permet de faire les listings et declarations TVA', '=
plugin_code=3DTVA', NULL, 'PL');
+INSERT INTO menu_ref VALUES ('TEST', 'Cela va marcher', 'amortis/index.p=
hp', NULL, 'Test description', '0', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
@@ -345,6 +357,7 @@
 INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('MODULARITY', 'Menu et profile', NULL, NULL=
, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CFGPROFILE', 'Profile', 'profile.inc.php',=
 NULL, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('TESTTVA', 'Test TVA', 'tva/index.php', NUL=
L, 'Test description', 'plugin_code=3DTESTTVA', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, NULL, NU=
LL, 'popup_recherche()', 'ME');
 INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
@@ -442,138 +455,241 @@
 INSERT INTO menu_ref VALUES ('PRINTBAL', 'Balance', 'balance.inc.php', N=
ULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, NULL, NU=
LL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MODOP', 'Modification d''op=C3=A9rations',=
 'modop/index.php', NULL, 'Modification op=C3=A9rations', 'plugin_code=3D=
MODOP', NULL, 'PL');
=20
=20
 --
 -- Data for Name: profile; Type: TABLE DATA; Schema: public; Owner: dany
 --
=20
-INSERT INTO profile VALUES ('Analytique', 2, 'Uniquement comptabilit=C3=A9=
 analytique', true, true);
-INSERT INTO profile VALUES ('Vente', 3, 'Uniquement vente', true, true);
-INSERT INTO profile VALUES ('default', 1, 'Profil par d=C3=A9faut', true=
, true);
+INSERT INTO profile VALUES ('Administrateur', 1, 'Profil par d=C3=A9faut=
 pour les adminstrateurs', true, true);
+INSERT INTO profile VALUES ('Utilisateur', 6, 'Profil par d=C3=A9faut po=
ur les Utilisateurs', true, true);
=20
=20
 --
 -- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 dany
 --
=20
-INSERT INTO profile_menu VALUES (51, 'COMPTA', NULL, 3, 1, 'M', NULL);
-INSERT INTO profile_menu VALUES (52, 'VEN', 'COMPTA', 3, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E',=
 NULL);
-INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E',=
 NULL);
-INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
NULL);
-INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '=
E', NULL);
-INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E',=
 NULL);
-INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E', =
NULL);
-INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', NULL)=
;
-INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E', =
NULL);
-INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E', NU=
LL);
-INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 NULL);
-INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', NULL);
-INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', NULL)=
;
-INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', NULL);
-INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'E', =
NULL);
-INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'E', N=
ULL);
-INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', NULL)=
;
-INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E', NULL);
-INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E', NULL)=
;
-INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E', N=
ULL);
-INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E', NULL);
-INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E', NULL);
-INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E', NULL);
-INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E', NULL);
-INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', NULL);
-INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (94, 'FINSALDO', 'MENUFIN', 1, 3, 'E', N=
ULL);
-INSERT INTO profile_menu VALUES (95, 'FINREC', 'MENUFIN', 1, 4, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', NUL=
L);
-INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', NULL);
-INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', NULL);
-INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 25, 'M', NULL);
-INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', N=
ULL);
-INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', NULL);
-INSERT INTO profile_menu VALUES (44, 'DASHBOARD', NULL, 1, 10, 'M', 1);
-INSERT INTO profile_menu VALUES (35, 'PRINT', 'GESTION', 1, 4, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (156, 'new_line', NULL, 1, 35, 'M', NULL=
);
-INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', =
NULL);
-INSERT INTO profile_menu VALUES (80, 'PLANANC', 'ANC', 2, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
NULL);
-INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', NULL);
-INSERT INTO profile_menu VALUES (126, 'CSV:postedetail', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 40, 'M', 0);
-INSERT INTO profile_menu VALUES (164, 'TVA', 'EXTENSION', 1, NULL, 'S', =
NULL);
-INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 45, 'M', NULL);
-INSERT INTO profile_menu VALUES (18, 'MENUODS', 'COMPTA', 1, 5, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (88, 'ODS', 'MENUODS', 1, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (89, 'ODSIMP', 'MENUODS', 1, 2, 'E', NUL=
L);
+INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', NULL);
+INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E',=
 0);
+INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E',=
 0);
+INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
0);
+INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', NULL);
+INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '=
E', 0);
+INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E',=
 0);
+INSERT INTO profile_menu VALUES (178, 'CFGPAYMENT', 'DIVPARM', 6, 4, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (179, 'CFGTVA', 'DIVPARM', 6, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (180, 'CFGACCOUNT', 'DIVPARM', 6, 6, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (181, 'CFGCATDOC', 'DIVPARM', 6, 8, 'E',=
 0);
+INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E', =
0);
+INSERT INTO profile_menu VALUES (182, 'CFGATTRIBCARD', 'DIVPARM', 6, 9, =
'E', 0);
+INSERT INTO profile_menu VALUES (189, 'PLANANC', 'ANC', 6, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (190, 'CFGCARDCAT', 'DIVPARM', 6, 7, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (191, 'ANCODS', 'ANC', 6, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (192, 'ANCGROUP', 'ANC', 6, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (193, 'ANCIMP', 'ANC', 6, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (194, 'LETTER', 'COMPTA', 6, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (196, 'PREFERENCE', NULL, 6, 15, 'M', 1)=
;
+INSERT INTO profile_menu VALUES (197, 'LETTERCARD', 'LETTER', 6, 1, 'E',=
 0);
+INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (198, 'LETTERACC', 'LETTER', 6, 2, 'E', =
0);
+INSERT INTO profile_menu VALUES (199, 'CUST', 'GESTION', 6, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (200, 'SUPPL', 'GESTION', 6, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (201, 'ADM', 'GESTION', 6, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (202, 'CARD', 'GESTION', 6, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E', =
0);
+INSERT INTO profile_menu VALUES (203, 'STOCK', 'GESTION', 6, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (204, 'FORECAST', 'GESTION', 6, 7, 'E', =
0);
+INSERT INTO profile_menu VALUES (205, 'FOLLOW', 'GESTION', 6, 8, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (206, 'VERIFBIL', 'ADV', 6, 21, 'E', 0);
+INSERT INTO profile_menu VALUES (207, 'STOCK', 'ADV', 6, 22, 'E', 0);
+INSERT INTO profile_menu VALUES (208, 'PREDOP', 'ADV', 6, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (209, 'OPEN', 'ADV', 6, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 0);
+INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (210, 'REPORT', 'ADV', 6, 25, 'E', 0);
+INSERT INTO profile_menu VALUES (211, 'CARD', 'COMPTA', 6, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (212, 'HIST', 'COMPTA', 6, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (213, 'FINSALDO', 'MENUFIN', 6, 3, 'E', =
0);
+INSERT INTO profile_menu VALUES (214, 'FINREC', 'MENUFIN', 6, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (215, 'ADV', 'COMPTA', 6, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (216, 'ACCESS', NULL, 6, 25, 'M', 0);
+INSERT INTO profile_menu VALUES (217, 'CSV:histo', NULL, 6, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (218, 'LOGOUT', NULL, 6, 30, 'M', 0);
+INSERT INTO profile_menu VALUES (219, 'PRINT', 'GESTION', 6, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (220, 'new_line', NULL, 6, 35, 'M', 0);
+INSERT INTO profile_menu VALUES (221, 'CSV:ledger', NULL, 6, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (222, 'PDF:ledger', NULL, 6, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (223, 'PRINT', 'COMPTA', 6, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (224, 'CSV:postedetail', NULL, 6, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (225, 'TVA', 'EXTENSION', 6, NULL, 'S', =
0);
+INSERT INTO profile_menu VALUES (226, 'MENUACH', 'COMPTA', 6, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (227, 'ACHIMP', 'MENUACH', 6, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (228, 'GESTION', NULL, 6, 45, 'M', 0);
+INSERT INTO profile_menu VALUES (229, 'MENUODS', 'COMPTA', 6, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', 0);
+INSERT INTO profile_menu VALUES (230, 'ODS', 'MENUODS', 6, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (231, 'ODSIMP', 'MENUODS', 6, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (232, 'ANC', NULL, 6, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (234, 'VENMENU', 'COMPTA', 6, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (235, 'VEN', 'VENMENU', 6, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (236, 'VENIMP', 'VENMENU', 6, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (237, 'EXTENSION', NULL, 6, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (238, 'FIN', 'MENUFIN', 6, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (239, 'MENUFIN', 'COMPTA', 6, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (240, 'FINIMP', 'MENUFIN', 6, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (241, 'IMPCARD', 'EXTENSION', 6, NULL, '=
S', 0);
+INSERT INTO profile_menu VALUES (242, 'AMORTIS', 'EXTENSION', 6, NULL, '=
S', 0);
+INSERT INTO profile_menu VALUES (243, 'TOOLPLAN', 'EXTENSION', 6, NULL, =
'S', 0);
+INSERT INTO profile_menu VALUES (244, 'SEARCH', NULL, 6, 60, 'M', 0);
+INSERT INTO profile_menu VALUES (245, 'ACH', 'MENUACH', 6, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (246, 'PRINTJRN', 'IMP', 6, 14, 'E', 0);
+INSERT INTO profile_menu VALUES (247, 'PRINTREC', 'IMP', 6, 9, 'E', 0);
+INSERT INTO profile_menu VALUES (248, 'PRINTPOSTE', 'IMP', 6, 8, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (249, 'PRINTREPORT', 'IMP', 6, 10, 'E', =
0);
+INSERT INTO profile_menu VALUES (250, 'PRINTBILAN', 'IMP', 6, 11, 'E', 0=
);
+INSERT INTO profile_menu VALUES (251, 'PRINTGL', 'IMP', 6, 13, 'E', 0);
+INSERT INTO profile_menu VALUES (252, 'PRINTBAL', 'IMP', 6, 15, 'E', 0);
+INSERT INTO profile_menu VALUES (253, 'PRINTCARD', 'IMP', 6, 12, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (254, 'IMPORTBANK', 'EXTENSION', 6, NULL=
, 'S', 0);
+INSERT INTO profile_menu VALUES (255, 'TOOL', 'EXTENSION', 6, NULL, 'S',=
 0);
+INSERT INTO profile_menu VALUES (256, 'AMORTIS', 'MENUACH', 6, 10, 'E', =
0);
+INSERT INTO profile_menu VALUES (258, 'CFGMENU', 'MODULARITY', 6, NULL, =
'E', 0);
+INSERT INTO profile_menu VALUES (259, 'CFGPROFILE', 'MODULARITY', 6, NUL=
L, 'E', 0);
+INSERT INTO profile_menu VALUES (260, 'PDF:postedetail', NULL, 6, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (261, 'CSV:fichedetail', NULL, 6, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (262, 'PDF:fichedetail', NULL, 6, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (263, 'CSV:fiche_balance', NULL, 6, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (264, 'PDF:fiche_balance', NULL, 6, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (265, 'CSV:report', NULL, 6, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (266, 'PDF:report', NULL, 6, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (267, 'CSV:fiche', NULL, 6, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (268, 'PDF:fiche', NULL, 6, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (269, 'CSV:glcompte', NULL, 6, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (270, 'PDF:glcompte', NULL, 6, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (271, 'PDF:sec', NULL, 6, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (272, 'CSV:AncList', NULL, 6, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (273, 'CSV:AncBalSimple', NULL, 6, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (274, 'PDF:AncBalSimple', NULL, 6, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (275, 'CSV:AncBalDouble', NULL, 6, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (276, 'PDF:AncBalDouble', NULL, 6, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (277, 'CSV:balance', NULL, 6, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (278, 'PDF:balance', NULL, 6, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (279, 'CSV:AncTable', NULL, 6, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (280, 'CSV:AncAccList', NULL, 6, NULL, '=
P', 0);
+INSERT INTO profile_menu VALUES (281, 'CSV:AncBalGroup', NULL, 6, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (282, 'OTH:Bilan', NULL, 6, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', 1);
+INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'E', =
0);
+INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'E', 0=
);
+INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E', 0=
);
+INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E', 0);
+INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E', 0);
+INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E', 0);
+INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (94, 'FINSALDO', 'MENUFIN', 1, 3, 'E', 0=
);
+INSERT INTO profile_menu VALUES (95, 'FINREC', 'MENUFIN', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 25, 'M', 0);
+INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', 0);
+INSERT INTO profile_menu VALUES (35, 'PRINT', 'GESTION', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (156, 'new_line', NULL, 1, 35, 'M', 0);
+INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (126, 'CSV:postedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (164, 'TVA', 'EXTENSION', 1, NULL, 'S', =
0);
+INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 45, 'M', 0);
+INSERT INTO profile_menu VALUES (18, 'MENUODS', 'COMPTA', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (88, 'ODS', 'MENUODS', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (89, 'ODSIMP', 'MENUODS', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 50, 'M', 0);
-INSERT INTO profile_menu VALUES (157, 'AMORTIS', 'MENUACH', 1, 10, 'M', =
NULL);
-INSERT INTO profile_menu VALUES (158, 'MODOP', 'EXTENSION', 1, NULL, 'S'=
, NULL);
-INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (82, 'EXTENSION', NULL, 1, 55, 'M', NULL=
);
-INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (93, 'FINIMP', 'MENUFIN', 1, 2, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (159, 'IMPCARD', 'EXTENSION', 1, NULL, '=
S', NULL);
-INSERT INTO profile_menu VALUES (160, 'AMORTIS', 'EXTENSION', 1, NULL, '=
S', NULL);
-INSERT INTO profile_menu VALUES (161, 'TOOLPLAN', 'EXTENSION', 1, NULL, =
'S', NULL);
-INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', NULL);
-INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', NULL);
-INSERT INTO profile_menu VALUES (16, 'PRINTJRN', 'IMP', 1, 14, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (10, 'PRINTREC', 'IMP', 1, 9, 'E', NULL)=
;
-INSERT INTO profile_menu VALUES (9, 'PRINTPOSTE', 'IMP', 1, 8, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (11, 'PRINTREPORT', 'IMP', 1, 10, 'E', N=
ULL);
-INSERT INTO profile_menu VALUES (13, 'PRINTBILAN', 'IMP', 1, 11, 'E', NU=
LL);
-INSERT INTO profile_menu VALUES (15, 'PRINTGL', 'IMP', 1, 13, 'E', NULL)=
;
-INSERT INTO profile_menu VALUES (17, 'PRINTBAL', 'IMP', 1, 15, 'E', NULL=
);
-INSERT INTO profile_menu VALUES (14, 'PRINTCARD', 'IMP', 1, 12, 'E', NUL=
L);
-INSERT INTO profile_menu VALUES (162, 'IMPORTBANK', 'EXTENSION', 1, NULL=
, 'S', NULL);
-INSERT INTO profile_menu VALUES (163, 'TOOL', 'EXTENSION', 1, NULL, 'S',=
 NULL);
-INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MODULARITY', 1, NULL, =
'M', NULL);
-INSERT INTO profile_menu VALUES (167, 'MODULARITY', 'PARAM', 1, 1, 'M', =
NULL);
-INSERT INTO profile_menu VALUES (172, 'CFGPROFILE', 'MODULARITY', 1, NUL=
L, 'M', NULL);
-INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (50, 'ANC', NULL, 2, 1, 'M', 0);
-INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (129, 'PDF:fichedetail', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (130, 'CSV:fiche_balance', NULL, 1, NULL=
, 'P', NULL);
-INSERT INTO profile_menu VALUES (131, 'PDF:fiche_balance', NULL, 1, NULL=
, 'P', NULL);
-INSERT INTO profile_menu VALUES (132, 'CSV:report', NULL, 1, NULL, 'P', =
NULL);
-INSERT INTO profile_menu VALUES (133, 'PDF:report', NULL, 1, NULL, 'P', =
NULL);
-INSERT INTO profile_menu VALUES (134, 'CSV:fiche', NULL, 1, NULL, 'P', N=
ULL);
-INSERT INTO profile_menu VALUES (135, 'PDF:fiche', NULL, 1, NULL, 'P', N=
ULL);
-INSERT INTO profile_menu VALUES (136, 'CSV:glcompte', NULL, 1, NULL, 'P'=
, NULL);
-INSERT INTO profile_menu VALUES (137, 'PDF:glcompte', NULL, 1, NULL, 'P'=
, NULL);
-INSERT INTO profile_menu VALUES (138, 'PDF:sec', NULL, 1, NULL, 'P', NUL=
L);
-INSERT INTO profile_menu VALUES (139, 'CSV:AncList', NULL, 1, NULL, 'P',=
 NULL);
-INSERT INTO profile_menu VALUES (140, 'CSV:AncBalSimple', NULL, 1, NULL,=
 'P', NULL);
-INSERT INTO profile_menu VALUES (141, 'PDF:AncBalSimple', NULL, 1, NULL,=
 'P', NULL);
-INSERT INTO profile_menu VALUES (142, 'CSV:AncBalDouble', NULL, 1, NULL,=
 'P', NULL);
-INSERT INTO profile_menu VALUES (143, 'PDF:AncBalDouble', NULL, 1, NULL,=
 'P', NULL);
-INSERT INTO profile_menu VALUES (144, 'CSV:balance', NULL, 1, NULL, 'P',=
 NULL);
-INSERT INTO profile_menu VALUES (145, 'PDF:balance', NULL, 1, NULL, 'P',=
 NULL);
-INSERT INTO profile_menu VALUES (146, 'CSV:AncTable', NULL, 1, NULL, 'P'=
, NULL);
-INSERT INTO profile_menu VALUES (147, 'CSV:AncAccList', NULL, 1, NULL, '=
P', NULL);
-INSERT INTO profile_menu VALUES (148, 'CSV:AncBalGroup', NULL, 1, NULL, =
'P', NULL);
-INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', N=
ULL);
+INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (82, 'EXTENSION', NULL, 1, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (93, 'FINIMP', 'MENUFIN', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (159, 'IMPCARD', 'EXTENSION', 1, NULL, '=
S', 0);
+INSERT INTO profile_menu VALUES (160, 'AMORTIS', 'EXTENSION', 1, NULL, '=
S', 0);
+INSERT INTO profile_menu VALUES (161, 'TOOLPLAN', 'EXTENSION', 1, NULL, =
'S', 0);
+INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', 0);
+INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (16, 'PRINTJRN', 'IMP', 1, 14, 'E', 0);
+INSERT INTO profile_menu VALUES (10, 'PRINTREC', 'IMP', 1, 9, 'E', 0);
+INSERT INTO profile_menu VALUES (9, 'PRINTPOSTE', 'IMP', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (11, 'PRINTREPORT', 'IMP', 1, 10, 'E', 0=
);
+INSERT INTO profile_menu VALUES (13, 'PRINTBILAN', 'IMP', 1, 11, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (15, 'PRINTGL', 'IMP', 1, 13, 'E', 0);
+INSERT INTO profile_menu VALUES (17, 'PRINTBAL', 'IMP', 1, 15, 'E', 0);
+INSERT INTO profile_menu VALUES (14, 'PRINTCARD', 'IMP', 1, 12, 'E', 0);
+INSERT INTO profile_menu VALUES (162, 'IMPORTBANK', 'EXTENSION', 1, NULL=
, 'S', 0);
+INSERT INTO profile_menu VALUES (163, 'TOOL', 'EXTENSION', 1, NULL, 'S',=
 0);
+INSERT INTO profile_menu VALUES (157, 'AMORTIS', 'MENUACH', 1, 10, 'E', =
0);
+INSERT INTO profile_menu VALUES (167, 'MODULARITY', 'PARAM', 1, 1, 'E', =
0);
+INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MODULARITY', 1, NULL, =
'E', 0);
+INSERT INTO profile_menu VALUES (172, 'CFGPROFILE', 'MODULARITY', 1, NUL=
L, 'E', 0);
+INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (129, 'PDF:fichedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (130, 'CSV:fiche_balance', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (131, 'PDF:fiche_balance', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (132, 'CSV:report', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (133, 'PDF:report', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (134, 'CSV:fiche', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (135, 'PDF:fiche', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (136, 'CSV:glcompte', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (137, 'PDF:glcompte', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (138, 'PDF:sec', NULL, 1, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (139, 'CSV:AncList', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (140, 'CSV:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (141, 'PDF:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (142, 'CSV:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (143, 'PDF:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (144, 'CSV:balance', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (145, 'PDF:balance', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (146, 'CSV:AncTable', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (147, 'CSV:AncAccList', NULL, 1, NULL, '=
P', 0);
+INSERT INTO profile_menu VALUES (148, 'CSV:AncBalGroup', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (1, 'DASHBOARD', NULL, 1, 10, 'M', 0);
+INSERT INTO profile_menu VALUES (302, 'TESTTVA', 'EXTENSION', 1, NULL, '=
S', NULL);
=20
=20
 --
+-- Data for Name: profile_menu_type; Type: TABLE DATA; Schema: public; O=
wner: dany
+--
+
+INSERT INTO profile_menu_type VALUES ('P', 'Impression');
+INSERT INTO profile_menu_type VALUES ('S', 'Extension');
+INSERT INTO profile_menu_type VALUES ('E', 'Menu');
+INSERT INTO profile_menu_type VALUES ('M', 'Module');
+
+
+--
 -- Data for Name: profile_user; Type: TABLE DATA; Schema: public; Owner:=
 dany
 --
=20
@@ -597,6 +713,14 @@
=20
=20
 --
+-- Name: profile_menu_type_pkey; Type: CONSTRAINT; Schema: public; Owner=
: dany; Tablespace:=20
+--
+
+ALTER TABLE ONLY profile_menu_type
+    ADD CONSTRAINT profile_menu_type_pkey PRIMARY KEY (pm_type);
+
+
+--
 -- Name: profile_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; Ta=
blespace:=20
 --
=20
@@ -635,6 +759,13 @@
=20
=20
 --
+-- Name: fki_profile_menu_type_fkey; Type: INDEX; Schema: public; Owner:=
 dany; Tablespace:=20
+--
+
+CREATE INDEX fki_profile_menu_type_fkey ON profile_menu USING btree (p_t=
ype_display);
+
+
+--
 -- Name: profile_menu_me_code_fkey; Type: FK CONSTRAINT; Schema: public;=
 Owner: dany
 --
=20
@@ -647,10 +778,18 @@
 --
=20
 ALTER TABLE ONLY profile_menu
-    ADD CONSTRAINT profile_menu_p_id_fkey FOREIGN KEY (p_id) REFERENCES =
profile(p_id);
+    ADD CONSTRAINT profile_menu_p_id_fkey FOREIGN KEY (p_id) REFERENCES =
profile(p_id) ON UPDATE CASCADE ON DELETE CASCADE;
=20
=20
 --
+-- Name: profile_menu_type_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: dany
+--
+
+ALTER TABLE ONLY profile_menu
+    ADD CONSTRAINT profile_menu_type_fkey FOREIGN KEY (p_type_display) R=
EFERENCES profile_menu_type(pm_type);
+
+
+--
 -- Name: profile_user_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: dany
 --
=20

Added: phpcompta/trunk/sql/style-epad.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/style-epad.sql	                        (rev 0)
+++ phpcompta/trunk/sql/style-epad.sql	2011-11-10 15:49:57 UTC (rev 4326)
@@ -0,0 +1,3 @@
+-- run to the account_repository
+insert into theme values ('EPad','style-epad.css',null);
+

Added: phpcompta/trunk/sql/tmp_pcmn_ins.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/tmp_pcmn_ins.sql	                        (rev 0)
+++ phpcompta/trunk/sql/tmp_pcmn_ins.sql	2011-11-10 15:49:57 UTC (rev 432=
6)
@@ -0,0 +1,21 @@
+-- Function: comptaproc.tmp_pcmn_ins()
+
+-- DROP FUNCTION comptaproc.tmp_pcmn_ins();
+
+CREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_ins()
+  RETURNS trigger AS
+$BODY$
+declare
+   r_record tmp_pcmn%ROWTYPE;
+begin
+r_record :=3D NEW;
+if  length(trim(r_record.pcm_type))=3D0 or r_record.pcm_type is NULL the=
n=20
+   r_record.pcm_type:=3Dfind_pcm_type(NEW.pcm_val);
+   return r_record;
+end if;
+return NEW;
+end;
+$BODY$
+  LANGUAGE plpgsql VOLATILE
+  COST 100;
+ALTER FUNCTION comptaproc.tmp_pcmn_ins() OWNER TO dany;

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	2011-11-10 12:58:09 UTC (rev 4325)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-10 15:49:57 UTC (rev 4326)
@@ -15,8 +15,10 @@
 trigger.tmp_pcmn.sql
 account_add.sql
 object-6.0.sql
+-- for account repository
 epad-style.sql
 extension.sql
-
+-- for account repository
+change_account_repo.sql
 */
 create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;



From MAILER-DAEMON Thu Nov 10 10:48:20 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROWrU-0004Da-R4
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 10:48:20 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 16:54:18 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.6217.1320940099.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4327 - 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, 10 Nov 2011 15:48:19 -0000

Author: danydb
Date: 2011-11-10 16:54:17 +0100 (Thu, 10 Nov 2011)
New Revision: 4327

Modified:
   phpcompta/trunk/include/profile.inc.php
Log:
Si clone un profil, par d?\195?\169faut on peut le modifier

Modified: phpcompta/trunk/include/profile.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/profile.inc.php	2011-11-10 15:49:57 UTC (rev =
4326)
+++ phpcompta/trunk/include/profile.inc.php	2011-11-10 15:54:17 UTC (rev =
4327)
@@ -76,6 +76,7 @@
 				where p_id=3D$2
 			",array($new_id,$p_id));
 		$cn->commit();
+		$p_id=3D$new_id;
=20
 	}
 	catch (Exception $exc)



From MAILER-DAEMON Thu Nov 10 11:01:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROX4I-0006z4-1N
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 11:01:34 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 17:07:23 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.6267.1320940893.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4328 - in phpcompta/trunk: html html/js
	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, 10 Nov 2011 16:01:32 -0000

Author: danydb
Date: 2011-11-10 17:07:22 +0100 (Thu, 10 Nov 2011)
New Revision: 4328

Removed:
   phpcompta/trunk/html/ajax_extension.php
   phpcompta/trunk/html/js/extension.js
   phpcompta/trunk/include/template/extension-detail.php
   phpcompta/trunk/include/template/extension-sec.php
   phpcompta/trunk/include/template/extension.php
Log:
remove obsolete files

Deleted: phpcompta/trunk/html/ajax_extension.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_extension.php	2011-11-10 15:54:17 UTC (rev =
4327)
+++ phpcompta/trunk/html/ajax_extension.php	2011-11-10 16:07:22 UTC (rev =
4328)
@@ -1,219 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief this file answer to ajax
- * parameters :
- * - action =3Dde  details extension
- *       parameters : dossier, and ex_id
- *
- *
- */
-require_once('class_dossier.php');
-require_once('constant.security.php');
-require_once('class_extension.php');
-require_once('function_javascript.php');
-require_once('ac_common.php');
-require_once('class_user.php');
-require_once('class_iselect.php');
-require_once ('class_user.php');
-
-$cn=3Dnew Database(dossier::id());
-/* check user */
-$user=3Dnew User($cn);
-set_language();
-$user->check(true);
-$user->check_dossier(dossier::id(),true);
-if ($user->check_action(EXTENSION)=3D=3D0 ) exit;
-$var=3Darray('gDossier','action');
-$cont=3D0;
-/*  check if mandatory parameters are given */
-foreach ($var as $v)
-{
-    if ( ! isset ($_REQUEST [$v] ) )
-    {
-        echo "$v is not set ";
-        $cont=3D1;
-    }
-}
-extract ($_REQUEST);
-$r=3D"";
-$extra=3D"";
-$ctl=3D"";
-switch($action)
-{
-    /*------------------------------------------------------------------=
----
-     *detail of an extension=20
-     *
-     *------------------------------------------------------------------=
----*/
-case 'de':
-        $ext=3Dnew Extension($cn);
-    $ext->set_parameter("id",$ex_id);
-    $ext->load();
-    $str_hidden=3DHtmlInput::hidden('ex_id',$ex_id);
-    $name=3Dnew IText('name',$ext->get_parameter("name"));
-    $str_name=3D$name->input();
-
-    $code=3Dnew IText('code',$ext->get_parameter("code"));
-    $str_code=3D$code->input();
-
-    $desc=3Dnew IText('desc',$ext->get_parameter("desc"));
-    $str_desc=3D$desc->input();
-
-    $file=3Dnew IText('file',$ext->get_parameter("filepath"));
-    $str_file=3D$file->input();
-
-    $enable=3Dnew ISelect('enable');
-    $array=3Darray(
-               array ('label'=3D>_('Oui'),'value'=3D>'Y'),
-               array('label'=3D>_('Non'),'value'=3D>'N')
-           );
-    $enable->value=3D$array;
-    $enable->selected=3D$ext->get_parameter('enable');
-    $str_enable=3D$enable->input();
-    $r.=3D'<div style=3D"overflow:hidden;">';
-    $r.=3D'<form  id=3D"formext" onsubmit=3D"extension_save(this);return=
 false">';
-    $r.=3Ddossier::hidden();
-    /* property of the extension */
-    ob_start();
-    require_once('template/extension-detail.php');
-    $r.=3Dob_get_contents();
-    ob_clean();
-    /* security */
-    $ans=3Darray(array('value'=3D>'Y','label'=3D>_('Acc=C3=A8s')),
-               array('value'=3D>'N','label'=3D>_('Interdit'))
-              );
-    $array=3DUser::get_list(dossier::id());
-
-    for ($i=3D0;$i<sizeof($array);$i++)
-    {
-        $i_select=3Dnew ISelect("is_".$array[$i]['use_login']);
-        $i_select->value=3D$ans;
-        $i_select->selected=3D($ext->can_request($array[$i]['use_login']=
)=3D=3D1)?'Y':'N';
-        $array[$i]['access']=3D$i_select->input();
-    }
-    require_once('template/extension-sec.php');
-    $r.=3Dob_get_contents();
-    ob_clean();
-
-    /* submit */
-    $r.=3DHtmlInput::submit('ex_save',_('Sauve'));
-    $r.=3D'</form>';
-    $r.=3D'</div>';
-    $ctl=3D'dtext';
-    break;
-    /* -----------------------------------------------------------------=
-----
-     * new  extension
-     *------------------------------------------------------------------=
----*/
-case 'ne':
-    $ext=3Dnew Extension($cn);
-    $ext->set_parameter("id",0);
-    $str_hidden=3DHtmlInput::hidden('ex_id',0);
-
-    $name=3Dnew IText('name',"");
-    $str_name=3D$name->input();
-
-    $code=3Dnew IText('code',"");
-    $str_code=3D$code->input();
-
-    $desc=3Dnew IText('desc',"");
-    $str_desc=3D$desc->input();
-
-    $file=3Dnew IText('file',"");
-    $str_file=3D$file->input();
-
-    $enable=3Dnew ISelect('enable');
-    $array=3Darray(
-               array ('label'=3D>_('Oui'),'value'=3D>'Y'),
-               array('label'=3D>_('Non'),'value'=3D>'N')
-           );
-    $enable->value=3D$array;
-    $enable->selected=3D'Y';
-    $str_enable=3D$enable->input();
-    $r.=3D'<div style=3D"overflow:auto">';
-    $r.=3D'<form id=3D"formext" onsubmit=3D"extension_save(this);return =
false;">';
-    $r.=3Ddossier::hidden();
-    ob_start();
-    require_once('template/extension-detail.php');
-    $r.=3Dob_get_contents();
-    ob_clean();
-
-    /* security */
-    $ans=3Darray(array('value'=3D>'Y','label'=3D>_('Acc=C3=A8s')),
-               array('value'=3D>'N','label'=3D>_('Interdit'))
-              );
-    $array=3DUser::get_list(dossier::id());
-    for ($i=3D0;$i<sizeof($array);$i++)
-    {
-        $i_select=3Dnew ISelect("is_".$array[$i]['use_login']);
-        $i_select->value=3D$ans;
-        $i_select->selected=3D($ext->can_request($array[$i]['use_login']=
)=3D=3D1)?'Y':'N';
-        $array[$i]['access']=3D$i_select->input();
-    }
-    require_once('template/extension-sec.php');
-    $r.=3Dob_get_contents();
-    ob_clean();
-
-
-    $r.=3DHtmlInput::submit('ex_save',_('Sauve'));
-    $r.=3D'</form>';
-    $r.=3D'</div>';
-    $ctl=3D'dtext';
-    break;
-    /*------------------------------------------------------------------=
----
-     * save the extension
-     *
-     *------------------------------------------------------------------=
----*/
-case 'se':
-    ob_start();
-    $ext=3Dnew Extension($cn);
-    $ext->fromArray($_POST);
-    try
-    {
-        $ext->save();
-        $ext->save_security($_POST);
-    }
-    catch (Exception $e)
-    {
-        $r=3Dalert(j( $e->getMessage()),true);
-    }
-    $html=3Dob_get_contents();
-    ob_clean();
-    break;
-case 're':
-    $ext=3Dnew Extension($cn);
-    $ext->set_parameter('id',$ex_id);
-    $ext->delete();
-    break;
-}
-
-$html=3Descape_xml($r);
-
-header('Content-type: text/xml; charset=3DUTF-8');
-echo <<<EOF
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-                             <data>
-                             <ctl>$ctl</ctl>
-                             <code>$html</code>
-                             <extra>$extra</extra>
-                             </data>
-EOF;

Deleted: phpcompta/trunk/html/js/extension.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/extension.js	2011-11-10 15:54:17 UTC (rev 432=
7)
+++ phpcompta/trunk/html/js/extension.js	2011-11-10 16:07:22 UTC (rev 432=
8)
@@ -1,186 +0,0 @@
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief javascript script for extension
- *
- */
-/**
-*@brief show the popup for extension and call ajax
-*@param the id of the extension to show
-*/
-function detail_extension(p_code)
-{
-    var dossier=3D$("gDossier").value;
-    showIPopup("dtext");
-    var queryString=3D'gDossier=3D'+dossier;
-    queryString+=3D'&ex_id=3D'+p_code;
-    queryString+=3D'&action=3Dde'; 	// de for detail extension
-
-    var action=3Dnew Ajax.Request ( 'ajax_extension.php',
-                                  {
-                                  method:'get',
-                                  parameters:queryString,
-                                  onFailure:errorExtension,
-                                  onSuccess:extDetail
-                                  }
-                                );
-}
-/**
-*@brief show the popup for adding a new  extension and call ajax
-*/
-function new_extension()
-{
-    var dossier=3D$("gDossier").value;
-    showIPopup("dtext");
-    var queryString=3D'gDossier=3D'+dossier;
-    queryString+=3D'&action=3Dne'; 	// ne for new extension
-
-    var action=3Dnew Ajax.Request ( 'ajax_extension.php',
-                                  {
-                                  method:'get',
-                                  parameters:queryString,
-                                  onFailure:errorExtension,
-                                  onSuccess:extDetail
-                                  }
-                                );
-}
-
-/**
-*@brief show the detail of a form
-*/
-function extDetail(req)
-{
-    try
-    {
-        var answer=3Dreq.responseXML;
-        var a=3Danswer.getElementsByTagName('ctl');
-        if ( a.length =3D=3D 0 )
-        {
-            var rec=3Dreq.responseText;
-            alert ('erreur :'+rec);
-        }
-        var html=3Danswer.getElementsByTagName('code');
-        var name_ctl=3Da[0].firstChild.nodeValue+'_content';
-        var code_html=3DgetNodeText(html[0]);
-        code_html=3Dunescape_xml(code_html);
-        $(name_ctl).innerHTML=3Dcode_html;
-    }
-    catch (e)
-    {
-        alert(e.message);
-    }
-    try
-    {
-        code_html.evalScripts();
-    }
-    catch(e)
-    {
-        alert("Impossible executer script de la reponse\n"+e.message);
-    }
-
-}
-/**
-*@brief save the extension (add or update)
-*/
-function extension_save(p_obj_form)
-{
-    try
-    {
-        var dossier=3D$("gDossier").value;
-        var queryString=3D'gDossier=3D'+dossier;
-        queryString+=3D'&action=3Dse'; 	// se save extension
-        // Data must be taken here
-        try
-        {
-            var data=3D$(p_obj_form).serialize(false);
-        }
-        catch(f)
-        {
-            var sType=3Dp_obj_form.tagName;
-            var sName=3Dp_obj_form.id;
-            var nbElement=3Dp_obj_form.elements.length;
-            alert("Message"+sName+" "+sType+" Nb Element"+nbElement+" "+=
f.message+"\n");
-            throw (f);
-        }
-        queryString+=3D'&'+data;
-        $("dtext_content").innerHTML=3Dloading();
-var action=3Dnew Ajax.Request ( 'ajax_extension.php', { method:'POST', p=
arameters:queryString,onFailure:errorExtension,
-                              onSuccess:successSave  }      );
-
-        hideIPopup('dtext');
-    }
-    catch(e)
-    {
-        alert("Probleme extension_save "+e._message+"\n"+e.description);
-    }
-}
-function errorExtension()
-{
-    alert('Ajax extension failed');
-}
-function successSave(req)
-{
-    try
-    {
-        var answer=3Dreq.responseXML;
-        var html=3Danswer.getElementsByTagName('code');
-        var code_html=3D'';
-        if ( html[0].firstChild !=3D null )
-        {
-            code_html=3Dhtml[0].firstChild.nodeValue;
-            code_html=3Dunescape_xml(code_html);
-        }
-    }
-    catch (e)
-    {
-        alert(e.message);
-    }
-    try
-    {
-        if (code_html.length > 0)
-        {
-            code_html.evalScripts();
-        }
-    }
-    catch(e)
-    {
-        alert("Impossible executer script de la reponse\n"+e.message);
-    }
-    window.location.reload();
-
-}
-function extension_remove(ex_id)
-{
-    var dossier=3D$("gDossier").value;
-    var queryString=3D'gDossier=3D'+dossier;
-    queryString+=3D'&ex_id=3D'+ex_id;
-    queryString+=3D'&action=3Dre'; 	// re for remove extension
-    var action=3Dnew Ajax.Request ( 'ajax_extension.php',
-                                  {
-                                  method:'POST',
-                                  parameters:queryString,
-                                  onFailure:errorExtension,
-                                  onSuccess:successSave
-                                  }
-                                );
-
-}

Deleted: phpcompta/trunk/include/template/extension-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/extension-detail.php	2011-11-10 15:5=
4:17 UTC (rev 4327)
+++ phpcompta/trunk/include/template/extension-detail.php	2011-11-10 16:0=
7:22 UTC (rev 4328)
@@ -1,47 +0,0 @@
-<div>
-<?=3D$str_hidden?>
-<fieldset>
-<legend><?=3D_('D=C3=A9tail extension')?></legend>
-<table>
-<tr>
-<td style=3D"text-align:right">
-<?=3D_('Nom')?>
-</td>
-<td>
-<?=3D$str_name?>
-</td>
-</TR>
-<tr>
-<td style=3D"text-align:right">
-<?=3D_('Code')?></td>
-<td>
-<?=3D$str_code?>
-</td>
-</tr>
-<tr>
-<td style=3D"text-align:right">
-<?=3D_('description')?>
-</td>
-<td>
-<?=3D$str_desc?>
-</td>
-</tr>
-<tr>
-<td style=3D"text-align:right">
-<?=3D_('chemin et nom de fichier')?>
-</td>
-<td>
-<?=3D$str_file?>
-</td>
-</tr>
-<tr>
-<td style=3D"text-align:right">
-<?=3D_('Activ=C3=A9')?>
-</td>
-<td>
-<?=3D$str_enable?>
-</td>
-</tr>
-</table>
-</fieldset>
-</div>

Deleted: phpcompta/trunk/include/template/extension-sec.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/extension-sec.php	2011-11-10 15:54:1=
7 UTC (rev 4327)
+++ phpcompta/trunk/include/template/extension-sec.php	2011-11-10 16:07:2=
2 UTC (rev 4328)
@@ -1,31 +0,0 @@
-<div style=3D"overflow:hidden">
-<fieldset>
-<legend><?=3D_('S=C3=A9curit=C3=A9')?></legend>
-<table class=3D"result">
-<tr >
-<th><?=3D_('login')?></th>
-<th><?=3D_('Pr=C3=A9nom')?></th>
-<th><?=3D_('Nom')?></th>
-<th><?=3D_('Acc=C3=A8s')?></th>
-</tr>
-<? for ($i =3D 0 ; $i < sizeof($array);$i++) : ?>
-<? if ( $i % 2 =3D=3D 0 ) $class=3D"even"; else $class=3D"odd"; ?>
-<tr>
-<td >
-<?=3D$array[$i]['use_login']?>
-</td>
-<td>
-<?=3D$array[$i]['use_first_name']?>
-</td>
-<td>
-<?=3D$array[$i]['use_name']?>
-</td>
-<td>
-<?=3D$array[$i]['access']?>
-</td>
-</tr>
-<? endfor;?>
-
-</table>
-</fieldset>
-</div>
\ No newline at end of file

Deleted: phpcompta/trunk/include/template/extension.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/extension.php	2011-11-10 15:54:17 UT=
C (rev 4327)
+++ phpcompta/trunk/include/template/extension.php	2011-11-10 16:07:22 UT=
C (rev 4328)
@@ -1,33 +0,0 @@
-<?=3D$str_new?>
-<table width=3D"100%">
-<? for ($i=3D0;$i < count($ext);$i++) : ?>
-<? $idx=3D$ext[$i]['ex_id']; ?>
-<tr id=3D"<? echo 'tr_'.$idx;?>" >
-<td>
-<a href=3D"javascript:detail_extension('<?=3D$idx?>')">
-<?=3D$ext[$i]['ex_code']?>
-</a>
-</td>
-<td>
-<?=3D$ext[$i]['ex_name']?>
-</td>
-<td>
-<?=3D$ext[$i]['ex_desc']?>
-</td>
-<td>
-   <?if ($ext[$i]['ex_enable'] =3D=3D 'Y' ) echo _('Activ=C3=A9'); else =
echo _('D=C3=A9sactiv=C3=A9');?>
-</td>
-<td>
-<?php
-   $bt=3Dnew IButton('remove');
-$bt->label=3D_('Effacer extension');
-$bt->javascript=3D'if (confirm(\''.j(_("Confirmez effacement de l'extens=
ion ??")).'\')) { ';
-$bt->javascript.=3D'extension_remove(\''.$ext[$i]['ex_id'].'\')}';
-echo $bt->input();
-?>
-</td>
-</tr>
-
-
-<? endfor; ?>
-</table>
\ No newline at end of file



From MAILER-DAEMON Thu Nov 10 11:04:13 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROX6r-0000mR-9H
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 11:04:13 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 17:10:12 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.6272.1320941053.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4330 - 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, 10 Nov 2011 16:04:11 -0000

Author: danydb
Date: 2011-11-10 17:10:12 +0100 (Thu, 10 Nov 2011)
New Revision: 4330

Modified:
   phpcompta/trunk/include/function_javascript.php
Log:
adapt for removal of extension.js

Modified: phpcompta/trunk/include/function_javascript.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/function_javascript.php	2011-11-10 16:08:06 U=
TC (rev 4329)
+++ phpcompta/trunk/include/function_javascript.php	2011-11-10 16:10:12 U=
TC (rev 4330)
@@ -2752,7 +2752,6 @@
     echo js_include('compute_direct.js');
     echo js_include('compute.js');
     echo js_include('confirm.js');
-    echo js_include('extension.js');
     echo js_include('forecast.js');
     echo js_include('gestion.js');
     echo js_include('todo_list.js');



From MAILER-DAEMON Thu Nov 10 11:38:02 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROXda-0004NC-Qo
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 11:38:02 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 17:08:08 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.6330.1320943081.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4329 - 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, 10 Nov 2011 16:38:01 -0000

Author: danydb
Date: 2011-11-10 17:08:06 +0100 (Thu, 10 Nov 2011)
New Revision: 4329

Modified:
   phpcompta/trunk/include/class_extension.php
   phpcompta/trunk/include/profile.inc.php
Log:
remove getTraceAsString() in exception

Modified: phpcompta/trunk/include/class_extension.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_extension.php	2011-11-10 16:07:22 UTC (=
rev 4328)
+++ phpcompta/trunk/include/class_extension.php	2011-11-10 16:08:06 UTC (=
rev 4329)
@@ -122,7 +122,6 @@
 		catch (Exception $exc)
 		{
 			echo alert($exc->getMessage());
-			echo $exc->getTraceAsString();
 		}
 	}
 	function update_plugin()
@@ -138,7 +137,6 @@
 		catch (Exception $exc)
 		{
 			echo alert($exc->getMessage());
-			echo $exc->getTraceAsString();
 		}
 	}
 	function remove_plugin()
@@ -152,7 +150,6 @@
 		catch (Exception $exc)
 		{
 			echo alert($exc->getMessage());
-			echo $exc->getTraceAsString();
 		}
 	}
 }

Modified: phpcompta/trunk/include/profile.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/profile.inc.php	2011-11-10 16:07:22 UTC (rev =
4328)
+++ phpcompta/trunk/include/profile.inc.php	2011-11-10 16:08:06 UTC (rev =
4329)
@@ -81,7 +81,7 @@
 	}
 	catch (Exception $exc)
 	{
-		echo $exc->getTraceAsString();
+		echo alert($exc->getMessage());
 		$cn->rollback();
 	}
=20
@@ -220,7 +220,6 @@
 	}
 	catch (Exception $exc)
 	{
-		echo $exc->getTraceAsString();
 		alert($exc->getMessage());
 	}
=20



From MAILER-DAEMON Thu Nov 10 12:52:07 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROYnH-0000jJ-Qz
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 12:52:07 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 18:58:07 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.6447.1320947527.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4331 - 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, 10 Nov 2011 17:52:07 -0000

Author: danydb
Date: 2011-11-10 18:58:05 +0100 (Thu, 10 Nov 2011)
New Revision: 4331

Modified:
   phpcompta/trunk/html/fid.php
   phpcompta/trunk/html/fid_card.php
Log:
Bug ODS in ajax card=20

Modified: phpcompta/trunk/html/fid.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/fid.php	2011-11-10 16:10:12 UTC (rev 4330)
+++ phpcompta/trunk/html/fid.php	2011-11-10 17:58:05 UTC (rev 4331)
@@ -23,7 +23,7 @@
 /*!\file
  * \brief Fid for the ajax request for cards
  * \see fiche_search.php
- * Valid parameter GET are=20
+ * Valid parameter GET are
  * - d type =3D cred, deb, all or filter or any sql where clause if the =
d starts with [sql]
  * - j is the legdger
  * - l field for the label
@@ -80,11 +80,21 @@
             $filter_card=3D"";
             break;
         case 'filter':
-            $get_cred=3D'jrn_def_fiche_cred';
-            $get_deb=3D'jrn_def_fiche_deb';
-            $filter_jrn=3D$cn->make_list("select $get_cred||','||$get_de=
b as fiche from jrn_def where jrn_def_id=3D$1",array($jrn));
-            $filter_card=3D($filter_jrn !=3D "")?" and fd_id in ($filter=
_jrn)":' and false ';
+			 $get_cred=3D'jrn_def_fiche_cred';
+        $get_deb=3D'jrn_def_fiche_deb';
+		$deb=3D$cn->get_value("select $get_deb from jrn_def where jrn_def_id=3D=
$1",array($jrn));
+		$cred=3D$cn->get_value("select $get_cred from jrn_def where jrn_def_id=
=3D$1",array($jrn));
=20
+		$filter_jrn=3D"";
+
+		if ($deb!=3D=3D'' && $cred!=3D'')
+			$filter_jrn	=3D$deb.','.$cred;
+		elseif($deb !=3D '')
+			$filter_jrn=3D$deb;
+		elseif($cred !=3D '')
+			$filter_jrn=3D$cred;
+
+		$filter_card=3D($filter_jrn !=3D "")?" and fd_id in ($filter_jrn)":' a=
nd false ';
             break;
         case 'all':
             $filter_card=3D'';

Modified: phpcompta/trunk/html/fid_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/fid_card.php	2011-11-10 16:10:12 UTC (rev 4330)
+++ phpcompta/trunk/html/fid_card.php	2011-11-10 17:58:05 UTC (rev 4331)
@@ -8,7 +8,7 @@
  *   (at your option) any later version.
  *
  *   PhpCompta is distributed in the hope that it will be useful,
-=20
+
  *   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.
@@ -30,17 +30,17 @@
 require_once('class_database.php');
 require_once('class_dossier.php');
 /*!\brief
- *  Received parameters are=20
+ *  Received parameters are
  *   - j for the ledger
  *   - e for extra (typecard)
- *   - type is the ledger type (ach, ven, fin, gl or nothing)=20
+ *   - type is the ledger type (ach, ven, fin, gl or nothing)
  *   - FID contains the string the user is typing
  *\note the typecard can be
  *   - cred card for the debit only if j is set
  *   - deb card for the debit only if j is set
  *   - filter card for debit and credit only if j OR type is set
  *   - list of fd_id
- *    =20
+ *
  */
=20
 $jrn=3D ( ! isset($_REQUEST['j']))?-1:$_REQUEST['j'];
@@ -79,9 +79,20 @@
     case 'filter':
         $get_cred=3D'jrn_def_fiche_cred';
         $get_deb=3D'jrn_def_fiche_deb';
-        $filter_jrn=3D$cn->make_list("select $get_cred||','||$get_deb as=
 fiche from jrn_def where jrn_def_id=3D$1",array($jrn));
-        $filter_card=3D($filter_jrn !=3D "")?" and fd_id in ($filter_jrn=
)":' and false ';
+		$deb=3D$cn->get_value("select $get_deb from jrn_def where jrn_def_id=3D=
$1",array($jrn));
+		$cred=3D$cn->get_value("select $get_cred from jrn_def where jrn_def_id=
=3D$1",array($jrn));
=20
+		$filter_jrn=3D"";
+
+		if ($deb!=3D=3D'' && $cred!=3D'')
+			$filter_jrn	=3D$deb.','.$cred;
+		elseif($deb !=3D '')
+			$filter_jrn=3D$deb;
+		elseif($cred !=3D '')
+			$filter_jrn=3D$cred;
+
+		$filter_card=3D($filter_jrn !=3D "")?" and fd_id in ($filter_jrn)":' a=
nd false ';
+
         break;
=20
     }



From MAILER-DAEMON Thu Nov 10 12:52:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROYnr-0001U5-2i
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 12:52:43 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 18:58:41 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.6448.1320947562.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4332 - 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, 10 Nov 2011 17:52:40 -0000

Author: danydb
Date: 2011-11-10 18:58:40 +0100 (Thu, 10 Nov 2011)
New Revision: 4332

Modified:
   phpcompta/trunk/include/opening.inc.php
   phpcompta/trunk/include/operation_ods_confirm.inc.php
Log:
0000416: Ouverture d'ann?\195?\169e : ?\195?\169criture anouveau enregist=
rement

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	2011-11-10 17:58:05 UTC (rev =
4331)
+++ phpcompta/trunk/include/opening.inc.php	2011-11-10 17:58:40 UTC (rev =
4332)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,183 +16,250 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-require_once 'user_menu.php';
-/*!\file
+/* !\file
  * \brief The opening of the exercices. it takes the saldo of the
  * choosen foolder / exercice and import it as a misc operation in the
  * current folder
+
+ *
+ *
+ *
  */
-$sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:'';
-$User=3Dnew User(new Database(dossier::id()));
-$User->Check();
 require_once("class_iselect.php");
 require_once('class_acc_ledger.php');
+
+$sa =3D (isset($_REQUEST['sa'])) ? $_REQUEST['sa'] : '';
+$User =3D new User(new Database(dossier::id()));
+$User->Check();
+
+require_once 'user_menu.php';
+
+// Correct (last step)
+if (isset($_POST['correct']))
+{
+	$ledger =3D new Acc_Ledger($cn, $_REQUEST['p_jrn']);
+	require_once 'operation_ods_new.inc.php';
+	exit();
+}
+
+// confirm before saving
+if ( isset($_POST['summary']))
+{
+	try {
+		$ledger =3D new Acc_Ledger($cn, $_REQUEST['p_jrn']);
+		$ledger->with_concerned=3Dfalse;
+			$ledger->verify($_POST);
+			require_once 'operation_ods_confirm.inc.php';
+	} catch (Exception $e)
+	{
+		echo alert($e->getMessage());
+		require('operation_ods_new.inc.php');
+
+	}
+	exit();
+}
+
+// record
+if (isset($_POST['save']))
+{
+	$array =3D $_POST;
+	$ledger =3D new Acc_Ledger($cn, $_REQUEST['p_jrn']);
+	$ledger->with_concerned=3Dfalse;
+	try
+	{
+		$ledger->save($array);
+		$jr_id =3D $cn->get_value('select jr_id from jrn where jr_internal=3D$=
1', array($ledger->internal));
+
+		echo '<h2> Op&eacute;ration enregistr&eacute;e  Piece ' . h($ledger->p=
j) . '</h2>';
+		if (strcmp($ledger->pj, $_POST['e_pj']) !=3D 0)
+		{
+			echo '<h3 class=3D"notice">' . _('Attention num=C3=A9ro pi=C3=A8ce ex=
istante, elle a du =C3=AAtre adapt=C3=A9e') . '</h3>';
+		}
+		printf('<a class=3D"detail" style=3D"display:inline" href=3D"javascrip=
t:modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), $ledger->in=
ternal);
+
+		// show feedback
+		echo '<div id=3D"jrn_name_div">'; echo '<h2 id=3D"jrn_name" style=3D"d=
isplay:inline">' . $ledger->get_name() . '</h2>'; echo '</div>';
+		echo $ledger->confirm($_POST, true);
+	}
+	catch (Exception $e)
+	{
+		require('operation_ods_new.inc.php');
+		alert($e->getMessage());
+	}
+	exit();
+}
+
+
 /* --------------------------------------------------
  * step 1 if nothing is asked we show the available folders
-*/
+ */
 if ($sa =3D=3D '')
 {
-    echo '<div class=3D"content">';
-    echo '<fieldset><legend> Etape 1 </legend>';
+	echo '<div class=3D"content">';
+	echo '<fieldset><legend> Etape 1 </legend>';
=20
-    echo 'Choississez le dossier o=C3=B9 sont les soldes =C3=A0 importer=
';
-    $avail=3D$User->get_available_folder();
+	echo 'Choississez le dossier o=C3=B9 sont les soldes =C3=A0 importer';
+	$avail =3D $User->get_available_folder();
=20
-    if ( empty( $avail) )
-    {
-        echo '*** Aucun dossier ***';
-        exit();
-    }
-    echo '<form class=3D"print" method=3D"post">';
-    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-    echo HtmlInput::hidden('sa','step2');
-    echo dossier::hidden();
-    $wAvail=3Dnew ISelect();
-    /* compute select list */
-    $array=3Darray();
-    $i=3D0;
-    foreach ($avail as $r)
-    {
-        $array[$i]['value']=3D$r['dos_id'];
-        $array[$i]['label']=3D$r['dos_name'];
-        $i++;
-    }
+	if (empty($avail))
+	{
+		echo '*** Aucun dossier ***';
+		exit();
+	}
+	echo '<form class=3D"print" method=3D"post">';
+	echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+	echo HtmlInput::hidden('sa', 'step2');
+	echo dossier::hidden();
+	$wAvail =3D new ISelect();
+	/* compute select list */
+	$array =3D array();
+	$i =3D 0;
+	foreach ($avail as $r)
+	{
+		$array[$i]['value'] =3D $r['dos_id'];
+		$array[$i]['label'] =3D $r['dos_name'];
+		$i++;
+	}
=20
-    $wAvail->value=3D$array;
-    echo 'Choix du dossier :'.$wAvail->input('f');
-    echo HtmlInput::submit('ok','Continuer');
+	$wAvail->value =3D $array;
+	echo 'Choix du dossier :' . $wAvail->input('f');
+	echo HtmlInput::submit('ok', 'Continuer');
=20
-    echo '</form>';
-    echo '</fieldset>';
-    echo '</div>';
-    exit();
+	echo '</form>';
+	echo '</fieldset>';
+	echo '</div>';
+	exit();
 }
 /* --------------------------------------------------
  * Step 2 choose now the exercice of this folder
  */
-$back=3D'do.php?ac=3D'.$_REQUEST['ac'].'&'.dossier::get();
-if ( $sa=3D=3D'step2')
+$back =3D 'do.php?ac=3D' . $_REQUEST['ac'] . '&' . dossier::get();
+if ($sa =3D=3D 'step2')
 {
-    echo '<div class=3D"content">'.
-    '<fieldset><legend>Etape 2</legend>'.
-    '<h2 class=3D"info">'.dossier::name($_REQUEST['f']).'</h2>'.
-    '<form class=3D"print" method=3D"post">'.
-    ' Choississez l\'exercice du dossier ';
-    echo dossier::hidden();
-     echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-    echo HtmlInput::hidden('sa','step3');
-    echo HtmlInput::hidden('f',$_REQUEST['f']);
-    $cn=3Dnew Database($_REQUEST['f']);
-    $periode=3D$cn->make_array("select distinct p_exercice,p_exercice fr=
om parm_periode order by p_exercice");
-    $w=3Dnew ISelect();
-    $w->table=3D0;
-    $w->label=3D'Periode';
-    $w->readonly=3Dfalse;
-    $w->value=3D$periode;
-    $w->name=3D"p_periode";
-    echo 'P&eacute;riode : '.$w->input();
-    echo HtmlInput::submit('ok','Continuer');
-    echo dossier::hidden();
-    echo "</form>";
-    echo HtmlInput::button_anchor('Retour',$back);
-    exit(0);
+	echo '<div class=3D"content">' .
+	'<fieldset><legend>Etape 2</legend>' .
+	'<h2 class=3D"info">' . dossier::name($_REQUEST['f']) . '</h2>' .
+	'<form class=3D"print" method=3D"post">' .
+	' Choississez l\'exercice du dossier ';
+	echo dossier::hidden();
+	echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+	echo HtmlInput::hidden('sa', 'step3');
+	echo HtmlInput::hidden('f', $_REQUEST['f']);
+	$cn =3D new Database($_REQUEST['f']);
+	$periode =3D $cn->make_array("select distinct p_exercice,p_exercice fro=
m parm_periode order by p_exercice");
+	$w =3D new ISelect();
+	$w->table =3D 0;
+	$w->label =3D 'Periode';
+	$w->readonly =3D false;
+	$w->value =3D $periode;
+	$w->name =3D "p_periode";
+	echo 'P&eacute;riode : ' . $w->input();
+	echo HtmlInput::submit('ok', 'Continuer');
+	echo dossier::hidden();
+	echo "</form>";
+	echo HtmlInput::button_anchor('Retour', $back);
+	exit(0);
 }
 /* --------------------------------------------------
  * select the ledger where we will import the data
  */
-if ( $sa =3D=3D 'step3')
+if ($sa =3D=3D 'step3')
 {
-    echo '<div class=3D"content">'.
-    '<fieldset><legend>Etape 3</legend>'.
-    '<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\'ouvertu=
re ';
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_action','ouv');
-    echo HtmlInput::hidden('sa','step4');
-    echo HtmlInput::hidden('f',$_REQUEST['f']);
-    echo HtmlInput::hidden('p_periode',$_REQUEST['p_periode']);
-    $wLedger=3Dnew ISelect();
-    $User=3Dnew User(new Database(dossier::id()));
-    $avail=3D$User->get_ledger('ODS');
-    /* compute select list */
-    $array=3Darray();
-    $i=3D0;
-    foreach ($avail as $r)
-    {
-        $array[$i]['value']=3D$r['jrn_def_id'];
-        $array[$i]['label']=3D$r['jrn_def_name'];
-        $i++;
-    }
-    $wLedger->value=3D$array;
-    echo $wLedger->input('p_jrn');
-    echo HtmlInput::submit('ok','Continuer');
-     echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-    echo dossier::hidden();
-    echo "</form>";
-    echo HtmlInput::button_anchor('Retour',$back.'&sa=3Dstep2&f=3D'.$_RE=
QUEST['f']);
-    exit(0);
-
+	echo '<div class=3D"content">' .
+	'<fieldset><legend>Etape 3</legend>' .
+	'<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 =
';
+	echo dossier::hidden();
+	echo HtmlInput::hidden('p_action', 'ouv');
+	echo HtmlInput::hidden('sa', 'step4');
+	echo HtmlInput::hidden('f', $_REQUEST['f']);
+	echo HtmlInput::hidden('p_periode', $_REQUEST['p_periode']);
+	$wLedger =3D new ISelect();
+	$User =3D new User(new Database(dossier::id()));
+	$avail =3D $User->get_ledger('ODS');
+	/* compute select list */
+	$array =3D array();
+	$i =3D 0;
+	foreach ($avail as $r)
+	{
+		$array[$i]['value'] =3D $r['jrn_def_id'];
+		$array[$i]['label'] =3D $r['jrn_def_name'];
+		$i++;
+	}
+	$wLedger->value =3D $array;
+	echo $wLedger->input('p_jrn');
+	echo HtmlInput::submit('ok', 'Continuer');
+	echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+	echo dossier::hidden();
+	echo "</form>";
+	echo HtmlInput::button_anchor('Retour', $back . '&sa=3Dstep2&f=3D' . $_=
REQUEST['f']);
+	exit(0);
 }
 /* --------------------------------------------------
  * Step 4 we import data from the selected folder and year and
  * transform it into a misc operation
  */
-if ( $sa=3D=3D'step4')
+if ($sa =3D=3D 'step4')
 {
-    echo '<div class=3D"content">';
-    echo '<fieldset><legend> Derni=C3=A8re =C3=A9tape</legend>';
-    $cn_target=3Dnew Database($_REQUEST['f']);
-    $saldo=3Dnew Acc_Ledger($cn_target,0);
-    $array=3D$saldo->get_saldo_exercice($_REQUEST['p_periode']);
-    /*  we need to transform the array into a Acc_Ledger array */
-    $result=3Darray();
-    $result['desc']=3D'Ecriture d\'ouverture';
-    $result['nb_item']=3Dsizeof($array);
-    $result['p_jrn']=3D$_REQUEST['p_jrn'];
-    $idx=3D0;
+	echo '<div class=3D"content">';
+	echo '<fieldset><legend> Derni=C3=A8re =C3=A9tape</legend>';
+	$cn_target =3D new Database($_REQUEST['f']);
+	$saldo =3D new Acc_Ledger($cn_target, 0);
+	$array =3D $saldo->get_saldo_exercice($_REQUEST['p_periode']);
+	/*  we need to transform the array into a Acc_Ledger array */
+	$result =3D array();
+	$result['desc'] =3D 'Ecriture d\'ouverture';
+	$result['nb_item'] =3D sizeof($array);
+	$result['p_jrn'] =3D $_REQUEST['p_jrn'];
+	$idx =3D 0;
=20
-    foreach ($array as $row )
-    {
-        $qcode=3D'qc_'.$idx;
-        $poste=3D'poste'.$idx;
-        $amount=3D'amount'.$idx;
-        $ck=3D'ck'.$idx;
-        $result[$qcode] =3D $row['j_qcode'];
-        if ( trim($row['j_qcode'])=3D=3D'')
-            $result[$poste] =3D $row['j_poste'];
-        $result[$amount] =3D abs($row['solde']);
-        if ( $row['solde'] > 0 ) $result[$ck]=3D'on';
-        $idx++;
-    }
-    $cn=3Dnew Database(dossier::id());
-    $User=3Dnew User($cn);
-    $jrn=3Dnew Acc_Ledger($cn,$_REQUEST['p_jrn']);
-    echo '<form class=3D"print" method=3D"post" action=3D"do.php">';
-    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-    echo HtmlInput::hidden('sa','step5');
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_jrn',$_REQUEST['p_jrn']);
-    echo $jrn->show_form($result,0);
-    echo '<hr>';
-    echo '<h2 class=3D"notice">Ne corrigez pas encore, cliquez continuer=
 pour passer =C3=A0 l\'=C3=A9tape suivante</h2>';
-    echo HtmlInput::submit('correct_it','Continuer');
-    echo '</form>';
-    echo HtmlInput::button_anchor('Retour',$back);
+	foreach ($array as $row)
+	{
+		$qcode =3D 'qc_' . $idx;
+		$poste =3D 'poste' . $idx;
+		$amount =3D 'amount' . $idx;
+		$ck =3D 'ck' . $idx;
+		$result[$qcode] =3D $row['j_qcode'];
+		if (trim($row['j_qcode']) =3D=3D '')
+			$result[$poste] =3D $row['j_poste'];
+		$result[$amount] =3D abs($row['solde']);
+		if ($row['solde'] > 0)
+			$result[$ck] =3D 'on';
+		$idx++;
+	}
+	$cn =3D new Database(dossier::id());
+	$User =3D new User($cn);
+	$jrn =3D new Acc_Ledger($cn, $_REQUEST['p_jrn']);
=20
-    echo '</div>';
+	echo '<form class=3D"print" method=3D"post">';
+	echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+	echo HtmlInput::hidden('sa', 'step5');
+	echo HtmlInput::hidden('f', $_REQUEST['f']);
+	echo HtmlInput::hidden('p_periode',$_REQUEST['p_periode']);
+	echo dossier::hidden();
+	echo HtmlInput::hidden('p_jrn', $_REQUEST['p_jrn']);
+	echo $jrn->input($result, 0);
+	echo '<hr>';
+	echo '<h2 class=3D"notice">Ne corrigez pas encore, cliquez continuer po=
ur passer =C3=A0 l\'=C3=A9tape suivante</h2>';
+	echo HtmlInput::submit('correct_it', 'Continuer');
+	echo '</form>';
+	echo HtmlInput::button_anchor('Retour', $back);
+
+	echo '</div>';
 }
 // if sa=3Dstep4 then record it
 //
 /*
  * @todo finir les ouvertures d'ann=C3=A9e
  */
-if ( $_REQUEST['sa']=3D=3D'step5')
+if ($_REQUEST['sa'] =3D=3D 'step5')
 {
-    echo "<h2> A ENREGISTRER</H2>";
+	$ledger =3D new Acc_Ledger($cn, $_REQUEST['p_jrn']);
+	require_once 'operation_ods_new.inc.php';
+}
=20
-}

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	2011-11-10 17:5=
8:05 UTC (rev 4331)
+++ phpcompta/trunk/include/operation_ods_confirm.inc.php	2011-11-10 17:5=
8:40 UTC (rev 4332)
@@ -35,6 +35,7 @@
 echo '</div>';
=20
 echo '<FORM METHOD=3D"POST">';
+echo HtmlInput::request_to_hidden(array('ac'));
 echo $ledger->confirm($_POST,false);
=20
 echo '<hr>';



From MAILER-DAEMON Thu Nov 10 12:54:00 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROYp6-0001bP-R9
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 12:54:00 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 19:00:04 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.6451.1320947640.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4333 - 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: Thu, 10 Nov 2011 17:54:00 -0000

Author: danydb
Date: 2011-11-10 19:00:01 +0100 (Thu, 10 Nov 2011)
New Revision: 4333

Modified:
   phpcompta/trunk/include/detail_menu.inc.php
   phpcompta/trunk/include/template/add_menu.php
Log:
Ajout confirmation

Modified: phpcompta/trunk/include/detail_menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/detail_menu.inc.php	2011-11-10 17:58:40 UTC (=
rev 4332)
+++ phpcompta/trunk/include/detail_menu.inc.php	2011-11-10 18:00:01 UTC (=
rev 4333)
@@ -62,7 +62,7 @@
 $pm_default->set_check($array[0]['pm_default']);
=20
 ?>
-<form method=3D"POST">
+<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
 	<?=3DHtmlInput::hidden('pm_id',$array[0]['pm_id'])?>
 	<?=3DHtmlInput::hidden('p_id',$array[0]['p_id'])?>
 <table>

Modified: phpcompta/trunk/include/template/add_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/add_menu.php	2011-11-10 17:58:40 UTC=
 (rev 4332)
+++ phpcompta/trunk/include/template/add_menu.php	2011-11-10 18:00:01 UTC=
 (rev 4333)
@@ -55,7 +55,7 @@
 $pm_default=3Dnew ICheckBox('pm_default');
 echo HtmlInput::title_box("Nouveau menu", $ctl);
 ?>
-<form method=3D"POST">
+<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
 	<?=3DHtmlInput::hidden('p_id',$p_id)?>
 <table>
 <tr>



From MAILER-DAEMON Thu Nov 10 16:21:48 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROc4C-0004yC-11
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 16:21:48 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 22:27:45 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.7098.1320960107.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4334 - 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, 10 Nov 2011 21:21:46 -0000

Author: danydb
Date: 2011-11-10 22:27:43 +0100 (Thu, 10 Nov 2011)
New Revision: 4334

Modified:
   phpcompta/trunk/html/do.php
Log:
Message erreur + cosmetique

Modified: phpcompta/trunk/html/do.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/do.php	2011-11-10 18:00:01 UTC (rev 4333)
+++ phpcompta/trunk/html/do.php	2011-11-10 21:27:43 UTC (rev 4334)
@@ -30,19 +30,26 @@
 require_once('ac_common.php');
 require_once 'function_javascript.php';
 require_once 'constant.security.php';
+// if gDossier is not set redirect to form to choose a folder
+if ( ! isset($_REQUEST['gDossier']))
+{
+    redirect('user_login.php');
+    exit();
+}
+if ( ! isset ($_SESSION['g_theme']))
+  {
+    echo "<h2> Vous  =C3=AAtes d=C3=A9connect=C3=A9</h2>";
+    redirect('user_login.php');
+    exit();
=20
+  }
+
 if (isset ($_POST["style_user"])){$_SESSION['g_theme']=3D$_POST['style_u=
ser'];}
=20
 html_page_start($_SESSION['g_theme']);
=20
 global $g_user, $cn;
=20
-// if gDossier is not set redirect to form to choose a folder
-if ( ! isset($_REQUEST['gDossier']))
-{
-    redirect('user_login.php');
-    exit();
-}
=20
=20
 $cn =3D new Database(Dossier::id());



From MAILER-DAEMON Thu Nov 10 16:22:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROc4w-00051w-6Y
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 16:22:34 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 22:28:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.7099.1320960153.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4335 - 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, 10 Nov 2011 21:22:33 -0000

Author: danydb
Date: 2011-11-10 22:28:35 +0100 (Thu, 10 Nov 2011)
New Revision: 4335

Modified:
   phpcompta/trunk/html/show_document_modele.php
Log:
To be protected


Modified: phpcompta/trunk/html/show_document_modele.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_document_modele.php	2011-11-10 21:27:43 UTC=
 (rev 4334)
+++ phpcompta/trunk/html/show_document_modele.php	2011-11-10 21:28:35 UTC=
 (rev 4335)
@@ -38,7 +38,7 @@
 $User->Check();
 // retrieve the document
 $r=3D$cn->exec_sql("select md_id,md_lob,md_filename,md_mimetype
-                 from document_modele where md_id=3D".$_REQUEST['md_id']=
);
+                 from document_modele where md_id=3D$1",array($_REQUEST[=
'md_id']));
 if ( Database::num_row($r) =3D=3D 0 )
 {
     echo_error("Invalid Document");



From MAILER-DAEMON Thu Nov 10 16:23:44 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROc64-0005E9-7Z
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 16:23:44 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 22:29:45 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.7100.1320960223.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4336 - 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, 10 Nov 2011 21:23:43 -0000

Author: danydb
Date: 2011-11-10 22:29:44 +0100 (Thu, 10 Nov 2011)
New Revision: 4336

Modified:
   phpcompta/trunk/include/class_database.php
Log:
Formatage + chgt make_array

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	2011-11-10 21:28:35 UTC (r=
ev 4335)
+++ phpcompta/trunk/include/class_database.php	2011-11-10 21:29:44 UTC (r=
ev 4336)
@@ -75,7 +75,7 @@
=20
         if ( $a =3D=3D false )
         {
-	  if (DEBUG)=20
+	  if (DEBUG)
 	    {
 	      ob_end_clean();
 	      echo '<h2 class=3D"error">Impossible de se connecter &agrave; pos=
tgreSql !</h2>';
@@ -91,7 +91,7 @@
 	      exit ("Connection impossible : v&eacute;rifiez vos param&egrave;t=
res de base
                   de donn&eacute;es");
 	    }
-	  else=20
+	  else
 	    {
 	      echo '<h2 class=3D"error">Erreur de connexion !</h2>';
 	    }
@@ -122,20 +122,20 @@
     {
         try
         {
-	 =20
+
             $this->sql=3D$p_string;
             $this->array=3D$p_array;
=20
            if ( $p_array=3D=3Dnull )
             {
-	      if ( ! DEBUG )=20
+	      if ( ! DEBUG )
 		$this->ret=3Dpg_query($this->db,$p_string);
 	      else
 		$this->ret=3D@pg_query($this->db,$p_string);
             }
             else
             {
-	      if ( ! DEBUG )=20
+	      if ( ! DEBUG )
 		$this->ret=3Dpg_query_params($this->db,$p_string,$p_array);
 	      else
 		$this->ret=3D@pg_query_params($this->db,$p_string,$p_array);
@@ -542,7 +542,7 @@
         else return false;
     }
     /*
-     *!\brief test if a view exist=20
+     *!\brief test if a view exist
      * \return true if the view. exist otherwise false
      */
     function exist_view($p_name)
@@ -553,7 +553,7 @@
         return true;
     }
     /*
-     *!\brief test if a schema exists=20
+     *!\brief test if a schema exists
      * \return true if the schemas exists otherwise false
      */
     function exist_schema($p_name)
@@ -630,7 +630,7 @@
     {
         $a=3D$this->exec_sql($p_sql);
         $max=3Dpg_NumRows($a);
-        if ( $max=3D=3D0) return null;
+        if ( $max=3D=3D0 && $p_null=3D=3D0) return null;
         for ($i=3D0;$i<$max;$i++)
         {
             $row=3Dpg_fetch_row($a);



From MAILER-DAEMON Thu Nov 10 16:24:10 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROc6U-0005Fg-Cj
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 16:24:10 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 22:30:11 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.7105.1320960249.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4337 - 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, 10 Nov 2011 21:24:08 -0000

Author: danydb
Date: 2011-11-10 22:30:09 +0100 (Thu, 10 Nov 2011)
New Revision: 4337

Modified:
   phpcompta/trunk/include/class_extension.php
Log:
remove comment

Modified: phpcompta/trunk/include/class_extension.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_extension.php	2011-11-10 21:29:44 UTC (=
rev 4336)
+++ phpcompta/trunk/include/class_extension.php	2011-11-10 21:30:09 UTC (=
rev 4337)
@@ -40,9 +40,6 @@
=20
 class Extension extends Menu_Ref_sql
 {
-	/**
-	 * @todo to be rewritten
-	 */
     public function verify()
     {
         // Verify that the elt we want to add is correct



From MAILER-DAEMON Thu Nov 10 16:25:00 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROc7I-0005Gw-Sg
	for mharc-phpcompta-dev@gnu.org; Thu, 10 Nov 2011 16:25:00 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2011 22:31:01 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.7106.1320960300.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4338 - 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, 10 Nov 2011 21:24:59 -0000

Author: danydb
Date: 2011-11-10 22:31:00 +0100 (Thu, 10 Nov 2011)
New Revision: 4338

Modified:
   phpcompta/trunk/include/opening.inc.php
Log:
remove comment

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	2011-11-10 21:30:09 UTC (rev =
4337)
+++ phpcompta/trunk/include/opening.inc.php	2011-11-10 21:31:00 UTC (rev =
4338)
@@ -254,9 +254,6 @@
 }
 // if sa=3Dstep4 then record it
 //
-/*
- * @todo finir les ouvertures d'ann=C3=A9e
- */
 if ($_REQUEST['sa'] =3D=3D 'step5')
 {
 	$ledger =3D new Acc_Ledger($cn, $_REQUEST['p_jrn']);



From MAILER-DAEMON Fri Nov 11 09:10:15 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROro7-0003xN-4O
	for mharc-phpcompta-dev@gnu.org; Fri, 11 Nov 2011 09:10:15 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 11 Nov 2011 15:15:58 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.8141.1321020614.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4339 - 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: Fri, 11 Nov 2011 14:10:13 -0000

Author: danydb
Date: 2011-11-11 15:15:56 +0100 (Fri, 11 Nov 2011)
New Revision: 4339

Added:
   phpcompta/trunk/include/user_detail.inc.php
Removed:
   phpcompta/trunk/html/priv_user.php
Log:
rewritting priv_user.php

Deleted: phpcompta/trunk/html/priv_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/priv_user.php	2011-11-10 21:31:00 UTC (rev 4338)
+++ phpcompta/trunk/html/priv_user.php	2011-11-11 14:15:56 UTC (rev 4339)
@@ -1,271 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/*! \file
- * \brief Users Security
- */
-include_once("ac_common.php");
-require_once('class_database.php');
-include_once("user_menu.php");
-html_page_start($_SESSION['g_theme']);
-
-$rep=3Dnew Database();
-include_once ("class_user.php");
-$User=3Dnew User($rep);
-$User->Check();
-/* only the global admin can modify something here
- */
-if ($User->admin !=3D 1)
-{
-    html_page_stop();
-    return;
-}
-
-if (! isset ($_REQUEST['UID'])  )
-{
-    html_page_stop();
-    exit();
-}
-$uid=3D$_REQUEST['UID'];
-$UserChange=3Dnew User($rep,$uid);
-
-$r_UID=3D$UserChange->id;
-if ( $r_UID =3D=3D false )
-{
-    // Message d'erreur
-    html_page_stop();
-}
-echo '<H2 class=3D"info"> Administration Globale</H2>';
-
-echo "<div>".MenuAdmin()."</div>";
-
-echo '<DIV class=3D"content" style=3D"width:80%;margin-left:10%">';
-
-echo '<h2>Gestion Utilisateurs</h2>';
-
-// User is valid and you're an admin
-
-
-?>
-
-
-
-<?php
-/* Parse the changes */
-if ( isset ( $_GET['reset_passwd']) )
-{
-    $cn=3Dnew Database();
-    $l_pass=3Dmd5('phpcompta');
-    /* prevent to change the password of superadmin */
-    if ( $uid !=3D '1' )
-      {
-	$Res=3D$cn->exec_sql( "update ac_users set use_pass=3D$1 where use_id=3D=
$2",array($l_pass,$uid));
-	echo '<H2 class=3D"info"> Password remis =C3=A0 phpcompta</H2>';
-      }
-}
-/*  Save the changes */
-if ( isset ($_POST['SAVE']) )
-{
-    $uid =3D $_POST['UID'];
-
-    // Update User
-    $cn=3Dnew Database();
-    $last_name=3D$_POST['fname'];
-    $first_name=3D$_POST['lname'];
-    $UserChange=3Dnew User($cn,$uid);
-    if ( $UserChange->load()=3D=3D-1)
-    {
-        alert("Cet utilisateur n'existe pas");
-    }
-    else
-    {
-        $UserChange->first_name=3D$first_name;
-        $UserChange->last_name=3D$last_name;
-        $UserChange->active=3D$_POST['Actif'];
-        $UserChange->admin=3D$_POST['Admin'];
-        $UserChange->save();
-
-        // Update Priv on Folder
-        foreach ($_POST as $name=3D>$elem)
-        {
-            if ( substr_count($name,'PRIV')!=3D0 )
-            {
-                $db_id=3Dsubstr($name,4);
-                $cn=3Dnew Database();
-                $UserChange->set_folder_access($db_id,$elem);
-
-            }
-
-        }
-    }
-}
-else
-{
-    if ( isset ($_POST["DELETE"]) )
-    {
-        $cn=3Dnew Database();
-        $Res=3D$cn->exec_sql("delete from priv_user where priv_jnt in ( =
select jnt_id from jnt_use_dos where use_id=3D$1",array($uid));
-        $Res=3D$cn->exec_sql("delete from jnt_use_dos where use_id=3D$1"=
,array($uid));
-        $Res=3D$cn->exec_sql("delete from ac_users where use_id=3D$1",ar=
ray($uid));
-
-        echo "<center><H2 class=3D\"info\"> User ".h($_POST['fname'])." =
".h($_POST['lname'])." (".
-        h($_POST['login']).") est effac=C3=A9</H2></CENTER>";
-        require_once("class_iselect.php");
-        require_once("user.inc.php");
-        return;
-    }
-}
-$UserChange->load();
-?>
-<FORM ACTION=3D"priv_user.php" METHOD=3D"POST">
-
-                                    <?php printf('<INPUT TYPE=3DHIDDEN N=
AME=3DUID VALUE=3D"%s">',$uid);
-?>
-<TABLE BORDER=3D0>
-              <TR>
-
-              <?php printf('<td>login</td><td> %s</td>',$UserChange->log=
in);
-?>
-</TD></tr>
-<TR><TD>
-<?php printf('Nom de famille </TD><td><INPUT class=3D"input_text"  type=3D=
"text" NAME=3D"fname" value=3D"%s"> ',$UserChange->name);
-?>
-</TD></TR>
-<?php printf('<td>pr=C3=A9nom</td><td>
-             <INPUT class=3D"input_text" type=3D"text" NAME=3D"lname" va=
lue=3D"%s"> ',$UserChange->first_name);
-?>
-</TD>
-</TR>
-</table>
-
-<TABLE>
-<?php
-if ( $UserChange->active =3D=3D 1 )
-{
-    $ACT=3D"CHECKED";
-    $NACT=3D"UNCHECKED";
-}
-else
-{
-    $ACT=3D"UNCHECKED";
-    $NACT=3D"CHECKED";
-}
-echo "<TR><TD>";
-printf('<INPUT type=3D"RADIO" NAME=3D"Actif" VALUE=3D"1" %s> Actif',$ACT=
);
-echo "</TD><TD>";
-printf('<INPUT type=3D"RADIO" NAME=3D"Actif" VALUE=3D"0" %s> Non Actif',=
$NACT);
-echo "</TD></TR>";
-?>
-</TABLE>
-</TD>
-<TD>
-<TABLE>
-<?php
-if ( $UserChange->admin =3D=3D 1 )
-{
-    $ACT=3D"CHECKED";
-    $NACT=3D"UNCHECKED";
-}
-else
-{
-    $ACT=3D"UNCHECKED";
-    $NACT=3D"CHECKED";
-}
-echo "<TR><TD>";
-printf('<INPUT type=3D"RADIO" NAME=3D"Admin" VALUE=3D"1" %s> Administrat=
eur global',$ACT);
-echo "</TD><TD>";
-printf('<INPUT type=3D"RADIO" NAME=3D"Admin" VALUE=3D"0" %s> Pas adminis=
trateur global ',$NACT);
-echo "</TD></TR>";
-?>
-</TABLE>
-</TD>
-</TR>
-<TR>
-<TD>
-<!-- Show all database and rights -->
-<H2 class=3D"info"> Droit sur les dossiers pour les utilisateurs normaux=
 </H2>
-                      <p class=3D"notice">
-                                   Les autres droits doivent =C3=AAtre r=
=C3=A9gl=C3=A9s dans les dossiers (param=C3=A8tre->s=C3=A9curit=C3=A9)
-                                   </p>
-                                   <TABLE>
-                                   <?php
-                                   $array=3Darray(
-                                              array('value'=3D>'X','labe=
l'=3D>'Aucun Acc=C3=A8s'),
-                                              array('value'=3D>'R','labe=
l'=3D>'Utilisateur normal'),
-                                              array('value'=3D>'P','labe=
l'=3D>'Utilisateur uniquement extension'),
-                                              array('value'=3D>'L','labe=
l'=3D>'Administrateur local(Tous les droits)')
-                                          );
-$repo=3Dnew Dossier(0);
-
-$Dossier=3D$repo->show_dossier('all',1,0);
-if (  empty ( $Dossier ))
-{
-    echo hb('* Aucun Dossier *');
-    echo '</div>';
-    exit();
-}
-
-$mod_user=3Dnew User(new Database(),$uid);
-foreach ( $Dossier as $rDossier)
-{
-
-    $priv=3D$mod_user->get_folder_access($rDossier['dos_id']);
-    printf("<TR><TD> Dossier : %s </TD>",h($rDossier['dos_name']));
-
-    $select=3Dnew ISelect();
-    $select->table=3D1;
-    $select->name=3Dsprintf('PRIV%s',$rDossier['dos_id']);
-    $select->value=3D$array;
-    $select->selected=3D$priv;
-    echo $select->input();
-    echo "</TD></TR>";
-}
-
-?>
-</TABLE>
-
-<?php echo HtmlInput::button_anchor('Reinitialiser le mot de passe',
-                                    sprintf('priv_user.php?reset_passwd&=
UID=3D%s',$uid));
-?>
-
-
-
-<input type=3D"Submit" class=3D"button" NAME=3D"SAVE" VALUE=3D"Sauver le=
s changements">
-
-                                       <input type=3D"Submit"  class=3D"=
button" NAME=3D"DELETE" VALUE=3D"Effacer" onclick=3D"return confirm('Conf=
irmer effacement ?');" >
-
-                                                                       <=
/FORM>
-                                                                       <=
?  echo HtmlInput::button_anchor('Retour','admin_repo.php?action=3Duser_m=
gt');
-?>
-</DIV>
-
-
-
-
-
-
-
-
-
-
-<?php
-html_page_stop();
-?>
-
-

Copied: phpcompta/trunk/include/user_detail.inc.php (from rev 4338, phpco=
mpta/trunk/html/priv_user.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user_detail.inc.php	                        (=
rev 0)
+++ phpcompta/trunk/include/user_detail.inc.php	2011-11-11 14:15:56 UTC (=
rev 4339)
@@ -0,0 +1,271 @@
+<?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
+*/
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+/*! \file
+ * \brief Users Security
+ */
+include_once("ac_common.php");
+require_once('class_database.php');
+include_once("user_menu.php");
+html_page_start($_SESSION['g_theme']);
+
+$rep=3Dnew Database();
+include_once ("class_user.php");
+$User=3Dnew User($rep);
+$User->Check();
+/* only the global admin can modify something here
+ */
+if ($User->admin !=3D 1)
+{
+    html_page_stop();
+    return;
+}
+
+if (! isset ($_REQUEST['UID'])  )
+{
+    html_page_stop();
+    exit();
+}
+$uid=3D$_REQUEST['UID'];
+$UserChange=3Dnew User($rep,$uid);
+
+$r_UID=3D$UserChange->id;
+if ( $r_UID =3D=3D false )
+{
+    // Message d'erreur
+    html_page_stop();
+}
+echo '<H2 class=3D"info"> Administration Globale</H2>';
+
+echo "<div>".MenuAdmin()."</div>";
+
+echo '<DIV class=3D"content" style=3D"width:80%;margin-left:10%">';
+
+echo '<h2>Gestion Utilisateurs</h2>';
+
+// User is valid and you're an admin
+
+
+?>
+
+
+
+<?php
+/* Parse the changes */
+if ( isset ( $_GET['reset_passwd']) )
+{
+    $cn=3Dnew Database();
+    $l_pass=3Dmd5('phpcompta');
+    /* prevent to change the password of superadmin */
+    if ( $uid !=3D '1' )
+      {
+	$Res=3D$cn->exec_sql( "update ac_users set use_pass=3D$1 where use_id=3D=
$2",array($l_pass,$uid));
+	echo '<H2 class=3D"info"> Password remis =C3=A0 phpcompta</H2>';
+      }
+}
+/*  Save the changes */
+if ( isset ($_POST['SAVE']) )
+{
+    $uid =3D $_POST['UID'];
+
+    // Update User
+    $cn=3Dnew Database();
+    $last_name=3D$_POST['fname'];
+    $first_name=3D$_POST['lname'];
+    $UserChange=3Dnew User($cn,$uid);
+    if ( $UserChange->load()=3D=3D-1)
+    {
+        alert("Cet utilisateur n'existe pas");
+    }
+    else
+    {
+        $UserChange->first_name=3D$first_name;
+        $UserChange->last_name=3D$last_name;
+        $UserChange->active=3D$_POST['Actif'];
+        $UserChange->admin=3D$_POST['Admin'];
+        $UserChange->save();
+
+        // Update Priv on Folder
+        foreach ($_POST as $name=3D>$elem)
+        {
+            if ( substr_count($name,'PRIV')!=3D0 )
+            {
+                $db_id=3Dsubstr($name,4);
+                $cn=3Dnew Database();
+                $UserChange->set_folder_access($db_id,$elem);
+
+            }
+
+        }
+    }
+}
+else
+{
+    if ( isset ($_POST["DELETE"]) )
+    {
+        $cn=3Dnew Database();
+        $Res=3D$cn->exec_sql("delete from priv_user where priv_jnt in ( =
select jnt_id from jnt_use_dos where use_id=3D$1",array($uid));
+        $Res=3D$cn->exec_sql("delete from jnt_use_dos where use_id=3D$1"=
,array($uid));
+        $Res=3D$cn->exec_sql("delete from ac_users where use_id=3D$1",ar=
ray($uid));
+
+        echo "<center><H2 class=3D\"info\"> User ".h($_POST['fname'])." =
".h($_POST['lname'])." (".
+        h($_POST['login']).") est effac=C3=A9</H2></CENTER>";
+        require_once("class_iselect.php");
+        require_once("user.inc.php");
+        return;
+    }
+}
+$UserChange->load();
+?>
+<FORM ACTION=3D"priv_user.php" METHOD=3D"POST">
+
+                                    <?php printf('<INPUT TYPE=3DHIDDEN N=
AME=3DUID VALUE=3D"%s">',$uid);
+?>
+<TABLE BORDER=3D0>
+              <TR>
+
+              <?php printf('<td>login</td><td> %s</td>',$UserChange->log=
in);
+?>
+</TD></tr>
+<TR><TD>
+<?php printf('Nom de famille </TD><td><INPUT class=3D"input_text"  type=3D=
"text" NAME=3D"fname" value=3D"%s"> ',$UserChange->name);
+?>
+</TD></TR>
+<?php printf('<td>pr=C3=A9nom</td><td>
+             <INPUT class=3D"input_text" type=3D"text" NAME=3D"lname" va=
lue=3D"%s"> ',$UserChange->first_name);
+?>
+</TD>
+</TR>
+</table>
+
+<TABLE>
+<?php
+if ( $UserChange->active =3D=3D 1 )
+{
+    $ACT=3D"CHECKED";
+    $NACT=3D"UNCHECKED";
+}
+else
+{
+    $ACT=3D"UNCHECKED";
+    $NACT=3D"CHECKED";
+}
+echo "<TR><TD>";
+printf('<INPUT type=3D"RADIO" NAME=3D"Actif" VALUE=3D"1" %s> Actif',$ACT=
);
+echo "</TD><TD>";
+printf('<INPUT type=3D"RADIO" NAME=3D"Actif" VALUE=3D"0" %s> Non Actif',=
$NACT);
+echo "</TD></TR>";
+?>
+</TABLE>
+</TD>
+<TD>
+<TABLE>
+<?php
+if ( $UserChange->admin =3D=3D 1 )
+{
+    $ACT=3D"CHECKED";
+    $NACT=3D"UNCHECKED";
+}
+else
+{
+    $ACT=3D"UNCHECKED";
+    $NACT=3D"CHECKED";
+}
+echo "<TR><TD>";
+printf('<INPUT type=3D"RADIO" NAME=3D"Admin" VALUE=3D"1" %s> Administrat=
eur global',$ACT);
+echo "</TD><TD>";
+printf('<INPUT type=3D"RADIO" NAME=3D"Admin" VALUE=3D"0" %s> Pas adminis=
trateur global ',$NACT);
+echo "</TD></TR>";
+?>
+</TABLE>
+</TD>
+</TR>
+<TR>
+<TD>
+<!-- Show all database and rights -->
+<H2 class=3D"info"> Droit sur les dossiers pour les utilisateurs normaux=
 </H2>
+                      <p class=3D"notice">
+                                   Les autres droits doivent =C3=AAtre r=
=C3=A9gl=C3=A9s dans les dossiers (param=C3=A8tre->s=C3=A9curit=C3=A9)
+                                   </p>
+                                   <TABLE>
+                                   <?php
+                                   $array=3Darray(
+                                              array('value'=3D>'X','labe=
l'=3D>'Aucun Acc=C3=A8s'),
+                                              array('value'=3D>'R','labe=
l'=3D>'Utilisateur normal'),
+                                              array('value'=3D>'P','labe=
l'=3D>'Utilisateur uniquement extension'),
+                                              array('value'=3D>'L','labe=
l'=3D>'Administrateur local(Tous les droits)')
+                                          );
+$repo=3Dnew Dossier(0);
+
+$Dossier=3D$repo->show_dossier('all',1,0);
+if (  empty ( $Dossier ))
+{
+    echo hb('* Aucun Dossier *');
+    echo '</div>';
+    exit();
+}
+
+$mod_user=3Dnew User(new Database(),$uid);
+foreach ( $Dossier as $rDossier)
+{
+
+    $priv=3D$mod_user->get_folder_access($rDossier['dos_id']);
+    printf("<TR><TD> Dossier : %s </TD>",h($rDossier['dos_name']));
+
+    $select=3Dnew ISelect();
+    $select->table=3D1;
+    $select->name=3Dsprintf('PRIV%s',$rDossier['dos_id']);
+    $select->value=3D$array;
+    $select->selected=3D$priv;
+    echo $select->input();
+    echo "</TD></TR>";
+}
+
+?>
+</TABLE>
+
+<?php echo HtmlInput::button_anchor('Reinitialiser le mot de passe',
+                                    sprintf('priv_user.php?reset_passwd&=
UID=3D%s',$uid));
+?>
+
+
+
+<input type=3D"Submit" class=3D"button" NAME=3D"SAVE" VALUE=3D"Sauver le=
s changements">
+
+                                       <input type=3D"Submit"  class=3D"=
button" NAME=3D"DELETE" VALUE=3D"Effacer" onclick=3D"return confirm('Conf=
irmer effacement ?');" >
+
+                                                                       <=
/FORM>
+                                                                       <=
?  echo HtmlInput::button_anchor('Retour','admin_repo.php?action=3Duser_m=
gt');
+?>
+</DIV>
+
+
+
+
+
+
+
+
+
+
+<?php
+html_page_stop();
+?>
+
+



From MAILER-DAEMON Fri Nov 11 10:36:17 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROt9N-0003fD-Fs
	for mharc-phpcompta-dev@gnu.org; Fri, 11 Nov 2011 10:36:17 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 11 Nov 2011 16:42:11 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.9047.1321025776.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4340 - in phpcompta/trunk: html html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Nov 2011 15:36:16 -0000

Author: danydb
Date: 2011-11-11 16:42:09 +0100 (Fri, 11 Nov 2011)
New Revision: 4340

Added:
   phpcompta/trunk/include/ajax_bank_saldo.inc.php.php
Removed:
   phpcompta/trunk/html/get_pj.php
Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/get_saldo.php
   phpcompta/trunk/html/js/ajax_fiche.js
   phpcompta/trunk/html/show_document_modele.php
   phpcompta/trunk/include/class_dossier.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_user.php
   phpcompta/trunk/include/user.inc.php
   phpcompta/trunk/include/user_detail.inc.php
Log:
move get_pj.php to include/ajax_bank_saldo.inc.php
Add security to show_document_modele with User::check_module
Rewriting of admin > utilisateur


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	2011-11-11 14:15:56 UTC (rev 4339)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-11 15:42:09 UTC (rev 4340)
@@ -521,4 +521,7 @@
 		$new=3Dfalse;
 		require_once 'template/plugin_detail.php';
 		break;
-}
+         case 'saldo':
+             require_once 'ajax_bank_saldo.inc.php';
+             break;
+}
\ No newline at end of file

Deleted: phpcompta/trunk/html/get_pj.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/get_pj.php	2011-11-11 14:15:56 UTC (rev 4339)
+++ phpcompta/trunk/html/get_pj.php	2011-11-11 15:42:09 UTC (rev 4340)
@@ -1,67 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief respond ajax request, the get contains
- *  the value :
- * - l for ledger
- * - gDossier
- * Must return at least tva, htva and tvac
-
- */
-
-require_once ('constant.php');
-require_once ('class_database.php');
-require_once('class_dossier.php');
-require_once('class_acc_ledger.php');
-require_once ('class_user.php');
-
-// Check if the needed field does exist
-extract ($_GET);
-foreach (array('l','gDossier') as $a)
-{
-    if ( ! isset (${$a}) )
-    {
-        echo "error $a is not set ";
-        exit();
-    }
-
-}
-if ( is_numeric($l) =3D=3D false  )
-{
-    exit();
-}
-$cn=3Dnew Database(dossier::id());
-$User=3Dnew User($cn);
-$User->Check();
-
-$Ledger=3Dnew Acc_Ledger($cn,$l);
-$prop=3D$Ledger->get_propertie();
-$pj_seq=3D$Ledger->guess_pj();
-$string=3D'{"pj":"'.$pj_seq.'"}';
-
-header("Content-type: text/json; charset: utf8",true);
-echo $string;
-
-
-?>
-

Modified: phpcompta/trunk/html/get_saldo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/get_saldo.php	2011-11-11 14:15:56 UTC (rev 4339)
+++ phpcompta/trunk/html/get_saldo.php	2011-11-11 15:42:09 UTC (rev 4340)
@@ -60,7 +60,6 @@
 $solde=3D$res['solde'];
 if ( $res['debit'] < $res['credit'] ) $solde=3D$solde*(-1);
=20
-//header("Content-type: text/html; charset: utf8",true);
 echo '{"saldo":"'.$solde.'"}';
=20
=20

Modified: phpcompta/trunk/html/js/ajax_fiche.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/ajax_fiche.js	2011-11-11 14:15:56 UTC (rev 43=
39)
+++ phpcompta/trunk/html/js/ajax_fiche.js	2011-11-11 15:42:09 UTC (rev 43=
40)
@@ -187,12 +187,12 @@
     var gDossier=3D$('gDossier').value;
     var ctl_value=3Dtrim($(p_ctl).value);
     var jrn=3D$('p_jrn').value;
-    queryString=3D"FID=3D"+ctl_value;
+    queryString=3D"FID=3D"+ctl_value+"&op=3Dsaldo";
     queryString=3DqueryString+'&gDossier=3D'+gDossier+'&j=3D'+jrn;
     queryString=3DqueryString+'&ctl=3D'+ctl_value;
     /*  alert(queryString); */
     var action=3Dnew Ajax.Request (
-                   "get_saldo.php",
+                   "ajax_misc.php",
                    {
                    method:'get',
                    parameters:queryString,

Modified: phpcompta/trunk/html/show_document_modele.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_document_modele.php	2011-11-11 14:15:56 UTC=
 (rev 4339)
+++ phpcompta/trunk/html/show_document_modele.php	2011-11-11 15:42:09 UTC=
 (rev 4340)
@@ -32,10 +32,11 @@
=20
=20
 require_once ('class_user.php');
-$User=3Dnew User(new Database());
+$User=3Dnew User($cn);
 /*!\todo Add security here
  */
 $User->Check();
+if ( $User->check_module("CFGDOCUMENT") =3D=3D 0 ) exit();
 // retrieve the document
 $r=3D$cn->exec_sql("select md_id,md_lob,md_filename,md_mimetype
                  from document_modele where md_id=3D$1",array($_REQUEST[=
'md_id']));

Copied: phpcompta/trunk/include/ajax_bank_saldo.inc.php.php (from rev 433=
9, phpcompta/trunk/html/get_pj.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_bank_saldo.inc.php.php	                 =
       (rev 0)
+++ phpcompta/trunk/include/ajax_bank_saldo.inc.php.php	2011-11-11 15:42:=
09 UTC (rev 4340)
@@ -0,0 +1,67 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ * \brief respond ajax request, the get contains
+ *  the value :
+ * - l for ledger
+ * - gDossier
+ * Must return at least tva, htva and tvac
+
+ */
+
+require_once ('constant.php');
+require_once ('class_database.php');
+require_once('class_dossier.php');
+require_once('class_acc_ledger.php');
+require_once ('class_user.php');
+
+// Check if the needed field does exist
+extract ($_GET);
+foreach (array('l','gDossier') as $a)
+{
+    if ( ! isset (${$a}) )
+    {
+        echo "error $a is not set ";
+        exit();
+    }
+
+}
+if ( is_numeric($l) =3D=3D false  )
+{
+    exit();
+}
+$cn=3Dnew Database(dossier::id());
+$User=3Dnew User($cn);
+$User->Check();
+
+$Ledger=3Dnew Acc_Ledger($cn,$l);
+$prop=3D$Ledger->get_propertie();
+$pj_seq=3D$Ledger->guess_pj();
+$string=3D'{"pj":"'.$pj_seq.'"}';
+
+header("Content-type: text/json; charset: utf8",true);
+echo $string;
+
+
+?>
+

Modified: phpcompta/trunk/include/class_dossier.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_dossier.php	2011-11-11 14:15:56 UTC (re=
v 4339)
+++ phpcompta/trunk/include/class_dossier.php	2011-11-11 15:42:09 UTC (re=
v 4340)
@@ -104,18 +104,35 @@
      * \brief Return all the users
      * as an array
      */
-    function get_user()
+    function get_user_folder($sql=3D"")
     {
-        $sql=3D"select * from ac_users where use_login!=3D'phpcompta'";
-        $Res=3D$this->cn->exec_sql($sql);
-        $Num=3D$this->cn->size();
-        if ( $Num =3D=3D 0 ) return null;
-        for ($i=3D0;$i < $Num; $i++)
-        {
-            $User[]=3D$this->cn->fetch($i);
+       =20
+        $sql=3D"
+            select
+                use_id,
+                use_first_name,
+                use_name,
+                use_login,
+                use_active,
+                use_admin,
+                ag_dossier
+            from
+            ac_users  as ac
+            left join    (select array_to_string(array_agg(dos_name),','=
) as ag_dossier,jt.use_id as jt_use_id
+                        from ac_dossier as ds
+                        join  jnt_use_dos as jt on (jt.dos_id=3Dds.dos_i=
d)
+                        join priv_user as pu on (pu.priv_jnt=3Djt.jnt_id=
)
+                        where
+                        pu.priv_priv !=3D 'X'
+                        group by jt.use_id) as dossier_name on (jt_use_i=
d=3Dac.use_id)
+            where
+            use_login!=3D'phpcompta'
+            $sql
+            ";
+       =20
+        $res=3D$this->cn->get_array($sql);
+        return $res;
         }
-        return $User;
-    }
=20
     /*!\brief check if gDossier is set */
     static function check()

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	2011-11-11 14:15:56 UTC =
(rev 4339)
+++ phpcompta/trunk/include/class_html_input.php	2011-11-11 15:42:09 UTC =
(rev 4340)
@@ -595,4 +595,25 @@
 		$r.=3Dh2info($name);
 		return $r;
 	}
+        /**
+         *Return a simple anchor with a url or a javascript
+         * if $p_js is not null then p_url will be javascript:void(0)
+         * we don't add the event onclick. You must give p_url OR p_js
+         * default CSS class=3Dline
+         * @param string $p_text text of the anchor
+         * @param string $p_url  url
+         * @param string $p_js javascript
+         */
+      static function anchor($p_text,$p_url=3D"",$p_js=3D"")
+      {
+          if ($p_js !=3D "")
+          {
+              $p_url=3D"javascript:void(0)";
+          }
+         =20
+ =20
+          $str=3Dsprintf('<a class=3D"line" href=3D"%s" %s>%s</a>',
+                  $p_url,$p_js,$p_text);
+          return $str;
+      }
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2011-11-11 14:15:56 UTC (rev 4=
339)
+++ phpcompta/trunk/include/class_user.php	2011-11-11 15:42:09 UTC (rev 4=
340)
@@ -123,9 +123,9 @@
 	{
=20
 		$Sql =3D "update ac_users set use_first_name=3D$1, use_name=3D$2
-             ,use_active=3D$3,use_admin=3D$4 where use_id=3D$5";
+             ,use_active=3D$3,use_admin=3D$4,use_pass=3D$5 where use_id=3D=
$6";
 		$cn =3D new Database();
-		$Res =3D $cn->exec_sql($Sql, array($this->first_name, $this->last_name=
, $this->active, $this->admin, $this->id));
+		$Res =3D $cn->exec_sql($Sql, array($this->first_name, $this->last_name=
, $this->active, $this->admin, $this->pass,$this->id));
 	}
=20
 	/* !
@@ -503,7 +503,23 @@
=20
 		return $l_array;
 	}
-
+        /**
+         * Check if an user can access a module, return 1 if yes, otherw=
ise 0
+         * record in audit log
+         * @param string $p_module menu_ref.me_code
+         */
+        function check_module($p_module)
+        {
+            $acc=3D$this->db->get_value("select count(*) from v_all_menu=
 where user_name =3D $1=20
+                and me_code=3D$2", array($this->login,$p_module));
+            if ($acc =3D=3D 0)
+            {
+                $this->audit("FAIL",$p_module);
+                return 0;
+            }
+            $this->audit("SUCCESS",$p_module);
+            return 1;
+        }
 	/* !
 	 * \brief  Check if an user is allowed to do an action
 	 * \param p_action_id
@@ -964,14 +980,24 @@
 		}
 		return $array;
 	}
-	function audit()
+	function audit($action=3D'AUDIT',$p_module=3D"")
 	{
 		global $audit;
+                if ($p_module=3D=3D"")
+                {
+                    $p_module=3D$_REQUEST['ac'];
+                }
 		$cn =3D new Database();
 		$sql =3D "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac=
_state) values ($1,$2,$3,$4,$5)";
 		if ($audit)
 		{
-				$cn->exec_sql($sql, array($_SESSION['g_user'], $_SERVER["REMOTE_ADDR=
"], $_REQUEST['ac'], $_SERVER['REQUEST_URI'], 'AUDIT'));
+				$cn->exec_sql($sql,=20
+                                        array(
+                                            $_SESSION['g_user'],=20
+                                            $_SERVER["REMOTE_ADDR"],=20
+                                            $p_module,=20
+                                            $_SERVER['REQUEST_URI'],=20
+                                            $action));
 		}
 	}
=20

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	2011-11-11 14:15:56 UTC (rev 433=
9)
+++ phpcompta/trunk/include/user.inc.php	2011-11-11 15:42:09 UTC (rev 434=
0)
@@ -23,11 +23,14 @@
 /*!\file
  *
  *
- * \brief user managemnt
+ * \brief user managemnt, included from admin_repo,=20
+ * action=3Duser_mgt
  *
  */
-
+require_once 'class_sort_table.php';
+/******************************************************/
 // Add user
+/******************************************************/
 if ( isset ($_POST["LOGIN"]) )
 {
     $cn=3Dnew Database();
@@ -46,10 +49,6 @@
                        array($first_name,$last_name,$login,$pass5));
 } //SET login
=20
-// Show all the existing user on 7 columns
-$repo=3Dnew Dossier(0);
-$cn=3D$repo->get_user();
-$compteur=3D0;
 ?>
 <div class=3D"content" style=3D"width:80%;margin-left:10%">
 <h2>Gestion Utilisateurs</h2>
@@ -68,33 +67,69 @@
=20
 ?>
 </FORM>
-
-<TABLE><TR>
 <?php
-if ( $cn !=3D null )
+// Show all the existing user on 7 columns
+$repo=3Dnew Dossier(0);
+/******************************************************/
+// Detail of a user
+/******************************************************/
+if ( isset($_REQUEST['det']))
 {
-    foreach ( $cn as $rUser)
+    require_once("user_detail.inc.php");
+ =20
+    exit();
+}
+
+   =20
+$compteur=3D0;
+$header=3Dnew Sort_Table();
+$url=3Dbasename($_SERVER['PHP_SELF'])."&action=3D".$_REQUEST['action'];
+$header->add("Login", $url," order by use_login asc", "order by use_logi=
n desc","la", "ld");
+$header->add("Nom", $url," order by use_login asc", "order by use_login =
desc","la", "ld");
+$header->add('Dossier',$url,' order by dossier_ag asc','order by dossier=
_ag desc',
+        'da','dd');       =20
+$ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la';
+$sql=3D$header->get_sql_order($ord);
+
+$a_user=3D$repo->get_user_folder($sql);
+
+if ( !empty ($a_user) )
+{
+    echo '<table class=3D"result">';
+    echo '<tr>';
+    echo '<th>'.$header->get_header(0).'</th>';
+    echo '<th>'.$header->get_header(1).'</th>';
+    echo th("Pr=C3=A9nom");
+    echo th("Actif");
+    echo '<th>'.$header->get_header(2).'</th>';
+    echo '</tr>';
+   =20
+    foreach ( $a_user as $r_user)
     {
         $compteur++;
-        if ( $compteur=3D=3D0 ) echo "<TR>";
-        if ( $compteur%3 =3D=3D 0)     echo "</TR><TR>";
+        $class=3D($compteur%2=3D=3D0)?"odd":"even";
+       =20
+        echo "<tr $class>";
         if ( $rUser['use_active'] =3D=3D 0 )
         {
-            $Active=3D"not actif";
+            $Active=3D"non actif";
         }
         else
         {
-            $Active=3D"";
+            $Active=3D"Actif";
         }
-        printf('<TD><A HREF=3Dpriv_user.php?UID=3D%s> %s %s ( %s )</A> %=
s </TD>',
-               $rUser['use_id'],
-               $rUser['use_first_name'],
-               $rUser['use_name'],
-               $rUser['use_login'],
-               $Active);
+        $det_url=3D$url."&det&use_id=3D".$r_user['use_id'];
+        echo "<td>";
+        echo HtmlInput::anchor($r_user['use_login'],$det_url);
+        echo "</td>";
+       =20
+        echo td($r_user['use_name']);
+        echo td($r_user['use_first_name']);
+        echo td($Active);
+        echo '</tr>';
     }// foreach
+    echo '</table>';
 } // $cn !=3D null
 ?>
-</TABLE>
=20
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/user_detail.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user_detail.inc.php	2011-11-11 14:15:56 UTC (=
rev 4339)
+++ phpcompta/trunk/include/user_detail.inc.php	2011-11-11 15:42:09 UTC (=
rev 4340)
@@ -15,244 +15,212 @@
  *   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
-*/
+ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/*! \file
+/* ! \file
  * \brief Users Security
  */
 include_once("ac_common.php");
 require_once('class_database.php');
 include_once("user_menu.php");
-html_page_start($_SESSION['g_theme']);
-
-$rep=3Dnew Database();
 include_once ("class_user.php");
-$User=3Dnew User($rep);
-$User->Check();
-/* only the global admin can modify something here
- */
-if ($User->admin !=3D 1)
-{
-    html_page_stop();
-    return;
-}
=20
-if (! isset ($_REQUEST['UID'])  )
+$rep =3D new Database();
+
+if (!isset($_REQUEST['use_id']))
 {
     html_page_stop();
     exit();
 }
-$uid=3D$_REQUEST['UID'];
-$UserChange=3Dnew User($rep,$uid);
+$uid =3D $_REQUEST['use_id'];
+$UserChange =3D new User($rep, $uid);
=20
-$r_UID=3D$UserChange->id;
-if ( $r_UID =3D=3D false )
+if ($UserChange->id =3D=3D false)
 {
     // Message d'erreur
     html_page_stop();
 }
-echo '<H2 class=3D"info"> Administration Globale</H2>';
=20
-echo "<div>".MenuAdmin()."</div>";
-
-echo '<DIV class=3D"content" style=3D"width:80%;margin-left:10%">';
-
-echo '<h2>Gestion Utilisateurs</h2>';
-
-// User is valid and you're an admin
-
-
-?>
-
-
-
-<?php
-/* Parse the changes */
-if ( isset ( $_GET['reset_passwd']) )
-{
-    $cn=3Dnew Database();
-    $l_pass=3Dmd5('phpcompta');
-    /* prevent to change the password of superadmin */
-    if ( $uid !=3D '1' )
-      {
-	$Res=3D$cn->exec_sql( "update ac_users set use_pass=3D$1 where use_id=3D=
$2",array($l_pass,$uid));
-	echo '<H2 class=3D"info"> Password remis =C3=A0 phpcompta</H2>';
-      }
-}
 /*  Save the changes */
-if ( isset ($_POST['SAVE']) )
+if (isset($_POST['SAVE']))
 {
     $uid =3D $_POST['UID'];
=20
     // Update User
-    $cn=3Dnew Database();
-    $last_name=3D$_POST['fname'];
-    $first_name=3D$_POST['lname'];
-    $UserChange=3Dnew User($cn,$uid);
-    if ( $UserChange->load()=3D=3D-1)
+    $cn =3D new Database();
+    $UserChange =3D new User($cn, $uid);
+    if ($UserChange->load() =3D=3D -1)
     {
         alert("Cet utilisateur n'existe pas");
     }
     else
     {
-        $UserChange->first_name=3D$first_name;
-        $UserChange->last_name=3D$last_name;
-        $UserChange->active=3D$_POST['Actif'];
-        $UserChange->admin=3D$_POST['Admin'];
+        $UserChange->first_name =3D $_POST['fname'];
+        $UserChange->last_name =3D $_POST['lname'];
+        $UserChange->active =3D $_POST['Actif'];
+        $UserChange->admin =3D $_POST['Admin'];
+        if ( trim($_POST['password'])<>'')
+        {
+                    $UserChange->pass =3D md5($_POST['pass']);
+        }
         $UserChange->save();
=20
         // Update Priv on Folder
-        foreach ($_POST as $name=3D>$elem)
+        foreach ($_POST as $name =3D> $elem)
         {
-            if ( substr_count($name,'PRIV')!=3D0 )
+            if (substr_count($name, 'PRIV') !=3D 0)
             {
-                $db_id=3Dsubstr($name,4);
-                $cn=3Dnew Database();
-                $UserChange->set_folder_access($db_id,$elem);
-
+                $db_id =3D substr($name, 4);
+                $cn =3D new Database();
+                $UserChange->set_folder_access($db_id, $elem);
             }
-
         }
     }
 }
 else
 {
-    if ( isset ($_POST["DELETE"]) )
+    if (isset($_POST["DELETE"]))
     {
-        $cn=3Dnew Database();
-        $Res=3D$cn->exec_sql("delete from priv_user where priv_jnt in ( =
select jnt_id from jnt_use_dos where use_id=3D$1",array($uid));
-        $Res=3D$cn->exec_sql("delete from jnt_use_dos where use_id=3D$1"=
,array($uid));
-        $Res=3D$cn->exec_sql("delete from ac_users where use_id=3D$1",ar=
ray($uid));
+        $cn =3D new Database();
+        $Res =3D $cn->exec_sql("delete from priv_user where priv_jnt in =
( select jnt_id from jnt_use_dos where use_id=3D$1", array($uid));
+        $Res =3D $cn->exec_sql("delete from jnt_use_dos where use_id=3D$=
1", array($uid));
+        $Res =3D $cn->exec_sql("delete from ac_users where use_id=3D$1",=
 array($uid));
=20
-        echo "<center><H2 class=3D\"info\"> User ".h($_POST['fname'])." =
".h($_POST['lname'])." (".
-        h($_POST['login']).") est effac=C3=A9</H2></CENTER>";
+        echo "<center><H2 class=3D\"info\"> User " . h($_POST['fname']) =
. " " . h($_POST['lname']) . " (" .
+        h($_POST['login']) . ") est effac=C3=A9</H2></CENTER>";
         require_once("class_iselect.php");
         require_once("user.inc.php");
         return;
     }
 }
 $UserChange->load();
+$it_pass=3Dnew IText('password');
+$it_pass->value=3D"";
 ?>
-<FORM ACTION=3D"priv_user.php" METHOD=3D"POST">
+<FORM  METHOD=3D"POST">
=20
-                                    <?php printf('<INPUT TYPE=3DHIDDEN N=
AME=3DUID VALUE=3D"%s">',$uid);
-?>
-<TABLE BORDER=3D0>
-              <TR>
+<?=3DHtmlInput::hidden('UID',$uid)?>
+    <TABLE BORDER=3D0>
+        <TR>
=20
-              <?php printf('<td>login</td><td> %s</td>',$UserChange->log=
in);
-?>
-</TD></tr>
-<TR><TD>
-<?php printf('Nom de famille </TD><td><INPUT class=3D"input_text"  type=3D=
"text" NAME=3D"fname" value=3D"%s"> ',$UserChange->name);
-?>
-</TD></TR>
-<?php printf('<td>pr=C3=A9nom</td><td>
-             <INPUT class=3D"input_text" type=3D"text" NAME=3D"lname" va=
lue=3D"%s"> ',$UserChange->first_name);
-?>
-</TD>
-</TR>
-</table>
+<?php printf('<td>login</td><td> %s</td>', $UserChange->login); ?>
+            </TD>
+        </tr>
+        <TR>
+            <TD>
+            <?php printf('Nom de famille </TD><td><INPUT class=3D"input_=
text"  type=3D"text" NAME=3D"lname" value=3D"%s"> ', $UserChange->name); =
?>
+            </TD>
+        </TR>
+        <TR>
+          <?php printf('<td>pr=C3=A9nom</td><td>
+             <INPUT class=3D"input_text" type=3D"text" NAME=3D"fname" va=
lue=3D"%s"> ', $UserChange->first_name);
+                ?>
+        </TD>
+        </TR>
+        <tr>
+            <td>
+                Mot de passe :<span class=3D"info">Laisser =C3=A0 VIDE p=
our ne PAS le changer</span>
+            </td>
+            <td>
+                <?=3D$it_pass->input();?>
+            </td>
+        </tr>
+    </table>
=20
-<TABLE>
+    <TABLE>
 <?php
-if ( $UserChange->active =3D=3D 1 )
+if ($UserChange->active =3D=3D 1)
 {
-    $ACT=3D"CHECKED";
-    $NACT=3D"UNCHECKED";
+    $ACT =3D "CHECKED";
+    $NACT =3D "UNCHECKED";
 }
 else
 {
-    $ACT=3D"UNCHECKED";
-    $NACT=3D"CHECKED";
+    $ACT =3D "UNCHECKED";
+    $NACT =3D "CHECKED";
 }
 echo "<TR><TD>";
-printf('<INPUT type=3D"RADIO" NAME=3D"Actif" VALUE=3D"1" %s> Actif',$ACT=
);
+printf('<INPUT type=3D"RADIO" NAME=3D"Actif" VALUE=3D"1" %s> Actif', $AC=
T);
 echo "</TD><TD>";
-printf('<INPUT type=3D"RADIO" NAME=3D"Actif" VALUE=3D"0" %s> Non Actif',=
$NACT);
+printf('<INPUT type=3D"RADIO" NAME=3D"Actif" VALUE=3D"0" %s> Non Actif',=
 $NACT);
 echo "</TD></TR>";
 ?>
-</TABLE>
+    </TABLE>
 </TD>
 <TD>
-<TABLE>
+    <TABLE>
 <?php
-if ( $UserChange->admin =3D=3D 1 )
+if ($UserChange->admin =3D=3D 1)
 {
-    $ACT=3D"CHECKED";
-    $NACT=3D"UNCHECKED";
+    $ACT =3D "CHECKED";
+    $NACT =3D "UNCHECKED";
 }
 else
 {
-    $ACT=3D"UNCHECKED";
-    $NACT=3D"CHECKED";
+    $ACT =3D "UNCHECKED";
+    $NACT =3D "CHECKED";
 }
 echo "<TR><TD>";
-printf('<INPUT type=3D"RADIO" NAME=3D"Admin" VALUE=3D"1" %s> Administrat=
eur global',$ACT);
+printf('<INPUT type=3D"RADIO" NAME=3D"Admin" VALUE=3D"1" %s> Administrat=
eur global', $ACT);
 echo "</TD><TD>";
-printf('<INPUT type=3D"RADIO" NAME=3D"Admin" VALUE=3D"0" %s> Pas adminis=
trateur global ',$NACT);
+printf('<INPUT type=3D"RADIO" NAME=3D"Admin" VALUE=3D"0" %s> Pas adminis=
trateur global ', $NACT);
 echo "</TD></TR>";
 ?>
-</TABLE>
+    </TABLE>
 </TD>
 </TR>
 <TR>
-<TD>
-<!-- Show all database and rights -->
-<H2 class=3D"info"> Droit sur les dossiers pour les utilisateurs normaux=
 </H2>
-                      <p class=3D"notice">
-                                   Les autres droits doivent =C3=AAtre r=
=C3=A9gl=C3=A9s dans les dossiers (param=C3=A8tre->s=C3=A9curit=C3=A9)
-                                   </p>
-                                   <TABLE>
-                                   <?php
-                                   $array=3Darray(
-                                              array('value'=3D>'X','labe=
l'=3D>'Aucun Acc=C3=A8s'),
-                                              array('value'=3D>'R','labe=
l'=3D>'Utilisateur normal'),
-                                              array('value'=3D>'P','labe=
l'=3D>'Utilisateur uniquement extension'),
-                                              array('value'=3D>'L','labe=
l'=3D>'Administrateur local(Tous les droits)')
-                                          );
-$repo=3Dnew Dossier(0);
+    <TD>
+        <!-- Show all database and rights -->
+        <H2 class=3D"info"> Droit sur les dossiers pour les utilisateurs=
 normaux </H2>
+        <p class=3D"notice">
+            Les autres droits doivent =C3=AAtre r=C3=A9gl=C3=A9s dans le=
s dossiers (param=C3=A8tre->s=C3=A9curit=C3=A9)
+        </p>
+        <TABLE>
+<?php
+$array =3D array(
+    array('value' =3D> 'X', 'label' =3D> 'Aucun Acc=C3=A8s'),
+    array('value' =3D> 'R', 'label' =3D> 'Utilisateur normal'),
+    array('value' =3D> 'L', 'label' =3D> 'Administrateur local(Tous les =
droits)')
+);
+$repo =3D new Dossier(0);
=20
-$Dossier=3D$repo->show_dossier('all',1,0);
-if (  empty ( $Dossier ))
+$Dossier =3D $repo->show_dossier('all', 1, 0);
+if (empty($Dossier))
 {
     echo hb('* Aucun Dossier *');
     echo '</div>';
     exit();
 }
=20
-$mod_user=3Dnew User(new Database(),$uid);
-foreach ( $Dossier as $rDossier)
+$mod_user =3D new User(new Database(), $uid);
+foreach ($Dossier as $rDossier)
 {
=20
-    $priv=3D$mod_user->get_folder_access($rDossier['dos_id']);
-    printf("<TR><TD> Dossier : %s </TD>",h($rDossier['dos_name']));
+    $priv =3D $mod_user->get_folder_access($rDossier['dos_id']);
+    printf("<TR><TD> Dossier : %s </TD>", h($rDossier['dos_name']));
=20
-    $select=3Dnew ISelect();
-    $select->table=3D1;
-    $select->name=3Dsprintf('PRIV%s',$rDossier['dos_id']);
-    $select->value=3D$array;
-    $select->selected=3D$priv;
+    $select =3D new ISelect();
+    $select->table =3D 1;
+    $select->name =3D sprintf('PRIV%s', $rDossier['dos_id']);
+    $select->value =3D $array;
+    $select->selected =3D $priv;
     echo $select->input();
     echo "</TD></TR>";
 }
-
 ?>
-</TABLE>
+        </TABLE>
=20
-<?php echo HtmlInput::button_anchor('Reinitialiser le mot de passe',
-                                    sprintf('priv_user.php?reset_passwd&=
UID=3D%s',$uid));
-?>
=20
=20
=20
-<input type=3D"Submit" class=3D"button" NAME=3D"SAVE" VALUE=3D"Sauver le=
s changements">
=20
-                                       <input type=3D"Submit"  class=3D"=
button" NAME=3D"DELETE" VALUE=3D"Effacer" onclick=3D"return confirm('Conf=
irmer effacement ?');" >
+        <input type=3D"Submit" class=3D"button" NAME=3D"SAVE" VALUE=3D"S=
auver les changements" onclick=3D"return confirm('Confirmer changement ?'=
);">
=20
-                                                                       <=
/FORM>
-                                                                       <=
?  echo HtmlInput::button_anchor('Retour','admin_repo.php?action=3Duser_m=
gt');
-?>
+        <input type=3D"Submit"  class=3D"button" NAME=3D"DELETE" VALUE=3D=
"Effacer" onclick=3D"return confirm('Confirmer effacement ?');" >
+
+</FORM>
+<? echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Duser=
_mgt'); ?>
 </DIV>
=20
=20



From MAILER-DAEMON Fri Nov 11 10:42:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROtEv-0005mb-42
	for mharc-phpcompta-dev@gnu.org; Fri, 11 Nov 2011 10:42:01 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 11 Nov 2011 16:47:56 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.9050.1321026120.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4341 - in phpcompta/trunk: html html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Nov 2011 15:41:59 -0000

Author: danydb
Date: 2011-11-11 16:47:55 +0100 (Fri, 11 Nov 2011)
New Revision: 4341

Added:
   phpcompta/trunk/include/ajax_bank_saldo.php.php
   phpcompta/trunk/include/ajax_update_predef.php.php
Removed:
   phpcompta/trunk/html/get_predef.php
   phpcompta/trunk/html/get_saldo.php
   phpcompta/trunk/include/ajax_bank_saldo.inc.php.php
Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/show_document.php
Log:
show_document.php  : add security
acc_ledger.js : move get_predef.php to include/ajax_up_predef.php
renaming files


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	2011-11-11 15:42:09 UTC (rev 4340)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-11 15:47:55 UTC (rev 4341)
@@ -522,6 +522,9 @@
 		require_once 'template/plugin_detail.php';
 		break;
          case 'saldo':
-             require_once 'ajax_bank_saldo.inc.php';
+             require_once 'ajax_bank_saldo.php';
              break;
+         case 'up_predef':
+             require_once 'ajax_update_predef.php';
+             break;
 }
\ No newline at end of file

Deleted: phpcompta/trunk/html/get_predef.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/get_predef.php	2011-11-11 15:42:09 UTC (rev 4340=
)
+++ phpcompta/trunk/html/get_predef.php	2011-11-11 15:47:55 UTC (rev 4341=
)
@@ -1,68 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief respond ajax request, the get contains
- *  the value :
- * - l for ledger=20
- * - gDossier
- * Must return at least tva, htva and tvac
- */
-
-require_once ('constant.php');
-require_once ('class_database.php');
-require_once('class_dossier.php');
-require_once('class_pre_operation.php');
-// Check if the needed field does exist
-extract ($_GET);
-foreach (array('l','t','d','gDossier') as $a)
-{
-    if ( ! isset (${$a}) )
-    {
-        echo "error $a is not set ";
-        exit();
-    }
-
-}
-$cn=3Dnew Database(dossier::id());
-$op=3Dnew Pre_operation_detail($cn);
-$op->set('ledger',$l);
-$op->set('ledger_type',$t);
-$op->set('direct',$d);
-$array=3D$op->get_operation();
-$string=3D'{"count":"'.count($array).'"';
-$idx=3D0;
-if (! empty($array))
-    foreach ($array as $a)
-{
-    $string.=3D',"value'.$idx.'":"'.$a['value'].'",';
-    $string.=3D'"label'.$idx.'":"'.$a['label'].'"';
-    $idx++;
-}
-$string.=3D"}";
-
-header("Content-type: text/json; charset: utf8",true);
-echo $string;
-
-
-?>
-

Deleted: phpcompta/trunk/html/get_saldo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/get_saldo.php	2011-11-11 15:42:09 UTC (rev 4340)
+++ phpcompta/trunk/html/get_saldo.php	2011-11-11 15:47:55 UTC (rev 4341)
@@ -1,66 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief get the saldo of a account
- * the get variable are :
- *  - l the jrn id
- *  - ctl the ctl where to get the quick_code
- */
-require_once('class_user.php');
-require_once('class_dossier.php');
-require_once('class_fiche.php');
-extract($_GET);
-/* check the parameters */
-foreach ( array('j','ctl') as $a )
-{
-    if ( ! isset(${$a}) )
-    {
-        echo "missing $a";
-        return;
-    }
-}
-
-$cn=3Dnew Database(dossier::id());
-$user=3Dnew User($cn);
-$user->check();
-if ( $user->check_jrn($_GET['j'])=3D=3D'X' ) return '{"saldo":"0"}';
-/*  make a filter on the exercice */
-
-$filter_year=3D"  j_tech_per in (select p_id from parm_periode ".
-             "where p_exercice=3D'".$user->get_exercice()."')";
-
-
-$id=3D$cn->get_value('select jrn_def_bank from jrn_def where jrn_def_id=3D=
$1',array($_GET['j']));
-$acc=3Dnew Fiche($cn,$id);
-
-$res=3D$acc->get_bk_balance($filter_year." and ( trim(jr_pj_number) !=3D=
 '' and jr_pj_number is not null)" );
-
-
-if ( empty($res) ) return '{"saldo":"0"}';
-$solde=3D$res['solde'];
-if ( $res['debit'] < $res['credit'] ) $solde=3D$solde*(-1);
-
-echo '{"saldo":"'.$solde.'"}';
-
-
-

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	2011-11-11 15:42:09 UTC (rev 43=
40)
+++ phpcompta/trunk/html/js/acc_ledger.js	2011-11-11 15:47:55 UTC (rev 43=
41)
@@ -32,10 +32,10 @@
 {
     var jrn=3Dg("p_jrn").value;
     var dossier=3Dg("gDossier").value;
-    var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn+'&t=3D'+p_type+'=
&d=3D'+p_direct;
+    var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn+'&t=3D'+p_type+'=
&d=3D'+p_direct+"&op=3Dup_predef";
     g("p_jrn_predef").value=3Djrn;
     var action=3Dnew Ajax.Request(
-                   "get_predef.php",
+                   "ajax_misc.php",
                    {
                    method:'get',
                    parameters:querystring,

Modified: phpcompta/trunk/html/show_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_document.php	2011-11-11 15:42:09 UTC (rev 4=
340)
+++ phpcompta/trunk/html/show_document.php	2011-11-11 15:47:55 UTC (rev 4=
341)
@@ -35,6 +35,7 @@
 $User=3Dnew User(new Database());
 $User->Check();
 $User->check_dossier($gDossier);
+
 /* Show the document */
 if ( $action =3D=3D 'sh')
 {

Deleted: phpcompta/trunk/include/ajax_bank_saldo.inc.php.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_bank_saldo.inc.php.php	2011-11-11 15:42:=
09 UTC (rev 4340)
+++ phpcompta/trunk/include/ajax_bank_saldo.inc.php.php	2011-11-11 15:47:=
55 UTC (rev 4341)
@@ -1,67 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief respond ajax request, the get contains
- *  the value :
- * - l for ledger
- * - gDossier
- * Must return at least tva, htva and tvac
-
- */
-
-require_once ('constant.php');
-require_once ('class_database.php');
-require_once('class_dossier.php');
-require_once('class_acc_ledger.php');
-require_once ('class_user.php');
-
-// Check if the needed field does exist
-extract ($_GET);
-foreach (array('l','gDossier') as $a)
-{
-    if ( ! isset (${$a}) )
-    {
-        echo "error $a is not set ";
-        exit();
-    }
-
-}
-if ( is_numeric($l) =3D=3D false  )
-{
-    exit();
-}
-$cn=3Dnew Database(dossier::id());
-$User=3Dnew User($cn);
-$User->Check();
-
-$Ledger=3Dnew Acc_Ledger($cn,$l);
-$prop=3D$Ledger->get_propertie();
-$pj_seq=3D$Ledger->guess_pj();
-$string=3D'{"pj":"'.$pj_seq.'"}';
-
-header("Content-type: text/json; charset: utf8",true);
-echo $string;
-
-
-?>
-

Copied: phpcompta/trunk/include/ajax_bank_saldo.php.php (from rev 4340, p=
hpcompta/trunk/include/ajax_bank_saldo.inc.php.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_bank_saldo.php.php	                     =
   (rev 0)
+++ phpcompta/trunk/include/ajax_bank_saldo.php.php	2011-11-11 15:47:55 U=
TC (rev 4341)
@@ -0,0 +1,67 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ * \brief respond ajax request, the get contains
+ *  the value :
+ * - l for ledger
+ * - gDossier
+ * Must return at least tva, htva and tvac
+
+ */
+
+require_once ('constant.php');
+require_once ('class_database.php');
+require_once('class_dossier.php');
+require_once('class_acc_ledger.php');
+require_once ('class_user.php');
+
+// Check if the needed field does exist
+extract ($_GET);
+foreach (array('l','gDossier') as $a)
+{
+    if ( ! isset (${$a}) )
+    {
+        echo "error $a is not set ";
+        exit();
+    }
+
+}
+if ( is_numeric($l) =3D=3D false  )
+{
+    exit();
+}
+$cn=3Dnew Database(dossier::id());
+$User=3Dnew User($cn);
+$User->Check();
+
+$Ledger=3Dnew Acc_Ledger($cn,$l);
+$prop=3D$Ledger->get_propertie();
+$pj_seq=3D$Ledger->guess_pj();
+$string=3D'{"pj":"'.$pj_seq.'"}';
+
+header("Content-type: text/json; charset: utf8",true);
+echo $string;
+
+
+?>
+

Copied: phpcompta/trunk/include/ajax_update_predef.php.php (from rev 4339=
, phpcompta/trunk/html/get_predef.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_update_predef.php.php	                  =
      (rev 0)
+++ phpcompta/trunk/include/ajax_update_predef.php.php	2011-11-11 15:47:5=
5 UTC (rev 4341)
@@ -0,0 +1,68 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ * \brief respond ajax request, the get contains
+ *  the value :
+ * - l for ledger=20
+ * - gDossier
+ * Must return at least tva, htva and tvac
+ */
+
+require_once ('constant.php');
+require_once ('class_database.php');
+require_once('class_dossier.php');
+require_once('class_pre_operation.php');
+// Check if the needed field does exist
+extract ($_GET);
+foreach (array('l','t','d','gDossier') as $a)
+{
+    if ( ! isset (${$a}) )
+    {
+        echo "error $a is not set ";
+        exit();
+    }
+
+}
+$cn=3Dnew Database(dossier::id());
+$op=3Dnew Pre_operation_detail($cn);
+$op->set('ledger',$l);
+$op->set('ledger_type',$t);
+$op->set('direct',$d);
+$array=3D$op->get_operation();
+$string=3D'{"count":"'.count($array).'"';
+$idx=3D0;
+if (! empty($array))
+    foreach ($array as $a)
+{
+    $string.=3D',"value'.$idx.'":"'.$a['value'].'",';
+    $string.=3D'"label'.$idx.'":"'.$a['label'].'"';
+    $idx++;
+}
+$string.=3D"}";
+
+header("Content-type: text/json; charset: utf8",true);
+echo $string;
+
+
+?>
+



From MAILER-DAEMON Fri Nov 11 10:44:38 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROtHS-0005zZ-DV
	for mharc-phpcompta-dev@gnu.org; Fri, 11 Nov 2011 10:44:38 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 11 Nov 2011 16:50:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.9053.1321026277.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4342 - 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, 11 Nov 2011 15:44:36 -0000

Author: danydb
Date: 2011-11-11 16:50:35 +0100 (Fri, 11 Nov 2011)
New Revision: 4342

Modified:
   phpcompta/trunk/html/ajax_report.php
Log:
update documentation

Modified: phpcompta/trunk/html/ajax_report.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_report.php	2011-11-11 15:47:55 UTC (rev 434=
1)
+++ phpcompta/trunk/html/ajax_report.php	2011-11-11 15:50:35 UTC (rev 434=
2)
@@ -21,7 +21,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 /*!\file
- * \brief Fid for the ajax request for cards
+ * \brief export definition of a report
  */
=20
=20



From MAILER-DAEMON Fri Nov 11 17:38:41 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROzk9-0004Vc-Vb
	for mharc-phpcompta-dev@gnu.org; Fri, 11 Nov 2011 17:38:41 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 11 Nov 2011 23:44:33 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.9536.1321051121.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4343 - 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 Nov 2011 22:38:40 -0000

Author: danydb
Date: 2011-11-11 23:44:31 +0100 (Fri, 11 Nov 2011)
New Revision: 4343

Modified:
   phpcompta/trunk/include/modele.inc.php
Log:
reformatting

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	2011-11-11 15:50:35 UTC (rev 4=
342)
+++ phpcompta/trunk/include/modele.inc.php	2011-11-11 22:44:31 UTC (rev 4=
343)
@@ -15,12 +15,12 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/*!\file
+/* !\file
  *
  *
  * \brief concerne only the template
@@ -28,376 +28,372 @@
  */
 require_once("class_itext.php");
 require_once("class_icheckbox.php");
-$sa=3D(isset ( $_REQUEST['sa']))?$_REQUEST['sa']:'list';
-if ( isset ($_POST['upd']) &&
-        isset($_POST['m']))
+$sa =3D (isset($_REQUEST['sa'])) ? $_REQUEST['sa'] : 'list';
+if (isset($_POST['upd']) &&
+		isset($_POST['m']))
 {
-    if (  isset($_POST['name']) && isset($_POST['desc']))
-    {
-        extract($_POST);
-        $cn=3Dnew Database();
-        if ( strlen(trim($name)) !=3D0
-                && $cn->get_value('select count(*) from modeledef where =
'.
-                                  'mod_name=3D$1 and mod_id !=3D$2',
-                                  array(trim($name),$m)) =3D=3D 0
-           )
-        {
+	if (isset($_POST['name']) && isset($_POST['desc']))
+	{
+		extract($_POST);
+		$cn =3D new Database();
+		if (strlen(trim($name)) !=3D 0
+				&& $cn->get_value('select count(*) from modeledef where ' .
+						'mod_name=3D$1 and mod_id !=3D$2', array(trim($name), $m)) =3D=3D =
0
+		)
+		{
=20
-            $cn->exec_sql("update modeledef set mod_name=3D$1, ".
-                          " mod_desc=3D$2 where mod_id=3D$3 ",
-                          array(trim($name),trim($desc),$m));
-
-
-        }
-    }
-    $sa=3D"list";
+			$cn->exec_sql("update modeledef set mod_name=3D$1, " .
+					" mod_desc=3D$2 where mod_id=3D$3 ", array(trim($name), trim($desc)=
, $m));
+		}
+	}
+	$sa =3D "list";
 }
=20
-$cn=3Dnew Database();
+$cn =3D new Database();
=20
=20
=20
 // IF FMOD_NAME is posted then must add a template
-if ( isset ($_POST["FMOD_NAME"]) )
+if (isset($_POST["FMOD_NAME"]))
 {
-    $encoding=3D$cn->get_value("select encoding from pg_database  where =
".
-                             " datname=3D'".domaine.'dossier'.sql_string=
($_POST["FMOD_DBID"])."'");
+	$encoding =3D $cn->get_value("select encoding from pg_database  where "=
 .
+			" datname=3D'" . domaine . 'dossier' . sql_string($_POST["FMOD_DBID"]=
) . "'");
=20
-    if ( $encoding !=3D 6 )
-    {
-        alert('D=C3=A9sol=C3=A9 vous devez migrer ce mod=C3=A8le en unic=
ode');
-        echo '<span class=3D"error">la base de donn=C3=A9e '.
-        domaine.'mod'.$_POST["FMOD_DBID"]." doit =C3=AAtre migr=C3=A9e e=
n unicode</span>";
-        echo '<span class=3D"error"> Pour le passer en unicode, faites-e=
n un backup puis restaurez le fichier re=C3=A7u</span>';
+	if ($encoding !=3D 6)
+	{
+		alert('D=C3=A9sol=C3=A9 vous devez migrer ce mod=C3=A8le en unicode');
+		echo '<span class=3D"error">la base de donn=C3=A9e ' .
+		domaine . 'mod' . $_POST["FMOD_DBID"] . " doit =C3=AAtre migr=C3=A9e e=
n unicode</span>";
+		echo '<span class=3D"error"> Pour le passer en unicode, faites-en un b=
ackup puis restaurez le fichier re=C3=A7u</span>';
=20
-        echo HtmlInput::button_anchor('Retour','admin_repo.php?action=3D=
dossier_mgt');
-        exit();
-    }
+		echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Ddossi=
er_mgt');
+		exit();
+	}
=20
-    $mod_name=3Dsql_string($_POST["FMOD_NAME"]);
-    $mod_desc=3Dsql_string($_POST["FMOD_DESC"]);
-    if ( $mod_name !=3D null)
-    {
-        $Res=3D$cn->exec_sql("insert into modeledef(mod_name,mod_desc)
-                           values ('".$mod_name."',".
-                           "'".$mod_desc."')");
+	$mod_name =3D sql_string($_POST["FMOD_NAME"]);
+	$mod_desc =3D sql_string($_POST["FMOD_DESC"]);
+	if ($mod_name !=3D null)
+	{
+		$Res =3D $cn->exec_sql("insert into modeledef(mod_name,mod_desc)
+                           values ('" . $mod_name . "'," .
+				"'" . $mod_desc . "')");
=20
-        // get the mod_id
-        $l_id=3D$cn->get_current_seq('s_modid');
-        if ( $l_id !=3D 0 )
-        {
-            $Sql=3Dsprintf("CREATE DATABASE %sMOD%d encoding=3D'UTF8' TE=
MPLATE %sDOSSIER%s",domaine,$l_id,domaine,$_POST["FMOD_DBID"]);
-            ob_start();
-            if ( $cn->exec_sql($Sql)=3D=3Dfalse)
-            {
-                ob_end_clean();
-                echo "<h2 class=3D\"error\"> Base de donn&eacute;e ".dom=
aine."dossier".$_POST['FMOD_DBID']."  est acc=C3=A8d&eacute;e, d&eacute;c=
onnectez-vous en d'abord</h2>";
-                $Res=3D$cn->exec_sql("delete from modeledef where mod_id=
=3D".$l_id);
+		// get the mod_id
+		$l_id =3D $cn->get_current_seq('s_modid');
+		if ($l_id !=3D 0)
+		{
+			$Sql =3D sprintf("CREATE DATABASE %sMOD%d encoding=3D'UTF8' TEMPLATE =
%sDOSSIER%s", domaine, $l_id, domaine, $_POST["FMOD_DBID"]);
+			ob_start();
+			if ($cn->exec_sql($Sql) =3D=3D false)
+			{
+				ob_end_clean();
+				echo "<h2 class=3D\"error\"> Base de donn&eacute;e " . domaine . "do=
ssier" . $_POST['FMOD_DBID'] . "  est acc=C3=A8d&eacute;e, d&eacute;conne=
ctez-vous en d'abord</h2>";
+				$Res =3D $cn->exec_sql("delete from modeledef where mod_id=3D" . $l_=
id);
=20
-                exit;
-            }
-        }
-    }// if $mod_name !=3D null
+				exit;
+			}
+		}
+	}// if $mod_name !=3D null
=20
-    $cn_mod=3Dnew Database($l_id,'mod');
+	$cn_mod =3D new Database($l_id, 'mod');
=20
-    // Clean some tables
+	// Clean some tables
=20
-    $Res=3D$cn_mod->exec_sql("select distinct jr_pj from jrn where jr_pj=
 is not null ");
-    if ( Database::num_row($Res) !=3D 0 )
-    {
-        $a_lob=3DDatabase::fetch_all($Res);
-        for($i=3D0;$i<count($a_lob);$i++)
-            $cn_mod->lo_unlink($a_lob[$i]['jr_pj']);
-    }
+	$Res =3D $cn_mod->exec_sql("select distinct jr_pj from jrn where jr_pj =
is not null ");
+	if (Database::num_row($Res) !=3D 0)
+	{
+		$a_lob =3D Database::fetch_all($Res);
+		for ($i =3D 0; $i < count($a_lob); $i++)
+			$cn_mod->lo_unlink($a_lob[$i]['jr_pj']);
+	}
=20
-    $Res=3D$cn_mod->exec_sql("truncate table centralized");
-    $Res=3D$cn_mod->exec_sql("truncate table jrn cascade");
-    $Res=3D$cn_mod->exec_sql("delete from del_jrn");
-    $Res=3D$cn_mod->exec_sql("delete from del_jrnx");
-    $Res=3D$cn_mod->exec_sql("truncate table  jrnx cascade ");
-    $Res=3D$cn_mod->exec_sql("delete from del_action");
+	$Res =3D $cn_mod->exec_sql("truncate table centralized");
+	$Res =3D $cn_mod->exec_sql("truncate table jrn cascade");
+	$Res =3D $cn_mod->exec_sql("delete from del_jrn");
+	$Res =3D $cn_mod->exec_sql("delete from del_jrnx");
+	$Res =3D $cn_mod->exec_sql("truncate table  jrnx cascade ");
+	$Res =3D $cn_mod->exec_sql("delete from del_action");
=20
-    $Res=3D$cn_mod->exec_sql('delete from operation_analytique');
+	$Res =3D $cn_mod->exec_sql('delete from operation_analytique');
=20
-    $Res=3D$cn_mod->exec_sql("truncate table import_tmp");
-    //	Reset the closed periode
-    $Res=3D$cn_mod->exec_sql("update parm_periode set p_closed=3D'f'");
-    $Res=3D$cn_mod->exec_sql('delete from jrn_periode');
-    $Res=3D$cn_mod->exec_sql(' insert into jrn_periode(p_id,jrn_def_id,s=
tatus) '.
-                           ' select p_id,jrn_def_id,\'OP\' '.
-                           ' from '.
-                           ' parm_periode cross join jrn_def');
+	$Res =3D $cn_mod->exec_sql("truncate table import_tmp");
+	//	Reset the closed periode
+	$Res =3D $cn_mod->exec_sql("update parm_periode set p_closed=3D'f'");
+	$Res =3D $cn_mod->exec_sql('delete from jrn_periode');
+	$Res =3D $cn_mod->exec_sql(' insert into jrn_periode(p_id,jrn_def_id,st=
atus) ' .
+			' select p_id,jrn_def_id,\'OP\' ' .
+			' from ' .
+			' parm_periode cross join jrn_def');
=20
-    // Reset Sequence
-    $a_seq=3Darray('s_jrn','s_jrn_op','s_centralized','s_stock_goods','s=
_internal');
-    foreach ($a_seq as $seq )
-    {
-        $sql=3Dsprintf("select setval('%s',1,false)",$seq);
-        $Res=3D$cn_mod->exec_sql($sql);
-    }
-    $sql=3D"select jrn_def_id from jrn_def ";
-    $Res=3D$cn_mod->exec_sql($sql);
-    $Max=3DDatabase::num_row($Res);
-    for ($seq=3D0;$seq<$Max;$seq++)
-    {
-        $row=3DDatabase::fetch_array($Res,$seq);
-        /* if seq doesn't exist create it */
-        if ( $cn_mod->exist_sequence('s_jrn_'.$row['jrn_def_id']) =3D=3D=
 false )
-        {
-            $cn_mod->create_sequence('s_jrn_'.$row['jrn_def_id']);
-        }
+	// Reset Sequence
+	$a_seq =3D array('s_jrn', 's_jrn_op', 's_centralized', 's_stock_goods',=
 's_internal');
+	foreach ($a_seq as $seq)
+	{
+		$sql =3D sprintf("select setval('%s',1,false)", $seq);
+		$Res =3D $cn_mod->exec_sql($sql);
+	}
+	$sql =3D "select jrn_def_id from jrn_def ";
+	$Res =3D $cn_mod->exec_sql($sql);
+	$Max =3D Database::num_row($Res);
+	for ($seq =3D 0; $seq < $Max; $seq++)
+	{
+		$row =3D Database::fetch_array($Res, $seq);
+		/* if seq doesn't exist create it */
+		if ($cn_mod->exist_sequence('s_jrn_' . $row['jrn_def_id']) =3D=3D fals=
e)
+		{
+			$cn_mod->create_sequence('s_jrn_' . $row['jrn_def_id']);
+		}
=20
=20
-        $sql=3Dsprintf ("select setval('s_jrn_%d',1,false)",$row['jrn_de=
f_id']);
-        $cn_mod->exec_sql($sql);
+		$sql =3D sprintf("select setval('s_jrn_%d',1,false)", $row['jrn_def_id=
']);
+		$cn_mod->exec_sql($sql);
=20
-        $sql=3Dsprintf ("select setval('s_jrn_pj%d',1,false)",$row['jrn_=
def_id']);
-        $cn_mod->exec_sql($sql);
-        $sql=3Dsprintf ("select setval('jnt_letter_jl_id_seq',1,false)")=
;
-        $cn_mod->exec_sql($sql);
+		$sql =3D sprintf("select setval('s_jrn_pj%d',1,false)", $row['jrn_def_=
id']);
+		$cn_mod->exec_sql($sql);
+		$sql =3D sprintf("select setval('jnt_letter_jl_id_seq',1,false)");
+		$cn_mod->exec_sql($sql);
+	}
+	//---
+	// Cleaning Follow_Up
+	//--
+	if (isset($_POST['DOC']))
+	{
+		$Res =3D $cn_mod->exec_sql("delete from action_gestion");
+		$Res =3D $cn_mod->exec_sql("delete from document");
=20
-    }
-    //---
-    // Cleaning Follow_Up
-    //--
-    if ( isset($_POST['DOC'] ))
-    {
-        $Res=3D$cn_mod->exec_sql("delete from action_gestion");
-        $Res=3D$cn_mod->exec_sql("delete from document");
+		// Remove lob file
+		$Res =3D $cn_mod->exec_sql("select distinct loid from pg_largeobject e=
xcept select md_lob from document_modele");
+		if (Database::num_row($Res) !=3D 0)
+		{
+			$a_lob =3D Database::fetch_all($Res);
+			//var_dump($a_lob);
+			foreach ($a_lob as $lob)
+			{
+				$cn_mod->lo_unlink($lob['loid']);
+			}
+		}
+	}
+	if (isset($_POST['CARD']))
+	{
+		$Res =3D $cn_mod->exec_sql("delete from  fiche_detail");
+		$Res =3D $cn_mod->exec_sql("delete from   fiche");
+		$Res =3D $cn_mod->exec_sql("delete from action_gestion");
+		$Res =3D $cn_mod->exec_sql("delete from document");
+		$Res =3D $cn_mod->exec_sql("delete from document_modele");
+		$Res =3D $cn_mod->exec_sql("delete from op_predef");
=20
-        // Remove lob file
-        $Res=3D$cn_mod->exec_sql("select distinct loid from pg_largeobje=
ct except select md_lob from document_modele");
-        if ( Database::num_row($Res) !=3D 0 )
-        {
-            $a_lob=3DDatabase::fetch_all($Res);
-            //var_dump($a_lob);
-            foreach ($a_lob as $lob)
-            {
-                $cn_mod->lo_unlink($lob['loid']);
-            }
-        }
-    }
-    if ( isset($_POST['CARD']))
-    {
-        $Res=3D$cn_mod->exec_sql("delete from  fiche_detail");
-        $Res=3D$cn_mod->exec_sql("delete from   fiche");
-        $Res=3D$cn_mod->exec_sql("delete from action_gestion");
-        $Res=3D$cn_mod->exec_sql("delete from document");
-        $Res=3D$cn_mod->exec_sql("delete from document_modele");
-        $Res=3D$cn_mod->exec_sql("delete from op_predef");
-
-        // Remove lob file
-        $Res=3D$cn_mod->exec_sql("select distinct loid from pg_largeobje=
ct");
-        if ( Database::num_row($Res) !=3D 0 )
-        {
-            $a_lob=3DDatabase::fetch_all($Res);
-            foreach ($a_lob as $lob)
-            $cn_mod->lo_unlink($lob['loid']);
-        }
-
-
-    }
-    if ( isset($_POST['CANAL']))
-    {
-        $Res=3D$cn_mod->exec_sql('delete from poste_analytique');
-        $Res=3D$cn_mod->exec_sql('delete from plan_analytique');
-    }
-
+		// Remove lob file
+		$Res =3D $cn_mod->exec_sql("select distinct loid from pg_largeobject")=
;
+		if (Database::num_row($Res) !=3D 0)
+		{
+			$a_lob =3D Database::fetch_all($Res);
+			foreach ($a_lob as $lob)
+				$cn_mod->lo_unlink($lob['loid']);
+		}
+	}
+	if (isset($_POST['CANAL']))
+	{
+		$Res =3D $cn_mod->exec_sql('delete from poste_analytique');
+		$Res =3D $cn_mod->exec_sql('delete from plan_analytique');
+	}
 }
 // Show all available templates
=20
-$Res=3D$cn->exec_sql("select mod_id,mod_name,mod_desc from
+$Res =3D $cn->exec_sql("select mod_id,mod_name,mod_desc from
                    modeledef order by mod_name");
-$count=3DDatabase::num_row($Res);
+$count =3D Database::num_row($Res);
 echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
 echo "<H2>Mod=C3=A8les</H2>";
-if ( $sa=3D=3D'list')
+if ($sa =3D=3D 'list')
 {
-    if ( $count =3D=3D 0 )
-    {
-        echo "No template available";
-    }
-    else
-    {
+	if ($count =3D=3D 0)
+	{
+		echo "No template available";
+	}
+	else
+	{
=20
=20
-        echo HtmlInput::button_anchor('Rafra&icirc;chir','admin_repo.php=
?action=3Dmodele_mgt');
-        echo HtmlInput::button_anchor('Ajouter','admin_repo.php?action=3D=
modele_mgt&sa=3Dadd');
+		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');
=20
-        echo '<table class=3D"result" style=3D"border-spacing:5;border-c=
ollapse:separate" >';
-        echo "<TR><TH>Nom</TH>".
-        "<TH>Description</TH>".
-        "<th> </th>".
-        "<th> </th>".
-        "<th> </th>".
+		echo '<table class=3D"result" style=3D"border-spacing:10;border-collap=
se:separate" >';
+		echo "<TR><TH>Nom</TH>" .
+		"<TH>Description</TH>" .
+		"<th> </th>" .
+		"<th> </th>" .
+		"<th> </th>" .
+		"</TR>";
=20
-        "</TR>";
-
-        for ($i=3D0;$i<$count;$i++)
-        {
-            $mod=3DDatabase::fetch_array($Res,$i);
-            printf('<TR>'.
-                   '<TD>%d <b> %s</b> </TD>'.
-                   '<TD><I> %s </I></TD>'.
-                   '<td> '.
-                   HtmlInput::button_anchor('Effacer','?action=3Dmodele_=
mgt&sa=3Ddel&m=3D'.$mod['mod_id']).'</td>'.
-                   '</td>'.
-                   '<td>'.HtmlInput::button_anchor('Modifie','?action=3D=
modele_mgt&sa=3Dmod&m=3D'.$mod['mod_id']).'</td>'.
-                   '</td>'.
-                   '<td>'.HtmlInput::button_anchor('Backup','backup.php?=
action=3Dbackup&sa=3Db&t=3Dm&d=3D'
-                                                   .$mod['mod_id']).'</t=
d>'.
-                   '</TR>',
-                   $mod['mod_id'],
-                   $mod['mod_name'],
-                   $mod['mod_desc']);
-
-        }// for
-        echo "</table>";
-    }// if count =3D 0
-    echo "<p class=3D\"notice\">Si vous voulez r&eacute;cup&eacute;rer t=
outes les adaptations d'un dossier ".
-    " dans un autre dossier, vous pouvez en faire un mod=C3=A8le.".
-    " Seules les fiches, la structure des journaux, les p&eacute;riodes,=
... seront reprises ".
-    "et aucune donn&eacute;e du dossier sur lequel le dossier est bas&ea=
cute;. Les donn=C3=A9es contenues dans les extensions ne sont pas effac=C3=
=A9es</p>";
+		for ($i =3D 0; $i < $count; $i++)
+		{
+			$mod =3D Database::fetch_array($Res, $i);
+			$class =3D ($i % 2 =3D=3D 0) ? "odd" : "even";
+			printf('<TR class=3D"' . $class . '" style=3D"vertical-align:top">' .
+					'<TD>%d <b> %s</b> </TD>' .
+					'<TD><I> %s </I></TD>' .
+					'<td> ' .
+					HtmlInput::button_anchor('Effacer', '?action=3Dmodele_mgt&sa=3Ddel&=
m=3D' . $mod['mod_id']) . '</td>' .
+					'</td>' .
+					'<td>' . HtmlInput::button_anchor('Modifie', '?action=3Dmodele_mgt&=
sa=3Dmod&m=3D' . $mod['mod_id']) . '</td>' .
+					'</td>' .
+					'<td>' . HtmlInput::button_anchor('Backup', 'backup.php?action=3Dba=
ckup&sa=3Db&t=3Dm&d=3D'
+							. $mod['mod_id']) . '</td>' .
+					'</TR>', $mod['mod_id'], $mod['mod_name'], $mod['mod_desc']);
+		}// for
+		echo "</table>";
+	}// if count =3D 0
+	echo "<p class=3D\"notice\">Si vous voulez r&eacute;cup&eacute;rer tout=
es les adaptations d'un dossier " .
+	" dans un autre dossier, vous pouvez en faire un mod=C3=A8le." .
+	" Seules les fiches, la structure des journaux, les p&eacute;riodes,...=
 seront reprises " .
+	"et aucune donn&eacute;e du dossier sur lequel le dossier est bas&eacut=
e;. Les donn=C3=A9es contenues dans les extensions ne sont pas effac=C3=A9=
es</p>";
 }
 //----------------------------------------------------------------------=
-----
 // Add a template
 //----------------------------------------------------------------------=
-----
-if ( $sa =3D=3D 'add')
+if ($sa =3D=3D 'add')
 {
 // Show All available folder
-    $Res=3D$cn->exec_sql("select dos_id, dos_name,dos_description from a=
c_dossier
+	$Res =3D $cn->exec_sql("select dos_id, dos_name,dos_description from ac=
_dossier
                        order by dos_name");
-    $count=3DDatabase::num_row($Res);
-    $available=3D"";
-    if ( $count !=3D 0 )
-    {
-        $available=3D'<SELECT NAME=3D"FMOD_DBID">';
-        for ($i=3D0;$i<$count;$i++)
-        {
-            $db=3DDatabase::fetch_array($Res,$i);
-            $available.=3D'<OPTION VALUE=3D"'.$db['dos_id'].'">'.$db['do=
s_name'].':'.$db['dos_description'];
-        }//for i
-        $available.=3D'</SELECT>';
-    }//if count !=3D0
-    ?>
-    <form action=3D"admin_repo.php?action=3Dmodele_mgt" METHOD=3D"post">
-                 <TABLE>
-                 <tr>
-                 <td>Nom </TD>
-                 <TD><INPUT TYPE=3D"TEXT" VALUE=3D"" NAME=3D"FMOD_NAME">=
</TD>
-                                                      </TR>
-                                                      <TR>
-                                                      <TD>Description</T=
D>
-                                                      <TD><TEXTAREA ROWS=
=3D"2" COLS=3D"60" NAME=3D"FMOD_DESC"></Textarea></TD>
-                                                                        =
                    </TR>
-                                                                        =
                    <TR>
-                                                                        =
                    <TD> Bas&eacute;
-    sur </TD>
-    <TD> <?php   echo $available ?></TD>
-    </TR>
-    <TR><TD>Nettoyage des Documents et courriers (ce qui  n'effacera pas=
 les mod=C3=A8les de documents)</TD><TD> <input type=3D"checkbox" name=3D=
"DOC"></TD></TR>
-            <TR><TD>Nettoyage de toutes les fiches (ce qui effacera clie=
nt, op&eacute;rations pr&eacute;d&eacute;finies fournisseurs mod=C3=A8les=
 de documents et documents)</TD><TD> <input type=3D"checkbox" name=3D"CAR=
D"></TD></TR>
+	$count =3D Database::num_row($Res);
+	$available =3D "";
+	if ($count !=3D 0)
+	{
+		$available =3D '<SELECT NAME=3D"FMOD_DBID">';
+		for ($i =3D 0; $i < $count; $i++)
+		{
+			$db =3D Database::fetch_array($Res, $i);
+			$available.=3D'<OPTION VALUE=3D"' . $db['dos_id'] . '">' . $db['dos_n=
ame'] . ':' . $db['dos_description'];
+		}//for i
+		$available.=3D'</SELECT>';
+	}//if count !=3D0
+	?>
+	<form action=3D"admin_repo.php?action=3Dmodele_mgt" METHOD=3D"post">
+		<TABLE>
+			<tr>
+				<td>Nom </TD>
+				<TD><INPUT TYPE=3D"TEXT" VALUE=3D"" NAME=3D"FMOD_NAME"></TD>
+			</TR>
+			<TR>
+				<TD>Description</TD>
+				<TD><TEXTAREA ROWS=3D"2" COLS=3D"60" NAME=3D"FMOD_DESC"></Textarea><=
/TD>
+																							</TR>
+																							<TR>
+																							<TD> Bas&eacute;
+	sur </TD>
+	<TD> <?php echo $available?></TD>
+	</TR>
+	<TR>
+		<TD>Nettoyage des Documents et courriers (ce qui  n'effacera pas les m=
od=C3=A8les de documents)</TD>
+		<TD> <input type=3D"checkbox" name=3D"DOC"></TD></TR>
+	<TR>
+		<TD>Nettoyage de toutes les fiches (ce qui effacera client,
+	op&eacute;rations pr&eacute;d&eacute;finies fournisseurs mod=C3=A8les d=
e documents et documents)</TD>
+		<TD> <input type=3D"checkbox" name=3D"CARD"></TD>
+	</TR>
=20
-            <TR><TD>Nettoyage de la comptabilit&eacute; analytique : eff=
acement des plans et des postes, les op&eacute;rations sont de toute fa&c=
cedil;on effac&eacute;es </TD><TD> <input type=3D"checkbox" name=3D"CANAL=
"></TD></TR>
-            </TABLE>
+	<TR>
+		<TD>Nettoyage de la comptabilit&eacute; analytique : effacement des pl=
ans et des postes, les op&eacute;rations
+	sont de toute fa&ccedil;on effac&eacute;es </TD>
+		<TD> <input type=3D"checkbox" name=3D"CANAL"></TD>
+	</TR>
+	</TABLE>
=20
-            '
+		            '
=20
-            <INPUT TYPE=3D"SUBMIT" class=3D"button" VALUE=3D"Ajout d'un =
modele">
-                                       <?php
-                                       echo HtmlInput::button_anchor('Re=
tour','?action=3Dmodele_mgt');
-            ?>
+		            <INPUT TYPE=3D"SUBMIT" class=3D"button" VALUE=3D"Ajout d'u=
n modele">
+				<?php
+				echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
+				?>
=20
-            </form>
-            <?php
-        }
-        //--------------------------------------------------------------=
-------------
-        // Modify
-        if ( $sa =3D=3D 'mod' && isset($_GET['m']) )
-        {
-            $cn=3Dnew Database();
+		            </form>
+					<?php
+				}
+				//------------------------------------------------------------------=
---------
+				// Modify
+				if ($sa =3D=3D 'mod' && isset($_GET['m']))
+				{
+					$cn =3D new Database();
=20
-            echo '<form method=3D"post">';
-            $name=3D$cn->get_value(
-                      "select mod_name from modeledef where ".
-                      " mod_id=3D$1",
-                      array($_GET['m']));
+					echo '<form method=3D"post">';
+					$name =3D $cn->get_value(
+							"select mod_name from modeledef where " .
+							" mod_id=3D$1", array($_GET['m']));
=20
-            $desc=3D$cn->get_value(
-                      "select mod_desc from modeledef where ".
-                      " mod_id=3D$1",
-                      array($_GET['m']));
-            $wText=3Dnew IText();
-            echo 'Nom : '.$wText->input('name',$name);
-            $wDesc=3Dnew ITextArea();
-            $wDesc->heigh=3D5;
-            echo '<br>Description :<br>';
-            echo $wDesc->input('desc',$desc);
-            echo HtmlInput::hidden('m',$_GET['m']);
-            echo HtmlInput::hidden('action','modele_mgt');
-            echo '<br>';
-            echo HtmlInput::button_anchor('Retour','?action=3Dmodele_mgt=
');
-            echo HtmlInput::submit('upd','Modifie');
-            echo '</form>';
-        }
+					$desc =3D $cn->get_value(
+							"select mod_desc from modeledef where " .
+							" mod_id=3D$1", array($_GET['m']));
+					$wText =3D new IText();
+					echo 'Nom : ' . $wText->input('name', $name);
+					$wDesc =3D new ITextArea();
+					$wDesc->heigh =3D 5;
+					echo '<br>Description :<br>';
+					echo $wDesc->input('desc', $desc);
+					echo HtmlInput::hidden('m', $_GET['m']);
+					echo HtmlInput::hidden('action', 'modele_mgt');
+					echo '<br>';
+					echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
+					echo HtmlInput::submit('upd', 'Modifie');
+					echo '</form>';
+				}
=20
-        //--------------------------------------------------------------=
-------------
-        // action =3D del
-        //--------------------------------------------------------------=
-------------
-        if ( $sa =3D=3D 'del' )
-        {
-            $cn=3Dnew Database();
-            $name=3D$cn->get_value('select mod_name from modeledef where=
 mod_id=3D$1',array($_REQUEST['m']));
-            echo '<form method=3D"post">';
-            echo HtmlInput::hidden('d',$_REQUEST['m']);
-            echo HtmlInput::hidden('sa','remove');
-            echo '<h2 class=3D"error">Etes vous sure et certain de voulo=
ir effacer '.$name.' ???</h2>';
-            $confirm=3Dnew ICheckBox();
-            $confirm->name=3D"p_confirm";
-            echo 'Cochez la case si vous =C3=AAtes s=C3=BBr de vouloir e=
ffacer ce mod=C3=A8le';
-            echo $confirm->input();
-            echo HtmlInput::submit('remove','Effacer');
-            echo HtmlInput::button_anchor('Retour','?action=3Dmodele_mgt=
');
-            echo '</form>';
-        }
-        //--------------------------------------------------------------=
-------------
-        // action =3D del
-        //--------------------------------------------------------------=
-------------
-        if ( $sa =3D=3D 'remove' )
-        {
-            if ( ! isset ($_REQUEST['p_confirm']))
-            {
-                echo('D=C3=A9sol=C3=A9, vous n\'avez pas coch=C3=A9 la c=
ase');
-                echo HtmlInput::button_anchor('Retour','?action=3Dmodele=
_mgt');
-                exit();
-            }
+				//------------------------------------------------------------------=
---------
+				// action =3D del
+				//------------------------------------------------------------------=
---------
+				if ($sa =3D=3D 'del')
+				{
+					$cn =3D new Database();
+					$name =3D $cn->get_value('select mod_name from modeledef where mod_=
id=3D$1', array($_REQUEST['m']));
+					echo '<form method=3D"post">';
+					echo HtmlInput::hidden('d', $_REQUEST['m']);
+					echo HtmlInput::hidden('sa', 'remove');
+					echo '<h2 class=3D"error">Etes vous sure et certain de vouloir effa=
cer ' . $name . ' ???</h2>';
+					$confirm =3D new ICheckBox();
+					$confirm->name =3D "p_confirm";
+					echo 'Cochez la case si vous =C3=AAtes s=C3=BBr de vouloir effacer =
ce mod=C3=A8le';
+					echo $confirm->input();
+					echo HtmlInput::submit('remove', 'Effacer');
+					echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
+					echo '</form>';
+				}
+				//------------------------------------------------------------------=
---------
+				// action =3D del
+				//------------------------------------------------------------------=
---------
+				if ($sa =3D=3D 'remove')
+				{
+					if (!isset($_REQUEST['p_confirm']))
+					{
+						echo('D=C3=A9sol=C3=A9, vous n\'avez pas coch=C3=A9 la case');
+						echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
+						exit();
+					}
=20
-            $cn=3Dnew Database();
-            $msg=3D"dossier";
-            $name=3D$cn->get_value("select mod_name from modeledef where=
 mod_id=3D$1",array($_REQUEST['m']));
-            if ( strlen(trim($name)) =3D=3D 0 )
-            {
-                echo "<h2 class=3D\"error\"> $msg inexistant</h2>";
-                exit();
-            }
-            $sql=3D"drop database ".domaine."mod".sql_string($_REQUEST['=
m']);
-            ob_start();
-            if ( $cn->exec_sql($sql)=3D=3Dfalse)
-            {
-                ob_end_clean();
+					$cn =3D new Database();
+					$msg =3D "dossier";
+					$name =3D $cn->get_value("select mod_name from modeledef where mod_=
id=3D$1", array($_REQUEST['m']));
+					if (strlen(trim($name)) =3D=3D 0)
+					{
+						echo "<h2 class=3D\"error\"> $msg inexistant</h2>";
+						exit();
+					}
+					$sql =3D "drop database " . domaine . "mod" . sql_string($_REQUEST[=
'm']);
+					ob_start();
+					if ($cn->exec_sql($sql) =3D=3D false)
+					{
+						ob_end_clean();
=20
-                echo "<h2 class=3D\"error\">
-                Base de donn=C3=A9e ".domaine."mod".$_REQUEST['m']."  es=
t acc=C3=A8d=C3=A9e, d=C3=A9connectez-vous d'abord</h2>";
-                exit;
-            }
-            ob_flush();
-            $sql=3D"delete from modeledef where mod_id=3D$1";
-            $cn->exec_sql($sql,array($_REQUEST['m']));
-            print '<h2 class=3D"info">';
-            print "Voil=C3=A0 le mod=C3=A8le $name est effac=C3=A9</H2>"=
;
-            echo HtmlInput::button_anchor('Retour','?action=3Dmodele_mgt=
');
-        }
-        echo '</div>';
-?>
+						echo "<h2 class=3D\"error\">
+                Base de donn=C3=A9e " . domaine . "mod" . $_REQUEST['m']=
 . "  est acc=C3=A8d=C3=A9e, d=C3=A9connectez-vous d'abord</h2>";
+						exit;
+					}
+					ob_flush();
+					$sql =3D "delete from modeledef where mod_id=3D$1";
+					$cn->exec_sql($sql, array($_REQUEST['m']));
+					print '<h2 class=3D"info">';
+					print "Voil=C3=A0 le mod=C3=A8le $name est effac=C3=A9</H2>";
+					echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
+				}
+				echo '</div>';
+				?>
=20



From MAILER-DAEMON Fri Nov 11 17:39:17 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROzkj-0004WJ-4G
	for mharc-phpcompta-dev@gnu.org; Fri, 11 Nov 2011 17:39:17 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 11 Nov 2011 23:45:13 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.9537.1321051156.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4344 - 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 Nov 2011 22:39:15 -0000

Author: danydb
Date: 2011-11-11 23:45:11 +0100 (Fri, 11 Nov 2011)
New Revision: 4344

Modified:
   phpcompta/trunk/include/modele.inc.php
Log:
reformatting

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	2011-11-11 22:44:31 UTC (rev 4=
343)
+++ phpcompta/trunk/include/modele.inc.php	2011-11-11 22:45:11 UTC (rev 4=
344)
@@ -308,92 +308,92 @@
 				?>
=20
 		            </form>
-					<?php
-				}
-				//------------------------------------------------------------------=
---------
-				// Modify
-				if ($sa =3D=3D 'mod' && isset($_GET['m']))
-				{
-					$cn =3D new Database();
+		<?php
+	}
+	//---------------------------------------------------------------------=
------
+	// Modify
+	if ($sa =3D=3D 'mod' && isset($_GET['m']))
+	{
+		$cn =3D new Database();
=20
-					echo '<form method=3D"post">';
-					$name =3D $cn->get_value(
-							"select mod_name from modeledef where " .
-							" mod_id=3D$1", array($_GET['m']));
+		echo '<form method=3D"post">';
+		$name =3D $cn->get_value(
+				"select mod_name from modeledef where " .
+				" mod_id=3D$1", array($_GET['m']));
=20
-					$desc =3D $cn->get_value(
-							"select mod_desc from modeledef where " .
-							" mod_id=3D$1", array($_GET['m']));
-					$wText =3D new IText();
-					echo 'Nom : ' . $wText->input('name', $name);
-					$wDesc =3D new ITextArea();
-					$wDesc->heigh =3D 5;
-					echo '<br>Description :<br>';
-					echo $wDesc->input('desc', $desc);
-					echo HtmlInput::hidden('m', $_GET['m']);
-					echo HtmlInput::hidden('action', 'modele_mgt');
-					echo '<br>';
-					echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
-					echo HtmlInput::submit('upd', 'Modifie');
-					echo '</form>';
-				}
+		$desc =3D $cn->get_value(
+				"select mod_desc from modeledef where " .
+				" mod_id=3D$1", array($_GET['m']));
+		$wText =3D new IText();
+		echo 'Nom : ' . $wText->input('name', $name);
+		$wDesc =3D new ITextArea();
+		$wDesc->heigh =3D 5;
+		echo '<br>Description :<br>';
+		echo $wDesc->input('desc', $desc);
+		echo HtmlInput::hidden('m', $_GET['m']);
+		echo HtmlInput::hidden('action', 'modele_mgt');
+		echo '<br>';
+		echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
+		echo HtmlInput::submit('upd', 'Modifie');
+		echo '</form>';
+	}
=20
-				//------------------------------------------------------------------=
---------
-				// action =3D del
-				//------------------------------------------------------------------=
---------
-				if ($sa =3D=3D 'del')
-				{
-					$cn =3D new Database();
-					$name =3D $cn->get_value('select mod_name from modeledef where mod_=
id=3D$1', array($_REQUEST['m']));
-					echo '<form method=3D"post">';
-					echo HtmlInput::hidden('d', $_REQUEST['m']);
-					echo HtmlInput::hidden('sa', 'remove');
-					echo '<h2 class=3D"error">Etes vous sure et certain de vouloir effa=
cer ' . $name . ' ???</h2>';
-					$confirm =3D new ICheckBox();
-					$confirm->name =3D "p_confirm";
-					echo 'Cochez la case si vous =C3=AAtes s=C3=BBr de vouloir effacer =
ce mod=C3=A8le';
-					echo $confirm->input();
-					echo HtmlInput::submit('remove', 'Effacer');
-					echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
-					echo '</form>';
-				}
-				//------------------------------------------------------------------=
---------
-				// action =3D del
-				//------------------------------------------------------------------=
---------
-				if ($sa =3D=3D 'remove')
-				{
-					if (!isset($_REQUEST['p_confirm']))
-					{
-						echo('D=C3=A9sol=C3=A9, vous n\'avez pas coch=C3=A9 la case');
-						echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
-						exit();
-					}
+	//---------------------------------------------------------------------=
------
+	// action =3D del
+	//---------------------------------------------------------------------=
------
+	if ($sa =3D=3D 'del')
+	{
+		$cn =3D new Database();
+		$name =3D $cn->get_value('select mod_name from modeledef where mod_id=3D=
$1', array($_REQUEST['m']));
+		echo '<form method=3D"post">';
+		echo HtmlInput::hidden('d', $_REQUEST['m']);
+		echo HtmlInput::hidden('sa', 'remove');
+		echo '<h2 class=3D"error">Etes vous sure et certain de vouloir effacer=
 ' . $name . ' ???</h2>';
+		$confirm =3D new ICheckBox();
+		$confirm->name =3D "p_confirm";
+		echo 'Cochez la case si vous =C3=AAtes s=C3=BBr de vouloir effacer ce =
mod=C3=A8le';
+		echo $confirm->input();
+		echo HtmlInput::submit('remove', 'Effacer');
+		echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
+		echo '</form>';
+	}
+	//---------------------------------------------------------------------=
------
+	// action =3D del
+	//---------------------------------------------------------------------=
------
+	if ($sa =3D=3D 'remove')
+	{
+		if (!isset($_REQUEST['p_confirm']))
+		{
+			echo('D=C3=A9sol=C3=A9, vous n\'avez pas coch=C3=A9 la case');
+			echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
+			exit();
+		}
=20
-					$cn =3D new Database();
-					$msg =3D "dossier";
-					$name =3D $cn->get_value("select mod_name from modeledef where mod_=
id=3D$1", array($_REQUEST['m']));
-					if (strlen(trim($name)) =3D=3D 0)
-					{
-						echo "<h2 class=3D\"error\"> $msg inexistant</h2>";
-						exit();
-					}
-					$sql =3D "drop database " . domaine . "mod" . sql_string($_REQUEST[=
'm']);
-					ob_start();
-					if ($cn->exec_sql($sql) =3D=3D false)
-					{
-						ob_end_clean();
+		$cn =3D new Database();
+		$msg =3D "dossier";
+		$name =3D $cn->get_value("select mod_name from modeledef where mod_id=3D=
$1", array($_REQUEST['m']));
+		if (strlen(trim($name)) =3D=3D 0)
+		{
+			echo "<h2 class=3D\"error\"> $msg inexistant</h2>";
+			exit();
+		}
+		$sql =3D "drop database " . domaine . "mod" . sql_string($_REQUEST['m'=
]);
+		ob_start();
+		if ($cn->exec_sql($sql) =3D=3D false)
+		{
+			ob_end_clean();
=20
-						echo "<h2 class=3D\"error\">
-                Base de donn=C3=A9e " . domaine . "mod" . $_REQUEST['m']=
 . "  est acc=C3=A8d=C3=A9e, d=C3=A9connectez-vous d'abord</h2>";
-						exit;
-					}
-					ob_flush();
-					$sql =3D "delete from modeledef where mod_id=3D$1";
-					$cn->exec_sql($sql, array($_REQUEST['m']));
-					print '<h2 class=3D"info">';
-					print "Voil=C3=A0 le mod=C3=A8le $name est effac=C3=A9</H2>";
-					echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
-				}
-				echo '</div>';
-				?>
+			echo "<h2 class=3D\"error\">
+	Base de donn=C3=A9e " . domaine . "mod" . $_REQUEST['m'] . "  est acc=C3=
=A8d=C3=A9e, d=C3=A9connectez-vous d'abord</h2>";
+			exit;
+		}
+		ob_flush();
+		$sql =3D "delete from modeledef where mod_id=3D$1";
+		$cn->exec_sql($sql, array($_REQUEST['m']));
+		print '<h2 class=3D"info">';
+		print "Voil=C3=A0 le mod=C3=A8le $name est effac=C3=A9</H2>";
+		echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
+	}
+	echo '</div>';
+	?>
=20



From MAILER-DAEMON Sun Nov 13 08:22:51 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPa1L-0003hU-6k
	for mharc-phpcompta-dev@gnu.org; Sun, 13 Nov 2011 08:22:51 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 13 Nov 2011 14:28:22 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.11924.1321190568.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4345 - in phpcompta/trunk: html 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: Sun, 13 Nov 2011 13:22:47 -0000

Author: danydb
Date: 2011-11-13 14:28:19 +0100 (Sun, 13 Nov 2011)
New Revision: 4345

Added:
   phpcompta/trunk/include/ajax_get_receipt.php
   phpcompta/trunk/sql/ajax-direct-form.sql
Modified:
   phpcompta/trunk/html/admin_repo.php
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/backup.php
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/js/card.js
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/html/user_login.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/audit_log.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_database.php
   phpcompta/trunk/include/class_dossier.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_user.php
   phpcompta/trunk/include/constant.security.php
   phpcompta/trunk/include/dossier.inc.php
   phpcompta/trunk/include/modele.inc.php
   phpcompta/trunk/include/param_sec.inc.php
   phpcompta/trunk/include/restore.inc.php
   phpcompta/trunk/include/template/module.php
   phpcompta/trunk/include/template/security_list_action.php
   phpcompta/trunk/include/user.inc.php
   phpcompta/trunk/include/user_detail.inc.php
   phpcompta/trunk/sql/object-6.0.sql
   phpcompta/trunk/sql/upgrade.sql
Log:
improve CSS
Finish new security + clean table action


Modified: phpcompta/trunk/html/admin_repo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin_repo.php	2011-11-11 22:45:11 UTC (rev 4344=
)
+++ phpcompta/trunk/html/admin_repo.php	2011-11-13 13:28:19 UTC (rev 4345=
)
@@ -19,7 +19,7 @@
 */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 /*! \file
- * \brief Administration of the repository : creation of user, folder, s=
ecurity,=20
+ * \brief Administration of the repository : creation of user, folder, s=
ecurity,
  *        templates... Accessible only by the administrator
  */
 require_once("user_common.php");
@@ -38,7 +38,7 @@
     html_page_stop();
     return;
 }
-
+load_all_script();
 echo '<H2 class=3D"info"> Administration Globale</H2>';
 echo '<div class=3D"topmenu">';
=20

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	2011-11-11 22:45:11 UTC (rev 4344)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-13 13:28:19 UTC (rev 4345)
@@ -521,10 +521,13 @@
 		$new=3Dfalse;
 		require_once 'template/plugin_detail.php';
 		break;
-         case 'saldo':
-             require_once 'ajax_bank_saldo.php';
-             break;
-         case 'up_predef':
-             require_once 'ajax_update_predef.php';
-             break;
+	 case 'saldo':
+		 require_once 'ajax_bank_saldo.php';
+		 break;
+	 case 'up_predef':
+		 require_once 'ajax_update_predef.php';
+		 break;
+	 case 'upd_receipt':
+		 require_once 'ajax_get_receipt.php';
+		 break;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/backup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/backup.php	2011-11-11 22:45:11 UTC (rev 4344)
+++ phpcompta/trunk/html/backup.php	2011-11-13 13:28:19 UTC (rev 4345)
@@ -58,7 +58,7 @@
         $cmd=3Descapeshellcmd (PG_DUMP);
         putenv("PGPASSWORD=3D".phpcompta_password);
         putenv("PGUSER=3D".phpcompta_user);
-
+		putenv("PGHOST=3D".phpcompta_psql_host);
         if ( $_REQUEST['t'] =3D=3D 'd' )
         {
             $database=3Ddomaine."dossier".$_REQUEST['d'];

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	2011-11-11 22:45:11 UTC (rev 43=
44)
+++ phpcompta/trunk/html/js/acc_ledger.js	2011-11-13 13:28:19 UTC (rev 43=
45)
@@ -85,9 +85,9 @@
 {
     var jrn=3Dg("p_jrn").value;
     var dossier=3Dg("gDossier").value;
-    var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn;
+    var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn+"&op=3Dupd_recei=
pt";
     var action=3Dnew Ajax.Request(
-                   "get_pj.php",
+                   "ajax_misc.php",
                    {
                    method:'get',
                    parameters:querystring,

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2011-11-11 22:45:11 UTC (rev 4344)
+++ phpcompta/trunk/html/js/card.js	2011-11-13 13:28:19 UTC (rev 4345)
@@ -240,6 +240,7 @@
 }
 function update_value(text,li)
 {
+	   ajaxFid(ctl);
 }
 /**
  *@brief is called when something change in ICard

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	2011-11-11 22:45:11 UTC (rev 434=
4)
+++ phpcompta/trunk/html/js/infobulle.js	2011-11-13 13:28:19 UTC (rev 434=
5)
@@ -17,8 +17,8 @@
 */
 /*!\file
  * \brief create the infobulle, the internalization is not yet implement=
ed
- * \code=20
- // Example=20
+ * \code
+ // Example
   echo JS_INFOBULLE;
   echo HtmlInput::infobulle(x);
  \endcode
@@ -27,10 +27,10 @@
 var posX=3D0,posy=3D0,offsetX=3D10,offsetY=3D10;
 document.onmousemove=3DgetPosition;
 var content=3Dnew Array();
-content[0]=3D"Donnez le quickcode ou tapez une partie du nom de la fiche=
 puis cliquer sur rechercher, si la recherche ne donne rien, il vous sera=
 propos=C3=A9 de cr=C3=A9er une nouvelle fiche";
+content[0]=3D"Donnez le quickcode ou tapez une partie du nom de la fiche=
, en appuyant sur le bouton, vous pourrez la chercher";
 content[1]=3D"(optionnel) La description est un commentaire libre qui se=
rt =C3=A0 identifier cette op=C3=A9ration";
 content[2]=3D"Selectionnez le journal o=C3=B9 l'op=C3=A9ration doit =C3=AA=
tre sauv=C3=A9e";
-content[3]=3D"Les p=C3=A9riodes comptables servent comme un second contr=
=C3=B4le pour la date de l'op=C3=A9ration. Modifiez dans vos pr=C3=A9f=C3=
=A9rence pour avoir une autre p=C3=A9riode par d=C3=A9faut";
+content[3]=3D"Les p=C3=A9riodes comptables servent comme un second contr=
=C3=B4le pour la date de l'op=C3=A9ration. Modifiez dans vos pr=C3=A9f=C3=
=A9rence pour avoir une autre p=C3=A9riode par d=C3=A9faut. Pour ne plus =
avoir =C3=A0 changer la p=C3=A9riode aller dans COMPANY, et mettez \"Affi=
cher la p=C3=A9riode comptable\" =C3=A0 non";
 content[4]=3D"(optionnel) L'=C3=A9ch=C3=A9ance est la date limite de pai=
ement";
 content[5]=3D"(optionnel)Le num=C3=A9ro d'extrait permet de retrouver pl=
us facilement l'extrait de banque";
 content[6]=3D"Indiquez ici le prix hors tva si vous =C3=AAtes affili=C3=A9=
 =C3=A0 la tva et que vous  pouvez la d=C3=A9duire , sinon indiquez ici l=
e total tva incluse et utilisez un taux tva de 0%";

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	2011-11-11 22:45:11 UTC (rev 434=
4)
+++ phpcompta/trunk/html/style-color.css	2011-11-13 13:28:19 UTC (rev 434=
5)
@@ -7,7 +7,7 @@
     padding:0;
     margin:0;
     color:#0E7E0E;
-   =20
+
 }
 .notice {
     color:red;
@@ -18,7 +18,7 @@
=20
 table.result,table.document ,table.resultfooter{
     color:blue;
-    border:1px solid blue ;=20
+    border:1px solid blue ;
     width:100%;
     border-spacing:  0px;
     border-collapse:collapse;
@@ -29,7 +29,7 @@
=20
=20
 }
-table.result th, table.document th {=20
+table.result th, table.document th {
     font-weight:bold;
     font-family:helvetica,arial,sans-serif;
     border-bottom:1px solid blue;
@@ -109,7 +109,7 @@
 div.u_tmenu {
=20
     margin-top:1px;
-    width:100%;=09
+    width:100%;
     background-color:#879ED4;
=20
=20
@@ -122,7 +122,7 @@
=20
 }
 div.u_tmenu div.u_tool {
-    background-color:#879ED4;=09
+    background-color:#879ED4;
     float:left;
=20
 }
@@ -145,7 +145,7 @@
=20
 div.u_subt2menu {
     background-color:lightgrey;
-    left:1%;=09
+    left:1%;
=20
 }
 div.lmenu {
@@ -177,39 +177,39 @@
     border-width:1px;
=20
 }
-div.redcontent{ 	=20
+div.redcontent{
=20
-    float:left; 	=20
+    float:left;
     padding-top:7px;
     padding-left:8px;
-    font-size:9px; 	=20
-    font-family:helvetica,arial,sans-serif; 	=20
+    font-size:9px;
+    font-family:helvetica,arial,sans-serif;
     width:75%;
=20
 }
-div.content{ 	=20
+div.content{
=20
-    float:left; 	=20
+    float:left;
     padding-top:7px;
-    width:100%; 	 	=20
-    font-family:helvetica,arial,sans-serif; =09
+    width:100%;
+    font-family:helvetica,arial,sans-serif;
     clear:both;
=20
=20
 }
-div.content30{ 	=20
+div.content30{
=20
-    float:left; 	=20
+    float:left;
     padding-top:7px;
-    width:35%; 	 =20
-    font-family:helvetica,arial,sans-serif; 	=20
+    width:35%;
+    font-family:helvetica,arial,sans-serif;
=20
 }
 div.no span{
     position:static;
-    font-family:helvetica,arial,sans-serif;=09
+    font-family:helvetica,arial,sans-serif;
     font-weight:bold;
-    color:red;=09
+    color:red;
=20
 }
 .error {
@@ -217,7 +217,7 @@
     margin-left:20%;
     text-align: center;
=20
-    color:white; =20
+    color:white;
     background-color:red;
     font-weight: bolder;
     font-size:120%;
@@ -227,7 +227,7 @@
     border:0;
     text-align:center
 }
-td.mshort {=20
+td.mshort {
     height:15px;
     width:60px;
     text-align:center;
@@ -238,7 +238,7 @@
 td.mtitle {
     text-align:center;
     width:95px;
-    height :30px;=20
+    height :30px;
     font-size:10px;
     background-color:#DDE6FF;
 }
@@ -254,11 +254,11 @@
     font-size:10px;
     border-style:groove
 }
-span.odd {=20
+span.odd {
     background-color:#ECF3FF;
     display:block;
 }
-span.even {=20
+span.even {
     background-color:#DDE6FF;
     display:block;
 }
@@ -266,7 +266,7 @@
 tr.odd {
     background-color:#DDE6FF;
     font-size:10px;
-    border-size:0px;	=09
+    border-size:0px;
 }
 tr {
     font-size:10px;
@@ -328,7 +328,7 @@
     background-color: #a9d6e4;
     color:white;
 }
-tr.even:hover td=20
+tr.even:hover td
 {
     text-decoration:none;
     background-color: #a9d6e4;
@@ -390,7 +390,7 @@
     color: blue;
 }
=20
-a.detail:hover  =20
+a.detail:hover
 {
     font-size:9px;
     font-family:helvetica,arial,sans-serif;
@@ -479,9 +479,9 @@
     font-weight:normal;
     border-color:336699;
     border-style:solid;
-    background-color:orange; =20
+    background-color:orange;
     border-width:1px;
-    color:blue;=20
+    color:blue;
 }
 div.content input.text {
     font-family:helvetica,arial,sans-serif;
@@ -490,7 +490,7 @@
     border-style:solid;
     border-width:1px;
     background-color:orange;
-    color:blue;=20
+    color:blue;
 }
=20
=20
@@ -529,10 +529,10 @@
     font-size: 120% ;
=20
 }
-fieldset fieldset legend {=20
+fieldset fieldset legend {
     font-size:110%;
     color:grey;
-}=09
+}
 select {
     border: 1px solid blue;
     margin:2px;
@@ -548,7 +548,7 @@
     background-color:yellow;
     top:0;left:0;
     visibility:hidden;
-    z-index:2;
+    z-index:20;
     width:25em;
=20
 }
@@ -589,8 +589,8 @@
     height:100%;
     z-index:1;
     /*background-color:lightgrey;*/
-    background-color: rgba(203, 203,203, 0.2);=09
-    display:none;=09
+    background-color: rgba(203, 203,203, 0.2);
+    display:none;
 }
=20
 div.popup_border_title {
@@ -609,7 +609,7 @@
     font-style: italic;
     font-weight: bolder;
     text-align:center;
-    /*border-bottom: 2px solid #201e87;*/=09
+    /*border-bottom: 2px solid #201e87;*/
     color: white;
     display:none;
     /*opacity:1;
@@ -621,12 +621,12 @@
     top:20%;
     left:20%;
     width:60%;
-    height:80% ;=20
+    height:80% ;
     /*background:lightgrey;*/
     z-index:10;
     /*border:dotted 1px black;*/
     border: 3px outset #201e87;
-    background-color:lightblue;=09
+    background-color:lightblue;
     font-family: helvetica,arial,sans-serif;
     font-style: italic;
     font-weight: bolder;
@@ -647,7 +647,7 @@
     width:100%;
     height:96%;
     overflow: auto;
-    background-color:#DFE7FF;=09
+    background-color:#DFE7FF;
     font-size:10px ;
     font-family: helvetica,arial,sans-serif;
     font-style: normal;
@@ -823,7 +823,7 @@
     margin:1 2 1 2;
     -moz-border-radius:2 2;
=20
-}=09
+}
 a#anchorbutton :hover {
     cursor:pointer;
     background-color:white;
@@ -832,7 +832,7 @@
     margin:1 2 1 2;
 }
 /* </style> */
-div.add_todo_list {=20
+div.add_todo_list {
     border:1px solid blue;
     display:none;
     background-color:#CFCDFF;
@@ -857,7 +857,7 @@
=20
 }
 div.op_detail_frame  {
-    background-color:#e4e7ed;=20
+    background-color:#e4e7ed;
     height:100%; width:100%;
=20
=20
@@ -875,7 +875,7 @@
     left:10%;
=20
=20
-    border:1px solid darkblue;=09
+    border:1px solid darkblue;
=20
 }
 div.op_detail_title {
@@ -884,7 +884,7 @@
=20
=20
 }
-div#div_jrn{=20
+div#div_jrn{
     position:absolute;
     border:1px solid black;
     top:15%;left:100;
@@ -894,7 +894,7 @@
     background-color:#EDF3FF;
=20
 }
-div#div_cat{=20
+div#div_cat{
     position:absolute;
     border:1px solid black;
     top:15%;left:100;
@@ -908,7 +908,7 @@
 {  color:red;text-align:right;display:block;width:30em;height:13;}
=20
 div#search_form
-{=20
+{
     position:absolute;
     border:1px solid black;
     top:15%;left:100;
@@ -918,7 +918,7 @@
     display:none;
     background-color:#e4e7ed;
 }
-table.result td=20
+table.result td
 {
     padding-left:5px;
     padding-right:5px;
@@ -928,7 +928,7 @@
 	margin-left: 30%;
 	margin-right: 30%;
 	width:20%;
-=09
+
 }
 table.info_op tr
 {
@@ -939,13 +939,13 @@
 h2#jrn_name
 {
 	margin-right:30%;
-=09
+
 }
 tr.footer{
 	font-size:14;
 	font-style: italic;
 	font-weight: bold;
-=09
+
 }
 span.remain {
 	font-weight: bold;
@@ -955,22 +955,22 @@
 {
 	float: right;
 	margin-right:150;
-=09
-=09
+
+
 }
 #predef_form {
 	margin-left:20%;
 	width:60%;
-=09
+
 }
 #direct
 {
 	display:inline;
 	float:right;
-=09
-=09
+
+
 }
-.direct=20
+.direct
 {
 		font-size:6px;
 	   border:groove 1px #00ff00;
@@ -984,13 +984,13 @@
   margin:0;
   overflow:hidden;
   z-index:10;
- =20
+
 position:absolute;
 left:30%;
 top:30%;
=20
=20
-border:1px solid darkblue;=09
+border:1px solid darkblue;
=20
 }
 #wait_box h2
@@ -998,11 +998,11 @@
 color:black;
 text-align:center;
 }
-div#div_jrnsearch_op{=20
-             =20
+div#div_jrnsearch_op{
+
               border:1px solid black;
               display:none;
               width:50em;
 		      background-color:#EDF3FF;
-		     =20
+
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-11 22:45:11 UTC (rev 434=
4)
+++ phpcompta/trunk/html/style-light.css	2011-11-13 13:28:19 UTC (rev 434=
5)
@@ -435,7 +435,7 @@
   font-family:helvetica,arial,sans-serif;
   text-decoration: none;
   display: block;
-  color: #0000ff;
+  color: blue;
 padding: 1px ;
=20
 }
@@ -565,6 +565,10 @@
 	   visibility:hidden;
 	   z-index:2;
 	   width:25em;
+	   padding-bottom: 10;
+	   padding-top: 10;
+	   padding-left: 10;
+	   padding-right: 10;
=20
 }
=20

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	2011-11-11 22:45:11 UTC (rev 4344)
+++ phpcompta/trunk/html/style.css	2011-11-13 13:28:19 UTC (rev 4345)
@@ -35,10 +35,8 @@
=20
   color:#25238F;
   text-align: left;
-  	     // background-color:#EDF3FF;
+  font-style: italic;
=20
-	      font-style: italic;
-
 }
=20
 h2 {
@@ -566,11 +564,15 @@
 	   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;
-	   z-index:2;
 	   width:25em;
-
+		z-index:20;
 }
=20
 span.action {
@@ -790,7 +792,7 @@
 cursor:inherit;
 }
=20
-.button, a.button,div.content a.button {
+a#anchorbutton, .button, a.button,div.content a.button {
 	font-size:10;
 	color:white;
 	font-weight: bold;
@@ -804,13 +806,17 @@
 	border-style:  outset ;
 	border-color:  blue ;
 	border-width:0;
-	padding:2 4 2 4;
+	padding-bottom: 4;
+	padding-top: 4;
+	padding-right: 6;
+	padding-left:  6;
+	margin-top:3px;
 	cursor:pointer;
 	margin:1 2 1 2;
 	-moz-border-radius:2 2;
=20
 }
-.button:hover,a.button:hover,div.content a.button:hover  {
+a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
@@ -836,33 +842,6 @@
 padding:0;
 text-align:center;
 }
-a#anchorbutton {
-	font-size:10;
-	color:white;
-	font-weight: bold;
-
-	text-decoration:none;
-	font-family: helvetica,sans-serif;
-	background-image: url("image/bg-submit3.gif");
-	background-repeat: repeat-x;
-	background-position: left;
-
-	border-style:  outset ;
-	border-color:  blue ;
-	border-width:1;
-	padding:2 4 2 4;
-	cursor:pointer;
-	margin:1 2 1 2;
-	-moz-border-radius:2 2;
-
-}
-a#anchorbutton:hover {
-	cursor:pointer;
-	background-color:white;
-	border-style:  inset ;
-	color:blue;
-	margin:1 2 1 2;
-	}
 /* </style> */
 div.add_todo_list {
                     border:1px solid blue;
@@ -1059,4 +1038,10 @@
   display:inline;
   color: #0000ff;
      background-color: rgb(93, 144, 205);
+}
+#close_div
+{
+ background-color:blue;
+ color:white;
+ text-decoration:none
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/user_login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_login.php	2011-11-11 22:45:11 UTC (rev 4344=
)
+++ phpcompta/trunk/html/user_login.php	2011-11-13 13:28:19 UTC (rev 4345=
)
@@ -119,7 +119,7 @@
 $result.=3D"</TR>";
 $result.=3D"</table>";
=20
-echo '<h2 class=3D"info">'._('Bienvenue').$User->first_name.'  '.$User->=
name.' '._("dans PhpCompta")."</h2>";
+echo '<h2 class=3D"info">'._('Bienvenue    ').$User->first_name.'  '.$Us=
er->name.'   '._("dans PhpCompta")."</h2>";
 echo '<br>'._('Choississez votre dossier');
 echo '<span style=3D"position:absolute;right:10px;top:30px">'.$result.'<=
/span>';
 echo '</div>';

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-11 22:45:11 UTC (rev 43=
44)
+++ phpcompta/trunk/include/ac_common.php	2011-11-13 13:28:19 UTC (rev 43=
45)
@@ -803,12 +803,20 @@
=20
     if (empty($default_module))
     {
-	$default_module =3D $cn->get_array("select me_code
-	    from profile_menu join profile_user using (p_id)
-	    where
-	    user_name=3D$1 and p_order=3D(select min(p_order) from profile_menu
-		where user_name=3D$2) limit 1", array($g_user->login, $g_user->login))=
;
-	return $default_module[0]['me_code'];
+		$default_module =3D $cn->get_array("select me_code
+			from profile_menu join profile_user using (p_id)
+			where
+			user_name=3D$1 and p_order=3D(select min(p_order) from profile_menu
+			where user_name=3D$2) limit 1", array($g_user->login, $g_user->login)=
);
+		/*
+		 * if nothing found, there is no profile for this user =3D> exit
+		 */
+		if ( empty ($default_module))
+		{
+			echo_warning("Utilisateur n'a pas de profile");
+			exit();
+		}
+		return $default_module[0]['me_code'];
     }
=20
     if (count($default_module) > 1)

Added: phpcompta/trunk/include/ajax_get_receipt.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_get_receipt.php	                        =
(rev 0)
+++ phpcompta/trunk/include/ajax_get_receipt.php	2011-11-13 13:28:19 UTC =
(rev 4345)
@@ -0,0 +1,67 @@
+<?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: 4283 $ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ * \brief respond ajax request, the get contains
+ *  the value :
+ * - l for ledger
+ * - gDossier
+ * Must return at least tva, htva and tvac
+
+ */
+
+require_once ('constant.php');
+require_once ('class_database.php');
+require_once('class_dossier.php');
+require_once('class_acc_ledger.php');
+require_once ('class_user.php');
+
+// Check if the needed field does exist
+extract ($_GET);
+foreach (array('l','gDossier') as $a)
+{
+    if ( ! isset (${$a}) )
+    {
+        echo "error $a is not set ";
+        exit();
+    }
+
+}
+if ( is_numeric($l) =3D=3D false  )
+{
+    exit();
+}
+$cn=3Dnew Database(dossier::id());
+$User=3Dnew User($cn);
+$User->Check();
+
+$Ledger=3Dnew Acc_Ledger($cn,$l);
+$prop=3D$Ledger->get_propertie();
+$pj_seq=3D$Ledger->guess_pj();
+$string=3D'{"pj":"'.$pj_seq.'"}';
+
+header("Content-type: text/json; charset: utf8",true);
+echo $string;
+
+
+?>
+

Modified: phpcompta/trunk/include/audit_log.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/audit_log.php	2011-11-11 22:45:11 UTC (rev 43=
44)
+++ phpcompta/trunk/include/audit_log.php	2011-11-13 13:28:19 UTC (rev 43=
45)
@@ -72,7 +72,8 @@
   case 'SUCCESS';
   echo '<td style=3D"background-color:green;color:white">';
   break;
-
+  default:
+	  echo '<td>';
   }
 ?>
 <?=3D$r['ac_state']?>

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	2011-11-11 22:45:11 UTC =
(rev 4344)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-13 13:28:19 UTC =
(rev 4345)
@@ -2619,7 +2619,7 @@
=20
         if ( $type=3D=3D"" || $this->id=3D=3D0) $type=3D'ALL';
         $r.=3D'<div id=3D"search_form" style=3D"display:none">';
-	$r.=3DHtmlInput::anchor_action('Fermer','$(\'search_form\').style.displ=
ay=3D\'none\';');
+	$r.=3DHtmlInput::anchor_hide('Fermer','$(\'search_form\').style.display=
=3D\'none\';');
 	$r.=3Dh2info('Recherche');
         $r.=3D'<FORM METHOD=3D"GET">';
         $r.=3D$this->search_form($type);

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	2011-11-11 22:45:11 UTC (r=
ev 4344)
+++ phpcompta/trunk/include/class_database.php	2011-11-13 13:28:19 UTC (r=
ev 4345)
@@ -135,6 +135,10 @@
             }
             else
             {
+				if ( !is_array($p_array))
+				{
+					throw new Exception("Erreur : exec_sql attend un array");
+				}
 	      if ( ! DEBUG )
 		$this->ret=3Dpg_query_params($this->db,$p_string,$p_array);
 	      else
@@ -143,7 +147,8 @@
             }
             if ( ! $this->ret )
             {
-                throw new Exception ("  SQL ERROR $p_string ",1);
+				$str_error=3Dpg_last_error($this->db);
+                throw new Exception ("  SQL ERROR $p_string ".$str_error=
,1);
             }
=20
         }
@@ -155,7 +160,8 @@
                 print_r($p_array);
                 echo $a->getMessage();
                 echo $a->getTrace();
-		echo pg_last_error($this->db);
+				echo $a->getTraceAsString();
+				echo pg_last_error($this->db);
             }
             throw ($a);
         }

Modified: phpcompta/trunk/include/class_dossier.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_dossier.php	2011-11-11 22:45:11 UTC (re=
v 4344)
+++ phpcompta/trunk/include/class_dossier.php	2011-11-13 13:28:19 UTC (re=
v 4345)
@@ -37,7 +37,7 @@
 require_once('class_database.php');
 require_once('ac_common.php');
=20
-class dossier
+class Dossier
 {
     private static $variable=3Darray("id"=3D>"dos_id",
                                    "name"=3D>"dos_name",
@@ -60,7 +60,7 @@
      *
      * Show the folder where user have access. Return    : nothing
      ++*/
-    function show_dossier($p_type,$p_first=3D0,$p_max=3D10,$p_Num=3D0)
+    function show_dossier($p_type,$p_first=3D0,$p_max=3D0,$p_Num=3D0)
     {
         $l_user=3D$_SESSION['g_user'];
         if ( $p_max =3D=3D 0 )
@@ -106,7 +106,7 @@
      */
     function get_user_folder($sql=3D"")
     {
-       =20
+
         $sql=3D"
             select
                 use_id,
@@ -129,7 +129,7 @@
             use_login!=3D'phpcompta'
             $sql
             ";
-       =20
+
         $res=3D$this->cn->get_array($sql);
         return $res;
         }
@@ -244,13 +244,57 @@
     }
=20
     static function get_version($p_cn)
-    {
-        return $p_cn->get_value('select val from version');
-    }
-    static function connect()
-    {
-	$id=3DDossier::id();
-	$cn=3D new Database($id);
-	return $cn;
-    }
+	{
+		return $p_cn->get_value('select val from version');
+	}
+
+	static function connect()
+	{
+		$id =3D Dossier::id();
+		$cn =3D new Database($id);
+		return $cn;
+	}
+	/**
+	 *connect to folder and give to admin. the profile Admin(builtin)
+	 * @param int $p_id dossier::id()
+	 */
+	static function synchro_admin($p_id)
+	{
+		// connect to target
+		$cn=3Dnew Database($p_id);
+
+		if (! $cn->exist_table("profile_menu"))
+		{
+			echo_warning("Dossier invalide");
+			return;
+		}
+		// connect to repo
+		$repo=3Dnew Database();
+
+		$a_admin=3D$repo->get_array("select use_login from ac_users where
+			use_admin=3D1 and use_active=3D1");
+		try
+		{
+			/**
+			 * synchro global
+			 */
+			$cn->start();
+			for ($i=3D0;$i<count($a_admin);$i++)
+			{
+				$exist=3D$cn->get_value("select p_id from profile_user
+					where user_name=3D$1",array($a_admin[$i]['use_login']));
+				if ( $exist =3D=3D "")
+				{
+					$cn->exec_sql("insert into profile_user(user_name,p_id) values($1,1=
)",
+							array($a_admin[$i]['use_login']));
+				}
+
+			}
+			$cn->commit();
+		} catch(Exception $e)
+		{
+			echo_warning($e->getMessage());
+			$cn->rollback();
+		}
+	}
 }

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	2011-11-11 22:45:11 UTC =
(rev 4344)
+++ phpcompta/trunk/include/class_html_input.php	2011-11-13 13:28:19 UTC =
(rev 4345)
@@ -208,7 +208,7 @@
      */
     static function button_anchor($p_label,$p_value,$p_name=3D"",$p_java=
script=3D"")
     {
-        $r=3Dsprintf('<span id=3D"%s"> <A id=3D"anchorbutton" style=3D"d=
isplay:inline;"  href=3D"%s" %s >%s</A></span>',
+        $r=3Dsprintf('<span id=3D"%s" class=3D"button"> <A class=3D"butt=
on" style=3D"display:inline;"  href=3D"%s" %s >%s</A></span>',
                    $p_name,
                    $p_value,
                    $p_javascript,
@@ -398,35 +398,34 @@
     {
 	$r=3D'';
 	$r.=3D'<div style=3D"float:right;margin:2;">';
-	$r.=3D '<A style=3D"background-color:blue;color:white;text-decoration:n=
one" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$div.'\');">Fer=
mer</A>';
+	$r.=3D '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"remo=
veDiv(\''.$div.'\');">Fermer</A>';
 	$r.=3D'</div>';
 	return $r;
     }
     /**
-     * button Html with an action in the top
-     *@param $action action action to perform (message)
-     *@param $javascript javascript of the DIV to close
-     *@see Acc_Ledger::display_search_form
-     *@note not protected against html
-     *@param $div_name is the name of the div to remove
+     * button Html
+     *@param $action action action to perform (message) without onclick
+     *@param $javascript javascript to execute
      */
-    static function button_action($action,$javascript)
+    static function button_action($action,$javascript,$id=3D"xx")
     {
+		$r=3D"";
+		$r.=3D'<input type=3D"button" id=3D"'.$id.'"class=3D"button" onclick=3D=
"'.$javascript.'" value=3D"'.h($action).'">';
+		return $r;
=20
-
     }
     /**
-     * Return a html string with an anchor looking like anchor_button in=
 the right corner
+     * Return a html string with an anchor to hide a div, put it in the =
right corner
      *@param $action action action to perform (message)
      *@param $javascript javascript
      *@note not protected against html
      *@see Acc_Ledger::display_search_form
      */
-    static function anchor_action($action,$javascript)
+    static function anchor_hide($action,$javascript)
     {
 	$r=3D'';
-	$r.=3D'<div style=3D"float:right">';
-	$r.=3D '<A style=3D"background-color:blue;color:white;text-decoration:n=
one" HREF=3D"javascript:void(0)" onclick=3D"'.$javascript.'");">'.$action=
.'</A>';
+	$r.=3D'<div style=3D"float:right;right;margin:2;">';
+	$r.=3D '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"'.$j=
avascript.'");">'.$action.'</A>';
 	$r.=3D'</div>';
 	return $r;
     }
@@ -610,8 +609,8 @@
           {
               $p_url=3D"javascript:void(0)";
           }
-         =20
- =20
+
+
           $str=3Dsprintf('<a class=3D"line" href=3D"%s" %s>%s</a>',
                   $p_url,$p_js,$p_text);
           return $str;

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2011-11-11 22:45:11 UTC (rev 4=
344)
+++ phpcompta/trunk/include/class_user.php	2011-11-13 13:28:19 UTC (rev 4=
345)
@@ -42,7 +42,7 @@
 	var $admin;
 	var $valid;
=20
-	function User($p_cn, $p_id=3D-1)
+	function User(&$p_cn, $p_id=3D-1)
 	{
 		// if p_id is not set then check the connected user
 		if ($p_id =3D=3D -1)
@@ -104,7 +104,8 @@
              use_name,
              use_login,
              use_active,
-             use_admin
+             use_admin,
+			 use_pass
              from ac_users ";
 		$cn =3D new Database();
 		$Res =3D $cn->exec_sql($sql . $sql_cond, $sql_array);
@@ -117,6 +118,7 @@
 		$this->active =3D $row['use_active'];
 		$this->login =3D $row['use_login'];
 		$this->admin =3D $row['use_admin'];
+		$this->password =3D $row['use_pass'];
 	}
=20
 	function save()
@@ -409,7 +411,7 @@
 		}
=20
 		$sql =3D sprintf("insert into user_local_pref (user_id,parameter_value=
,parameter_type)
-                     values ('%s','%d','PERIODE')", $this->login, $pid);
+                     values ('%s','%d','PERIODE')", $this->id, $pid);
 		$Res =3D $this->db->exec_sql($sql);
 	}
=20
@@ -510,7 +512,7 @@
          */
         function check_module($p_module)
         {
-            $acc=3D$this->db->get_value("select count(*) from v_all_menu=
 where user_name =3D $1=20
+            $acc=3D$this->db->get_value("select count(*) from v_all_menu=
 where user_name =3D $1
                 and me_code=3D$2", array($this->login,$p_module));
             if ($acc =3D=3D 0)
             {
@@ -624,14 +626,14 @@
 		{
 			foreach ($default_parameter as $name =3D> $value)
 			{
-				$Insert =3D sprintf($Sql, $this->login, $name, $value);
+				$Insert =3D sprintf($Sql, $this->id, $name, $value);
 				$cn->exec_sql($Insert);
 			}
 		}
 		else
 		{
 			$value =3D ($p_value =3D=3D "") ? $default_parameter[$p_type] : $p_va=
lue;
-			$Insert =3D sprintf($Sql, $this->login, $p_type, $value);
+			$Insert =3D sprintf($Sql, $this->id, $p_type, $value);
 			$cn->exec_sql($Insert);
 		}
 	}
@@ -991,16 +993,37 @@
 		$sql =3D "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac=
_state) values ($1,$2,$3,$4,$5)";
 		if ($audit)
 		{
-				$cn->exec_sql($sql,=20
+				$cn->exec_sql($sql,
                                         array(
-                                            $_SESSION['g_user'],=20
-                                            $_SERVER["REMOTE_ADDR"],=20
-                                            $p_module,=20
-                                            $_SERVER['REQUEST_URI'],=20
+                                            $_SESSION['g_user'],
+                                            $_SERVER["REMOTE_ADDR"],
+                                            $p_module,
+                                            $_SERVER['REQUEST_URI'],
                                             $action));
 		}
 	}
+	function save_profile($p_id)
+	{
+		$count=3D$this->db->get_value("select count(*) from profile_user where=
 user_name=3D$1",  array($this->login));
+		if ($count=3D=3D0)
+		{
+			$this->db->exec_sql("insert into profile_user(p_id,user_name)
+								values ($1,$2)",
+								array($p_id,$this->login));
=20
+		} else {
+			$this->db->exec_sql("update profile_user set p_id=3D$1 where user_nam=
e=3D$2",
+								array($p_id,$this->login));
+
+		}
+	}
+	function get_profile()
+	{
+		$profile=3D$this->db->get_value("select p_id from profile_user where
+				user_name=3D$1",array($this->login));
+		return $profile;
+	}
+
 }
=20
 ?>

Modified: phpcompta/trunk/include/constant.security.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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.security.php	2011-11-11 22:45:11 UTC=
 (rev 4344)
+++ phpcompta/trunk/include/constant.security.php	2011-11-13 13:28:19 UTC=
 (rev 4345)
@@ -1,49 +1,6 @@
 <?php
-define ("CAPA",210);  //Ajout de plan analytique
-define ("CAPO",220);  //Ajout de poste analytique
-define ("CAGA",230);  //Ajout de groupe analytique
-define('CAOD',235);   // Ajout d'OD
-define ("CAIMP",240);  //Impression
-define('GESTION',300); /* Access gestion */
-define ("GEBQ",305);  //Import en Banque
-define ("GEOP",307);  //Effacement d'op=C3=A9ration
-define ("GECOUR",310);  //Courrier (lecture & =C3=A9criture)
-define ("GESUPPL",311);	/* Fournisseur */
-define ("GECUST",312);	/* Clients */
-define ("GEADM",313);	/* Administration */
-define ("GESTOCK",320);  //gestion de stock
-define ("IMPRAP",700);  //Rapport
-define ("IMPJRN",710);  //Journaux
-define ("IMPFIC",720);  //Fiche
-define ("IMPPOSTE",730);  //Poste
-define ("IMPBIL",740);  //Bilan
-define ("IMPBAL",750);	/* Impression balance */
 define ('FICADD',800);	 /* Ajout de fiche */
 define ("FIC",805);  //Cr=C3=A9ation, modification et effacement de fich=
e
 define ("FICCAT",910);  //cr=C3=A9ation, modification et effacement de c=
at=C3=A9gorie de fiche
-define ("PARCA",1100);  //Mode comptabilit=C3=A9 analytique
-define ("PARPER",1110);  //Ajout de p=C3=A9riode
-define ("PARFIC",1120);  //Cat=C3=A9gorie des fiches
-define ("PARDOC",1130);  //Document
-define ("PARCATDOC",1135);  //Add Document category
-define ("PARJRN",1140);  //Modification journaux
-define ("PARSEC",1245);	 /* S=C3=A9curit=C3=A9 */
-define ("PARTVA",1150);  //TVA
-define ("PARMP",1160);  //Moyen de paiement
-define ("PARCLO",1180);  //Cl=C3=B4ture
-define ("PARPCMN",1185); /* Chagt plan comptable */
-define ("PARPOS",1170);  //Poste Comptable de base
-define ("PARCENT",1190);  //Centralisation
-define ("PAREO",1200);  //=C3=89criture d'ouverture
-define ("PARSTR",1210);  //Mode strict
-define ("PARCOORD",1220);  //Coordonn=C3=A9es soci=C3=A9t=C3=A9
-define ("PARRAP",1230);  //Cr=C3=A9ation de rapport
-define ("PARPREDE",1240);  //Effacement et cr=C3=A9ation d'op=C3=A9ratio=
n pr=C3=A9d=C3=A9finie
-define ("STOLE",1500);  //Stock (lecture)
-define ("STOWRITE",1510);  //Stock (changement)
-define ("EXTENSION",1600);  //Extension
-define ("PREVCON",1701);  //Prevision
-define ("PREVMOD",1702);  //Prevision
-
 global $audit; $audit=3Dtrue;
 ?>

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	2011-11-11 22:45:11 UTC (rev =
4344)
+++ phpcompta/trunk/include/dossier.inc.php	2011-11-13 13:28:19 UTC (rev =
4345)
@@ -123,9 +123,9 @@
                 $fev=3D29;
             else
                 $fev=3D28;
-
+			xdebug_break();
             $Res=3D$cn->exec_sql("delete from user_local_pref where para=
meter_type=3D'PERIODE'");
-            $nb_day=3Darray(31,$fev,31,30,31,30,31,31,30,31,30,30);
+            $nb_day=3Darray(31,$fev,31,30,31,30,31,31,30,31,30,31);
             $m=3D1;
             foreach ($nb_day as $day)
             {
@@ -137,16 +137,14 @@
                 $Res=3D$cn->exec_sql($sql);
                 $m++;
             }
-            $sql=3Dsprintf("insert into parm_periode (p_start,p_end,p_ex=
ercice)
-                         values (to_date('31-12-%s','DD-MM-YYYY'),to_dat=
e('31-12-%s','DD-MM-YYYY'),'%s')",
-                         $year,$year,$year);
-            $Res=3D$cn->exec_sql($sql);
             $sql=3D"	insert into jrn_periode(p_id,jrn_def_id,status) ".
                  "select p_id,jrn_def_id, 'OP'".
                  " from parm_periode cross join jrn_def";
             $Res=3D$cn->exec_sql($sql);
=20
+			Dossier::synchro_admin($l_id);
=20
+
         }
     } // if $l_id !=3D 0
 } // $_POST[DATABASE]
@@ -162,14 +160,8 @@
     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');
=20
-    $offset=3D(isset($_REQUEST['offset']))?$_REQUEST['offset']:0;
-    $page=3D(isset($_REQUEST['page']))?$_REQUEST['page']:1;
-    $count=3D$cn->get_value("select count(*) from ac_dossier");
-    $size=3D(isset ($_SESSION['g_pagesize']))?$_SESSION['g_pagesize']:40=
;
-    if ( $size=3D=3D-1) $size=3D200;
-    echo jrn_navigation_bar($offset,$count,$size,$page);
     $repo=3Dnew Dossier(0);
-    $Res=3D$repo->show_dossier('all',$offset,$size);
+    $Res=3D$repo->show_dossier('all');
     $compteur=3D1;
     $template=3D"";
=20
@@ -188,7 +180,7 @@
             else
                 $cl=3D'class=3D"even"';
=20
-            echo "<TR $cl><TD VALIGN=3D\"TOP\"> ".
+            echo "<TR $cl><TD style=3D\"vertical-align:top\"> ".
 	      $Dossier['dos_id']."</td><td> <B>".h($Dossier['dos_name'])."</B> =
</TD>";
 	    $str_name=3Ddomaine.'dossier'.$Dossier['dos_id'];
 	    $size=3D$cn->get_value("select pg_database_size($1)/(1024*1024)::fl=
oat",
@@ -217,7 +209,6 @@
     }
     echo '</table>';
=20
-    echo jrn_navigation_bar($offset,$count,$size,$page);
=20
 }
=20

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	2011-11-11 22:45:11 UTC (rev 4=
344)
+++ phpcompta/trunk/include/modele.inc.php	2011-11-13 13:28:19 UTC (rev 4=
345)
@@ -113,6 +113,7 @@
 	$Res =3D $cn_mod->exec_sql("delete from del_jrnx");
 	$Res =3D $cn_mod->exec_sql("truncate table  jrnx cascade ");
 	$Res =3D $cn_mod->exec_sql("delete from del_action");
+	$Res =3D $cn_mod->exec_sql("delete from profile_user");
=20
 	$Res =3D $cn_mod->exec_sql('delete from operation_analytique');
=20

Modified: phpcompta/trunk/include/param_sec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_sec.inc.php	2011-11-11 22:45:11 UTC (re=
v 4344)
+++ phpcompta/trunk/include/param_sec.inc.php	2011-11-13 13:28:19 UTC (re=
v 4345)
@@ -27,59 +27,91 @@
 include_once ("ac_common.php");
 require_once("class_iselect.php");
 require_once('class_dossier.php');
+include_once ("class_user.php");
+require_once('class_database.php');
+require_once 'class_sort_table.php';
+
 $gDossier=3Ddossier::id();
 $str_dossier=3Ddossier::get();
=20
-require_once('class_database.php');
 /* Admin. Dossier */
 $cn=3Dnew Database($gDossier);
-include_once ("class_user.php");
 $User=3Dnew User($cn);
+
 $User->Check();
 $User->check_dossier($gDossier);
=20
 include_once ("user_menu.php");
-$cn_dossier=3Dnew Database($gDossier);
=20
-
-if ( $User->check_action(PARSEC) =3D=3D 0 )
+////////////////////////////////////////////////////////////////////////=
/
+// List users
+////////////////////////////////////////////////////////////////////////=
/
+if ( ! isset($_REQUEST['action']))
 {
-    /* Cannot Access */
-    NoAccess();
-    exit -1;
-}
+	$base_url=3D$_SERVER['PHP_SELF']."?ac=3D".$_REQUEST['ac']."&".dossier::=
get();
=20
-$cn=3Dnew Database();
-/*  Show all the users, included local admin */
-$user_sql=3D$cn->exec_sql("select  use_id,use_first_name,use_name,use_lo=
gin,use_admin,priv_priv from ac_users natural join jnt_use_dos ".
-                        " join priv_user on (jnt_id=3Dpriv_jnt) where us=
e_login !=3D 'phpcompta' and priv_priv <> 'X' and dos_id=3D".$gDossier.' =
order by use_login,use_name');
-$MaxUser=3DDatabase::num_row($user_sql);
-if ( ! isset($_REQUEST['action']))
-{
     echo '<DIV class=3D"content" >';
+	$header=3Dnew Sort_Table();
+	$header->add('Login',$base_url,"order by use_login asc","order by use_l=
ogin desc",'la','ld');
+	$header->add('Nom',$base_url,"order by use_name asc,use_first_name asc"=
,"order by use_name desc,use_first_name desc",'na','nd');
+	$header->add('Type d\'utilisateur',$base_url,"order by use_admin asc,us=
e_login asc","order by use_admin desc,use_login desc",'ta','td');
=20
-    echo '<TABLE CELLSPACING=3D"20" ALIGN=3D"CENTER">';
+
+	$order=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la';
+
+	$ord_sql=3D$header->get_sql_order($order);
+
+
+	$repo=3Dnew Database();
+	/*  Show all the users, included local admin */
+	$user_sql=3D$repo->exec_sql("select  use_id,
+										use_first_name,
+										use_name,
+										use_login,
+										use_admin,
+										priv_priv
+										from ac_users natural join jnt_use_dos ".
+							" join priv_user on (jnt_id=3Dpriv_jnt)
+								where use_login !=3D 'phpcompta' and priv_priv <> 'X'
+								and dos_id=3D$1  ".$ord_sql,
+								array($gDossier));
+
+	$MaxUser=3DDatabase::num_row($user_sql);
+
+
+    echo '<TABLE class=3D"result" style=3D"width:80%;margin-left:10%">';
+	echo "<tr>";
+	echo '<th>'.$header->get_header(0).'</th>';
+	echo '<th>'.$header->get_header(1).'</th>';
+	echo th('pr=C3=A9nom');
+	echo th('profile');
+	echo '<th>'.$header->get_header(2).'</th>';
     for ($i =3D 0;$i < $MaxUser;$i++)
     {
+		echo '<tr>';
         $l_line=3DDatabase::fetch_array($user_sql,$i);
-        //  echo '<TR>';
-        if ( $i % 3 =3D=3D 0 && $i !=3D 0)
-            echo "</TR><TR>";
-        $str=3D($l_line['priv_priv'] =3D=3D 'L')?'Local Admin':' ';
-        $str=3D($l_line['priv_priv'] =3D=3D 'P')?'Uniquement Extension':=
$str;
+
+
+		$str=3D"";
         $str=3D($l_line['priv_priv'] =3D=3D 'R')?'Utilisateur Normal':$s=
tr;
         if ( $l_line['use_admin'] =3D=3D 1 )
-            $str=3D' Super Admin';
+            $str=3D' Administrateur global';
=20
-        printf ('<TD><A href=3D"?p_action=3Dsec&action=3Dview&user_id=3D=
%s&'.$str_dossier.'">%s %s ( %s )[%s]</A></TD>',
-                $l_line['use_id'],
-                $l_line['use_first_name'],
-                $l_line['use_name'],
-                $l_line['use_login'],
-                $str);
+		// get profile
+		$profile=3D$cn->get_value("select p_name from profile
+				join profile_user using(p_id) where user_name=3D$1",array($l_line['u=
se_login']));
=20
+		$url=3D$base_url."&action=3Dview&user_id=3D".$l_line['use_id'];
+		echo "<td>";
+		echo HtmlInput::anchor($l_line['use_login'], $url);
+		echo "</td>";
+		echo td($l_line['use_name']);
+		echo td($l_line['use_first_name']);
+		echo td($profile);
+		echo td($str);
+
+		echo "</TR>";
     }
-    echo "</TR>";
     echo '</TABLE>';
 }
 $action=3D"";
@@ -94,52 +126,70 @@
 //----------------------------------------------------------------------
 if ( isset($_POST['ok']))
 {
+	try
+	{
+	$cn->start();
+    $sec_User=3Dnew User($cn,$_POST['user_id']);
=20
-    $sec_User=3Dnew User($cn_dossier,$_POST['user_id']);
-    /* Save first the ledger */
-    $cn_dossier=3Dnew Database(dossier::id());
-    $a=3D$cn_dossier->get_array('select jrn_def_id from jrn_def');
-    foreach ($a as $key)
+	// save profile
+	$sec_User->save_profile($_POST['profile']);
+
+	/* Save first the ledger */
+    $a=3D$cn->get_array('select jrn_def_id from jrn_def');
+
+	foreach ($a as $key)
     {
         $id=3D$key['jrn_def_id'];
         $priv=3Dsprintf("jrn_act%d",$id);
-        $count=3D$cn_dossier->get_value('select count(*) from user_sec_j=
rn where uj_login=3D$1 '.
+        $count=3D$cn->get_value('select count(*) from user_sec_jrn where=
 uj_login=3D$1 '.
                                       ' and uj_jrn_id=3D$2',array($sec_U=
ser->login,$id));
         if ( $count =3D=3D 0 )
         {
-            $cn_dossier->exec_sql('insert into user_sec_jrn (uj_login,uj=
_jrn_id,uj_priv)'.
+            $cn->exec_sql('insert into user_sec_jrn (uj_login,uj_jrn_id,=
uj_priv)'.
                                   ' values ($1,$2,$3)',
                                   array($sec_User->login,$id,$_POST[$pri=
v]));
=20
         }
         else
         {
-            $cn_dossier->exec_sql('update user_sec_jrn set uj_priv=3D$1 =
where uj_login=3D$2 and uj_jrn_id=3D$3',
+            $cn->exec_sql('update user_sec_jrn set uj_priv=3D$1 where uj=
_login=3D$2 and uj_jrn_id=3D$3',
                                   array($_POST[$priv],$sec_User->login,$=
id));
         }
     }
     /* now save all the actions */
-    $a=3D$cn_dossier->get_array('select ac_id from action');
+    $a=3D$cn->get_array('select ac_id from action');
=20
     foreach ($a as $key)
     {
         $id=3D$key['ac_id'];
         $priv=3Dsprintf("action%d",$id);
-        $count=3D$cn_dossier->get_value('select count(*) from user_sec_a=
ct where ua_login=3D$1 '.
+		if ( ! isset ($_POST[$priv]))
+		{
+			$cn->exec_sql("delete from user_sec_act where ua_act_id=3D$1",array($=
id));
+			continue;
+		}
+        $count=3D$cn->get_value('select count(*) from user_sec_act where=
 ua_login=3D$1 '.
                                       ' and ua_act_id=3D$2',array($sec_U=
ser->login,$id));
         if ( $_POST[$priv] =3D=3D 1 && $count =3D=3D 0)
         {
-            $cn_dossier->exec_sql('insert into user_sec_act (ua_login,ua=
_act_id)'.
+            $cn->exec_sql('insert into user_sec_act (ua_login,ua_act_id)=
'.
                                   ' values ($1,$2)',
                                   array($sec_User->login,$id));
=20
         }
         if ($_POST[$priv] =3D=3D 0 )
         {
-            $cn_dossier->exec_sql('delete from user_sec_act  where ua_lo=
gin=3D$1 and ua_act_id=3D$2',
+            $cn->exec_sql('delete from user_sec_act  where ua_login=3D$1=
 and ua_act_id=3D$2',
                                   array($sec_User->login,$id));
         }
-    }
+	 }
+	 $cn->commit();
+	} // end try
+	catch (Exception $e)
+	{
+		echo_warning ($e->getTraceAsString());
+		$cn->rollback();
+	}
=20
 }
=20
@@ -153,32 +203,23 @@
 if ( $action =3D=3D "view" )
 {
     $l_Db=3Dsprintf("dossier%d",$gDossier);
+    $return=3D HtmlInput::button_anchor('Retour =C3=A0 la liste','?&ac=3D=
'.$_REQUEST['ac'].'&'.dossier::get(),'retour');
=20
-    $cn=3Dnew Database();
-    $User=3Dnew User($cn,$_GET['user_id']);
+    $repo=3Dnew Database();
+    $User=3Dnew User($repo,$_GET['user_id']);
     $admin=3D0;
     $access=3D$User->get_folder_access($gDossier);
=20
     $str=3D"Aucun acc=C3=A8s";
=20
-    if ( $access =3D=3D 'L')
+	if ($access=3D=3D'R')
     {
-        $str=3D'Local Admin';
-        $admin=3D1;
-    }
-    elseif ($access=3D=3D'R')
-    {
         $str=3D' Utilisateur normal';
     }
-    elseif ($access=3D=3D'P')
-    {
-        $str=3D' Extension uniquement';
-    }
=20
-
     if ( $User->admin=3D=3D1 )
     {
-        $str=3D' Super Admin';
+        $str=3D' Administrateur';
         $admin=3D1;
     }
=20
@@ -187,14 +228,22 @@
=20
     if ( $admin !=3D 0 )
     {
-        echo '<h2 class=3D"info"> Cet utilisateur est administrateur, il=
 a tous les droits</h2>';
-        exit();
+        echo '<h2 class=3D"notice"> Cet utilisateur est administrateur, =
il a tous les droits</h2>';
+		echo "<p> Impossible de modifier cet utilisateur dans cet =C3=A9cran, =
il faut passer par
+			l'=C3=A9cran administration -> utilisateur.
+			</p>";
+		echo $return;
+		exit();
     }
     //
     // Check if the user can access that folder
     if ( $access =3D=3D 'X' )
     {
         echo "<H2 class=3D\"error\">L'utilisateur n'a pas acc=C3=A8s =C3=
=A0 ce dossier</H2>";
+			echo "<p> Impossible de modifier cet utilisateur dans cet =C3=A9cran,=
 il faut passer par
+			l'=C3=A9cran administration -> utilisateur.
+			</p>";
+		echo $return;
         $action=3D"";
         return;
     }
@@ -203,32 +252,34 @@
     // Show access for journal
     //------------------------------------------------------------------=
--------------
=20
-    $Res=3D$cn_dossier->exec_sql("select jrn_def_id,jrn_def_name  from j=
rn_def ".
+    $Res=3D$cn->exec_sql("select jrn_def_id,jrn_def_name  from jrn_def "=
.
                                " order by jrn_def_name");
-    $sec_User=3Dnew User($cn_dossier,$_GET['user_id']);
+    $sec_User=3Dnew User($cn,$_GET['user_id']);
=20
     echo '<form method=3D"post">';
-    $sHref=3Dsprintf ('export.php?p_action=3Dsec&act=3DPDF:sec&user_id=3D=
%s&'.$str_dossier ,
+    $sHref=3Dsprintf ('export.php?act=3DPDF:sec&user_id=3D%s&'.$str_doss=
ier ,
                     $_GET ['user_id']
                    );
=20
-    echo HtmlInput::button('Imprime','imprime',"onclick=3D\"window.open(=
'".$sHref."');\"");
-    echo HtmlInput::submit('ok','Sauve');
-    echo HtmlInput::reset('Annule');
-    echo HtmlInput::button_anchor('Retour =C3=A0 la liste','?p_action=3D=
sec&'.dossier::get(),'retour');
-
     echo dossier::hidden();
     echo HtmlInput::hidden('action','sec');
     echo HtmlInput::hidden('user_id',$_GET['user_id']);
+	$i_profile=3Dnew ISelect ('profile');
+	$i_profile->value=3D$cn->make_array("select p_id,p_name from profile
+			order by p_name");
=20
+	$i_profile->selected=3D$sec_User->get_profile();
+
+	echo "<p>";
+	echo " Profile ".$i_profile->input();
+	echo "</p>";
     echo '<Fieldset><legend>Journaux </legend>';
-    echo '<table align=3D"CENTER" width=3D"100%">';
+    echo '<table>';
     $MaxJrn=3DDatabase::num_row($Res);
     $jrn_priv=3Dnew ISelect();
     $array=3Darray(
                array ('value'=3D>'R','label'=3D>'Uniquement lecture'),
                array ('value'=3D>'W','label'=3D>'Lecture et =C3=A9critur=
e'),
-               //	       array ('value'=3D>'O','label'=3D>'Uniquement op=
=C3=A9rations pr=C3=A9d=C3=A9finies'),
                array ('value'=3D>'X','label'=3D>'Aucun acc=C3=A8s')
            );
=20
@@ -238,9 +289,9 @@
         $l_line=3DDatabase::fetch_array($Res,$i);
=20
         echo '<TR> ';
-        if ( $i =3D=3D 0 ) echo '<TD> <B> Journal </B> </TD>';
+        if ( $i =3D=3D 0 ) echo '<TD class=3D"num"> <B> Journal </B> </T=
D>';
         else echo "<TD></TD>";
-        echo "<TD> $l_line[jrn_def_name] </TD>";
+        echo "<TD class=3D\"num\"> $l_line[jrn_def_name] </TD>";
=20
         $jrn_priv->name=3D'jrn_act'.$l_line['jrn_def_id'];
         $jrn_priv->value=3D$array;
@@ -263,6 +314,7 @@
     echo HtmlInput::button('Imprime','imprime',"onclick=3D\"window.open(=
'".$sHref."');\"");
     echo HtmlInput::submit('ok','Sauve');
     echo HtmlInput::reset('Annule');
+	echo $return;
     echo '</form>';
 } // end of the form
 echo "</DIV>";

Modified: phpcompta/trunk/include/restore.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/restore.inc.php	2011-11-11 22:45:11 UTC (rev =
4344)
+++ phpcompta/trunk/include/restore.inc.php	2011-11-13 13:28:19 UTC (rev =
4345)
@@ -24,7 +24,7 @@
 require_once('class_ifile.php');
=20
 /*!\file
- * \brief restaure a database=20
+ * \brief restaure a database
  */
 if ( isset ($_REQUEST['sa'] ))
 {
@@ -111,6 +111,7 @@
=20
         $new_cn->apply_patch($name,0);
         echo '<span class=3D"error">'.'Ne pas recharger la page, sinon v=
otre base de donn=C3=A9es sera restaur=C3=A9e une fois de plus'.'</span>'=
;
+		Dossier::synchro_admin($id);
         echo $retour;
=20
         echo '</div>';

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2011-11-11 22:45:11 UTC (=
rev 4344)
+++ phpcompta/trunk/include/template/module.php	2011-11-13 13:28:19 UTC (=
rev 4345)
@@ -17,14 +17,28 @@
 		<?=3DHtmlInput::default_value('ac', '', $_REQUEST)?>
 		<?=3DDossier::hidden()?>
 		<?
+
 			$direct=3Dnew IText('ac');
 			$direct->style=3D'class=3D"direct"';
 			$direct->value=3D'';
 			$direct->size=3D(strlen($direct->value)<10)?10:strlen($direct->value)=
;
 			echo $direct->input();
+			$gDossier=3Ddossier::id();
+			?>
+		<div id=3D"ac_choices" class=3D"autocomplete" ></div>
+		<?
 			echo HtmlInput::submit('go','aller');
 			?>
-	</form>
+
+	</form
+	<script type=3D"text/javascript" charset=3D"utf8" language=3D"javascrip=
t">
+
+		try {
+			new Ajax.Autocompleter("ac","ac_choices","direct.php?gDossier=3D<?=3D=
$gDossier?>",
+                            {paramName:"acs",minChars:1,indicator:null,
+                            callback:null,
+                             afterUpdateElement:null});} catch (e){alert=
(e.message);};
+		</script>
 	</div>
 <?
 endif;

Modified: phpcompta/trunk/include/template/security_list_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/security_list_action.php	2011-11-11 =
22:45:11 UTC (rev 4344)
+++ phpcompta/trunk/include/template/security_list_action.php	2011-11-13 =
13:28:19 UTC (rev 4345)
@@ -8,7 +8,7 @@
 	$gDossier=3Ddossier::id();
 	?>
 <fieldset><legend><?php echo $p_legend;?></legend>
-	<TABLE align=3D"right">
+	<TABLE >
=20
 		<?php
 			foreach  ( $p_array as $l_line){
@@ -36,65 +36,16 @@
 			</td>
 		</tr>
 		<?php
-			}
+} // end loop
=20
-
 			?>
 	</table>
 </fieldset>
-<?php } ?>
-<div style=3D"float:left;width:33%">
-<div style=3D"float:top">
-			<?php   $array=3D$cn_dossier->get_array(
-				"select ac_id, ac_description from action  where ac_id >=3D$1 and ac=
_id <=3D$2 order by ac_id ",
-				array(1100,1400));
-                                display_security_fieldset(_('Param=C3=A8=
tre'),$array,$sec_User); ?>
+<?php
=20
-</div>
-</div>
-<div style=3D"float:left;width:33%">
-<div style=3D"float:top">
-			<?php   $array=3D$cn_dossier->get_array("select ac_id, ac_description=
 from action  where ac_id >=3D$1 and ac_id <=3D$2 order by ac_id ",
+}// end function
+
+?>
+			<?php   $array=3D$cn->get_array("select ac_id, ac_description from ac=
tion  where ac_id >=3D$1 and ac_id <=3D$2 order by ac_id ",
 				array(800,1000));
                                 display_security_fieldset(_('Fiche'),$ar=
ray,$sec_User); ?>
-</div>
-	<div style=3D"float:top">
-			<?php   $array=3D$cn_dossier->get_array(
-				"select ac_id, ac_description from action  where ac_id >=3D$1 and ac=
_id <=3D$2 order by ac_id ",
-				array(200,299));
-                                display_security_fieldset(_('Comptabilit=
=C3=A9 Analytique'),$array,$sec_User); ?>
-</div>
-
-<div style=3D"float:top">
-
-			<?php   $array=3D$cn_dossier->get_array(
-				"select ac_id, ac_description from action  where ac_id >=3D$1 and ac=
_id <=3D$2 order by ac_id ",
-				array(700,799));
-                                display_security_fieldset(_('Impression'=
),$array,$sec_User); ?>
-</div>
-</div>
-<div style=3D"float:left;">
-<div style=3D"float:top">
-			<?php   $array=3D$cn_dossier->get_array(
-				"select ac_id, ac_description from action  where ac_id >=3D$1 and ac=
_id <$2 order by ac_id ",
-				array(1500,1600));
-                                display_security_fieldset(_('Stock'),$ar=
ray,$sec_User); ?>
-</div>
-<div style=3D"float:top">
-		<?php   $array=3D$cn_dossier->get_array(
-				"select ac_id, ac_description from action  where ac_id >=3D$1 and ac=
_id <=3D$2 order by ac_id ",
-				array(1700,1799));
-                                display_security_fieldset(_('Pr=C3=A9vis=
ion'),$array,$sec_User); ?>
-<div style=3D"float:top">
-			<?php   $array=3D$cn_dossier->get_array(
-				"select ac_id, ac_description from action  where ac_id >=3D$1 and ac=
_id <=3D$2 order by ac_id ",
-				array(1600,1699));
-                                display_security_fieldset(_('Extension')=
,$array,$sec_User); ?>
-</div>
-<div style=3D"float:top">
-			<?php   $array=3D$cn_dossier->get_array(
-				"select ac_id, ac_description from action  where ac_id >=3D$1 and ac=
_id <=3D$2 order by ac_id ",
-				array(300,400));
-                                display_security_fieldset(_('Gestion'),$=
array,$sec_User); ?>
-</div>
-</div>
\ No newline at end of file

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	2011-11-11 22:45:11 UTC (rev 434=
4)
+++ phpcompta/trunk/include/user.inc.php	2011-11-13 13:28:19 UTC (rev 434=
5)
@@ -23,15 +23,16 @@
 /*!\file
  *
  *
- * \brief user managemnt, included from admin_repo,=20
+ * \brief user managemnt, included from admin_repo,
  * action=3Duser_mgt
  *
  */
 require_once 'class_sort_table.php';
+echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
 /******************************************************/
 // Add user
 /******************************************************/
-if ( isset ($_POST["LOGIN"]) )
+if ( isset ($_POST["ADD"]) )
 {
     $cn=3Dnew Database();
     $pass5=3Dmd5($_POST['PASS']);
@@ -43,14 +44,29 @@
     $login=3Dstr_replace('"',"",$login);
     $login=3Dstr_replace(" ","",$login);
     $login=3Dstrtolower($login);
-
+	if ( trim($login)=3D=3D"")
+	{
+		alert("Le login ne peut pas =C3=AAtre vide");
+	}
+	else
+	{
     $Res=3D$cn->exec_sql("insert into ac_users(use_first_name,use_name,u=
se_login,use_active,use_pass)
                        values ($1,$2,$3,1,$4)",
                        array($first_name,$last_name,$login,$pass5));
+
+	}
 } //SET login
=20
+// View user detail
+if ( isset($_REQUEST['det']))
+{
+    require_once("user_detail.inc.php");
+
+    exit();
+}
 ?>
-<div class=3D"content" style=3D"width:80%;margin-left:10%">
+
+<div id=3D"create_user" style=3D"display:none">
 <h2>Gestion Utilisateurs</h2>
 <TABLE> <TR>
 <form action=3D"admin_repo.php?action=3Duser_mgt" method=3D"POST">
@@ -62,32 +78,32 @@
 echo '<TD> Last Name </TD><TD><INPUT class=3D"input_text"  TYPE=3D"TEXT"=
 NAME=3D"LNAME"></TD></TR>';
 echo '<TR><TD> login </TD><TD><INPUT class=3D"input_text"  TYPE=3D"TEXT"=
 NAME=3D"LOGIN"></TD>';
 echo '<TD> password </TD><TD> <INPUT class=3D"input_text" TYPE=3D"TEXT" =
NAME=3D"PASS"></TD></TR>';
-echo '<TD> <INPUT TYPE=3D"SUBMIT" class=3D"button" Value=3D"Create user"=
 NAME=3D"ADD"></TD>';
 echo '</TABLE>';
+echo HtmlInput::submit("ADD",'Cr=C3=A9er Utilisateur');
+echo HtmlInput::button_action("Fermer", "$('create_user').style.display=3D=
'none';$('cu').style.display=3D'block'");
=20
+
 ?>
 </FORM>
+</div>
+
 <?php
+echo HtmlInput::button_action("Ajout utilisateur", "$('create_user').sho=
w();$('cu').hide()","cu");
 // Show all the existing user on 7 columns
 $repo=3Dnew Dossier(0);
 /******************************************************/
 // Detail of a user
 /******************************************************/
-if ( isset($_REQUEST['det']))
-{
-    require_once("user_detail.inc.php");
- =20
-    exit();
-}
=20
-   =20
+
+
 $compteur=3D0;
 $header=3Dnew Sort_Table();
-$url=3Dbasename($_SERVER['PHP_SELF'])."&action=3D".$_REQUEST['action'];
+$url=3Dbasename($_SERVER['PHP_SELF'])."?action=3D".$_REQUEST['action'];
 $header->add("Login", $url," order by use_login asc", "order by use_logi=
n desc","la", "ld");
-$header->add("Nom", $url," order by use_login asc", "order by use_login =
desc","la", "ld");
-$header->add('Dossier',$url,' order by dossier_ag asc','order by dossier=
_ag desc',
-        'da','dd');       =20
+$header->add("Nom", $url," order by use_login asc", "order by use_login =
desc","na", "nd");
+$header->add('Dossier',$url,' order by ag_dossier asc','order by ag_doss=
ier desc',
+        'da','dd');
 $ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la';
 $sql=3D$header->get_sql_order($ord);
=20
@@ -101,16 +117,17 @@
     echo '<th>'.$header->get_header(1).'</th>';
     echo th("Pr=C3=A9nom");
     echo th("Actif");
+	echo "<th>Type</th>";
     echo '<th>'.$header->get_header(2).'</th>';
     echo '</tr>';
-   =20
+
     foreach ( $a_user as $r_user)
     {
         $compteur++;
         $class=3D($compteur%2=3D=3D0)?"odd":"even";
-       =20
-        echo "<tr $class>";
-        if ( $rUser['use_active'] =3D=3D 0 )
+
+        echo "<tr class=3D\"$class\">";
+        if ( $r_user['use_active'] =3D=3D 0 )
         {
             $Active=3D"non actif";
         }
@@ -122,10 +139,13 @@
         echo "<td>";
         echo HtmlInput::anchor($r_user['use_login'],$det_url);
         echo "</td>";
-       =20
+
         echo td($r_user['use_name']);
         echo td($r_user['use_first_name']);
         echo td($Active);
+		$type=3D($r_user['use_admin']=3D=3D1)?"Administrateur":"Utilisateur";
+		echo "<td>".$type."</td>";
+		echo td($r_user['ag_dossier']);
         echo '</tr>';
     }// foreach
     echo '</table>';

Modified: phpcompta/trunk/include/user_detail.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/user_detail.inc.php	2011-11-11 22:45:11 UTC (=
rev 4344)
+++ phpcompta/trunk/include/user_detail.inc.php	2011-11-13 13:28:19 UTC (=
rev 4345)
@@ -61,8 +61,11 @@
         $UserChange->admin =3D $_POST['Admin'];
         if ( trim($_POST['password'])<>'')
         {
-                    $UserChange->pass =3D md5($_POST['pass']);
-        }
+                    $UserChange->pass =3D md5($_POST['password']);
+        }		else
+		{
+			$UserChange->pass=3D$UserChange->password;
+		}
         $UserChange->save();
=20
         // Update Priv on Folder
@@ -73,6 +76,7 @@
                 $db_id =3D substr($name, 4);
                 $cn =3D new Database();
                 $UserChange->set_folder_access($db_id, $elem);
+				Dossier::synchro_admin($db_id);
             }
         }
     }
@@ -97,6 +101,8 @@
 $it_pass=3Dnew IText('password');
 $it_pass->value=3D"";
 ?>
+<h1 class=3D"info">Modification</h1>
+<? echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Duser=
_mgt'); ?>
 <FORM  METHOD=3D"POST">
=20
 <?=3DHtmlInput::hidden('UID',$uid)?>
@@ -174,14 +180,15 @@
         <!-- Show all database and rights -->
         <H2 class=3D"info"> Droit sur les dossiers pour les utilisateurs=
 normaux </H2>
         <p class=3D"notice">
-            Les autres droits doivent =C3=AAtre r=C3=A9gl=C3=A9s dans le=
s dossiers (param=C3=A8tre->s=C3=A9curit=C3=A9)
+            Les autres droits doivent =C3=AAtre r=C3=A9gl=C3=A9s dans le=
s dossiers (param=C3=A8tre->s=C3=A9curit=C3=A9), le fait de changer un ut=
ilisateur d'administrateur =C3=A0 utilisateur
+			normal ne change pas le profil administrateur dans les dossiers.
+			Il faut aller dans CFGSECURITY pour diminuer ses privil=C3=A8ges.
         </p>
         <TABLE>
 <?php
 $array =3D array(
     array('value' =3D> 'X', 'label' =3D> 'Aucun Acc=C3=A8s'),
-    array('value' =3D> 'R', 'label' =3D> 'Utilisateur normal'),
-    array('value' =3D> 'L', 'label' =3D> 'Administrateur local(Tous les =
droits)')
+    array('value' =3D> 'R', 'label' =3D> 'Utilisateur normal')
 );
 $repo =3D new Dossier(0);
=20
@@ -218,9 +225,9 @@
         <input type=3D"Submit" class=3D"button" NAME=3D"SAVE" VALUE=3D"S=
auver les changements" onclick=3D"return confirm('Confirmer changement ?'=
);">
=20
         <input type=3D"Submit"  class=3D"button" NAME=3D"DELETE" VALUE=3D=
"Effacer" onclick=3D"return confirm('Confirmer effacement ?');" >
+<? echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Duser=
_mgt'); ?>
+</FORM>
=20
-</FORM>
-<? echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Duser=
_mgt'); ?>
 </DIV>
=20
=20

Added: phpcompta/trunk/sql/ajax-direct-form.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/ajax-direct-form.sql	                        (rev=
 0)
+++ phpcompta/trunk/sql/ajax-direct-form.sql	2011-11-13 13:28:19 UTC (rev=
 4345)
@@ -0,0 +1,26 @@
+-- Function: comptaproc.get_pcm_tree(account_type)
+
+DROP FUNCTION comptaproc.get_menu_tree(text);
+
+CREATE OR REPLACE FUNCTION comptaproc.get_menu_tree(p_code text)
+  RETURNS SETOF text AS
+$BODY$
+declare
+	i record;
+	e RECORD;
+begin
+	for i in select me_code from profile_menu where me_code_dep=3Dp_code
+	loop
+		return next i;
+		for e in select get_pcm_tree from get_menu_tree(i)
+		loop
+			return next e;
+		end loop;
+
+	end loop;
+	return;
+end;
+$BODY$
+  LANGUAGE plpgsql VOLATILE
+  COST 100
+  ROWS 1000;

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-11 22:45:11 UTC (rev 4344)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-13 13:28:19 UTC (rev 4345)
@@ -200,7 +200,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 302, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 647, true);
=20
=20
 --
@@ -240,7 +240,7 @@
 -- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: da=
ny
 --
=20
-SELECT pg_catalog.setval('profile_p_id_seq', 7, true);
+SELECT pg_catalog.setval('profile_p_id_seq', 10, true);
=20
=20
 --
@@ -302,7 +302,7 @@
 -- Name: profile_user_pu_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
-SELECT pg_catalog.setval('profile_user_pu_id_seq', 1, true);
+SELECT pg_catalog.setval('profile_user_pu_id_seq', 5, true);
=20
=20
 --
@@ -346,7 +346,6 @@
 INSERT INTO menu_ref VALUES ('IMPORTBANK', 'Importation banque', 'import=
bank/index.php', NULL, 'Import. fichier CVS de la banque', 'plugin_code=3D=
IMPORTBANK', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('TOOL', 'Outil comptable', 'tools/index.php=
', NULL, 'Outil comptable', 'plugin_code=3DTOOL', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('TVA', 'Module de TVA', 'tva/index.php', NU=
LL, 'Cette extension permet de faire les listings et declarations TVA', '=
plugin_code=3DTVA', NULL, 'PL');
-INSERT INTO menu_ref VALUES ('TEST', 'Cela va marcher', 'amortis/index.p=
hp', NULL, 'Test description', '0', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
@@ -357,7 +356,6 @@
 INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('MODULARITY', 'Menu et profile', NULL, NULL=
, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CFGPROFILE', 'Profile', 'profile.inc.php',=
 NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('TESTTVA', 'Test TVA', 'tva/index.php', NUL=
L, 'Test description', 'plugin_code=3DTESTTVA', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, NULL, NU=
LL, 'popup_recherche()', 'ME');
 INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
@@ -406,7 +404,6 @@
 INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('FINSALDO', 'Soldes', 'compta_fin_saldo.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('FINREC', 'Rapprochement', 'compta_fin_rec.=
inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'=
, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, NULL, =
NULL, 'search_reconcile()', 'ME');
 INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', 'cfgledger.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'=
, NULL, NULL, NULL, NULL, 'ME');
@@ -456,6 +453,7 @@
 INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, NULL, NU=
LL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('MODOP', 'Modification d''op=C3=A9rations',=
 'modop/index.php', NULL, 'Modification op=C3=A9rations', 'plugin_code=3D=
MODOP', NULL, 'PL');
+INSERT INTO menu_ref VALUES ('ACCESS', 'Accueil', NULL, 'user_login.php'=
, NULL, NULL, NULL, 'ME');
=20
=20
 --
@@ -470,60 +468,46 @@
 -- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 dany
 --
=20
+INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', NULL);
 INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', NULL);
-INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E',=
 0);
-INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
-INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E',=
 0);
-INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
0);
-INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', NULL);
-INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '=
E', 0);
-INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E',=
 0);
 INSERT INTO profile_menu VALUES (178, 'CFGPAYMENT', 'DIVPARM', 6, 4, 'E'=
, 0);
 INSERT INTO profile_menu VALUES (179, 'CFGTVA', 'DIVPARM', 6, 5, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (180, 'CFGACCOUNT', 'DIVPARM', 6, 6, 'E'=
, 0);
 INSERT INTO profile_menu VALUES (181, 'CFGCATDOC', 'DIVPARM', 6, 8, 'E',=
 0);
-INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E', =
0);
 INSERT INTO profile_menu VALUES (182, 'CFGATTRIBCARD', 'DIVPARM', 6, 9, =
'E', 0);
+INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', 0);
+INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E',=
 0);
 INSERT INTO profile_menu VALUES (189, 'PLANANC', 'ANC', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (190, 'CFGCARDCAT', 'DIVPARM', 6, 7, 'E'=
, 0);
 INSERT INTO profile_menu VALUES (191, 'ANCODS', 'ANC', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (192, 'ANCGROUP', 'ANC', 6, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (193, 'ANCIMP', 'ANC', 6, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (194, 'LETTER', 'COMPTA', 6, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
 INSERT INTO profile_menu VALUES (196, 'PREFERENCE', NULL, 6, 15, 'M', 1)=
;
 INSERT INTO profile_menu VALUES (197, 'LETTERCARD', 'LETTER', 6, 1, 'E',=
 0);
-INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', 0);
 INSERT INTO profile_menu VALUES (198, 'LETTERACC', 'LETTER', 6, 2, 'E', =
0);
 INSERT INTO profile_menu VALUES (199, 'CUST', 'GESTION', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (200, 'SUPPL', 'GESTION', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (201, 'ADM', 'GESTION', 6, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (202, 'CARD', 'GESTION', 6, 6, 'E', 0);
-INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E', =
0);
 INSERT INTO profile_menu VALUES (203, 'STOCK', 'GESTION', 6, 5, 'E', 0);
 INSERT INTO profile_menu VALUES (204, 'FORECAST', 'GESTION', 6, 7, 'E', =
0);
 INSERT INTO profile_menu VALUES (205, 'FOLLOW', 'GESTION', 6, 8, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (206, 'VERIFBIL', 'ADV', 6, 21, 'E', 0);
 INSERT INTO profile_menu VALUES (207, 'STOCK', 'ADV', 6, 22, 'E', 0);
 INSERT INTO profile_menu VALUES (208, 'PREDOP', 'ADV', 6, 23, 'E', 0);
-INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (209, 'OPEN', 'ADV', 6, 24, 'E', 0);
-INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 0);
-INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (210, 'REPORT', 'ADV', 6, 25, 'E', 0);
 INSERT INTO profile_menu VALUES (211, 'CARD', 'COMPTA', 6, 7, 'E', 0);
-INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (212, 'HIST', 'COMPTA', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (213, 'FINSALDO', 'MENUFIN', 6, 3, 'E', =
0);
 INSERT INTO profile_menu VALUES (214, 'FINREC', 'MENUFIN', 6, 4, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (215, 'ADV', 'COMPTA', 6, 20, 'E', 0);
 INSERT INTO profile_menu VALUES (216, 'ACCESS', NULL, 6, 25, 'M', 0);
 INSERT INTO profile_menu VALUES (217, 'CSV:histo', NULL, 6, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (218, 'LOGOUT', NULL, 6, 30, 'M', 0);
 INSERT INTO profile_menu VALUES (219, 'PRINT', 'GESTION', 6, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (220, 'new_line', NULL, 6, 35, 'M', 0);
@@ -536,11 +520,10 @@
 INSERT INTO profile_menu VALUES (227, 'ACHIMP', 'MENUACH', 6, 2, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (228, 'GESTION', NULL, 6, 45, 'M', 0);
 INSERT INTO profile_menu VALUES (229, 'MENUODS', 'COMPTA', 6, 5, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'E', 0);
-INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', 0);
 INSERT INTO profile_menu VALUES (230, 'ODS', 'MENUODS', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (231, 'ODSIMP', 'MENUODS', 6, 2, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (232, 'ANC', NULL, 6, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E',=
 0);
 INSERT INTO profile_menu VALUES (234, 'VENMENU', 'COMPTA', 6, 2, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (235, 'VEN', 'VENMENU', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (236, 'VENIMP', 'VENMENU', 6, 2, 'E', 0)=
;
@@ -564,12 +547,16 @@
 INSERT INTO profile_menu VALUES (254, 'IMPORTBANK', 'EXTENSION', 6, NULL=
, 'S', 0);
 INSERT INTO profile_menu VALUES (255, 'TOOL', 'EXTENSION', 6, NULL, 'S',=
 0);
 INSERT INTO profile_menu VALUES (256, 'AMORTIS', 'MENUACH', 6, 10, 'E', =
0);
+INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
0);
 INSERT INTO profile_menu VALUES (258, 'CFGMENU', 'MODULARITY', 6, NULL, =
'E', 0);
 INSERT INTO profile_menu VALUES (259, 'CFGPROFILE', 'MODULARITY', 6, NUL=
L, 'E', 0);
 INSERT INTO profile_menu VALUES (260, 'PDF:postedetail', NULL, 6, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '=
E', 0);
 INSERT INTO profile_menu VALUES (261, 'CSV:fichedetail', NULL, 6, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (262, 'PDF:fichedetail', NULL, 6, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (263, 'CSV:fiche_balance', NULL, 6, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E',=
 0);
 INSERT INTO profile_menu VALUES (264, 'PDF:fiche_balance', NULL, 6, NULL=
, 'P', 0);
 INSERT INTO profile_menu VALUES (265, 'CSV:report', NULL, 6, NULL, 'P', =
0);
 INSERT INTO profile_menu VALUES (266, 'PDF:report', NULL, 6, NULL, 'P', =
0);
@@ -580,6 +567,7 @@
 INSERT INTO profile_menu VALUES (271, 'PDF:sec', NULL, 6, NULL, 'P', 0);
 INSERT INTO profile_menu VALUES (272, 'CSV:AncList', NULL, 6, NULL, 'P',=
 0);
 INSERT INTO profile_menu VALUES (273, 'CSV:AncBalSimple', NULL, 6, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (526, 'PRINTGL', 'PRINT', 1, 20, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (274, 'PDF:AncBalSimple', NULL, 6, NULL,=
 'P', 0);
 INSERT INTO profile_menu VALUES (275, 'CSV:AncBalDouble', NULL, 6, NULL,=
 'P', 0);
 INSERT INTO profile_menu VALUES (276, 'PDF:AncBalDouble', NULL, 6, NULL,=
 'P', 0);
@@ -589,7 +577,23 @@
 INSERT INTO profile_menu VALUES (280, 'CSV:AncAccList', NULL, 6, NULL, '=
P', 0);
 INSERT INTO profile_menu VALUES (281, 'CSV:AncBalGroup', NULL, 6, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (282, 'OTH:Bilan', NULL, 6, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', 1);
+INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E', =
0);
+INSERT INTO profile_menu VALUES (523, 'PRINTBAL', 'PRINT', 1, 50, 'E', 0=
);
+INSERT INTO profile_menu VALUES (529, 'PRINTREPORT', 'PRINT', 1, 85, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E', =
0);
+INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 0);
+INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', 0);
+INSERT INTO profile_menu VALUES (527, 'PRINTJRN', 'PRINT', 1, 10, 'E', 0=
);
+INSERT INTO profile_menu VALUES (530, 'PRINTREC', 'PRINT', 1, 100, 'E', =
0);
+INSERT INTO profile_menu VALUES (524, 'PRINTBILAN', 'PRINT', 1, 90, 'E',=
 0);
+INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', 0);
 INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'E', =
0);
 INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'E', 0=
);
 INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', 0);
@@ -675,8 +679,9 @@
 INSERT INTO profile_menu VALUES (147, 'CSV:AncAccList', NULL, 1, NULL, '=
P', 0);
 INSERT INTO profile_menu VALUES (148, 'CSV:AncBalGroup', NULL, 1, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (1, 'DASHBOARD', NULL, 1, 10, 'M', 0);
-INSERT INTO profile_menu VALUES (302, 'TESTTVA', 'EXTENSION', 1, NULL, '=
S', NULL);
+INSERT INTO profile_menu VALUES (528, 'PRINTPOSTE', 'PRINT', 1, 30, 'E',=
 0);
+INSERT INTO profile_menu VALUES (525, 'PRINTCARD', 'PRINT', 1, 40, 'E', =
0);
+INSERT INTO profile_menu VALUES (1, 'DASHBOARD', NULL, 1, 10, 'M', 1);
=20
=20
 --
@@ -694,6 +699,8 @@
 --
=20
 INSERT INTO profile_user VALUES ('phpcompta', 1, 1);
+INSERT INTO profile_user VALUES ('acama-viramar', 2, 1);
+INSERT INTO profile_user VALUES ('adama', 5, 6);
=20
=20
 --

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	2011-11-11 22:45:11 UTC (rev 4344)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-13 13:28:19 UTC (rev 4345)
@@ -1,24 +1,30 @@
+\set ECHO all
+\set ON_ERROR_ROLLBACK
+\set ON_ERROR_STOP
+begin;
 drop table public.import_tmp;
 drop table public.format_csv_banque;
-insert into parametre values ('MY_ALPHANUM','N');
+insert into parameter values ('MY_ALPHANUM','N');
+delete from action where ac_id not in (800,805,910);
=20
 /*
 script SQL to run
-account_alphanum.sql
-account_compute.sql
-account_insert.sql
-account-update.sql
-change-pcmn-to-alphanum.sql
-format_account.sql
-tmp_pcmn_alphanum_ins_upd.sql
-tmp_pcmn_ins.sql
-trigger.tmp_pcmn.sql
-account_add.sql
-object-6.0.sql
+*/
+\i account_alphanum.sql
+\i account_compute.sql
+\i account_insert.sql
+\i account-update.sql
+-- \i change-pcmn-to-alphanum.sql
+\i format_account.sql
+\i tmp_pcmn_alphanum_ins_upd.sql
+\i tmp_pcmn_ins.sql
+\i trigger.tmp_pcmn.sql
+\i account_add.sql
+\i object-6.0.sql
+\i extension.sql
 -- for account repository
-epad-style.sql
-extension.sql
--- for account repository
-change_account_repo.sql
-*/
+\i change_account_repo.sql
+\i style-epad.sql
+
 create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
+commit;



From MAILER-DAEMON Sun Nov 13 12:23:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPdlp-0002Q7-57
	for mharc-phpcompta-dev@gnu.org; Sun, 13 Nov 2011 12:23:05 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 13 Nov 2011 18:28:51 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.12095.1321204984.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4346 - in phpcompta/trunk:
	dev/manage-code/create-file html include include/template sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Nov 2011 17:23:03 -0000

Author: danydb
Date: 2011-11-13 18:28:49 +0100 (Sun, 13 Nov 2011)
New Revision: 4346

Added:
   phpcompta/trunk/html/direct.php
Modified:
   phpcompta/trunk/dev/manage-code/create-file/
   phpcompta/trunk/html/
   phpcompta/trunk/include/dashboard.inc.php
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/include/template/ledger_detail_ach.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
   phpcompta/trunk/include/template/module.php
   phpcompta/trunk/sql/ajax-direct-form.sql
   phpcompta/trunk/sql/upgrade.sql
Log:
Ajout PU pour detail ach & ven =20
ajout ajax pour direct form



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



Property changes on: phpcompta/trunk/html
___________________________________________________________________
Name: svn:ignore
   - *.log
ajax
.user_login.php.swp
.~lock.a.csv#
.~lock.a.ods#
.a.csv.swp

   + *.log
ajax
.user_login.php.swp
.~lock.a.csv#
.~lock.a.ods#
.a.csv.swp
.direct.php.swp


Added: phpcompta/trunk/html/direct.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/direct.php	                        (rev 0)
+++ phpcompta/trunk/html/direct.php	2011-11-13 17:28:49 UTC (rev 4346)
@@ -0,0 +1,19 @@
+<?
+require_once ("class_database.php");
+require_once 'class_user.php';
+$cn=3Dnew Database($_GET['gDossier']);
+$user=3Dnew User($cn);
+$user->Check();
+$user->check_dossier($_GET['gDossier']);
+$res=3D$cn->exec_sql("select code,description from get_profile_menu($1) =
where code ~* $2 limit 8",array($user->login,$_POST['acs']));
+$nb=3DDatabase::num_row($res);
+	echo "<ul>";
+for ($i =3D 0;$i< $nb;$i++)
+{
+	$row=3DDatabase::fetch_array($res,$i);
+	echo "<li>";
+	echo $row['code'];
+	echo '<span class=3D"informal"> '.$row['description'].'</span></li>';
+}
+	echo "</ul>";
+?>

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	2011-11-13 13:28:19 UTC (re=
v 4345)
+++ phpcompta/trunk/include/dashboard.inc.php	2011-11-13 17:28:49 UTC (re=
v 4346)
@@ -17,18 +17,6 @@
 /* others report */
 $cal=3Dnew Calendar();
 $cal->get_preference();
-$Ledger=3Dnew Acc_Ledger($cn,0);
-$last_ledger=3Darray();
-if ( $g_user->check_action(GESTION)=3D=3D1)
-  {
-    $Operation=3Dnew Follow_Up($cn);
-    $last_ledger=3D$Ledger->get_last(10);
-    $last_operation=3D$Operation->get_last(10);
-  }
-else
-  {
-    $last_operation=3Darray();
-  }
 ob_start();
 require_once('template/dashboard.php');
 $ret=3Dob_get_contents();

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2011-11-13 13:28:19 UT=
C (rev 4345)
+++ phpcompta/trunk/include/template/dashboard.php	2011-11-13 17:28:49 UT=
C (rev 4346)
@@ -1,10 +1,11 @@
-<div style=3D"float:left;width:42%">
+<div>
+	<div style=3D"float:left;width:50%">
 <fieldset>
 <legend><?=3D_('Calendrier')?>
 </legend>
 <?php echo $cal->display(); ?>
 </fieldset>
-</div>
+
 <?php
 /*
  * Todo list
@@ -21,14 +22,20 @@
 }
 $todo=3Dnew Todo_List($cn);
 $array=3D$todo->load_all();
-echo '<div id=3D"add_todo_list" class=3D"add_todo_list">';
-echo '<form method=3D"post">';
+?>
+<div id=3D"add_todo_list" class=3D"add_todo_list">
+	<script charset=3D"utf8" type=3D"text/javascript" language=3D"javascrip=
t">
+		new Draggable($('add_todo_list'),{});
+	</script>
+<form method=3D"post">
+<?php
 $wDate=3Dnew IDate('p_date_todo');
 $wDate->id=3D'p_date_todo';
 $wTitle=3Dnew IText('p_title');
 $wDesc=3Dnew ITextArea('p_desc');
 $wDesc->heigh=3D5;
 $wDesc->width=3D40;
+echo h2info("Note");
 echo _("Date")." ".$wDate->input().'<br>';
 echo _("Titre")." ".$wTitle->input().'<br>';
 echo _("Description")."<br>".$wDesc->input().'<br>';
@@ -36,13 +43,14 @@
 echo HtmlInput::hidden('tl_id',0);
 echo HtmlInput::submit('save_todo_list',_('Sauve'),'onClick=3D"$(\'add_t=
odo_list\').hide();return true;"');
 echo HtmlInput::button('hide',_('Annuler'),'onClick=3D"$(\'add_todo_list=
\').hide();return true;"');
-echo '</form>';
-echo '</div>';
+?>
+</form>
+</div>
+</div>
+<div style=3D"float:left;width:50%">'
+<fieldset> <legend><?=3D_('Pense-B=C3=AAte')?></legend>
=20
-echo '<div style=3D"float:left;width:27%;">';
-echo '<fieldset> <legend>'._('Pense-B=C3=AAte').'</legend>';
-
-
+<?php
 echo HtmlInput::button('add',_('Ajout'),'onClick=3D"add_todo()"');
 if ( ! empty ($array) )  {
   echo '<table id=3D"table_todo" width=3D"100%">';
@@ -69,8 +77,11 @@
   }
   echo '</table>';
 }
-echo '</fieldset>';
-echo '</div>';
+?>
+</fieldset>
+</div>
+	<div style=3D"clear:both"></div>
+<?php
 /*
  * Mini Report
  */
@@ -84,7 +95,6 @@
 }
=20
 if ( $report !=3D 0 ) {
-  echo '<div style=3D"float:left;width:30%">';
   echo '<fieldset style=3D"background-color:white"><legend>'.$rapport->g=
et_name().'</legend>';
   $exercice=3D$g_user->get_exercice();
   if ( $exercice =3D=3D 0 ) {
@@ -110,80 +120,10 @@
   echo '</fieldset>';
   echo '</div>';
  } else {
-  echo '<div style=3D"float:right;width:20%">';
   echo '<fieldset style=3D"background-color:white"><legend>'._('Aucun ra=
pport d=C3=A9fini').'</legend>';
   echo '<a href=3D"user_pref.php?'.dossier::get().'">'._('Cliquez ici po=
ur mettre =C3=A0 jour vos pr=C3=A9f=C3=A9rences').'</a>';
   echo '</fieldset>';
-  echo '</div>';
  }
=20
 ?>
-<div style=3D"float:left;clear:both;width:100%">
-<div style=3D"float:left;width:49%">
-<fieldset>
-<legend><?=3D_('Derni=C3=A8res op=C3=A9rations')?>
-</legend>
-<table width=3D"100%">
-<?php
-for($i=3D0;$i<count($last_ledger);$i++):
- if ( $i % 2 =3D=3D 0 ) $odd=3D'class=3D"odd" '; else $odd=3D'class=3D"e=
ven" ';
-?>
-<tr <?=3D$odd?> >
-<td>
-<?=3D$last_ledger[$i]['jr_date_fmt']?>
-</td>
-<td>
-   <?=3Dh(substr($last_ledger[$i]['jr_comment'],0,30))?>
-</td>
-<td>
-   <?=3Dh(substr($last_ledger[$i]['jr_pj_number'],0,10))?>
-</td>
-
-<td style=3D"text-align:right">
-   <?=3Dnbm($last_ledger[$i]['jr_montant'])?>
-</td>
-<td>
-   <? echo $detail=3DHtmlInput::detail_op($last_ledger[$i]['jr_id'],$las=
t_ledger[$i]['jr_internal']); ?>
-</td>
-
-</tr>
-<? endfor;?>
-</table>
-
-</fieldset>
 </div>
-
-
-<div style=3D"float:left;width:49%">
-<fieldset>
-<legend><?=3D_('Derni=C3=A8res actions')?>
-</legend>
-<table width=3D"100%">
-<?php
-for($i=3D0;$i<count($last_operation);$i++):
-  if ( $i % 2 =3D=3D 0 ) $odd=3D'class=3D"odd" '; else $odd=3D'class=3D"=
even" ';
-?>
-<tr <?=3D$odd?>>
-<td>
-   <?=3Dh($last_operation[$i]['ag_timestamp_fmt'])?>
-</td>
-<td>
-   <?=3Dh($last_operation[$i]['vw_name'])?>
-</td>
-
-<td>
-<? echo '<A HREF=3D"commercial.php?'.dossier::get().'&p_action=3Dsuivi_c=
ourrier&sa=3Ddetail&ag_id=3D'.$last_operation[$i]['ag_id'].'">'; ?>
-<?=3Dh(substr($last_operation[$i]['ag_title'],0,40))?>
-</a>
-</td>
-<td>
-<?=3D$last_operation[$i]['dt_value']?>
-</tr>
-
-<? endfor;?>
-</table>
-</fieldset>
-</div>
-
-</div>
-</div>

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	2011-11-13 13:=
28:19 UTC (rev 4345)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php	2011-11-13 17:=
28:49 UTC (rev 4346)
@@ -37,7 +37,7 @@
 							$bk=3Dnew Fiche($cn,$obj->det->array[0]['qp_supplier']);
 							echo td(_('Fournisseur'));
=20
-							$view_history=3D sprintf('<A class=3D"detail" HREF=3D"javascript:=
view_history_card(\'%s\',\'%s\')" >%s</A>',
+							$view_history=3D sprintf('<A class=3D"line" HREF=3D"javascript:vi=
ew_history_card(\'%s\',\'%s\')" >%s</A>',
 											$bk->id, $gDossier, $bk->get_quick_code());
 							echo td(h($bk->getName())).td($view_history);;
 							?>
@@ -99,6 +99,7 @@
 } 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
@@ -138,6 +139,8 @@
    }
     $row.=3Dtd($fiche->strAttribut(ATTR_DEF_NAME));
     $row.=3Dtd($sym_tva,'style=3D"text-align:center"');
+	$pu=3Dbcdiv($q['qp_price'],$q['qp_quantite']);
+    $row.=3Dtd(nbm($pu),'class=3D"num"');
     $row.=3Dtd(nbm($q['qp_quantite']),'class=3D"num"');
=20
     $no_ded=3Dbcadd($q['qp_dep_priv'],$q['qp_nd_amount']);

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	2011-11-13 13:=
28:19 UTC (rev 4345)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php	2011-11-13 17:=
28:49 UTC (rev 4346)
@@ -18,7 +18,7 @@
 						$date=3Dnew IDate('p_date');
 						$date->value=3Dformat_date($obj->det->jr_date);
 						 echo td('Date').td($date->input());
-						=20
+
 						 ?>
 						 </td>
 						</tr>
@@ -28,15 +28,15 @@
 							$date_ech=3Dnew IDate('p_ech');
 							$date_ech->value=3Dformat_date($obj->det->jr_ech);
 							 echo td('Echeance').td($date_ech->input());
-							=20
+
 							 ?>
-							</td>		=09
+							</td>
 						<tr>
 						<td>
 						<?
 						$bk=3Dnew Fiche($cn,$obj->det->array[0]['qs_client']);
 						echo td(_('Client'));
-					=09
+
 						$view_history=3D sprintf('<A class=3D"detail" HREF=3D"javascript:v=
iew_history_card(\'%s\',\'%s\')" >%s</A>',
 										$bk->id, $gDossier, $bk->get_quick_code());
 						echo td(h($bk->getName())).td($view_history);;
@@ -45,7 +45,7 @@
 						</tr>
 						<tr>
 						<td>
-						<?=20
+						<?
 						$itext=3Dnew IText('npj');
 						$itext->value=3D$obj->det->jr_pj_number;
 						echo td(_('Pi=C3=A8ce')).td($itext->input());
@@ -53,13 +53,13 @@
 						</td>
 						<tr>
 						<td>
-						<?=20
+						<?
 						  $itext=3Dnew IText('lib');
 						  $itext->value=3D$obj->det->jr_comment;
 						  $itext->size=3D40;
 						echo td(_('Libell=C3=A9')).td($itext->input(),' colspan=3D"2" ');
-					=09
-					=09
+
+
 						?>
 						</td>
 						</tr>
@@ -80,7 +80,7 @@
 			$inote->value=3D$obj->det->note;
 			echo $inote->input();
 			?>
-		=09
+
 			</td>
 			</tr>
 			</table>
@@ -95,16 +95,17 @@
   $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=20
+else
   echo th('');
-echo th(_('Quantit=C3=A9'), 'style=3D"text-align:right"');
 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=20
+} else
   echo th(_('Total'), 'style=3D"text-align:right"');
=20
     if ($owner->MY_ANALYTIC !=3D 'nu' && $div =3D=3D 'popup'){
@@ -118,17 +119,20 @@
       echo Anc_Plan::hidden($a_anc);
     }
=20
-echo '</tr>'; =20
+echo '</tr>';
   for ($e=3D0;$e<count($obj->det->array);$e++) {
-    $row=3D'';=20
+    $row=3D'';
     $q=3D$obj->det->array[$e];
     $fiche=3Dnew Fiche($cn,$q['qs_fiche']);
-    $view_history=3D sprintf('<A class=3D"detail" HREF=3D"javascript:vie=
w_history_card(\'%s\',\'%s\')" >%s</A>',
+    $view_history=3D sprintf('<A class=3D"line" HREF=3D"javascript:view_=
history_card(\'%s\',\'%s\')" >%s</A>',
 				$fiche->id, $gDossier, $fiche->strAttribut(ATTR_DEF_QUICKCODE));
=20
     $row=3Dtd($view_history);
     $row.=3Dtd($fiche->strAttribut(ATTR_DEF_NAME));
     $sym_tva=3D'';
+	$pu=3Dbcdiv($q['qs_price'],$q['qs_quantite']);
+    $row.=3Dtd(nbm($pu),'class=3D"num"');
+    $row.=3Dtd(nbm($q['qs_quantite']),'class=3D"num"');
    if ( $owner->MY_TVA_USE=3D=3D'Y') {
      /* retrieve TVA symbol */
      $tva=3Dnew Acc_Tva($cn,$q['qs_vat_code']);
@@ -139,7 +143,6 @@
=20
    $row.=3Dtd($sym_tva,'style=3D"text-align:center"');
=20
-    $row.=3Dtd(nbm($q['qs_quantite']),'class=3D"num"');
     $htva=3D$q['qs_price'];
     $row.=3Dtd(nbm($htva),'class=3D"num"');
     $tvac=3Dbcadd($htva,$q['qs_vat']);
@@ -159,9 +162,9 @@
 	echo HtmlInput::hidden('op[]',$anc_op->j_id);
 	/* compute total price */
 	bcscale(2);
-=09
+
 	$row.=3D$anc_op->display_table(1,$htva,$div);
-=09
+
       }  else {
 	$row.=3Dtd('');
       }
@@ -188,7 +191,7 @@
 <legend>
 <?=3D_('Ecritures comptables')?>
 </legend>
-<?=20
+<?
   /* if it is not in a popup, the details are hidden */
   if ( $div !=3D 'popup') {
     $ib=3Dnew IButton ("a".$div);
@@ -200,7 +203,7 @@
     $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=20
+  } else
     echo '<div>';
=20
   $detail=3Dnew Acc_Misc($cn,$obj->jr_id);
@@ -233,7 +236,7 @@
     $row.=3Dtd($view_history);
=20
     if ( $q['j_qcode'] !=3D'') {
-      // nom de la fiche=20
+      // nom de la fiche
       $ff=3Dnew Fiche($cn);
       $ff->get_by_qcode( $q['j_qcode']);
       $row.=3Dtd($ff->strAttribut(h(ATTR_DEF_NAME)));

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2011-11-13 13:28:19 UTC (=
rev 4345)
+++ phpcompta/trunk/include/template/module.php	2011-11-13 17:28:49 UTC (=
rev 4346)
@@ -21,11 +21,11 @@
 			$direct=3Dnew IText('ac');
 			$direct->style=3D'class=3D"direct"';
 			$direct->value=3D'';
-			$direct->size=3D(strlen($direct->value)<10)?10:strlen($direct->value)=
;
+			$direct->size=3D20;
 			echo $direct->input();
 			$gDossier=3Ddossier::id();
 			?>
-		<div id=3D"ac_choices" class=3D"autocomplete" ></div>
+		<div id=3D"ac_choices" class=3D"autocomplete" style=3D"width:150"></di=
v>
 		<?
 			echo HtmlInput::submit('go','aller');
 			?>

Modified: phpcompta/trunk/sql/ajax-direct-form.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/ajax-direct-form.sql	2011-11-13 13:28:19 UTC (rev=
 4345)
+++ phpcompta/trunk/sql/ajax-direct-form.sql	2011-11-13 17:28:49 UTC (rev=
 4346)
@@ -1,19 +1,55 @@
--- Function: comptaproc.get_pcm_tree(account_type)
+create type menu_tree as (code text,description text);
+=20
+create or replace function comptaproc.get_profile_menu(login text)
+returns setof  menu_tree
+as
+$BODY$
+declare
+	a menu_tree;
+	e menu_tree;
+begin
+for a in select me_code,me_description from v_all_menu where user_name=3D=
login=20
+	and me_code_dep is null and me_type <> 'PR' and me_type <>'SP'
+loop
+		return next a;
+=09
+		for e in select * from get_menu_tree(a.code,login)
+		loop=20
+			return next e;
+		end loop;
+=09
+	end loop;
+return;
+end;
+$BODY$ language plpgsql;
=20
-DROP FUNCTION comptaproc.get_menu_tree(text);
=20
-CREATE OR REPLACE FUNCTION comptaproc.get_menu_tree(p_code text)
-  RETURNS SETOF text AS
+
+
+CREATE OR REPLACE FUNCTION comptaproc.get_menu_tree(p_code text,login te=
xt)
+  RETURNS SETOF menu_tree AS
 $BODY$
 declare
-	i record;
-	e RECORD;
+	i menu_tree;
+	e menu_tree;
+	a text;
+	x v_all_menu%ROWTYPE;
 begin
-	for i in select me_code from profile_menu where me_code_dep=3Dp_code
-	loop
+	for x in select *  from v_all_menu where me_code_dep=3Dp_code::text and=
 user_name=3Dlogin::text
+	loop=09
+		if x.me_code_dep is not null then
+			i.code :=3D x.me_code_dep||'/'||x.me_code;
+		else
+			i.code :=3D x.me_code;
+		end if;
+
+		i.description :=3D x.me_description;
+	=09
 		return next i;
-		for e in select get_pcm_tree from get_menu_tree(i)
+	=09
+	for e in select *  from get_menu_tree(x.me_code,login)
 		loop
+			e.code:=3Dx.me_code_dep||'/'||e.code;
 			return next e;
 		end loop;
=20
@@ -21,6 +57,5 @@
 	return;
 end;
 $BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100
-  ROWS 1000;
+  LANGUAGE plpgsql;
+=09

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	2011-11-13 13:28:19 UTC (rev 4345)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-13 17:28:49 UTC (rev 4346)
@@ -22,6 +22,7 @@
 \i account_add.sql
 \i object-6.0.sql
 \i extension.sql
+\i ajax-direct-form.sql
 -- for account repository
 \i change_account_repo.sql
 \i style-epad.sql



From MAILER-DAEMON Mon Nov 14 04:24:25 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPsm9-0000Xh-Fu
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Nov 2011 04:24:25 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Nov 2011 10:30:03 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.13340.1321262664.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4347 - in phpcompta/trunk: html include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Nov 2011 09:24:24 -0000

Author: danydb
Date: 2011-11-14 10:30:00 +0100 (Mon, 14 Nov 2011)
New Revision: 4347

Modified:
   phpcompta/trunk/html/do.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/compta_ven.inc.php
Log:
Replace $own by a global variable, except for ajax and export.

This variable is set in do.php

Modified: phpcompta/trunk/html/do.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/do.php	2011-11-13 17:28:49 UTC (rev 4346)
+++ phpcompta/trunk/html/do.php	2011-11-14 09:30:00 UTC (rev 4347)
@@ -48,7 +48,7 @@
=20
 html_page_start($_SESSION['g_theme']);
=20
-global $g_user, $cn;
+global $g_user, $cn,$g_parameter;
=20
=20
=20
@@ -60,6 +60,7 @@
     redirect("extension.php?" . dossier::get(), 0);
     exit();
 }
+$g_parameter=3Dnew Own($cn);
=20
 load_all_script();
 /*  Check Browser version if < IE6 then unsupported */

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	2011-11-13 17:28:49 UTC =
(rev 4346)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-14 09:30:00 UTC =
(rev 4347)
@@ -29,7 +29,6 @@
 require_once('class_fiche.php');
 require_once('class_user.php');
 require_once ('class_dossier.php');
-require_once ('class_own.php');
 require_once ('class_anc_operation.php');
 require_once ('class_acc_operation.php');
 require_once ('class_acc_account_ledger.php');
@@ -591,11 +590,11 @@
      */
     public function list_operation_to_reconcile($sql)
     {
+        global $g_parameter;
         $user=3Dnew User($this->db);
         $gDossier=3Ddossier::id();
         $limit=3D" LIMIT 25";
         // Sort
-        $own=3Dnew Own($this->db);
=20
 		// Count
         $count=3D$this->db->count_sql($sql);
@@ -763,6 +762,7 @@
      */
     public function list_operation($sql,$offset,$p_paid=3D0)
     {
+        global $g_parameter;
 		$table=3Dnew Sort_Table();
         $user=3Dnew User($this->db);
         $gDossier=3Ddossier::id();
@@ -785,7 +785,6 @@
 		$table->add("Description",$url,"order by jr_comment asc",
 				"order by jr_comment desc","ca","cd");
=20
-        $own=3Dnew Own($this->db);
 		$ord=3D ( ! isset ($_GET['ord']))?'da':$_GET['ord'];
 		$order=3D$table->get_sql_order($ord);
=20
@@ -1322,6 +1321,7 @@
      */
     function confirm($p_array,$p_readonly=3Dfalse)
     {
+        global $g_parameter;
 		if (! $p_readonly ) $this->verify($p_array);
 		$this->id=3D$p_array['p_jrn'];
         if ( empty($p_array)) return 'Aucun r&eacute;sultat';
@@ -1336,7 +1336,6 @@
         {
             $lPeriode->find_periode($e_date);
         }
-        $owner=3Dnew own($this->db);
 		$total=3D0;
 		bcscale(2);
=20
@@ -1357,7 +1356,7 @@
         $ret.=3D"<th style=3D\"text-align:right\">"._("D=C3=A9bit")."</t=
h>";
         $ret.=3D"<th style=3D\"text-align:right\">"._("Cr=C3=A9dit")."</=
th>";
         /* if we use the AC */
-        if ($owner->MY_ANALYTIC!=3D'nu')
+        if ($g_parameter->MY_ANALYTIC!=3D'nu')
         {
             $anc=3Dnew Anc_Plan($this->db);
             $a_anc=3D$anc->get_list();
@@ -1431,13 +1430,13 @@
             $ret.=3D"</td>";
             // CA
=20
-            if (  $owner->MY_ANALYTIC!=3D'nu') // use of AA
+            if (  $g_parameter->MY_ANALYTIC!=3D'nu') // use of AA
             {
                 if ( preg_match("/^[6,7]+/",$strPoste)=3D=3D1)
                 {
                     // show form
                     $op=3Dnew Anc_Operation($this->db);
-                    $null=3D($owner->MY_ANALYTIC=3D=3D'op')?1:0;
+                    $null=3D($g_parameter->MY_ANALYTIC=3D=3D'op')?1:0;
                     $p_array['pa_id']=3D$a_anc;
                     /* op is the operation it contains either a sequence=
 or a jrnx.j_id */
                     $ret.=3DHtmlInput::hidden('op[]=3D',$i);
@@ -1458,7 +1457,7 @@
         }
 		$ret.=3Dtr(td('').td(_('Totaux')).td($total,'class=3D"num"').td($total=
,'class=3D"num"'),'class=3D"footer"');
         $ret.=3D"</table>";
-		if ( $owner->MY_ANALYTIC!=3D'nu'  && $p_readonly=3D=3Dfalse)
+		if ( $g_parameter->MY_ANALYTIC!=3D'nu'  && $p_readonly=3D=3Dfalse)
 			$ret.=3D'<input type=3D"button" class=3D"button" value=3D"'._('verifi=
e Imputation Analytique').'" onClick=3D"verify_ca(\'\');">';
         return $ret;
     }
@@ -1472,8 +1471,8 @@
      */
     function input($p_array=3Dnull,$p_readonly=3D0)
     {
+        global $g_parameter;
         $user =3D new User($this->db);
-        $owner=3Dnew Own($this->db);
=20
         if ( $p_readonly =3D=3D 1 )
             return $this->show_summary($p_array);
@@ -1481,7 +1480,7 @@
         if ( $p_array !=3D null )
             extract($p_array);
         $add_js=3D"";
-        if ( $owner->MY_PJ_SUGGEST=3D=3D'Y')
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
         {
             $add_js=3D"update_pj();";
         }
@@ -1550,8 +1549,7 @@
=20
         /* suggest PJ ? */
         $default_pj=3D'';
-        $owner=3Dnew Own($this->db);
-        if ( $owner->MY_PJ_SUGGEST=3D=3D'Y')
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
         {
             $default_pj=3D$this->guess_pj();
         }
@@ -1857,6 +1855,7 @@
      */
     function save ($p_array)
     {
+        global $g_parameter;
         extract ($p_array);
         try
         {
@@ -1868,7 +1867,6 @@
             $internal=3D$this->compute_internal_code($seq);
=20
             $group=3D$this->db->get_next_seq("s_oa_group");
-            $owner=3Dnew own($this->db);
             $tot_amount=3D0;
             $tot_deb=3D0;
             $tot_cred=3D0;
@@ -1930,7 +1928,7 @@
                 $tot_amount+=3Dround($acc_op->amount,2);
                 $tot_deb+=3D($acc_op->type=3D=3D'd')?$acc_op->amount:0;
                 $tot_cred+=3D($acc_op->type=3D=3D'c')?$acc_op->amount:0;
-                if ( $owner->MY_ANALYTIC !=3D "nu" )
+                if ( $g_parameter->MY_ANALYTIC !=3D "nu" )
                 {
                     if ( preg_match("/^[6,7]+/",$poste)=3D=3D1)
                     {
@@ -2143,9 +2141,9 @@
      */
     function check_strict()
     {
-        $owner=3Dnew Own($this->db);
-        if ( $owner->MY_STRICT=3D=3D'Y') return true;
-        if ( $owner->MY_STRICT=3D=3D'N') return false;
+        global $g_parameter;
+        if ( $g_parameter->MY_STRICT=3D=3D'Y') return true;
+        if ( $g_parameter->MY_STRICT=3D=3D'N') return false;
         exit("Valeur invalid ".__FILE__.':'.__LINE__);
     }
     /*!
@@ -2155,9 +2153,9 @@
      */
     function check_periode()
     {
-        $owner=3Dnew Own($this->db);
-        if ( $owner->MY_CHECK_PERIODE=3D=3D'Y') return true;
-        if ( $owner->MY_CHECK_PERIODE=3D=3D'N') return false;
+        global $g_parameter;
+        if ( $g_parameter->MY_CHECK_PERIODE=3D=3D'Y') return true;
+        if ( $g_parameter->MY_CHECK_PERIODE=3D=3D'N') return false;
         exit("Valeur invalid ".__FILE__.':'.__LINE__);
     }
=20

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-13 17:28:49 =
UTC (rev 4346)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-14 09:30:00 =
UTC (rev 4347)
@@ -187,9 +187,9 @@
      */
     function input($p_array=3Dnull)
     {
+        global $g_parameter;
         if ( $p_array !=3D null)
             extract ($p_array);
-        $owner=3Dnew Own($this->db);
=20
         $pview_only=3Dfalse;
         $user =3D new User($this->db);
@@ -203,7 +203,7 @@
         // The first day of the periode
         $pPeriode=3Dnew Periode($this->db);
         list ($l_date_start,$l_date_end)=3D$pPeriode->get_date_limit($us=
er->get_periode());
-        if (  $owner->MY_DATE_SUGGEST=3D=3D'Y' )
+        if (  $g_parameter->MY_DATE_SUGGEST=3D=3D'Y' )
             $op_date=3D( ! isset($e_date) ) ?$l_date_start:$e_date;
         else
             $op_date=3D( ! isset($e_date) ) ?'':$e_date;
@@ -250,7 +250,7 @@
=20
 	$add_js=3D'onchange=3D"update_pj();update_bank();get_last_date();ajax_s=
aldo(\'first_sold\');update_name();"';
=20
-	if ( $owner->MY_DATE_SUGGEST =3D=3D 'Y')
+	if ( $g_parameter->MY_DATE_SUGGEST =3D=3D 'Y')
 	  $add_js=3D'onchange=3D"update_pj();update_bank();get_last_date();ajax=
_saldo(\'first_sold\')";';
=20
         $wLedger=3D$this->select_ledger('FIN',2);
@@ -272,7 +272,7 @@
         //-------------------------------------------------
         // Extrait
         $default_pj=3D'';
-        if ( $owner->MY_PJ_SUGGEST=3D=3D'Y')
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
         {
             $default_pj=3D$this->guess_pj();
         }
@@ -386,11 +386,11 @@
      */
     public function confirm($p_array)
     {
+        global $g_parameter;
         $r=3D"";
         bcscale(2);
         extract ($p_array);
         $pPeriode=3Dnew Periode($this->db);
-	$owner=3Dnew Own($this->db);
         if ($this->check_periode() =3D=3D true)
         {
             $pPeriode->p_id=3D$periode;
@@ -476,7 +476,7 @@
         $r.=3D'<th colspan=3D"2"> Op. Concern&eacute;e(s)</th>';
=20
 	/* if we use the AC */
-        if ($owner->MY_ANALYTIC!=3D'nu')
+        if ($g_parameter->MY_ANALYTIC!=3D'nu')
         {
             $anc=3Dnew Anc_Plan($this->db);
             $a_anc=3D$anc->get_list();
@@ -525,11 +525,11 @@
             $r.=3D${"e_concerned".$i};
             $r.=3D'</td>';
             // encode the pa
-            if ( $owner->MY_ANALYTIC!=3D'nu' && preg_match("/^[6,7]/",$f=
Tiers->strAttribut(ATTR_DEF_ACCOUNT))=3D=3D1 ) // use of AA
+            if ( $g_parameter->MY_ANALYTIC!=3D'nu' && preg_match("/^[6,7=
]/",$fTiers->strAttribut(ATTR_DEF_ACCOUNT))=3D=3D1 ) // use of AA
             {
                 // show form
                 $anc_op=3Dnew Anc_Operation($this->db);
-                $null=3D($owner->MY_ANALYTIC=3D=3D'op')?1:0;
+                $null=3D($g_parameter->MY_ANALYTIC=3D=3D'op')?1:0;
                 $r.=3D'<td>';
                 $p_mode=3D1;
                 $p_array['pa_id']=3D$a_anc;
@@ -591,6 +591,7 @@
      */
     public function insert($p_array)
     {
+        global $g_parameter;
 		bcscale(2);
         $internal_code=3D"";
         $oid=3D0;
@@ -600,7 +601,6 @@
         $bank_id=3D$this->get_bank();
         $fBank=3Dnew Fiche($this->db,$bank_id);
         $e_bank_account=3D$fBank->strAttribut(ATTR_DEF_QUICKCODE);
-	$owner=3Dnew Own($this->db);
         // Get the saldo
         $pPeriode=3Dnew Periode($this->db);
         if ( $this->check_periode() =3D=3D true )
@@ -793,7 +793,7 @@
                  */
 		$this->insert_quant_fin($fBank->id,$jr_id,$fPoste->id,${"e_other$i"."_=
amount"});
=20
-                if ( $owner->MY_ANALYTIC !=3D "nu" )
+                if ( $g_parameter->MY_ANALYTIC !=3D "nu" )
                 {
                     // for each item, insert into operation_analytique *=
/
                     $op=3Dnew Anc_Operation($this->db);

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	2011-11-13 17:2=
8:49 UTC (rev 4346)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-14 09:3=
0:00 UTC (rev 4347)
@@ -60,6 +60,7 @@
      */
     public function verify($p_array)
     {
+        global $g_parameter;
         extract ($p_array);
         /* check if we can write into this ledger */
         $user=3Dnew User($this->db);
@@ -165,9 +166,8 @@
             if ( isNumber(${'e_quant'.$i}) =3D=3D 0 )
                 throw new Exception(_('La fiche ').${'e_march'.$i}._('a =
une quantit=C3=A9 invalide').' ['.${'e_quant'.$i}.']',7);
=20
-            $owner=3Dnew Own($this->db);
             // Check if the given tva id is valid
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 if (${'e_march'.$i.'_tva_id'} =3D=3D 0 )
                     throw new Exception(_('La fiche ').${'e_march'.$i}._=
('a un code tva invalide').' ['.${'e_march'.$i.'_tva_id'}.']',13);
@@ -301,10 +301,10 @@
      */
     public function insert($p_array)
     {
+        global $g_parameter;
         extract ($p_array);
         $this->verify($p_array) ;
=20
-        $owner=3Dnew own($this->db);
         $group=3D$this->db->get_next_seq("s_oa_group"); /* for analytic =
*/
         $seq=3D$this->db->get_next_seq('s_grpt');
         $this->id=3D$p_jrn;
@@ -358,7 +358,7 @@
                 $fiche->get_by_qcode(${"e_march".$i});
=20
                 /* tva */
-                if ($owner->MY_TVA_USE=3D=3D'Y')
+                if ($g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
                     $idx_tva=3D${'e_march'.$i.'_tva_id'};
                     $oTva=3Dnew Acc_Tva($this->db);
@@ -371,7 +371,7 @@
                 $acc_amount=3Dnew Acc_Compute();
                 $acc_amount->check=3Dfalse;
                 $acc_amount->set_parameter('amount',$amount);
-                if ( $owner->MY_TVA_USE=3D=3D'Y')
+                if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
                     $acc_amount->set_parameter('amount_vat_rate',$oTva->=
get_parameter('rate'));
                     if ( strlen(trim(${'e_march'.$i.'_tva_amount'})) =3D=
=3D0)
@@ -453,7 +453,7 @@
=20
                 /* Compute sum vat */
=20
-                if ( $owner->MY_TVA_USE=3D=3D'Y')
+                if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
                     $tva_item=3D$acc_amount->amount_vat;
=20
@@ -477,7 +477,7 @@
=20
                 InsertStockGoods($this->db,$j_id,${'e_march'.$i},$nNeg*$=
{'e_quant'.$i},'d') ;
=20
-                if ( $owner->MY_ANALYTIC !=3D "nu" )
+                if ( $g_parameter->MY_ANALYTIC !=3D "nu" )
                 {
                     // for each item, insert into operation_analytique *=
/
                     $op=3Dnew Anc_Operation($this->db);
@@ -491,7 +491,7 @@
                 }
                 // insert into quant_purchase
                 //-----
-                if ( $owner->MY_TVA_USE=3D=3D'Y')
+                if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
                     $r=3D$this->db->exec_sql("select insert_quant_purcha=
se ".
                                            "(null".
@@ -643,7 +643,7 @@
=20
             }
=20
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 /* save all vat
                  * $i contains the tva_id and value contains the vat amo=
unt
@@ -876,11 +876,11 @@
      */
     public function input($p_array=3Dnull)
     {
+        global $g_parameter;
         if ( $p_array !=3D null ) extract($p_array);
=20
         $user =3D new User($this->db);
-        $owner=3Dnew Own($this->db);
-        $flag_tva=3D$owner->MY_TVA_USE;
+        $flag_tva=3D$g_parameter->MY_TVA_USE;
         /* Add button */
         $f_add_button=3Dnew IButton('add_card');
         $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche');
@@ -901,7 +901,7 @@
         // The first day of the periode
         $oPeriode=3Dnew Periode($this->db);
         list ($l_date_start,$l_date_end)=3D$oPeriode->get_date_limit($us=
er->get_periode());
-        if (  $owner->MY_DATE_SUGGEST=3D=3D'Y' )
+        if (  $g_parameter->MY_DATE_SUGGEST=3D=3D'Y' )
             $op_date=3D( ! isset($e_date) ) ?$l_date_start:$e_date;
         else
             $op_date=3D( ! isset($e_date) ) ?'':$e_date;
@@ -962,7 +962,7 @@
         //--
         /* if we suggest the next pj, then we need a javascript */
         $add_js=3D"";
-        if ( $owner->MY_PJ_SUGGEST=3D=3D'Y')
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
         {
             $add_js=3D"update_pj();";
         }
@@ -989,7 +989,7 @@
         //--
         /* suggest PJ ? */
         $default_pj=3D'';
-        if ( $owner->MY_PJ_SUGGEST=3D=3D'Y')
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
         {
             $default_pj=3D$this->guess_pj();
         }
@@ -1074,7 +1074,7 @@
             $march_price=3D(isset(${"e_march".$i."_price"}))?${"e_march"=
.$i."_price"}:""
                          ;
             /* use vat */
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 $march_tva_id=3D(isset(${"e_march$i"."_tva_id"}))?${"e_m=
arch$i"."_tva_id"}:""
                               ;
@@ -1093,7 +1093,7 @@
                 $fMarch->get_by_qcode($march);
                 $march_label=3D$fMarch->strAttribut(ATTR_DEF_NAME);
                 /* vat use */
-                if ( ! isset($march_tva_id) && $owner->MY_TVA_USE=3D=3D'=
Y' )
+                if ( ! isset($march_tva_id) && $g_parameter->MY_TVA_USE=3D=
=3D'Y' )
                     $march_tva_id=3D$fMarch->strAttribut(ATTR_DEF_TVA);
             }
             // Show input
@@ -1127,12 +1127,12 @@
=20
             $array[$i]['hidden']=3D'';
             // For computing we need some hidden field for holding the v=
alue
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 $array[$i]['hidden'].=3DHtmlInput::hidden('tva_march'.$i=
,0);
             }
=20
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 $tvac=3Dnew INum('tvac_march'.$i);
             else
                 $tvac=3Dnew IHidden('tvac_march'.$i);
@@ -1158,7 +1158,7 @@
             $Price->size=3D9;
             $Price->javascript=3D"onBlur=3D'format_number(this);clean_tv=
a($i);compute_ledger($i)'";
             $array[$i]['pu']=3D$Price->input("e_march".$i."_price",$marc=
h_price);
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
=20
                 // vat label
@@ -1204,7 +1204,7 @@
=20
=20
         /* if we suggest the pj n# the run the script */
-        if ( $owner->MY_PJ_SUGGEST=3D=3D'Y')
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
         {
             $r.=3D'<script> update_pj();</script>';
         }
@@ -1230,6 +1230,7 @@
      */
     function confirm($p_array,$p_summary=3Dfalse)
     {
+        global $g_parameter;
         extract ($p_array);
=20
 		// we don't need to verify if we need only a feedback
@@ -1239,7 +1240,6 @@
 		$anc=3Dnull;
         // to show a select list for the analytic
         // if analytic is op (optionnel) there is a blank line
-        $owner =3D new Own($this->db);
=20
         bcscale(4);
         $client=3Dnew Fiche($this->db);
@@ -1288,7 +1288,7 @@
         $r.=3D"<th>"._('D=C3=A9nomination')."</th>";
         $r.=3D"<th>"._('prix')."</th>";
         /* vat use */
-        if ( $owner->MY_TVA_USE=3D=3D'Y')
+        if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
         {
             $r.=3D"<th>"._('quantit=C3=A9')."</th>";
             $r.=3D"<th>tva</th>";
@@ -1303,7 +1303,7 @@
         }
=20
         /* if we use the AC */
-        if ($owner->MY_ANALYTIC!=3D'nu')
+        if ($g_parameter->MY_ANALYTIC!=3D'nu')
         {
             $anc=3Dnew Anc_Plan($this->db);
             $a_anc=3D$anc->get_list();
@@ -1331,7 +1331,7 @@
             $fiche->get_by_qcode(${"e_march".$i});
             $fiche_name=3Dh($fiche->getName());
=20
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 $idx_tva=3D${"e_march".$i."_tva_id"};
                 $oTva=3Dnew Acc_Tva($this->db);
@@ -1340,7 +1340,7 @@
             }
             $amount=3Dbcmul(${"e_march".$i."_price"},${'e_quant'.$i});
=20
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 //----- if tva_amount is not given we compute the vat --=
--
                 if ( strlen (trim (${'e_march'.$i.'_tva_amount'})) =3D=3D=
 0)
@@ -1380,7 +1380,7 @@
             $r.=3D'<td align=3D"right">';
             $r.=3Dnbm(${"e_quant".$i});
             $r.=3D'</td>';
-            if ($owner->MY_TVA_USE =3D=3D 'Y')
+            if ($g_parameter->MY_TVA_USE =3D=3D 'Y')
             {
                 $r.=3D'<td align=3D"right">';
                 $r.=3D$oTva->get_parameter('label');
@@ -1396,11 +1396,11 @@
             $r.=3Dnbm(round($tot_row,2));
             $r.=3D'</td>';
             // encode the pa
-            if ( $owner->MY_ANALYTIC!=3D'nu') // use of AA
+            if ( $g_parameter->MY_ANALYTIC!=3D'nu') // use of AA
             {
                 // show form
                 $anc_op=3Dnew Anc_Operation($this->db);
-                $null=3D($owner->MY_ANALYTIC=3D=3D'op')?1:0;
+                $null=3D($g_parameter->MY_ANALYTIC=3D=3D'op')?1:0;
                 $r.=3D'<td>';
                 $p_mode=3D($p_summary=3D=3Dfalse)?1:0;
                 $p_array['pa_id']=3D$a_anc;
@@ -1417,7 +1417,7 @@
=20
=20
         $r.=3D'</table>';
-        if ( $owner->MY_ANALYTIC!=3D'nu' && !$p_summary) // use of AA
+        if ( $g_parameter->MY_ANALYTIC!=3D'nu' && !$p_summary) // use of=
 AA
             $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'V=C3=A9rifiez imputation analytique').'" onClick=3D"verify_ca(\'\');">';
         $r.=3D'</fieldset>';
=20
@@ -1430,7 +1430,7 @@
         $r.=3D'<div style=3D"position:float;float:left;text-align:right;=
padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-weight:b=
old">';
=20
         $r.=3D'<br>'._('Total HTVA');
-        if ($owner->MY_TVA_USE=3D=3D'Y')
+        if ($g_parameter->MY_TVA_USE=3D=3D'Y')
         {
             foreach ($tva as $i=3D>$value)
             {
@@ -1450,7 +1450,7 @@
         $r.=3D'<div style=3D"position:float;float:left;text-align:right;=
color:blue;font-size:1.2em;font-weight:bold">';
         $r.=3D'<br><span id=3D"htva">'.nbm($tot_amount).'</span>';
=20
-        if ( $owner->MY_TVA_USE=3D=3D'Y')
+        if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
         {
             foreach ($tva as $i=3D>$value)
             {
@@ -1498,7 +1498,7 @@
         {
             $r.=3DHtmlInput::hidden("e_march".$i,${"e_march".$i});
             $r.=3DHtmlInput::hidden("e_march".$i."_price",${"e_march".$i=
."_price"});
-            if ( $owner->MY_TVA_USE=3D=3D'Y' )
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y' )
             {
                 $r.=3DHtmlInput::hidden("e_march".$i."_tva_id",${"e_marc=
h".$i."_tva_id"});
                 $r.=3DHtmlInput::hidden('e_march'.$i.'_tva_amount', ${'e=
_march'.$i.'_tva_amount'});

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	2011-11-13 17:28:49=
 UTC (rev 4346)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-14 09:30:00=
 UTC (rev 4347)
@@ -58,6 +58,7 @@
      */
     public function verify($p_array)
     {
+        global $g_parameter;
         extract ($p_array);
         /* check for a double reload */
         if (  isset($mt) && $this->db->count_sql('select jr_mt from jrn =
where jr_mt=3D$1',array($mt)) !=3D 0 )
@@ -167,8 +168,7 @@
                 throw new Exception(_('La fiche ').${'e_march'.$i}._('n\=
'a pas de poste comptable'),8);
=20
             // Check if the given tva id is valid
-            $owner=3Dnew Own($this->db);
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 if (  isNumber(${'e_march'.$i.'_tva_id'}) =3D=3D 0 )
                     throw new Exception(_('La fiche ').${'e_march'.$i}._=
('a un code tva invalide').' ['.${'e_march'.$i.'_tva_id'}.']',13);
@@ -236,10 +236,10 @@
      */
     public function insert($p_array)
     {
+        global $g_parameter;
         extract ($p_array);
         $this->verify($p_array) ;
=20
-        $owner=3Dnew own($this->db);
         $group=3D$this->db->get_next_seq("s_oa_group"); /* for analytic =
*/
         $seq=3D$this->db->get_next_seq('s_grpt');
         $this->id=3D$p_jrn;
@@ -315,7 +315,7 @@
=20
                 $j_id=3D$acc_operation->insert_jrnx();
=20
-                if ($owner->MY_TVA_USE =3D=3D 'Y' )
+                if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
                 {
                     /* Compute sum vat */
                     $oTva=3Dnew Acc_Tva($this->db);
@@ -349,7 +349,7 @@
                 // what card need a stock management
                 InsertStockGoods($this->db,$j_id,${'e_march'.$i},$nNeg*$=
{'e_quant'.$i},'c') ;
=20
-                if ( $owner->MY_ANALYTIC !=3D "nu" )
+                if ( $g_parameter->MY_ANALYTIC !=3D "nu" )
                 {
                     // for each item, insert into operation_analytique *=
/
                     $op=3Dnew Anc_Operation($this->db);
@@ -360,7 +360,7 @@
                     $op->oa_description=3Dsql_string($e_comm);
                     $op->save_form_plan($_POST,$i,$j_id);
                 }
-                if ( $owner->MY_TVA_USE=3D=3D'Y')
+                if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
                     /* save into quant_sold */
                     $r=3D$this->db->exec_sql("select insert_quant_sold (=
$1,$2,$3,$4,$5,$6,$7,$8)",
@@ -386,7 +386,7 @@
                                                  null,
                                                  $e_client));
=20
-                }  // if ( $owner->MY_TVA_USE=3D=3D'Y') {
+                }  // if ( $g_parameter->MY_TVA_USE=3D=3D'Y') {
             }// end loop : save all items
=20
             /*  save total customer */
@@ -406,9 +406,9 @@
=20
             /** save all vat
              * $i contains the tva_id and value contains the vat amount
-             * if if ($owner->MY_TVA_USE =3D=3D 'Y' )
+             * if if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
              */
-            if ($owner->MY_TVA_USE =3D=3D 'Y' )
+            if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
             {
                 foreach ($tva as $i =3D> $value)
                 {
@@ -432,7 +432,7 @@
=20
=20
                 }
-            } // if ($owner->MY_TVA_USE=3D=3D'Y')
+            } // if ($g_parameter->MY_TVA_USE=3D=3D'Y')
             /* insert into jrn */
             $acc_operation=3Dnew Acc_Operation($this->db);
             $acc_operation->date=3D$e_date;
@@ -615,6 +615,7 @@
      */
     function confirm($p_array,$p_summary=3Dfalse)
     {
+        global $g_parameter;
         extract ($p_array);
=20
 		// don't need to verify for a summary
@@ -622,7 +623,6 @@
         $anc=3Dnull;
         // to show a select list for the analytic & VAT USE
         // if analytic is op (optionnel) there is a blank line
-        $owner =3D new Own($this->db);
=20
         bcscale(4);
         $client=3Dnew Fiche($this->db);
@@ -674,13 +674,13 @@
         $r.=3D"<th>"._('tva')."</th>";
=20
=20
-        if ( $owner->MY_TVA_USE=3D=3D'Y')
+        if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
         {
             $r.=3D'<th> '._('Montant TVA').'</th>';
             $r.=3D'<th>'._('Montant HTVA').'</th>';
         }
         /* if we use the AC */
-        if ($owner->MY_ANALYTIC!=3D'nu')
+        if ($g_parameter->MY_ANALYTIC!=3D'nu')
         {
             $anc=3Dnew Anc_Plan($this->db);
             $a_anc=3D$anc->get_list();
@@ -702,7 +702,7 @@
             $fiche=3Dnew Fiche($this->db);
             $fiche->get_by_qcode(${"e_march".$i});
             $fiche_name=3Dh($fiche->getName());
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 $oTva=3Dnew Acc_Tva($this->db);
                 $idx_tva=3D${"e_march".$i."_tva_id"};
@@ -713,7 +713,7 @@
             $op=3Dnew Acc_Compute();
             $amount=3Dbcmul(${"e_march".$i."_price"},${'e_quant'.$i});
             $op->set_parameter("amount",$amount);
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 $op->set_parameter('amount_vat_rate',$oTva->get_paramete=
r('rate'));
                 $op->compute_vat();
@@ -740,7 +740,7 @@
             $r.=3D'<td align=3D"right">';
             $r.=3D${"e_quant".$i};
             $r.=3D'</td>';
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 $r.=3D'<td align=3D"right">';
                 $r.=3D$oTva->get_parameter('label');
@@ -760,11 +760,11 @@
             $r.=3D'</td>';
=20
             // encode the pa
-            if ( $owner->MY_ANALYTIC!=3D'nu') // use of AA
+            if ( $g_parameter->MY_ANALYTIC!=3D'nu') // use of AA
             {
                 // show form
                 $anc_op=3Dnew Anc_Operation($this->db);
-                $null=3D($owner->MY_ANALYTIC=3D=3D'op')?1:0;
+                $null=3D($g_parameter->MY_ANALYTIC=3D=3D'op')?1:0;
                 $r.=3D'<td>';
                 $p_mode=3D($p_summary=3D=3Dfalse)?1:0;
                 $p_array['pa_id']=3D$a_anc;
@@ -781,7 +781,7 @@
=20
=20
         $r.=3D'</table>';
-        if ( $owner->MY_ANALYTIC!=3D'nu' && $p_summary ) // use of AA
+        if ( $g_parameter->MY_ANALYTIC!=3D'nu' && $p_summary ) // use of=
 AA
             $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'V=C3=A9rifiez Imputation Analytique').'" onClick=3D"verify_ca(\'\');">';
         $r.=3D'</fieldset>';
         if (! $p_summary )
@@ -795,7 +795,7 @@
         $tot=3Dround(bcadd($tot_amount,$tot_tva),2);
         $r.=3D'<div style=3D"width:40%;position:float;float:left;text-al=
ign:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;fon=
t-weight:bold">';
         /* use VAT */
-        if ($owner->MY_TVA_USE =3D=3D 'Y' )
+        if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
         {
             $r.=3D'<br>Total HTVA';
             foreach ($tva as $i=3D>$value)
@@ -817,7 +817,7 @@
         $r.=3D'<div style=3D"position:float;float:left;text-align:right;=
color:blue;font-size:1.2em;font-weight:bold">';
         $r.=3D'<br><span id=3D"htva">'.nbm($tot_amount).'</span>';
=20
-        if ($owner->MY_TVA_USE =3D=3D 'Y' )
+        if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
         {
             foreach ($tva as $i=3D>$value)
             {
@@ -869,7 +869,7 @@
         {
             $r.=3DHtmlInput::hidden("e_march".$i,${"e_march".$i});
             $r.=3DHtmlInput::hidden("e_march".$i."_price",${"e_march".$i=
."_price"});
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
                 $r.=3DHtmlInput::hidden("e_march".$i."_tva_id",${"e_marc=
h".$i."_tva_id"});
                 $r.=3DHtmlInput::hidden("e_march".$i."_tva_amount",${"e_=
march".$i."_tva_amount"});
@@ -964,10 +964,10 @@
     */
     function input($p_array=3Dnull)
     {
+        global $g_parameter;
         if ( $p_array !=3D null ) extract($p_array);
         $user =3D new User($this->db);
-        $owner=3Dnew Own($this->db);
-        $flag_tva=3D$owner->MY_TVA_USE;
+        $flag_tva=3D$g_parameter->MY_TVA_USE;
         /* Add button */
         $f_add_button=3Dnew IButton('add_card');
         $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche');
@@ -988,7 +988,7 @@
         // The first day of the periode
         $oPeriode=3Dnew Periode($this->db);
         list ($l_date_start,$l_date_end)=3D$oPeriode->get_date_limit($us=
er->get_periode());
-        if (  $owner->MY_DATE_SUGGEST=3D=3D'Y' )
+        if (  $g_parameter->MY_DATE_SUGGEST=3D=3D'Y' )
             $op_date=3D( ! isset($e_date) ) ?$l_date_start:$e_date;
         else
             $op_date=3D( ! isset($e_date) ) ?'':$e_date;
@@ -1042,7 +1042,7 @@
         }
         /* if we suggest the next pj, then we need a javascript */
         $add_js=3D"";
-        if ( $owner->MY_PJ_SUGGEST=3D=3D'Y')
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
         {
             $add_js=3D"update_pj();";
         }
@@ -1071,7 +1071,7 @@
         //--
         /* suggest PJ ? */
         $default_pj=3D'';
-        if ( $owner->MY_PJ_SUGGEST=3D=3D'Y')
+        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
         {
             $default_pj=3D$this->guess_pj();
         }
@@ -1211,7 +1211,7 @@
             $htva->value=3D0;
             $array[$i]['htva']=3D$htva->input();
=20
-            if ( $owner->MY_TVA_USE=3D=3D'Y')
+            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 $tvac=3Dnew INum('tvac_march'.$i);
             else
                 $tvac=3Dnew IHidden('tvac_march'.$i);

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	2011-11-13 17:28:49 UTC (r=
ev 4346)
+++ phpcompta/trunk/include/compta_ven.inc.php	2011-11-14 09:30:00 UTC (r=
ev 4347)
@@ -35,8 +35,8 @@
 //menu =3D show a list of ledger
 $str_dossier=3Ddossier::get();
 $ac=3D"ac=3D".$_REQUEST['ac'];
+global $g_parameter;
=20
-
 //----------------------------------------------------------------------
 // Encode a new invoice
 // empty form for encoding
@@ -239,9 +239,8 @@
     echo '</div>';
     echo "</FORM>";
=20
-    $own=3Dnew Own($cn);
     /* if we suggest the pj n# the run the script */
-    if ( $own->MY_PJ_SUGGEST=3D=3D'Y')
+    if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
     {
         echo '<script> update_pj();get_last_date()</script>';
     }



From MAILER-DAEMON Mon Nov 14 05:23:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPtgr-0007CR-1i
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Nov 2011 05:23:01 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Nov 2011 11:28:45 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.13496.1321266180.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r189 - trunk/modop
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?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 Nov 2011 10:22:59 -0000

Author: danydb
Date: 2011-11-14 11:28:44 +0100 (Mon, 14 Nov 2011)
New Revision: 189

Modified:
   trunk/modop/class_modop_operation.php
   trunk/modop/index.php
   trunk/modop/modop_confirm.php
   trunk/modop/modop_display.php
   trunk/modop/modop_save.php
Log:
Adapt to version 6.0

Modified: trunk/modop/class_modop_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/class_modop_operation.php	2011-10-30 17:15:52 UTC (rev 18=
8)
+++ trunk/modop/class_modop_operation.php	2011-11-14 10:28:44 UTC (rev 18=
9)
@@ -35,7 +35,7 @@
     /**
      *@brief retrieve data from jrnx, jrn, quant_xxx and format them to
      * usable for the acc_leger input function
-     *@see Acc_Ledger::show_form(),Acc_Ledger_Purchase::input(),Acc_Ledg=
er_Sold::input(),
+     *@see Acc_Ledger::input(),Acc_Ledger_Purchase::input(),Acc_Ledger_S=
old::input(),
      */
     function format()
     {
@@ -205,18 +205,13 @@
       */
     function suspend_strict()
     {
-        $owner=3Dnew Own($this->db);
-        if ( $owner->MY_STRICT =3D=3D 'Y')
-        {
-            $owner->MY_STRICT=3D'N';
-            $owner->save('MY_STRICT');
-            $this->strict=3Dtrue;
-        }
-        else
-            $this->strict=3Dfalse;
+        global $g_parameter;
+        $g_parameter->MY_STRICT=3D'N';
+       $this->strict=3Dfalse;
     }
     /**
      *@brief activate strict mode, only if $this->strict=3Dtrue
+     * @deprecated
      *@see suspend_receipt
      */
     function activate_strict()
@@ -233,18 +228,13 @@
       */
     function suspend_receipt()
     {
-        $owner=3Dnew Own($this->db);
-        if ( $owner->MY_PJ_SUGGEST =3D=3D 'Y')
-        {
-            $owner->MY_PJ_SUGGEST=3D'N';
-            $owner->save('MY_PJ_SUGGEST');
-            $this->toggle=3Dtrue;
-        }
-        else
-            $this->toggle=3Dfalse;
+        global $g_parameter;
+        $g_parameter->MY_PJ_SUGGEST=3D'N';
+        $this->toggle=3Dfalse;
     }
     /**
      *@brief activate receipt, only if $this->toggle=3Dtrue
+     *@deprecated
      *@see suspend_receipt
      */
     function activate_receipt()

Modified: trunk/modop/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/index.php	2011-10-30 17:15:52 UTC (rev 188)
+++ trunk/modop/index.php	2011-11-14 10:28:44 UTC (rev 189)
@@ -36,6 +36,7 @@
 ?>
 <FORM METHOD=3D"GET">
   <? echo HtmlInput::extension().dossier::hidden();?>
+  <? echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
 <?=3D_("Code interne de l'op=C3=A9ration =C3=A0 modifier") ?>
   <?=3D$str->input()?>
   <?=3DHtmlInput::submit('seek','retrouver')?>
@@ -43,8 +44,6 @@
   <?=3D$search->input()?>
 <hr>
 <?php
-echo IButton::show_calc();
-
   if ( isset($_GET['seek'])) {
     /* retrieve and show the accounting */
     if ( trim($_GET['jr_internal'])=3D=3D'') {

Modified: trunk/modop/modop_confirm.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/modop_confirm.php	2011-10-30 17:15:52 UTC (rev 188)
+++ trunk/modop/modop_confirm.php	2011-11-14 10:28:44 UTC (rev 189)
@@ -35,6 +35,7 @@
   $jrn=3Dnew Acc_Ledger_Purchase($cn,$_GET['p_jrn']);
   try {
   echo '<FORM METHOD=3D"GET">';
+  echo HtmlInput::hidden('ac',$_REQUEST['ac']);
   echo HtmlInput::extension().dossier::hidden();
   echo HtmlInput::hidden('action','save');
   echo HtmlInput::hidden('ext_jr_id',$_GET['ext_jr_id']);
@@ -55,6 +56,7 @@
   try {
   $a=3D$jrn->confirm($_GET);
   echo '<FORM METHOD=3D"GET">';
+  echo HtmlInput::hidden('ac',$_REQUEST['ac']);
   echo HtmlInput::extension().dossier::hidden();
   echo HtmlInput::hidden('action','save');
   echo HtmlInput::hidden('ext_jr_id',$_GET['ext_jr_id']);
@@ -76,8 +78,9 @@
   $jrn->with_concerned=3Dfalse;
   try {
     $jrn->verify($_GET);
-    $a=3D $jrn->show_form($_GET,1);
+    $a=3D $jrn->input($_GET,1);
     echo '<FORM METHOD=3D"GET">';
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo HtmlInput::extension().dossier::hidden();
     echo HtmlInput::hidden('action','save');
     echo HtmlInput::hidden('ext_jr_id',$_GET['ext_jr_id']);

Modified: trunk/modop/modop_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/modop_display.php	2011-10-30 17:15:52 UTC (rev 188)
+++ trunk/modop/modop_display.php	2011-11-14 10:28:44 UTC (rev 189)
@@ -96,6 +96,7 @@
=20
     echo '<FORM METHOD=3D"GET" class=3D"print">';
     $op->suspend_receipt();
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo $jrn->input($op->array);
     echo HtmlInput::extension().dossier::hidden();
     echo HtmlInput::hidden('action','confirm');
@@ -105,7 +106,6 @@
     echo HtmlInput::hidden('ext_jr_internal',$op->jr_internal);
     echo HtmlInput::button('add_item',_('Ajout article'),      ' onClick=
=3D"ledger_add_row()"');
     echo '</form>';
-    $op->activate_receipt();
=20
 }
 /* ---------------------------------------------------------------------=
- */
@@ -130,8 +130,7 @@
=20
     echo '<FORM METHOD=3D"GET" class=3D"print">';
     echo $jrn->input($op->array);
-    $op->activate_receipt();
-
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo HtmlInput::extension().dossier::hidden();
     echo HtmlInput::hidden('action','confirm');
     echo HtmlInput::submit('save','Sauve');
@@ -159,9 +158,8 @@
     $op->suspend_receipt();
=20
     echo '<FORM METHOD=3D"GET" class=3D"print">';
-    echo $jrn->show_form($op->array);
-    $op->activate_receipt();
-
+    echo $jrn->input($op->array);
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo HtmlInput::extension().dossier::hidden();
     echo HtmlInput::hidden('action','confirm');
     echo HtmlInput::submit('save','Sauve');
@@ -201,6 +199,7 @@
     $f_add_button->javascript=3D" select_card_type(this);";
     $str_add_button=3D$f_add_button->input();
     echo '<FORM METHOD=3D"GET" class=3D"print">';
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     $Date=3Dnew IDate("e_date",$op->array['e_date']);
     $f_date=3D$Date->input();
     $label=3DHtmlInput::infobulle(3);
@@ -208,7 +207,6 @@
     // Ledger (p_jrn)
     //--
     $add_js=3D"";
-    $owner=3Dnew Own($cn);
=20
     $wLedger=3D$jrn->select_ledger('FIN',2);
     $wLedger->javascript=3D$add_js;

Modified: trunk/modop/modop_save.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/modop_save.php	2011-10-30 17:15:52 UTC (rev 188)
+++ trunk/modop/modop_save.php	2011-11-14 10:28:44 UTC (rev 189)
@@ -40,8 +40,6 @@
         $pj=3D$_GET['e_pj'];
         $_GET['e_pj']=3Dmicrotime();
         $new_internal=3D$jrn->insert($_GET);
-        $op->activate_receipt();
-        $op->activate_strict();
     }
     catch (Exception $e)
     {
@@ -89,8 +87,6 @@
         $pj=3D$_GET['e_pj'];
         $_GET['e_pj']=3Dmicrotime();
         $new_internal=3D$jrn->insert($_GET);
-        $op->activate_receipt();
-        $op->activate_strict();
     }
     catch (Exception $e)
     {
@@ -143,8 +139,6 @@
         $_GET['e_pj']=3Dmicrotime();
         $jrn->save($_GET);
         $new_internal=3D$jrn->internal;
-        $op->activate_receipt();
-        $op->activate_strict();
     }
     catch (Exception $e)
     {



From MAILER-DAEMON Mon Nov 14 05:32:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPtpb-0000YH-S7
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Nov 2011 05:32:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Nov 2011 11:37:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.13502.1321266723.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4348 - 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 Nov 2011 10:32:02 -0000

Author: danydb
Date: 2011-11-14 11:37:46 +0100 (Mon, 14 Nov 2011)
New Revision: 4348

Modified:
   phpcompta/trunk/include/company.inc.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/export_balance_csv.php
   phpcompta/trunk/include/modify_periode.inc.php
   phpcompta/trunk/include/modify_predf_op.php
   phpcompta/trunk/include/save_predf_op.php
   phpcompta/trunk/include/stock.inc.php
Log:
Update security, remove $user->check_action except for FICADD and FICCAT

Modified: phpcompta/trunk/include/company.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/company.inc.php	2011-11-14 09:30:00 UTC (rev =
4347)
+++ phpcompta/trunk/include/company.inc.php	2011-11-14 10:37:46 UTC (rev =
4348)
@@ -17,9 +17,9 @@
         $m->MY_PAYS=3D$p_pays;
         $m->MY_CHECK_PERIODE=3D$p_check_periode;
         $m->MY_DATE_SUGGEST=3D$p_date_suggest;
-        if ( $g_user->check_action(PARCA)!=3D0)$m->MY_ANALYTIC=3D$p_comp=
ta;
-        if ( $g_user->check_action(PARSTR)!=3D0) $m->MY_STRICT=3D$p_stri=
ct;
-        if ( $g_user->check_action(PARTVA)!=3D0)$m->MY_TVA_USE=3D$p_tva_=
use;
+        $m->MY_ANALYTIC=3D$p_compta;
+         $m->MY_STRICT=3D$p_strict;
+        $m->MY_TVA_USE=3D$p_tva_use;
         $m->MY_PJ_SUGGEST=3D$p_pj;
 	$m->MY_ALPHANUM=3D$p_alphanum;
=20
@@ -93,11 +93,8 @@
     echo "<tr>".td(_("Pays"),'style=3D"text-align:right"').$all->input("=
p_pays",$my->MY_PAYS)."</tr>";
     $all->value=3D'';
     echo "<tr>".td(_("Num=C3=A9ro de Tva"),'style=3D"text-align:right"')=
.$all->input("p_tva",$my->MY_TVA)."</tr>";
-    if ( $g_user->check_action(PARCA)=3D=3D0) $compta->setReadonly(true)=
;
     echo "<tr>".td(_("Utilisation de la compta. analytique"),'style=3D"t=
ext-align:right"').$compta->input("p_compta",$array)."</tr>";
-    if ( $g_user->check_action(PARSTR)=3D=3D0) $strict->setReadonly(true=
);
     echo "<tr>".td(_("Utilisation du mode strict "),'style=3D"text-align=
:right"').$strict->input("p_strict",$strict_array)."</tr>";
-    if ( $g_user->check_action(PARTVA)=3D=3D0) $tva_use->setReadonly(tru=
e);
     echo "<tr>".td(_("Assujetti =C3=A0 la tva"),'style=3D"text-align:rig=
ht"').$tva_use->input("p_tva_use",$strict_array)."</tr>";
     echo "<tr>".td(_("Sugg=C3=A9rer le num=C3=A9ro de pi=C3=A8ce justifi=
cative"),'style=3D"text-align:right"').$pj_suggest->input("p_pj",$strict_=
array)."</tr>";
     echo "<tr>".td(_("Sugg=C3=A9rer la date"),'style=3D"text-align:right=
"').$date_suggest->input("p_date_suggest",$strict_array)."</tr>";

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	2011-11-14 09:30:00 UTC (r=
ev 4347)
+++ phpcompta/trunk/include/compta_ach.inc.php	2011-11-14 10:37:46 UTC (r=
ev 4348)
@@ -113,7 +113,7 @@
=20
=20
 		/* Save the predefined operation */
-		if (isset($_POST['opd_save']) && $g_user->check_action(PARPREDE) =3D=3D=
 1)
+		if (isset($_POST['opd_save']) )
 		{
 			$opd =3D new Pre_op_ach($cn);
 			$opd->get_post();

Modified: phpcompta/trunk/include/export_balance_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_balance_csv.php	2011-11-14 09:30:00 UT=
C (rev 4347)
+++ phpcompta/trunk/include/export_balance_csv.php	2011-11-14 10:37:46 UT=
C (rev 4348)
@@ -35,13 +35,6 @@
=20
=20
 require_once ('class_user.php');
-$User=3Dnew User($cn);
-$User->Check();
-if ( $User->check_action(IMPBAL) =3D=3D 0)
-{
-    NoAccess();
-    exit;
-}
 echo 'poste;libelle;deb;cred;solde deb;solde cred';
 printf("\n");
 $bal=3Dnew Acc_Balance($cn);

Modified: phpcompta/trunk/include/modify_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/modify_periode.inc.php	2011-11-14 09:30:00 UT=
C (rev 4347)
+++ phpcompta/trunk/include/modify_periode.inc.php	2011-11-14 10:37:46 UT=
C (rev 4348)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,95 +16,89 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 require_once('class_periode.php');
=20
-/*!\file
+/* !\file
  * \brief display or save a periode
  * variable received $op, $cn $user
  */
-$err=3D0;$html=3D'';
-  /* we check the security */
- if ( $user->check_action(PARPER) =3D=3D 0 )
-   {
-     $html=3D'<div class=3D"error">Acc=C3=A8s interdit</div>';
-     $err=3D1;
-   }=20
- else=20
-   {
-     switch ($op)
-       {
-       case 'input_per':
-	 $per=3Dnew Periode($cn,$_GET['p_id']);
-	 $per->load();
-	 $limit=3D$per->get_date_limit($_GET['p_id']);
+$err =3D 0;
+$html =3D '';
+/* we check the security */
+switch ($op)
+{
+    case 'input_per':
+        $per =3D new Periode($cn, $_GET['p_id']);
+        $per->load();
+        $limit =3D $per->get_date_limit($_GET['p_id']);
=20
-	 $p_start=3Dnew IDate('p_start');
-	 $p_start->value=3D$limit['p_start'];
-	 $p_end =3D new IDate('p_end');
-	 $p_end->value =3D $limit['p_end'];
-	 $p_exercice=3Dnew INum('p_exercice');
-	 $p_exercice->value=3D$per->p_exercice;
+        $p_start =3D new IDate('p_start');
+        $p_start->value =3D $limit['p_start'];
+        $p_end =3D new IDate('p_end');
+        $p_end->value =3D $limit['p_end'];
+        $p_exercice =3D new INum('p_exercice');
+        $p_exercice->value =3D $per->p_exercice;
=20
-	 $html=3D'';
-	 $html.=3DHtmlInput::anchor_close('mod_periode');
-	 $html.=3Dh2info('Modification p=C3=A9riode');
-	 $html.=3D'<p> Modifier les dates de d=C3=A9but et fin de p=C3=A9riode<=
/p>';
-	 $html.=3D'<p class=3D"notice">Cela pourrait avoir un impact sur les op=
=C3=A9rations d=C3=A9j=C3=A0 existantes</p>';
-	 $html.=3D'<form method=3D"post" onsubmit=3D"return save_periode(this)"=
>';
-	 $html.=3Ddossier::hidden();
-	 $html.=3D'<table>';
+        $html =3D '';
+        $html.=3DHtmlInput::anchor_close('mod_periode');
+        $html.=3Dh2info('Modification p=C3=A9riode');
+        $html.=3D'<p> Modifier les dates de d=C3=A9but et fin de p=C3=A9=
riode</p>';
+        $html.=3D'<p class=3D"notice">Cela pourrait avoir un impact sur =
les op=C3=A9rations d=C3=A9j=C3=A0 existantes</p>';
+        $html.=3D'<form method=3D"post" onsubmit=3D"return save_periode(=
this)">';
+        $html.=3Ddossier::hidden();
+        $html.=3D'<table>';
=20
-	 $html.=3Dtr(td(' D=C3=A9but p=C3=A9riode : ').td($p_start->input()));
-	 $html.=3Dtr(td(' Fin p=C3=A9riode : ').td($p_end->input()));
-	 $html.=3Dtr(td(' Exercice : ').td($p_exercice->input()));
-	 $html.=3D'</table>';
-	 $html.=3DHtmlInput::submit('sauver','sauver');
-	 $html.=3DHtmlInput::button('close','Fermer','onclick=3D"removeDiv(\'mo=
d_periode\')"');
-	 $html.=3DHtmlInput::hidden('p_id',$_GET['p_id']);
-	 $html.=3D'</form>';
-	 break;
-       case 'save_per':
-	 $per=3Dnew Periode($cn,$_POST['p_id']);
-	 $per->load();
-	 if ( isDate($_POST['p_start']) =3D=3D null ||=20
-	      isDate($_POST['p_end'] =3D=3D null ) ||
-	      isNumber($_POST['p_exercice']) =3D=3D 0 ||
-	      $_POST['p_exercice'] > 2099 ||
-	      $_POST['p_exercice'] < 2000 )
-	   {
-	     $html=3D'';
-	     $html.=3DHtmlInput::anchor_close('mod_periode');
-	     $html.=3D'<h2 class=3D"info"> Modifier les dates de d=C3=A9but et =
fin de p=C3=A9riode</h2>';
-	     $html.=3D"<div class=3D\"error\">Erreur date invalide</div>";
+        $html.=3Dtr(td(' D=C3=A9but p=C3=A9riode : ') . td($p_start->inp=
ut()));
+        $html.=3Dtr(td(' Fin p=C3=A9riode : ') . td($p_end->input()));
+        $html.=3Dtr(td(' Exercice : ') . td($p_exercice->input()));
+        $html.=3D'</table>';
+        $html.=3DHtmlInput::submit('sauver', 'sauver');
+        $html.=3DHtmlInput::button('close', 'Fermer', 'onclick=3D"remove=
Div(\'mod_periode\')"');
+        $html.=3DHtmlInput::hidden('p_id', $_GET['p_id']);
+        $html.=3D'</form>';
+        break;
+    case 'save_per':
+        $per =3D new Periode($cn, $_POST['p_id']);
+        $per->load();
+        if (isDate($_POST['p_start']) =3D=3D null ||
+                isDate($_POST['p_end'] =3D=3D null) ||
+                isNumber($_POST['p_exercice']) =3D=3D 0 ||
+                $_POST['p_exercice'] > 2099 ||
+                $_POST['p_exercice'] < 2000)
+        {
+            $html =3D '';
+            $html.=3DHtmlInput::anchor_close('mod_periode');
+            $html.=3D'<h2 class=3D"info"> Modifier les dates de d=C3=A9b=
ut et fin de p=C3=A9riode</h2>';
+            $html.=3D"<div class=3D\"error\">Erreur date invalide</div>"=
;
=20
-	     $html.=3DHtmlInput::button('close','Fermer','onclick=3D"removeDiv(=
\'mod_periode\')"');
-	   }=20
-	 else=20
-	   {
-	     $sql=3D"update parm_periode set p_start=3Dto_date($1,'DD.MM.YYYY')=
,p_end=3Dto_date($2,'DD.MM.YYYY'),p_exercice=3D$3 where p_id=3D$4";
-	     try {
-	       $cn->exec_sql($sql,array($_POST['p_start'],$_POST['p_end'],$_POS=
T['p_exercice'],$_POST['p_id']));
-	       $html=3D'<h2 class=3D"info"> Modifier les dates de d=C3=A9but et=
 fin de p=C3=A9riode</h2>';
-	       $html.=3D'<h2 class=3D"notice"> Sauv=C3=A9 </h2>';
-	      =20
-	       $html.=3DHtmlInput::button('close','Fermer','onclick=3D"	refresh=
_window();"');
+            $html.=3DHtmlInput::button('close', 'Fermer', 'onclick=3D"re=
moveDiv(\'mod_periode\')"');
+        }
+        else
+        {
+            $sql =3D "update parm_periode set p_start=3Dto_date($1,'DD.M=
M.YYYY'),p_end=3Dto_date($2,'DD.MM.YYYY'),p_exercice=3D$3 where p_id=3D$4=
";
+            try
+            {
+                $cn->exec_sql($sql, array($_POST['p_start'], $_POST['p_e=
nd'], $_POST['p_exercice'], $_POST['p_id']));
+                $html =3D '<h2 class=3D"info"> Modifier les dates de d=C3=
=A9but et fin de p=C3=A9riode</h2>';
+                $html.=3D'<h2 class=3D"notice"> Sauv=C3=A9 </h2>';
=20
+                $html.=3DHtmlInput::button('close', 'Fermer', 'onclick=3D=
"	refresh_window();"');
+            }
+            catch (Exception $e)
+            {
+                $html =3D alert($e->getTrace(), true);
+            }
+        }
+        break;
+}
=20
-	     } catch (Exception $e) {
-	       $html=3Dalert($e->getTrace(),true);
-	     }
-	    =20
-	   }
-	 break;=20
-       }
-   }
-$html=3Descape_xml($html);
+$html =3D escape_xml($html);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo '<?xml version=3D"1.0" encoding=3D"UTF-8"?>';
 echo '<xml>';
-echo '<data>'.$html.'</data>';
+echo '<data>' . $html . '</data>';
 echo '</xml>';

Modified: phpcompta/trunk/include/modify_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/modify_predf_op.php	2011-11-14 09:30:00 UTC (=
rev 4347)
+++ phpcompta/trunk/include/modify_predf_op.php	2011-11-14 10:37:46 UTC (=
rev 4348)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,39 +16,33 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/*!\file
+/* !\file
  * \brief display a form to change the name of a predefined operation
  */
 ob_start();
-if ( $user->check_action(PARPREDE)=3D=3D0)
-  {
-    echo alert('Action interdite');
-  }
-else
-  {
-    echo HtmlInput::anchor_close('mod_predf_op');
-    echo h2info('Modification du nom');
-    echo '
+echo HtmlInput::anchor_close('mod_predf_op');
+echo h2info('Modification du nom');
+echo '
     <form method=3D"get" onsubmit=3D"save_predf_op(this);return false;">=
';
-    $name=3Dnew IText('predf_name');
-    $name->value=3D$cn->get_value('select od_name from op_predef where o=
d_id=3D$1',array($_GET['id']));
-    $name->size=3D60;
-    echo "Nom =3D".$name->input();
-    echo dossier::hidden().HtmlInput::hidden('od_id',$_GET['id']);
-    echo "<hr>";
-    echo HtmlInput::submit('save','Sauve');
-    echo HtmlInput::button('close','Annuler','onclick=3D"removeDiv(\'mod=
_predf_op\')"');
-    echo '</form>';
+$name =3D new IText('predf_name');
+$name->value =3D $cn->get_value('select od_name from op_predef where od_=
id=3D$1', array($_GET['id']));
+$name->size =3D 60;
+echo "Nom =3D" . $name->input();
+echo dossier::hidden() . HtmlInput::hidden('od_id', $_GET['id']);
+echo "<hr>";
+echo HtmlInput::submit('save', 'Sauve');
+echo HtmlInput::button('close', 'Annuler', 'onclick=3D"removeDiv(\'mod_p=
redf_op\')"');
+echo '</form>';
=20
-  }
-$html=3Dob_get_contents();
+
+$html =3D ob_get_contents();
 ob_clean();
-$html=3Descape_xml($html);
+$html =3D escape_xml($html);
=20
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: phpcompta/trunk/include/save_predf_op.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/save_predf_op.php	2011-11-14 09:30:00 UTC (re=
v 4347)
+++ phpcompta/trunk/include/save_predf_op.php	2011-11-14 10:37:46 UTC (re=
v 4348)
@@ -25,8 +25,6 @@
  * included from ajax_misc
  */
=20
-if ( $user->check_action(PARPREDE)=3D=3D0) exit();
-
 if ( trim($_GET['predf_name']) !=3D '')
   {
     $cn->exec_sql('update op_predef set od_name =3D$1 where od_id=3D$2',

Modified: phpcompta/trunk/include/stock.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.inc.php	2011-11-14 09:30:00 UTC (rev 43=
47)
+++ phpcompta/trunk/include/stock.inc.php	2011-11-14 10:37:46 UTC (rev 43=
48)
@@ -68,12 +68,6 @@
     }
     else
     {
-        // Check if User Can change the stock
-        if ( $g_user->check_action($gDossier,GESTOCK) =3D=3D 0 )
-        {
-            NoAccess();
-            exit (-1);
-        }
=20
         // if neg the stock decrease =3D> credit
         $type=3D( $change < 0 )?'c':'d';
@@ -132,7 +126,7 @@
     $sg_code=3D(isset ($_GET['sg_code'] ))?$_GET['sg_code']:$_POST['sg_c=
ode'];
     $year=3D(isset($_GET['year']))?$_GET['year']:$_POST['year'];
     $a=3DViewDetailStock($cn,$sg_code,$year);
-    $write=3D$g_user->check_action(STOWRITE);
+    $write=3D1;
=20
     $b=3D"";
=20



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

Author: danydb
Date: 2011-11-14 14:57:44 +0100 (Mon, 14 Nov 2011)
New Revision: 4349

Modified:
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/company.inc.php
Log:
Update security, add PARSTR
New function xml_error (for ajax_misc.php)


Modified: phpcompta/trunk/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_card.php	2011-11-14 10:37:46 UTC (rev 4348)
+++ phpcompta/trunk/html/ajax_card.php	2011-11-14 13:57:44 UTC (rev 4349)
@@ -96,6 +96,7 @@
     /* Remove a attribut */
     /* ------------------------------------------------------------ */
 case 'rmfa':
+    if ($user->check_action(FICCAT)=3D=3D0)exit();
         ob_start();
     if( ! isset($_GET['ad_id']) || isNumber($_GET['ad_id']) =3D=3D0)
         throw new Exception ( "Parametre ad_id est invalide",11);

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	2011-11-14 10:37:46 UTC (rev 4348)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-14 13:57:44 UTC (rev 4349)
@@ -71,7 +71,7 @@
 		break;
 	case "rm_stock":
 		require_once('constant.security.php');
-		if ($user->check_action(GESTOCK) =3D=3D 0)
+		if ($user->check_action(STOWRITE) =3D=3D 0)
 		{
 			exit();
 		}
@@ -263,6 +263,7 @@
 	case 'dl':
 		require_once('class_lettering.php');
 		$exercice =3D $user->get_exercice();
+                if ($user->check_module("LETTERCARD") =3D=3D 0 && $user-=
>check_module("LETTERACC") =3D=3D 0) exit();
 		$periode =3D new Periode($cn);
 		list($first_per, $last_per) =3D $periode->get_limit($exercice);
=20

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-14 10:37:46 UTC (rev 43=
48)
+++ phpcompta/trunk/include/ac_common.php	2011-11-14 13:57:44 UTC (rev 43=
49)
@@ -940,4 +940,17 @@
     }
     return $array;
 }
+function ajax_xml_error($p_code,$p_string)
+{
+    $html =3D escape_xml($p_string);
+    header('Content-type: text/xml; charset=3DUTF-8');
+		echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<code>$p_code</code>
+<value>$html</value>
+</data>
+EOF;
+}
+
 ?>

Modified: phpcompta/trunk/include/company.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/company.inc.php	2011-11-14 10:37:46 UTC (rev =
4348)
+++ phpcompta/trunk/include/company.inc.php	2011-11-14 13:57:44 UTC (rev =
4349)
@@ -18,7 +18,7 @@
         $m->MY_CHECK_PERIODE=3D$p_check_periode;
         $m->MY_DATE_SUGGEST=3D$p_date_suggest;
         $m->MY_ANALYTIC=3D$p_compta;
-         $m->MY_STRICT=3D$p_strict;
+        if ( $g_user->check_action(PARSTR)!=3D0) $m->MY_STRICT=3D$p_stri=
ct;
         $m->MY_TVA_USE=3D$p_tva_use;
         $m->MY_PJ_SUGGEST=3D$p_pj;
 	$m->MY_ALPHANUM=3D$p_alphanum;
@@ -94,6 +94,7 @@
     $all->value=3D'';
     echo "<tr>".td(_("Num=C3=A9ro de Tva"),'style=3D"text-align:right"')=
.$all->input("p_tva",$my->MY_TVA)."</tr>";
     echo "<tr>".td(_("Utilisation de la compta. analytique"),'style=3D"t=
ext-align:right"').$compta->input("p_compta",$array)."</tr>";
+    if ( $g_user->check_action(PARSTR)=3D=3D0) $strict->setReadonly(true=
);
     echo "<tr>".td(_("Utilisation du mode strict "),'style=3D"text-align=
:right"').$strict->input("p_strict",$strict_array)."</tr>";
     echo "<tr>".td(_("Assujetti =C3=A0 la tva"),'style=3D"text-align:rig=
ht"').$tva_use->input("p_tva_use",$strict_array)."</tr>";
     echo "<tr>".td(_("Sugg=C3=A9rer le num=C3=A9ro de pi=C3=A8ce justifi=
cative"),'style=3D"text-align:right"').$pj_suggest->input("p_pj",$strict_=
array)."</tr>";



From MAILER-DAEMON Mon Nov 14 09:33:12 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPxay-00033U-KI
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Nov 2011 09:33:12 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Nov 2011 15:38:49 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.14786.1321281192.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4350 - 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 Nov 2011 14:33:12 -0000

Author: danydb
Date: 2011-11-14 15:38:47 +0100 (Mon, 14 Nov 2011)
New Revision: 4350

Modified:
   phpcompta/trunk/sql/account-update.sql
   phpcompta/trunk/sql/account_add.sql
   phpcompta/trunk/sql/account_alphanum.sql
   phpcompta/trunk/sql/account_compute.sql
   phpcompta/trunk/sql/account_insert.sql
   phpcompta/trunk/sql/backup-new-object.sh
   phpcompta/trunk/sql/format_account.sql
   phpcompta/trunk/sql/object-6.0.sql
   phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql
   phpcompta/trunk/sql/tmp_pcmn_ins.sql
   phpcompta/trunk/sql/upgrade.sql
Log:
sql scripts : remove owner

Modified: phpcompta/trunk/sql/account-update.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/account-update.sql	2011-11-14 13:57:44 UTC (rev 4=
349)
+++ phpcompta/trunk/sql/account-update.sql	2011-11-14 14:38:47 UTC (rev 4=
350)
@@ -52,4 +52,3 @@
 $BODY$
   LANGUAGE plpgsql VOLATILE
   COST 100;
-ALTER FUNCTION comptaproc.account_update(integer, account_type) OWNER TO=
 dany;

Modified: phpcompta/trunk/sql/account_add.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/account_add.sql	2011-11-14 13:57:44 UTC (rev 4349=
)
+++ phpcompta/trunk/sql/account_add.sql	2011-11-14 14:38:47 UTC (rev 4350=
)
@@ -22,4 +22,3 @@
 $BODY$
   LANGUAGE plpgsql VOLATILE
   COST 100;
-ALTER FUNCTION comptaproc.account_add(account_type, character varying) O=
WNER TO dany;

Modified: phpcompta/trunk/sql/account_alphanum.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/account_alphanum.sql	2011-11-14 13:57:44 UTC (rev=
 4349)
+++ phpcompta/trunk/sql/account_alphanum.sql	2011-11-14 14:38:47 UTC (rev=
 4350)
@@ -18,4 +18,3 @@
 $BODY$
   LANGUAGE plpgsql VOLATILE
   COST 100;
-ALTER FUNCTION comptaproc.account_auto(integer) OWNER TO dany;

Modified: phpcompta/trunk/sql/account_compute.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/account_compute.sql	2011-11-14 13:57:44 UTC (rev =
4349)
+++ phpcompta/trunk/sql/account_compute.sql	2011-11-14 14:38:47 UTC (rev =
4350)
@@ -46,4 +46,3 @@
 $BODY$
   LANGUAGE plpgsql VOLATILE
   COST 100;
-ALTER FUNCTION comptaproc.account_compute(integer) OWNER TO dany;

Modified: phpcompta/trunk/sql/account_insert.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/account_insert.sql	2011-11-14 13:57:44 UTC (rev 4=
349)
+++ phpcompta/trunk/sql/account_insert.sql	2011-11-14 14:38:47 UTC (rev 4=
350)
@@ -87,4 +87,3 @@
 $BODY$
   LANGUAGE plpgsql VOLATILE
   COST 100;
-ALTER FUNCTION comptaproc.account_insert(integer, text) OWNER TO dany;

Modified: phpcompta/trunk/sql/backup-new-object.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/backup-new-object.sh	2011-11-14 13:57:44 UTC (rev=
 4349)
+++ phpcompta/trunk/sql/backup-new-object.sh	2011-11-14 14:38:47 UTC (rev=
 4350)
@@ -1 +1 @@
-pg_dump testdossier82 --inserts -t profile -t menu_ref -t profile_menu -=
t profile_user -t profile_menu_type -t v_all_menu > object-6.0.sql
+pg_dump testdossier82 -no-owner --inserts -t profile -t menu_ref -t prof=
ile_menu -t profile_user -t profile_menu_type -t v_all_menu > object-6.0.=
sql

Modified: phpcompta/trunk/sql/format_account.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/format_account.sql	2011-11-14 13:57:44 UTC (rev 4=
349)
+++ phpcompta/trunk/sql/format_account.sql	2011-11-14 14:38:47 UTC (rev 4=
350)
@@ -25,7 +25,7 @@
 end;$BODY$
   LANGUAGE plpgsql VOLATILE
   COST 100;
-ALTER FUNCTION comptaproc.format_account(account_type) OWNER TO dany;
+
 COMMENT ON FUNCTION comptaproc.format_account(account_type) IS 'format t=
he accounting :
 - upper case
 - remove space and special char.

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-14 13:57:44 UTC (rev 4349)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-14 14:38:47 UTC (rev 4350)
@@ -16,7 +16,6 @@
 SET default_with_oids =3D false;
=20
 --
--- Name: menu_ref; Type: TABLE; Schema: public; Owner: dany; Tablespace:=
=20
 --
=20
 CREATE TABLE menu_ref (
@@ -31,38 +30,32 @@
 );
=20
=20
-ALTER TABLE public.menu_ref OWNER TO dany;
=20
 --
--- Name: COLUMN menu_ref.me_code; Type: COMMENT; Schema: public; Owner: =
dany
 --
=20
 COMMENT ON COLUMN menu_ref.me_code IS 'Menu Code ';
=20
=20
 --
--- Name: COLUMN menu_ref.me_menu; Type: COMMENT; Schema: public; Owner: =
dany
 --
=20
 COMMENT ON COLUMN menu_ref.me_menu IS 'Label to display';
=20
=20
 --
--- Name: COLUMN menu_ref.me_file; Type: COMMENT; Schema: public; Owner: =
dany
 --
=20
 COMMENT ON COLUMN menu_ref.me_file IS 'if not empty file to include';
=20
=20
 --
--- Name: COLUMN menu_ref.me_url; Type: COMMENT; Schema: public; Owner: d=
any
 --
=20
 COMMENT ON COLUMN menu_ref.me_url IS 'url ';
=20
=20
 --
--- Name: COLUMN menu_ref.me_type; Type: COMMENT; Schema: public; Owner: =
dany
 --
=20
 COMMENT ON COLUMN menu_ref.me_type IS 'ME for menu
@@ -72,7 +65,6 @@
=20
=20
 --
--- Name: profile; Type: TABLE; Schema: public; Owner: dany; Tablespace:=20
 --
=20
 CREATE TABLE profile (
@@ -84,45 +76,38 @@
 );
=20
=20
-ALTER TABLE public.profile OWNER TO dany;
=20
 --
--- Name: TABLE profile; Type: COMMENT; Schema: public; Owner: dany
 --
=20
 COMMENT ON TABLE profile IS 'Available profile ';
=20
=20
 --
--- Name: COLUMN profile.p_name; Type: COMMENT; Schema: public; Owner: da=
ny
 --
=20
 COMMENT ON COLUMN profile.p_name IS 'Name of the profile';
=20
=20
 --
--- Name: COLUMN profile.p_desc; Type: COMMENT; Schema: public; Owner: da=
ny
 --
=20
 COMMENT ON COLUMN profile.p_desc IS 'description of the profile';
=20
=20
 --
--- Name: COLUMN profile.with_calc; Type: COMMENT; Schema: public; Owner:=
 dany
 --
=20
 COMMENT ON COLUMN profile.with_calc IS 'show the calculator';
=20
=20
 --
--- Name: COLUMN profile.with_direct_form; Type: COMMENT; Schema: public;=
 Owner: dany
 --
=20
 COMMENT ON COLUMN profile.with_direct_form IS 'show the direct form';
=20
=20
 --
--- Name: profile_menu; Type: TABLE; Schema: public; Owner: dany; Tablesp=
ace:=20
 --
=20
 CREATE TABLE profile_menu (
@@ -136,38 +121,32 @@
 );
=20
=20
-ALTER TABLE public.profile_menu OWNER TO dany;
=20
 --
--- Name: TABLE profile_menu; Type: COMMENT; Schema: public; Owner: dany
 --
=20
 COMMENT ON TABLE profile_menu IS 'Join  between the profile and the menu=
 ';
=20
=20
 --
--- Name: COLUMN profile_menu.me_code_dep; Type: COMMENT; Schema: public;=
 Owner: dany
 --
=20
 COMMENT ON COLUMN profile_menu.me_code_dep IS 'menu code dependency';
=20
=20
 --
--- Name: COLUMN profile_menu.p_id; Type: COMMENT; Schema: public; Owner:=
 dany
 --
=20
 COMMENT ON COLUMN profile_menu.p_id IS 'link to profile';
=20
=20
 --
--- Name: COLUMN profile_menu.p_order; Type: COMMENT; Schema: public; Own=
er: dany
 --
=20
 COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu';
=20
=20
 --
--- Name: COLUMN profile_menu.p_type_display; Type: COMMENT; Schema: publ=
ic; Owner: dany
 --
=20
 COMMENT ON COLUMN profile_menu.p_type_display IS 'M is a module
@@ -176,7 +155,6 @@
=20
=20
 --
--- Name: profile_menu_pm_id_seq; Type: SEQUENCE; Schema: public; Owner: =
dany
 --
=20
 CREATE SEQUENCE profile_menu_pm_id_seq
@@ -187,24 +165,20 @@
     CACHE 1;
=20
=20
-ALTER TABLE public.profile_menu_pm_id_seq OWNER TO dany;
=20
 --
--- Name: profile_menu_pm_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: dany
 --
=20
 ALTER SEQUENCE profile_menu_pm_id_seq OWNED BY profile_menu.pm_id;
=20
=20
 --
--- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
 SELECT pg_catalog.setval('profile_menu_pm_id_seq', 647, true);
=20
=20
 --
--- Name: profile_menu_type; Type: TABLE; Schema: public; Owner: dany; Ta=
blespace:=20
 --
=20
 CREATE TABLE profile_menu_type (
@@ -213,10 +187,8 @@
 );
=20
=20
-ALTER TABLE public.profile_menu_type OWNER TO dany;
=20
 --
--- Name: profile_p_id_seq; Type: SEQUENCE; Schema: public; Owner: dany
 --
=20
 CREATE SEQUENCE profile_p_id_seq
@@ -227,24 +199,20 @@
     CACHE 1;
=20
=20
-ALTER TABLE public.profile_p_id_seq OWNER TO dany;
=20
 --
--- Name: profile_p_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owne=
r: dany
 --
=20
 ALTER SEQUENCE profile_p_id_seq OWNED BY profile.p_id;
=20
=20
 --
--- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: da=
ny
 --
=20
 SELECT pg_catalog.setval('profile_p_id_seq', 10, true);
=20
=20
 --
--- Name: profile_user; Type: TABLE; Schema: public; Owner: dany; Tablesp=
ace:=20
 --
=20
 CREATE TABLE profile_user (
@@ -254,31 +222,26 @@
 );
=20
=20
-ALTER TABLE public.profile_user OWNER TO dany;
=20
 --
--- Name: TABLE profile_user; Type: COMMENT; Schema: public; Owner: dany
 --
=20
 COMMENT ON TABLE profile_user IS 'Contains the available profile for use=
rs';
=20
=20
 --
--- Name: COLUMN profile_user.user_name; Type: COMMENT; Schema: public; O=
wner: dany
 --
=20
 COMMENT ON COLUMN profile_user.user_name IS 'fk to available_user : logi=
n';
=20
=20
 --
--- Name: COLUMN profile_user.p_id; Type: COMMENT; Schema: public; Owner:=
 dany
 --
=20
 COMMENT ON COLUMN profile_user.p_id IS 'fk to profile';
=20
=20
 --
--- Name: profile_user_pu_id_seq; Type: SEQUENCE; Schema: public; Owner: =
dany
 --
=20
 CREATE SEQUENCE profile_user_pu_id_seq
@@ -289,55 +252,46 @@
     CACHE 1;
=20
=20
-ALTER TABLE public.profile_user_pu_id_seq OWNER TO dany;
=20
 --
--- Name: profile_user_pu_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: dany
 --
=20
 ALTER SEQUENCE profile_user_pu_id_seq OWNED BY profile_user.pu_id;
=20
=20
 --
--- Name: profile_user_pu_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: dany
 --
=20
 SELECT pg_catalog.setval('profile_user_pu_id_seq', 5, true);
=20
=20
 --
--- Name: v_all_menu; Type: VIEW; Schema: public; Owner: dany
 --
=20
 CREATE VIEW v_all_menu AS
     SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript, mr.me_type FROM (((profi=
le_menu pm JOIN profile_user pu ON ((pu.p_id =3D pm.p_id))) JOIN profile =
p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr USING (me_code)) ORDER BY p=
m.p_order;
=20
=20
-ALTER TABLE public.v_all_menu OWNER TO dany;
=20
 --
--- Name: p_id; Type: DEFAULT; Schema: public; Owner: dany
 --
=20
 ALTER TABLE profile ALTER COLUMN p_id SET DEFAULT nextval('profile_p_id_=
seq'::regclass);
=20
=20
 --
--- Name: pm_id; Type: DEFAULT; Schema: public; Owner: dany
 --
=20
 ALTER TABLE profile_menu ALTER COLUMN pm_id SET DEFAULT nextval('profile=
_menu_pm_id_seq'::regclass);
=20
=20
 --
--- Name: pu_id; Type: DEFAULT; Schema: public; Owner: dany
 --
=20
 ALTER TABLE profile_user ALTER COLUMN pu_id SET DEFAULT nextval('profile=
_user_pu_id_seq'::regclass);
=20
=20
 --
--- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan=
y
 --
=20
 INSERT INTO menu_ref VALUES ('IMPCARD', 'Import Fiche', 'import_card/ind=
ex.php', NULL, 'Importation de fiches', 'plugin_code=3DIMPCARD', NULL, 'P=
L');
@@ -457,7 +411,6 @@
=20
=20
 --
--- Data for Name: profile; Type: TABLE DATA; Schema: public; Owner: dany
 --
=20
 INSERT INTO profile VALUES ('Administrateur', 1, 'Profil par d=C3=A9faut=
 pour les adminstrateurs', true, true);
@@ -465,7 +418,6 @@
=20
=20
 --
--- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 dany
 --
=20
 INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', NULL);
@@ -685,7 +637,6 @@
=20
=20
 --
--- Data for Name: profile_menu_type; Type: TABLE DATA; Schema: public; O=
wner: dany
 --
=20
 INSERT INTO profile_menu_type VALUES ('P', 'Impression');
@@ -695,7 +646,6 @@
=20
=20
 --
--- Data for Name: profile_user; Type: TABLE DATA; Schema: public; Owner:=
 dany
 --
=20
 INSERT INTO profile_user VALUES ('phpcompta', 1, 1);
@@ -704,7 +654,6 @@
=20
=20
 --
--- Name: menu_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; T=
ablespace:=20
 --
=20
 ALTER TABLE ONLY menu_ref
@@ -712,7 +661,6 @@
=20
=20
 --
--- Name: profile_menu_pkey; Type: CONSTRAINT; Schema: public; Owner: dan=
y; Tablespace:=20
 --
=20
 ALTER TABLE ONLY profile_menu
@@ -720,7 +668,6 @@
=20
=20
 --
--- Name: profile_menu_type_pkey; Type: CONSTRAINT; Schema: public; Owner=
: dany; Tablespace:=20
 --
=20
 ALTER TABLE ONLY profile_menu_type
@@ -728,7 +675,6 @@
=20
=20
 --
--- Name: profile_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; Ta=
blespace:=20
 --
=20
 ALTER TABLE ONLY profile
@@ -736,7 +682,6 @@
=20
=20
 --
--- Name: profile_user_pkey; Type: CONSTRAINT; Schema: public; Owner: dan=
y; Tablespace:=20
 --
=20
 ALTER TABLE ONLY profile_user
@@ -744,7 +689,6 @@
=20
=20
 --
--- Name: profile_user_user_name_key; Type: CONSTRAINT; Schema: public; O=
wner: dany; Tablespace:=20
 --
=20
 ALTER TABLE ONLY profile_user
@@ -752,28 +696,24 @@
=20
=20
 --
--- Name: fki_profile_menu_me_code; Type: INDEX; Schema: public; Owner: d=
any; Tablespace:=20
 --
=20
 CREATE INDEX fki_profile_menu_me_code ON profile_menu USING btree (me_co=
de);
=20
=20
 --
--- Name: fki_profile_menu_profile; Type: INDEX; Schema: public; Owner: d=
any; Tablespace:=20
 --
=20
 CREATE INDEX fki_profile_menu_profile ON profile_menu USING btree (p_id)=
;
=20
=20
 --
--- Name: fki_profile_menu_type_fkey; Type: INDEX; Schema: public; Owner:=
 dany; Tablespace:=20
 --
=20
 CREATE INDEX fki_profile_menu_type_fkey ON profile_menu USING btree (p_t=
ype_display);
=20
=20
 --
--- Name: profile_menu_me_code_fkey; Type: FK CONSTRAINT; Schema: public;=
 Owner: dany
 --
=20
 ALTER TABLE ONLY profile_menu
@@ -781,7 +721,6 @@
=20
=20
 --
--- Name: profile_menu_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: dany
 --
=20
 ALTER TABLE ONLY profile_menu
@@ -789,7 +728,6 @@
=20
=20
 --
--- Name: profile_menu_type_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: dany
 --
=20
 ALTER TABLE ONLY profile_menu
@@ -797,7 +735,6 @@
=20
=20
 --
--- Name: profile_user_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: dany
 --
=20
 ALTER TABLE ONLY profile_user

Modified: phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.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/tmp_pcmn_alphanum_ins_upd.sql	2011-11-14 13:57:44=
 UTC (rev 4349)
+++ phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql	2011-11-14 14:38:47=
 UTC (rev 4350)
@@ -13,4 +13,3 @@
 $BODY$
   LANGUAGE plpgsql VOLATILE
   COST 100;
-ALTER FUNCTION comptaproc.tmp_pcmn_ins() OWNER TO dany;

Modified: phpcompta/trunk/sql/tmp_pcmn_ins.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/tmp_pcmn_ins.sql	2011-11-14 13:57:44 UTC (rev 434=
9)
+++ phpcompta/trunk/sql/tmp_pcmn_ins.sql	2011-11-14 14:38:47 UTC (rev 435=
0)
@@ -18,4 +18,3 @@
 $BODY$
   LANGUAGE plpgsql VOLATILE
   COST 100;
-ALTER FUNCTION comptaproc.tmp_pcmn_ins() OWNER TO dany;

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	2011-11-14 13:57:44 UTC (rev 4349)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-14 14:38:47 UTC (rev 4350)
@@ -24,8 +24,8 @@
 \i extension.sql
 \i ajax-direct-form.sql
 -- for account repository
-\i change_account_repo.sql
-\i style-epad.sql
+-- \i change_account_repo.sql
+-- \i style-epad.sql
=20
 create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
 commit;



From MAILER-DAEMON Mon Nov 14 15:24:06 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQ34Y-0004UF-4v
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Nov 2011 15:24:06 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Nov 2011 21:29:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.15588.1321302245.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r190 - in trunk: amortis amortis/include importbank
	importbank/include importbank/include/template modop skel
	tool_pcmn tools tools/include tools/include/template tva
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Nov 2011 20:24:05 -0000

Author: danydb
Date: 2011-11-14 21:29:38 +0100 (Mon, 14 Nov 2011)
New Revision: 190

Modified:
   trunk/amortis/amortize_javascript.js
   trunk/amortis/include/class_am_generate.php
   trunk/importbank/bank_js.js
   trunk/importbank/include/class_bank_item.php
   trunk/importbank/include/class_import_bank.php
   trunk/importbank/include/import_bank.php
   trunk/importbank/include/template/show_field.php
   trunk/importbank/include/template/show_list.php
   trunk/importbank/index.php
   trunk/modop/class_modop_operation.php
   trunk/modop/index.php
   trunk/modop/modop_display.php
   trunk/skel/skel_javascript.js
   trunk/tool_pcmn/index.php
   trunk/tools/include/operation.inc.php
   trunk/tools/include/template/numbering.php
   trunk/tools/include/template/search_view.php
   trunk/tools/index.php
   trunk/tva/ajax.php
   trunk/tva/index.php
   trunk/tva/js_scripts.js
Log:
adapt?\195?\169 ?\195?\160 version 6.0

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	2011-11-14 10:28:44 UTC (rev 189=
)
+++ trunk/amortis/amortize_javascript.js	2011-11-14 20:29:38 UTC (rev 190=
)
@@ -29,7 +29,7 @@
      }
     var str_style=3D"top:"+sx+";width:50%;height:70%";
=20
-    var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load=
ing()};
+    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing()};
=20
     add_div(div);
=20
@@ -62,7 +62,7 @@
      }
     var str_style=3D"top:"+sx+";width:50%;height:auto";
=20
-    var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load=
ing()};
+    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing()};
=20
     add_div(div);
=20

Modified: trunk/amortis/include/class_am_generate.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/class_am_generate.php	2011-11-14 10:28:44 UTC (=
rev 189)
+++ trunk/amortis/include/class_am_generate.php	2011-11-14 20:29:38 UTC (=
rev 190)
@@ -78,7 +78,7 @@
   'p_year' =3D> string '' (length=3D0)
   'p_jrn' =3D> string '4' (length=3D1)
   'p_date' =3D> string '' (length=3D0)
-  'a_id' =3D>=20
+  'a_id' =3D>
     array
       0 =3D> string '86' (length=3D2)
       1 =3D> string '85' (length=3D2)
@@ -92,7 +92,7 @@
     $msg=3D'';
     if ( isNumber($p_array['p_year']) =3D=3D 0 || $p_array['p_year'] < 1=
900 || $p_array['p_year']>2100) $msg=3D"Ann=C3=A9e invalide\n";
     if ( isDate($p_array['p_date']) =3D=3D null) $msg.=3D"Date invalide =
";
-    if ( $msg !=3D '')=20
+    if ( $msg !=3D '')
       {
 	echo alert($msg);
 	return false;
@@ -112,7 +112,7 @@
       {
 	if ( isset ($p_array['p_ck'.$i]))
 	  {
-	=20
+
 	    /*
 	     * If selected the add it to array
 	     */
@@ -134,15 +134,15 @@
 		       'ld'.$idx =3D>'Amortissement '.$fiche->strAttribut(ATTR_DEF_QUI=
CKCODE),
 		       'qc_'.$idx=3D>'');
 	    $array+=3D$mat;
-	    $idx++;	      =20
+	    $idx++;
 	  }
       }
     $array+=3Darray('nb_item'=3D>$idx);
     $ledger=3Dnew Acc_Ledger($cn,$p_array['p_jrn']);
-    $ledger->with_concerned=3Dfalse;   =20
+    $ledger->with_concerned=3Dfalse;
     echo '<div style=3D"width:80%;margin-left:10%">';
     echo '<form method=3D"POST" style=3D"display:inline">';
-    echo $ledger->show_form($array,true);
+    echo $ledger->input($array,true);
     echo HtmlInput::submit('save','Sauver');
     echo HtmlInput::hidden('sa',$p_array['sa']);
     echo HtmlInput::hidden('sb',$p_array['sb']);
@@ -178,7 +178,7 @@
     echo HtmlInput::submit('correct','Corriger');
     echo '</form>';
     echo '</div>';
-    return true;		=20
+    return true;
   }
   /**
    * save into amortissement_histo
@@ -190,7 +190,7 @@
   'p_year' =3D> string '' (length=3D0)
   'p_jrn' =3D> string '4' (length=3D1)
   'p_date' =3D> string '' (length=3D0)
-  'a_id' =3D>=20
+  'a_id' =3D>
     array
       0 =3D> string '86' (length=3D2)
       1 =3D> string '85' (length=3D2)

Modified: trunk/importbank/bank_js.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/importbank/bank_js.js	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/importbank/bank_js.js	2011-11-14 20:29:38 UTC (rev 190)
@@ -1,7 +1,7 @@
 function reconcilie(target,dossier_id,p_id,plugin_code)
 {
-    var qs=3D"?gDossier=3D"+dossier_id+'&plugin_code=3D'+plugin_code+'&a=
ct=3Dshow&id=3D'+p_id+'&ctl=3D'+target;
-   =20
+    var qs=3D"gDossier=3D"+dossier_id+'&plugin_code=3D'+plugin_code+'&ac=
t=3Dshow&id=3D'+p_id+'&ctl=3D'+target;
+
     var action=3Dnew Ajax.Request ( 'ajax.php',
 				  {
 				      method:'get',
@@ -10,12 +10,12 @@
 				      onSuccess:success_box
 				  }
 				);
-    if ( $(target))=20
+    if ( $(target))
     {
 	removeDiv(target);
     }
     var sx=3D0;
-    var height=3D0;=20
+    var height=3D0;
     if ( window.scrollY)
     {
         sx=3Dwindow.scrollY+height;
@@ -26,8 +26,8 @@
      }
     var str_style=3D"top:"+sx+";margin-left:10%;";
=20
-    var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load=
ing(),drag:1};
-   =20
+    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
+
     add_div(div);
 }
=20
@@ -41,7 +41,7 @@
 				      onFailure:error_box,
 				      onSuccess:success_bank_info
 				  });
-   =20
+
     return false;
 }
=20
@@ -60,4 +60,4 @@
     catch(e) {
 	alert('Erreur success_box_info '+e.message);
     }
-}=09
\ No newline at end of file
+}
\ No newline at end of file

Modified: trunk/importbank/include/class_bank_item.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/class_bank_item.php	2011-11-14 10:28:44 UTC =
(rev 189)
+++ trunk/importbank/include/class_bank_item.php	2011-11-14 20:29:38 UTC =
(rev 190)
@@ -53,12 +53,12 @@
 	$w->set_attribute('label','e_third');
 	$w->set_attribute('typecard','deb');
 	$w->set_callback('filter_card');
-	$w->set_function('fill_data');=20
+	$w->set_function('fill_data');
 	$w->set_attribute('inp','fiche');
=20
 	$wConcerned=3Dnew IConcerned();
 	$wConcerned->name=3D"e_concerned".$id;
-	$wConcerned->extra=3Dabs($bi->amount);
+	$wConcerned->amount_id=3Dabs($bi->amount);
 	$wConcerned->extra2=3D'paid';
 	$wConcerned->label=3D_('op. concern=C3=A9e');
 	$wConcerned->table=3D0;

Modified: trunk/importbank/include/class_import_bank.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/class_import_bank.php	2011-11-14 10:28:44 UT=
C (rev 189)
+++ trunk/importbank/include/class_import_bank.php	2011-11-14 20:29:38 UT=
C (rev 190)
@@ -91,7 +91,8 @@
 				from importbank.import as a
 				join importbank.format_bank as b on (format_bank_id=3Db.id)
 				order by i_date desc');
-    $link=3D'?'.Dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'=
].'&sb=3Dlist&sa=3D'.$_REQUEST['sa'];
+    $link=3D'?'.Dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'=
].
+			'&sb=3Dlist&sa=3D'.$_REQUEST['sa']."&ac=3D".$_REQUEST['ac'];
=20
     $status=3D$cn->prepare('status','select count(*) from importbank.tem=
p_bank where import_id=3D$1  and status=3D$2');
=20
@@ -174,11 +175,11 @@
=20
   }
   /**
-   * return the HTML style for the status=20
+   * return the HTML style for the status
    * White : new
    * green : transfered
    * red  : error
-   */=20
+   */
   static function color_status($id)
   {
     $style=3D"";
@@ -214,7 +215,7 @@
   }
   /**
    *@brief import row marked to transfer and from the specific import to
-   * the database=20
+   * the database
    *@param $p_array
    */
   static function transfer_record($p_array)
@@ -255,7 +256,7 @@
=20
 	    if ( $row->f_id =3D=3D null || $row->f_id=3D=3D'')
 	      {
-		// error=20
+		// error
 		self::transfert_error($row->id,'Aucune fiche donn=C3=A9e');
 		continue;
 	      }
@@ -268,13 +269,13 @@
             // V=C3=A9rification que le poste comptable trouv=C3=A9 exis=
te
             if ( $poste_comptable =3D=3D NOTFOUND || strlen(trim($poste_=
comptable))=3D=3D0)
 	      {
-		// error=20
+		// error
 		self::transfert_error($row->id,'Poste comptable de la  fiche est incor=
recte');
 		continue;
 	      }
 	    if ( self::check_date ($row->tp_date) =3D=3D false)
 	      {
-		// error=20
+		// error
 		self::transfert_error($row->id,'Date hors des limites');
 		continue;
 	      }
@@ -355,9 +356,9 @@
 		  array('E',$message,$id));
   }
   /**
-   * check=20
+   * check
    * if the date is outside the defined periode
-   */=20
+   */
   function check_date($p_date)
   {
     global $cn;
@@ -388,6 +389,6 @@
 	$err=3D$e->getMessage();
 	return $err;
       }
-  =20
+
   }
 }
\ No newline at end of file

Modified: trunk/importbank/include/import_bank.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/import_bank.php	2011-11-14 10:28:44 UTC (rev=
 189)
+++ trunk/importbank/include/import_bank.php	2011-11-14 20:29:38 UTC (rev=
 190)
@@ -2,7 +2,7 @@
 /*
  * Step 1/4
  */
-if ( ! isset ($_REQUEST ['sb']))=20
+if ( ! isset ($_REQUEST ['sb']))
   {
     echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
     echo '<form method=3D"get">';
@@ -12,7 +12,7 @@
     $iselect->value[]=3D$new;
     require_once('template/import_new.php');
     echo HtmlInput::submit('select_submit','Valider');
-    echo HtmlInput::get_to_hidden(array('gDossier','plugin_code','sa'));
+    echo HtmlInput::get_to_hidden(array('gDossier','plugin_code','sa','a=
c'));
     echo HtmlInput::hidden('sb','select_form');
     echo '</form>';
     echo '</div>';
@@ -27,30 +27,30 @@
 $jrn_def->value=3D$cn->make_array('select jrn_def_id,jrn_def_name from j=
rn_def where '.$user->get_ledger_sql('FIN',3).' order by jrn_def_name');
 $sep_decimal=3Dnew ISelect('sep_dec');
 $sep_decimal->value=3D$adecimal;
-   =20
+
 $sep_thousand=3Dnew ISelect('sep_thous');
 $sep_thousand->value=3D$athousand;
-   =20
+
 $sep_field=3Dnew ISelect('sep_field');
 $sep_field->value=3D$aseparator;
=20
 $col_valid=3Dnew INum('col_valid');
-   =20
+
 $format_date=3Dnew ISelect('format_date');
 $format_date->value=3D$aformat_date;
-   =20
+
 $file=3Dnew IFile('import_file');
 $skip=3Dnew INum('skip');
 $skip->value=3D0;
 $skip->size=3D5;
=20
-$nb_col=3Dnew INum('nb_col');   =20
+$nb_col=3Dnew INum('nb_col');
 /*
  * Step 2 : show the selected format and upload the file
  */
 if ( $_REQUEST ['sb'] =3D=3D 'select_form')
   {
-   =20
+
     if ( $_GET['format'] !=3D '0')
       {
 	$format_bank=3Dnew Format_Bank_Sql($cn,$_GET['format']);
@@ -135,7 +135,7 @@
 	$nb_col->value=3D$_POST['nb_col'];
 	$skip->value=3D$_POST['skip'];
=20
-=09
+
 	$filename=3D$_POST['filename'];
=20
 	$fbank=3Dfopen($filename,'r');
@@ -155,7 +155,7 @@
 	    $pos_extra=3D$format_bank->pos_extra;
=20
 	  }
-=20
+
 	echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
 	$sb=3D'confirm';
 	require_once ('template/confirm_transfer.php');

Modified: trunk/importbank/include/template/show_field.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/show_field.php	2011-11-14 10:28:44 =
UTC (rev 189)
+++ trunk/importbank/include/template/show_field.php	2011-11-14 20:29:38 =
UTC (rev 190)
@@ -1,6 +1,6 @@
 <h2>Etape 2 / 4: introduire le fichier</h2>
=20
-<form method=3D"POST"   enctype=3D"multipart/form-data" action=3D"extens=
ion.php">
+<form method=3D"POST"   enctype=3D"multipart/form-data" >
 <table>
 <tr>
 	<td>
@@ -77,7 +77,7 @@
=20
 Fichier =C3=A0 importer <?=3D$file->input()?>
=20
-<?=20
+<?
 echo HtmlInput::submit('input_file','Valider');
 echo HtmlInput::get_to_hidden(array('format','gDossier','sa','plugin_cod=
e','format'));
 echo HtmlInput::hidden('sb',$sb);

Modified: trunk/importbank/include/template/show_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	2011-11-14 10:28:44 U=
TC (rev 189)
+++ trunk/importbank/include/template/show_list.php	2011-11-14 20:29:38 U=
TC (rev 190)
@@ -1,11 +1,11 @@
 <form method=3D"get">
=20
 Filtrer : <?=3D$filter->input()?>
-<?=3DHtmlInput::request_to_hidden(array('gDossier','plugin_code','sb','s=
a','id'))?>
+<?=3DHtmlInput::request_to_hidden(array('gDossier','plugin_code','ac','s=
b','sa','id'))?>
 <?=3DHtmlInput::submit('refresh','Recharger')?>
 </form>
 <form method=3D"get" onsubmit=3D"return confirm ('Vous confirmez ?')">
-<?=3DHtmlInput::request_to_hidden(array('gDossier','plugin_code','sb','s=
a','id',$filter->name))?>
+<?=3DHtmlInput::request_to_hidden(array('gDossier','plugin_code','ac','s=
b','sa','id',$filter->name))?>
 <?=3DHtmlInput::submit('delete_record','Effacer')?>
 <?=3DHtmlInput::submit('transfer_record','Transf=C3=A8rer')?>
 </form>
@@ -70,7 +70,7 @@
=20
 </table>
 <form method=3D"get" onsubmit=3D"return confirm ('Vous confirmez?')">
-<?=3DHtmlInput::request_to_hidden(array('gDossier','plugin_code','sb','s=
a','id',$filter->name))?>
+<?=3DHtmlInput::request_to_hidden(array('gDossier','plugin_code','ac','s=
b','sa','id',$filter->name))?>
 <?=3DHtmlInput::submit('delete_record','Effacer')?>
 <?=3DHtmlInput::submit('transfer_record','Transf=C3=A8rer')?>
 </form>

Modified: trunk/importbank/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/importbank/index.php	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/importbank/index.php	2011-11-14 20:29:38 UTC (rev 190)
@@ -45,7 +45,7 @@
  */
 global $cn;
=20
-$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'];
+$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];
=20
 $array=3Darray (
 	array($url.'&sa=3Dimport',_('Importation'),_('Importation de nouveaux f=
ichiers'),1),
@@ -119,7 +119,7 @@
       }
=20
     /*
-     * Show all the import=20
+     * Show all the import
      */
     if ( ! isset($_REQUEST['sb']))
       {

Modified: trunk/modop/class_modop_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/class_modop_operation.php	2011-11-14 10:28:44 UTC (rev 18=
9)
+++ trunk/modop/class_modop_operation.php	2011-11-14 20:29:38 UTC (rev 19=
0)
@@ -26,10 +26,10 @@
=20
 class Modop_Operation
 {
-    function __construct($p_cn,$p_internal)
+    function __construct($p_cn,$p_id)
     {
         $this->db=3D$p_cn;
-        $this->jr_internal=3Dtrim($p_internal);
+        $this->jr_id=3Dtrim($p_id);
         $this->array=3Darray();
     }
     /**
@@ -41,8 +41,8 @@
     {
         /*  check if we retrieve it */
         $this->ledger_type=3D$this->db->get_value("select jrn_def_type f=
rom jrn_def ".
-                                                " where jrn_def_id =3D (=
select jr_def_id from jrn where jr_internal=3D$1)",
-                                                array($this->jr_internal=
));
+                                                " where jrn_def_id =3D (=
select jr_def_id from jrn where jr_id=3D$1)",
+                                                array($this->jr_id));
         if ($this->ledger_type=3D=3D'')
             throw new Exception('Operation non trouv=C3=A9e');
         /* -------------------------------------------------------------=
--------- */
@@ -53,10 +53,12 @@
             $this->array['e_mp']=3D0;
             $this->array['jrn_type']=3D'ACH';
             $jrn=3D$this->db->get_array("select jr_id,to_char(jr_date,'D=
D.MM.YYYY') as date_fmt,".
-                                      " to_char(jrn_ech,'DD.MM.YYYY') as=
 ech_fmt,jr_comment,jr_pj_number, jr_tech_per,jr_Def_id ".
-                                      " from jrn where jr_internal=3D$1"=
,
-                                      array($this->jr_internal));
+                                      " to_char(jrn_ech,'DD.MM.YYYY') as=
 ech_fmt,jr_comment,jr_pj_number,
+										  jr_tech_per,jr_Def_id,jr_internal ".
+                                      " from jrn where jr_id=3D$1",
+                                      array($this->jr_id));
             $this->jr_id=3D$jrn[0]['jr_id'];
+			$this->jr_internal=3D$jrn[0]['jr_internal'];
             /*  retrieve from jrn */
             $this->array['e_ech']=3D$jrn[0]['ech_fmt'];
             $this->array['e_date']=3D$jrn[0]['date_fmt'];
@@ -101,9 +103,15 @@
         {
             $this->array['e_mp']=3D0;
             $this->array['jrn_type']=3D'VEN';
-            $jrn=3D$this->db->get_array("select jr_id,to_char(jr_date,'D=
D.MM.YYYY') as date_fmt,to_char(jrn_ech,'DD.MM.YYYY') as ech_fmt,jr_comme=
nt,jr_pj_number, jr_tech_per,jr_Def_id from jrn where jr_internal=3D$1",
-                                      array($this->jr_internal));
+            $jrn=3D$this->db->get_array("select jr_id,
+						to_char(jr_date,'DD.MM.YYYY') as date_fmt,
+						to_char(jrn_ech,'DD.MM.YYYY') as ech_fmt,
+						jr_comment,jr_pj_number,
+						jr_tech_per,jr_Def_id,jr_internal
+						from jrn where jr_id=3D$1",
+                                      array($this->jr_id));
             $this->jr_id=3D$jrn[0]['jr_id'];
+            $this->jr_internal=3D$jrn[0]['jr_internal'];
             /*  retrieve from jrn */
             $this->array['e_ech']=3D$jrn[0]['ech_fmt'];
             $this->array['e_date']=3D$jrn[0]['date_fmt'];
@@ -149,17 +157,18 @@
         {
             $this->array['e_mp']=3D0;
             $this->array['jrn_type']=3D'ODS';
-            $jrn=3D$this->db->get_array("select jr_id,to_char(jr_date,'D=
D.MM.YYYY') as date_fmt,jr_comment,jr_pj_number, jr_tech_per,jr_Def_id fr=
om jrn where jr_internal=3D$1",
-                                      array($this->jr_internal));
+            $jrn=3D$this->db->get_array("select jr_id,jr_internal,to_cha=
r(jr_date,'DD.MM.YYYY') as date_fmt,jr_comment,jr_pj_number, jr_tech_per,=
jr_Def_id from jrn where jr_id=3D$1",
+                                      array($this->jr_id));
             $this->jr_id=3D$jrn[0]['jr_id'];
+            $this->jr_internal=3D$jrn[0]['jr_internal'];
             /*  retrieve from jrn */
             $this->array['e_date']=3D$jrn[0]['date_fmt'];
             $this->array['desc']=3D$jrn[0]['jr_comment'];
             $this->array['e_pj']=3D$jrn[0]['jr_pj_number'];
             $this->array['p_jrn']=3D$jrn[0]['jr_def_id'];
             $this->array['periode']=3D$jrn[0]['jr_tech_per'];
-            $ods=3D$this->db->get_array('select j_qcode,j_poste,j_text,j=
_montant,j_debit from jrnx where j_grpt =3D (select jr_grpt_id from jrn w=
here jr_internal=3D$1)',
-                                      array($this->jr_internal));
+            $ods=3D$this->db->get_array('select j_qcode,j_poste,j_text,j=
_montant,j_debit from jrnx where j_grpt =3D (select jr_grpt_id from jrn w=
here jr_id=3D$1)',
+                                      array($this->jr_id));
             for ($e=3D0; $e<count($ods); $e++)
             {
                 $this->array['qc_'.$e]=3D$ods[$e]['j_qcode'];
@@ -177,8 +186,8 @@
 ////////////////////////////////////////////////////////////////////////=
///
         if ( $this->ledger_type=3D=3D"FIN")
         {
-            $jrn=3D$this->db->get_array("select jr_id,to_char(jr_date,'D=
D.MM.YYYY') as date_fmt,to_char(jrn_ech,'DD.MM.YYYY') as ech_fmt,jr_comme=
nt,jr_pj_number, jr_tech_per,jr_Def_id from jrn where jr_internal=3D$1",
-                                      array($this->jr_internal));
+            $jrn=3D$this->db->get_array("select jr_id,to_char(jr_date,'D=
D.MM.YYYY') as date_fmt,to_char(jrn_ech,'DD.MM.YYYY') as ech_fmt,jr_comme=
nt,jr_pj_number, jr_tech_per,jr_Def_id from jrn where jr_id=3D$1",
+                                      array($this->jr_id));
             /*  retrieve from jrn */
             $this->jr_id=3D$jrn[0]['jr_id'];
             $this->array['e_date']=3D$jrn[0]['date_fmt'];

Modified: trunk/modop/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/index.php	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/modop/index.php	2011-11-14 20:29:38 UTC (rev 190)
@@ -24,32 +24,30 @@
  * \brief modify a operation
  */
 Extension::check_version(3432);
-$str=3Dnew IText("jr_internal");
-$str->value=3D(isset($_GET['jr_internal']))?strtoupper($_GET['jr_interna=
l']):'';
-$str->value=3D(isset($_GET['ext_jr_internal']))?strtoupper($_GET['ext_jr=
_internal']):$str->value;
+$str=3Dnew IConcerned("jr_id");
+$str->value=3D(isset($_GET['jr_id']))?strtoupper($_GET['jr_id']):'';
+$str->value=3D(isset($_GET['ext_jr_id']))?strtoupper($_GET['ext_jr_id'])=
:$str->value;
=20
-$search=3Dnew IButton('getjr');
-$js=3D"openRecherche(".dossier::id().")";
-$search->label=3D'Chercher dans les journaux';
-$search->javascript=3Dsprintf('%s',$js);
=20
+
 ?>
 <FORM METHOD=3D"GET">
   <? echo HtmlInput::extension().dossier::hidden();?>
   <? echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
 <?=3D_("Code interne de l'op=C3=A9ration =C3=A0 modifier") ?>
   <?=3D$str->input()?>
-  <?=3DHtmlInput::submit('seek','retrouver')?>
+	<?
+
+	echo HtmlInput::submit('seek','retrouver')?>
 </FORM>
-  <?=3D$search->input()?>
 <hr>
 <?php
   if ( isset($_GET['seek'])) {
     /* retrieve and show the accounting */
-    if ( trim($_GET['jr_internal'])=3D=3D'') {
+    if ( trim($_GET['jr_id'])=3D=3D'') {
       alert('Aucune op=C3=A9ration demand=C3=A9'); exit;}
     /*  retrieve and display operation */
-    require_once('modop_display.php');=20
+    require_once('modop_display.php');
     exit();
   }
 $action=3D(isset ($_GET['action']))?$_GET['action']:'end';

Modified: trunk/modop/modop_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/modop_display.php	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/modop/modop_display.php	2011-11-14 20:29:38 UTC (rev 190)
@@ -33,21 +33,12 @@
 require_once ('class_ipopup.php');
 //----------------------------------------------------------------------
 // create compute button
-$compute=3Dnew IPopup('compute');
-$compute->value=3DJS_CALC_LINE;
-//$compute->title=3D"Calculatrice";
-$compute->drag=3Dtrue;
-$compute->blocking=3Dfalse;
-$compute->set_height("350");
-$compute->set_width("500");
-echo $compute->input();
-
 $cn=3Dnew Database(dossier::id());
=20
 /*  we can't modify from a closed periode */
 /*  get periode */
-$sql=3D"select jr_tech_per from jrn where jr_internal=3D$1";
-$periode=3D$cn->get_value($sql,array(trim($_GET['jr_internal'])));
+$sql=3D"select jr_tech_per from jrn where jr_id=3D$1";
+$periode=3D$cn->get_value($sql,array(trim($_GET['jr_id'])));
 if ( $cn->count() =3D=3D 0 )
 {
     alert('Op=C3=A9ration non trouv=C3=A9e');
@@ -65,7 +56,7 @@
=20
 /* check if periode is closed */
 // retrieve jrn
-$op=3Dnew Modop_Operation($cn,$_GET['jr_internal']);
+$op=3Dnew Modop_Operation($cn,$_GET['jr_id']);
 try
 {
     $op->format();		/* load format the data into an array with by the cl=
ass_acc_ledger... */
@@ -313,10 +304,6 @@
     $wAmount->setReadOnly(false);
     $array[0]['amount']=3D$wAmount->input();
     // show compute
-    $cal=3Dnew IButton('calc');
-    $cal->label=3D'Calculatrice';
-    $cal->javascript=3D" showIPopup('compute') ";
-    $str_cal_button=3D$cal->input();
     require_once('template_ledger_fin.php');
=20
     echo HtmlInput::extension().dossier::hidden().HtmlInput::hidden('jrn=
_type','FIN');

Modified: trunk/skel/skel_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/skel/skel_javascript.js	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/skel/skel_javascript.js	2011-11-14 20:29:38 UTC (rev 190)
@@ -29,7 +29,7 @@
      }
     var str_style=3D"top:"+sx+";width:50%;height:70%";
=20
-    var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load=
ing()};
+    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing()};
    =20
     add_div(div);
=20
@@ -62,7 +62,7 @@
      }
     var str_style=3D"top:"+sx+";width:50%;height:auto";
=20
-    var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load=
ing()};
+    var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing()};
    =20
     add_div(div);
=20

Modified: trunk/tool_pcmn/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/tool_pcmn/index.php	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/tool_pcmn/index.php	2011-11-14 20:29:38 UTC (rev 190)
@@ -35,7 +35,7 @@
  * load javascript
  */
=20
-$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'];
+$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];
=20
 $cn=3Dnew Database (dossier::id());
=20

Modified: trunk/tools/include/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
--- trunk/tools/include/operation.inc.php	2011-11-14 10:28:44 UTC (rev 18=
9)
+++ trunk/tools/include/operation.inc.php	2011-11-14 20:29:38 UTC (rev 19=
0)
@@ -9,6 +9,7 @@
 echo HtmlInput::submit("viewsearch",_("Recherche"));
 echo HtmlInput::extension();
 echo HtmlInput::hidden('sa',$_REQUEST['sa']);
+echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 echo '</form>';
=20
 /*

Modified: trunk/tools/include/template/numbering.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/template/numbering.php	2011-11-14 10:28:44 UTC (r=
ev 189)
+++ trunk/tools/include/template/numbering.php	2011-11-14 20:29:38 UTC (r=
ev 190)
@@ -1,7 +1,7 @@
 <?
 echo  HtmlInput::button('receipt_bt','Renum=C3=A9roter les pi=C3=A8ces',=
'onclick=3D"$(\'div_receipt\').show();"');
 ?>
-<div id=3D"div_receipt" class=3D"op_detail" style=3D"top:230;margin:5;ov=
erflow:visible;display:none;">
+<div id=3D"div_receipt" class=3D"inner_box" style=3D"top:230;margin:5;ov=
erflow:visible;display:none;">
 <h2 class=3D"info" >R=C3=A9num=C3=A9roter les pi=C3=A8ces, donner le pr=C3=
=A9fixe puis le num=C3=A9ro</h2>
 <p class=3D"notice">Il vaut mieux que le pr=C3=A9fixe se termine par aut=
re chose qu'un chiffre</p>
 <form method=3D"POST" id=3D"form1" onsubmit=3D"return confirm('Vous conf=
irmez ?')">

Modified: trunk/tools/include/template/search_view.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/template/search_view.php	2011-11-14 10:28:44 UTC =
(rev 189)
+++ trunk/tools/include/template/search_view.php	2011-11-14 20:29:38 UTC =
(rev 190)
@@ -9,11 +9,11 @@
 <form method=3D"POST" id=3D"form1" onsubmit=3D"return confirm('Vous conf=
irmez?')">
 <?
 	echo HtmlInput::extension();
-	echo HtmlInput::get_to_hidden(array('sa'));
+	echo HtmlInput::get_to_hidden(array('sa','ac'));
 	echo Dossier::hidden();
 ?>
=20
-<div id=3D"div_poste" class=3D"op_detail" style=3D"top:230;margin:5;over=
flow:visible;display:none;">
+<div id=3D"div_poste" class=3D"inner_box" style=3D"top:230;margin:5;over=
flow:visible;display:none;">
 	<h2 class=3D"info">Poste comptable </h2>
 	<p class=3D"notice">Changera dans les op=C3=A9rations s=C3=A9lectionn=C3=
=A9es le poste comptable.Attention, cela ne changera pas la fiche, soyez =
prudent</p>
 <?
@@ -49,7 +49,7 @@
 </table>
 </div>
=20
-<div id=3D"div_card" class=3D"op_detail" style=3D"top:230;margin:5;overf=
low:visible;display:none;">
+<div id=3D"div_card" class=3D"inner_box" style=3D"top:230;margin:5;overf=
low:visible;display:none;">
 <h2 class=3D"info">Changer  la fiche </h2>
 	<p class=3D"notice">Attention, dans les op=C3=A9rations s=C3=A9lectionn=
=C3=A9es cela changera la fiche et le poste comptable: ce sera celui de l=
a fiche qui sera utilis=C3=A9, soyez prudent</p>
 <?
@@ -93,7 +93,7 @@
=20
 </div>
=20
-<div id=3D"div_ledger" class=3D"op_detail" style=3D"top:230;margin:5;ove=
rflow:visible;display:none;">
+<div id=3D"div_ledger" class=3D"inner_box" style=3D"top:230;margin:5;ove=
rflow:visible;display:none;">
 <h2 class=3D"info">D=C3=A9placer dans un autre journal </h2>
 	<p class=3D"notice">Attention, pour les op=C3=A9rations s=C3=A9lectionn=
=C3=A9es,cela  transf=C3=A8rera les op=C3=A9rations vers le journal chois=
i mais il faut que ce journal soit de m=C3=AAme type (achat vers achat, v=
ente vers vente...), les pi=C3=A8ces justificatives ne seront pas mises =C3=
=A0 jour, soyez prudent</p>
=20

Modified: trunk/tools/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/tools/index.php	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/tools/index.php	2011-11-14 20:29:38 UTC (rev 190)
@@ -21,7 +21,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 /*!\file
- * \brief main file for tools=20
+ * \brief main file for tools
  */
=20
 /*
@@ -33,7 +33,7 @@
 ob_clean();
 echo create_script($j);
=20
-$url=3D'?'.dossier::get()."&plugin_code=3D".$_REQUEST['plugin_code'];
+$url=3D'?'.dossier::get()."&plugin_code=3D".$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];
 $array=3Darray (
          array($url.'&sa=3Dop',_('Op=C3=A9ration'),_('Changer poste comp=
table ou fiche'),1),
          array($url.'&sa=3Dpj',_('Pi=C3=A8ce'),_('R=C3=A9num=C3=A9roter =
des pi=C3=A8ces justificative'),2)

Modified: trunk/tva/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/ajax.php	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/tva/ajax.php	2011-11-14 20:29:38 UTC (rev 190)
@@ -71,7 +71,7 @@
       $r.=3Ddossier::hidden();
       $r.=3DHtmlInput::submit('save','Sauver','onclick=3D"return confirm=
(\'Vous confirmez ? \')"');
       $r.=3D'</form>';
-    } else=20
+    } else
     {
       $ctl=3D'record_write';
       $r=3DHtmlInput::anchor_close($ctl);
@@ -105,7 +105,7 @@
       $array['poste'.$i]=3D$atva;
       $array['amount'.$i]=3D$atva_amount;
       $array['ld'.$i]=3D'';
-      if ( isset($atva_ic)) $array['ck'.$i]=3D1;     =20
+      if ( isset($atva_ic)) $array['ck'.$i]=3D1;
       $i++;
       $nb_item++;
     }
@@ -114,7 +114,7 @@
       $array['poste'.$i]=3D$crtva;
       $array['amount'.$i]=3D$crtva_amount;
       $array['ld'.$i]=3D'';
-      if ( isset($crtva_ic)) $array['ck'.$i]=3D1;     =20
+      if ( isset($crtva_ic)) $array['ck'.$i]=3D1;
       $i++;
       $nb_item++;
     }
@@ -123,7 +123,7 @@
       $array['poste'.$i]=3D$dttva;
       $array['amount'.$i]=3D$dttva_amount;
       $array['ld'.$i]=3D'';
-      if ( isset($dttva_ic)) $array['ck'.$i]=3D1;     =20
+      if ( isset($dttva_ic)) $array['ck'.$i]=3D1;
       $i++;
       $nb_item++;
     }
@@ -132,7 +132,7 @@
       $array['poste'.$i]=3D$solde;
       $array['amount'.$i]=3D$solde_amount;
       $array['ld'.$i]=3D'';
-      if ( isset($solde_ic)) $array['ck'.$i]=3D1;     =20
+      if ( isset($solde_ic)) $array['ck'.$i]=3D1;
       $i++;
       $nb_item++;
     }
@@ -148,7 +148,8 @@
    $ods->save($array);
    echo h2info("Sauv=C3=A9e : ajoutez le num=C3=A9ro de pi=C3=A8ce");
    echo   HtmlInput::detail_op($ods->jr_id,'d=C3=A9tail op=C3=A9ration :=
 '.$ods->internal);
-  =20
+   $ods->with_concerned=3Dfalse;
+   echo $ods->confirm($array,true);
   } catch(Exception $e) {
     echo alert($e->getMessage());
   }
@@ -157,7 +158,7 @@
    break;
 case 'rm_form':
   switch($type)
-    {=20
+    {
     case 'da':
       $sql=3D"delete from tva_belge.declaration_amount where da_id=3D$1"=
;
       break;

Modified: trunk/tva/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/index.php	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/tva/index.php	2011-11-14 20:29:38 UTC (rev 190)
@@ -25,7 +25,7 @@
  */
 Extension::check_version(3600);
=20
-$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'];
+$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];
 $array=3Darray (
 	array($url.'&sa=3Ddec',_('D=C3=A9claration TVA'),_('D=C3=A9claration Tr=
imestriel ou annuel de TVA'),1),
 	array($url.'&sa=3Dli',_('Listing intracommunautaire'),_('Listing intrac=
ommunautaire trimestriel'),2),
@@ -69,23 +69,23 @@
 }
 // check schema
 $a=3D$cn->exist_column('assujetti_chld','ac_periode','tva_belge');
-if ( $a =3D=3D false)=20
+if ( $a =3D=3D false)
   $cn->exec_sql("alter table tva_belge.assujetti_chld add ac_periode tex=
t");
=20
 $a=3D$cn->exist_column('assujetti_chld','exercice','tva_belge');
-if ( $a =3D=3D false)=20
+if ( $a =3D=3D false)
   $cn->exec_sql("alter table tva_belge.assujetti_chld add exercice text"=
);
=20
 $a=3D$cn->exist_column('declaration_amount','exercice','tva_belge');
-if ( $a =3D=3D false)=20
+if ( $a =3D=3D false)
   $cn->exec_sql("alter table tva_belge.declaration_amount add exercice t=
ext");
=20
 $a=3D$cn->exist_column('intracomm','exercice','tva_belge');
-if ( $a =3D=3D false)=20
+if ( $a =3D=3D false)
   $cn->exec_sql("alter table tva_belge.intracomm add exercice text");
=20
 $a=3D$cn->exist_column('assujetti','exercice','tva_belge');
-if ( $a =3D=3D false)=20
+if ( $a =3D=3D false)
   $cn->exec_sql("alter table tva_belge.assujetti add exercice text");
=20
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dtva" target=3D"_blan=
k">Aide</a></div>';

Modified: trunk/tva/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
--- trunk/tva/js_scripts.js	2011-11-14 10:28:44 UTC (rev 189)
+++ trunk/tva/js_scripts.js	2011-11-14 20:29:38 UTC (rev 190)
@@ -4,7 +4,7 @@
 	$('detail').show();
 	$('main').hide();
 	var gDossier=3D$('gDossier').value; var code=3D$('plugin_code').value;
-	var queryString=3D'?act=3Ddsp_decl&gDossier=3D'+gDossier+'&plugin_code=3D=
'+code;
+	var queryString=3D'act=3Ddsp_decl&gDossier=3D'+gDossier+'&plugin_code=3D=
'+code;
 	queryString+=3D'&type=3D'+p_type+'&id=3D'+p_id;
 	var action=3Dnew Ajax.Request ( 'ajax.php',
 				  {
@@ -33,17 +33,17 @@
 }
 function record_writing(plugin,dossier,p_id) {
     // call ajax to fill with form
-    query=3D'?gDossier=3D'+dossier+'&plugin_code=3D'+plugin+'&act=3Drw&p=
_id=3D'+p_id;
+    query=3D'gDossier=3D'+dossier+'&plugin_code=3D'+plugin+'&act=3Drw&p_=
id=3D'+p_id;
=20
     // add a section
-    show_box({id:'record_write',html:loading(),cssclass:'op_detail',styl=
e:'position:absolute;top:0;left:0%;margin-top:10%;height:80%;margin-left:=
10%;width:80%;',js_error:null,js_success:success_record_writing,qs:query,=
fixed:1,callback:'ajax.php'});
+    show_box({id:'record_write',html:loading(),cssclass:'inner_box',styl=
e:'position:absolute;top:0;left:0%;margin-top:10%;height:80%;margin-left:=
10%;width:80%;',js_error:null,js_success:success_record_writing,qs:query,=
fixed:1,callback:'ajax.php'});
 }
 function remove_form(plugin,dossier,p_id,type) {
     // call ajax to fill with form
-    query=3D'?gDossier=3D'+dossier+'&plugin_code=3D'+plugin+'&act=3Drm_f=
orm&p_id=3D'+p_id+"&type=3D"+type;
+    query=3D'gDossier=3D'+dossier+'&plugin_code=3D'+plugin+'&act=3Drm_fo=
rm&p_id=3D'+p_id+"&type=3D"+type;
=20
     // add a section
-    show_box({id:'remove_form',html:loading(),cssclass:'op_detail',style=
:'position:absolute;top:0;left:20%;margin-top:10%;',js_error:null,js_succ=
ess:success_box,qs:query,callback:'ajax.php'});
+    show_box({id:'remove_form',html:loading(),cssclass:'inner_box',style=
:'position:absolute;top:0;left:20%;margin-top:10%;',js_error:null,js_succ=
ess:success_box,qs:query,callback:'ajax.php'});
 }
=20
 function success_record_writing(req) {
@@ -54,10 +54,10 @@
 	if ( a.length =3D=3D 0 ) { var rec=3Dreq.responseText;alert ('erreur :'=
+rec);}
 	var name_ctl=3Da[0].firstChild.nodeValue;
 	var code_html=3DgetNodeText(html[0]);
-=09
+
 	code_html=3Dunescape_xml(code_html);
 	g(name_ctl).innerHTML=3Dcode_html;
-    }=20
+    }
     catch (e) {
 	alert("success_box"+e.message);}
     try{
@@ -66,7 +66,7 @@
 	alert("answer_box Impossible executer script de la reponse\n"+e.message=
);}
 }
 function save_write(obj) {
-    var query=3D"?act=3Dsw&"+$(obj).serialize();
+    var query=3D"act=3Dsw&"+$(obj).serialize();
     var action=3Dnew Ajax.Request ( 'ajax.php',
 				  {
 				      method:'get',
@@ -85,10 +85,10 @@
 	if ( a.length =3D=3D 0 ) { var rec=3Dreq.responseText;alert ('erreur :'=
+rec);}
 	var name_ctl=3Da[0].firstChild.nodeValue;
 	var code_html=3DgetNodeText(html[0]);
-=09
+
 	code_html=3Dunescape_xml(code_html);
 	g(name_ctl).innerHTML=3Dcode_html;
-    }=20
+    }
     catch (e) {
 	alert("success_box"+e.message);}
     try{



From MAILER-DAEMON Mon Nov 14 15:30:02 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQ3AI-0005tz-P8
	for mharc-phpcompta-dev@gnu.org; Mon, 14 Nov 2011 15:30:02 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 14 Nov 2011 21:35:44 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.15595.1321302601.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4351 - in phpcompta/trunk: html html/js 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: Mon, 14 Nov 2011 20:30:01 -0000

Author: danydb
Date: 2011-11-14 21:35:43 +0100 (Mon, 14 Nov 2011)
New Revision: 4351

Modified:
   phpcompta/trunk/html/do.php
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/extension_choice.inc.php
   phpcompta/trunk/sql/
   phpcompta/trunk/sql/backup-new-object.sh
   phpcompta/trunk/sql/object-6.0.sql
Log:
fix small bugs

Modified: phpcompta/trunk/html/do.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/do.php	2011-11-14 14:38:47 UTC (rev 4350)
+++ phpcompta/trunk/html/do.php	2011-11-14 20:35:43 UTC (rev 4351)
@@ -137,7 +137,7 @@
 		show_menu($all, $i);
     }
 }
-elseif (isset($_REQUEST['plugin_code']))
+/*elseif (isset($_REQUEST['plugin_code']))
 {
 	$default =3D find_default_module();
     $_GET['ac']=3D$default;
@@ -147,7 +147,7 @@
     $all[0] =3D $default;
     show_menu($all, 0);
 	require_once 'extension_choice.inc.php';
-}
+}*/
 else
 {
     $default =3D find_default_module();

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	2011-11-14 14:38:47 UTC (rev 4350)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-14 20:35:43 UTC (rev 4351)
@@ -1032,9 +1032,12 @@
 		{amount_id=3D0;}
 	else if ($(amount_id))
 		{
-			if ($(amount_id).value) {amount_id=3D$(amount_id).value;}
-			else if ($(amount_id).innerHTML) {amount_id=3D$(amount_id).innerHTML;=
}
+			if ($(amount_id).value)
+			{amount_id=3D$(amount_id).value;}
+			else if
+			($(amount_id).innerHTML) {amount_id=3D$(amount_id).innerHTML;}
 		}
+
 	var target=3D"search_op";
 	removeDiv(target);
 	var str_style=3Dfixed_position(77, 99)

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	2011-11-14 14:38:47 UTC =
(rev 4350)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-14 20:35:43 UTC =
(rev 4351)
@@ -1475,7 +1475,7 @@
         $user =3D new User($this->db);
=20
         if ( $p_readonly =3D=3D 1 )
-            return $this->show_summary($p_array);
+            return $this->confirm($p_array);
=20
         if ( $p_array !=3D null )
             extract($p_array);

Modified: phpcompta/trunk/include/extension_choice.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/extension_choice.inc.php	2011-11-14 14:38:47 =
UTC (rev 4350)
+++ phpcompta/trunk/include/extension_choice.inc.php	2011-11-14 20:35:43 =
UTC (rev 4351)
@@ -40,6 +40,7 @@
 }
 else
 {
+	if (!isset($_REQUEST['ac'])) echo_warning ("ac non positionn=C3=A9");
     echo '<form method=3D"get" action=3D"do.php">';
     echo Dossier::hidden();
     echo HtmlInput::request_to_hidden(array('plugin_code','ac'));


Property changes on: phpcompta/trunk/sql
___________________________________________________________________
Name: svn:ignore
   - .upgrade.sql.swp
.object-6.0.sql.swp

   + .upgrade.sql.swp
.object-6.0.sql.swp
.backup-new-object.sh.swp


Modified: phpcompta/trunk/sql/backup-new-object.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/backup-new-object.sh	2011-11-14 14:38:47 UTC (rev=
 4350)
+++ phpcompta/trunk/sql/backup-new-object.sh	2011-11-14 20:35:43 UTC (rev=
 4351)
@@ -1 +1 @@
-pg_dump testdossier82 -no-owner --inserts -t profile -t menu_ref -t prof=
ile_menu -t profile_user -t profile_menu_type -t v_all_menu > object-6.0.=
sql
+pg_dump testdossier82 --no-owner --inserts -t profile -t menu_ref -t pro=
file_menu -t profile_user -t profile_menu_type -t v_all_menu > object-6.0=
.sql

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-14 14:38:47 UTC (rev 4350)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-14 20:35:43 UTC (rev 4351)
@@ -16,6 +16,7 @@
 SET default_with_oids =3D false;
=20
 --
+-- Name: menu_ref; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
 --
=20
 CREATE TABLE menu_ref (
@@ -30,32 +31,36 @@
 );
=20
=20
-
 --
+-- Name: COLUMN menu_ref.me_code; Type: COMMENT; Schema: public; Owner: =
-
 --
=20
 COMMENT ON COLUMN menu_ref.me_code IS 'Menu Code ';
=20
=20
 --
+-- Name: COLUMN menu_ref.me_menu; Type: COMMENT; Schema: public; Owner: =
-
 --
=20
 COMMENT ON COLUMN menu_ref.me_menu IS 'Label to display';
=20
=20
 --
+-- Name: COLUMN menu_ref.me_file; Type: COMMENT; Schema: public; Owner: =
-
 --
=20
 COMMENT ON COLUMN menu_ref.me_file IS 'if not empty file to include';
=20
=20
 --
+-- Name: COLUMN menu_ref.me_url; Type: COMMENT; Schema: public; Owner: -
 --
=20
 COMMENT ON COLUMN menu_ref.me_url IS 'url ';
=20
=20
 --
+-- Name: COLUMN menu_ref.me_type; Type: COMMENT; Schema: public; Owner: =
-
 --
=20
 COMMENT ON COLUMN menu_ref.me_type IS 'ME for menu
@@ -65,6 +70,7 @@
=20
=20
 --
+-- Name: profile; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
 --
=20
 CREATE TABLE profile (
@@ -76,38 +82,43 @@
 );
=20
=20
-
 --
+-- Name: TABLE profile; Type: COMMENT; Schema: public; Owner: -
 --
=20
 COMMENT ON TABLE profile IS 'Available profile ';
=20
=20
 --
+-- Name: COLUMN profile.p_name; Type: COMMENT; Schema: public; Owner: -
 --
=20
 COMMENT ON COLUMN profile.p_name IS 'Name of the profile';
=20
=20
 --
+-- Name: COLUMN profile.p_desc; Type: COMMENT; Schema: public; Owner: -
 --
=20
 COMMENT ON COLUMN profile.p_desc IS 'description of the profile';
=20
=20
 --
+-- Name: COLUMN profile.with_calc; Type: COMMENT; Schema: public; Owner:=
 -
 --
=20
 COMMENT ON COLUMN profile.with_calc IS 'show the calculator';
=20
=20
 --
+-- Name: COLUMN profile.with_direct_form; Type: COMMENT; Schema: public;=
 Owner: -
 --
=20
 COMMENT ON COLUMN profile.with_direct_form IS 'show the direct form';
=20
=20
 --
+-- Name: profile_menu; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
 --
=20
 CREATE TABLE profile_menu (
@@ -121,32 +132,36 @@
 );
=20
=20
-
 --
+-- Name: TABLE profile_menu; Type: COMMENT; Schema: public; Owner: -
 --
=20
 COMMENT ON TABLE profile_menu IS 'Join  between the profile and the menu=
 ';
=20
=20
 --
+-- Name: COLUMN profile_menu.me_code_dep; Type: COMMENT; Schema: public;=
 Owner: -
 --
=20
 COMMENT ON COLUMN profile_menu.me_code_dep IS 'menu code dependency';
=20
=20
 --
+-- Name: COLUMN profile_menu.p_id; Type: COMMENT; Schema: public; Owner:=
 -
 --
=20
 COMMENT ON COLUMN profile_menu.p_id IS 'link to profile';
=20
=20
 --
+-- Name: COLUMN profile_menu.p_order; Type: COMMENT; Schema: public; Own=
er: -
 --
=20
 COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu';
=20
=20
 --
+-- Name: COLUMN profile_menu.p_type_display; Type: COMMENT; Schema: publ=
ic; Owner: -
 --
=20
 COMMENT ON COLUMN profile_menu.p_type_display IS 'M is a module
@@ -155,6 +170,7 @@
=20
=20
 --
+-- Name: profile_menu_pm_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
 --
=20
 CREATE SEQUENCE profile_menu_pm_id_seq
@@ -165,20 +181,22 @@
     CACHE 1;
=20
=20
-
 --
+-- Name: profile_menu_pm_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
 --
=20
 ALTER SEQUENCE profile_menu_pm_id_seq OWNED BY profile_menu.pm_id;
=20
=20
 --
+-- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 647, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 648, true);
=20
=20
 --
+-- Name: profile_menu_type; Type: TABLE; Schema: public; Owner: -; Table=
space:=20
 --
=20
 CREATE TABLE profile_menu_type (
@@ -187,8 +205,8 @@
 );
=20
=20
-
 --
+-- Name: profile_p_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --
=20
 CREATE SEQUENCE profile_p_id_seq
@@ -199,20 +217,22 @@
     CACHE 1;
=20
=20
-
 --
+-- Name: profile_p_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owne=
r: -
 --
=20
 ALTER SEQUENCE profile_p_id_seq OWNED BY profile.p_id;
=20
=20
 --
+-- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
=20
 SELECT pg_catalog.setval('profile_p_id_seq', 10, true);
=20
=20
 --
+-- Name: profile_user; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
 --
=20
 CREATE TABLE profile_user (
@@ -222,26 +242,29 @@
 );
=20
=20
-
 --
+-- Name: TABLE profile_user; Type: COMMENT; Schema: public; Owner: -
 --
=20
 COMMENT ON TABLE profile_user IS 'Contains the available profile for use=
rs';
=20
=20
 --
+-- Name: COLUMN profile_user.user_name; Type: COMMENT; Schema: public; O=
wner: -
 --
=20
 COMMENT ON COLUMN profile_user.user_name IS 'fk to available_user : logi=
n';
=20
=20
 --
+-- Name: COLUMN profile_user.p_id; Type: COMMENT; Schema: public; Owner:=
 -
 --
=20
 COMMENT ON COLUMN profile_user.p_id IS 'fk to profile';
=20
=20
 --
+-- Name: profile_user_pu_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
 --
=20
 CREATE SEQUENCE profile_user_pu_id_seq
@@ -252,54 +275,59 @@
     CACHE 1;
=20
=20
-
 --
+-- Name: profile_user_pu_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
 --
=20
 ALTER SEQUENCE profile_user_pu_id_seq OWNED BY profile_user.pu_id;
=20
=20
 --
+-- Name: profile_user_pu_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
 --
=20
 SELECT pg_catalog.setval('profile_user_pu_id_seq', 5, true);
=20
=20
 --
+-- Name: v_all_menu; Type: VIEW; Schema: public; Owner: -
 --
=20
 CREATE VIEW v_all_menu AS
-    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript, mr.me_type FROM (((profi=
le_menu pm JOIN profile_user pu ON ((pu.p_id =3D pm.p_id))) JOIN profile =
p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr USING (me_code)) ORDER BY p=
m.p_order;
+    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript, mr.me_type, pm.p_id, mr.=
me_description FROM (((profile_menu pm JOIN profile_user pu ON ((pu.p_id =
=3D pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr=
 USING (me_code)) ORDER BY pm.p_order;
=20
=20
-
 --
+-- Name: p_id; Type: DEFAULT; Schema: public; Owner: -
 --
=20
 ALTER TABLE profile ALTER COLUMN p_id SET DEFAULT nextval('profile_p_id_=
seq'::regclass);
=20
=20
 --
+-- Name: pm_id; Type: DEFAULT; Schema: public; Owner: -
 --
=20
 ALTER TABLE profile_menu ALTER COLUMN pm_id SET DEFAULT nextval('profile=
_menu_pm_id_seq'::regclass);
=20
=20
 --
+-- Name: pu_id; Type: DEFAULT; Schema: public; Owner: -
 --
=20
 ALTER TABLE profile_user ALTER COLUMN pu_id SET DEFAULT nextval('profile=
_user_pu_id_seq'::regclass);
=20
=20
 --
+-- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: -
 --
=20
 INSERT INTO menu_ref VALUES ('IMPCARD', 'Import Fiche', 'import_card/ind=
ex.php', NULL, 'Importation de fiches', 'plugin_code=3DIMPCARD', NULL, 'P=
L');
 INSERT INTO menu_ref VALUES ('AMORTIS', 'Amortissement', 'amortis/index.=
php', NULL, 'Amortissement', 'plugin_code=3DAMORTIS', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('TOOLPLAN', 'Import/export plan', 'tool_pcm=
n/index.php', NULL, 'Importation /export de plan comptable', 'plugin_code=
=3DTOOLPLAN', NULL, 'PL');
-INSERT INTO menu_ref VALUES ('IMPORTBANK', 'Importation banque', 'import=
bank/index.php', NULL, 'Import. fichier CVS de la banque', 'plugin_code=3D=
IMPORTBANK', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('TOOL', 'Outil comptable', 'tools/index.php=
', NULL, 'Outil comptable', 'plugin_code=3DTOOL', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('TVA', 'Module de TVA', 'tva/index.php', NU=
LL, 'Cette extension permet de faire les listings et declarations TVA', '=
plugin_code=3DTVA', NULL, 'PL');
+INSERT INTO menu_ref VALUES ('IMPORTBANK', 'Importation banque', 'import=
bank/index.php', NULL, 'Import. fichier CVS de la banque', 'plugin_code=3D=
IMPORTBANK', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
@@ -411,6 +439,7 @@
=20
=20
 --
+-- Data for Name: profile; Type: TABLE DATA; Schema: public; Owner: -
 --
=20
 INSERT INTO profile VALUES ('Administrateur', 1, 'Profil par d=C3=A9faut=
 pour les adminstrateurs', true, true);
@@ -418,8 +447,10 @@
=20
=20
 --
+-- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 -
 --
=20
+INSERT INTO profile_menu VALUES (648, 'MODOP', 'EXTENSION', 1, 10, 'E', =
0);
 INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', NULL);
 INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (178, 'CFGPAYMENT', 'DIVPARM', 6, 4, 'E'=
, 0);
@@ -488,14 +519,6 @@
 INSERT INTO profile_menu VALUES (243, 'TOOLPLAN', 'EXTENSION', 6, NULL, =
'S', 0);
 INSERT INTO profile_menu VALUES (244, 'SEARCH', NULL, 6, 60, 'M', 0);
 INSERT INTO profile_menu VALUES (245, 'ACH', 'MENUACH', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (246, 'PRINTJRN', 'IMP', 6, 14, 'E', 0);
-INSERT INTO profile_menu VALUES (247, 'PRINTREC', 'IMP', 6, 9, 'E', 0);
-INSERT INTO profile_menu VALUES (248, 'PRINTPOSTE', 'IMP', 6, 8, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (249, 'PRINTREPORT', 'IMP', 6, 10, 'E', =
0);
-INSERT INTO profile_menu VALUES (250, 'PRINTBILAN', 'IMP', 6, 11, 'E', 0=
);
-INSERT INTO profile_menu VALUES (251, 'PRINTGL', 'IMP', 6, 13, 'E', 0);
-INSERT INTO profile_menu VALUES (252, 'PRINTBAL', 'IMP', 6, 15, 'E', 0);
-INSERT INTO profile_menu VALUES (253, 'PRINTCARD', 'IMP', 6, 12, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (254, 'IMPORTBANK', 'EXTENSION', 6, NULL=
, 'S', 0);
 INSERT INTO profile_menu VALUES (255, 'TOOL', 'EXTENSION', 6, NULL, 'S',=
 0);
 INSERT INTO profile_menu VALUES (256, 'AMORTIS', 'MENUACH', 6, 10, 'E', =
0);
@@ -594,14 +617,6 @@
 INSERT INTO profile_menu VALUES (161, 'TOOLPLAN', 'EXTENSION', 1, NULL, =
'S', 0);
 INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', 0);
 INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (16, 'PRINTJRN', 'IMP', 1, 14, 'E', 0);
-INSERT INTO profile_menu VALUES (10, 'PRINTREC', 'IMP', 1, 9, 'E', 0);
-INSERT INTO profile_menu VALUES (9, 'PRINTPOSTE', 'IMP', 1, 8, 'E', 0);
-INSERT INTO profile_menu VALUES (11, 'PRINTREPORT', 'IMP', 1, 10, 'E', 0=
);
-INSERT INTO profile_menu VALUES (13, 'PRINTBILAN', 'IMP', 1, 11, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (15, 'PRINTGL', 'IMP', 1, 13, 'E', 0);
-INSERT INTO profile_menu VALUES (17, 'PRINTBAL', 'IMP', 1, 15, 'E', 0);
-INSERT INTO profile_menu VALUES (14, 'PRINTCARD', 'IMP', 1, 12, 'E', 0);
 INSERT INTO profile_menu VALUES (162, 'IMPORTBANK', 'EXTENSION', 1, NULL=
, 'S', 0);
 INSERT INTO profile_menu VALUES (163, 'TOOL', 'EXTENSION', 1, NULL, 'S',=
 0);
 INSERT INTO profile_menu VALUES (157, 'AMORTIS', 'MENUACH', 1, 10, 'E', =
0);
@@ -637,6 +652,7 @@
=20
=20
 --
+-- Data for Name: profile_menu_type; Type: TABLE DATA; Schema: public; O=
wner: -
 --
=20
 INSERT INTO profile_menu_type VALUES ('P', 'Impression');
@@ -646,6 +662,7 @@
=20
=20
 --
+-- Data for Name: profile_user; Type: TABLE DATA; Schema: public; Owner:=
 -
 --
=20
 INSERT INTO profile_user VALUES ('phpcompta', 1, 1);
@@ -654,6 +671,7 @@
=20
=20
 --
+-- Name: menu_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
 --
=20
 ALTER TABLE ONLY menu_ref
@@ -661,6 +679,7 @@
=20
=20
 --
+-- Name: profile_menu_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
 --
=20
 ALTER TABLE ONLY profile_menu
@@ -668,6 +687,7 @@
=20
=20
 --
+-- Name: profile_menu_type_pkey; Type: CONSTRAINT; Schema: public; Owner=
: -; Tablespace:=20
 --
=20
 ALTER TABLE ONLY profile_menu_type
@@ -675,6 +695,7 @@
=20
=20
 --
+-- Name: profile_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
 --
=20
 ALTER TABLE ONLY profile
@@ -682,6 +703,7 @@
=20
=20
 --
+-- Name: profile_user_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
 --
=20
 ALTER TABLE ONLY profile_user
@@ -689,6 +711,7 @@
=20
=20
 --
+-- Name: profile_user_user_name_key; Type: CONSTRAINT; Schema: public; O=
wner: -; Tablespace:=20
 --
=20
 ALTER TABLE ONLY profile_user
@@ -696,24 +719,28 @@
=20
=20
 --
+-- Name: fki_profile_menu_me_code; Type: INDEX; Schema: public; Owner: -=
; Tablespace:=20
 --
=20
 CREATE INDEX fki_profile_menu_me_code ON profile_menu USING btree (me_co=
de);
=20
=20
 --
+-- Name: fki_profile_menu_profile; Type: INDEX; Schema: public; Owner: -=
; Tablespace:=20
 --
=20
 CREATE INDEX fki_profile_menu_profile ON profile_menu USING btree (p_id)=
;
=20
=20
 --
+-- Name: fki_profile_menu_type_fkey; Type: INDEX; Schema: public; Owner:=
 -; Tablespace:=20
 --
=20
 CREATE INDEX fki_profile_menu_type_fkey ON profile_menu USING btree (p_t=
ype_display);
=20
=20
 --
+-- Name: profile_menu_me_code_fkey; Type: FK CONSTRAINT; Schema: public;=
 Owner: -
 --
=20
 ALTER TABLE ONLY profile_menu
@@ -721,6 +748,7 @@
=20
=20
 --
+-- Name: profile_menu_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
 --
=20
 ALTER TABLE ONLY profile_menu
@@ -728,6 +756,7 @@
=20
=20
 --
+-- Name: profile_menu_type_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
 --
=20
 ALTER TABLE ONLY profile_menu
@@ -735,6 +764,7 @@
=20
=20
 --
+-- Name: profile_user_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
 --
=20
 ALTER TABLE ONLY profile_user



From MAILER-DAEMON Tue Nov 15 04:45:46 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQFaM-0006ST-8O
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 04:45:46 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 10:51:15 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.16496.1321350344.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4352 - 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: Tue, 15 Nov 2011 09:45:44 -0000

Author: danydb
Date: 2011-11-15 10:51:13 +0100 (Tue, 15 Nov 2011)
New Revision: 4352

Added:
   phpcompta/trunk/include/ajax_add_menu.php
   phpcompta/trunk/include/ajax_get_menu_detail.php
   phpcompta/trunk/include/ajax_get_profile.php
   phpcompta/trunk/include/ajax_mod_document.php
   phpcompta/trunk/include/ajax_mod_periode.php
   phpcompta/trunk/include/ajax_mod_predf_op.php
   phpcompta/trunk/include/ajax_plugin_detail.php
   phpcompta/trunk/include/ajax_save_predf_op.php
Removed:
   phpcompta/trunk/include/detail_menu.inc.php
   phpcompta/trunk/include/modify_mod_document.inc.php
   phpcompta/trunk/include/modify_periode.inc.php
   phpcompta/trunk/include/modify_predf_op.php
   phpcompta/trunk/include/save_predf_op.php
   phpcompta/trunk/include/show_profile.inc.php
   phpcompta/trunk/include/template/add_menu.php
   phpcompta/trunk/include/template/plugin_detail.php
Modified:
   phpcompta/trunk/html/ajax_misc.php
Log:
450 Code cleaning ajax_misc rename files for ajax

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	2011-11-14 20:35:43 UTC (rev 4351)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-15 09:51:13 UTC (rev 4352)
@@ -466,19 +466,19 @@
 EOF;
 		break;
 	case 'mod_doc':
-		require_once('modify_mod_document.inc.php');
+		require_once('ajax_mod_document.php');
 		break;
 	case 'input_per':
-		require_once('modify_periode.inc.php');
+		require_once('ajax_mod_periode.php');
 		break;
 	case 'save_per':
-		require_once('modify_periode.inc.php');
+		require_once('ajax_mod_periode.php');
 		break;
 	case 'mod_predf':
-		require_once('modify_predf_op.php');
+		require_once('ajax_mod_predf_op.php');
 		break;
 	case 'save_predf':
-		require_once('save_predf_op.php');
+		require_once('ajax_save_predf_op.php');
 		break;
 	case 'search_op':
 		/* put_global(array
@@ -488,13 +488,13 @@
 		require_once 'search.inc.php';
 		break;
 	case 'display_profile':
-		require_once("show_profile.inc.php");
+		require_once("ajax_get_profile.php");
 		break;
 	case 'det_menu':
-		require_once("detail_menu.inc.php");
+		require_once("ajax_detail_menu.php");
 		break;
 	case 'add_menu':
-		require_once 'template/add_menu.php';
+		require_once 'ajax_add_menu.php';
 		break;
 	case 'add_plugin':
 		$me_code=3Dnew IText('me_code');
@@ -503,7 +503,7 @@
 		$me_description=3Dnew IText("me_description");
 		$me_parameter=3Dnew IText("me_parameter");
 		$new=3Dtrue;
-		require_once 'template/plugin_detail.php';
+		require_once 'ajax_plugin_detail.php';
 		break;
 	case 'mod_plugin':
 		$m=3D$cn->get_array("select me_code,me_file,me_menu,me_description,me_=
parameter
@@ -520,7 +520,7 @@
 		$me_description=3Dnew IText("me_description",$m[0] ['me_description'])=
;
 		$me_parameter=3Dnew IText("me_parameter",$m[0] ['me_parameter']);
 		$new=3Dfalse;
-		require_once 'template/plugin_detail.php';
+		require_once 'ajax_plugin_detail.php';
 		break;
 	 case 'saldo':
 		 require_once 'ajax_bank_saldo.php';

Copied: phpcompta/trunk/include/ajax_add_menu.php (from rev 4351, phpcomp=
ta/trunk/include/template/add_menu.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_add_menu.php	                        (re=
v 0)
+++ phpcompta/trunk/include/ajax_add_menu.php	2011-11-15 09:51:13 UTC (re=
v 4352)
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show the form to add a menu
+ */
+$ame_code_dep=3D$cn->make_array("
+	select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') =
from
+	menu_ref
+	where
+	me_file is null and me_javascript is null and me_type<>'PR'
+		UNION ALL
+		select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')=
 from menu_ref
+	where
+		me_code=3D'EXTENSION'
+	order by 1
+	",1);
+$ame_code=3D$cn->make_array("
+	select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') =
from
+	menu_ref
+	order by 1
+	");
+$p_order=3Dnew INum("p_order","10");
+$atype=3D$cn->make_array("select pm_type,pm_desc from profile_menu_type =
order by 1");
+
+$me_code=3Dnew ISelect('me_code');
+$me_code->value=3D$ame_code;
+
+$me_code_dep=3Dnew ISelect('me_code_dep');
+$me_code_dep->value=3D$ame_code_dep;
+
+$p_type=3Dnew ISelect('p_type');
+$p_type->value=3D$atype;
+$pm_default=3Dnew ICheckBox('pm_default');
+echo HtmlInput::title_box("Nouveau menu", $ctl);
+?>
+<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
+	<?=3DHtmlInput::hidden('p_id',$p_id)?>
+<table>
+<tr>
+	<td>Code</td>
+	<td><?=3D$me_code->input()?></td>
+</tr>
+<tr>
+	<td>D=C3=A9pendant de </td>
+	<td><?=3D$me_code_dep->input()?></td>
+</tr>
+
+<tr>
+	<td>Ordre d'apparition</td>
+	<td><?=3D$p_order->input()?></td>
+</tr>
+<tr>
+	<td>Menu par d=C3=A9faut</td>
+	<td><?=3D$pm_default->input()?></td>
+</tr>
+<tr>
+	<td>Type de menu</td>
+	<td><?=3D$p_type->input()?></td>
+</tr>
+</table>
+<?
+echo HtmlInput::submit('add_menu',"Valider");
+echo '</form>';
+?>

Copied: phpcompta/trunk/include/ajax_get_menu_detail.php (from rev 4351, =
phpcompta/trunk/include/detail_menu.inc.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_get_menu_detail.php	                    =
    (rev 0)
+++ phpcompta/trunk/include/ajax_get_menu_detail.php	2011-11-15 09:51:13 =
UTC (rev 4352)
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief
+ *
+ */
+// retrieve data
+$profile=3D$cn->get_value("select p_id from profile_menu where pm_id=3D$=
1",array($pm_id));
+$a_value=3D$cn->make_array("select me_code,me_code||' '||me_menu||' '||c=
oalesce(me_description,'') from menu_ref",0);
+$a_value_null=3D$cn->make_array("select me_code,me_code||' '||me_menu||'=
 '||coalesce(me_description,'') from menu_ref
+	where
+	me_code in (select me_code from profile_menu where p_id=3D$profile and =
p_type_display<>'P' and pm_id <> $pm_id)
+		UNION ALL
+		select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')=
 from menu_ref
+	where
+		me_code=3D'EXTENSION'",1);
+$a_type=3D$cn->make_array("select pm_type,pm_desc from profile_menu_type=
",1);
+
+$array=3D$cn->get_array("select p_id,pm_id,me_code,me_code_dep,p_order,p=
_type_display,pm_default
+	from profile_menu
+	where pm_id=3D$1",array($pm_id));
+if ( empty($array)) {
+		alert("Code invalide");
+		exit();
+}
+
+
+echo HtmlInput::title_box($array[0]['me_code'],'divdm'.$pm_id);
+
+$me_code=3Dnew ISelect('me_code');
+$me_code->value=3D$a_value;
+$me_code->selected=3D$array[0]['me_code'];
+
+$me_code_dep=3Dnew ISelect('me_code_dep');
+$me_code_dep->value=3D$a_value_null;
+$me_code_dep->selected=3D$array[0]['me_code_dep'];
+
+$p_order=3Dnew Inum('p_order',$array[0]['p_order']);
+$pm_default=3Dnew ICheckBox('pm_default','1');
+$pm_default->set_check($array[0]['pm_default']);
+
+?>
+<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
+	<?=3DHtmlInput::hidden('pm_id',$array[0]['pm_id'])?>
+	<?=3DHtmlInput::hidden('p_id',$array[0]['p_id'])?>
+<table>
+<tr>
+	<td>Code</td>
+	<td><?=3D$me_code->input()?></td>
+</tr>
+<?
+if ($array[0]['p_type_display']!=3D'P'):
+?>
+<tr>
+	<td>D=C3=A9pendant de </td>
+	<td><?=3D$me_code_dep->input()?></td>
+</tr>
+
+<tr>
+	<td>Ordre d'apparition</td>
+	<td><?=3D$p_order->input()?></td>
+</tr>
+<tr>
+	<td>Menu par d=C3=A9faut</td>
+	<td><?=3D$pm_default->input()?></td>
+</tr>
+<? endif;?>
+</table>
+	<p>
+Cochez cette case si vous souhaitez effacer ce menu ainsi que ceux qui e=
n d=C3=A9pendent
+<?
+$delete=3Dnew ICheckBox('delete',"1");
+echo $delete->input();
+?>
+</p>
+<?
+echo HtmlInput::submit('mod',"Valider");
+echo '</form>';
+
+
+?>

Copied: phpcompta/trunk/include/ajax_get_profile.php (from rev 4351, phpc=
ompta/trunk/include/show_profile.inc.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_get_profile.php	                        =
(rev 0)
+++ phpcompta/trunk/include/ajax_get_profile.php	2011-11-15 09:51:13 UTC =
(rev 4352)
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief show the profile detail, included from ajax_misc.php
+ * @see ajax_misc.php scripts.js profile.inc.php
+ *
+ */
+require_once 'class_profile_sql.php';
+require_once 'class_profile_menu.php';
+$profile=3Dnew Profile_sql($cn,$p_id);
+$gDossier=3DDossier::id();
+$add_one=3DHtmlInput::button("add", "Ajout Menu","onclick=3D\"add_menu({=
dossier:$gDossier,p_id:$p_id})\"")
+?>
+<hr>
+<h1>Profile <?=3D$profile->p_name?></h1>
+
+<?
+$id=3DHtmlInput::hidden('p_id',$profile->p_id);
+$name=3Dnew IText("p_name",$profile->p_name);
+$desc=3Dnew IText("p_desc",$profile->p_desc);
+$with_calc=3Dnew ICheckBox("with_calc","t");
+$with_calc->set_check($profile->with_calc);
+
+$with_direct_form=3Dnew ICheckBox("with_direct_form","t");
+$with_direct_form->set_check($profile->with_direct_form);
+
+echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
+echo HtmlInput::hidden('p_id',$profile->p_id);
+require_once("template/profile.php");
+echo HtmlInput::submit("save_name","Modifier");
+echo '</form>';
+
+echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
+
+echo '
+Vous pouvez aussi copier ce profil et puis le corriger';
+
+echo HtmlInput::hidden('p_id',$profile->p_id);
+echo HtmlInput::submit("clone","Copier");
+echo '</form>';
+
+echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
+
+echo '
+Effacer ce profil';
+
+echo HtmlInput::hidden('p_id',$profile->p_id);
+echo HtmlInput::submit("delete_profil","Effacer ce profil");
+echo '</form>';
+//Menu / Module /plugin in this profile
+echo "<h1> D=C3=A9tail du profile</h1>";
+echo "<h2>Menu</h2>";
+echo $add_one;
+$profile_menu=3Dnew Profile_Menu($cn);
+$profile_menu->listing_profile($p_id);
+echo "<h2>Impression</h2>";
+$profile_menu->printing($p_id);
+?>
+<?=3D$add_one?>

Copied: phpcompta/trunk/include/ajax_mod_document.php (from rev 4351, php=
compta/trunk/include/modify_mod_document.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/ajax_mod_document.php	                       =
 (rev 0)
+++ phpcompta/trunk/include/ajax_mod_document.php	2011-11-15 09:51:13 UTC=
 (rev 4352)
@@ -0,0 +1,52 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ * \brief show the detail of a document and let you modify it
+ */
+require_once('class_database.php');
+require_once('class_dossier.php');
+require_once("class_document_modele.php");
+
+  /* 1. Check security */
+$cn=3Dnew Database(dossier::id());
+  /* 2. find the document */
+$doc=3Dnew Document_Modele($cn,$id);
+
+  /* 3. display it */
+$doc->load();
+ob_start();
+require('template/modele_document.php');
+
+$html=3Dob_get_contents();
+ob_clean();
+$html=3Descape_xml($html);
+header('Content-type: text/xml; charset=3DUTF-8');
+
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl>mod_doc</ctl>
+<code>$html</code>
+</data>
+EOF;
+exit();

Copied: phpcompta/trunk/include/ajax_mod_periode.php (from rev 4351, phpc=
ompta/trunk/include/modify_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/ajax_mod_periode.php	                        =
(rev 0)
+++ phpcompta/trunk/include/ajax_mod_periode.php	2011-11-15 09:51:13 UTC =
(rev 4352)
@@ -0,0 +1,104 @@
+<?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
+require_once('class_periode.php');
+
+/* !\file
+ * \brief display or save a periode
+ * variable received $op, $cn $user
+ */
+$err =3D 0;
+$html =3D '';
+/* we check the security */
+switch ($op)
+{
+    case 'input_per':
+        $per =3D new Periode($cn, $_GET['p_id']);
+        $per->load();
+        $limit =3D $per->get_date_limit($_GET['p_id']);
+
+        $p_start =3D new IDate('p_start');
+        $p_start->value =3D $limit['p_start'];
+        $p_end =3D new IDate('p_end');
+        $p_end->value =3D $limit['p_end'];
+        $p_exercice =3D new INum('p_exercice');
+        $p_exercice->value =3D $per->p_exercice;
+
+        $html =3D '';
+        $html.=3DHtmlInput::anchor_close('mod_periode');
+        $html.=3Dh2info('Modification p=C3=A9riode');
+        $html.=3D'<p> Modifier les dates de d=C3=A9but et fin de p=C3=A9=
riode</p>';
+        $html.=3D'<p class=3D"notice">Cela pourrait avoir un impact sur =
les op=C3=A9rations d=C3=A9j=C3=A0 existantes</p>';
+        $html.=3D'<form method=3D"post" onsubmit=3D"return save_periode(=
this)">';
+        $html.=3Ddossier::hidden();
+        $html.=3D'<table>';
+
+        $html.=3Dtr(td(' D=C3=A9but p=C3=A9riode : ') . td($p_start->inp=
ut()));
+        $html.=3Dtr(td(' Fin p=C3=A9riode : ') . td($p_end->input()));
+        $html.=3Dtr(td(' Exercice : ') . td($p_exercice->input()));
+        $html.=3D'</table>';
+        $html.=3DHtmlInput::submit('sauver', 'sauver');
+        $html.=3DHtmlInput::button('close', 'Fermer', 'onclick=3D"remove=
Div(\'mod_periode\')"');
+        $html.=3DHtmlInput::hidden('p_id', $_GET['p_id']);
+        $html.=3D'</form>';
+        break;
+    case 'save_per':
+        $per =3D new Periode($cn, $_POST['p_id']);
+        $per->load();
+        if (isDate($_POST['p_start']) =3D=3D null ||
+                isDate($_POST['p_end'] =3D=3D null) ||
+                isNumber($_POST['p_exercice']) =3D=3D 0 ||
+                $_POST['p_exercice'] > 2099 ||
+                $_POST['p_exercice'] < 2000)
+        {
+            $html =3D '';
+            $html.=3DHtmlInput::anchor_close('mod_periode');
+            $html.=3D'<h2 class=3D"info"> Modifier les dates de d=C3=A9b=
ut et fin de p=C3=A9riode</h2>';
+            $html.=3D"<div class=3D\"error\">Erreur date invalide</div>"=
;
+
+            $html.=3DHtmlInput::button('close', 'Fermer', 'onclick=3D"re=
moveDiv(\'mod_periode\')"');
+        }
+        else
+        {
+            $sql =3D "update parm_periode set p_start=3Dto_date($1,'DD.M=
M.YYYY'),p_end=3Dto_date($2,'DD.MM.YYYY'),p_exercice=3D$3 where p_id=3D$4=
";
+            try
+            {
+                $cn->exec_sql($sql, array($_POST['p_start'], $_POST['p_e=
nd'], $_POST['p_exercice'], $_POST['p_id']));
+                $html =3D '<h2 class=3D"info"> Modifier les dates de d=C3=
=A9but et fin de p=C3=A9riode</h2>';
+                $html.=3D'<h2 class=3D"notice"> Sauv=C3=A9 </h2>';
+
+                $html.=3DHtmlInput::button('close', 'Fermer', 'onclick=3D=
"	refresh_window();"');
+            }
+            catch (Exception $e)
+            {
+                $html =3D alert($e->getTrace(), true);
+            }
+        }
+        break;
+}
+
+$html =3D escape_xml($html);
+header('Content-type: text/xml; charset=3DUTF-8');
+echo '<?xml version=3D"1.0" encoding=3D"UTF-8"?>';
+echo '<xml>';
+echo '<data>' . $html . '</data>';
+echo '</xml>';

Copied: phpcompta/trunk/include/ajax_mod_predf_op.php (from rev 4351, php=
compta/trunk/include/modify_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	                       =
 (rev 0)
+++ phpcompta/trunk/include/ajax_mod_predf_op.php	2011-11-15 09:51:13 UTC=
 (rev 4352)
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/* !\file
+ * \brief display a form to change the name of a predefined operation
+ */
+ob_start();
+echo HtmlInput::anchor_close('mod_predf_op');
+echo h2info('Modification du nom');
+echo '
+    <form method=3D"get" onsubmit=3D"save_predf_op(this);return false;">=
';
+$name =3D new IText('predf_name');
+$name->value =3D $cn->get_value('select od_name from op_predef where od_=
id=3D$1', array($_GET['id']));
+$name->size =3D 60;
+echo "Nom =3D" . $name->input();
+echo dossier::hidden() . HtmlInput::hidden('od_id', $_GET['id']);
+echo "<hr>";
+echo HtmlInput::submit('save', 'Sauve');
+echo HtmlInput::button('close', 'Annuler', 'onclick=3D"removeDiv(\'mod_p=
redf_op\')"');
+echo '</form>';
+
+
+$html =3D ob_get_contents();
+ob_clean();
+$html =3D escape_xml($html);
+
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<ctl>mod_predf_op</ctl>
+<code>$html</code>
+</data>
+EOF;

Copied: phpcompta/trunk/include/ajax_plugin_detail.php (from rev 4351, ph=
pcompta/trunk/include/template/plugin_detail.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_plugin_detail.php	                      =
  (rev 0)
+++ phpcompta/trunk/include/ajax_plugin_detail.php	2011-11-15 09:51:13 UT=
C (rev 4352)
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief add, modify or delete plugin
+ *
+ */
+$msg=3D($new=3D=3D1)?"Nouvelle extension":"Modification ".$me_menu->valu=
e;
+echo HtmlInput::title_box($msg, $ctl);
+?>
+<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez')">
+<table>
+	<tr>
+		<TD>Label</td>
+		<td><?=3D$me_menu->input();?></td>
+	</tr>
+	<tr>
+		<TD>Code</td>
+		<td><?=3D$me_code->input();?></td>
+	</tr>
+	<tr>
+		<TD>Description</td>
+		<td><?=3D$me_description->input();?></td>
+	</tr>
+	<tr>
+		<TD>Fichier</td>
+		<td><?=3D$me_file->input();?></td>
+	</tr>
+</table>
+	<?
+	if ($new =3D=3D1 )
+	{
+		echo HtmlInput::submit("save_plugin","Ajouter ce plugin");
+	} else {
+		$delete=3Dnew ICheckBox('delete_pl');
+		echo "<p>Voulez-vous effacer ce plugin ? ".$delete->input()."</p>";
+		echo HtmlInput::submit("mod_plugin","Modifier ce plugin");
+
+	}
+	?>
+</form>
\ No newline at end of file

Copied: phpcompta/trunk/include/ajax_save_predf_op.php (from rev 4351, ph=
pcompta/trunk/include/save_predf_op.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_save_predf_op.php	                      =
  (rev 0)
+++ phpcompta/trunk/include/ajax_save_predf_op.php	2011-11-15 09:51:13 UT=
C (rev 4352)
@@ -0,0 +1,33 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ * \brief save the new predefined operation=20
+ * included from ajax_misc
+ */
+
+if ( trim($_GET['predf_name']) !=3D '')
+  {
+    $cn->exec_sql('update op_predef set od_name =3D$1 where od_id=3D$2',
+		  array($_GET['predf_name'],$_GET['od_id']));
+    $cn->commit();
+  }

Deleted: phpcompta/trunk/include/detail_menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/detail_menu.inc.php	2011-11-14 20:35:43 UTC (=
rev 4351)
+++ phpcompta/trunk/include/detail_menu.inc.php	2011-11-15 09:51:13 UTC (=
rev 4352)
@@ -1,103 +0,0 @@
-<?php
-
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/**
- * @file
- * @brief
- *
- */
-// retrieve data
-$profile=3D$cn->get_value("select p_id from profile_menu where pm_id=3D$=
1",array($pm_id));
-$a_value=3D$cn->make_array("select me_code,me_code||' '||me_menu||' '||c=
oalesce(me_description,'') from menu_ref",0);
-$a_value_null=3D$cn->make_array("select me_code,me_code||' '||me_menu||'=
 '||coalesce(me_description,'') from menu_ref
-	where
-	me_code in (select me_code from profile_menu where p_id=3D$profile and =
p_type_display<>'P' and pm_id <> $pm_id)
-		UNION ALL
-		select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')=
 from menu_ref
-	where
-		me_code=3D'EXTENSION'",1);
-$a_type=3D$cn->make_array("select pm_type,pm_desc from profile_menu_type=
",1);
-
-$array=3D$cn->get_array("select p_id,pm_id,me_code,me_code_dep,p_order,p=
_type_display,pm_default
-	from profile_menu
-	where pm_id=3D$1",array($pm_id));
-if ( empty($array)) {
-		alert("Code invalide");
-		exit();
-}
-
-
-echo HtmlInput::title_box($array[0]['me_code'],'divdm'.$pm_id);
-
-$me_code=3Dnew ISelect('me_code');
-$me_code->value=3D$a_value;
-$me_code->selected=3D$array[0]['me_code'];
-
-$me_code_dep=3Dnew ISelect('me_code_dep');
-$me_code_dep->value=3D$a_value_null;
-$me_code_dep->selected=3D$array[0]['me_code_dep'];
-
-$p_order=3Dnew Inum('p_order',$array[0]['p_order']);
-$pm_default=3Dnew ICheckBox('pm_default','1');
-$pm_default->set_check($array[0]['pm_default']);
-
-?>
-<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
-	<?=3DHtmlInput::hidden('pm_id',$array[0]['pm_id'])?>
-	<?=3DHtmlInput::hidden('p_id',$array[0]['p_id'])?>
-<table>
-<tr>
-	<td>Code</td>
-	<td><?=3D$me_code->input()?></td>
-</tr>
-<?
-if ($array[0]['p_type_display']!=3D'P'):
-?>
-<tr>
-	<td>D=C3=A9pendant de </td>
-	<td><?=3D$me_code_dep->input()?></td>
-</tr>
-
-<tr>
-	<td>Ordre d'apparition</td>
-	<td><?=3D$p_order->input()?></td>
-</tr>
-<tr>
-	<td>Menu par d=C3=A9faut</td>
-	<td><?=3D$pm_default->input()?></td>
-</tr>
-<? endif;?>
-</table>
-	<p>
-Cochez cette case si vous souhaitez effacer ce menu ainsi que ceux qui e=
n d=C3=A9pendent
-<?
-$delete=3Dnew ICheckBox('delete',"1");
-echo $delete->input();
-?>
-</p>
-<?
-echo HtmlInput::submit('mod',"Valider");
-echo '</form>';
-
-
-?>

Deleted: phpcompta/trunk/include/modify_mod_document.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/modify_mod_document.inc.php	2011-11-14 20:35:=
43 UTC (rev 4351)
+++ phpcompta/trunk/include/modify_mod_document.inc.php	2011-11-15 09:51:=
13 UTC (rev 4352)
@@ -1,52 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief show the detail of a document and let you modify it
- */
-require_once('class_database.php');
-require_once('class_dossier.php');
-require_once("class_document_modele.php");
-
-  /* 1. Check security */
-$cn=3Dnew Database(dossier::id());
-  /* 2. find the document */
-$doc=3Dnew Document_Modele($cn,$id);
-
-  /* 3. display it */
-$doc->load();
-ob_start();
-require('template/modele_document.php');
-
-$html=3Dob_get_contents();
-ob_clean();
-$html=3Descape_xml($html);
-header('Content-type: text/xml; charset=3DUTF-8');
-
-echo <<<EOF
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<data>
-<ctl>mod_doc</ctl>
-<code>$html</code>
-</data>
-EOF;
-exit();

Deleted: phpcompta/trunk/include/modify_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/modify_periode.inc.php	2011-11-14 20:35:43 UT=
C (rev 4351)
+++ phpcompta/trunk/include/modify_periode.inc.php	2011-11-15 09:51:13 UT=
C (rev 4352)
@@ -1,104 +0,0 @@
-<?php
-
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-require_once('class_periode.php');
-
-/* !\file
- * \brief display or save a periode
- * variable received $op, $cn $user
- */
-$err =3D 0;
-$html =3D '';
-/* we check the security */
-switch ($op)
-{
-    case 'input_per':
-        $per =3D new Periode($cn, $_GET['p_id']);
-        $per->load();
-        $limit =3D $per->get_date_limit($_GET['p_id']);
-
-        $p_start =3D new IDate('p_start');
-        $p_start->value =3D $limit['p_start'];
-        $p_end =3D new IDate('p_end');
-        $p_end->value =3D $limit['p_end'];
-        $p_exercice =3D new INum('p_exercice');
-        $p_exercice->value =3D $per->p_exercice;
-
-        $html =3D '';
-        $html.=3DHtmlInput::anchor_close('mod_periode');
-        $html.=3Dh2info('Modification p=C3=A9riode');
-        $html.=3D'<p> Modifier les dates de d=C3=A9but et fin de p=C3=A9=
riode</p>';
-        $html.=3D'<p class=3D"notice">Cela pourrait avoir un impact sur =
les op=C3=A9rations d=C3=A9j=C3=A0 existantes</p>';
-        $html.=3D'<form method=3D"post" onsubmit=3D"return save_periode(=
this)">';
-        $html.=3Ddossier::hidden();
-        $html.=3D'<table>';
-
-        $html.=3Dtr(td(' D=C3=A9but p=C3=A9riode : ') . td($p_start->inp=
ut()));
-        $html.=3Dtr(td(' Fin p=C3=A9riode : ') . td($p_end->input()));
-        $html.=3Dtr(td(' Exercice : ') . td($p_exercice->input()));
-        $html.=3D'</table>';
-        $html.=3DHtmlInput::submit('sauver', 'sauver');
-        $html.=3DHtmlInput::button('close', 'Fermer', 'onclick=3D"remove=
Div(\'mod_periode\')"');
-        $html.=3DHtmlInput::hidden('p_id', $_GET['p_id']);
-        $html.=3D'</form>';
-        break;
-    case 'save_per':
-        $per =3D new Periode($cn, $_POST['p_id']);
-        $per->load();
-        if (isDate($_POST['p_start']) =3D=3D null ||
-                isDate($_POST['p_end'] =3D=3D null) ||
-                isNumber($_POST['p_exercice']) =3D=3D 0 ||
-                $_POST['p_exercice'] > 2099 ||
-                $_POST['p_exercice'] < 2000)
-        {
-            $html =3D '';
-            $html.=3DHtmlInput::anchor_close('mod_periode');
-            $html.=3D'<h2 class=3D"info"> Modifier les dates de d=C3=A9b=
ut et fin de p=C3=A9riode</h2>';
-            $html.=3D"<div class=3D\"error\">Erreur date invalide</div>"=
;
-
-            $html.=3DHtmlInput::button('close', 'Fermer', 'onclick=3D"re=
moveDiv(\'mod_periode\')"');
-        }
-        else
-        {
-            $sql =3D "update parm_periode set p_start=3Dto_date($1,'DD.M=
M.YYYY'),p_end=3Dto_date($2,'DD.MM.YYYY'),p_exercice=3D$3 where p_id=3D$4=
";
-            try
-            {
-                $cn->exec_sql($sql, array($_POST['p_start'], $_POST['p_e=
nd'], $_POST['p_exercice'], $_POST['p_id']));
-                $html =3D '<h2 class=3D"info"> Modifier les dates de d=C3=
=A9but et fin de p=C3=A9riode</h2>';
-                $html.=3D'<h2 class=3D"notice"> Sauv=C3=A9 </h2>';
-
-                $html.=3DHtmlInput::button('close', 'Fermer', 'onclick=3D=
"	refresh_window();"');
-            }
-            catch (Exception $e)
-            {
-                $html =3D alert($e->getTrace(), true);
-            }
-        }
-        break;
-}
-
-$html =3D escape_xml($html);
-header('Content-type: text/xml; charset=3DUTF-8');
-echo '<?xml version=3D"1.0" encoding=3D"UTF-8"?>';
-echo '<xml>';
-echo '<data>' . $html . '</data>';
-echo '</xml>';

Deleted: phpcompta/trunk/include/modify_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/modify_predf_op.php	2011-11-14 20:35:43 UTC (=
rev 4351)
+++ phpcompta/trunk/include/modify_predf_op.php	2011-11-15 09:51:13 UTC (=
rev 4352)
@@ -1,54 +0,0 @@
-<?php
-
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/* !\file
- * \brief display a form to change the name of a predefined operation
- */
-ob_start();
-echo HtmlInput::anchor_close('mod_predf_op');
-echo h2info('Modification du nom');
-echo '
-    <form method=3D"get" onsubmit=3D"save_predf_op(this);return false;">=
';
-$name =3D new IText('predf_name');
-$name->value =3D $cn->get_value('select od_name from op_predef where od_=
id=3D$1', array($_GET['id']));
-$name->size =3D 60;
-echo "Nom =3D" . $name->input();
-echo dossier::hidden() . HtmlInput::hidden('od_id', $_GET['id']);
-echo "<hr>";
-echo HtmlInput::submit('save', 'Sauve');
-echo HtmlInput::button('close', 'Annuler', 'onclick=3D"removeDiv(\'mod_p=
redf_op\')"');
-echo '</form>';
-
-
-$html =3D ob_get_contents();
-ob_clean();
-$html =3D escape_xml($html);
-
-header('Content-type: text/xml; charset=3DUTF-8');
-echo <<<EOF
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<data>
-<ctl>mod_predf_op</ctl>
-<code>$html</code>
-</data>
-EOF;

Deleted: phpcompta/trunk/include/save_predf_op.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/save_predf_op.php	2011-11-14 20:35:43 UTC (re=
v 4351)
+++ phpcompta/trunk/include/save_predf_op.php	2011-11-15 09:51:13 UTC (re=
v 4352)
@@ -1,33 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief save the new predefined operation=20
- * included from ajax_misc
- */
-
-if ( trim($_GET['predf_name']) !=3D '')
-  {
-    $cn->exec_sql('update op_predef set od_name =3D$1 where od_id=3D$2',
-		  array($_GET['predf_name'],$_GET['od_id']));
-    $cn->commit();
-  }

Deleted: phpcompta/trunk/include/show_profile.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/show_profile.inc.php	2011-11-14 20:35:43 UTC =
(rev 4351)
+++ phpcompta/trunk/include/show_profile.inc.php	2011-11-15 09:51:13 UTC =
(rev 4352)
@@ -1,81 +0,0 @@
-<?php
-
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/**
- * @file
- * @brief show the profile detail, included from ajax_misc.php
- * @see ajax_misc.php scripts.js profile.inc.php
- *
- */
-require_once 'class_profile_sql.php';
-require_once 'class_profile_menu.php';
-$profile=3Dnew Profile_sql($cn,$p_id);
-$gDossier=3DDossier::id();
-$add_one=3DHtmlInput::button("add", "Ajout Menu","onclick=3D\"add_menu({=
dossier:$gDossier,p_id:$p_id})\"")
-?>
-<hr>
-<h1>Profile <?=3D$profile->p_name?></h1>
-
-<?
-$id=3DHtmlInput::hidden('p_id',$profile->p_id);
-$name=3Dnew IText("p_name",$profile->p_name);
-$desc=3Dnew IText("p_desc",$profile->p_desc);
-$with_calc=3Dnew ICheckBox("with_calc","t");
-$with_calc->set_check($profile->with_calc);
-
-$with_direct_form=3Dnew ICheckBox("with_direct_form","t");
-$with_direct_form->set_check($profile->with_direct_form);
-
-echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
-echo HtmlInput::hidden('p_id',$profile->p_id);
-require_once("template/profile.php");
-echo HtmlInput::submit("save_name","Modifier");
-echo '</form>';
-
-echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
-
-echo '
-Vous pouvez aussi copier ce profil et puis le corriger';
-
-echo HtmlInput::hidden('p_id',$profile->p_id);
-echo HtmlInput::submit("clone","Copier");
-echo '</form>';
-
-echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
-
-echo '
-Effacer ce profil';
-
-echo HtmlInput::hidden('p_id',$profile->p_id);
-echo HtmlInput::submit("delete_profil","Effacer ce profil");
-echo '</form>';
-//Menu / Module /plugin in this profile
-echo "<h1> D=C3=A9tail du profile</h1>";
-echo "<h2>Menu</h2>";
-echo $add_one;
-$profile_menu=3Dnew Profile_Menu($cn);
-$profile_menu->listing_profile($p_id);
-echo "<h2>Impression</h2>";
-$profile_menu->printing($p_id);
-?>
-<?=3D$add_one?>

Deleted: phpcompta/trunk/include/template/add_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/add_menu.php	2011-11-14 20:35:43 UTC=
 (rev 4351)
+++ phpcompta/trunk/include/template/add_menu.php	2011-11-15 09:51:13 UTC=
 (rev 4352)
@@ -1,86 +0,0 @@
-<?php
-
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/**
- * @file
- * @brief show the form to add a menu
- */
-$ame_code_dep=3D$cn->make_array("
-	select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') =
from
-	menu_ref
-	where
-	me_file is null and me_javascript is null and me_type<>'PR'
-		UNION ALL
-		select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')=
 from menu_ref
-	where
-		me_code=3D'EXTENSION'
-	order by 1
-	",1);
-$ame_code=3D$cn->make_array("
-	select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') =
from
-	menu_ref
-	order by 1
-	");
-$p_order=3Dnew INum("p_order","10");
-$atype=3D$cn->make_array("select pm_type,pm_desc from profile_menu_type =
order by 1");
-
-$me_code=3Dnew ISelect('me_code');
-$me_code->value=3D$ame_code;
-
-$me_code_dep=3Dnew ISelect('me_code_dep');
-$me_code_dep->value=3D$ame_code_dep;
-
-$p_type=3Dnew ISelect('p_type');
-$p_type->value=3D$atype;
-$pm_default=3Dnew ICheckBox('pm_default');
-echo HtmlInput::title_box("Nouveau menu", $ctl);
-?>
-<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
-	<?=3DHtmlInput::hidden('p_id',$p_id)?>
-<table>
-<tr>
-	<td>Code</td>
-	<td><?=3D$me_code->input()?></td>
-</tr>
-<tr>
-	<td>D=C3=A9pendant de </td>
-	<td><?=3D$me_code_dep->input()?></td>
-</tr>
-
-<tr>
-	<td>Ordre d'apparition</td>
-	<td><?=3D$p_order->input()?></td>
-</tr>
-<tr>
-	<td>Menu par d=C3=A9faut</td>
-	<td><?=3D$pm_default->input()?></td>
-</tr>
-<tr>
-	<td>Type de menu</td>
-	<td><?=3D$p_type->input()?></td>
-</tr>
-</table>
-<?
-echo HtmlInput::submit('add_menu',"Valider");
-echo '</form>';
-?>

Deleted: phpcompta/trunk/include/template/plugin_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/plugin_detail.php	2011-11-14 20:35:4=
3 UTC (rev 4351)
+++ phpcompta/trunk/include/template/plugin_detail.php	2011-11-15 09:51:1=
3 UTC (rev 4352)
@@ -1,62 +0,0 @@
-<?php
-
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/**
- * @file
- * @brief add, modify or delete plugin
- *
- */
-$msg=3D($new=3D=3D1)?"Nouvelle extension":"Modification ".$me_menu->valu=
e;
-echo HtmlInput::title_box($msg, $ctl);
-?>
-<form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez')">
-<table>
-	<tr>
-		<TD>Label</td>
-		<td><?=3D$me_menu->input();?></td>
-	</tr>
-	<tr>
-		<TD>Code</td>
-		<td><?=3D$me_code->input();?></td>
-	</tr>
-	<tr>
-		<TD>Description</td>
-		<td><?=3D$me_description->input();?></td>
-	</tr>
-	<tr>
-		<TD>Fichier</td>
-		<td><?=3D$me_file->input();?></td>
-	</tr>
-</table>
-	<?
-	if ($new =3D=3D1 )
-	{
-		echo HtmlInput::submit("save_plugin","Ajouter ce plugin");
-	} else {
-		$delete=3Dnew ICheckBox('delete_pl');
-		echo "<p>Voulez-vous effacer ce plugin ? ".$delete->input()."</p>";
-		echo HtmlInput::submit("mod_plugin","Modifier ce plugin");
-
-	}
-	?>
-</form>
\ No newline at end of file



From MAILER-DAEMON Tue Nov 15 05:35:50 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQGMo-0001UI-AI
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 05:35:50 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 11:41:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.16594.1321353349.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4353 - in phpcompta/trunk: html 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: Tue, 15 Nov 2011 10:35:49 -0000

Author: danydb
Date: 2011-11-15 11:41:26 +0100 (Tue, 15 Nov 2011)
New Revision: 4353

Added:
   phpcompta/trunk/html/ajax_todo_list.php
Removed:
   phpcompta/trunk/html/todo_list.php
Modified:
   phpcompta/trunk/html/js/todo_list.js
   phpcompta/trunk/html/show_document.php
   phpcompta/trunk/include/class_calendar.php
   phpcompta/trunk/include/class_database.php
   phpcompta/trunk/include/class_todo_list.php
   phpcompta/trunk/include/constant.security.php
   phpcompta/trunk/include/template/security_list_action.php
   phpcompta/trunk/sql/upgrade.sql
Log:
#450 s?\195?\169curit?\195?\169 ajax : ajout d'action
code cleaning : renommage de fichier pour ajax

Copied: phpcompta/trunk/html/ajax_todo_list.php (from rev 4352, phpcompta=
/trunk/html/todo_list.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_todo_list.php	                        (rev =
0)
+++ phpcompta/trunk/html/ajax_todo_list.php	2011-11-15 10:41:26 UTC (rev =
4353)
@@ -0,0 +1,66 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ * \brief handle the ajax request for the todo_list (delete, update
+ * and insert)
+ * for add, needed parameters=20
+ * - gDossier
+ * - d date,=20
+ * - t title=20
+ * - de description
+ * for update, same as ADD +=20
+ * - i id
+ * for delete
+ * - gDossier=20
+ * - i id
+ */
+require_once ('class_dossier.php');
+require_once ('class_todo_list.php');
+require_once ('class_database.php');
+
+$cn=3Dnew Database($gDossier);
+$user=3Dnew User($cn);
+$user->check(true);
+$user->check_dossier($gDossier,true);
+ajax_disconnected('add_todo_list');
+
+if (isset($_REQUEST['show']))
+{
+    $cn=3Dnew Database(dossier::id());
+    $todo=3Dnew Todo_list($cn);
+    $todo->set_parameter('id',$_REQUEST['id']);
+    $todo->load();
+    header('Content-type: text/xml; charset=3DUTF-8');
+    header ('<?xml version=3D"1.0" encoding=3D"UTF-8"?>');
+    echo $todo->toXML();
+    exit();
+}
+
+if (isset($_REQUEST['del']))
+{
+    $cn=3Dnew Database(dossier::id());
+    $todo=3Dnew Todo_list($cn);
+    $todo->set_parameter('id',$_REQUEST['id']);
+    $todo->delete();
+    exit();
+}

Modified: phpcompta/trunk/html/js/todo_list.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/todo_list.js	2011-11-15 09:51:13 UTC (rev 435=
2)
+++ phpcompta/trunk/html/js/todo_list.js	2011-11-15 10:41:26 UTC (rev 435=
3)
@@ -34,7 +34,7 @@
     try
     {
         var action=3Dnew Ajax.Request(
-                       'todo_list.php',
+                       'ajax_todo_list.php',
                        {
                    method:'get',
                    parameters:
@@ -107,7 +107,7 @@
     var gDossier=3D$('gDossier').value;
=20
     var action=3Dnew Ajax.Request(
-                   'todo_list.php',
+                   'ajax_todo_list.php',
                    {
                    method:'get',
                    parameters:

Modified: phpcompta/trunk/html/show_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_document.php	2011-11-15 09:51:13 UTC (rev 4=
352)
+++ phpcompta/trunk/html/show_document.php	2011-11-15 10:41:26 UTC (rev 4=
353)
@@ -39,16 +39,22 @@
 /* Show the document */
 if ( $action =3D=3D 'sh')
 {
-    // retrieve the document
-    $doc=3Dnew Document($cn,$_REQUEST['d_id']);
-    $doc->Send();
+    if ( $User->check_action(VIEWDOC)=3D=3D1)
+    {
+        // retrieve the document
+        $doc=3Dnew Document($cn,$_REQUEST['d_id']);
+        $doc->Send();
+    }
 }
 /* remove the document */
 if ( $action =3D=3D 'rm' )
 {
-    $doc=3Dnew Document($cn,$_REQUEST['d_id']);
-    $doc->remove();
-    $json=3Dsprintf('{"d_id":"%s"}',$_REQUEST['d_id']);
-    header("Content-type: text/html; charset: utf8",true);
-    print $json;
+    if ($User->check_action(RMDOC)=3D=3D1)
+    {
+        $doc=3Dnew Document($cn,$_REQUEST['d_id']);
+        $doc->remove();
+        $json=3Dsprintf('{"d_id":"%s"}',$_REQUEST['d_id']);
+        header("Content-type: text/html; charset: utf8",true);
+        print $json;
+    }
 }

Deleted: phpcompta/trunk/html/todo_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/todo_list.php	2011-11-15 09:51:13 UTC (rev 4352)
+++ phpcompta/trunk/html/todo_list.php	2011-11-15 10:41:26 UTC (rev 4353)
@@ -1,61 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief handle the ajax request for the todo_list (delete, update
- * and insert)
- * for add, needed parameters=20
- * - gDossier
- * - d date,=20
- * - t title=20
- * - de description
- * for update, same as ADD +=20
- * - i id
- * for delete
- * - gDossier=20
- * - i id
- */
-require_once ('class_dossier.php');
-require_once ('class_todo_list.php');
-require_once ('class_database.php');
-
-/*!\todo needs security for the users */
-if (isset($_REQUEST['show']))
-{
-    $cn=3Dnew Database(dossier::id());
-    $todo=3Dnew Todo_list($cn);
-    $todo->set_parameter('id',$_REQUEST['id']);
-    $todo->load();
-    header('Content-type: text/xml; charset=3DUTF-8');
-    header ('<?xml version=3D"1.0" encoding=3D"UTF-8"?>');
-    echo $todo->toXML();
-    exit();
-}
-/*!\todo needs security for the users */
-if (isset($_REQUEST['del']))
-{
-    $cn=3Dnew Database(dossier::id());
-    $todo=3Dnew Todo_list($cn);
-    $todo->set_parameter('id',$_REQUEST['id']);
-    $todo->delete();
-    exit();
-}

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	2011-11-15 09:51:13 UTC (r=
ev 4352)
+++ phpcompta/trunk/include/class_calendar.php	2011-11-15 10:41:26 UTC (r=
ev 4353)
@@ -135,9 +135,21 @@
     function get_preference()
     {
         $cn=3Dnew Database(dossier::id());
-        $user=3Dnew User($cn);
-        $this->default_periode=3D$user->get_periode();
-        return  $this->default_periode;
+        $today=3Ddate('d.m.Y');
+        $p_id=3D$cn->get_value("
+                select p_id from parm_periode=20
+                where=20
+                p_start <=3D to_date($1,'DD.MM.YYYY')
+                and=20
+                p_end >=3D to_date($1,'DD.MM.YYYY')",
+                array($today));
+        if ( $p_id =3D=3D '')
+        {
+            $user=3Dnew User($cn);
+            $this->default_periode=3D$user->get_periode();
+            $p_id=3D$this->default_periode;
+        }
+        return  $p_id;
     }
     /**
      *@brief set the periode to the parameter, change the value of $this=
->default_periode

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	2011-11-15 09:51:13 UTC (r=
ev 4352)
+++ phpcompta/trunk/include/class_database.php	2011-11-15 10:41:26 UTC (r=
ev 4353)
@@ -160,8 +160,8 @@
                 print_r($p_array);
                 echo $a->getMessage();
                 echo $a->getTrace();
-				echo $a->getTraceAsString();
-				echo pg_last_error($this->db);
+                echo $a->getTraceAsString();
+                echo pg_last_error($this->db);
             }
             throw ($a);
         }

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	2011-11-15 09:51:13 UTC (=
rev 4352)
+++ phpcompta/trunk/include/class_todo_list.php	2011-11-15 10:41:26 UTC (=
rev 4353)
@@ -198,11 +198,11 @@
     {
=20
         $sql=3D"select tl_id,tl_title,tl_desc,to_char( tl_date,'DD.MM.YY=
YY') as tl_date
-             from todo_list where tl_id=3D$1";
+             from todo_list where tl_id=3D$1 and use_login=3D$2";
=20
         $res=3D$this->cn->exec_sql(
                  $sql,
-                 array($this->tl_id)
+                 array($this->tl_id,$_SESSION['g_user'])
              );
=20
         if ( Database::num_row($res) =3D=3D 0 ) return;
@@ -215,8 +215,8 @@
     }
     public function delete()
     {
-        $sql=3D"delete from todo_list where tl_id=3D$1";
-        $res=3D$this->cn->exec_sql($sql,array($this->tl_id));
+        $sql=3D"delete from todo_list where tl_id=3D$1 and use_login=3D$=
2";
+        $res=3D$this->cn->exec_sql($sql,array($this->tl_id,$_SESSION['g_=
user']));
=20
     }
     /**

Modified: phpcompta/trunk/include/constant.security.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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.security.php	2011-11-15 09:51:13 UTC=
 (rev 4352)
+++ phpcompta/trunk/include/constant.security.php	2011-11-15 10:41:26 UTC=
 (rev 4353)
@@ -2,5 +2,7 @@
 define ('FICADD',800);	 /* Ajout de fiche */
 define ("FIC",805);  //Cr=C3=A9ation, modification et effacement de fich=
e
 define ("FICCAT",910);  //cr=C3=A9ation, modification et effacement de c=
at=C3=A9gorie de fiche
+define ('RMDOC',1020);   // Effacement de document pour follow up
+define ('VIEWDOC',1010);   // Voir document pour follow up
 global $audit; $audit=3Dtrue;
 ?>

Modified: phpcompta/trunk/include/template/security_list_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/security_list_action.php	2011-11-15 =
09:51:13 UTC (rev 4352)
+++ phpcompta/trunk/include/template/security_list_action.php	2011-11-15 =
10:41:26 UTC (rev 4353)
@@ -49,3 +49,6 @@
 			<?php   $array=3D$cn->get_array("select ac_id, ac_description from ac=
tion  where ac_id >=3D$1 and ac_id <=3D$2 order by ac_id ",
 				array(800,1000));
                                 display_security_fieldset(_('Fiche'),$ar=
ray,$sec_User); ?>
+                        <?php   $array=3D$cn->get_array("select ac_id, a=
c_description from action  where ac_id >=3D$1 and ac_id <=3D$2 order by a=
c_id ",
+				array(1050,1100));
+                                display_security_fieldset(_('Suivi'),$ar=
ray,$sec_User); ?>

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	2011-11-15 09:51:13 UTC (rev 4352)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-15 10:41:26 UTC (rev 4353)
@@ -6,7 +6,8 @@
 drop table public.format_csv_banque;
 insert into parameter values ('MY_ALPHANUM','N');
 delete from action where ac_id not in (800,805,910);
-
+insert into action (ac_id,ac_description, ac_module, ac_code) values(102=
0,'Effacer les documents du suivi','followup','RMDOC');
+insert into action (ac_id,ac_description, ac_module, ac_code) values(101=
0,'Voir les documents du suivi','followup','VIEWDOC');
 /*
 script SQL to run
 */



From MAILER-DAEMON Tue Nov 15 06:26:33 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQH9t-00055P-3l
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 06:26:33 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 12:32:05 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.16699.1321356391.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4354 - in phpcompta/trunk: dev 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: Tue, 15 Nov 2011 11:26:30 -0000

Author: danydb
Date: 2011-11-15 12:32:03 +0100 (Tue, 15 Nov 2011)
New Revision: 4354

Added:
   phpcompta/trunk/include/class_impress.php
Removed:
   phpcompta/trunk/include/impress_inc.php
Modified:
   phpcompta/trunk/dev/test_parse_formula.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/class_acc_bilan.php
   phpcompta/trunk/include/class_acc_report.php
   phpcompta/trunk/include/config.inc
   phpcompta/trunk/include/config_file.php
   phpcompta/trunk/include/export_bilan_oth.php
   phpcompta/trunk/include/export_fiche_detail_pdf.php
   phpcompta/trunk/include/export_form_csv.php
   phpcompta/trunk/include/export_form_pdf.php
   phpcompta/trunk/include/export_gl_csv.php
   phpcompta/trunk/include/export_gl_pdf.php
   phpcompta/trunk/include/export_ledger_pdf.php
   phpcompta/trunk/include/export_poste_detail_pdf.php
   phpcompta/trunk/sql/upgrade.sql
Log:
#452 : change parseFormula and checkFormula in a OO Way + renaming of fun=
ctions and file, create a new class : Impress

Modified: phpcompta/trunk/dev/test_parse_formula.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/dev/test_parse_formula.php	2011-11-15 10:41:26 UTC (r=
ev 4353)
+++ phpcompta/trunk/dev/test_parse_formula.php	2011-11-15 11:32:03 UTC (r=
ev 4354)
@@ -1,10 +1,10 @@
 <?
 /*
-# check the CheckFormula and the ParseFormula
+# check the Impress::check_formula and the parse_formula
 # This file is a part of PhpCompta under GPL
 # Author D. DE BONTRIDDER ddebontridder@yahoo.fr
 */
-include_once('impress_inc.php');
+include_once('class_impress.php');
=20
 echo '<hr>';
 foreach ( array('1',
@@ -30,21 +30,21 @@
 		'ls -1')
 	as $a ) {
   echo "Testing :".$a;
-  echo (CheckFormula($a)=3D=3Dfalse)?'Non valide ':'ok';
+  echo (Impress::check_formula($a)=3D=3Dfalse)?'Non valide ':'ok';
=20
   echo '<br>';
  =20
   foreach (array('+','-','/') as $b ) {
     $ee=3Dstr_replace('*',$b,$a);
     echo "Testing :".$ee;
-    echo (CheckFormula($ee)=3D=3Dfalse)?'Non valide ':'ok';
+    echo (Impress::check_formula($ee)=3D=3Dfalse)?'Non valide ':'ok';
     echo '<br>';
=20
   }
   for($e=3D0;$e<3;$e++) {
     $a.=3D"*".$a;
   echo "Testing :".$a;
-  echo (CheckFormula($a)=3D=3Dfalse)?'Non valide ':'ok';
+  echo (Impress::check_formula($a)=3D=3Dfalse)?'Non valide ':'ok';
   echo '<br>';
=20
   }

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-15 10:41:26 UTC (rev 43=
53)
+++ phpcompta/trunk/include/ac_common.php	2011-11-15 11:32:03 UTC (rev 43=
54)
@@ -619,6 +619,8 @@
  */
 function set_language()
 {
+    // desactivate local check
+    if ( defined(LOCALE) && LOCALE=3D=3D0 ) return;
     $dir =3D "";
     // set differently the language depending of the operating system
     if (what_os() =3D=3D 1)
@@ -859,10 +861,6 @@
=20
     if (empty($amenu) || count($amenu) =3D=3D 1)
     {
-	/**
-	 * @todo add security
-	 * check if user can access this module
-	 */
 		$file =3D $cn->get_array("select me_file,me_parameter,me_javascript,me=
_type
 		from menu_ref
 		join profile_menu using (me_code)

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	2011-11-15 10:41:26 UTC (=
rev 4353)
+++ phpcompta/trunk/include/class_acc_bilan.php	2011-11-15 11:32:03 UTC (=
rev 4354)
@@ -27,7 +27,7 @@
 require_once("class_iselect.php");
 require_once ('class_database.php');
 require_once ('class_dossier.php');
-require_once ('impress_inc.php');
+require_once ('class_impress.php');
 require_once ('header_print.php');
 require_once ('class_acc_account_ledger.php');
=20
@@ -305,7 +305,7 @@
         while (! feof ($p_handle))
         {
             $buffer=3Dtrim(fgets($p_handle));
-            // $a=3D(CheckFormula($buffer)  =3D=3D true)?"$buffer ok<br>=
":'<font color=3D"red">'.'Pas ok '.$buffer."</font><br>";
+            // $a=3D(Impress::check_formula($buffer)  =3D=3D true)?"$buf=
fer ok<br>":'<font color=3D"red">'.'Pas ok '.$buffer."</font><br>";
             // echo $a;
             // blank line are skipped
             if (strlen(trim($buffer))=3D=3D0)
@@ -315,7 +315,7 @@
                 continue;
             // buffer contains a formula A$=3D....
             // We need to eval it
-            $a=3DParseFormula($this->db,"$buffer",$buffer,$this->from,$t=
his->to,false);
+            $a=3DImpress::parse_formula($this->db,"$buffer",$buffer,$thi=
s->from,$this->to,false);
             $b=3Dstr_replace("$","\$this->",$a);
             if ( eval("$b;") =3D=3D=3D false )
                 echo_debug(__FILE__,__LINE__,"Code failed with $b");

Modified: phpcompta/trunk/include/class_acc_report.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_report.php	2011-11-15 10:41:26 UTC =
(rev 4353)
+++ phpcompta/trunk/include/class_acc_report.php	2011-11-15 11:32:03 UTC =
(rev 4354)
@@ -25,7 +25,7 @@
 require_once("class_itext.php");
 require_once("class_ibutton.php");
 require_once('class_acc_report_row.php');
-require_once('impress_inc.php');
+require_once('class_impress.php');
=20
 /*!
  * \brief Class rapport  Create, view, modify and parse report
@@ -85,7 +85,7 @@
         for ($i=3D0;$i<$Max;$i++)
         {
             $l_line=3DDatabase::fetch_array($Res,$i);
-            $col[]=3DParseFormula($this->db,
+            $col[]=3DImpress::parse_formula($this->db,
                                 $l_line['fo_label'],
                                 $l_line['fo_formula'],
                                 $p_start,

Copied: phpcompta/trunk/include/class_impress.php (from rev 4352, phpcomp=
ta/trunk/include/impress_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/class_impress.php	                        (re=
v 0)
+++ phpcompta/trunk/include/class_impress.php	2011-11-15 11:32:03 UTC (re=
v 4354)
@@ -0,0 +1,233 @@
+<?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
+*/
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+// $Revision$
+/*!\file
+ * \brief contains function for the printing
+ * \todo the functions of class_impress.php should be replaced in a OO w=
ay
+*/
+require_once('class_periode.php');
+
+
+class Impress
+{
+    /*! \brief   Purpose Parse a formula
+     *=20
+     * \param $p_cn connexion
+     * \param $p_label
+     * \param $p_formula
+     * \param $p_eval  true if we eval here otherwise the function retur=
ns
+     *                 a string which must be evaluated
+     * \param $p_type_date : type of the date 0 for accountant period or=
 1
+     * for calendar
+     * \return array
+     *
+     *
+     */
+    static function parse_formula($p_cn,$p_label,$p_formula,$p_start,$p_=
end,$p_eval=3Dtrue,$p_type_date=3D0)
+    {
+
+        if ( Impress::check_formula($p_formula) =3D=3D false)
+        {
+            if ( $p_eval =3D=3D true)
+                return array('desc'=3D>$p_label.'  Erreur Formule!',
+                             'montant'=3D>0);
+            else
+                return $p_formula;
+
+        }
+        if ( $p_type_date =3D=3D 0 )
+            $cond=3Dsql_filter_per($p_cn,$p_start,$p_end,'p_id','j_tech_=
per');
+        else
+            $cond=3D"( j_date >=3D to_date('$p_start','DD.MM.YYYY') and =
j_date <=3D to_date('$p_end','DD.MM.YYYY'))";
+        include_once("class_acc_account_ledger.php");
+
+        //    while (@ereg("(\[[0-9]*%*D*C*S*\])",$p_formula,$e) =3D=3D =
true)
+        while (preg_match_all("(\[[0-9]*%*D*C*S*\])",$p_formula,$e) =3D=3D=
 true)
+          {
+
+            // remove the [ ]
+            $x=3D$e[0];
+            foreach ($x as $line)
+              {
+                $compute=3D'all';
+                if ( strpos($line,'D') !=3D 0 )
+                  $compute=3D'deb';
+                if ( strpos($line,'C') !=3D 0 )
+                  $compute=3D'cred';
+                if ( strpos($line,'S') !=3D 0 )
+                  $compute=3D'signed';
+                $line=3Dstr_replace ("[","",$line);
+                $line=3Dstr_replace ("]","",$line);
+                $line=3Dstr_replace ("D","",$line);
+                $line=3Dstr_replace ("C","",$line);
+                $line=3Dstr_replace ("S","",$line);
+                // If there is a FROM clause we must recompute
+                // the time cond
+
+                if ($p_type_date =3D=3D 0 && preg_match ("/FROM=3D[0-9]+=
\.[0-9]+/", $p_formula,$afrom) =3D=3D 1 )
+                  {
+                    // There is a FROM clause
+                    // then we must modify the cond for the periode
+                    $from=3Dstr_replace("FROM=3D","",$afrom[0]);
+
+                    // Get the periode
+                    /*! \note special value for the clause FROM=3D00.000=
0
+                     */
+                    if ( $from =3D=3D '00.0000' )
+                      {
+
+                        // retrieve the first month of this periode
+                        $User=3Dnew User($p_cn);
+                        $user_periode=3D$User->get_periode();
+                        $oPeriode=3Dnew Periode($p_cn);
+                        $periode=3D$oPeriode->get_exercice($user_periode=
);
+                        list($first,$last)=3D$oPeriode->get_limit($perio=
de);
+                        $ret=3D$first->get_date_limit();
+                        $end_date=3D$oPeriode->get_date_limit($p_end);
+                        if ($ret =3D=3D null ) throw new Exception ('Pas=
 de limite =C3=A0 cette p=C3=A9riode',1);
+                        $cond=3Dsql_filter_per($p_cn,$ret['p_start'],$en=
d_date['p_end'],'date','j_tech_per');
+
+
+                      }
+                    else
+                      {
+                        $oPeriode=3Dnew Periode($p_cn);
+                        try
+                          {
+                            $from=3D$oPeriode->find_periode('01'.$from);
+                          }
+                        catch (Exception $exp)
+                          {
+                            /* if none periode is found
+                               then we take the first periode of the yea=
r
+                            */
+                            $User=3Dnew User($p_cn);
+                            $user_periode=3D$User->get_periode();
+
+                            $year=3D$oPeriode->get_exercice($user_period=
e);
+                            list($first,$last)=3D$oPeriode->get_limit($y=
ear);
+                            $ret=3D$first->get_date_limit();
+                            $end_date=3D$oPeriode->get_date_limit($p_end=
);
+                            if ($ret =3D=3D null ) throw new Exception (=
'Pas de limite =C3=A0 cette p=C3=A9riode',1);
+                            $cond=3Dsql_filter_per($p_cn,$ret['p_start']=
,$end_date['p_end'],'date','j_tech_per');
+                          }
+                      }
+                  }
+
+                if ( strpos($p_formula,"FROM") !=3D 0)
+                  {
+                    // We remove FROM out of the p_formula
+                    $p_formula=3Dsubstr_replace($p_formula,"",strpos($p_=
formula,"FROM"));
+                  }
+
+                // Get sum of account
+                $P=3Dnew Acc_Account_Ledger($p_cn,$line);
+                $detail=3D$P->get_solde_detail($cond);
+
+
+                if ( $compute=3D=3D'all')
+                  $i=3D$detail['solde'];
+                if ( $compute=3D=3D'deb')
+                  $i=3D$detail['debit'];
+                if ( $compute=3D=3D'cred')
+                  $i=3D$detail['credit'];
+                if ( $compute=3D=3D'signed')
+                  $i=3D$detail['debit']-$detail['credit'];
+                $p_formula=3Dstr_replace($x[0],$i,$p_formula);
+              }
+          }
+
+        // $p_eval is true then we eval and returns result
+        if ( $p_eval =3D=3D true)
+        {
+            $p_formula=3D"\$result=3D".$p_formula.";";
+
+            eval("$p_formula");
+
+            while (preg_match("/\[([0-9]+)([Tt]*)\]/",trim($p_label),$e)=
 =3D=3D 1)
+            {
+                $nom =3D "!!".$e[1]."!!";
+                if (Impress::check_formula($e[0]))
+                {
+                    $nom =3D $p_cn->get_value ( "SELECT pcm_lib AS acct_=
name FROM tmp_pcmn WHERE pcm_val::text LIKE $1||'%' ORDER BY pcm_val ASC =
LIMIT 1",array($e[1]));
+                    if($nom)
+                    {
+                        if($e[2] =3D=3D 'T') $nom =3D strtoupper($nom);
+                        if($e[2] =3D=3D 't') $nom =3D strtolower($nom);
+                    }
+                }
+                $p_label =3D str_replace($e[0], $nom, $p_label);
+            }
+
+            $aret=3Darray('desc'=3D>$p_label,
+                        'montant'=3D>$result);
+            return $aret;
+        }
+        else
+        {
+            // $p_eval is false we returns only the string
+            return $p_formula;
+        }
+    }
+    /*!
+     * \brief  Check if formula doesn't contain
+     *           php injection
+     * \param string
+     *
+     * \return true if the formula is good otherwise false
+     */
+    static function Impress::check_formula($p_string)
+    {
+        // the preg_match gets too complex if we want to add a test
+        // for parenthesis, math function...
+        // So I prefer remove them before testing
+        $p_string=3Dstr_replace("round","",$p_string);
+        $p_string=3Dstr_replace("abs","",$p_string);
+        $p_string=3Dstr_replace("(","",$p_string);
+        $p_string=3Dstr_replace(")","",$p_string);
+        // for  the inline test like $a=3D(cond)?value:other;
+        $p_string=3Dstr_replace("?","+",$p_string);
+        $p_string=3Dstr_replace(":","+",$p_string);
+        $p_string=3Dstr_replace(">=3D","+",$p_string);
+        $p_string=3Dstr_replace("<=3D","+",$p_string);
+        $p_string=3Dstr_replace(">","+",$p_string);
+        $p_string=3Dstr_replace("<","+",$p_string);
+        // eat Space
+        $p_string=3Dstr_replace(" ","",$p_string);
+        // Remove D/C/S
+        $p_string=3Dstr_replace("C","",$p_string);
+        $p_string=3Dstr_replace("D","",$p_string);
+        $p_string=3Dstr_replace("S","",$p_string);
+        // Remove T,t
+        $p_string=3Dstr_replace("T","",$p_string);
+        $p_string=3Dstr_replace("t","",$p_string);
+
+        if ( @ereg ("^(\\$[a-zA-Z]*[0-9]*=3D){0,1}((\[{0,1}[0-9]+\.*[0-9=
]*%{0,1}\]{0,1})+ *([+-\*/])* *(\[{0,1}[0-9]+\.*[0-9]*%{0,1}\]{0,1})*)*((=
[+-\*/])*\\$([a-zA-Z])+[0-9]*([+-\*/])*)* *( *FROM=3D[0-9][0-0].20[0-9][0=
-9]){0,1}$",$p_string) =3D=3D false)
+        {
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+}
+?>

Modified: phpcompta/trunk/include/config.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config.inc	2011-11-15 10:41:26 UTC (rev 4353)
+++ phpcompta/trunk/include/config.inc	2011-11-15 11:32:03 UTC (rev 4354)
@@ -36,3 +36,4 @@
 //
 // the domain can't start by a number !!!
 define ("domaine","");
+define ("LOCALE",1);
\ No newline at end of file

Modified: phpcompta/trunk/include/config_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config_file.php	2011-11-15 10:41:26 UTC (rev =
4353)
+++ phpcompta/trunk/include/config_file.php	2011-11-15 11:32:03 UTC (rev =
4354)
@@ -62,6 +62,7 @@
         $cpasswd=3D'dany';
         $cport=3D5432;
         $cdomain=3D'';
+        $clocal=3D1;
     }
     else extract ($p_array);
=20
@@ -76,6 +77,12 @@
     $r.=3D'<A href=3D"#" title=3D"'.$text->title.'" onclick=3D"alert(\''=
.$text->title.'\')">(?)</a>';
     $r.=3D'<br>';
=20
+    $r.=3D'D&eacute;sactivation changement de langue: ';
+    $text->title=3D'D&eacute;sactiver le changement de langue (requis po=
ur MacOSX';
+    $r.=3D$text->input('clocale',$clocale);
+    $r.=3D'<A href=3D"#" title=3D"'.$text->title.'" onclick=3D"alert(\''=
.$text->title.'\')">(?)</a>';
+    $r.=3D'<br>';
+   =20
     $r.=3D'Chemin complet vers les executable de Postgresql : ';
     $text->title=3D'Le chemin vers le repertoire contenant psql, pg_dump=
...';
     $r.=3D$text->input('cpath',$cpath);
@@ -140,6 +147,9 @@
     fputs($hFile, 'define ("phpcompta_psql_host","127.0.0.1");');
     fputs($hFile,"\r\n");
=20
+    fputs($hFile, 'define ("locale",'.$clocal.');');
+    fputs($hFile,"\r\n");
+   =20
     fputs($hFile, 'define ("domaine","");');
     fputs($hFile,"\r\n");
     fputs($hFile,'?>');

Modified: phpcompta/trunk/include/export_bilan_oth.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_bilan_oth.php	2011-11-15 10:41:26 UTC =
(rev 4353)
+++ phpcompta/trunk/include/export_bilan_oth.php	2011-11-15 11:32:03 UTC =
(rev 4354)
@@ -22,7 +22,7 @@
  * \brief send a Bilan in RTF format
  */
 include_once("ac_common.php");
-include_once("impress_inc.php");
+include_once("class_impress.php");
 require_once('class_database.php');
 require_once ('header_print.php');
 require_once ('class_acc_bilan.php');

Modified: phpcompta/trunk/include/export_fiche_detail_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_detail_pdf.php	2011-11-15 10:41:=
26 UTC (rev 4353)
+++ phpcompta/trunk/include/export_fiche_detail_pdf.php	2011-11-15 11:32:=
03 UTC (rev 4354)
@@ -26,7 +26,7 @@
 include_once("class_acc_account_ledger.php");
 include_once("ac_common.php");
 require_once('class_database.php');
-include_once("impress_inc.php");
+include_once("class_impress.php");
 require_once("class_fiche.php");
 require_once ('header_print.php');
 require_once('class_dossier.php');

Modified: phpcompta/trunk/include/export_form_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_form_csv.php	2011-11-15 10:41:26 UTC (=
rev 4353)
+++ phpcompta/trunk/include/export_form_csv.php	2011-11-15 11:32:03 UTC (=
rev 4354)
@@ -25,7 +25,7 @@
 require_once('class_database.php');
 require_once ('class_user.php');
 require_once("class_acc_report.php");
-require_once("impress_inc.php");
+require_once("class_impress.php");
 header('Pragma: public');
 header('Content-type: application/csv');
 header('Content-Disposition: attachment;filename=3D"rapport.csv"',FALSE)=
;

Modified: phpcompta/trunk/include/export_form_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_form_pdf.php	2011-11-15 10:41:26 UTC (=
rev 4353)
+++ phpcompta/trunk/include/export_form_pdf.php	2011-11-15 11:32:03 UTC (=
rev 4354)
@@ -27,7 +27,7 @@
 include_once("class_acc_report.php");
 include_once("ac_common.php");
 require_once('class_database.php');
-include_once("impress_inc.php");
+include_once("class_impress.php");
 require_once('class_user.php');
 require_once ('header_print.php');
 require_once('class_dossier.php');

Modified: phpcompta/trunk/include/export_gl_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_gl_csv.php	2011-11-15 10:41:26 UTC (re=
v 4353)
+++ phpcompta/trunk/include/export_gl_csv.php	2011-11-15 11:32:03 UTC (re=
v 4354)
@@ -27,7 +27,7 @@
 include_once('class_acc_account_ledger.php');
 include_once('ac_common.php');
 require_once('class_database.php');
-include_once('impress_inc.php');
+include_once('class_impress.php');
 require_once('class_own.php');
 require_once('class_dossier.php');
 require_once('class_user.php');

Modified: phpcompta/trunk/include/export_gl_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_gl_pdf.php	2011-11-15 10:41:26 UTC (re=
v 4353)
+++ phpcompta/trunk/include/export_gl_pdf.php	2011-11-15 11:32:03 UTC (re=
v 4354)
@@ -27,7 +27,7 @@
 include_once('class_acc_account_ledger.php');
 include_once('ac_common.php');
 require_once('class_database.php');
-include_once('impress_inc.php');
+include_once('class_impress.php');
 require_once('class_own.php');
 require_once('class_dossier.php');
 require_once('class_user.php');

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	2011-11-15 10:41:26 UTC=
 (rev 4353)
+++ phpcompta/trunk/include/export_ledger_pdf.php	2011-11-15 11:32:03 UTC=
 (rev 4354)
@@ -32,7 +32,7 @@
 include_once('class_user.php');
 include_once("ac_common.php");
 require_once('class_database.php');
-include_once("impress_inc.php");
+include_once("class_impress.php");
 include_once("class_acc_ledger.php");
 require_once('class_own.php');
 require_once('class_periode.php');

Modified: phpcompta/trunk/include/export_poste_detail_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_poste_detail_pdf.php	2011-11-15 10:41:=
26 UTC (rev 4353)
+++ phpcompta/trunk/include/export_poste_detail_pdf.php	2011-11-15 11:32:=
03 UTC (rev 4354)
@@ -26,7 +26,7 @@
 include_once("class_acc_account_ledger.php");
 include_once("ac_common.php");
 require_once('class_database.php');
-include_once("impress_inc.php");
+include_once("class_impress.php");
 require_once ('header_print.php');
 require_once('class_dossier.php');
 require_once('class_user.php');

Deleted: phpcompta/trunk/include/impress_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_inc.php	2011-11-15 10:41:26 UTC (rev =
4353)
+++ phpcompta/trunk/include/impress_inc.php	2011-11-15 11:32:03 UTC (rev =
4354)
@@ -1,230 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-// $Revision$
-/*!\file
- * \brief contains function for the printing
- * \todo the functions of impress_inc.php should be replaced in a OO way
-*/
-require_once('class_periode.php');
-
-/*! \brief   Purpose Parse a formula
- *=20
- * \param $p_cn connexion
- * \param $p_label
- * \param $p_formula
- * \param $p_eval  true if we eval here otherwise the function returns
- *                 a string which must be evaluated
- * \param $p_type_date : type of the date 0 for accountant period or 1
- * for calendar
- * \return array
- *
- *
- */
-function ParseFormula($p_cn,$p_label,$p_formula,$p_start,$p_end,$p_eval=3D=
true,$p_type_date=3D0)
-{
-
-    if ( CheckFormula($p_formula) =3D=3D false)
-    {
-        if ( $p_eval =3D=3D true)
-            return array('desc'=3D>$p_label.'  Erreur Formule!',
-                         'montant'=3D>0);
-        else
-            return $p_formula;
-
-    }
-    if ( $p_type_date =3D=3D 0 )
-        $cond=3Dsql_filter_per($p_cn,$p_start,$p_end,'p_id','j_tech_per'=
);
-    else
-        $cond=3D"( j_date >=3D to_date('$p_start','DD.MM.YYYY') and j_da=
te <=3D to_date('$p_end','DD.MM.YYYY'))";
-    include_once("class_acc_account_ledger.php");
-
-    //    while (@ereg("(\[[0-9]*%*D*C*S*\])",$p_formula,$e) =3D=3D true=
)
-    while (preg_match_all("(\[[0-9]*%*D*C*S*\])",$p_formula,$e) =3D=3D t=
rue)
-      {
-
-        // remove the [ ]
-        $x=3D$e[0];
-	foreach ($x as $line)
-	  {
-	    $compute=3D'all';
-	    if ( strpos($line,'D') !=3D 0 )
-	      $compute=3D'deb';
-	    if ( strpos($line,'C') !=3D 0 )
-	      $compute=3D'cred';
-	    if ( strpos($line,'S') !=3D 0 )
-	      $compute=3D'signed';
-	    $line=3Dstr_replace ("[","",$line);
-	    $line=3Dstr_replace ("]","",$line);
-	    $line=3Dstr_replace ("D","",$line);
-	    $line=3Dstr_replace ("C","",$line);
-	    $line=3Dstr_replace ("S","",$line);
-	    // If there is a FROM clause we must recompute
-	    // the time cond
-
-	    if ($p_type_date =3D=3D 0 && preg_match ("/FROM=3D[0-9]+\.[0-9]+/",=
 $p_formula,$afrom) =3D=3D 1 )
-	      {
-		// There is a FROM clause
-		// then we must modify the cond for the periode
-		$from=3Dstr_replace("FROM=3D","",$afrom[0]);
-
-		// Get the periode
-		/*! \note special value for the clause FROM=3D00.0000
-		 */
-		if ( $from =3D=3D '00.0000' )
-		  {
-
-		    // retrieve the first month of this periode
-		    $User=3Dnew User($p_cn);
-		    $user_periode=3D$User->get_periode();
-		    $oPeriode=3Dnew Periode($p_cn);
-		    $periode=3D$oPeriode->get_exercice($user_periode);
-		    list($first,$last)=3D$oPeriode->get_limit($periode);
-		    $ret=3D$first->get_date_limit();
-		    $end_date=3D$oPeriode->get_date_limit($p_end);
-		    if ($ret =3D=3D null ) throw new Exception ('Pas de limite =C3=A0 =
cette p=C3=A9riode',1);
-		    $cond=3Dsql_filter_per($p_cn,$ret['p_start'],$end_date['p_end'],'d=
ate','j_tech_per');
-
-
-		  }
-		else
-		  {
-		    $oPeriode=3Dnew Periode($p_cn);
-		    try
-		      {
-			$from=3D$oPeriode->find_periode('01'.$from);
-		      }
-		    catch (Exception $exp)
-		      {
-			/* if none periode is found
-			   then we take the first periode of the year
-			*/
-			$User=3Dnew User($p_cn);
-			$user_periode=3D$User->get_periode();
-
-			$year=3D$oPeriode->get_exercice($user_periode);
-			list($first,$last)=3D$oPeriode->get_limit($year);
-			$ret=3D$first->get_date_limit();
-			$end_date=3D$oPeriode->get_date_limit($p_end);
-			if ($ret =3D=3D null ) throw new Exception ('Pas de limite =C3=A0 cet=
te p=C3=A9riode',1);
-			$cond=3Dsql_filter_per($p_cn,$ret['p_start'],$end_date['p_end'],'date=
','j_tech_per');
-		      }
-		  }
-	      }
-
-	    if ( strpos($p_formula,"FROM") !=3D 0)
-	      {
-		// We remove FROM out of the p_formula
-		$p_formula=3Dsubstr_replace($p_formula,"",strpos($p_formula,"FROM"));
-	      }
-
-	    // Get sum of account
-	    $P=3Dnew Acc_Account_Ledger($p_cn,$line);
-	    $detail=3D$P->get_solde_detail($cond);
-
-
-	    if ( $compute=3D=3D'all')
-	      $i=3D$detail['solde'];
-	    if ( $compute=3D=3D'deb')
-	      $i=3D$detail['debit'];
-	    if ( $compute=3D=3D'cred')
-	      $i=3D$detail['credit'];
-	    if ( $compute=3D=3D'signed')
-	      $i=3D$detail['debit']-$detail['credit'];
-	    $p_formula=3Dstr_replace($x[0],$i,$p_formula);
-	  }
-      }
-
-    // $p_eval is true then we eval and returns result
-    if ( $p_eval =3D=3D true)
-    {
-        $p_formula=3D"\$result=3D".$p_formula.";";
-
-        eval("$p_formula");
-
-        while (preg_match("/\[([0-9]+)([Tt]*)\]/",trim($p_label),$e) =3D=
=3D 1)
-        {
-            $nom =3D "!!".$e[1]."!!";
-            if (CheckFormula($e[0]))
-            {
-                $nom =3D $p_cn->get_value ( "SELECT pcm_lib AS acct_name=
 FROM tmp_pcmn WHERE pcm_val::text LIKE $1||'%' ORDER BY pcm_val ASC LIMI=
T 1",array($e[1]));
-                if($nom)
-                {
-                    if($e[2] =3D=3D 'T') $nom =3D strtoupper($nom);
-                    if($e[2] =3D=3D 't') $nom =3D strtolower($nom);
-                }
-            }
-            $p_label =3D str_replace($e[0], $nom, $p_label);
-        }
-
-        $aret=3Darray('desc'=3D>$p_label,
-                    'montant'=3D>$result);
-        return $aret;
-    }
-    else
-    {
-        // $p_eval is false we returns only the string
-        return $p_formula;
-    }
-}
-/*!
- * \brief  Check if formula doesn't contain
- *           php injection
- * \param string
- *
- * \return true if the formula is good otherwise false
- */
-function CheckFormula($p_string)
-{
-    // the preg_match gets too complex if we want to add a test
-    // for parenthesis, math function...
-    // So I prefer remove them before testing
-    $p_string=3Dstr_replace("round","",$p_string);
-    $p_string=3Dstr_replace("abs","",$p_string);
-    $p_string=3Dstr_replace("(","",$p_string);
-    $p_string=3Dstr_replace(")","",$p_string);
-    // for  the inline test like $a=3D(cond)?value:other;
-    $p_string=3Dstr_replace("?","+",$p_string);
-    $p_string=3Dstr_replace(":","+",$p_string);
-    $p_string=3Dstr_replace(">=3D","+",$p_string);
-    $p_string=3Dstr_replace("<=3D","+",$p_string);
-    $p_string=3Dstr_replace(">","+",$p_string);
-    $p_string=3Dstr_replace("<","+",$p_string);
-    // eat Space
-    $p_string=3Dstr_replace(" ","",$p_string);
-    // Remove D/C/S
-    $p_string=3Dstr_replace("C","",$p_string);
-    $p_string=3Dstr_replace("D","",$p_string);
-    $p_string=3Dstr_replace("S","",$p_string);
-    // Remove T,t
-    $p_string=3Dstr_replace("T","",$p_string);
-    $p_string=3Dstr_replace("t","",$p_string);
-
-    if ( @ereg ("^(\\$[a-zA-Z]*[0-9]*=3D){0,1}((\[{0,1}[0-9]+\.*[0-9]*%{=
0,1}\]{0,1})+ *([+-\*/])* *(\[{0,1}[0-9]+\.*[0-9]*%{0,1}\]{0,1})*)*(([+-\=
*/])*\\$([a-zA-Z])+[0-9]*([+-\*/])*)* *( *FROM=3D[0-9][0-0].20[0-9][0-9])=
{0,1}$",$p_string) =3D=3D false)
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
-}
-
-?>

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	2011-11-15 10:41:26 UTC (rev 4353)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-15 11:32:03 UTC (rev 4354)
@@ -5,6 +5,7 @@
 drop table public.import_tmp;
 drop table public.format_csv_banque;
 insert into parameter values ('MY_ALPHANUM','N');
+update PARAMETER set pr_value=3D'N' where pr_id=3D'MY_CHECK_PERIODE';
 delete from action where ac_id not in (800,805,910);
 insert into action (ac_id,ac_description, ac_module, ac_code) values(102=
0,'Effacer les documents du suivi','followup','RMDOC');
 insert into action (ac_id,ac_description, ac_module, ac_code) values(101=
0,'Voir les documents du suivi','followup','VIEWDOC');



From MAILER-DAEMON Tue Nov 15 08:12:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQIoZ-0006fO-8f
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 08:12:39 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 14:18:14 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.17121.1321362757.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4355 - 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, 15 Nov 2011 13:12:36 -0000

Author: danydb
Date: 2011-11-15 14:18:12 +0100 (Tue, 15 Nov 2011)
New Revision: 4355

Modified:
   phpcompta/trunk/include/class_impress.php
Log:
fix bug : typo

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	2011-11-15 11:32:03 UTC (re=
v 4354)
+++ phpcompta/trunk/include/class_impress.php	2011-11-15 13:18:12 UTC (re=
v 4355)
@@ -194,7 +194,7 @@
      *
      * \return true if the formula is good otherwise false
      */
-    static function Impress::check_formula($p_string)
+    static function check_formula($p_string)
     {
         // the preg_match gets too complex if we want to add a test
         // for parenthesis, math function...
@@ -229,5 +229,4 @@
             return true;
         }
     }
-}
-?>
+}
\ No newline at end of file



From MAILER-DAEMON Tue Nov 15 08:17:06 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQIss-0007Ge-GN
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 08:17:06 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 14:22:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.17133.1321363025.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4356 - in phpcompta/trunk: 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: Tue, 15 Nov 2011 13:17:04 -0000

Author: danydb
Date: 2011-11-15 14:22:38 +0100 (Tue, 15 Nov 2011)
New Revision: 4356

Modified:
   phpcompta/trunk/include/class_acc_payment.php
   phpcompta/trunk/include/template/new_mod_payment.php
   phpcompta/trunk/sql/upgrade.sql
Log:
#447 mode de paiement par journaux

Modified: phpcompta/trunk/include/class_acc_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_payment.php	2011-11-15 13:18:12 UTC=
 (rev 4355)
+++ phpcompta/trunk/include/class_acc_payment.php	2011-11-15 13:22:38 UTC=
 (rev 4356)
@@ -34,7 +34,6 @@
  *\note the private data member are accessed via
   - mp_id  =3D=3D> id ( Primary key )
   - mp_lib =3D=3D> lib (label)
-  - mp_type =3D=3D> type (type of the ledger ACH or VEN )
   - mp_jrn_def_id =3D=3D> ledger (Number of the ledger where to save)
   - mp_fd_id =3D=3D> fiche_def (fiche class to use)
   - mp_qcode =3D=3D> qcode (quick_code of the card)
@@ -46,16 +45,15 @@
     private static $variable=3Darray("id"=3D>"mp_id",
                                    "lib"=3D>"mp_lib",
                                    "qcode"=3D>"mp_qcode",
-                                   "type"=3D>"mp_type",
-                                   "ledger"=3D>"mp_jrn_def_id",
+                                   "ledger_target"=3D>"mp_jrn_def_id",
+                                   "ledger_source"=3D>"jrn_def_id",
                                    "fiche_def"=3D>"mp_fd_id");
=20
=20
     private  $mp_lib;
     private  $mp_qcode;
-    private  $mp_type;
     private  $mp_jrn_def_if;
-
+    private  $jrn_def_id;
     private  $mp_fd_id;
=20
     function __construct ($p_cn,$p_init=3D0)
@@ -106,29 +104,29 @@
     {
         if ( $this->verify() !=3D 0 ) return;
         $sql=3D'INSERT INTO mod_payment(
-             mp_lib, mp_jrn_def_id, mp_type, mp_fd_id, mp_qcode)
-             VALUES ($1, $2, $3, $4, upper($5)) returning mp_id';
+             mp_lib, mp_jrn_def_id, mp_fd_id, mp_qcode,jrn_def_id)
+             VALUES ($1, $2, $3, upper($4),$5) returning mp_id';
         $this->mp_id=3D$this->cn->exec_sql($sql,array(
                                              $this->mp_lib,
                                              $this->mp_jrn_def_id,
-                                             $this->mp_type,
                                              $this->mp_fd_id,
-                                             $this->mp_qcode));
+                                             $this->mp_qcode,
+                                             $this->jrn_def_id));
     }
=20
     public function update()
     {
         if ( $this->verify() !=3D 0 ) return;
=20
-        $sql=3D"update mod_payment set mp_lib=3D$1,mp_qcode=3D$2,mp_type=
=3D$3,mp_jrn_def_id=3D$4,mp_fd_id=3D$5 ".
+        $sql=3D"update mod_payment set mp_lib=3D$1,mp_qcode=3D$2,mp_jrn_=
def_id=3D$3,mp_fd_id=3D$4,jrn_def_id=3D$5 ".
              " where mp_id =3D $6";
         $res=3D$this->cn->exec_sql(
                  $sql,
                  array($this->mp_lib,
                        $this->mp_qcode,
-                       $this->mp_type,
                        $this->mp_jrn_def_id,
                        $this->mp_fd_id,
+                       $this->jrn_def_id,
                        $this->mp_id)
              );
         if ( strlen (trim($this->mp_jrn_def_id))=3D=3D0)
@@ -136,6 +134,11 @@
                 'update mod_payment '.
                 'set mp_jrn_def_id =3D null where mp_id=3D$1',
                 array($this->mp_id));
+        if ( strlen (trim($this->jrn_def_id))=3D=3D0)
+            $this->cn->exec_sql(
+                'update mod_payment '.
+                'set mp_jrn_def_id =3D null where mp_id=3D$1',
+                array($this->mp_id));
         if ( strlen (trim($this->mp_qcode))=3D=3D0)
             $this->cn->exec_sql(
                 'update mod_payment '.
@@ -151,7 +154,7 @@
=20
     public function load()
     {
-        $sql=3D'select mp_id,mp_lib,mp_fd_id,mp_jrn_def_id,mp_qcode,mp_t=
ype from mod_payment '.
+        $sql=3D'select mp_id,mp_lib,mp_fd_id,mp_jrn_def_id,mp_qcode,jrn_=
def_id from mod_payment '.
              ' where mp_id =3D $1';
         $res=3D$this->cn->exec_sql(
                  $sql,
@@ -174,7 +177,7 @@
         $sql=3D"delete from mod_payment where mp_id=3D$1";
         $this->cn->exec_sql($sql,array($this->mp_id));
     }
-    /*!\brief retrieve all the data for a certain type
+    /*!\brief retrieve all the data for a certain ledger
      *\param non
      *\return an array of row
      */
@@ -182,8 +185,8 @@
     {
         $sql=3D'select mp_id '.
              ' from mod_payment '.
-             ' where mp_type=3D$1';
-        $array=3D$this->cn->get_array($sql,array($this->mp_type));
+             ' where jrn_def_id=3D$1';
+        $array=3D$this->cn->get_array($sql,array($this->jrn_def_id));
         $ret=3Darray();
         if ( !empty($array) )
         {
@@ -196,7 +199,7 @@
         }
         return $ret;
     }
-    /*!\brief retrieve all the data for a certain type but filter on the
+    /*!\brief retrieve all the data for a ledger but filter on the
      *valid record (jrn and fd not null
      *\param non
      *\return an array of row
@@ -205,9 +208,9 @@
     {
         $sql=3D'select mp_id '.
              ' from mod_payment '.
-             ' where mp_type=3D$1 and mp_jrn_def_id is not null and '.
+             ' where jrn_def_id=3D$1 and mp_jrn_def_id is not null and '=
.
              ' (mp_fd_id is not null or mp_qcode is not null)';
-        $array=3D$this->cn->get_array($sql,array($this->mp_type));
+        $array=3D$this->cn->get_array($sql,array($this->jrn_def_id));
         $ret=3Darray();
         if ( !empty($array) )
         {
@@ -220,7 +223,6 @@
         }
         return $ret;
     }
-
     public function row()
     {
         //--------------------------------------------------------------=
-------------
@@ -269,6 +271,7 @@
         $eth=3D'</th>';
         $r=3D'';
         $r.=3DHtmlInput::hidden('id',$this->mp_id);
+        $r.=3DHtmlInput::hidden('jrn_def_id',$this->jrn_def_id);
         $r.=3D'<table>';
         $r.=3D$tr.$td.'Libell&eacute;'.$etd;
         $r.=3D$td;
@@ -370,7 +373,7 @@
      */
     public function from_array($p_array)
     {
-        $idx=3Darray('mp_id','mp_lib','mp_fd_id','mp_jrn_def_id','mp_qco=
de','mp_type');
+        $idx=3Darray('mp_id','mp_lib','mp_fd_id','mp_jrn_def_id','mp_qco=
de','jrn_def_id');
         foreach ($idx as $l)
         if (isset($p_array[$l])) $this->$l=3D$p_array[$l];
     }
@@ -382,12 +385,12 @@
         //label
         $lib=3Dnew IText('mp_lib');
         $f_lib=3D$lib->input();
-        // Type of ledger
-        $tledger=3Dnew ISelect('mp_type');
-        $tledger->value=3Darray(array ('value'=3D>'ACH','label'=3D>_('Ac=
hat')),
-                              array ('value'=3D>'VEN','label'=3D>_('Vent=
e')));
-        $f_type=3D$tledger->input();
=20
+        $ledger_source=3Dnew ISelect('jrn_def_id');
+        $ledger_source->value=3D$this->cn->make_array("select jrn_def_id=
,jrn_Def_name from
+                              jrn_def where jrn_def_type  in ('ACH','VEN=
') order by jrn_def_name");
+        $f_source=3D$ledger_source->input();
+       =20
         // type of card
         $tcard=3Dnew ISelect('mp_fd_id');
         $tcard->value=3D$this->cn->make_array('select fd_id,fd_label fro=
m fiche_def join fiche_def_ref '.
@@ -418,16 +421,6 @@
     static function test_me()
     {
=20
-        $cn=3Dnew Database(dossier::id());
-        $ac=3Dnew Acc_Payment($cn);
-        $ac->set_parameter('type','ACH');
-        echo '<form method=3D"post">';
-        echo HtmlInput::hidden('test_select',$_REQUEST['test_select']);
-        echo $ac->select();
-        echo HtmlInput::submit('go','go');
-        echo '</form>';
-        if ( isset($_POST['go']))
-            print_r($_POST);
     }
=20
 }

Modified: phpcompta/trunk/include/template/new_mod_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/new_mod_payment.php	2011-11-15 13:18=
:12 UTC (rev 4355)
+++ phpcompta/trunk/include/template/new_mod_payment.php	2011-11-15 13:22=
:38 UTC (rev 4356)
@@ -4,31 +4,32 @@
 <table>
 <tr>
 <td>
-   <?=3D_('Libell=C3=A9')?>
+   <?=3D_('Pour le journal')?>
 </td>
 <td>
-<?=3D$f_lib?>
+<?=3D$f_source?>
 </td>
 </tr>
=20
 <tr>
 <td>
-   <?=3D_('Type de fiche')?>
+   <?=3D_('Libell=C3=A9')?>
 </td>
 <td>
-<?=3D$f_type_fiche?>
+<?=3D$f_lib?>
 </td>
 </tr>
=20
 <tr>
 <td>
-   <?=3D_('Pour le type de journal')?>
+   <?=3D_('Type de fiche')?>
 </td>
 <td>
-<?=3D$f_type?>
+<?=3D$f_type_fiche?>
 </td>
 </tr>
=20
+
 <tr>
 <td>
    <?=3D_('Paiement enregistr=C3=A9 dans ')?>

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	2011-11-15 13:18:12 UTC (rev 4355)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-15 13:22:38 UTC (rev 4356)
@@ -28,6 +28,7 @@
 -- for account repository
 -- \i change_account_repo.sql
 -- \i style-epad.sql
+\i mode_paiement.sql
=20
 create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
 commit;



From MAILER-DAEMON Tue Nov 15 08:22:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQIy7-0000uh-Mr
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 08:22:31 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 14:28:10 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.17154.1321363350.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4357 - 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, 15 Nov 2011 13:22:30 -0000

Author: danydb
Date: 2011-11-15 14:28:08 +0100 (Tue, 15 Nov 2011)
New Revision: 4357

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/payment_middle.inc.php
Log:
Bug : #447 mode de paiement par journaux -=20

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-15 13:2=
2:38 UTC (rev 4356)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-15 13:2=
8:08 UTC (rev 4357)
@@ -1216,7 +1216,7 @@
         $r.=3D'<fieldset>';
         $r.=3D'<legend> '._('Pay=C3=A9 par').' </legend>';
         $mp=3Dnew Acc_Payment($this->db);
-        $mp->set_parameter('type','ACH');
+        $mp->set_parameter('ledger_source',$this->id);
         $r.=3D$mp->select();
         $r.=3D'</fieldset>';
         return $r;

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	2011-11-15 13:22:38=
 UTC (rev 4356)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-15 13:28:08=
 UTC (rev 4357)
@@ -1289,7 +1289,7 @@
         $r.=3D'<fieldset>';
         $r.=3D'<legend> '._('Pay=C3=A9 par').' </legend>';
         $mp=3Dnew Acc_Payment($this->db);
-        $mp->set_parameter('type','VEN');
+        $mp->set_parameter('ledger_source',$this->id);
         $r.=3D$mp->select();
         $r.=3D'</fieldset>';
         return $r;

Modified: phpcompta/trunk/include/payment_middle.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/payment_middle.inc.php	2011-11-15 13:22:38 UT=
C (rev 4356)
+++ phpcompta/trunk/include/payment_middle.inc.php	2011-11-15 13:28:08 UT=
C (rev 4357)
@@ -50,7 +50,7 @@
     echo HtmlInput::hidden('p_action','divers');
     echo HtmlInput::hidden('sa','mp');
     echo HtmlInput::hidden('sb','save');
-    echo HtmlInput::hidden('mp_type',$row->get_parameter('type'));
+    echo HtmlInput::hidden('jrn_def_id',$row->get_parameter('ledger_sour=
ce'));
     echo HtmlInput::hidden('mp_lib',$row->get_parameter('lib'));
=20
     echo $row->form();



From MAILER-DAEMON Tue Nov 15 08:23:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQIyn-00015N-WC
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 08:23:13 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 14:28:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.17159.1321363393.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4358 - 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, 15 Nov 2011 13:23:12 -0000

Author: danydb
Date: 2011-11-15 14:28:49 +0100 (Tue, 15 Nov 2011)
New Revision: 4358

Added:
   phpcompta/trunk/sql/mode_paiement.sql
Log:
SQL Script: #447 mode de paiement par journaux -

Added: phpcompta/trunk/sql/mode_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/mode_paiement.sql	                        (rev 0)
+++ phpcompta/trunk/sql/mode_paiement.sql	2011-11-15 13:28:49 UTC (rev 43=
58)
@@ -0,0 +1,13 @@
+-- Mode de paiement par journaux
+
+
+alter table mod_payment add jrn_def_id bigint;
+update mod_payment set jrn_def_id=3D2 where mp_type=3D'VEN';
+update mod_payment set jrn_def_id=3D3 where mp_type=3D'ACH';
+
+alter table mod_payment drop mp_type;
+
+
+alter table mod_payment add constraint foreign key (jrn_def_id) referenc=
es jrn_def(jrn_def_id);
+
+comment on column mod_payment.jrn_def_id is 'Ledger using this payment m=
ethod';



From MAILER-DAEMON Tue Nov 15 08:33:41 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQJ8v-0003qd-Ao
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 08:33:41 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 14:39:21 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.17194.1321364020.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4359 - 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, 15 Nov 2011 13:33:39 -0000

Author: danydb
Date: 2011-11-15 14:39:20 +0100 (Tue, 15 Nov 2011)
New Revision: 4359

Modified:
   phpcompta/trunk/include/class_acc_payment.php
   phpcompta/trunk/include/payment_middle.inc.php
Log:
Mode de paiement

Modified: phpcompta/trunk/include/class_acc_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_payment.php	2011-11-15 13:28:49 UTC=
 (rev 4358)
+++ phpcompta/trunk/include/class_acc_payment.php	2011-11-15 13:39:20 UTC=
 (rev 4359)
@@ -177,16 +177,15 @@
         $sql=3D"delete from mod_payment where mp_id=3D$1";
         $this->cn->exec_sql($sql,array($this->mp_id));
     }
-    /*!\brief retrieve all the data for a certain ledger
+    /*!\brief retrieve all the data for all ledgers
      *\param non
      *\return an array of row
      */
     public function get_all()
     {
-        $sql=3D'select mp_id '.
-             ' from mod_payment '.
-             ' where jrn_def_id=3D$1';
-        $array=3D$this->cn->get_array($sql,array($this->jrn_def_id));
+        $sql=3D'select mp_id,mp_lib '.
+             ' from mod_payment order by mp_lib';
+        $array=3D$this->cn->get_array($sql);
         $ret=3Darray();
         if ( !empty($array) )
         {

Modified: phpcompta/trunk/include/payment_middle.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/payment_middle.inc.php	2011-11-15 13:28:49 UT=
C (rev 4358)
+++ phpcompta/trunk/include/payment_middle.inc.php	2011-11-15 13:39:20 UT=
C (rev 4359)
@@ -114,10 +114,9 @@
 //----------------------------------------------------------------------
=20
 echo '<fieldset>';
-echo '<legend>Journaux d\' achat</legend>';
+echo '<legend>Journaux </legend>';
 /* Get the data from database */
 $mp=3Dnew Acc_Payment($cn);
-$mp->set_parameter('type','ACH');
 $array=3D$mp->get_all();
 /* if there are data show them in a table */
 if ( ! empty ($array))
@@ -138,37 +137,5 @@
     echo '</table>';
 }
 echo '</fieldset>';
-
-//----------------------------------------------------------------------
-// LEDGER SOLD
-//----------------------------------------------------------------------
-
-echo '<fieldset>';
-echo '<legend>Journaux de vente</legend>';
-$mp=3Dnew Acc_Payment($cn);
-$mp->set_parameter('type','VEN');
-$array=3D$mp->get_all();
-/* if there are data show them in a table */
-if ( ! empty ($array))
-{
-    echo '<table style=3D"border: 2px outset blue; width: 100%;" >';
-    echo $tr.$th.'Libell&eacute;'.$eth.$th.'Type de fiche'
-    .$eth.$th.'enregistr&eacute; dans le journal'.$eth.
-    $th.' Avec la fiche'.$eth.$th.'Action'.$eth.$etr;
-    foreach ($array as $row)
-    {
-        echo $tr;
-        echo $row->row();
-        echo $td.HtmlInput::button_anchor('Modifie','?p_action=3Ddivers&=
sa=3Dmp&sb=3Dchange&'.dossier::get().
-                                              '&id=3D'.$row->get_paramet=
er('id'));
-        echo $etr;
-
-    }
-    echo '</table>';
-}
-echo '</fieldset>';
-// Button to insert new one
-echo HtmlInput::button_anchor(_('Ajout'),'?p_action=3Ddivers&sa=3Dmp&sb=3D=
ins&'.dossier::get());
-
 echo '</div>';
 ?>



From MAILER-DAEMON Tue Nov 15 08:41:10 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQJGA-0005ab-In
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 08:41:10 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 14:46:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.17209.1321364470.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4360 - 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, 15 Nov 2011 13:41:10 -0000

Author: danydb
Date: 2011-11-15 14:46:49 +0100 (Tue, 15 Nov 2011)
New Revision: 4360

Modified:
   phpcompta/trunk/include/payment_middle.inc.php
Log:
Mode de paiement

Modified: phpcompta/trunk/include/payment_middle.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/payment_middle.inc.php	2011-11-15 13:39:20 UT=
C (rev 4359)
+++ phpcompta/trunk/include/payment_middle.inc.php	2011-11-15 13:46:49 UT=
C (rev 4360)
@@ -95,7 +95,7 @@
     echo HtmlInput::submit('insert',_('Enregistre'));
     echo '</form>';
     echo HtmlInput::button_anchor(_('Retour sans sauvez'),
-                                  '?p_action=3Ddivers&sa=3Dmp&'.dossier:=
:get()
+                                  '?p_action=3Ddivers&sa=3Dmp&'.dossier:=
:get()."&ac=3D".$_REQUEST['ac']
                                      );
=20
     exit();
@@ -121,7 +121,7 @@
 /* if there are data show them in a table */
 if ( ! empty ($array))
 {
-    echo '<table style=3D"border: 2px outset blue; width: 100%;" >';
+    echo '<table >';
     echo $tr.$th._('Libell=C3=A9').$eth.$th._('Type de fiche')
     .$eth.$th._('enregistr=C3=A9 dans le journal').$eth.
     $th._(' Avec la fiche').$eth.$th.'Action'.$eth.$etr;



From MAILER-DAEMON Tue Nov 15 08:41:51 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQJGp-0005kB-71
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 08:41:51 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 14:47:29 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.17210.1321364510.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4361 - 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, 15 Nov 2011 13:41:50 -0000

Author: danydb
Date: 2011-11-15 14:47:28 +0100 (Tue, 15 Nov 2011)
New Revision: 4361

Modified:
   phpcompta/trunk/include/class_acc_payment.php
Log:
Mode de paiement

Modified: phpcompta/trunk/include/class_acc_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_payment.php	2011-11-15 13:46:49 UTC=
 (rev 4360)
+++ phpcompta/trunk/include/class_acc_payment.php	2011-11-15 13:47:28 UTC=
 (rev 4361)
@@ -234,12 +234,18 @@
         $eth=3D'</th>';
=20
         $r=3D'';
-        $r.=3D$td.$this->mp_lib.$etd;
+        if ( $this->jrn_def_id !=3D '' )
+        {
+            $name=3D$this->cn->get_value("select jrn_def_name from jrn_d=
ef where jrn_def_id=3D$1",
+                    array($this->jrn_def_id));
+        }
+        $r.=3Dtd($this->mp_lib);
+       =20
         if ( $this->mp_fd_id !=3D NULL && $this->mp_fd_id !=3D0)
         {
             $fiche=3Dnew Fiche_Def($this->cn,$this->mp_fd_id);
             $fiche->Get();
-            $r.=3D$td.$fiche->label.$etd;
+            $r.=3Dtd($fiche->label);
         }
         else
             $r.=3D$td.$etd;
@@ -249,7 +255,7 @@
         {
             $f=3Dnew Fiche($this->cn);
             $f->get_by_qcode($this->mp_qcode);
-            $r.=3D$td.$f->strAttribut(ATTR_DEF_NAME).$etd;
+            $r.=3Dtd($f->strAttribut(ATTR_DEF_NAME));
=20
         }
         else



From MAILER-DAEMON Tue Nov 15 10:54:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQLLB-0005ps-Gx
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 10:54:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 17:00:07 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.17641.1321372466.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4362 - 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, 15 Nov 2011 15:54:26 -0000

Author: danydb
Date: 2011-11-15 17:00:05 +0100 (Tue, 15 Nov 2011)
New Revision: 4362

Modified:
   phpcompta/trunk/include/class_anc_balance_double.php
   phpcompta/trunk/include/class_anc_balance_simple.php
   phpcompta/trunk/include/export_balance_pdf.php
   phpcompta/trunk/include/export_fiche_detail_pdf.php
   phpcompta/trunk/include/export_form_pdf.php
   phpcompta/trunk/include/export_gl_pdf.php
   phpcompta/trunk/include/export_ledger_pdf.php
   phpcompta/trunk/include/export_poste_detail_pdf.php
   phpcompta/trunk/include/export_security_pdf.php
Log:
#389 PDF : ajout setTitle et setAuthor

Modified: phpcompta/trunk/include/class_anc_balance_double.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_balance_double.php	2011-11-15 13:47=
:28 UTC (rev 4361)
+++ phpcompta/trunk/include/class_anc_balance_double.php	2011-11-15 16:00=
:05 UTC (rev 4362)
@@ -177,6 +177,8 @@
         if (empty($array))return;
         $pdf=3Dnew PDF($this->db);
         $pdf->Setdossierinfo(dossier::name());
+        $pdf->setTitle("Balance analytique",true);
+        $pdf->SetAuthor('Phpcompta');
         $pdf->AliasNbPages();
         $pdf->AddPage();
=20

Modified: phpcompta/trunk/include/class_anc_balance_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_anc_balance_simple.php	2011-11-15 13:47=
:28 UTC (rev 4361)
+++ phpcompta/trunk/include/class_anc_balance_simple.php	2011-11-15 16:00=
:05 UTC (rev 4362)
@@ -184,6 +184,7 @@
         $pdf->set_info($this->from_poste,$this->to_poste,$this->from,$th=
is->to);
         $pdf->AliasNbPages();
         $pdf->AddPage();
+        $pdf->setTitle("Balance analytique",true);
=20
         $pdf->SetFont('DejaVu','',6);
         for ($i=3D0;$i<count($array);$i++)

Modified: phpcompta/trunk/include/export_balance_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_balance_pdf.php	2011-11-15 13:47:28 UT=
C (rev 4361)
+++ phpcompta/trunk/include/export_balance_pdf.php	2011-11-15 16:00:05 UT=
C (rev 4362)
@@ -91,7 +91,9 @@
 $pdf->setDossierInfo(" Balance  ".$per_text);
 $pdf->AliasNbPages();
 $pdf->AddPage();
+$pdf->SetAuthor('Phpcompta');
 $pdf->SetFont('DejaVuCond','',7);
+$pdf->setTitle("Balance comptable",true);
 $pdf->Cell(30,6,'poste');
 $pdf->Cell(80,6,'Libell=C3=A9');
 $pdf->Cell(20,6,'Total D=C3=A9bit',0,0,'R');

Modified: phpcompta/trunk/include/export_fiche_detail_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_detail_pdf.php	2011-11-15 13:47:=
28 UTC (rev 4361)
+++ phpcompta/trunk/include/export_fiche_detail_pdf.php	2011-11-15 16:00:=
05 UTC (rev 4362)
@@ -42,6 +42,8 @@
 $pdf->setDossierInfo("  Periode : ".$_GET['from_periode']." - ".$_GET['t=
o_periode']);
 $pdf->AliasNbPages();
 $pdf->AddPage();
+$pdf->SetAuthor('Phpcompta');
+$pdf->setTitle("D=C3=A9tail fiche",true);
=20
=20
 $Fiche=3Dnew Fiche($cn,$f_id);

Modified: phpcompta/trunk/include/export_form_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_form_pdf.php	2011-11-15 13:47:28 UTC (=
rev 4361)
+++ phpcompta/trunk/include/export_form_pdf.php	2011-11-15 16:00:05 UTC (=
rev 4362)
@@ -46,9 +46,9 @@
 $pdf->setDossierInfo($Libelle);
 $pdf->AliasNbPages();
 $pdf->AddPage();
+$pdf->SetAuthor('Phpcompta');
+$pdf->setTitle("Rapport ".$Libelle,true);
=20
-
-
 // Step ??
 //--
 if ( $_GET['p_step'] =3D=3D 0 )

Modified: phpcompta/trunk/include/export_gl_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_gl_pdf.php	2011-11-15 13:47:28 UTC (re=
v 4361)
+++ phpcompta/trunk/include/export_gl_pdf.php	2011-11-15 16:00:05 UTC (re=
v 4362)
@@ -71,8 +71,9 @@
 $pdf->setDossierInfo("  Periode : ".$from_periode." - ".$to_periode);
 $pdf->AliasNbPages();
 $pdf->AddPage();
+$pdf->setTitle("Grand Livre",true);
+$pdf->SetAuthor('Phpcompta');
=20
-
 if ( count($a_poste) =3D=3D 0 )
 {
     $pdf->Output();

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	2011-11-15 13:47:28 UTC=
 (rev 4361)
+++ phpcompta/trunk/include/export_ledger_pdf.php	2011-11-15 16:00:05 UTC=
 (rev 4362)
@@ -78,7 +78,9 @@
     $pdf->setDossierInfo($Jrn->name);
     $pdf->AliasNbPages();
     $pdf->AddPage();
-
+    $pdf->SetAuthor('Phpcompta');
+    $pdf->setTitle("Journal",true);
+   =20
     $pdf->export($Jrn);
=20
     $fDate=3Ddate('dmy-Hi');
@@ -99,6 +101,9 @@
             $pdf->setDossierInfo($Jrn->name);
             $pdf->AliasNbPages();
             $pdf->AddPage();
+            $pdf->SetAuthor('Phpcompta');
+            $pdf->setTitle("Journal",true);
+
             $pdf->Cell(0,6,'Ce journal ne peut =C3=AAtre imprim=C3=A9 en=
 mode simple');
             $pdf->output('erreur.pdf','I');
             exit();
@@ -120,6 +125,9 @@
             $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','I');
@@ -131,6 +139,9 @@
             $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','I');
@@ -145,6 +156,9 @@
         $pdf->setDossierInfo($Jrn->name);
         $pdf->AliasNbPages();
         $pdf->AddPage();
+        $pdf->SetAuthor('Phpcompta');
+        $pdf->setTitle("Journal",true);
+       =20
         $pdf->export();
         $fDate=3Ddate('dmy-Hi');
         $pdf->Output('journal-'.$fDate.'.pdf','I');
@@ -155,6 +169,9 @@
         $pdf=3D new Print_Ledger_Misc($cn,$Jrn);
         $pdf->setDossierInfo($Jrn->name);
         $pdf->AliasNbPages();
+        $pdf->SetAuthor('Phpcompta');
+        $pdf->setTitle("Journal",true);
+       =20
         $pdf->AddPage();
         $pdf->export();
         $fDate=3Ddate('dmy-Hi');

Modified: phpcompta/trunk/include/export_poste_detail_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_poste_detail_pdf.php	2011-11-15 13:47:=
28 UTC (rev 4361)
+++ phpcompta/trunk/include/export_poste_detail_pdf.php	2011-11-15 16:00:=
05 UTC (rev 4362)
@@ -52,7 +52,10 @@
 $pdf->setDossierInfo("  Periode : ".$_GET['from_periode']." - ".$_GET['t=
o_periode']);
 $pdf->AliasNbPages();
 $pdf->AddPage();
+$pdf->SetAuthor('Phpcompta');
+$pdf->setTitle("D=C3=A9tail poste comptable",true);
=20
+
 if ( count($a_poste) =3D=3D 0 )
 {
     $pdf->Output('poste.pdf','I');

Modified: phpcompta/trunk/include/export_security_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_security_pdf.php	2011-11-15 13:47:28 U=
TC (rev 4361)
+++ phpcompta/trunk/include/export_security_pdf.php	2011-11-15 16:00:05 U=
TC (rev 4362)
@@ -75,6 +75,8 @@
 $pdf->setDossierInfo(dossier::name().' S=C3=A9curit=C3=A9');
 $pdf->AliasNbPages();
 $pdf->AddPage();
+$pdf->SetAuthor('Phpcompta');
+$pdf->setTitle("S=C3=A9curit=C3=A9",true);
=20
 $str_user=3Dsprintf("( %d ) %s %s [ %s ] - %s",
                   $SecUser->id,



From MAILER-DAEMON Tue Nov 15 15:35:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQPj7-0000dx-Rv
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 15:35:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 21:40:52 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.18035.1321389329.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4363 - in phpcompta/trunk: html 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: Tue, 15 Nov 2011 20:35:28 -0000

Author: danydb
Date: 2011-11-15 21:40:50 +0100 (Tue, 15 Nov 2011)
New Revision: 4363

Added:
   phpcompta/trunk/include/ajax_update_payment.php
   phpcompta/trunk/include/ajax_update_predef.php
Removed:
   phpcompta/trunk/include/ajax_update_predef.php.php
Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_acc_payment.php
   phpcompta/trunk/include/class_calendar.php
   phpcompta/trunk/include/payment_middle.inc.php
   phpcompta/trunk/include/template/new_mod_payment.php
   phpcompta/trunk/sql/
   phpcompta/trunk/sql/mode_paiement.sql
Log:

Fix small bugs + add payment method by ledger


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	2011-11-15 16:00:05 UTC (rev 4362)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-15 20:40:50 UTC (rev 4363)
@@ -531,4 +531,7 @@
 	 case 'upd_receipt':
 		 require_once 'ajax_get_receipt.php';
 		 break;
+	 case 'up_pay_method':
+		 require_once 'ajax_update_payment.php';
+		 break;
 }
\ No newline at end of file

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	2011-11-15 16:00:05 UTC (rev 43=
62)
+++ phpcompta/trunk/html/js/acc_ledger.js	2011-11-15 20:40:50 UTC (rev 43=
63)
@@ -44,7 +44,32 @@
                    }
                );
 }
+
 /**
+* @brief update the list of payment method when we change the ledger.
+*/
+function update_pay_method()
+{
+	waiting_box();
+    var jrn=3Dg("p_jrn").value;
+    var dossier=3Dg("gDossier").value;
+    var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn+"&op=3Dup_pay_me=
thod";
+    var action=3Dnew Ajax.Request(
+                   "ajax_misc.php",
+                   {
+                   method:'get',
+                   parameters:querystring,
+                   onFailure:error_get_predef,
+                   onSuccess:function(req){
+										remove_waiting_box();
+										var answer=3Dreq.responseText;
+										$('payment').innerHTML=3Danswer;
+								}
+                   }
+               );
+}
+
+/**
  *@brief update ctl id =3Djrn_name with the value of p_jrn
  */
 function update_name()

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	2011-11-15 16:00:05 UTC (rev 4362)
+++ phpcompta/trunk/html/style.css	2011-11-15 20:40:50 UTC (rev 4363)
@@ -13,7 +13,7 @@
         font-style: italic;
         }
=20
-table.result  ,table.resultfooter {
+table.table_large, table.result  ,table.resultfooter {
   color:blue;
   /* border:blue solid 1px; */
   width:100%;
@@ -27,10 +27,10 @@
=20
=20
 }
-table.result th {
+table.table_large th,table.result th {
   font-weight:bold;
   font-family:helvetica,sans-serif;
- border-bottom:2px solid blue;
+ border-bottom:1px solid blue;
  border-top:0;
=20
   color:#25238F;
@@ -931,7 +931,7 @@
 	      background-color:#e4e7ed;
 }
=20
-table.result td
+table.table_large td, table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -1044,4 +1044,8 @@
  background-color:blue;
  color:white;
  text-decoration:none
+}
+table.table_large tr.odd ,table.table_large tr.even {
+
+	height:32px;
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-15 16:00:05 UTC (rev 43=
62)
+++ phpcompta/trunk/include/ac_common.php	2011-11-15 20:40:50 UTC (rev 43=
63)
@@ -620,7 +620,7 @@
 function set_language()
 {
     // desactivate local check
-    if ( defined(LOCALE) && LOCALE=3D=3D0 ) return;
+    if ( defined("LOCALE") && LOCALE=3D=3D0 ) return;
     $dir =3D "";
     // set differently the language depending of the operating system
     if (what_os() =3D=3D 1)

Added: phpcompta/trunk/include/ajax_update_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_update_payment.php	                     =
   (rev 0)
+++ phpcompta/trunk/include/ajax_update_payment.php	2011-11-15 20:40:50 U=
TC (rev 4363)
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief refresh the area with payment method
+ * -l for the ledger
+ */
+require_once 'class_acc_ledger.php';
+$ledger=3Dnew Acc_Ledger($cn,$l);
+echo $ledger->input_paid(1);
+?>

Copied: phpcompta/trunk/include/ajax_update_predef.php (from rev 4362, ph=
pcompta/trunk/include/ajax_update_predef.php.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_update_predef.php	                      =
  (rev 0)
+++ phpcompta/trunk/include/ajax_update_predef.php	2011-11-15 20:40:50 UT=
C (rev 4363)
@@ -0,0 +1,68 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ * \brief respond ajax request, the get contains
+ *  the value :
+ * - l for ledger=20
+ * - gDossier
+ * Must return at least tva, htva and tvac
+ */
+
+require_once ('constant.php');
+require_once ('class_database.php');
+require_once('class_dossier.php');
+require_once('class_pre_operation.php');
+// Check if the needed field does exist
+extract ($_GET);
+foreach (array('l','t','d','gDossier') as $a)
+{
+    if ( ! isset (${$a}) )
+    {
+        echo "error $a is not set ";
+        exit();
+    }
+
+}
+$cn=3Dnew Database(dossier::id());
+$op=3Dnew Pre_operation_detail($cn);
+$op->set('ledger',$l);
+$op->set('ledger_type',$t);
+$op->set('direct',$d);
+$array=3D$op->get_operation();
+$string=3D'{"count":"'.count($array).'"';
+$idx=3D0;
+if (! empty($array))
+    foreach ($array as $a)
+{
+    $string.=3D',"value'.$idx.'":"'.$a['value'].'",';
+    $string.=3D'"label'.$idx.'":"'.$a['label'].'"';
+    $idx++;
+}
+$string.=3D"}";
+
+header("Content-type: text/json; charset: utf8",true);
+echo $string;
+
+
+?>
+

Deleted: phpcompta/trunk/include/ajax_update_predef.php.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_update_predef.php.php	2011-11-15 16:00:0=
5 UTC (rev 4362)
+++ phpcompta/trunk/include/ajax_update_predef.php.php	2011-11-15 20:40:5=
0 UTC (rev 4363)
@@ -1,68 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief respond ajax request, the get contains
- *  the value :
- * - l for ledger=20
- * - gDossier
- * Must return at least tva, htva and tvac
- */
-
-require_once ('constant.php');
-require_once ('class_database.php');
-require_once('class_dossier.php');
-require_once('class_pre_operation.php');
-// Check if the needed field does exist
-extract ($_GET);
-foreach (array('l','t','d','gDossier') as $a)
-{
-    if ( ! isset (${$a}) )
-    {
-        echo "error $a is not set ";
-        exit();
-    }
-
-}
-$cn=3Dnew Database(dossier::id());
-$op=3Dnew Pre_operation_detail($cn);
-$op->set('ledger',$l);
-$op->set('ledger_type',$t);
-$op->set('direct',$d);
-$array=3D$op->get_operation();
-$string=3D'{"count":"'.count($array).'"';
-$idx=3D0;
-if (! empty($array))
-    foreach ($array as $a)
-{
-    $string.=3D',"value'.$idx.'":"'.$a['value'].'",';
-    $string.=3D'"label'.$idx.'":"'.$a['label'].'"';
-    $idx++;
-}
-$string.=3D"}";
-
-header("Content-type: text/json; charset: utf8",true);
-echo $string;
-
-
-?>
-

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	2011-11-15 16:00:05 UTC =
(rev 4362)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-15 20:40:50 UTC =
(rev 4363)
@@ -42,6 +42,7 @@
 require_once('class_lettering.php');
 require_once 'class_sort_table.php';
 require_once 'class_jrn_def_sql.php';
+require_once 'class_acc_payment.php';
 /*!\file
 * \brief Class for jrn,  class acc_ledger for manipulating the ledger
 */
@@ -3222,6 +3223,22 @@
 			$Res=3D$this->db->alter_seq("s_jrn_pj".$p_jrn,$jrn_def_pj_seq);
 		}
 	}
+	function input_paid($nofieldset=3D0)
+    {
+        $r=3D'';
+		if ( $nofieldset=3D=3D0)
+		{
+			$r.=3D'<fieldset id=3D"payment"> ';
+		}
+        $r.=3D'<legend> '._('Pay=C3=A9 par').' </legend>';
+        $mp=3Dnew Acc_Payment($this->db);
+        $mp->set_parameter('ledger_source',$this->id);
+        $r.=3D$mp->select();
+        if ( $nofieldset=3D=3D0)
+			$r.=3D'</fieldset>';
+        return $r;
+    }
+
 	/**
 	 * display screen to enter a new ledger
 	 */

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	2011-11-15 16:0=
0:05 UTC (rev 4362)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-15 20:4=
0:50 UTC (rev 4363)
@@ -968,7 +968,9 @@
         }
         $add_js.=3D'get_last_date();';
 		$add_js.=3D'update_name();';
-        $wLedger=3D$this->select_ledger('ACH',2);
+		$add_js.=3D'update_pay_method()';
+
+		$wLedger=3D$this->select_ledger('ACH',2);
         if ($wLedger =3D=3D null) exit (_('Pas de journal disponible'));
         $wLedger->javascript=3D"onChange=3D'update_predef(\"ach\",\"f\")=
;$add_js'";
         $label=3D" Journal ".HtmlInput::infobulle(2) ;
@@ -1210,17 +1212,6 @@
         }
         return $r;
     }
-    function input_paid()
-    {
-        $r=3D'';
-        $r.=3D'<fieldset>';
-        $r.=3D'<legend> '._('Pay=C3=A9 par').' </legend>';
-        $mp=3Dnew Acc_Payment($this->db);
-        $mp->set_parameter('ledger_source',$this->id);
-        $r.=3D$mp->select();
-        $r.=3D'</fieldset>';
-        return $r;
-    }
=20
     /*!@brief show the summary of the operation and propose to save it
      *@param array contains normally $_POST. It proposes also to save

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	2011-11-15 16:00:05=
 UTC (rev 4362)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-15 20:40:50=
 UTC (rev 4363)
@@ -1048,6 +1048,7 @@
         }
         $add_js.=3D'get_last_date();';
 		$add_js.=3D'update_name();';
+		$add_js.=3D'update_pay_method()';
=20
         $wLedger=3D$this->select_ledger('VEN',2);
         if ( $wLedger =3D=3D null )
@@ -1283,18 +1284,7 @@
         $r.=3D"</DIV>";
         return $r;
     }
-    function input_paid()
-    {
-        $r=3D'';
-        $r.=3D'<fieldset>';
-        $r.=3D'<legend> '._('Pay=C3=A9 par').' </legend>';
-        $mp=3Dnew Acc_Payment($this->db);
-        $mp->set_parameter('ledger_source',$this->id);
-        $r.=3D$mp->select();
-        $r.=3D'</fieldset>';
-        return $r;
-    }
-
+=20
     /*!\brief test function
      */
     static function test_me($p_string=3D'')

Modified: phpcompta/trunk/include/class_acc_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_payment.php	2011-11-15 16:00:05 UTC=
 (rev 4362)
+++ phpcompta/trunk/include/class_acc_payment.php	2011-11-15 20:40:50 UTC=
 (rev 4363)
@@ -222,7 +222,7 @@
         }
         return $ret;
     }
-    public function row()
+    public function row_deprecated()
     {
         //--------------------------------------------------------------=
-------------
         // Common variable
@@ -240,7 +240,7 @@
                     array($this->jrn_def_id));
         }
         $r.=3Dtd($this->mp_lib);
-       =20
+
         if ( $this->mp_fd_id !=3D NULL && $this->mp_fd_id !=3D0)
         {
             $fiche=3Dnew Fiche_Def($this->cn,$this->mp_fd_id);
@@ -264,57 +264,51 @@
     }
     /*!\brief return a string with a form (into a table)
      *\param none
-     *\return a html string=20
+     *\return a html string
      */
     public function form()
     {
-        $td=3D'<TD>';
-        $etd=3D'</td>';
-        $tr=3D'<tr>';
-        $etr=3D'</tr>';
-        $th=3D'<th>';
-        $eth=3D'</th>';
-        $r=3D'';
-        $r.=3DHtmlInput::hidden('id',$this->mp_id);
-        $r.=3DHtmlInput::hidden('jrn_def_id',$this->jrn_def_id);
-        $r.=3D'<table>';
-        $r.=3D$tr.$td.'Libell&eacute;'.$etd;
-        $r.=3D$td;
-        $r.=3D$this->mp_lib;
-        $r.=3D$etd.$etr;
-        $r.=3D$tr.$td;
-        $r.=3D'Type de fiche '.$etd;
-        $array=3D$this->cn->make_array('select fd_id,fd_label from fiche=
_def join fiche_def_ref '.
-                                     ' using (frd_id) where frd_id in (2=
5,4) order by fd_label');
-        $fd=3Dnew ISelect();
-        $fd->name=3D'mp_fd_id';
-        $fd->value=3D$array;
-        $fd->selected=3D$this->mp_fd_id;
-        $r.=3D$td.$fd->input();
-        $r.=3D$etd;
-        $r.=3D$tr.$td.'Enregistre dans le journal '.$etd;
-        $array=3D$this->cn->make_array('select jrn_def_id,jrn_def_name f=
rom '.
-                                     ' jrn_def where jrn_def_type =3D \'=
ODS\' or jrn_def_type=3D\'FIN\'');
-        $jrn=3Dnew ISelect();
-        $jrn->value=3D$array;
-        $jrn->name=3D'mp_jrn_def_id';
-        $jrn->selected=3D(isset ($this->mp_jrn_def_id))?$this->mp_jrn_de=
f_id:0;
-        $r.=3D$td.$jrn->input().$etd;
-        $r.=3D$etr.$tr;
-        $r.=3D$td.'Avec la fiche'.$etd;
-        $f=3Dnew ICard();
-        $f->jrn=3D$jrn->selected;
-        $f->noadd=3Dtrue;
-        $f->name=3D'mp_qcode';
+	//label
+        $lib=3Dnew IText('mp_lib');
+        $lib->value=3D$this->mp_lib;
+		$f_lib=3D$lib->input();
+
+
+        $ledger_source=3Dnew ISelect('jrn_def_id');
+        $ledger_source->value=3D$this->cn->make_array("select jrn_def_id=
,jrn_Def_name from
+                              jrn_def where jrn_def_type  in ('ACH','VEN=
') order by jrn_def_name");
+		$ledger_source->selected=3D$this->jrn_def_id;
+        $f_source=3D$ledger_source->input();
+
+        // type of card
+        $tcard=3Dnew ISelect('mp_fd_id');
+        $tcard->value=3D$this->cn->make_array('select fd_id,fd_label fro=
m fiche_def join fiche_def_ref '.
+                                            ' using (frd_id) where frd_i=
d in (25,4) order by fd_label');
+		$tcard->selected=3D$this->mp_fd_id;
+
+        $f_type_fiche=3D$tcard->input();
+        $ledger_record=3Dnew ISelect('mp_jrn_def_id');
+        $ledger_record->value=3D$this->cn->make_array("select jrn_def_id=
,jrn_Def_name from
+                              jrn_def where jrn_def_type  in ('ODS','FIN=
')");
+		$ledger_record->selected=3D$this->mp_jrn_def_id;
+        $f_ledger_record=3D$ledger_record->input();
+
+        // the card
+        $qcode=3Dnew ICard();
+        $qcode->noadd=3Dtrue;
+        $qcode->name=3D'mp_qcode';
         $list=3D$this->cn->make_list('select fd_id from fiche_def where =
frd_id in (25,4)');
-        $f->typecard=3D$list;
-	$f->dblclick=3D'fill_ipopcard(this);';
-        $f->extra2=3D_('Recherche');
-        $f->value=3D(isset($this->mp_qcode))?$this->mp_qcode:'';
-        $r.=3D$td.$f->input().$etd;
-        $s=3Dnew ISpan();
-        $r.=3D$td.$s->input('mp_qcode_label');
-        $r.=3D'</table>';
+        $qcode->typecard=3D$list;
+		$qcode->dblclick=3D'fill_ipopcard(this);';
+		$qcode->value=3D$this->mp_qcode;
+
+        $f_qcode=3D$qcode->input();
+
+		$msg=3D"Modification de ".$this->mp_lib;
+        ob_start();
+        require_once('template/new_mod_payment.php');
+        $r=3Dob_get_contents();
+        ob_end_clean();
         return $r;
=20
     }
@@ -395,7 +389,7 @@
         $ledger_source->value=3D$this->cn->make_array("select jrn_def_id=
,jrn_Def_name from
                               jrn_def where jrn_def_type  in ('ACH','VEN=
') order by jrn_def_name");
         $f_source=3D$ledger_source->input();
-       =20
+
         // type of card
         $tcard=3Dnew ISelect('mp_fd_id');
         $tcard->value=3D$this->cn->make_array('select fd_id,fd_label fro=
m fiche_def join fiche_def_ref '.
@@ -412,9 +406,10 @@
         $qcode->name=3D'mp_qcode';
         $list=3D$this->cn->make_list('select fd_id from fiche_def where =
frd_id in (25,4)');
         $qcode->typecard=3D$list;
-	$qcode->dblclick=3D'fill_ipopcard(this);';
+		$qcode->dblclick=3D'fill_ipopcard(this);';
=20
         $f_qcode=3D$qcode->input();
+		$msg=3D"Ajout d'un nouveau moyen de paiement";
         ob_start();
         require_once('template/new_mod_payment.php');
         $r=3Dob_get_contents();

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	2011-11-15 16:00:05 UTC (r=
ev 4362)
+++ phpcompta/trunk/include/class_calendar.php	2011-11-15 20:40:50 UTC (r=
ev 4363)
@@ -137,18 +137,18 @@
         $cn=3Dnew Database(dossier::id());
         $today=3Ddate('d.m.Y');
         $p_id=3D$cn->get_value("
-                select p_id from parm_periode=20
-                where=20
+                select p_id from parm_periode
+                where
                 p_start <=3D to_date($1,'DD.MM.YYYY')
-                and=20
+                and
                 p_end >=3D to_date($1,'DD.MM.YYYY')",
                 array($today));
         if ( $p_id =3D=3D '')
         {
             $user=3Dnew User($cn);
-            $this->default_periode=3D$user->get_periode();
-            $p_id=3D$this->default_periode;
+            $p_id=3D$user->get_periode();
         }
+		$this->default_periode=3D$p_id;
         return  $p_id;
     }
     /**

Modified: phpcompta/trunk/include/payment_middle.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/payment_middle.inc.php	2011-11-15 16:00:05 UT=
C (rev 4362)
+++ phpcompta/trunk/include/payment_middle.inc.php	2011-11-15 20:40:50 UT=
C (rev 4363)
@@ -20,7 +20,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 require_once('class_acc_payment.php');
-
+require_once 'class_sort_table.php';
 //----------------------------------------------------------------------=
-----
 // Common variable
 $td=3D'<TD>';
@@ -46,18 +46,15 @@
     $javascript=3D"return confirm('"._('Vous confirmez')."')";
     echo '<form method=3D"post" onsubmit=3D"'.$javascript.'">';
     echo dossier::hidden();
-    echo HtmlInput::hidden('p_jrn',0);
-    echo HtmlInput::hidden('p_action','divers');
     echo HtmlInput::hidden('sa','mp');
     echo HtmlInput::hidden('sb','save');
-    echo HtmlInput::hidden('jrn_def_id',$row->get_parameter('ledger_sour=
ce'));
-    echo HtmlInput::hidden('mp_lib',$row->get_parameter('lib'));
+    echo HtmlInput::hidden('id',$row->get_parameter("id"));
=20
     echo $row->form();
     echo HtmlInput::submit('save',_('Sauve'));
     echo HtmlInput::submit('delete',_('Efface'));
-    echo HtmlInput::button_anchor(_('Retour sans sauvez'),
-                                  '?p_action=3Ddivers&sa=3Dmp&'.dossier:=
:get()
+    echo HtmlInput::button_anchor(_('Retour sans sauver'),
+                                  '?p_action=3Ddivers&sa=3Dmp&'.dossier:=
:get()."&ac=3D".$_REQUEST['ac']
                                      );
     echo '</form>';
     exit();
@@ -82,60 +79,71 @@
     $row->delete();
 }
 //----------------------------------------------------------------------=
-----
+// Insert a new mod of payment
+//----------------------------------------------------------------------=
-----
+if ( isset($_POST['insert']))
+{
+    $row=3Dnew Acc_Payment($cn);
+    $row->from_array($_POST);
+    $row->insert();
+	$sb=3D"list";
+}
+
+//----------------------------------------------------------------------=
-----
 // Show form to enter a new one
 //----------------------------------------------------------------------=
-----
 if ($sb=3D=3D'ins')
 {
     $mp=3Dnew Acc_Payment($cn);
     $r=3D$mp->blank();
-    echo '<form method=3D"POST">';
-    echo dossier::hidden().HtmlInput::hidden('sa',$_REQUEST['sa']).
+    echo '<form method=3D"POST" onsubmit=3D"return confirm(\'Vous confir=
mez ?\')">';
+    echo dossier::hidden();
 	HtmlInput::hidden('ac',$_REQUEST['ac']).HtmlInput::hidden('sb','insert'=
);
     echo $r;
     echo HtmlInput::submit('insert',_('Enregistre'));
     echo '</form>';
-    echo HtmlInput::button_anchor(_('Retour sans sauvez'),
+    echo HtmlInput::button_anchor(_('Retour sans sauver'),
                                   '?p_action=3Ddivers&sa=3Dmp&'.dossier:=
:get()."&ac=3D".$_REQUEST['ac']
                                      );
=20
     exit();
 }
-//----------------------------------------------------------------------=
-----
-// Insert a new mod of payment
-//----------------------------------------------------------------------=
-----
-if ( $sb=3D=3D'insert')
-{
-    $row=3Dnew Acc_Payment($cn);
-    $row->from_array($_POST);
-    $row->insert();
-}
-//----------------------------------------------------------------------
-// LEDGER PURCHASE
-//----------------------------------------------------------------------
+//----------------------------------------------------------------------=
----------
+//LIST
+//----------------------------------------------------------------------=
----------
+/* Get the data from database */
+$header=3Dnew Sort_Table();
+$base_url=3D$_SERVER['PHP_SELF']."?".Dossier::get()."&ac=3D".$_REQUEST['=
ac'];
=20
-echo '<fieldset>';
-echo '<legend>Journaux </legend>';
-/* Get the data from database */
-$mp=3Dnew Acc_Payment($cn);
-$array=3D$mp->get_all();
+$header->add("Libelle",$base_url,"order by mp_lib asc","order by mp_lib =
desc",'la','ld');
+$header->add("Pour le journal",$base_url,"order by jrn_def_name asc","or=
der by jrn_def_name  desc",'ja','jd');
+$header->add("Type de fiche",$base_url,"order by fd_label asc","order by=
 fd_label desc",'tc','td');
+$header->add("Enregistr=C3=A9 dans le journal",$base_url,"order by jrn_t=
arget asc","order by jrn_target desc",'jta','jtd');
+$header->add("Avec la fiche",$base_url,"order by vw_name asc","order by =
vw_name desc",'na','nd');
+
+$order=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la';
+
+$sql=3D$header->get_sql_order($order);
+
+$array=3D$cn->get_array("
+	select
+			mp_id,mp_lib,mp_jrn_def_id,mp_fd_id,mp_qcode,j.jrn_def_id,
+			j.jrn_def_name as jrn_def_name,
+			j2.jrn_def_name as jrn_target,
+			fd_label,
+			coalesce(mp_qcode,'A choisir =C3=A0 l''encodage') as vw_name
+			from mod_payment as mp
+			left join jrn_def as j on (j.jrn_def_id=3Dmp.jrn_def_id)
+			left join jrn_def as j2 on (j2.jrn_def_id=3Dmp.mp_jrn_def_id)
+			left join fiche_def as fd on (mp.mp_fd_id=3Dfd.fd_id)
+			$sql
+	");
 /* if there are data show them in a table */
 if ( ! empty ($array))
 {
-    echo '<table >';
-    echo $tr.$th._('Libell=C3=A9').$eth.$th._('Type de fiche')
-    .$eth.$th._('enregistr=C3=A9 dans le journal').$eth.
-    $th._(' Avec la fiche').$eth.$th.'Action'.$eth.$etr;
-    foreach ($array as $row)
-    {
-        echo $tr;
-        echo $row->row();
-        echo $td.HtmlInput::button_anchor(_('Modifie'),'?ac=3D'.$_REQUES=
T['ac'].'&sa=3Dmp&sb=3Dchange&'.dossier::get().
-                                              '&id=3D'.$row->get_paramet=
er('id'));
-        echo $etr;
=20
-    }
-    echo '</table>';
+	require_once 'template/list_mod_payment.php';
+	echo HtmlInput::button_anchor("Ajout", $base_url."&sb=3Dins");
 }
-echo '</fieldset>';
 echo '</div>';
 ?>

Modified: phpcompta/trunk/include/template/new_mod_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/new_mod_payment.php	2011-11-15 16:00=
:05 UTC (rev 4362)
+++ phpcompta/trunk/include/template/new_mod_payment.php	2011-11-15 20:40=
:50 UTC (rev 4363)
@@ -1,5 +1,5 @@
 <fieldset>
-<legend><?=3D_('Nouveau moyen de paiement')?>
+<legend><?=3D$msg?>
 </legend>
 <table>
 <tr>


Property changes on: phpcompta/trunk/sql
___________________________________________________________________
Name: svn:ignore
   - .upgrade.sql.swp
.object-6.0.sql.swp
.backup-new-object.sh.swp

   + .upgrade.sql.swp
.object-6.0.sql.swp
.backup-new-object.sh.swp
.mode_paiement.sql.swp


Modified: phpcompta/trunk/sql/mode_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/mode_paiement.sql	2011-11-15 16:00:05 UTC (rev 43=
62)
+++ phpcompta/trunk/sql/mode_paiement.sql	2011-11-15 20:40:50 UTC (rev 43=
63)
@@ -8,6 +8,6 @@
 alter table mod_payment drop mp_type;
=20
=20
-alter table mod_payment add constraint foreign key (jrn_def_id) referenc=
es jrn_def(jrn_def_id);
+alter table mod_payment add constraint mod_payment_jrn_def_id_fk foreign=
 key (jrn_def_id) references jrn_def(jrn_def_id) on delete cascade on upd=
ate cascade;
=20
 comment on column mod_payment.jrn_def_id is 'Ledger using this payment m=
ethod';



From MAILER-DAEMON Tue Nov 15 15:50:06 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQPxG-00026U-Qk
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 15:50:06 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 15 Nov 2011 21:55:47 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.18061.1321390206.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4364 - 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, 15 Nov 2011 20:50:05 -0000

Author: danydb
Date: 2011-11-15 21:55:45 +0100 (Tue, 15 Nov 2011)
New Revision: 4364

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_acc_payment.php
Log:

Fix small bugs payment method by ledger


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	2011-11-15 20:4=
0:50 UTC (rev 4363)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-15 20:5=
5:45 UTC (rev 4364)
@@ -733,7 +733,7 @@
=20
                 /* jrnx */
                 $acseq=3D$this->db->get_next_seq('s_grpt');
-                $acjrn=3Dnew Acc_Ledger($this->db,$mp->get_parameter('le=
dger'));
+                $acjrn=3Dnew Acc_Ledger($this->db,$mp->get_parameter('le=
dger_target'));
                 $acinternal=3D$acjrn->compute_internal_code($acseq);
=20
                 /* Insert paid by  */
@@ -757,7 +757,7 @@
                 $acc_pay->amount=3Dabs(round($cust_amount,2));
                 $acc_pay->desc=3D$e_comm;
                 $acc_pay->grpt=3D$acseq;
-                $acc_pay->jrn=3D$mp->get_parameter('ledger');
+                $acc_pay->jrn=3D$mp->get_parameter('ledger_target');
                 $acc_pay->periode=3D$tperiode;
 		$acc_pay->type=3D($cust_amount>=3D0)?'c':'d';
                 $acc_pay->insert_jrnx();
@@ -770,7 +770,7 @@
                 $acc_pay->amount=3Dabs(round($cust_amount,2));
                 $acc_pay->desc=3D$e_comm;
                 $acc_pay->grpt=3D$acseq;
-                $acc_pay->jrn=3D$mp->get_parameter('ledger');
+                $acc_pay->jrn=3D$mp->get_parameter('ledger_target');
                 $acc_pay->periode=3D$tperiode;
 		$acc_pay->type=3D($cust_amount>=3D0)?'d':'c';
                 $let_other=3D$acc_pay->insert_jrnx();
@@ -819,7 +819,8 @@
             echo '<span class=3D"error">'.
             'Erreur dans l\'enregistrement '.
             __FILE__.':'.__LINE__.' '.
-            $e->getMessage().$e->getTrace();
+            $e->getMessage().$e->getTraceAsString();
+
             $this->db->rollback();
             exit();
         }

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	2011-11-15 20:40:50=
 UTC (rev 4363)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-15 20:55:45=
 UTC (rev 4364)
@@ -493,7 +493,7 @@
=20
                 /* jrnx */
                 $acseq=3D$this->db->get_next_seq('s_grpt');
-                $acjrn=3Dnew Acc_Ledger($this->db,$mp->get_parameter('le=
dger'));
+                $acjrn=3Dnew Acc_Ledger($this->db,$mp->get_parameter('le=
dger_target'));
                 $acinternal=3D$acjrn->compute_internal_code($acseq);
=20
                 /* Insert paid by  */
@@ -517,7 +517,7 @@
                 $acc_pay->amount=3Dabs(round($cust_amount,2));
                 $acc_pay->desc=3D$e_comm;
                 $acc_pay->grpt=3D$acseq;
-                $acc_pay->jrn=3D$mp->get_parameter('ledger');
+                $acc_pay->jrn=3D$mp->get_parameter('ledger_target');
                 $acc_pay->periode=3D$tperiode;
                 $acc_pay->type=3D($cust_amount>=3D0)?'d':'c';
                 $acc_pay->insert_jrnx();
@@ -530,7 +530,7 @@
                 $acc_pay->amount=3Dabs(round($cust_amount,2));
                 $acc_pay->desc=3D$e_comm;
                 $acc_pay->grpt=3D$acseq;
-                $acc_pay->jrn=3D$mp->get_parameter('ledger');
+                $acc_pay->jrn=3D$mp->get_parameter('ledger_target');
                 $acc_pay->periode=3D$tperiode;
 		$acc_pay->type=3D($cust_amount>=3D0)?'c':'d';
                 $let_other=3D$acc_pay->insert_jrnx();
@@ -1284,7 +1284,7 @@
         $r.=3D"</DIV>";
         return $r;
     }
-=20
+
     /*!\brief test function
      */
     static function test_me($p_string=3D'')

Modified: phpcompta/trunk/include/class_acc_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_payment.php	2011-11-15 20:40:50 UTC=
 (rev 4363)
+++ phpcompta/trunk/include/class_acc_payment.php	2011-11-15 20:55:45 UTC=
 (rev 4364)
@@ -69,7 +69,10 @@
             return $this->$idx;
         }
         else
+		{
+			throw new Exception("Attribut inexistant $p_string");
             exit (__FILE__.":".__LINE__.'Erreur attribut inexistant');
+		}
     }
     public function set_parameter($p_string,$p_value)
     {



From MAILER-DAEMON Tue Nov 15 18:15:25 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQSDt-0000Qn-62
	for mharc-phpcompta-dev@gnu.org; Tue, 15 Nov 2011 18:15:25 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 16 Nov 2011 00:20:56 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.18340.1321398924.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4365 - in phpcompta/trunk: html 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: Tue, 15 Nov 2011 23:15:23 -0000

Author: danydb
Date: 2011-11-16 00:20:54 +0100 (Wed, 16 Nov 2011)
New Revision: 4365

Modified:
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/html/ajax_ledger.php
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/ajax_poste.php
   phpcompta/trunk/html/direct.php
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/show_document_modele.php
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/constant.security.php
   phpcompta/trunk/include/document_modele.inc.php
   phpcompta/trunk/include/lettering.account.inc.php
   phpcompta/trunk/include/payment_middle.inc.php
   phpcompta/trunk/include/periode.inc.php
   phpcompta/trunk/include/profile.inc.php
   phpcompta/trunk/include/search.inc.php
   phpcompta/trunk/include/template/category_of_card.php
   phpcompta/trunk/include/template/form_ledger_detail.php
   phpcompta/trunk/include/template/form_ledger_fin.php
   phpcompta/trunk/include/template/history_top.php
   phpcompta/trunk/include/template/ledger_detail_forbidden.php
   phpcompta/trunk/include/template/ledger_detail_top.php
   phpcompta/trunk/include/template/modele_document.php
   phpcompta/trunk/include/template/search_top.php
   phpcompta/trunk/include/template/security_list_action.php
   phpcompta/trunk/sql/object-6.0.sql
   phpcompta/trunk/sql/upgrade.sql
Log:
improve appearance
fix bug due can_request, add new action

Modified: phpcompta/trunk/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_card.php	2011-11-15 20:55:45 UTC (rev 4364)
+++ phpcompta/trunk/html/ajax_card.php	2011-11-15 23:20:54 UTC (rev 4365)
@@ -305,9 +305,7 @@
 case 'fs':
     require_once('class_acc_ledger.php');
     $r=3D'';
-    $r.=3D'<div style=3D"float:right;height:10px;display:block;margin-to=
p:2px;margin-right:2px">';
-    $r.=3D '<A style=3D"background-color:blue;color:white;text-decoratio=
n:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\'search_card\')=
;">Fermer</A>';
-    $r.=3D'</div>';
+	$r.=3DHtmlInput::anchor_close('search_card');
     $r.=3D'<div> '.h2info(_('Recherche de fiche')).'</div>';
=20
     $r.=3D'<form method=3D"GET" onsubmit=3D"this.ctl=3D\'ipop_card\';sea=
rch_get_card(this);return false;">';

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	2011-11-15 20:55:45 UTC (rev 436=
4)
+++ phpcompta/trunk/html/ajax_ledger.php	2011-11-15 23:20:54 UTC (rev 436=
5)
@@ -163,7 +163,7 @@
     }
     catch (Exception $e)
     {
-        echo '<A style=3D"background-color:blue;color:white;text-decorat=
ion:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$div.'\');=
">Fermer</A>';
+        echo HtmlInput::anchor_close($div);
         echo '<h2 class=3D"error">D=C3=A9sol=C3=A9 il y a une erreur</h2=
>';
     }
     $html=3Dob_get_contents();
@@ -424,11 +424,11 @@
     // ask for a date for reversing the operation
 case 'ask_extdate':
     $date=3Dnew IDate('p_date');
-    $html=3D '<A style=3D"background-color:blue;color:white;text-decorat=
ion:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$div.'\');=
">Fermer</A>';
     $html.=3D"<form id=3D\"form_".$div."\" onsubmit=3D\"return reverseOp=
eration(this);\">";
     $html.=3DHtmlInput::hidden('jr_id',$_REQUEST['jr_id']).HtmlInput::hi=
dden('div',$div).dossier::hidden().HtmlInput::hidden('act','reverseop');
     $html.=3D'<h2 class=3D"info">entrez une date </H2>'.$date->input();
     $html.=3DHtmlInput::submit('x','accepter');
+	$html=3DHtmlInput::button_close($div);
     $html.=3D'</form>';
     break;
     ////////////////////////////////////////////////////////////////////=
////////////

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	2011-11-15 20:55:45 UTC (rev 4364)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-15 23:20:54 UTC (rev 4365)
@@ -263,7 +263,7 @@
 	case 'dl':
 		require_once('class_lettering.php');
 		$exercice =3D $user->get_exercice();
-                if ($user->check_module("LETTERCARD") =3D=3D 0 && $user-=
>check_module("LETTERACC") =3D=3D 0) exit();
+                if ($user->check_module("LETCARD") =3D=3D 0 && $user->ch=
eck_module("LETACC") =3D=3D 0) exit();
 		$periode =3D new Periode($cn);
 		list($first_per, $last_per) =3D $periode->get_limit($exercice);
=20
@@ -481,10 +481,6 @@
 		require_once('ajax_save_predf_op.php');
 		break;
 	case 'search_op':
-		/* put_global(array
-		  (array('key'=3D>'ac','value'=3D>'JSSEARCH')),
-		  (array('key'=3D>'ledger_type','value'=3D>'ALL'))
-		  ); */
 		require_once 'search.inc.php';
 		break;
 	case 'display_profile':

Modified: phpcompta/trunk/html/ajax_poste.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_poste.php	2011-11-15 20:55:45 UTC (rev 4364=
)
+++ phpcompta/trunk/html/ajax_poste.php	2011-11-15 23:20:54 UTC (rev 4365=
)
@@ -79,9 +79,7 @@
     $str_poste=3D$it->input();
     $str_submit=3DHtmlInput::submit('sf',_('Recherche'));
     $r=3D'';
-    $r.=3D'<div style=3D"float:right;height:10px;display:block;margin-to=
p:2px;margin-right:2px">';
-    $r.=3D '<A style=3D"background-color:blue;color:white;text-decoratio=
n:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\'search_account=
\');">Fermer</A>';
-    $r.=3D'</div>';
+	$r=3DHtmlInput::anchor_close('search_account');
     $r.=3D'<div> '.h2info(_('Poste Comptable')).'</div>';
=20
     $r.=3D'<form id=3D"sp" method=3D"get" onsubmit=3D"'.$attr.'search_ge=
t_poste(this);return false;">';

Modified: phpcompta/trunk/html/direct.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/direct.php	2011-11-15 20:55:45 UTC (rev 4364)
+++ phpcompta/trunk/html/direct.php	2011-11-15 23:20:54 UTC (rev 4365)
@@ -5,7 +5,7 @@
 $user=3Dnew User($cn);
 $user->Check();
 $user->check_dossier($_GET['gDossier']);
-$res=3D$cn->exec_sql("select code,description from get_profile_menu($1) =
where code ~* $2 limit 8",array($user->login,$_POST['acs']));
+$res=3D$cn->exec_sql("select code,description from get_profile_menu($1) =
where code ~* $2 or description ~* $3 limit 8",array($user->login,$_POST[=
'acs'],$_POST['acs']));
 $nb=3DDatabase::num_row($res);
 	echo "<ul>";
 for ($i =3D 0;$i< $nb;$i++)

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	2011-11-15 20:55:45 UTC (rev 4364)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-15 23:20:54 UTC (rev 4365)
@@ -854,11 +854,11 @@
     }
     var sid=3D'calc1';
     var shtml=3D'';
-    shtml+=3D'<form name=3D"calc_line"  method=3D"GET" onSubmit=3D"cal()=
;return false;" >Cette calculatrice vous permet de calculer, =C3=A9crivez=
 simplement les op=C3=A9rations que vous voulez puis la touche retour. ex=
emple : 1+2+3*(1/5) <input class=3D"input_text" type=3D"text" size=3D"30"=
 id=3D"inp" name=3D"calculator"> <input type=3D"button" value=3D"Efface t=
out" onClick=3D"Clean();return false;" > <input type=3D"button" value=3D"=
Fermer" onClick=3D"removeDiv(\'calc1\')" >';
+    shtml+=3D'<form name=3D"calc_line"  method=3D"GET" onSubmit=3D"cal()=
;return false;" >Calculatrice simplifi=C3=A9e: =C3=A9crivez simplement le=
s op=C3=A9rations que vous voulez puis la touche retour. exemple : 1+2+3*=
(1/5) <input class=3D"input_text" type=3D"text" size=3D"30" id=3D"inp" na=
me=3D"calculator"> <input type=3D"button" value=3D"Efface tout" class=3D"=
button" onClick=3D"Clean();return false;" > <input type=3D"button" class=3D=
"button" value=3D"Fermer" onClick=3D"removeDiv(\'calc1\')" >';
     shtml+=3D'</form><span id=3D"result">  </span><br><span id=3D"sub_to=
tal">  Taper une formule (ex 20*5.1) puis enter  </span><br><span id=3D"l=
isting"> </span>';
=20
 var obj=3D{id:sid,html:shtml,
-	 drag:true,style:'position:absolute;display:block;top:30px;left:150px;w=
idth:250px;border:1px solid black;background-color:#99b1df;font-size:12;p=
adding: 2 2 2 2;'
+	 drag:true,style:''
         };
     add_div(obj);
     this.document.getElementById('inp').focus();
@@ -1024,6 +1024,7 @@
 }
 /**
  *ctl_concern is the widget to update
+ *amount_id is either a html obj. or an amount
  */
 function search_reconcile(dossier,ctl_concern,amount_id,ledger)
 {

Modified: phpcompta/trunk/html/show_document_modele.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/show_document_modele.php	2011-11-15 20:55:45 UTC=
 (rev 4364)
+++ phpcompta/trunk/html/show_document_modele.php	2011-11-15 23:20:54 UTC=
 (rev 4365)
@@ -36,7 +36,7 @@
 /*!\todo Add security here
  */
 $User->Check();
-if ( $User->check_module("CFGDOCUMENT") =3D=3D 0 ) exit();
+if ( $User->check_module("CFGDOC") =3D=3D 0 ) exit();
 // retrieve the document
 $r=3D$cn->exec_sql("select md_id,md_lob,md_filename,md_mimetype
                  from document_modele where md_id=3D$1",array($_REQUEST[=
'md_id']));

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	2011-11-15 20:55:45 UTC (rev 4364)
+++ phpcompta/trunk/html/style.css	2011-11-15 23:20:54 UTC (rev 4365)
@@ -714,7 +714,7 @@
   /*height:32px;*/
   cursor:pointer;
 }
-span.informal{ font-size:12; }
+span.informal{ font-size:95%; color:black;}
=20
 ul.select_table  {
 	/*padding:5px;*/
@@ -813,7 +813,7 @@
 	margin-top:3px;
 	cursor:pointer;
 	margin:1 2 1 2;
-	-moz-border-radius:2 2;
+	-moz-border-radius:4 4;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
@@ -1041,11 +1041,28 @@
 }
 #close_div
 {
- background-color:blue;
- color:white;
- text-decoration:none
+ background-color:white;
+ color:blue;
+ text-decoration:none;
+ border:1px solid blue;
+ margin-left: 2px;
+ margin-right:2px;
+ margin-top:2px;
+ font-size:10px;
 }
 table.table_large tr.odd ,table.table_large tr.even {
=20
 	height:32px;
-}
\ No newline at end of file
+}
+#calc1
+{
+	position:absolute;
+	display:block;
+	top:30px;
+	left:150px;
+	width:300px;
+	border:1px solid black;
+	background-color:#aec3e8;
+	font-size:16;
+	padding: 20 20;
+}

Modified: phpcompta/trunk/include/constant.security.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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.security.php	2011-11-15 20:55:45 UTC=
 (rev 4364)
+++ phpcompta/trunk/include/constant.security.php	2011-11-15 23:20:54 UTC=
 (rev 4365)
@@ -4,5 +4,6 @@
 define ("FICCAT",910);  //cr=C3=A9ation, modification et effacement de c=
at=C3=A9gorie de fiche
 define ('RMDOC',1020);   // Effacement de document pour follow up
 define ('VIEWDOC',1010);   // Voir document pour follow up
+define ('PARCATDOC',1050);   // modifier type document pour follow up
 global $audit; $audit=3Dtrue;
 ?>

Modified: phpcompta/trunk/include/document_modele.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/document_modele.inc.php	2011-11-15 20:55:45 U=
TC (rev 4364)
+++ phpcompta/trunk/include/document_modele.inc.php	2011-11-15 23:20:54 U=
TC (rev 4365)
@@ -25,8 +25,7 @@
 require_once("class_document_modele.php");
 $sub_action=3D(isset ($_REQUEST['sa']))?$_REQUEST['sa']:"";
 echo js_include('modele_document.js');
-
-echo "<hr>";
+echo '<div class=3D"content">';
 // show the form for adding a template
 //
 $doc=3Dnew Document_modele($cn);

Modified: phpcompta/trunk/include/lettering.account.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/lettering.account.inc.php	2011-11-15 20:55:45=
 UTC (rev 4364)
+++ phpcompta/trunk/include/lettering.account.inc.php	2011-11-15 23:20:54=
 UTC (rev 4365)
@@ -36,7 +36,7 @@
=20
 $poste=3Dnew IPoste();
 $poste->name=3D"acc";
-$poste->table=3D1;
+$poste->table=3D0;
 $poste->set_attribute('jrn',0);
 $poste->set_attribute('gDossier',dossier::id());
 $poste->set_attribute('ipopup','ipop_account');

Modified: phpcompta/trunk/include/payment_middle.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/payment_middle.inc.php	2011-11-15 20:55:45 UT=
C (rev 4364)
+++ phpcompta/trunk/include/payment_middle.inc.php	2011-11-15 23:20:54 UT=
C (rev 4365)
@@ -101,10 +101,10 @@
 	HtmlInput::hidden('ac',$_REQUEST['ac']).HtmlInput::hidden('sb','insert'=
);
     echo $r;
     echo HtmlInput::submit('insert',_('Enregistre'));
-    echo '</form>';
     echo HtmlInput::button_anchor(_('Retour sans sauver'),
                                   '?p_action=3Ddivers&sa=3Dmp&'.dossier:=
:get()."&ac=3D".$_REQUEST['ac']
                                      );
+    echo '</form>';
=20
     exit();
 }

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	2011-11-15 20:55:45 UTC (rev =
4364)
+++ phpcompta/trunk/include/periode.inc.php	2011-11-15 23:20:54 UTC (rev =
4365)
@@ -38,7 +38,6 @@
=20
 if ( isset ($_POST["add_per"] ))
 {
-    $g_user->can_request(PARPER,1);
     extract($_POST);
     $obj=3Dnew Periode($cn);
     if ( $obj->insert($p_date_start,$p_date_end,$p_exercice) =3D=3D 1 )
@@ -50,7 +49,6 @@
 }
 if (isset($_POST['add_exercice']))
   {
-    $g_user->can_request(PARPER,1);
     $obj=3Dnew Periode($cn);
     $exercice=3D$cn->get_value('select max(p_exercice::float)+1 from par=
m_periode');
     if ( $obj->insert_exercice($exercice) =3D=3D 1 )
@@ -62,7 +60,6 @@
   }
 if ( $action=3D=3D"closed")
 {
-    $g_user->can_request(PARCLO);
     $p_per=3D$_GET['p_per'];
     $per=3Dnew Periode($cn);
     $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
@@ -74,7 +71,6 @@
=20
 if ( $action=3D=3D "delete_per" )
 {
-    $g_user->can_request(PARPER);
     $p_per=3D$_GET["p_per"];
 // Check if the periode is not used
     if ( $cn->count_sql("select * from jrnx where j_tech_per=3D$p_per") =
!=3D 0 )
@@ -89,7 +85,6 @@
 }
 if ( $action =3D=3D 'reopen')
   {
-    $g_user->can_request(PARCLO);
     $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
     $per=3Dnew Periode($cn);
     $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;

Modified: phpcompta/trunk/include/profile.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/profile.inc.php	2011-11-15 20:55:45 UTC (rev =
4364)
+++ phpcompta/trunk/include/profile.inc.php	2011-11-15 23:20:54 UTC (rev =
4365)
@@ -275,7 +275,7 @@
 echo '<div id=3D"detail_profile" class=3D"content">';
 if (isset($_POST['p_id']))
 {
-	require_once 'show_profile.inc.php';
+	require_once 'ajax_get_profile.php';
 }
 echo '</div>';
 ?>

Modified: phpcompta/trunk/include/search.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/search.inc.php	2011-11-15 20:55:45 UTC (rev 4=
364)
+++ phpcompta/trunk/include/search.inc.php	2011-11-15 23:20:54 UTC (rev 4=
365)
@@ -124,7 +124,7 @@
 	    if ($step<$max_line ) echo '<span class=3D"notice">Nombre d\'enregi=
strements trouv=C3=A9s =3D' .$max_line.' limite =3D  '.$step.'</SPAN>';
    }
 	echo '<form method=3D"get" onsubmit=3D"set_reconcile(this);return false=
">';
-
+	echo HtmlInput::submit("upd_rec","Mettre =C3=A0 jour");
     echo $content;
 	echo HtmlInput::submit("upd_rec","Mettre =C3=A0 jour");
 	echo '</form>';

Modified: phpcompta/trunk/include/template/category_of_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/category_of_card.php	2011-11-15 20:5=
5:45 UTC (rev 4364)
+++ phpcompta/trunk/include/template/category_of_card.php	2011-11-15 23:2=
0:54 UTC (rev 4365)
@@ -1,8 +1,6 @@
-<div style=3D"float:right;height:10px;display:block;margin-top:2px;margi=
n-right:2px">
 <?
-     echo '<A style=3D"background-color:blue;color:white;text-decoration=
:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$ctl.'\');">F=
ermer</A>';
+     echo HtmlInput::anchor_close($ctl);
 ?>
-</div>
    <? echo h2info(_("Ajout d'une cat=C3=A9gorie").$msg); ?>
=20
 <div class=3D"content">

Modified: phpcompta/trunk/include/template/form_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_detail.php	2011-11-15 20=
:55:45 UTC (rev 4364)
+++ phpcompta/trunk/include/template/form_ledger_detail.php	2011-11-15 23=
:20:54 UTC (rev 4365)
@@ -20,7 +20,7 @@
 <legend><?=3D$f_legend_detail?></legend>
 <table id=3D"sold_item" width=3D"100%" border=3D"0">
 <tr>
-<th colspan=3D"2">Code <?=3DHtmlInput::infobulle(0)?></th>
+<th style=3D"width:auto"colspan=3D"2">Code <?=3DHtmlInput::infobulle(0)?=
></th>
       <th><?=3D_('D=C3=A9nomination')?></th>
       <th><?=3D_('prix/unit=C3=A9 htva')?><?=3DHtmlInput::infobulle(6)?>=
</th>
       <th><?=3D_('quantit=C3=A9')?></th>

Modified: phpcompta/trunk/include/template/form_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_fin.php	2011-11-15 20:55=
:45 UTC (rev 4364)
+++ phpcompta/trunk/include/template/form_ledger_fin.php	2011-11-15 23:20=
:54 UTC (rev 4365)
@@ -21,10 +21,10 @@
    <fieldset><legend><?=3D_('Op=C3=A9rations')?></legend>
 <table id=3D"fin_item" width=3D"100%" border=3D"0">
 <tr>
-<th colspan=3D"2">code<?HtmlInput::infobulle(0)?></TH>
-   <th><?=3D_('Commentaire')?></TH>
-   <th><?=3D_('Montant')?></TH>
-   <th colspan=3D"2"> <?=3D_('Op. Concern=C3=A9e(s)')?></th>
+<th style=3D"text-align: left;width: auto"colspan=3D"2">code<?HtmlInput:=
:infobulle(0)?></TH>
+   <th style=3D"text-align: left"><?=3D_('Commentaire')?></TH>
+   <th style=3D"text-align: left"><?=3D_('Montant')?></TH>
+   <th style=3D"text-align: left;width:auto"colspan=3D"2"> <?=3D_('Op. C=
oncern=C3=A9e(s)')?></th>
 </tr>
=20
 <? foreach ($array as $item) {

Modified: phpcompta/trunk/include/template/history_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/history_top.php	2011-11-15 20:55:45 =
UTC (rev 4364)
+++ phpcompta/trunk/include/template/history_top.php	2011-11-15 23:20:54 =
UTC (rev 4365)
@@ -4,9 +4,9 @@
    {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3Dde&ajax=3D$callback";
-     echo '<A style=3D"margin-right:5px;background-color:blue;color:whit=
e;text-decoration:none" HREF=3D"javascript:void(0)" onclick=3D"var a=3Dwi=
ndow.open(\'popup.php?'.$str.'\',\'\',\'toolbar=3D0,width=3D600,height=3D=
400,scrollbars=3Dyes,resizable=3Dyes,status=3D0,location=3D0\'); a.focus(=
);removeDiv(\''.$div.'\')">
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'toolbar=3D0,width=3D600,h=
eight=3D400,scrollbars=3Dyes,resizable=3Dyes,status=3D0,location=3D0\'); =
a.focus();removeDiv(\''.$div.'\')">
 !pop me up ! </A>';
-echo '<A style=3D"background-color:blue;color:white;text-decoration:none=
" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$div.'\');">Fermer=
</A>';=20
-}=20
+echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"removeD=
iv(\''.$div.'\');">Fermer</A>';
+}
 ?>
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/ledger_detail_forbidden.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_forbidden.php	2011-11-=
15 20:55:45 UTC (rev 4364)
+++ phpcompta/trunk/include/template/ledger_detail_forbidden.php	2011-11-=
15 23:20:54 UTC (rev 4365)
@@ -1,8 +1,6 @@
-<div style=3D"margin:0;padding:0;text-align:right;height:13px">
-<?=20
-echo '<A style=3D"background-color:blue;color:white;text-decoration:none=
" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$div.'\');">Fermer=
</A>';=20
+<?
+echo HtmlInput::anchor_close($div);
 ?>
-</div>
 <div style=3D"margin:0;padding:0;background-color:red;text-align:center;=
">
 <h2 class=3D"error">Acc=C3=A8s interdit : vous n'avez pas acc=C3=A8s =C3=
=A0 cette information, contactez votre responsable</h2>;
 </div>
\ No newline at end of file

Modified: phpcompta/trunk/include/template/ledger_detail_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_top.php	2011-11-15 20:=
55:45 UTC (rev 4364)
+++ phpcompta/trunk/include/template/ledger_detail_top.php	2011-11-15 23:=
20:54 UTC (rev 4365)
@@ -1,11 +1,11 @@
 <div style=3D"float:right;height:10px;display:block;margin-top:2px;margi=
n-right:2px">
-<?=20
+<?
    if ($div !=3D "popup") {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3D$action&ajax=3D$callback";
-     echo '<A style=3D"margin-right:5px;background-color:blue;color:whit=
e;text-decoration:none" HREF=3D"javascript:void(0)" onclick=3D"var a=3Dwi=
ndow.open(\'popup.php?'.$str.'\',\'\',\'toolbar=3D0,width=3D600,height=3D=
400,scrollbars=3Dyes,resizable=3Dyes,status=3D0,location=3D0\'); a.focus(=
);removeDiv(\''.$div.'\')">
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'toolbar=3D0,width=3D600,h=
eight=3D400,scrollbars=3Dyes,resizable=3Dyes,status=3D0,location=3D0\'); =
a.focus();removeDiv(\''.$div.'\')">
 !pop me up ! </A>';
-     echo '<A style=3D"background-color:blue;color:white;text-decoration=
:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$div.'\');">F=
ermer</A>';=20
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"re=
moveDiv(\''.$div.'\');">Fermer</A>';
    }
 ?>
 </div>

Modified: phpcompta/trunk/include/template/modele_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/modele_document.php	2011-11-15 20:55=
:45 UTC (rev 4364)
+++ phpcompta/trunk/include/template/modele_document.php	2011-11-15 23:20=
:54 UTC (rev 4365)
@@ -1,6 +1,4 @@
-<div style=3D"float:right">
-<A style=3D"background-color:blue;color:white;text-decoration:none" HREF=
=3D"javascript:void(0)" onclick=3D"removeDiv('mod_doc');">Fermer</A>
-</div>
+<?=3DHtmlInput::anchor_close('mod_doc');?>
 <h2 class=3D"info">Mod=C3=A8le de document</h2>
 <form  method=3D"post" enctype=3D"multipart/form-data">
 <table>

Modified: phpcompta/trunk/include/template/search_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/search_top.php	2011-11-15 20:55:45 U=
TC (rev 4364)
+++ phpcompta/trunk/include/template/search_top.php	2011-11-15 23:20:54 U=
TC (rev 4365)
@@ -33,7 +33,7 @@
    if ($div =3D=3D "search_op") {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D"recherche.php?".Dossier::get().'&ac=3DSEARCH';
-     echo '<A style=3D"background-color:blue;color:white;text-decoration=
:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$div.'\');">F=
ermer</A>';
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"re=
moveDiv(\''.$div.'\');">Fermer</A>';
    }
 ?>
 </div>

Modified: phpcompta/trunk/include/template/security_list_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/security_list_action.php	2011-11-15 =
20:55:45 UTC (rev 4364)
+++ phpcompta/trunk/include/template/security_list_action.php	2011-11-15 =
23:20:54 UTC (rev 4365)
@@ -50,5 +50,5 @@
 				array(800,1000));
                                 display_security_fieldset(_('Fiche'),$ar=
ray,$sec_User); ?>
                         <?php   $array=3D$cn->get_array("select ac_id, a=
c_description from action  where ac_id >=3D$1 and ac_id <=3D$2 order by a=
c_id ",
-				array(1050,1100));
+				array(1001,1100));
                                 display_security_fieldset(_('Suivi'),$ar=
ray,$sec_User); ?>

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-15 20:55:45 UTC (rev 4364)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-15 23:20:54 UTC (rev 4365)
@@ -192,7 +192,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 648, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 650, true);
=20
=20
 --
@@ -328,7 +328,7 @@
 INSERT INTO menu_ref VALUES ('TOOL', 'Outil comptable', 'tools/index.php=
', NULL, 'Outil comptable', 'plugin_code=3DTOOL', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('TVA', 'Module de TVA', 'tva/index.php', NU=
LL, 'Cette extension permet de faire les listings et declarations TVA', '=
plugin_code=3DTVA', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('IMPORTBANK', 'Importation banque', 'import=
bank/index.php', NULL, 'Import. fichier CVS de la banque', 'plugin_code=3D=
IMPORTBANK', NULL, 'PL');
-INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 'Nouvel achat ou d=C3=A9pense', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
@@ -336,75 +336,21 @@
 INSERT INTO menu_ref VALUES ('PDF:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('MODULARITY', 'Menu et profile', NULL, NULL=
, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGPROFILE', 'Profile', 'profile.inc.php',=
 NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, NULL, NU=
LL, 'popup_recherche()', 'ME');
+INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, 'Recherc=
he', NULL, 'popup_recherche()', 'ME');
+INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, 'Param=C3=A8=
tres divers', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, 'Conf=
ig. de la tva', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, 'Fi=
che', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, 'S=
tock', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MOD', 'Menu et profile', NULL, NULL, 'Menu=
 ', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPRO', 'Profile', 'profile.inc.php', NUL=
L, 'Configuration profile', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPAY', 'Moyen de paiement', 'payment_mid=
dle.inc.php', NULL, 'Config. des m=C3=A9thodes de paiement', NULL, NULL, =
'ME');
+INSERT INTO menu_ref VALUES ('CFGACC', 'Poste', 'poste.inc.php', NULL, '=
Config. poste comptable de base', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 'Nouvelle vente ou recette', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, NULL, NULL=
, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment=
_middle.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, NULL,=
 NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL=
L, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL=
L, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU=
LL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PDF:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, NULL, 'ledger_type=3DODS', NULL,=
 'ME');
-INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, =
NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi=
nies', 'preod.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DACH', NULL, 'ME');
-INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL, NUL=
L, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param=
_sec.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou=
nt.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, NULL, NUL=
L, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NUL=
L, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGDOCUMENT', 'Document', 'document_modele=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in=
c.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', =
NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, N=
ULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, NULL, 'ledger_type=3DALL', NULL, 'ME');
-INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, NULL, N=
ULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'extension_choice=
.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, NULL, NULL,=
 NULL, 'ME');
-INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('FINIMP', 'Historique financier', 'history_=
operation.inc.php', NULL, NULL, 'ledger_type=3DFIN', NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('FINSALDO', 'Soldes', 'compta_fin_saldo.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('FINREC', 'Rapprochement', 'compta_fin_rec.=
inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, NULL, =
NULL, 'search_reconcile()', 'ME');
-INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', 'cfgledger.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'=
, NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph=
p', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie=
nt.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N=
ULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, NULL, 'ledger_type=3DVEN', NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card=
_attr.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL=
, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL, NUL=
L, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU=
LL, NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc=
.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL=
L, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PDF:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
@@ -425,17 +371,63 @@
 INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('new_line', NULL, NULL, NULL, 'Saut de lign=
e', NULL, NULL, 'SP');
-INSERT INTO menu_ref VALUES ('PRINTJRN', 'Historique', 'impress_jrn.inc.=
php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTREC', 'Rapprochement', 'impress_rec.i=
nc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTPOSTE', 'Poste', 'impress_poste.inc.p=
hp', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTREPORT', 'Rapport', 'impress_rapport.=
inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTBILAN', 'Bilan', 'impress_bilan.inc.p=
hp', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTGL', 'Grand Livre', 'impress_gl_compt=
es.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTBAL', 'Balance', 'balance.inc.php', N=
ULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, NULL, NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, NULL, NU=
LL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, 'Suivi fournisseur', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('MODOP', 'Modification d''op=C3=A9rations',=
 'modop/index.php', NULL, 'Modification op=C3=A9rations', 'plugin_code=3D=
MODOP', NULL, 'PL');
-INSERT INTO menu_ref VALUES ('ACCESS', 'Accueil', NULL, 'user_login.php'=
, NULL, NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LET', 'Lettrage', NULL, NULL, 'Lettrage', =
NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, 'OD analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, 'V=C3=A9rification de la comptabilit=C3=A9', NULL, NU=
LL, 'ME');
+INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, 'Cr=C3=A9ation de rapport', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, 'Ecriture d''ouverture', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, 'Historique achat', 'ledger_type=3DACH', NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, 'Suivi, courrier, devis', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, 'Pr=C3=A9vision', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('EXT', 'Extension', 'extension_choice.inc.p=
hp', NULL, 'Extensions (plugins)', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGDOC', 'Document', 'document_modele.inc.=
php', NULL, 'Config. mod=C3=A8le de document', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGLED', 'journaux', 'cfgledger.inc.php', =
NULL, 'Configuration des journaux', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, 'Gestion des op=C3=A9rations pr=C3=A9d=C3=A9finifies', =
NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, 'Menu ava=
nc=C3=A9', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, 'Mo=
dule comptabilit=C3=A9 analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGSEC', 'S=C3=A9curit=C3=A9', 'param_sec.=
inc.php', NULL, 'configuration de la s=C3=A9curit=C3=A9', NULL, NULL, 'ME=
');
+INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, 'Plan analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, 'Groupe analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', =
NULL, 'Impression compta. analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, '=
Menu ventes et recettes', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, 'Pr=C3=A9f=C3=A9rence', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, 'Historique', 'ledger_type=3DALL', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, 'Menu F=
inancier', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FIMP', 'Historique financier', 'history_op=
eration.inc.php', NULL, 'Historique financier', 'ledger_type=3DFIN', NULL=
, 'ME');
+INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, 'Menu achat=
', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, 'Menu op=C3=A9rations diverses', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, 'Nouvelle op=C3=A9rations diverses', NULL, NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('FREC', 'Rapprochement', 'compta_fin_rec.in=
c.php', NULL, 'Rapprochement bancaire', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, 'Suivi administration, banque', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, 'Nouvel extrait bancaire', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGATCARD', 'Attribut de fiche', 'card_att=
r.inc.php', NULL, 'Gestion des mod=C3=A8les de fiches', NULL, NULL, 'ME')=
;
+INSERT INTO menu_ref VALUES ('FSALDO', 'Soldes', 'compta_fin_saldo.inc.p=
hp', NULL, 'Solde des comptes en banques, caisse...', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, 'Reche=
rche', NULL, 'search_reconcile()', 'ME');
+INSERT INTO menu_ref VALUES ('LETACC', 'Lettrage par Poste', 'lettering.=
account.inc.php', NULL, 'lettrage par poste comptable', NULL, NULL, 'ME')=
;
+INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, 'Balance par cat=C3=A9gorie de fiche', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, '=
Suivi client', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, 'Gestion cat=C3=A9gorie de fiche', NULL, NULL, '=
ME');
+INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, 'Config. cat=C3=A9gorie de documents', NUL=
L, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, 'Historique des ventes', 'ledger_type=3DVEN', NULL,=
 'ME');
+INSERT INTO menu_ref VALUES ('LETCARD', 'Lettrage par Fiche', 'lettering=
.card.inc.php', NULL, 'Lettrage par fiche', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, 'Config. du plan comptable', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', 'So=
rtie', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, 'Tableau de bord', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
'Module comptabilit=C3=A9', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, 'Module g=
estion', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, 'Mod=
ule param=C3=A8tre', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTJRN', 'Historique', 'impress_jrn.inc.=
php', NULL, 'Impression historique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREC', 'Rapprochement', 'impress_rec.i=
nc.php', NULL, 'Impression des rapprochements', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTPOSTE', 'Poste', 'impress_poste.inc.p=
hp', NULL, 'Impression du d=C3=A9tail d''un poste comptable', NULL, NULL,=
 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREPORT', 'Rapport', 'impress_rapport.=
inc.php', NULL, 'Impression de rapport', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBILAN', 'Bilan', 'impress_bilan.inc.p=
hp', NULL, 'Impression de bilan', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTGL', 'Grand Livre', 'impress_gl_compt=
es.inc.php', NULL, 'Impression du grand livre', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBAL', 'Balance', 'balance.inc.php', N=
ULL, 'Impression des balances comptables', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, 'Impression cat=C3=A9gorie de fiches', NULL,=
 NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, 'Menu im=
pression', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACCESS', 'Accueil', NULL, 'user_login.php'=
, 'Accueil', NULL, NULL, 'ME');
=20
=20
 --
@@ -450,28 +442,42 @@
 -- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 -
 --
=20
-INSERT INTO profile_menu VALUES (648, 'MODOP', 'EXTENSION', 1, 10, 'E', =
0);
+INSERT INTO profile_menu VALUES (178, 'CFGPAY', 'DIVPARM', 6, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (59, 'CFGPAY', 'DIVPARM', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (194, 'LET', 'COMPTA', 6, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (237, 'EXT', NULL, 6, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (240, 'FIMP', 'MENUFIN', 6, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (214, 'FREC', 'MENUFIN', 6, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', NULL);
+INSERT INTO profile_menu VALUES (213, 'FSALDO', 'MENUFIN', 6, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (182, 'CFGATCARD', 'DIVPARM', 6, 9, 'E',=
 0);
+INSERT INTO profile_menu VALUES (68, 'CFGATCARD', 'DIVPARM', 1, 9, 'E', =
0);
+INSERT INTO profile_menu VALUES (180, 'CFGACC', 'DIVPARM', 6, 6, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (61, 'CFGACC', 'DIVPARM', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (198, 'LETACC', 'LET', 6, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (197, 'LETCARD', 'LET', 6, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (225, 'TVA', 'EXT', 6, NULL, 'S', 0);
+INSERT INTO profile_menu VALUES (241, 'IMPCARD', 'EXT', 6, NULL, 'S', 0)=
;
+INSERT INTO profile_menu VALUES (242, 'AMORTIS', 'EXT', 6, NULL, 'S', 0)=
;
+INSERT INTO profile_menu VALUES (243, 'TOOLPLAN', 'EXT', 6, NULL, 'S', 0=
);
+INSERT INTO profile_menu VALUES (254, 'IMPORTBANK', 'EXT', 6, NULL, 'S',=
 0);
+INSERT INTO profile_menu VALUES (255, 'TOOL', 'EXT', 6, NULL, 'S', 0);
+INSERT INTO profile_menu VALUES (648, 'MODOP', 'EXT', 1, 10, 'E', 0);
 INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (178, 'CFGPAYMENT', 'DIVPARM', 6, 4, 'E'=
, 0);
 INSERT INTO profile_menu VALUES (179, 'CFGTVA', 'DIVPARM', 6, 5, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (180, 'CFGACCOUNT', 'DIVPARM', 6, 6, 'E'=
, 0);
 INSERT INTO profile_menu VALUES (181, 'CFGCATDOC', 'DIVPARM', 6, 8, 'E',=
 0);
-INSERT INTO profile_menu VALUES (182, 'CFGATTRIBCARD', 'DIVPARM', 6, 9, =
'E', 0);
+INSERT INTO profile_menu VALUES (258, 'CFGMENU', 'MOD', 6, NULL, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (259, 'CFGPRO', 'MOD', 6, NULL, 'E', 0);
 INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', 0);
 INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E',=
 0);
 INSERT INTO profile_menu VALUES (189, 'PLANANC', 'ANC', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (190, 'CFGCARDCAT', 'DIVPARM', 6, 7, 'E'=
, 0);
 INSERT INTO profile_menu VALUES (191, 'ANCODS', 'ANC', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (192, 'ANCGROUP', 'ANC', 6, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (193, 'ANCIMP', 'ANC', 6, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (194, 'LETTER', 'COMPTA', 6, 8, 'E', 0);
 INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
 INSERT INTO profile_menu VALUES (196, 'PREFERENCE', NULL, 6, 15, 'M', 1)=
;
-INSERT INTO profile_menu VALUES (197, 'LETTERCARD', 'LETTER', 6, 1, 'E',=
 0);
-INSERT INTO profile_menu VALUES (198, 'LETTERACC', 'LETTER', 6, 2, 'E', =
0);
 INSERT INTO profile_menu VALUES (199, 'CUST', 'GESTION', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (200, 'SUPPL', 'GESTION', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (201, 'ADM', 'GESTION', 6, 3, 'E', 0);
@@ -486,8 +492,6 @@
 INSERT INTO profile_menu VALUES (210, 'REPORT', 'ADV', 6, 25, 'E', 0);
 INSERT INTO profile_menu VALUES (211, 'CARD', 'COMPTA', 6, 7, 'E', 0);
 INSERT INTO profile_menu VALUES (212, 'HIST', 'COMPTA', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (213, 'FINSALDO', 'MENUFIN', 6, 3, 'E', =
0);
-INSERT INTO profile_menu VALUES (214, 'FINREC', 'MENUFIN', 6, 4, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (215, 'ADV', 'COMPTA', 6, 20, 'E', 0);
 INSERT INTO profile_menu VALUES (216, 'ACCESS', NULL, 6, 25, 'M', 0);
 INSERT INTO profile_menu VALUES (217, 'CSV:histo', NULL, 6, NULL, 'P', 0=
);
@@ -498,7 +502,6 @@
 INSERT INTO profile_menu VALUES (222, 'PDF:ledger', NULL, 6, NULL, 'P', =
0);
 INSERT INTO profile_menu VALUES (223, 'PRINT', 'COMPTA', 6, 6, 'E', 0);
 INSERT INTO profile_menu VALUES (224, 'CSV:postedetail', NULL, 6, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (225, 'TVA', 'EXTENSION', 6, NULL, 'S', =
0);
 INSERT INTO profile_menu VALUES (226, 'MENUACH', 'COMPTA', 6, 3, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (227, 'ACHIMP', 'MENUACH', 6, 2, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (228, 'GESTION', NULL, 6, 45, 'M', 0);
@@ -506,32 +509,20 @@
 INSERT INTO profile_menu VALUES (230, 'ODS', 'MENUODS', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (231, 'ODSIMP', 'MENUODS', 6, 2, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (232, 'ANC', NULL, 6, 50, 'M', 0);
-INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E',=
 0);
 INSERT INTO profile_menu VALUES (234, 'VENMENU', 'COMPTA', 6, 2, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (235, 'VEN', 'VENMENU', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (236, 'VENIMP', 'VENMENU', 6, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (237, 'EXTENSION', NULL, 6, 55, 'M', 0);
 INSERT INTO profile_menu VALUES (238, 'FIN', 'MENUFIN', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (239, 'MENUFIN', 'COMPTA', 6, 4, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (240, 'FINIMP', 'MENUFIN', 6, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (241, 'IMPCARD', 'EXTENSION', 6, NULL, '=
S', 0);
-INSERT INTO profile_menu VALUES (242, 'AMORTIS', 'EXTENSION', 6, NULL, '=
S', 0);
-INSERT INTO profile_menu VALUES (243, 'TOOLPLAN', 'EXTENSION', 6, NULL, =
'S', 0);
 INSERT INTO profile_menu VALUES (244, 'SEARCH', NULL, 6, 60, 'M', 0);
 INSERT INTO profile_menu VALUES (245, 'ACH', 'MENUACH', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (254, 'IMPORTBANK', 'EXTENSION', 6, NULL=
, 'S', 0);
-INSERT INTO profile_menu VALUES (255, 'TOOL', 'EXTENSION', 6, NULL, 'S',=
 0);
 INSERT INTO profile_menu VALUES (256, 'AMORTIS', 'MENUACH', 6, 10, 'E', =
0);
 INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
0);
-INSERT INTO profile_menu VALUES (258, 'CFGMENU', 'MODULARITY', 6, NULL, =
'E', 0);
-INSERT INTO profile_menu VALUES (259, 'CFGPROFILE', 'MODULARITY', 6, NUL=
L, 'E', 0);
 INSERT INTO profile_menu VALUES (260, 'PDF:postedetail', NULL, 6, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '=
E', 0);
 INSERT INTO profile_menu VALUES (261, 'CSV:fichedetail', NULL, 6, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (262, 'PDF:fichedetail', NULL, 6, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (263, 'CSV:fiche_balance', NULL, 6, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E',=
 0);
 INSERT INTO profile_menu VALUES (264, 'PDF:fiche_balance', NULL, 6, NULL=
, 'P', 0);
 INSERT INTO profile_menu VALUES (265, 'CSV:report', NULL, 6, NULL, 'P', =
0);
 INSERT INTO profile_menu VALUES (266, 'PDF:report', NULL, 6, NULL, 'P', =
0);
@@ -552,25 +543,20 @@
 INSERT INTO profile_menu VALUES (280, 'CSV:AncAccList', NULL, 6, NULL, '=
P', 0);
 INSERT INTO profile_menu VALUES (281, 'CSV:AncBalGroup', NULL, 6, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (282, 'OTH:Bilan', NULL, 6, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E', =
0);
+INSERT INTO profile_menu VALUES (23, 'LET', 'COMPTA', 1, 8, 'E', 0);
 INSERT INTO profile_menu VALUES (523, 'PRINTBAL', 'PRINT', 1, 50, 'E', 0=
);
 INSERT INTO profile_menu VALUES (529, 'PRINTREPORT', 'PRINT', 1, 85, 'E'=
, 0);
 INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', 0);
-INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E', =
0);
-INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 0);
 INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'E', 0);
 INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', 0);
 INSERT INTO profile_menu VALUES (527, 'PRINTJRN', 'PRINT', 1, 10, 'E', 0=
);
 INSERT INTO profile_menu VALUES (530, 'PRINTREC', 'PRINT', 1, 100, 'E', =
0);
 INSERT INTO profile_menu VALUES (524, 'PRINTBILAN', 'PRINT', 1, 90, 'E',=
 0);
 INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', 0);
-INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'E', =
0);
-INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'E', 0=
);
 INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E', 0);
@@ -585,8 +571,6 @@
 INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E', 0);
 INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', 0);
 INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (94, 'FINSALDO', 'MENUFIN', 1, 3, 'E', 0=
);
-INSERT INTO profile_menu VALUES (95, 'FINREC', 'MENUFIN', 1, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', 0);
 INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 25, 'M', 0);
 INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', 0=
);
@@ -597,7 +581,6 @@
 INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
0);
 INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', 0);
 INSERT INTO profile_menu VALUES (126, 'CSV:postedetail', NULL, 1, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (164, 'TVA', 'EXTENSION', 1, NULL, 'S', =
0);
 INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 45, 'M', 0);
@@ -608,21 +591,22 @@
 INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (82, 'EXTENSION', NULL, 1, 55, 'M', 0);
 INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (73, 'CFGDOC', 'PARAM', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (74, 'CFGLED', 'PARAM', 1, 9, 'E', 0);
+INSERT INTO profile_menu VALUES (71, 'CFGSEC', 'PARAM', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (82, 'EXT', NULL, 1, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (95, 'FREC', 'MENUFIN', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (94, 'FSALDO', 'MENUFIN', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (27, 'LETACC', 'LET', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (24, 'LETCARD', 'LET', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (164, 'TVA', 'EXT', 1, NULL, 'S', 0);
+INSERT INTO profile_menu VALUES (167, 'MOD', 'PARAM', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (93, 'FINIMP', 'MENUFIN', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (159, 'IMPCARD', 'EXTENSION', 1, NULL, '=
S', 0);
-INSERT INTO profile_menu VALUES (160, 'AMORTIS', 'EXTENSION', 1, NULL, '=
S', 0);
-INSERT INTO profile_menu VALUES (161, 'TOOLPLAN', 'EXTENSION', 1, NULL, =
'S', 0);
+INSERT INTO profile_menu VALUES (93, 'FIMP', 'MENUFIN', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', 0);
 INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (162, 'IMPORTBANK', 'EXTENSION', 1, NULL=
, 'S', 0);
-INSERT INTO profile_menu VALUES (163, 'TOOL', 'EXTENSION', 1, NULL, 'S',=
 0);
 INSERT INTO profile_menu VALUES (157, 'AMORTIS', 'MENUACH', 1, 10, 'E', =
0);
-INSERT INTO profile_menu VALUES (167, 'MODULARITY', 'PARAM', 1, 1, 'E', =
0);
-INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MODULARITY', 1, NULL, =
'E', 0);
-INSERT INTO profile_menu VALUES (172, 'CFGPROFILE', 'MODULARITY', 1, NUL=
L, 'E', 0);
 INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (129, 'PDF:fichedetail', NULL, 1, NULL, =
'P', 0);
@@ -648,7 +632,14 @@
 INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', 0=
);
 INSERT INTO profile_menu VALUES (528, 'PRINTPOSTE', 'PRINT', 1, 30, 'E',=
 0);
 INSERT INTO profile_menu VALUES (525, 'PRINTCARD', 'PRINT', 1, 40, 'E', =
0);
+INSERT INTO profile_menu VALUES (160, 'AMORTIS', 'EXT', 1, NULL, 'S', 0)=
;
 INSERT INTO profile_menu VALUES (1, 'DASHBOARD', NULL, 1, 10, 'M', 1);
+INSERT INTO profile_menu VALUES (163, 'TOOL', 'EXT', 1, NULL, 'S', 0);
+INSERT INTO profile_menu VALUES (162, 'IMPORTBANK', 'EXT', 1, NULL, 'S',=
 0);
+INSERT INTO profile_menu VALUES (161, 'TOOLPLAN', 'EXT', 1, NULL, 'S', 0=
);
+INSERT INTO profile_menu VALUES (159, 'IMPCARD', 'EXT', 1, NULL, 'S', 0)=
;
+INSERT INTO profile_menu VALUES (172, 'CFGPRO', 'MOD', 1, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MOD', 1, NULL, 'E', 0)=
;
=20
=20
 --

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	2011-11-15 20:55:45 UTC (rev 4364)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-15 23:20:54 UTC (rev 4365)
@@ -9,6 +9,7 @@
 delete from action where ac_id not in (800,805,910);
 insert into action (ac_id,ac_description, ac_module, ac_code) values(102=
0,'Effacer les documents du suivi','followup','RMDOC');
 insert into action (ac_id,ac_description, ac_module, ac_code) values(101=
0,'Voir les documents du suivi','followup','VIEWDOC');
+insert into action (ac_id,ac_description, ac_module, ac_code) values(105=
0,'Modifier le type de document','followup','PARCATDOC');
 /*
 script SQL to run
 */



From MAILER-DAEMON Wed Nov 16 04:39:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQbxN-00071v-Db
	for mharc-phpcompta-dev@gnu.org; Wed, 16 Nov 2011 04:39:01 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 16 Nov 2011 10:44:37 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.19256.1321436340.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4366 - 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 Nov 2011 09:38:59 -0000

Author: danydb
Date: 2011-11-16 10:44:31 +0100 (Wed, 16 Nov 2011)
New Revision: 4366

Modified:
   phpcompta/trunk/include/dossier.inc.php
Log:
remoe xdebug_break

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	2011-11-15 23:20:54 UTC (rev =
4365)
+++ phpcompta/trunk/include/dossier.inc.php	2011-11-16 09:44:31 UTC (rev =
4366)
@@ -123,7 +123,6 @@
                 $fev=3D29;
             else
                 $fev=3D28;
-			xdebug_break();
             $Res=3D$cn->exec_sql("delete from user_local_pref where para=
meter_type=3D'PERIODE'");
             $nb_day=3Darray(31,$fev,31,30,31,30,31,31,30,31,30,31);
             $m=3D1;



From MAILER-DAEMON Wed Nov 16 05:09:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQcQt-0002Qa-Ia
	for mharc-phpcompta-dev@gnu.org; Wed, 16 Nov 2011 05:09:31 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 16 Nov 2011 11:15:04 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.19439.1321438171.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4367 - 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 Nov 2011 10:09:29 -0000

Author: danydb
Date: 2011-11-16 11:15:02 +0100 (Wed, 16 Nov 2011)
New Revision: 4367

Modified:
   phpcompta/trunk/include/dossier.inc.php
Log:
change $cn by $repo when connecting to repository

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	2011-11-16 09:44:31 UTC (rev =
4366)
+++ phpcompta/trunk/include/dossier.inc.php	2011-11-16 10:15:02 UTC (rev =
4367)
@@ -42,7 +42,7 @@
 // check and add an new folder
 if ( isset ($_POST["DATABASE"]) )
 {
-    $cn=3Dnew Database();
+    $repo=3Dnew Database();
     $dos=3Dtrim($_POST["DATABASE"]);
     $dos=3Dsql_string($dos);
     if (strlen($dos)=3D=3D0)
@@ -50,7 +50,7 @@
         echo _("Le nom du dossier est vide");
         exit -1;
     }
-    $encoding=3D$cn->get_value("select encoding from pg_database  where =
".
+    $encoding=3D$repo->get_value("select encoding from pg_database  wher=
e ".
                              " datname=3D'".domaine.'mod'.sql_string($_P=
OST["FMOD_ID"])."'");
     if ( $encoding !=3D 6 )
     {
@@ -65,20 +65,19 @@
     $desc=3Dsql_string($_POST["DESCRIPTION"]);
     try
     {
-        $cn->start();
-        $Res=3D$cn->exec_sql("insert into ac_dossier(dos_name,dos_descri=
ption)
+        $repo->start();
+        $Res=3D$repo->exec_sql("insert into ac_dossier(dos_name,dos_desc=
ription)
                            values ('".$dos."','$desc')");
-        $l_id=3D$cn->get_current_seq('dossier_id');
-        $cn->commit();
+        $l_id=3D$repo->get_current_seq('dossier_id');
+        $repo->commit();
     }
     catch (Exception $e)
     {
         $msg=3D_("Desole la creation de ce dossier a echoue,\n la cause =
la plus probable est".
                ' deux fois le m=C3=AAme nom de dossier');
         alert($msg);
-        ;
         $l_id=3D0;
-        $cn->rollback();
+        $repo->rollback();
=20
     }
     // If the id is not null, name successfully inserted
@@ -93,7 +92,7 @@
         if ( strlen($year) !=3D 4 || isNumber($year) =3D=3D 0 || $year >=
 2100 || $year < 2000 || $year !=3D round($year,0))
         {
             echo "$year"._(" est une ann=C3=A9e invalide");
-            $Res=3D$cn->exec_sql("delete from ac_dossier where dos_id=3D=
$l_id");
+            $Res=3D$repo->exec_sql("delete from ac_dossier where dos_id=3D=
$l_id");
         }
         else
         {
@@ -103,18 +102,18 @@
                          domaine,
                          sql_string($_POST["FMOD_ID"]));
             ob_start();
-            if ( $cn->exec_sql($Sql)=3D=3Dfalse)
+            if ( $repo->exec_sql($Sql)=3D=3Dfalse)
             {
                 echo   "[".$Sql."]";
=20
                 //ob_end_clean();
-                $cn->exec_sql("delete from ac_dossier where dos_id=3D$l_=
id");
+                $repo->exec_sql("delete from ac_dossier where dos_id=3D$=
l_id");
                 echo "<h2 class=3D\"error\">"._(" Base de donn=C3=A9e ")=
.domaine."mod".$_POST['FMOD_ID']."  ".
                 _("est acc=C3=A8d=C3=A9e, d=C3=A9connectez-vous d'abord"=
)."</h2>";
                 exit;
             }
             ob_flush();
-            $Res=3D$cn->exec_sql("insert into jnt_use_dos (use_id,dos_id=
) values (1,$l_id)");
+            $Res=3D$repo->exec_sql("insert into jnt_use_dos (use_id,dos_=
id) values (1,$l_id)");
             // Connect to the new database
             $cn=3Dnew Database($l_id);
             //--year --
@@ -141,7 +140,7 @@
                  " from parm_periode cross join jrn_def";
             $Res=3D$cn->exec_sql($sql);
=20
-			Dossier::synchro_admin($l_id);
+	    Dossier::synchro_admin($l_id);
=20
=20
         }



From MAILER-DAEMON Wed Nov 16 05:48:36 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQd2i-00033O-0j
	for mharc-phpcompta-dev@gnu.org; Wed, 16 Nov 2011 05:48:36 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 16 Nov 2011 11:54:14 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.19514.1321440514.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4368 - 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, 16 Nov 2011 10:48:34 -0000

Author: danydb
Date: 2011-11-16 11:54:12 +0100 (Wed, 16 Nov 2011)
New Revision: 4368

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

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	2011-11-16 10:15:02 UTC (rev 4367)
+++ phpcompta/trunk/html/style.css	2011-11-16 10:54:12 UTC (rev 4368)
@@ -820,7 +820,7 @@
 	cursor:pointer;
 	background-color:white;
 	border-style:  inset ;
-	color:blue;
+	color:red;
 	margin:1 2 1 2;
 	}
 	td.tool {



From MAILER-DAEMON Wed Nov 16 09:52:30 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQgqk-0004fy-Mh
	for mharc-phpcompta-dev@gnu.org; Wed, 16 Nov 2011 09:52:30 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 16 Nov 2011 15:57:54 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.20025.1321455150.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4369 - 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, 16 Nov 2011 14:52:29 -0000

Author: danydb
Date: 2011-11-16 15:57:52 +0100 (Wed, 16 Nov 2011)
New Revision: 4369

Modified:
   phpcompta/trunk/include/anc_group.inc.php
   phpcompta/trunk/include/anc_imp.inc.php
   phpcompta/trunk/include/dossier.inc.php
   phpcompta/trunk/include/template/menu.php
Log:
#455 am?\195?\169liorer apparence module comptabilit?\195?\169 analytique

Modified: phpcompta/trunk/include/anc_group.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/anc_group.inc.php	2011-11-16 10:54:12 UTC (re=
v 4368)
+++ phpcompta/trunk/include/anc_group.inc.php	2011-11-16 14:57:52 UTC (re=
v 4369)
@@ -55,10 +55,10 @@
 }
 $array=3D$r->myList();
=20
-echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
+echo '<div class=3D"content" >';
 echo '<form method=3D"post">';
 echo dossier::hidden();
-echo '<table style=3D"border: 2px outset blue; width: 100%;"  >';
+echo '<table class=3D"result"  >';
 echo '<tr> <th> Code </th><th>Plan </td><th>Description</th></tr>';
 foreach ($array as $idx=3D>$m)
 {

Modified: phpcompta/trunk/include/anc_imp.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/anc_imp.inc.php	2011-11-16 10:54:12 UTC (rev =
4368)
+++ phpcompta/trunk/include/anc_imp.inc.php	2011-11-16 14:57:52 UTC (rev =
4369)
@@ -45,11 +45,11 @@
            );
 $sub=3D(isset($_GET['sub']))?$_GET['sub']:'no';
=20
-echo '<div class=3D"content"  style=3D"width:88%;margin-left:12%">';
+echo '<div class=3D"content"  >';
 echo ShowItem($menu,"H","mtitle","mtitle",$sub);
 echo '</div>';
=20
-echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
+echo '<div class=3D"content" >';
=20
 $hidden=3Dnew IHidden();
 $str_hidden=3D$hidden->input("p_action","ca_imp");

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	2011-11-16 10:54:12 UTC (rev =
4368)
+++ phpcompta/trunk/include/dossier.inc.php	2011-11-16 14:57:52 UTC (rev =
4369)
@@ -66,6 +66,7 @@
     try
     {
         $repo->start();
+       =20
         $Res=3D$repo->exec_sql("insert into ac_dossier(dos_name,dos_desc=
ription)
                            values ('".$dos."','$desc')");
         $l_id=3D$repo->get_current_seq('dossier_id');
@@ -150,7 +151,6 @@
 <h2> Dossier Management</h2>
=20
 <?php
-$cn=3Dnew Database();
 //----------------------------------------------------------------------=
-----
 // List of folder
 if ( $sa =3D=3D 'list' )
@@ -163,7 +163,7 @@
     $compteur=3D1;
     $template=3D"";
=20
-    echo '<TABLE class=3D"result" style=3D"border-collapse:separate;bord=
er-spacing:4">';
+    echo '<TABLE class=3D"table_large" >';
     $r=3Dth('ID').th('Nom du dossier ').th('Description').th('Taille').t=
h('Nom base de donn=C3=A9es');
     $r=3Dtr($r);
     echo $r;
@@ -214,8 +214,9 @@
 // Add a new folder
 if ( $sa =3D=3D 'add' )
 {
+    $repo=3Dnew Database();
     // Load the available Templates
-    $Res=3D$cn->exec_sql("select mod_id,mod_name,mod_desc from
+    $Res=3D$repo->exec_sql("select mod_id,mod_name,mod_desc from
                        modeledef order by mod_name");
     $count=3DDatabase::num_row($Res);
=20

Modified: phpcompta/trunk/include/template/menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu.php	2011-11-16 10:54:12 UTC (re=
v 4368)
+++ phpcompta/trunk/include/template/menu.php	2011-11-16 14:57:52 UTC (re=
v 4369)
@@ -1,11 +1,12 @@
 <div class=3D"topmenu">
     <? if ( count($amenu) > 4 && $idx =3D=3D 0) :
-	$width =3D 100;
+	$style =3D "width:100%";
     ?>
-<table style=3D"width:<?=3D$width?>%">
+<table style=3D"<?=3D$style?>" >
     <? else:
+        $style=3D"width:80%;margin-right:10%"
 	?>
-<table>
+<table style=3D"<?=3D$style?>" >
     <? endif;?>
=20
=20



From MAILER-DAEMON Wed Nov 16 11:11:54 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQi5a-0007cA-6Y
	for mharc-phpcompta-dev@gnu.org; Wed, 16 Nov 2011 11:11:54 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 16 Nov 2011 17:17:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.20217.1321459913.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4370 - 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: Wed, 16 Nov 2011 16:11:52 -0000

Author: danydb
Date: 2011-11-16 17:17:16 +0100 (Wed, 16 Nov 2011)
New Revision: 4370

Modified:
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/anc_od.inc.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/template/ledger_search.php
   phpcompta/trunk/include/template/menu.php
   phpcompta/trunk/include/template/module.php
Log:
 fix cosmetic for IE7 & chrome

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	2011-11-16 14:57:52 UTC (rev 4369)
+++ phpcompta/trunk/html/style.css	2011-11-16 16:17:16 UTC (rev 4370)
@@ -437,7 +437,7 @@
   text-decoration: none;
   display: block;
   color: blue;
-padding: 1px ;
+padding: 0;
=20
 }
=20
@@ -980,15 +980,14 @@
 #direct
 {
 	display:inline;
-	float:right;
+	float:left;
+	width:400px;
=20
-
 }
-.direct
+#calc
 {
-		font-size:6px;
-	   border:groove 1px #000000;
-	margin:1px;
+	display:inline;
+	float:left;
 }
 div#wait_box
 {
@@ -1047,7 +1046,7 @@
  border:1px solid blue;
  margin-left: 2px;
  margin-right:2px;
- margin-top:2px;
+ margin-top:0px;
  font-size:10px;
 }
 table.table_large tr.odd ,table.table_large tr.even {

Modified: phpcompta/trunk/include/anc_od.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/anc_od.inc.php	2011-11-16 14:57:52 UTC (rev 4=
369)
+++ phpcompta/trunk/include/anc_od.inc.php	2011-11-16 16:17:16 UTC (rev 4=
370)
@@ -50,7 +50,7 @@
 // show the left menu
 //----------------------------------------------------------------------
 echo '
-<div class=3D"content" style=3D"width:88%;margin-left:12%">
+<div class=3D"content" >
 <div class=3D"lmenu">
 <table>
 <tr>

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	2011-11-16 14:57:52 UTC =
(rev 4369)
+++ phpcompta/trunk/include/class_html_input.php	2011-11-16 16:17:16 UTC =
(rev 4370)
@@ -397,7 +397,7 @@
     static function anchor_close($div)
     {
 	$r=3D'';
-	$r.=3D'<div style=3D"float:right;margin:2;">';
+	$r.=3D'<div style=3D"float:right;margin-right:2px;margin-top:1px;paddin=
g:0">';
 	$r.=3D '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"remo=
veDiv(\''.$div.'\');">Fermer</A>';
 	$r.=3D'</div>';
 	return $r;

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	2011-11-16 14:57:5=
2 UTC (rev 4369)
+++ phpcompta/trunk/include/template/ledger_search.php	2011-11-16 16:17:1=
6 UTC (rev 4370)
@@ -1,4 +1,4 @@
-<fieldset><legend><?=3D_('Crit=C3=A8res de Recherche')?></legend>
+
 <table>
 <tr>
 <td style=3D'text-align:right;width:30em'>
@@ -64,4 +64,4 @@
 </tr>
=20
 </table>
-</fieldset>
+

Modified: phpcompta/trunk/include/template/menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu.php	2011-11-16 14:57:52 UTC (re=
v 4369)
+++ phpcompta/trunk/include/template/menu.php	2011-11-16 16:17:16 UTC (re=
v 4370)
@@ -4,7 +4,17 @@
     ?>
 <table style=3D"<?=3D$style?>" >
     <? else:
-        $style=3D"width:80%;margin-right:10%"
+switch (count($amenu))
+{
+case 4:
+case 3:
+   $width=3Dcount($amenu)*15;
+   $left=3Dround((100-$width)/2);
+$style=3D"width:$width%;margin-left:$left%";
+break;
+default:
+$style=3D"";
+}
 	?>
 <table style=3D"<?=3D$style?>" >
     <? endif;?>
@@ -19,7 +29,7 @@
 		$class=3D"selectedcell";
 ?>
 	<td class=3D"<?=3D$class?>">
-	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$_REQUEST['ac']?>">
+	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$_REQUEST['ac']?>" alt=3D"<?=3Dh($amenu[$i]['me_description'])?=
>" >
 	    <?=3D$amenu[$i]['me_menu']?>
 	    </a>
 	</td>

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2011-11-16 14:57:52 UTC (=
rev 4369)
+++ phpcompta/trunk/include/template/module.php	2011-11-16 16:17:16 UTC (=
rev 4370)
@@ -6,7 +6,9 @@
=20
 if ( $cn->get_value("select count(*) from profile join profile_user usin=
g (p_id)
 		where user_name=3D$1 and with_calc=3Dtrue",array($_SESSION['g_user']))=
 =3D=3D1):
+  echo '<div id=3D"calc">';
 	echo IButton::show_calc();
+echo '</div>';
 endif;
=20
 if ( $cn->get_value("select count(*) from profile join profile_user usin=
g (p_id)
@@ -19,7 +21,7 @@
 		<?
=20
 			$direct=3Dnew IText('ac');
-			$direct->style=3D'class=3D"direct"';
+			$direct->style=3D'class=3D"input_text"';
 			$direct->value=3D'';
 			$direct->size=3D20;
 			echo $direct->input();
@@ -30,8 +32,8 @@
 			echo HtmlInput::submit('go','aller');
 			?>
=20
-	</form
-	<script type=3D"text/javascript" charset=3D"utf8" language=3D"javascrip=
t">
+	</form>
+	<script charset=3D"utf8" language=3D"javascript">
=20
 		try {
 			new Ajax.Autocompleter("ac","ac_choices","direct.php?gDossier=3D<?=3D=
$gDossier?>",



From MAILER-DAEMON Wed Nov 16 18:53:15 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQpI3-0005kd-Fc
	for mharc-phpcompta-dev@gnu.org; Wed, 16 Nov 2011 18:53:15 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 00:58:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.22015.1321487594.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4371 - 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 Nov 2011 23:53:13 -0000

Author: danydb
Date: 2011-11-17 00:58:37 +0100 (Thu, 17 Nov 2011)
New Revision: 4371

Modified:
   phpcompta/trunk/include/dossier.inc.php
Log:
bug : 452 folder creation failed

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	2011-11-16 16:17:16 UTC (rev =
4370)
+++ phpcompta/trunk/include/dossier.inc.php	2011-11-16 23:58:37 UTC (rev =
4371)
@@ -66,7 +66,7 @@
     try
     {
         $repo->start();
-       =20
+
         $Res=3D$repo->exec_sql("insert into ac_dossier(dos_name,dos_desc=
ription)
                            values ('".$dos."','$desc')");
         $l_id=3D$repo->get_current_seq('dossier_id');
@@ -159,6 +159,7 @@
     echo HtmlInput::button_anchor(_('Ajouter'),'admin_repo.php?action=3D=
dossier_mgt&sa=3Dadd');
=20
     $repo=3Dnew Dossier(0);
+	$repocn=3Dnew Database();
     $Res=3D$repo->show_dossier('all');
     $compteur=3D1;
     $template=3D"";
@@ -181,7 +182,7 @@
             echo "<TR $cl><TD style=3D\"vertical-align:top\"> ".
 	      $Dossier['dos_id']."</td><td> <B>".h($Dossier['dos_name'])."</B> =
</TD>";
 	    $str_name=3Ddomaine.'dossier'.$Dossier['dos_id'];
-	    $size=3D$cn->get_value("select pg_database_size($1)/(1024*1024)::fl=
oat",
+	    $size=3D$repocn->get_value("select pg_database_size($1)/(1024*1024)=
::float",
 				 array($str_name));
 	    echo "<TD><I>  ".h($Dossier['dos_description'])."</I></td>";
 	    echo td(nbm($size)."MB",' style=3D"text-align:right"');



From MAILER-DAEMON Wed Nov 16 19:28:28 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RQpq8-0002xB-Rw
	for mharc-phpcompta-dev@gnu.org; Wed, 16 Nov 2011 19:28:28 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 01:34:04 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.22111.1321489708.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4372 - 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: Thu, 17 Nov 2011 00:28:27 -0000

Author: danydb
Date: 2011-11-17 01:34:03 +0100 (Thu, 17 Nov 2011)
New Revision: 4372

Modified:
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/template/menu.php
   phpcompta/trunk/include/template/module.php
Log:
cosmetic

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-16 23:58:37 UTC (rev 43=
71)
+++ phpcompta/trunk/include/ac_common.php	2011-11-17 00:34:03 UTC (rev 43=
72)
@@ -739,7 +739,7 @@
     global $g_user;
     $cn =3D Dossier::connect();
     $amodule =3D $cn->get_array("select
-	me_code,me_menu,me_url,me_javascript,p_order,me_type
+	me_code,me_menu,me_url,me_javascript,p_order,me_type,me_description
 	from v_all_menu
 	where
 	user_name=3D$1
@@ -749,7 +749,7 @@
     if ($selected !=3D -1)
     {
 	require_once('template/module.php');
-	$file =3D $cn->get_array("select me_file,me_parameter,me_javascript,me_=
type from v_all_menu
+	$file =3D $cn->get_array("select me_file,me_parameter,me_javascript,me_=
type,me_description from v_all_menu
 	    where me_code=3D$1 and user_name=3D$2", array($selected,$g_user->lo=
gin));
 	if ( count($file ) =3D=3D 0 )
 	{
@@ -842,7 +842,7 @@
     global $g_user;
     $cn =3D Dossier::connect();
     $amenu =3D $cn->get_array("select
-	me_menu,me_code,me_url,me_javascript,me_type
+	me_menu,me_code,me_url,me_javascript,me_type,me_description
 	from v_all_menu
 	where
 	me_code_dep=3D$1 and user_name=3D$2 order by p_order", array($module[$i=
dx], $g_user->login));

Modified: phpcompta/trunk/include/template/menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu.php	2011-11-16 23:58:37 UTC (re=
v 4371)
+++ phpcompta/trunk/include/template/menu.php	2011-11-17 00:34:03 UTC (re=
v 4372)
@@ -3,7 +3,7 @@
 	$style =3D "width:100%";
     ?>
 <table style=3D"<?=3D$style?>" >
-    <? else:
+    <? elseif ($idx=3D=3D0):
 switch (count($amenu))
 {
 case 4:
@@ -15,9 +15,11 @@
 default:
 $style=3D"";
 }
-	?>
+	else:
+		$style=3D" class=3D\"mtitle\"";
+
+    	endif;?>
 <table style=3D"<?=3D$style?>" >
-    <? endif;?>
=20
=20
     <tr>
@@ -29,7 +31,7 @@
 		$class=3D"selectedcell";
 ?>
 	<td class=3D"<?=3D$class?>">
-	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$_REQUEST['ac']?>" alt=3D"<?=3Dh($amenu[$i]['me_description'])?=
>" >
+	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$_REQUEST['ac']?>" title=3D"<?=3Dh($amenu[$i]['me_description']=
)?>" >
 	    <?=3D$amenu[$i]['me_menu']?>
 	    </a>
 	</td>
@@ -57,7 +59,7 @@
 		}
=20
 ?>	<td class=3D"<?=3D$class?>">
-	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$url?>" <?=3D$js?> >
+	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$url?>" <?=3D$js?> title=3D"<?=3Dh($amenu[$i]['me_description']=
)?>">
 	    <?=3D$amenu[$i]['me_menu']?>
 	    </a>
 	</td>

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2011-11-16 23:58:37 UTC (=
rev 4371)
+++ phpcompta/trunk/include/template/module.php	2011-11-17 00:34:03 UTC (=
rev 4372)
@@ -76,7 +76,7 @@
 				$url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['me_code'];
 		    }
 		    ?>
-		<td class=3D"tool" style=3D"<?=3D$style?>"><a class=3D"mtitle" href=3D=
"<?=3D$url?>" <?=3D$js?> ><?=3D$row['me_menu']?></td>
+		<td class=3D"tool" style=3D"<?=3D$style?>"><a class=3D"mtitle" href=3D=
"<?=3D$url?>" title=3D"<?=3D$row['me_description']?>" <?=3D$js?> ><?=3D$r=
ow['me_menu']?></td>
 		<?
 		    endforeach;
 		?>



From MAILER-DAEMON Thu Nov 17 06:36:16 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RR0GO-0001m8-2u
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 06:36:16 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 12:41:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.24912.1321529775.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4373 - 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: Thu, 17 Nov 2011 11:36:14 -0000

Author: danydb
Date: 2011-11-17 12:41:37 +0100 (Thu, 17 Nov 2011)
New Revision: 4373

Added:
   phpcompta/trunk/include/anc_acc_balance.inc.php
   phpcompta/trunk/include/anc_acc_table.inc.php
   phpcompta/trunk/include/anc_balance_double.inc.php
   phpcompta/trunk/include/anc_balance_simple.inc.php
   phpcompta/trunk/include/anc_great_ledger.inc.php
   phpcompta/trunk/include/anc_group_balance.inc.php
   phpcompta/trunk/include/anc_history.inc.php
   phpcompta/trunk/sql/anc-modularity-imp.sql
Removed:
   phpcompta/trunk/include/anc_imp.inc.php
Modified:
   phpcompta/trunk/include/class_anc_acc_list.php
   phpcompta/trunk/include/class_anc_balance_double.php
   phpcompta/trunk/include/class_anc_listing.php
   phpcompta/trunk/include/class_anc_print.php
   phpcompta/trunk/include/class_anc_table.php
   phpcompta/trunk/sql/upgrade.sql
Log:
0000241: Modularit?\195?\169 : ajout impression compta anc

Added: phpcompta/trunk/include/anc_acc_balance.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/anc_acc_balance.inc.php	                     =
   (rev 0)
+++ phpcompta/trunk/include/anc_acc_balance.inc.php	2011-11-17 11:41:37 U=
TC (rev 4373)
@@ -0,0 +1,16 @@
+<?php
+
+require_once('class_anc_acc_list.php');
+$tab =3D new Anc_Acc_List($cn);
+$tab->get_request();
+echo '<form method=3D"get">';
+echo $tab->display_form();
+echo '<p>' . HtmlInput::submit('Recherche', 'Recherche') . '</p>';
+
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $tab->show_button();
+    $tab->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_acc_table.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/anc_acc_table.inc.php	                       =
 (rev 0)
+++ phpcompta/trunk/include/anc_acc_table.inc.php	2011-11-17 11:41:37 UTC=
 (rev 4373)
@@ -0,0 +1,16 @@
+<?php
+
+require_once('class_anc_table.php');
+$tab =3D new Anc_Table($cn);
+$tab->get_request();
+echo '<form method=3D"get">';
+echo $tab->display_form();
+echo '<p>' . HtmlInput::submit('Recherche', 'Recherche') . '</p>';
+
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $tab->show_button();
+    $tab->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_balance_double.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/anc_balance_double.inc.php	                  =
      (rev 0)
+++ phpcompta/trunk/include/anc_balance_double.inc.php	2011-11-17 11:41:3=
7 UTC (rev 4373)
@@ -0,0 +1,14 @@
+<?php
+
+require_once ('class_anc_balance_double.php');
+$bc =3D new Anc_Balance_Double($cn);
+$bc->get_request();
+echo '<form method=3D"get">';
+echo $bc->display_form();
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $bc->show_button();
+    echo $bc->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_balance_simple.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/anc_balance_simple.inc.php	                  =
      (rev 0)
+++ phpcompta/trunk/include/anc_balance_simple.inc.php	2011-11-17 11:41:3=
7 UTC (rev 4373)
@@ -0,0 +1,14 @@
+<?php
+
+require_once ('class_anc_balance_simple.php');
+$bs =3D new Anc_Balance_Simple($cn);
+$bs->get_request();
+echo '<form method=3D"get">';
+echo $bs->display_form();
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $bs->show_button();
+    echo $bs->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_great_ledger.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/anc_great_ledger.inc.php	                    =
    (rev 0)
+++ phpcompta/trunk/include/anc_great_ledger.inc.php	2011-11-17 11:41:37 =
UTC (rev 4373)
@@ -0,0 +1,14 @@
+<?php
+
+require_once('class_anc_grandlivre.php');
+$gl =3D new Anc_GrandLivre($cn);
+$gl->get_request();
+echo '<form method=3D"get">';
+echo $gl->display_form();
+echo '<p>' . HtmlInput::submit('Recherche', 'Recherche') . '</p>';
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $gl->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_group_balance.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/anc_group_balance.inc.php	                   =
     (rev 0)
+++ phpcompta/trunk/include/anc_group_balance.inc.php	2011-11-17 11:41:37=
 UTC (rev 4373)
@@ -0,0 +1,16 @@
+<?php
+
+require_once('class_anc_group.php');
+$gr =3D new Anc_Group($cn);
+$gr->get_request();
+echo '<form method=3D"get">';
+echo $gr->display_form();
+echo '<p>' . HtmlInput::submit('Recherche', 'Recherche') . '</p>';
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $gr->show_button();
+
+    echo $gr->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_history.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/anc_history.inc.php	                        (=
rev 0)
+++ phpcompta/trunk/include/anc_history.inc.php	2011-11-17 11:41:37 UTC (=
rev 4373)
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+require_once ('class_anc_listing.php');
+$list =3D new Anc_Listing($cn);
+$list->get_request();
+
+echo $list->display_form();
+//---- result
+if (isset($_GET['result']))
+{
+    echo '<div class=3D"content">';
+
+    //--------------------------------
+    // export Buttons
+    //---------------------------------
+    echo $list->show_button();
+    echo $list->display_html();
+    echo '</div>';
+}
+echo '</div>';
+?>

Deleted: phpcompta/trunk/include/anc_imp.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/anc_imp.inc.php	2011-11-17 00:34:03 UTC (rev =
4372)
+++ phpcompta/trunk/include/anc_imp.inc.php	2011-11-17 11:41:37 UTC (rev =
4373)
@@ -1,189 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- *
- *
- * \brief this file is included for printing the analytic
- * accountancy.
- *
- */
-require_once("class_ihidden.php");
-require_once('class_anc_operation.php');
-require_once('class_anc_plan.php');
-require_once('ac_common.php');
-$str_dossier=3DDossier::get();
-
-//-- the menu
-$menu=3Darray(array("?ac=3D".$_REQUEST['ac']."&sub=3Dlisting&$str_dossie=
r",_("Historique"),_("Historique des op=C3=A9rations"),"listing"),
-            array("?ac=3D".$_REQUEST['ac']."&sub=3Dancgl&$str_dossier",_=
("grand livre"),_("Grand livre d' plan analytique"),"ancgl"),
-            array("?ac=3D".$_REQUEST['ac']."&sub=3Dbs&$str_dossier",_("B=
alance simple"),_("Balance simple d'un plan analytique"),"bs"),
-            array("?ac=3D".$_REQUEST['ac']."&sub=3Dbc2&$str_dossier",_("=
Balance crois=C3=A9e"),_("Balance crois=C3=A9e de 2 plans analytiques"),"=
bc2"),
-	    array("?ac=3D".$_REQUEST['ac']."&sub=3Dtab&$str_dossier",_("Tableau=
"),_("Tableau li=C3=A9 =C3=A0 la comptabilit=C3=A9"),'tab'),
-	    array("?ac=3D".$_REQUEST['ac']."&sub=3Dlico&$str_dossier",_("Balanc=
e comptabilit=C3=A9"),_("Lien entre comptabilit=C3=A9 et Comptabilit=C3=A9=
 analytique"),'lico'),
-	    array("?ac=3D".$_REQUEST['ac']."&sub=3Dgroup&$str_dossier",_("Group=
e"),_("Balance par groupe"),'group'),
-
-           );
-$sub=3D(isset($_GET['sub']))?$_GET['sub']:'no';
-
-echo '<div class=3D"content"  >';
-echo ShowItem($menu,"H","mtitle","mtitle",$sub);
-echo '</div>';
-
-echo '<div class=3D"content" >';
-
-$hidden=3Dnew IHidden();
-$str_hidden=3D$hidden->input("p_action","ca_imp");
-$str_hidden.=3D$hidden->input("sub",$sub);
-
-// select following the sub action
-//----------------------------------------------------------------------=
--------
-// listing
-if ( $sub=3D=3D'listing')
-{
-    require_once ('class_anc_listing.php');
-    $list=3Dnew Anc_Listing($cn);
-    $list->get_request();
-
-    echo $list->display_form($str_hidden);
-    //---- result
-    if ( isset($_GET['result']) )
-    {
-        echo '<div class=3D"content">';
-
-        //--------------------------------
-        // export Buttons
-        //---------------------------------
-        echo $list->show_button($str_hidden);
-        echo $list->display_html();
-        echo '</div>';
-    }
-    echo '</div>';
-}
-
-//----------------------------------------------------------------------=
--------
-// Simple balance
-if ($sub =3D=3D 'bs')
-{
-    require_once ('class_anc_balance_simple.php');
-    $bs=3Dnew Anc_Balance_Simple($cn);
-    $bs->get_request();
-    echo '<form method=3D"get">';
-    echo $bs->display_form($str_hidden);
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-        echo $bs->show_button($str_hidden);
-        echo $bs->display_html();
-    }
-}
-
-//----------------------------------------------------------------------=
--------
-// crossed balance
-if ( $sub =3D=3D 'bc2')
-{
-    require_once ('class_anc_balance_double.php');
-    $bc=3Dnew Anc_Balance_Double($cn);
-    $bc->get_request ();
-    echo '<form method=3D"get">';
-    echo $bc->display_form($str_hidden);
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-        echo $bc->show_button($str_hidden);
-        echo $bc->display_html();
-    }
-}
-//----------------------------------------------------------------------
-// Table linked between accountancy and analytic
-//----------------------------------------------------------------------=
-----
-if ( $sub =3D=3D 'tab')
-  {
-    require_once('class_anc_table.php');
-    $tab=3Dnew Anc_Table($cn);
-    $tab->get_request();
-    echo '<form method=3D"get">';
-    echo $tab->display_form($str_hidden);
-    echo '<p>'.HtmlInput::submit('Recherche','Recherche').'</p>';
-
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-        echo $tab->show_button($str_hidden);
-	$tab->display_html();
-    }
-  }
-
-//----------------------------------------------------------------------
-//  linked between accountancy and analytic
-//----------------------------------------------------------------------=
-----
-if ( $sub =3D=3D 'lico')
-  {
-    require_once('class_anc_acc_list.php');
-    $tab=3Dnew Anc_Acc_List($cn);
-    $tab->get_request();
-    echo '<form method=3D"get">';
-    echo $tab->display_form($str_hidden);
-    echo '<p>'.HtmlInput::submit('Recherche','Recherche').'</p>';
-
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-        echo $tab->show_button($str_hidden);
-	$tab->display_html();
-    }
-  }
-
-//----------------------------------------------------------------------=
-----
-if ( $sub =3D=3D 'ancgl')
-  {
-    require_once('class_anc_grandlivre.php');
-    $gl=3Dnew Anc_GrandLivre($cn);
-    $gl->get_request();
-    echo '<form method=3D"get">';
-    echo $gl->display_form($str_hidden);
-    echo '<p>'.HtmlInput::submit('Recherche','Recherche').'</p>';
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-	echo $gl->display_html();
-    }
-  }
-//----------------------------------------------------------------------=
-----
-// Balance by group
-//----------------------------------------------------------------------=
-----
-if ( $sub =3D=3D 'group')
-  {
-    require_once('class_anc_group.php');
-    $gr=3Dnew Anc_Group($cn);
-    $gr->get_request();
-    echo '<form method=3D"get">';
-    echo $gr->display_form($str_hidden);
-    echo '<p>'.HtmlInput::submit('Recherche','Recherche').'</p>';
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-      echo $gr->show_button($str_hidden);
-
-      echo $gr->display_html();
-    }
-  }

Modified: phpcompta/trunk/include/class_anc_acc_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_anc_acc_list.php	2011-11-17 00:34:03 UT=
C (rev 4372)
+++ phpcompta/trunk/include/class_anc_acc_list.php	2011-11-17 11:41:37 UT=
C (rev 4373)
@@ -51,6 +51,7 @@
    =20
     $icard->selected=3D$this->card_poste;
     $r.=3D$icard->input();
+    $r.=3DHtmlInput::request_to_hidden(array('ac'));
     return $r;
   }
  /**

Modified: phpcompta/trunk/include/class_anc_balance_double.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_balance_double.php	2011-11-17 00:34=
:03 UTC (rev 4372)
+++ phpcompta/trunk/include/class_anc_balance_double.php	2011-11-17 11:41=
:37 UTC (rev 4373)
@@ -322,7 +322,7 @@
         $plan_id->value=3D$this->db->make_array("select pa_id, pa_name f=
rom plan_analytique order by pa_name");
         $plan_id->selected=3D$this->pa_id2;
         $r.=3D "Plan Analytique :".$plan_id->input();
-
+        $r.=3DHtmlInput::request_to_hidden(array('ac'));
         $poste=3Dnew IText();
         $poste->size=3D10;
         $r.=3D"Entre le poste ".$poste->input("from_poste2",$this->from_=
poste2);

Modified: phpcompta/trunk/include/class_anc_listing.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_anc_listing.php	2011-11-17 00:34:03 UTC=
 (rev 4372)
+++ phpcompta/trunk/include/class_anc_listing.php	2011-11-17 11:41:37 UTC=
 (rev 4373)
@@ -190,6 +190,7 @@
         $r.=3D HtmlInput::hidden("from_poste",$this->from_poste);
         $r.=3D HtmlInput::hidden("to_poste",$this->to_poste);
 	$r.=3DHtmlInput::hidden('act','CSV:AncList');
+        $r.=3DHtmlInput::hidden('ac',$_REQUEST['ac']);
         $r.=3D $p_string;
         $r.=3D dossier::hidden();
         $r.=3DHtmlInput::submit('bt_csv',"Export en CSV");

Modified: phpcompta/trunk/include/class_anc_print.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_print.php	2011-11-17 00:34:03 UTC (=
rev 4372)
+++ phpcompta/trunk/include/class_anc_print.php	2011-11-17 11:41:37 UTC (=
rev 4373)
@@ -116,9 +116,8 @@
         $r.=3D"Depuis : ".$from->input();
         $r.=3D "jusque : ".$to->input();
         $r.=3D '<span class=3D"notice">'._('Les dates sont en format DD.=
MM.YYYY').'</span>';
-
+        $r.=3DHtmlInput::request_to_hidden(array('ac'));
         $r.=3D$p_hidden;
-	$r.=3DHtmlInput::hidden('ac',$_REQUEST['ac']);
         $r.=3D'<span style=3D"padding:5px;margin:5px;display:block;">';
         $plan=3Dnew Anc_Plan($this->db);
         $plan_id=3Dnew ISelect("pa_id");
@@ -141,6 +140,7 @@
         $r.=3D'<span class=3D"notice" style=3D"display:block">'._('Selec=
tionnez le plan qui vous int=C3=A9resse avant de cliquer sur Recherche').=
'</span>';
=20
         $r.=3D'</span>';
+        $r.=3DHtmlInput::request_to_hidden(array('ac'));
         return $r;
     }
     /*!

Modified: phpcompta/trunk/include/class_anc_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/class_anc_table.php	2011-11-17 00:34:03 UTC (=
rev 4372)
+++ phpcompta/trunk/include/class_anc_table.php	2011-11-17 11:41:37 UTC (=
rev 4373)
@@ -44,9 +44,9 @@
 			array('value'=3D>1,'label'=3D>'Par fiche'),
 			array('value'=3D>2,'label'=3D>'Par poste comptable')
 			);
-   =20
     $icard->selected=3D$this->card_poste;
     $r.=3D$icard->input();
+    $r.=3DHtmlInput::request_to_hidden(array('ac'));
     return $r;
   }
=20

Added: phpcompta/trunk/sql/anc-modularity-imp.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/anc-modularity-imp.sql	                        (r=
ev 0)
+++ phpcompta/trunk/sql/anc-modularity-imp.sql	2011-11-17 11:41:37 UTC (r=
ev 4373)
@@ -0,0 +1,9 @@
+
+insert into menu_ref(me_code,me_menu,me_file,me_description,me_type)=20
+values ('ANCHOP','Historique','anc_history.inc.php','Historique des impu=
tations analytiques','ME')
+values ('ANCGL','Grand''Livre','anc_great_ledger.inc.php','Grand livre d=
''plan analytique','ME')
+values ('ANCBS','Balance simple','anc_balance_simple.inc.php','Balance s=
imple des imputations analytiques','ME')
+values ('ANCBC2','Balance crois=C3=A9e double','anc_balance_double.inc.p=
hp','Balance double crois=C3=A9es des imputations analytiques','ME')
+values ('ANCTAB','Tableau','anc_acc_table.inc.php','Tableau li=C3=A9 =C3=
=A0 la comptabilit=C3=A9','ME')
+values ('ANCBCC','Balance Analytique/comptabilit=C3=A9','anc_acc_balance=
.inc.php','Lien entre comptabilit=C3=A9 et Comptabilit=C3=A9 analytique',=
'ME')
+values ('ANCGR','Groupe','anc_group_balance.inc.php','Balance par groupe=
','ME');

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	2011-11-17 00:34:03 UTC (rev 4372)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-17 11:41:37 UTC (rev 4373)
@@ -26,10 +26,17 @@
 \i object-6.0.sql
 \i extension.sql
 \i ajax-direct-form.sql
+
+\i mode_paiement.sql
+\i anc-modularity-imp.sql
+
+
+create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
+
+
+---------------------------------------------------
 -- for account repository
+---------------------------------------------------
 -- \i change_account_repo.sql
 -- \i style-epad.sql
-\i mode_paiement.sql
-
-create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
 commit;



From MAILER-DAEMON Thu Nov 17 08:03:45 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RR1d3-0002uE-AQ
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 08:03:45 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 14:09:08 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.25139.1321535022.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4374 - in phpcompta/trunk: html 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 Nov 2011 13:03:42 -0000

Author: danydb
Date: 2011-11-17 14:09:06 +0100 (Thu, 17 Nov 2011)
New Revision: 4374

Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/sql/anc-modularity-imp.sql
Log:
#455 modularit?\195?\169 pour ANCIMP

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	2011-11-17 11:41:37 UTC (rev 4373)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-17 13:09:06 UTC (rev 4374)
@@ -487,7 +487,7 @@
 		require_once("ajax_get_profile.php");
 		break;
 	case 'det_menu':
-		require_once("ajax_detail_menu.php");
+		require_once("ajax_get_menu_detail.php");
 		break;
 	case 'add_menu':
 		require_once 'ajax_add_menu.php';

Modified: phpcompta/trunk/sql/anc-modularity-imp.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/anc-modularity-imp.sql	2011-11-17 11:41:37 UTC (r=
ev 4373)
+++ phpcompta/trunk/sql/anc-modularity-imp.sql	2011-11-17 13:09:06 UTC (r=
ev 4374)
@@ -1,9 +1,21 @@
=20
 insert into menu_ref(me_code,me_menu,me_file,me_description,me_type)=20
-values ('ANCHOP','Historique','anc_history.inc.php','Historique des impu=
tations analytiques','ME')
-values ('ANCGL','Grand''Livre','anc_great_ledger.inc.php','Grand livre d=
''plan analytique','ME')
-values ('ANCBS','Balance simple','anc_balance_simple.inc.php','Balance s=
imple des imputations analytiques','ME')
-values ('ANCBC2','Balance crois=C3=A9e double','anc_balance_double.inc.p=
hp','Balance double crois=C3=A9es des imputations analytiques','ME')
-values ('ANCTAB','Tableau','anc_acc_table.inc.php','Tableau li=C3=A9 =C3=
=A0 la comptabilit=C3=A9','ME')
-values ('ANCBCC','Balance Analytique/comptabilit=C3=A9','anc_acc_balance=
.inc.php','Lien entre comptabilit=C3=A9 et Comptabilit=C3=A9 analytique',=
'ME')
-values ('ANCGR','Groupe','anc_group_balance.inc.php','Balance par groupe=
','ME');
+values ('ANCHOP','Historique','anc_history.inc.php','Historique des impu=
tations analytiques','ME'),
+('ANCGL','Grand''Livre','anc_great_ledger.inc.php','Grand livre d''plan =
analytique','ME'),
+('ANCBS','Balance simple','anc_balance_simple.inc.php','Balance simple d=
es imputations analytiques','ME'),
+('ANCBC2','Balance crois=C3=A9e double','anc_balance_double.inc.php','Ba=
lance double crois=C3=A9es des imputations analytiques','ME'),
+('ANCTAB','Tableau','anc_acc_table.inc.php','Tableau li=C3=A9 =C3=A0 la =
comptabilit=C3=A9','ME'),
+('ANCBCC','Balance Analytique/comptabilit=C3=A9','anc_acc_balance.inc.ph=
p','Lien entre comptabilit=C3=A9 et Comptabilit=C3=A9 analytique','ME'),
+('ANCGR','Groupe','anc_group_balance.inc.php','Balance par groupe','ME')=
;
+
+update menu_ref set me_file=3Dnull where me_code=3D'ANCIMP';
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order,p_type_displa=
y,pm_default)
+values=20
+('ANCHOP','ANCIMP',1,10,'E',0),
+('ANCGL','ANCIMP',1,20,'E',0),
+('ANCBS','ANCIMP',1,30,'E',0),
+('ANCBC2','ANCIMP',1,40,'E',0),
+('ANCTAB','ANCIMP',1,50,'E',0),
+('ANCBCC','ANCIMP',1,60,'E',0),
+('ANCGR','ANCIMP',1,70,'E',0);
\ No newline at end of file



From MAILER-DAEMON Thu Nov 17 08:07:02 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RR1gE-0007GC-2H
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 08:07:02 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 14:12:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.25148.1321535221.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4375 - 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 Nov 2011 13:07:00 -0000

Author: danydb
Date: 2011-11-17 14:12:28 +0100 (Thu, 17 Nov 2011)
New Revision: 4375

Modified:
   phpcompta/trunk/include/class_anc_print.php
Log:
#455 modularit?\195?\169 pour ANCIMP: cosmetique message erreur

Modified: phpcompta/trunk/include/class_anc_print.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_print.php	2011-11-17 13:09:06 UTC (=
rev 4374)
+++ phpcompta/trunk/include/class_anc_print.php	2011-11-17 13:12:28 UTC (=
rev 4375)
@@ -90,7 +90,9 @@
         $pa=3Dnew Anc_Plan($this->db);
         if ( $pa->count() =3D=3D 0 )
         {
+            echo '<div class=3D"content">';
             echo '<h2 class=3D"error">'._('Aucun plan d=C3=A9fini').'</h=
2>';
+            echo '</div>';
             exit();
         }
=20



From MAILER-DAEMON Thu Nov 17 08:41:17 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RR2DM-0003kj-Qf
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 08:41:16 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 14:38:13 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.25220.1321537274.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4376 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Nov 2011 13:41:06 -0000

Author: danydb
Date: 2011-11-17 14:38:12 +0100 (Thu, 17 Nov 2011)
New Revision: 4376

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

Modified: phpcompta/trunk/include/template/menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu.php	2011-11-17 13:12:28 UTC (re=
v 4375)
+++ phpcompta/trunk/include/template/menu.php	2011-11-17 13:38:12 UTC (re=
v 4376)
@@ -8,7 +8,7 @@
 {
 case 4:
 case 3:
-   $width=3Dcount($amenu)*15;
+   $width=3Dcount($amenu)*20;
    $left=3Dround((100-$width)/2);
 $style=3D"width:$width%;margin-left:$left%";
 break;



From MAILER-DAEMON Thu Nov 17 09:14:49 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RR2jp-0007kh-Il
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 09:14:49 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 15:20:16 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.25419.1321539288.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4377 - in phpcompta/trunk: html include sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Nov 2011 14:14:47 -0000

Author: danydb
Date: 2011-11-17 15:20:15 +0100 (Thu, 17 Nov 2011)
New Revision: 4377

Added:
   phpcompta/trunk/include/export_anc_grandlivre_csv.php
   phpcompta/trunk/sql/anc-grandlivre.sql
Modified:
   phpcompta/trunk/html/export.php
   phpcompta/trunk/include/class_anc_grandlivre.php
   phpcompta/trunk/include/class_database.php
   phpcompta/trunk/include/class_impress.php
Log:
add export CSV to ANC grand livre

Modified: phpcompta/trunk/html/export.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/export.php	2011-11-17 13:38:12 UTC (rev 4376)
+++ phpcompta/trunk/html/export.php	2011-11-17 14:20:15 UTC (rev 4377)
@@ -39,7 +39,7 @@
 if ( $act=3D=3D'X' || ! isset($_GET['act']) || $user->check_print($_GET[=
'act'])=3D=3D0 )
   {
     echo alert('Acc=C3=A8s interdit');
-	redirect("do.php?".dossier::get());
+    redirect("do.php?".dossier::get());
     exit();
   }
=20
@@ -156,6 +156,9 @@
       require_once 'export_bilan_oth.php';
       exit();
       break;
+  case 'CSV:AncGrandLivre':
+      require_once 'export_anc_grandlivre_csv.php';
+      break;
    default:
     alert('Action inconnue '.$_GET['act']);
     exit();

Modified: phpcompta/trunk/include/class_anc_grandlivre.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_grandlivre.php	2011-11-17 13:38:12 =
UTC (rev 4376)
+++ phpcompta/trunk/include/class_anc_grandlivre.php	2011-11-17 14:20:15 =
UTC (rev 4377)
@@ -24,6 +24,7 @@
  * \brief show the Grand Livre for analytic
  */
 require_once('class_anc_print.php');
+require_once 'class_impress.php';
=20
 class Anc_GrandLivre extends Anc_Print
 {
@@ -63,7 +64,7 @@
 	left join jrn on  (j_grpt=3Djr_grpt_id)
              where $pa_id_cond oa_amount <> 0.0  $cond_poste
 	order by po_name,oa_date ,qcode,j_poste");
-
+       =20
 =09
         return $array;
     }
@@ -149,4 +150,71 @@
         $r.=3D '</table>';
         return $r;
     }
+      /*!
+     * \brief Show the button to export in PDF or CSV
+     * \param $url_csv url of the csv
+     * \param $url_pdf url of the pdf
+     * \param $p_string hidden data to include in the form
+     *
+     *
+     * \return string with the button
+     */
+    function show_button($p_string=3D"")
+    {
+        $r=3D"";
+   /*     $r.=3D '<form method=3D"GET" action=3D"export.php" style=3D"di=
splay:inline">';
+        $r.=3D $p_string;
+        $r.=3D dossier::hidden();
+        $r.=3D HtmlInput::hidden("to",$this->to);
+        $r.=3D HtmlInput::hidden("act","PDF:AncGrandLivre");
+
+        $r.=3D HtmlInput::hidden("from",$this->from);
+        $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);
+        $r.=3D HtmlInput::hidden("from_poste",$this->from_poste);
+        $r.=3D HtmlInput::hidden("to_poste",$this->to_poste);
+        $r.=3DHtmlInput::submit('bt_pdf',"Export en PDF");
+        $r.=3D '</form>';
+*/
+        $r.=3D '<form method=3D"GET" action=3D"export.php"  style=3D"dis=
play:inline">';
+        $r.=3D HtmlInput::hidden("act","CSV:AncGrandLivre");
+        $r.=3D HtmlInput::hidden("to",$this->to);
+        $r.=3D HtmlInput::hidden("from",$this->from);
+        $r.=3D HtmlInput::hidden("pa_id",$this->pa_id);
+        $r.=3D HtmlInput::hidden("from_poste",$this->from_poste);
+        $r.=3D HtmlInput::hidden("to_poste",$this->to_poste);
+        $r.=3D $p_string;
+        $r.=3D dossier::hidden();
+        $r.=3DHtmlInput::submit('bt_csv',"Export en CSV");
+        $r.=3D '</form>';
+        return $r;
+    }
+    function display_csv()
+    {
+        $r=3D"";
+        //---Html
+        $array=3D$this->load();
+        if ( is_array($array) =3D=3D false )
+        {
+            return $array;
+
+        }
+
+        if ( empty($array) )
+        {
+            $r.=3D _("aucune donn=C3=A9e");
+            return $r;
+        }
+
+        $ix=3D0;$prev=3D'xx';
+	$tot_deb=3D$tot_cred=3D0;
+        $aheader=3Darray();
+        $aheader=3Darray("title"=3D>'Date','type'=3D>'string');
+        $aheader=3Darray("title"=3D>'Poste','type'=3D>'string');
+        $aheader=3Darray("title"=3D>'Quick_Code','type'=3D>'string');
+        $aheader=3Darray("title"=3D>'libelle','type'=3D>'string');
+        $aheader=3Darray("title"=3D>'Num.interne','type'=3D>'string');
+        $aheader=3Darray("title"=3D>'Debit','type'=3D>'num');
+        $aheader=3Darray("title"=3D>'Credit','type'=3D>'num');
+        Impress::array_to_csv($array, $aheader);
+    }
 }
\ No newline at end of file

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	2011-11-17 13:38:12 UTC (r=
ev 4376)
+++ phpcompta/trunk/include/class_database.php	2011-11-17 14:20:15 UTC (r=
ev 4377)
@@ -846,6 +846,45 @@
     {
       return pg_transaction_status($this->db);
     }
+    /**
+     * with the handle of a successull query, echo each row into CSV and
+     * send it directly
+     * @param type $ret handle to a query
+     * @param type $aheader  double array, each item of the array contai=
ns=20
+     * a key type (num) and a key title
+     */
+    function query_to_csv($ret,$aheader)
+    {
+        $seq=3D"";
+        for ($i=3D0;$i<count($i);$i++)
+        {
+            echo '"'.$aheader[$i]['title'].'"';
+            $seq=3D";";
+        }
+        printf("\n\r");
+       =20
+        $seq=3D"";
+        // fetch all the rows
+        for ($i=3D0;$i<count(Database::num_row($ret));$i++)
+        {
+            $row=3DDatabase::fetch_array($ret, $i);
+            $sep2=3D"";
+            // for each rows, for each value
+            for ($e=3D0;$e<count($row);$e++)
+            {
+                switch ($aheader[$e]['type'])
+                {
+                    case 'num':
+                        echo nb($row[$e]).$sep2;
+                        break;
+                    default:
+                        echo '"'.$row[$e].'"'.$sep2;
+                }
+                $sep2=3D";";
+            }
+            printf("\n\r");
+        }
+    }
 }
=20
 /* test::test_me(); */

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	2011-11-17 13:38:12 UTC (re=
v 4376)
+++ phpcompta/trunk/include/class_impress.php	2011-11-17 14:20:15 UTC (re=
v 4377)
@@ -229,4 +229,43 @@
             return true;
         }
     }
+     /**
+     * with the handle of a successull query, echo each row into CSV and
+     * send it directly
+     * @param type $array of data
+     * @param type $aheader  double array, each item of the array contai=
ns=20
+     * a key type (num) and a key title
+     */
+    static function array_to_csv($array,$aheader)
+    {
+        $seq=3D"";
+        for ($i=3D0;$i<count($i);$i++)
+        {
+            echo '"'.$aheader[$i]['title'].'"';
+            $seq=3D";";
+        }
+        printf("\n\r");
+       =20
+        $seq=3D"";
+        // fetch all the rows
+        for ($i=3D0;$i<count($array);$i++)
+        {
+            $row=3D$array[$i];
+            $sep2=3D"";
+            // for each rows, for each value
+            for ($e=3D0;$e<count($row);$e++)
+            {
+                switch ($aheader[$e]['type'])
+                {
+                    case 'num':
+                        echo nb($row[$e]).$sep2;
+                        break;
+                    default:
+                        echo '"'.$row[$e].'"'.$sep2;
+                }
+                $sep2=3D";";
+            }
+            printf("\n\r");
+        }
+    }
 }
\ No newline at end of file

Added: phpcompta/trunk/include/export_anc_grandlivre_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_anc_grandlivre_csv.php	               =
         (rev 0)
+++ phpcompta/trunk/include/export_anc_grandlivre_csv.php	2011-11-17 14:2=
0:15 UTC (rev 4377)
@@ -0,0 +1,17 @@
+<?php
+header('Pragma: public');
+header('Content-type: application/csv');
+header('Content-Disposition: attachment;filename=3D"anc-grand-livre.csv"=
',FALSE);
+
+require_once 'class_anc_grandlivre.php';
+
+$cn=3DDossier::connect();
+
+$gl=3Dnew Anc_GrandLivre($cn);
+$gl->get_request();
+echo $gl->display_csv();
+
+
+
+
+?>

Added: phpcompta/trunk/sql/anc-grandlivre.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/anc-grandlivre.sql	                        (rev 0=
)
+++ phpcompta/trunk/sql/anc-grandlivre.sql	2011-11-17 14:20:15 UTC (rev 4=
377)
@@ -0,0 +1,15 @@
+insert into menu_ref(me_code,me_menu,me_file,me_description,me_type)=20
+values ('CSV:AncGrandLivre','Impression Grand-Livre',null,null,'PR');
+CREATE TABLE profile_menu (
+    pm_id integer NOT NULL,
+    me_code text,
+    me_code_dep text,
+    p_id integer,
+    p_order integer,
+    p_type_display text NOT NULL,
+    pm_default integer
+);
+
+insert into profile_menu(me_code,me_code_dep,p_id,pm_default)
+values ( 'CSV:AncGrandLivre', NULL, 1 , 'P', 0);
+



From MAILER-DAEMON Thu Nov 17 09:36:22 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RR34g-0006fm-Px
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 09:36:22 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 15:41:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.25465.1321540582.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4378 - 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 Nov 2011 14:36:21 -0000

Author: danydb
Date: 2011-11-17 15:41:47 +0100 (Thu, 17 Nov 2011)
New Revision: 4378

Modified:
   phpcompta/trunk/include/anc_great_ledger.inc.php
Log:
add export CSV to ANC grand livre, missing buttons

Modified: phpcompta/trunk/include/anc_great_ledger.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/anc_great_ledger.inc.php	2011-11-17 14:20:15 =
UTC (rev 4377)
+++ phpcompta/trunk/include/anc_great_ledger.inc.php	2011-11-17 14:41:47 =
UTC (rev 4378)
@@ -9,6 +9,8 @@
 echo '</form>';
 if (isset($_GET['result']))
 {
+    echo $gl->display_form();
     echo $gl->display_html();
+    echo $gl->display_form();
 }
 ?>



From MAILER-DAEMON Thu Nov 17 09:44:55 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RR3Cx-0000I1-7Y
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 09:44:55 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 15:50:21 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.25480.1321541094.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4379 - 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 Nov 2011 14:44:54 -0000

Author: danydb
Date: 2011-11-17 15:50:20 +0100 (Thu, 17 Nov 2011)
New Revision: 4379

Modified:
   phpcompta/trunk/include/anc_great_ledger.inc.php
Log:
add export CSV to ANC grand livre, missing buttons

Modified: phpcompta/trunk/include/anc_great_ledger.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/anc_great_ledger.inc.php	2011-11-17 14:41:47 =
UTC (rev 4378)
+++ phpcompta/trunk/include/anc_great_ledger.inc.php	2011-11-17 14:50:20 =
UTC (rev 4379)
@@ -9,8 +9,8 @@
 echo '</form>';
 if (isset($_GET['result']))
 {
-    echo $gl->display_form();
+    echo $gl->display_button();
     echo $gl->display_html();
-    echo $gl->display_form();
+    echo $gl->display_button();
 }
 ?>



From MAILER-DAEMON Thu Nov 17 15:22:52 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RR8U0-0005qO-5a
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 15:22:52 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 17 Nov 2011 21:28:21 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.26460.1321561371.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4380 - 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: Thu, 17 Nov 2011 20:22:50 -0000

Author: danydb
Date: 2011-11-17 21:28:19 +0100 (Thu, 17 Nov 2011)
New Revision: 4380

Modified:
   phpcompta/trunk/include/anc_great_ledger.inc.php
   phpcompta/trunk/include/class_anc_grandlivre.php
   phpcompta/trunk/include/class_impress.php
   phpcompta/trunk/sql/
   phpcompta/trunk/sql/anc-grandlivre.sql
   phpcompta/trunk/sql/upgrade.sql
Log:
expprt GrandLivre Analytique

Modified: phpcompta/trunk/include/anc_great_ledger.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/anc_great_ledger.inc.php	2011-11-17 14:50:20 =
UTC (rev 4379)
+++ phpcompta/trunk/include/anc_great_ledger.inc.php	2011-11-17 20:28:19 =
UTC (rev 4380)
@@ -9,8 +9,8 @@
 echo '</form>';
 if (isset($_GET['result']))
 {
-    echo $gl->display_button();
+    echo $gl->show_button();
     echo $gl->display_html();
-    echo $gl->display_button();
+    echo $gl->show_button();
 }
 ?>

Modified: phpcompta/trunk/include/class_anc_grandlivre.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_grandlivre.php	2011-11-17 14:50:20 =
UTC (rev 4379)
+++ phpcompta/trunk/include/class_anc_grandlivre.php	2011-11-17 20:28:19 =
UTC (rev 4380)
@@ -44,7 +44,7 @@
         $pa_id_cond=3D"";
         if ( isset ( $this->pa_id) && $this->pa_id !=3D'')
             $pa_id_cond=3D "pa_id=3D".$this->pa_id." and";
-        $array=3D$this->db->get_array("	select oa_id,=09
+        $array=3D$this->db->get_array("	select oa_id,
 	po_name,
 	oa_description,
 	po_description,
@@ -52,22 +52,53 @@
 	to_char(oa_date,'DD.MM.YYYY') as oa_date,
 	oa_amount,
 	oa_group,
-	j_id ,=20
-	jr_internal, =20
-	jr_id,=20
+	j_id ,
+	jr_internal,
+	jr_id,
 	jr_comment,
 	j_poste,
 	jrnx.f_id,
 	( select ad_value from fiche_Detail where f_id=3Djrnx.f_id and ad_id=3D=
23) as qcode
-	from operation_analytique as B join poste_analytique using(po_id)=20
+	from operation_analytique as B join poste_analytique using(po_id)
 	left join jrnx using (j_id)
 	left join jrn on  (j_grpt=3Djr_grpt_id)
              where $pa_id_cond oa_amount <> 0.0  $cond_poste
 	order by po_name,oa_date ,qcode,j_poste");
-       =20
-=09
+
+
         return $array;
     }
+
+	function load_csv()
+    {
+      $filter_date=3D$this->set_sql_filter();
+      $cond_poste=3D'';
+      if ($this->from_poste !=3D "" )
+            $cond_poste=3D" and upper(po_name) >=3D upper('".$this->from=
_poste."')";
+        if ($this->to_poste !=3D "" )
+            $cond_poste.=3D" and upper(po_name) <=3D upper('".$this->to_=
poste."')";
+        $pa_id_cond=3D"";
+        if ( isset ( $this->pa_id) && $this->pa_id !=3D'')
+            $pa_id_cond=3D "pa_id=3D".$this->pa_id." and";
+        $array=3D$this->db->get_array("	select
+	po_name,
+	to_char(oa_date,'DD.MM.YYYY') as oa_date,
+	j_poste,
+	( select ad_value from fiche_Detail where f_id=3Djrnx.f_id and ad_id=3D=
23) as qcode,
+	jr_comment,
+	jr_internal,
+	case when oa_debit=3D't' then 'D' else 'C' end,
+	oa_amount
+	from operation_analytique as B join poste_analytique using(po_id)
+	left join jrnx using (j_id)
+	left join jrn on  (j_grpt=3Djr_grpt_id)
+             where $pa_id_cond oa_amount <> 0.0  $cond_poste
+	order by po_name,oa_date ,qcode,j_poste");
+
+
+        return $array;
+    }
+
    /*!
      * \brief compute the html display
      *
@@ -120,7 +151,7 @@
 	      $prev=3D$row['po_name'];
 	      $ix++;
 	    }
-	     =20
+
             $r.=3D '<tr>';
 	    $detail=3D($row['jr_id'] !=3D null)?HtmlInput::detail_op($row['jr_i=
d'],$row['jr_internal']):'';
 	    $post_detail=3D($row['j_poste'] !=3D null)?HtmlInput::history_accou=
nt($row['j_poste'],$row['j_poste']):'';
@@ -192,7 +223,7 @@
     {
         $r=3D"";
         //---Html
-        $array=3D$this->load();
+        $array=3D$this->load_csv();
         if ( is_array($array) =3D=3D false )
         {
             return $array;
@@ -208,13 +239,14 @@
         $ix=3D0;$prev=3D'xx';
 	$tot_deb=3D$tot_cred=3D0;
         $aheader=3Darray();
-        $aheader=3Darray("title"=3D>'Date','type'=3D>'string');
-        $aheader=3Darray("title"=3D>'Poste','type'=3D>'string');
-        $aheader=3Darray("title"=3D>'Quick_Code','type'=3D>'string');
-        $aheader=3Darray("title"=3D>'libelle','type'=3D>'string');
-        $aheader=3Darray("title"=3D>'Num.interne','type'=3D>'string');
-        $aheader=3Darray("title"=3D>'Debit','type'=3D>'num');
-        $aheader=3Darray("title"=3D>'Credit','type'=3D>'num');
+        $aheader[]=3Darray("title"=3D>'Imp. Analytique','type'=3D>'strin=
g');
+        $aheader[]=3Darray("title"=3D>'Date','type'=3D>'string');
+        $aheader[]=3Darray("title"=3D>'Poste','type'=3D>'string');
+        $aheader[]=3Darray("title"=3D>'Quick_Code','type'=3D>'string');
+        $aheader[]=3Darray("title"=3D>'libelle','type'=3D>'string');
+        $aheader[]=3Darray("title"=3D>'Num.interne','type'=3D>'string');
+        $aheader[]=3Darray("title"=3D>'Debit','type'=3D>'string');
+        $aheader[]=3Darray("title"=3D>'Credit','type'=3D>'num');
         Impress::array_to_csv($array, $aheader);
     }
 }
\ No newline at end of file

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	2011-11-17 14:50:20 UTC (re=
v 4379)
+++ phpcompta/trunk/include/class_impress.php	2011-11-17 20:28:19 UTC (re=
v 4380)
@@ -29,7 +29,7 @@
 class Impress
 {
     /*! \brief   Purpose Parse a formula
-     *=20
+     *
      * \param $p_cn connexion
      * \param $p_label
      * \param $p_formula
@@ -233,39 +233,47 @@
      * with the handle of a successull query, echo each row into CSV and
      * send it directly
      * @param type $array of data
-     * @param type $aheader  double array, each item of the array contai=
ns=20
+     * @param type $aheader  double array, each item of the array contai=
ns
      * a key type (num) and a key title
      */
     static function array_to_csv($array,$aheader)
     {
         $seq=3D"";
-        for ($i=3D0;$i<count($i);$i++)
+        for ($i=3D0;$i<count($aheader);$i++)
         {
-            echo '"'.$aheader[$i]['title'].'"';
+            echo $seq.'"'.$aheader[$i]['title'].'"';
             $seq=3D";";
         }
-        printf("\n\r");
-       =20
+        printf("\r");
+
         $seq=3D"";
         // fetch all the rows
         for ($i=3D0;$i<count($array);$i++)
         {
             $row=3D$array[$i];
             $sep2=3D"";
+			$e=3D0;
             // for each rows, for each value
-            for ($e=3D0;$e<count($row);$e++)
+            foreach ($array[$i] as $key=3D>$value)
             {
-                switch ($aheader[$e]['type'])
-                {
-                    case 'num':
-                        echo nb($row[$e]).$sep2;
-                        break;
-                    default:
-                        echo '"'.$row[$e].'"'.$sep2;
-                }
-                $sep2=3D";";
+				if ($e > count($aheader)) $e=3D0;
+
+				if ( isset ($aheader[$e]['type']))
+				{
+					switch ($aheader[$e]['type'])
+					{
+						case 'num':
+							echo $sep2.nb($value);
+							break;
+						default:
+							echo $sep2.'"'.$value.'"';
+					}
+				} else {
+					echo '"'.$value.'"'.$sep2;
+				}
+                $sep2=3D";";$e++;
             }
-            printf("\n\r");
+            printf("\r");
         }
     }
 }
\ No newline at end of file


Property changes on: phpcompta/trunk/sql
___________________________________________________________________
Name: svn:ignore
   - .upgrade.sql.swp
.object-6.0.sql.swp
.backup-new-object.sh.swp
.mode_paiement.sql.swp

   + .upgrade.sql.swp
.object-6.0.sql.swp
.backup-new-object.sh.swp
.mode_paiement.sql.swp
.anc-grandlivre.sql.swp


Modified: phpcompta/trunk/sql/anc-grandlivre.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/anc-grandlivre.sql	2011-11-17 14:50:20 UTC (rev 4=
379)
+++ phpcompta/trunk/sql/anc-grandlivre.sql	2011-11-17 20:28:19 UTC (rev 4=
380)
@@ -1,15 +1,6 @@
 insert into menu_ref(me_code,me_menu,me_file,me_description,me_type)=20
 values ('CSV:AncGrandLivre','Impression Grand-Livre',null,null,'PR');
-CREATE TABLE profile_menu (
-    pm_id integer NOT NULL,
-    me_code text,
-    me_code_dep text,
-    p_id integer,
-    p_order integer,
-    p_type_display text NOT NULL,
-    pm_default integer
-);
=20
-insert into profile_menu(me_code,me_code_dep,p_id,pm_default)
+insert into profile_menu(me_code,me_code_dep,p_id,p_type_display,pm_defa=
ult)
 values ( 'CSV:AncGrandLivre', NULL, 1 , 'P', 0);
=20

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	2011-11-17 14:50:20 UTC (rev 4379)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-17 20:28:19 UTC (rev 4380)
@@ -29,8 +29,8 @@
=20
 \i mode_paiement.sql
 \i anc-modularity-imp.sql
+\i anc-grandlivre.sql
=20
-
 create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
=20
=20



From MAILER-DAEMON Thu Nov 17 18:10:50 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRB6Y-0006bG-RJ
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 18:10:50 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 00:16:12 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27037.1321571449.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4381 - 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: Thu, 17 Nov 2011 23:10:48 -0000

Author: danydb
Date: 2011-11-18 00:16:10 +0100 (Fri, 18 Nov 2011)
New Revision: 4381

Modified:
   phpcompta/trunk/include/class_extension.php
   phpcompta/trunk/include/export_fiche_balance_csv.php
   phpcompta/trunk/include/export_fiche_balance_pdf.php
   phpcompta/trunk/include/impress_fiche.inc.php
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/include/template/impress_cat_card.php
Log:
add PDF + CSV all card, balance + history

Modified: phpcompta/trunk/include/class_extension.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_extension.php	2011-11-17 20:28:19 UTC (=
rev 4380)
+++ phpcompta/trunk/include/class_extension.php	2011-11-17 23:16:10 UTC (=
rev 4381)
@@ -79,10 +79,10 @@
      */
     static function make_array($cn)
     {
-        $sql=3D"select me_code as value, me_menu as label from ".
+        $sql=3D"select DISTINCT me_code as value, me_menu as label from =
".
              " menu_ref join profile_menu using (me_code)
 				 join profile_user using (p_id) where ".
-             " user_name=3D$1 and me_type=3D'PL' and me_code_dep=3D'EXTE=
NSION'";
+             " user_name=3D$1 and me_type=3D'PL' ORDER BY ME_MENU";
         $a=3D$cn->get_array($sql,array($_SESSION['g_user']));
         return $a;
     }

Modified: phpcompta/trunk/include/export_fiche_balance_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_balance_csv.php	2011-11-17 20:28=
:19 UTC (rev 4380)
+++ phpcompta/trunk/include/export_fiche_balance_csv.php	2011-11-17 23:16=
:10 UTC (rev 4381)
@@ -33,47 +33,158 @@
 require_once('class_database.php');
 require_once('class_dossier.php');
 require_once('ac_common.php');
+$allcard=3D(isset($_GET['allcard']))?1:0;
=20
 /* balance */
 if ( $_GET['histo'] =3D=3D 4 || $_GET['histo'] =3D=3D 5)
 {
     $fd=3Dnew Fiche_Def($cn,$_REQUEST['cat']);
-    if ( $fd->hasAttribute(ATTR_DEF_ACCOUNT) =3D=3D false )
+    if ( $allcard=3D=3D1 && $fd->hasAttribute(ATTR_DEF_ACCOUNT) =3D=3D f=
alse )
     {
       exit;
     }
-    $aCard=3D$cn->get_array("select f_id,ad_value from fiche join fiche_=
Detail using (f_id)  where ad_id=3D1 and fd_id=3D$1 order by 2 ",array($_=
REQUEST['cat']));
+	// all card
+	if ($allcard=3D=3D1)
+	{
+		$afiche=3D$cn->get_array("select fd_id from vw_fiche_def where ad_id=3D=
".ATTR_DEF_ACCOUNT." order by fd_label asc");
+	}
+	else
+	{
+		$afiche[0]=3Darray('fd_id'=3D>$_REQUEST['cat']);
+	}
+	printf('"Quick code";"Nom";"debit";"credit";"solde";"D/C";');
+		printf("\n");
+	for ($e =3D 0; $e < count($afiche); $e++)
+	{
+		$aCard =3D $cn->get_array("select f_id,ad_value from fiche join fiche_=
Detail using (f_id)  where ad_id=3D1 and fd_id=3D$1 order by 2 ", array($=
afiche[$e]['fd_id']));
=20
-    if ( empty($aCard))
-    {
-        echo "Aucune fiche trouv=C3=A9e";//Save PDF to file
-        $fDate=3Ddate('dmy-Hi');
-        exit;
-    }
-    printf ('"Quick code";"Nom";"debit";"credit";"solde";"D/C";');
-    printf ("\n");
-    for ($i=3D0;$i < count($aCard);$i++)
-    {
-        if ( isDate($_REQUEST['start']) =3D=3D null || isDate ($_REQUEST=
['end']) =3D=3D null ) 	 exit;
-        $filter=3D " (j_date >=3D to_date('".$_REQUEST['start']."','DD.M=
M.YYYY') ".
-                 " and  j_date <=3D to_date('".$_REQUEST['end']."','DD.M=
M.YYYY')) ";
-        $oCard=3Dnew Fiche($cn,$aCard[$i]['f_id']);
-        $solde=3D$oCard->get_solde_detail($filter);
-        if ( $solde['debit'] =3D=3D 0 && $solde['credit']=3D=3D0) contin=
ue;
-	/* only not purged card */
-	if ($_GET['histo'] =3D=3D 5 && $solde['solde'] =3D=3D0) continue;
-	$side=3D'';
-	if(bcsub($solde['credit'],$solde['debit']) < 0) $side=3D'Deb.';
-	if(bcsub($solde['credit'],$solde['debit']) > 0) $side=3D'Cred.';
+		if (empty($aCard))
+		{
+			continue;
+		}
=20
-        printf('"%s";"%s";%s;%s;%s;"%s"',
-	       $oCard->strAttribut(ATTR_DEF_QUICKCODE),
-	        $oCard->strAttribut(ATTR_DEF_NAME),
-	        nb($solde['debit']),
-	        nb($solde['credit']),
-	        nb(abs($solde['solde'])),
-	        $side);
-	printf("\n");
-    }
+		for ($i =3D 0; $i < count($aCard); $i++)
+		{
+			if (isDate($_REQUEST['start']) =3D=3D null || isDate($_REQUEST['end']=
) =3D=3D null)
+				exit;
+			$filter =3D " (j_date >=3D to_date('" . $_REQUEST['start'] . "','DD.M=
M.YYYY') " .
+					" and  j_date <=3D to_date('" . $_REQUEST['end'] . "','DD.MM.YYYY')=
) ";
+			$oCard =3D new Fiche($cn, $aCard[$i]['f_id']);
+			$solde =3D $oCard->get_solde_detail($filter);
+			if ($solde['debit'] =3D=3D 0 && $solde['credit'] =3D=3D 0)
+				continue;
+			/* only not purged card */
+			if ($_GET['histo'] =3D=3D 5 && $solde['solde'] =3D=3D 0)
+				continue;
+			$side =3D '';
+			if (bcsub($solde['credit'], $solde['debit']) < 0)
+				$side =3D 'Deb.';
+			if (bcsub($solde['credit'], $solde['debit']) > 0)
+				$side =3D 'Cred.';
+
+			printf('"%s";"%s";%s;%s;%s;"%s"', $oCard->strAttribut(ATTR_DEF_QUICKC=
ODE), $oCard->strAttribut(ATTR_DEF_NAME), nb($solde['debit']), nb($solde[=
'credit']), nb(abs($solde['solde'])), $side);
+			printf("\n");
+		}
+	}
 }
+else
+{
+	// all card
+	if ($allcard =3D=3D 1)
+	{
+		$afiche =3D $cn->get_array("select fd_id from vw_fiche_def where ad_id=
=3D" . ATTR_DEF_ACCOUNT . " order by fd_label asc");
+	}
+	else
+	{
+		$afiche[0] =3D array('fd_id' =3D> $_REQUEST['cat']);
+	}
+	for ($e =3D 0; $e < count($afiche); $e++)
+	{
+		$array =3D Fiche::get_fiche_def($cn, $afiche[$e]['fd_id'], 'name_asc')=
;
+
+		foreach ($array as $card)
+		{
+			$row =3D new Fiche($cn, $card['f_id']);
+			$letter =3D new Lettering_Card($cn);
+			$letter->set_parameter('quick_code', $row->strAttribut(ATTR_DEF_QUICK=
CODE));
+			$letter->set_parameter('start', $_GET['start']);
+			$letter->set_parameter('end', $_GET['end']);
+			// all
+			if ($_GET['histo'] =3D=3D 0)
+			{
+				$letter->get_all();
+			}
+
+			// lettered
+			if ($_GET['histo'] =3D=3D 1)
+			{
+				$letter->get_letter();
+			}
+			// unlettered
+			if ($_GET['histo'] =3D=3D 2)
+			{
+				$letter->get_unletter();
+			}
+			/* skip if nothing to display */
+			if (count($letter->content) =3D=3D 0)
+				continue;
+			printf('"%s"'."\n",$row->strAttribut(ATTR_DEF_QUICKCODE), $row->strAt=
tribut(ATTR_DEF_NAME));
+
+			printf('"%s";"%s";"%s";"%s";"%s";"%s";"%s"',
+					_('Date'),
+				_('ref'),
+				_('Interne'),
+				_('Comm'),
+				_('D=C3=A9bit'),
+				_('Cr=C3=A9bit'),
+				_('Prog.'),
+				_('Let.'));
+			printf("\n");
+			$amount_deb =3D 0;
+			$amount_cred =3D 0;
+			$prog =3D 0;
+			bcscale(2);
+			for ($i =3D 0; $i < count($letter->content); $i++)
+			{
+				$row =3D $letter->content[$i];
+				printf ('"%s";',$row['j_date_fmt']);
+				printf ('"%s";',$row['jr_pj_number']);
+				printf ('"%s";',$row['jr_internal']);
+				printf ('"%s";',$row['jr_comment']);
+				if ($row['j_debit'] =3D=3D 't')
+				{
+					printf("%s;",nb($row['j_montant']));
+					$amount_deb+=3D$row['j_montant'];
+					$prog =3D bcadd($prog, $row['j_montant']);
+					printf (";");
+				}
+				else
+				{
+					printf(";");
+					printf("%s;",nb($row['j_montant']));
+					$amount_cred+=3D$row['j_montant'];
+					$prog =3D bcsub($prog, $row['j_montant']);
+				}
+				printf ("%s;",nb($prog));
+				if ($row['letter'] !=3D -1)
+					printf('"%s";',$row['letter']);
+				else
+					printf(";");
+				printf("\n");
+			}
+			if ($prog < 0 )
+				$msg=3D"Solde Debit";
+			elseif ($prog>0)
+				$msg=3D"Solde Credit";
+			else
+				$msg=3D"sold=C3=A9";
+
+			printf(';;;"%s";%s;%s;%s',
+					$msg,nb($amount_deb),nb($amount_cred),nb($prog));
+			printf("\n");
+		}
+	}
+}
 exit;
+
+

Modified: phpcompta/trunk/include/export_fiche_balance_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_balance_pdf.php	2011-11-17 20:28=
:19 UTC (rev 4380)
+++ phpcompta/trunk/include/export_fiche_balance_pdf.php	2011-11-17 23:16=
:10 UTC (rev 4381)
@@ -21,7 +21,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 /*!\file
- * \brief Called by impress->category, export in PDF the history of a ca=
tegory
+ * \brief Called by impress->category, export in PDF the history of a ca=
tegory or balance
  * of card
  */
=20
@@ -50,10 +50,11 @@
 $pdf->SetTitle($name,1);
 $pdf->SetAuthor('Phpcompta');
 /* balance */
+$allcard=3D(isset($_GET['allcard']))?1:0;
 if ( $_GET['histo'] =3D=3D 4 || $_GET['histo']=3D=3D5)
 {
     $fd=3Dnew Fiche_Def($cn,$_REQUEST['cat']);
-    if ( $fd->hasAttribute(ATTR_DEF_ACCOUNT) =3D=3D false )
+    if ($allcard=3D=3D1 &&  $fd->hasAttribute(ATTR_DEF_ACCOUNT) =3D=3D f=
alse )
     {
         $pdf->Cell(0,10, "Cette cat=C3=A9gorie n'ayant pas de poste comp=
table n'a pas de balance");
         //Save PDF to file
@@ -61,16 +62,24 @@
         $pdf->Output("category-$fDate.pdf", 'I');
         exit;
     }
-    $aCard=3D$cn->get_array("select f_id,ad_value from fiche join fiche_=
Detail using (f_id)  where ad_id=3D1 and fd_id=3D$1 order by 2 ",array($_=
REQUEST['cat']));
+	// all card
+	if ($allcard=3D=3D1)
+	{
+		$afiche=3D$cn->get_array("select fd_id from vw_fiche_def where ad_id=3D=
".ATTR_DEF_ACCOUNT." order by fd_label asc");
+	}
+	else
+	{
+		$afiche[0]=3Darray('fd_id'=3D>$_REQUEST['cat']);
+	}
=20
-    if ( empty($aCard))
+	if ( $allcard=3D=3D0 && empty($aCard))
     {
         $pdf->Cell(0,10, "Aucune fiche trouv=C3=A9e");//Save PDF to file
         $fDate=3Ddate('dmy-Hi');
         $pdf->Output("category-$fDate.pdf", 'I');
         exit;
     }
-    $pdf->SetFont('DejaVuCond','',7);
+	$pdf->SetFont('DejaVuCond','',7);
     $pdf->Cell(30,7,'Quick Code',0,0,'L',0);
     $pdf->Cell(80,7,'Libell=C3=A9',0,0,'L',0);
     $pdf->Cell(20,7,'D=C3=A9bit',0,0,'R',0);
@@ -78,6 +87,14 @@
     $pdf->Cell(20,7,'Solde',0,0,'R',0);
     $pdf->Cell(20,7,'D/C',0,0,'C',0);
     $pdf->Ln();
+	for ($e =3D 0; $e < count($afiche); $e++)
+	{
+    $aCard=3D$cn->get_array("select f_id,ad_value from fiche join fiche_=
Detail using (f_id)  where ad_id=3D1 and fd_id=3D$1 order by 2 ",array($a=
fiche[$e]['fd_id']));
+
+
+	if (empty($aCard)) continue;
+
+
     $idx=3D0;
     for ($i=3D0;$i < count($aCard);$i++)
     {
@@ -113,125 +130,142 @@
         $pdf->Cell(20,7,$side,0,0,'C',$fill);
         $pdf->Ln();
     }
+	}
 }
 else
 {
-    $array=3DFiche::get_fiche_def($cn,$_GET['cat'],'name_asc');
-    /*
-     * You show now the result
-     */
-    if ($array =3D=3D null  )
-    {
-        exit();
-    }
-    $tab=3Darray(13,25,55,20,20,12,20);
-    $align=3Darray('L','L','L','R','R','R','R');
+	// all card
+	if ($allcard =3D=3D 1)
+	{
+		$afiche =3D $cn->get_array("select fd_id from vw_fiche_def where ad_id=
=3D" . ATTR_DEF_ACCOUNT . " order by fd_label asc");
+	}
+	else
+	{
+		$afiche[0] =3D array('fd_id' =3D> $_REQUEST['cat']);
+	}
=20
-    foreach($array as $row_fiche)
-    {
-      $row=3Dnew Fiche($cn,$row_fiche['f_id']);
-        $letter=3Dnew Lettering_Card($cn);
-        $letter->set_parameter('quick_code',$row->strAttribut(ATTR_DEF_Q=
UICKCODE));
-        $letter->set_parameter('start',$_GET['start']);
-        $letter->set_parameter('end',$_GET['end']);
-        // all
-        if ( $_GET['histo'] =3D=3D 0 )
-        {
-            $letter->get_all();
-        }
+	for ($e =3D 0; $e < count($afiche); $e++)
+	{
+		$array =3D Fiche::get_fiche_def($cn,$afiche[$e]['fd_id'] , 'name_asc')=
;
+		/*
+		 * You show now the result
+		 */
+		if ($array =3D=3D null)
+		{
+			continue;
+		}
+		$tab =3D array(13, 25, 55, 20, 20, 12, 20);
+		$align =3D array('L', 'L', 'L', 'R', 'R', 'R', 'R');
=20
-        // lettered
-        if ( $_GET['histo'] =3D=3D 1 )
-        {
-            $letter->get_letter();
-        }
-        // unlettered
-        if ( $_GET['histo'] =3D=3D 2 )
-        {
-            $letter->get_unletter();
-        }
-        /* skip if nothing to display */
-        if (count($letter->content) =3D=3D 0 ) continue;
-        $pdf->SetFont('DejaVuCond','',10);
-	$fiche=3Dnew Fiche($cn,$row_fiche['f_id']);
-        $pdf->Cell(0,7,$fiche->strAttribut(ATTR_DEF_NAME),1,1,'C');
+		foreach ($array as $row_fiche)
+		{
+			$row =3D new Fiche($cn, $row_fiche['f_id']);
+			$letter =3D new Lettering_Card($cn);
+			$letter->set_parameter('quick_code', $row->strAttribut(ATTR_DEF_QUICK=
CODE));
+			$letter->set_parameter('start', $_GET['start']);
+			$letter->set_parameter('end', $_GET['end']);
+			// all
+			if ($_GET['histo'] =3D=3D 0)
+			{
+				$letter->get_all();
+			}
=20
-        $pdf->SetFont('DejaVuCond','',7);
+			// lettered
+			if ($_GET['histo'] =3D=3D 1)
+			{
+				$letter->get_letter();
+			}
+			// unlettered
+			if ($_GET['histo'] =3D=3D 2)
+			{
+				$letter->get_unletter();
+			}
+			/* skip if nothing to display */
+			if (count($letter->content) =3D=3D 0)
+				continue;
+			$pdf->SetFont('DejaVuCond', '', 10);
+			$fiche =3D new Fiche($cn, $row_fiche['f_id']);
+			$pdf->Cell(0, 7, $fiche->strAttribut(ATTR_DEF_NAME), 1, 1, 'C');
=20
-        $pdf->Cell($tab[0],7,'Date');
-        $pdf->Cell($tab[1],7,'ref');
-        $pdf->Cell($tab[1],7,'Int.');
-        $pdf->Cell($tab[2],7,'Comm');
-        $pdf->Cell(40,7,'Montant',0,0,'C');
-        $pdf->Cell($tab[5],7,'Let.',0,0,'R');
-        $pdf->Cell($tab[6],7,'Som. Let.',0,0,'R');
-        $pdf->ln();
+			$pdf->SetFont('DejaVuCond', '', 7);
=20
-        $amount_deb=3D0;
-        $amount_cred=3D0;
-        for ($i=3D0;$i<count($letter->content);$i++)
-        {
-            if ( $i % 2 =3D=3D 0 )
-            {
-                $pdf->SetFillColor(220,221,255);
-                $fill=3D1;
-            }
-            else
-            {
-                $pdf->SetFillColor(0,0,0);
-                $fill=3D0;
-            }
-            $pdf->SetFont('DejaVuCond','',7);
-            $row=3D$letter->content[$i];
-            $str_date=3Dshrink_date($row['j_date_fmt']);
+			$pdf->Cell($tab[0], 7, 'Date');
+			$pdf->Cell($tab[1], 7, 'ref');
+			$pdf->Cell($tab[1], 7, 'Int.');
+			$pdf->Cell($tab[2], 7, 'Comm');
+			$pdf->Cell(40, 7, 'Montant', 0, 0, 'C');
+			$pdf->Cell($tab[5], 7, 'Let.', 0, 0, 'R');
+			$pdf->Cell($tab[6], 7, 'Som. Let.', 0, 0, 'R');
+			$pdf->ln();
=20
-            $pdf->Cell($tab[0],4,$str_date,0,0,$align[0],$fill);
-            $pdf->Cell($tab[1],4,$row['jr_pj_number'],0,0,$align[1],$fil=
l);
-            $pdf->Cell($tab[1],4,$row['jr_internal'],0,0,$align[1],$fill=
);
-            $pdf->Cell($tab[2],4,$row['jr_comment'],0,0,$align[2],$fill)=
;
-            if ( $row['j_debit'] =3D=3D 't')
-            {
-                $pdf->Cell($tab[3],4,sprintf('%10.2f',$row['j_montant'])=
,0,0,$align[4],$fill);
-                $amount_deb+=3D$row['j_montant'];
-                $pdf->Cell($tab[4],4,"",0,0,'C',$fill);
-            }
-            else
-            {
-                $pdf->Cell($tab[3],4,"",0,0,'C',$fill);
-                $pdf->Cell($tab[4],4,sprintf('%10.2f',$row['j_montant'])=
,0,0,$align[4],$fill);
-                $amount_cred+=3D$row['j_montant'];
-            }
-            if ($row['letter'] !=3D -1 )
-            {
-                $pdf->Cell($tab[5],4,$row['letter'],0,0,$align[5],$fill)=
;
-                // get sum for this lettering
-                $sql=3D"select sum(j_montant) from jrnx where j_debit=3D=
$1 and j_id in ".
-                     " (select j_id from jnt_letter join letter_deb usin=
g (jl_id) where jl_id=3D$2 union ".
-                     "  select j_id from jnt_letter join letter_cred usi=
ng (jl_id) where jl_id=3D$3)";
-                $sum=3D$cn->get_value($sql,array($row['j_debit'],$row['l=
etter'],$row['letter']));
-                $pdf->Cell($tab[6],4,sprintf('%.2f',$sum),'0','0','R',$f=
ill);
-            }
-            else
-                $pdf->Cell($tab[5],4,"",0,0,'R',$fill);
-            $pdf->Ln();
-        }
-        $pdf->SetFillColor(0,0,0);
-        $pdf->SetFont('DejaVuCond','B',8);
-        $debit =3Dsprintf('Debit  : % 12.2f',$amount_deb);
-        $credit=3Dsprintf('Credit : % 12.2f',$amount_cred);
-        if ( $amount_deb>$amount_cred) $s=3D'solde d=C3=A9biteur';
-        else $s=3D'solde crediteur';
-        $solde =3Dsprintf('%s  : % 12.2f',$s,(abs(round($amount_cred-$am=
ount_deb,2))));
+			$amount_deb =3D 0;
+			$amount_cred =3D 0;
+			for ($i =3D 0; $i < count($letter->content); $i++)
+			{
+				if ($i % 2 =3D=3D 0)
+				{
+					$pdf->SetFillColor(220, 221, 255);
+					$fill =3D 1;
+				}
+				else
+				{
+					$pdf->SetFillColor(0, 0, 0);
+					$fill =3D 0;
+				}
+				$pdf->SetFont('DejaVuCond', '', 7);
+				$row =3D $letter->content[$i];
+				$str_date =3D shrink_date($row['j_date_fmt']);
=20
-        $pdf->Cell(0,6,$debit,0,0,'R');
-        $pdf->ln(4);
-        $pdf->Cell(0,6,$credit,0,0,'R');
-        $pdf->ln(4);
-        $pdf->Cell(0,6,$solde,0,0,'R');
-        $pdf->ln(4);
+				$pdf->Cell($tab[0], 4, $str_date, 0, 0, $align[0], $fill);
+				$pdf->Cell($tab[1], 4, $row['jr_pj_number'], 0, 0, $align[1], $fill)=
;
+				$pdf->Cell($tab[1], 4, $row['jr_internal'], 0, 0, $align[1], $fill);
+				$pdf->Cell($tab[2], 4, $row['jr_comment'], 0, 0, $align[2], $fill);
+				if ($row['j_debit'] =3D=3D 't')
+				{
+					$pdf->Cell($tab[3], 4, sprintf('%10.2f', $row['j_montant']), 0, 0, =
$align[4], $fill);
+					$amount_deb+=3D$row['j_montant'];
+					$pdf->Cell($tab[4], 4, "", 0, 0, 'C', $fill);
+				}
+				else
+				{
+					$pdf->Cell($tab[3], 4, "", 0, 0, 'C', $fill);
+					$pdf->Cell($tab[4], 4, sprintf('%10.2f', $row['j_montant']), 0, 0, =
$align[4], $fill);
+					$amount_cred+=3D$row['j_montant'];
+				}
+				if ($row['letter'] !=3D -1)
+				{
+					$pdf->Cell($tab[5], 4, $row['letter'], 0, 0, $align[5], $fill);
+					// get sum for this lettering
+					$sql =3D "select sum(j_montant) from jrnx where j_debit=3D$1 and j_=
id in " .
+							" (select j_id from jnt_letter join letter_deb using (jl_id) wher=
e jl_id=3D$2 union " .
+							"  select j_id from jnt_letter join letter_cred using (jl_id) whe=
re jl_id=3D$3)";
+					$sum =3D $cn->get_value($sql, array($row['j_debit'], $row['letter']=
, $row['letter']));
+					$pdf->Cell($tab[6], 4, sprintf('%.2f', $sum), '0', '0', 'R', $fill)=
;
+				}
+				else
+					$pdf->Cell($tab[5], 4, "", 0, 0, 'R', $fill);
+				$pdf->Ln();
+			}
+			$pdf->SetFillColor(0, 0, 0);
+			$pdf->SetFont('DejaVuCond', 'B', 8);
+			$debit =3D sprintf('Debit  : % 12.2f', $amount_deb);
+			$credit =3D sprintf('Credit : % 12.2f', $amount_cred);
+			if ($amount_deb > $amount_cred)
+				$s =3D 'solde d=C3=A9biteur';
+			else
+				$s =3D 'solde crediteur';
+			$solde =3D sprintf('%s  : % 12.2f', $s, (abs(round($amount_cred - $am=
ount_deb, 2))));
=20
-        $pdf->Ln();
-    }
+			$pdf->Cell(0, 6, $debit, 0, 0, 'R');
+			$pdf->ln(4);
+			$pdf->Cell(0, 6, $credit, 0, 0, 'R');
+			$pdf->ln(4);
+			$pdf->Cell(0, 6, $solde, 0, 0, 'R');
+			$pdf->ln(4);
+
+			$pdf->Ln();
+		}
+	}
 }
 //Save PDF to file
 $fDate=3Ddate('dmy-Hi');

Modified: phpcompta/trunk/include/impress_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/impress_fiche.inc.php	2011-11-17 20:28:19 UTC=
 (rev 4380)
+++ phpcompta/trunk/include/impress_fiche.inc.php	2011-11-17 23:16:10 UTC=
 (rev 4381)
@@ -38,6 +38,9 @@
 $categorie->selected=3D(isset($_GET['cat']))?$_GET['cat']:0;
 $str_categorie=3D$categorie->input();
=20
+$icall=3Dnew ICheckBox("allcard",1);
+$icall->selected=3D(isset($_GET['allcard']))?1:0;
+$str_icall=3D$icall->input();
 /* periode */
 $exercice=3D$g_user->get_exercice();
 $iperiode=3Dnew Periode($cn);
@@ -63,8 +66,8 @@
                   array('value'=3D>5,'label'=3D>_('Balance non sold=C3=A9=
e' ))
               );
 $histo->javascript=3D'onchange=3D"if (this.value=3D=3D3) {
-                   g(&quot;trstart&quot;).style.display=3D&quot;none&quo=
t;;g(&quot;trend&quot;).style.display=3D&quot;none&quot;;}
-                   else  {g(&quot;trstart&quot;).style.display=3D&quot;&=
quot;;g(&quot;trend&quot;).style.display=3D&quot;&quot;}"';
+                   g(&quot;trstart&quot;).style.display=3D&quot;none&quo=
t;;g(&quot;trend&quot;).style.display=3D&quot;none&quot;;g(&quot;allcard&=
quot;).style.display=3D&quot;none&quot;;}
+                   else  {g(&quot;trstart&quot;).style.display=3D&quot;&=
quot;;g(&quot;trend&quot;).style.display=3D&quot;&quot;;g(&quot;allcard&q=
uot;).style.display=3D&quot;&quot;;}"';
=20
 $histo->selected=3D(isset($_GET['histo']))?$_GET['histo']:3;
 $str_histo=3D$histo->input();
@@ -76,8 +79,8 @@
 echo HtmlInput::submit('cat_display',_('Recherche'));
 echo '</FORM>';
 $str=3D"if (g('histo').value=3D=3D3) {
-     g('trstart').style.display=3D'none';g('trend').style.display=3D'non=
e';}
-     else  {g('trstart').style.display=3D'';g('trend').style.display=3D'=
';}";
+     g('trstart').style.display=3D'none';g('trend').style.display=3D'non=
e';g('allcard').style.display=3D'none';}
+     else  {g('trstart').style.display=3D'';g('trend').style.display=3D'=
';g('allcard').style.display=3D'';}";
 echo create_script($str);
 echo '<hr>';
 //-----------------------------------------------------
@@ -94,6 +97,8 @@
     echo '<h2 class=3D"info2"> Aucune fiche trouv=C3=A9e</h2>';
     exit();
 }
+
+$allcard=3D(isset($_GET['allcard']))?1:0;
 // summary
 if ( $_GET['histo'] =3D=3D 3 )
 {
@@ -119,77 +124,96 @@
 $export_pdf.=3DHtmlInput::hidden('start',$_GET['start']);
 $export_pdf.=3DHtmlInput::hidden('end',$_GET['end']);
 $export_pdf.=3DHtmlInput::hidden('histo',$_GET['histo']);
+$export_pdf.=3DHtmlInput::request_to_hidden(array('allcard'));
 $export_pdf.=3Ddossier::hidden();
 $export_pdf.=3DHtmlInput::submit('pdf','Export en PDF');
 $export_pdf.=3D'</FORM>';
+
 $export_csv=3D'<FORM METHOD=3D"get" ACTION=3D"export.php" style=3D"displ=
ay:inline">';
-
 $export_csv.=3DHtmlInput::hidden('cat',$_GET['cat']);
 $export_csv.=3DHtmlInput::hidden('act','CSV:fiche_balance');
 $export_csv.=3DHtmlInput::hidden('start',$_GET['start']);
 $export_csv.=3DHtmlInput::hidden('end',$_GET['end']);
 $export_csv.=3DHtmlInput::hidden('histo',$_GET['histo']);
+$export_csv.=3DHtmlInput::request_to_hidden(array('allcard'));
 $export_csv.=3Ddossier::hidden();
 $export_csv.=3DHtmlInput::submit('CSV','Export en CSV');
 $export_csv.=3D'</FORM>';
=20
-echo $export_pdf;
 // Balance
 if ( $_GET['histo'] =3D=3D 4 || $_GET['histo']=3D=3D5 )
 {
     if ( isDate($_REQUEST['start']) =3D=3D null || isDate ($_REQUEST['en=
d']) =3D=3D null )
     {
+        echo h2('Date invalide !','class=3D"error"');
         alert('Date invalide !');
         exit;
     }
+	echo $export_pdf;
     echo $export_csv;
+
+
     $fd=3Dnew Fiche_Def($cn,$_REQUEST['cat']);
-    if ( $fd->hasAttribute(ATTR_DEF_ACCOUNT) =3D=3D false )
+    if ( $allcard=3D=3D1 && $fd->hasAttribute(ATTR_DEF_ACCOUNT) =3D=3D f=
alse )
     {
       echo alert("Cette cat=C3=A9gorie n'ayant pas de poste comptable n'=
a pas de balance");
       exit;
     }
-    $ret=3D$cn->exec_sql("select f_id,ad_value from fiche join fiche_det=
ail using(f_id) where fd_id=3D$1 and ad_id=3D1 order by 2 ",array($_REQUE=
ST['cat']));
-    if ( $cn->count()=3D=3D0)
-    {
-        echo "Aucune fiche trouv=C3=A9e";
-        exit;
-    }
-    echo '<table class=3D"result" style=3D"width:80%;margin-left:10%">';
-    echo tr(
-        th('Quick Code').
-        th('Libell=C3=A9').
-        th('D=C3=A9bit','style=3D"text-align:right"').
-        th('Cr=C3=A9dit','style=3D"text-align:right"').
-        th('Solde','style=3D"text-align:right"').
-        th('D/C','style=3D"text-align:right"')
-    );
-    $idx=3D0;
-    for ($i=3D0;$i < Database::num_row($ret);$i++)
-    {
-        $filter=3D " (j_date >=3D to_date('".$_REQUEST['start']."','DD.M=
M.YYYY') ".
-                 " and  j_date <=3D to_date('".$_REQUEST['end']."','DD.M=
M.YYYY')) ";
-	$aCard=3DDatabase::fetch_array($ret,$i);
-        $oCard=3Dnew Fiche($cn,$aCard['f_id']);
-        $solde=3D$oCard->get_solde_detail($filter);
-        if ( $solde['debit'] =3D=3D 0 && $solde['credit']=3D=3D0) contin=
ue;
-	/* only not purged card */
-	if ($_GET['histo'] =3D=3D 5 && $solde['debit'] =3D=3D $solde['credit'])=
 continue;
-        $class=3D'';
-        if ( $idx%2 =3D=3D 0) $class=3D'class=3D"odd"';
-        $idx++;
-        echo tr(
-            td(HtmlInput::history_card($oCard->id,$oCard->strAttribut(AT=
TR_DEF_QUICKCODE))).
-            td($oCard->strAttribut(ATTR_DEF_NAME)).
-            td(nbm($solde['debit']),'style=3D"text-align:right"').
-            td(nbm($solde['credit']),'style=3D"text-align:right"').
-            td(nbm(abs($solde['solde'])),'style=3D"text-align:right"').
-            td((($solde['debit']<$solde['credit'])?'CRED':'DEB'),'style=3D=
"text-align:right"'),
-            $class
-        );
+	// all card
+	if ($allcard=3D=3D1)
+	{
+		$afiche=3D$cn->get_array("select fd_id from vw_fiche_def where ad_id=3D=
".ATTR_DEF_ACCOUNT." order by fd_label asc");
+	}
+	else
+	{
+		$afiche[0]=3Darray('fd_id'=3D>$_REQUEST['cat']);
+	}
=20
-    }
-    echo '</table>';
+	for ($e=3D0;$e<count($afiche);$e++)
+	{
+		$ret=3D$cn->exec_sql("select f_id,ad_value from fiche join fiche_detai=
l using(f_id) where fd_id=3D$1 and ad_id=3D1 order by 2 ",array($afiche[$=
e]['fd_id']));
+		if ( $cn->count()=3D=3D0)
+		{
+			echo "Aucune fiche trouv=C3=A9e";
+			exit;
+		}
+		echo '<h2>'.$cn->get_value("select fd_label from fiche_def where fd_id=
=3D$1",array($afiche[$e]['fd_id'])).'</h2>';
+		echo '<table class=3D"result" style=3D"width:80%;margin-left:10%">';
+		echo tr(
+			th('Quick Code').
+			th('Libell=C3=A9').
+			th('D=C3=A9bit','style=3D"text-align:right"').
+			th('Cr=C3=A9dit','style=3D"text-align:right"').
+			th('Solde','style=3D"text-align:right"').
+			th('D/C','style=3D"text-align:right"')
+		);
+		$idx=3D0;
+		for ($i=3D0;$i < Database::num_row($ret);$i++)
+		{
+			$filter=3D " (j_date >=3D to_date('".$_REQUEST['start']."','DD.MM.YYY=
Y') ".
+					 " and  j_date <=3D to_date('".$_REQUEST['end']."','DD.MM.YYYY')) "=
;
+			$aCard=3DDatabase::fetch_array($ret,$i);
+			$oCard=3Dnew Fiche($cn,$aCard['f_id']);
+			$solde=3D$oCard->get_solde_detail($filter);
+			if ( $solde['debit'] =3D=3D 0 && $solde['credit']=3D=3D0) continue;
+		/* only not purged card */
+		if ($_GET['histo'] =3D=3D 5 && $solde['debit'] =3D=3D $solde['credit']=
) continue;
+			$class=3D'';
+			if ( $idx%2 =3D=3D 0) $class=3D'class=3D"odd"';
+			$idx++;
+			echo tr(
+				td(HtmlInput::history_card($oCard->id,$oCard->strAttribut(ATTR_DEF_Q=
UICKCODE))).
+				td($oCard->strAttribut(ATTR_DEF_NAME)).
+				td(nbm($solde['debit']),'style=3D"text-align:right"').
+				td(nbm($solde['credit']),'style=3D"text-align:right"').
+				td(nbm(abs($solde['solde'])),'style=3D"text-align:right"').
+				td((($solde['debit']<$solde['credit'])?'CRED':'DEB'),'style=3D"text-=
align:right"'),
+				$class
+			);
+
+		}
+		echo '</table>';
+	}
     echo $export_pdf;
     echo $export_csv;
=20
@@ -197,101 +221,128 @@
 }
 if ( isDate($_REQUEST['start']) =3D=3D null || isDate ($_REQUEST['end'])=
 =3D=3D null )
 {
+	echo h2('Date invalide !','class=3D"error"');
     alert('Date invalide !');
     exit;
 }
-// for the lettering
-foreach($array as $card)
+//----------------------------------------------------------------------=
------
+// for the lettering / history
+//----------------------------------------------------------------------=
------
+
+// all card
+if ($allcard=3D=3D1)
 {
-  $row=3Dnew Fiche($cn,$card['f_id']);
-    $letter=3Dnew Lettering_Card($cn);
-    $letter->set_parameter('quick_code',$row->strAttribut(ATTR_DEF_QUICK=
CODE));
-    $letter->set_parameter('start',$_GET['start']);
-    $letter->set_parameter('end',$_GET['end']);
-    // all
-    if ( $_GET['histo'] =3D=3D 0 )
-    {
-        $letter->get_all();
-    }
+	$afiche=3D$cn->get_array("select fd_id from vw_fiche_def where ad_id=3D=
".ATTR_DEF_ACCOUNT." order by fd_label asc");
+}
+else
+{
+	$afiche[0]=3Darray('fd_id'=3D>$_REQUEST['cat']);
+}
+echo $export_csv;
+echo $export_pdf;
=20
-    // lettered
-    if ( $_GET['histo'] =3D=3D 1 )
-    {
-        $letter->get_letter();
-    }
-    // unlettered
-    if ( $_GET['histo'] =3D=3D 2 )
-    {
-        $letter->get_unletter();
-    }
-    /* skip if nothing to display */
-    if (count($letter->content) =3D=3D 0 ) continue;
-    $detail_card=3DHtmlInput::card_detail($row->strAttribut(ATTR_DEF_QUI=
CKCODE),$row->strAttribut(ATTR_DEF_NAME));
+for ($e =3D 0; $e < count($afiche); $e++)
+{
+	$array =3D Fiche::get_fiche_def($cn, $afiche[$e]['fd_id'], 'name_asc');
=20
-    echo '<h2 style=3D"font-size:14px;text-align:left;margin-left:10;pad=
ding-left:50;border:solid 1px blue;width:25%;text-decoration:underline">'=
.$detail_card.'</h2>';
+	foreach ($array as $card)
+	{
+		$row =3D new Fiche($cn, $card['f_id']);
+		$letter =3D new Lettering_Card($cn);
+		$letter->set_parameter('quick_code', $row->strAttribut(ATTR_DEF_QUICKC=
ODE));
+		$letter->set_parameter('start', $_GET['start']);
+		$letter->set_parameter('end', $_GET['end']);
+		// all
+		if ($_GET['histo'] =3D=3D 0)
+		{
+			$letter->get_all();
+		}
=20
-    echo '<table style=3D"width:80%;padding-left:10%;padding-right:10%">=
';
-    echo '<tr>';
-    echo th(_('Date'));
-    echo th(_('ref'));
-    echo th(_('Interne'));
-    echo th(_('Comm'));
-    echo th(_('Montant'),'style=3D"width:auto" colspan=3D"2"');
-    echo th(_('Prog.'));
-    echo th(_('Let.'));
-    echo '</tr>';
-    $amount_deb=3D0;
-    $amount_cred=3D0;
-    $prog=3D0;
-    bcscale(2);
-    for ($i=3D0;$i<count($letter->content);$i++)
-    {
-        if ($i%2 =3D=3D 0 )
-            echo '<tr class=3D"even">';
-        else
-            echo '<tr class=3D"odd">';
-        $row=3D$letter->content[$i];
-        echo td($row['j_date_fmt']);
-        echo td($row['jr_pj_number']);
-        echo td(HtmlInput::detail_op($row['jr_id'],$row['jr_internal']))=
;
-        echo td($row['jr_comment']);
-        if ( $row['j_debit'] =3D=3D 't')
-        {
-	  echo td(nbm($row['j_montant']),' style=3D"text-align:right"');
-            $amount_deb+=3D$row['j_montant'];
-            $prog=3Dbcadd($prog,$row['j_montant']);
-            echo td("");
-        }
-        else
-        {
-            echo td("");
-            echo td(nbm($row['j_montant']),' style=3D"text-align:right"'=
);
-            $amount_cred+=3D$row['j_montant'];
-            $prog=3Dbcsub($prog,$row['j_montant']);
-        }
-        echo td(nbm($prog),'style=3D"text-align:right"');
-        if ($row['letter'] !=3D -1 ) echo td($row['letter']);
-        else echo td('');
-        echo '</tr>';
-    }
-    echo '</table>';
-    echo '<table>';
-    echo '<tr>';
-    echo td(_('Debit'));
-    echo td($amount_deb,' style=3D"font-weight:bold;text-align:right"');
-    echo '</tr>';
-    echo '<tr>';
-    echo td(_('Credit'));
-    echo td($amount_cred,' style=3D"font-weight:bold;text-align:right"')=
;
-    echo '</tr>';
-    echo '<tr>';
-    if ( $amount_deb>$amount_cred) $s=3D'solde d=C3=A9biteur';
-    else $s=3D'solde crediteur';
-    echo td($s);
-    echo td(abs(round($amount_cred-$amount_deb,2)),' style=3D"font-weigh=
t:bold;text-align:right"');
-    echo '</tr>';
-    echo '</table>';
+		// lettered
+		if ($_GET['histo'] =3D=3D 1)
+		{
+			$letter->get_letter();
+		}
+		// unlettered
+		if ($_GET['histo'] =3D=3D 2)
+		{
+			$letter->get_unletter();
+		}
+		/* skip if nothing to display */
+		if (count($letter->content) =3D=3D 0)
+			continue;
+		$detail_card =3D HtmlInput::card_detail($row->strAttribut(ATTR_DEF_QUI=
CKCODE), $row->strAttribut(ATTR_DEF_NAME));
+
+		echo '<h2 style=3D"font-size:14px;text-align:left;margin-left:10;paddi=
ng-left:50;border:solid 1px blue;width:25%;text-decoration:underline">' .=
 $detail_card . '</h2>';
+
+		echo '<table style=3D"width:80%;padding-left:10%;padding-right:10%">';
+		echo '<tr>';
+		echo th(_('Date'));
+		echo th(_('ref'));
+		echo th(_('Interne'));
+		echo th(_('Comm'));
+		echo th(_('Montant'), 'style=3D"width:auto" colspan=3D"2"');
+		echo th(_('Prog.'));
+		echo th(_('Let.'));
+		echo '</tr>';
+		$amount_deb =3D 0;
+		$amount_cred =3D 0;
+		$prog =3D 0;
+		bcscale(2);
+		for ($i =3D 0; $i < count($letter->content); $i++)
+		{
+			if ($i % 2 =3D=3D 0)
+				echo '<tr class=3D"even">';
+			else
+				echo '<tr class=3D"odd">';
+			$row =3D $letter->content[$i];
+			echo td($row['j_date_fmt']);
+			echo td($row['jr_pj_number']);
+			echo td(HtmlInput::detail_op($row['jr_id'], $row['jr_internal']));
+			echo td($row['jr_comment']);
+			if ($row['j_debit'] =3D=3D 't')
+			{
+				echo td(nbm($row['j_montant']), ' style=3D"text-align:right"');
+				$amount_deb+=3D$row['j_montant'];
+				$prog =3D bcadd($prog, $row['j_montant']);
+				echo td("");
+			}
+			else
+			{
+				echo td("");
+				echo td(nbm($row['j_montant']), ' style=3D"text-align:right"');
+				$amount_cred+=3D$row['j_montant'];
+				$prog =3D bcsub($prog, $row['j_montant']);
+			}
+			echo td(nbm($prog), 'style=3D"text-align:right"');
+			if ($row['letter'] !=3D -1)
+				echo td($row['letter']);
+			else
+				echo td('');
+			echo '</tr>';
+		}
+		echo '</table>';
+		echo '<table>';
+		echo '<tr>';
+		echo td(_('Debit'));
+		echo td($amount_deb, ' style=3D"font-weight:bold;text-align:right"');
+		echo '</tr>';
+		echo '<tr>';
+		echo td(_('Credit'));
+		echo td($amount_cred, ' style=3D"font-weight:bold;text-align:right"');
+		echo '</tr>';
+		echo '<tr>';
+		if ($amount_deb > $amount_cred)
+			$s =3D 'solde d=C3=A9biteur';
+		else
+			$s =3D 'solde crediteur';
+		echo td($s);
+		echo td(abs(round($amount_cred - $amount_deb, 2)), ' style=3D"font-wei=
ght:bold;text-align:right"');
+		echo '</tr>';
+		echo '</table>';
+	}
 }
+echo $export_csv;
 echo $export_pdf;
=20
=20

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	2011-11-17 20:28:19 UT=
C (rev 4380)
+++ phpcompta/trunk/include/template/dashboard.php	2011-11-17 23:16:10 UT=
C (rev 4381)
@@ -95,7 +95,7 @@
 }
=20
 if ( $report !=3D 0 ) {
-  echo '<fieldset style=3D"background-color:white"><legend>'.$rapport->g=
et_name().'</legend>';
+  echo '<fieldset style=3D"width:50%;background-color:white"><legend>'.$=
rapport->get_name().'</legend>';
   $exercice=3D$g_user->get_exercice();
   if ( $exercice =3D=3D 0 ) {
     alert(_('Aucune periode par defaut'));
@@ -120,7 +120,7 @@
   echo '</fieldset>';
   echo '</div>';
  } else {
-  echo '<fieldset style=3D"background-color:white"><legend>'._('Aucun ra=
pport d=C3=A9fini').'</legend>';
+  echo '<fieldset style=3D"width:50%;background-color:white"><legend>'._=
('Aucun rapport d=C3=A9fini').'</legend>';
   echo '<a href=3D"user_pref.php?'.dossier::get().'">'._('Cliquez ici po=
ur mettre =C3=A0 jour vos pr=C3=A9f=C3=A9rences').'</a>';
   echo '</fieldset>';
  }

Modified: phpcompta/trunk/include/template/impress_cat_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/impress_cat_card.php	2011-11-17 20:2=
8:19 UTC (rev 4380)
+++ phpcompta/trunk/include/template/impress_cat_card.php	2011-11-17 23:1=
6:10 UTC (rev 4381)
@@ -14,5 +14,9 @@
 <tr id=3D"trend">
   <td><?=3D_('Jusque')?></td>
   <td><?=3D$str_end?></td>
+<tr id=3D"allcard">
+	<td>Toutes les fiches</td>
+	<td><?=3D$str_icall?></td>
 </tr>
+</tr>
 </table>



From MAILER-DAEMON Thu Nov 17 18:11:17 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRB6y-0007GF-W5
	for mharc-phpcompta-dev@gnu.org; Thu, 17 Nov 2011 18:11:16 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 00:16:49 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27040.1321571475.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r191 - in trunk: amortis tools/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 Nov 2011 23:11:15 -0000

Author: danydb
Date: 2011-11-18 00:16:49 +0100 (Fri, 18 Nov 2011)
New Revision: 191

Modified:
   trunk/amortis/ajax.php
   trunk/tools/include/template/search_box.php
Log:
add missing $_REQUEST[ac] + use of anchor_close for amortis

Modified: trunk/amortis/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/ajax.php	2011-11-14 20:29:38 UTC (rev 190)
+++ trunk/amortis/ajax.php	2011-11-17 23:16:49 UTC (rev 191)
@@ -31,9 +31,7 @@
 $ctl=3D$t;
 $html=3D'op=C3=A9ration non trouv=C3=A9e';
 $extra=3D'';
-$close=3D'<div style=3D"float:right;height:10px;display:block;margin-top=
:2px;margin-right:2px">';
-$close.=3D'<A style=3D"background-color:blue;color:white;text-decoration=
:none" HREF=3D"javascript:void(0)" onclick=3D"removeDiv(\''.$t.'\');">Fer=
mer</A>';=20
-$close.=3D'</div>';
+$close=3DHtmlInput::anchor_close($t);
 $html=3D$close.$html;
 switch($op)
   {
@@ -80,7 +78,7 @@
     $html=3Dob_get_contents();
     ob_clean();
     break;
-   =20
+
   }
=20
 $html=3Descape_xml($html);

Modified: trunk/tools/include/template/search_box.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/template/search_box.php	2011-11-14 20:29:38 UTC (=
rev 190)
+++ trunk/tools/include/template/search_box.php	2011-11-17 23:16:49 UTC (=
rev 191)
@@ -14,5 +14,6 @@
 	<td><?=3D$idate_end->input()?></td>
 	</tr>
 </table>
+	<?=3DHtmlInput::request_to_hidden(array('ac','plugin_code'));?>
 <?=3D$submit?>
 </FORM>
\ No newline at end of file



From MAILER-DAEMON Fri Nov 18 04:05:49 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRKOL-0000TP-3N
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 04:05:49 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 10:11:18 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27817.1321607148.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4382 - 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: Fri, 18 Nov 2011 09:05:48 -0000

Author: danydb
Date: 2011-11-18 10:11:15 +0100 (Fri, 18 Nov 2011)
New Revision: 4382

Modified:
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/compta_ven.inc.php
Log:
0000459: Document g?\195?\169n?\195?\169r?\195?\169 doit ?\195?\170tre vi=
sible dans le dernier ?\195?\169cran

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	2011-11-17 23:16:10 UTC (rev 4381)
+++ phpcompta/trunk/html/style.css	2011-11-18 09:11:15 UTC (rev 4382)
@@ -1065,3 +1065,10 @@
 	font-size:16;
 	padding: 20 20;
 }
+span.invoice
+{
+    font-size: 120%;
+    font-style: italic;
+    display:inline;
+    padding : 20;
+}
\ No newline at end of file

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	2011-11-17 23:16:10 UTC (r=
ev 4381)
+++ phpcompta/trunk/include/compta_ach.inc.php	2011-11-18 09:11:15 UTC (r=
ev 4382)
@@ -134,7 +134,9 @@
 		}
 		if (isset($Ledger->doc))
 		{
-			echo $Ledger->doc . '<hr>';
+                     echo '<span class=3D"invoice">';
+                     echo $Ledger->doc;
+                     echo '</span>';
 		}
 		/* Save the additional information into jrn_info */
 		$obj =3D new Acc_Ledger_Info($cn);

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	2011-11-17 23:16:10 UTC (r=
ev 4381)
+++ phpcompta/trunk/include/compta_ven.inc.php	2011-11-18 09:11:15 UTC (r=
ev 4382)
@@ -155,7 +155,9 @@
             /* Show link for Invoice */
             if (isset ($Ledger->doc) )
             {
+                echo '<span class=3D"invoice">';
                 echo $Ledger->doc;
+                echo '</span>';
             }
=20
=20



From MAILER-DAEMON Fri Nov 18 04:25:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRKhb-0003zZ-JS
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 04:25:43 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 10:31:14 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27843.1321608343.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4383 - 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, 18 Nov 2011 09:25:42 -0000

Author: danydb
Date: 2011-11-18 10:31:12 +0100 (Fri, 18 Nov 2011)
New Revision: 4383

Modified:
   phpcompta/trunk/html/style.css
Log:
0000459: Document g?\195?\169n?\195?\169r?\195?\169 doit ?\195?\170tre vi=
sible dans le dernier ?\195?\169cran, am?\195?\169liore apparance

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	2011-11-18 09:11:15 UTC (rev 4382)
+++ phpcompta/trunk/html/style.css	2011-11-18 09:31:12 UTC (rev 4383)
@@ -1062,13 +1062,14 @@
 	width:300px;
 	border:1px solid black;
 	background-color:#aec3e8;
-	font-size:16;
-	padding: 20 20;
+	font-size:16px;
+	padding: 20px 20px;
 }
 span.invoice
 {
     font-size: 120%;
     font-style: italic;
-    display:inline;
-    padding : 20;
+    display:block;
+    margin: 20px;
+    font-weight: bold;
 }
\ No newline at end of file



From MAILER-DAEMON Fri Nov 18 04:35:27 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRKr1-0005tK-6h
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 04:35:27 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 10:40:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27856.1321608925.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4384 - 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: Fri, 18 Nov 2011 09:35:24 -0000

Author: danydb
Date: 2011-11-18 10:40:49 +0100 (Fri, 18 Nov 2011)
New Revision: 4384

Added:
   phpcompta/trunk/include/ajax_anc_search.php
Removed:
   phpcompta/trunk/html/search_ca.php
Log:
#168 : recherche poste ANC

Deleted: phpcompta/trunk/html/search_ca.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/search_ca.php	2011-11-18 09:31:12 UTC (rev 4383)
+++ phpcompta/trunk/html/search_ca.php	2011-11-18 09:40:49 UTC (rev 4384)
@@ -1,99 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- *
- * \brief show a screen to search a ca account
- *
- */
-
-// parameter are gDossier , c1 : the control id to update,
-// c2 the control id which contains the pa_id
-require_once("class_itext.php");
-require_once("class_ihidden.php");
-require_once("class_ibutton.php");
-require_once ('class_database.php');
-require_once ("ac_common.php");
-require_once ('class_dossier.php');
-require_once ('class_anc_account.php');
-require_once ('class_anc_plan.php');
-require_once('function_javascript.php');
-
-/*!\todo add security here : check user and access to CA
- */
-
-html_page_start();
-load_all_script();
-//------------- FORM ----------------------------------
-echo '<FORM METHOD=3D"GET">';
-$texte=3Dnew IText();
-echo '<span>'._('Recherche').':';
-echo $texte->input('label');
-echo '</span>';
-echo dossier::hidden();
-$hid=3Dnew IHidden();
-echo $hid->input("c1",$_REQUEST['c1']);
-echo $hid->input("c2",$_REQUEST['c2']);
-echo $hid->input("go");
-echo HtmlInput::submit("go",_("Recherche"));
-echo '</form>';
-//------------- FORM ----------------------------------
-if ( isset($_REQUEST['go']))
-{
-    $cn=3Dnew Database(dossier::id());
-    $plan=3Dnew Anc_Plan($cn,$_REQUEST['c2']);
-    $plan->pa_id=3D$_REQUEST['c2'];
-    if ( $plan->exist()=3D=3Dfalse)
-        exit("Ce plan n'existe pas");
-
-    $sql=3D"select po_name , po_description from poste_analytique ".
-         "where pa_id=3D".$_REQUEST['c2']." and ".
-         " upper (po_name) like upper('%".Database::escape_string($_REQU=
EST['label'])."%') order by po_name";
-    $res=3D$cn->exec_sql($sql);
-    $array=3DDatabase::fetch_all($res);
-    if (empty($array) =3D=3D true)
-    {
-        echo "D&eacute;sol&eacute; aucun poste trouv&eacute;";
-        return;
-    }
-    $button=3Dnew IButton();
-    $button->name=3D"Choix";
-    $button->label=3D"Choix";
-
-    echo '<table>';
-    foreach ($array as $line)
-    {
-        $button->javascript=3Dsprintf("set_inparent('%s','%s');window.cl=
ose();",
-                                    $_REQUEST['c1'],
-                                    $line['po_name']);
-        echo '<tr>'.
-        '<td>'.
-        $button->input().
-        '</td>'.
-        '<td>'.
-        $line['po_name'].
-        '</td><td>'.
-        $line['po_description'].
-        '</tr>';
-    }
-    echo '</table>';
-}

Copied: phpcompta/trunk/include/ajax_anc_search.php (from rev 4383, phpco=
mpta/trunk/html/search_ca.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_search.php	                        (=
rev 0)
+++ phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 09:40:49 UTC (=
rev 4384)
@@ -0,0 +1,99 @@
+<?php
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ *
+ * \brief show a screen to search a ca account
+ *
+ */
+
+// parameter are gDossier , c1 : the control id to update,
+// c2 the control id which contains the pa_id
+require_once("class_itext.php");
+require_once("class_ihidden.php");
+require_once("class_ibutton.php");
+require_once ('class_database.php');
+require_once ("ac_common.php");
+require_once ('class_dossier.php');
+require_once ('class_anc_account.php');
+require_once ('class_anc_plan.php');
+require_once('function_javascript.php');
+
+/*!\todo add security here : check user and access to CA
+ */
+
+html_page_start();
+load_all_script();
+//------------- FORM ----------------------------------
+echo '<FORM METHOD=3D"GET">';
+$texte=3Dnew IText();
+echo '<span>'._('Recherche').':';
+echo $texte->input('label');
+echo '</span>';
+echo dossier::hidden();
+$hid=3Dnew IHidden();
+echo $hid->input("c1",$_REQUEST['c1']);
+echo $hid->input("c2",$_REQUEST['c2']);
+echo $hid->input("go");
+echo HtmlInput::submit("go",_("Recherche"));
+echo '</form>';
+//------------- FORM ----------------------------------
+if ( isset($_REQUEST['go']))
+{
+    $cn=3Dnew Database(dossier::id());
+    $plan=3Dnew Anc_Plan($cn,$_REQUEST['c2']);
+    $plan->pa_id=3D$_REQUEST['c2'];
+    if ( $plan->exist()=3D=3Dfalse)
+        exit("Ce plan n'existe pas");
+
+    $sql=3D"select po_name , po_description from poste_analytique ".
+         "where pa_id=3D".$_REQUEST['c2']." and ".
+         " upper (po_name) like upper('%".Database::escape_string($_REQU=
EST['label'])."%') order by po_name";
+    $res=3D$cn->exec_sql($sql);
+    $array=3DDatabase::fetch_all($res);
+    if (empty($array) =3D=3D true)
+    {
+        echo "D&eacute;sol&eacute; aucun poste trouv&eacute;";
+        return;
+    }
+    $button=3Dnew IButton();
+    $button->name=3D"Choix";
+    $button->label=3D"Choix";
+
+    echo '<table>';
+    foreach ($array as $line)
+    {
+        $button->javascript=3Dsprintf("set_inparent('%s','%s');window.cl=
ose();",
+                                    $_REQUEST['c1'],
+                                    $line['po_name']);
+        echo '<tr>'.
+        '<td>'.
+        $button->input().
+        '</td>'.
+        '<td>'.
+        $line['po_name'].
+        '</td><td>'.
+        $line['po_description'].
+        '</tr>';
+    }
+    echo '</table>';
+}



From MAILER-DAEMON Fri Nov 18 04:44:55 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRL0B-0007mE-8o
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 04:44:55 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 10:50:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27899.1321609494.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4385 - in phpcompta/trunk: html html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Nov 2011 09:44:53 -0000

Author: danydb
Date: 2011-11-18 10:50:18 +0100 (Fri, 18 Nov 2011)
New Revision: 4385

Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/include/ajax_anc_search.php
Log:
#168 recherche imp. analytique anc=20

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	2011-11-18 09:40:49 UTC (rev 4384)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-18 09:50:18 UTC (rev 4385)
@@ -530,4 +530,7 @@
 	 case 'up_pay_method':
 		 require_once 'ajax_update_payment.php';
 		 break;
+         case 'openancsearch':
+                 require_once('ajax_anc_search.php');
+                 break;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/js/anc_script.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/anc_script.js	2011-11-18 09:40:49 UTC (rev 43=
84)
+++ phpcompta/trunk/html/js/anc_script.js	2011-11-18 09:50:18 UTC (rev 43=
85)
@@ -182,10 +182,35 @@
 {
     var pa_id=3Dg(p_source).value;
     var url=3D"gDossier=3D"+p_dossier+"&c1=3D"+p_target+"&c2=3D"+pa_id;
-    var a=3Dwindow.open("search_ca.php"+url,"CA recherche",'statusbar=3D=
no,scrollbars=3Dyes,toolbar=3Dno');
-    a.focus();
+    waiting_box();
+    removeDiv('search_anc');
+    var qs=3D"op=3Dopenancsearch&gDossier=3D"+p_dossier+"&ctl=3Dsearchan=
c";
+
+    var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+    {
+        method:'get',
+        parameters:qs,
+        onFailure:null,
+        onSuccess:function(req){
+            try{
+                remove_waiting_box();
+                var pos=3Dfixed_position(250,150)+";width:30%";
+                add_div({
+                    id:"searchanc",
+                    drag:1,
+                    cssclass:"inner_box",
+                    style:pos
+                });
+                $('searchanc').innerHTML=3Dreq.responseText;
+
+            } catch(e){
+                alert(e.message);
+            }
+        }
+    }
+    );
+   =20
 }
-
 function caod_checkTotal()
 {
     var ie4=3Dfalse;

Modified: phpcompta/trunk/include/ajax_anc_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 09:40:49 UTC (=
rev 4384)
+++ phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 09:50:18 UTC (=
rev 4385)
@@ -38,13 +38,8 @@
 require_once ('class_anc_plan.php');
 require_once('function_javascript.php');
=20
-/*!\todo add security here : check user and access to CA
- */
-
-html_page_start();
-load_all_script();
 //------------- FORM ----------------------------------
-echo '<FORM METHOD=3D"GET">';
+echo '<FORM METHOD=3D"GET" onsubmit=3D"search_anc_form(this);return fals=
e">';
 $texte=3Dnew IText();
 echo '<span>'._('Recherche').':';
 echo $texte->input('label');
@@ -59,7 +54,7 @@
 //------------- FORM ----------------------------------
 if ( isset($_REQUEST['go']))
 {
-    $cn=3Dnew Database(dossier::id());
+    $cn=3DDossier::connect();
     $plan=3Dnew Anc_Plan($cn,$_REQUEST['c2']);
     $plan->pa_id=3D$_REQUEST['c2'];
     if ( $plan->exist()=3D=3Dfalse)



From MAILER-DAEMON Fri Nov 18 05:18:53 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRLX3-0004rQ-B0
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 05:18:53 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 11:24:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27943.1321611532.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4386 - in phpcompta/trunk: html html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Nov 2011 10:18:52 -0000

Author: danydb
Date: 2011-11-18 11:24:18 +0100 (Fri, 18 Nov 2011)
New Revision: 4386

Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/include/ajax_anc_search.php
Log:
#168 recherche imp. analytique anc

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	2011-11-18 09:50:18 UTC (rev 4385)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-18 10:24:18 UTC (rev 4386)
@@ -531,6 +531,8 @@
 		 require_once 'ajax_update_payment.php';
 		 break;
          case 'openancsearch':
+         case 'resultancsearch':
                  require_once('ajax_anc_search.php');
                  break;
+           =20
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/js/anc_script.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/anc_script.js	2011-11-18 09:50:18 UTC (rev 43=
85)
+++ phpcompta/trunk/html/js/anc_script.js	2011-11-18 10:24:18 UTC (rev 43=
86)
@@ -194,7 +194,7 @@
         onSuccess:function(req){
             try{
                 remove_waiting_box();
-                var pos=3Dfixed_position(250,150)+";width:30%";
+                var pos=3Dfixed_position(250,150)+";width:30%;height:50%=
";
                 add_div({
                     id:"searchanc",
                     drag:1,
@@ -211,6 +211,30 @@
     );
    =20
 }
+function search_anc_form(obj)
+{
+    var qs=3D"op=3Dresultancsearch&ctl=3Dsearchanc&gDossier=3D"+obj.gDos=
sier;
+    qs+=3Dobj.serialize(false);
+    waiting_box();
+    var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+    {
+        method:'get',
+        parameters:qs,
+        onFailure:null,
+        onSuccess:function(req){
+            try{
+                remove_waiting_box();
+                $('searchanc').innerHTML=3Dreq.responseText;
+                req.responseText.evalScripts();
+
+            } catch(e){
+                alert(e.message);
+            }
+        }
+    }
+    );
+    return false;
+}
 function caod_checkTotal()
 {
     var ie4=3Dfalse;

Modified: phpcompta/trunk/include/ajax_anc_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 09:50:18 UTC (=
rev 4385)
+++ phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 10:24:18 UTC (=
rev 4386)
@@ -38,10 +38,14 @@
 require_once ('class_anc_plan.php');
 require_once('function_javascript.php');
=20
+echo HtmlInput::title_box("Recherche activit=C3=A9", $ctl);
+
 //------------- FORM ----------------------------------
 echo '<FORM METHOD=3D"GET" onsubmit=3D"search_anc_form(this);return fals=
e">';
+echo '<span>'._('Recherche').':';
+
 $texte=3Dnew IText();
-echo '<span>'._('Recherche').':';
+$texte->value=3DHtmlInput::default_value('label',"", $_GET);
 echo $texte->input('label');
 echo '</span>';
 echo dossier::hidden();
@@ -77,7 +81,7 @@
     echo '<table>';
     foreach ($array as $line)
     {
-        $button->javascript=3Dsprintf("set_inparent('%s','%s');window.cl=
ose();",
+        $button->javascript=3Dsprintf("$('%s').value=3D'%s'",
                                     $_REQUEST['c1'],
                                     $line['po_name']);
         echo '<tr>'.



From MAILER-DAEMON Fri Nov 18 05:19:32 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRLXg-0004yk-UI
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 05:19:32 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 11:24:59 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27948.1321611572.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4387 - 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, 18 Nov 2011 10:19:32 -0000

Author: danydb
Date: 2011-11-18 11:24:58 +0100 (Fri, 18 Nov 2011)
New Revision: 4387

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
Log:
#459 : visibilit?\195?\169 doc. g?\195?\169n?\195?\169r?\195?\169

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	2011-11-18 10:2=
4:18 UTC (rev 4386)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-18 10:2=
4:58 UTC (rev 4387)
@@ -709,8 +709,8 @@
             if ( isset($_POST['gen_invoice']) )
             {
                 $ref_doc=3D $this->create_document($internal,$p_array);
-                $this->doc=3D _('Document g=C3=A9n=C3=A9r=C3=A9');
-                $this->doc.=3D'<A style=3D"display:inline" HREF=3D"show_=
pj.php?'.dossier::get().'&jr_grpt_id=3D'.$seq.'&jrn=3D'.$this->id.'">'.$r=
ef_doc.'</A>';
+                $this->doc=3D _('Document g=C3=A9n=C3=A9r=C3=A9')."  : "=
;
+                $this->doc.=3D'<A style=3D"line" HREF=3D"show_pj.php?'.d=
ossier::get().'&jr_grpt_id=3D'.$seq.'&jrn=3D'.$this->id.'">'.$ref_doc.'</=
A>';
             }
=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	2011-11-18 10:24:18=
 UTC (rev 4386)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-18 10:24:58=
 UTC (rev 4387)
@@ -473,8 +473,8 @@
                     if ( isset($_POST['gen_invoice']))
                     {
                         $file=3D$this->create_document($internal,$p_arra=
y);
-                        $this->doc=3D _('Document g=C3=A9n=C3=A9r=C3=A9'=
);
-                        $this->doc.=3D'<A STYLE=3D"display:inline;" HREF=
=3D"show_pj.php?'.dossier::get().'&jr_grpt_id=3D'.$seq.'&jrn=3D'.$this->i=
d.'">'.$file.'</A>';
+                        $this->doc=3D _('Document g=C3=A9n=C3=A9r=C3=A9'=
)."  : ";
+                        $this->doc.=3D'<A class=3D"line" HREF=3D"show_pj=
.php?'.dossier::get().'&jr_grpt_id=3D'.$seq.'&jrn=3D'.$this->id.'">'.$fil=
e.'</A>';
                     }
             }
             //----------------------------------------



From MAILER-DAEMON Fri Nov 18 05:20:35 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRLYh-0005L4-Sr
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 05:20:35 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 11:26:04 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27953.1321611635.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4388 - 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, 18 Nov 2011 10:20:34 -0000

Author: danydb
Date: 2011-11-18 11:26:03 +0100 (Fri, 18 Nov 2011)
New Revision: 4388

Modified:
   phpcompta/trunk/include/ajax_anc_search.php
Log:
#168 : recherche activit?\195?\169 analytique : protection car. html

Modified: phpcompta/trunk/include/ajax_anc_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 10:24:58 UTC (=
rev 4387)
+++ phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 10:26:03 UTC (=
rev 4388)
@@ -89,9 +89,9 @@
         $button->input().
         '</td>'.
         '<td>'.
-        $line['po_name'].
+        h($line['po_name']).
         '</td><td>'.
-        $line['po_description'].
+        h($line['po_description']).
         '</tr>';
     }
     echo '</table>';



From MAILER-DAEMON Fri Nov 18 05:23:37 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRLbd-0005WQ-Da
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 05:23:37 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 11:29:05 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.27960.1321611816.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4389 - 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, 18 Nov 2011 10:23:36 -0000

Author: danydb
Date: 2011-11-18 11:29:04 +0100 (Fri, 18 Nov 2011)
New Revision: 4389

Modified:
   phpcompta/trunk/include/ajax_anc_search.php
Log:
#168 : recherche activit?\195?\169 analytique : Plan analytique n'existe =
pas

Modified: phpcompta/trunk/include/ajax_anc_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 10:26:03 UTC (=
rev 4388)
+++ phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 10:29:04 UTC (=
rev 4389)
@@ -37,7 +37,7 @@
 require_once ('class_anc_account.php');
 require_once ('class_anc_plan.php');
 require_once('function_javascript.php');
-
+var_dump($_GET);
 echo HtmlInput::title_box("Recherche activit=C3=A9", $ctl);
=20
 //------------- FORM ----------------------------------
@@ -65,9 +65,9 @@
         exit("Ce plan n'existe pas");
=20
     $sql=3D"select po_name , po_description from poste_analytique ".
-         "where pa_id=3D".$_REQUEST['c2']." and ".
-         " upper (po_name) like upper('%".Database::escape_string($_REQU=
EST['label'])."%') order by po_name";
-    $res=3D$cn->exec_sql($sql);
+         "where pa_id=3D$1 and ".
+         " upper (po_name) like upper('%'||$2||'%') order by po_name";
+    $res=3D$cn->exec_sql($sql,array($_REQUEST['c2'],$_REQUEST['label']))=
;
     $array=3DDatabase::fetch_all($res);
     if (empty($array) =3D=3D true)
     {



From MAILER-DAEMON Fri Nov 18 05:50:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRM1d-0001Bb-43
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 05:50:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 11:55:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28157.1321613428.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4390 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Nov 2011 10:50:27 -0000

Author: danydb
Date: 2011-11-18 11:55:55 +0100 (Fri, 18 Nov 2011)
New Revision: 4390

Modified:
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/include/ajax_anc_search.php
   phpcompta/trunk/include/anc_pa.inc.php
Log:
#168 recherche anc

Modified: phpcompta/trunk/html/js/anc_script.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/anc_script.js	2011-11-18 10:29:04 UTC (rev 43=
89)
+++ phpcompta/trunk/html/js/anc_script.js	2011-11-18 10:55:55 UTC (rev 43=
90)
@@ -181,10 +181,10 @@
 function search_ca (p_dossier,p_target,p_source)
 {
     var pa_id=3Dg(p_source).value;
-    var url=3D"gDossier=3D"+p_dossier+"&c1=3D"+p_target+"&c2=3D"+pa_id;
     waiting_box();
     removeDiv('search_anc');
     var qs=3D"op=3Dopenancsearch&gDossier=3D"+p_dossier+"&ctl=3Dsearchan=
c";
+    qs+=3D"&c2=3D"+pa_id+"&c1=3D"+p_target;
=20
     var action=3Dnew Ajax.Request ( 'ajax_misc.php',
     {
@@ -213,7 +213,7 @@
 }
 function search_anc_form(obj)
 {
-    var qs=3D"op=3Dresultancsearch&ctl=3Dsearchanc&gDossier=3D"+obj.gDos=
sier;
+    var qs=3D"op=3Dresultancsearch&ctl=3Dsearchanc&";
     qs+=3Dobj.serialize(false);
     waiting_box();
     var action=3Dnew Ajax.Request ( 'ajax_misc.php',

Modified: phpcompta/trunk/include/ajax_anc_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 10:29:04 UTC (=
rev 4389)
+++ phpcompta/trunk/include/ajax_anc_search.php	2011-11-18 10:55:55 UTC (=
rev 4390)
@@ -37,16 +37,16 @@
 require_once ('class_anc_account.php');
 require_once ('class_anc_plan.php');
 require_once('function_javascript.php');
-var_dump($_GET);
+
 echo HtmlInput::title_box("Recherche activit=C3=A9", $ctl);
=20
 //------------- FORM ----------------------------------
 echo '<FORM METHOD=3D"GET" onsubmit=3D"search_anc_form(this);return fals=
e">';
 echo '<span>'._('Recherche').':';
=20
-$texte=3Dnew IText();
-$texte->value=3DHtmlInput::default_value('label',"", $_GET);
-echo $texte->input('label');
+$texte=3Dnew IText('plabel');
+$texte->value=3DHtmlInput::default_value('plabel',"", $_GET);
+echo $texte->input();
 echo '</span>';
 echo dossier::hidden();
 $hid=3Dnew IHidden();
@@ -66,9 +66,9 @@
=20
     $sql=3D"select po_name , po_description from poste_analytique ".
          "where pa_id=3D$1 and ".
-         " upper (po_name) like upper('%'||$2||'%') order by po_name";
-    $res=3D$cn->exec_sql($sql,array($_REQUEST['c2'],$_REQUEST['label']))=
;
-    $array=3DDatabase::fetch_all($res);
+         " (po_name ~* $2 or po_description ~* $3) order by po_name";
+    $array=3D$cn->get_array($sql,array($_REQUEST['c2'],$_REQUEST['plabel=
'],$_REQUEST['plabel']));
+
     if (empty($array) =3D=3D true)
     {
         echo "D&eacute;sol&eacute; aucun poste trouv&eacute;";
@@ -81,9 +81,9 @@
     echo '<table>';
     foreach ($array as $line)
     {
-        $button->javascript=3Dsprintf("$('%s').value=3D'%s'",
+        $button->javascript=3Dsprintf("$('%s').value=3D'%s';removeDiv('%=
s')",
                                     $_REQUEST['c1'],
-                                    $line['po_name']);
+                                    $line['po_name'],$ctl);
         echo '<tr>'.
         '<td>'.
         $button->input().

Modified: phpcompta/trunk/include/anc_pa.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/anc_pa.inc.php	2011-11-18 10:29:04 UTC (rev 4=
389)
+++ phpcompta/trunk/include/anc_pa.inc.php	2011-11-18 10:55:55 UTC (rev 4=
390)
@@ -189,7 +189,7 @@
         $new->get();
         $array=3D$new->get_poste_analytique(" order by po_name");
         $ret.=3D'<div class=3D"redcontent">';
-        $ret.=3D'<table style=3D"width:100%;border:solid blue 2px ;borde=
r-style:outset;">';
+        $ret.=3D'<table class=3D"table_large">';
         $ret.=3D"<tr>";
         $ret.=3D"<th> Nom </td>";
         $ret.=3D"<th> Montant </td>";



From MAILER-DAEMON Fri Nov 18 07:43:08 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRNme-0006oX-Gg
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 07:43:08 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 13:48:30 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28725.1321620187.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4391 - 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, 18 Nov 2011 12:43:06 -0000

Author: danydb
Date: 2011-11-18 13:48:29 +0100 (Fri, 18 Nov 2011)
New Revision: 4391

Added:
   phpcompta/trunk/include/class_ianccard.php
Modified:
   phpcompta/trunk/include/class_anc_print.php
Log:
#462 : autocompletion pour les activit?\195?\169s

Modified: phpcompta/trunk/include/class_anc_print.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_print.php	2011-11-18 10:55:55 UTC (=
rev 4390)
+++ phpcompta/trunk/include/class_anc_print.php	2011-11-18 12:48:29 UTC (=
rev 4391)
@@ -37,7 +37,7 @@
 require_once('constant.php');
 require_once('class_dossier.php');
 require_once ('class_anc_plan.php');
-
+require_once 'class_ianccard.php';
 class Anc_Print
 {
     var $db;						/*!< $db database connection */
@@ -104,8 +104,9 @@
         $to->value=3D$this->to;
         $to->size=3D10;
=20
-        $from_poste=3Dnew IText('from_poste','from_poste');
+        $from_poste=3Dnew IAncCard('from_poste','from_poste');
         $from_poste->size=3D10;
+        $from_poste->plan_ctl=3D'pa_id';
         $from_poste->value=3D$this->from_poste;
=20
         $to_poste=3Dnew IText('to_poste','to_poste');

Added: phpcompta/trunk/include/class_ianccard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_ianccard.php	                        (r=
ev 0)
+++ phpcompta/trunk/include/class_ianccard.php	2011-11-18 12:48:29 UTC (r=
ev 4391)
@@ -0,0 +1,200 @@
+<?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: 4273 $ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/*!\file
+ * \brief Input HTML for the card show buttons
+ *
+ */
+
+/*!
+ * \brief=20
+*/
+require_once('class_html_input.php');
+require_once('function_javascript.php');
+
+class IAncCard extends HtmlInput
+{
+    function __construct($name=3D"",$value=3D"")
+    {
+        parent::__construct($name,$value);
+        $this->fct=3D'update_value';
+        $this->dblclick=3D'';
+        $this->callback=3D'null';
+        $this->javascript=3D'';
+        // the pa_id to filter
+        $this->plan=3D0;
+        // or the container of the Plan Analytic which contains the pa_i=
d
+        $this->plan_ctl=3D"";
+    }
+    /*!\brief set the javascript callback function
+     * by default it is update_value called BEFORE the querystring is se=
nd
+     *
+     *\param $p_name callback function name
+     */
+    function set_callback($p_name)
+    {
+        $this->callback=3D$p_name;
+    }
+
+    /*!\brief set the javascript callback function
+     * by default it is update_value called AFTER an item has been selec=
ted
+     *\param $p_name callback function name
+     */
+    function set_function($p_name)
+    {
+        $this->fct=3D$p_name;
+    }
+  =20
+    /*!\brief set the extra javascript property for a double click on
+     *  INPUT field
+     *\param $p_action action when a double click happens
+     *\note the $p_action cannot contain a double quote
+     */
+    function set_dblclick($p_action)
+    {
+        $this->dblclick=3D$p_action;
+    }
+    /*!\brief show the html  input of the widget*/
+    public function input($p_name=3Dnull,$p_value=3Dnull)
+    {
+        if ( $p_name =3D=3D null && $this->name =3D=3D "")
+            throw (new Exception('Le nom d une icard doit =C3=AAtre donn=
e'));
+
+        $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
+        if ( $this->readOnly=3D=3Dtrue) return $this->display();
+
+
+        $attr=3D$this->get_js_attr();
+
+        $label=3D'';
+        if ( $this->dblclick !=3D '')
+        {
+            $e=3Dsprintf(' ondblclick=3D"%s" ',
+                       $this->dblclick);
+            $this->dblclick=3D$e;
+        }
+        $input=3Dsprintf('<INPUT TYPE=3D"Text"  class=3D"input_text"  '.
+                       ' NAME=3D"%s" ID=3D"%s" VALUE=3D"%s" SIZE=3D"%d" =
%s %s>',
+                       $this->name,
+                       $this->name,
+                       $this->value,
+                       $this->size,
+                       $this->dblclick,
+                       $this->javascript
+                      );
+
+
+        $div=3Dsprintf('<div id=3D"%s_choices"  class=3D"autocomplete"><=
/div>',
+                     $this->name);
+        $query=3D"op=3Dautoanc&".dossier::get();
+       =20
+        // add parameter to search into a plan (pa_id) or get the value =
from
+        // a HtmlObject
+        if ($this->plan <> 0)
+        {
+            $query.=3D"&pa_id=3D".$this->plan;
+        } elseif ( $this->plan_ctl <> '')
+        {
+            $query.=3D"&pa_ctl=3D".$this->plan_ctl;
+        }
+
+        $javascript=3Dsprintf('try { new Ajax.Autocompleter("%s","%s_cho=
ices","ajax_misc.php?%s",'.
+                            '{paramName:"anccard",minChars:2,indicator:n=
ull, '.
+                            'callback:%s, '.
+                            ' afterUpdateElement:%s});} catch (e){alert(=
e.message);};',
+                            $this->name,
+                            $this->name,
+                            $query,
+                            $this->callback,
+                            $this->fct);
+
+        $javascript=3Dcreate_script($javascript.$this->dblclick);
+
+        $r=3D$label.$input.$attr.$div.$javascript;
+        if ( $this->table =3D=3D 1 )
+            $r=3Dtd($r);
+        return $r;
+
+    }
+    /*!\brief print in html the readonly value of the widget*/
+    public function display()
+    {
+        $r=3Dsprintf('        =20
+                    <INPUT TYPE=3D"hidden" NAME=3D"%s" VALUE=3D"%s" SIZE=
=3D"8">',
+                   $this->name,
+                   $this->value
+                  );
+        $r.=3D'<span>'.$this->value.'</span>';
+        return $r;
+
+    }
+    /**
+     *@brief return a string containing the button for displaying
+     * a search form. When clicking on the result, update the input text=
 file
+     * the common used attribute as
+     *   - jrn   the ledger
+     *   - label the field to update
+     *   - name name of the input text
+     *   - price amount
+     *   - tvaid
+     *   - typecard (deb, cred, filter or list of value)
+     * will be set
+     * if ICard is in readOnly, the button disappears, so the return str=
ing is empty
+    \code
+      // search ipopup
+    $search_card=3Dnew IPopup('ipop_card');
+    $search_card->title=3D_('Recherche de fiche');
+    $search_card->value=3D'';
+    echo $search_card->input();
+
+    $a=3Dnew ICard('test');
+    $a->search();
+
+    \endcode
+     *\see ajax_card.php
+     *\note the ipopup id is hard coded : ipop_card
+     *@return HTML string with the button
+     */
+    function search()
+    {
+        if ( $this->readOnly=3D=3Dtrue) return '';
+
+        $button=3Dnew IButton($this->name.'_bt');
+        $a=3D"";
+        foreach (array('typecard','jrn','label','price','tvaid') as $att=
)
+        {
+            if (isset($this->$att) )
+                $a.=3D"this.".$att."=3D'".$this->$att."';";
+        }
+        if (isset($this->name))
+            $a.=3D"this.inp=3D'".$this->name."';";
+        $a.=3D"this.popup=3D'ipop_card';";
+
+        $button->javascript=3D$a.' search_card(this)';
+        return $button->input();
+    }
+
+    static public function test_me()
+    {
+     =20
+    }
+}



From MAILER-DAEMON Fri Nov 18 07:52:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRNvJ-0001R9-SN
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 07:52:05 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 13:57:35 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28746.1321620725.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4392 - 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, 18 Nov 2011 12:52:04 -0000

Author: danydb
Date: 2011-11-18 13:57:33 +0100 (Fri, 18 Nov 2011)
New Revision: 4392

Added:
   phpcompta/trunk/include/ajax_auto_anc_card.php
Log:
#462 : autocompletion pour les activit?\195?\169s

Added: phpcompta/trunk/include/ajax_auto_anc_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_auto_anc_card.php	                      =
  (rev 0)
+++ phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 12:57:33 UT=
C (rev 4392)
@@ -0,0 +1,20 @@
+<?
+require_once ("class_database.php");
+require_once 'class_user.php';
+$cn=3Dnew Database($_GET['gDossier']);
+$user=3Dnew User($cn);
+$user->Check();
+$user->check_dossier($_GET['gDossier']);
+$res=3D$cn->exec_sql("select po_id,po_description from  poste_analytique=
 where pa_id=3D$1 ~* and (po_description ~*$2 or po_id ~* $3 limit 8",
+        array($_REQUEST['pa_id'],$_POST['anccard'],$_POST['anccard']));
+$nb=3DDatabase::num_row($res);
+	echo "<ul>";
+for ($i =3D 0;$i< $nb;$i++)
+{
+	$row=3DDatabase::fetch_array($res,$i);
+	echo "<li>";
+	echo $row['po_id'];
+	echo '<span class=3D"informal"> '.$row['po_description'].'</span></li>'=
;
+}
+	echo "</ul>";
+?>
\ No newline at end of file



From MAILER-DAEMON Fri Nov 18 07:55:18 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRNyQ-0001kc-Bv
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 07:55:18 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:00:45 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28753.1321620917.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4393 - 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, 18 Nov 2011 12:55:17 -0000

Author: danydb
Date: 2011-11-18 14:00:43 +0100 (Fri, 18 Nov 2011)
New Revision: 4393

Added:
   phpcompta/trunk/sql/tva.sql
Log:
#392 TVA Cocontractant TVA Deb + Tva Cred

Added: phpcompta/trunk/sql/tva.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/tva.sql	                        (rev 0)
+++ phpcompta/trunk/sql/tva.sql	2011-11-18 13:00:43 UTC (rev 4393)
@@ -0,0 +1,3 @@
+alter table tva_rate add tva_both_side integer ;
+alter table tva_rate alter tva_both_side set default 0;
+update tva_rate set tva_both_side=3D0;
\ No newline at end of file



From MAILER-DAEMON Fri Nov 18 07:55:30 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRNyc-0001l3-FZ
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 07:55:30 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:00:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28756.1321620930.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4394 - 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, 18 Nov 2011 12:55:29 -0000

Author: danydb
Date: 2011-11-18 14:00:54 +0100 (Fri, 18 Nov 2011)
New Revision: 4394

Modified:
   phpcompta/trunk/sql/upgrade.sql
Log:
#392 TVA Cocontractant TVA Deb + Tva Cred

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	2011-11-18 13:00:43 UTC (rev 4393)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-18 13:00:54 UTC (rev 4394)
@@ -30,7 +30,7 @@
 \i mode_paiement.sql
 \i anc-modularity-imp.sql
 \i anc-grandlivre.sql
-
+\i tva.sql
 create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
=20
=20



From MAILER-DAEMON Fri Nov 18 07:55:58 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRNz4-0001mM-Jg
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 07:55:58 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:01:29 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28759.1321620958.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4395 - 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, 18 Nov 2011 12:55:57 -0000

Author: danydb
Date: 2011-11-18 14:01:28 +0100 (Fri, 18 Nov 2011)
New Revision: 4395

Modified:
   phpcompta/trunk/html/ajax_misc.php
Log:
0000462: Autocompletion pour les postes analytiques mod ajax_misc.php

Modified: phpcompta/trunk/html/ajax_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_misc.php	2011-11-18 13:00:54 UTC (rev 4394)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-18 13:01:28 UTC (rev 4395)
@@ -534,5 +534,8 @@
          case 'resultancsearch':
                  require_once('ajax_anc_search.php');
                  break;
+         case 'autoanc':
+                require_once('ajax_auto_anc_card.php');
+                break;
            =20
 }
\ No newline at end of file



From MAILER-DAEMON Fri Nov 18 08:23:55 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RROQ7-0000qs-GC
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 08:23:55 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:29:24 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28812.1321622634.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4396 - 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, 18 Nov 2011 13:23:53 -0000

Author: danydb
Date: 2011-11-18 14:29:23 +0100 (Fri, 18 Nov 2011)
New Revision: 4396

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
Log:
strict standard

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	2011-11-18 13:01:28 UTC =
(rev 4395)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-18 13:29:23 UTC =
(rev 4396)
@@ -1854,8 +1854,9 @@
      * \return array with [0] =3D false if failed otherwise true, [1] er=
ror
      * code
      */
-    function save ($p_array)
+    function save ($p_array=3Dnull)
     {
+      if ($p_array =3D=3D null) throw new Exception ('save cannot use a =
empty array');
         global $g_parameter;
         extract ($p_array);
         try
@@ -3187,8 +3188,10 @@
 	 * @param type $array  normally post
 	 * @see verify_ledger
 	 */
-	function update($array)
+	function update($array=3D'')
 	{
+	        if ($array =3D=3D null) throw new Exception ('save cannot use a=
 empty array');
+
 		extract ($array);
 		$this->jrn_def_id=3D$p_jrn;
 		$this->jrn_def_name=3D$p_jrn_name;



From MAILER-DAEMON Fri Nov 18 08:24:08 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RROQK-0000sg-KC
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 08:24:08 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:29:38 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28813.1321622647.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4397 - 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, 18 Nov 2011 13:24:06 -0000

Author: danydb
Date: 2011-11-18 14:29:37 +0100 (Fri, 18 Nov 2011)
New Revision: 4397

Modified:
   phpcompta/trunk/include/constant.php
Log:
improve error_reporting

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	2011-11-18 13:29:23 UTC (rev 439=
6)
+++ phpcompta/trunk/include/constant.php	2011-11-18 13:29:37 UTC (rev 439=
7)
@@ -53,7 +53,7 @@
 define ('MAX_FORECAST_ITEM',10);
 define ('MAX_PREDEFINED_OPERATION',30);
=20
-if ( DEBUG ) error_reporting(15);  else error_reporting(0);
+if ( DEBUG ) error_reporting(2147483647);  else error_reporting(0);
 // Erreur
 define ("NOERROR",0);
 define ("BADPARM",1);



From MAILER-DAEMON Fri Nov 18 08:24:37 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RROQn-0000u2-Oe
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 08:24:37 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:30:06 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28814.1321622676.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4398 - 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, 18 Nov 2011 13:24:35 -0000

Author: danydb
Date: 2011-11-18 14:30:04 +0100 (Fri, 18 Nov 2011)
New Revision: 4398

Modified:
   phpcompta/trunk/include/class_jrn_def_sql.php
Log:
strict standard

Modified: phpcompta/trunk/include/class_jrn_def_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_jrn_def_sql.php	2011-11-18 13:29:37 UTC=
 (rev 4397)
+++ phpcompta/trunk/include/class_jrn_def_sql.php	2011-11-18 13:30:04 UTC=
 (rev 4398)
@@ -127,7 +127,7 @@
 			throw new Exception('DATATYPE jrn_def_num_op $this->jrn_def_num_op no=
n numerique');
 	}
=20
-	public function save()
+	public function save($p_string=3D'')
 	{
 		/* please adapt */
 		if ($this->jrn_def_id =3D=3D -1)
@@ -280,7 +280,7 @@
 		}
 	}
=20
-	public function update()
+	public function update($p_string=3D'')
 	{
 		if ($this->verify_sql() !=3D 0)
 			return;



From MAILER-DAEMON Fri Nov 18 08:34:12 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RROa4-0002qV-5W
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 08:34:12 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:39:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28836.1321623251.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4399 - 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, 18 Nov 2011 13:34:11 -0000

Author: danydb
Date: 2011-11-18 14:39:39 +0100 (Fri, 18 Nov 2011)
New Revision: 4399

Modified:
   phpcompta/trunk/include/ajax_auto_anc_card.php
   phpcompta/trunk/include/class_anc_print.php
   phpcompta/trunk/include/class_ianccard.php
Log:
0000462: Autocompletion pour les postes analytiques mod ajax_misc.php

Modified: phpcompta/trunk/include/ajax_auto_anc_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:30:04 UT=
C (rev 4398)
+++ phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:39:39 UT=
C (rev 4399)
@@ -5,8 +5,16 @@
 $user=3Dnew User($cn);
 $user->Check();
 $user->check_dossier($_GET['gDossier']);
-$res=3D$cn->exec_sql("select po_id,po_description from  poste_analytique=
 where pa_id=3D$1 ~* and (po_description ~*$2 or po_id ~* $3 limit 8",
+if ( isset($_REQUEST['pa_id']) )
+{  =20
+    $res=3D$cn->exec_sql("select po_id,po_description from  poste_analyt=
ique where pa_id=3D$1 ~* and (po_description ~*$2 or po_id ~* $3 order by=
 po_id limit 12",
         array($_REQUEST['pa_id'],$_POST['anccard'],$_POST['anccard']));
+}
+else
+{
+       $res=3D$cn->exec_sql("select po_id,po_description from  poste_ana=
lytique where po_description ~*$2 or po_id ~* $3 order by po_id limit 12 =
",
+        array($_POST['anccard'],$_POST['anccard']));
+}
 $nb=3DDatabase::num_row($res);
 	echo "<ul>";
 for ($i =3D 0;$i< $nb;$i++)

Modified: phpcompta/trunk/include/class_anc_print.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_print.php	2011-11-18 13:30:04 UTC (=
rev 4398)
+++ phpcompta/trunk/include/class_anc_print.php	2011-11-18 13:39:39 UTC (=
rev 4399)
@@ -109,7 +109,7 @@
         $from_poste->plan_ctl=3D'pa_id';
         $from_poste->value=3D$this->from_poste;
=20
-        $to_poste=3Dnew IText('to_poste','to_poste');
+        $to_poste=3Dnew IAncCard('to_poste','to_poste');
         $to_poste->value=3D$this->to_poste;
         $to_poste->size=3D10;
=20
@@ -128,16 +128,14 @@
         $plan_id->selected=3D$this->pa_id;
         $r.=3D_( "Plan Analytique :").$plan_id->input();
=20
-        $poste=3Dnew IText();
-        $poste->size=3D10;
-        $r.=3D_("Entre l'activit=C3=A9 ").$poste->input("from_poste",$th=
is->from_poste);
+        $r.=3D_("Entre l'activit=C3=A9 ").$from_poste->input();
         $choose=3Dnew IButton();
         $choose->name=3D_("Choix Poste");
         $choose->label=3D_("Recherche");
         $choose->javascript=3D"onClick=3Dsearch_ca(".dossier::id().",'fr=
om_poste','pa_id')";
         $r.=3D$choose->input();
=20
-        $r.=3D_(" et l'activit=C3=A9 ").$poste->input("to_poste",$this->=
to_poste);
+        $r.=3D_(" et l'activit=C3=A9 ").$to_poste->input();
         $choose->javascript=3D"onClick=3Dsearch_ca(".dossier::id().",'to=
_poste','pa_id')";
         $r.=3D$choose->input();
         $r.=3D'<span class=3D"notice" style=3D"display:block">'._('Selec=
tionnez le plan qui vous int=C3=A9resse avant de cliquer sur Recherche').=
'</span>';

Modified: phpcompta/trunk/include/class_ianccard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_ianccard.php	2011-11-18 13:30:04 UTC (r=
ev 4398)
+++ phpcompta/trunk/include/class_ianccard.php	2011-11-18 13:39:39 UTC (r=
ev 4399)
@@ -118,7 +118,7 @@
         }
=20
         $javascript=3Dsprintf('try { new Ajax.Autocompleter("%s","%s_cho=
ices","ajax_misc.php?%s",'.
-                            '{paramName:"anccard",minChars:2,indicator:n=
ull, '.
+                            '{paramName:"anccard",minChars:1,indicator:n=
ull, '.
                             'callback:%s, '.
                             ' afterUpdateElement:%s});} catch (e){alert(=
e.message);};',
                             $this->name,



From MAILER-DAEMON Fri Nov 18 08:37:26 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RROdC-0003sX-Ne
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 08:37:26 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:42:57 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28840.1321623445.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4400 - 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, 18 Nov 2011 13:37:25 -0000

Author: danydb
Date: 2011-11-18 14:42:55 +0100 (Fri, 18 Nov 2011)
New Revision: 4400

Modified:
   phpcompta/trunk/include/ajax_auto_anc_card.php
Log:
0000462: Autocompletion pour les postes analytiques mod ajax_misc.php

Modified: phpcompta/trunk/include/ajax_auto_anc_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:39:39 UT=
C (rev 4399)
+++ phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:42:55 UT=
C (rev 4400)
@@ -12,7 +12,7 @@
 }
 else
 {
-       $res=3D$cn->exec_sql("select po_id,po_description from  poste_ana=
lytique where po_description ~*$2 or po_id ~* $3 order by po_id limit 12 =
",
+       $res=3D$cn->exec_sql("select po_id,po_description from  poste_ana=
lytique where po_description ~*$1 or po_id ~* $2 order by po_id limit 12 =
",
         array($_POST['anccard'],$_POST['anccard']));
 }
 $nb=3DDatabase::num_row($res);



From MAILER-DAEMON Fri Nov 18 08:39:08 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RROeq-0003xK-2y
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 08:39:08 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:44:38 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28843.1321623547.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4401 - 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, 18 Nov 2011 13:39:07 -0000

Author: danydb
Date: 2011-11-18 14:44:37 +0100 (Fri, 18 Nov 2011)
New Revision: 4401

Modified:
   phpcompta/trunk/include/ajax_auto_anc_card.php
Log:
0000462: Autocompletion probl operateur ~*

Modified: phpcompta/trunk/include/ajax_auto_anc_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:42:55 UT=
C (rev 4400)
+++ phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:44:37 UT=
C (rev 4401)
@@ -7,12 +7,12 @@
 $user->check_dossier($_GET['gDossier']);
 if ( isset($_REQUEST['pa_id']) )
 {  =20
-    $res=3D$cn->exec_sql("select po_id,po_description from  poste_analyt=
ique where pa_id=3D$1 ~* and (po_description ~*$2 or po_id ~* $3 order by=
 po_id limit 12",
+    $res=3D$cn->exec_sql("select po_id,po_description from  poste_analyt=
ique where pa_id=3D$1 ~* and (po_description ~* $2 or po_id ~* $3 order b=
y po_id limit 12",
         array($_REQUEST['pa_id'],$_POST['anccard'],$_POST['anccard']));
 }
 else
 {
-       $res=3D$cn->exec_sql("select po_id,po_description from  poste_ana=
lytique where po_description ~*$1 or po_id ~* $2 order by po_id limit 12 =
",
+       $res=3D$cn->exec_sql("select po_id,po_description from  poste_ana=
lytique where po_description ~* $1 or po_id ~* $2 order by po_id limit 12=
 ",
         array($_POST['anccard'],$_POST['anccard']));
 }
 $nb=3DDatabase::num_row($res);



From MAILER-DAEMON Fri Nov 18 08:40:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RROgE-00047w-Eb
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 08:40:34 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:46:05 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28846.1321623634.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4402 - 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, 18 Nov 2011 13:40:33 -0000

Author: danydb
Date: 2011-11-18 14:46:04 +0100 (Fri, 18 Nov 2011)
New Revision: 4402

Modified:
   phpcompta/trunk/include/ajax_auto_anc_card.php
Log:
0000462: Autocompletion po_name

Modified: phpcompta/trunk/include/ajax_auto_anc_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:44:37 UT=
C (rev 4401)
+++ phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:46:04 UT=
C (rev 4402)
@@ -7,12 +7,12 @@
 $user->check_dossier($_GET['gDossier']);
 if ( isset($_REQUEST['pa_id']) )
 {  =20
-    $res=3D$cn->exec_sql("select po_id,po_description from  poste_analyt=
ique where pa_id=3D$1 ~* and (po_description ~* $2 or po_id ~* $3 order b=
y po_id limit 12",
+    $res=3D$cn->exec_sql("select po_id,po_description from  poste_analyt=
ique where pa_id=3D$1 ~* and (po_description ~* $2 or po_name ~* $3 order=
 by po_id limit 12",
         array($_REQUEST['pa_id'],$_POST['anccard'],$_POST['anccard']));
 }
 else
 {
-       $res=3D$cn->exec_sql("select po_id,po_description from  poste_ana=
lytique where po_description ~* $1 or po_id ~* $2 order by po_id limit 12=
 ",
+       $res=3D$cn->exec_sql("select po_id,po_description from  poste_ana=
lytique where po_description ~* $1 or po_name ~* $2 order by po_id limit =
12 ",
         array($_POST['anccard'],$_POST['anccard']));
 }
 $nb=3DDatabase::num_row($res);
@@ -21,7 +21,7 @@
 {
 	$row=3DDatabase::fetch_array($res,$i);
 	echo "<li>";
-	echo $row['po_id'];
+	echo $row['po_name'];
 	echo '<span class=3D"informal"> '.$row['po_description'].'</span></li>'=
;
 }
 	echo "</ul>";



From MAILER-DAEMON Fri Nov 18 08:43:30 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RROj4-0004C8-0W
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 08:43:30 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:48:59 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28850.1321623808.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4403 - 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, 18 Nov 2011 13:43:27 -0000

Author: danydb
Date: 2011-11-18 14:48:58 +0100 (Fri, 18 Nov 2011)
New Revision: 4403

Modified:
   phpcompta/trunk/include/ajax_auto_anc_card.php
Log:
ajax poste analytique

Modified: phpcompta/trunk/include/ajax_auto_anc_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:46:04 UT=
C (rev 4402)
+++ phpcompta/trunk/include/ajax_auto_anc_card.php	2011-11-18 13:48:58 UT=
C (rev 4403)
@@ -7,12 +7,12 @@
 $user->check_dossier($_GET['gDossier']);
 if ( isset($_REQUEST['pa_id']) )
 {  =20
-    $res=3D$cn->exec_sql("select po_id,po_description from  poste_analyt=
ique where pa_id=3D$1 ~* and (po_description ~* $2 or po_name ~* $3 order=
 by po_id limit 12",
+    $res=3D$cn->exec_sql("select po_name,po_description from  poste_anal=
ytique where pa_id=3D$1 ~* and (po_description ~* $2 or po_name ~* $3 ord=
er by po_id limit 12",
         array($_REQUEST['pa_id'],$_POST['anccard'],$_POST['anccard']));
 }
 else
 {
-       $res=3D$cn->exec_sql("select po_id,po_description from  poste_ana=
lytique where po_description ~* $1 or po_name ~* $2 order by po_id limit =
12 ",
+       $res=3D$cn->exec_sql("select po_name,po_description from  poste_a=
nalytique where po_description ~* $1 or po_name ~* $2 order by po_id limi=
t 12 ",
         array($_POST['anccard'],$_POST['anccard']));
 }
 $nb=3DDatabase::num_row($res);



From MAILER-DAEMON Fri Nov 18 08:52:51 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RROs7-0005g3-Q3
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 08:52:51 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 14:58:20 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.28857.1321624371.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4404 - in phpcompta/trunk: html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Nov 2011 13:52:50 -0000

Author: danydb
Date: 2011-11-18 14:58:19 +0100 (Fri, 18 Nov 2011)
New Revision: 4404

Modified:
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/include/class_ianccard.php
Log:
0000462: Autocompletion filter thanks  a html object

Modified: phpcompta/trunk/html/js/anc_script.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/anc_script.js	2011-11-18 13:48:58 UTC (rev 44=
03)
+++ phpcompta/trunk/html/js/anc_script.js	2011-11-18 13:58:19 UTC (rev 44=
04)
@@ -342,3 +342,16 @@
     $("pamount"+nb.value).value=3D"0";
     nb.value++;
 }
+/**
+ *@brief this function is called before the querystring is send to the
+ * fid2.php, add a filter based on the ledger 'p_jrn'
+ *@param obj is the input field
+ *@param queryString is the queryString to modify
+ *@see ICard::input
+ */
+function filter_anc(obj,queryString)
+{
+    var pa_id=3Dobj.plan_ctl;
+    queryString=3DqueryString+"&pa_id=3D"+pa_id;
+    return queryString;
+}
\ No newline at end of file

Modified: phpcompta/trunk/include/class_ianccard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_ianccard.php	2011-11-18 13:48:58 UTC (r=
ev 4403)
+++ phpcompta/trunk/include/class_ianccard.php	2011-11-18 13:58:19 UTC (r=
ev 4404)
@@ -47,7 +47,7 @@
     }
     /*!\brief set the javascript callback function
      * by default it is update_value called BEFORE the querystring is se=
nd
-     *
+     * If you use the plan ctl must be set to filter_anc
      *\param $p_name callback function name
      */
     function set_callback($p_name)
@@ -83,7 +83,7 @@
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
=20
-        $attr=3D$this->get_js_attr();
+      =20
=20
         $label=3D'';
         if ( $this->dblclick !=3D '')
@@ -114,9 +114,9 @@
             $query.=3D"&pa_id=3D".$this->plan;
         } elseif ( $this->plan_ctl <> '')
         {
-            $query.=3D"&pa_ctl=3D".$this->plan_ctl;
+               $this->set_attribute("plan_ctl", $this->plan_ctl);
         }
-
+        $attr=3D$this->get_js_attr();
         $javascript=3Dsprintf('try { new Ajax.Autocompleter("%s","%s_cho=
ices","ajax_misc.php?%s",'.
                             '{paramName:"anccard",minChars:1,indicator:n=
ull, '.
                             'callback:%s, '.



From MAILER-DAEMON Fri Nov 18 09:47:33 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRPj3-0008Rl-Ra
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 09:47:33 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 15:53:00 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.29351.1321627653.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4405 - 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, 18 Nov 2011 14:47:32 -0000

Author: danydb
Date: 2011-11-18 15:52:58 +0100 (Fri, 18 Nov 2011)
New Revision: 4405

Modified:
   phpcompta/trunk/sql/tva.sql
Log:
SQL : tva procedure to change

Modified: phpcompta/trunk/sql/tva.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/tva.sql	2011-11-18 13:58:19 UTC (rev 4404)
+++ phpcompta/trunk/sql/tva.sql	2011-11-18 14:52:58 UTC (rev 4405)
@@ -1,3 +1,74 @@
 alter table tva_rate add tva_both_side integer ;
 alter table tva_rate alter tva_both_side set default 0;
-update tva_rate set tva_both_side=3D0;
\ No newline at end of file
+update tva_rate set tva_both_side=3D0;drop FUNCTION comptaproc.tva_modif=
y(integer, text, numeric, text, text);
+
+CREATE OR REPLACE FUNCTION comptaproc.tva_modify(integer, text, numeric,=
 text, text,integer)
+ RETURNS integer
+ LANGUAGE plpgsql
+AS $function$
+declare
+	p_tva_id alias for $1;
+	p_tva_label alias for $2;
+	p_tva_rate alias for $3;
+	p_tva_comment alias for $4;
+	p_tva_poste alias for $5;
+	p_tva_both_side alias for $6;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+update tva_rate set tva_label=3Dp_tva_label,tva_rate=3Dp_tva_rate,tva_co=
mment=3Dp_tva_comment,tva_poste=3Dp_tva_poste,tva_both_side=3Dp_tva_both_=
side
+	where tva_id=3Dp_tva_id;
+return 0;
+end;
+$function$
+drop FUNCTION comptaproc.tva_insert(text, numeric, text, text);
+CREATE OR REPLACE FUNCTION comptaproc.tva_insert(text, numeric, text, te=
xt,integer)
+ RETURNS integer
+ LANGUAGE plpgsql
+AS $function$
+declare
+	l_tva_id integer;
+	p_tva_label alias for $1;
+	p_tva_rate alias for $2;
+	p_tva_comment alias for $3;
+	p_tva_poste alias for $4;
+	p_tva_both_side alias for $5;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+select into l_tva_id nextval('s_tva') ;
+insert into tva_rate(tva_id,tva_label,tva_rate,tva_comment,tva_poste,tva=
_both_side)
+	values (l_tva_id,p_tva_label,p_tva_rate,p_tva_comment,p_tva_poste,p_tva=
_both_side);
+return 0;
+end;
+$function$



From MAILER-DAEMON Fri Nov 18 09:49:47 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRPlD-0000Wt-Hp
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 09:49:47 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 18 Nov 2011 15:55:15 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.29397.1321627786.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4406 - 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: Fri, 18 Nov 2011 14:49:45 -0000

Author: danydb
Date: 2011-11-18 15:55:13 +0100 (Fri, 18 Nov 2011)
New Revision: 4406

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_acc_tva.php
   phpcompta/trunk/include/tva.inc.php
   phpcompta/trunk/sql/tva.sql
Log:
0000392: Cocontractant : TVA au d?\195?\169bit ET cr?\195?\169dit

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	2011-11-18 14:5=
2:58 UTC (rev 4405)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-18 14:5=
5:13 UTC (rev 4406)
@@ -384,7 +384,7 @@
                         $acc_amount->amount_vat=3D ${'e_march'.$i.'_tva_=
amount'};
=20
                     }
-                    $tot_tva+=3D$acc_amount->amount_vat;
+                    if ($oTva->get_parameter("both_side")=3D=3D0) $tot_t=
va=3Dbcadd($tot_tva,$acc_amount->amount_vat);
                 }
=20
                 $acc_operation=3Dnew Acc_Operation($this->db);
@@ -667,6 +667,20 @@
                     $acc_operation->periode=3D$tperiode;
                     if ( $value > 0 ) $tot_debit=3Dbcadd($tot_debit,$val=
ue);
                     $acc_operation->insert_jrnx();
+                    // if TVA is on both side, we deduce it immediately
+                    if ( $oTva->get_parameter("both_side")=3D=3D1)
+                    {
+                        $poste_vat=3D$oTva->get_side('c');
+                        $cust_amount=3Dbcadd($tot_amount,$tot_tva);
+                        $acc_operation=3Dnew Acc_Operation($this->db);
+                        $acc_operation->date=3D$e_date;
+                        $acc_operation->poste=3D$poste_vat;
+                        $acc_operation->amount=3D$value;
+                        $acc_operation->grpt=3D$seq;
+                        $acc_operation->jrn=3D$p_jrn;
+                        $acc_operation->type=3D'c';
+                        $acc_operation->periode=3D$tperiode;
+                    }
=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	2011-11-18 14:52:58=
 UTC (rev 4405)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-18 14:55:13=
 UTC (rev 4406)
@@ -333,7 +333,7 @@
                         $tva[$idx_tva]+=3D$tva_item;
                     else
                         $tva[$idx_tva]=3D$tva_item;
-                    $tot_tva=3Dround(bcadd($tva_item,$tot_tva),2);
+                    if ($oTva->get_parameter("both_side")=3D=3D0) $tot_t=
va=3Dround(bcadd($tva_item,$tot_tva),2);
                 }
=20
                 /* Save the stock */
@@ -429,6 +429,21 @@
                     $acc_operation->periode=3D$tperiode;
                     if ($value < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($=
value));
                     $acc_operation->insert_jrnx();
+                   =20
+                    // if TVA is on both side, we deduce it immediately
+                    if ( $oTva->get_parameter("both_side")=3D=3D1)
+                    {
+                        $poste_vat=3D$oTva->get_side('d');
+                        $cust_amount=3Dbcadd($tot_amount,$tot_tva);
+                        $acc_operation=3Dnew Acc_Operation($this->db);
+                        $acc_operation->date=3D$e_date;
+                        $acc_operation->poste=3D$poste_vat;
+                        $acc_operation->amount=3D$value;
+                        $acc_operation->grpt=3D$seq;
+                        $acc_operation->jrn=3D$p_jrn;
+                        $acc_operation->type=3D'd';
+                        $acc_operation->periode=3D$tperiode;
+                    }
=20
=20
                 }

Modified: phpcompta/trunk/include/class_acc_tva.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_tva.php	2011-11-18 14:52:58 UTC (re=
v 4405)
+++ phpcompta/trunk/include/class_acc_tva.php	2011-11-18 14:55:13 UTC (re=
v 4406)
@@ -43,7 +43,8 @@
                                    "label"=3D>"tva_label",
                                    "rate"=3D>"tva_rate",
                                    "comment"=3D>"tva_comment",
-                                   "account"=3D>"tva_poste");
+                                   "account"=3D>"tva_poste",
+                                    "both_side"=3D>'tva_both_side');
=20
     function __construct ($p_init,$p_tva_id=3D0)
     {
@@ -94,14 +95,15 @@
     public function insert()
     {
         if ( $this->verify() !=3D 0 ) return;
-        $sql=3D"select tva_insert($1,$2,$3,$4)";
+        $sql=3D"select tva_insert($1,$2,$3,$4,$5)";
=20
         $res=3D$this->cn->exec_sql(
                  $sql,
                  array($this->tva_label,
                        $this->tva_rate,
                        $this->tva_comment,
-                       $this->tva_poste)
+                       $this->tva_poste,
+                        $this->tva_both_side)
              );
         $this->tva_id=3D$this->cn->get_current_seq('s_tva');
         $err=3DDatabase::fetch_result($res);
@@ -110,14 +112,15 @@
     public function update()
     {
         if ( $this->verify() !=3D 0 ) return;
-        $sql=3D"update tva_rate set tva_label=3D$1,tva_rate=3D$2,tva_com=
ment=3D$3,tva_poste=3D$4 ".
-             " where tva_id =3D $5";
+        $sql=3D"update tva_rate set tva_label=3D$1,tva_rate=3D$2,tva_com=
ment=3D$3,tva_poste=3D$4,tva_both_side=3D$5 ".
+             " where tva_id =3D $6";
         $res=3D$this->cn->exec_sql(
                  $sql,
                  array($this->tva_label,
                        $this->tva_rate,
                        $this->tva_comment,
                        $this->tva_poste,
+                       $this->tva_both_side,
                        $this->tva_id)
              );
=20
@@ -129,7 +132,7 @@
      */
     public function load()
     {
-        $sql=3D"select tva_label,tva_rate, tva_comment,tva_poste from tv=
a_rate where tva_id=3D$1";
+        $sql=3D"select tva_label,tva_rate, tva_comment,tva_poste,tva_bot=
h_side from tva_rate where tva_id=3D$1";
         $res=3D$this->cn->exec_sql(
                  $sql,
                  array($this->tva_id)

Modified: phpcompta/trunk/include/tva.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/tva.inc.php	2011-11-18 14:52:58 UTC (rev 4405=
)
+++ phpcompta/trunk/include/tva.inc.php	2011-11-18 14:55:13 UTC (rev 4406=
)
@@ -35,6 +35,7 @@
 	echo '<p class=3D"notice">Vous ne pouvez pas effacer tous taux' .
 	' Si votre soci&eacute;t&eacute; n\'utilise pas la TVA, changer dans le=
 menu soci&eacute;t&eacute</p>';
 }
+$both=3D(isset($_REQUEST['both']))?1:0;
 //-----------------------------------------------------
 // Record Change
 if (isset($_POST['confirm_mod'])
@@ -54,23 +55,21 @@
     {
 	if (isset($_POST['confirm_add']))
 	{
-	    $sql =3D "select tva_insert($1,$2,$3,$4)";
+	    $sql =3D "select tva_insert($1,$2,$3,$4,$5)";
=20
 	    $res =3D $cn->exec_sql(
 		    $sql, array($tva_label,
 		$tva_rate,
 		$tva_comment,
-		$tva_poste)
+		$tva_poste,
+                        $both)
 	    );
 	    $err =3D Database::fetch_result($res);
 	}
 	if (isset($_POST['confirm_mod']))
 	{
 	    $Res =3D $cn->exec_sql(
-		    "select tva_modify($tva_id,'$tva_label',
-                     '$tva_rate','$tva_comment','$tva_poste')");
-	    $Res =3D $cn->exec_sql(
-		    "select tva_modify($1,$2,$3,$4,$5)", array($tva_id, $tva_label, $t=
va_rate, $tva_comment, $tva_poste)
+		    "select tva_modify($1,$2,$3,$4,$5,$6)", array($tva_id, $tva_label,=
 $tva_rate, $tva_comment, $tva_poste,$both)
 	    );
 	    $err =3D Database::fetch_result($Res);
 	}
@@ -96,7 +95,7 @@
 }
 //-----------------------------------------------------
 // Display
-$sql =3D "select tva_id,tva_label,tva_rate,tva_comment,tva_poste from tv=
a_rate order by tva_label";
+$sql =3D "select tva_id,tva_label,tva_rate,tva_comment,tva_poste,tva_bot=
h_side from tva_rate order by tva_label";
 $Res =3D $cn->exec_sql($sql);
 ?>
 <TABLE>
@@ -105,6 +104,7 @@
 	<th>Taux</th>
 	<th>Commentaire</th>
 	<th>Poste</th>
+	<th>Utilis=C3=A9 en m=C3=AAme temps au cr=C3=A9dit et au d=C3=A9bit</th=
>
     </tr>
 <?php
 $val =3D Database::fetch_all($Res);
@@ -116,7 +116,8 @@
 	'tva_label' =3D> $row['tva_label'],
 	'tva_rate' =3D> $row['tva_rate'],
 	'tva_comment' =3D> $row['tva_comment'],
-	'tva_poste' =3D> $row['tva_poste']
+	'tva_poste' =3D> $row['tva_poste'],
+	'tva_both_side' =3D> $row['tva_both_side']
     );
=20
     echo "<TR>";
@@ -142,6 +143,11 @@
     echo "</TD>";
=20
     echo "<TD>";
+    $str_msg=3D( $row['tva_both_side']=3D=3D1)?'Employ=C3=A9 au cr=C3=A9=
dit et d=C3=A9bit':'normal' ;
+    echo $str_msg;
+    echo "</TD>";
+   =20
+    echo "<TD>";
     echo HtmlInput::submit("rm", "Efface");
     echo HtmlInput::submit("mod", "Modifie");
     $w =3D new IHidden();
@@ -194,12 +200,14 @@
     	<th>Taux</th>
     	<th>Commentaire</th>
     	<th>Poste</th>
+    	<th>Double c=C3=B4t=C3=A9</th>
         </tr>
         <tr>
     	<td> <?php echo $tva_array[$index]['tva_label'];?></td>
     	<td> <?php echo $tva_array[$index]['tva_rate'];?></td>
     	<td> <?php echo $tva_array[$index]['tva_comment'];?></td>
     	<td> <?php echo $tva_array[$index]['tva_poste'];?></td>
+    	<td> <?php echo $tva_array[$index]['tva_both_side'];?></td>
         </Tr>
     </table>
 		<?php
@@ -248,6 +256,14 @@
 	    echo $w->input('tva_poste', '')
 	    ?></td>
         </Tr>
+        <tr>
+    	<td  align=3D"right">Utilis=C3=A9 au d=C3=A9bit et au cr=C3=A9dit a=
fin d'annuler cette tva </td>
+    	<td> <?php
+	    $w =3D new ICheckBox("both", 1);
+	    $w->size =3D 20;
+	    echo $w->input('both', '')
+	    ?></td>
+        </Tr>
     </table>
     <input type=3D"submit" class=3D"button" value=3D"Confirme" name=3D"c=
onfirm_add">
     <input type=3D"submit" class=3D"button" value=3D"Cancel" name=3D"no"=
>
@@ -302,6 +318,15 @@
 	    echo $w->input('tva_poste', $tva_array[$index]['tva_poste'])
 	    ?></td>
         </Tr>
+        <tr>
+    	<td  align=3D"right">Utilis=C3=A9 au d=C3=A9bit et au cr=C3=A9dit a=
fin d'annuler cette tva </td>
+    	<td> <?php
+	    $w =3D new ICheckBox("both",$tva_array[$index]['tva_both_side'] );
+            $w->selected=3D$tva_array[$index]['tva_both_side'];
+	    $w->size =3D 20;
+	    echo $w->input('both', '')
+	    ?></td>
+        </Tr>
     </table>
     <input type=3D"submit" class=3D"button" value=3D"Confirme" name=3D"c=
onfirm_mod">
     <input type=3D"submit" class=3D"button" value=3D"Cancel" name=3D"no"=
>

Modified: phpcompta/trunk/sql/tva.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/tva.sql	2011-11-18 14:52:58 UTC (rev 4405)
+++ phpcompta/trunk/sql/tva.sql	2011-11-18 14:55:13 UTC (rev 4406)
@@ -1,74 +1,85 @@
 alter table tva_rate add tva_both_side integer ;
 alter table tva_rate alter tva_both_side set default 0;
-update tva_rate set tva_both_side=3D0;drop FUNCTION comptaproc.tva_modif=
y(integer, text, numeric, text, text);
-
-CREATE OR REPLACE FUNCTION comptaproc.tva_modify(integer, text, numeric,=
 text, text,integer)
- RETURNS integer
- LANGUAGE plpgsql
-AS $function$
-declare
-	p_tva_id alias for $1;
-	p_tva_label alias for $2;
-	p_tva_rate alias for $3;
-	p_tva_comment alias for $4;
-	p_tva_poste alias for $5;
-	p_tva_both_side alias for $6;
-	debit text;
-	credit text;
-	nCount integer;
-begin
-if length(trim(p_tva_label)) =3D 0 then
-	return 3;
-end if;
-
-if length(trim(p_tva_poste)) !=3D 0 then
-	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
-	debit  =3D split_part(p_tva_poste,',',1);
-	credit	=3D split_part(p_tva_poste,',',2);
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
-	if nCount =3D 0 then return 4; end if;
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
-	if nCount =3D 0 then return 4; end if;
-
-end if;
-update tva_rate set tva_label=3Dp_tva_label,tva_rate=3Dp_tva_rate,tva_co=
mment=3Dp_tva_comment,tva_poste=3Dp_tva_poste,tva_both_side=3Dp_tva_both_=
side
-	where tva_id=3Dp_tva_id;
-return 0;
-end;
-$function$
-drop FUNCTION comptaproc.tva_insert(text, numeric, text, text);
-CREATE OR REPLACE FUNCTION comptaproc.tva_insert(text, numeric, text, te=
xt,integer)
- RETURNS integer
- LANGUAGE plpgsql
-AS $function$
-declare
-	l_tva_id integer;
-	p_tva_label alias for $1;
-	p_tva_rate alias for $2;
-	p_tva_comment alias for $3;
-	p_tva_poste alias for $4;
-	p_tva_both_side alias for $5;
-	debit text;
-	credit text;
-	nCount integer;
-begin
-if length(trim(p_tva_label)) =3D 0 then
-	return 3;
-end if;
-
-if length(trim(p_tva_poste)) !=3D 0 then
-	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
-	debit  =3D split_part(p_tva_poste,',',1);
-	credit	=3D split_part(p_tva_poste,',',2);
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
-	if nCount =3D 0 then return 4; end if;
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
-	if nCount =3D 0 then return 4; end if;
-
-end if;
-select into l_tva_id nextval('s_tva') ;
-insert into tva_rate(tva_id,tva_label,tva_rate,tva_comment,tva_poste,tva=
_both_side)
-	values (l_tva_id,p_tva_label,p_tva_rate,p_tva_comment,p_tva_poste,p_tva=
_both_side);
-return 0;
-end;
-$function$
+update tva_rate set tva_both_side=3D0;
+
+----------------------------------------------------------------------
+-- TVA MODIFY
+----------------------------------------------------------------------
+drop FUNCTION comptaproc.tva_modify(integer, text, numeric, text, text);
+
+CREATE OR REPLACE FUNCTION comptaproc.tva_modify(integer, text, numeric,=
 text, text,integer)
+ RETURNS integer
+ LANGUAGE plpgsql
+AS $function$
+declare
+	p_tva_id alias for $1;
+	p_tva_label alias for $2;
+	p_tva_rate alias for $3;
+	p_tva_comment alias for $4;
+	p_tva_poste alias for $5;
+	p_tva_both_side alias for $6;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+update tva_rate set tva_label=3Dp_tva_label,tva_rate=3Dp_tva_rate,tva_co=
mment=3Dp_tva_comment,tva_poste=3Dp_tva_poste,tva_both_side=3Dp_tva_both_=
side
+	where tva_id=3Dp_tva_id;
+return 0;
+end;
+$function$
+
+----------------------------------------------------------------------
+-- TVA INSERT
+----------------------------------------------------------------------
+
+drop FUNCTION comptaproc.tva_insert(text, numeric, text, text);
+
+CREATE OR REPLACE FUNCTION comptaproc.tva_insert(text, numeric, text, te=
xt,integer)
+ RETURNS integer
+ LANGUAGE plpgsql
+AS $function$
+declare
+	l_tva_id integer;
+	p_tva_label alias for $1;
+	p_tva_rate alias for $2;
+	p_tva_comment alias for $3;
+	p_tva_poste alias for $4;
+	p_tva_both_side alias for $5;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+select into l_tva_id nextval('s_tva') ;
+insert into tva_rate(tva_id,tva_label,tva_rate,tva_comment,tva_poste,tva=
_both_side)
+	values (l_tva_id,p_tva_label,p_tva_rate,p_tva_comment,p_tva_poste,p_tva=
_both_side);
+return 0;
+end;
+$function$



From MAILER-DAEMON Fri Nov 18 18:30:12 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRXsq-0002No-CO
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 18:30:12 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 19 Nov 2011 00:35:38 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.31035.1321659011.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4407 - 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: Fri, 18 Nov 2011 23:30:10 -0000

Author: danydb
Date: 2011-11-19 00:35:36 +0100 (Sat, 19 Nov 2011)
New Revision: 4407

Modified:
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_acc_tva.php
   phpcompta/trunk/include/tva.inc.php
   phpcompta/trunk/sql/tva.sql
Log:
#392 TVA cocontractant : fix vente

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	2011-11-18 14:55:13=
 UTC (rev 4406)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-18 23:35:36=
 UTC (rev 4407)
@@ -288,7 +288,7 @@
                 $fiche=3Dnew Fiche($this->db);
                 $fiche->get_by_qcode(${"e_march".$i});
                 $amount=3Dbcmul(${'e_march'.$i.'_price'},${'e_quant'.$i}=
);
-                $tot_amount+=3D$amount;
+                $tot_amount=3Dbcadd($tot_amount,$amount);
                 $acc_operation=3Dnew Acc_Operation($this->db);
                 $acc_operation->date=3D$e_date;
                 $sposte=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT);
@@ -321,6 +321,8 @@
                     $oTva=3Dnew Acc_Tva($this->db);
                     $idx_tva=3D${'e_march'.$i.'_tva_id'};
                     $tva_item=3D${'e_march'.$i.'_tva_amount'};
+		    $oTva->set_parameter("id",$idx_tva);
+		    $oTva->load();
                     /* if empty then we need to compute it */
                     if (trim($tva_item)=3D=3D'')
                     {
@@ -333,6 +335,7 @@
                         $tva[$idx_tva]+=3D$tva_item;
                     else
                         $tva[$idx_tva]=3D$tva_item;
+		    var_dump($oTva->get_parameter("both_side"));
                     if ($oTva->get_parameter("both_side")=3D=3D0) $tot_t=
va=3Dround(bcadd($tva_item,$tot_tva),2);
                 }
=20
@@ -433,6 +436,7 @@
                     // if TVA is on both side, we deduce it immediately
                     if ( $oTva->get_parameter("both_side")=3D=3D1)
                     {
+		      echo "remove_tva";
                         $poste_vat=3D$oTva->get_side('d');
                         $cust_amount=3Dbcadd($tot_amount,$tot_tva);
                         $acc_operation=3Dnew Acc_Operation($this->db);
@@ -443,6 +447,8 @@
                         $acc_operation->jrn=3D$p_jrn;
                         $acc_operation->type=3D'd';
                         $acc_operation->periode=3D$tperiode;
+			$acc_operation->insert_jrnx();
+			$tot_debit=3Dbcadd($tot_debit,$value);
                     }
=20
=20

Modified: phpcompta/trunk/include/class_acc_tva.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_tva.php	2011-11-18 14:55:13 UTC (re=
v 4406)
+++ phpcompta/trunk/include/class_acc_tva.php	2011-11-18 23:35:36 UTC (re=
v 4407)
@@ -132,7 +132,7 @@
      */
     public function load()
     {
-        $sql=3D"select tva_label,tva_rate, tva_comment,tva_poste,tva_bot=
h_side from tva_rate where tva_id=3D$1";
+        $sql=3D"select tva_id,tva_label,tva_rate, tva_comment,tva_poste,=
tva_both_side from tva_rate where tva_id=3D$1";
         $res=3D$this->cn->exec_sql(
                  $sql,
                  array($this->tva_id)

Modified: phpcompta/trunk/include/tva.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/tva.inc.php	2011-11-18 14:55:13 UTC (rev 4406=
)
+++ phpcompta/trunk/include/tva.inc.php	2011-11-18 23:35:36 UTC (rev 4407=
)
@@ -35,7 +35,7 @@
 	echo '<p class=3D"notice">Vous ne pouvez pas effacer tous taux' .
 	' Si votre soci&eacute;t&eacute; n\'utilise pas la TVA, changer dans le=
 menu soci&eacute;t&eacute</p>';
 }
-$both=3D(isset($_REQUEST['both']))?1:0;
+$both_side=3D(isset($_REQUEST['both']))?1:0;
 //-----------------------------------------------------
 // Record Change
 if (isset($_POST['confirm_mod'])
@@ -50,7 +50,7 @@
     {
 	$err =3D 2;
     }
-
+    var_dump($_POST);
     if ($err =3D=3D 0)
     {
 	if (isset($_POST['confirm_add']))
@@ -62,14 +62,14 @@
 		$tva_rate,
 		$tva_comment,
 		$tva_poste,
-                        $both)
+                        $both_side)
 	    );
 	    $err =3D Database::fetch_result($res);
 	}
 	if (isset($_POST['confirm_mod']))
 	{
 	    $Res =3D $cn->exec_sql(
-		    "select tva_modify($1,$2,$3,$4,$5,$6)", array($tva_id, $tva_label,=
 $tva_rate, $tva_comment, $tva_poste,$both)
+		    "select tva_modify($1,$2,$3,$4,$5,$6)", array($tva_id, $tva_label,=
 $tva_rate, $tva_comment, $tva_poste,$both_side)
 	    );
 	    $err =3D Database::fetch_result($Res);
 	}

Modified: phpcompta/trunk/sql/tva.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/tva.sql	2011-11-18 14:55:13 UTC (rev 4406)
+++ phpcompta/trunk/sql/tva.sql	2011-11-18 23:35:36 UTC (rev 4407)
@@ -9,7 +9,6 @@
=20
 CREATE OR REPLACE FUNCTION comptaproc.tva_modify(integer, text, numeric,=
 text, text,integer)
  RETURNS integer
- LANGUAGE plpgsql
 AS $function$
 declare
 	p_tva_id alias for $1;
@@ -41,6 +40,7 @@
 return 0;
 end;
 $function$
+ LANGUAGE plpgsql;
=20
 ----------------------------------------------------------------------
 -- TVA INSERT
@@ -50,7 +50,6 @@
=20
 CREATE OR REPLACE FUNCTION comptaproc.tva_insert(text, numeric, text, te=
xt,integer)
  RETURNS integer
- LANGUAGE plpgsql
 AS $function$
 declare
 	l_tva_id integer;
@@ -83,3 +82,4 @@
 return 0;
 end;
 $function$
+ LANGUAGE plpgsql;



From MAILER-DAEMON Fri Nov 18 19:15:15 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRYaR-0006Mn-Uf
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 19:15:15 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 19 Nov 2011 01:20:40 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.31271.1321661715.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r192 - 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: Sat, 19 Nov 2011 00:15:14 -0000

Author: danydb
Date: 2011-11-19 01:20:38 +0100 (Sat, 19 Nov 2011)
New Revision: 192

Modified:
   trunk/tva/class_ext_list_assujetti.php
   trunk/tva/class_ext_list_intra.php
   trunk/tva/class_ext_tva.php
   trunk/tva/class_ext_tvagen.php
   trunk/tva/form_periode.php
   trunk/tva/list_tva.inc.php
Log:
adaptation TVA version 6.0

Modified: trunk/tva/class_ext_list_assujetti.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/class_ext_list_assujetti.php	2011-11-17 23:16:49 UTC (rev 1=
91)
+++ trunk/tva/class_ext_list_assujetti.php	2011-11-19 00:20:38 UTC (rev 1=
92)
@@ -44,13 +44,13 @@
 			      );
   private $aChild=3Darray();
   static function choose_periode($by_year=3Dfalse) {
-  =20
+
     // year
     $year =3D new IText('year');
     $year->size=3D4;
     $str_year=3D$year->input();
-   =20
-  =20
+
+
     $str_submit=3DHtmlInput::submit('decl',_('Afficher'));
     $str_hidden=3DHtmlInput::extension().dossier::hidden();
     if (isset($_REQUEST['sa']))
@@ -59,6 +59,7 @@
     $r.=3D"Ann=C3=A9e :".$str_year;
     $r.=3D$str_submit;
     $r.=3D$str_hidden;
+	$r.=3DHtmlInput::request_to_hidden(array('ac'));
     $r.=3D'</form>';
     return $r;
   }
@@ -82,11 +83,11 @@
 	$child->set_parameter('tva_num',$tva_num[$i]);
=20
 	$array[]=3D$child;
-      }//end for			   =20
+      }//end for
       $this->aChild=3D$array;
-    } else=20
+    } else
       $this->aChild=3Darray();
-   =20
+
     $this->start_periode=3D$p_array['start_periode'];
     $this->end_periode=3D$p_array['end_periode'];
     $this->flag_periode=3D$p_array['flag_periode'];
@@ -99,6 +100,7 @@
   }
   function display() {
     $r=3D '<form class=3D"print" id=3D"readonly">';
+	$r.=3DHtmlInput::request_to_hidden(array('ac'));
     $r.=3D$this->display_info();
     $r.=3D$this->display_declaration_amount();
     $r.=3D'</form>';
@@ -131,12 +133,12 @@
     $array=3Darray();
     // retrieve missing and compute an array
     for ($i=3D0;$i<$nb;$i++){
-      $child=3Dnew Ext_List_Assujetti_Child($this->db);=09
+      $child=3Dnew Ext_List_Assujetti_Child($this->db);
       foreach ($res[$i] as $idx=3D>$value){
 	$child->$idx=3D$value;
-      }=09
+      }
       $array[]=3D$child;
-    }//end for			   =20
+    }//end for
     $this->aChild=3D$array;
=20
     return 1;
@@ -150,7 +152,7 @@
     /* insert into the first table */
     $sql=3D<<<EOF
       INSERT INTO tva_belge.assujetti(
-				      start_date, end_date,  periodicity, tva_name,=20
+				      start_date, end_date,  periodicity, tva_name,
 				      num_tva, adress, country,  periode_dec,exercice)
       VALUES (to_date($1,'DD.MM.YYYY'),to_date($2,'DD.MM.YYYY'),$3,$4,$5=
,$6,$7,$8,$9) returning a_id;
 EOF;
@@ -188,8 +190,8 @@
     if (trim($a)=3D=3D'') $a=3D-1;
     $sql=3D<<<EOF
       select sum(j_montant) as amount,j_qcode
-      from jrnx=20
-      where j_grpt in (select distinct j_grpt from quant_sold join jrnx =
using (j_id) where qs_vat_code in ($a) )=20
+      from jrnx
+      where j_grpt in (select distinct j_grpt from quant_sold join jrnx =
using (j_id) where qs_vat_code in ($a) )
       and j_poste::text like $1||'%'
       and (j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date(=
$3,'DD.MM.YYYY'))
       group by j_qcode
@@ -212,7 +214,7 @@
       $fiche->get_by_qcode($all[$i]['j_qcode'],false);
       $num_tva=3D$fiche->strAttribut(ATTR_DEF_NUMTVA);
       $child->set_parameter('tva_num',$num_tva);
-      $sq=3D"select sum(qs_vat) from quant_sold=20
+      $sq=3D"select sum(qs_vat) from quant_sold
 where qs_client =3D $1 and j_id in (select distinct j_id from jrnx where=
  j_date >=3D to_date($2,'DD.MM.YYYY')
                                   and j_date <=3D to_date($3,'DD.MM.YYYY=
')
                                   )
@@ -239,7 +241,7 @@
       $child->set_parameter('name_child',$fiche->strAttribut(ATTR_DEF_NA=
ME));
=20
       $array[]=3D$child;
-    }//end for			   =20
+    }//end for
     $this->aChild=3D$array;
   }
   /**
@@ -251,7 +253,7 @@
     $clean=3Dnew IButton();
     $clean->label=3D'Efface ligne';
     $clean->javascript=3D"deleteRow('tb_dsp',this);";
-=09
+
     $r=3D'';
     $r.=3Dth('QuickCode');
     $r.=3Dth('Name');
@@ -307,9 +309,9 @@
=20
     $sql=3D<<<EOF
       INSERT INTO tva_belge.assujetti_chld(
-					   a_id, ac_tvanum, ac_amount, ac_vat,  ac_qcode,=20
+					   a_id, ac_tvanum, ac_amount, ac_vat,  ac_qcode,
 					   ac_name)
-      VALUES ($1, $2, $3, $4, $5, $6) returning ac_id;=20
+      VALUES ($1, $2, $3, $4, $5, $6) returning ac_id;
 EOF;
     $this->ic_id=3D$this->db->get_value($sql,array(
 						 $this->a_id,

Modified: trunk/tva/class_ext_list_intra.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/class_ext_list_intra.php	2011-11-17 23:16:49 UTC (rev 191)
+++ trunk/tva/class_ext_list_intra.php	2011-11-19 00:20:38 UTC (rev 192)
@@ -65,11 +65,11 @@
       $child->set_parameter('tva_num',$tva_num[$i]);
=20
       $array[]=3D$child;
-    }//end for			   =20
+    }//end for
     $this->aChild=3D$array;
     } else
       $this->aChild=3Darray();
-   =20
+
     $this->start_periode=3D$p_array['start_periode'];
     $this->end_periode=3D$p_array['end_periode'];
     $this->flag_periode=3D$p_array['flag_periode'];
@@ -79,11 +79,12 @@
     $this->country=3D$p_array['country'];
     $this->periode_dec=3D$p_array['periode_dec'];
     $this->exercice=3D$p_array['exercice'];
-   =20
+
   }
   function display() {
      $r=3D '<form class=3D"print" id=3D"readonly">';
      $r.=3D$this->display_info();
+	 $r.=3DHtmlInput::request_to_hidden(array('ac'));
      $r.=3D$this->display_declaration_amount();
      $r.=3D'</form>';
      $js_remove=3Dsprintf("onclick=3D\"if ( confirm('%s')){remove_form('=
%s',%d,%d,'li');}\"",
@@ -115,12 +116,12 @@
    $array=3Darray();
    // retrieve missing and compute an array
    for ($i=3D0;$i<$nb;$i++){
-     $child=3Dnew Ext_List_Intra_Child($this->db);=09
+     $child=3Dnew Ext_List_Intra_Child($this->db);
      foreach ($res[$i] as $idx=3D>$value){
        $child->$idx=3D$value;
-     }=09
+     }
      $array[]=3D$child;
-   }//end for			   =20
+   }//end for
    $this->aChild=3D$array;
=20
    return 1;
@@ -134,7 +135,7 @@
     /* insert into the first table */
     $sql=3D<<<EOF
 INSERT INTO tva_belge.intracomm(
-            start_date, end_date,  periodicity, tva_name,=20
+            start_date, end_date,  periodicity, tva_name,
             num_tva, adress, country,  periode_dec,exercice)
       VALUES (to_date($1,'DD.MM.YYYY'),to_date($2,'DD.MM.YYYY'),$3,$4,$5=
,$6,$7,$8,$9) returning i_id;
 EOF;
@@ -172,8 +173,8 @@
     if (trim($a)=3D=3D'') $a=3D-1;
     $sql=3D<<<EOF
       select sum(j_montant) as amount,j_qcode
-      from jrnx=20
-      where j_grpt in (select distinct j_grpt from quant_sold join jrnx =
using (j_id) where qs_vat_code in ($a) )=20
+      from jrnx
+      where j_grpt in (select distinct j_grpt from quant_sold join jrnx =
using (j_id) where qs_vat_code in ($a) )
       and j_poste::text like $1||'%'
       and (j_date >=3D to_date($2,'DD.MM.YYYY') and j_date <=3D to_date(=
$3,'DD.MM.YYYY'))
       group by j_qcode
@@ -212,12 +213,12 @@
=20
       if ( strpos($num_tva,'BE') =3D=3D=3D 0) { echo "pas bon";continue;=
}
       $child->set_parameter('tva_num',$num_tva);
-     =20
+
       $child->set_parameter('name_child',$fiche->strAttribut(ATTR_DEF_NA=
ME));
       $child->set_parameter('code','L');
=20
       $array[]=3D$child;
-    }//end for			   =20
+    }//end for
     $this->aChild=3D$array;
   }
   /**
@@ -230,7 +231,7 @@
     $clean=3Dnew IButton();
     $clean->label=3D'Efface ligne';
     $clean->javascript=3D"deleteRow('tb_dsp',this);";
-=09
+
     $r=3D'';
     $r.=3Dth('QuickCode');
     $r.=3Dth('Name');
@@ -288,9 +289,9 @@
   function insert() {
 $sql=3D<<<EOF
 INSERT INTO tva_belge.intracomm_chld(
-            i_id, ic_tvanum, ic_amount, ic_code, ic_periode, ic_qcode,=20
+            i_id, ic_tvanum, ic_amount, ic_code, ic_periode, ic_qcode,
             ic_name)
-  VALUES ($1, $2, $3, $4, $5, $6, $7) returning ic_id;=20
+  VALUES ($1, $2, $3, $4, $5, $6, $7) returning ic_id;
 EOF;
 $this->ic_id=3D$this->db->get_value($sql,array(
 					     $this->i_id,

Modified: trunk/tva/class_ext_tva.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/class_ext_tva.php	2011-11-17 23:16:49 UTC (rev 191)
+++ trunk/tva/class_ext_tva.php	2011-11-19 00:20:38 UTC (rev 192)
@@ -80,7 +80,7 @@
   /**
    *@brief retrieve * row thanks a condition
    */
-   public function seek($cond,$p_array=3Dnull)=20
+   public function seek($cond,$p_array=3Dnull)
    {
    }
    public function from_array($p_array) {
@@ -104,14 +104,14 @@
=20
     if ( $this->verify() !=3D 0 ) return;
     $sql=3D"INSERT INTO tva_belge.declaration_amount(
-             d00, d01, d02, d03, d44, d45, d46, d47, d48, d49, d81,=20
-            d82, d83, d84, d85, d86, d87, d88, d54, d55, d56, d57, d61, =
d63,=20
-            dxx, d59, d62, d64, dyy, d71, d72, d91, start_date, end_date=
,=20
+             d00, d01, d02, d03, d44, d45, d46, d47, d48, d49, d81,
+            d82, d83, d84, d85, d86, d87, d88, d54, d55, d56, d57, d61, =
d63,
+            dxx, d59, d62, d64, dyy, d71, d72, d91, start_date, end_date=
,
              periodicity,tva_name,num_tva,adress,country,periode_dec,exe=
rcice)
-    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12,=20
-            $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, =
$25,=20
+    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12,
+            $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, =
$25,
             $26, $27, $28, $29, $30, $31, $32, to_date($33,'DD.MM.YYYY')=
, to_date($34,'DD.MM.YYYY'), $35,$36,
-            $37,$38,$39,$40,$41)=20
+            $37,$38,$39,$40,$41)
              returning da_id;";
       $this->da_id=3D$this->db->get_value($sql,
 				     array($this->d00, /* 1 */
@@ -166,7 +166,7 @@
=20
   public function load() {
=20
-   $sql=3D"select * from tva_belge.declaration_amount where da_id=3D$1";=
=20
+   $sql=3D"select * from tva_belge.declaration_amount where da_id=3D$1";
=20
    $res=3D$this->db->get_array(
 			    $sql,
@@ -176,7 +176,7 @@
    foreach ($res[0] as $idx=3D>$value) { $this->$idx=3D$value; }
   }
   public function delete() {
-/*    $sql=3D"delete from tva_rate where tva_id=3D$1";=20
+/*    $sql=3D"delete from tva_rate where tva_id=3D$1";
     $res=3D$this->cn->exec_sql($sql,array($this->tva_id));
 */
   }
@@ -201,7 +201,7 @@
=20
     // set default value 0 for all
     $keys=3Darray_keys($this->variable);
-    for ($i =3D 0;$i < count($this->variable);$i++) {=20
+    for ($i =3D 0;$i < count($this->variable);$i++) {
       $idx=3D$keys[$i];
       $this->$idx=3D0;
       if ( $idx=3D=3D'd91') break;
@@ -228,7 +228,7 @@
       $oTva->set_parameter('grid','GRIL'.$array[$e]);
       $amount=3D$oTva->amount_operation();
       $this->set_parameter('d'.$array[$e],$amount);
-    =20
+
     }
     //Frame IV
     $array=3Darray('54','55','56','57','61','63');
@@ -240,7 +240,7 @@
=20
     }
=20
-  =20
+
     $array=3Darray('59','62','64');
     for ($e=3D0;$e<count($array);$e++) {
       $oTva=3Dnew Tva_amount($this->db,'in',$this->start_periode,$this->=
end_periode);
@@ -265,7 +265,7 @@
     // GRILYY
     $this->dyy=3Dround($this->d59+$this->d62+$this->d64,2);
=20
-   =20
+
     //Fram VI
     if ( $this->dxx > $this->dyy ) $this->d71=3D$this->dxx-$this->dyy;
     if ( $this->dxx < $this->dyy ) $this->d72=3D$this->dyy-$this->dxx;
@@ -367,7 +367,7 @@
        $saldo=3Dnew Acc_Account_Ledger($this->db,$deb);
        /* get label */
        $lib=3D$this->db->get_value('select pcm_lib from tmp_pcmn where p=
cm_val=3D$1',array($deb));
-			=09
+
        $cond=3Dsprintf(" j_date >=3Dto_date('%s','DD.MM.YYYY') and j_dat=
e <=3D '%s'",
 		     $first_day,
 		     $this->end_date);
@@ -381,19 +381,19 @@
=20
        $ICheckBox=3Dnew ICheckBox('deb['.$idx.']');
        if ( $result['debit'] < $result['credit'] ) {
-	 $amount_vat-=3D$result['solde'];	 $ICheckBox->selected=3Dtrue;}=20
+	 $amount_vat-=3D$result['solde'];	 $ICheckBox->selected=3Dtrue;}
        else {
 	 $amount_vat+=3D$result['solde'];	 $ICheckBox->selected=3Dfalse;
        }
        $idx++;
        /* display row */
        $r.=3Dtr(td($account->input()).td($lib).td($amount->input()).td($=
ICheckBox->input()));
-      =20
+
        /* get saldo for CREDIT*/
        $saldo=3Dnew Acc_Account_Ledger($this->db,$cred);
        /* get label */
        $lib=3D$this->db->get_value('select pcm_lib from tmp_pcmn where p=
cm_val=3D$1',array($cred));
-			=09
+
        $cond=3Dsprintf(" j_date >=3Dto_date('%s','DD.MM.YYYY') and j_dat=
e <=3D '%s'",
 		     $first_day,
 		     $this->end_date);
@@ -409,11 +409,11 @@
        if ( $result['debit'] < $result['credit'] ) {$amount_vat-=3D$resu=
lt['solde'];	 $ICheckBox->selected=3Dtrue;}
        else {	 $ICheckBox->selected=3Dfalse;
 	 $amount_vat+=3D$result['solde'];}
-      =20
+
        /* display row */
        $r.=3Dtr(td($account->input()).td($lib).td($amount->input()).td($=
ICheckBox->input()));
        $idx++;
-      =20
+
      }
      /* ATVA */
      $atva=3D$this->db->get_value("select paccount from tva_belge.parame=
ter where pcode=3D'ATVA'");
@@ -422,7 +422,7 @@
        $saldo=3Dnew Acc_Account_Ledger($this->db,$atva);
        /* get label */
        $lib=3D$this->db->get_value('select pcm_lib from tmp_pcmn where p=
cm_val=3D$1',array($atva));
-			=09
+
        $cond=3Dsprintf(" j_date >=3Dto_date('%s','DD.MM.YYYY') and j_dat=
e <=3D '%s'",
 		     $first_day,
 		     $this->end_date);
@@ -435,7 +435,7 @@
=20
        if ( $result['debit'] < $result['credit'] ) {
 	 $amount_vat-=3D$result['solde'];	 $ICheckBox->selected=3Dtrue;}
-       else {      =20
+       else {
 	 $ICheckBox->selected=3Dfalse;
 	 $amount_vat+=3D$result['solde'];
        }
@@ -451,7 +451,7 @@
        $saldo=3Dnew Acc_Account_Ledger($this->db,$crtva);
        /* get label */
        $lib=3D$this->db->get_value('select pcm_lib from tmp_pcmn where p=
cm_val=3D$1',array($crtva));
-			=09
+
        $cond=3Dsprintf(" j_date >=3Dto_date('%s','DD.MM.YYYY') and j_dat=
e <=3D '%s'",
 		     $first_day,
 		     $this->end_date);
@@ -481,7 +481,7 @@
        $saldo=3Dnew Acc_Account_Ledger($this->db,$dttva);
        /* get label */
        $lib=3D$this->db->get_value('select pcm_lib from tmp_pcmn where p=
cm_val=3D$1',array($dttva));
-			=09
+
        $cond=3Dsprintf(" j_date >=3Dto_date('%s','DD.MM.YYYY') and j_dat=
e <=3D '%s'",
 		     $first_day,
 		     $this->end_date);
@@ -509,7 +509,7 @@
        if ( $dttva !=3D ''  ) {
 	 /* get label */
 	 $lib=3D$this->db->get_value('select pcm_lib from tmp_pcmn where pcm_va=
l=3D$1',array($dttva));
-			=09
+
 	 $ICheckBox=3Dnew ICheckBox('solde_ic');
 	 $ICheckBox->selected=3Dfalse;
 	 $account=3Dnew IText('solde');
@@ -525,7 +525,7 @@
        if ( $crtva !=3D ''  ) {
 	 /* get label */
 	 $lib=3D$this->db->get_value('select pcm_lib from tmp_pcmn where pcm_va=
l=3D$1',array($crtva));
-			=09
+
 	 $ICheckBox=3Dnew ICheckBox('solde_ic');
 	 $ICheckBox->selected=3Dtrue;
 	 $account=3Dnew IText('solde');
@@ -544,6 +544,7 @@
    }
    function display() {
      $r=3D '<form class=3D"print" id=3D"readonly">';
+	 $r.=3DHtmlInput::request_to_hidden(array('ac'));
      $r.=3D'<div style=3D"position:absolute;top:150;right:0;width:200;ri=
ght-margin:3%">';
      $r.=3D$this->menu();
      $r.=3D'</div>';

Modified: trunk/tva/class_ext_tvagen.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/class_ext_tvagen.php	2011-11-17 23:16:49 UTC (rev 191)
+++ trunk/tva/class_ext_tvagen.php	2011-11-19 00:20:38 UTC (rev 192)
@@ -28,7 +28,7 @@
 require_once('class_own.php');
 /**
  *@brief transform a string into an arrau without empty element and  dup=
licate
- * the array is sorted=20
+ * the array is sorted
  *@param $p_string string containing a comma a separator
  *@return array
  *
@@ -50,13 +50,13 @@
 {
   function __construct($p_cn) {
     $this->db=3D$p_cn;
-  }			  =20
+  }
   public function get_parameter($p_string) {
     if ( array_key_exists($p_string,$this->variable) ) {
       $idx=3D$this->variable[$p_string];
       return $this->$idx;
     }
-    else=20
+    else
       throw new Exception (__FILE__.":".__LINE__.'Erreur attribut inexis=
tant');
   }
   public function set_parameter($p_string,$p_value) {
@@ -64,16 +64,16 @@
       $idx=3D$this->variable[$p_string];
       $this->$idx=3D$p_value;
     }
-    else=20
+    else
       throw new Exception (__FILE__.":".__LINE__.'Erreur attribut inexis=
tant');
-   =20
-   =20
+
+
   }
   public function get_info() {    return var_export(self::$variable,true=
);  }
=20
   public function save() {
   /* please adapt */
-    if (  $this->get_parameter("id") =3D=3D 0 )=20
+    if (  $this->get_parameter("id") =3D=3D 0 )
       $this->insert();
     else
       $this->update();
@@ -83,7 +83,7 @@
     require_once('class_iradio.php');
     $monthly=3Dnew IRadio('periodic');
     $monthly->value=3D1;
-   =20
+
     // month
     $month=3Dnew ISelect('bymonth');
     $array=3Darray ();
@@ -98,8 +98,8 @@
     $year =3D new IText('year');
     $year->size=3D4;
     $str_year=3D$year->input();
-   =20
-    // Tri=20
+
+    // Tri
     $quater=3Dnew ISelect('byquaterly');
     $array=3Darray();
     for ($i=3D0;$i<4;$i++) {
@@ -115,6 +115,7 @@
     $str_hidden=3DHtmlInput::extension().dossier::hidden();
     if (isset($_REQUEST['sa']))
       $str_hidden.=3DHtmlInput::hidden('sa',$_REQUEST['sa']);
+	$str_hidden.=3DHtmlInput::request_to_hidden(array('ac'));
     $str_byyear=3D'';
     if ( $by_year =3D=3D true ) {
       $yearly=3Dnew IRadio('periodic');

Modified: trunk/tva/form_periode.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/form_periode.php	2011-11-17 23:16:49 UTC (rev 191)
+++ trunk/tva/form_periode.php	2011-11-19 00:20:38 UTC (rev 192)
@@ -12,6 +12,7 @@
 ?>
 <?=3D_('Par ann=C3=A9e')?> <?=3D$str_byyear?><br/>
 <?php
+echo HtmlInput::request_to_hidden(array('ac'));
 endif;
 ?>
 <br>

Modified: trunk/tva/list_tva.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/list_tva.inc.php	2011-11-17 23:16:49 UTC (rev 191)
+++ trunk/tva/list_tva.inc.php	2011-11-19 00:20:38 UTC (rev 192)
@@ -30,6 +30,7 @@
=20
 echo '<div id=3D"main" class=3D"content" style=3D"width:80%;margin-left:=
10%">';
 echo '<form method=3D"get">';
+echo HtmlInput::request_to_hidden(array('ac'));
 echo _('Filtrer par ');
 $choice=3Dnew ISelect('type');
 $choice->value=3Darray(
@@ -50,14 +51,14 @@
 case 0:
  $sql=3D"
 select da_id as id, 'D=C3=A9claration trim/mens' as type_title,1 as type=
_decl,to_char(date_decl,'DD.MM.YYYY') as date_fmt,date_decl,
-case when periodicity =3D'1' then 'Mensuel' =20
+case when periodicity =3D'1' then 'Mensuel'
 when periodicity =3D '2' then 'Trimestriel'
 end as fmt_periodicity,
-periode_dec,exercice=20
-from tva_belge.declaration_amount=20
+periode_dec,exercice
+from tva_belge.declaration_amount
 union all
 select i_id as id, 'Listing Intracom' as type_title, 3 as type_decl, to_=
char(date_decl,'DD.MM.YYYY') as date_fmt,date_decl,
-case when periodicity =3D'1' then 'Mensuel' =20
+case when periodicity =3D'1' then 'Mensuel'
 when periodicity =3D '2' then 'Trimestriel'
 when periodicity =3D '3' then 'Annuel'
 end as fmt_periodicity,
@@ -66,7 +67,7 @@
 union all
 select a_id as id, 'Listing assujetti' as type_title, 2 as type_decl, to=
_char(date_decl,'DD.MM.YYYY') as date_fmt,date_decl,
  'Annuel' as fmt_periodicity,
-periode_dec,exercice=20
+periode_dec,exercice
 from tva_belge.assujetti
=20
 order by date_decl desc
@@ -75,10 +76,10 @@
   break;
=20
 case 1:
-=20
+
   $sql=3D"
 select da_id as id, 'D=C3=A9claration trim/mens' as type_title,1 as type=
_decl,to_char(date_decl,'DD.MM.YYYY') as date_fmt,
-case when periodicity =3D'1' then 'Mensuel' =20
+case when periodicity =3D'1' then 'Mensuel'
 when periodicity =3D '2' then 'Trimestriel'
 end as fmt_periodicity,
 periode_dec,exercice
@@ -97,7 +98,7 @@
 case 3:
 $sql=3D"
 select i_id as id, 'Listing Intracom' as type_title, 3 as type_decl, to_=
char(date_decl,'DD.MM.YYYY') as date_fmt,date_decl,
-case when periodicity =3D'1' then 'Mensuel' =20
+case when periodicity =3D'1' then 'Mensuel'
 when periodicity =3D '2' then 'Trimestriel'
 when periodicity =3D '3' then 'Annuel'
 end as fmt_periodicity,



From MAILER-DAEMON Fri Nov 18 20:38:58 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRZtS-0003Gq-I5
	for mharc-phpcompta-dev@gnu.org; Fri, 18 Nov 2011 20:38:58 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 19 Nov 2011 02:44:25 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.31375.1321666737.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4408 - 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, 19 Nov 2011 01:38:56 -0000

Author: danydb
Date: 2011-11-19 02:44:23 +0100 (Sat, 19 Nov 2011)
New Revision: 4408

Modified:
   phpcompta/trunk/html/ajax_todo_list.php
Log:
fix small bug ajax_todo_list.php

Modified: phpcompta/trunk/html/ajax_todo_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_todo_list.php	2011-11-18 23:35:36 UTC (rev =
4407)
+++ phpcompta/trunk/html/ajax_todo_list.php	2011-11-19 01:44:23 UTC (rev =
4408)
@@ -23,25 +23,26 @@
 /*!\file
  * \brief handle the ajax request for the todo_list (delete, update
  * and insert)
- * for add, needed parameters=20
+ * for add, needed parameters
  * - gDossier
- * - d date,=20
- * - t title=20
+ * - d date,
+ * - t title
  * - de description
- * for update, same as ADD +=20
+ * for update, same as ADD +
  * - i id
  * for delete
- * - gDossier=20
+ * - gDossier
  * - i id
  */
 require_once ('class_dossier.php');
 require_once ('class_todo_list.php');
 require_once ('class_database.php');
+require_once ('class_user.php');
=20
-$cn=3Dnew Database($gDossier);
+$cn=3D Dossier::connect();
 $user=3Dnew User($cn);
 $user->check(true);
-$user->check_dossier($gDossier,true);
+$user->check_dossier(Dossier::id(),true);
 ajax_disconnected('add_todo_list');
=20
 if (isset($_REQUEST['show']))



From MAILER-DAEMON Mon Nov 21 07:12:37 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSSjl-0001E8-N1
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 07:12:37 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 13:17:45 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36067.1321877556.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4409 - 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, 21 Nov 2011 12:12:36 -0000

Author: danydb
Date: 2011-11-21 13:17:43 +0100 (Mon, 21 Nov 2011)
New Revision: 4409

Modified:
   phpcompta/trunk/include/company.inc.php
Log:
remove PARSTR from company.inc.php

Modified: phpcompta/trunk/include/company.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/company.inc.php	2011-11-19 01:44:23 UTC (rev =
4408)
+++ phpcompta/trunk/include/company.inc.php	2011-11-21 12:17:43 UTC (rev =
4409)
@@ -18,7 +18,7 @@
         $m->MY_CHECK_PERIODE=3D$p_check_periode;
         $m->MY_DATE_SUGGEST=3D$p_date_suggest;
         $m->MY_ANALYTIC=3D$p_compta;
-        if ( $g_user->check_action(PARSTR)!=3D0) $m->MY_STRICT=3D$p_stri=
ct;
+        $m->MY_STRICT=3D$p_strict;
         $m->MY_TVA_USE=3D$p_tva_use;
         $m->MY_PJ_SUGGEST=3D$p_pj;
 	$m->MY_ALPHANUM=3D$p_alphanum;



From MAILER-DAEMON Mon Nov 21 07:22:54 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSSti-0003o3-5x
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 07:22:54 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 13:28:11 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36100.1321878173.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4410 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 12:22:52 -0000

Author: danydb
Date: 2011-11-21 13:28:09 +0100 (Mon, 21 Nov 2011)
New Revision: 4410

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
debugging install page

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 12:17:43 UTC (rev 440=
9)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 12:28:09 UTC (rev 441=
0)
@@ -92,6 +92,11 @@
 /* If htaccess file doesn't exists we create them here
  * if os =3D=3D 1 then windows, 0 means Unix
  */
+/**
+ *@todo remove this test for production
+ */
+if ( ! DEBUG )
+{
 $file=3D'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DIRE=
CTORY_SEPARATOR.'.htaccess';
 $hFile=3D@fopen($file,'w+');
 if ( ! $hFile )     exit('Impossible d\'&eacute;crire dans le r&eacute;p=
ertoire include');
@@ -172,7 +177,7 @@
 // magic_quotes_runtime =3D Off
 // magic_quotes_sybase =3D Off
 // include_path
-
+}
 ?>
 <?
 require_once('config_file.php');



From MAILER-DAEMON Mon Nov 21 07:49:36 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSTJY-0000Ol-27
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 07:49:36 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 13:54:43 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36140.1321879775.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4411 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 12:49:34 -0000

Author: danydb
Date: 2011-11-21 13:54:42 +0100 (Mon, 21 Nov 2011)
New Revision: 4411

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 12:28:09 UTC (rev 441=
0)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 12:54:42 UTC (rev 441=
1)
@@ -4,6 +4,7 @@
    	font-family:sans-serif;
 	font-size:12px;
 	color:blue;
+        background-color:#EDF3FF;
  }
 h2.info {
 	color:green;
@@ -15,10 +16,13 @@
 	font-size:14px;
 	font-family:sans-serif;
 }
-.warning  {
+
+p.warning  {
    	font-family:sans-serif;
 	font-size:12px;
 	color:red;
+        border: 1px solid red;
+        padding:30px;
  }
 .info {
 	color:blue;
@@ -40,7 +44,7 @@
 }
 </style>
 <p align=3D"center">
-  <IMG SRC=3D"../image/logo7.jpg" alt=3D"Logo">
+  <IMG SRC=3D"../image/logo7.gif" alt=3D"Logo PhpCompta">
 </p>
 <?php
=20
@@ -69,6 +73,8 @@
  *        This file is included in each release  for a new upgrade
  *
  */
+$failed=3D"<span style=3D\"font-size:18px;color;red\">&#x2716;</span>";
+$succeed=3D"<span style=3D\"font-size:18px;color;green\">&#x2713;</span>=
";
=20
 $inc_path=3Dget_include_path();
 /**
@@ -152,7 +158,7 @@
 if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'in=
clude'.DIRECTORY_SEPARATOR.'config.inc.php')) {
   /* if the config file is not found we propose to create one */
   if ( is_writable ('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'i=
nclude'.DIRECTORY_SEPARATOR.'constant.php') =3D=3D false ) {
-    echo '<h2 class=3D"error"> On ne peut pas &eacute;crire dans le r&ea=
cute;pertoire de phpcompta, changez-en les droits </h2>';
+    echo '<h2 class=3D"error"> Ecriture non possible </h2><p class=3D"wa=
rning"> On ne peut pas &eacute;crire dans le r&eacute;pertoire de phpcomp=
ta, changez-en les droits </p>';
     exit();
   }
=20
@@ -186,74 +192,106 @@
=20
 ?>
 <h2>Info</h2>
-Vous utilisez le domaine <?php echo domaine; ?>
+Vous utilisez le domaine <?php echo domaine; ?> <?=3D$succeed?>=20
 <h2>Php setting</h2>
 <?php
=20
 $flag_php=3D0;
=20
 //ini_set("memory_limit","200M");
+echo "<ul>";
 foreach (array('magic_quotes_gpc','magic_quotes_runtime') as $a) {
-
-  if ( ini_get($a) =3D=3D false ) print $a.': Ok  <br>';
+echo "<li>";
+  if ( ini_get($a) =3D=3D false ) print $a.': '.$succeed;
   else {
-	print ("<h2 class=3D\"error\">$a has a bad value  !!!</h2>");
+        print $a.': '.$failed;
+	print ("<h2 class=3D\"error\">$a a une mauvaise valeur !</h2>");
 	$flag_php++;
   }
=20
+echo "</li>";
 }
 $module=3Dget_loaded_extensions();
=20
+echo "<li>";
 if ( in_array('pgsql',$module) =3D=3D false )
 {
-  print '<h2 class=3D"error">D&eacute;sol&eacute; mais soit vous n\'avez=
 pas install&eacute; ou activ=C3=A9 l\'extension(pgsql)  pour postgresql =
soit php n\'a pas pas &eacute;t&eacute; compil&eacute; avec les bonnes op=
tions </h2>';
+  echo 'module PGSQL '.$failed;
+  print '<span class=3D"warning">D&eacute;sol&eacute; mais soit vous n\'=
avez pas install&eacute; ou activ=C3=A9 l\'extension(pgsql)  pour postgre=
sql soit php n\'a pas pas &eacute;t&eacute; compil&eacute; avec les bonne=
s options </span>';
   $flag_php++;
-} else echo 'module PGSQL ok <br>';
+} else echo 'module PGSQL '.$succeed;
+echo "</li>";
=20
+echo "<li>";
 if ( in_array('bcmath',$module) =3D=3D false )
 {
-  print '<h2 class=3D"error">D&eacute;sol&eacute; mais soit vous n\'avez=
 pas install&eacute; ou activ=C3=A9 l\'extension (bcmath)  pour bcmath so=
it php n\'a pas pas &eacute;t&eacute; compil&eacute; avec les bonnes opti=
ons </h2>';
+  echo 'module BCMATH ok '.$failed;
+  print '<span class=3D"warning">D&eacute;sol&eacute; mais soit vous n\'=
avez pas install&eacute; ou activ=C3=A9 l\'extension (bcmath)  pour bcmat=
h soit php n\'a pas pas &eacute;t&eacute; compil&eacute; avec les bonnes =
options </span>';
   $flag_php++;
-} else echo 'module BCMATH ok <br>';
+} else echo 'module BCMATH '.$succeed;
+echo "</li>";
+
+echo "<li>";
 if ( in_array('gettext',$module) =3D=3D false )
 {
-  print '<h2 class=3D"error">D&eacute;sol&eacute; mais soit vous n\'avez=
 pas install&eacute; ou activ=C3=A9 l\'extension  (gettext) pour gettext =
soit php n\'a pas pas &eacute;t&eacute; compil&eacute; avec les bonnes op=
tions </h2>';
+  echo 'module GETTEXT '.$failed;
+  print '<span class=3D"warning">D&eacute;sol&eacute; mais soit vous n\'=
avez pas install&eacute; ou activ=C3=A9 l\'extension  (gettext) pour gett=
ext soit php n\'a pas pas &eacute;t&eacute; compil&eacute; avec les bonne=
s options </span>';
   $flag_php++;
-} else echo 'module GETTEXT ok <br>';
+} else echo 'module GETTEXT '.$succeed;
+echo "</li>";
=20
+echo "<li>";
 if ( in_array('zip',$module) =3D=3D false )
 {
-  print '<h2 class=3D"error">D&eacute;sol&eacute; mais soit vous n\'avez=
 pas install&eacute; ou activ=C3=A9 l\'extension (zip) pour zip soit php =
n\'a pas pas &eacute;t&eacute; compil&eacute; avec les bonnes options </h=
2>';
+  echo 'module ZIP '.$failed;
+  print '<span class=3D"warning">D&eacute;sol&eacute; mais soit vous n\'=
avez pas install&eacute; ou activ=C3=A9 l\'extension (zip) pour zip soit =
php n\'a pas pas &eacute;t&eacute; compil&eacute; avec les bonnes options=
 </span>';
   $flag_php++;
-} else echo 'module ZIP ok <br>';
+} else echo 'module ZIP '.$succeed;
+echo "</li>";
=20
-
+echo "<li>";
 if ( ini_get("max_execution_time") < 60 )  {
-	print '<h2 class=3D"info"> max_execution_time should be set to 60 minim=
um</h2>';
+        echo 'Avertissement : '.$failed;
+	print '<span class=3D"info"> max_execution_time devrait =C3=AAtre de 60=
 minimum</span>';
 }
+echo "</li>";
+
+echo "<li>";
 if ( ini_get("session.auto_start") =3D=3D false )  {
-	print '<h2 class=3D"error"> session.auto_start must be set to true </h2=
>';
+        echo 'Avertissement : '.$failed;
+	print '<span class=3D"warning"> session.auto_start doit =C3=AAtre mis =C3=
=A0 vrai</span>';
 	$flag_php++;
 }
+echo "</li>";
+
+echo "<li>";
 if ( ini_get("session.use_trans_sid") =3D=3D false )  {
-	print '<h2 class=3D"error"> avertissement session.use_trans_sid should =
be set to true </h2>';
+        echo 'Avertissement : '.$failed;
+	print '<span class=3D"warning"> avertissement session.use_trans_sid sho=
uld be set to true </span>';
 }
+echo "</li>";
+
+echo "<li>";
 if ( strpos($inc_path,"../include") =3D=3D 0 && strpos ($inc_path,'..\\i=
nclude') =3D=3D 0)
 {
-  print ("<h2 class=3D\"error\"> include_path incorrect  !!!".$inc_path.=
"</h2>");
+    echo 'variable include_path: '.$failed;
+  print ("<span class=3D\"warning"> include_path incorrect  !!!".$inc_pa=
th."</span>");
 	$flag_php++;
 }
  else
    if ( strpos($inc_path,"addon") =3D=3D 0) {
-  print ("<h2 class=3D\"error\">2 include_path incorrect  !!!".$inc_path=
."</h2>");
+       echo 'variable include_path: '.$failed;
+    print ("<span class=3D\"warning\">2 include_path incorrect  !!!".$in=
c_path."</span>");
 	$flag_php++;
  }else
-   print 'include_path : ok ('.$inc_path.')<br>';
+   echo 'variable include_path: '.$succeed;
+echo "</li>";
=20
+ echo "</ul>";
 if ( $flag_php=3D=3D0 ) {
-	echo '<p class=3D"info">php.ini est bien configur&eacute;</p>';
+	echo '<p class=3D"info">'.$succeed.' php.ini est bien configur&eacute;<=
/p>';
 } else {
-	echo '<p class=3D"error"> php mal configur&eacute;</p>';
+	echo '<p class=3D"warning">'.$failed.' php mal configur&eacute;</p>';
 	exit -1;
 }
 /* check user */
@@ -274,7 +312,7 @@
      )=20
   {
 ?>
-  <p> Vous devez absolument utiliser au minimum une version 8.4 de PostG=
resql, si votre distribution n'en
+  <p><?=3D$failed?> Vous devez absolument utiliser au minimum une versio=
n 8.4 de PostGresql, si votre distribution n'en
 offre pas, installez en une en la compilant. </p><p>Lisez attentivement =
la notice sur postgresql.org pour migrer
 vos bases de donn&eacute;es
 </p>
@@ -289,7 +327,7 @@
 $sql=3D"select lanname from pg_language where lanname=3D'plpgsql'";
 $Res=3D$cn->count_sql($sql);
 if ( $Res=3D=3D0) { ?>
-<p> Vous devez installer le langage plpgsql pour permettre aux fonctions=
 SQL de fonctionner.</p>
+<p><?=3D$failed?> Vous devez installer le langage plpgsql pour permettre=
 aux fonctions SQL de fonctionner.</p>
 <p>Pour cela, sur la ligne de commande en tant qu\'utilisateur postgres,=
 faites createlang plpgsql template1
 </p>
=20
@@ -310,14 +348,15 @@
   switch ($a['name']){
   case 'effective_cache_size':
     if ( $a['setting'] < 1000 ){
-      print '<p class=3D"warning">Attention le param&egrave;tre effectiv=
e_cache_size est de '.
+     =20
+      print '<p class=3D"warning">'.$failed.'Attention le param&egrave;t=
re effective_cache_size est de '.
 	$a['setting']." au lieu de 1000 </p>";
       $flag++;
     }
     break;
   case 'shared_buffers':
     if ( $a['setting'] < 640 ){
-      print '<p class=3D"warning">Attention le param&egrave;tre shared_b=
uffer est de '.
+      print '<p class=3D"warning">'.$failed.'Attention le param&egrave;t=
re shared_buffer est de '.
 	$a['setting']."au lieu de 640</p>";
       $flag++;
     }
@@ -325,9 +364,9 @@
   }
  }
 if ( $flag =3D=3D 0 ) {
-  echo '<p class=3D"info">La base de donn&eacute;es est bien configur&ea=
cute;e</p>';
+  echo '<p class=3D"info"> La base de donn&eacute;es est bien configur&e=
acute;e '.$succeed.'</p>';
  } else {
-  echo '<p class=3D"warning">Il y a '.$flag.' param&egrave;tre qui sont =
trop bas</p>';
+  echo '<p class=3D"warning">'.$failed.'Il y a '.$flag.' param&egrave;tr=
e qui sont trop bas</p>';
  }
 if ( ! isset($_POST['go']) ) {
 ?>



From MAILER-DAEMON Mon Nov 21 07:56:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSTPy-0002Cy-5d
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 07:56:14 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:01:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36151.1321880173.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4412 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 12:56:13 -0000

Author: danydb
Date: 2011-11-21 14:01:26 +0100 (Mon, 21 Nov 2011)
New Revision: 4412

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: typo

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 12:54:42 UTC (rev 441=
1)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:01:26 UTC (rev 441=
2)
@@ -275,7 +275,7 @@
 if ( strpos($inc_path,"../include") =3D=3D 0 && strpos ($inc_path,'..\\i=
nclude') =3D=3D 0)
 {
     echo 'variable include_path: '.$failed;
-  print ("<span class=3D\"warning"> include_path incorrect  !!!".$inc_pa=
th."</span>");
+  print ("<span class=3D\"warning\"> include_path incorrect  !!!".$inc_p=
ath."</span>");
 	$flag_php++;
 }
  else



From MAILER-DAEMON Mon Nov 21 07:56:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSTQN-0002Ds-As
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 07:56:39 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:01:53 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36152.1321880198.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4413 - phpcompta/trunk/html/image
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?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, 21 Nov 2011 12:56:37 -0000

Author: danydb
Date: 2011-11-21 14:01:51 +0100 (Mon, 21 Nov 2011)
New Revision: 4413

Added:
   phpcompta/trunk/html/image/logo7.gif
Log:
#20 am?\195?\169liorer cosmetique setup.php: typo

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


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



From MAILER-DAEMON Mon Nov 21 08:10:02 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSTdK-0003rh-Cj
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:10:02 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:15:11 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36207.1321881001.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4414 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:10:00 -0000

Author: danydb
Date: 2011-11-21 14:15:10 +0100 (Mon, 21 Nov 2011)
New Revision: 4414

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: list + font-family verdana

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:01:51 UTC (rev 441=
3)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:15:10 UTC (rev 441=
4)
@@ -1,7 +1,7 @@
 <style type=3D"text/css">
 <!--
 body {
-   	font-family:sans-serif;
+   	font-family:Verdana,arial,sans-serif;
 	font-size:12px;
 	color:blue;
         background-color:#EDF3FF;
@@ -9,16 +9,16 @@
 h2.info {
 	color:green;
 	font-size:14px;
-	font-family:sans-serif;
+	font-family:Verdana,arial,sans-serif;
 }
 h2.error {
 	color:red;
 	font-size:14px;
-	font-family:sans-serif;
+	font-family:Verdana,arial,sans-serif;
 }
=20
 p.warning  {
-   	font-family:sans-serif;
+   	font-family:Verdana,arial,sans-serif;
 	font-size:12px;
 	color:red;
         border: 1px solid red;
@@ -27,7 +27,7 @@
 .info {
 	color:blue;
 	font-size:12px;
-	font-family:sans-serif;
+	font-family:Verdana,arial,sans-serif;
 }
 a:hover{
 color:blue;
@@ -192,14 +192,14 @@
=20
 ?>
 <h2>Info</h2>
-Vous utilisez le domaine <?php echo domaine; ?> <?=3D$succeed?>=20
+Vous utilisez le domaine <?php echo domaine; ?>=20
 <h2>Php setting</h2>
 <?php
=20
 $flag_php=3D0;
=20
 //ini_set("memory_limit","200M");
-echo "<ul>";
+echo "<ul style=3D\"list-style-type: square;\">";
 foreach (array('magic_quotes_gpc','magic_quotes_runtime') as $a) {
 echo "<li>";
   if ( ini_get($a) =3D=3D false ) print $a.': '.$succeed;
@@ -249,27 +249,27 @@
 } else echo 'module ZIP '.$succeed;
 echo "</li>";
=20
-echo "<li>";
 if ( ini_get("max_execution_time") < 60 )  {
+        echo "<li>";
         echo 'Avertissement : '.$failed;
 	print '<span class=3D"info"> max_execution_time devrait =C3=AAtre de 60=
 minimum</span>';
+        echo "</li>";
 }
-echo "</li>";
=20
-echo "<li>";
 if ( ini_get("session.auto_start") =3D=3D false )  {
+        echo "<li>";
         echo 'Avertissement : '.$failed;
 	print '<span class=3D"warning"> session.auto_start doit =C3=AAtre mis =C3=
=A0 vrai</span>';
+        echo "</li>";
 	$flag_php++;
 }
-echo "</li>";
=20
-echo "<li>";
 if ( ini_get("session.use_trans_sid") =3D=3D false )  {
+        echo "<li>";
         echo 'Avertissement : '.$failed;
 	print '<span class=3D"warning"> avertissement session.use_trans_sid sho=
uld be set to true </span>';
+        echo "</li>";
 }
-echo "</li>";
=20
 echo "<li>";
 if ( strpos($inc_path,"../include") =3D=3D 0 && strpos ($inc_path,'..\\i=
nclude') =3D=3D 0)



From MAILER-DAEMON Mon Nov 21 08:13:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSTgF-0004BF-9e
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:13:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:18:14 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36214.1321881182.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4415 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:13:01 -0000

Author: danydb
Date: 2011-11-21 14:18:12 +0100 (Mon, 21 Nov 2011)
New Revision: 4415

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: place de succeed

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:15:10 UTC (rev 441=
4)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:18:12 UTC (rev 441=
5)
@@ -289,9 +289,9 @@
=20
  echo "</ul>";
 if ( $flag_php=3D=3D0 ) {
-	echo '<p class=3D"info">'.$succeed.' php.ini est bien configur&eacute;<=
/p>';
+	echo '<p class=3D"info"> php.ini est bien configur&eacute; '.$succeed.'=
</p>';
 } else {
-	echo '<p class=3D"warning">'.$failed.' php mal configur&eacute;</p>';
+	echo '<p class=3D"warning"> php mal configur&eacute; '.$failed.'</p>';
 	exit -1;
 }
 /* check user */



From MAILER-DAEMON Mon Nov 21 08:21:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSToP-00050c-Jn
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:21:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:26:38 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36234.1321881688.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4416 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:21:27 -0000

Author: danydb
Date: 2011-11-21 14:26:36 +0100 (Mon, 21 Nov 2011)
New Revision: 4416

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: ajout $succeed pour patch

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:18:12 UTC (rev 441=
5)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:26:36 UTC (rev 441=
6)
@@ -459,7 +459,7 @@
   $db=3Dnew Database($db_row['mod_id'],'mod');
   $db->apply_patch($db_row['mod_name']);
  }
-echo '</ul>';
+
 //----------------------------------------------------------------------
 // Upgrade the account_repository
 //----------------------------------------------------------------------
@@ -476,6 +476,6 @@
    }
=20
  if (! DEBUG) ob_end_clean();
- echo "<h2 class=3D\"info\">Voil&agrave; tout est install&eacute; ;-) </=
H2>";
+ echo "<p class=3D\"warning\">Tout est install&eacute;</p>";
 ?>
 <A HREF=3D"../index.php">Connectez-vous =C3=A0 PhpCompta</A>



From MAILER-DAEMON Mon Nov 21 08:21:33 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSToT-00050s-NE
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:21:33 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:26:43 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36235.1321881692.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4417 - 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, 21 Nov 2011 13:21:32 -0000

Author: danydb
Date: 2011-11-21 14:26:42 +0100 (Mon, 21 Nov 2011)
New Revision: 4417

Modified:
   phpcompta/trunk/include/class_database.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: ajout $succeed pour patch

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	2011-11-21 13:26:36 UTC (r=
ev 4416)
+++ phpcompta/trunk/include/class_database.php	2011-11-21 13:26:42 UTC (r=
ev 4417)
@@ -359,7 +359,7 @@
     function apply_patch($p_name,$from_setup=3D1)
     {
         $MaxVersion=3DDBVERSION-1;
-        echo '<ul>';
+        echo '<ul style=3D"list-type-style:square">';
         $add=3D($from_setup=3D=3D0)?'admin/':'';
         for ( $i =3D 4;$i <=3D $MaxVersion;$i++)
         {
@@ -367,9 +367,11 @@
             if ( $this->get_version() <=3D $i )
             {
                 echo "<li>Patching ".$p_name.
-                " from the version ".$this->get_version()." to $to</h3> =
</li>";
+                " from the version ".$this->get_version()." to $to ";
=20
                 $this->execute_script($add.'sql/patch/upgrade'.$i.'.sql'=
);
+                echo $succeed;
+               =20
                 if ( ! DEBUG ) ob_start();
                 // specific for version 4
                 if ( $i =3D=3D 4 )



From MAILER-DAEMON Mon Nov 21 08:25:49 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSTsb-0005yN-1e
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:25:49 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:30:57 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36238.1321881946.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4418 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:25:46 -0000

Author: danydb
Date: 2011-11-21 14:30:56 +0100 (Mon, 21 Nov 2011)
New Revision: 4418

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: cosmetic r?\195?\169sultat

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:26:42 UTC (rev 441=
7)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:30:56 UTC (rev 441=
8)
@@ -6,10 +6,12 @@
 	color:blue;
         background-color:#EDF3FF;
  }
-h2.info {
-	color:green;
-	font-size:14px;
+p.info {
+	color:blue;
 	font-family:Verdana,arial,sans-serif;
+        padding: 30px;
+        border : 1px solid green;
+           =20
 }
 h2.error {
 	color:red;
@@ -425,7 +427,7 @@
 //--
 $cn=3Dnew Database();
=20
-echo "<h2 class=3D\"info\"> F&eacute;licitation : Installation r&eacute;=
ussie</h2>";
+echo "<p class=3D\"info\"> F&eacute;licitation : Installation r&eacute;u=
ssie</p>";
=20
 echo '<hr>';
 echo "<h1>Mise a jour du systeme</h1>";
@@ -476,6 +478,6 @@
    }
=20
  if (! DEBUG) ob_end_clean();
- echo "<p class=3D\"warning\">Tout est install&eacute;</p>";
+ echo "<p class=3D\"info\">Tout est install&eacute; $succeed</p>";
 ?>
 <A HREF=3D"../index.php">Connectez-vous =C3=A0 PhpCompta</A>



From MAILER-DAEMON Mon Nov 21 08:28:04 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSTum-0006Ki-Jo
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:28:04 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:33:14 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36247.1321882083.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4419 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:28:03 -0000

Author: danydb
Date: 2011-11-21 14:33:13 +0100 (Mon, 21 Nov 2011)
New Revision: 4419

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: title

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:30:56 UTC (rev 441=
8)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:33:13 UTC (rev 441=
9)
@@ -18,6 +18,13 @@
 	font-size:14px;
 	font-family:Verdana,arial,sans-serif;
 }
+h1 {
+	color:blue;
+	font-size:14px;
+	font-family:Verdana,arial,sans-serif;
+        border : 1px solid green;
+        text-align: center;
+}
=20
 p.warning  {
    	font-family:Verdana,arial,sans-serif;
@@ -191,7 +198,7 @@
 require_once('config_file.php');
 include_once('constant.php');
 require_once('class_database.php');
-
+echo "<h1>Configuration</h1>";
 ?>
 <h2>Info</h2>
 Vous utilisez le domaine <?php echo domaine; ?>=20
@@ -429,6 +436,7 @@
=20
 echo "<p class=3D\"info\"> F&eacute;licitation : Installation r&eacute;u=
ssie</p>";
=20
+
 echo '<hr>';
 echo "<h1>Mise a jour du systeme</h1>";
 echo "<h2 > Mise &agrave; jour dossier</h2>";



From MAILER-DAEMON Mon Nov 21 08:35:59 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSU2R-000877-KH
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:35:59 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:41:11 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36257.1321882558.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4420 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:35:58 -0000

Author: danydb
Date: 2011-11-21 14:41:09 +0100 (Mon, 21 Nov 2011)
New Revision: 4420

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: title h1 & h2

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:33:13 UTC (rev 441=
9)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:41:09 UTC (rev 442=
0)
@@ -15,17 +15,22 @@
 }
 h2.error {
 	color:red;
-	font-size:14px;
+	font-size:12px;
 	font-family:Verdana,arial,sans-serif;
 }
 h1 {
 	color:blue;
-	font-size:14px;
+	font-size:16px;
 	font-family:Verdana,arial,sans-serif;
-        border : 1px solid green;
+        border : 1px solid blue;
         text-align: center;
 }
-
+h2 {
+	color:blue;
+	font-size:14px;
+	font-family:Verdana,arial,sans-serif;
+        font-style: italic;
+}
 p.warning  {
    	font-family:Verdana,arial,sans-serif;
 	font-size:12px;
@@ -437,7 +442,6 @@
 echo "<p class=3D\"info\"> F&eacute;licitation : Installation r&eacute;u=
ssie</p>";
=20
=20
-echo '<hr>';
 echo "<h1>Mise a jour du systeme</h1>";
 echo "<h2 > Mise &agrave; jour dossier</h2>";
=20
@@ -460,7 +464,6 @@
 //----------------------------------------------------------------------
 $Resdossier=3D$cn->exec_sql("select mod_id, mod_name from modeledef");
 $MaxDossier=3D$cn->size();
-echo '<hr>';
 echo "<h2>Mise &agrave; jour mod&egrave;le</h2>";
=20
 for ($e=3D0;$e < $MaxDossier;$e++) {
@@ -473,7 +476,6 @@
 //----------------------------------------------------------------------
 // Upgrade the account_repository
 //----------------------------------------------------------------------
-echo '<hr>';
  echo "<h2>Mise &agrave; jour Repository</h2>";
  $cn=3Dnew Database();
  if ( DEBUG =3D=3D false ) ob_start();



From MAILER-DAEMON Mon Nov 21 08:40:21 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSU6f-0003Je-5V
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:40:21 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:45:26 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36270.1321882819.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4421 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:40:17 -0000

Author: danydb
Date: 2011-11-21 14:45:23 +0100 (Mon, 21 Nov 2011)
New Revision: 4421

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: title h1 & h2

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:41:09 UTC (rev 442=
0)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:45:23 UTC (rev 442=
1)
@@ -11,6 +11,9 @@
 	font-family:Verdana,arial,sans-serif;
         padding: 30px;
         border : 1px solid green;
+        width:70%;
+        margin-left: 15%;
+        margin-right: 15%;
            =20
 }
 h2.error {
@@ -439,9 +442,6 @@
 //--
 $cn=3Dnew Database();
=20
-echo "<p class=3D\"info\"> F&eacute;licitation : Installation r&eacute;u=
ssie</p>";
-
-
 echo "<h1>Mise a jour du systeme</h1>";
 echo "<h2 > Mise &agrave; jour dossier</h2>";
=20
@@ -488,6 +488,7 @@
    }
=20
  if (! DEBUG) ob_end_clean();
- echo "<p class=3D\"info\">Tout est install&eacute; $succeed</p>";
+ echo "<p class=3D\"info\">Tout est install&eacute; $succeed";
 ?>
 <A HREF=3D"../index.php">Connectez-vous =C3=A0 PhpCompta</A>
+</p>
\ No newline at end of file



From MAILER-DAEMON Mon Nov 21 08:41:38 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSU7u-0005Z2-Hg
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:41:38 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:46:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36273.1321882897.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4422 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:41:36 -0000

Author: danydb
Date: 2011-11-21 14:46:38 +0100 (Mon, 21 Nov 2011)
New Revision: 4422

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php: h3 + p.info

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:45:23 UTC (rev 442=
1)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:46:38 UTC (rev 442=
2)
@@ -34,6 +34,13 @@
 	font-family:Verdana,arial,sans-serif;
         font-style: italic;
 }
+h3 {
+	color:blue;
+	font-size:12px;
+	font-family:Verdana,arial,sans-serif;
+        font-style: italic;
+        text-decoration: underline;
+}
 p.warning  {
    	font-family:Verdana,arial,sans-serif;
 	font-size:12px;



From MAILER-DAEMON Mon Nov 21 08:42:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSU8U-0006Ib-83
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:42:14 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:47:24 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36274.1321882933.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4423 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:42:12 -0000

Author: danydb
Date: 2011-11-21 14:47:23 +0100 (Mon, 21 Nov 2011)
New Revision: 4423

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php:h1 padding

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:46:38 UTC (rev 442=
2)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:47:23 UTC (rev 442=
3)
@@ -27,6 +27,8 @@
 	font-family:Verdana,arial,sans-serif;
         border : 1px solid blue;
         text-align: center;
+        padding-top: 10px;
+        padding-bottom: 10px;
 }
 h2 {
 	color:blue;



From MAILER-DAEMON Mon Nov 21 08:47:23 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSUDT-0006kK-E6
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:47:23 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:52:38 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36277.1321883242.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4424 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:47:22 -0000

Author: danydb
Date: 2011-11-21 14:52:37 +0100 (Mon, 21 Nov 2011)
New Revision: 4424

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php:msg connectez-vous


Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:47:23 UTC (rev 442=
3)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:52:37 UTC (rev 442=
4)
@@ -499,5 +499,5 @@
  if (! DEBUG) ob_end_clean();
  echo "<p class=3D\"info\">Tout est install&eacute; $succeed";
 ?>
-<A HREF=3D"../index.php">Connectez-vous =C3=A0 PhpCompta</A>
+<A style=3D"display:block;text-align: center" HREF=3D"../index.php">Conn=
ectez-vous =C3=A0 PhpCompta</A>
 </p>
\ No newline at end of file



From MAILER-DAEMON Mon Nov 21 08:48:13 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSUEH-0007Pu-K4
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:48:13 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:53:31 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36278.1321883292.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4425 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:48:11 -0000

Author: danydb
Date: 2011-11-21 14:53:30 +0100 (Mon, 21 Nov 2011)
New Revision: 4425

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php:h3 normal

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:52:37 UTC (rev 442=
4)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:53:30 UTC (rev 442=
5)
@@ -40,7 +40,7 @@
 	color:blue;
 	font-size:12px;
 	font-family:Verdana,arial,sans-serif;
-        font-style: italic;
+        font-style: normal;
         text-decoration: underline;
 }
 p.warning  {



From MAILER-DAEMON Mon Nov 21 08:53:48 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSUJg-0000wm-Tk
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:53:48 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 14:58:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36371.1321883627.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4426 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:53:47 -0000

Author: danydb
Date: 2011-11-21 14:58:54 +0100 (Mon, 21 Nov 2011)
New Revision: 4426

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php:couleur des succeeds

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:53:30 UTC (rev 442=
5)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 13:58:54 UTC (rev 442=
6)
@@ -99,8 +99,8 @@
  *        This file is included in each release  for a new upgrade
  *
  */
-$failed=3D"<span style=3D\"font-size:18px;color;red\">&#x2716;</span>";
-$succeed=3D"<span style=3D\"font-size:18px;color;green\">&#x2713;</span>=
";
+$failed=3D"<span style=3D\"font-size:18px;color:red\">&#x2716;</span>";
+$succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</span>=
";
=20
 $inc_path=3Dget_include_path();
 /**



From MAILER-DAEMON Mon Nov 21 08:57:36 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSUNM-0001gS-Ny
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 08:57:36 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 15:02:45 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.36461.1321883855.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4427 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 13:57:34 -0000

Author: danydb
Date: 2011-11-21 15:02:43 +0100 (Mon, 21 Nov 2011)
New Revision: 4427

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
#20 am?\195?\169liorer cosmetique setup.php:ajout tags html, title, body =
head

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 13:58:54 UTC (rev 442=
6)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-21 14:02:43 UTC (rev 442=
7)
@@ -1,3 +1,8 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 FINAL//EN"><HTML><HEAD>
+    <TITLE>PhpCompta - Mise =C3=A0 jour</TITLE>
+    <META http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUT=
F8">
+    </title>
+<head>
 <style type=3D"text/css">
 <!--
 body {
@@ -69,6 +74,8 @@
   background-color:lightgrey;
 }
 </style>
+</head>
+<body>
 <p align=3D"center">
   <IMG SRC=3D"../image/logo7.gif" alt=3D"Logo PhpCompta">
 </p>



From MAILER-DAEMON Mon Nov 21 10:42:11 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSW0Z-0003WK-Rr
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 10:42:11 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 16:47:18 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.37248.1321890130.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4428 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 15:42:10 -0000

Author: danydb
Date: 2011-11-21 16:47:16 +0100 (Mon, 21 Nov 2011)
New Revision: 4428

Modified:
   phpcompta/trunk/html/style.css
Log:
#css font-family : verdana, arial

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	2011-11-21 14:02:43 UTC (rev 4427)
+++ phpcompta/trunk/html/style.css	2011-11-21 15:47:16 UTC (rev 4428)
@@ -3,7 +3,7 @@
 BODY {
   background-color:#EDF3FF;
  font-size:10;
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
   padding: 0px 10px 0px 10px ;
   margin:0;
   color:blue;
@@ -29,7 +29,7 @@
 }
 table.table_large th,table.result th {
   font-weight:bold;
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
  border-bottom:1px solid blue;
  border-top:0;
=20
@@ -40,7 +40,7 @@
 }
=20
 h2 {
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
   font-size:14px;
   color:grey;
 }
@@ -151,7 +151,7 @@
 div.lextmenu {
=20
 	float:left;
-	font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
 	font-size:9px;
=20
 }
@@ -166,7 +166,7 @@
 div.recherche_form{
 	width:700px;
 	font-size:9px;
-	font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
   border-style:outset;
   border-width:1px;
=20
@@ -177,7 +177,7 @@
 	 padding-top:7px;
 	 padding-left:8px;
          font-size:9px;
-         font-family:helvetica,sans-serif;
+         font-family:verdana,helvetica,sans-serif;
 	 width:75%;
=20
 }
@@ -186,7 +186,7 @@
          float:left;
 		padding-top:7px;
          width:100%;
-         font-family:helvetica,sans-serif;
+         font-family:verdana,helvetica,sans-serif;
          clear:both;
=20
=20
@@ -196,12 +196,12 @@
          float:left;
 	 padding-top:7px;
          width:35%;
-         font-family:helvetica,sans-serif;
+         font-family:verdana,helvetica,sans-serif;
=20
 }
 div.no span{
 	position:static;
-	font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
 	font-weight:bold;
 	color:red;
=20
@@ -216,7 +216,7 @@
 }
 table.document th{
   font-weight:bold;
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
   border-bottom:2px solid blue;
   border-top:0;
   color:#25238F;
@@ -396,7 +396,7 @@
 a.detail
 {
   font-size:9px;
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
     text-decoration: none;
     display: block;
     color: blue;
@@ -405,7 +405,7 @@
 a.detail:hover
 {
   font-size:9px;
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -417,7 +417,7 @@
 	 padding:1em 1em;
 }
 div.redcontent a {
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
   text-decoration: none;
   display: block;
   color: blue;
@@ -425,7 +425,7 @@
 }
=20
 div.redcontent a:hover {
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -433,7 +433,7 @@
=20
 }
 div.content a {
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
   text-decoration: none;
   display: block;
   color: blue;
@@ -443,7 +443,7 @@
=20
=20
 div.content a:hover {
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -487,7 +487,7 @@
=20
 }
 div.redcontent input.text {
-   font-family:helvetica,sans-serif;
+   font-family:verdana,helvetica,sans-serif;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -496,7 +496,7 @@
   color:blue;
 }
 div.content input.text {
-   font-family:helvetica,sans-serif;
+   font-family:verdana,helvetica,sans-serif;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -876,7 +876,7 @@
 div.inner_box  {
   background-color:#e4e7ed;
  font-size:10;
-  font-family:helvetica,sans-serif;
+  font-family:verdana,helvetica,sans-serif;
   padding:0;
   margin:0;
   overflow:hidden;



From MAILER-DAEMON Mon Nov 21 10:44:13 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSW2X-0003gr-3P
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 10:44:13 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 16:49:27 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.37251.1321890252.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4429 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 15:44:11 -0000

Author: danydb
Date: 2011-11-21 16:49:26 +0100 (Mon, 21 Nov 2011)
New Revision: 4429

Modified:
   phpcompta/trunk/html/style.css
Log:
#css font-family : verdana

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	2011-11-21 15:47:16 UTC (rev 4428)
+++ phpcompta/trunk/html/style.css	2011-11-21 15:49:26 UTC (rev 4429)
@@ -628,7 +628,7 @@
 	border: 2px outset #201e87;
 	background-color:#879ED4;
 	font-size: 110% ;
-	font-family: helvetica,sans-serif;
+	font-family: verdana,helvetica,sans-serif;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -650,7 +650,7 @@
 	/*border:dotted 1px black;*/
 	border: 3px outset #201e87;
 	background-color: #879ED4;
-	font-family: helvetica,sans-serif;
+	font-family: verdana,helvetica,sans-serif;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -672,7 +672,7 @@
 	overflow: auto;
 	background-color:#DFE7FF;
 	font-size:10px ;
-	font-family: helvetica,sans-serif;
+	font-family: verdana,helvetica,sans-serif;
 	font-style: normal;
 	font-weight: normal;
 	color: black;
@@ -798,7 +798,7 @@
 	font-weight: bold;
=20
 	text-decoration:none;
-	font-family: helvetica,sans-serif;
+	font-family: verdana,helvetica,sans-serif;
 	background-image: url("image/bg-submit2.gif");
 	background-repeat: repeat-x;
 	background-position: left;
@@ -993,7 +993,7 @@
 {
   background-color:#F1E6E6;
  font-size:10;
-  font-family:helvetica,arial,sans-serif;
+  font-family: verdana,helvetica,arial,sans-serif;
   padding:0;
   margin:0;
   overflow:hidden;



From MAILER-DAEMON Mon Nov 21 15:15:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSaHU-0007Za-7X
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 15:15:56 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 21:21:01 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.37758.1321906555.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4430 - in phpcompta/trunk: . html html/image
	include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 20:15:54 -0000

Author: danydb
Date: 2011-11-21 21:20:59 +0100 (Mon, 21 Nov 2011)
New Revision: 4430

Removed:
   phpcompta/trunk/html/caisse.php
Modified:
   phpcompta/trunk/
   phpcompta/trunk/html/
   phpcompta/trunk/html/image/loading.gif
   phpcompta/trunk/html/index.php
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_jrn_def_sql.php
Log:
fichier obsolete, enl?\195?\168ve erreur en mode strict, fichiers css


Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svn:ignore
   - cache
compile
tmp

   + cache
compile
tmp
.setenv.sh.swp



Property changes on: phpcompta/trunk/html
___________________________________________________________________
Name: svn:ignore
   - *.log
ajax
.user_login.php.swp
.~lock.a.csv#
.~lock.a.ods#
.a.csv.swp
.direct.php.swp

   + *.log
ajax
.user_login.php.swp
.~lock.a.csv#
.~lock.a.ods#
.a.csv.swp
.direct.php.swp
.style-light.css.swp
.a.swp


Deleted: phpcompta/trunk/html/caisse.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/caisse.php	2011-11-21 15:49:26 UTC (rev 4429)
+++ phpcompta/trunk/html/caisse.php	2011-11-21 20:20:59 UTC (rev 4430)
@@ -1,69 +0,0 @@
-<script language=3D"javascript">
-                 function set_code(p_code)
-                 {
-
-                     for (i=3D0;i<10;i++)
-                     {
-                         if ( document.getElementById("id_"+i).value =3D=
=3D "")
-                         {
-                             document.getElementById("id_"+i).value=3Dp_=
code;
-                             break;
-                         }
-                     }
-                 }
-                 function f_reset(p_code)
-                 {
-                     document.getElementById("id_"+p_code).value=3D"";
-                 }
-                 </script>
-                 <style type=3D"text/css">
-                             /* CSS goes here */
-                             body {
-                                 font-size:
-                                 14px;
-                                 font-color:
-                                 green;
-                             }
-
-                             .btn {
-                                 border-size:
-                                 4px;
-                                 border-color:
-                                 blue;
-                                 border-style:
-                                 sunken;
-                                 background:
-                                 inherit;
-                                 font:
-                                 inherit;
-                                 color:
-                                 blue;
-                                 padding:
-                                 2px;
-                                 width:
-                                 150px;
-                                 height:
-                                 60px;
-                             }
-
-                             </style>
-                             <?php
-                             echo '<form method=3D"post" action=3D"resul=
t.php">';
-
-for ($i=3D0;$i<10;$i++)
-{
-    echo 'montant <input type=3D"TEXT" name=3D"in'.$i.'" id=3D"id_'.$i.'=
">';
-    echo '<input type=3D"BUTTON" value=3D"Efface" onClick=3D"f_reset('.$=
i.')">';
-    echo '<BR>';
-}
-
-
-
-for ($i=3D0; $i < 5;$i++)
-{
-    echo '<INPUT TYPE=3D"BUTTON" class=3D"btn" name=3D"button" value=3D"=
code '.$i.'" onClick=3D"set_code('.$i.')">';
-}
-?>
-<input type=3D"submit">
-            <input type=3D"reset">
-                        </form>

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

Modified: phpcompta/trunk/html/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	2011-11-21 15:49:26 UTC (rev 4429)
+++ phpcompta/trunk/html/index.php	2011-11-21 20:20:59 UTC (rev 4430)
@@ -30,7 +30,7 @@
  *  ce fichier deviendra l'un des patch </li>
  * <li>Faire de la doc </li>
  * </ol>
- *=20
+ *
  * </p>
  * \section conseil Conseils
  * <p>
@@ -63,7 +63,7 @@
  *
  * \section convention_code Coding convention
  * <p>
- * Some coding conventions to have a homogene code=20
+ * Some coding conventions to have a homogene code
  * <ol>
  * <li>Reuse the existing code , </li>
  * <li>Improve and check that the function is still working</li>
@@ -71,7 +71,7 @@
  * <li>In the folder include: filenames ending by  *.inc.php will be exe=
cuter after being included</li>
  * <li>Dans le r=C3=A9pertoire include: Les noms de fichiers sont *.php =
pour les fichiers contenant des fonctions uniquement</li>
  * <li>In the folder include: filenames end by  *.php if they contains o=
nly function</li>
- * <li>In the folder include: filenames starting with=20
+ * <li>In the folder include: filenames starting with
  * class_*.php if it is related to a class.</li>
  * <li>In the folder include/template: files for the HTML presentation
  * </li>
@@ -79,7 +79,7 @@
  *  </li>
  * <li>Write documentation </li>
  * </ol>
- *=20
+ *
  * </p>
  * \section advice Advices
  * <p>
@@ -122,8 +122,8 @@
 <style>
 BODY {
 background-color:white;
-font-size:12px;
-font-family:sans-serif;
+font-size:14px;
+font-family:sans-serif,arial;
 color:blue;
 }
 .remark {
@@ -136,7 +136,7 @@
 }
 .gras {
 font-size:12px;
-font-family:sans-serif;
+font-family:sans-serif,arial;
 color:red;
=20
 }
@@ -186,7 +186,7 @@
=20
 echo '
 <span style=3D"background-color:#879ed4;color:white;padding-left:4px;pad=
ding-right:4px;">
-version  5.6.SVNINFO - '.$my_domain.'
+version  6.0.SVNINFO - '.$my_domain.'
 </span>
 <BR>
 <BR>
@@ -238,9 +238,9 @@
     echo '<tr>';
   }
 echo '
-<TR>
-<TD COLSPAN=3D2 ALIGN=3DCENTER>
-<INPUT TYPE=3D"SUBMIT"  class=3D"button" NAME=3D"login" value=3D"Se conn=
ecter">
+<TR style=3D"height:50px;vertical-align:bottom">
+<TD style=3D"width:auto;text-align:center" colspan=3D"2">
+<INPUT TYPE=3D"SUBMIT"  style=3D"width:60%;height:32px;-moz-border-radiu=
s:10px;border-radius:10px" class=3D"button" NAME=3D"login" value=3D"Se co=
nnecter">
 </TD>
 </TR>
 </table>

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	2011-11-21 15:49:26 UTC (rev 442=
9)
+++ phpcompta/trunk/html/style-color.css	2011-11-21 20:20:59 UTC (rev 443=
0)
@@ -1,390 +1,402 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-    background-color:#E3FFE0;
-    font-size:10;
-    font-family:helvetica,arial,sans-serif;
-    padding:0;
-    margin:0;
-    color:#0E7E0E;
-
+  background-color:#EDF3FF;
+ font-size:10;
+  font-family:helvetica,sans-serif;
+  padding: 0px 10px 0px 10px ;
+  margin:0;
+  color:blue;
 }
 .notice {
-    color:red;
-    font-style: italic;
-    font-family: Arial,Helvetica,sans-serif;
-    font-weight: bold;
-}
+		color:red;
+        font-style: italic;
+        }
=20
-table.result,table.document ,table.resultfooter{
-    color:blue;
-    border:1px solid blue ;
-    width:100%;
-    border-spacing:  0px;
-    border-collapse:collapse;
+table.table_large, table.result  ,table.resultfooter {
+  color:blue;
+  /* border:blue solid 1px; */
+  width:100%;
+   border-spacing:  0px;
+   border-collapse:collapse;
+
 }
 table.resultfooter tfoot {
-    font-size:110%;
-    font-weight: bold;
+	font-size:110%;
+	font-weight: bold;
=20
=20
 }
-table.result th, table.document th {
-    font-weight:bold;
-    font-family:helvetica,arial,sans-serif;
-    border-bottom:1px solid blue;
-    padding-left:10px;
-    padding-right:10px;
-    padding-top:0;padding-bottom:0;
-    margin:0 0 0 0;
-    text-align: left;
-    background-color:lightgrey;
-    color:darkblue;
+table.table_large th,table.result th {
+  font-weight:bold;
+  font-family:helvetica,sans-serif;
+ border-bottom:1px solid blue;
+ border-top:0;
=20
+  color:#25238F;
+  text-align: left;
+  font-style: italic;
+
 }
=20
 h2 {
-    font-family:Helvetica,arial,sans-serif;
-    font-size:14px;
-    color:grey;
+  font-family:helvetica,sans-serif;
+  font-size:14px;
+  color:grey;
 }
 div.info {
-    background:#879ed4;
-    color:white;
-    font-size:120%;
-    text-align:center;
+	background:#879ed4;
+	color:white;
+	font-size:120%;
+  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:14pt;
+  text-align:center;
+  padding:0px;
+  margin:0px;
 }
 redcontent h2.info {
-    background:#879ed4;
-    color:white;
-    font-size:14pt;
-    text-align:center;
-    padding:0px;
-    margin:0px;
+  background:#879ed4;
+  color:white;
+  font-size:14pt;
+  text-align:center;
+  padding:0px;
+  margin:0px;
 }
 h2.info {
-    background-color:#0E7E0E;
-    color:white;
-    font-size:14px;
-    text-align:center;
-    padding:0px;
-    margin:0px;
+  background-color:#879ED4;
+	color:white;
+	font-size:14px;
+  text-align:center;
+  padding:0px;
+  margin:0px;
+  border:1px solid grey;
+
 }
=20
 h3.info {
-    background:#879ed4;
-    color:white;
-    font-size:14px;
-    text-align:center;
+  background:#879ed4;
+  color:white;
+  font-size:14px;
+  text-align:center;
 }
=20
 h2.info2 {
-    color:blue;
-    font-size:14px;
-    text-align:center;
+  color:blue;
+  font-size:14px;
+  text-align:center;
=20
 }
=20
=20
 h2.error {
-    background:red;
-    color:white;
-    font-size:14px;
+	background:red;
+	color:white;
+	font-size:14px;
 }
=20
 h1.title {
-    color: blue;
-    font-size:25px;
+	color: blue;
+	font-size:25px;
 }
=20
 div.u_tmenu {
+  margin-top:0px;
+  width:100%;
+ /* background-color:#879ED4; */
=20
-    margin-top:1px;
-    width:100%;
-    background-color:#879ED4;
=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 {
-    background-color:#879ED4;
-    float:left;
+	   float:left;
=20
 }
 div.u_tool {
-    float:left;
-    width:  100%;
-
-
-}
+	float:left;
+	width:  100%;
+	}
 div.u_tool div.name {
-    float:left;
-    margin-left:10px;
+       float:left;
+       margin-left:10px;
 }
 div.u_tool div.acces_direct{
-    float:right;
-    margin-right:10px;
-    text-align:right;
+	float:right;
+	margin-right:10px;
+	text-align:right;
=20
 }
=20
 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:9px;
=20
 }
 div.lextmenu {
=20
-    float:left;
-    font-family:helvetica,arial,sans-serif;
-    font-size:9px;
+	float:left;
+	font-family:helvetica,sans-serif;
+	font-size:9px;
=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:Helvetica,arial,sans-serif;
-    border-style:outset;
-    border-width:1px;
+	width:700px;
+	font-size:9px;
+	font-family:helvetica,sans-serif;
+  border-style:outset;
+  border-width:1px;
=20
 }
 div.redcontent{
=20
-    float:left;
-    padding-top:7px;
-    padding-left:8px;
-    font-size:9px;
-    font-family:helvetica,arial,sans-serif;
-    width:75%;
+         float:left;
+	 padding-top:7px;
+	 padding-left:8px;
+         font-size:9px;
+         font-family:helvetica,sans-serif;
+	 width:75%;
=20
 }
 div.content{
=20
-    float:left;
-    padding-top:7px;
-    width:100%;
-    font-family:helvetica,arial,sans-serif;
-    clear:both;
+         float:left;
+		padding-top:7px;
+         width:100%;
+         font-family:helvetica,sans-serif;
+         clear:both;
=20
=20
 }
 div.content30{
=20
-    float:left;
-    padding-top:7px;
-    width:35%;
-    font-family:helvetica,arial,sans-serif;
+         float:left;
+	 padding-top:7px;
+         width:35%;
+         font-family:helvetica,sans-serif;
=20
 }
 div.no span{
-    position:static;
-    font-family:helvetica,arial,sans-serif;
-    font-weight:bold;
-    color:red;
+	position:static;
+	font-family:helvetica,sans-serif;
+	font-weight:bold;
+	color:red;
=20
 }
+
+table.document {
+   color:blue;
+   width:100%;
+   border-spacing:  0px;
+   border-collapse:collapse;
+
+}
+table.document th{
+  font-weight:bold;
+  font-family:helvetica,sans-serif;
+  border-bottom:2px solid blue;
+  border-top:0;
+  color:#25238F;
+  text-align: left;
+  background-color:#EDF3FF;
+  font-style: italic;
+}
 .error {
-    width:60%;
-    margin-left:20%;
-    text-align: center;
+width:60%;
+margin-left:20%;
+text-align: center;
=20
-    color:white;
-    background-color:red;
-    font-weight: bolder;
-    font-size:120%;
+color:white;
+background-color:red;
+font-weight: bolder;
+font-size:120%;
 }
=20
 table.mtitle {
-    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:10px;
     background-color:#DDE6FF;
+    border:1px solid #99B1DF;
 }
 td.msubtitle {
-    text-align:center;
-    height:20px;
-    font-size:10px;
+	text-align:center;
+	height:20px;
+	font-size:10px;
     background-color:#DDE6FF;
 }
 span.mtitle {
-    color:gray;
-    background-color:blue;
-    font-size:10px;
-    border-style:groove
+	color:gray;
+	background-color:blue;
+	font-size:10px;
+	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;
-    border-size:0px;
+	background-color:#DDE6FF;
+	font-size:10px;
 }
 tr {
-    font-size:10px;
+	font-size:10px;
 }
 td.odd{
-    background-color:#DDE6FF ;
-    border-size:0px;
-    font-size:10px;
+	background-color:#DDE6FF ;
+	font-size:10px;
 }
 td.even{
-    border:0px;
-    font-size:10px;
+	border:0px;
+	font-size:10px;
 }
 td.cell{
-    height:32px;
-    padding: 1px;
+	    height:32px;
+	     padding: 1px;
 }
 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:10px;
+        background:#5D90CD ;
+        color:white;
+        text-align:center;
+	     width:120px;
 }
 a.mtitle {
-    font-size:10px;
-    text-decoration:none;
-    display:inline;
-    color: blue;
+  font-size:10px;
+  text-decoration:none;
+  display:inline;
+ color: blue;
=20
 }
 a.mtitle:hover {
-    font-size:10px;
-    text-decoration:none;
-    display:inline;
-    color: darkblue;
-    background-color:#5D90CD;
+  font-size:10px;
+  text-decoration:none;
+  display:inline;
=20
+ color: yellow;
+background-color:#5D90CD;
+
 }
 td.selectedcell a.mtitle {
-    font-size:1em;
-    text-decoration:none;
-    display:block;
-    color:white;
+ font-size:1em;
+ text-decoration:none;
+ display:block;
+ color:white;
 }
 a.dossier {
-    font-size:10px;
-    text-decoration:none;
-    display:block;
-    color: #202267;
+  font-size:10px;
+  text-decoration:none;
+  display:block;
+   color: #202267;
=20
 }
 tr.odd:hover td
 {
-    text-decoration:none;
-    background-color: #a9d6e4;
-    color:white;
+  text-decoration:none;
+  background-color: #a9d6e4;
+  color:yellow;
 }
 tr.even:hover td
 {
-    text-decoration:none;
-    background-color: #a9d6e4;
-    color:white;
+  text-decoration:none;
+  background-color: #a9d6e4;
+  color:yellow;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-    background-color:#a9d6e4;
-    color:white;
+  background-color:#a9d6e4;
+  color:yellow;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-    background-color:#a9d6e4;
-    color:white;
+  background-color:#a9d6e4;
+  color:yellow;
 }
 a.cell {
-    text-decoration:none;
-    display:block;
-    color:blue;
-    background-color:white;
-    font-size:9px;
+  text-decoration:none;
+  display:block;
+  color:blue;
+  background-color:white;
+  font-size:9px;
 }
=20
 a.cell:hover {
-    font-size:9px;
-    color:white;
-    background-color:#5D90CD;
-    text-decoration:none;
-    display:block;
-}
+  font-size:9px;
+  color:yellow;
+  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:helvetica,arial,sans-serif;
+  font-size:9px;
+  font-family:helvetica,sans-serif;
     text-decoration: none;
     display: block;
     color: blue;
@@ -392,8 +404,8 @@
=20
 a.detail:hover
 {
-    font-size:9px;
-    font-family:helvetica,arial,sans-serif;
+  font-size:9px;
+  font-family:helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -401,19 +413,19 @@
 }
=20
 li.menuv,ol.menuv {
-    display:inline;
-    padding:1em 1em;
+	 display:inline;
+	 padding:1em 1em;
 }
 div.redcontent a {
-    font-family:helvetica,arial,sans-serif;
-    text-decoration: none;
-    display: block;
-    color: blue;
+  font-family:helvetica,sans-serif;
+  text-decoration: none;
+  display: block;
+  color: blue;
=20
 }
=20
 div.redcontent a:hover {
-    font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -421,17 +433,17 @@
=20
 }
 div.content a {
-    font-family:helvetica,arial,sans-serif;
-    text-decoration: none;
-    display: block;
-    color: #0E7E0E;
-    padding: 1px ;
+  font-family:helvetica,sans-serif;
+  text-decoration: none;
+  display: block;
+  color: blue;
+padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-    font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -440,493 +452,493 @@
 }
=20
 div.redcontent a.mtitle {
-    text-decoration:none;
-    display:inline;
+  text-decoration:none;
+  display:inline;
=20
=20
-    color:black;
+  color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-    text-decoration:none;
-    display:inline;
-    color:white;
-    background-color:darkblue;
+  text-decoration:none;
+  display:inline;
+  color:white;
+  background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-    font-size:10px;
-    text-decoration:none;
-    display:inline;
-    color:blue;
+  font-size:10px;
+  text-decoration:none;
+  display:inline;
+  color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-    text-decoration:none;
-    display:inline;
-    background-color:darkblue;
-    color:white;
+  text-decoration:none;
+  display:inline;
+  background-color:darkblue;
+  color:white;
=20
=20
 }
 div.redcontent input.text {
-    font-family:helvetica,arial,sans-serif;
-    font-weight:normal;
-    border-color:336699;
-    border-style:solid;
-    background-color:orange;
-    border-width:1px;
-    color:blue;
+   font-family:helvetica,sans-serif;
+  font-weight:normal;
+  border-color:336699;
+  border-style:solid;
+  background-color:greenyellow;
+  border-width:1px;
+  color:blue;
 }
 div.content input.text {
-    font-family:helvetica,arial,sans-serif;
-    font-weight:normal;
-    border-color:336699;
-    border-style:solid;
-    border-width:1px;
-    background-color:orange;
-    color:blue;
+   font-family:helvetica,sans-serif;
+  font-weight:normal;
+  border-color:336699;
+  border-style:solid;
+  border-width:1px;
+  background-color:greenyellow;
+  color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-    background-color:orange;
+  background-color:greenyellow;
 }
 div.content input:focus {
-    background-color:orange;
+  background-color:greenyellow;
 }
 div.redcontent textarea:focus {
-    background-color: orange;
+background-color: greenyellow;
 }
 .document {
-    color: #1a207d;
-    border-collapse:collapse;
+color: #1a207d;
+border-collapse:collapse;
 }
 a.document{
-    font-size:12px;
-    text-decoration:none;
-    display:block;
+  font-size:12px;
+  text-decoration:none;
+  display:block;
 }
 a.document:hover {
-    text-decoration:none;
-    display:block;
+  text-decoration:none;
+  display:block;
=20
=20
 }
 .input_text {
-    border:groove 1px blue;
-    margin:1px;
+	   border:groove 1px blue;
+	margin:1px;
 }
+.input_text:hover {
+	border:groove 1px blue;
+	margin:1px;
+	background-color: greenyellow;
+}
 legend {
-    font-weight: bold;
-    font-style: italic;
-    font-size: 120% ;
+font-weight: bold;
+font-style: italic;
+font-size: 120% ;
=20
 }
 fieldset fieldset legend {
-    font-size:110%;
-    color:grey;
-}
+	 font-size:110%;
+	 color:grey;
+	 }
 select {
-    border: 1px solid blue;
-    margin:2px;
-    background-color:white;
+border: 1px solid blue;
+margin:2px;
+background-color:white;
=20
+
 }
=20
=20
=20
 .infobulle {
-    position:absolute;
-    border:1px solid black;
-    background-color:yellow;
-    top:0;left:0;
-    visibility:hidden;
-    z-index:20;
-    width:25em;
-
+	   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:red;
+	}
 span.action a.action {
-    border:2px outset ;
-    padding-left: 3px;
-    padding-right:3px;
-    text-decoration:none;
-    font-size:14px;
+  border:2px outset ;
+  padding-left: 3px;
+  padding-right:3px;
+  text-decoration:none;
+  font-size:14px;
=20
-    display:inline;
-    color:black;
-    background-color:lightgrey;
+  display:inline;
+  color:black;
+  background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-    text-decoration:none;
-    display:inline;
-    background-color:lightblue;
-    color:black;
+  text-decoration:none;
+  display:inline;
+  background-color:lightblue;
+  color:black;
 }
 div.popup_back{
-    position:absolute;
-    top:0px;
-    left:0px;
-    width:100%;
-    height:100%;
-    z-index:1;
-    /*background-color:lightgrey;*/
-    background-color: rgba(203, 203,203, 0.2);
-    display:none;
+	position:absolute;
+	top:0px;
+	left:0px;
+	opacity:0.6;
+	width:100%;
+	height:100%;
+	z-index:1;
+	/*background-color:lightgrey;*/
+
+	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: helvetica,arial,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: 110% ;
+	font-family: 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);*/
=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:lightblue;
-    font-family: helvetica,arial,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: helvetica,sans-serif;
+	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:4%;
-    bottom:0;
-    left:0;
-    right:0;
-    width:100%;
-    height:96%;
-    overflow: auto;
-    background-color:#DFE7FF;
-    font-size:10px ;
-    font-family: helvetica,arial,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:10px ;
+	font-family: 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);*/
 }
 div.autocomplete {
-    position:relative;
-    background-color:white;
-    border:1px solid #888;
-    margin:0;
-    padding:0;
-    text-align:left;
-    font-size:12px;
+  position:relative;
+  background-color:white;
+  border:1px solid #888;
+  margin:0;
+  padding:0;
+  text-align:left;
+  font-size:12px;
=20
 }
 div.autocomplete em {
-    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:375;
-    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:10; }
+span.informal{ font-size:95%; color:black;}
+
 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{
-    border:1px groove grey;
-    float:left;
+		border:1px groove grey;
+		float:left;
=20
-}
+		}
 div.pc_calendar table {
-    text-align:center;
+	text-align:center;
=20
 }
 div.pc_calendar tr{
-    height:40;
+	height:40;
=20
=20
 }
 div.pc_calendar td{
-    width:10em;
+	width:10em;
 }
=20
 div.pc_calendar td.weekend {
-    background-color:#cce0e6;
+	background-color:#cce0e6;
=20
 }
 div.pc_calendar td.workday{
-    background-color:inherit;
+	background-color:inherit;
=20
=20
 }
 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
-.button {
-    font-size:10;
-    color:black;
-    text-decoration:none;
-    font-family: helvetica,arial,sans-serif;
-    background-color:#DFDFDF;
-    border-style:  outset ;
-    border-color:  blue ;
-    border-width:1;
-    padding:2 4 2 4;
-    cursor:pointer;
-    margin:1 2 1 2;
-    -moz-border-radius:2 2;
+a#anchorbutton, .button, a.button,div.content a.button {
+	font-size:10;
+	color:white;
+	font-weight: bold;
=20
+	text-decoration:none;
+	font-family: helvetica,sans-serif,arial;
+	background-image: url("image/bg-submit3.gif");
+	background-repeat: repeat-x;
+	background-position: left;
+	height:24px;
+	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;
+	-moz-border-radius:6;
+	border-radius:6;
+
 }
-.button:hover {
-    cursor:pointer;
-    background-color:white;
-    border-style:  inset ;
-    color:blue;
-    margin:1 2 1 2;
-}
-td.tool {
-    border: 0;
+a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
+	cursor:pointer;
+	background-color:white;
+	color:yellow;
+	margin:1 2 1 2;
+	}
+	td.tool {
+	border: solid 1px gray;
=20
-}
+	}
 div.topmenu {
-    float:left;
-    width:100%;
+	float:left;
+	width:100%;
=20
 }
=20
 h2.dossier {
-    color:white;
-    font-style: oblique;
+	color:darkblue;
+	font-style: italic;
=20
-    font-size:15px;
-    margin:0;
-    padding:0;
-    text-align:center;
+font-size:20px;
+margin:0;
+padding:0;
+text-align:center;
 }
-a#anchorbutton {
-    font-size:10;
-    color:black;
-    text-decoration:none;
-    font-family: helvetica,arial,sans-serif;
-    background-color:#DFDFDF;
-    border-style:  outset ;
-    border-color:  blue ;
-    border-width:1;
-    padding:2 4 2 4;
-    cursor:pointer;
-    margin:1 2 1 2;
-    -moz-border-radius:2 2;
+/* </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}
+div.welcome {
=20
 }
-a#anchorbutton :hover {
-    cursor:pointer;
-    background-color:white;
-    border-style:  inset ;
-    color:blue;
-    margin:1 2 1 2;
-}
-/* </style> */
-div.add_todo_list {
-    border:1px solid blue;
-    display:none;
-    background-color:#CFCDFF;
-    padding:3;
-    position:absolute;
-    text-align:left;
-    line-height:3em;
-    z-index:1}
 div.gest_name {
-    float:right;
-    margin-right:150;
-    margin-top:15
+	float:right;
+	margin-right:150;
+	margin-top:15
 }
 h2.gest_name {
-    border-left: 1px solid  #403a8d;
-    border-bottom:1px solid  #403a8d;
-    border-top:1px solid  #403a8d;
-    border-right:1px solid  #403a8d;
-    padding: 5px;
-    font-size:140%;
-    color:#403a8d;
-
+	border-left: 5px solid  #403a8d;
+	border-bottom:1px solid  #b4bbc2;
+		border-top:1px solid  #b4bbc2;
+		border-right:1px solid  #b4bbc2;
+	padding: 5px;
 }
 div.op_detail_frame  {
-    background-color:#e4e7ed;
-    height:100%; width:100%;
+  background-color:#e4e7ed;
+  height:100%; width:100%;
=20
=20
 }
 div.inner_box  {
-    background-color:#ccffcc;
-    font-size:10;
-    font-family:helvetica,arial,sans-serif;
-    padding:0;
-    margin:0;
-    overflow:hidden;
-    z-index:3;
+  background-color:#e4e7ed;
+ font-size:10;
+  font-family:helvetica,sans-serif;
+  padding:0;
+  margin:0;
+  overflow:hidden;
+  z-index:3;
=20
-    position:absolute;
-    left:10%;
+position:absolute;
+left:10%;
=20
=20
-    border:1px solid darkblue;
+border:1px solid darkblue;
=20
 }
 div.op_detail_title {
-    background-color:grey;
-    /*	width:500;*/
+	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
 }
+
 div.divinfo
-{  color:red;text-align:right;display:block;width:30em;height:13;}
+{  color:red;text-align:right;display:block;width:30em;height:13;font-we=
ight:bold}
=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:100;
+              margin-left:25%
+              z-index:2;
+              width:50%;
+              display:none;
+	      background-color:#e4e7ed;
 }
-table.result td
+
+table.table_large td, table.result td
 {
-    padding-left:5px;
-    padding-right:5px;
+	padding-left:5px;
+	padding-right:5px;
 }
 table.info_op
 {
-	margin-left: 30%;
-	margin-right: 30%;
+	font-size:18;
+	margin-right:30%;
 	width:20%;
=20
 }
@@ -934,11 +946,11 @@
 {
 font-size:14;
 background:white;
-width:5%
 }
 h2#jrn_name
 {
 	margin-right:30%;
+	float: right;
=20
 }
 tr.footer{
@@ -951,6 +963,7 @@
 	font-weight: bold;
 	color:black;
 	}
+
 div#jrn_name_div
 {
 	float: right;
@@ -966,14 +979,14 @@
 #direct
 {
 	display:inline;
-	float:right;
+	float:left;
+	width:400px;
=20
-
 }
-.direct
+#calc
 {
-		font-size:6px;
-	   border:groove 1px #00ff00;
+	display:inline;
+	float:left;
 }
 div#wait_box
 {
@@ -1005,4 +1018,57 @@
               width:50em;
 		      background-color:#EDF3FF;
=20
+}
+ul {
+	padding-left: 110px;
+}
+a.line,div.content a.line
+{
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+ color: #0000ff;
+}
+a.line:hover,div_content a.line
+{
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+  color: #0000ff;
+     background-color: rgb(93, 144, 205);
+}
+#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;
+}
+table.table_large tr.odd ,table.table_large tr.even {
+
+	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;
+}
+span.invoice
+{
+    font-size: 120%;
+    font-style: italic;
+    display:block;
+    margin: 20px;
+    font-weight: bold;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-21 15:49:26 UTC (rev 442=
9)
+++ phpcompta/trunk/html/style-light.css	2011-11-21 20:20:59 UTC (rev 443=
0)
@@ -3,18 +3,18 @@
 BODY {
   background-color:#EDF3FF;
  font-size:10;
- color:blue;
-  font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
   padding: 0px 10px 0px 10px ;
   margin:0;
+  color:blue;
 }
 .notice {
 		color:red;
         font-style: italic;
         }
=20
-table.result  ,table.resultfooter {
-  color:#0000ff;
+table.table_large, table.result  ,table.resultfooter {
+  color:blue;
   /* border:blue solid 1px; */
   width:100%;
    border-spacing:  0px;
@@ -27,10 +27,10 @@
=20
=20
 }
-table.result th {
+table.table_large th,table.result th {
   font-weight:bold;
-  font-family:helvetica,arial,sans-serif;
- border-bottom:1px solid black;
+  font-family:helvetica,sans-serif;
+ border-bottom:1px solid blue;
  border-top:0;
=20
   color:#25238F;
@@ -40,7 +40,7 @@
 }
=20
 h2 {
-  font-family:Helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
   font-size:14px;
   color:grey;
 }
@@ -86,7 +86,7 @@
 }
=20
 h2.info2 {
-  color:#0000ff;
+  color:blue;
   font-size:14px;
   text-align:center;
=20
@@ -100,7 +100,7 @@
 }
=20
 h1.title {
-	color: #0000ff;
+	color: blue;
 	font-size:25px;
 }
=20
@@ -125,7 +125,6 @@
 div.u_tool {
 	float:left;
 	width:  100%;
-
 	}
 div.u_tool div.name {
        float:left;
@@ -150,8 +149,9 @@
=20
 }
 div.lextmenu {
+
 	float:left;
-	font-family:helvetica,arial,sans-serif;
+	font-family:helvetica,sans-serif;
 	font-size:9px;
=20
 }
@@ -166,47 +166,49 @@
 div.recherche_form{
 	width:700px;
 	font-size:9px;
-	font-family:Helvetica,arial,sans-serif;
+	font-family:helvetica,sans-serif;
   border-style:outset;
   border-width:1px;
=20
 }
 div.redcontent{
+
          float:left;
 	 padding-top:7px;
 	 padding-left:8px;
          font-size:9px;
-         font-family:helvetica,arial,sans-serif;
+         font-family:helvetica,sans-serif;
 	 width:75%;
=20
 }
 div.content{
+
          float:left;
 		padding-top:7px;
-         width:96%;
-         font-family:helvetica,arial,sans-serif;
+         width:100%;
+         font-family:helvetica,sans-serif;
          clear:both;
-         margin-left:2%;
=20
=20
 }
 div.content30{
+
          float:left;
 	 padding-top:7px;
          width:35%;
-         font-family:helvetica,arial,sans-serif;
+         font-family:helvetica,sans-serif;
=20
 }
 div.no span{
 	position:static;
-	font-family:helvetica,arial,sans-serif;
+	font-family:helvetica,sans-serif;
 	font-weight:bold;
 	color:red;
=20
 }
=20
 table.document {
-   color:#0000ff;
+   color:blue;
    width:100%;
    border-spacing:  0px;
    border-collapse:collapse;
@@ -214,8 +216,8 @@
 }
 table.document th{
   font-weight:bold;
-  font-family:helvetica,arial,sans-serif;
-  border-bottom:2px solid #0000ff;
+  font-family:helvetica,sans-serif;
+  border-bottom:2px solid blue;
   border-top:0;
   color:#25238F;
   text-align: left;
@@ -225,9 +227,10 @@
 .error {
 width:60%;
 margin-left:20%;
+text-align: center;
+
 color:white;
 background-color:red;
-text-align: center;
 font-weight: bolder;
 font-size:120%;
 }
@@ -260,7 +263,7 @@
 }
 span.mtitle {
 	color:gray;
-	background-color:#0000ff;
+	background-color:blue;
 	font-size:10px;
 	border-style:groove
 }
@@ -276,14 +279,12 @@
 tr.odd {
 	background-color:#DDE6FF;
 	font-size:10px;
-  border-width:0px;
 }
 tr {
 	font-size:10px;
 }
 td.odd{
 	background-color:#DDE6FF ;
-	border-width:0px;
 	font-size:10px;
 }
 td.even{
@@ -296,7 +297,7 @@
 }
 td.selectedcell{
 	border-style:inset;
-        border-color:#0000ff;
+        border-color:blue;
 	border-width:1pt ;
 	font-size:10px;
         background:#5D90CD ;
@@ -308,7 +309,7 @@
   font-size:10px;
   text-decoration:none;
   display:inline;
- color: #0000ff;
+ color: blue;
=20
 }
 a.mtitle:hover {
@@ -316,7 +317,7 @@
   text-decoration:none;
   display:inline;
=20
- color: darkblue;
+ color: yellow;
 background-color:#5D90CD;
=20
 }
@@ -337,35 +338,35 @@
 {
   text-decoration:none;
   background-color: #a9d6e4;
-  color:white;
+  color:yellow;
 }
 tr.even:hover td
 {
   text-decoration:none;
   background-color: #a9d6e4;
-  color:white;
+  color:yellow;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
   background-color:#a9d6e4;
-  color:white;
+  color:yellow;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
   background-color:#a9d6e4;
-  color:white;
+  color:yellow;
 }
 a.cell {
   text-decoration:none;
   display:block;
-  color:#0000ff;
+  color:blue;
   background-color:white;
   font-size:9px;
 }
=20
 a.cell:hover {
   font-size:9px;
-  color:white;
+  color:yellow;
   background-color:#5D90CD;
   text-decoration:none;
   display:block;
@@ -395,16 +396,16 @@
 a.detail
 {
   font-size:9px;
-  font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
     text-decoration: none;
     display: block;
-    color: #0000ff;
+    color: blue;
 }
=20
 a.detail:hover
 {
   font-size:9px;
-  font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -416,15 +417,15 @@
 	 padding:1em 1em;
 }
 div.redcontent a {
-  font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
   text-decoration: none;
   display: block;
-  color: #0000ff;
+  color: blue;
=20
 }
=20
 div.redcontent a:hover {
-  font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -432,17 +433,17 @@
=20
 }
 div.content a {
-  font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
   text-decoration: none;
   display: block;
   color: blue;
-padding: 1px ;
+padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-  font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -471,7 +472,7 @@
   font-size:10px;
   text-decoration:none;
   display:inline;
-  color:#0000ff;
+  color:blue;
=20
=20
=20
@@ -486,34 +487,34 @@
=20
 }
 div.redcontent input.text {
-   font-family:helvetica,arial,sans-serif;
+   font-family:helvetica,sans-serif;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
-  background-color:orange;
+  background-color:greenyellow;
   border-width:1px;
-  color:#0000ff;
+  color:blue;
 }
 div.content input.text {
-   font-family:helvetica,arial,sans-serif;
+   font-family:helvetica,sans-serif;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
   border-width:1px;
-  background-color:orange;
-  color:#0000ff;
+  background-color:greenyellow;
+  color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-  background-color:orange;
+  background-color:greenyellow;
 }
 div.content input:focus {
-  background-color:orange;
+  background-color:greenyellow;
 }
 div.redcontent textarea:focus {
-background-color: orange;
+background-color: greenyellow;
 }
 .document {
 color: #1a207d;
@@ -531,11 +532,13 @@
=20
 }
 .input_text {
-	   border:groove 1px #0000ff;
+	   border:groove 1px blue;
 	margin:1px;
 }
 .input_text:hover {
-	background-color: yellow;
+	border:groove 1px blue;
+	margin:1px;
+	background-color: greenyellow;
 }
 legend {
 font-weight: bold;
@@ -548,7 +551,7 @@
 	 color:grey;
 	 }
 select {
-border: 1px solid #0000ff;
+border: 1px solid blue;
 margin:2px;
 background-color:white;
=20
@@ -561,15 +564,15 @@
 	   position:absolute;
 	   border:1px solid black;
 	   background-color:yellow;
-	   top:0;left:0;
-	   visibility:hidden;
-	   z-index:2;
-	   width:25em;
 	   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 {
@@ -604,12 +607,12 @@
 	position:absolute;
 	top:0px;
 	left:0px;
+	opacity:0.6;
 	width:100%;
-height: 150%;
-
+	height:100%;
 	z-index:1;
 	/*background-color:lightgrey;*/
-	/*background-color: rgba(203, 203,203, 0.2);*/
+
 	display:none;
 }
=20
@@ -625,7 +628,7 @@
 	border: 2px outset #201e87;
 	background-color:#879ED4;
 	font-size: 110% ;
-	font-family: helvetica,arial,sans-serif;
+	font-family: helvetica,sans-serif;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -647,7 +650,7 @@
 	/*border:dotted 1px black;*/
 	border: 3px outset #201e87;
 	background-color: #879ED4;
-	font-family: helvetica,arial,sans-serif;
+	font-family: helvetica,sans-serif;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -667,9 +670,9 @@
 	width:100%;
 	height:96%;
 	overflow: auto;
-  background-color:#e4e7ed;
+	background-color:#DFE7FF;
 	font-size:10px ;
-	font-family: helvetica,arial,sans-serif;
+	font-family: helvetica,sans-serif;
 	font-style: normal;
 	font-weight: normal;
 	color: black;
@@ -682,41 +685,36 @@
 div.autocomplete {
   position:relative;
   background-color:white;
+  border:1px solid #888;
   margin:0;
   padding:0;
   text-align:left;
   font-size:12px;
=20
 }
-span.informal {
-    font-size:12px;
-
- }
 div.autocomplete em {
-	color:#0000ff;
+	color:blue;
 	font-weight:bold;
 }
 div.autocomplete ul {
   list-style-type:none;
-  width: 350px;
   background-color:white;
+  border:1px solid #888;
+  width:375px;
   margin:0;
   padding:0;
-  border:1px solid #888;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
   list-style-type:none;
-  width: auto;
   display:block;
   margin:0;
   padding:0px;
   /*height:32px;*/
-  border:1px dotted  #e6e6fa;
-
   cursor:pointer;
 }
+span.informal{ font-size:95%; color:black;}
=20
 ul.select_table  {
 	/*padding:5px;*/
@@ -794,32 +792,37 @@
 cursor:inherit;
 }
=20
-.button , a.button,div.content a.button {
+a#anchorbutton, .button, a.button,div.content a.button {
 	font-size:10;
-	color:white;
+	color:black;
 	font-weight: bold;
=20
 	text-decoration:none;
-	font-family: helvetica,arial,sans-serif;
-	background-image: url("image/bg-submit3.gif");
+	font-family: helvetica,sans-serif,arial;
+	background-color: #DFDFDF;
 	background-repeat: repeat-x;
 	background-position: left;
-
-	border-style:  outset ;
-	border-color:  #0000ff ;
-	border-width:0;
-	padding:2 4 2 4;
+	height:32px;
+	border-color:  gray;
+	border-style: outset;
+	border-width:2;
+	padding-bottom: 4;
+	padding-top: 4;
+	padding-right: 6;
+	padding-left:  6;
+	margin-top:3px;
 	cursor:pointer;
 	margin:1 2 1 2;
-	-moz-border-radius:2 2;
+	-moz-border-radius:6;
+	border-radius:6;
=20
 }
-.button:hover, a.button:hover,div.content a.button:hover  {
+a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
 	cursor:pointer;
 	background-color:white;
-	border-style:  inset ;
-	color:#0000ff;
+	color:black;
 	margin:1 2 1 2;
+	border-style: inset;
 	}
 	td.tool {
 	border: solid 1px gray;
@@ -840,37 +843,9 @@
 padding:0;
 text-align:center;
 }
-a#anchorbutton {
-	font-size:10;
-	color:white;
-	font-weight: bold;
-
-	text-decoration:none;
-	font-family: helvetica,arial,sans-serif;
-	background-image: url("image/bg-submit3.gif");
-	background-repeat: repeat-x;
-	background-position: left;
-
-	border-style:  outset ;
-	border-color:  #0000ff ;
-	border-width:1;
-	padding:2 4 2 4;
-	cursor:pointer;
-	margin:1 2 1 2;
-	-moz-border-radius:2 2;
-
-}
-a#anchorbutton:hover {
-	cursor:pointer;
-	background-color:white;
-	border-style:  inset ;
-	color:#0000ff;
-
-	margin:1 2 1 2;
-	}
 /* </style> */
 div.add_todo_list {
-                    border:1px solid #0000ff;
+                    border:1px solid blue;
                     display:none;
                     background-color:#BFD0FF;
                     padding:3;
@@ -900,9 +875,9 @@
=20
 }
 div.inner_box  {
-  background-color:#e4e7ed;
+  background-color:whitesmoke;
  font-size:10;
-  font-family:helvetica,arial,sans-serif;
+  font-family:helvetica,sans-serif;
   padding:0;
   margin:0;
   overflow:hidden;
@@ -945,27 +920,27 @@
 div.divinfo
 {  color:red;text-align:right;display:block;width:30em;height:13;font-we=
ight:bold}
=20
-
 div#search_form
 {
               position:absolute;
               border:1px solid black;
               top:15%;left:100;
-              margin-left:25%;
+              margin-left:25%
               z-index:2;
               width:50%;
               display:none;
 	      background-color:#e4e7ed;
 }
-table.result td
+
+table.table_large td, table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
 }
 table.info_op
 {
-	margin-left: 30%;
-	margin-right: 30%;
+	font-size:18;
+	margin-right:30%;
 	width:20%;
=20
 }
@@ -973,17 +948,12 @@
 {
 font-size:14;
 background:white;
-width:5%
 }
 h2#jrn_name
 {
-	padding:0 ;
-	margin:0;
+	margin-right:30%;
+	float: right;
=20
-	float:right;
-	font-size:18;
-	display: inline;
-	color:#15158e;
 }
 tr.footer{
 	font-size:14;
@@ -995,6 +965,7 @@
 	font-weight: bold;
 	color:black;
 	}
+
 div#jrn_name_div
 {
 	float: right;
@@ -1010,17 +981,15 @@
 #direct
 {
 	display:inline;
-	float:right;
+	float:left;
+	width:400px;
=20
-
 }
-.direct
+#calc
 {
-		font-size:6px;
-	   border:groove 1px #33378d;
-	margin:1px;
+	display:inline;
+	float:left;
 }
-
 div#wait_box
 {
   background-color:#F1E6E6;
@@ -1053,5 +1022,55 @@
=20
 }
 ul {
-	padding-left: 100px;
+	padding-left: 110px;
 }
+a.line,div.content a.line
+{
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+ color: #0000ff;
+}
+a.line:hover,div_content a.line
+{
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+  color: #0000ff;
+     background-color: rgb(93, 144, 205);
+}
+#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;
+}
+table.table_large tr.odd ,table.table_large tr.even {
+
+	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;
+}
+span.invoice
+{
+    font-size: 120%;
+    font-style: italic;
+    display:block;
+    margin: 20px;
+    font-weight: bold;
+}
\ No newline at end of file

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-21 15:49:26 =
UTC (rev 4429)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-21 20:20:59 =
UTC (rev 4430)
@@ -185,7 +185,7 @@
      *\return string with html code
      *\note the form tag are not  set here
      */
-    function input($p_array=3Dnull)
+    function input($p_array=3Dnull,$notused=3D0)
     {
         global $g_parameter;
         if ( $p_array !=3D null)
@@ -384,7 +384,7 @@
      *\param $p_array an array usually is $_POST
      *\return string with code html
      */
-    public function confirm($p_array)
+    public function confirm($p_array,$p_nothing=3D0)
     {
         global $g_parameter;
         $r=3D"";
@@ -589,7 +589,7 @@
      *\param $p_array usually $_POST
      *\return string with HTML code
      */
-    public function insert($p_array)
+    public function insert($p_array=3Dnull)
     {
         global $g_parameter;
 		bcscale(2);

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	2011-11-21 15:4=
9:26 UTC (rev 4429)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-21 20:2=
0:59 UTC (rev 4430)
@@ -179,7 +179,7 @@
 		/*
 		 * check if the accounting for VAT are valid
 		 */
-		$a_poste=3Dsplit(',',$tva_rate->tva_poste);
+		$a_poste=3Dexplode(',',$tva_rate->tva_poste);
=20
 		if (
 		    $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=3D=
$1',array($a_poste[0])) =3D=3D 0 ||
@@ -259,10 +259,6 @@
=20
     }
=20
-    public function save($p_array)
-    {
-        echo "<h2> Acc_Ledger_Purchase::save Not implemented</h2>";
-    }
=20
     /*!\brief insert into the database, it calls first the verify functi=
on
      * change the value of this->jr_id and this->jr_internal.
@@ -299,7 +295,7 @@
      *\return string
      *\note throw an Exception
      */
-    public function insert($p_array)
+    public function insert($p_array=3Dnull)
     {
         global $g_parameter;
         extract ($p_array);
@@ -467,10 +463,7 @@
                 /* if the quantity is < 0 then the stock increase (retur=
n of
                  *  material)
                  */
-                $nNeg=3D($
-                       {"e_quant".$i
-                       }
-                       <0)?-1:1;
+                $nNeg=3D(${"e_quant" . $i}< 0) ? -1 : 1;
=20
                 // always save quantity but in withStock we can find
                 // what card need a stock management
@@ -680,6 +673,7 @@
                         $acc_operation->jrn=3D$p_jrn;
                         $acc_operation->type=3D'c';
                         $acc_operation->periode=3D$tperiode;
+						$acc_operation->insert_jrnx();
                     }
=20
                 }
@@ -842,21 +836,6 @@
         return $internal;
     }
=20
-    public function update()
-    {
-        echo "<h2> Acc_Ledger_Purchase::update Not implemented</h2>";
-    }
-
-    public function load()
-    {
-        echo "<h2> Acc_Ledger_Purchase::load Not implemented</h2>";
-
-    }
-
-    public function delete()
-    {
-        echo "<h2> Acc_Ledger_Purchase::delete Not implemented</h2>";
-    }
     /*!\brief display the form for entering data for invoice
      *\param $p_array is null or you can put the predef operation or the=
 $_POST
     \code
@@ -889,7 +868,7 @@
     \endcode
      *\return HTML string
      */
-    public function input($p_array=3Dnull)
+    public function input($p_array=3Dnull,$p_readonly=3D0)
     {
         global $g_parameter;
         if ( $p_array !=3D null ) extract($p_array);

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	2011-11-21 15:49:26=
 UTC (rev 4429)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-21 20:20:59=
 UTC (rev 4430)
@@ -180,7 +180,7 @@
 		/*
 		 * check if the accounting for VAT are valid
 		 */
-		$a_poste=3Dsplit(',',$tva_rate->tva_poste);
+		$a_poste=3Dexplode(',',$tva_rate->tva_poste);
=20
 		if (
 		    $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=3D=
$1',array($a_poste[0])) =3D=3D 0 ||
@@ -221,10 +221,6 @@
=20
     }
=20
-    public function save($p_array)
-    {
-        echo "<h2> Acc_Ledger_Sold::save Not implemented</h2>";
-    }
=20
     /*!\brief insert into the database, it calls first the verify functi=
on,
      * change the value of this->jr_id and this->jr_internal
@@ -234,7 +230,7 @@
      *\return string
      *\note throw an Exception
      */
-    public function insert($p_array)
+    public function insert($p_array=3Dnull)
     {
         global $g_parameter;
         extract ($p_array);
@@ -432,7 +428,7 @@
                     $acc_operation->periode=3D$tperiode;
                     if ($value < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($=
value));
                     $acc_operation->insert_jrnx();
-                   =20
+
                     // if TVA is on both side, we deduce it immediately
                     if ( $oTva->get_parameter("both_side")=3D=3D1)
                     {
@@ -613,22 +609,7 @@
         return $internal;
     }
=20
-    public function update()
-    {
-        echo "<h2> Acc_Ledger_Sold::update Not implemented</h2>";
-    }
=20
-    public function load()
-    {
-        echo "<h2> Acc_Ledger_Sold::load Not implemented</h2>";
-
-    }
-
-    public function delete()
-    {
-        echo "<h2> Acc_Ledger_Sold::delete Not implemented</h2>";
-    }
-
     /*!@brief show the summary of the operation and propose to save it
      *@param array contains normally $_POST. It proposes also to save
      * the Analytic accountancy
@@ -983,7 +964,7 @@
     *
     *\return HTML string
     */
-    function input($p_array=3Dnull)
+    function input($p_array=3Dnull,$p_readonly=3D0)
     {
         global $g_parameter;
         if ( $p_array !=3D null ) extract($p_array);

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2011-11-21 15:49:26 UTC =
(rev 4429)
+++ phpcompta/trunk/include/class_html_input.php	2011-11-21 20:20:59 UTC =
(rev 4430)
@@ -222,7 +222,7 @@
     }
     static function warnbulle($p_comment)
     {
-        $r=3D'<A HREF=3D"#" style=3D"display:inline;color:black;backgrou=
nd-color:red;padding-left:4px;padding-right:4px;text-decoration:none;" on=
mouseover=3D"showBulle(\''.$p_comment.'\')"  onclick=3D"showBulle(\''.$p_=
comment.'\')" onmouseout=3D"hideBulle(0)">XX</A>';
+        $r=3D'<A HREF=3D"#" style=3D"display:inline;color:red;background=
-color:white;padding-left:4px;padding-right:4px;text-decoration:none;" on=
mouseover=3D"showBulle(\''.$p_comment.'\')"  onclick=3D"showBulle(\''.$p_=
comment.'\')" onmouseout=3D"hideBulle(0)">&Delta;</A>';
         return $r;
     }
     /**

Modified: phpcompta/trunk/include/class_jrn_def_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_jrn_def_sql.php	2011-11-21 15:49:26 UTC=
 (rev 4429)
+++ phpcompta/trunk/include/class_jrn_def_sql.php	2011-11-21 20:20:59 UTC=
 (rev 4430)
@@ -172,7 +172,7 @@
 		return $oobj;
 	}
=20
-	public function insert()
+	public function insert($p_array=3Dnull)
 	{
 		if ($this->verify_sql() !=3D 0)
 			return;



From MAILER-DAEMON Mon Nov 21 16:12:51 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSbAZ-0002D0-CH
	for mharc-phpcompta-dev@gnu.org; Mon, 21 Nov 2011 16:12:51 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 21 Nov 2011 22:18:04 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.37918.1321909970.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4431 - in phpcompta/trunk: html html/image 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: Mon, 21 Nov 2011 21:12:50 -0000

Author: danydb
Date: 2011-11-21 22:18:02 +0100 (Mon, 21 Nov 2011)
New Revision: 4431

Modified:
   phpcompta/trunk/html/image/loading.gif
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_anc_acc_list.php
   phpcompta/trunk/sql/object-6.0.sql
Log:
fix details

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

Modified: phpcompta/trunk/html/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	2011-11-21 20:20:59 UTC (rev 4430)
+++ phpcompta/trunk/html/style.css	2011-11-21 21:18:02 UTC (rev 4431)
@@ -836,6 +836,7 @@
 h2.dossier {
 	color:darkblue;
 	font-style: italic;
+display:inline;
=20
 font-size:20px;
 margin:0;

Modified: phpcompta/trunk/include/class_anc_acc_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_anc_acc_list.php	2011-11-21 20:20:59 UT=
C (rev 4430)
+++ phpcompta/trunk/include/class_anc_acc_list.php	2011-11-21 21:18:02 UT=
C (rev 4431)
@@ -29,9 +29,9 @@
 class Anc_Acc_List extends Anc_Acc_Link
 {
   /**
-   *@brief display form to get the parameter=20
+   *@brief display form to get the parameter
    *  - card_poste 1 by card, 2 by account
-   *  - from_poste=20
+   *  - from_poste
    *  - to_poste
    *  - from from date
    *  - to until date
@@ -48,7 +48,7 @@
 			array('value'=3D>4,'label'=3D>'Par activit=C3=A9/Poste Comptable')
=20
 			);
-   =20
+
     $icard->selected=3D$this->card_poste;
     $r.=3D$icard->input();
     $r.=3DHtmlInput::request_to_hidden(array('ac'));
@@ -64,7 +64,7 @@
     $date=3D($date !=3D '')?"  $date":'';
     $sql_from_poste=3D($this->from_poste!=3D'')?" and  po.po_name >=3D u=
pper('".Database::escape_string($this->from_poste)."')":'';
     $sql_to_poste=3D($this->to_poste!=3D'')?" and  po.po_name <=3D upper=
('".Database::escape_string($this->to_poste)."')":'';
-    $this->arow=3D$this->db->get_array("=20
+    $this->arow=3D$this->db->get_array("
  SELECT po.po_id, po.pa_id, po.po_name, po.po_description, sum(
         CASE
             WHEN operation_analytique.oa_debit =3D true THEN operation_a=
nalytique.oa_amount * (-1)::numeric
@@ -115,7 +115,7 @@
     WHEN operation_analytique.oa_debit =3D true THEN operation_analytiqu=
e.oa_amount * (-1)::numeric
     ELSE operation_analytique.oa_amount
 END) <> 0::numeric order by po_name,name",array($this->pa_id));
-   =20
+
   }
=20
   /**
@@ -185,8 +185,8 @@
    *@brief display the button export CSV
    *@param $p_hidden is a string containing hidden items
    *@return html string
-   */ =20
-  function show_button($p_hidden)
+   */
+  function show_button($p_hidden=3D"")
   {
     $r=3D"";
     $r.=3D '<form method=3D"GET" action=3D"export.php"  style=3D"display=
:inline">';
@@ -224,7 +224,7 @@
 	 * Show all the result
 	 */
 	$tot_card=3D0;$prev=3D'';
-	echo '<table class=3D"result" style=3D"margin-left:20px;margin-top:5px"=
>';
+	echo '<table class=3D"result" style=3D"margin-left:5px;margin-top:5px">=
';
 	$tot_glob=3D0;
 	for ($i=3D0;$i<count($this->arow);$i++)
 	  {
@@ -538,9 +538,9 @@
 	  }
       }
=20
-		   =20
=20
-  =20
+
+
   }
=20
 }
\ No newline at end of file

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-21 20:20:59 UTC (rev 4430)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-21 21:18:02 UTC (rev 4431)
@@ -192,7 +192,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 650, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 662, true);
=20
=20
 --
@@ -329,13 +329,20 @@
 INSERT INTO menu_ref VALUES ('TVA', 'Module de TVA', 'tva/index.php', NU=
LL, 'Cette extension permet de faire les listings et declarations TVA', '=
plugin_code=3DTVA', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('IMPORTBANK', 'Importation banque', 'import=
bank/index.php', NULL, 'Import. fichier CVS de la banque', 'plugin_code=3D=
IMPORTBANK', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 'Nouvel achat ou d=C3=A9pense', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCHOP', 'Historique', 'anc_history.inc.ph=
p', NULL, 'Historique des imputations analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGL', 'Grand''Livre', 'anc_great_ledger.=
inc.php', NULL, 'Grand livre d''plan analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBS', 'Balance simple', 'anc_balance_sim=
ple.inc.php', NULL, 'Balance simple des imputations analytiques', NULL, N=
ULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBC2', 'Balance crois=C3=A9e double', 'a=
nc_balance_double.inc.php', NULL, 'Balance double crois=C3=A9es des imput=
ations analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCTAB', 'Tableau', 'anc_acc_table.inc.php=
', NULL, 'Tableau li=C3=A9 =C3=A0 la comptabilit=C3=A9', NULL, NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('ANCBCC', 'Balance Analytique/comptabilit=C3=
=A9', 'anc_acc_balance.inc.php', NULL, 'Lien entre comptabilit=C3=A9 et C=
omptabilit=C3=A9 analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGR', 'Groupe', 'anc_group_balance.inc.p=
hp', NULL, 'Balance par groupe', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CSV:AncGrandLivre', 'Impression Grand-Livr=
e', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, 'Recherc=
he', NULL, 'popup_recherche()', 'ME');
 INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, 'Param=C3=A8=
tres divers', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, 'Conf=
ig. de la tva', NULL, NULL, 'ME');
@@ -346,11 +353,11 @@
 INSERT INTO menu_ref VALUES ('CFGPAY', 'Moyen de paiement', 'payment_mid=
dle.inc.php', NULL, 'Config. des m=C3=A9thodes de paiement', NULL, NULL, =
'ME');
 INSERT INTO menu_ref VALUES ('CFGACC', 'Poste', 'poste.inc.php', NULL, '=
Config. poste comptable de base', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 'Nouvelle vente ou recette', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, 'Configuration des menus et plugins', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PDF:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, NULL, 'ledger_type=3DODS', NULL,=
 'ME');
 INSERT INTO menu_ref VALUES ('PDF:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
@@ -370,7 +377,6 @@
 INSERT INTO menu_ref VALUES ('CSV:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('new_line', NULL, NULL, NULL, 'Saut de lign=
e', NULL, NULL, 'SP');
 INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, 'Suivi fournisseur', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('MODOP', 'Modification d''op=C3=A9rations',=
 'modop/index.php', NULL, 'Modification op=C3=A9rations', 'plugin_code=3D=
MODOP', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('LET', 'Lettrage', NULL, NULL, 'Lettrage', =
NULL, NULL, 'ME');
@@ -390,7 +396,7 @@
 INSERT INTO menu_ref VALUES ('CFGSEC', 'S=C3=A9curit=C3=A9', 'param_sec.=
inc.php', NULL, 'configuration de la s=C3=A9curit=C3=A9', NULL, NULL, 'ME=
');
 INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, 'Plan analytique', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, 'Groupe analytique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', =
NULL, 'Impression compta. analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, 'Historique op=C3=A9rations dive=
rses', 'ledger_type=3DODS', NULL, 'ME');
 INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, '=
Menu ventes et recettes', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, 'Pr=C3=A9f=C3=A9rence', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, 'Historique', 'ledger_type=3DALL', NULL, 'ME');
@@ -428,6 +434,8 @@
 INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, 'Impression cat=C3=A9gorie de fiches', NULL,=
 NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, 'Menu im=
pression', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('ACCESS', 'Accueil', NULL, 'user_login.php'=
, 'Accueil', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', NULL, NULL, 'Impres=
sion compta. analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('new_line', 'saut de ligne', NULL, NULL, 'S=
aut de ligne', NULL, NULL, 'SP');
=20
=20
 --
@@ -448,7 +456,6 @@
 INSERT INTO profile_menu VALUES (237, 'EXT', NULL, 6, 55, 'M', 0);
 INSERT INTO profile_menu VALUES (240, 'FIMP', 'MENUFIN', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (214, 'FREC', 'MENUFIN', 6, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', NULL);
 INSERT INTO profile_menu VALUES (213, 'FSALDO', 'MENUFIN', 6, 3, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (182, 'CFGATCARD', 'DIVPARM', 6, 9, 'E',=
 0);
 INSERT INTO profile_menu VALUES (68, 'CFGATCARD', 'DIVPARM', 1, 9, 'E', =
0);
@@ -468,9 +475,11 @@
 INSERT INTO profile_menu VALUES (181, 'CFGCATDOC', 'DIVPARM', 6, 8, 'E',=
 0);
 INSERT INTO profile_menu VALUES (258, 'CFGMENU', 'MOD', 6, NULL, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (259, 'CFGPRO', 'MOD', 6, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (651, 'ANCHOP', 'ANCIMP', 1, 10, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', 0);
 INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (652, 'ANCGL', 'ANCIMP', 1, 20, 'E', 0);
 INSERT INTO profile_menu VALUES (189, 'PLANANC', 'ANC', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (190, 'CFGCARDCAT', 'DIVPARM', 6, 7, 'E'=
, 0);
 INSERT INTO profile_menu VALUES (191, 'ANCODS', 'ANC', 6, 2, 'E', 0);
@@ -478,26 +487,32 @@
 INSERT INTO profile_menu VALUES (193, 'ANCIMP', 'ANC', 6, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
 INSERT INTO profile_menu VALUES (196, 'PREFERENCE', NULL, 6, 15, 'M', 1)=
;
+INSERT INTO profile_menu VALUES (653, 'ANCBS', 'ANCIMP', 1, 30, 'E', 0);
 INSERT INTO profile_menu VALUES (199, 'CUST', 'GESTION', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (200, 'SUPPL', 'GESTION', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (201, 'ADM', 'GESTION', 6, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (202, 'CARD', 'GESTION', 6, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (654, 'ANCBC2', 'ANCIMP', 1, 40, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (203, 'STOCK', 'GESTION', 6, 5, 'E', 0);
 INSERT INTO profile_menu VALUES (204, 'FORECAST', 'GESTION', 6, 7, 'E', =
0);
 INSERT INTO profile_menu VALUES (205, 'FOLLOW', 'GESTION', 6, 8, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (655, 'ANCTAB', 'ANCIMP', 1, 50, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (206, 'VERIFBIL', 'ADV', 6, 21, 'E', 0);
 INSERT INTO profile_menu VALUES (207, 'STOCK', 'ADV', 6, 22, 'E', 0);
 INSERT INTO profile_menu VALUES (208, 'PREDOP', 'ADV', 6, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (656, 'ANCBCC', 'ANCIMP', 1, 60, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (209, 'OPEN', 'ADV', 6, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (657, 'ANCGR', 'ANCIMP', 1, 70, 'E', 0);
+INSERT INTO profile_menu VALUES (658, 'CSV:AncGrandLivre', NULL, 1, NULL=
, 'P', 0);
 INSERT INTO profile_menu VALUES (210, 'REPORT', 'ADV', 6, 25, 'E', 0);
 INSERT INTO profile_menu VALUES (211, 'CARD', 'COMPTA', 6, 7, 'E', 0);
 INSERT INTO profile_menu VALUES (212, 'HIST', 'COMPTA', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (215, 'ADV', 'COMPTA', 6, 20, 'E', 0);
 INSERT INTO profile_menu VALUES (216, 'ACCESS', NULL, 6, 25, 'M', 0);
 INSERT INTO profile_menu VALUES (217, 'CSV:histo', NULL, 6, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', 0);
 INSERT INTO profile_menu VALUES (218, 'LOGOUT', NULL, 6, 30, 'M', 0);
 INSERT INTO profile_menu VALUES (219, 'PRINT', 'GESTION', 6, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (220, 'new_line', NULL, 6, 35, 'M', 0);
 INSERT INTO profile_menu VALUES (221, 'CSV:ledger', NULL, 6, NULL, 'P', =
0);
 INSERT INTO profile_menu VALUES (222, 'PDF:ledger', NULL, 6, NULL, 'P', =
0);
 INSERT INTO profile_menu VALUES (223, 'PRINT', 'COMPTA', 6, 6, 'E', 0);
@@ -506,6 +521,7 @@
 INSERT INTO profile_menu VALUES (227, 'ACHIMP', 'MENUACH', 6, 2, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (228, 'GESTION', NULL, 6, 45, 'M', 0);
 INSERT INTO profile_menu VALUES (229, 'MENUODS', 'COMPTA', 6, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (662, 'new_line', NULL, 1, 35, 'M', 0);
 INSERT INTO profile_menu VALUES (230, 'ODS', 'MENUODS', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (231, 'ODSIMP', 'MENUODS', 6, 2, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (232, 'ANC', NULL, 6, 50, 'M', 0);
@@ -576,7 +592,6 @@
 INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', 0=
);
 INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', 0);
 INSERT INTO profile_menu VALUES (35, 'PRINT', 'GESTION', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (156, 'new_line', NULL, 1, 35, 'M', 0);
 INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', =
0);
 INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
0);
 INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', 0);
@@ -601,6 +616,7 @@
 INSERT INTO profile_menu VALUES (27, 'LETACC', 'LET', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (24, 'LETCARD', 'LET', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (164, 'TVA', 'EXT', 1, NULL, 'S', 0);
+INSERT INTO profile_menu VALUES (659, 'AMORTIS', 'GESTION', 1, 10, 'E', =
0);
 INSERT INTO profile_menu VALUES (167, 'MOD', 'PARAM', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (93, 'FIMP', 'MENUFIN', 1, 2, 'E', 0);



From MAILER-DAEMON Tue Nov 22 05:17:57 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSnQL-00016j-L2
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 05:17:57 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 11:23:00 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39214.1321957076.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4432 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Nov 2011 10:17:55 -0000

Author: danydb
Date: 2011-11-22 11:22:58 +0100 (Tue, 22 Nov 2011)
New Revision: 4432

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
setup.php remove debug

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-21 21:18:02 UTC (rev 443=
1)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-22 10:22:58 UTC (rev 443=
2)
@@ -112,10 +112,6 @@
 $inc_path=3Dget_include_path();
 /**
  *@brief create correctly the htaccess file
- *@param
- *@param
- *@return
- *@see
  */
 function create_htaccess() {
 $inc_path=3Dget_include_path();
@@ -131,11 +127,6 @@
 /* If htaccess file doesn't exists we create them here
  * if os =3D=3D 1 then windows, 0 means Unix
  */
-/**
- *@todo remove this test for production
- */
-if ( ! DEBUG )
-{
 $file=3D'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DIRE=
CTORY_SEPARATOR.'.htaccess';
 $hFile=3D@fopen($file,'w+');
 if ( ! $hFile )     exit('Impossible d\'&eacute;crire dans le r&eacute;p=
ertoire include');
@@ -165,7 +156,6 @@
     fwrite($hFile,'php_value include_path .:../../include:../include:add=
on'."\n");
   foreach ($array as $value ) fwrite($hFile,$value."\n");
   fclose($hFile);
-}
=20
 if ( strpos($inc_path,";") !=3D 0 ) {
   $new_path=3D$inc_path.';..\..\include;addon';
@@ -217,8 +207,6 @@
 // magic_quotes_sybase =3D Off
 // include_path
 }
-?>
-<?
 require_once('config_file.php');
 include_once('constant.php');
 require_once('class_database.php');



From MAILER-DAEMON Tue Nov 22 05:31:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSndR-00048m-M3
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 05:31:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 11:36:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39245.1321957888.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4433 - 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, 22 Nov 2011 10:31:27 -0000

Author: danydb
Date: 2011-11-22 11:36:38 +0100 (Tue, 22 Nov 2011)
New Revision: 4433

Modified:
   phpcompta/trunk/include/search.inc.php
Log:
probleme ie7, le reconcile ne fonctionne  pas

Modified: phpcompta/trunk/include/search.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/search.inc.php	2011-11-22 10:22:58 UTC (rev 4=
432)
+++ phpcompta/trunk/include/search.inc.php	2011-11-22 10:36:38 UTC (rev 4=
433)
@@ -39,10 +39,6 @@
 // display a search box
=20
=20
-/**
- * @todo si ajax alors pas de form GET mais plutot une fonction
- * javascript pour chercher
- */
 $base=3Dbasename($_SERVER['SCRIPT_NAME']);
 $inside=3Dfalse;
 $ledger=3Dnew Acc_Ledger($cn,0);
@@ -56,6 +52,7 @@
 }
=20
 $search_box=3D$ledger->search_form('ALL',1,'search_op');
+var_dump($search_box);
=20
 if ($base =3D=3D 'recherche.php' || $base =3D=3D 'do.php')
 	{
@@ -121,21 +118,21 @@
=20
    }   else
    {
-	    if ($step<$max_line ) echo '<span class=3D"notice">Nombre d\'enregi=
strements trouv=C3=A9s =3D' .$max_line.' limite =3D  '.$step.'</SPAN>';
+	    if ($step<$max_line ) echo '<span class=3D"notice">Nombre d\'enregi=
strements trouv=C3=A9s =3D' .$max_line.' limite =3D  '.$step.'</span>';
    }
 	echo '<form method=3D"get" onsubmit=3D"set_reconcile(this);return false=
">';
 	echo HtmlInput::submit("upd_rec","Mettre =C3=A0 jour");
-    echo $content;
+	echo HtmlInput::get_to_hidden(array('ctlc','amount_id','ledger'));
+	echo HtmlInput::get_to_hidden(array('l','date_start','date_end','desc',=
'amount_min','amount_max','qcodesearch_op','accounting','unpaid','gDossie=
r','ledger_type'));
+        echo $content;
 	echo HtmlInput::submit("upd_rec","Mettre =C3=A0 jour");
-	echo '</form>';
     if (! $inside )echo $bar;
=20
-	echo HtmlInput::get_to_hidden(array('ctlc','amount_id','ledger'));
-	echo HtmlInput::get_to_hidden(array('l','date_start','date_end','desc',=
'amount_min','amount_max','qcodesearch_op','accounting','unpaid','gDossie=
r','ledger_type'));
     if (isset($_GET['r_jrn'])) {
       foreach ($_GET['r_jrn'] as $k=3D>$v)
 		echo HtmlInput::hidden('r_jrn['.$k.']',$v);
     }
+    echo '</form>';
 }
 echo '</div>';
 ?>



From MAILER-DAEMON Tue Nov 22 05:33:36 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSnfU-0004yq-68
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 05:33:36 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 11:38:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39250.1321958015.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4434 - 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, 22 Nov 2011 10:33:34 -0000

Author: danydb
Date: 2011-11-22 11:38:35 +0100 (Tue, 22 Nov 2011)
New Revision: 4434

Modified:
   phpcompta/trunk/include/template/ledger_search.php
Log:
probleme ie7, cosmetic : choix des journaux hors de la table

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	2011-11-22 10:36:3=
8 UTC (rev 4433)
+++ phpcompta/trunk/include/template/ledger_search.php	2011-11-22 10:38:3=
5 UTC (rev 4434)
@@ -1,14 +1,8 @@
=20
-<table>
-<tr>
-<td style=3D'text-align:right;width:30em'>
 <?=3D_('Dans le journal')?>
-</td>
-<td>
    <?php echo $f_ledger; ?>
-</td>
-</tr>
=20
+<table>
 <tr>
 <td style=3D'text-align:right;width:30em'>
 <?=3D_('Et Compris entre les date')?>



From MAILER-DAEMON Tue Nov 22 07:40:35 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSpeN-0008WA-HU
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 07:40:35 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 13:45:38 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39498.1321965634.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4435 - 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: Tue, 22 Nov 2011 12:40:33 -0000

Author: danydb
Date: 2011-11-22 13:45:35 +0100 (Tue, 22 Nov 2011)
New Revision: 4435

Modified:
   phpcompta/trunk/html/style.css
Log:
inner_box : z-index 10

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	2011-11-22 10:38:35 UTC (rev 4434)
+++ phpcompta/trunk/html/style.css	2011-11-22 12:45:35 UTC (rev 4435)
@@ -881,7 +881,7 @@
   padding:0;
   margin:0;
   overflow:hidden;
-  z-index:3;
+  z-index:10;
=20
 position:absolute;
 left:10%;



From MAILER-DAEMON Tue Nov 22 07:41:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSpen-00005h-LQ
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 07:41:01 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 13:46:15 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39503.1321965660.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4436 - 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, 22 Nov 2011 12:40:59 -0000

Author: danydb
Date: 2011-11-22 13:46:14 +0100 (Tue, 22 Nov 2011)
New Revision: 4436

Modified:
   phpcompta/trunk/include/search.inc.php
Log:
remove debug

Modified: phpcompta/trunk/include/search.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/search.inc.php	2011-11-22 12:45:35 UTC (rev 4=
435)
+++ phpcompta/trunk/include/search.inc.php	2011-11-22 12:46:14 UTC (rev 4=
436)
@@ -52,7 +52,6 @@
 }
=20
 $search_box=3D$ledger->search_form('ALL',1,'search_op');
-var_dump($search_box);
=20
 if ($base =3D=3D 'recherche.php' || $base =3D=3D 'do.php')
 	{



From MAILER-DAEMON Tue Nov 22 07:42:50 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSpgY-0000Mt-JJ
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 07:42:50 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 13:48:03 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39508.1321965768.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4437 - 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, 22 Nov 2011 12:42:48 -0000

Author: danydb
Date: 2011-11-22 13:48:03 +0100 (Tue, 22 Nov 2011)
New Revision: 4437

Modified:
   phpcompta/trunk/include/template/ledger_search.php
Log:
recherche choix des journaux dans la table

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	2011-11-22 12:46:1=
4 UTC (rev 4436)
+++ phpcompta/trunk/include/template/ledger_search.php	2011-11-22 12:48:0=
3 UTC (rev 4437)
@@ -1,8 +1,14 @@
=20
+<table>
+<tr>
+<td style=3D'text-align:right;width:30em'>
 <?=3D_('Dans le journal')?>
+</td>
+<td>
    <?php echo $f_ledger; ?>
+</td>
+</tr>
=20
-<table>
 <tr>
 <td style=3D'text-align:right;width:30em'>
 <?=3D_('Et Compris entre les date')?>



From MAILER-DAEMON Tue Nov 22 07:44:57 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSpib-0000TN-4P
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 07:44:57 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 13:50:10 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39513.1321965896.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4438 - 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: Tue, 22 Nov 2011 12:44:56 -0000

Author: danydb
Date: 2011-11-22 13:50:09 +0100 (Tue, 22 Nov 2011)
New Revision: 4438

Modified:
   phpcompta/trunk/html/style.css
Log:
inner_box -> z-index =3D 3

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	2011-11-22 12:48:03 UTC (rev 4437)
+++ phpcompta/trunk/html/style.css	2011-11-22 12:50:09 UTC (rev 4438)
@@ -881,7 +881,7 @@
   padding:0;
   margin:0;
   overflow:hidden;
-  z-index:10;
+  z-index:3;
=20
 position:absolute;
 left:10%;



From MAILER-DAEMON Tue Nov 22 08:11:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSq82-0004yA-NB
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 08:11:14 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 14:16:23 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39547.1321967473.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4439 - 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: Tue, 22 Nov 2011 13:11:13 -0000

Author: danydb
Date: 2011-11-22 14:16:22 +0100 (Tue, 22 Nov 2011)
New Revision: 4439

Modified:
   phpcompta/trunk/html/ajax_ledger.php
   phpcompta/trunk/include/class_acc_operation.php
   phpcompta/trunk/include/template/ledger_detail_ach.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
Log:
ajout pay?\195?\169 par dans les d?\195?\169tail op?\195?\169rations VEN =
& ACH

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	2011-11-22 12:50:09 UTC (rev 443=
8)
+++ phpcompta/trunk/html/ajax_ledger.php	2011-11-22 13:16:22 UTC (rev 443=
9)
@@ -385,6 +385,14 @@
                     {
                         $rec->insert($rapt);
                     }
+              if ( isset($_POST['ipaid']))
+              {
+                  $cn->exec_sql("update jrn set jr_rapt=3D'paid' where j=
r_id=3D$1",array($jr_id));
+              }
+              else
+              {
+                  $cn->exec_sql("update jrn set jr_rapt=3Dnull where jr_=
id=3D$1",array($jr_id));
+              }
             }
             ////////////////////////////////////////////////////
             // CA

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	2011-11-22 12:50:09 U=
TC (rev 4438)
+++ phpcompta/trunk/include/class_acc_operation.php	2011-11-22 13:16:22 U=
TC (rev 4439)
@@ -545,7 +545,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_pj_number, jr_mt,jr_rapt
              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/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	2011-11-22 12:=
50:09 UTC (rev 4438)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php	2011-11-22 13:=
16:22 UTC (rev 4439)
@@ -63,6 +63,16 @@
 							?>
 							</td>
 							</tr>
+                                                           <tr>
+                                                            <td>Pay=C3=A9=
</td>
+                                                            <td>
+                                                                <?
+                                                                $ipaid=3D=
new ICheckBox("ipaid",'paid');
+                                                                $ipaid->=
value=3D$obj->det->jr_rapt;
+                                                                echo $ip=
aid->input();
+                                                                ?>
+                                                            </td>
+                                                        </tr>
 				</table>
 				</td><td>
 				<table style=3D"border:solid 1px yellow">
@@ -85,6 +95,7 @@
 				</table>
 				</td>
 				</tr>
+                               =20
 </table>
=20
 <fieldset><legend><?=3D_('D=C3=A9tail')?></legend>

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	2011-11-22 12:=
50:09 UTC (rev 4438)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php	2011-11-22 13:=
16:22 UTC (rev 4439)
@@ -63,6 +63,16 @@
 						?>
 						</td>
 						</tr>
+                                               <tr>
+                                                        <td>Pay=C3=A9</t=
d>
+                                                        <td>
+                                                            <?
+                                                            $ipaid=3Dnew=
 ICheckBox("ipaid",'paid');
+                                                            $ipaid->valu=
e=3D$obj->det->jr_rapt;
+                                                            echo $ipaid-=
>input();
+                                                            ?>
+                                                        </td>
+                                                    </tr>
 						</table>
 </td>
 <td>



From MAILER-DAEMON Tue Nov 22 08:32:35 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSqSh-0000RQ-Ov
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 08:32:35 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 14:37:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39605.1321968754.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4440 - 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, 22 Nov 2011 13:32:34 -0000

Author: danydb
Date: 2011-11-22 14:37:37 +0100 (Tue, 22 Nov 2011)
New Revision: 4440

Modified:
   phpcompta/trunk/include/template/ledger_detail_ach.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
Log:
ajout pay?\195?\169 par dans les d?\195?\169tail op?\195?\169rations VEN =
& ACH

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	2011-11-22 13:=
16:22 UTC (rev 4439)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php	2011-11-22 13:=
37:37 UTC (rev 4440)
@@ -68,7 +68,7 @@
                                                             <td>
                                                                 <?
                                                                 $ipaid=3D=
new ICheckBox("ipaid",'paid');
-                                                                $ipaid->=
value=3D$obj->det->jr_rapt;
+                                                                $ipaid->=
selected=3D($obj->det->jr_rapt=3D=3D'paid');
                                                                 echo $ip=
aid->input();
                                                                 ?>
                                                             </td>

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	2011-11-22 13:=
16:22 UTC (rev 4439)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php	2011-11-22 13:=
37:37 UTC (rev 4440)
@@ -68,7 +68,7 @@
                                                         <td>
                                                             <?
                                                             $ipaid=3Dnew=
 ICheckBox("ipaid",'paid');
-                                                            $ipaid->valu=
e=3D$obj->det->jr_rapt;
+                                                            $ipaid->sele=
cted=3D($obj->det->jr_rapt=3D=3D'paid');
                                                             echo $ipaid-=
>input();
                                                             ?>
                                                         </td>



From MAILER-DAEMON Tue Nov 22 09:04:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSqxn-0007EL-3d
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 09:04:43 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 15:09:52 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39636.1321970682.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4441 - 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: Tue, 22 Nov 2011 14:04:41 -0000

Author: danydb
Date: 2011-11-22 15:09:52 +0100 (Tue, 22 Nov 2011)
New Revision: 4441

Modified:
   phpcompta/trunk/html/ajax_ledger.php
Log:
detail ledger -> paid/not paid

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	2011-11-22 13:37:37 UTC (rev 444=
0)
+++ phpcompta/trunk/html/ajax_ledger.php	2011-11-22 14:09:52 UTC (rev 444=
1)
@@ -385,6 +385,7 @@
                     {
                         $rec->insert($rapt);
                     }
+            }
               if ( isset($_POST['ipaid']))
               {
                   $cn->exec_sql("update jrn set jr_rapt=3D'paid' where j=
r_id=3D$1",array($jr_id));
@@ -393,7 +394,6 @@
               {
                   $cn->exec_sql("update jrn set jr_rapt=3Dnull where jr_=
id=3D$1",array($jr_id));
               }
-            }
             ////////////////////////////////////////////////////
             // CA
             //////////////////////////////////////////////////



From MAILER-DAEMON Tue Nov 22 09:11:58 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSr4o-0000Eo-Rt
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 09:11:58 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 15:17:07 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39678.1321971118.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4442 - 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, 22 Nov 2011 14:11:58 -0000

Author: danydb
Date: 2011-11-22 15:17:06 +0100 (Tue, 22 Nov 2011)
New Revision: 4442

Modified:
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/js/scripts.js
Log:
add waiting_box when saving operation in detail

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	2011-11-22 14:09:52 UTC (rev 44=
41)
+++ phpcompta/trunk/html/js/acc_ledger.js	2011-11-22 14:17:06 UTC (rev 44=
42)
@@ -50,23 +50,23 @@
 */
 function update_pay_method()
 {
-	waiting_box();
+    waiting_box();
     var jrn=3Dg("p_jrn").value;
     var dossier=3Dg("gDossier").value;
     var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn+"&op=3Dup_pay_me=
thod";
     var action=3Dnew Ajax.Request(
-                   "ajax_misc.php",
-                   {
-                   method:'get',
-                   parameters:querystring,
-                   onFailure:error_get_predef,
-                   onSuccess:function(req){
-										remove_waiting_box();
-										var answer=3Dreq.responseText;
-										$('payment').innerHTML=3Danswer;
-								}
-                   }
-               );
+        "ajax_misc.php",
+        {
+            method:'get',
+            parameters:querystring,
+            onFailure:error_get_predef,
+            onSuccess:function(req){
+                remove_waiting_box();
+                var answer=3Dreq.responseText;
+                $('payment').innerHTML=3Danswer;
+            }
+        }
+        );
 }
=20
 /**
@@ -637,6 +637,7 @@
 */
 function removeOperation(p_jr_id,dossier,div)
 {
+    waiting_box();
     var qs=3D"gDossier=3D"+dossier+"&act=3Drmop&div=3D"+div+"&jr_id=3D"+=
p_jr_id;
     var action=3Dnew Ajax.Request(
                    "ajax_ledger.php",
@@ -659,7 +660,7 @@
     var qs=3D$(obj).serialize();
     g('ext'+obj.divname).style.display=3D'none';
     g('bext'+obj.divname).style.display=3D'none';
-
+    waiting_box();
     var action=3Dnew Ajax.Request(
                    "ajax_ledger.php",
                    {
@@ -864,7 +865,7 @@
     queryString+=3D'&jr_id=3D'+obj.jr_id.value;
     queryString+=3D'&div=3D'+obj.whatdiv.value;
     queryString+=3D'&act=3Dsave';
-
+    waiting_box();
     if ( g('inpopup'))
     {
         var action=3Dnew Ajax.Request ( 'ajax_ledger.php',

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	2011-11-22 14:09:52 UTC (rev 4441)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-22 14:17:06 UTC (rev 4442)
@@ -31,6 +31,7 @@
 {
     try
     {
+        remove_waiting_box();
         var answer=3Dreq.responseXML;
         var a=3Danswer.getElementsByTagName('ctl');
         var html=3Danswer.getElementsByTagName('code');



From MAILER-DAEMON Tue Nov 22 09:21:51 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSrEN-0002DH-NK
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 09:21:51 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 15:26:59 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.39721.1321971711.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4443 - 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: Tue, 22 Nov 2011 14:21:50 -0000

Author: danydb
Date: 2011-11-22 15:26:59 +0100 (Tue, 22 Nov 2011)
New Revision: 4443

Modified:
   phpcompta/trunk/html/style.css
Log:
dossier name smaller

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	2011-11-22 14:17:06 UTC (rev 4442)
+++ phpcompta/trunk/html/style.css	2011-11-22 14:26:59 UTC (rev 4443)
@@ -838,7 +838,7 @@
 	font-style: italic;
 display:inline;
=20
-font-size:20px;
+font-size:14px;
 margin:0;
 padding:0;
 text-align:center;
@@ -1073,4 +1073,4 @@
     display:block;
     margin: 20px;
     font-weight: bold;
-}
\ No newline at end of file
+}



From MAILER-DAEMON Tue Nov 22 12:54:58 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSuYc-0002OE-DY
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 12:54:58 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 18:59:30 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.40310.1321984497.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4444 - 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, 22 Nov 2011 17:54:55 -0000

Author: danydb
Date: 2011-11-22 18:59:28 +0100 (Tue, 22 Nov 2011)
New Revision: 4444

Modified:
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/company.inc.php
Log:
remove warning in company.inc.php about PARSTR

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	2011-11-22 14:26:59 UTC =
(rev 4443)
+++ phpcompta/trunk/include/class_html_input.php	2011-11-22 17:59:28 UTC =
(rev 4444)
@@ -300,7 +300,7 @@
         echo $ledger->input();
=20
         /* create a hidden div for the ledger */
-        echo '<div id=3D"div_jrn'.$div.'">';
+        echo '<div id=3D"div_jrn'.$div.'" >';
         echo '<h2 class=3D"info">Choix des journaux</h2>';
=20
         echo '<ul>';

Modified: phpcompta/trunk/include/company.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/company.inc.php	2011-11-22 14:26:59 UTC (rev =
4443)
+++ phpcompta/trunk/include/company.inc.php	2011-11-22 17:59:28 UTC (rev =
4444)
@@ -94,7 +94,7 @@
     $all->value=3D'';
     echo "<tr>".td(_("Num=C3=A9ro de Tva"),'style=3D"text-align:right"')=
.$all->input("p_tva",$my->MY_TVA)."</tr>";
     echo "<tr>".td(_("Utilisation de la compta. analytique"),'style=3D"t=
ext-align:right"').$compta->input("p_compta",$array)."</tr>";
-    if ( $g_user->check_action(PARSTR)=3D=3D0) $strict->setReadonly(true=
);
+   =20
     echo "<tr>".td(_("Utilisation du mode strict "),'style=3D"text-align=
:right"').$strict->input("p_strict",$strict_array)."</tr>";
     echo "<tr>".td(_("Assujetti =C3=A0 la tva"),'style=3D"text-align:rig=
ht"').$tva_use->input("p_tva_use",$strict_array)."</tr>";
     echo "<tr>".td(_("Sugg=C3=A9rer le num=C3=A9ro de pi=C3=A8ce justifi=
cative"),'style=3D"text-align:right"').$pj_suggest->input("p_pj",$strict_=
array)."</tr>";



From MAILER-DAEMON Tue Nov 22 17:21:35 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSyid-0007hz-QU
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 17:21:35 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 23:26:41 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.40930.1322000495.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r193 - trunk/importbank/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, 22 Nov 2011 22:21:34 -0000

Author: danydb
Date: 2011-11-22 23:26:40 +0100 (Tue, 22 Nov 2011)
New Revision: 193

Modified:
   trunk/importbank/include/class_import_bank.php
Log:

Fix strict standard


Modified: trunk/importbank/include/class_import_bank.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/class_import_bank.php	2011-11-19 00:20:38 UT=
C (rev 192)
+++ trunk/importbank/include/class_import_bank.php	2011-11-22 22:26:40 UT=
C (rev 193)
@@ -279,7 +279,7 @@
 		self::transfert_error($row->id,'Date hors des limites');
 		continue;
 	      }
-	    $err=3Dself::is_closed($row->tp_date,$led_id);
+		    $err=3Dself::is_closed($row->tp_date,$led_id);
 	    if ( $err !=3D '')
 	      {
 		self::transfert_error($err,'Date hors des journaux');
@@ -349,7 +349,7 @@
   /**
    *Update the row with an error message, and change is status to E
    */
-  function transfert_error($id,$message)
+  static function transfert_error($id,$message)
   {
     global $cn;
     $cn->exec_sql('update importbank.temp_bank set status=3D$1,tp_error_=
msg=3D$2 where id=3D$3',
@@ -359,7 +359,7 @@
    * check
    * if the date is outside the defined periode
    */
-  function check_date($p_date)
+  static function check_date($p_date)
   {
     global $cn;
     $sql=3D"select count(*) from parm_periode where p_start <=3D to_date=
($1,'DD.MM.YYYY') and p_end >=3D to_date($1,'DD.MM.YYYY') ";
@@ -371,7 +371,7 @@
    * Check if the date is in a periode and if the ledger
    * is closed or not
    */
-  function is_closed($p_date,$ledger_id)
+  static function is_closed($p_date,$ledger_id)
   {
     global $cn;
     try



From MAILER-DAEMON Tue Nov 22 17:25:50 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSymk-0008Kz-Ao
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 17:25:50 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 23:31:03 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.40943.1322000749.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r194 - trunk/importbank/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, 22 Nov 2011 22:25:48 -0000

Author: danydb
Date: 2011-11-22 23:31:01 +0100 (Tue, 22 Nov 2011)
New Revision: 194

Modified:
   trunk/importbank/include/class_import_bank.php
Log:

Fix error handling with closed periode


Modified: trunk/importbank/include/class_import_bank.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/class_import_bank.php	2011-11-22 22:26:40 UT=
C (rev 193)
+++ trunk/importbank/include/class_import_bank.php	2011-11-22 22:31:01 UT=
C (rev 194)
@@ -282,7 +282,7 @@
 		    $err=3Dself::is_closed($row->tp_date,$led_id);
 	    if ( $err !=3D '')
 	      {
-		self::transfert_error($err,'Date hors des journaux');
+		self::transfert_error($row->id,$err.' - Date hors des journaux');
 		continue;
 	      }
=20
@@ -326,9 +326,9 @@
             // insert rapt
 	    if ( $cn->get_value ('select count(jr_id) from jrn where jr_id=3D$1=
',array($row->tp_rec)) =3D=3D 1)
 	      {
-		$acc_reconc=3Dnew Acc_Reconciliation($cn);
-		$acc_reconc->set_jr_id($jr_id);
-		$acc_reconc->insert($row->tp_rec);
+			$acc_reconc=3Dnew Acc_Reconciliation($cn);
+			$acc_reconc->set_jr_id($jr_id);
+			$acc_reconc->insert($row->tp_rec);
 	      }
=20
             $sql2 =3D "update importbank.temp_bank set status =3D 'T',tp=
_error_msg=3Dnull  where id=3D$1";



From MAILER-DAEMON Tue Nov 22 17:26:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSynP-0008Mk-Q7
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 17:26:31 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 23:31:41 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.40944.1322000790.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4445 - in phpcompta/trunk: html 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, 22 Nov 2011 22:26:29 -0000

Author: danydb
Date: 2011-11-22 23:31:40 +0100 (Tue, 22 Nov 2011)
New Revision: 4445

Modified:
   phpcompta/trunk/html/index.php
   phpcompta/trunk/include/template/ledger_detail_ach.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
Log:

Cosmetic : detail VEN & ACH
Larger font for connect button


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	2011-11-22 17:59:28 UTC (rev 4444)
+++ phpcompta/trunk/html/index.php	2011-11-22 22:31:40 UTC (rev 4445)
@@ -145,7 +145,7 @@
 margin:1px;
 }
 .button {
-font-size:10px;
+font-size:12px;
 color:white;
 font-weight: bold;
=20
@@ -164,6 +164,7 @@
 cursor:pointer;
 margin:1 2 1 2;
 -moz-border-radius:2 2;
+border-radius:2 2;
=20
 }
 .button:hover {

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	2011-11-22 17:=
59:28 UTC (rev 4444)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php	2011-11-22 22:=
31:40 UTC (rev 4445)
@@ -64,6 +64,7 @@
 							</td>
 							</tr>
                                                            <tr>
+															   <td></td>
                                                             <td>Pay=C3=A9=
</td>
                                                             <td>
                                                                 <?
@@ -95,7 +96,7 @@
 				</table>
 				</td>
 				</tr>
-                               =20
+
 </table>
=20
 <fieldset><legend><?=3D_('D=C3=A9tail')?></legend>

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	2011-11-22 17:=
59:28 UTC (rev 4444)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php	2011-11-22 22:=
31:40 UTC (rev 4445)
@@ -64,6 +64,7 @@
 						</td>
 						</tr>
                                                <tr>
+												   <td></td>
                                                         <td>Pay=C3=A9</t=
d>
                                                         <td>
                                                             <?



From MAILER-DAEMON Tue Nov 22 17:39:41 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSz09-0002fC-Eb
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 17:39:41 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 23:44:53 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.40959.1322001580.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4446 - 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, 22 Nov 2011 22:39:40 -0000

Author: danydb
Date: 2011-11-22 23:44:52 +0100 (Tue, 22 Nov 2011)
New Revision: 4446

Modified:
   phpcompta/trunk/sql/account-update.sql
   phpcompta/trunk/sql/account_alphanum.sql
   phpcompta/trunk/sql/account_compute.sql
   phpcompta/trunk/sql/account_insert.sql
   phpcompta/trunk/sql/ajax-direct-form.sql
   phpcompta/trunk/sql/format_account.sql
   phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql
   phpcompta/trunk/sql/tmp_pcmn_ins.sql
   phpcompta/trunk/sql/trigger.tmp_pcmn.sql
   phpcompta/trunk/sql/tva.sql
Log:

update script SQL


Modified: phpcompta/trunk/sql/account-update.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/account-update.sql	2011-11-22 22:31:40 UTC (rev 4=
445)
+++ phpcompta/trunk/sql/account-update.sql	2011-11-22 22:44:52 UTC (rev 4=
446)
@@ -1,7 +1,3 @@
--- Function: comptaproc.account_update(integer, account_type)
-
--- DROP FUNCTION comptaproc.account_update(integer, account_type);
-
 CREATE OR REPLACE FUNCTION comptaproc.account_update(p_f_id integer, p_a=
ccount account_type)
   RETURNS integer AS
 $BODY$
@@ -50,5 +46,4 @@
 return 0;
 end;
 $BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100;
+LANGUAGE plpgsql;

Modified: phpcompta/trunk/sql/account_alphanum.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/account_alphanum.sql	2011-11-22 22:31:40 UTC (rev=
 4445)
+++ phpcompta/trunk/sql/account_alphanum.sql	2011-11-22 22:44:52 UTC (rev=
 4446)
@@ -1,7 +1,3 @@
--- Function: comptaproc.account_auto(integer)
-
--- DROP FUNCTION comptaproc.account_auto(integer);
-
 CREATE OR REPLACE FUNCTION comptaproc.account_alphanum()
   RETURNS boolean AS
 $BODY$
@@ -16,5 +12,4 @@
 	return l_auto;
 end;
 $BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100;
+  LANGUAGE plpgsql;

Modified: phpcompta/trunk/sql/account_compute.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/account_compute.sql	2011-11-22 22:31:40 UTC (rev =
4445)
+++ phpcompta/trunk/sql/account_compute.sql	2011-11-22 22:44:52 UTC (rev =
4446)
@@ -1,7 +1,3 @@
--- Function: comptaproc.account_compute(integer)
-
--- DROP FUNCTION comptaproc.account_compute(integer);
-
 CREATE OR REPLACE FUNCTION comptaproc.account_compute(p_f_id integer)
   RETURNS account_type AS
 $BODY$
@@ -44,5 +40,5 @@
 	return sResult;
 end;
 $BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100;
+LANGUAGE plpgsql;
+ =20

Modified: phpcompta/trunk/sql/account_insert.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/account_insert.sql	2011-11-22 22:31:40 UTC (rev 4=
445)
+++ phpcompta/trunk/sql/account_insert.sql	2011-11-22 22:44:52 UTC (rev 4=
446)
@@ -1,5 +1,3 @@
--- Function: comptaproc.account_insert(integer, text)
-
  DROP FUNCTION comptaproc.account_insert(integer, text);
=20
 CREATE OR REPLACE FUNCTION comptaproc.account_insert(p_f_id integer, p_a=
ccount text)
@@ -85,5 +83,5 @@
 return 0;
 end;
 $BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100;
+LANGUAGE plpgsql;
+

Modified: phpcompta/trunk/sql/ajax-direct-form.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/ajax-direct-form.sql	2011-11-22 22:31:40 UTC (rev=
 4445)
+++ phpcompta/trunk/sql/ajax-direct-form.sql	2011-11-22 22:44:52 UTC (rev=
 4446)
@@ -57,5 +57,5 @@
 	return;
 end;
 $BODY$
-  LANGUAGE plpgsql;
+LANGUAGE plpgsql;
 =09

Modified: phpcompta/trunk/sql/format_account.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/format_account.sql	2011-11-22 22:31:40 UTC (rev 4=
445)
+++ phpcompta/trunk/sql/format_account.sql	2011-11-22 22:44:52 UTC (rev 4=
446)
@@ -1,7 +1,3 @@
--- Function: comptaproc.format_account(account_type)
-
--- DROP FUNCTION comptaproc.format_account(account_type);
-
 CREATE OR REPLACE FUNCTION comptaproc.format_account(p_account account_t=
ype)
   RETURNS account_type AS
 $BODY$
@@ -22,10 +18,10 @@
=20
 return upper(sResult);
=20
-end;$BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100;
-
+end;
+$BODY$
+LANGUAGE plpgsql;
+ =20
 COMMENT ON FUNCTION comptaproc.format_account(account_type) IS 'format t=
he accounting :
 - upper case
 - remove space and special char.

Modified: phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.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/tmp_pcmn_alphanum_ins_upd.sql	2011-11-22 22:31:40=
 UTC (rev 4445)
+++ phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql	2011-11-22 22:44:52=
 UTC (rev 4446)
@@ -11,5 +11,4 @@
 return r_record;
 end;
 $BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100;
+LANGUAGE plpgsql;

Modified: phpcompta/trunk/sql/tmp_pcmn_ins.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/tmp_pcmn_ins.sql	2011-11-22 22:31:40 UTC (rev 444=
5)
+++ phpcompta/trunk/sql/tmp_pcmn_ins.sql	2011-11-22 22:44:52 UTC (rev 444=
6)
@@ -1,8 +1,4 @@
--- Function: comptaproc.tmp_pcmn_ins()
-
--- DROP FUNCTION comptaproc.tmp_pcmn_ins();
-
-CREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_ins()
+ZCREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_ins()
   RETURNS trigger AS
 $BODY$
 declare
@@ -16,5 +12,5 @@
 return NEW;
 end;
 $BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100;
+LANGUAGE plpgsql;
+

Modified: phpcompta/trunk/sql/trigger.tmp_pcmn.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/trigger.tmp_pcmn.sql	2011-11-22 22:31:40 UTC (rev=
 4445)
+++ phpcompta/trunk/sql/trigger.tmp_pcmn.sql	2011-11-22 22:44:52 UTC (rev=
 4446)
@@ -1,7 +1,3 @@
--- Trigger: t_tmp_pcm_alphanum_ins_upd on tmp_pcmn
-
--- DROP TRIGGER t_tmp_pcm_alphanum_ins_upd ON tmp_pcmn;
-
 CREATE TRIGGER t_tmp_pcm_alphanum_ins_upd
   BEFORE INSERT OR UPDATE
   ON tmp_pcmn

Modified: phpcompta/trunk/sql/tva.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/tva.sql	2011-11-22 22:31:40 UTC (rev 4445)
+++ phpcompta/trunk/sql/tva.sql	2011-11-22 22:44:52 UTC (rev 4446)
@@ -40,7 +40,7 @@
 return 0;
 end;
 $function$
- LANGUAGE plpgsql;
+LANGUAGE plpgsql;
=20
 ----------------------------------------------------------------------
 -- TVA INSERT
@@ -82,4 +82,4 @@
 return 0;
 end;
 $function$
- LANGUAGE plpgsql;
+LANGUAGE plpgsql;



From MAILER-DAEMON Tue Nov 22 17:45:49 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSz65-00046h-Vb
	for mharc-phpcompta-dev@gnu.org; Tue, 22 Nov 2011 17:45:49 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 22 Nov 2011 23:50:45 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.40963.1322001948.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4447 - 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, 22 Nov 2011 22:45:47 -0000

Author: danydb
Date: 2011-11-22 23:50:44 +0100 (Tue, 22 Nov 2011)
New Revision: 4447

Removed:
   phpcompta/trunk/sql/change-pcmn-to-alphanum.sql
   phpcompta/trunk/sql/comptaproc.sql
   phpcompta/trunk/sql/correct-quant.sql
   phpcompta/trunk/sql/correct_quant_sold.sql
   phpcompta/trunk/sql/downgrade.sql
Modified:
   phpcompta/trunk/sql/upgrade.sql
Log:

Housekeeping drop obsolete files


Deleted: phpcompta/trunk/sql/change-pcmn-to-alphanum.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/change-pcmn-to-alphanum.sql	2011-11-22 22:44:52 U=
TC (rev 4446)
+++ phpcompta/trunk/sql/change-pcmn-to-alphanum.sql	2011-11-22 22:50:44 U=
TC (rev 4447)
@@ -1,1554 +0,0 @@
-begin;
-
-DROP FUNCTION  account_add(p_id poste_comptable, p_name character varyin=
g) cascade;
-DROP FUNCTION  account_auto(p_fd_id integer) cascade;
-DROP FUNCTION  account_compute(p_f_id integer) cascade;
-DROP FUNCTION  account_insert(p_f_id integer, p_account text) cascade;
-DROP FUNCTION  account_parent(p_account poste_comptable) cascade;
-DROP FUNCTION  account_update(p_f_id integer, p_account text) cascade;
-DROP FUNCTION  action_gestion_ins_upd() cascade;
-DROP FUNCTION  attribut_insert(p_f_id integer, p_ad_id integer, p_value =
character varying) cascade;
-DROP FUNCTION  attribute_correct_order() cascade;
-DROP FUNCTION  bud_card_ins_upd() cascade;
-DROP FUNCTION  bud_detail_ins_upd() cascade;
-DROP FUNCTION  card_class_base(p_f_id integer) cascade;
-DROP FUNCTION  check_balance(p_grpt integer) cascade;
-DROP FUNCTION  correct_sequence(p_sequence text, p_col text, p_table tex=
t) cascade;
-DROP FUNCTION  create_missing_sequence() cascade;
-DROP FUNCTION  drop_index(p_constraint character varying) cascade;
-DROP FUNCTION  drop_it(p_constraint character varying) cascade;
-DROP FUNCTION  extension_ins_upd() cascade;
-DROP FUNCTION  fiche_account_parent(p_f_id integer) cascade;
-DROP FUNCTION  fiche_attribut_synchro(p_fd_id integer) cascade;
-DROP FUNCTION  find_pcm_type(pp_value numeric) cascade;
-DROP FUNCTION  group_analytic_ins_upd() cascade;
-DROP FUNCTION  group_analytique_del() cascade;
-DROP FUNCTION  html_quote(p_string text) cascade;
-DROP FUNCTION  info_def_ins_upd() cascade;
-DROP FUNCTION  insert_jrnx (p_date character varying, p_montant numeric,=
 p_poste poste_comptable, p_grpt integer, p_jrn_def integer, p_debit bool=
ean, p_tech_user text, p_tech_per integer, p_qcode text, p_comment text) =
cascade;
-
-DROP FUNCTION  insert_quant_purchase(p_internal text, p_j_id numeric, p_=
fiche character varying, p_quant numeric, p_price numeric, p_vat numeric,=
 p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric, p_nd_tva_recu=
p numeric, p_dep_priv numeric, p_client character varying) cascade;
-DROP FUNCTION  insert_quant_sold(p_internal text, p_jid numeric, p_fiche=
 character varying, p_quant numeric, p_price numeric, p_vat numeric, p_va=
t_code integer, p_client character varying) cascade;
-DROP FUNCTION  insert_quick_code(nf_id integer, tav_text text) cascade;
-DROP FUNCTION  jrn_check_periode() cascade;
-DROP FUNCTION  jrn_def_add() cascade;
-DROP FUNCTION  jrn_def_delete() cascade;
-DROP FUNCTION  jrn_del() cascade;
-DROP FUNCTION  jrnx_del() cascade;
-DROP FUNCTION  plan_analytic_ins_upd() cascade;
-DROP FUNCTION  poste_analytique_ins_upd() cascade;
-DROP FUNCTION  proc_check_balance() cascade;
-DROP FUNCTION  t_document_modele_validate() cascade;
-DROP FUNCTION  t_document_type_insert() cascade;
-DROP FUNCTION  t_document_validate() cascade;
-DROP FUNCTION  t_jrn_def_sequence() cascade;
-DROP FUNCTION  tmp_pcmn_ins() cascade;
-DROP FUNCTION  trim_cvs_quote() cascade;
-DROP FUNCTION  trim_space_format_csv_banque() cascade;
-DROP FUNCTION  tva_delete(integer) cascade;
-DROP FUNCTION  tva_insert(text, numeric, text, text) cascade;
-DROP FUNCTION  tva_modify(integer, text, numeric, text, text) cascade;
-DROP FUNCTION  update_quick_code(njft_id integer, tav_text text) cascade=
;
-
-
-DROP VIEW vw_client ;
-DROP VIEW vw_fiche_attr ;
-DROP VIEW vw_fiche_def ;
-DROP VIEW vw_fiche_min ;
-DROP VIEW vw_poste_qcode ;
-DROP VIEW vw_supplier ;
-
-create domain account_type varchar(30);
-alter table centralized alter c_poste  type account_type;
-alter table del_jrnx alter j_poste  type account_type;
-alter table fiche_def alter fd_class_base  type account_type;
-alter table jrnx alter j_poste  type account_type;
-alter table parm_poste alter p_value  type account_type;
-alter table tmp_pcmn alter pcm_val  type account_type;
-alter table tmp_pcmn alter pcm_val_parent  type account_type;
-
-CREATE VIEW vw_client AS
-    SELECT a.f_id, a.av_text AS name, a1.av_text AS quick_code, b.av_tex=
t AS tva_num, c.av_text AS poste_comptable, d.av_text AS rue, e.av_text A=
S code_postal, f.av_text AS pays, g.av_text AS telephone, h.av_text AS em=
ail FROM (((((((((SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.=
frd_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_d=
ef.fd_create_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_bas=
e, jnt_fic_att_value.ad_id, attr_value.av_text FROM ((((fiche JOIN fiche_=
def USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JOIN jnt_fic_att_va=
lue USING (f_id)) JOIN attr_value USING (jft_id)) WHERE (jnt_fic_att_valu=
e.ad_id =3D 1)) a JOIN (SELECT jnt_fic_att_value.jft_id, fiche.f_id, fich=
e_def.frd_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, f=
iche_def.fd_create_account, fiche_def_ref.frd_text, fiche_def_ref.frd_cla=
ss_base, jnt_fic_att_value.ad_id, attr_value.av_text FROM ((((fiche JOIN =
fiche_def USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JOIN jnt_fic_=
att_value USING (f_id)) JOIN attr_value USING (jft_id)) WHERE (jnt_fic_at=
t_value.ad_id =3D 13)) b USING (f_id)) JOIN (SELECT jnt_fic_att_value.jft=
_id, fiche.f_id, fiche_def.frd_id, fiche.fd_id, fiche_def.fd_class_base, =
fiche_def.fd_label, fiche_def.fd_create_account, fiche_def_ref.frd_text, =
fiche_def_ref.frd_class_base, jnt_fic_att_value.ad_id, attr_value.av_text=
 FROM ((((fiche JOIN fiche_def USING (fd_id)) JOIN fiche_def_ref USING (f=
rd_id)) JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_i=
d)) WHERE (jnt_fic_att_value.ad_id =3D 23)) a1 USING (f_id)) JOIN (SELECT=
 jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id, fiche.fd_id, fic=
he_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_create_account, fi=
che_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_fic_att_value.ad_=
id, attr_value.av_text FROM ((((fiche JOIN fiche_def USING (fd_id)) JOIN =
fiche_def_ref USING (frd_id)) JOIN jnt_fic_att_value USING (f_id)) JOIN a=
ttr_value USING (jft_id)) WHERE (jnt_fic_att_value.ad_id =3D 5)) c USING =
(f_id)) JOIN (SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_=
id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.f=
d_create_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, j=
nt_fic_att_value.ad_id, attr_value.av_text FROM ((((fiche JOIN fiche_def =
USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JOIN jnt_fic_att_value =
USING (f_id)) JOIN attr_value USING (jft_id)) WHERE (jnt_fic_att_value.ad=
_id =3D 14)) d USING (f_id)) JOIN (SELECT jnt_fic_att_value.jft_id, fiche=
.f_id, fiche_def.frd_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.=
fd_label, fiche_def.fd_create_account, fiche_def_ref.frd_text, fiche_def_=
ref.frd_class_base, jnt_fic_att_value.ad_id, attr_value.av_text FROM ((((=
fiche JOIN fiche_def USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JO=
IN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) WHERE =
(jnt_fic_att_value.ad_id =3D 15)) e USING (f_id)) JOIN (SELECT jnt_fic_at=
t_value.jft_id, fiche.f_id, fiche_def.frd_id, fiche.fd_id, fiche_def.fd_c=
lass_base, fiche_def.fd_label, fiche_def.fd_create_account, fiche_def_ref=
.frd_text, fiche_def_ref.frd_class_base, jnt_fic_att_value.ad_id, attr_va=
lue.av_text FROM ((((fiche JOIN fiche_def USING (fd_id)) JOIN fiche_def_r=
ef USING (frd_id)) JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value U=
SING (jft_id)) WHERE (jnt_fic_att_value.ad_id =3D 16)) f USING (f_id)) JO=
IN (SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id, fiche.=
fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_create_a=
ccount, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_fic_att=
_value.ad_id, attr_value.av_text FROM ((((fiche JOIN fiche_def USING (fd_=
id)) JOIN fiche_def_ref USING (frd_id)) JOIN jnt_fic_att_value USING (f_i=
d)) JOIN attr_value USING (jft_id)) WHERE (jnt_fic_att_value.ad_id =3D 17=
)) g USING (f_id)) LEFT JOIN (SELECT jnt_fic_att_value.jft_id, fiche.f_id=
, fiche_def.frd_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_la=
bel, fiche_def.fd_create_account, fiche_def_ref.frd_text, fiche_def_ref.f=
rd_class_base, jnt_fic_att_value.ad_id, attr_value.av_text FROM ((((fiche=
 JOIN fiche_def USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JOIN jn=
t_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) WHERE (jnt_=
fic_att_value.ad_id =3D 18)) h USING (f_id)) WHERE (a.frd_id =3D 9);
-
-CREATE OR REPLACE VIEW vw_fiche_attr AS
- SELECT a.f_id, a.fd_id, a.av_text AS vw_name, b.av_text AS vw_sell, c.a=
v_text AS vw_buy, d.av_text AS tva_code, tva_rate.tva_id, tva_rate.tva_ra=
te, tva_rate.tva_label, e.av_text AS vw_addr, f.av_text AS vw_cp, j.av_te=
xt AS quick_code, h.av_text AS vw_description, i.av_text AS tva_num, fich=
e_def.frd_id
-   FROM ( SELECT fiche.f_id, fiche.fd_id, attr_value.av_text
-	   FROM fiche
-      JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-   JOIN attr_def USING (ad_id)
-  WHERE jnt_fic_att_value.ad_id =3D 1) a
-   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
-	   FROM fiche
-      JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-   JOIN attr_def USING (ad_id)
-  WHERE jnt_fic_att_value.ad_id =3D 6) b ON a.f_id =3D b.f_id
-   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
-      FROM fiche
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-   JOIN attr_def USING (ad_id)
-  WHERE jnt_fic_att_value.ad_id =3D 7) c ON a.f_id =3D c.f_id
-   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
-   FROM fiche
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-   JOIN attr_def USING (ad_id)
-  WHERE jnt_fic_att_value.ad_id =3D 2) d ON a.f_id =3D d.f_id
-   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
-   FROM fiche
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-   JOIN attr_def USING (ad_id)
-  WHERE jnt_fic_att_value.ad_id =3D 14) e ON a.f_id =3D e.f_id
-   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
-   FROM fiche
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-   JOIN attr_def USING (ad_id)
-  WHERE jnt_fic_att_value.ad_id =3D 15) f ON a.f_id =3D f.f_id
-   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
-   FROM fiche
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-   JOIN attr_def USING (ad_id)
-  WHERE jnt_fic_att_value.ad_id =3D 23) j ON a.f_id =3D j.f_id
-   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
-   FROM fiche
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-   JOIN attr_def USING (ad_id)
-  WHERE jnt_fic_att_value.ad_id =3D 9) h ON a.f_id =3D h.f_id
-   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
-   FROM fiche
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-   JOIN attr_def USING (ad_id)
-  WHERE jnt_fic_att_value.ad_id =3D 13) i ON a.f_id =3D i.f_id
-   LEFT JOIN tva_rate ON d.av_text =3D tva_rate.tva_id::text
-   JOIN fiche_def USING (fd_id);
-
-
-
-CREATE VIEW vw_fiche_def AS
-    SELECT jnt_fic_attr.fd_id, jnt_fic_attr.ad_id, attr_def.ad_text, att=
r_value.av_text, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.f=
d_create_account, fiche_def.frd_id FROM (((((jnt_fic_att_value JOIN attr_=
value USING (jft_id)) JOIN fiche USING (f_id)) JOIN jnt_fic_attr USING (f=
d_id)) JOIN attr_def ON ((attr_def.ad_id =3D jnt_fic_attr.ad_id))) JOIN f=
iche_def USING (fd_id));
-CREATE VIEW vw_fiche_min AS
-    SELECT attr_min.frd_id, attr_min.ad_id, attr_def.ad_text, fiche_def_=
ref.frd_text, fiche_def_ref.frd_class_base FROM ((attr_min JOIN attr_def =
USING (ad_id)) JOIN fiche_def_ref USING (frd_id));
-CREATE VIEW vw_poste_qcode AS
-    SELECT a.f_id, a.av_text AS j_poste, b.av_text AS j_qcode FROM ((SEL=
ECT jnt_fic_att_value.f_id, attr_value.av_text FROM (attr_value JOIN jnt_=
fic_att_value USING (jft_id)) WHERE (jnt_fic_att_value.ad_id =3D 5)) a JO=
IN (SELECT jnt_fic_att_value.f_id, attr_value.av_text FROM (attr_value JO=
IN jnt_fic_att_value USING (jft_id)) WHERE (jnt_fic_att_value.ad_id =3D 2=
3)) b USING (f_id));
-CREATE VIEW vw_supplier AS
-    SELECT a.f_id, a.av_text AS name, a1.av_text AS quick_code, b.av_tex=
t AS tva_num, c.av_text AS poste_comptable, d.av_text AS rue, e.av_text A=
S code_postal, f.av_text AS pays, g.av_text AS telephone, h.av_text AS em=
ail FROM (((((((((SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.=
frd_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_d=
ef.fd_create_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_bas=
e, jnt_fic_att_value.ad_id, attr_value.av_text FROM ((((fiche JOIN fiche_=
def USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JOIN jnt_fic_att_va=
lue USING (f_id)) JOIN attr_value USING (jft_id)) WHERE (jnt_fic_att_valu=
e.ad_id =3D 1)) a JOIN (SELECT jnt_fic_att_value.jft_id, fiche.f_id, fich=
e_def.frd_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, f=
iche_def.fd_create_account, fiche_def_ref.frd_text, fiche_def_ref.frd_cla=
ss_base, jnt_fic_att_value.ad_id, attr_value.av_text FROM ((((fiche JOIN =
fiche_def USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JOIN jnt_fic_=
att_value USING (f_id)) JOIN attr_value USING (jft_id)) WHERE (jnt_fic_at=
t_value.ad_id =3D 13)) b USING (f_id)) JOIN (SELECT jnt_fic_att_value.jft=
_id, fiche.f_id, fiche_def.frd_id, fiche.fd_id, fiche_def.fd_class_base, =
fiche_def.fd_label, fiche_def.fd_create_account, fiche_def_ref.frd_text, =
fiche_def_ref.frd_class_base, jnt_fic_att_value.ad_id, attr_value.av_text=
 FROM ((((fiche JOIN fiche_def USING (fd_id)) JOIN fiche_def_ref USING (f=
rd_id)) JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_i=
d)) WHERE (jnt_fic_att_value.ad_id =3D 23)) a1 USING (f_id)) JOIN (SELECT=
 jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id, fiche.fd_id, fic=
he_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_create_account, fi=
che_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_fic_att_value.ad_=
id, attr_value.av_text FROM ((((fiche JOIN fiche_def USING (fd_id)) JOIN =
fiche_def_ref USING (frd_id)) JOIN jnt_fic_att_value USING (f_id)) JOIN a=
ttr_value USING (jft_id)) WHERE (jnt_fic_att_value.ad_id =3D 5)) c USING =
(f_id)) JOIN (SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_=
id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.f=
d_create_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, j=
nt_fic_att_value.ad_id, attr_value.av_text FROM ((((fiche JOIN fiche_def =
USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JOIN jnt_fic_att_value =
USING (f_id)) JOIN attr_value USING (jft_id)) WHERE (jnt_fic_att_value.ad=
_id =3D 14)) d USING (f_id)) JOIN (SELECT jnt_fic_att_value.jft_id, fiche=
.f_id, fiche_def.frd_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.=
fd_label, fiche_def.fd_create_account, fiche_def_ref.frd_text, fiche_def_=
ref.frd_class_base, jnt_fic_att_value.ad_id, attr_value.av_text FROM ((((=
fiche JOIN fiche_def USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JO=
IN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) WHERE =
(jnt_fic_att_value.ad_id =3D 15)) e USING (f_id)) JOIN (SELECT jnt_fic_at=
t_value.jft_id, fiche.f_id, fiche_def.frd_id, fiche.fd_id, fiche_def.fd_c=
lass_base, fiche_def.fd_label, fiche_def.fd_create_account, fiche_def_ref=
.frd_text, fiche_def_ref.frd_class_base, jnt_fic_att_value.ad_id, attr_va=
lue.av_text FROM ((((fiche JOIN fiche_def USING (fd_id)) JOIN fiche_def_r=
ef USING (frd_id)) JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value U=
SING (jft_id)) WHERE (jnt_fic_att_value.ad_id =3D 16)) f USING (f_id)) JO=
IN (SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id, fiche.=
fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_create_a=
ccount, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_fic_att=
_value.ad_id, attr_value.av_text FROM ((((fiche JOIN fiche_def USING (fd_=
id)) JOIN fiche_def_ref USING (frd_id)) JOIN jnt_fic_att_value USING (f_i=
d)) JOIN attr_value USING (jft_id)) WHERE (jnt_fic_att_value.ad_id =3D 17=
)) g USING (f_id)) LEFT JOIN (SELECT jnt_fic_att_value.jft_id, fiche.f_id=
, fiche_def.frd_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_la=
bel, fiche_def.fd_create_account, fiche_def_ref.frd_text, fiche_def_ref.f=
rd_class_base, jnt_fic_att_value.ad_id, attr_value.av_text FROM ((((fiche=
 JOIN fiche_def USING (fd_id)) JOIN fiche_def_ref USING (frd_id)) JOIN jn=
t_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) WHERE (jnt_=
fic_att_value.ad_id =3D 18)) h USING (f_id)) WHERE (a.frd_id =3D 8);
-
-CREATE FUNCTION account_auto(p_fd_id integer) RETURNS boolean
-    AS $$
-declare
-	l_auto bool;
-begin
-
-	select fd_create_account into l_auto from fiche_def where fd_id=3Dp_fd_=
id;
-	if l_auto is null then
-		l_auto:=3Dfalse;
-	end if;
-	return l_auto;
-end;
-$$
-    LANGUAGE plpgsql;
-
-
-
-
-CREATE FUNCTION account_add(p_id account_type, p_name character varying)=
 RETURNS void
-    AS $$
-declare
-	nParent tmp_pcmn.pcm_val_parent%type;
-	nCount integer;
-begin
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_id;
-	if nCount =3D 0 then
-		nParent=3Daccount_parent(p_id);
-		insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent)
-			values (p_id, p_name,nParent);
-	end if;
-return;
-end ;
-$$
-    LANGUAGE plpgsql;
-
-
-
-CREATE FUNCTION action_gestion_ins_upd() RETURNS "trigger"
-    AS $$
-begin
-NEW.ag_title :=3D substr(trim(NEW.ag_title),1,70);
-NEW.ag_hour :=3D substr(trim(NEW.ag_hour),1,5);
-return NEW;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION attribut_insert(p_f_id integer, p_ad_id integer, p_value=
 character varying) RETURNS void
-    AS $$
-declare=20
-	n_jft_id integer;
-begin
-	select nextval('s_jnt_fic_att_value') into n_jft_id;
-	 insert into jnt_fic_att_value (jft_id,f_id,ad_id) values (n_jft_id,p_f=
_id,p_ad_id);
-	 insert into attr_value (jft_id,av_text) values (n_jft_id,trim(p_value)=
);
-return;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION attribute_correct_order() RETURNS void
-    AS $$
-declare
-    crs_correct cursor for select A.jnt_id,A.jnt_order from jnt_fic_attr=
 as A join jnt_fic_attr as B using (fd_id) where A.jnt_order=3DB.jnt_orde=
r and A.jnt_id > B.jnt_id;
-    rec record;
-begin
-	open crs_correct;
-	loop
-	fetch crs_correct into rec;
-	if NOT FOUND then
-		close crs_correct;
-		return;
-	end if;
-	update jnt_fic_attr set jnt_order=3Djnt_order + 1 where jnt_id =3D rec.=
jnt_id;
-	end loop;
-	close crs_correct;
-	perform attribute_correct_order ();
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION bud_card_ins_upd() RETURNS "trigger"
-    AS $$declare
- sCode text;
-begin
-
-sCode:=3Dtrim(upper(NEW.bc_code));
-sCode:=3Dreplace(sCode,' ','_');
-sCode:=3Dsubstr(sCode,1,10);
-NEW.bc_code:=3DsCode;
-return NEW;
-end;$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION card_class_base(p_f_id integer) RETURNS account_type
-    AS $$
-declare
-	n_poste fiche_def.fd_class_base%type;
-begin
-
-	select fd_class_base into n_poste from fiche_def join fiche using
-(fd_id)
-	where f_id=3Dp_f_id;
-	if not FOUND then=20
-		raise exception 'Invalid fiche card_class_base(%)',p_f_id;
-	end if;
-return n_poste;
-end;=20
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION check_balance(p_grpt integer) RETURNS numeric
-    AS $$
-declare=20
-	amount_jrnx_debit numeric;
-	amount_jrnx_credit numeric;
-	amount_jrn numeric;
-begin
-	select sum (j_montant) into amount_jrnx_credit=20
-	from jrnx=20
-		where=20
-	j_grpt=3Dp_grpt
-	and j_debit=3Dfalse;
-
-	select sum (j_montant) into amount_jrnx_debit=20
-	from jrnx=20
-		where=20
-	j_grpt=3Dp_grpt
-	and j_debit=3Dtrue;
-
-	select jr_montant into amount_jrn=20
-	from jrn
-	where
-	jr_grpt_id=3Dp_grpt;
-
-	if ( amount_jrnx_debit !=3D amount_jrnx_credit )=20
-		then
-		return abs(amount_jrnx_debit-amount_jrnx_credit);
-		end if;
-	if ( amount_jrn !=3D amount_jrnx_credit)
-		then
-		return -1*abs(amount_jrn - amount_jrnx_credit);
-		end if;
-	return 0;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION correct_sequence(p_sequence text, p_col text, p_table te=
xt) RETURNS integer
-    AS $$
-declare
-last_sequence int8;
-max_sequence int8;
-n integer;
-begin
-	select count(*) into n from pg_class where relkind=3D'S' and relname=3D=
lower(p_sequence);
-	if n =3D 0 then
-		raise exception  ' Unknow sequence  % ',p_sequence;
-	end if;
-	select count(*) into n from pg_class where relkind=3D'r' and relname=3D=
lower(p_table);
-	if n =3D 0 then
-		raise exception ' Unknow table  % ',p_table;
-	end if;
-
-	execute 'select last_value   from '||p_sequence into last_sequence;
-	raise notice 'Last value of the sequence is %', last_sequence;
-
-	execute 'select max('||p_col||')  from '||p_table into max_sequence;
-	if  max_sequence is null then
-		max_sequence :=3D 0;
-	end if;
-	raise notice 'Max value of the sequence is %', max_sequence;
-	max_sequence:=3D max_sequence +1;=09
-	execute 'alter sequence '||p_sequence||' restart with '||max_sequence;
-return 0;
-
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION create_missing_sequence() RETURNS integer
-    AS $$
-declare
-p_sequence text;
-nSeq integer;
-c1 cursor for select jrn_def_id from jrn_def;
-begin
-	open c1;
-	loop
-	   fetch c1 into nSeq;
-	   if not FOUND THEN
-	   	close c1;
-	   	return 0;
-	   end if;
-	   p_sequence:=3D's_jrn_pj'||nSeq::text;
-	execute 'create sequence '||p_sequence;
-	end loop;
-close c1;
-return 0;
-
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION drop_index(p_constraint character varying) RETURNS void
-    AS $$
-declare=20
-	nCount integer;
-begin
-	select count(*) into nCount from pg_indexes where indexname=3Dp_constra=
int;
-	if nCount =3D 1 then
-	execute 'drop index '||p_constraint ;
-	end if;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION drop_it(p_constraint character varying) RETURNS void
-    AS $$
-declare=20
-	nCount integer;
-begin
-	select count(*) into nCount from pg_constraint where conname=3Dp_constr=
aint;
-	if nCount =3D 1 then
-	execute 'alter table parm_periode drop constraint '||p_constraint ;
-	end if;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION extension_ins_upd() RETURNS "trigger"
-    AS $$
-declare
- sCode text;
- sFile text;
-begin
-sCode:=3Dtrim(upper(NEW.ex_code));
-sCode:=3Dreplace(sCode,' ','_');
-sCode:=3Dsubstr(sCode,1,15);
-sCode=3Dupper(sCode);
-NEW.ex_code:=3DsCode;
-sFile:=3DNEW.ex_file;
-sFile:=3Dreplace(sFile,';','_');
-sFile:=3Dreplace(sFile,'<','_');
-sFile:=3Dreplace(sFile,'>','_');
-sFile:=3Dreplace(sFile,'..','');
-sFile:=3Dreplace(sFile,'&','');
-sFile:=3Dreplace(sFile,'|','');
-
-
-
-return NEW;
-
-end;
-
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION fiche_account_parent(p_f_id integer) RETURNS account_typ=
e
-    AS $$
-declare
-ret account_type;
-begin
-	select fd_class_base into ret from fiche_def join fiche using (fd_id) w=
here f_id=3Dp_f_id;
-	if not FOUND then
-		raise exception '% N''existe pas',p_f_id;
-	end if;
-	return ret;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION fiche_attribut_synchro(p_fd_id integer) RETURNS void
-    AS $$
-declare
-	-- this sql gives the f_id and the missing attribute (ad_id)
-	list_missing cursor for select f_id,fd_id,ad_id,jnt_order from jnt_fic_=
attr join fiche as A using (fd_id) where fd_id=3Dp_fd_id and ad_id not in=
 (select ad_id from fiche join jnt_fic_att_value using (f_id) where fd_id=
=3Djnt_fic_attr.fd_id and A.f_id=3Df_id);
-	rec record;
-	-- value of the last insert
-	jnt jnt_fic_att_value%ROWTYPE;
-begin
-	open list_missing;
-	loop
-=09
-	fetch list_missing into rec;
-	IF NOT FOUND then
-		exit;
-	end if;
-	-- insert a value into jnt_fic_att_value
-	insert 	into jnt_fic_att_value (f_id,ad_id) values (rec.f_id,rec.ad_id)=
 returning * into jnt;
-
-	-- now we insert into attr_value
-	insert into attr_value values (jnt.jft_id,'');
-	end loop;
-	close list_missing;
-end;=20
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION find_pcm_type(pp_value numeric) RETURNS text
-    AS $$
-declare
-        str_type text;
-        str_value text;
-        n_value numeric;
-        nLength integer;
-begin=20
-        str_value:=3Dtrim(to_char(pp_value,'9999999999999999999999999999=
9'));
-        nLength:=3Dlength(str_value);
-	while nLength > 0 loop
-		n_value:=3Dto_number(str_value,'99999999999999999999999999999');
-      		select p_type into str_type from parm_poste where p_value=3Dn_va=
lue;
-		if FOUND then
-			return str_type;
-		end if;
-		nLength:=3DnLength-1;
-		str_value:=3Dsubstring(str_value from 1 for nLength);=09
-	end loop;
-return 'CON';
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION group_analytic_ins_upd() RETURNS "trigger"
-    AS $$
-declare=20
-name text;
-begin
-name:=3Dupper(NEW.ga_id);
-name:=3Dtrim(name);
-name:=3Dreplace(name,' ','');
-NEW.ga_id:=3Dname;
-return NEW;
-end;$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION group_analytique_del() RETURNS "trigger"
-    AS $$
-begin
-update poste_analytique set ga_id=3Dnull
-where ga_id=3DOLD.ga_id;
-return OLD;
-end;$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION html_quote(p_string text) RETURNS text
-    AS $$
-declare
-	r text;
-begin
-	r:=3Dp_string;
-	r:=3Dreplace(r,'<','&lt;');
-	r:=3Dreplace(r,'>','&gt;');
-	r:=3Dreplace(r,'''','&quot;');
-	return r;
-end;$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION info_def_ins_upd() RETURNS "trigger"
-    AS $$
-declare=20
-	row_info_def info_def%ROWTYPE;
-	str_type text;
-begin
-row_info_def:=3DNEW;
-str_type:=3Dupper(trim(NEW.id_type));
-str_type:=3Dreplace(str_type,' ','');
-str_type:=3Dreplace(str_type,',','');
-str_type:=3Dreplace(str_type,';','');
-if  length(str_type) =3D0 then
-	raise exception 'id_type cannot be null';
-end if;
-row_info_def.id_type:=3Dstr_type;
-return row_info_def;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE OR REPLACE FUNCTION insert_jrnx(p_date character varying, p_monta=
nt numeric, p_poste account_type, p_grpt integer, p_jrn_def integer, p_de=
bit boolean, p_tech_user text, p_tech_per integer, p_qcode text,p_comment=
 text)
-  RETURNS void AS
-$BODY$
-declare
-	sCode varchar;
-	nCount_qcode integer;
-begin
-	sCode=3Dtrim(p_qcode);
-
-	-- if p_qcode is empty try to find one
-	if length(sCode) =3D 0 or p_qcode is null then
-		select count(*) into nCount_qcode
-			from vw_poste_qcode where j_poste=3Dp_poste::text;
-	-- if we find only one q_code for a accountancy account
-	-- then retrieve it
-		if nCount_qcode =3D 1 then
-			select j_qcode::text into sCode
-			from vw_poste_qcode where j_poste=3Dp_poste::text;
-		else
-		 sCode=3DNULL;
-		end if;
-
-	end if;
-
-	insert into jrnx
-	(
-		j_date,
-		j_montant,
-		j_poste,
-		j_grpt,
-		j_jrn_def,
-		j_debit,
-		j_text,
-		j_tech_user,
-		j_tech_per,
-		j_qcode
-	) values
-	(
-		to_date(p_date,'DD.MM.YYYY'),
-		p_montant,
-		p_poste,
-		p_grpt,
-		p_jrn_def,
-		p_debit,
-		p_comment,
-		p_tech_user,
-		p_tech_per,
-		sCode
-	);
-
-return;
-end;
-$BODY$
-LANGUAGE plpgsql;
-CREATE FUNCTION insert_quant_purchase(p_internal text, p_j_id numeric, p=
_fiche character varying, p_quant numeric, p_price numeric, p_vat numeric=
, p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric, p_nd_tva_rec=
up numeric, p_dep_priv numeric, p_client character varying) RETURNS void
-    AS $$
-declare
-	fid_client integer;
-	fid_good   integer;
-begin
-	select f_id into fid_client from
-		attr_value join jnt_fic_att_value using (jft_id) where ad_id=3D23 and =
av_text=3Dupper(trim(p_client));
-	select f_id into fid_good from
-		attr_value join jnt_fic_att_value using (jft_id) where ad_id=3D23 and =
av_text=3Dupper(trim(p_fiche));
-	insert into quant_purchase
-		(qp_internal,
-		j_id,
-		qp_fiche,
-		qp_quantite,
-		qp_price,
-		qp_vat,
-		qp_vat_code,
-		qp_nd_amount,
-		qp_nd_tva,
-		qp_nd_tva_recup,
-		qp_supplier,
-		qp_dep_priv)
-	values
-		(p_internal,
-		p_j_id,
-		fid_good,
-		p_quant,
-		p_price,
-		p_vat,
-		p_vat_code,
-		p_nd_amount,
-		p_nd_tva,
-		p_nd_tva_recup,
-		fid_client,
-		p_dep_priv);
-	return;
-end;
- $$
-    LANGUAGE plpgsql;
-CREATE FUNCTION insert_quant_sold(p_internal text, p_jid numeric, p_fich=
e character varying, p_quant numeric, p_price numeric, p_vat numeric, p_v=
at_code integer, p_client character varying) RETURNS void
-    AS $$
-declare
-	fid_client integer;
-	fid_good   integer;
-begin
-
-	select f_id into fid_client from
-		attr_value join jnt_fic_att_value using (jft_id) where ad_id=3D23 and =
av_text=3Dupper(trim(p_client));
-	select f_id into fid_good from
-		attr_value join jnt_fic_att_value using (jft_id) where ad_id=3D23 and =
av_text=3Dupper(trim(p_fiche));
-	insert into quant_sold
-		(qs_internal,j_id,qs_fiche,qs_quantite,qs_price,qs_vat,qs_vat_code,qs_=
client,qs_valid)
-	values
-		(p_internal,p_jid,fid_good,p_quant,p_price,p_vat,p_vat_code,fid_client=
,'Y');
-	return;
-end;
- $$
-    LANGUAGE plpgsql;
-CREATE FUNCTION insert_quick_code(nf_id integer, tav_text text) RETURNS =
integer
-    AS $$
-	declare
-	ns integer;
-	nExist integer;
-	tText text;
-	begin
-	tText :=3D upper(trim(tav_text));
-	tText :=3D replace(tText,' ','');
-=09
-	loop
-		-- take the next sequence
-		select nextval('s_jnt_fic_att_value') into ns;
-		if length (tText) =3D 0 or tText is null then
-			tText :=3D 'FID'||ns;
-		end if;
-		-- av_text already used ?
-		select count(*) into nExist=20
-			from jnt_fic_att_value join attr_value using (jft_id)=20
-		where=20
-			ad_id=3D23 and  av_text=3Dupper(tText);
-
-		if nExist =3D 0 then
-			exit;
-		end if;
-		tText:=3D'FID'||ns;
-	end loop;
-	-- insert into table jnt_fic_att_value
-	insert into jnt_fic_att_value values (ns,nf_id,23);
-	-- insert value into attr_value
-	insert into attr_value values (ns,upper(tText));
-	return ns;
-	end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION jrn_check_periode() RETURNS "trigger"
-    AS $$
-declare=20
-bClosed bool;
-str_status text;
-ljr_tech_per jrn.jr_tech_per%TYPE;
-ljr_def_id jrn.jr_def_id%TYPE;
-lreturn jrn%ROWTYPE;
-begin
-if TG_OP=3D'INSERT' then
-	ljr_tech_per :=3DNEW.jr_tech_per;
-	ljr_def_id   :=3DNEW.jr_def_id;
-        lreturn      :=3DNEW;
-end if;
-
-if TG_OP=3D'DELETE' then
-	ljr_tech_per :=3DOLD.jr_tech_per;
-	ljr_def_id   :=3DOLD.jr_def_id;
-        lreturn      :=3DOLD;
-end if;
-
-select p_closed into bClosed from parm_periode=20
-	where p_id=3Dljr_tech_per;
-
-if bClosed =3D true then
-	raise exception 'Periode fermee';
-end if;
-
-select status into str_status from jrn_periode=20
-       where p_id =3Dljr_tech_per and jrn_def_id=3Dljr_def_id;
-
-if str_status <> 'OP' then
-	raise exception 'Periode fermee';
-end if;
-
-return lreturn;
-end;$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION jrn_def_add() RETURNS "trigger"
-    AS $$begin
-execute 'insert into jrn_periode(p_id,jrn_def_id,status) select p_id,'||=
NEW.jrn_def_id||',
-	case when p_central=3Dtrue then ''CE''
-	      when p_closed=3Dtrue then ''CL''
-	else ''OP''
-	end
-from
-parm_periode ';
-return NEW;
-end;$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION jrn_def_delete() RETURNS "trigger"
-    AS $$
-declare=20
-nb numeric;
-begin
-select count(*) into nb from jrn where jr_def_id=3DOLD.jrn_def_id;
-
-if nb <> 0 then
-	raise exception 'EFFACEMENT INTERDIT: JOURNAL UTILISE';
-end if;
-return OLD;
-end;$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION jrn_del() RETURNS "trigger"
-    AS $$
-declare
-row jrn%ROWTYPE;
-begin
-row:=3DOLD;
-insert into del_jrn ( jr_id,
-       jr_def_id,
-       jr_montant,
-       jr_comment,
-       jr_date,
-       jr_grpt_id,
-       jr_internal,
-       jr_tech_date,
-       jr_tech_per,
-       jrn_ech,
-       jr_ech,
-       jr_rapt,
-       jr_valid,
-       jr_opid,
-       jr_c_opid,
-       jr_pj,
-       jr_pj_name,
-       jr_pj_type,
-       jr_pj_number,
-       del_jrn_date)=20
-       select  jr_id,
-	      jr_def_id,
-	      jr_montant,
-	      jr_comment,
-	      jr_date,
-	      jr_grpt_id,
-	      jr_internal,
-	      jr_tech_date,
-	      jr_tech_per,
-	      jrn_ech,
-	      jr_ech,
-	      jr_rapt,
-	      jr_valid,
-	      jr_opid,
-	      jr_c_opid,
-	      jr_pj,
-	      jr_pj_name,
-	      jr_pj_type,
-	      jr_pj_number
-	      ,now() from jrn where jr_id=3Drow.jr_id;
-return row;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION jrnx_del() RETURNS "trigger"
-    AS $$
-declare
-row jrnx%ROWTYPE;
-begin
-row:=3DOLD;
-insert into del_jrnx select * from jrnx where j_id=3Drow.j_id;
-return row;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION plan_analytic_ins_upd() RETURNS "trigger"
-    AS $$
-declare
-   name text;
-begin
-   name:=3Dupper(NEW.pa_name);
-   name:=3Dtrim(name);
-   name:=3Dreplace(name,' ','');
-   NEW.pa_name:=3Dname;
-return NEW;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION poste_analytique_ins_upd() RETURNS "trigger"
-    AS $$declare
-name text;
-rCount record;
-
-begin
-name:=3Dupper(NEW.po_name);
-name:=3Dtrim(name);
-name:=3Dreplace(name,' ','');	=09
-NEW.po_name:=3Dname;
-
-if NEW.ga_id is NULL then
-return NEW;
-end if;
-
-if length(trim(NEW.ga_id)) =3D 0 then
-  NEW.ga_id:=3DNULL;
-  return NEW;
-end if;
-perform 'select ga_id from groupe_analytique where ga_id=3D'||NEW.ga_id;
-if NOT FOUND then
-   raise exception' Inexistent Group Analytic %',NEW.ga_id;
-end if;
-return NEW;
-end;$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION proc_check_balance() RETURNS "trigger"
-    AS $$
-declare=20
-	diff numeric;
-	tt integer;
-begin
-	if TG_OP =3D 'INSERT' or TG_OP=3D'UPDATE' then
-	tt=3DNEW.jr_grpt_id;
-	diff:=3Dcheck_balance(tt);
-	if diff !=3D 0 then
-		raise exception 'balance error %',diff ;
-	end if;
-	return NEW;
-	end if;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION t_document_modele_validate() RETURNS "trigger"
-    AS $$
-declare=20
-    lText text;
-    modified document_modele%ROWTYPE;
-begin
-    modified:=3DNEW;
-
-	modified.md_filename:=3Dreplace(NEW.md_filename,' ','_');
-	return modified;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION t_document_type_insert() RETURNS "trigger"
-    AS $$
-declare
-nCounter integer;
-    BEGIN
-select count(*) into nCounter from pg_class where relname=3D'seq_doc_typ=
e_'||NEW.dt_id;
-if nCounter =3D 0 then
-        execute  'create sequence seq_doc_type_'||NEW.dt_id;
-end if;
-        RETURN NEW;
-    END;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION t_document_validate() RETURNS "trigger"
-    AS $$
-declare
-  lText text;
-  modified document%ROWTYPE;
-begin
-    	modified:=3DNEW;
-	modified.d_filename:=3Dreplace(NEW.d_filename,' ','_');
-	return modified;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION t_jrn_def_sequence() RETURNS "trigger"
-    AS $$
-declare
-nCounter integer;
-
-    BEGIN
-    select count(*) into nCounter=20
-       from pg_class where relname=3D's_jrn_'||NEW.jrn_def_id;
-       if nCounter =3D 0 then
-       	   execute  'create sequence s_jrn_'||NEW.jrn_def_id;
-	   raise notice 'Creating sequence s_jrn_%',NEW.jrn_def_id;
-	 end if;
-
-        RETURN NEW;
-    END;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION tmp_pcmn_ins() RETURNS "trigger"
-    AS $$
-declare
-   r_record tmp_pcmn%ROWTYPE;
-begin
-r_record=3DNEW;
-if  length(trim(r_record.pcm_type))=3D0 or r_record.pcm_type is NULL the=
n=20
-   r_record.pcm_type:=3Dfind_pcm_type(NEW.pcm_val);
-   return r_record;
-end if;
-return NEW;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION trim_cvs_quote() RETURNS "trigger"
-    AS $$
-declare
-        modified import_tmp%ROWTYPE;
-begin
-	modified:=3DNEW;
-	modified.devise=3Dreplace(new.devise,'"','');
-	modified.poste_comptable=3Dreplace(new.poste_comptable,'"','');
-        modified.compte_ordre=3Dreplace(NEW.COMPTE_ORDRE,'"','');
-        modified.detail=3Dreplace(NEW.DETAIL,'"','');
-        modified.num_compte=3Dreplace(NEW.NUM_COMPTE,'"','');
-        return modified;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION trim_space_format_csv_banque() RETURNS "trigger"
-    AS $$
-declare
-        modified format_csv_banque%ROWTYPE;
-begin
-        modified.name=3Dtrim(NEW.NAME);
-        modified.include_file=3Dtrim(new.include_file);
-		if ( length(modified.name) =3D 0 ) then
-			modified.name=3Dnull;
-		end if;
-		if ( length(modified.include_file) =3D 0 ) then
-			modified.include_file=3Dnull;
-		end if;
-
-        return modified;
-end;
-$$
-    LANGUAGE plpgsql;
-CREATE FUNCTION tva_delete(integer) RETURNS void
-    AS $_$=20
-declare
-	p_tva_id alias for $1;
-	nCount integer;
-begin
-	nCount=3D0;
-	select count(*) into nCount from quant_sold where qs_vat_code=3Dp_tva_i=
d;
-	if nCount !=3D 0 then
-                 return;
-	=09
-	end if;
-	select count(*) into nCount from quant_purchase where qp_vat_code=3Dp_t=
va_id;
-	if nCount !=3D 0 then
-                 return;
-	=09
-	end if;
-
-delete from tva_rate where tva_id=3Dp_tva_id;
-	return;
-end;
-$_$
-    LANGUAGE plpgsql;
-CREATE FUNCTION tva_insert(text, numeric, text, text) RETURNS integer
-    AS $_$
-declare
-l_tva_id integer;
-p_tva_label alias for $1;
-p_tva_rate alias for $2;
-p_tva_comment alias for $3;
-p_tva_poste alias for $4;
-debit text;
-credit text;
-nCount integer;
-begin
-if length(trim(p_tva_label)) =3D 0 then
-	return 3;
-end if;
-
-if length(trim(p_tva_poste)) !=3D 0 then
-	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
-	debit  =3D split_part(p_tva_poste,',',1);
-	credit  =3D split_part(p_tva_poste,',',2);
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
-	if nCount =3D 0 then return 4; end if;
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
-	if nCount =3D 0 then return 4; end if;
-=20
-end if;
-select into l_tva_id nextval('s_tva') ;
-insert into tva_rate(tva_id,tva_label,tva_rate,tva_comment,tva_poste)
-	values (l_tva_id,p_tva_label,p_tva_rate,p_tva_comment,p_tva_poste);
-return 0;
-end;
-$_$
-    LANGUAGE plpgsql;
-CREATE FUNCTION tva_modify(integer, text, numeric, text, text) RETURNS i=
nteger
-    AS $_$
-declare
-p_tva_id alias for $1;
-p_tva_label alias for $2;
-p_tva_rate alias for $3;
-p_tva_comment alias for $4;
-p_tva_poste alias for $5;
-debit text;
-credit text;
-nCount integer;
-begin
-if length(trim(p_tva_label)) =3D 0 then
-	return 3;
-end if;
-
-if length(trim(p_tva_poste)) !=3D 0 then
-	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
-	debit  =3D split_part(p_tva_poste,',',1);
-	credit  =3D split_part(p_tva_poste,',',2);
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
-	if nCount =3D 0 then return 4; end if;
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
-	if nCount =3D 0 then return 4; end if;
-=20
-end if;
-update tva_rate set tva_label=3Dp_tva_label,tva_rate=3Dp_tva_rate,tva_co=
mment=3Dp_tva_comment,tva_poste=3Dp_tva_poste
-	where tva_id=3Dp_tva_id;
-return 0;
-end;
-$_$
-    LANGUAGE plpgsql;
-CREATE FUNCTION update_quick_code(njft_id integer, tav_text text) RETURN=
S integer
-    AS $$
-	declare
-	ns integer;
-	nExist integer;
-	tText text;
-	old_qcode varchar;
-	begin
-	-- get current value
-	select av_text into old_qcode from attr_value where jft_id=3Dnjft_id;
-	-- av_text didn't change so no update
-	if tav_text =3D upper( trim(old_qcode)) then
-		return 0;
-	end if;
-=09
-	tText :=3D trim(upper(tav_text));
-	tText :=3D replace(tText,' ','');
-	if length ( tText) =3D 0 or tText is null then
-		return 0;
-	end if;
-	=09
-	ns :=3D njft_id;
-
-	loop
-		-- av_text already used ?
-		select count(*) into nExist=20
-			from jnt_fic_att_value join attr_value using (jft_id)=20
-		where=20
-			ad_id=3D23 and av_text=3DtText;
-
-		if nExist =3D 0 then
-			exit;
-		end if;=09
-		if tText =3D 'FID'||ns then
-			-- take the next sequence
-			select nextval('s_jnt_fic_att_value') into ns;
-		end if;
-		tText  :=3D'FID'||ns;
-	=09
-	end loop;
-	update attr_value set av_text =3D tText where jft_id=3Dnjft_id;
-
-	-- update also the contact
-	update attr_value set av_text =3D tText=20
-		where jft_id in=20
-			( select jft_id=20
-				from jnt_fic_att_value join attr_value using (jft_id)=20
-			where ad_id=3D25 and av_text=3Dold_qcode);
-
-
-	update jrnx set j_qcode=3DtText where j_qcode =3D old_qcode;
-	return ns;
-	end;
-$$
-    LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION account_update(p_f_id integer, p_account acco=
unt_type)
-  RETURNS integer AS
-$BODY$
-declare
-nMax fiche.f_id%type;
-nCount integer;
-nParent tmp_pcmn.pcm_val_parent%type;
-sName varchar;
-nJft_id attr_value.jft_id%type;
-first text;
-second text;
-begin
-=09
-	if length(trim(p_account)) !=3D 0 then
-		if position (',' in p_account) =3D 0 then
-			select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_account::=
account_type;
-			if nCount =3D 0 then
-			select av_text into sName from=20
-				attr_value join jnt_fic_att_value using (jft_id)
-				where
-				ad_id=3D1 and f_id=3Dp_f_id;
-			nParent:=3Daccount_parent(p_account::account_type);
-			insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_accoun=
t::account_type,sName,nParent);
-			end if;	=09
-		else=20
-		raise info 'presence of a comma';
-		-- there is 2 accounts separated by a comma
-		first :=3D split_part(p_account,',',1);
-		second :=3D split_part(p_account,',',2);
-		-- check there is no other coma
-		raise info 'first value % second value %', first, second;
-	=09
-		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
-			raise exception 'Too many comas, invalid account';
-		end if;
-		end if;	=09
-	end if;
-	select jft_id into njft_id from jnt_fic_att_value where f_id=3Dp_f_id a=
nd ad_id=3D5;
-	update attr_value set av_text=3Dp_account where jft_id=3Dnjft_id;
-	=09
-return njft_id;
-end;
-$BODY$
-LANGUAGE 'plpgsql' ;
-
-CREATE OR REPLACE FUNCTION account_insert(p_f_id integer, p_account acco=
unt_type)
-  RETURNS integer AS
-$BODY$
-declare
-nParent tmp_pcmn.pcm_val_parent%type;
-sName varchar;
-nNew tmp_pcmn.pcm_val%type;
-bAuto bool;
-nFd_id integer;
-nCount integer;
-first text;
-second text;
-begin
-
-	if length(trim(p_account)) !=3D 0 then
-	-- if there is coma in p_account, treat normally
-		if position (',' in p_account) =3D 0 then
-			raise info 'p_account is not empty';
-				select count(*)  into nCount from tmp_pcmn where pcm_val=3Dp_account=
::account_type;
-				raise notice 'found in tmp_pcm %',nCount;
-				if nCount !=3D0  then
-					raise info 'this account exists in tmp_pcmn ';
-					perform attribut_insert(p_f_id,5,p_account);
-				   else
-				       -- account doesn't exist, create it
-					select av_text into sName from
-						attr_value join jnt_fic_att_value using (jft_id)
-					where
-					ad_id=3D1 and f_id=3Dp_f_id;
-
-					nParent:=3Daccount_parent(p_account::account_type);
-					insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_acco=
unt::account_type,sName,nParent);
-					perform attribut_insert(p_f_id,5,p_account::text);
-
-				end if;
-		else
-		raise info 'presence of a comma';
-		-- there is 2 accounts separated by a comma
-		first :=3D split_part(p_account,',',1);
-		second :=3D split_part(p_account,',',2);
-		-- check there is no other coma
-		raise info 'first value % second value %', first, second;
-
-		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
-			raise exception 'Too many comas, invalid account';
-		end if;
-		perform attribut_insert(p_f_id,5,p_account::text);
-		end if;
-	else
-	raise info 'p_account is  empty';
-		select fd_id into nFd_id from fiche where f_id=3Dp_f_id;
-		bAuto:=3D account_auto(nFd_id);
-		if bAuto =3D true then
-			raise notice 'account generated automatically';
-			nNew:=3Daccount_compute(p_f_id);
-			raise notice 'nNew %', nNew;
-			select av_text into sName from
-			attr_value join jnt_fic_att_value using (jft_id)
-			where
-			ad_id=3D1 and f_id=3Dp_f_id;
-			nParent:=3Daccount_parent(nNew);
-			perform account_add  (nNew,sName);
-			perform attribut_insert(p_f_id,5,nNew);
-
-		else
-		-- if there is an account_base then it is the default
-		      select fd_class_base::text into nNew from fiche_def join fiche u=
sing (fd_id) where f_id=3Dp_f_id;
-			if nNew is null or length(trim(nNew)) =3D 0 then
-				raise notice 'count is null';
-				 perform attribut_insert(p_f_id,5,null);
-			else
-				 perform attribut_insert(p_f_id,5,nNew);
-			end if;
-		end if;
-	end if;
-
-return 0;
-end;
-$BODY$
-LANGUAGE 'plpgsql';
-
-
-
-
-CREATE TRIGGER action_gestion_t_insert_update
-    BEFORE INSERT OR UPDATE ON action_gestion
-    FOR EACH ROW
-    EXECUTE PROCEDURE action_gestion_ins_upd();
-
-
-
-COMMENT ON TRIGGER action_gestion_t_insert_update ON action_gestion IS '=
Truncate the column ag_title to 70 char';
-
-
-
-CREATE TRIGGER document_modele_validate
-    BEFORE INSERT OR UPDATE ON document_modele
-    FOR EACH ROW
-    EXECUTE PROCEDURE t_document_modele_validate();
-
-
-
-CREATE TRIGGER document_validate
-    BEFORE INSERT OR UPDATE ON document
-    FOR EACH ROW
-    EXECUTE PROCEDURE t_document_validate();
-
-
-
-CREATE TRIGGER info_def_ins_upd_t
-    BEFORE INSERT OR UPDATE ON info_def
-    FOR EACH ROW
-    EXECUTE PROCEDURE info_def_ins_upd();
-
-
-
-CREATE TRIGGER t_check_balance
-    AFTER INSERT OR UPDATE ON jrn
-    FOR EACH ROW
-    EXECUTE PROCEDURE proc_check_balance();
-
-
-
-CREATE TRIGGER t_check_jrn
-    BEFORE INSERT OR DELETE ON jrn
-    FOR EACH ROW
-    EXECUTE PROCEDURE jrn_check_periode();
-
-
-
-CREATE TRIGGER t_group_analytic_del
-    BEFORE DELETE ON groupe_analytique
-    FOR EACH ROW
-    EXECUTE PROCEDURE group_analytique_del();
-
-
-
-CREATE TRIGGER t_group_analytic_ins_upd
-    BEFORE INSERT OR UPDATE ON groupe_analytique
-    FOR EACH ROW
-    EXECUTE PROCEDURE group_analytic_ins_upd();
-
-
-
-CREATE TRIGGER t_jrn_def_add_periode
-    AFTER INSERT ON jrn_def
-    FOR EACH ROW
-    EXECUTE PROCEDURE jrn_def_add();
-
-
-
-CREATE TRIGGER t_jrn_def_delete
-    BEFORE DELETE ON jrn_def
-    FOR EACH ROW
-    EXECUTE PROCEDURE jrn_def_delete();
-
-
-
-CREATE TRIGGER t_jrn_del
-    BEFORE DELETE ON jrn
-    FOR EACH ROW
-    EXECUTE PROCEDURE jrn_del();
-
-
-
-CREATE TRIGGER t_jrnx_del
-    BEFORE DELETE ON jrnx
-    FOR EACH ROW
-    EXECUTE PROCEDURE jrnx_del();
-
-
-
-CREATE TRIGGER t_plan_analytique_ins_upd
-    BEFORE INSERT OR UPDATE ON plan_analytique
-    FOR EACH ROW
-    EXECUTE PROCEDURE plan_analytic_ins_upd();
-
-
-
-CREATE TRIGGER t_poste_analytique_ins_upd
-    BEFORE INSERT OR UPDATE ON poste_analytique
-    FOR EACH ROW
-    EXECUTE PROCEDURE poste_analytique_ins_upd();
-
-
-
-CREATE TRIGGER t_tmp_pcmn_ins
-    BEFORE INSERT ON tmp_pcmn
-    FOR EACH ROW
-    EXECUTE PROCEDURE tmp_pcmn_ins();
-
-
-
-CREATE TRIGGER trg_extension_ins_upd
-    BEFORE INSERT OR UPDATE ON extension
-    FOR EACH ROW
-    EXECUTE PROCEDURE extension_ins_upd();
-
-
-
-CREATE TRIGGER trigger_document_type_i
-    AFTER INSERT ON document_type
-    FOR EACH ROW
-    EXECUTE PROCEDURE t_document_type_insert();
-
-
-
-CREATE TRIGGER trigger_jrn_def_sequence_i
-    AFTER INSERT ON jrn_def
-    FOR EACH ROW
-    EXECUTE PROCEDURE t_jrn_def_sequence();
-
-
-
-CREATE TRIGGER trim_quote
-    BEFORE INSERT OR UPDATE ON import_tmp
-    FOR EACH ROW
-    EXECUTE PROCEDURE trim_cvs_quote();
-
-
-
-CREATE TRIGGER trim_space
-    BEFORE INSERT OR UPDATE ON format_csv_banque
-    FOR EACH ROW
-    EXECUTE PROCEDURE trim_space_format_csv_banque();
-   =20
-DROP VIEW vw_fiche_def;
-DROP VIEW vw_supplier;
-DROP VIEW vw_client;
-
-CREATE OR REPLACE VIEW vw_fiche_def AS=20
- SELECT jnt_fic_attr.fd_id, jnt_fic_attr.ad_id, attr_def.ad_text, fiche_=
def.fd_class_base, fiche_def.fd_label, fiche_def.fd_create_account, fiche=
_def.frd_id
-   FROM fiche_def
-   JOIN jnt_fic_attr USING (fd_id)
-   JOIN attr_def ON attr_def.ad_id =3D jnt_fic_attr.ad_id;
-
-COMMENT ON VIEW vw_fiche_def IS 'all the attributs for  card family';
-
-CREATE OR REPLACE VIEW vw_supplier AS=20
- SELECT a.f_id, a.av_text AS name, a1.av_text AS quick_code, b.av_text A=
S tva_num, c.av_text AS poste_comptable, d.av_text AS rue, e.av_text AS c=
ode_postal, f.av_text AS pays, g.av_text AS telephone, h.av_text AS email
-   FROM ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-           FROM fiche
-      JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 1) a
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-           FROM fiche
-      JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 13) b USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-      FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 23) a1 USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 5) c USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 14) d USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 15) e USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 16) f USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 17) g USING (f_id)
-   LEFT JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.fr=
d_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def=
.fd_create_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base,=
 jnt_fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 18) h USING (f_id)
-  WHERE a.frd_id =3D 8;
-CREATE OR REPLACE VIEW vw_client AS=20
- SELECT a.f_id, a.av_text AS name, a1.av_text AS quick_code, b.av_text A=
S tva_num, c.av_text AS poste_comptable, d.av_text AS rue, e.av_text AS c=
ode_postal, f.av_text AS pays, g.av_text AS telephone, h.av_text AS email
-   FROM ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-           FROM fiche
-      JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 1) a
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-           FROM fiche
-      JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 13) b USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-      FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 23) a1 USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 5) c USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 14) d USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 15) e USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 16) f USING (f_id)
-   JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.frd_id,=
 fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def.fd_c=
reate_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base, jnt_=
fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 17) g USING (f_id)
-   LEFT JOIN ( SELECT jnt_fic_att_value.jft_id, fiche.f_id, fiche_def.fr=
d_id, fiche.fd_id, fiche_def.fd_class_base, fiche_def.fd_label, fiche_def=
.fd_create_account, fiche_def_ref.frd_text, fiche_def_ref.frd_class_base,=
 jnt_fic_att_value.ad_id, attr_value.av_text
-   FROM fiche
-   JOIN fiche_def USING (fd_id)
-   JOIN fiche_def_ref USING (frd_id)
-   JOIN jnt_fic_att_value USING (f_id)
-   JOIN attr_value USING (jft_id)
-  WHERE jnt_fic_att_value.ad_id =3D 18) h USING (f_id)
-  WHERE a.frd_id =3D 9;
-
-CREATE OR REPLACE FUNCTION account_parent(p_account account_type)
-  RETURNS poste_comptable AS
-$BODY$
-declare
-	nParent tmp_pcmn.pcm_val_parent%type;
-	sParent varchar;
-	nCount integer;
-begin
-	sParent:=3Dp_account;
-	sParent:=3Dtrim(sParent::text);
-	nParent:=3D0;
-	while nParent =3D 0 loop
-		select count(*) into nCount
-		from tmp_pcmn
-		where
-		pcm_val =3D sParent;
-		if nCount !=3D 0 then
-			nParent:=3DsParent;
-			return nParent;
-		end if;
-		sParent:=3D substr(sParent,1,length(sParent)-1);
-		if length(sParent) <=3D 0 then
-			raise exception 'Impossible de trouver le compte parent pour %',p_acc=
ount;
-		end if;
-	end loop;
-	raise notice 'account_parent : Parent is %',nParent;
-	return nParent;
-end;
-$BODY$
-LANGUAGE 'plpgsql' VOLATILE;
-
-
-CREATE OR REPLACE FUNCTION account_compute(p_f_id integer)
-  RETURNS account_type AS
-$BODY$
-declare
-        class_base account_type;
-        maxcode account_type;
-        nCount integer;
-begin
-        select fd_class_base into class_base
-        from
-                fiche_def join fiche using (fd_id)
-        where
-                f_id=3Dp_f_id;
-        raise notice 'account_compute class base %',class_base;
-        select count (pcm_val) into nCount from tmp_pcmn where pcm_val_p=
arent =3D class_base;
-        if nCount =3D 0  then
-                maxcode:=3Dclass_base;
-        else
-                select max (pcm_val) into maxcode from tmp_pcmn where pc=
m_val_parent =3D class_base;
-        end if;
-        if maxcode =3D class_base then
-                maxcode:=3Dclass_base::text||'0000';
-        end if;
-        maxcode:=3Dto_char(to_number(maxcode,'99999999999999999999999999=
9999')+1,'999999999999999999999999999999');
-        raise notice 'account_compute Max code %',maxcode;
-        return maxcode::text;
-end;
-$BODY$
-  LANGUAGE 'plpgsql' VOLATILE;
-commit;

Deleted: phpcompta/trunk/sql/comptaproc.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/comptaproc.sql	2011-11-22 22:44:52 UTC (rev 4446)
+++ phpcompta/trunk/sql/comptaproc.sql	2011-11-22 22:50:44 UTC (rev 4447)
@@ -1,1972 +0,0 @@
---
--- PostgreSQL database dump
---
-
-SET statement_timeout =3D 0;
-SET client_encoding =3D 'UTF8';
-SET standard_conforming_strings =3D off;
-SET check_function_bodies =3D false;
-SET client_min_messages =3D warning;
-SET escape_string_warning =3D off;
-
---
--- Name: comptaproc; Type: SCHEMA; Schema: -; Owner: -
---
-
-CREATE SCHEMA comptaproc;
-
-
-SET search_path =3D comptaproc, pg_catalog;
-
---
--- Name: account_add(public.account_type, character varying); Type: FUNC=
TION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION account_add(p_id public.account_type, p_name character v=
arying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-declare
-	nParent tmp_pcmn.pcm_val_parent%type;
-	nCount integer;
-begin
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_id;
-	if nCount =3D 0 then
-		nParent=3Daccount_parent(p_id);
-		insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent)
-			values (p_id, p_name,nParent);
-	end if;
-return;
-end ;
-$$;
-
-
---
--- Name: account_auto(integer); Type: FUNCTION; Schema: comptaproc; Owne=
r: -
---
-
-CREATE FUNCTION account_auto(p_fd_id integer) RETURNS boolean
-    LANGUAGE plpgsql
-    AS $$
-declare
-	l_auto bool;
-begin
-
-	select fd_create_account into l_auto from fiche_def where fd_id=3Dp_fd_=
id;
-	if l_auto is null then
-		l_auto:=3Dfalse;
-	end if;
-	return l_auto;
-end;
-$$;
-
-
---
--- Name: account_compute(integer); Type: FUNCTION; Schema: comptaproc; O=
wner: -
---
-
-CREATE FUNCTION account_compute(p_f_id integer) RETURNS public.account_t=
ype
-    LANGUAGE plpgsql
-    AS $$
-declare
-	class_base fiche_def.fd_class_base%type;
-	maxcode numeric;
-	sResult account_type;
-begin
-	select fd_class_base into class_base
-	from
-		fiche_def join fiche using (fd_id)
-	where
-		f_id=3Dp_f_id;
-	raise notice 'account_compute class base %',class_base;
-	select count (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent =
=3D class_base;
-	if maxcode =3D 0	then
-		maxcode:=3Dclass_base::numeric;
-	else
-		select max (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent =3D=
 class_base;
-		maxcode:=3Dmaxcode::numeric;
-	end if;
-	if maxcode::text =3D class_base then
-		maxcode:=3Dclass_base::numeric*1000;
-	end if;
-	maxcode:=3Dmaxcode+1;
-	raise notice 'account_compute Max code %',maxcode;
-	sResult:=3Dmaxcode::account_type;
-	return sResult;
-end;
-$$;
-
-
---
--- Name: account_insert(integer, text); Type: FUNCTION; Schema: comptapr=
oc; Owner: -
---
-
-CREATE FUNCTION account_insert(p_f_id integer, p_account text) RETURNS i=
nteger
-    LANGUAGE plpgsql
-    AS $_$
-declare
-	nParent tmp_pcmn.pcm_val_parent%type;
-	sName varchar;
-	nNew tmp_pcmn.pcm_val%type;
-	bAuto bool;
-	nFd_id integer;
-	sClass_Base fiche_def.fd_class_base%TYPE;
-	nCount integer;
-	first text;
-	second text;
-begin
-
-	if p_account is not null and length(trim(p_account)) !=3D 0 then
-	-- if there is coma in p_account, treat normally
-		if position (',' in p_account) =3D 0 then
-			raise info 'p_account is not empty';
-				select count(*)  into nCount from tmp_pcmn where pcm_val=3Dp_account=
::account_type;
-				raise notice 'found in tmp_pcm %',nCount;
-				if nCount !=3D0  then
-					raise info 'this account exists in tmp_pcmn ';
-					perform attribut_insert(p_f_id,5,p_account);
-				   else
-				       -- account doesn't exist, create it
-					select ad_value into sName from
-						fiche_detail
-					where
-					ad_id=3D1 and f_id=3Dp_f_id;
-
-					nParent:=3Daccount_parent(p_account::account_type);
-					insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_acco=
unt::account_type,sName,nParent);
-					perform attribut_insert(p_f_id,5,p_account);
-
-				end if;
-		else
-		raise info 'presence of a comma';
-		-- there is 2 accounts separated by a comma
-		first :=3D split_part(p_account,',',1);
-		second :=3D split_part(p_account,',',2);
-		-- check there is no other coma
-		raise info 'first value % second value %', first, second;
-
-		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
-			raise exception 'Too many comas, invalid account';
-		end if;
-		perform attribut_insert(p_f_id,5,p_account);
-		end if;
-	else
-	raise info 'p_account is  empty';
-		select fd_id into nFd_id from fiche where f_id=3Dp_f_id;
-		bAuto:=3D account_auto(nFd_id);
-
-		select fd_class_base into sClass_base from fiche_def where fd_id=3DnFd=
_id;
-raise info 'sClass_Base : %',sClass_base;
-		if bAuto =3D true and sClass_base similar to '^[[:digit:]]*$'  then
-			raise info 'account generated automatically';
-			nNew:=3Daccount_compute(p_f_id);
-			raise info 'nNew %', nNew;
-			select ad_value into sName from
-				fiche_detail
-			where
-				ad_id=3D1 and f_id=3Dp_f_id;
-			nParent:=3Daccount_parent(nNew);
-			perform account_add  (nNew,sName);
-			perform attribut_insert(p_f_id,5,nNew);
-
-		else
-		-- if there is an account_base then it is the default
-		      select fd_class_base::account_type into nNew from fiche_def join=
 fiche using (fd_id) where f_id=3Dp_f_id;
-			if nNew is null or length(trim(nNew)) =3D 0 then
-				raise notice 'count is null';
-				 perform attribut_insert(p_f_id,5,null);
-			else
-				 perform attribut_insert(p_f_id,5,nNew);
-			end if;
-		end if;
-	end if;
-
-return 0;
-end;
-$_$;
-
-
---
--- Name: account_parent(public.account_type); Type: FUNCTION; Schema: co=
mptaproc; Owner: -
---
-
-CREATE FUNCTION account_parent(p_account public.account_type) RETURNS pu=
blic.account_type
-    LANGUAGE plpgsql
-    AS $$
-declare
-	sSubParent tmp_pcmn.pcm_val_parent%type;
-	sResult tmp_pcmn.pcm_val_parent%type;
-	nCount integer;
-begin
-	if p_account is NULL then
-		return NULL;
-	end if;
-	sSubParent:=3Dp_account;
-	while true loop
-		select count(*) into nCount
-		from tmp_pcmn
-		where
-		pcm_val =3D sSubParent;
-		if nCount !=3D 0 then
-			sResult:=3D sSubParent;
-			exit;
-		end if;
-		sSubParent:=3D substr(sSubParent,1,length(sSubParent)-1);
-		if length(sSubParent) <=3D 0 then
-			raise exception 'Impossible de trouver le compte parent pour %',p_acc=
ount;
-		end if;
-		raise notice 'sSubParent % % ',sSubParent,length(sSubParent);
-	end loop;
-	raise notice 'account_parent : Parent is %',sSubParent;
-	return sSubParent;
-end;
-$$;
-
-
---
--- Name: account_update(integer, public.account_type); Type: FUNCTION; S=
chema: comptaproc; Owner: -
---
-
-CREATE FUNCTION account_update(p_f_id integer, p_account public.account_=
type) RETURNS integer
-    LANGUAGE plpgsql
-    AS $$
-declare
-	nMax fiche.f_id%type;
-	nCount integer;
-	nParent tmp_pcmn.pcm_val_parent%type;
-	sName varchar;
-	first text;
-	second text;
-begin
-
-	if length(trim(p_account)) !=3D 0 then
-		if position (',' in p_account) =3D 0 then
-			select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_account;
-			if nCount =3D 0 then
-			select ad_value into sName from
-				fiche_detail
-				where
-				ad_id=3D1 and f_id=3Dp_f_id;
-			nParent:=3Daccount_parent(p_account);
-			insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_accoun=
t,sName,nParent);
-			end if;
-		else
-		raise info 'presence of a comma';
-		-- there is 2 accounts separated by a comma
-		first :=3D split_part(p_account,',',1);
-		second :=3D split_part(p_account,',',2);
-		-- check there is no other coma
-		raise info 'first value % second value %', first, second;
-
-		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
-			raise exception 'Too many comas, invalid account';
-		end if;
-		end if;
-	end if;
-=09
-	update fiche_detail set ad_value=3Dp_account where f_id=3Dp_f_id and ad=
_id=3D5 ;
-
-return 0;
-end;
-$$;
-
-
---
--- Name: action_gestion_ins_upd(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
---
-
-CREATE FUNCTION action_gestion_ins_upd() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-begin
-NEW.ag_title :=3D substr(trim(NEW.ag_title),1,70);
-NEW.ag_hour :=3D substr(trim(NEW.ag_hour),1,5);
-return NEW;
-end;
-$$;
-
-
---
--- Name: action_get_tree(bigint); Type: FUNCTION; Schema: comptaproc; Ow=
ner: -
---
-
-CREATE FUNCTION action_get_tree(p_id bigint) RETURNS SETOF bigint
-    LANGUAGE plpgsql
-    AS $$
-
-declare
-   e bigint;
-   i bigint;
-begin
-   for e in select ag_id from action_gestion where ag_ref_ag_id=3Dp_id
-   loop
-        for i in select action_get_tree from  comptaproc.action_get_tree=
(e)
-        loop
-                raise notice ' =3D=3D i %', i;
-                return next i;
-        end loop;
-    raise notice ' =3D e %', e;
-    return next e;
-   end loop;
-   return;
-
-end;
-$$;
-
-
---
--- Name: attribut_insert(integer, integer, character varying); Type: FUN=
CTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION attribut_insert(p_f_id integer, p_ad_id integer, p_value=
 character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-begin
-	insert into fiche_detail (f_id,ad_id, ad_value) values (p_f_id,p_ad_id,=
p_value);
-=09
-return;
-end;
-$$;
-
-
---
--- Name: attribute_correct_order(); Type: FUNCTION; Schema: comptaproc; =
Owner: -
---
-
-CREATE FUNCTION attribute_correct_order() RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-declare
-    crs_correct cursor for select A.jnt_id,A.jnt_order from jnt_fic_attr=
 as A join jnt_fic_attr as B using (fd_id) where A.jnt_order=3DB.jnt_orde=
r and A.jnt_id > B.jnt_id;
-    rec record;
-begin
-	open crs_correct;
-	loop
-	fetch crs_correct into rec;
-	if NOT FOUND then
-		close crs_correct;
-		return;
-	end if;
-	update jnt_fic_attr set jnt_order=3Djnt_order + 1 where jnt_id =3D rec.=
jnt_id;
-	end loop;
-	close crs_correct;
-	perform attribute_correct_order ();
-end;
-$$;
-
-
---
--- Name: card_after_delete(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
---
-
-CREATE FUNCTION card_after_delete() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-
-begin
-
-	delete from action_gestion where f_id_dest =3D OLD.f_id;
-	return OLD;
-
-end;
-$$;
-
-
---
--- Name: card_class_base(integer); Type: FUNCTION; Schema: comptaproc; O=
wner: -
---
-
-CREATE FUNCTION card_class_base(p_f_id integer) RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-declare
-	n_poste fiche_def.fd_class_base%type;
-begin
-
-	select fd_class_base into n_poste from fiche_def join fiche using
-(fd_id)
-	where f_id=3Dp_f_id;
-	if not FOUND then
-		raise exception 'Invalid fiche card_class_base(%)',p_f_id;
-	end if;
-return n_poste;
-end;
-$$;
-
-
---
--- Name: check_balance(integer); Type: FUNCTION; Schema: comptaproc; Own=
er: -
---
-
-CREATE FUNCTION check_balance(p_grpt integer) RETURNS numeric
-    LANGUAGE plpgsql
-    AS $$
-declare=20
-	amount_jrnx_debit numeric;
-	amount_jrnx_credit numeric;
-	amount_jrn numeric;
-begin
-	select sum (j_montant) into amount_jrnx_credit=20
-	from jrnx=20
-		where=20
-	j_grpt=3Dp_grpt
-	and j_debit=3Dfalse;
-
-	select sum (j_montant) into amount_jrnx_debit=20
-	from jrnx=20
-		where=20
-	j_grpt=3Dp_grpt
-	and j_debit=3Dtrue;
-
-	select jr_montant into amount_jrn=20
-	from jrn
-	where
-	jr_grpt_id=3Dp_grpt;
-
-	if ( amount_jrnx_debit !=3D amount_jrnx_credit )=20
-		then
-		return abs(amount_jrnx_debit-amount_jrnx_credit);
-		end if;
-	if ( amount_jrn !=3D amount_jrnx_credit)
-		then
-		return -1*abs(amount_jrn - amount_jrnx_credit);
-		end if;
-	return 0;
-end;
-$$;
-
-
---
--- Name: correct_sequence(text, text, text); Type: FUNCTION; Schema: com=
ptaproc; Owner: -
---
-
-CREATE FUNCTION correct_sequence(p_sequence text, p_col text, p_table te=
xt) RETURNS integer
-    LANGUAGE plpgsql
-    AS $$
-declare
-last_sequence int8;
-max_sequence int8;
-n integer;
-begin
-	select count(*) into n from pg_class where relkind=3D'S' and relname=3D=
lower(p_sequence);
-	if n =3D 0 then
-		raise exception  ' Unknow sequence  % ',p_sequence;
-	end if;
-	select count(*) into n from pg_class where relkind=3D'r' and relname=3D=
lower(p_table);
-	if n =3D 0 then
-		raise exception ' Unknow table  % ',p_table;
-	end if;
-
-	execute 'select last_value   from '||p_sequence into last_sequence;
-	raise notice 'Last value of the sequence is %', last_sequence;
-
-	execute 'select max('||p_col||')  from '||p_table into max_sequence;
-	if  max_sequence is null then
-		max_sequence :=3D 0;
-	end if;
-	raise notice 'Max value of the sequence is %', max_sequence;
-	max_sequence:=3D max_sequence +1;=09
-	execute 'alter sequence '||p_sequence||' restart with '||max_sequence;
-return 0;
-
-end;
-$$;
-
-
---
--- Name: FUNCTION correct_sequence(p_sequence text, p_col text, p_table =
text); Type: COMMENT; Schema: comptaproc; Owner: -
---
-
-COMMENT ON FUNCTION correct_sequence(p_sequence text, p_col text, p_tabl=
e text) IS ' Often the primary key is a sequence number and sometimes the=
 value of the sequence is not synchronized with the primary key ( p_seque=
nce : sequence name, p_col : col of the pk,p_table : concerned table';
-
-
---
--- Name: create_missing_sequence(); Type: FUNCTION; Schema: comptaproc; =
Owner: -
---
-
-CREATE FUNCTION create_missing_sequence() RETURNS integer
-    LANGUAGE plpgsql
-    AS $$
-declare
-p_sequence text;
-nSeq integer;
-c1 cursor for select jrn_def_id from jrn_def;
-begin
-	open c1;
-	loop
-	   fetch c1 into nSeq;
-	   if not FOUND THEN
-	   	close c1;
-	   	return 0;
-	   end if;
-	   p_sequence:=3D's_jrn_pj'||nSeq::text;
-	execute 'create sequence '||p_sequence;
-	end loop;
-close c1;
-return 0;
-
-end;
-$$;
-
-
---
--- Name: drop_index(character varying); Type: FUNCTION; Schema: comptapr=
oc; Owner: -
---
-
-CREATE FUNCTION drop_index(p_constraint character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-declare=20
-	nCount integer;
-begin
-	select count(*) into nCount from pg_indexes where indexname=3Dp_constra=
int;
-	if nCount =3D 1 then
-	execute 'drop index '||p_constraint ;
-	end if;
-end;
-$$;
-
-
---
--- Name: drop_it(character varying); Type: FUNCTION; Schema: comptaproc;=
 Owner: -
---
-
-CREATE FUNCTION drop_it(p_constraint character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-declare=20
-	nCount integer;
-begin
-	select count(*) into nCount from pg_constraint where conname=3Dp_constr=
aint;
-	if nCount =3D 1 then
-	execute 'alter table parm_periode drop constraint '||p_constraint ;
-	end if;
-end;
-$$;
-
-
---
--- Name: extension_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
---
-
-CREATE FUNCTION extension_ins_upd() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
- sCode text;
- sFile text;
-begin
-sCode:=3Dtrim(upper(NEW.ex_code));
-sCode:=3Dreplace(sCode,' ','_');
-sCode:=3Dsubstr(sCode,1,15);
-sCode=3Dupper(sCode);
-NEW.ex_code:=3DsCode;
-sFile:=3DNEW.ex_file;
-sFile:=3Dreplace(sFile,';','_');
-sFile:=3Dreplace(sFile,'<','_');
-sFile:=3Dreplace(sFile,'>','_');
-sFile:=3Dreplace(sFile,'..','');
-sFile:=3Dreplace(sFile,'&','');
-sFile:=3Dreplace(sFile,'|','');
-
-
-
-return NEW;
-
-end;
-
-$$;
-
-
---
--- Name: fiche_account_parent(integer); Type: FUNCTION; Schema: comptapr=
oc; Owner: -
---
-
-CREATE FUNCTION fiche_account_parent(p_f_id integer) RETURNS public.acco=
unt_type
-    LANGUAGE plpgsql
-    AS $$
-declare
-ret tmp_pcmn.pcm_val%TYPE;
-begin
-	select fd_class_base into ret from fiche_def join fiche using (fd_id) w=
here f_id=3Dp_f_id;
-	if not FOUND then
-		raise exception '% N''existe pas',p_f_id;
-	end if;
-	return ret;
-end;
-$$;
-
-
---
--- Name: fiche_attribut_synchro(integer); Type: FUNCTION; Schema: compta=
proc; Owner: -
---
-
-CREATE FUNCTION fiche_attribut_synchro(p_fd_id integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-declare
-	-- this sql gives the f_id and the missing attribute (ad_id)
-	list_missing cursor for select f_id,fd_id,ad_id,jnt_order from jnt_fic_=
attr join fiche as A using (fd_id) where fd_id=3Dp_fd_id and ad_id not in=
 (select ad_id from fiche join fiche_detail using (f_id) where fd_id=3Djn=
t_fic_attr.fd_id and A.f_id=3Df_id);
-	rec record;
-begin
-	open list_missing;
-	loop
-=09
-	fetch list_missing into rec;
-	IF NOT FOUND then
-		exit;
-	end if;
-=09
-	-- now we insert into attr_value
-	insert into fiche_detail (f_id,ad_id,ad_value) values (rec.f_id,rec.ad_=
id,null);
-	end loop;
-	close list_missing;
-end;=20
-$$;
-
-
---
--- Name: fiche_def_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
---
-
-CREATE FUNCTION fiche_def_ins_upd() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-begin
-
-if position (',' in NEW.fd_class_base) !=3D 0 then
-   NEW.fd_create_account=3D'f';
-
-end if;
-return NEW;
-end;$$;
-
-
---
--- Name: fill_quant_fin(); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION fill_quant_fin() RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-declare
-   sBank text;
-   sCassa text;
-   sCustomer text;
-   sSupplier text;
-   rec record;
-   recBank record;
-   recSupp_Cust record;
-   nCount integer;
-   nAmount numeric;
-   nBank integer;
-   nOther integer;
-   nSupp_Cust integer;
-begin
-	select p_value into sBank from parm_code where p_code=3D'BANQUE';
-	select p_value into sCassa from parm_code where p_code=3D'CAISSE';
-	select p_value into sSupplier from parm_code where p_code=3D'SUPPLIER';
-	select p_value into sCustomer from parm_code where p_code=3D'CUSTOMER';
-=09
-	for rec in select jr_id,jr_grpt_id from jrn=20
-	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN')
-		and jr_id not in (select jr_id from quant_fin)
-	loop
-		-- there are only 2 lines for bank operations
-		-- first debit
-		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
-		if nCount > 2 then=20
-			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
-			return;
-		end if;
-		nBank :=3D 0; nOther:=3D0;
-		for recBank in select  j_id, j_montant,j_debit,j_qcode,j_poste from jr=
nx where j_grpt=3Drec.jr_grpt_id
-		loop
-		if recBank.j_poste like sBank||'%' then
-			-- retrieve f_id for bank
-			select f_id into nBank from vw_poste_qcode where j_qcode=3DrecBank.j_=
qcode;
-			if recBank.j_debit =3D false then
-				nAmount=3DrecBank.j_montant*(-1);
-			else=20
-				nAmount=3DrecBank.j_montant;
-			end if;
-		else
-			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecBank.j=
_qcode;
-		end if;
-		end loop;
-		if nBank !=3D 0 and nOther !=3D 0 then
-			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nBank,nOther,nAmount);
-		end if;
-	end loop;
-	for rec in select jr_id,jr_grpt_id from jrn=20
-	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN') and jr_id not in (select jr_id from quant_fin)
-	loop
-		-- there are only 2 lines for bank operations
-		-- first debit
-		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
-		if nCount > 2 then=20
-			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
-			return;
-		end if;
-		nBank :=3D 0; nOther:=3D0;
-		for recBank in select  j_id, j_montant,j_debit,j_qcode,j_poste from jr=
nx where j_grpt=3Drec.jr_grpt_id
-		loop
-		if recBank.j_poste like sCassa||'%' then
-			-- retrieve f_id for bank
-			select f_id into nBank from vw_poste_qcode where j_qcode=3DrecBank.j_=
qcode;
-			if recBank.j_debit =3D false then
-				nAmount=3DrecBank.j_montant*(-1);
-			else=20
-				nAmount=3DrecBank.j_montant;
-			end if;
-		else
-			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecBank.j=
_qcode;
-		end if;
-		end loop;
-		if nBank !=3D 0 and nOther !=3D 0 then
-			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nBank,nOther,nAmount);
-		end if;
-	end loop;
-
-	for rec in select jr_id,jr_grpt_id from jrn=20
-	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN') and jr_id not in (select jr_id from quant_fin)
-	loop
-		-- there are only 2 lines for bank operations
-		-- first debit
-		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
-		if nCount > 2 then=20
-			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
-			return;
-		end if;
-		nSupp_Cust :=3D 0; nOther:=3D0;
-		for recSupp_Cust in select  j_id, j_montant,j_debit,j_qcode,j_poste fr=
om jrnx where j_grpt=3Drec.jr_grpt_id
-		loop
-		if recSupp_Cust.j_poste like sSupplier||'%'  then
-			-- retrieve f_id for bank
-			select f_id into nSupp_Cust from vw_poste_qcode where j_qcode=3DrecSu=
pp_Cust.j_qcode;
-			if recSupp_Cust.j_debit =3D true then
-				nAmount=3DrecSupp_Cust.j_montant*(-1);
-			else=20
-				nAmount=3DrecSupp_Cust.j_montant;
-			end if;
-		else if  recSupp_Cust.j_poste like sCustomer||'%' then
-			select f_id into nSupp_Cust from vw_poste_qcode where j_qcode=3DrecSu=
pp_Cust.j_qcode;
-			if recSupp_Cust.j_debit =3D false then
-				nAmount=3DrecSupp_Cust.j_montant*(-1);
-			else=20
-				nAmount=3DrecSupp_Cust.j_montant;
-			end if;
-			else
-			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecSupp_C=
ust.j_qcode;
-		=09
-			end if;
-		end if;
-		end loop;
-		if nSupp_Cust !=3D 0 and nOther !=3D 0 then
-			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nOther,nSupp_Cust,nAmount);
-		end if;
-	end loop;
-	for rec in select jr_id,jr_grpt_id from jrn=20
-	    where jr_def_id in (select jrn_def_id from jrn_def where jrn_def_ty=
pe=3D'FIN') and jr_id not in (select jr_id from quant_fin)
-	loop
-		-- there are only 2 lines for bank operations
-		-- first debit
-		select count(j_id) into nCount from jrnx where j_grpt=3Drec.jr_grpt_id=
;
-		if nCount > 2 then=20
-			raise notice 'Trop de valeur pour jr_grpt_id % count %',rec.jr_grpt_i=
d,nCount;
-			return;
-		end if;
-		nSupp_Cust :=3D 0; nOther:=3D0;
-		for recSupp_Cust in select  j_id, j_montant,j_debit,j_qcode,j_poste fr=
om jrnx where j_grpt=3Drec.jr_grpt_id
-		loop
-		if recSupp_Cust.j_poste like '441%'  then
-			-- retrieve f_id for bank
-			select f_id into nSupp_Cust from vw_poste_qcode where j_qcode=3DrecSu=
pp_Cust.j_qcode;
-			if recSupp_Cust.j_debit =3D false then
-				nAmount=3DrecSupp_Cust.j_montant*(-1);
-			else=20
-				nAmount=3DrecSupp_Cust.j_montant;
-			end if;
-			else
-			select f_id into nOther from vw_poste_qcode where j_qcode=3DrecSupp_C=
ust.j_qcode;
-		=09
-		=09
-		end if;
-		end loop;
-		if nSupp_Cust !=3D 0 and nOther !=3D 0 then
-			insert into quant_fin (jr_id,qf_bank,qf_other,qf_amount) values (rec.=
jr_id,nOther,nSupp_Cust,nAmount);
-		end if;
-	end loop;
-	return;
-end;
-$$;
-
-
---
--- Name: find_pcm_type(public.account_type); Type: FUNCTION; Schema: com=
ptaproc; Owner: -
---
-
-CREATE FUNCTION find_pcm_type(pp_value public.account_type) RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-declare
-	str_type parm_poste.p_type%TYPE;
-	str_value parm_poste.p_type%TYPE;
-	nLength integer;
-begin
-	str_value:=3Dpp_value;
-	nLength:=3Dlength(str_value::text);
-	while nLength > 0 loop
-		select p_type into str_type from parm_poste where p_value=3Dstr_value;
-		if FOUND then
-			return str_type;
-		end if;
-		nLength:=3DnLength-1;
-		str_value:=3Dsubstring(str_value::text from 1 for nLength)::account_ty=
pe;
-	end loop;
-return 'CON';
-end;
-$$;
-
-
---
--- Name: find_periode(text); Type: FUNCTION; Schema: comptaproc; Owner: =
-
---
-
-CREATE FUNCTION find_periode(p_date text) RETURNS integer
-    LANGUAGE plpgsql
-    AS $$
-
-declare n_p_id int4;
-begin
-
-select p_id into n_p_id
-	from parm_periode
-	where
-		p_start <=3D to_date(p_date,'DD.MM.YYYY')
-		and
-		p_end >=3D to_date(p_date,'DD.MM.YYYY');
-
-if NOT FOUND then
-	return -1;
-end if;
-
-return n_p_id;
-
-end;$$;
-
-
---
--- Name: get_letter_jnt(bigint); Type: FUNCTION; Schema: comptaproc; Own=
er: -
---
-
-CREATE FUNCTION get_letter_jnt(a bigint) RETURNS bigint
-    LANGUAGE plpgsql
-    AS $$
-declare
- nResult bigint;
-begin
-   select jl_id into nResult from jnt_letter join letter_deb using (jl_i=
d) where j_id =3D a;
-   if NOT FOUND then
-	select jl_id into nResult from jnt_letter join letter_cred using (jl_id=
) where j_id =3D a;
-	if NOT found then
-		return null;
-	end if;
-    end if;
-return nResult;
-end;
-$$;
-
-
---
--- Name: get_pcm_tree(public.account_type); Type: FUNCTION; Schema: comp=
taproc; Owner: -
---
-
-CREATE FUNCTION get_pcm_tree(source public.account_type) RETURNS SETOF p=
ublic.account_type
-    LANGUAGE plpgsql
-    AS $$
-declare
-	i account_type;
-	e account_type;
-begin
-	for i in select pcm_val from tmp_pcmn where pcm_val_parent=3Dsource
-	loop
-		return next i;
-		for e in select get_pcm_tree from get_pcm_tree(i)
-		loop
-			return next e;
-		end loop;
-
-	end loop;
-	return;
-end;
-$$;
-
-
---
--- Name: group_analytic_ins_upd(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
---
-
-CREATE FUNCTION group_analytic_ins_upd() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare=20
-name text;
-begin
-name:=3Dupper(NEW.ga_id);
-name:=3Dtrim(name);
-name:=3Dreplace(name,' ','');
-NEW.ga_id:=3Dname;
-return NEW;
-end;$$;
-
-
---
--- Name: group_analytique_del(); Type: FUNCTION; Schema: comptaproc; Own=
er: -
---
-
-CREATE FUNCTION group_analytique_del() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-begin
-update poste_analytique set ga_id=3Dnull
-where ga_id=3DOLD.ga_id;
-return OLD;
-end;$$;
-
-
---
--- Name: html_quote(text); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION html_quote(p_string text) RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-declare
-	r text;
-begin
-	r:=3Dp_string;
-	r:=3Dreplace(r,'<','&lt;');
-	r:=3Dreplace(r,'>','&gt;');
-	r:=3Dreplace(r,'''','&quot;');
-	return r;
-end;$$;
-
-
---
--- Name: FUNCTION html_quote(p_string text); Type: COMMENT; Schema: comp=
taproc; Owner: -
---
-
-COMMENT ON FUNCTION html_quote(p_string text) IS 'remove harmfull HTML c=
har';
-
-
---
--- Name: info_def_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner: =
-
---
-
-CREATE FUNCTION info_def_ins_upd() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare=20
-	row_info_def info_def%ROWTYPE;
-	str_type text;
-begin
-row_info_def:=3DNEW;
-str_type:=3Dupper(trim(NEW.id_type));
-str_type:=3Dreplace(str_type,' ','');
-str_type:=3Dreplace(str_type,',','');
-str_type:=3Dreplace(str_type,';','');
-if  length(str_type) =3D0 then
-	raise exception 'id_type cannot be null';
-end if;
-row_info_def.id_type:=3Dstr_type;
-return row_info_def;
-end;
-$$;
-
-
---
--- Name: insert_jrnx(character varying, numeric, public.account_type, in=
teger, integer, boolean, text, integer, text, text); Type: FUNCTION; Sche=
ma: comptaproc; Owner: -
---
-
-CREATE FUNCTION insert_jrnx(p_date character varying, p_montant numeric,=
 p_poste public.account_type, p_grpt integer, p_jrn_def integer, p_debit =
boolean, p_tech_user text, p_tech_per integer, p_qcode text, p_comment te=
xt) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-begin
-	insert into jrnx
-	(
-		j_date,
-		j_montant,
-		j_poste,
-		j_grpt,
-		j_jrn_def,
-		j_debit,
-		j_text,
-		j_tech_user,
-		j_tech_per,
-		j_qcode
-	) values
-	(
-		to_date(p_date,'DD.MM.YYYY'),
-		p_montant,
-		p_poste,
-		p_grpt,
-		p_jrn_def,
-		p_debit,
-		p_comment,
-		p_tech_user,
-		p_tech_per,
-		p_qcode
-	);
-
-return;
-end;
-$$;
-
-
---
--- Name: insert_quant_purchase(text, numeric, character varying, numeric=
, numeric, numeric, integer, numeric, numeric, numeric, numeric, characte=
r varying); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION insert_quant_purchase(p_internal text, p_j_id numeric, p=
_fiche character varying, p_quant numeric, p_price numeric, p_vat numeric=
, p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric, p_nd_tva_rec=
up numeric, p_dep_priv numeric, p_client character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-declare
-	fid_client integer;
-	fid_good   integer;
-begin
-	select f_id into fid_client from
-		fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(p_client));
-	select f_id into fid_good from
-		 fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(p_fiche));
-	insert into quant_purchase
-		(qp_internal,
-		j_id,
-		qp_fiche,
-		qp_quantite,
-		qp_price,
-		qp_vat,
-		qp_vat_code,
-		qp_nd_amount,
-		qp_nd_tva,
-		qp_nd_tva_recup,
-		qp_supplier,
-		qp_dep_priv)
-	values
-		(p_internal,
-		p_j_id,
-		fid_good,
-		p_quant,
-		p_price,
-		p_vat,
-		p_vat_code,
-		p_nd_amount,
-		p_nd_tva,
-		p_nd_tva_recup,
-		fid_client,
-		p_dep_priv);
-	return;
-end;
- $$;
-
-
---
--- Name: insert_quant_sold(text, numeric, character varying, numeric, nu=
meric, numeric, integer, character varying); Type: FUNCTION; Schema: comp=
taproc; Owner: -
---
-
-CREATE FUNCTION insert_quant_sold(p_internal text, p_jid numeric, p_fich=
e character varying, p_quant numeric, p_price numeric, p_vat numeric, p_v=
at_code integer, p_client character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-declare
-	fid_client integer;
-	fid_good   integer;
-begin
-
-	select f_id into fid_client from
-		fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(p_client));
-	select f_id into fid_good from
-		fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(p_fiche));
-	insert into quant_sold
-		(qs_internal,j_id,qs_fiche,qs_quantite,qs_price,qs_vat,qs_vat_code,qs_=
client,qs_valid)
-	values
-		(p_internal,p_jid,fid_good,p_quant,p_price,p_vat,p_vat_code,fid_client=
,'Y');
-	return;
-end;
- $$;
-
-
---
--- Name: insert_quick_code(integer, text); Type: FUNCTION; Schema: compt=
aproc; Owner: -
---
-
-CREATE FUNCTION insert_quick_code(nf_id integer, tav_text text) RETURNS =
integer
-    LANGUAGE plpgsql
-    AS $$
-	declare
-	ns integer;
-	nExist integer;
-	tText text;
-	begin
-	tText :=3D upper(trim(tav_text));
-	tText :=3D replace(tText,' ','');
-=09
-	loop
-		-- take the next sequence
-		select nextval('s_jnt_fic_att_value') into ns;
-		if length (tText) =3D 0 or tText is null then
-			tText :=3D 'FID'||ns;
-		end if;
-		-- av_text already used ?
-		select count(*) into nExist=20
-			from fiche_detail
-		where=20
-			ad_id=3D23 and  ad_value=3Dupper(tText);
-
-		if nExist =3D 0 then
-			exit;
-		end if;
-		tText:=3D'FID'||ns;
-	end loop;
-
-
-	insert into fiche_detail(jft_id,f_id,ad_id,ad_value) values (ns,nf_id,2=
3,upper(tText));
-	return ns;
-	end;
-$$;
-
-
---
--- Name: is_closed(integer, integer); Type: FUNCTION; Schema: comptaproc=
; Owner: -
---
-
-CREATE FUNCTION is_closed(p_periode integer, p_jrn_def_id integer) RETUR=
NS boolean
-    LANGUAGE plpgsql
-    AS $$
-declare
-bClosed bool;
-str_status text;
-begin
-select p_closed into bClosed from parm_periode
-	where p_id=3Dp_periode;
-
-if bClosed =3D true then
-	return bClosed;
-end if;
-
-select status into str_status from jrn_periode
-       where p_id =3Dp_periode and jrn_def_id=3Dp_jrn_def_id;
-
-if str_status <> 'OP' then
-   return bClosed;
-end if;
-return false;
-end;
-$$;
-
-
---
--- Name: jnt_fic_attr_ins(); Type: FUNCTION; Schema: comptaproc; Owner: =
-
---
-
-CREATE FUNCTION jnt_fic_attr_ins() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-   r_record jnt_fic_attr%ROWTYPE;
-   i_max integer;
-begin
-r_record=3DNEW;
-perform comptaproc.fiche_attribut_synchro(r_record.fd_id);
-select coalesce(max(jnt_order),0) into i_max from jnt_fic_attr where fd_=
id=3Dr_record.fd_id;
-i_max :=3D i_max + 10;
-NEW.jnt_order=3Di_max;
-return NEW;
-end;
-$$;
-
-
---
--- Name: jrn_add_note(bigint, text); Type: FUNCTION; Schema: comptaproc;=
 Owner: -
---
-
-CREATE FUNCTION jrn_add_note(p_jrid bigint, p_note text) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-declare
-	tmp bigint;
-begin
-	if length(trim(p_note)) =3D 0 then
-	   delete from jrn_note where jr_id=3D p_jrid;
-	   return;
-	end if;
-=09
-	select n_id into tmp from jrn_note where jr_id =3D p_jrid;
-=09
-	if FOUND then
-	   update jrn_note set n_text=3Dtrim(p_note) where jr_id =3D p_jrid;
-	else=20
-	   insert into jrn_note (jr_id,n_text) values ( p_jrid, p_note);
-
-	end if;
-=09
-	return;
-end;
-$$;
-
-
---
--- Name: jrn_check_periode(); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
---
-
-CREATE FUNCTION jrn_check_periode() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-bClosed bool;
-str_status text;
-ljr_tech_per jrn.jr_tech_per%TYPE;
-ljr_def_id jrn.jr_def_id%TYPE;
-lreturn jrn%ROWTYPE;
-begin
-if TG_OP=3D'UPDATE' then
-	ljr_tech_per :=3DOLD.jr_tech_per ;
-	NEW.jr_tech_per :=3D comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM=
.YYYY'));
-	ljr_def_id   :=3DOLD.jr_def_id;
-	lreturn      :=3DNEW;
-	if NEW.jr_date =3D OLD.jr_date then
-		return NEW;
-	end if;
-	if comptaproc.is_closed(NEW.jr_tech_per,NEW.jr_def_id) =3D true then
-	      	raise exception 'Periode fermee';
-	end if;
-end if;
-
-if TG_OP=3D'INSERT' then
-	NEW.jr_tech_per :=3D comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM=
.YYYY'));
-	ljr_tech_per :=3DNEW.jr_tech_per ;
-	ljr_def_id   :=3DNEW.jr_def_id;
-	lreturn      :=3DNEW;
-end if;
-
-if TG_OP=3D'DELETE' then
-	ljr_tech_per :=3DOLD.jr_tech_per;
-	ljr_def_id   :=3DOLD.jr_def_id;
-	lreturn      :=3DOLD;
-end if;
-
-if comptaproc.is_closed (ljr_def_id,ljr_def_id) =3D true then
-   	raise exception 'Periode fermee';
-end if;
-
-return lreturn;
-end;$$;
-
-
---
--- Name: jrn_def_add(); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION jrn_def_add() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$begin
-execute 'insert into jrn_periode(p_id,jrn_def_id,status) select p_id,'||=
NEW.jrn_def_id||',
-	case when p_central=3Dtrue then ''CE''
-	      when p_closed=3Dtrue then ''CL''
-	else ''OP''
-	end
-from
-parm_periode ';
-return NEW;
-end;$$;
-
-
---
--- Name: jrn_def_delete(); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION jrn_def_delete() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare=20
-nb numeric;
-begin
-select count(*) into nb from jrn where jr_def_id=3DOLD.jrn_def_id;
-
-if nb <> 0 then
-	raise exception 'EFFACEMENT INTERDIT: JOURNAL UTILISE';
-end if;
-return OLD;
-end;$$;
-
-
---
--- Name: jrn_del(); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION jrn_del() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-row jrn%ROWTYPE;
-begin
-row:=3DOLD;
-insert into del_jrn ( jr_id,
-       jr_def_id,
-       jr_montant,
-       jr_comment,
-       jr_date,
-       jr_grpt_id,
-       jr_internal,
-       jr_tech_date,
-       jr_tech_per,
-       jrn_ech,
-       jr_ech,
-       jr_rapt,
-       jr_valid,
-       jr_opid,
-       jr_c_opid,
-       jr_pj,
-       jr_pj_name,
-       jr_pj_type,
-       jr_pj_number,
-       del_jrn_date)=20
-       select  jr_id,
-	      jr_def_id,
-	      jr_montant,
-	      jr_comment,
-	      jr_date,
-	      jr_grpt_id,
-	      jr_internal,
-	      jr_tech_date,
-	      jr_tech_per,
-	      jrn_ech,
-	      jr_ech,
-	      jr_rapt,
-	      jr_valid,
-	      jr_opid,
-	      jr_c_opid,
-	      jr_pj,
-	      jr_pj_name,
-	      jr_pj_type,
-	      jr_pj_number
-	      ,now() from jrn where jr_id=3Drow.jr_id;
-return row;
-end;
-$$;
-
-
---
--- Name: jrnx_del(); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION jrnx_del() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-row jrnx%ROWTYPE;
-begin
-row:=3DOLD;
-
-
-insert into del_jrnx(
-            j_id, j_date, j_montant, j_poste, j_grpt, j_rapt, j_jrn_def,=
=20
-            j_debit, j_text, j_centralized, j_internal, j_tech_user, j_t=
ech_date,=20
-            j_tech_per, j_qcode, f_id)  SELECT j_id, j_date, j_montant, =
j_poste, j_grpt, j_rapt, j_jrn_def,=20
-       j_debit, j_text, j_centralized, j_internal, j_tech_user, j_tech_d=
ate,=20
-       j_tech_per, j_qcode, f_id from jrnx where j_id=3Drow.j_id;
-return row;
-end;
-$$;
-
-
---
--- Name: jrnx_ins(); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION jrnx_ins() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-n_fid bigint;
-begin
-
-NEW.j_tech_per :=3D comptaproc.find_periode(to_char(NEW.j_date,'DD.MM.YY=
YY'));
-if NEW.j_tech_per =3D -1 then
-	raise exception 'P=C3=A9riode invalide';
-end if;
-
-if NEW.j_qcode is NULL then
-   return NEW;
-end if;
-
-NEW.j_qcode=3Dtrim(upper(NEW.j_qcode));
-
-if length (NEW.j_qcode) =3D 0 then
-    NEW.j_qcode=3DNULL;
-    else
-   select f_id into n_fid from fiche_detail  where ad_id=3D23 and ad_val=
ue=3DNEW.j_qcode;
-	if NOT FOUND then
-		raise exception 'La fiche dont le quick code est % n''existe pas',NEW.=
j_qcode;
-	end if;
-end if;
-NEW.f_id:=3Dn_fid;
-return NEW;
-end;
-$$;
-
-
---
--- Name: jrnx_letter_del(); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION jrnx_letter_del() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-row jrnx%ROWTYPE;
-begin
-row:=3DOLD;
-delete from jnt_letter=20
-	where (jl_id in (select jl_id from letter_deb) and jl_id not in(select =
jl_id from letter_cred ))=20
-		or (jl_id not in (select jl_id from letter_deb  ) and jl_id  in(select=
 jl_id from letter_cred ));
-return row;
-end;
-$$;
-
-
---
--- Name: plan_analytic_ins_upd(); Type: FUNCTION; Schema: comptaproc; Ow=
ner: -
---
-
-CREATE FUNCTION plan_analytic_ins_upd() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-   name text;
-begin
-   name:=3Dupper(NEW.pa_name);
-   name:=3Dtrim(name);
-   name:=3Dreplace(name,' ','');
-   NEW.pa_name:=3Dname;
-return NEW;
-end;
-$$;
-
-
---
--- Name: poste_analytique_ins_upd(); Type: FUNCTION; Schema: comptaproc;=
 Owner: -
---
-
-CREATE FUNCTION poste_analytique_ins_upd() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$declare
-name text;
-rCount record;
-
-begin
-name:=3Dupper(NEW.po_name);
-name:=3Dtrim(name);
-name:=3Dreplace(name,' ','');	=09
-NEW.po_name:=3Dname;
-
-if NEW.ga_id is NULL then
-return NEW;
-end if;
-
-if length(trim(NEW.ga_id)) =3D 0 then
-  NEW.ga_id:=3DNULL;
-  return NEW;
-end if;
-perform 'select ga_id from groupe_analytique where ga_id=3D'||NEW.ga_id;
-if NOT FOUND then
-   raise exception' Inexistent Group Analytic %',NEW.ga_id;
-end if;
-return NEW;
-end;$$;
-
-
---
--- Name: proc_check_balance(); Type: FUNCTION; Schema: comptaproc; Owner=
: -
---
-
-CREATE FUNCTION proc_check_balance() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare=20
-	diff numeric;
-	tt integer;
-begin
-	if TG_OP =3D 'INSERT' or TG_OP=3D'UPDATE' then
-	tt=3DNEW.jr_grpt_id;
-	diff:=3Dcheck_balance(tt);
-	if diff !=3D 0 then
-		raise exception 'balance error %',diff ;
-	end if;
-	return NEW;
-	end if;
-end;
-$$;
-
-
---
--- Name: quant_purchase_ins_upd(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
---
-
-CREATE FUNCTION quant_purchase_ins_upd() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-	begin
-		if NEW.qp_price < 0 OR NEW.qp_quantite <0 THEN
-			NEW.qp_price :=3D abs (NEW.qp_price)*(-1);
-			NEW.qp_quantite :=3D abs (NEW.qp_quantite)*(-1);
-		end if;
-return NEW;
-end;
-$$;
-
-
---
--- Name: quant_sold_ins_upd(); Type: FUNCTION; Schema: comptaproc; Owner=
: -
---
-
-CREATE FUNCTION quant_sold_ins_upd() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-	begin
-		if NEW.qs_price < 0 OR NEW.qs_quantite <0 THEN
-			NEW.qs_price :=3D abs (NEW.qs_price)*(-1);
-			NEW.qs_quantite :=3D abs (NEW.qs_quantite)*(-1);
-		end if;
-return NEW;
-end;
-$$;
-
-
---
--- Name: t_document_modele_validate(); Type: FUNCTION; Schema: comptapro=
c; Owner: -
---
-
-CREATE FUNCTION t_document_modele_validate() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare=20
-    lText text;
-    modified document_modele%ROWTYPE;
-begin
-    modified:=3DNEW;
-
-	modified.md_filename:=3Dreplace(NEW.md_filename,' ','_');
-	return modified;
-end;
-$$;
-
-
---
--- Name: t_document_type_insert(); Type: FUNCTION; Schema: comptaproc; O=
wner: -
---
-
-CREATE FUNCTION t_document_type_insert() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-nCounter integer;
-    BEGIN
-select count(*) into nCounter from pg_class where relname=3D'seq_doc_typ=
e_'||NEW.dt_id;
-if nCounter =3D 0 then
-        execute  'create sequence seq_doc_type_'||NEW.dt_id;
-end if;
-        RETURN NEW;
-    END;
-$$;
-
-
---
--- Name: t_document_validate(); Type: FUNCTION; Schema: comptaproc; Owne=
r: -
---
-
-CREATE FUNCTION t_document_validate() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-  lText text;
-  modified document%ROWTYPE;
-begin
-    	modified:=3DNEW;
-	modified.d_filename:=3Dreplace(NEW.d_filename,' ','_');
-	return modified;
-end;
-$$;
-
-
---
--- Name: t_jrn_def_sequence(); Type: FUNCTION; Schema: comptaproc; Owner=
: -
---
-
-CREATE FUNCTION t_jrn_def_sequence() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-nCounter integer;
-
-    BEGIN
-    select count(*) into nCounter=20
-       from pg_class where relname=3D's_jrn_'||NEW.jrn_def_id;
-       if nCounter =3D 0 then
-       	   execute  'create sequence s_jrn_'||NEW.jrn_def_id;
-	   raise notice 'Creating sequence s_jrn_%',NEW.jrn_def_id;
-	 end if;
-
-        RETURN NEW;
-    END;
-$$;
-
-
---
--- Name: table_analytic_account(text, text); Type: FUNCTION; Schema: com=
ptaproc; Owner: -
---
-
-CREATE FUNCTION table_analytic_account(p_from text, p_to text) RETURNS S=
ETOF public.anc_table_account_type
-    LANGUAGE plpgsql
-    AS $$
-declare
-	ret ANC_table_account_type%ROWTYPE;
-	sql_from text:=3D'';
-	sql_to text:=3D'';
-	sWhere text:=3D'';
-	sAnd text:=3D'';
-	sResult text:=3D'';
-begin
-if p_from <> '' and p_from is not null then
-	sql_from:=3D'oa_date >=3D to_date('''||p_from::text||''',''DD.MM.YYYY''=
)';
-	sWhere:=3D' where ';
-end if;
-
-if p_to <> '' and p_to is not null then
-	sql_to=3D' oa_date <=3D to_date('''||p_to::text||''',''DD.MM.YYYY'')';
-	sWhere :=3D ' where ';
-end if;
-
-if sql_to <> '' and sql_from <> '' then
-	sAnd:=3D' and ';
-end if;
-
-sResult :=3D sWhere || sql_from || sAnd || sql_to;
-
-for ret in EXECUTE 'SELECT po.po_id,
-			    po.pa_id, po.po_name,=20
-			    po.po_description,sum(
-        CASE
-            WHEN operation_analytique.oa_debit =3D true THEN operation_a=
nalytique.oa_amount * (-1)::numeric
-            ELSE operation_analytique.oa_amount
-        END) AS sum_amount, jrnx.j_poste, tmp_pcmn.pcm_lib AS name
-   FROM operation_analytique
-   JOIN poste_analytique po USING (po_id)
-   JOIN jrnx USING (j_id)
-   JOIN tmp_pcmn ON jrnx.j_poste::text =3D tmp_pcmn.pcm_val::text
-'|| sResult ||'
-  GROUP BY po.po_id, po.po_name, po.pa_id, jrnx.j_poste, tmp_pcmn.pcm_li=
b, po.po_description
- HAVING sum(
-CASE
-    WHEN operation_analytique.oa_debit =3D true THEN operation_analytiqu=
e.oa_amount * (-1)::numeric
-    ELSE operation_analytique.oa_amount
-END) <> 0::numeric '
-	loop
-	return next ret;
-end loop;
-end;
-$$;
-
-
---
--- Name: table_analytic_card(text, text); Type: FUNCTION; Schema: compta=
proc; Owner: -
---
-
-CREATE FUNCTION table_analytic_card(p_from text, p_to text) RETURNS SETO=
F public.anc_table_card_type
-    LANGUAGE plpgsql
-    AS $$
-declare
-	ret ANC_table_card_type%ROWTYPE;
-	sql_from text:=3D'';
-	sql_to text:=3D'';
-	sWhere text:=3D'';
-	sAnd text:=3D'';
-	sResult text:=3D'';
-begin
-if p_from <> '' and p_from is not null then
-	sql_from:=3D'oa_date >=3D to_date('''||p_from::text||''',''DD.MM.YYYY''=
)';
-	sWhere:=3D' where ';
-end if;
-
-if p_to <> '' and p_to is not null then
-	sql_to=3D' oa_date <=3D to_date('''||p_to::text||''',''DD.MM.YYYY'')';
-	sWhere :=3D ' where ';
-end if;
-
-if sql_to <> '' and sql_from <> '' then
-	sAnd :=3D' and ';
-end if;
-
-sResult :=3D sWhere || sql_from || sAnd || sql_to;
-
-for ret in EXECUTE ' SELECT po.po_id, po.pa_id, po.po_name, po.po_descri=
ption,  sum(
-        CASE
-            WHEN operation_analytique.oa_debit =3D true THEN operation_a=
nalytique.oa_amount * (-1)::numeric
-            ELSE operation_analytique.oa_amount
-        END) AS sum_amount, jrnx.f_id, jrnx.j_qcode, ( SELECT fiche_deta=
il.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id =3D 1 AND fiche_detail.f_id =3D jrnx.=
f_id) AS name
-   FROM operation_analytique
-   JOIN poste_analytique po USING (po_id)
-   JOIN jrnx USING (j_id)'|| sResult ||'
-  GROUP BY po.po_id, po.po_name, po.pa_id, jrnx.f_id, jrnx.j_qcode, ( SE=
LECT fiche_detail.ad_value
-   FROM fiche_detail
-  WHERE fiche_detail.ad_id =3D 1 AND fiche_detail.f_id =3D jrnx.f_id), p=
o.po_description
- HAVING sum(
-CASE
-    WHEN operation_analytique.oa_debit =3D true THEN operation_analytiqu=
e.oa_amount * (-1)::numeric
-    ELSE operation_analytique.oa_amount
-END) <> 0::numeric;'
-
-
-	loop
-	return next ret;
-end loop;
-end;
-$$;
-
-
---
--- Name: tmp_pcmn_ins(); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION tmp_pcmn_ins() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-   r_record tmp_pcmn%ROWTYPE;
-begin
-r_record=3DNEW;
-if  length(trim(r_record.pcm_type))=3D0 or r_record.pcm_type is NULL the=
n=20
-   r_record.pcm_type:=3Dfind_pcm_type(NEW.pcm_val);
-   return r_record;
-end if;
-return NEW;
-end;
-$$;
-
-
---
--- Name: trim_cvs_quote(); Type: FUNCTION; Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION trim_cvs_quote() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-        modified import_tmp%ROWTYPE;
-begin
-	modified:=3DNEW;
-	modified.devise=3Dreplace(new.devise,'"','');
-	modified.poste_comptable=3Dreplace(new.poste_comptable,'"','');
-        modified.compte_ordre=3Dreplace(NEW.COMPTE_ORDRE,'"','');
-        modified.detail=3Dreplace(NEW.DETAIL,'"','');
-        modified.num_compte=3Dreplace(NEW.NUM_COMPTE,'"','');
-        return modified;
-end;
-$$;
-
-
---
--- Name: trim_space_format_csv_banque(); Type: FUNCTION; Schema: comptap=
roc; Owner: -
---
-
-CREATE FUNCTION trim_space_format_csv_banque() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-declare
-        modified format_csv_banque%ROWTYPE;
-begin
-        modified.name=3Dtrim(NEW.NAME);
-        modified.include_file=3Dtrim(new.include_file);
-		if ( length(modified.name) =3D 0 ) then
-			modified.name=3Dnull;
-		end if;
-		if ( length(modified.include_file) =3D 0 ) then
-			modified.include_file=3Dnull;
-		end if;
-
-        return modified;
-end;
-$$;
-
-
---
--- Name: tva_delete(integer); Type: FUNCTION; Schema: comptaproc; Owner:=
 -
---
-
-CREATE FUNCTION tva_delete(integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $_$=20
-declare
-	p_tva_id alias for $1;
-	nCount integer;
-begin
-	nCount=3D0;
-	select count(*) into nCount from quant_sold where qs_vat_code=3Dp_tva_i=
d;
-	if nCount !=3D 0 then
-                 return;
-	=09
-	end if;
-	select count(*) into nCount from quant_purchase where qp_vat_code=3Dp_t=
va_id;
-	if nCount !=3D 0 then
-                 return;
-	=09
-	end if;
-
-delete from tva_rate where tva_id=3Dp_tva_id;
-	return;
-end;
-$_$;
-
-
---
--- Name: tva_insert(text, numeric, text, text); Type: FUNCTION; Schema: =
comptaproc; Owner: -
---
-
-CREATE FUNCTION tva_insert(text, numeric, text, text) RETURNS integer
-    LANGUAGE plpgsql
-    AS $_$
-declare
-	l_tva_id integer;
-	p_tva_label alias for $1;
-	p_tva_rate alias for $2;
-	p_tva_comment alias for $3;
-	p_tva_poste alias for $4;
-	debit text;
-	credit text;
-	nCount integer;
-begin
-if length(trim(p_tva_label)) =3D 0 then
-	return 3;
-end if;
-
-if length(trim(p_tva_poste)) !=3D 0 then
-	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
-	debit  =3D split_part(p_tva_poste,',',1);
-	credit	=3D split_part(p_tva_poste,',',2);
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
-	if nCount =3D 0 then return 4; end if;
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
-	if nCount =3D 0 then return 4; end if;
-
-end if;
-select into l_tva_id nextval('s_tva') ;
-insert into tva_rate(tva_id,tva_label,tva_rate,tva_comment,tva_poste)
-	values (l_tva_id,p_tva_label,p_tva_rate,p_tva_comment,p_tva_poste);
-return 0;
-end;
-$_$;
-
-
---
--- Name: tva_modify(integer, text, numeric, text, text); Type: FUNCTION;=
 Schema: comptaproc; Owner: -
---
-
-CREATE FUNCTION tva_modify(integer, text, numeric, text, text) RETURNS i=
nteger
-    LANGUAGE plpgsql
-    AS $_$
-declare
-	p_tva_id alias for $1;
-	p_tva_label alias for $2;
-	p_tva_rate alias for $3;
-	p_tva_comment alias for $4;
-	p_tva_poste alias for $5;
-	debit text;
-	credit text;
-	nCount integer;
-begin
-if length(trim(p_tva_label)) =3D 0 then
-	return 3;
-end if;
-
-if length(trim(p_tva_poste)) !=3D 0 then
-	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
-	debit  =3D split_part(p_tva_poste,',',1);
-	credit	=3D split_part(p_tva_poste,',',2);
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
-	if nCount =3D 0 then return 4; end if;
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
-	if nCount =3D 0 then return 4; end if;
-
-end if;
-update tva_rate set tva_label=3Dp_tva_label,tva_rate=3Dp_tva_rate,tva_co=
mment=3Dp_tva_comment,tva_poste=3Dp_tva_poste
-	where tva_id=3Dp_tva_id;
-return 0;
-end;
-$_$;
-
-
---
--- Name: update_quick_code(integer, text); Type: FUNCTION; Schema: compt=
aproc; Owner: -
---
-
-CREATE FUNCTION update_quick_code(njft_id integer, tav_text text) RETURN=
S integer
-    LANGUAGE plpgsql
-    AS $$
-	declare
-	ns integer;
-	nExist integer;
-	tText text;
-	old_qcode varchar;
-	begin
-	-- get current value
-	select ad_value into old_qcode from fiche_detail where jft_id=3Dnjft_id=
;
-	-- av_text didn't change so no update
-	if tav_text =3D upper( trim(old_qcode)) then
-		return 0;
-	end if;
-=09
-	tText :=3D trim(upper(tav_text));
-	tText :=3D replace(tText,' ','');
-	if length ( tText) =3D 0 or tText is null then
-		return 0;
-	end if;
-	=09
-	ns :=3D njft_id;
-
-	loop
-		-- av_text already used ?
-		select count(*) into nExist=20
-			from fiche_detail
-		where=20
-			ad_id=3D23 and ad_value=3DtText;
-
-		if nExist =3D 0 then
-			exit;
-		end if;=09
-		if tText =3D 'FID'||ns then
-			-- take the next sequence
-			select nextval('s_jnt_fic_att_value') into ns;
-		end if;
-		tText  :=3D'FID'||ns;
-	=09
-	end loop;
-	update fiche_detail set ad_value =3D tText where jft_id=3Dnjft_id;
-
-	-- update also the contact
-	update fiche_detail set ad_value =3D tText=20
-		where jft_id in=20
-			( select jft_id=20
-				from fiche_detail=20
-			where ad_id=3D25 and ad_value=3Dold_qcode);
-
-
-	update jrnx set j_qcode=3DtText where j_qcode =3D old_qcode;
-	return ns;
-	end;
-$$;
-
-
---
--- PostgreSQL database dump complete
---
-

Deleted: phpcompta/trunk/sql/correct-quant.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/correct-quant.sql	2011-11-22 22:44:52 UTC (rev 44=
46)
+++ phpcompta/trunk/sql/correct-quant.sql	2011-11-22 22:50:44 UTC (rev 44=
47)
@@ -1,54 +0,0 @@
-CREATE OR REPLACE FUNCTION correct_quant_purchase() returns void
-as
-$BODY$
-declare
-	r_invalid quant_purchase;
-	s_QuickCode text;
-	b_j_debit bool;
-	r_new record;
-	r_jrnx record;
-begin
-
-for r_invalid in select * from quant_purchase where qp_valid=3D'A'
-loop
-
--- get qcode=20
-select j_qcode into s_QuickCode from vw_poste_qcode where f_id=3Dr_inval=
id.qp_fiche;
-raise notice 'qp_id % Quick code is %',r_invalid.qp_id,s_QuickCode;
-
--- get deb or cred
-select j_debit,j_grpt,j_jrn_def,j_montant into r_jrnx from jrnx where j_=
id=3Dr_invalid.j_id;
-if NOT FOUND then
-	raise notice 'error not found jrnx %',r_invalid.j_id;
-	update quant_purchase set qp_valid=3D'Y' where qp_id=3Dr_invalid.qp_id;
-	continue;
-end if;
-raise notice 'j_debit % , j_grpt % ,j_jrn_def  % qp_price %',r_jrnx.j_de=
bit,r_jrnx.j_grpt,r_jrnx.j_jrn_def ,r_invalid.qp_price;
-
-select jr_internal,j_id,j_montant into r_new
-	from jrnx join jrn on (j_grpt=3Djr_grpt_id)
-	where=20
-	j_jrn_def=3Dr_jrnx.j_jrn_def
-	and j_id not in (select j_id from  quant_purchase)
-	and j_qcode=3Ds_QuickCode
-	and j_montant=3Dr_jrnx.j_montant
-	and j_debit !=3D r_jrnx.j_debit;
-
-if NOT FOUND then
-	raise notice 'error not found %', r_invalid.j_id;
-	update quant_purchase set qp_valid=3D'Y' where qp_id=3Dr_invalid.qp_id;
-	continue;    =20
-end if;
-raise notice 'j_id % found amount %',r_new.j_id,r_new.j_montant;
-
--- insert into quant_purchase
-insert into quant_purchase (qp_internal,j_id,qp_fiche,qp_quantite,qp_pri=
ce,qp_vat,qp_nd_amount,qp_nd_tva_recup,qp_valid,qp_dep_priv,qp_supplier,q=
p_vat_code)
-values (r_new.jr_internal,r_invalid.j_id,r_invalid.qp_fiche,(r_invalid.q=
p_quantite * (-1)),r_invalid.qp_price * (-1),r_invalid.qp_vat*(-1),r_inva=
lid.qp_nd_amount*(-1),r_invalid.qp_nd_tva_recup*(-1) ,'Y',r_invalid.qp_de=
p_priv*(-1),r_invalid.qp_supplier,r_invalid.qp_vat_code);
-
-update quant_purchase set qp_valid=3D'Y' where qp_id=3Dr_invalid.qp_id;
-end loop;
-return;
-end;
-$BODY$
-  LANGUAGE 'plpgsql' VOLATILE;
-

Deleted: phpcompta/trunk/sql/correct_quant_sold.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/correct_quant_sold.sql	2011-11-22 22:44:52 UTC (r=
ev 4446)
+++ phpcompta/trunk/sql/correct_quant_sold.sql	2011-11-22 22:50:44 UTC (r=
ev 4447)
@@ -1,53 +0,0 @@
-CREATE OR REPLACE FUNCTION correct_quant_sale() returns void
-as
-$BODY$
-declare
-	r_invalid quant_sold;
-	s_QuickCode text;
-	b_j_debit bool;
-	r_new record;
-	r_jrnx record;
-begin
-
-for r_invalid in select * from quant_sold where qs_valid=3D'A'
-loop
-
--- get qcode=20
-select j_qcode into s_QuickCode from vw_poste_qcode where f_id=3Dr_inval=
id.qs_fiche;
-raise notice 'qp_id % Quick code is %',r_invalid.qs_id,s_QuickCode;
-
--- get deb or cred
-select j_debit,j_grpt,j_jrn_def,j_montant into r_jrnx from jrnx where j_=
id=3Dr_invalid.j_id;
-if NOT FOUND then
-	update quant_sold set qs_valid=3D'Y' where qs_id=3Dr_invalid.qs_id;
-	raise notice 'error not found jrnx %',r_invalid.j_id;
-	continue;
-end if;
-raise notice 'j_debit % , j_grpt % ,j_jrn_def  % qs_price %',r_jrnx.j_de=
bit,r_jrnx.j_grpt,r_jrnx.j_jrn_def ,r_invalid.qs_price;
-
-select jr_internal,j_id,j_montant into r_new
-	from jrnx join jrn on (j_grpt=3Djr_grpt_id)
-	where=20
-	j_jrn_def=3Dr_jrnx.j_jrn_def
-	and j_id not in (select j_id from  quant_sold)
-	and j_qcode=3Ds_QuickCode
-	and j_montant=3Dr_jrnx.j_montant
-	and j_debit !=3D r_jrnx.j_debit;
-
-if NOT FOUND then
-   update quant_sold set qs_valid=3D'Y' where qs_id=3Dr_invalid.qs_id;
-	raise notice 'error not found %', r_invalid.j_id;
-	continue;
-end if;
-raise notice 'j_id % found amount %',r_new.j_id,r_new.j_montant;
-
--- insert into quant_sold
-
- insert into quant_sold (qs_internal,j_id,qs_fiche,qs_quantite,qs_price,=
qs_vat,qs_valid,qs_client,qs_vat_code)
- values (r_new.jr_internal,r_invalid.j_id,r_invalid.qs_fiche,(r_invalid.=
qs_quantite * (-1)),r_invalid.qs_price * (-1),r_invalid.qs_vat*(-1),'Y',r=
_invalid.qs_client,r_invalid.qs_vat_code);
- update quant_sold set qs_valid=3D'Y' where qs_id=3Dr_invalid.qs_id;
-end loop;
-return;
-end;
-$BODY$
-  LANGUAGE 'plpgsql' VOLATILE;
\ No newline at end of file

Deleted: phpcompta/trunk/sql/downgrade.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

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	2011-11-22 22:44:52 UTC (rev 4446)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-22 22:50:44 UTC (rev 4447)
@@ -17,7 +17,6 @@
 \i account_compute.sql
 \i account_insert.sql
 \i account-update.sql
--- \i change-pcmn-to-alphanum.sql
 \i format_account.sql
 \i tmp_pcmn_alphanum_ins_upd.sql
 \i tmp_pcmn_ins.sql



From MAILER-DAEMON Wed Nov 23 08:37:09 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTD0f-0000Xo-6U
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 08:37:09 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 14:41:57 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.42717.1322055427.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4448 - 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, 23 Nov 2011 13:37:06 -0000

Author: danydb
Date: 2011-11-23 14:41:55 +0100 (Wed, 23 Nov 2011)
New Revision: 4448

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
Log:
#466 text alignement

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	2011-11-22 22:5=
0:44 UTC (rev 4447)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-23 13:4=
1:55 UTC (rev 4448)
@@ -1271,20 +1271,20 @@
         $r.=3D'<TR>';
         $r.=3D"<th>Code</th>";
         $r.=3D"<th>"._('D=C3=A9nomination')."</th>";
-        $r.=3D"<th>"._('prix')."</th>";
+        $r.=3D"<th style=3D\"text-align:right\">"._('prix')."</th>";
         /* vat use */
         if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
         {
-            $r.=3D"<th>"._('quantit=C3=A9')."</th>";
-            $r.=3D"<th>tva</th>";
-            $r.=3D'<th> '._('Montant TVA').'</th>';
-            $r.=3D'<th>'._('Montant HTVA').'</th>';
-            $r.=3D'<th>'._('Totaux').'</th>';
+            $r.=3D"<th style=3D\"text-align:right\">"._('quantit=C3=A9')=
."</th>";
+            $r.=3D"<th style=3D\"text-align:right\">tva</th>";
+            $r.=3D'<th style=3D"text-align:right"> '._('Montant TVA').'<=
/th>';
+            $r.=3D'<th style=3D"text-align:right">'._('Montant HTVA').'<=
/th>';
+            $r.=3D'<th style=3D"text-align:right">'._('Totaux').'</th>';
         }
         else
         {
-            $r.=3D"<th>"._('quantit=C3=A9')."</th>";
-            $r.=3D'<th> '._('Total')."</th>";
+            $r.=3D"<th style=3D\"text-align:right\">"._('quantit=C3=A9')=
."</th>";
+            $r.=3D'<th style=3D"text-align:right"> '._('Total')."</th>";
         }
=20
         /* if we use the AC */
@@ -1359,25 +1359,25 @@
             $r.=3D'<TD style=3D"width:60%;border-bottom:1px dotted grey;=
">';
             $r.=3D$fiche_name;
             $r.=3D'</td>';
-            $r.=3D'<td align=3D"right">';
+            $r.=3D'<td class=3D"num">';
             $r.=3Dnbm(${"e_march".$i."_price"});
             $r.=3D'</td>';
-            $r.=3D'<td align=3D"right">';
+            $r.=3D'<td class=3D"num">';
             $r.=3Dnbm(${"e_quant".$i});
             $r.=3D'</td>';
             if ($g_parameter->MY_TVA_USE =3D=3D 'Y')
             {
-                $r.=3D'<td align=3D"right">';
+                $r.=3D'<td class=3D"num">';
                 $r.=3D$oTva->get_parameter('label');
                 $r.=3D'</td>';
-                $r.=3D'<td align=3D"right">';
+                $r.=3D'<td class=3D"num">';
                 $r.=3Dnbm($tva_item);
                 $r.=3D'</td>';
-				$r.=3D'<td align=3D"right">';
+				$r.=3D'<td class=3D"num">';
 				$r.=3Dnbm(round($amount,2));
 				$r.=3D'</td>';
             }
-			$r.=3D'<td align=3D"right">';
+			$r.=3D'<td class=3D"num">';
             $r.=3Dnbm(round($tot_row,2));
             $r.=3D'</td>';
             // encode the pa

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	2011-11-22 22:50:44=
 UTC (rev 4447)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-23 13:41:55=
 UTC (rev 4448)
@@ -671,15 +671,15 @@
         $r.=3D'<TR>';
         $r.=3D"<th>"._('Code')."</th>";
         $r.=3D"<th>"._('D=C3=A9nomination')."</th>";
-        $r.=3D"<th>"._('prix')."</th>";
-        $r.=3D"<th>"._('quantit=C3=A9')."</th>";
-        $r.=3D"<th>"._('tva')."</th>";
+        $r.=3D"<th style=3D\"text-align:right\">"._('prix')."</th>";
+        $r.=3D"<th style=3D\"text-align:right\">"._('quantit=C3=A9')."</=
th>";
+        $r.=3D"<th style=3D\"text-align:right\">"._('tva')."</th>";
=20
=20
         if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
         {
-            $r.=3D'<th> '._('Montant TVA').'</th>';
-            $r.=3D'<th>'._('Montant HTVA').'</th>';
+            $r.=3D'<th style=3D"text-align:right"> '._('Montant TVA').'<=
/th>';
+            $r.=3D'<th style=3D"text-align:right">'._('Montant HTVA').'<=
/th>';
         }
         /* if we use the AC */
         if ($g_parameter->MY_ANALYTIC!=3D'nu')
@@ -736,18 +736,18 @@
             $r.=3D'<TD style=3D"width:60%;border-bottom:1px dotted grey;=
">';
             $r.=3D$fiche_name;
             $r.=3D'</td>';
-            $r.=3D'<td align=3D"right">';
+            $r.=3D'<td class=3D"num">';
             $r.=3Dnbm(${"e_march".$i."_price"});
             $r.=3D'</td>';
-            $r.=3D'<td align=3D"right">';
-            $r.=3D${"e_quant".$i};
+            $r.=3D'<td class=3D"num">';
+            $r.=3Dnbm(${"e_quant".$i});
             $r.=3D'</td>';
             if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
             {
-                $r.=3D'<td align=3D"right">';
+                $r.=3D'<td class=3D"num">';
                 $r.=3D$oTva->get_parameter('label');
                 $r.=3D'</td>';
-                $r.=3D'<td align=3D"right">';
+                $r.=3D'<td class=3D"num">';
                 $r.=3Dnbm($tva_item);
                 /* warning if tva_computed and given are not the
                    same */
@@ -757,7 +757,7 @@
                 }
                 $r.=3D'</td>';
             }
-            $r.=3D'<td align=3D"right">';
+            $r.=3D'<td class=3D"num">';
             $r.=3Dnbm($amount);
             $r.=3D'</td>';
=20
@@ -789,7 +789,7 @@
         if (! $p_summary )
 		{
 			$r.=3D$this->extra_info();
-	        $r.=3D'<div style=3D"width:40%;position:float;float:right;text-=
align:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;f=
ont-weight:bold">';
+                         $r.=3D'<div style=3D"width:40%;position:float;f=
loat:right;text-align:right;padding-left:5%;padding-right:5%;color:blue;f=
ont-size:1.2em;font-weight:bold">';
 		}
 		else
 			$r.=3D'<div style=3D"width:60%;position:float;float:left;text-align:r=
ight;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-wei=
ght:bold">';



From MAILER-DAEMON Wed Nov 23 08:44:27 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTD7j-0001iI-MP
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 08:44:27 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 14:49:37 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.42733.1322055867.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4449 - 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, 23 Nov 2011 13:44:26 -0000

Author: danydb
Date: 2011-11-23 14:49:36 +0100 (Wed, 23 Nov 2011)
New Revision: 4449

Modified:
   phpcompta/trunk/include/class_follow_up.php
Log:
#371 change type of document

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	2011-11-23 13:41:55 UTC (=
rev 4448)
+++ phpcompta/trunk/include/class_follow_up.php	2011-11-23 13:49:36 UTC (=
rev 4449)
@@ -145,11 +145,17 @@
         }
         else
         {
-            // Doc Type
+            /*// Doc Type
             $doc_type=3Dnew IHidden();
             $doc_type->name=3D"dt_id";
             $doc_type->value=3D$this->dt_id;
-            $str_doc_type=3D$doc_type->input().$this->db->get_value("sel=
ect dt_value from document_type where dt_id=3D".$this->dt_id);
+            $str_doc_type=3D$doc_type->input().$this->db->get_value("sel=
ect dt_value from document_type where dt_id=3D".$this->dt_id);*/
+             $doc_type=3Dnew ISelect();
+            $doc_type->name=3D"dt_id";
+            $doc_type->value=3D$this->db->make_array("select dt_id,dt_va=
lue from document_type");
+            $doc_type->selected=3D$this->dt_id;
+            $doc_type->readonly=3Dfalse;
+            $str_doc_type=3D$doc_type->input();
         }
=20
         // Description



From MAILER-DAEMON Wed Nov 23 09:27:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTDmz-0006DR-Fb
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 09:27:05 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 15:32:10 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.42855.1322058424.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4450 - 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, 23 Nov 2011 14:27:03 -0000

Author: danydb
Date: 2011-11-23 15:32:09 +0100 (Wed, 23 Nov 2011)
New Revision: 4450

Modified:
   phpcompta/trunk/include/class_follow_up.php
Log:
#371 change type of document : bug action_detail

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	2011-11-23 13:49:36 UTC (=
rev 4449)
+++ phpcompta/trunk/include/class_follow_up.php	2011-11-23 14:32:09 UTC (=
rev 4450)
@@ -638,7 +638,7 @@
         /* insert also the details */
         for ( $i =3D 0; $i < MAX_ARTICLE;$i++)
         {
-            $act=3Dnew Action_Detail($this->db);
+            $act=3Dnew Follow_Up_Detail($this->db);
             $act->from_array($_POST,$i);
             $act->ag_id=3D$this->ag_id;
             $act->save();



From MAILER-DAEMON Wed Nov 23 09:34:57 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTDub-00075W-GP
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 09:34:57 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 15:39:56 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.42873.1322058896.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4451 - 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, 23 Nov 2011 14:34:55 -0000

Author: danydb
Date: 2011-11-23 15:39:55 +0100 (Wed, 23 Nov 2011)
New Revision: 4451

Modified:
   phpcompta/trunk/include/param_sec.inc.php
Log:
#468 CFGSEC Changement du profile pour utilisateur global sauf phpcompta

Modified: phpcompta/trunk/include/param_sec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_sec.inc.php	2011-11-23 14:32:09 UTC (re=
v 4450)
+++ phpcompta/trunk/include/param_sec.inc.php	2011-11-23 14:39:55 UTC (re=
v 4451)
@@ -64,19 +64,18 @@
=20
 	$repo=3Dnew Database();
 	/*  Show all the users, included local admin */
-	$user_sql=3D$repo->exec_sql("select  use_id,
-										use_first_name,
-										use_name,
-										use_login,
-										use_admin,
-										priv_priv
-										from ac_users natural join jnt_use_dos ".
-							" join priv_user on (jnt_id=3Dpriv_jnt)
-								where use_login !=3D 'phpcompta' and priv_priv <> 'X'
-								and dos_id=3D$1  ".$ord_sql,
-								array($gDossier));
+	$user_sql =3D $repo->exec_sql("select use_id,
+                                            use_first_name,
+                                            use_name,
+                                            use_login,
+                                            use_admin,
+                                            priv_priv
+                                                from ac_users natural jo=
in jnt_use_dos " .
+                                               " join priv_user on (jnt_=
id=3Dpriv_jnt)
+					where use_login !=3D 'phpcompta' and priv_priv <> 'X'
+					and dos_id=3D$1  " . $ord_sql, array($gDossier));
=20
-	$MaxUser=3DDatabase::num_row($user_sql);
+    $MaxUser =3D Database::num_row($user_sql);
=20
=20
     echo '<TABLE class=3D"result" style=3D"width:80%;margin-left:10%">';
@@ -226,7 +225,7 @@
     echo '<h2>'.h($User->first_name).' '.h($User->name).' '.hi($User->lo=
gin)."($str)</h2>";
=20
=20
-    if ( $admin !=3D 0 )
+    if ( $_GET['user_id'] =3D=3D 1 )
     {
         echo '<h2 class=3D"notice"> Cet utilisateur est administrateur, =
il a tous les droits</h2>';
 		echo "<p> Impossible de modifier cet utilisateur dans cet =C3=A9cran, =
il faut passer par
@@ -295,7 +294,11 @@
=20
         $jrn_priv->name=3D'jrn_act'.$l_line['jrn_def_id'];
         $jrn_priv->value=3D$array;
-        $jrn_priv->selected=3D$sec_User->get_ledger_access($l_line['jrn_=
def_id']);
+        if ($admin !=3D 1)
+            $jrn_priv->selected=3D$sec_User->get_ledger_access($l_line['=
jrn_def_id']);
+        else
+            $jrn_priv->selected=3D'W';
+           =20
=20
         echo '<td>';
         echo $jrn_priv->input();



From MAILER-DAEMON Wed Nov 23 09:57:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTEGP-00064v-4N
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 09:57:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 16:02:34 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.42931.1322060248.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4452 - 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, 23 Nov 2011 14:57:27 -0000

Author: danydb
Date: 2011-11-23 16:02:33 +0100 (Wed, 23 Nov 2011)
New Revision: 4452

Modified:
   phpcompta/trunk/include/class_user.php
Log:
#468 CFGSEC Changement du profile pour utilisateur global sauf phpcompta:=
 bug pour insert_global_pref

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2011-11-23 14:39:55 UTC (rev 4=
451)
+++ phpcompta/trunk/include/class_user.php	2011-11-23 15:02:33 UTC (rev 4=
452)
@@ -626,14 +626,14 @@
 		{
 			foreach ($default_parameter as $name =3D> $value)
 			{
-				$Insert =3D sprintf($Sql, $this->id, $name, $value);
+				$Insert =3D sprintf($Sql, $this->login, $name, $value);
 				$cn->exec_sql($Insert);
 			}
 		}
 		else
 		{
 			$value =3D ($p_value =3D=3D "") ? $default_parameter[$p_type] : $p_va=
lue;
-			$Insert =3D sprintf($Sql, $this->id, $p_type, $value);
+			$Insert =3D sprintf($Sql, $this->login, $p_type, $value);
 			$cn->exec_sql($Insert);
 		}
 	}



From MAILER-DAEMON Wed Nov 23 10:18:09 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTEaP-00057E-Sn
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 10:18:09 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 16:23:15 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.43051.1322061489.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4453 - 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 Nov 2011 15:18:08 -0000

Author: danydb
Date: 2011-11-23 16:23:12 +0100 (Wed, 23 Nov 2011)
New Revision: 4453

Modified:
   phpcompta/trunk/html/style.css
Log:
436: improve theme=20

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	2011-11-23 15:02:33 UTC (rev 4452)
+++ phpcompta/trunk/html/style.css	2011-11-23 15:23:12 UTC (rev 4453)
@@ -68,7 +68,7 @@
   margin:0px;
 }
 h2.info {
-  background-color:#879ED4;
+  background-color:darkblue;
 	color:white;
 	font-size:14px;
   text-align:center;



From MAILER-DAEMON Wed Nov 23 11:28:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTFgg-0000Lq-TB
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 11:28:42 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 17:33:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.43174.1322065721.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4454 - 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: Wed, 23 Nov 2011 16:28:40 -0000

Author: danydb
Date: 2011-11-23 17:33:48 +0100 (Wed, 23 Nov 2011)
New Revision: 4454

Modified:
   phpcompta/trunk/doc/manuel-fr.odt
Log:
documentation

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)



From MAILER-DAEMON Wed Nov 23 14:45:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTIlC-0005qR-5c
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 14:45:34 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 20:50:40 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.43751.1322077533.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4455 - 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, 23 Nov 2011 19:45:32 -0000

Author: danydb
Date: 2011-11-23 20:50:38 +0100 (Wed, 23 Nov 2011)
New Revision: 4455

Added:
   phpcompta/trunk/include/template/list_mod_payment.php
Log:

add missing file


Added: phpcompta/trunk/include/template/list_mod_payment.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/list_mod_payment.php	               =
         (rev 0)
+++ phpcompta/trunk/include/template/list_mod_payment.php	2011-11-23 19:5=
0:38 UTC (rev 4455)
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief list payment method
+ *
+ */
+
+?>
+ <table class=3D"table_large" >
+	 <tr >
+		 <th>
+			 <?=3D$header->get_header(0)?>
+		 </th>
+		 <th style=3D"text-align:center">
+			 <?=3D$header->get_header(1)?>
+		 </th>
+		 <th style=3D"text-align:center">
+			 <?=3D$header->get_header(2)?>
+		 </th>
+		 <th style=3D"text-align:center">
+			 <?=3D$header->get_header(3)?>
+		 </th>
+		 <th style=3D"text-align:center">
+			 <?=3D$header->get_header(4)?>
+		 </th>
+		 <th>
+
+		 </th>
+	 </tr>
+<? for ($i=3D0;$i<count($array);$i++):
+	if ($i%2=3D=3D0):
+		$class=3D'class=3D"odd" ';
+	else:
+		$class=3D'class=3D"even"';
+	endif;
+?>
+	 <tr <?=3D$class?>>
+		 <td>
+			 <?=3Dh($array[$i]['mp_lib'])?>
+		 </td>
+		 <td style=3D"text-align:center">
+			 <?=3Dh($array[$i]['jrn_def_name'])?>
+
+		 </td>
+		 <td style=3D"text-align:center">
+			 <?=3Dh($array[$i]['fd_label'])?>
+
+		 </td>
+		 <td style=3D"text-align:center">
+			 <?=3Dh($array[$i]['jrn_target'])?>
+		 </td>
+		 <td style=3D"text-align:center">
+			 <?=3Dh($array[$i]['vw_name'])?>
+		 </td>
+
+<?
+echo $td.HtmlInput::button_anchor(_('Modifie'),'?ac=3D'.$_REQUEST['ac'].=
'&sa=3Dmp&sb=3Dchange&'.dossier::get().
+                                              '&id=3D'.$array[$i]['mp_id=
']);
+?>
+
+	 </tr>
+<? endfor;?>
+
+</table>
\ No newline at end of file



From MAILER-DAEMON Wed Nov 23 16:31:41 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTKPt-0001bw-KW
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 16:31:41 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 22:36:46 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.43943.1322083900.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4456 - 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: Wed, 23 Nov 2011 21:31:39 -0000

Author: danydb
Date: 2011-11-23 22:36:44 +0100 (Wed, 23 Nov 2011)
New Revision: 4456

Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/include/class_acc_bilan.php
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_contact.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/compta_ods.inc.php
   phpcompta/trunk/include/compta_ven.inc.php
   phpcompta/trunk/include/export_fiche_balance_pdf.php
   phpcompta/trunk/include/impress_fiche.inc.php
   phpcompta/trunk/include/operation_ods_new.inc.php
   phpcompta/trunk/include/stock.inc.php
Log:

Fix a lot of small bugs


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	2011-11-23 19:50:38 UTC (rev 4455)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-23 21:36:44 UTC (rev 4456)
@@ -66,15 +66,10 @@
 switch ($op)
 {
 	case "remove_anc":
-		if ($user->check_action(CAOD))
 			$cn->exec_sql("delete from operation_analytique where oa_group=3D$1",=
 array($_GET['oa']));
 		break;
 	case "rm_stock":
 		require_once('constant.security.php');
-		if ($user->check_action(STOWRITE) =3D=3D 0)
-		{
-			exit();
-		}
 		$cn->exec_sql('delete from stock_goods where sg_id=3D$1', array($s_id)=
);
 		$html =3D escape_xml($s_id);
 		header('Content-type: text/xml; charset=3DUTF-8');
@@ -537,5 +532,5 @@
          case 'autoanc':
                 require_once('ajax_auto_anc_card.php');
                 break;
-           =20
+
 }
\ No newline at end of file

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	2011-11-23 19:50:38 UTC (=
rev 4455)
+++ phpcompta/trunk/include/class_acc_bilan.php	2011-11-23 21:36:44 UTC (=
rev 4456)
@@ -144,6 +144,7 @@
     /*!\brief verify that the saldo is good for the type of account */
     function verify()
     {
+		bcscale(2);
         echo '<h3> Comptes normaux </h3>';
         $this->warning('Actif avec un solde crediteur','ACT','D');
         $this->warning('Passif avec un solde debiteur','PAS','C');
@@ -171,7 +172,7 @@
         $sql.=3D"and $sql_periode";
=20
         $credit_actif=3D$this->db->get_value($sql);
-        $total_actif=3Dabs($debit_actif-$credit_actif);
+        $total_actif=3Dabs(bcsub($debit_actif,$credit_actif));
         echo '<table >';
         echo tr(td( 'Total actif ').td($total_actif,'style=3D"text-align=
:right"'));
=20
@@ -187,13 +188,13 @@
              " where j_debit=3D'f' and (pcm_type=3D'PAS' or pcm_type=3D'=
PASINV') ";
         $sql.=3D"and $sql_periode";
         $credit_passif=3D$this->db->get_value($sql);
-        $total_passif=3Dabs($debit_passif-$credit_passif);
+        $total_passif=3Dabs(bcsub($debit_passif,$credit_passif));
=20
         /* diff actif / passif */
         echo tr(td('Total passif ').td($total_passif,'style=3D"text-alig=
n:right"'));
         if ( $total_actif !=3D $total_passif )
         {
-            $diff=3D$total_actif-$total_passif;
+            $diff=3Dbcsub($total_actif,$total_passif);
             echo tr(td(' Difference Actif - Passif ').td($diff,'style=3D=
"text-align:right"'),'style=3D"font-weight:bolder"');
         }
=20
@@ -208,7 +209,7 @@
              " where j_debit=3D'f' and (pcm_type=3D'CHA' or pcm_type=3D'=
CHAINV')";
         $sql.=3D"and $sql_periode";
         $credit_charge=3D$this->db->get_value($sql);
-        $total_charge=3Dabs($debit_charge-$credit_charge);
+        $total_charge=3Dabs(bcsub($debit_charge,$credit_charge));
         echo tr(td('Total charge ').td($total_charge,'style=3D"text-alig=
n:right"'));
=20
=20
@@ -223,10 +224,10 @@
              " where j_debit=3D'f' and (pcm_type=3D'PRO' or pcm_type=3D'=
PROINV')";
         $sql.=3D"and $sql_periode";
         $credit_pro=3D$this->db->get_value($sql);
-        $total_pro=3Dabs($debit_pro-$credit_pro);
+        $total_pro=3Dabs(bcsub($debit_pro,$credit_pro));
         echo tr(td('Total produit ').td($total_pro,'style=3D"text-align:=
right"'));
=20
-        $diff=3D$total_pro-$total_charge;
+        $diff=3Dbcsub($total_pro,$total_charge);
=20
         echo tr( td("Difference Produit - Charge",'style=3D"padding-righ=
t:20px"').td($diff,'style=3D"text-align:right"'),'style=3D"font-weight:bo=
lder"');
         echo '</table>';
@@ -296,8 +297,8 @@
      * \param $p_handle the handle to the file
      * \param
      * \param
-     *=20
      *
+     *
      * \return
      */
     function compute_formula($p_handle)
@@ -324,9 +325,9 @@
         }// end read form line per line
     }
     /*!\brief generate the ods document
-    * \param the handle to the template file=20
-    * \return the xml=20
-    *@note=20
+    * \param the handle to the template file
+    * \return the xml
+    *@note
     * Sur une seule ligne il y a plusieurs donn=C3=A9es, donc il y a plu=
sieurs boucles, pour les autres documents
     * cela devrait =C3=AAtre fait aussi, actuellement ces documents, n'a=
cceptent qu'une formule par ligne.
     *@note
@@ -352,13 +353,13 @@
         ob_start();
 	/* unzip the document */
 	$zip =3D new Zip_Extended;
-	if ($zip->open($work_file) =3D=3D=3D TRUE)=20
+	if ($zip->open($work_file) =3D=3D=3D TRUE)
 	  {
 	    $zip->extractTo($dirname.DIRECTORY_SEPARATOR);
 	    $zip->close();
-	  } else=20
+	  } else
 	  {
-	    echo __FILE__.":".__LINE__."cannot unzip model ".$filename;=09
+	    echo __FILE__.":".__LINE__."cannot unzip model ".$filename;
 	  }
=20
 	ob_end_clean();
@@ -391,7 +392,7 @@
             // the line contains the magic <<
             $tmp=3D"";
=20
-	   =20
+
 	    while (preg_match_all($regex,$line_rtf,$f2) > 0 )
 	      {
                 // the f2 array contains all the magic << in the line
@@ -606,13 +607,13 @@
         case 'ods':
             /*   header("Pragma: public");
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-            header("Cache-Control: must-revalidate");=20
+            header("Cache-Control: must-revalidate");
             if ( $this->b_type =3D=3D 'odt' )
             header('Content-type: application/vnd.oasis.opendocument.tex=
t');
             if ( $this->b_type =3D=3D 'ods' )
             header('Content-type: application/vnd.oasis.opendocument.spr=
eadsheet');
             header('Content-Disposition: attachment;filename=3D"'.$this-=
>b_name.'.odt"',FALSE);
-            header("Accept-Ranges: bytes");=20
+            header("Accept-Ranges: bytes");
             */
             ob_start();
             // save the file in a temp folder
@@ -636,14 +637,14 @@
 	     */
             ob_start();
 	    $zip =3D new Zip_Extended;
-	    if ($zip->open($work_file) =3D=3D=3D TRUE)=20
+	    if ($zip->open($work_file) =3D=3D=3D TRUE)
 	      {
 		$zip->extractTo($dirname.DIRECTORY_SEPARATOR);
 		$zip->close();
-	      }=20
-	    else=20
+	      }
+	    else
 	      {
-		echo __FILE__.":".__LINE__."cannot unzip model ".$filename;=09
+		echo __FILE__.":".__LINE__."cannot unzip model ".$filename;
 	      }
=20
             // Remove the file we do  not need anymore

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-23 19:50:38 =
UTC (rev 4455)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-23 21:36:44 =
UTC (rev 4456)
@@ -472,7 +472,7 @@
         $r.=3D"<TR>";
         $r.=3D"<th colspan=3D\"2\">code</TH>";
         $r.=3D"<th>Commentaire</TH>";
-        $r.=3D"<th>Montant</TH>";
+        $r.=3D"<th style=3D\"text-align:right\">Montant</TH>";
         $r.=3D'<th colspan=3D"2"> Op. Concern&eacute;e(s)</th>';
=20
 	/* if we use the AC */
@@ -521,8 +521,12 @@
             // amount
             $r.=3D'<td class=3D"num">'.nbm($tiers_amount).'</td>';
             // concerned
-            $r.=3D'<td>';
-            $r.=3D${"e_concerned".$i};
+            $r.=3D'<td style=3D"text-align:center">';
+			if (${"e_concerned".$i} !=3D '')
+			{
+				$jr_internal=3D$this->db->get_value("select jr_internal from jrn whe=
re jr_id=3D$1",array(${"e_concerned".$i}));
+	            $r.=3DHtmlInput::detail_op(${"e_concerned".$i},$jr_internal=
);
+			}
             $r.=3D'</td>';
             // encode the pa
             if ( $g_parameter->MY_ANALYTIC!=3D'nu' && preg_match("/^[6,7=
]/",$fTiers->strAttribut(ATTR_DEF_ACCOUNT))=3D=3D1 ) // use of AA
@@ -636,7 +640,7 @@
             $amount=3D0.0;
             $idx_operation=3D0;
             $ret=3D'<table class=3D"result" style=3D"width:75%">';
-            $ret.=3Dtr(th('Quick Code').th('Nom').th('Libell=C3=A9').th(=
'Montant'));
+            $ret.=3Dtr(th('Quick Code').th('Nom').th('Libell=C3=A9').th(=
'Montant',' style=3D"text-align:right"'));
             // Credit =3D goods
             for ( $i =3D 0; $i < $nb_item;$i++)
             {

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-23 19:50:38=
 UTC (rev 4455)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-23 21:36:44=
 UTC (rev 4456)
@@ -331,7 +331,6 @@
                         $tva[$idx_tva]+=3D$tva_item;
                     else
                         $tva[$idx_tva]=3D$tva_item;
-		    var_dump($oTva->get_parameter("both_side"));
                     if ($oTva->get_parameter("both_side")=3D=3D0) $tot_t=
va=3Dround(bcadd($tva_item,$tot_tva),2);
                 }
=20
@@ -1283,7 +1282,6 @@
=20
         $r.=3DHtmlInput::button('add_item',_('Ajout article'),      ' on=
Click=3D"ledger_add_row()"');
=20
-        $r.=3D"</DIV>";
         return $r;
     }
=20

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	2011-11-23 19:50:38 UTC (re=
v 4455)
+++ phpcompta/trunk/include/class_contact.php	2011-11-23 21:36:44 UTC (re=
v 4456)
@@ -42,12 +42,12 @@
     /*!   Summary
      **************************************************
      * \brief  show the default screen
-     *       =20
+     *
      * \param  p_search (filter)
-     *=09
+     *
      * \return string to display
      */
-    function Summary($p_search=3D"",$p_action=3D"",$p_sql=3D"")
+    function Summary($p_search=3D"",$p_action=3D"",$p_sql=3D"",$p_nothin=
g=3Dfalse)
     {
         $p_search=3Dsql_string($p_search);
         $extra_sql=3D"";

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	2011-11-23 19:50:38 UTC (r=
ev 4455)
+++ phpcompta/trunk/include/compta_ach.inc.php	2011-11-23 21:36:44 UTC (r=
ev 4456)
@@ -169,6 +169,9 @@
 else
 	$Ledger->id =3D $_REQUEST ['p_jrn'];
=20
+if (isset ($_REQUEST['p_jrn_predef'])){
+	$Ledger->id=3D$_REQUEST['p_jrn_predef'];
+}
 // pre defined operation
 //
 echo '<div id=3D"predef_form">';

Modified: phpcompta/trunk/include/compta_ods.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ods.inc.php	2011-11-23 19:50:38 UTC (r=
ev 4455)
+++ phpcompta/trunk/include/compta_ods.inc.php	2011-11-23 21:36:44 UTC (r=
ev 4456)
@@ -40,12 +40,12 @@
 $cn =3D new Database(dossier::id());
=20
 $id =3D (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : -1;
+$id =3D (isset($_REQUEST['p_jrn_predef'])) ? $_REQUEST['p_jrn_predef'] :=
 -1;
 $ledger =3D new Acc_Ledger($cn, $id);
 $first_ledger =3D $ledger->get_first('ODS');
 $ledger->id =3D ($ledger->id =3D=3D -1) ? $first_ledger['jrn_def_id'] : =
$id;
=20
 /* !\brief show a form for quick_writing */
-$id =3D (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : -1;
 $def =3D -1;
 $ledger->with_concerned =3D true;
=20

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	2011-11-23 19:50:38 UTC (r=
ev 4455)
+++ phpcompta/trunk/include/compta_ven.inc.php	2011-11-23 21:36:44 UTC (r=
ev 4456)
@@ -180,14 +180,17 @@
 // pre defined operation
 //
=20
-    if ( !isset($_REQUEST ['p_jrn']))
+    if ( !isset($_REQUEST ['p_jrn']) )
     {
         $def_ledger=3D$Ledger->get_first('ven');
         $Ledger->id=3D$def_ledger['jrn_def_id'];
     }
     else
         $Ledger->id=3D$_REQUEST ['p_jrn'];
-
+	if (isset ($_REQUEST['p_jrn_predef'])){
+		$Ledger->id=3D$_REQUEST['p_jrn_predef'];
+	}
+=09
    echo '<div id=3D"predef_form">';
     echo '<form style=3D"display:inline" method=3D"GET" >';
 	echo HtmlInput::hidden('ac',$_REQUEST['ac']);

Modified: phpcompta/trunk/include/export_fiche_balance_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_balance_pdf.php	2011-11-23 19:50=
:38 UTC (rev 4455)
+++ phpcompta/trunk/include/export_fiche_balance_pdf.php	2011-11-23 21:36=
:44 UTC (rev 4456)
@@ -72,7 +72,7 @@
 		$afiche[0]=3Darray('fd_id'=3D>$_REQUEST['cat']);
 	}
=20
-	if ( $allcard=3D=3D0 && empty($aCard))
+	if ( $allcard=3D=3D0 && empty($afiche))
     {
         $pdf->Cell(0,10, "Aucune fiche trouv=C3=A9e");//Save PDF to file
         $fDate=3Ddate('dmy-Hi');

Modified: phpcompta/trunk/include/impress_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/impress_fiche.inc.php	2011-11-23 19:50:38 UTC=
 (rev 4455)
+++ phpcompta/trunk/include/impress_fiche.inc.php	2011-11-23 21:36:44 UTC=
 (rev 4456)
@@ -154,7 +154,7 @@
=20
=20
     $fd=3Dnew Fiche_Def($cn,$_REQUEST['cat']);
-    if ( $allcard=3D=3D1 && $fd->hasAttribute(ATTR_DEF_ACCOUNT) =3D=3D f=
alse )
+    if ( $allcard=3D=3D0 && $fd->hasAttribute(ATTR_DEF_ACCOUNT) =3D=3D f=
alse )
     {
       echo alert("Cette cat=C3=A9gorie n'ayant pas de poste comptable n'=
a pas de balance");
       exit;
@@ -172,10 +172,13 @@
 	for ($e=3D0;$e<count($afiche);$e++)
 	{
 		$ret=3D$cn->exec_sql("select f_id,ad_value from fiche join fiche_detai=
l using(f_id) where fd_id=3D$1 and ad_id=3D1 order by 2 ",array($afiche[$=
e]['fd_id']));
-		if ( $cn->count()=3D=3D0)
+		if ( $cn->count()=3D=3D0 )
 		{
-			echo "Aucune fiche trouv=C3=A9e";
-			exit;
+			if ( $allcard=3D=3D0) {
+				echo "Aucune fiche trouv=C3=A9e";
+				exit;
+			} else
+				continue;
 		}
 		echo '<h2>'.$cn->get_value("select fd_label from fiche_def where fd_id=
=3D$1",array($afiche[$e]['fd_id'])).'</h2>';
 		echo '<table class=3D"result" style=3D"width:80%;margin-left:10%">';

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-23 19:50:38=
 UTC (rev 4455)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-23 21:36:44=
 UTC (rev 4456)
@@ -31,7 +31,8 @@
 global $g_user;
 $cn=3Dnew Database(dossier::id());
=20
-$id=3D(isset ($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1;
+$id =3D (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : -1;
+$id =3D (isset($_REQUEST['p_jrn_predef'])) ? $_REQUEST['p_jrn_predef'] :=
 -1;
 $ledger=3Dnew Acc_Ledger($cn,$id);
 $first_ledger=3D$ledger->get_first('ODS');
 $ledger->id=3D($ledger->id=3D=3D-1)?$first_ledger['jrn_def_id']:$id;

Modified: phpcompta/trunk/include/stock.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.inc.php	2011-11-23 19:50:38 UTC (rev 44=
55)
+++ phpcompta/trunk/include/stock.inc.php	2011-11-23 21:36:44 UTC (rev 44=
56)
@@ -41,17 +41,12 @@
=20
 $href=3Dbasename($_SERVER['PHP_SELF']);
=20
-// Get The priv on the selected folder
-$g_user->can_request(STOLE,1);
-
-
 $action=3D ( isset ($_GET['action']))? $_GET['action']:"";
 include_once("stock_inc.php");
=20
 // Adjust the stock
 if ( isset ($_POST['sub_change']))
 {
-    $g_user->can_request(STOWRITE,1);
     $change=3D$_POST['stock_change'];
     $sg_code=3D$_POST['sg_code'];
     $sg_date=3D$_POST['sg_date'];
@@ -121,8 +116,6 @@
 // View details
 if ( $action =3D=3D 'detail' )
 {
-    // Check if User Can see the stock
-    $g_user->can_request(STOLE,1);
     $sg_code=3D(isset ($_GET['sg_code'] ))?$_GET['sg_code']:$_POST['sg_c=
ode'];
     $year=3D(isset($_GET['year']))?$_GET['year']:$_POST['year'];
     $a=3DViewDetailStock($cn,$sg_code,$year);



From MAILER-DAEMON Wed Nov 23 16:56:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTKny-0001rP-M5
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 16:56:34 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 23:01:40 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.44010.1322085393.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4457 - 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, 23 Nov 2011 21:56:32 -0000

Author: danydb
Date: 2011-11-23 23:01:39 +0100 (Wed, 23 Nov 2011)
New Revision: 4457

Modified:
   phpcompta/trunk/include/anc_pa.inc.php
Log:

#471 apparence bouton effacer


Modified: phpcompta/trunk/include/anc_pa.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/anc_pa.inc.php	2011-11-23 21:36:44 UTC (rev 4=
456)
+++ phpcompta/trunk/include/anc_pa.inc.php	2011-11-23 22:01:39 UTC (rev 4=
457)
@@ -159,7 +159,7 @@
         $ret.=3DHtmlInput::hidden('sa','po_update');
         $ret.=3DHtmlInput::submit('Correction','Correction');
         $ret.=3Dsprintf('<A class=3D"mtitle" HREF=3D"?ac=3D'.$_REQUEST['=
ac'].'&sa=3Dpo_delete&po_id=3D%s&pa_id=3D%s&'.$str_dossier.'">'.
-                      '<input type=3D"button" value=3D"Efface" onClick=3D=
"return confirm(\' Voulez-vous vraiment effacer cette activit=C3=A9\');">=
</A>',
+                      '<input type=3D"button" class=3D"button" value=3D"=
Efface" onClick=3D"return confirm(\' Voulez-vous vraiment effacer cette a=
ctivit=C3=A9\');"></A>',
                       $po->id,
                       $_REQUEST['pa_id']
                      );



From MAILER-DAEMON Wed Nov 23 17:17:40 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTL8O-0000Vu-KP
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 17:17:40 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 23:22:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.44045.1322086659.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4458 - 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, 23 Nov 2011 22:17:39 -0000

Author: danydb
Date: 2011-11-23 23:22:46 +0100 (Wed, 23 Nov 2011)
New Revision: 4458

Modified:
   phpcompta/trunk/include/menu.inc.php
Log:

#469 s?\195?\169parer plugin et menu (ajout d'un filtre)


Modified: phpcompta/trunk/include/menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/menu.inc.php	2011-11-23 22:01:39 UTC (rev 445=
7)
+++ phpcompta/trunk/include/menu.inc.php	2011-11-23 22:22:46 UTC (rev 445=
8)
@@ -92,9 +92,33 @@
=20
 $order=3D$table->get_sql_order($ord);
=20
+
+
+$iselect=3Dnew ISelect('p_type');
+$iselect->value=3Darray(
+	array("value"=3D>'',"label"=3D>"Tout"),
+	array("value"=3D>'ME',"label"=3D>"Menu"),
+	array("value"=3D>'PR',"label"=3D>"Impression"),
+	array("value"=3D>'PL',"label"=3D>"Extension / Plugin"),
+	array("value"=3D>'SP',"label"=3D>"Valeurs sp=C3=A9ciales")
+	);
+$iselect->selected=3D(isset($_REQUEST['p_type']))?$_REQUEST['p_type']:''=
;
+$sql=3D"";
+if ( $iselect->selected !=3D '')
+{
+	$sql=3D"where me_type=3D'".sql_string($_REQUEST['p_type'])."'  ";
+}
 $menu=3Dnew Menu_Ref_sql($cn);
-$ret=3D$menu->seek($order);
-echo '<p class=3D"info"> le type vaut :
+$ret=3D$menu->seek($sql.$order);
+?>
+<fieldset><legend>Recherche</legend>
+<form method=3D"GET">
+	<?=3D$iselect->input()?>
+	<?=3DHtmlInput::submit("search", "Recherche")?>
+	<?=3DHtmlInput::request_to_hidden(array('ac','gDossier','ord'))?>
+</form>
+</fieldset>
+<p class=3D"info"> le type vaut :
 	<ul>
 	<li> ME pour Menu</li>
 	<li> PR pour les impressions </li>
@@ -102,7 +126,8 @@
 	<li> SP pour des valeurs sp=C3=A9ciales</li>
 	</ul>
=20
-	</p>';
+	</p>
+<?
 $gDossier=3DDossier::id();
 echo HtmlInput::button("Add_plugin", "Ajout d'un plugin", "onclick=3Dadd=
_plugin($gDossier)");
 echo '<table class=3D"result">';



From MAILER-DAEMON Wed Nov 23 17:24:47 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTLFH-0003Oy-QQ
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 17:24:47 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 23:29:53 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.44054.1322087085.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4459 - 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 Nov 2011 22:24:44 -0000

Author: danydb
Date: 2011-11-23 23:29:52 +0100 (Wed, 23 Nov 2011)
New Revision: 4459

Modified:
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
Log:

#436 CSS : apparence choix journaux dans reconciliation


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	2011-11-23 22:22:46 UTC (rev 445=
8)
+++ phpcompta/trunk/html/style-color.css	2011-11-23 22:29:52 UTC (rev 445=
9)
@@ -1012,7 +1012,8 @@
 text-align:center;
 }
 div#div_jrnsearch_op{
-
+			 position:absolute;
+			  z-index: 5;
               border:1px solid black;
               display:none;
               width:50em;

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	2011-11-23 22:22:46 UTC (rev 445=
8)
+++ phpcompta/trunk/html/style-light.css	2011-11-23 22:29:52 UTC (rev 445=
9)
@@ -1014,7 +1014,8 @@
 text-align:center;
 }
 div#div_jrnsearch_op{
-
+  position:absolute;
+			  z-index: 5;
               border:1px solid black;
               display:none;
               width:50em;

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	2011-11-23 22:22:46 UTC (rev 4458)
+++ phpcompta/trunk/html/style.css	2011-11-23 22:29:52 UTC (rev 4459)
@@ -1019,6 +1019,8 @@
               display:none;
               width:50em;
 		      background-color:#EDF3FF;
+			  position:absolute;
+			  z-index: 5;
=20
 }
 ul {



From MAILER-DAEMON Wed Nov 23 17:31:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTLLN-0005mX-2q
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 17:31:05 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 23:36:11 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.44084.1322087464.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4460 - 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 Nov 2011 22:31:04 -0000

Author: danydb
Date: 2011-11-23 23:36:08 +0100 (Wed, 23 Nov 2011)
New Revision: 4460

Modified:
   phpcompta/trunk/html/style-epad.css
Log:

#436 CSS : apparence choix journaux dans reconciliation


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	2011-11-23 22:29:52 UTC (rev 4459=
)
+++ phpcompta/trunk/html/style-epad.css	2011-11-23 22:36:08 UTC (rev 4460=
)
@@ -18,26 +18,26 @@
   width:100%;
    border-spacing:  0px;
    border-collapse:collapse;
-  =20
+
 }
 table.resultfooter tfoot {
 	font-size:110%;
 	font-weight: bold;
-=09
-=09
+
+
 }
-table.result th {=20
+table.result th {
   font-weight:bold;
   font-family:helvetica,sans-serif;
- border-bottom:2px solid blue;=20
+ border-bottom:2px solid blue;
  border-top:0;
-=20
+
   color:#25238F;
   text-align: left;
   	     // background-color:#EDF3FF;
-  	     =20
+
 	      font-style: italic;
-	     =20
+
 }
=20
 h2 {
@@ -76,7 +76,7 @@
   padding:0px;
   margin:0px;
   border:1px solid grey;
- =20
+
 }
=20
 h3.info {
@@ -107,10 +107,10 @@
=20
 div.u_tmenu {
   margin-top:0px;
-  width:100%;=09
+  width:100%;
  /* background-color:#879ED4; */
- =20
- =20
+
+
 }
 div.u_subtmenu {
   background-color:white	;
@@ -121,7 +121,7 @@
 }
 div.u_tmenu div.u_tool {
 	   float:left;
-	  =20
+
 }
 div.u_tool {
 	float:left;
@@ -135,12 +135,12 @@
 	float:right;
 	margin-right:10px;
 	text-align:right;
-=09
+
 }
=20
 div.u_subt2menu {
 background-color:lightgrey;
-  left:1%;=09
+  left:1%;
=20
 }
 div.lmenu {
@@ -172,40 +172,40 @@
   border-width:1px;
=20
 }
-div.redcontent{ 	=20
-  =20
-         float:left; 	=20
+div.redcontent{
+
+         float:left;
 	 padding-top:7px;
 	 padding-left:8px;
-         font-size:9px; 	=20
-         font-family:helvetica,sans-serif; 	=20
+         font-size:9px;
+         font-family:helvetica,sans-serif;
 	 width:75%;
=20
 }
-div.content{ 	=20
+div.content{
=20
-         float:left; 	=20
+         float:left;
 		padding-top:7px;
-         width:100%; 	 	=20
-         font-family:helvetica,sans-serif; =09
+         width:100%;
+         font-family:helvetica,sans-serif;
          clear:both;
-         =20
=20
+
 }
-div.content30{ 	=20
-   	=20
-         float:left; 	=20
+div.content30{
+
+         float:left;
 	 padding-top:7px;
-         width:35%; 	 =20
-         font-family:helvetica,sans-serif; 	=20
+         width:35%;
+         font-family:helvetica,sans-serif;
=20
 }
 div.no span{
 	position:static;
-	font-family:helvetica,sans-serif;=09
+	font-family:helvetica,sans-serif;
 	font-weight:bold;
-	color:red;=09
-=09
+	color:red;
+
 }
=20
 table.document {
@@ -230,7 +230,7 @@
 margin-left:20%;
 text-align: center;
=20
-color:white; =20
+color:white;
 background-color:red;
 font-weight: bolder;
 font-size:120%;
@@ -240,7 +240,7 @@
 	border:0;
 	text-align:center
 }
-td.mshort {=20
+td.mshort {
   height:15px;
   width:60px;
   text-align:center;
@@ -251,7 +251,7 @@
 td.mtitle {
 	text-align:center;
 	width:95px;
-        height :30px;=20
+        height :30px;
 	font-size:10px;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
@@ -268,11 +268,11 @@
 	font-size:10px;
 	border-style:groove
 }
-span.odd {=20
+span.odd {
   background-color:#ECF3FF;
   display:block;
  }
-span.even {=20
+span.even {
   background-color:#DDE6FF;
   display:block;
  }
@@ -311,16 +311,16 @@
   text-decoration:none;
   display:inline;
  color: blue;
-=09
+
 }
 a.mtitle:hover {
   font-size:10px;
   text-decoration:none;
   display:inline;
- =20
+
  color: darkblue;
 background-color:#5D90CD;
-=09
+
 }
 td.selectedcell a.mtitle {
  font-size:1em;
@@ -333,7 +333,7 @@
   text-decoration:none;
   display:block;
    color: #202267;
-=09
+
 }
 tr.odd:hover td
 {
@@ -341,7 +341,7 @@
   background-color: #a9d6e4;
   color:white;
 }
-tr.even:hover td=20
+tr.even:hover td
 {
   text-decoration:none;
   background-color: #a9d6e4;
@@ -403,7 +403,7 @@
     color: blue;
 }
=20
-a.detail:hover  =20
+a.detail:hover
 {
   font-size:12px;
   font-family:helvetica,sans-serif;
@@ -439,7 +439,7 @@
   display: block;
   color: blue;
 padding: 1px ;
-=09
+
 }
=20
=20
@@ -456,7 +456,7 @@
   text-decoration:none;
   display:inline;
=20
- =20
+
   color:black;
=20
 }
@@ -474,9 +474,9 @@
   text-decoration:none;
   display:inline;
   color:blue;
-   =20
=20
=20
+
 }
=20
 div.content a.mtitle:hover {
@@ -484,17 +484,17 @@
   display:inline;
   background-color:darkblue;
   color:white;
-=20
=20
+
 }
 div.redcontent input.text {
    font-family:helvetica,sans-serif;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
-  background-color:orange; =20
+  background-color:orange;
   border-width:1px;
-  color:blue;=20
+  color:blue;
 }
 div.content input.text {
    font-family:helvetica,sans-serif;
@@ -503,7 +503,7 @@
   border-style:solid;
   border-width:1px;
   background-color:orange;
-  color:blue;=20
+  color:blue;
 }
=20
=20
@@ -540,12 +540,12 @@
 font-weight: bold;
 font-style: italic;
 font-size: 120% ;
-=09
+
 }
-fieldset fieldset legend {=20
+fieldset fieldset legend {
 	 font-size:110%;
 	 color:grey;
-	 }=09
+	 }
 select {
 border: 1px solid blue;
 margin:2px;
@@ -564,12 +564,12 @@
 	   visibility:hidden;
 	   z-index:2;
 	   width:25em;
-      =20
+
 }
=20
 span.action {
 	height:3em;
-=09
+
 }
 td.num {
 	text-align:right;
@@ -583,7 +583,7 @@
   padding-right:3px;
   text-decoration:none;
   font-size:14px;
- =20
+
   display:inline;
   color:black;
   background-color:lightgrey;
@@ -604,8 +604,8 @@
 	height:100%;
 	z-index:1;
 	/*background-color:lightgrey;*/
-=09
-	display:none;=09
+
+	display:none;
 }
=20
 div.popup_border_title {
@@ -624,19 +624,19 @@
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/=09
+	/*border-bottom: 2px solid #201e87;*/
 	color: white;
 	display:none;
 	/*opacity:1;
 	filter:alpha(opacity=3D100);*/
-=09
+
 	}
 div.popup_border_notitle {
 	position:absolute;
 	top:20%;
 	left:20%;
 	width:60%;
-	height:80% ;=20
+	height:80% ;
 	/*background:lightgrey;*/
 	z-index:10;
 	/*border:dotted 1px black;*/
@@ -662,7 +662,7 @@
 	width:100%;
 	height:96%;
 	overflow: auto;
-	background-color:#DFE7FF;=09
+	background-color:#DFE7FF;
 	font-size:12px ;
 	font-family: helvetica,sans-serif;
 	font-style: normal;
@@ -682,7 +682,7 @@
   padding:0;
   text-align:left;
   font-size:12px;
- =20
+
 }
 div.autocomplete em {
 	color:blue;
@@ -734,20 +734,20 @@
 	margin: 0px;
 	padding:  0px;
 }
-=09
+
 div.pc_calendar{
 		border:1px groove grey;
 		float:left;
-	=09
+
 		}
 div.pc_calendar table {
 	text-align:center;
-	=09
+
 }
 div.pc_calendar tr{
 	height:40;
-=09
-=09
+
+
 }
 div.pc_calendar td{
 	width:10em;
@@ -755,26 +755,26 @@
=20
 div.pc_calendar td.weekend {
 	background-color:#cce0e6;
-=09
+
 }
 div.pc_calendar td.workday{
 	background-color:inherit;
-=09
-=09
+
+
 }
 div.pc_calendar span.day{
 	font-weight: bold;
 	display:block;
-=09
+
 }
 div.pc_calendar span.event{
 	font-weight: bolder;
-=09
+
 }
 span.todo  {
 	text-align: left;
 	background-color:yellow;
-=09
+
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
 -moz-user-focus:ignore;
@@ -788,13 +788,13 @@
 	font-size:10;
 	color:white;
 	font-weight: bold;
-=09
+
 	text-decoration:none;
 	font-family: helvetica,sans-serif;
 	background-image: url("image/bg-submit2.gif");
 	background-repeat: repeat-x;
 	background-position: left;
-=09
+
 	border-style:  outset ;
 	border-color:  blue ;
 	border-width:0;
@@ -802,7 +802,7 @@
 	cursor:pointer;
 	margin:1 2 1 2;
 	-moz-border-radius:2 2;
-=09
+
 }
 .button:hover {
 	cursor:pointer;
@@ -813,18 +813,18 @@
 	}
 	td.tool {
 	border: solid 1px gray;
-=09
+
 	}
 div.topmenu {
 	float:left;
 	width:100%;
-=09
+
 }
=20
 h2.dossier {
 	color:darkblue;
 	font-style: italic;
-=09
+
 font-size:20px;
 margin:0;
 padding:0;
@@ -834,13 +834,13 @@
 	font-size:10;
 	color:white;
 	font-weight: bold;
-=09
+
 	text-decoration:none;
 	font-family: helvetica,sans-serif;
 	background-image: url("image/bg-submit3.gif");
 	background-repeat: repeat-x;
 	background-position: left;
-=09
+
 	border-style:  outset ;
 	border-color:  blue ;
 	border-width:1;
@@ -848,7 +848,7 @@
 	cursor:pointer;
 	margin:1 2 1 2;
 	-moz-border-radius:2 2;
-=09
+
 }
 a#anchorbutton:hover {
 	cursor:pointer;
@@ -858,7 +858,7 @@
 	margin:1 2 1 2;
 	}
 /* </style> */
-div.add_todo_list {=20
+div.add_todo_list {
                     border:1px solid blue;
                     display:none;
                     background-color:#BFD0FF;
@@ -883,10 +883,10 @@
 	padding: 5px;
 }
 div.op_detail_frame  {
-  background-color:#e4e7ed;=20
+  background-color:#e4e7ed;
   height:100%; width:100%;
- =20
- =20
+
+
 }
 div.inner_box  {
   background-color:#e4e7ed;
@@ -896,21 +896,21 @@
   margin:0;
   overflow:hidden;
   z-index:3;
- =20
+
 position:absolute;
 left:10%;
=20
=20
-border:1px solid darkblue;=09
+border:1px solid darkblue;
=20
 }
 div.op_detail_title {
 	background-color:grey;
 /*	width:500;*/
-=09
-=09
+
+
 }
-div#div_jrn{=20
+div#div_jrn{
               position:absolute;
               border:1px solid black;
                top:15%;left:100;
@@ -918,9 +918,9 @@
               z-index:2;
               width:50em;
 		      background-color:#EDF3FF;
-		     =20
+
 }
- div#div_cat{=20
+ div#div_cat{
               position:absolute;
               border:1px solid black;
                top:15%;left:100;
@@ -928,14 +928,14 @@
               z-index:2;
               width:50em;
              background-color:#EDF3FF;
-		     =20
+
 }
-=20
+
 div.divinfo
 {  color:red;text-align:right;display:block;width:30em;height:13;font-we=
ight:bold}
=20
 div#search_form
-{=20
+{
               position:absolute;
               border:1px solid black;
               top:15%;left:100;
@@ -946,7 +946,7 @@
 	      background-color:#e4e7ed;
 }
=20
-table.result td=20
+table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -956,7 +956,7 @@
 	font-size:18;
 	margin-right:30%;
 	width:20%;
-=09
+
 }
 table.info_op tr
 {
@@ -967,39 +967,39 @@
 {
 	margin-right:30%;
 	float: right;
-=09
+
 }
 tr.footer{
 	font-size:14;
 	font-style: italic;
 	font-weight: bold;
-=09
+
 }
 span.remain {
 	font-weight: bold;
 	color:black;
 	}
-=09
+
 div#jrn_name_div
 {
 	float: right;
 	margin-right:150;
-=09
-=09
+
+
 }
 #predef_form {
 	margin-left:20%;
 	width:60%;
-=09
+
 }
 #direct
 {
 	display:inline;
 	float:right;
-=09
-=09
+
+
 }
-.direct=20
+.direct
 {
 		font-size:10px;
 	   border:groove 1px #000000;
@@ -1014,13 +1014,13 @@
   margin:0;
   overflow:hidden;
   z-index:10;
- =20
+
 position:absolute;
 left:30%;
 top:30%;
=20
=20
-border:1px solid darkblue;=09
+border:1px solid darkblue;
=20
 }
 #wait_box h2
@@ -1028,11 +1028,65 @@
 color:black;
 text-align:center;
 }
-div#div_jrnsearch_op{=20
-             =20
+div#div_jrnsearch_op{
+               position:absolute;
+			  z-index: 5;
               border:1px solid black;
               display:none;
               width:50em;
 		      background-color:#EDF3FF;
-		     =20
+
+}
+ul {
+	padding-left: 110px;
+}
+a.line,div.content a.line
+{
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+ color: #0000ff;
+}
+a.line:hover,div_content a.line
+{
+font-size:110%;
+  text-decoration:underline;
+  display:inline;
+  color: #0000ff;
+     background-color: rgb(93, 144, 205);
+}
+#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;
+}
+table.table_large tr.odd ,table.table_large tr.even {
+
+	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;
+}
+span.invoice
+{
+    font-size: 120%;
+    font-style: italic;
+    display:block;
+    margin: 20px;
+    font-weight: bold;
 }
\ No newline at end of file



From MAILER-DAEMON Wed Nov 23 17:31:22 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTLLe-0006Eq-6V
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 17:31:22 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 23:36:29 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.44085.1322087481.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4461 - 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, 23 Nov 2011 22:31:20 -0000

Author: danydb
Date: 2011-11-23 23:36:28 +0100 (Wed, 23 Nov 2011)
New Revision: 4461

Modified:
   phpcompta/trunk/include/report.inc.php
Log:

#470: Avanc?\195?\169 -> cr?\195?\169ation de rapport ne fonctionne pas


Modified: phpcompta/trunk/include/report.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/report.inc.php	2011-11-23 22:36:08 UTC (rev 4=
460)
+++ phpcompta/trunk/include/report.inc.php	2011-11-23 22:36:28 UTC (rev 4=
461)
@@ -33,16 +33,6 @@
 require_once('class_ipopup.php');
=20
=20
-echo ICard::ipopup('ipopcard');
-echo ICard::ipopup('ipop_newcard');
-echo IPoste::ipopup('ipop_account');
-$search_card=3Dnew IPopup('ipop_card');
-$search_card->title=3D_('Recherche de fiche');
-$search_card->value=3D'';
-echo $search_card->input();
-
-
-
 $gDossier=3Ddossier::id();
 $str_dossier=3Ddossier::get();
=20
@@ -80,14 +70,15 @@
 }
=20
 $lis=3D$rap->get_list();
+$ac=3D"&ac=3D".$_REQUEST['ac'];
 $p_action=3D'p_action=3Ddefreport';
 echo '<div class=3D"lmenu">';
 echo '<TABLE>';
-echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"?'.$p_action.=
'&action=3Dadd&'.$str_dossier.'">Ajout</A></TD></TR>';
+echo '<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"?'.$p_action.=
$ac.'&action=3Dadd&'.$str_dossier.'">Ajout</A></TD></TR>';
=20
 foreach ( $lis as $row)
 {
-    printf ('<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"?'.$p_=
action.'&action=3Dview&fr_id=3D%s&%s">%s</A></TD></TR>', $row->id,$str_do=
ssier,$row->name);
+    printf ('<TR><TD class=3D"mtitle"><A class=3D"mtitle" HREF=3D"?'.$p_=
action.$ac.'&action=3Dview&fr_id=3D%s&%s">%s</A></TD></TR>', $row->id,$st=
r_dossier,$row->name);
=20
 }
 echo "</TABLE>";



From MAILER-DAEMON Wed Nov 23 17:35:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTLPO-00081h-9r
	for mharc-phpcompta-dev@gnu.org; Wed, 23 Nov 2011 17:35:14 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 23 Nov 2011 23:40:21 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.44086.1322087713.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4462 - 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: Wed, 23 Nov 2011 22:35:12 -0000

Author: danydb
Date: 2011-11-23 23:40:20 +0100 (Wed, 23 Nov 2011)
New Revision: 4462

Modified:
   phpcompta/trunk/html/export.php
   phpcompta/trunk/include/class_user.php
Log:

audit impression


Modified: phpcompta/trunk/html/export.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/export.php	2011-11-23 22:36:28 UTC (rev 4461)
+++ phpcompta/trunk/html/export.php	2011-11-23 22:40:20 UTC (rev 4462)
@@ -43,7 +43,6 @@
     exit();
   }
=20
-
   switch( $_GET['act'])
   {
   case 'CSV:histo':

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2011-11-23 22:36:28 UTC (rev 4=
461)
+++ phpcompta/trunk/include/class_user.php	2011-11-23 22:40:20 UTC (rev 4=
462)
@@ -715,6 +715,7 @@
 	function check_print($p_action)
 	{
 		global $audit,$cn;
+		$this->audit('AUDIT', $p_action);
 		if ($this->Admin() =3D=3D 1)
 			return 1;
 		if ($this->is_local_admin(dossier::id()) =3D=3D 1)



From MAILER-DAEMON Thu Nov 24 04:45:52 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTVsO-000423-Ca
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 04:45:52 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 10:50:43 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45379.1322127951.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4463 - 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: Thu, 24 Nov 2011 09:45:50 -0000

Author: danydb
Date: 2011-11-24 10:50:41 +0100 (Thu, 24 Nov 2011)
New Revision: 4463

Modified:
   phpcompta/trunk/html/js/scripts.js
Log:
Prob. IE Width search_op

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	2011-11-23 22:40:20 UTC (rev 4462)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-24 09:50:41 UTC (rev 4463)
@@ -1042,7 +1042,8 @@
=20
 	var target=3D"search_op";
 	removeDiv(target);
-	var str_style=3Dfixed_position(77, 99)
+	var str_style=3Dfixed_position(77, 99);
+        str_style+=3D";width:55%";
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20



From MAILER-DAEMON Thu Nov 24 04:48:11 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTVud-0004Ps-Ke
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 04:48:11 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 10:53:08 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45382.1322128090.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4464 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Nov 2011 09:48:09 -0000

Author: danydb
Date: 2011-11-24 10:53:07 +0100 (Thu, 24 Nov 2011)
New Revision: 4464

Modified:
   phpcompta/trunk/include/template/ledger_search.php
Log:
Prob. IE Width search_op

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	2011-11-24 09:50:4=
1 UTC (rev 4463)
+++ phpcompta/trunk/include/template/ledger_search.php	2011-11-24 09:53:0=
7 UTC (rev 4464)
@@ -1,7 +1,7 @@
=20
 <table>
 <tr>
-<td style=3D'text-align:right;width:30em'>
+<td style=3D"text-align:right;width:30em">
 <?=3D_('Dans le journal')?>
 </td>
 <td>
@@ -10,7 +10,7 @@
 </tr>
=20
 <tr>
-<td style=3D'text-align:right;width:30em'>
+<td style=3D"text-align:right;width:30em">
 <?=3D_('Et Compris entre les date')?>
 </td>
 <td>
@@ -19,7 +19,7 @@
 </tr>
=20
 <tr>
-<td style=3D'text-align:right;width:30em'>
+<td style=3D"text-align:right;width:30em">
 <?=3D_('Et contenant dans le libell=C3=A9, pi=C3=A8ce justificative ou n=
=C2=B0 interne')?>
 </td>
=20
@@ -28,7 +28,7 @@
 </td>
 </tr>
 <tr>
-<td style=3D'text-align:right;width:30em'>
+<td style=3D"text-align:right;width:30em">
 <?=3D_('Et compris entre les montants')?>
 </td>
 <td >
@@ -36,7 +36,7 @@
 </td>
 </tr>
 <tr>
-<td style=3D'text-align:right;width:30em'>
+<td style=3D"text-align:right;width:30em">
 	<?=3D_('Et utilisant la fiche (quick code)')?>
 </td>
 <td>
@@ -44,7 +44,7 @@
 </td>
 </tr>
 <tr>
-<td style=3D'text-align:right;width:30em'>
+<td style=3D"text-align:right;width:30em">
 	<?php echo _('Et utilisant le poste comptable').$info?>
 </td>
=20
@@ -54,7 +54,7 @@
 </tr>
=20
 <tr>
-<td style=3D'text-align:right';width:30em>
+<td style=3D"text-align:right;width:30em">
 	<?=3D_('Et uniquement non pay=C3=A9es')?>
 </td>
=20



From MAILER-DAEMON Thu Nov 24 05:27:07 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTWWJ-0004DI-QL
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 05:27:07 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 11:32:10 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45464.1322130427.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4465 - 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 Nov 2011 10:27:07 -0000

Author: danydb
Date: 2011-11-24 11:32:08 +0100 (Thu, 24 Nov 2011)
New Revision: 4465

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
Log:
Prob. IE Width search_op

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	2011-11-24 09:53:07 UTC =
(rev 4464)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-24 10:32:08 UTC =
(rev 4465)
@@ -729,7 +729,7 @@
             $r.=3D"</tr>";
=20
         }
-		echo '</table>';
+	$r.=3D'</table>';
         return array ($count,$r);
     }
     /*!\brief Show all the operation



From MAILER-DAEMON Thu Nov 24 05:34:15 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTWdD-0005jF-Ni
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 05:34:15 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 11:39:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45471.1322130855.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4466 - 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: Thu, 24 Nov 2011 10:34:15 -0000

Author: danydb
Date: 2011-11-24 11:39:18 +0100 (Thu, 24 Nov 2011)
New Revision: 4466

Modified:
   phpcompta/trunk/html/js/scripts.js
Log:
Prob. IE Width search_op

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	2011-11-24 10:32:08 UTC (rev 4465)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-24 10:39:18 UTC (rev 4466)
@@ -1076,24 +1076,29 @@
  */
 function search_operation(obj)
 {
+    try{
 	var dossier=3Dg('gDossier').value;
 	waiting_box();
 	var target=3D"search_op";
-
-    var qs=3Dobj.serialize()+"&op=3Dsearch_op&ctl=3Dsearch_op";
-
-    var action=3Dnew Ajax.Request ( 'ajax_misc.php',
-				  {
-				      method:'get',
-				      parameters:qs,
-				      onFailure:null,
-				      onSuccess:function (req){
-						  remove_waiting_box();
-						  $('search_op').innerHTML=3Dreq.responseText;
-						  req.responseText.evalScripts();
-					  }
-				  }
-				);
+       =20
+        var qs=3Dobj.serialize()+"&op=3Dsearch_op&ctl=3Dsearch_op";
+       =20
+        var action=3Dnew Ajax.Request ( 'ajax_misc.php',
+        {
+            method:'get',
+            parameters:qs,
+            onFailure:null,
+            onSuccess:function (req){
+                remove_waiting_box();
+                $('search_op').innerHTML=3Dreq.responseText;
+                req.responseText.evalScripts();
+            }
+        }
+    );
+    } catch (e)
+    {
+        alert(e.message);
+    }
 }
=20
 function set_reconcile(obj)



From MAILER-DAEMON Thu Nov 24 05:36:36 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTWfU-0006vc-QJ
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 05:36:36 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 11:41:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45474.1322130996.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4467 - 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: Thu, 24 Nov 2011 10:36:35 -0000

Author: danydb
Date: 2011-11-24 11:41:38 +0100 (Thu, 24 Nov 2011)
New Revision: 4467

Modified:
   phpcompta/trunk/html/js/scripts.js
Log:
Prob. IE Width search_op

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	2011-11-24 10:39:18 UTC (rev 4466)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-24 10:41:38 UTC (rev 4467)
@@ -1082,7 +1082,7 @@
 	var target=3D"search_op";
        =20
         var qs=3Dobj.serialize()+"&op=3Dsearch_op&ctl=3Dsearch_op";
-       =20
+        alert(qs);
         var action=3Dnew Ajax.Request ( 'ajax_misc.php',
         {
             method:'get',



From MAILER-DAEMON Thu Nov 24 05:54:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTWwN-0003Sb-Fb
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 05:54:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 11:59:04 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45519.1322132042.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4468 - 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: Thu, 24 Nov 2011 10:54:02 -0000

Author: danydb
Date: 2011-11-24 11:59:03 +0100 (Thu, 24 Nov 2011)
New Revision: 4468

Modified:
   phpcompta/trunk/html/js/scripts.js
Log:
Prob. IE Width search_op

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	2011-11-24 10:41:38 UTC (rev 4467)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-24 10:59:03 UTC (rev 4468)
@@ -1097,6 +1097,7 @@
     );
     } catch (e)
     {
+        remove_waiting_box();
         alert(e.message);
     }
 }



From MAILER-DAEMON Thu Nov 24 08:10:49 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTZ4j-0006Oe-8q
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 08:10:49 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 14:15:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45799.1322140248.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4469 - 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: Thu, 24 Nov 2011 13:10:47 -0000

Author: danydb
Date: 2011-11-24 14:15:46 +0100 (Thu, 24 Nov 2011)
New Revision: 4469

Modified:
   phpcompta/trunk/html/js/scripts.js
Log:
add get_properties to know detail of an object

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	2011-11-24 10:59:03 UTC (rev 4468)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-24 13:15:46 UTC (rev 4469)
@@ -1080,9 +1080,8 @@
 	var dossier=3Dg('gDossier').value;
 	waiting_box();
 	var target=3D"search_op";
-       =20
+
         var qs=3Dobj.serialize()+"&op=3Dsearch_op&ctl=3Dsearch_op";
-        alert(qs);
         var action=3Dnew Ajax.Request ( 'ajax_misc.php',
         {
             method:'get',
@@ -1273,4 +1272,15 @@
 					  }
 				  }
 				);
-}
\ No newline at end of file
+}
+
+function get_properties(obj)
+{
+    var a_array=3D[];
+    var s_type=3D"["+typeof obj+"]";
+    for (var m in obj)
+    {
+	a_array.push(m);
+    }
+    alert(s_type+a_array.join(","));
+}



From MAILER-DAEMON Thu Nov 24 08:31:19 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTZOZ-0002sA-Uq
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 08:31:19 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 14:36:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45834.1322141478.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4470 - 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, 24 Nov 2011 13:31:18 -0000

Author: danydb
Date: 2011-11-24 14:36:17 +0100 (Thu, 24 Nov 2011)
New Revision: 4470

Modified:
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/operation_ods_new.inc.php
Log:
cosmetic alignement + totaux ODS

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	2011-11-24 13:15:46 UTC (rev 446=
9)
+++ phpcompta/trunk/html/style-color.css	2011-11-24 13:36:17 UTC (rev 447=
0)
@@ -938,8 +938,7 @@
 table.info_op
 {
 	font-size:18;
-	margin-right:30%;
-	width:20%;
+	width:100%;
=20
 }
 table.info_op tr

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	2011-11-24 13:15:46 UTC (rev 446=
9)
+++ phpcompta/trunk/html/style-light.css	2011-11-24 13:36:17 UTC (rev 447=
0)
@@ -940,8 +940,7 @@
 table.info_op
 {
 	font-size:18;
-	margin-right:30%;
-	width:20%;
+	width:100%;
=20
 }
 table.info_op tr

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	2011-11-24 13:15:46 UTC (rev 4469)
+++ phpcompta/trunk/html/style.css	2011-11-24 13:36:17 UTC (rev 4470)
@@ -940,9 +940,7 @@
 table.info_op
 {
 	font-size:18;
-	margin-right:30%;
-	width:20%;
-
+	width:100%;
 }
 table.info_op tr
 {

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	2011-11-24 13:15:46 UTC =
(rev 4469)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-24 13:36:17 UTC =
(rev 4470)
@@ -1337,8 +1337,8 @@
         {
             $lPeriode->find_periode($e_date);
         }
-		$total=3D0;
-		bcscale(2);
+	$total_deb=3D0;$total_cred=3D0;
+	bcscale(2);
=20
         $ret=3D"";
         $ret.=3D"<table >";
@@ -1422,10 +1422,15 @@
                 continue;
             $ret.=3D"<td>".h(${"ld".$i}).HtmlInput::hidden('ld'.$i,${'ld=
'.$i})."</td>";
             if ( isset(${"ck$i"}))
-				$ret.=3D"<td class=3D\"num\">".nbm(${"amount".$i}).HtmlInput::hidden=
('amount'.$i,${'amount'.$i})."</td>".td("");
-			else
-				$ret.=3Dtd("")."<td class=3D\"num\">".nbm(${"amount".$i}).HtmlInput:=
:hidden('amount'.$i,${'amount'.$i})."</td>";
-			$total=3Dbcadd($total,${"amount".$i});
+	      {
+		$ret.=3D"<td class=3D\"num\">".nbm(${"amount".$i}).HtmlInput::hidden('=
amount'.$i,${'amount'.$i})."</td>".td("");
+		$total_deb=3Dbcadd($total_deb,${'amount'.$i});
+	      }
+	    else
+	      {
+		$ret.=3Dtd("")."<td class=3D\"num\">".nbm(${"amount".$i}).HtmlInput::h=
idden('amount'.$i,${'amount'.$i})."</td>";
+		$total_cred=3Dbcadd($total_cred,${"amount".$i});
+	      }
             $ret.=3D"<td>";
             $ret.=3D(isset(${"ck$i"}))?HtmlInput::hidden('ck'.$i,${'ck'.=
$i}):"";
             $ret.=3D"</td>";
@@ -1456,7 +1461,7 @@
=20
             $ret.=3D"</tr>";
         }
-		$ret.=3Dtr(td('').td(_('Totaux')).td($total,'class=3D"num"').td($total=
,'class=3D"num"'),'class=3D"footer"');
+		$ret.=3Dtr(td('').td(_('Totaux')).td($total_deb,'class=3D"num"').td($t=
otal_cred,'class=3D"num"'),'class=3D"footer"');
         $ret.=3D"</table>";
 		if ( $g_parameter->MY_ANALYTIC!=3D'nu'  && $p_readonly=3D=3Dfalse)
 			$ret.=3D'<input type=3D"button" class=3D"button" value=3D"'._('verifi=
e Imputation Analytique').'" onClick=3D"verify_ca(\'\');">';
@@ -1586,11 +1591,11 @@
 		$ret.=3D$f_add_button->input();
         $ret.=3D'<table id=3D"quick_item" style=3D"width:100%">';
         $ret.=3D'<tr>'.
-              '<th >Quickcode'.$info.'</th>'.
-              '<th >'._('Poste').$info_poste.'</th>'.
-              '<th >'._('Libell=C3=A9').'</th>'.
-              '<th>'._('Montant').'</th>'.
-              '<th>'._('D=C3=A9bit').'</th>'.
+              '<th style=3D"text-align:left">Quickcode'.$info.'</th>'.
+              '<th style=3D"text-align:left">'._('Poste').$info_poste.'<=
/th>'.
+              '<th style=3D"text-align:left">'._('Libell=C3=A9').'</th>'=
.
+              '<th style=3D"text-align:left">'._('Montant').'</th>'.
+              '<th style=3D"text-align:left">'._('D=C3=A9bit').'</th>'.
               '</tr>';
=20
=20

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-24 13:15:46=
 UTC (rev 4469)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2011-11-24 13:36:17=
 UTC (rev 4470)
@@ -92,7 +92,7 @@
=20
 echo HtmlInput::submit('summary', _('Sauvez'));
=20
-echo '<div style=3D"position:absolute;right:20px">';
+echo '<div style=3D"position:absolute;width:40%;right:20px">';
 echo '<table class=3D"info_op">'.
  '<tr>'.td(_('D=C3=A9bit')) . '<td id=3D"totalDeb"></td>' .
  td(_('Cr=C3=A9dit')) . ' <td id=3D"totalCred"></td>' .



From MAILER-DAEMON Thu Nov 24 09:26:19 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTaFn-0003cG-B7
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 09:26:19 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 15:31:12 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45931.1322144778.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4471 - 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, 24 Nov 2011 14:26:17 -0000

Author: danydb
Date: 2011-11-24 15:31:09 +0100 (Thu, 24 Nov 2011)
New Revision: 4471

Modified:
   phpcompta/trunk/html/user_pref.php
   phpcompta/trunk/include/pref.inc.php
Log:
 Bug in preference

Modified: phpcompta/trunk/html/user_pref.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_pref.php	2011-11-24 13:36:17 UTC (rev 4470)
+++ phpcompta/trunk/html/user_pref.php	2011-11-24 14:31:09 UTC (rev 4471)
@@ -87,19 +87,8 @@
 // comta style
=20
 include_once ("user_menu.php");
-if ( isset ($_REQUEST['gDossier']) )
-{
-    if ( $_REQUEST['gDossier'] !=3D 0 )
-    {
-        echo '<div class=3D"u_tmenu">';
-        echo menu_tool('user_pref.php');
-        echo "</div>";
-    }
-}
-else
-{
-    echo "<h2 class=3D\"info\"> Pr&eacute;f&eacute;rences</h2>";
-}
+echo "<h2 class=3D\"info\"> Pr&eacute;f&eacute;rences</h2>";
+
 require_once("pref.inc.php");
 html_page_stop();
 ?>

Modified: phpcompta/trunk/include/pref.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/pref.inc.php	2011-11-24 13:36:17 UTC (rev 447=
0)
+++ phpcompta/trunk/include/pref.inc.php	2011-11-24 14:31:09 UTC (rev 447=
1)
@@ -33,6 +33,8 @@
 //----------------------------------------------------------------------
 //
 global $g_user;
+$cn=3DDossier::connect();
+$g_user=3Dnew User($cn);
 $inside_dossier =3D false;
=20
 if (isset($_REQUEST['gDossier']))
@@ -218,7 +220,11 @@
 	{
 	    echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?');
 	}
+	else
+	  {
+	    echo HtmlInput::button_anchor(_('Retour'), 'do.php?'.Dossier::get()=
);
=20
+	  }
=20
=20
 	echo "</DIV>";



From MAILER-DAEMON Thu Nov 24 09:40:44 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTaTk-00008Y-1F
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 09:40:44 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 24 Nov 2011 15:45:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.45952.1322145643.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4472 - 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 Nov 2011 14:40:42 -0000

Author: danydb
Date: 2011-11-24 15:45:36 +0100 (Thu, 24 Nov 2011)
New Revision: 4472

Modified:
   phpcompta/trunk/html/ajax_misc.php
Log:
#472 protect ajax for stock and ANCODS

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	2011-11-24 14:31:09 UTC (rev 4471)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-24 14:45:36 UTC (rev 4472)
@@ -66,9 +66,11 @@
 switch ($op)
 {
 	case "remove_anc":
+	  if ($user->check_module('ANCODS') =3D=3D 0) exit();
 			$cn->exec_sql("delete from operation_analytique where oa_group=3D$1",=
 array($_GET['oa']));
 		break;
 	case "rm_stock":
+	  if ($user->check_module('STOCK') =3D=3D 0) exit();
 		require_once('constant.security.php');
 		$cn->exec_sql('delete from stock_goods where sg_id=3D$1', array($s_id)=
);
 		$html =3D escape_xml($s_id);



From MAILER-DAEMON Thu Nov 24 20:12:59 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTkLb-0007qF-HE
	for mharc-phpcompta-dev@gnu.org; Thu, 24 Nov 2011 20:12:59 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2011 02:17:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.47318.1322183578.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4473 - 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, 25 Nov 2011 01:12:57 -0000

Author: danydb
Date: 2011-11-25 02:17:51 +0100 (Fri, 25 Nov 2011)
New Revision: 4473

Modified:
   phpcompta/trunk/html/style-color.css
Log:
test css

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	2011-11-24 14:45:36 UTC (rev 447=
2)
+++ phpcompta/trunk/html/style-color.css	2011-11-25 01:17:51 UTC (rev 447=
3)
@@ -1,12 +1,12 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-  background-color:#EDF3FF;
+  background-color:#EBE4E8;
  font-size:10;
-  font-family:helvetica,sans-serif;
+  font-family:arial,helvetica,sans-serif;
   padding: 0px 10px 0px 10px ;
   margin:0;
-  color:blue;
+  color:black;
 }
 .notice {
 		color:red;
@@ -29,7 +29,6 @@
 }
 table.table_large th,table.result th {
   font-weight:bold;
-  font-family:helvetica,sans-serif;
  border-bottom:1px solid blue;
  border-top:0;
=20
@@ -40,7 +39,7 @@
 }
=20
 h2 {
-  font-family:helvetica,sans-serif;
+
   font-size:14px;
   color:grey;
 }
@@ -68,14 +67,14 @@
   margin:0px;
 }
 h2.info {
-  background-color:#879ED4;
+  background-color:darkgray;
 	color:white;
 	font-size:14px;
   text-align:center;
-  padding:0px;
-  margin:0px;
-  border:1px solid grey;
-
+  padding:0 px;
+  margin:0px;=20
+  padding-bottom:3px;
+ =20
 }
=20
 h3.info {
@@ -84,15 +83,6 @@
   font-size:14px;
   text-align:center;
 }
-
-h2.info2 {
-  color:blue;
-  font-size:14px;
-  text-align:center;
-
-}
-
-
 h2.error {
 	background:red;
 	color:white;
@@ -151,7 +141,7 @@
 div.lextmenu {
=20
 	float:left;
-	font-family:helvetica,sans-serif;
+
 	font-size:9px;
=20
 }
@@ -166,7 +156,7 @@
 div.recherche_form{
 	width:700px;
 	font-size:9px;
-	font-family:helvetica,sans-serif;
+
   border-style:outset;
   border-width:1px;
=20
@@ -177,7 +167,7 @@
 	 padding-top:7px;
 	 padding-left:8px;
          font-size:9px;
-         font-family:helvetica,sans-serif;
+
 	 width:75%;
=20
 }
@@ -185,8 +175,10 @@
=20
          float:left;
 		padding-top:7px;
-         width:100%;
-         font-family:helvetica,sans-serif;
+         width:80%;
+		margin-left:10%;
+		margin-right:10%;
+	=09
          clear:both;
=20
=20
@@ -196,12 +188,12 @@
          float:left;
 	 padding-top:7px;
          width:35%;
-         font-family:helvetica,sans-serif;
=20
+
 }
 div.no span{
 	position:static;
-	font-family:helvetica,sans-serif;
+
 	font-weight:bold;
 	color:red;
=20
@@ -216,7 +208,7 @@
 }
 table.document th{
   font-weight:bold;
-  font-family:helvetica,sans-serif;
+
   border-bottom:2px solid blue;
   border-top:0;
   color:#25238F;
@@ -252,8 +244,8 @@
 	width:95px;
         height :30px;
 	font-size:10px;
-    background-color:#DDE6FF;
-    border:1px solid #99B1DF;
+    background-color:#99B1DF;
+    border:1px solid #DDE6FF;
 }
 td.msubtitle {
 	text-align:center;
@@ -277,8 +269,10 @@
  }
=20
 tr.odd {
-	background-color:#DDE6FF;
+	background-color:gray;
 	font-size:10px;
+	color:white;
+=09
 }
 tr {
 	font-size:10px;
@@ -309,7 +303,7 @@
   font-size:10px;
   text-decoration:none;
   display:inline;
- color: blue;
+ color: black;
=20
 }
 a.mtitle:hover {
@@ -317,7 +311,7 @@
   text-decoration:none;
   display:inline;
=20
- color: yellow;
+ color: red;
 background-color:#5D90CD;
=20
 }
@@ -396,7 +390,7 @@
 a.detail
 {
   font-size:9px;
-  font-family:helvetica,sans-serif;
+
     text-decoration: none;
     display: block;
     color: blue;
@@ -405,7 +399,7 @@
 a.detail:hover
 {
   font-size:9px;
-  font-family:helvetica,sans-serif;
+
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -417,7 +411,7 @@
 	 padding:1em 1em;
 }
 div.redcontent a {
-  font-family:helvetica,sans-serif;
+
   text-decoration: none;
   display: block;
   color: blue;
@@ -425,7 +419,7 @@
 }
=20
 div.redcontent a:hover {
-  font-family:helvetica,sans-serif;
+
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -433,7 +427,7 @@
=20
 }
 div.content a {
-  font-family:helvetica,sans-serif;
+
   text-decoration: none;
   display: block;
   color: blue;
@@ -443,7 +437,7 @@
=20
=20
 div.content a:hover {
-  font-family:helvetica,sans-serif;
+
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -487,7 +481,7 @@
=20
 }
 div.redcontent input.text {
-   font-family:helvetica,sans-serif;
+
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -496,7 +490,7 @@
   color:blue;
 }
 div.content input.text {
-   font-family:helvetica,sans-serif;
+
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -628,7 +622,7 @@
 	border: 2px outset #201e87;
 	background-color:#879ED4;
 	font-size: 110% ;
-	font-family: helvetica,sans-serif;
+
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -650,7 +644,7 @@
 	/*border:dotted 1px black;*/
 	border: 3px outset #201e87;
 	background-color: #879ED4;
-	font-family: helvetica,sans-serif;
+
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -672,7 +666,7 @@
 	overflow: auto;
 	background-color:#DFE7FF;
 	font-size:10px ;
-	font-family: helvetica,sans-serif;
+
 	font-style: normal;
 	font-weight: normal;
 	color: black;
@@ -798,7 +792,7 @@
 	font-weight: bold;
=20
 	text-decoration:none;
-	font-family: helvetica,sans-serif,arial;
+
 	background-image: url("image/bg-submit3.gif");
 	background-repeat: repeat-x;
 	background-position: left;
@@ -827,9 +821,9 @@
=20
 	}
 div.topmenu {
-	float:left;
-	width:100%;
-
+	width:80%;
+	margin-left:10%;
+=09
 }
=20
 h2.dossier {
@@ -873,9 +867,9 @@
=20
 }
 div.inner_box  {
-  background-color:#e4e7ed;
- font-size:10;
-  font-family:helvetica,sans-serif;
+  background-color:#dddddd;
+ font-size:12;
+
   padding:0;
   margin:0;
   overflow:hidden;
@@ -885,6 +879,7 @@
 left:10%;
=20
=20
+
 border:1px solid darkblue;
=20
 }
@@ -991,7 +986,7 @@
 {
   background-color:#F1E6E6;
  font-size:10;
-  font-family:helvetica,arial,sans-serif;
+
   padding:0;
   margin:0;
   overflow:hidden;
@@ -1040,9 +1035,9 @@
 #close_div
 {
  background-color:white;
- color:blue;
+ color:red;
  text-decoration:none;
- border:1px solid blue;
+ border:1px solid red;
  margin-left: 2px;
  margin-right:2px;
  margin-top:0px;



From MAILER-DAEMON Fri Nov 25 07:08:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTua7-0001Gz-Th
	for mharc-phpcompta-dev@gnu.org; Fri, 25 Nov 2011 07:08:39 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2011 13:13:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.48240.1322222918.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4474 - 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, 25 Nov 2011 12:08:38 -0000

Author: danydb
Date: 2011-11-25 13:13:34 +0100 (Fri, 25 Nov 2011)
New Revision: 4474

Modified:
   phpcompta/trunk/include/pref.inc.php
Log:
Fix bug


Modified: phpcompta/trunk/include/pref.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/pref.inc.php	2011-11-25 01:17:51 UTC (rev 447=
3)
+++ phpcompta/trunk/include/pref.inc.php	2011-11-25 12:13:34 UTC (rev 447=
4)
@@ -33,7 +33,7 @@
 //----------------------------------------------------------------------
 //
 global $g_user;
-$cn=3DDossier::connect();
+
 $g_user=3Dnew User($cn);
 $inside_dossier =3D false;
=20



From MAILER-DAEMON Fri Nov 25 11:11:08 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTyMm-0003tz-MB
	for mharc-phpcompta-dev@gnu.org; Fri, 25 Nov 2011 11:11:08 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2011 17:16:07 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.49019.1322237467.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4475 - 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: Fri, 25 Nov 2011 16:11:07 -0000

Author: danydb
Date: 2011-11-25 17:16:05 +0100 (Fri, 25 Nov 2011)
New Revision: 4475

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/sql/tva.sql
Log:
add both_sided VAT in table quant_purchase and quant_sold

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	2011-11-25 12:1=
3:34 UTC (rev 4474)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-25 16:1=
6:05 UTC (rev 4475)
@@ -341,7 +341,7 @@
             $tot_perso=3D0;
             $tot_tva_nd=3D0;
             $tot_tva_ndded=3D0;
-
+            $n_both=3D0;
             /* Save all the items without vat and no deductible vat and =
expense*/
             for ($i=3D0;$i< $nb_item;$i++)
             {
@@ -486,6 +486,8 @@
                 //-----
                 if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
+                    if ( $oTva->get_parameter("both_side")=3D=3D1) $n_bo=
th=3D$acc_amount->amount_vat;
+                       =20
                     $r=3D$this->db->exec_sql("select insert_quant_purcha=
se ".
                                            "(null".
                                            ",".$j_id.		 /* 2 */
@@ -498,7 +500,7 @@
                                            ",".$acc_amount->nd_vat.	    =
 /* 9 */
                                            ",".$acc_amount->nd_ded_vat. =
   /* 10 */
                                            ",".$acc_amount->amount_perso=
.  /* 11 */
-                                           ",'".$e_client."')");	     /*=
 12 */
+                                           ",'".$e_client."',".$n_both."=
)");	     /* 12 */
=20
                 }
                 else
@@ -515,7 +517,7 @@
                                            ",0".
                                            ",".$acc_amount->nd_ded_vat.
                                            ",".$acc_amount->amount_perso=
.
-                                           ",'".$e_client."')");
+                                           ",'".$e_client."',".$n_both."=
)");
=20
=20
                 }
@@ -673,7 +675,7 @@
                         $acc_operation->jrn=3D$p_jrn;
                         $acc_operation->type=3D'c';
                         $acc_operation->periode=3D$tperiode;
-						$acc_operation->insert_jrnx();
+                        $acc_operation->insert_jrnx();
                     }
=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	2011-11-25 12:13:34=
 UTC (rev 4474)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-25 16:16:05=
 UTC (rev 4475)
@@ -272,6 +272,7 @@
             $tot_amount=3D0;
             $tot_tva=3D0;
             $tot_debit=3D0;
+            $n_both=3D0;
             $this->db->start();
             /* Save all the items without vat */
             for ($i=3D0;$i< $nb_item;$i++)
@@ -332,6 +333,7 @@
                     else
                         $tva[$idx_tva]=3D$tva_item;
                     if ($oTva->get_parameter("both_side")=3D=3D0) $tot_t=
va=3Dround(bcadd($tva_item,$tot_tva),2);
+                    else $n_both=3D$tva_item;
                 }
=20
                 /* Save the stock */
@@ -361,7 +363,7 @@
                 if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
                     /* save into quant_sold */
-                    $r=3D$this->db->exec_sql("select insert_quant_sold (=
$1,$2,$3,$4,$5,$6,$7,$8)",
+                    $r=3D$this->db->exec_sql("select insert_quant_sold (=
$1,$2,$3,$4,$5,$6,$7,$8,$9)",
                                            array(null, /* 1 */
                                                  $j_id,	/* 2 */
                                                  ${'e_march'.$i} , /* 3 =
*/
@@ -369,12 +371,13 @@
                                                  round($amount,2),	     =
  /* 5 */
                                                  $tva_item,	       /* 6 =
*/
                                                  $idx_tva,	       /* 7 *=
/
-                                                 $e_client));      /* 8 =
*/
+                                                 $e_client,      /* 8 */
+                                                 $n_both));
=20
                 }
                 else
                 {
-                    $r=3D$this->db->exec_sql("select insert_quant_sold (=
$1,$2,$3,$4,$5,$6,$7,$8) ",
+                    $r=3D$this->db->exec_sql("select insert_quant_sold (=
$1,$2,$3,$4,$5,$6,$7,$8,$9) ",
                                            array(null, /* 1 */
                                                  $j_id,	  /* 2 */
                                                  ${'e_march'.$i}, /* 3 *=
/
@@ -382,7 +385,8 @@
                                                  $amount,		// 5
                                                  0,
                                                  null,
-                                                 $e_client));
+                                                 $e_client,
+                                                         0));
=20
                 }  // if ( $g_parameter->MY_TVA_USE=3D=3D'Y') {
             }// end loop : save all items
@@ -431,7 +435,6 @@
                     // if TVA is on both side, we deduce it immediately
                     if ( $oTva->get_parameter("both_side")=3D=3D1)
                     {
-		      echo "remove_tva";
                         $poste_vat=3D$oTva->get_side('d');
                         $cust_amount=3Dbcadd($tot_amount,$tot_tva);
                         $acc_operation=3Dnew Acc_Operation($this->db);
@@ -444,6 +447,7 @@
                         $acc_operation->periode=3D$tperiode;
 			$acc_operation->insert_jrnx();
 			$tot_debit=3Dbcadd($tot_debit,$value);
+                        $n_both=3D$value;
                     }
=20
=20

Modified: phpcompta/trunk/sql/tva.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/tva.sql	2011-11-25 12:13:34 UTC (rev 4474)
+++ phpcompta/trunk/sql/tva.sql	2011-11-25 16:16:05 UTC (rev 4475)
@@ -83,3 +83,76 @@
 end;
 $function$
 LANGUAGE plpgsql;
+
+alter table quant_purchase add qp_vat_sided number (20,4);
+alter table quant_sold add qs_vat_sided number (20,4);
+
+DROP FUNCTION comptaproc.insert_quant_purchase(text,numeric, character v=
arying,numeric,numeric,numeric,integer,,numeric,numeric,,numeric,numeric,=
character varying, numeric);
+-- procedure insert_quant_purchase
+CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(p_internal t=
ext, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price =
numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva=
 numeric, p_nd_tva_recup numeric, p_dep_priv numeric, p_client character =
varying,p_tva_sided numeric)
+ RETURNS void
+ LANGUAGE plpgsql
+AS $function$
+declare
+        fid_client integer;
+        fid_good   integer;
+begin
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                 fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim=
(p_fiche));
+        insert into quant_purchase
+                (qp_internal,
+                j_id,
+                qp_fiche,
+                qp_quantite,
+                qp_price,
+                qp_vat,
+                qp_vat_code,
+                qp_nd_amount,
+                qp_nd_tva,
+                qp_nd_tva_recup,
+                qp_supplier,
+                qp_dep_priv,
+                qp_vat_sided)
+        values
+                (p_internal,
+                p_j_id,
+                fid_good,
+                p_quant,
+                p_price,
+                p_vat,
+                p_vat_code,
+                p_nd_amount,
+                p_nd_tva,
+                p_nd_tva_recup,
+                fid_client,
+                p_dep_priv,
+                p_tva_sided);
+        return;
+end;
+ $function$
+
+DROP FUNCTION comptaproc.insert_quant_sold(text, numeric, character vary=
ing, numeric, numeric, numeric, integer, character varying);
+
+-- procedure insert_quant_sold
+CREATE OR REPLACE FUNCTION comptaproc.insert_quant_sold(p_internal text,=
 p_jid numeric, p_fiche character varying, p_quant numeric, p_price numer=
ic, p_vat numeric, p_vat_code integer, p_client character varying,p_tva_s=
ided numeric)
+ RETURNS void
+ LANGUAGE plpgsql
+AS $function$
+declare
+        fid_client integer;
+        fid_good   integer;
+begin
+
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_fiche));
+        insert into quant_sold
+                (qs_internal,j_id,qs_fiche,qs_quantite,qs_price,qs_vat,q=
s_vat_code,qs_client,qs_valid,qs_vat_sided)
+        values
+                (p_internal,p_jid,fid_good,p_quant,p_price,p_vat,p_vat_c=
ode,fid_client,'Y',p_tva_sided);
+        return;
+end;
+ $function$



From MAILER-DAEMON Fri Nov 25 11:15:18 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RTyQo-0004Ei-Ai
	for mharc-phpcompta-dev@gnu.org; Fri, 25 Nov 2011 11:15:18 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 25 Nov 2011 17:20:12 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.49026.1322237717.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4476 - 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, 25 Nov 2011 16:15:17 -0000

Author: danydb
Date: 2011-11-25 17:20:12 +0100 (Fri, 25 Nov 2011)
New Revision: 4476

Modified:
   phpcompta/trunk/sql/tva.sql
Log:
add both_sided VAT in table quant_purchase and quant_sold

Modified: phpcompta/trunk/sql/tva.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/tva.sql	2011-11-25 16:16:05 UTC (rev 4475)
+++ phpcompta/trunk/sql/tva.sql	2011-11-25 16:20:12 UTC (rev 4476)
@@ -7,6 +7,16 @@
 ----------------------------------------------------------------------
 drop FUNCTION comptaproc.tva_modify(integer, text, numeric, text, text);
=20
+
+
+alter table quant_purchase add qp_vat_sided number (20,4);
+alter table quant_sold add qs_vat_sided number (20,4);
+
+alter table quant_purchase alter qp_vat_sided set default 0.0;
+alter table quant_solde alter qs_vat_sided set default 0.0;
+comment on column quant_purchase.qp_vat_sided is 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
+comment on column quant_purchase.qp_vat_sided is 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
+
 CREATE OR REPLACE FUNCTION comptaproc.tva_modify(integer, text, numeric,=
 text, text,integer)
  RETURNS integer
 AS $function$
@@ -84,14 +94,12 @@
 $function$
 LANGUAGE plpgsql;
=20
-alter table quant_purchase add qp_vat_sided number (20,4);
-alter table quant_sold add qs_vat_sided number (20,4);
=20
+
 DROP FUNCTION comptaproc.insert_quant_purchase(text,numeric, character v=
arying,numeric,numeric,numeric,integer,,numeric,numeric,,numeric,numeric,=
character varying, numeric);
 -- procedure insert_quant_purchase
 CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(p_internal t=
ext, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price =
numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva=
 numeric, p_nd_tva_recup numeric, p_dep_priv numeric, p_client character =
varying,p_tva_sided numeric)
  RETURNS void
- LANGUAGE plpgsql
 AS $function$
 declare
         fid_client integer;
@@ -131,14 +139,14 @@
                 p_tva_sided);
         return;
 end;
- $function$
+ $function$=20
+ LANGUAGE plpgsql;
=20
 DROP FUNCTION comptaproc.insert_quant_sold(text, numeric, character vary=
ing, numeric, numeric, numeric, integer, character varying);
=20
 -- procedure insert_quant_sold
 CREATE OR REPLACE FUNCTION comptaproc.insert_quant_sold(p_internal text,=
 p_jid numeric, p_fiche character varying, p_quant numeric, p_price numer=
ic, p_vat numeric, p_vat_code integer, p_client character varying,p_tva_s=
ided numeric)
  RETURNS void
- LANGUAGE plpgsql
 AS $function$
 declare
         fid_client integer;
@@ -155,4 +163,5 @@
                 (p_internal,p_jid,fid_good,p_quant,p_price,p_vat,p_vat_c=
ode,fid_client,'Y',p_tva_sided);
         return;
 end;
- $function$
+ $function$=20
+ LANGUAGE plpgsql;



From MAILER-DAEMON Fri Nov 25 20:10:11 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RU6mR-00077C-T5
	for mharc-phpcompta-dev@gnu.org; Fri, 25 Nov 2011 20:10:11 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 26 Nov 2011 02:14:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.49808.1322269810.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4477 - in phpcompta/trunk: html html/admin
	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: Sat, 26 Nov 2011 01:10:09 -0000

Author: danydb
Date: 2011-11-26 02:14:51 +0100 (Sat, 26 Nov 2011)
New Revision: 4477

Added:
   phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.sql
   phpcompta/trunk/html/admin/sql/patch/upgrade97.sql
Modified:
   phpcompta/trunk/html/admin/setup.php
   phpcompta/trunk/html/admin/sql/patch/
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/ajax_get_profile.php
   phpcompta/trunk/include/anc_acc_table.inc.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_anc_account.php
   phpcompta/trunk/include/class_anc_group.php
   phpcompta/trunk/include/class_anc_group_operation.php
   phpcompta/trunk/include/class_calendar.php
   phpcompta/trunk/include/class_database.php
   phpcompta/trunk/include/class_follow_up.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/dossier.inc.php
   phpcompta/trunk/include/menu.inc.php
   phpcompta/trunk/include/modele.inc.php
   phpcompta/trunk/include/template/calendar.php
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/include/tva.inc.php
   phpcompta/trunk/sql/
   phpcompta/trunk/sql/backup-new-object.sh
   phpcompta/trunk/sql/object-6.0.sql
   phpcompta/trunk/sql/tmp_pcmn_ins.sql
   phpcompta/trunk/sql/tva.sql
   phpcompta/trunk/sql/upgrade.sql
Log:
fix small bugs and add SQL script for update

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-25 16:20:12 UTC (rev 447=
6)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-26 01:14:51 UTC (rev 447=
7)
@@ -19,7 +19,7 @@
         width:70%;
         margin-left: 15%;
         margin-right: 15%;
-           =20
+
 }
 h2.error {
 	color:red;
@@ -65,7 +65,7 @@
 	background-color:blue;
 	color:lightgrey;
 	}
-a {=20
+a {
 color:blue;
 padding:5px;
   font-size:15px;
@@ -188,7 +188,7 @@
   echo '<form method=3D"post">';
   echo '<h1 class=3D"info">Entrez les informations n&eacute;cessaires &a=
grave; phpcompta</h1>';
   require_once('config_file.php');
- =20
+
   echo config_file_form();
   echo HtmlInput::submit('save_config','Sauver la configuration');
   echo '</form>';
@@ -213,7 +213,7 @@
 echo "<h1>Configuration</h1>";
 ?>
 <h2>Info</h2>
-Vous utilisez le domaine <?php echo domaine; ?>=20
+Vous utilisez le domaine <?php echo domaine; ?>
 <h2>Php setting</h2>
 <?php
=20
@@ -330,7 +330,7 @@
=20
 if ( $version[0] < 8 ||
      ($version[0]=3D=3D'8' && $version[2]<4)
-     )=20
+     )
   {
 ?>
   <p><?=3D$failed?> Vous devez absolument utiliser au minimum une versio=
n 8.4 de PostGresql, si votre distribution n'en
@@ -369,7 +369,7 @@
   switch ($a['name']){
   case 'effective_cache_size':
     if ( $a['setting'] < 1000 ){
-     =20
+
       print '<p class=3D"warning">'.$failed.'Attention le param&egrave;t=
re effective_cache_size est de '.
 	$a['setting']." au lieu de 1000 </p>";
       $flag++;
@@ -461,6 +461,7 @@
   echo "<h3>Patching ".$db_row['dos_name'].'</h3>';
   $db=3Dnew Database($db_row['dos_id'],'dos');
   $db->apply_patch($db_row['dos_name']);
+  Dossier::synchro_admin($db_row['dos_id']);
  }
=20
 //----------------------------------------------------------------------


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


Added: phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.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/ac-upgrade13.sql	               =
         (rev 0)
+++ phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.sql	2011-11-26 01:1=
4:51 UTC (rev 4477)
@@ -0,0 +1,10 @@
+begin;
+-- Check: valid_state
+ ALTER TABLE audit_connect DROP CONSTRAINT valid_state;
+
+ALTER TABLE audit_connect ADD CONSTRAINT valid_state CHECK (ac_state =3D=
 'FAIL'::text OR ac_state =3D 'SUCCESS'::text or ac_state=3D'AUDIT');
+-- run to the account_repository
+insert into theme values ('EPad','style-epad.css',null);
+
+update version set val=3D14;
+commit;

Added: phpcompta/trunk/html/admin/sql/patch/upgrade97.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/upgrade97.sql	                  =
      (rev 0)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade97.sql	2011-11-26 01:14:5=
1 UTC (rev 4477)
@@ -0,0 +1,963 @@
+begin;
+drop table public.import_tmp;
+drop table public.format_csv_banque;
+insert into parameter values ('MY_ALPHANUM','N');
+update PARAMETER set pr_value=3D'N' where pr_id=3D'MY_CHECK_PERIODE';
+delete from user_sec_act where ua_act_id not in (800,805,910);
+delete from action where ac_id not in (800,805,910);
+insert into action (ac_id,ac_description, ac_module, ac_code) values(102=
0,'Effacer les documents du suivi','followup','RMDOC');
+insert into action (ac_id,ac_description, ac_module, ac_code) values(101=
0,'Voir les documents du suivi','followup','VIEWDOC');
+insert into action (ac_id,ac_description, ac_module, ac_code) values(105=
0,'Modifier le type de document','followup','PARCATDOC');
+create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
+
+CREATE OR REPLACE FUNCTION comptaproc.account_alphanum()
+  RETURNS boolean AS
+$BODY$
+declare
+	l_auto bool;
+begin
+	l_auto :=3D true;
+	select pr_value into l_auto from parameter where pr_id=3D'MY_ALPHANUM';
+	if l_auto =3D 'N' or l_auto is null then
+		l_auto:=3Dfalse;
+	end if;
+	return l_auto;
+end;
+$BODY$
+  LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION comptaproc.account_compute(p_f_id integer)
+  RETURNS account_type AS
+$BODY$
+declare
+	class_base fiche_def.fd_class_base%type;
+	maxcode numeric;
+	sResult account_type;
+	bAlphanum bool;
+	sName text;
+begin
+	select fd_class_base into class_base
+	from
+		fiche_def join fiche using (fd_id)
+	where
+		f_id=3Dp_f_id;
+	raise notice 'account_compute class base %',class_base;
+	bAlphanum :=3D account_alphanum();
+	if bAlphanum =3D false  then
+		select count (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent=
 =3D class_base;
+		if maxcode =3D 0	then
+			maxcode:=3Dclass_base::numeric;
+		else
+			select max (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent =
=3D class_base;
+			maxcode:=3Dmaxcode::numeric;
+		end if;
+		if maxcode::text =3D class_base then
+			maxcode:=3Dclass_base::numeric*1000;
+		end if;
+		maxcode:=3Dmaxcode+1;
+		raise notice 'account_compute Max code %',maxcode;
+		sResult:=3Dmaxcode::account_type;
+	else
+		-- if alphanum, use name
+		select ad_value into sName from fiche_detail where f_id=3Dp_f_id and a=
d_id=3D1;
+		if sName is null then
+			raise exception 'Cannot compute an accounting without the name of the=
 card for %',p_f_id;
+		end if;
+		sResult :=3D class_base||sName;
+	end if;
+	return sResult;
+end;
+$BODY$
+LANGUAGE plpgsql;
+ =20
+DROP FUNCTION comptaproc.account_insert(integer, text);
+
+CREATE OR REPLACE FUNCTION comptaproc.account_insert(p_f_id integer, p_a=
ccount text)
+  RETURNS text  AS
+$BODY$
+declare
+	nParent tmp_pcmn.pcm_val_parent%type;
+	sName varchar;
+	sNew tmp_pcmn.pcm_val%type;
+	bAuto bool;
+	nFd_id integer;
+	sClass_Base fiche_def.fd_class_base%TYPE;
+	nCount integer;
+	first text;
+	second text;
+begin
+
+	if p_account is not null and length(trim(p_account)) !=3D 0 then
+	-- if there is coma in p_account, treat normally
+		if position (',' in p_account) =3D 0 then
+			raise info 'p_account is not empty';
+				select count(*)  into nCount from tmp_pcmn where pcm_val=3Dp_account=
::account_type;
+				raise notice 'found in tmp_pcm %',nCount;
+				if nCount !=3D0  then
+					raise info 'this account exists in tmp_pcmn ';
+					perform attribut_insert(p_f_id,5,p_account);
+				   else
+				       -- account doesn't exist, create it
+					select ad_value into sName from
+						fiche_detail
+					where
+					ad_id=3D1 and f_id=3Dp_f_id;
+
+					nParent:=3Daccount_parent(p_account::account_type);
+					insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_acco=
unt::account_type,sName,nParent);
+					perform attribut_insert(p_f_id,5,p_account);
+
+				end if;
+		else
+		raise info 'presence of a comma';
+		-- there is 2 accounts separated by a comma
+		first :=3D split_part(p_account,',',1);
+		second :=3D split_part(p_account,',',2);
+		-- check there is no other coma
+		raise info 'first value % second value %', first, second;
+
+		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
+			raise exception 'Too many comas, invalid account';
+		end if;
+		perform attribut_insert(p_f_id,5,p_account);
+		end if;
+	else
+	raise info 'p_account is  empty';
+		select fd_id into nFd_id from fiche where f_id=3Dp_f_id;
+		bAuto:=3D account_auto(nFd_id);
+
+		select fd_class_base into sClass_base from fiche_def where fd_id=3DnFd=
_id;
+raise info 'sClass_Base : %',sClass_base;
+		if bAuto =3D true and sClass_base similar to '[[:digit:]]*'  then
+			raise info 'account generated automatically';
+			sNew:=3Daccount_compute(p_f_id);
+			raise info 'sNew %', sNew;
+			select ad_value into sName from
+				fiche_detail
+			where
+				ad_id=3D1 and f_id=3Dp_f_id;
+			nParent:=3Daccount_parent(sNew);
+			sNew :=3D account_add  (sNew,sName);
+			perform attribut_insert(p_f_id,5,sNew);
+
+		else
+		-- if there is an account_base then it is the default
+		      select fd_class_base::account_type into sNew from fiche_def join=
 fiche using (fd_id) where f_id=3Dp_f_id;
+			if sNew is null or length(trim(sNew)) =3D 0 then
+				raise notice 'count is null';
+				 perform attribut_insert(p_f_id,5,null);
+			else
+				 perform attribut_insert(p_f_id,5,sNew);
+			end if;
+		end if;
+	end if;
+
+return 0;
+end;
+$BODY$
+LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION comptaproc.account_update(p_f_id integer, p_a=
ccount account_type)
+  RETURNS integer AS
+$BODY$
+declare
+	nMax fiche.f_id%type;
+	nCount integer;
+	nParent tmp_pcmn.pcm_val_parent%type;
+	sName varchar;
+	first text;
+	second text;
+begin
+
+	if length(trim(p_account)) !=3D 0 then
+		-- 2 accounts in card separated by comma=20
+		if position (',' in p_account) =3D 0 then
+			select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_account;
+			if nCount =3D 0 then
+			select ad_value into sName from
+				fiche_detail
+				where
+				ad_id=3D1 and f_id=3Dp_f_id;
+			nParent:=3Daccount_parent(p_account);
+			insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_accoun=
t,sName,nParent);
+		end if;
+		else
+		raise info 'presence of a comma';
+		-- there is 2 accounts separated by a comma
+		first :=3D split_part(p_account,',',1);
+		second :=3D split_part(p_account,',',2);
+		-- check there is no other coma
+		raise info 'first value % second value %', first, second;
+
+		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
+			raise exception 'Too many comas, invalid account';
+		end if;
+		-- check that both account are in PCMN
+	=09
+		end if;
+	else
+		-- account is null
+		update fiche_detail set ad_value=3Dnull where f_id=3Dp_f_id and ad_id=3D=
5 ;
+	end if;
+=09
+	update fiche_detail set ad_value=3Dp_account where f_id=3Dp_f_id and ad=
_id=3D5 ;
+
+return 0;
+end;
+$BODY$
+LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION comptaproc.format_account(p_account account_t=
ype)
+  RETURNS account_type AS
+$BODY$
+
+declare
+
+sResult account_type;
+
+begin
+sResult :=3D lower(p_account);
+
+sResult :=3D translate(sResult,'=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','eeeeaaaiiuuuoo');
+sResult :=3D translate(sResult,' $=E2=82=AC=C2=B5=C2=A3%.+-/\!(){}(),;_&=
|"#''^','');
+
+if not sResult similar to '^[[:alnum:]_]+$' then
+	raise exception 'Invalid character in %',p_account;
+end if;
+
+return upper(sResult);
+
+end;
+$BODY$
+LANGUAGE plpgsql;
+ =20
+COMMENT ON FUNCTION comptaproc.format_account(account_type) IS 'format t=
he accounting :
+- upper case
+- remove space and special char.
+';
+
+CREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_alphanum_ins_upd()
+  RETURNS trigger AS
+$BODY$
+declare
+   r_record tmp_pcmn%ROWTYPE;
+begin
+r_record :=3D NEW;
+r_record.pcm_val:=3Dformat_account(NEW.pcm_val);
+
+return r_record;
+end;
+$BODY$
+LANGUAGE plpgsql;
+CREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_ins()
+  RETURNS trigger AS
+$BODY$
+declare
+   r_record tmp_pcmn%ROWTYPE;
+begin
+r_record :=3D NEW;
+if  length(trim(r_record.pcm_type))=3D0 or r_record.pcm_type is NULL the=
n=20
+   r_record.pcm_type:=3Dfind_pcm_type(NEW.pcm_val);
+   return r_record;
+end if;
+return NEW;
+end;
+$BODY$
+LANGUAGE plpgsql;
+
+CREATE TRIGGER t_tmp_pcm_alphanum_ins_upd
+  BEFORE INSERT OR UPDATE
+  ON tmp_pcmn
+  FOR EACH ROW
+  EXECUTE PROCEDURE comptaproc.tmp_pcmn_alphanum_ins_upd();
+
+DROP FUNCTION comptaproc.account_add(account_type, character varying);
+
+CREATE OR REPLACE FUNCTION comptaproc.account_add(p_id account_type, p_n=
ame character varying)
+  RETURNS text AS
+$BODY$
+declare
+	nParent tmp_pcmn.pcm_val_parent%type;
+	nCount integer;
+	sReturn text;
+begin
+	sReturn:=3D format_account(p_id);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3DsReturn;
+	if nCount =3D 0 then
+		nParent=3Daccount_parent(p_id);
+		insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent)
+			values (p_id, p_name,nParent) returning pcm_val into sReturn;
+	end if;
+return sReturn;
+end ;
+$BODY$
+  LANGUAGE plpgsql;
+
+CREATE TABLE menu_ref (
+    me_code text NOT NULL,
+    me_menu text,
+    me_file text,
+    me_url text,
+    me_description text,
+    me_parameter text,
+    me_javascript text,
+    me_type character varying(2)
+);
+COMMENT ON COLUMN menu_ref.me_code IS 'Menu Code ';
+COMMENT ON COLUMN menu_ref.me_menu IS 'Label to display';
+COMMENT ON COLUMN menu_ref.me_file IS 'if not empty file to include';
+COMMENT ON COLUMN menu_ref.me_url IS 'url ';
+COMMENT ON COLUMN menu_ref.me_type IS 'ME for menu
+PR for Printing
+SP for special meaning (ex: return to line)
+PL for plugin';
+
+CREATE TABLE profile (
+    p_name text NOT NULL,
+    p_id integer NOT NULL,
+    p_desc text,
+    with_calc boolean DEFAULT true,
+    with_direct_form boolean DEFAULT true
+);
+
+COMMENT ON TABLE profile IS 'Available profile ';
+COMMENT ON COLUMN profile.p_name IS 'Name of the profile';
+COMMENT ON COLUMN profile.p_desc IS 'description of the profile';
+COMMENT ON COLUMN profile.with_calc IS 'show the calculator';
+COMMENT ON COLUMN profile.with_direct_form IS 'show the direct form';
+
+CREATE TABLE profile_menu (
+    pm_id integer NOT NULL,
+    me_code text,
+    me_code_dep text,
+    p_id integer,
+    p_order integer,
+    p_type_display text NOT NULL,
+    pm_default integer
+);
+COMMENT ON TABLE profile_menu IS 'Join  between the profile and the menu=
 ';
+COMMENT ON COLUMN profile_menu.me_code_dep IS 'menu code dependency';
+COMMENT ON COLUMN profile_menu.p_id IS 'link to profile';
+COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu';
+COMMENT ON COLUMN profile_menu.pm_default IS 'default menu';
+COMMENT ON COLUMN profile_menu.p_type_display IS 'M is a module
+E is a menu
+S is a select (for plugin)';
+
+
+CREATE SEQUENCE profile_menu_pm_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+ALTER SEQUENCE profile_menu_pm_id_seq OWNED BY profile_menu.pm_id;
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 778, true);
+
+CREATE TABLE profile_menu_type (
+    pm_type text NOT NULL,
+    pm_desc text
+);
+
+CREATE SEQUENCE profile_p_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+ALTER SEQUENCE profile_p_id_seq OWNED BY profile.p_id;
+
+SELECT pg_catalog.setval('profile_p_id_seq', 11, true);
+
+CREATE TABLE profile_user (
+    user_name text NOT NULL,
+    pu_id integer NOT NULL,
+    p_id integer
+);
+
+COMMENT ON TABLE profile_user IS 'Contains the available profile for use=
rs';
+COMMENT ON COLUMN profile_user.user_name IS 'fk to available_user : logi=
n';
+COMMENT ON COLUMN profile_user.p_id IS 'fk to profile';
+
+CREATE SEQUENCE profile_user_pu_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+ALTER SEQUENCE profile_user_pu_id_seq OWNED BY profile_user.pu_id;
+SELECT pg_catalog.setval('profile_user_pu_id_seq', 6, true);
+CREATE VIEW v_all_menu AS
+    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript, mr.me_type, pm.p_id, mr.=
me_description FROM (((profile_menu pm JOIN profile_user pu ON ((pu.p_id =
=3D pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr=
 USING (me_code)) ORDER BY pm.p_order;
+ALTER TABLE profile ALTER COLUMN p_id SET DEFAULT nextval('profile_p_id_=
seq'::regclass);
+ALTER TABLE profile_menu ALTER COLUMN pm_id SET DEFAULT nextval('profile=
_menu_pm_id_seq'::regclass);
+ALTER TABLE profile_user ALTER COLUMN pu_id SET DEFAULT nextval('profile=
_user_pu_id_seq'::regclass);
+INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 'Nouvel achat ou d=C3=A9pense', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCHOP', 'Historique', 'anc_history.inc.ph=
p', NULL, 'Historique des imputations analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGL', 'Grand''Livre', 'anc_great_ledger.=
inc.php', NULL, 'Grand livre d''plan analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBS', 'Balance simple', 'anc_balance_sim=
ple.inc.php', NULL, 'Balance simple des imputations analytiques', NULL, N=
ULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBC2', 'Balance crois=C3=A9e double', 'a=
nc_balance_double.inc.php', NULL, 'Balance double crois=C3=A9es des imput=
ations analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCTAB', 'Tableau', 'anc_acc_table.inc.php=
', NULL, 'Tableau li=C3=A9 =C3=A0 la comptabilit=C3=A9', NULL, NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('ANCBCC', 'Balance Analytique/comptabilit=C3=
=A9', 'anc_acc_balance.inc.php', NULL, 'Lien entre comptabilit=C3=A9 et C=
omptabilit=C3=A9 analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGR', 'Groupe', 'anc_group_balance.inc.p=
hp', NULL, 'Balance par groupe', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CSV:AncGrandLivre', 'Impression Grand-Livr=
e', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, 'Recherc=
he', NULL, 'popup_recherche()', 'ME');
+INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, 'Param=C3=A8=
tres divers', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, 'Conf=
ig. de la tva', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, 'Fi=
che', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, 'S=
tock', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MOD', 'Menu et profile', NULL, NULL, 'Menu=
 ', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPRO', 'Profile', 'profile.inc.php', NUL=
L, 'Configuration profile', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPAY', 'Moyen de paiement', 'payment_mid=
dle.inc.php', NULL, 'Config. des m=C3=A9thodes de paiement', NULL, NULL, =
'ME');
+INSERT INTO menu_ref VALUES ('CFGACC', 'Poste', 'poste.inc.php', NULL, '=
Config. poste comptable de base', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 'Nouvelle vente ou recette', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, 'Configuration des menus et plugins', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PDF:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:sec', 'Export S=C3=A9curit=C3=A9', NUL=
L, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncList', 'Export Comptabilit=C3=A9 an=
alytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique balance simple', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('PDF:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:histo', 'Export Historique', NULL, NUL=
L, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
+INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, 'Suivi fournisseur', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LET', 'Lettrage', NULL, NULL, 'Lettrage', =
NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, 'OD analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, 'V=C3=A9rification de la comptabilit=C3=A9', NULL, NU=
LL, 'ME');
+INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, 'Cr=C3=A9ation de rapport', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, 'Ecriture d''ouverture', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, 'Historique achat', 'ledger_type=3DACH', NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, 'Suivi, courrier, devis', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, 'Pr=C3=A9vision', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('EXT', 'Extension', 'extension_choice.inc.p=
hp', NULL, 'Extensions (plugins)', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGDOC', 'Document', 'document_modele.inc.=
php', NULL, 'Config. mod=C3=A8le de document', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGLED', 'journaux', 'cfgledger.inc.php', =
NULL, 'Configuration des journaux', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, 'Gestion des op=C3=A9rations pr=C3=A9d=C3=A9finifies', =
NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, 'Menu ava=
nc=C3=A9', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, 'Mo=
dule comptabilit=C3=A9 analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGSEC', 'S=C3=A9curit=C3=A9', 'param_sec.=
inc.php', NULL, 'configuration de la s=C3=A9curit=C3=A9', NULL, NULL, 'ME=
');
+INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, 'Plan analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, 'Groupe analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, 'Historique op=C3=A9rations dive=
rses', 'ledger_type=3DODS', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, '=
Menu ventes et recettes', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, 'Pr=C3=A9f=C3=A9rence', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, 'Historique', 'ledger_type=3DALL', NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, 'Menu F=
inancier', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FIMP', 'Historique financier', 'history_op=
eration.inc.php', NULL, 'Historique financier', 'ledger_type=3DFIN', NULL=
, 'ME');
+INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, 'Menu achat=
', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, 'Menu op=C3=A9rations diverses', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, 'Nouvelle op=C3=A9rations diverses', NULL, NULL, 'ME'=
);
+INSERT INTO menu_ref VALUES ('FREC', 'Rapprochement', 'compta_fin_rec.in=
c.php', NULL, 'Rapprochement bancaire', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, 'Suivi administration, banque', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, 'Nouvel extrait bancaire', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGATCARD', 'Attribut de fiche', 'card_att=
r.inc.php', NULL, 'Gestion des mod=C3=A8les de fiches', NULL, NULL, 'ME')=
;
+INSERT INTO menu_ref VALUES ('FSALDO', 'Soldes', 'compta_fin_saldo.inc.p=
hp', NULL, 'Solde des comptes en banques, caisse...', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, 'Reche=
rche', NULL, 'search_reconcile()', 'ME');
+INSERT INTO menu_ref VALUES ('LETACC', 'Lettrage par Poste', 'lettering.=
account.inc.php', NULL, 'lettrage par poste comptable', NULL, NULL, 'ME')=
;
+INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, 'Balance par cat=C3=A9gorie de fiche', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, '=
Suivi client', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, 'Gestion cat=C3=A9gorie de fiche', NULL, NULL, '=
ME');
+INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, 'Config. cat=C3=A9gorie de documents', NUL=
L, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, 'Historique des ventes', 'ledger_type=3DVEN', NULL,=
 'ME');
+INSERT INTO menu_ref VALUES ('LETCARD', 'Lettrage par Fiche', 'lettering=
.card.inc.php', NULL, 'Lettrage par fiche', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, 'Config. du plan comptable', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', 'So=
rtie', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, 'Tableau de bord', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
'Module comptabilit=C3=A9', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, 'Module g=
estion', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, 'Mod=
ule param=C3=A8tre', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTJRN', 'Historique', 'impress_jrn.inc.=
php', NULL, 'Impression historique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREC', 'Rapprochement', 'impress_rec.i=
nc.php', NULL, 'Impression des rapprochements', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTPOSTE', 'Poste', 'impress_poste.inc.p=
hp', NULL, 'Impression du d=C3=A9tail d''un poste comptable', NULL, NULL,=
 'ME');
+INSERT INTO menu_ref VALUES ('PRINTREPORT', 'Rapport', 'impress_rapport.=
inc.php', NULL, 'Impression de rapport', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBILAN', 'Bilan', 'impress_bilan.inc.p=
hp', NULL, 'Impression de bilan', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTGL', 'Grand Livre', 'impress_gl_compt=
es.inc.php', NULL, 'Impression du grand livre', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTBAL', 'Balance', 'balance.inc.php', N=
ULL, 'Impression des balances comptables', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, 'Impression cat=C3=A9gorie de fiches', NULL,=
 NULL, 'ME');
+INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, 'Menu im=
pression', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ACCESS', 'Accueil', NULL, 'user_login.php'=
, 'Accueil', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', NULL, NULL, 'Impres=
sion compta. analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('new_line', 'saut de ligne', NULL, NULL, 'S=
aut de ligne', NULL, NULL, 'SP');
+
+INSERT INTO profile VALUES ('Administrateur', 1, 'Profil par d=C3=A9faut=
 pour les adminstrateurs', true, true);
+INSERT INTO profile VALUES ('Utilisateur', 2, 'Profil par d=C3=A9faut po=
ur les utilisateurs', true, true);
+INSERT INTO profile_menu VALUES (59, 'CFGPAY', 'DIVPARM', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (68, 'CFGATCARD', 'DIVPARM', 1, 9, 'E', =
0);
+INSERT INTO profile_menu VALUES (61, 'CFGACC', 'DIVPARM', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (651, 'ANCHOP', 'ANCIMP', 1, 10, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', 0);
+INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (652, 'ANCGL', 'ANCIMP', 1, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (653, 'ANCBS', 'ANCIMP', 1, 30, 'E', 0);
+INSERT INTO profile_menu VALUES (654, 'ANCBC2', 'ANCIMP', 1, 40, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (655, 'ANCTAB', 'ANCIMP', 1, 50, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (656, 'ANCBCC', 'ANCIMP', 1, 60, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (657, 'ANCGR', 'ANCIMP', 1, 70, 'E', 0);
+INSERT INTO profile_menu VALUES (658, 'CSV:AncGrandLivre', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (662, 'new_line', NULL, 1, 35, 'M', 0);
+INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
0);
+INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (526, 'PRINTGL', 'PRINT', 1, 20, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (23, 'LET', 'COMPTA', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (523, 'PRINTBAL', 'PRINT', 1, 50, 'E', 0=
);
+INSERT INTO profile_menu VALUES (529, 'PRINTREPORT', 'PRINT', 1, 85, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 0);
+INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', 0);
+INSERT INTO profile_menu VALUES (527, 'PRINTJRN', 'PRINT', 1, 10, 'E', 0=
);
+INSERT INTO profile_menu VALUES (530, 'PRINTREC', 'PRINT', 1, 100, 'E', =
0);
+INSERT INTO profile_menu VALUES (524, 'PRINTBILAN', 'PRINT', 1, 90, 'E',=
 0);
+INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', 0);
+INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E', 0=
);
+INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E', 0);
+INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E', 0);
+INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E', 0);
+INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 25, 'M', 0);
+INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', 0);
+INSERT INTO profile_menu VALUES (35, 'PRINT', 'GESTION', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (126, 'CSV:postedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 45, 'M', 0);
+INSERT INTO profile_menu VALUES (18, 'MENUODS', 'COMPTA', 1, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (88, 'ODS', 'MENUODS', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (89, 'ODSIMP', 'MENUODS', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (73, 'CFGDOC', 'PARAM', 1, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (74, 'CFGLED', 'PARAM', 1, 9, 'E', 0);
+INSERT INTO profile_menu VALUES (71, 'CFGSEC', 'PARAM', 1, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (82, 'EXT', NULL, 1, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (95, 'FREC', 'MENUFIN', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (94, 'FSALDO', 'MENUFIN', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (27, 'LETACC', 'LET', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (24, 'LETCARD', 'LET', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (167, 'MOD', 'PARAM', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (93, 'FIMP', 'MENUFIN', 1, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', 0);
+INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (129, 'PDF:fichedetail', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (130, 'CSV:fiche_balance', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (131, 'PDF:fiche_balance', NULL, 1, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (132, 'CSV:report', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (133, 'PDF:report', NULL, 1, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (134, 'CSV:fiche', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (135, 'PDF:fiche', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (136, 'CSV:glcompte', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (137, 'PDF:glcompte', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (138, 'PDF:sec', NULL, 1, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (139, 'CSV:AncList', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (140, 'CSV:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (141, 'PDF:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (142, 'CSV:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (143, 'PDF:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (144, 'CSV:balance', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (145, 'PDF:balance', NULL, 1, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (146, 'CSV:AncTable', NULL, 1, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (147, 'CSV:AncAccList', NULL, 1, NULL, '=
P', 0);
+INSERT INTO profile_menu VALUES (148, 'CSV:AncBalGroup', NULL, 1, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (528, 'PRINTPOSTE', 'PRINT', 1, 30, 'E',=
 0);
+INSERT INTO profile_menu VALUES (525, 'PRINTCARD', 'PRINT', 1, 40, 'E', =
0);
+INSERT INTO profile_menu VALUES (1, 'DASHBOARD', NULL, 1, 10, 'M', 1);
+INSERT INTO profile_menu VALUES (172, 'CFGPRO', 'MOD', 1, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MOD', 1, NULL, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (663, 'CFGPAY', 'DIVPARM', 2, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (664, 'CFGATCARD', 'DIVPARM', 2, 9, 'E',=
 0);
+INSERT INTO profile_menu VALUES (665, 'CFGACC', 'DIVPARM', 2, 6, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (668, 'ANCHOP', 'ANCIMP', 2, 10, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (669, 'COMPTA', NULL, 2, 40, 'M', 0);
+INSERT INTO profile_menu VALUES (672, 'ANCGL', 'ANCIMP', 2, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (673, 'CFGTVA', 'DIVPARM', 2, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (674, 'ANCBS', 'ANCIMP', 2, 30, 'E', 0);
+INSERT INTO profile_menu VALUES (675, 'ANCBC2', 'ANCIMP', 2, 40, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (676, 'ANCTAB', 'ANCIMP', 2, 50, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (677, 'ANCBCC', 'ANCIMP', 2, 60, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (678, 'ANCGR', 'ANCIMP', 2, 70, 'E', 0);
+INSERT INTO profile_menu VALUES (679, 'CSV:AncGrandLivre', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (680, 'new_line', NULL, 2, 35, 'M', 0);
+INSERT INTO profile_menu VALUES (681, 'CFGCATDOC', 'DIVPARM', 2, 8, 'E',=
 0);
+INSERT INTO profile_menu VALUES (683, 'PRINTGL', 'PRINT', 2, 20, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (684, 'LET', 'COMPTA', 2, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (685, 'PRINTBAL', 'PRINT', 2, 50, 'E', 0=
);
+INSERT INTO profile_menu VALUES (686, 'PRINTREPORT', 'PRINT', 2, 85, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (688, 'PLANANC', 'ANC', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (689, 'CFGCARDCAT', 'DIVPARM', 2, 7, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (690, 'ANCODS', 'ANC', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (717, 'CSV:ledger', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (718, 'PDF:ledger', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (719, 'PRINT', 'COMPTA', 2, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (720, 'CSV:postedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (721, 'MENUACH', 'COMPTA', 2, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (722, 'ACHIMP', 'MENUACH', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (723, 'GESTION', NULL, 2, 45, 'M', 0);
+INSERT INTO profile_menu VALUES (724, 'MENUODS', 'COMPTA', 2, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (725, 'ODS', 'MENUODS', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (726, 'ODSIMP', 'MENUODS', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (727, 'ANC', NULL, 2, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (728, 'VENMENU', 'COMPTA', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (729, 'VEN', 'VENMENU', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (730, 'VENIMP', 'VENMENU', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (731, 'FIN', 'MENUFIN', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (735, 'EXT', NULL, 2, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (736, 'FREC', 'MENUFIN', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (737, 'FSALDO', 'MENUFIN', 2, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (738, 'LETACC', 'LET', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (691, 'ANCGROUP', 'ANC', 2, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (692, 'ANCIMP', 'ANC', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (694, 'PRINTJRN', 'PRINT', 2, 10, 'E', 0=
);
+INSERT INTO profile_menu VALUES (695, 'PRINTREC', 'PRINT', 2, 100, 'E', =
0);
+INSERT INTO profile_menu VALUES (696, 'PRINTBILAN', 'PRINT', 2, 90, 'E',=
 0);
+INSERT INTO profile_menu VALUES (697, 'PREFERENCE', NULL, 2, 15, 'M', 0)=
;
+INSERT INTO profile_menu VALUES (698, 'CUST', 'GESTION', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (699, 'SUPPL', 'GESTION', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (700, 'ADM', 'GESTION', 2, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (701, 'CARD', 'GESTION', 2, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (702, 'STOCK', 'GESTION', 2, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (703, 'FORECAST', 'GESTION', 2, 7, 'E', =
0);
+INSERT INTO profile_menu VALUES (704, 'FOLLOW', 'GESTION', 2, 8, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (705, 'VERIFBIL', 'ADV', 2, 21, 'E', 0);
+INSERT INTO profile_menu VALUES (706, 'STOCK', 'ADV', 2, 22, 'E', 0);
+INSERT INTO profile_menu VALUES (707, 'PREDOP', 'ADV', 2, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (708, 'OPEN', 'ADV', 2, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (709, 'REPORT', 'ADV', 2, 25, 'E', 0);
+INSERT INTO profile_menu VALUES (710, 'CARD', 'COMPTA', 2, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (711, 'HIST', 'COMPTA', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (712, 'ADV', 'COMPTA', 2, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (713, 'ACCESS', NULL, 2, 25, 'M', 0);
+INSERT INTO profile_menu VALUES (714, 'CSV:histo', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (715, 'LOGOUT', NULL, 2, 30, 'M', 0);
+INSERT INTO profile_menu VALUES (716, 'PRINT', 'GESTION', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (739, 'LETCARD', 'LET', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (742, 'MENUFIN', 'COMPTA', 2, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (743, 'FIMP', 'MENUFIN', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (744, 'SEARCH', NULL, 2, 60, 'M', 0);
+INSERT INTO profile_menu VALUES (745, 'ACH', 'MENUACH', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (746, 'PDF:postedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (747, 'CSV:fichedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (748, 'PDF:fichedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (749, 'CSV:fiche_balance', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (750, 'PDF:fiche_balance', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (751, 'CSV:report', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (752, 'PDF:report', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (753, 'CSV:fiche', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (754, 'PDF:fiche', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (755, 'CSV:glcompte', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (756, 'PDF:glcompte', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (757, 'PDF:sec', NULL, 2, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (758, 'CSV:AncList', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (759, 'CSV:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (760, 'PDF:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (761, 'CSV:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (762, 'PDF:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (763, 'CSV:balance', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (764, 'PDF:balance', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (765, 'CSV:AncTable', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (766, 'CSV:AncAccList', NULL, 2, NULL, '=
P', 0);
+INSERT INTO profile_menu VALUES (767, 'CSV:AncBalGroup', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (768, 'OTH:Bilan', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (769, 'PRINTPOSTE', 'PRINT', 2, 30, 'E',=
 0);
+INSERT INTO profile_menu VALUES (770, 'PRINTCARD', 'PRINT', 2, 40, 'E', =
0);
+INSERT INTO profile_menu VALUES (777, 'CFGPRO', 'MOD', 2, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (778, 'CFGMENU', 'MOD', 2, NULL, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (772, 'DASHBOARD', NULL, 2, 10, 'M', 1);
+INSERT INTO profile_menu_type VALUES ('P', 'Impression');
+INSERT INTO profile_menu_type VALUES ('S', 'Extension');
+INSERT INTO profile_menu_type VALUES ('E', 'Menu');
+INSERT INTO profile_menu_type VALUES ('M', 'Module');
+INSERT INTO profile_user VALUES ('phpcompta', 1, 1);
+ALTER TABLE ONLY menu_ref    ADD CONSTRAINT menu_ref_pkey PRIMARY KEY (m=
e_code);
+ALTER TABLE ONLY profile_menu    ADD CONSTRAINT profile_menu_pkey PRIMAR=
Y KEY (pm_id);
+ALTER TABLE ONLY profile_menu_type    ADD CONSTRAINT profile_menu_type_p=
key PRIMARY KEY (pm_type);
+ALTER TABLE ONLY profile    ADD CONSTRAINT profile_pkey PRIMARY KEY (p_i=
d);
+ALTER TABLE ONLY profile_user    ADD CONSTRAINT profile_user_pkey PRIMAR=
Y KEY (pu_id);
+ALTER TABLE ONLY profile_user    ADD CONSTRAINT profile_user_user_name_k=
ey UNIQUE (user_name, p_id);
+CREATE INDEX fki_profile_menu_me_code ON profile_menu USING btree (me_co=
de);
+CREATE INDEX fki_profile_menu_profile ON profile_menu USING btree (p_id)=
;
+CREATE INDEX fki_profile_menu_type_fkey ON profile_menu USING btree (p_t=
ype_display);
+ALTER TABLE ONLY profile_menu    ADD CONSTRAINT profile_menu_me_code_fke=
y FOREIGN KEY (me_code) REFERENCES menu_ref(me_code) ON UPDATE CASCADE ON=
 DELETE CASCADE;
+ALTER TABLE ONLY profile_menu    ADD CONSTRAINT profile_menu_p_id_fkey F=
OREIGN KEY (p_id) REFERENCES profile(p_id) ON UPDATE CASCADE ON DELETE CA=
SCADE;
+ALTER TABLE ONLY profile_menu    ADD CONSTRAINT profile_menu_type_fkey F=
OREIGN KEY (p_type_display) REFERENCES profile_menu_type(pm_type);
+ALTER TABLE ONLY profile_user    ADD CONSTRAINT profile_user_p_id_fkey F=
OREIGN KEY (p_id) REFERENCES profile(p_id) ON UPDATE CASCADE ON DELETE CA=
SCADE;
+insert into menu_ref(me_code,me_menu,me_file,me_description,me_type,me_p=
arameter) select ex_code,ex_name,ex_file,ex_desC,'PL','plugin_code=3D'||e=
x_code from extension;
+insert into profile_menu (me_code,me_code_dep,p_id,p_type_display) selec=
t me_code,'EXTENSION',1,'S' from menu_ref where me_type=3D'PL';
+create type menu_tree as (code text,description text);
+
+create or replace function comptaproc.get_profile_menu(login text)
+returns setof  menu_tree
+as
+$BODY$
+declare
+	a menu_tree;
+	e menu_tree;
+begin
+for a in select me_code,me_description from v_all_menu where user_name=3D=
login=20
+	and me_code_dep is null and me_type <> 'PR' and me_type <>'SP'
+loop
+		return next a;
+=09
+		for e in select * from get_menu_tree(a.code,login)
+		loop=20
+			return next e;
+		end loop;
+=09
+	end loop;
+return;
+end;
+$BODY$ language plpgsql;
+
+
+
+
+CREATE OR REPLACE FUNCTION comptaproc.get_menu_tree(p_code text,login te=
xt)
+  RETURNS SETOF menu_tree AS
+$BODY$
+declare
+	i menu_tree;
+	e menu_tree;
+	a text;
+	x v_all_menu%ROWTYPE;
+begin
+	for x in select *  from v_all_menu where me_code_dep=3Dp_code::text and=
 user_name=3Dlogin::text
+	loop=09
+		if x.me_code_dep is not null then
+			i.code :=3D x.me_code_dep||'/'||x.me_code;
+		else
+			i.code :=3D x.me_code;
+		end if;
+
+		i.description :=3D x.me_description;
+	=09
+		return next i;
+	=09
+	for e in select *  from get_menu_tree(x.me_code,login)
+		loop
+			e.code:=3Dx.me_code_dep||'/'||e.code;
+			return next e;
+		end loop;
+
+	end loop;
+	return;
+end;
+$BODY$
+LANGUAGE plpgsql;
+=09
+alter table mod_payment add jrn_def_id bigint;
+update mod_payment set jrn_def_id=3D2 where mp_type=3D'VEN';
+update mod_payment set jrn_def_id=3D3 where mp_type=3D'ACH';
+
+alter table mod_payment drop mp_type;
+
+alter table mod_payment add constraint mod_payment_jrn_def_id_fk foreign=
 key (jrn_def_id) references jrn_def(jrn_def_id) on delete cascade on upd=
ate cascade;
+
+comment on column mod_payment.jrn_def_id is 'Ledger using this payment m=
ethod';
+alter table tva_rate add tva_both_side integer ;
+alter table tva_rate alter tva_both_side set default 0;
+update tva_rate set tva_both_side=3D0;
+
+drop FUNCTION comptaproc.tva_modify(integer, text, numeric, text, text);
+alter table quant_purchase add qp_vat_sided numeric (20,4);
+alter table quant_sold add qs_vat_sided numeric (20,4);
+
+alter table quant_purchase alter qp_vat_sided set default 0.0;
+alter table quant_sold alter qs_vat_sided set default 0.0;
+
+update quant_purchase set qp_vat_sided=3D0.0;
+update quant_sold set qs_vat_sided=3D0.0;
+
+comment on column quant_purchase.qp_vat_sided is 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
+comment on column quant_purchase.qp_vat_sided is 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
+
+CREATE OR REPLACE FUNCTION comptaproc.tva_modify(integer, text, numeric,=
 text, text,integer)
+ RETURNS integer
+AS $function$
+declare
+	p_tva_id alias for $1;
+	p_tva_label alias for $2;
+	p_tva_rate alias for $3;
+	p_tva_comment alias for $4;
+	p_tva_poste alias for $5;
+	p_tva_both_side alias for $6;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+update tva_rate set tva_label=3Dp_tva_label,tva_rate=3Dp_tva_rate,tva_co=
mment=3Dp_tva_comment,tva_poste=3Dp_tva_poste,tva_both_side=3Dp_tva_both_=
side
+	where tva_id=3Dp_tva_id;
+return 0;
+end;
+$function$
+LANGUAGE plpgsql;
+
+drop FUNCTION comptaproc.tva_insert(text, numeric, text, text);
+
+CREATE OR REPLACE FUNCTION comptaproc.tva_insert(text, numeric, text, te=
xt,integer)
+ RETURNS integer
+AS $function$
+declare
+	l_tva_id integer;
+	p_tva_label alias for $1;
+	p_tva_rate alias for $2;
+	p_tva_comment alias for $3;
+	p_tva_poste alias for $4;
+	p_tva_both_side alias for $5;
+	debit text;
+	credit text;
+	nCount integer;
+begin
+if length(trim(p_tva_label)) =3D 0 then
+	return 3;
+end if;
+
+if length(trim(p_tva_poste)) !=3D 0 then
+	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
+	debit  =3D split_part(p_tva_poste,',',1);
+	credit	=3D split_part(p_tva_poste,',',2);
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
+	if nCount =3D 0 then return 4; end if;
+	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
+	if nCount =3D 0 then return 4; end if;
+
+end if;
+select into l_tva_id nextval('s_tva') ;
+insert into tva_rate(tva_id,tva_label,tva_rate,tva_comment,tva_poste,tva=
_both_side)
+	values (l_tva_id,p_tva_label,p_tva_rate,p_tva_comment,p_tva_poste,p_tva=
_both_side);
+return 0;
+end;
+$function$
+LANGUAGE plpgsql;
+
+DROP FUNCTION comptaproc.insert_quant_purchase(text,numeric, character v=
arying,numeric,numeric,numeric,integer,numeric,numeric,numeric,numeric,ch=
aracter varying);
+
+CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(p_internal t=
ext, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price =
numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva=
 numeric, p_nd_tva_recup numeric, p_dep_priv numeric, p_client character =
varying,p_tva_sided numeric)
+ RETURNS void
+AS $function$
+declare
+        fid_client integer;
+        fid_good   integer;
+begin
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                 fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim=
(p_fiche));
+        insert into quant_purchase
+                (qp_internal,
+                j_id,
+                qp_fiche,
+                qp_quantite,
+                qp_price,
+                qp_vat,
+                qp_vat_code,
+                qp_nd_amount,
+                qp_nd_tva,
+                qp_nd_tva_recup,
+                qp_supplier,
+                qp_dep_priv,
+                qp_vat_sided)
+        values
+                (p_internal,
+                p_j_id,
+                fid_good,
+                p_quant,
+                p_price,
+                p_vat,
+                p_vat_code,
+                p_nd_amount,
+                p_nd_tva,
+                p_nd_tva_recup,
+                fid_client,
+                p_dep_priv,
+                p_tva_sided);
+        return;
+end;
+ $function$=20
+ LANGUAGE plpgsql;
+
+DROP FUNCTION comptaproc.insert_quant_sold(text, numeric, character vary=
ing, numeric, numeric, numeric, integer, character varying);
+CREATE OR REPLACE FUNCTION comptaproc.insert_quant_sold(p_internal text,=
 p_jid numeric, p_fiche character varying, p_quant numeric, p_price numer=
ic, p_vat numeric, p_vat_code integer, p_client character varying,p_tva_s=
ided numeric)
+ RETURNS void
+AS $function$
+declare
+        fid_client integer;
+        fid_good   integer;
+begin
+
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_fiche));
+        insert into quant_sold
+                (qs_internal,j_id,qs_fiche,qs_quantite,qs_price,qs_vat,q=
s_vat_code,qs_client,qs_valid,qs_vat_sided)
+        values
+                (p_internal,p_jid,fid_good,p_quant,p_price,p_vat,p_vat_c=
ode,fid_client,'Y',p_tva_sided);
+        return;
+end;
+ $function$=20
+ LANGUAGE plpgsql;
+update version set val=3D98;
+
+commit;
\ No newline at end of file

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	2011-11-25 16:20:12 UTC (rev 4476)
+++ phpcompta/trunk/html/js/scripts.js	2011-11-26 01:14:51 UTC (rev 4477)
@@ -1043,7 +1043,7 @@
 	var target=3D"search_op";
 	removeDiv(target);
 	var str_style=3Dfixed_position(77, 99);
-        str_style+=3D";width:55%";
+        str_style+=3D";width:80%";
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20

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	2011-11-25 16:20:12 UTC (rev 4476)
+++ phpcompta/trunk/html/style.css	2011-11-26 01:14:51 UTC (rev 4477)
@@ -2,7 +2,7 @@
=20
 BODY {
   background-color:#EDF3FF;
- font-size:10;
+ font-size:12px;
   font-family:verdana,helvetica,sans-serif;
   padding: 0px 10px 0px 10px ;
   margin:0;
@@ -744,7 +744,7 @@
 }
=20
 div.pc_calendar{
-		border:1px groove grey;
+	=09
 		float:left;
=20
 		}
@@ -758,7 +758,8 @@
=20
 }
 div.pc_calendar td{
-	width:10em;
+	width:14%;
+	border:#879ed4 solid 1px;
 }
=20
 div.pc_calendar td.weekend {

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-25 16:20:12 UTC (rev 44=
76)
+++ phpcompta/trunk/include/ac_common.php	2011-11-26 01:14:51 UTC (rev 44=
77)
@@ -808,7 +808,7 @@
 		$default_module =3D $cn->get_array("select me_code
 			from profile_menu join profile_user using (p_id)
 			where
-			user_name=3D$1 and p_order=3D(select min(p_order) from profile_menu
+			user_name=3D$1 and p_order=3D(select min(p_order) from profile_menu j=
oin profile_user using (p_id)
 			where user_name=3D$2) limit 1", array($g_user->login, $g_user->login)=
);
 		/*
 		 * if nothing found, there is no profile for this user =3D> exit

Modified: phpcompta/trunk/include/ajax_get_profile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_get_profile.php	2011-11-25 16:20:12 UTC =
(rev 4476)
+++ phpcompta/trunk/include/ajax_get_profile.php	2011-11-26 01:14:51 UTC =
(rev 4477)
@@ -51,31 +51,37 @@
 require_once("template/profile.php");
 echo HtmlInput::submit("save_name","Modifier");
 echo '</form>';
+if ($profile->p_id > 0)
+{
+	echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirme=
z\')">';
=20
-echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
-
-echo '
+	echo '
 Vous pouvez aussi copier ce profil et puis le corriger';
=20
-echo HtmlInput::hidden('p_id',$profile->p_id);
-echo HtmlInput::submit("clone","Copier");
-echo '</form>';
+	echo HtmlInput::hidden('p_id', $profile->p_id);
+	echo HtmlInput::submit("clone", "Copier");
+	echo '</form>';
=20
-echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirmez=
\')">';
+	echo '<form method=3D"POST" onsubmit=3D"return confirm (\'vous confirme=
z\')">';
=20
-echo '
+	echo '
 Effacer ce profil';
=20
-echo HtmlInput::hidden('p_id',$profile->p_id);
-echo HtmlInput::submit("delete_profil","Effacer ce profil");
-echo '</form>';
-//Menu / Module /plugin in this profile
-echo "<h1> D=C3=A9tail du profile</h1>";
-echo "<h2>Menu</h2>";
-echo $add_one;
-$profile_menu=3Dnew Profile_Menu($cn);
-$profile_menu->listing_profile($p_id);
-echo "<h2>Impression</h2>";
-$profile_menu->printing($p_id);
+	echo HtmlInput::hidden('p_id', $profile->p_id);
+	echo HtmlInput::submit("delete_profil", "Effacer ce profil");
+	echo '</form>';
+
+	//Menu / Module /plugin in this profile
+	echo "<h1> D=C3=A9tail du profile</h1>";
+	echo "<h2>Menu</h2>";
+	echo $add_one;
+	$profile_menu =3D new Profile_Menu($cn);
+	$profile_menu->listing_profile($p_id);
+	echo "<h2>Impression</h2>";
+	$profile_menu->printing($p_id);
+
+	echo $add_one;
+}
 ?>
-<?=3D$add_one?>
+
+

Modified: phpcompta/trunk/include/anc_acc_table.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/anc_acc_table.inc.php	2011-11-25 16:20:12 UTC=
 (rev 4476)
+++ phpcompta/trunk/include/anc_acc_table.inc.php	2011-11-26 01:14:51 UTC=
 (rev 4477)
@@ -10,7 +10,7 @@
 echo '</form>';
 if (isset($_GET['result']))
 {
-    echo $tab->show_button();
+    echo $tab->show_button("");
     $tab->display_html();
 }
 ?>

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	2011-11-25 16:20:12 UTC =
(rev 4476)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-26 01:14:51 UTC =
(rev 4477)
@@ -781,6 +781,7 @@
 		$table->add('PJ',$url,' order by  substring(jr_pj_number,\'\\\d+$\')::=
numeric asc ',
 				' order by  substring(jr_pj_number,\'\\\d+$\')::numeric desc ' ,
 				"pja","pjd");
+		$table->add('Tiers',$url," order by  name asc"," order by  name desc",=
'na','nd');
 		$table->add('Montant',$url," order by jr_montant asc"," order by jr_mo=
ntant desc",
 				"ma","md");
 		$table->add("Description",$url,"order by jr_comment asc",
@@ -819,10 +820,10 @@
         $r.=3D'<th>'.$table->get_header(0).'</th>';
         $r.=3D'<th>'.$table->get_header(1).'</td>';
         $r.=3D'<th>'.$table->get_header(2).'</th>';
-	$r.=3Dth('tiers');
+        $r.=3D'<th>'.$table->get_header(3).'</th>';
+        $r.=3D'<th>'.$table->get_header(5).'</th>';
+	$r.=3Dth('Notes',' style=3D"width:15%"');
         $r.=3D'<th>'.$table->get_header(4).'</th>';
-	$r.=3Dth('Notes',' style=3D"width:15%"');
-        $r.=3D'<th>'.$table->get_header(3).'</th>';
         // if $p_paid is not equal to 0 then we have a paid column
         if ( $p_paid !=3D 0 )
         {
@@ -1845,7 +1846,7 @@
         if ( $this->id=3D=3D0) return;
         $num =3D$this->db->get_next_seq('s_internal');
         $atype=3D$this->get_propertie();
-        $type=3D$atype['jrn_def_code'];
+        $type=3Dsubstr($atype['jrn_def_code'],0,1);
         $internal_code=3Dsprintf("%s%06X",$type,$num);
         $this->jr_internal=3D$internal_code;
         return $internal_code;

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	2011-11-25 16:2=
0:12 UTC (rev 4476)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2011-11-26 01:1=
4:51 UTC (rev 4477)
@@ -341,10 +341,10 @@
             $tot_perso=3D0;
             $tot_tva_nd=3D0;
             $tot_tva_ndded=3D0;
-            $n_both=3D0;
             /* Save all the items without vat and no deductible vat and =
expense*/
             for ($i=3D0;$i< $nb_item;$i++)
             {
+				$n_both=3D0;
                 if ( strlen(trim(${'e_march'.$i})) =3D=3D 0 ) continue;
                 if ( ${'e_march'.$i.'_price'} =3D=3D 0 ) continue;
                 if ( ${'e_quant'.$i} =3D=3D 0 ) continue;
@@ -487,7 +487,7 @@
                 if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
                 {
                     if ( $oTva->get_parameter("both_side")=3D=3D1) $n_bo=
th=3D$acc_amount->amount_vat;
-                       =20
+
                     $r=3D$this->db->exec_sql("select insert_quant_purcha=
se ".
                                            "(null".
                                            ",".$j_id.		 /* 2 */

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-25 16:20:12=
 UTC (rev 4476)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2011-11-26 01:14:51=
 UTC (rev 4477)
@@ -272,11 +272,11 @@
             $tot_amount=3D0;
             $tot_tva=3D0;
             $tot_debit=3D0;
-            $n_both=3D0;
             $this->db->start();
             /* Save all the items without vat */
             for ($i=3D0;$i< $nb_item;$i++)
             {
+				$n_both=3D0;
                 if ( strlen(trim(${'e_march'.$i})) =3D=3D 0 ) continue;
                 if ( ${'e_march'.$i.'_price'} =3D=3D 0 ) continue;
                 if ( ${'e_quant'.$i} =3D=3D 0 ) continue;

Modified: phpcompta/trunk/include/class_anc_account.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_account.php	2011-11-25 16:20:12 UTC=
 (rev 4476)
+++ phpcompta/trunk/include/class_anc_account.php	2011-11-26 01:14:51 UTC=
 (rev 4477)
@@ -158,15 +158,15 @@
     private function format_data()
     {
=20
-        $this->name=3Dsql_string($this->name);
-        $this->pa_id=3Dsql_string($this->pa_id);
-        $this->amount=3Dsql_string($this->amount);
+        $this->name=3D$this->name;
+        $this->pa_id=3D$this->pa_id;
+        $this->amount=3D$this->amount;
         if (strlen($this->amount) =3D=3D 0 )
             $this->amount=3D0.0;
         if ( isNumber($this->amount) =3D=3D0 )
             $this->amount=3D0;
=20
-        $this->description=3Dsql_string($this->description);
+        $this->description=3D$this->description;
     }
     function delete()
     {

Modified: phpcompta/trunk/include/class_anc_group.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anc_group.php	2011-11-25 16:20:12 UTC (=
rev 4476)
+++ phpcompta/trunk/include/class_anc_group.php	2011-11-26 01:14:51 UTC (=
rev 4477)
@@ -68,7 +68,7 @@
         return "";
     }
     /*!
-     * \brief remove from the database=20
+     * \brief remove from the database
      */
=20
     function remove()
@@ -163,15 +163,15 @@
       $sql=3D"with m as (select po_id,
 	po_name,
 	ga_id,
-	case when  oa_debit =3D 't' then oa_amount=20
+	case when  oa_debit =3D 't' then oa_amount
 	else 0
 	end  as amount_deb,
-	case when oa_debit =3D 'f' then oa_amount=20
+	case when oa_debit =3D 'f' then oa_amount
 	else 0
 	end as amount_cred,
 	oa_date
-	from operation_analytique=20
-join poste_analytique using (po_id)=20
+	from operation_analytique
+join poste_analytique using (po_id)
 where pa_id=3D$1 $filter_date )
 select sum(amount_cred) as sum_cred, sum(amount_deb)as sum_deb,po_name,g=
a_id,ga_description
 from m left join groupe_analytique using (ga_id)
@@ -194,14 +194,14 @@
       if ( empty ($array) ) return "";
       require_once('template/anc_balance_group.php');
=20
-     =20
+
     }
   /**
    *@brief display the button export CSV
    *@param $p_hidden is a string containing hidden items
    *@return html string
-   */ =20
-  function show_button($p_hidden)
+   */
+  function show_button($p_hidden=3D"")
   {
     $r=3D"";
     $r.=3D '<form method=3D"GET" action=3D"export.php"  style=3D"display=
:inline">';

Modified: phpcompta/trunk/include/class_anc_group_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_anc_group_operation.php	2011-11-25 16:2=
0:12 UTC (rev 4476)
+++ phpcompta/trunk/include/class_anc_group_operation.php	2011-11-26 01:1=
4:51 UTC (rev 4477)
@@ -106,16 +106,16 @@
=20
         $ret=3D"";
=20
-        $ret.=3D'<table style=3D"border: 2px outset blue; width: 100%;"	=
>';
+        $ret.=3D'<table style=3D"result"	>';
=20
         $ret.=3D"<TR>".$wDate->input()."</tr>";
-        $ret.=3D'<tr><td style=3D"border:1px groove blue">Description</t=
d>'.
+        $ret.=3D'<tr><td>Description</td>'.
               '<td colspan=3D"3">'.
               $wDescription->input()."</td></tr>";
         $Plan=3Dnew Anc_Plan($this->db);
         $aPlan=3D$Plan->get_list();
         $max=3D(count($this->a_operation)<$this->nMaxRow)?$this->nMaxRow=
:count($this->a_operation);
-        $ret.=3D'</table><table  id=3D"ago" style=3D"border: 2px outset =
blue; width: 100%;">';
+        $ret.=3D'</table><table  id=3D"ago" style=3D"width: 100%;">';
         /* show 10 rows */
         $ret.=3D"<tr>";
         foreach ($aPlan as $d)
@@ -123,7 +123,7 @@
             $idx=3D$d['id'];
             /* array of possible value for the select */
             $aPoste[$idx]=3D$this->db->make_array("select po_id as value=
,".
-                                                " html_quote(po_name||':=
'||coalesce(po_description,'-')) as label ".
+                                                " po_name||':'||coalesce=
(po_description,'-') as label ".
                                                 " from poste_analytique =
".
                                                 " where pa_id =3D ".$idx=
.
                                                 " order by po_name ");

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	2011-11-25 16:20:12 UTC (r=
ev 4476)
+++ phpcompta/trunk/include/class_calendar.php	2011-11-26 01:14:51 UTC (r=
ev 4477)
@@ -45,7 +45,8 @@
     function fill_from_action(&$p_array)
     {
         $cn=3Dnew Database(dossier::id());
-        $sql=3D"select ag_id,substr(ag_title,0,20) as ag_title_fmt,to_ch=
ar(ag_timestamp,'DD')::integer as ag_timestamp_day ".
+        $sql=3D"select ag_id,substr(ag_title,0,20) as ag_title_fmt,ag_re=
f,
+				to_char(ag_timestamp,'DD')::integer as ag_timestamp_day ".
              " from action_gestion ".
              " where ".
              " to_char(ag_timestamp,'MM')::integer=3D$1 ".
@@ -56,8 +57,8 @@
         {
             $ind=3D$array[$i]['ag_timestamp_day'];
             $p_array[$ind]=3D(isset($p_array[$ind]))?$p_array[$ind]:'';
-            $p_array[$ind].=3D'<A HREF=3D"commercial.php?'.dossier::get(=
).'&p_action=3Dsuivi_courrier&sa=3Ddetail&ag_id=3D'.$array[$i]['ag_id'].'=
">';
-            $p_array[$ind].=3D"<span class=3D\"day\">".h($array[$i]['ag_=
title_fmt']).'</span>';
+            $p_array[$ind].=3D'<A class=3D"line" HREF=3D"do.php?ac=3DFOL=
LOW&'.dossier::get().'&sa=3Ddetail&ag_id=3D'.$array[$i]['ag_id'].'">';
+            $p_array[$ind].=3D"<span class=3D\"calfollow\">".h($array[$i=
]['ag_ref']." ".$array[$i]['ag_title_fmt']).'</span>';
             $p_array[$ind].=3D"</A>";
=20
         }

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	2011-11-25 16:20:12 UTC (r=
ev 4476)
+++ phpcompta/trunk/include/class_database.php	2011-11-26 01:14:51 UTC (r=
ev 4477)
@@ -359,6 +359,7 @@
     function apply_patch($p_name,$from_setup=3D1)
     {
         $MaxVersion=3DDBVERSION-1;
+		$succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
         echo '<ul style=3D"list-type-style:square">';
         $add=3D($from_setup=3D=3D0)?'admin/':'';
         for ( $i =3D 4;$i <=3D $MaxVersion;$i++)
@@ -371,7 +372,7 @@
=20
                 $this->execute_script($add.'sql/patch/upgrade'.$i.'.sql'=
);
                 echo $succeed;
-               =20
+
                 if ( ! DEBUG ) ob_start();
                 // specific for version 4
                 if ( $i =3D=3D 4 )
@@ -451,6 +452,7 @@
                     $country=3D$this->get_value ("select pr_value from p=
arameter where pr_id=3D'MY_COUNTRY'");
                     $this->execute_script($add."sql/patch/upgrade61.".$c=
ountry.".sql");
                 }
+	=09
                 if ( ! DEBUG ) ob_end_clean();
             }
         }
@@ -852,7 +854,7 @@
      * with the handle of a successull query, echo each row into CSV and
      * send it directly
      * @param type $ret handle to a query
-     * @param type $aheader  double array, each item of the array contai=
ns=20
+     * @param type $aheader  double array, each item of the array contai=
ns
      * a key type (num) and a key title
      */
     function query_to_csv($ret,$aheader)
@@ -864,7 +866,7 @@
             $seq=3D";";
         }
         printf("\n\r");
-       =20
+
         $seq=3D"";
         // fetch all the rows
         for ($i=3D0;$i<count(Database::num_row($ret));$i++)

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	2011-11-25 16:20:12 UTC (=
rev 4476)
+++ phpcompta/trunk/include/class_follow_up.php	2011-11-26 01:14:51 UTC (=
rev 4477)
@@ -863,7 +863,8 @@
                             " ag_priority =3D $10 ,".
                             " ag_dest =3D $11 , ".
                             " ag_cal =3D $12 ,".
-                            " ag_contact =3D $13 ".
+                            " ag_contact =3D $13, ".
+							" ag_ref =3D $14 ".
                             " where ag_id =3D $8",
                             array ( $this->ag_comment, /* 1 */
                                     $this->ag_timestamp, /* 2 */
@@ -877,7 +878,8 @@
                                     $this->ag_priority, /* 10 */
                                     $this->ag_dest,     /* 11 */
                                     $ag_cal,	      /* 12 */
-                                    $contact->id   /* 13 */
+                                    $contact->id,   /* 13 */
+									$this->ag_ref
                                   ));
         // Upload  documents
         $doc=3Dnew Document($this->db);

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	2011-11-25 16:20:12 UTC (rev 447=
6)
+++ phpcompta/trunk/include/constant.php	2011-11-26 01:14:51 UTC (rev 447=
7)
@@ -40,11 +40,11 @@
  * define ("DEBUG",false);
  *
  */
-$version_phpcompta=3D4208;
+$version_phpcompta=3D4444;
 define ("DEBUG",true);
=20
-define ("DBVERSION",97);
-define ("DBVERSIONREPO",13);
+define ("DBVERSION",98);
+define ("DBVERSIONREPO",14);
 define ('NOTFOUND','--not found--');
=20
 define ("MAX_COMPTE",4);

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	2011-11-25 16:20:12 UTC (rev =
4476)
+++ phpcompta/trunk/include/dossier.inc.php	2011-11-26 01:14:51 UTC (rev =
4477)
@@ -345,8 +345,8 @@
     $cn->exec_sql($sql,array($_REQUEST['d']));
     $sql=3D"delete from ac_dossier where dos_id=3D$1";
     $cn->exec_sql($sql,array($_REQUEST['d']));
-    print '<h2 class=3D"info">';
-    print "Voil=C3=A0 le dossier ".h($name)." est effac=C3=A9</h2>";
+    print '<h2 class=3D"error">';
+    print "Le dossier ".h($name)." est effac=C3=A9</h2>";
     echo HtmlInput::button_anchor('Retour','?action=3Ddossier_mgt');
 }
 ?>

Modified: phpcompta/trunk/include/menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/menu.inc.php	2011-11-25 16:20:12 UTC (rev 447=
6)
+++ phpcompta/trunk/include/menu.inc.php	2011-11-26 01:14:51 UTC (rev 447=
7)
@@ -83,6 +83,7 @@
 $table->add('Code',$url,"order by me_code asc","order by me_code desc","=
codea","coded");
 $table->add('Menu',$url,"order by me_menu asc","order by me_menu desc","=
menua","menud");
 $table->add('Description',$url,"order by me_description asc","order by m=
e_description desc","desa","desd");
+$table->add('Fichier',$url,"order by me_file asc","order by me_file desc=
","fa","fd");
 $table->add('URL',$url,"order by me_url asc","order by me_url desc","url=
a","urld");
 $table->add('Param=C3=A8tre',$url,"order by me_parametere asc","order by=
 me_parameter desc","paa","pad");
 $table->add('Javascript',$url,"order by me_javascript asc","order by me_=
javascript desc","jsa","jsd");
@@ -139,6 +140,7 @@
 echo '<th>'.$table->get_header(4).'</th>';
 echo '<th>'.$table->get_header(5).'</th>';
 echo '<th>'.$table->get_header(6).'</th>';
+echo '<th>'.$table->get_header(7).'</th>';
 echo '</tr>';
=20
 for ($i=3D0;$i<Database::num_row($ret);$i++)
@@ -157,6 +159,7 @@
 	echo td($js);
 	echo td($row->me_menu);
 	echo td($row->me_description);
+	echo td($row->me_file);
 	echo td($row->me_url);
 	echo td($row->me_parameter);
 	echo td($row->me_javascript);

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	2011-11-25 16:20:12 UTC (rev 4=
476)
+++ phpcompta/trunk/include/modele.inc.php	2011-11-26 01:14:51 UTC (rev 4=
477)
@@ -391,8 +391,8 @@
 		ob_flush();
 		$sql =3D "delete from modeledef where mod_id=3D$1";
 		$cn->exec_sql($sql, array($_REQUEST['m']));
-		print '<h2 class=3D"info">';
-		print "Voil=C3=A0 le mod=C3=A8le $name est effac=C3=A9</H2>";
+		print '<h2 class=3D"error">';
+		print "Le mod=C3=A8le $name est effac=C3=A9</H2>";
 		echo HtmlInput::button_anchor('Retour', '?action=3Dmodele_mgt');
 	}
 	echo '</div>';

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	2011-11-25 16:20:12 UTC=
 (rev 4476)
+++ phpcompta/trunk/include/template/calendar.php	2011-11-26 01:14:51 UTC=
 (rev 4477)
@@ -1,4 +1,4 @@
-<div class=3D"pc_calendar" id=3D"user_cal">
+<div class=3D"pc_calendar" id=3D"user_cal" style=3D"width:100%">
 <?=3D$month_year?>
 <table width=3D"100%">
 <tr>
@@ -23,7 +23,7 @@
 $timestamp_date=3Dmktime(0,0,0,$this->month,$ind,$this->year);
 $date_calendar=3Ddate('w',$timestamp_date);
 $st=3D"";
-if ( $today_month=3D=3D$this->month && $today_day=3D=3D$ind)=20
+if ( $today_month=3D=3D$this->month && $today_day=3D=3D$ind)
   $st=3D'  style=3D"border:1px solid red" ';
 if ( $date_calendar =3D=3D $week ) {
 	echo '<td class=3D"'.$class.'"'.$st.'>'.'<span class=3D"day">'.$ind."</=
span>";

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	2011-11-25 16:20:12 UT=
C (rev 4476)
+++ phpcompta/trunk/include/template/dashboard.php	2011-11-26 01:14:51 UT=
C (rev 4477)
@@ -1,10 +1,10 @@
-<div>
-	<div style=3D"float:left;width:50%">
-<fieldset>
+<div style=3D"float:left;width:50%">
+<fieldset style=3D"width:100%">
 <legend><?=3D_('Calendrier')?>
 </legend>
 <?php echo $cal->display(); ?>
 </fieldset>
+</div>
=20
 <?php
 /*
@@ -23,31 +23,8 @@
 $todo=3Dnew Todo_List($cn);
 $array=3D$todo->load_all();
 ?>
-<div id=3D"add_todo_list" class=3D"add_todo_list">
-	<script charset=3D"utf8" type=3D"text/javascript" language=3D"javascrip=
t">
-		new Draggable($('add_todo_list'),{});
-	</script>
-<form method=3D"post">
-<?php
-$wDate=3Dnew IDate('p_date_todo');
-$wDate->id=3D'p_date_todo';
-$wTitle=3Dnew IText('p_title');
-$wDesc=3Dnew ITextArea('p_desc');
-$wDesc->heigh=3D5;
-$wDesc->width=3D40;
-echo h2info("Note");
-echo _("Date")." ".$wDate->input().'<br>';
-echo _("Titre")." ".$wTitle->input().'<br>';
-echo _("Description")."<br>".$wDesc->input().'<br>';
-echo dossier::hidden();
-echo HtmlInput::hidden('tl_id',0);
-echo HtmlInput::submit('save_todo_list',_('Sauve'),'onClick=3D"$(\'add_t=
odo_list\').hide();return true;"');
-echo HtmlInput::button('hide',_('Annuler'),'onClick=3D"$(\'add_todo_list=
\').hide();return true;"');
-?>
-</form>
-</div>
-</div>
-<div style=3D"float:left;width:50%">'
+
+<div style=3D"float:right;width:45%">
 <fieldset> <legend><?=3D_('Pense-B=C3=AAte')?></legend>
=20
 <?php
@@ -66,7 +43,7 @@
       $row['tl_date'].
       '</td>'.
       '<td>'.
-      '<a href=3D"javascript:void(0)" onclick=3D"todo_list_show(\''.$row=
['tl_id'].'\')">'.
+      '<a class=3D"line" href=3D"javascript:void(0)" onclick=3D"todo_lis=
t_show(\''.$row['tl_id'].'\')">'.
       htmlspecialchars($row['tl_title']).
       '</a>'.
        '</td>'.
@@ -80,7 +57,8 @@
 ?>
 </fieldset>
 </div>
-	<div style=3D"clear:both"></div>
+<div style=3D"clear:both">
+	<div style=3D"float:left;width:50%">
 <?php
 /*
  * Mini Report
@@ -95,7 +73,7 @@
 }
=20
 if ( $report !=3D 0 ) {
-  echo '<fieldset style=3D"width:50%;background-color:white"><legend>'.$=
rapport->get_name().'</legend>';
+  echo '<fieldset ><legend>'.$rapport->get_name().'</legend>';
   $exercice=3D$g_user->get_exercice();
   if ( $exercice =3D=3D 0 ) {
     alert(_('Aucune periode par defaut'));
@@ -127,3 +105,28 @@
=20
 ?>
 </div>
+</div>
+
+<div id=3D"add_todo_list" class=3D"add_todo_list">
+	<script charset=3D"utf8" type=3D"text/javascript" language=3D"javascrip=
t">
+		new Draggable($('add_todo_list'),{});
+	</script>
+<form method=3D"post">
+<?php
+$wDate=3Dnew IDate('p_date_todo');
+$wDate->id=3D'p_date_todo';
+$wTitle=3Dnew IText('p_title');
+$wDesc=3Dnew ITextArea('p_desc');
+$wDesc->heigh=3D5;
+$wDesc->width=3D40;
+echo h2info("Note");
+echo _("Date")." ".$wDate->input().'<br>';
+echo _("Titre")." ".$wTitle->input().'<br>';
+echo _("Description")."<br>".$wDesc->input().'<br>';
+echo dossier::hidden();
+echo HtmlInput::hidden('tl_id',0);
+echo HtmlInput::submit('save_todo_list',_('Sauve'),'onClick=3D"$(\'add_t=
odo_list\').hide();return true;"');
+echo HtmlInput::button('hide',_('Annuler'),'onClick=3D"$(\'add_todo_list=
\').hide();return true;"');
+?>
+</form>
+</div>
\ No newline at end of file

Modified: phpcompta/trunk/include/tva.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/tva.inc.php	2011-11-25 16:20:12 UTC (rev 4476=
)
+++ phpcompta/trunk/include/tva.inc.php	2011-11-26 01:14:51 UTC (rev 4477=
)
@@ -50,8 +50,8 @@
     {
 	$err =3D 2;
     }
-    var_dump($_POST);
-    if ($err =3D=3D 0)
+
+	if ($err =3D=3D 0)
     {
 	if (isset($_POST['confirm_add']))
 	{
@@ -146,7 +146,7 @@
     $str_msg=3D( $row['tva_both_side']=3D=3D1)?'Employ=C3=A9 au cr=C3=A9=
dit et d=C3=A9bit':'normal' ;
     echo $str_msg;
     echo "</TD>";
-   =20
+
     echo "<TD>";
     echo HtmlInput::submit("rm", "Efface");
     echo HtmlInput::submit("mod", "Modifie");


Property changes on: phpcompta/trunk/sql
___________________________________________________________________
Name: svn:ignore
   - .upgrade.sql.swp
.object-6.0.sql.swp
.backup-new-object.sh.swp
.mode_paiement.sql.swp
.anc-grandlivre.sql.swp

   + .upgrade.sql.swp
.object-6.0.sql.swp
.backup-new-object.sh.swp
.mode_paiement.sql.swp
.anc-grandlivre.sql.swp
.tmp_pcmn_ins.sql.swp
.anc-modularity-imp.sql.swp


Modified: phpcompta/trunk/sql/backup-new-object.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/backup-new-object.sh	2011-11-25 16:20:12 UTC (rev=
 4476)
+++ phpcompta/trunk/sql/backup-new-object.sh	2011-11-26 01:14:51 UTC (rev=
 4477)
@@ -1 +1 @@
-pg_dump testdossier82 --no-owner --inserts -t profile -t menu_ref -t pro=
file_menu -t profile_user -t profile_menu_type -t v_all_menu > object-6.0=
.sql
+pg_dump testdossier100 --no-owner --inserts -t profile -t menu_ref -t pr=
ofile_menu -t profile_user -t profile_menu_type -t v_all_menu > object-6.=
0.sql

Modified: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-25 16:20:12 UTC (rev 4476)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-26 01:14:51 UTC (rev 4477)
@@ -158,6 +158,7 @@
 --
=20
 COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu';
+COMMENT ON COLUMN profile_menu.pm_default IS 'default menu';
=20
=20
 --
@@ -192,7 +193,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
 --
=20
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 662, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 778, true);
=20
=20
 --
@@ -228,7 +229,7 @@
 -- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
=20
-SELECT pg_catalog.setval('profile_p_id_seq', 10, true);
+SELECT pg_catalog.setval('profile_p_id_seq', 11, true);
=20
=20
 --
@@ -286,7 +287,7 @@
 -- Name: profile_user_pu_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
 --
=20
-SELECT pg_catalog.setval('profile_user_pu_id_seq', 5, true);
+SELECT pg_catalog.setval('profile_user_pu_id_seq', 6, true);
=20
=20
 --
@@ -322,12 +323,6 @@
 -- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: -
 --
=20
-INSERT INTO menu_ref VALUES ('IMPCARD', 'Import Fiche', 'import_card/ind=
ex.php', NULL, 'Importation de fiches', 'plugin_code=3DIMPCARD', NULL, 'P=
L');
-INSERT INTO menu_ref VALUES ('AMORTIS', 'Amortissement', 'amortis/index.=
php', NULL, 'Amortissement', 'plugin_code=3DAMORTIS', NULL, 'PL');
-INSERT INTO menu_ref VALUES ('TOOLPLAN', 'Import/export plan', 'tool_pcm=
n/index.php', NULL, 'Importation /export de plan comptable', 'plugin_code=
=3DTOOLPLAN', NULL, 'PL');
-INSERT INTO menu_ref VALUES ('TOOL', 'Outil comptable', 'tools/index.php=
', NULL, 'Outil comptable', 'plugin_code=3DTOOL', NULL, 'PL');
-INSERT INTO menu_ref VALUES ('TVA', 'Module de TVA', 'tva/index.php', NU=
LL, 'Cette extension permet de faire les listings et declarations TVA', '=
plugin_code=3DTVA', NULL, 'PL');
-INSERT INTO menu_ref VALUES ('IMPORTBANK', 'Importation banque', 'import=
bank/index.php', NULL, 'Import. fichier CVS de la banque', 'plugin_code=3D=
IMPORTBANK', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 'Nouvel achat ou d=C3=A9pense', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('ANCHOP', 'Historique', 'anc_history.inc.ph=
p', NULL, 'Historique des imputations analytiques', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('ANCGL', 'Grand''Livre', 'anc_great_ledger.=
inc.php', NULL, 'Grand livre d''plan analytique', NULL, NULL, 'ME');
@@ -378,7 +373,6 @@
 INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, 'Suivi fournisseur', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('MODOP', 'Modification d''op=C3=A9rations',=
 'modop/index.php', NULL, 'Modification op=C3=A9rations', 'plugin_code=3D=
MODOP', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('LET', 'Lettrage', NULL, NULL, 'Lettrage', =
NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, 'OD analytique', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, 'V=C3=A9rification de la comptabilit=C3=A9', NULL, NU=
LL, 'ME');
@@ -443,122 +437,33 @@
 --
=20
 INSERT INTO profile VALUES ('Administrateur', 1, 'Profil par d=C3=A9faut=
 pour les adminstrateurs', true, true);
-INSERT INTO profile VALUES ('Utilisateur', 6, 'Profil par d=C3=A9faut po=
ur les Utilisateurs', true, true);
+INSERT INTO profile VALUES ('Utilisateur', 2, 'Profil par d=C3=A9faut po=
ur les utilisateurs', true, true);
=20
=20
 --
 -- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 -
 --
=20
-INSERT INTO profile_menu VALUES (178, 'CFGPAY', 'DIVPARM', 6, 4, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (59, 'CFGPAY', 'DIVPARM', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (194, 'LET', 'COMPTA', 6, 8, 'E', 0);
-INSERT INTO profile_menu VALUES (237, 'EXT', NULL, 6, 55, 'M', 0);
-INSERT INTO profile_menu VALUES (240, 'FIMP', 'MENUFIN', 6, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (214, 'FREC', 'MENUFIN', 6, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (213, 'FSALDO', 'MENUFIN', 6, 3, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (182, 'CFGATCARD', 'DIVPARM', 6, 9, 'E',=
 0);
 INSERT INTO profile_menu VALUES (68, 'CFGATCARD', 'DIVPARM', 1, 9, 'E', =
0);
-INSERT INTO profile_menu VALUES (180, 'CFGACC', 'DIVPARM', 6, 6, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (61, 'CFGACC', 'DIVPARM', 1, 6, 'E', 0);
-INSERT INTO profile_menu VALUES (198, 'LETACC', 'LET', 6, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (197, 'LETCARD', 'LET', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (225, 'TVA', 'EXT', 6, NULL, 'S', 0);
-INSERT INTO profile_menu VALUES (241, 'IMPCARD', 'EXT', 6, NULL, 'S', 0)=
;
-INSERT INTO profile_menu VALUES (242, 'AMORTIS', 'EXT', 6, NULL, 'S', 0)=
;
-INSERT INTO profile_menu VALUES (243, 'TOOLPLAN', 'EXT', 6, NULL, 'S', 0=
);
-INSERT INTO profile_menu VALUES (254, 'IMPORTBANK', 'EXT', 6, NULL, 'S',=
 0);
-INSERT INTO profile_menu VALUES (255, 'TOOL', 'EXT', 6, NULL, 'S', 0);
-INSERT INTO profile_menu VALUES (648, 'MODOP', 'EXT', 1, 10, 'E', 0);
 INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (179, 'CFGTVA', 'DIVPARM', 6, 5, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (181, 'CFGCATDOC', 'DIVPARM', 6, 8, 'E',=
 0);
-INSERT INTO profile_menu VALUES (258, 'CFGMENU', 'MOD', 6, NULL, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (259, 'CFGPRO', 'MOD', 6, NULL, 'E', 0);
 INSERT INTO profile_menu VALUES (651, 'ANCHOP', 'ANCIMP', 1, 10, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', 0);
 INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (652, 'ANCGL', 'ANCIMP', 1, 20, 'E', 0);
-INSERT INTO profile_menu VALUES (189, 'PLANANC', 'ANC', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (190, 'CFGCARDCAT', 'DIVPARM', 6, 7, 'E'=
, 0);
-INSERT INTO profile_menu VALUES (191, 'ANCODS', 'ANC', 6, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (192, 'ANCGROUP', 'ANC', 6, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (193, 'ANCIMP', 'ANC', 6, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
-INSERT INTO profile_menu VALUES (196, 'PREFERENCE', NULL, 6, 15, 'M', 1)=
;
 INSERT INTO profile_menu VALUES (653, 'ANCBS', 'ANCIMP', 1, 30, 'E', 0);
-INSERT INTO profile_menu VALUES (199, 'CUST', 'GESTION', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (200, 'SUPPL', 'GESTION', 6, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (201, 'ADM', 'GESTION', 6, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (202, 'CARD', 'GESTION', 6, 6, 'E', 0);
 INSERT INTO profile_menu VALUES (654, 'ANCBC2', 'ANCIMP', 1, 40, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (203, 'STOCK', 'GESTION', 6, 5, 'E', 0);
-INSERT INTO profile_menu VALUES (204, 'FORECAST', 'GESTION', 6, 7, 'E', =
0);
-INSERT INTO profile_menu VALUES (205, 'FOLLOW', 'GESTION', 6, 8, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (655, 'ANCTAB', 'ANCIMP', 1, 50, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (206, 'VERIFBIL', 'ADV', 6, 21, 'E', 0);
-INSERT INTO profile_menu VALUES (207, 'STOCK', 'ADV', 6, 22, 'E', 0);
-INSERT INTO profile_menu VALUES (208, 'PREDOP', 'ADV', 6, 23, 'E', 0);
 INSERT INTO profile_menu VALUES (656, 'ANCBCC', 'ANCIMP', 1, 60, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (209, 'OPEN', 'ADV', 6, 24, 'E', 0);
 INSERT INTO profile_menu VALUES (657, 'ANCGR', 'ANCIMP', 1, 70, 'E', 0);
 INSERT INTO profile_menu VALUES (658, 'CSV:AncGrandLivre', NULL, 1, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (210, 'REPORT', 'ADV', 6, 25, 'E', 0);
-INSERT INTO profile_menu VALUES (211, 'CARD', 'COMPTA', 6, 7, 'E', 0);
-INSERT INTO profile_menu VALUES (212, 'HIST', 'COMPTA', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (215, 'ADV', 'COMPTA', 6, 20, 'E', 0);
-INSERT INTO profile_menu VALUES (216, 'ACCESS', NULL, 6, 25, 'M', 0);
-INSERT INTO profile_menu VALUES (217, 'CSV:histo', NULL, 6, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', 0);
-INSERT INTO profile_menu VALUES (218, 'LOGOUT', NULL, 6, 30, 'M', 0);
-INSERT INTO profile_menu VALUES (219, 'PRINT', 'GESTION', 6, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (221, 'CSV:ledger', NULL, 6, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (222, 'PDF:ledger', NULL, 6, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (223, 'PRINT', 'COMPTA', 6, 6, 'E', 0);
-INSERT INTO profile_menu VALUES (224, 'CSV:postedetail', NULL, 6, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (226, 'MENUACH', 'COMPTA', 6, 3, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (227, 'ACHIMP', 'MENUACH', 6, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (228, 'GESTION', NULL, 6, 45, 'M', 0);
-INSERT INTO profile_menu VALUES (229, 'MENUODS', 'COMPTA', 6, 5, 'E', 0)=
;
 INSERT INTO profile_menu VALUES (662, 'new_line', NULL, 1, 35, 'M', 0);
-INSERT INTO profile_menu VALUES (230, 'ODS', 'MENUODS', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (231, 'ODSIMP', 'MENUODS', 6, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (232, 'ANC', NULL, 6, 50, 'M', 0);
-INSERT INTO profile_menu VALUES (234, 'VENMENU', 'COMPTA', 6, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (235, 'VEN', 'VENMENU', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (236, 'VENIMP', 'VENMENU', 6, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (238, 'FIN', 'MENUFIN', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (239, 'MENUFIN', 'COMPTA', 6, 4, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (244, 'SEARCH', NULL, 6, 60, 'M', 0);
-INSERT INTO profile_menu VALUES (245, 'ACH', 'MENUACH', 6, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (256, 'AMORTIS', 'MENUACH', 6, 10, 'E', =
0);
 INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
0);
-INSERT INTO profile_menu VALUES (260, 'PDF:postedetail', NULL, 6, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (261, 'CSV:fichedetail', NULL, 6, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (262, 'PDF:fichedetail', NULL, 6, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (263, 'CSV:fiche_balance', NULL, 6, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (264, 'PDF:fiche_balance', NULL, 6, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (265, 'CSV:report', NULL, 6, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (266, 'PDF:report', NULL, 6, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (267, 'CSV:fiche', NULL, 6, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (268, 'PDF:fiche', NULL, 6, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (269, 'CSV:glcompte', NULL, 6, NULL, 'P'=
, 0);
-INSERT INTO profile_menu VALUES (270, 'PDF:glcompte', NULL, 6, NULL, 'P'=
, 0);
-INSERT INTO profile_menu VALUES (271, 'PDF:sec', NULL, 6, NULL, 'P', 0);
-INSERT INTO profile_menu VALUES (272, 'CSV:AncList', NULL, 6, NULL, 'P',=
 0);
-INSERT INTO profile_menu VALUES (273, 'CSV:AncBalSimple', NULL, 6, NULL,=
 'P', 0);
 INSERT INTO profile_menu VALUES (526, 'PRINTGL', 'PRINT', 1, 20, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (274, 'PDF:AncBalSimple', NULL, 6, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (275, 'CSV:AncBalDouble', NULL, 6, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (276, 'PDF:AncBalDouble', NULL, 6, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (277, 'CSV:balance', NULL, 6, NULL, 'P',=
 0);
-INSERT INTO profile_menu VALUES (278, 'PDF:balance', NULL, 6, NULL, 'P',=
 0);
-INSERT INTO profile_menu VALUES (279, 'CSV:AncTable', NULL, 6, NULL, 'P'=
, 0);
-INSERT INTO profile_menu VALUES (280, 'CSV:AncAccList', NULL, 6, NULL, '=
P', 0);
-INSERT INTO profile_menu VALUES (281, 'CSV:AncBalGroup', NULL, 6, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (282, 'OTH:Bilan', NULL, 6, NULL, 'P', 0=
);
 INSERT INTO profile_menu VALUES (23, 'LET', 'COMPTA', 1, 8, 'E', 0);
 INSERT INTO profile_menu VALUES (523, 'PRINTBAL', 'PRINT', 1, 50, 'E', 0=
);
 INSERT INTO profile_menu VALUES (529, 'PRINTREPORT', 'PRINT', 1, 85, 'E'=
, 0);
@@ -615,14 +520,11 @@
 INSERT INTO profile_menu VALUES (94, 'FSALDO', 'MENUFIN', 1, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (27, 'LETACC', 'LET', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (24, 'LETCARD', 'LET', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (164, 'TVA', 'EXT', 1, NULL, 'S', 0);
-INSERT INTO profile_menu VALUES (659, 'AMORTIS', 'GESTION', 1, 10, 'E', =
0);
 INSERT INTO profile_menu VALUES (167, 'MOD', 'PARAM', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (93, 'FIMP', 'MENUFIN', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', 0);
 INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (157, 'AMORTIS', 'MENUACH', 1, 10, 'E', =
0);
 INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', 0);
 INSERT INTO profile_menu VALUES (129, 'PDF:fichedetail', NULL, 1, NULL, =
'P', 0);
@@ -648,14 +550,108 @@
 INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', 0=
);
 INSERT INTO profile_menu VALUES (528, 'PRINTPOSTE', 'PRINT', 1, 30, 'E',=
 0);
 INSERT INTO profile_menu VALUES (525, 'PRINTCARD', 'PRINT', 1, 40, 'E', =
0);
-INSERT INTO profile_menu VALUES (160, 'AMORTIS', 'EXT', 1, NULL, 'S', 0)=
;
 INSERT INTO profile_menu VALUES (1, 'DASHBOARD', NULL, 1, 10, 'M', 1);
-INSERT INTO profile_menu VALUES (163, 'TOOL', 'EXT', 1, NULL, 'S', 0);
-INSERT INTO profile_menu VALUES (162, 'IMPORTBANK', 'EXT', 1, NULL, 'S',=
 0);
-INSERT INTO profile_menu VALUES (161, 'TOOLPLAN', 'EXT', 1, NULL, 'S', 0=
);
-INSERT INTO profile_menu VALUES (159, 'IMPCARD', 'EXT', 1, NULL, 'S', 0)=
;
 INSERT INTO profile_menu VALUES (172, 'CFGPRO', 'MOD', 1, NULL, 'E', 0);
 INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MOD', 1, NULL, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (663, 'CFGPAY', 'DIVPARM', 2, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (664, 'CFGATCARD', 'DIVPARM', 2, 9, 'E',=
 0);
+INSERT INTO profile_menu VALUES (665, 'CFGACC', 'DIVPARM', 2, 6, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (668, 'ANCHOP', 'ANCIMP', 2, 10, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (669, 'COMPTA', NULL, 2, 40, 'M', 0);
+INSERT INTO profile_menu VALUES (672, 'ANCGL', 'ANCIMP', 2, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (673, 'CFGTVA', 'DIVPARM', 2, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (674, 'ANCBS', 'ANCIMP', 2, 30, 'E', 0);
+INSERT INTO profile_menu VALUES (675, 'ANCBC2', 'ANCIMP', 2, 40, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (676, 'ANCTAB', 'ANCIMP', 2, 50, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (677, 'ANCBCC', 'ANCIMP', 2, 60, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (678, 'ANCGR', 'ANCIMP', 2, 70, 'E', 0);
+INSERT INTO profile_menu VALUES (679, 'CSV:AncGrandLivre', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (680, 'new_line', NULL, 2, 35, 'M', 0);
+INSERT INTO profile_menu VALUES (681, 'CFGCATDOC', 'DIVPARM', 2, 8, 'E',=
 0);
+INSERT INTO profile_menu VALUES (683, 'PRINTGL', 'PRINT', 2, 20, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (684, 'LET', 'COMPTA', 2, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (685, 'PRINTBAL', 'PRINT', 2, 50, 'E', 0=
);
+INSERT INTO profile_menu VALUES (686, 'PRINTREPORT', 'PRINT', 2, 85, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (688, 'PLANANC', 'ANC', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (689, 'CFGCARDCAT', 'DIVPARM', 2, 7, 'E'=
, 0);
+INSERT INTO profile_menu VALUES (690, 'ANCODS', 'ANC', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (717, 'CSV:ledger', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (718, 'PDF:ledger', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (719, 'PRINT', 'COMPTA', 2, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (720, 'CSV:postedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (721, 'MENUACH', 'COMPTA', 2, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (722, 'ACHIMP', 'MENUACH', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (723, 'GESTION', NULL, 2, 45, 'M', 0);
+INSERT INTO profile_menu VALUES (724, 'MENUODS', 'COMPTA', 2, 5, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (725, 'ODS', 'MENUODS', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (726, 'ODSIMP', 'MENUODS', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (727, 'ANC', NULL, 2, 50, 'M', 0);
+INSERT INTO profile_menu VALUES (728, 'VENMENU', 'COMPTA', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (729, 'VEN', 'VENMENU', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (730, 'VENIMP', 'VENMENU', 2, 2, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (731, 'FIN', 'MENUFIN', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (735, 'EXT', NULL, 2, 55, 'M', 0);
+INSERT INTO profile_menu VALUES (736, 'FREC', 'MENUFIN', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (737, 'FSALDO', 'MENUFIN', 2, 3, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (738, 'LETACC', 'LET', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (691, 'ANCGROUP', 'ANC', 2, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (692, 'ANCIMP', 'ANC', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (694, 'PRINTJRN', 'PRINT', 2, 10, 'E', 0=
);
+INSERT INTO profile_menu VALUES (695, 'PRINTREC', 'PRINT', 2, 100, 'E', =
0);
+INSERT INTO profile_menu VALUES (696, 'PRINTBILAN', 'PRINT', 2, 90, 'E',=
 0);
+INSERT INTO profile_menu VALUES (697, 'PREFERENCE', NULL, 2, 15, 'M', 0)=
;
+INSERT INTO profile_menu VALUES (698, 'CUST', 'GESTION', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (699, 'SUPPL', 'GESTION', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (700, 'ADM', 'GESTION', 2, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (701, 'CARD', 'GESTION', 2, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (702, 'STOCK', 'GESTION', 2, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (703, 'FORECAST', 'GESTION', 2, 7, 'E', =
0);
+INSERT INTO profile_menu VALUES (704, 'FOLLOW', 'GESTION', 2, 8, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (705, 'VERIFBIL', 'ADV', 2, 21, 'E', 0);
+INSERT INTO profile_menu VALUES (706, 'STOCK', 'ADV', 2, 22, 'E', 0);
+INSERT INTO profile_menu VALUES (707, 'PREDOP', 'ADV', 2, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (708, 'OPEN', 'ADV', 2, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (709, 'REPORT', 'ADV', 2, 25, 'E', 0);
+INSERT INTO profile_menu VALUES (710, 'CARD', 'COMPTA', 2, 7, 'E', 0);
+INSERT INTO profile_menu VALUES (711, 'HIST', 'COMPTA', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (712, 'ADV', 'COMPTA', 2, 20, 'E', 0);
+INSERT INTO profile_menu VALUES (713, 'ACCESS', NULL, 2, 25, 'M', 0);
+INSERT INTO profile_menu VALUES (714, 'CSV:histo', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (715, 'LOGOUT', NULL, 2, 30, 'M', 0);
+INSERT INTO profile_menu VALUES (716, 'PRINT', 'GESTION', 2, 4, 'E', 0);
+INSERT INTO profile_menu VALUES (739, 'LETCARD', 'LET', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (742, 'MENUFIN', 'COMPTA', 2, 4, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (743, 'FIMP', 'MENUFIN', 2, 2, 'E', 0);
+INSERT INTO profile_menu VALUES (744, 'SEARCH', NULL, 2, 60, 'M', 0);
+INSERT INTO profile_menu VALUES (745, 'ACH', 'MENUACH', 2, 1, 'E', 0);
+INSERT INTO profile_menu VALUES (746, 'PDF:postedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (747, 'CSV:fichedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (748, 'PDF:fichedetail', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (749, 'CSV:fiche_balance', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (750, 'PDF:fiche_balance', NULL, 2, NULL=
, 'P', 0);
+INSERT INTO profile_menu VALUES (751, 'CSV:report', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (752, 'PDF:report', NULL, 2, NULL, 'P', =
0);
+INSERT INTO profile_menu VALUES (753, 'CSV:fiche', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (754, 'PDF:fiche', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (755, 'CSV:glcompte', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (756, 'PDF:glcompte', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (757, 'PDF:sec', NULL, 2, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (758, 'CSV:AncList', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (759, 'CSV:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (760, 'PDF:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (761, 'CSV:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (762, 'PDF:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
+INSERT INTO profile_menu VALUES (763, 'CSV:balance', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (764, 'PDF:balance', NULL, 2, NULL, 'P',=
 0);
+INSERT INTO profile_menu VALUES (765, 'CSV:AncTable', NULL, 2, NULL, 'P'=
, 0);
+INSERT INTO profile_menu VALUES (766, 'CSV:AncAccList', NULL, 2, NULL, '=
P', 0);
+INSERT INTO profile_menu VALUES (767, 'CSV:AncBalGroup', NULL, 2, NULL, =
'P', 0);
+INSERT INTO profile_menu VALUES (768, 'OTH:Bilan', NULL, 2, NULL, 'P', 0=
);
+INSERT INTO profile_menu VALUES (769, 'PRINTPOSTE', 'PRINT', 2, 30, 'E',=
 0);
+INSERT INTO profile_menu VALUES (770, 'PRINTCARD', 'PRINT', 2, 40, 'E', =
0);
+INSERT INTO profile_menu VALUES (777, 'CFGPRO', 'MOD', 2, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (778, 'CFGMENU', 'MOD', 2, NULL, 'E', 0)=
;
+INSERT INTO profile_menu VALUES (772, 'DASHBOARD', NULL, 2, 10, 'M', 1);
=20
=20
 --
@@ -673,8 +669,6 @@
 --
=20
 INSERT INTO profile_user VALUES ('phpcompta', 1, 1);
-INSERT INTO profile_user VALUES ('acama-viramar', 2, 1);
-INSERT INTO profile_user VALUES ('adama', 5, 6);
=20
=20
 --

Modified: phpcompta/trunk/sql/tmp_pcmn_ins.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/tmp_pcmn_ins.sql	2011-11-25 16:20:12 UTC (rev 447=
6)
+++ phpcompta/trunk/sql/tmp_pcmn_ins.sql	2011-11-26 01:14:51 UTC (rev 447=
7)
@@ -1,4 +1,4 @@
-ZCREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_ins()
+CREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_ins()
   RETURNS trigger AS
 $BODY$
 declare

Modified: phpcompta/trunk/sql/tva.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/tva.sql	2011-11-25 16:20:12 UTC (rev 4476)
+++ phpcompta/trunk/sql/tva.sql	2011-11-26 01:14:51 UTC (rev 4477)
@@ -9,11 +9,15 @@
=20
=20
=20
-alter table quant_purchase add qp_vat_sided number (20,4);
-alter table quant_sold add qs_vat_sided number (20,4);
+alter table quant_purchase add qp_vat_sided numeric (20,4);
+alter table quant_sold add qs_vat_sided numeric (20,4);
=20
 alter table quant_purchase alter qp_vat_sided set default 0.0;
-alter table quant_solde alter qs_vat_sided set default 0.0;
+alter table quant_sold alter qs_vat_sided set default 0.0;
+
+update quant_purchase set qp_vat_sided=3D0.0;
+update quant_sold set qs_vat_sided=3D0.0;
+
 comment on column quant_purchase.qp_vat_sided is 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
 comment on column quant_purchase.qp_vat_sided is 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
=20
@@ -96,7 +100,7 @@
=20
=20
=20
-DROP FUNCTION comptaproc.insert_quant_purchase(text,numeric, character v=
arying,numeric,numeric,numeric,integer,,numeric,numeric,,numeric,numeric,=
character varying, numeric);
+DROP FUNCTION comptaproc.insert_quant_purchase(text,numeric, character v=
arying,numeric,numeric,numeric,integer,numeric,numeric,numeric,numeric,ch=
aracter varying);
 -- procedure insert_quant_purchase
 CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(p_internal t=
ext, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price =
numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva=
 numeric, p_nd_tva_recup numeric, p_dep_priv numeric, p_client character =
varying,p_tva_sided numeric)
  RETURNS void

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	2011-11-25 16:20:12 UTC (rev 4476)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-26 01:14:51 UTC (rev 4477)
@@ -27,8 +27,6 @@
 \i ajax-direct-form.sql
=20
 \i mode_paiement.sql
-\i anc-modularity-imp.sql
-\i anc-grandlivre.sql
 \i tva.sql
 create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
=20



From MAILER-DAEMON Fri Nov 25 20:10:20 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RU6ma-00077W-0D
	for mharc-phpcompta-dev@gnu.org; Fri, 25 Nov 2011 20:10:20 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 26 Nov 2011 02:15:20 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.49811.1322269819.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r195 - in trunk: amortis importbank modop tool_pcmn
	tools 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: Sat, 26 Nov 2011 01:10:19 -0000

Author: danydb
Date: 2011-11-26 02:15:17 +0100 (Sat, 26 Nov 2011)
New Revision: 195

Modified:
   trunk/amortis/index.php
   trunk/importbank/index.php
   trunk/modop/index.php
   trunk/tool_pcmn/index.php
   trunk/tools/index.php
   trunk/tva/ajax.php
   trunk/tva/index.php
Log:
add minimum version to 6.0

Modified: trunk/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/index.php	2011-11-22 22:31:01 UTC (rev 194)
+++ trunk/amortis/index.php	2011-11-26 01:15:17 UTC (rev 195)
@@ -19,7 +19,7 @@
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
+Extension::check_version(4400);
 /*!\file
  * \brief main entry
  */

Modified: trunk/importbank/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/importbank/index.php	2011-11-22 22:31:01 UTC (rev 194)
+++ trunk/importbank/index.php	2011-11-26 01:15:17 UTC (rev 195)
@@ -30,6 +30,7 @@
 require_once('include/class_import_bank.php');
 require_once('bank_constant.php');
 require_once('class_html_table.php');
+Extension::check_version(4400);
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_banqu=
e" target=3D"_blank">Aide</a></div>';
 $cn=3Dnew Database(dossier::id());

Modified: trunk/modop/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/index.php	2011-11-22 22:31:01 UTC (rev 194)
+++ trunk/modop/index.php	2011-11-26 01:15:17 UTC (rev 195)
@@ -23,7 +23,7 @@
 /*!\file
  * \brief modify a operation
  */
-Extension::check_version(3432);
+Extension::check_version(4400);
 $str=3Dnew IConcerned("jr_id");
 $str->value=3D(isset($_GET['jr_id']))?strtoupper($_GET['jr_id']):'';
 $str->value=3D(isset($_GET['ext_jr_id']))?strtoupper($_GET['ext_jr_id'])=
:$str->value;

Modified: trunk/tool_pcmn/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/tool_pcmn/index.php	2011-11-22 22:31:01 UTC (rev 194)
+++ trunk/tool_pcmn/index.php	2011-11-26 01:15:17 UTC (rev 195)
@@ -27,7 +27,7 @@
 /*
  * load javascript
  */
-
+Extension::check_version(4400);
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_plan_=
comptable" target=3D"_blank">Aide</a></div>';
 $cn=3Dnew Database(dossier::id());

Modified: trunk/tools/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/tools/index.php	2011-11-22 22:31:01 UTC (rev 194)
+++ trunk/tools/index.php	2011-11-26 01:15:17 UTC (rev 195)
@@ -23,6 +23,7 @@
 /*!\file
  * \brief main file for tools
  */
+Extension::check_version(4400);
=20
 /*
  * load javascript
@@ -38,7 +39,6 @@
          array($url.'&sa=3Dop',_('Op=C3=A9ration'),_('Changer poste comp=
table ou fiche'),1),
          array($url.'&sa=3Dpj',_('Pi=C3=A8ce'),_('R=C3=A9num=C3=A9roter =
des pi=C3=A8ces justificative'),2)
        );
-Extension::check_version(4190);
=20
 $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
 $def=3D0;

Modified: trunk/tva/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/ajax.php	2011-11-22 22:31:01 UTC (rev 194)
+++ trunk/tva/ajax.php	2011-11-26 01:15:17 UTC (rev 195)
@@ -57,21 +57,26 @@
       $ledger=3Dnew Acc_ledger($cn,0);
       $sel_ledger=3D$ledger->select_ledger('ODS',1);
       $r.=3Dh2info('G=C3=A9n=C3=A9ration =C3=A9criture');
-
-      $r.=3D'<form onsubmit=3D"save_write(this);return false;">';
-      $decl=3Dnew Ext_Tva($cn);
-      $decl->set_parameter('id',$_GET['p_id']);
-      $decl->load();
-      $date=3Dnew IDate('pdate');
-      $r.=3D"Date :".$date->input().'<br>';
-      $r.=3D"Choix du journal : ".$sel_ledger->input();
-      $r.=3D$decl->propose_form();
-      $r.=3DHtmlInput::hidden('mt',microtime(true));
-      $r.=3DHtmlInput::extension();
-      $r.=3Ddossier::hidden();
-      $r.=3DHtmlInput::submit('save','Sauver','onclick=3D"return confirm=
(\'Vous confirmez ? \')"');
-      $r.=3D'</form>';
-    } else
+	  if ($sel_ledger !=3D null)
+	  {
+		  $r.=3D'<form onsubmit=3D"save_write(this);return false;">';
+		  $decl=3Dnew Ext_Tva($cn);
+		  $decl->set_parameter('id',$_GET['p_id']);
+		  $decl->load();
+		  $date=3Dnew IDate('pdate');
+		  $r.=3D"Date :".$date->input().'<br>';
+		  $r.=3D"Choix du journal : ".$sel_ledger->input();
+		  $r.=3D$decl->propose_form();
+		  $r.=3DHtmlInput::hidden('mt',microtime(true));
+		  $r.=3DHtmlInput::extension();
+		  $r.=3Ddossier::hidden();
+		  $r.=3DHtmlInput::submit('save','Sauver','onclick=3D"return confirm(\=
'Vous confirmez ? \')"');
+		  $r.=3D'</form>';
+		} else {
+			$r.=3D'<h2 class=3D"error"> Aucun journal accessible</h2>';
+		}
+	}
+	else
     {
       $ctl=3D'record_write';
       $r=3DHtmlInput::anchor_close($ctl);

Modified: trunk/tva/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/index.php	2011-11-22 22:31:01 UTC (rev 194)
+++ trunk/tva/index.php	2011-11-26 01:15:17 UTC (rev 195)
@@ -23,7 +23,7 @@
 /*!\file
  * \brief main file for tva
  */
-Extension::check_version(3600);
+Extension::check_version(4400);
=20
 $url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];
 $array=3Darray (



From MAILER-DAEMON Sat Nov 26 09:54:36 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUJeG-0006hv-K0
	for mharc-phpcompta-dev@gnu.org; Sat, 26 Nov 2011 09:54:36 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 26 Nov 2011 15:59:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.50720.1322319275.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4478 - in phpcompta/trunk: html html/image 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, 26 Nov 2011 14:54:34 -0000

Author: danydb
Date: 2011-11-26 15:59:15 +0100 (Sat, 26 Nov 2011)
New Revision: 4478

Added:
   phpcompta/trunk/html/image/bg-submit4.png
Modified:
   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/html/user_login.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/impress_gl_comptes.inc.php
   phpcompta/trunk/include/template/module.php
Log:
improve style

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


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

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	2011-11-26 01:14:51 UTC (rev 447=
7)
+++ phpcompta/trunk/html/style-color.css	2011-11-26 14:59:15 UTC (rev 447=
8)
@@ -1,24 +1,24 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-  background-color:#EBE4E8;
- font-size:10;
-  font-family:arial,helvetica,sans-serif;
-  padding: 0px 10px 0px 10px ;
-  margin:0;
-  color:black;
+	background-color:#EDF3FF;
+	font-size:12px;
+	font-family:verdana,helvetica,sans-serif;
+	padding: 0px 10px 0px 10px ;
+	margin:0;
+	color:blue;
 }
 .notice {
-		color:red;
-        font-style: italic;
-        }
+	color:red;
+	font-style: italic;
+}
=20
 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 {
@@ -28,61 +28,76 @@
=20
 }
 table.table_large th,table.result th {
-  font-weight:bold;
- border-bottom:1px solid blue;
- border-top:0;
+	font-weight:bold;
+	font-family:verdana,helvetica,sans-serif;
+	border-bottom:1px solid blue;
+	border-top:0;
=20
-  color:#25238F;
-  text-align: left;
-  font-style: italic;
+	color:#25238F;
+	text-align: left;
+	font-style: italic;
=20
 }
=20
 h2 {
-
-  font-size:14px;
-  color:grey;
+	font-family:verdana,helvetica,sans-serif;
+	font-size:14px;
+	color:grey;
 }
 div.info {
 	background:#879ed4;
 	color:white;
 	font-size:120%;
-  text-align:center;
+	text-align:center;
 }
=20
 content h2.info {
 	background:#879ed4;
-  color:black;
-  font-size:14pt;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+	color:black;
+	font-size:14pt;
+	text-align:center;
+	padding:0px;
+	margin:0px;
 }
 redcontent h2.info {
-  background:#879ed4;
-  color:white;
-  font-size:14pt;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+	background:#879ed4;
+	color:white;
+	font-size:14pt;
+	text-align:center;
+	padding:0px;
+	margin:0px;
 }
 h2.info {
-  background-color:darkgray;
+	background-color:#8989E5;
 	color:white;
 	font-size:14px;
-  text-align:center;
-  padding:0 px;
-  margin:0px;=20
-  padding-bottom:3px;
- =20
+	text-align:center;
+	padding:0px;
+	margin:0px;
+	border:1px solid grey;
+
 }
-
+table h2.info
+{
+	font-variant: small-caps;
+	background-color: inherit;
+	color:darkblue;
+}
 h3.info {
-  background:#879ed4;
-  color:white;
-  font-size:14px;
-  text-align:center;
+	background:#879ed4;
+	color:white;
+	font-size:14px;
+	text-align:center;
 }
+
+h2.info2 {
+	color:blue;
+	font-size:14px;
+	text-align:center;
+
+}
+
+
 h2.error {
 	background:red;
 	color:white;
@@ -95,136 +110,141 @@
 }
=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%;
-	}
+}
 div.u_tool div.name {
-       float:left;
-       margin-left:10px;
+	float:left;
+	margin-left:10px;
 }
-div.u_tool div.acces_direct{
+div.u_tool {
 	float:right;
 	margin-right:10px;
 	text-align:right;
=20
 }
-
+div.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;
+	float:left;
+	clear:left;
 	font-size:9px;
=20
 }
 div.lextmenu {
=20
 	float:left;
-
+	font-family:verdana,helvetica,sans-serif;
 	font-size:9px;
=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;
=20
-  border-style:outset;
-  border-width:1px;
-
 }
 div.redcontent{
=20
-         float:left;
-	 padding-top:7px;
-	 padding-left:8px;
-         font-size:9px;
+	float:left;
+	padding-top:7px;
+	padding-left:8px;
+	font-size:9px;
+	font-family:verdana,helvetica,sans-serif;
+	width:75%;
=20
-	 width:75%;
-
 }
 div.content{
=20
-         float:left;
-		padding-top:7px;
-         width:80%;
-		margin-left:10%;
-		margin-right:10%;
-	=09
-         clear:both;
+	float:left;
+	padding-top:7px;
+	width:100%;
+	font-family:verdana,helvetica,sans-serif;
+	clear:both;
=20
=20
 }
 div.content30{
=20
-         float:left;
-	 padding-top:7px;
-         width:35%;
+	float:left;
+	padding-top:7px;
+	width:35%;
+	font-family:verdana,helvetica,sans-serif;
=20
-
 }
 div.no span{
 	position:static;
-
+	font-family:verdana,helvetica,sans-serif;
 	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;
-
-  border-bottom:2px solid blue;
-  border-top:0;
-  color:#25238F;
-  text-align: left;
-  background-color:#EDF3FF;
-  font-style: italic;
+	font-weight:bold;
+	font-family:verdana,helvetica,sans-serif;
+	border-bottom:2px solid blue;
+	border-top:0;
+	color:#25238F;
+	text-align: left;
+	background-color:#EDF3FF;
+	font-style: italic;
 }
 .error {
-width:60%;
-margin-left:20%;
-text-align: center;
+	width:60%;
+	margin-left:20%;
+	text-align: center;
=20
-color:white;
-background-color:red;
-font-weight: bolder;
-font-size:120%;
+	color:white;
+	background-color:red;
+	font-weight: bolder;
+	font-size:120%;
 }
=20
 table.mtitle {
@@ -232,20 +252,20 @@
 	text-align:center
 }
 td.mshort {
-  height:15px;
-  width:60px;
-  text-align:center;
-  border:  1px solid;
-  color:#5D90CD ;
-  background-color:#DDE6FF;
+	height:15px;
+	width:60px;
+	text-align:center;
+	border:  1px solid;
+	color:#5D90CD ;
+	background-color:#DDE6FF;
 }
 td.mtitle {
 	text-align:center;
 	width:95px;
-        height :30px;
+	height :30px;
 	font-size:10px;
-    background-color:#99B1DF;
-    border:1px solid #DDE6FF;
+    background-color:#DDE6FF;
+    border:1px solid #99B1DF;
 }
 td.msubtitle {
 	text-align:center;
@@ -260,19 +280,17 @@
 	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:gray;
+	background-color:#DDE6FF;
 	font-size:10px;
-	color:white;
-=09
 }
 tr {
 	font-size:10px;
@@ -286,85 +304,85 @@
 	font-size:10px;
 }
 td.cell{
-	    height:32px;
-	     padding: 1px;
+	height:32px;
+	padding: 1px;
 }
 td.selectedcell{
 	border-style:inset;
-        border-color:blue;
+	border-color:blue;
 	border-width:1pt ;
 	font-size:10px;
-        background:#5D90CD ;
-        color:white;
-        text-align:center;
-	     width:120px;
+	background:#5D90CD ;
+	color:white;
+	text-align:center;
+	width:120px;
 }
 a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
- color: black;
+	font-size:10px;
+	text-decoration:none;
+	display:inline;
+	color: blue;
=20
 }
 a.mtitle:hover {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
+	font-size:10px;
+	text-decoration:none;
+	display:inline;
=20
- color: red;
-background-color:#5D90CD;
+	color: darkblue;
+	background-color:#5D90CD;
=20
 }
 td.selectedcell a.mtitle {
- font-size:1em;
- text-decoration:none;
- display:block;
- color:white;
+	font-size:1em;
+	text-decoration:none;
+	display:block;
+	color:white;
 }
 a.dossier {
-  font-size:10px;
-  text-decoration:none;
-  display:block;
-   color: #202267;
+	font-size:10px;
+	text-decoration:none;
+	display:block;
+	color: #202267;
=20
 }
 tr.odd:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:yellow;
+	text-decoration:none;
+	background-color: #a9d6e4;
+	color:white;
 }
 tr.even:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:yellow;
+	text-decoration:none;
+	background-color: #a9d6e4;
+	color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:yellow;
+	background-color:#a9d6e4;
+	color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:yellow;
+	background-color:#a9d6e4;
+	color:white;
 }
 a.cell {
-  text-decoration:none;
-  display:block;
-  color:blue;
-  background-color:white;
-  font-size:9px;
+	text-decoration:none;
+	display:block;
+	color:blue;
+	background-color:white;
+	font-size:9px;
 }
=20
 a.cell:hover {
-  font-size:9px;
-  color:yellow;
-  background-color:#5D90CD;
-  text-decoration:none;
-  display:block;
-	}
+	font-size:9px;
+	color:white;
+	background-color:#5D90CD;
+	text-decoration:none;
+	display:block;
+}
=20
=20
 a.one:link {
@@ -374,23 +392,23 @@
 a.one:visited {
 	text-decoration:none;
 	color:#3010FF
-	}
+}
=20
 a.one:active {
 	background: #0000FF;
-	}
+}
=20
 a.one:hover {
-	    text-decoration:underline;
+	text-decoration:underline;
 	background:#3010FF;
 	color:#FFFFFF;
-	}
+}
=20
=20
 a.detail
 {
-  font-size:9px;
-
+	font-size:9px;
+	font-family:verdana,helvetica,sans-serif;
     text-decoration: none;
     display: block;
     color: blue;
@@ -398,8 +416,8 @@
=20
 a.detail:hover
 {
-  font-size:9px;
-
+	font-size:9px;
+	font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -407,19 +425,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;
=20
-  text-decoration: none;
-  display: block;
-  color: blue;
-
 }
=20
 div.redcontent a:hover {
-
+	font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -427,17 +445,17 @@
=20
 }
 div.content a {
+	font-family:verdana,helvetica,sans-serif;
+	text-decoration: none;
+	display: block;
+	color: blue;
+	padding: 0;
=20
-  text-decoration: none;
-  display: block;
-  color: blue;
-padding: 0;
-
 }
=20
=20
 div.content a:hover {
-
+	font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -446,108 +464,108 @@
 }
=20
 div.redcontent a.mtitle {
-  text-decoration:none;
-  display:inline;
+	text-decoration:none;
+	display:inline;
=20
=20
-  color:black;
+	color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  color:white;
-  background-color:darkblue;
+	text-decoration:none;
+	display:inline;
+	color:white;
+	background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
-  color:blue;
+	font-size:10px;
+	text-decoration:none;
+	display:inline;
+	color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:darkblue;
-  color:white;
+	text-decoration:none;
+	display:inline;
+	background-color:darkblue;
+	color:white;
=20
=20
 }
 div.redcontent input.text {
-
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  background-color:greenyellow;
-  border-width:1px;
-  color:blue;
+	font-family:verdana,helvetica,sans-serif;
+	font-weight:normal;
+	border-color:336699;
+	border-style:solid;
+	background-color:orange;
+	border-width:1px;
+	color:blue;
 }
 div.content input.text {
-
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  border-width:1px;
-  background-color:greenyellow;
-  color:blue;
+	font-family:verdana,helvetica,sans-serif;
+	font-weight:normal;
+	border-color:336699;
+	border-style:solid;
+	border-width:1px;
+	background-color:orange;
+	color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-  background-color:greenyellow;
+	background-color:orange;
 }
 div.content input:focus {
-  background-color:greenyellow;
+	background-color:orange;
 }
 div.redcontent textarea:focus {
-background-color: greenyellow;
+	background-color: orange;
 }
 .document {
-color: #1a207d;
-border-collapse:collapse;
+	color: #1a207d;
+	border-collapse:collapse;
 }
 a.document{
-  font-size:12px;
-  text-decoration:none;
-  display:block;
+	font-size:12px;
+	text-decoration:none;
+	display:block;
 }
 a.document:hover {
-  text-decoration:none;
-  display:block;
+	text-decoration:none;
+	display:block;
=20
=20
 }
 .input_text {
-	   border:groove 1px blue;
+	border:groove 1px blue;
 	margin:1px;
 }
 .input_text:hover {
 	border:groove 1px blue;
 	margin:1px;
-	background-color: greenyellow;
+	background-color: orange;
 }
 legend {
-font-weight: bold;
-font-style: italic;
-font-size: 120% ;
+	font-weight: bold;
+	font-style: italic;
+	font-size: 120% ;
=20
 }
 fieldset fieldset legend {
-	 font-size:110%;
-	 color:grey;
-	 }
+	font-size:110%;
+	color:grey;
+}
 select {
-border: 1px solid blue;
-margin:2px;
-background-color:white;
+	border: 1px solid blue;
+	margin:2px;
+	background-color:white;
=20
=20
 }
@@ -555,18 +573,18 @@
=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 {
@@ -578,24 +596,24 @@
 }
 tr.priority1 {
 	background-color:red;
-	}
+}
 span.action a.action {
-  border:2px outset ;
-  padding-left: 3px;
-  padding-right:3px;
-  text-decoration:none;
-  font-size:14px;
+	border:2px outset ;
+	padding-left: 3px;
+	padding-right:3px;
+	text-decoration:none;
+	font-size:14px;
=20
-  display:inline;
-  color:black;
-  background-color:lightgrey;
+	display:inline;
+	color:black;
+	background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:lightblue;
-  color:black;
+	text-decoration:none;
+	display:inline;
+	background-color:lightblue;
+	color:black;
 }
 div.popup_back{
 	position:absolute;
@@ -622,7 +640,7 @@
 	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;
@@ -632,7 +650,7 @@
 	/*opacity:1;
 	filter:alpha(opacity=3D100);*/
=20
-	}
+}
 div.popup_border_notitle {
 	position:absolute;
 	top:20%;
@@ -644,7 +662,7 @@
 	/*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;
@@ -653,7 +671,7 @@
 	/*opacity:0.7;
 	filter:alpha(opacity=3D70);
 	*/
-	}
+}
=20
 div.popup_content {
 	position:absolute;
@@ -666,7 +684,7 @@
 	overflow: auto;
 	background-color:#DFE7FF;
 	font-size:10px ;
-
+	font-family: verdana,helvetica,sans-serif;
 	font-style: normal;
 	font-weight: normal;
 	color: black;
@@ -677,13 +695,13 @@
 	filter:alpha(opacity=3D100);*/
 }
 div.autocomplete {
-  position:relative;
-  background-color:white;
-  border:1px solid #888;
-  margin:0;
-  padding:0;
-  text-align:left;
-  font-size:12px;
+	position:relative;
+	background-color:white;
+	border:1px solid #888;
+	margin:0;
+	padding:0;
+	text-align:left;
+	font-size:12px;
=20
 }
 div.autocomplete em {
@@ -691,45 +709,45 @@
 	font-weight:bold;
 }
 div.autocomplete ul {
-  list-style-type:none;
-  background-color:white;
-  border:1px solid #888;
-  width:375px;
-  margin:0;
-  padding:0;
+	list-style-type:none;
+	background-color:white;
+	border:1px solid #888;
+	width:375px;
+	margin:0;
+	padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
-  list-style-type:none;
-  display:block;
-  margin:0;
-  padding:0px;
-  /*height:32px;*/
-  cursor:pointer;
+	list-style-type:none;
+	display:block;
+	margin:0;
+	padding:0px;
+	/*height:32px;*/
+	cursor:pointer;
 }
 span.informal{ font-size:95%; color:black;}
=20
 ul.select_table  {
 	/*padding:5px;*/
 	overflow:hidden;
-	}
+}
 ul.select_table a{
 	width:100%;
 	display:block;
 	background-color:inherit;
 	color: black;
 	text-decoration:none;
-	}
+}
 ul.select_table a:hover{
 	background-color:white;
 	color:black;
 	/*text-decoration:underline;*/
-	}
+}
 ul.select_table li {
 	display:table-row;
 	list-style-type: none;
-	}
+}
 ul.select_table li span {
 	display:table-cell;
 	width:25em;
@@ -738,10 +756,10 @@
 }
=20
 div.pc_calendar{
-		border:1px groove grey;
-		float:left;
=20
-		}
+	float:left;
+
+}
 div.pc_calendar table {
 	text-align:center;
=20
@@ -752,7 +770,8 @@
=20
 }
 div.pc_calendar td{
-	width:10em;
+	width:14%;
+	border:#879ed4 solid 1px;
 }
=20
 div.pc_calendar td.weekend {
@@ -779,72 +798,76 @@
=20
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
--moz-user-focus:ignore;
--moz-user-input:disabled;
-background-color:lightgrey;
-color:black;
-cursor:inherit;
+	-moz-user-focus:ignore;
+	-moz-user-input:disabled;
+	background-color:lightgrey;
+	color:black;
+	cursor:inherit;
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
 	font-size:10;
-	color:white;
+	color:darkblue;
 	font-weight: bold;
=20
 	text-decoration:none;
-
-	background-image: url("image/bg-submit3.gif");
-	background-repeat: repeat-x;
-	background-position: left;
-	height:24px;
+	font-family: arial,helvetica,sans-serif;
+	background-color: ##DEE3E5;
+	border-style:  solid ;
 	border-color:  blue ;
-	border-width:0;
+	border-width:1;
 	padding-bottom: 4;
 	padding-top: 4;
 	padding-right: 6;
 	padding-left:  6;
 	margin-top:3px;
+	margin-bottom:3px;
+	margin-right:3px;
+	margin-left:3px;
 	cursor:pointer;
-	margin:1 2 1 2;
-	-moz-border-radius:6;
-	border-radius:6;
+	-moz-border-radius:5 5;
+	border-radius:5 5;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
 	cursor:pointer;
-	background-color:white;
-	color:yellow;
-	margin:1 2 1 2;
-	}
-	td.tool {
+	background-color:darkblue;
+	color:#DEE3E5;
+	margin-top:3px;
+	margin-bottom:3px;
+	margin-right:3px;
+	margin-left:3px;
+}
+td.tool {
 	border: solid 1px gray;
=20
-	}
+}
 div.topmenu {
-	width:80%;
-	margin-left:10%;
-=09
+	float:left;
+	width:100%;
+
 }
=20
 h2.dossier {
 	color:darkblue;
 	font-style: italic;
+	display:inline;
=20
-font-size:20px;
-margin:0;
-padding:0;
-text-align:center;
+	font-size:14px;
+	margin:0;
+	padding:0;
+	text-align:center;
 }
 /* </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}
+	border:1px solid blue;
+	display:none;
+	background-color:#BFD0FF;
+	padding:3;
+	position:absolute;
+	text-align:left;
+	line-height:3em;
+	z-index:1}
 div.welcome {
=20
 }
@@ -856,57 +879,56 @@
 h2.gest_name {
 	border-left: 5px solid  #403a8d;
 	border-bottom:1px solid  #b4bbc2;
-		border-top:1px solid  #b4bbc2;
-		border-right:1px solid  #b4bbc2;
+	border-top:1px solid  #b4bbc2;
+	border-right:1px solid  #b4bbc2;
 	padding: 5px;
 }
 div.op_detail_frame  {
-  background-color:#e4e7ed;
-  height:100%; width:100%;
+	background-color:#e4e7ed;
+	height:100%; width:100%;
=20
=20
 }
 div.inner_box  {
-  background-color:#dddddd;
- font-size:12;
+	background-color:#e4e7ed;
+	font-size:10;
+	font-family:verdana,helvetica,sans-serif;
+	padding:0;
+	margin:0;
+	overflow:hidden;
+	z-index:3;
=20
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:3;
+	position:absolute;
+	left:10%;
=20
-position:absolute;
-left:10%;
=20
+	border:1px solid darkblue;
=20
-
-border:1px solid darkblue;
-
 }
 div.op_detail_title {
 	background-color:grey;
-/*	width:500;*/
+	/*	width:500;*/
=20
=20
 }
 div#div_jrn{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-		      background-color:#EDF3FF;
+	position:absolute;
+	border:1px solid black;
+	top:15%;left:100;
+	visibility:hidden;
+	z-index:2;
+	width:50em;
+	background-color:#EDF3FF;
=20
 }
- div#div_cat{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-             background-color:#EDF3FF;
+div#div_cat{
+	position:absolute;
+	border:1px solid black;
+	top:15%;left:100;
+	visibility:hidden;
+	z-index:2;
+	width:50em;
+	background-color:#EDF3FF;
=20
 }
=20
@@ -915,14 +937,14 @@
=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:100;
+	margin-left:25%
+		z-index:2;
+	width:50%;
+	display:none;
+	background-color:#e4e7ed;
 }
=20
 table.table_large td, table.result td
@@ -934,12 +956,11 @@
 {
 	font-size:18;
 	width:100%;
-
 }
 table.info_op tr
 {
-font-size:14;
-background:white;
+	font-size:14;
+	background:white;
 }
 h2#jrn_name
 {
@@ -956,7 +977,7 @@
 span.remain {
 	font-weight: bold;
 	color:black;
-	}
+}
=20
 div#jrn_name_div
 {
@@ -984,64 +1005,66 @@
 }
 div#wait_box
 {
-  background-color:#F1E6E6;
- font-size:10;
+	background-color:#F1E6E6;
+	font-size:10;
+	font-family: verdana,helvetica,arial,sans-serif;
+	padding:0;
+	margin:0;
+	overflow:hidden;
+	z-index:10;
=20
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:10;
+	position:absolute;
+	left:30%;
+	top:30%;
=20
-position:absolute;
-left:30%;
-top:30%;
=20
+	border:1px solid darkblue;
=20
-border:1px solid darkblue;
-
 }
 #wait_box h2
 {
-color:black;
-text-align:center;
+	color:black;
+	text-align:center;
 }
 div#div_jrnsearch_op{
-			 position:absolute;
-			  z-index: 5;
-              border:1px solid black;
-              display:none;
-              width:50em;
-		      background-color:#EDF3FF;
=20
+	border:1px solid black;
+	display:none;
+	width:50em;
+	background-color:#EDF3FF;
+	position:absolute;
+	z-index: 5;
+
 }
 ul {
 	padding-left: 110px;
 }
 a.line,div.content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
- color: #0000ff;
+	font-size:110%;
+	text-decoration:underline;
+	display:inline;
+	color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
-  color: #0000ff;
-     background-color: rgb(93, 144, 205);
+	font-size:110%;
+	text-decoration:underline;
+	display:inline;
+	color: #0000ff;
+	background-color: rgb(93, 144, 205);
 }
 #close_div
 {
- background-color:white;
- color:red;
- text-decoration:none;
- border:1px solid red;
- margin-left: 2px;
- margin-right:2px;
- margin-top:0px;
- font-size:10px;
+	background-color:white;
+	color:red;
+	font-family: arial;
+	text-decoration:none;
+	border:1px solid red;
+	margin-left: 2px;
+	margin-right:2px;
+	margin-top:0px;
+	font-size:10px;
 }
 table.table_large tr.odd ,table.table_large tr.even {
=20
@@ -1066,4 +1089,4 @@
     display:block;
     margin: 20px;
     font-weight: bold;
-}
\ No newline at end of file
+}

Modified: phpcompta/trunk/html/style-epad.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-epad.css	2011-11-26 01:14:51 UTC (rev 4477=
)
+++ phpcompta/trunk/html/style-epad.css	2011-11-26 14:59:15 UTC (rev 4478=
)
@@ -1,95 +1,99 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-  background-color:#EDF3FF;
- font-size:14;
-  font-family:helvetica,sans-serif;
-  padding: 0px 10px 0px 10px ;
-  margin:0;
+	background-color:#EDF3FF;
+	font-size:14px;
+	font-family:verdana,helvetica,sans-serif;
+	padding: 0px 10px 0px 10px ;
+	margin:0;
+	color:blue;
 }
 .notice {
-		color:red;
-        font-style: italic;
-        }
+	color:red;
+	font-style: italic;
+}
=20
-table.result  ,table.resultfooter {
-  color:blue;
-  /* border:blue solid 1px; */
-  width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+table.table_large, table.result  ,table.resultfooter {
+	color:blue;
+	/* border:blue solid 1px; */
+	width:100%;
+	border-spacing:  0px;
+	border-collapse:collapse;
=20
 }
 table.resultfooter tfoot {
-	font-size:110%;
+	font-size:14%;
 	font-weight: bold;
=20
=20
 }
-table.result th {
-  font-weight:bold;
-  font-family:helvetica,sans-serif;
- border-bottom:2px solid blue;
- border-top:0;
+table.table_large th,table.result th {
+	font-weight:bold;
+	font-family:verdana,helvetica,sans-serif;
+	border-bottom:1px solid blue;
+	border-top:0;
=20
-  color:#25238F;
-  text-align: left;
-  	     // background-color:#EDF3FF;
+	color:#25238F;
+	text-align: left;
+	font-style: italic;
=20
-	      font-style: italic;
-
 }
=20
 h2 {
-  font-family:helvetica,sans-serif;
-  font-size:14px;
-  color:grey;
+	font-family:verdana,helvetica,sans-serif;
+	font-size:16px;
+	color:grey;
 }
 div.info {
 	background:#879ed4;
 	color:white;
-	font-size:120%;
-  text-align:center;
+	font-size:16px;
+	text-align:center;
 }
=20
 content h2.info {
 	background:#879ed4;
-  color:black;
-  font-size:14pt;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+	color:black;
+	font-size:16px;
+	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:16px;
+	text-align:center;
+	padding:0px;
+	margin:0px;
 }
 h2.info {
-  background-color:#879ED4;
+	background-color:#8989E5;
 	color:white;
-	font-size:14px;
-  text-align:center;
-  padding:0px;
-  margin:0px;
-  border:1px solid grey;
+	font-size:16px;
+	text-align:center;
+	padding:0px;
+	margin:0px;
+	border:1px solid grey;
=20
 }
-
+table h2.info
+{
+	font-variant: small-caps;
+	background-color: inherit;
+	color:darkblue;
+}
 h3.info {
-  background:#879ed4;
-  color:white;
-  font-size:14px;
-  text-align:center;
+	background:#879ed4;
+	color:white;
+	font-size:16px;
+	text-align:center;
 }
=20
 h2.info2 {
-  color:blue;
-  font-size:14px;
-  text-align:center;
+	color:blue;
+	font-size:16px;
+	text-align:center;
=20
 }
=20
@@ -97,143 +101,150 @@
 h2.error {
 	background:red;
 	color:white;
-	font-size:14px;
+	font-size:16px;
 }
=20
 h1.title {
 	color: blue;
-	font-size:25px;
+	font-size:27px;
 }
=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%;
-	}
+}
 div.u_tool div.name {
-       float:left;
-       margin-left:10px;
+	float:left;
+	margin-left:10px;
 }
-div.u_tool div.acces_direct{
+div.u_tool {
 	float:right;
 	margin-right:10px;
 	text-align:right;
=20
 }
-
+div.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:14px;
+	float:left;
+	clear:left;
+	font-size:11px;
=20
 }
 div.lextmenu {
=20
 	float:left;
-	font-family:helvetica,sans-serif;
-	font-size:14px;
+	font-family:verdana,helvetica,sans-serif;
+	font-size:11px;
=20
 }
 div.searchmenu {
-  left:30px;
-  width:95px;
-  top:100px;
-  position:absolute;
+	left:30px;
+	width:95px;
+	top:100px;
+	position:absolute;
=20
 }
=20
 div.recherche_form{
 	width:700px;
-	font-size:14px;
-	font-family:helvetica,sans-serif;
-  border-style:outset;
-  border-width:1px;
+	font-size:9px;
+	font-family:verdana,helvetica,sans-serif;
+	border-style:outset;
+	border-width:1px;
=20
 }
 div.redcontent{
=20
-         float:left;
-	 padding-top:7px;
-	 padding-left:8px;
-         font-size:9px;
-         font-family:helvetica,sans-serif;
-	 width:75%;
+	float:left;
+	padding-top:7px;
+	padding-left:8px;
+	font-size:12px;
+	font-family:verdana,helvetica,sans-serif;
+	width:75%;
=20
 }
 div.content{
=20
-         float:left;
-		padding-top:7px;
-         width:100%;
-         font-family:helvetica,sans-serif;
-         clear:both;
+	float:left;
+	padding-top:7px;
+	width:100%;
+	font-family:verdana,helvetica,sans-serif;
+	clear:both;
=20
=20
 }
 div.content30{
=20
-         float:left;
-	 padding-top:7px;
-         width:35%;
-         font-family:helvetica,sans-serif;
+	float:left;
+	padding-top:7px;
+	width:35%;
+	font-family:verdana,helvetica,sans-serif;
=20
 }
 div.no span{
 	position:static;
-	font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
 	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:helvetica,sans-serif;
-  border-bottom:2px solid blue;
-  border-top:0;
-  color:#25238F;
-  text-align: left;
-  background-color:#EDF3FF;
-  font-style: italic;
+	font-weight:bold;
+	font-family:verdana,helvetica,sans-serif;
+	border-bottom:2px solid blue;
+	border-top:0;
+	color:#25238F;
+	text-align: left;
+	background-color:#EDF3FF;
+	font-style: italic;
 }
 .error {
-width:60%;
-margin-left:20%;
-text-align: center;
+	width:60%;
+	margin-left:20%;
+	text-align: center;
=20
-color:white;
-background-color:red;
-font-weight: bolder;
-font-size:120%;
+	color:white;
+	background-color:red;
+	font-weight: bolder;
+	font-size:120%;
 }
=20
 table.mtitle {
@@ -241,137 +252,137 @@
 	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;
+	height :30px;
+	font-size:12px;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
 }
 td.msubtitle {
 	text-align:center;
 	height:20px;
-	font-size:10px;
+	font-size:12px;
     background-color:#DDE6FF;
 }
 span.mtitle {
 	color:gray;
 	background-color:blue;
-	font-size:10px;
+	font-size:12px;
 	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;
+	font-size:12px;
 }
 tr {
-	font-size:10px;
+	font-size:12px;
 }
 td.odd{
 	background-color:#DDE6FF ;
-	font-size:10px;
+	font-size:12px;
 }
 td.even{
 	border:0px;
-	font-size:10px;
+	font-size:12px;
 }
 td.cell{
-	    height:32px;
-	     padding: 1px;
+	height:32px;
+	padding: 1px;
 }
 td.selectedcell{
 	border-style:inset;
-        border-color:blue;
+	border-color:blue;
 	border-width:1pt ;
-	font-size:10px;
-        background:#5D90CD ;
-        color:white;
-        text-align:center;
-	     width:120px;
+	font-size:12px;
+	background:#5D90CD ;
+	color:white;
+	text-align:center;
+	width:120px;
 }
 a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
- color: blue;
+	font-size:12px;
+	text-decoration:none;
+	display:inline;
+	color: blue;
=20
 }
 a.mtitle:hover {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
+	font-size:12px;
+	text-decoration:none;
+	display:inline;
=20
- color: darkblue;
-background-color:#5D90CD;
+	color: darkblue;
+	background-color:#5D90CD;
=20
 }
 td.selectedcell a.mtitle {
- font-size:1em;
- text-decoration:none;
- display:block;
- color:white;
+	font-size:1em;
+	text-decoration:none;
+	display:block;
+	color:white;
 }
 a.dossier {
-  font-size:10px;
-  text-decoration:none;
-  display:block;
-   color: #202267;
+	font-size:12px;
+	text-decoration:none;
+	display:block;
+	color: #202267;
=20
 }
 tr.odd:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+	text-decoration:none;
+	background-color: #a9d6e4;
+	color:white;
 }
 tr.even:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+	text-decoration:none;
+	background-color: #a9d6e4;
+	color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+	background-color:#a9d6e4;
+	color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+	background-color:#a9d6e4;
+	color:white;
 }
 a.cell {
-  text-decoration:none;
-  display:block;
-  color:blue;
-  background-color:white;
-  font-size:12px;
+	text-decoration:none;
+	display:block;
+	color:blue;
+	background-color:white;
+	font-size:9px;
 }
=20
 a.cell:hover {
-  font-size:12px;
-  color:white;
-  background-color:#5D90CD;
-  text-decoration:none;
-  display:block;
-	}
+	font-size:9px;
+	color:white;
+	background-color:#5D90CD;
+	text-decoration:none;
+	display:block;
+}
=20
=20
 a.one:link {
@@ -381,23 +392,23 @@
 a.one:visited {
 	text-decoration:none;
 	color:#3010FF
-	}
+}
=20
 a.one:active {
 	background: #0000FF;
-	}
+}
=20
 a.one:hover {
-	    text-decoration:underline;
+	text-decoration:underline;
 	background:#3010FF;
 	color:#FFFFFF;
-	}
+}
=20
=20
 a.detail
 {
-  font-size:9px;
-  font-family:helvetica,sans-serif;
+	font-size:12px;
+	font-family:verdana,helvetica,sans-serif;
     text-decoration: none;
     display: block;
     color: blue;
@@ -405,8 +416,8 @@
=20
 a.detail:hover
 {
-  font-size:12px;
-  font-family:helvetica,sans-serif;
+	font-size:12px;
+	font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -414,19 +425,19 @@
 }
=20
 li.menuv,ol.menuv {
-	 display:inline;
-	 padding:1em 1em;
+	display:inline;
+	padding:1em 1em;
 }
 div.redcontent a {
-  font-family:helvetica,sans-serif;
-  text-decoration: none;
-  display: block;
-  color: blue;
+	font-family:verdana,helvetica,sans-serif;
+	text-decoration: none;
+	display: block;
+	color: blue;
=20
 }
=20
 div.redcontent a:hover {
-  font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -434,17 +445,17 @@
=20
 }
 div.content a {
-  font-family:helvetica,sans-serif;
-  text-decoration: none;
-  display: block;
-  color: blue;
-padding: 1px ;
+	font-family:verdana,helvetica,sans-serif;
+	text-decoration: none;
+	display: block;
+	color: blue;
+	padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-  font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -453,103 +464,108 @@
 }
=20
 div.redcontent a.mtitle {
-  text-decoration:none;
-  display:inline;
+	text-decoration:none;
+	display:inline;
=20
=20
-  color:black;
+	color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  color:white;
-  background-color:darkblue;
+	text-decoration:none;
+	display:inline;
+	color:white;
+	background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
-  color:blue;
+	font-size:10px;
+	text-decoration:none;
+	display:inline;
+	color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:darkblue;
-  color:white;
+	text-decoration:none;
+	display:inline;
+	background-color:darkblue;
+	color:white;
=20
=20
 }
 div.redcontent input.text {
-   font-family:helvetica,sans-serif;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  background-color:orange;
-  border-width:1px;
-  color:blue;
+	font-family:verdana,helvetica,sans-serif;
+	font-weight:normal;
+	border-color:336699;
+	border-style:solid;
+	background-color:orange;
+	border-width:1px;
+	color:blue;
 }
 div.content input.text {
-   font-family:helvetica,sans-serif;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  border-width:1px;
-  background-color:orange;
-  color:blue;
+	font-family:verdana,helvetica,sans-serif;
+	font-weight:normal;
+	border-color:336699;
+	border-style:solid;
+	border-width:1px;
+	background-color:orange;
+	color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-  background-color:orange;
+	background-color:orange;
 }
 div.content input:focus {
-  background-color:orange;
+	background-color:orange;
 }
 div.redcontent textarea:focus {
-background-color: orange;
+	background-color: orange;
 }
 .document {
-color: #1a207d;
-border-collapse:collapse;
+	color: #1a207d;
+	border-collapse:collapse;
 }
 a.document{
-  font-size:12px;
-  text-decoration:none;
-  display:block;
+	font-size:12px;
+	text-decoration:none;
+	display:block;
 }
 a.document:hover {
-  text-decoration:none;
-  display:block;
+	text-decoration:none;
+	display:block;
=20
=20
 }
 .input_text {
-	   border:groove 1px blue;
+	border:groove 1px blue;
 	margin:1px;
 }
+.input_text:hover {
+	border:groove 1px blue;
+	margin:1px;
+	background-color: orange;
+}
 legend {
-font-weight: bold;
-font-style: italic;
-font-size: 120% ;
+	font-weight: bold;
+	font-style: italic;
+	font-size: 120% ;
=20
 }
 fieldset fieldset legend {
-	 font-size:110%;
-	 color:grey;
-	 }
+	font-size:110%;
+	color:grey;
+}
 select {
-border: 1px solid blue;
-margin:2px;
-background-color:white;
+	border: 1px solid blue;
+	margin:2px;
+	background-color:white;
=20
=20
 }
@@ -557,14 +573,18 @@
=20
=20
 .infobulle {
-	   position:absolute;
-	   border:1px solid black;
-	   background-color:yellow;
-	   top:0;left:0;
-	   visibility:hidden;
-	   z-index:2;
-	   width:25em;
-
+	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 {
@@ -576,24 +596,24 @@
 }
 tr.priority1 {
 	background-color:red;
-	}
+}
 span.action a.action {
-  border:2px outset ;
-  padding-left: 3px;
-  padding-right:3px;
-  text-decoration:none;
-  font-size:14px;
+	border:2px outset ;
+	padding-left: 3px;
+	padding-right:3px;
+	text-decoration:none;
+	font-size:14px;
=20
-  display:inline;
-  color:black;
-  background-color:lightgrey;
+	display:inline;
+	color:black;
+	background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:lightblue;
-  color:black;
+	text-decoration:none;
+	display:inline;
+	background-color:lightblue;
+	color:black;
 }
 div.popup_back{
 	position:absolute;
@@ -620,7 +640,7 @@
 	border: 2px outset #201e87;
 	background-color:#879ED4;
 	font-size: 110% ;
-	font-family: helvetica,sans-serif;
+	font-family: verdana,helvetica,sans-serif;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -630,7 +650,7 @@
 	/*opacity:1;
 	filter:alpha(opacity=3D100);*/
=20
-	}
+}
 div.popup_border_notitle {
 	position:absolute;
 	top:20%;
@@ -642,7 +662,7 @@
 	/*border:dotted 1px black;*/
 	border: 3px outset #201e87;
 	background-color: #879ED4;
-	font-family: helvetica,sans-serif;
+	font-family: verdana,helvetica,sans-serif;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -651,7 +671,7 @@
 	/*opacity:0.7;
 	filter:alpha(opacity=3D70);
 	*/
-	}
+}
=20
 div.popup_content {
 	position:absolute;
@@ -663,8 +683,8 @@
 	height:96%;
 	overflow: auto;
 	background-color:#DFE7FF;
-	font-size:12px ;
-	font-family: helvetica,sans-serif;
+	font-size:10px ;
+	font-family: verdana,helvetica,sans-serif;
 	font-style: normal;
 	font-weight: normal;
 	color: black;
@@ -675,13 +695,13 @@
 	filter:alpha(opacity=3D100);*/
 }
 div.autocomplete {
-  position:relative;
-  background-color:white;
-  border:1px solid #888;
-  margin:0;
-  padding:0;
-  text-align:left;
-  font-size:12px;
+	position:relative;
+	background-color:white;
+	border:1px solid #888;
+	margin:0;
+	padding:0;
+	text-align:left;
+	font-size:12px;
=20
 }
 div.autocomplete em {
@@ -689,45 +709,45 @@
 	font-weight:bold;
 }
 div.autocomplete ul {
-  list-style-type:none;
-  background-color:white;
-  border:1px solid #888;
-  width:375px;
-  margin:0;
-  padding:0;
+	list-style-type:none;
+	background-color:white;
+	border:1px solid #888;
+	width:375px;
+	margin:0;
+	padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
-  list-style-type:none;
-  display:block;
-  margin:0;
-  padding:0px;
-  /*height:32px;*/
-  cursor:pointer;
+	list-style-type:none;
+	display:block;
+	margin:0;
+	padding:0px;
+	/*height:32px;*/
+	cursor:pointer;
 }
-span.informal{ font-size:12; }
+span.informal{ font-size:95%; color:black;}
=20
 ul.select_table  {
 	/*padding:5px;*/
 	overflow:hidden;
-	}
+}
 ul.select_table a{
 	width:100%;
 	display:block;
 	background-color:inherit;
 	color: black;
 	text-decoration:none;
-	}
+}
 ul.select_table a:hover{
 	background-color:white;
 	color:black;
 	/*text-decoration:underline;*/
-	}
+}
 ul.select_table li {
 	display:table-row;
 	list-style-type: none;
-	}
+}
 ul.select_table li span {
 	display:table-cell;
 	width:25em;
@@ -736,10 +756,10 @@
 }
=20
 div.pc_calendar{
-		border:1px groove grey;
-		float:left;
=20
-		}
+	float:left;
+
+}
 div.pc_calendar table {
 	text-align:center;
=20
@@ -750,7 +770,8 @@
=20
 }
 div.pc_calendar td{
-	width:10em;
+	width:14%;
+	border:#879ed4 solid 1px;
 }
=20
 div.pc_calendar td.weekend {
@@ -777,44 +798,46 @@
=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
-.button {
-	font-size:10;
+a#anchorbutton, .button, a.button,div.content a.button {
+	font-size:12px;
 	color:white;
 	font-weight: bold;
-
-	text-decoration:none;
-	font-family: helvetica,sans-serif;
-	background-image: url("image/bg-submit2.gif");
+	background-image: url("image/bg-submit4.png");
 	background-repeat: repeat-x;
 	background-position: left;
-
-	border-style:  outset ;
-	border-color:  blue ;
-	border-width:0;
-	padding:2 4 2 4;
+	text-decoration:none;
+	font-family: arial,helvetica,sans-serif;
+	background-color: #DEE3E5;
+	margin-top:3px;
+	margin-bottom:3px;
+	margin-right:3px;
+	margin-left:3px;
+	padding:5;
 	cursor:pointer;
-	margin:1 2 1 2;
-	-moz-border-radius:2 2;
+	-moz-border-radius:4 4;
+	border-radius:4 4;
+	border-style: outset;
=20
 }
-.button:hover {
+a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
 	cursor:pointer;
-	background-color:white;
-	border-style:  inset ;
-	color:blue;
-	margin:1 2 1 2;
-	}
-	td.tool {
+	color:red;
+	margin-top:3px;
+	margin-bottom:3px;
+	margin-right:3px;
+	margin-left:3px;
+}
+td.tool {
 	border: solid 1px gray;
=20
-	}
+}
 div.topmenu {
 	float:left;
 	width:100%;
@@ -824,49 +847,23 @@
 h2.dossier {
 	color:darkblue;
 	font-style: italic;
+	display:inline;
=20
-font-size:20px;
-margin:0;
-padding:0;
-text-align:center;
+	font-size:14px;
+	margin:0;
+	padding:0;
+	text-align:center;
 }
-a#anchorbutton {
-	font-size:10;
-	color:white;
-	font-weight: bold;
-
-	text-decoration:none;
-	font-family: helvetica,sans-serif;
-	background-image: url("image/bg-submit3.gif");
-	background-repeat: repeat-x;
-	background-position: left;
-
-	border-style:  outset ;
-	border-color:  blue ;
-	border-width:1;
-	padding:2 4 2 4;
-	cursor:pointer;
-	margin:1 2 1 2;
-	-moz-border-radius:2 2;
-
-}
-a#anchorbutton:hover {
-	cursor:pointer;
-	background-color:white;
-	border-style:  inset ;
-	color:blue;
-	margin:1 2 1 2;
-	}
 /* </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}
+	border:1px solid blue;
+	display:none;
+	background-color:#BFD0FF;
+	padding:3;
+	position:absolute;
+	text-align:left;
+	line-height:3em;
+	z-index:1}
 div.welcome {
=20
 }
@@ -878,56 +875,56 @@
 h2.gest_name {
 	border-left: 5px solid  #403a8d;
 	border-bottom:1px solid  #b4bbc2;
-		border-top:1px solid  #b4bbc2;
-		border-right:1px solid  #b4bbc2;
+	border-top:1px solid  #b4bbc2;
+	border-right:1px solid  #b4bbc2;
 	padding: 5px;
 }
 div.op_detail_frame  {
-  background-color:#e4e7ed;
-  height:100%; width:100%;
+	background-color:#e4e7ed;
+	height:100%; width:100%;
=20
=20
 }
 div.inner_box  {
-  background-color:#e4e7ed;
- font-size:10;
-  font-family:helvetica,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:3;
+	background-color:#e4e7ed;
+	font-size:10;
+	font-family:verdana,helvetica,sans-serif;
+	padding:0;
+	margin:0;
+	overflow:hidden;
+	z-index:3;
=20
-position:absolute;
-left:10%;
+	position:absolute;
+	left:10%;
=20
=20
-border:1px solid darkblue;
+	border:1px solid darkblue;
=20
 }
 div.op_detail_title {
 	background-color:grey;
-/*	width:500;*/
+	/*	width:500;*/
=20
=20
 }
 div#div_jrn{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-		      background-color:#EDF3FF;
+	position:absolute;
+	border:1px solid black;
+	top:15%;left:100;
+	visibility:hidden;
+	z-index:2;
+	width:50em;
+	background-color:#EDF3FF;
=20
 }
- div#div_cat{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-             background-color:#EDF3FF;
+div#div_cat{
+	position:absolute;
+	border:1px solid black;
+	top:15%;left:100;
+	visibility:hidden;
+	z-index:2;
+	width:50em;
+	background-color:#EDF3FF;
=20
 }
=20
@@ -936,17 +933,17 @@
=20
 div#search_form
 {
-              position:absolute;
-              border:1px solid black;
-              top:15%;left:100;
-              margin-left:25%
-              z-index:2;
-              width:50%;
-              display:none;
-	      background-color:#e4e7ed;
+	position:absolute;
+	border:1px solid black;
+	top:15%;left:100;
+	margin-left:25%
+		z-index:2;
+	width:50%;
+	display:none;
+	background-color:#e4e7ed;
 }
=20
-table.result td
+table.table_large td, table.result td
 {
 	padding-left:5px;
 	padding-right:5px;
@@ -954,14 +951,12 @@
 table.info_op
 {
 	font-size:18;
-	margin-right:30%;
-	width:20%;
-
+	width:100%;
 }
 table.info_op tr
 {
-font-size:14;
-background:white;
+	font-size:14;
+	background:white;
 }
 h2#jrn_name
 {
@@ -978,7 +973,7 @@
 span.remain {
 	font-weight: bold;
 	color:black;
-	}
+}
=20
 div#jrn_name_div
 {
@@ -995,76 +990,77 @@
 #direct
 {
 	display:inline;
-	float:right;
+	float:left;
+	width:400px;
=20
-
 }
-.direct
+#calc
 {
-		font-size:10px;
-	   border:groove 1px #000000;
-	margin:1px;
+	display:inline;
+	float:left;
 }
 div#wait_box
 {
-  background-color:#F1E6E6;
- font-size:10;
-  font-family:helvetica,arial,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:10;
+	background-color:#F1E6E6;
+	font-size:10;
+	font-family: verdana,helvetica,arial,sans-serif;
+	padding:0;
+	margin:0;
+	overflow:hidden;
+	z-index:10;
=20
-position:absolute;
-left:30%;
-top:30%;
+	position:absolute;
+	left:30%;
+	top:30%;
=20
=20
-border:1px solid darkblue;
+	border:1px solid darkblue;
=20
 }
 #wait_box h2
 {
-color:black;
-text-align:center;
+	color:black;
+	text-align:center;
 }
 div#div_jrnsearch_op{
-               position:absolute;
-			  z-index: 5;
-              border:1px solid black;
-              display:none;
-              width:50em;
-		      background-color:#EDF3FF;
=20
+	border:1px solid black;
+	display:none;
+	width:50em;
+	background-color:#EDF3FF;
+	position:absolute;
+	z-index: 5;
+
 }
 ul {
 	padding-left: 110px;
 }
 a.line,div.content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
- color: #0000ff;
+	font-size:110%;
+	text-decoration:underline;
+	display:inline;
+	color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
-  color: #0000ff;
-     background-color: rgb(93, 144, 205);
+	font-size:110%;
+	text-decoration:underline;
+	display:inline;
+	color: #0000ff;
+	background-color: rgb(93, 144, 205);
 }
 #close_div
 {
- background-color:white;
- color:blue;
- text-decoration:none;
- border:1px solid blue;
- margin-left: 2px;
- margin-right:2px;
- margin-top:0px;
- font-size:10px;
+	background-color:white;
+	color:red;
+	font-family: arial;
+	text-decoration:none;
+	border:1px solid red;
+	margin-left: 2px;
+	margin-right:2px;
+	margin-top:0px;
+	font-size:12px;
 }
 table.table_large tr.odd ,table.table_large tr.even {
=20
@@ -1089,4 +1085,4 @@
     display:block;
     margin: 20px;
     font-weight: bold;
-}
\ No newline at end of file
+}

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-26 01:14:51 UTC (rev 447=
7)
+++ phpcompta/trunk/html/style-light.css	2011-11-26 14:59:15 UTC (rev 447=
8)
@@ -1,24 +1,24 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-  background-color:#EDF3FF;
- font-size:10;
-  font-family:helvetica,sans-serif;
-  padding: 0px 10px 0px 10px ;
-  margin:0;
-  color:blue;
+	background-color:#EDF3FF;
+	font-size:12px;
+	font-family:verdana,helvetica,sans-serif;
+	padding: 0px 10px 0px 10px ;
+	margin:0;
+	color:blue;
 }
 .notice {
-		color:red;
-        font-style: italic;
-        }
+	color:red;
+	font-style: italic;
+}
=20
 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 {
@@ -28,67 +28,72 @@
=20
 }
 table.table_large th,table.result th {
-  font-weight:bold;
-  font-family:helvetica,sans-serif;
- border-bottom:1px solid blue;
- border-top:0;
+	font-weight:bold;
+	font-family:verdana,helvetica,sans-serif;
+	border-bottom:1px solid blue;
+	border-top:0;
=20
-  color:#25238F;
-  text-align: left;
-  font-style: italic;
+	color:#25238F;
+	text-align: left;
+	font-style: italic;
=20
 }
=20
 h2 {
-  font-family:helvetica,sans-serif;
-  font-size:14px;
-  color:grey;
+	font-family:verdana,helvetica,sans-serif;
+	font-size:14px;
+	color:grey;
 }
 div.info {
 	background:#879ed4;
 	color:white;
 	font-size:120%;
-  text-align:center;
+	text-align:center;
 }
=20
 content h2.info {
 	background:#879ed4;
-  color:black;
-  font-size:14pt;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+	color:black;
+	font-size:14pt;
+	text-align:center;
+	padding:0px;
+	margin:0px;
 }
 redcontent h2.info {
-  background:#879ed4;
-  color:white;
-  font-size:14pt;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+	background:#879ed4;
+	color:white;
+	font-size:14pt;
+	text-align:center;
+	padding:0px;
+	margin:0px;
 }
 h2.info {
-  background-color:#879ED4;
+	background-color:#8989E5;
 	color:white;
 	font-size:14px;
-  text-align:center;
-  padding:0px;
-  margin:0px;
-  border:1px solid grey;
+	text-align:center;
+	padding:0px;
+	margin:0px;
+	border:1px solid grey;
=20
 }
-
+table h2.info
+{
+	font-variant: small-caps;
+	background-color: inherit;
+	color:darkblue;
+}
 h3.info {
-  background:#879ed4;
-  color:white;
-  font-size:14px;
-  text-align:center;
+	background:#879ed4;
+	color:white;
+	font-size:14px;
+	text-align:center;
 }
=20
 h2.info2 {
-  color:blue;
-  font-size:14px;
-  text-align:center;
+	color:blue;
+	font-size:14px;
+	text-align:center;
=20
 }
=20
@@ -105,134 +110,141 @@
 }
=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%;
-	}
+}
 div.u_tool div.name {
-       float:left;
-       margin-left:10px;
+	float:left;
+	margin-left:10px;
 }
-div.u_tool div.acces_direct{
+div.u_tool {
 	float:right;
 	margin-right:10px;
 	text-align:right;
=20
 }
-
+div.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;
+	float:left;
+	clear:left;
 	font-size:9px;
=20
 }
 div.lextmenu {
=20
 	float:left;
-	font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
 	font-size:9px;
=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:helvetica,sans-serif;
-  border-style:outset;
-  border-width:1px;
+	font-family:verdana,helvetica,sans-serif;
+	border-style:outset;
+	border-width:1px;
=20
 }
 div.redcontent{
=20
-         float:left;
-	 padding-top:7px;
-	 padding-left:8px;
-         font-size:9px;
-         font-family:helvetica,sans-serif;
-	 width:75%;
+	float:left;
+	padding-top:7px;
+	padding-left:8px;
+	font-size:9px;
+	font-family:verdana,helvetica,sans-serif;
+	width:75%;
=20
 }
 div.content{
=20
-         float:left;
-		padding-top:7px;
-         width:100%;
-         font-family:helvetica,sans-serif;
-         clear:both;
+	float:left;
+	padding-top:7px;
+	width:100%;
+	font-family:verdana,helvetica,sans-serif;
+	clear:both;
=20
=20
 }
 div.content30{
=20
-         float:left;
-	 padding-top:7px;
-         width:35%;
-         font-family:helvetica,sans-serif;
+	float:left;
+	padding-top:7px;
+	width:35%;
+	font-family:verdana,helvetica,sans-serif;
=20
 }
 div.no span{
 	position:static;
-	font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
 	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:helvetica,sans-serif;
-  border-bottom:2px solid blue;
-  border-top:0;
-  color:#25238F;
-  text-align: left;
-  background-color:#EDF3FF;
-  font-style: italic;
+	font-weight:bold;
+	font-family:verdana,helvetica,sans-serif;
+	border-bottom:2px solid blue;
+	border-top:0;
+	color:#25238F;
+	text-align: left;
+	background-color:#EDF3FF;
+	font-style: italic;
 }
 .error {
-width:60%;
-margin-left:20%;
-text-align: center;
+	width:60%;
+	margin-left:20%;
+	text-align: center;
=20
-color:white;
-background-color:red;
-font-weight: bolder;
-font-size:120%;
+	color:white;
+	background-color:red;
+	font-weight: bolder;
+	font-size:120%;
 }
=20
 table.mtitle {
@@ -240,17 +252,17 @@
 	text-align:center
 }
 td.mshort {
-  height:15px;
-  width:60px;
-  text-align:center;
-  border:  1px solid;
-  color:#5D90CD ;
-  background-color:#DDE6FF;
+	height:15px;
+	width:60px;
+	text-align:center;
+	border:  1px solid;
+	color:#5D90CD ;
+	background-color:#DDE6FF;
 }
 td.mtitle {
 	text-align:center;
 	width:95px;
-        height :30px;
+	height :30px;
 	font-size:10px;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
@@ -268,13 +280,13 @@
 	border-style:groove
 }
 span.odd {
-  background-color:#ECF3FF;
-  display:block;
- }
+	background-color:#ECF3FF;
+	display:block;
+}
 span.even {
-  background-color:#DDE6FF;
-  display:block;
- }
+	background-color:#DDE6FF;
+	display:block;
+}
=20
 tr.odd {
 	background-color:#DDE6FF;
@@ -292,85 +304,85 @@
 	font-size:10px;
 }
 td.cell{
-	    height:32px;
-	     padding: 1px;
+	height:32px;
+	padding: 1px;
 }
 td.selectedcell{
 	border-style:inset;
-        border-color:blue;
+	border-color:blue;
 	border-width:1pt ;
 	font-size:10px;
-        background:#5D90CD ;
-        color:white;
-        text-align:center;
-	     width:120px;
+	background:#5D90CD ;
+	color:white;
+	text-align:center;
+	width:120px;
 }
 a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
- color: blue;
+	font-size:10px;
+	text-decoration:none;
+	display:inline;
+	color: blue;
=20
 }
 a.mtitle:hover {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
+	font-size:10px;
+	text-decoration:none;
+	display:inline;
=20
- color: yellow;
-background-color:#5D90CD;
+	color: darkblue;
+	background-color:#5D90CD;
=20
 }
 td.selectedcell a.mtitle {
- font-size:1em;
- text-decoration:none;
- display:block;
- color:white;
+	font-size:1em;
+	text-decoration:none;
+	display:block;
+	color:white;
 }
 a.dossier {
-  font-size:10px;
-  text-decoration:none;
-  display:block;
-   color: #202267;
+	font-size:10px;
+	text-decoration:none;
+	display:block;
+	color: #202267;
=20
 }
 tr.odd:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:yellow;
+	text-decoration:none;
+	background-color: #a9d6e4;
+	color:white;
 }
 tr.even:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:yellow;
+	text-decoration:none;
+	background-color: #a9d6e4;
+	color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:yellow;
+	background-color:#a9d6e4;
+	color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:yellow;
+	background-color:#a9d6e4;
+	color:white;
 }
 a.cell {
-  text-decoration:none;
-  display:block;
-  color:blue;
-  background-color:white;
-  font-size:9px;
+	text-decoration:none;
+	display:block;
+	color:blue;
+	background-color:white;
+	font-size:9px;
 }
=20
 a.cell:hover {
-  font-size:9px;
-  color:yellow;
-  background-color:#5D90CD;
-  text-decoration:none;
-  display:block;
-	}
+	font-size:9px;
+	color:white;
+	background-color:#5D90CD;
+	text-decoration:none;
+	display:block;
+}
=20
=20
 a.one:link {
@@ -380,23 +392,23 @@
 a.one:visited {
 	text-decoration:none;
 	color:#3010FF
-	}
+}
=20
 a.one:active {
 	background: #0000FF;
-	}
+}
=20
 a.one:hover {
-	    text-decoration:underline;
+	text-decoration:underline;
 	background:#3010FF;
 	color:#FFFFFF;
-	}
+}
=20
=20
 a.detail
 {
-  font-size:9px;
-  font-family:helvetica,sans-serif;
+	font-size:9px;
+	font-family:verdana,helvetica,sans-serif;
     text-decoration: none;
     display: block;
     color: blue;
@@ -404,8 +416,8 @@
=20
 a.detail:hover
 {
-  font-size:9px;
-  font-family:helvetica,sans-serif;
+	font-size:9px;
+	font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -413,19 +425,19 @@
 }
=20
 li.menuv,ol.menuv {
-	 display:inline;
-	 padding:1em 1em;
+	display:inline;
+	padding:1em 1em;
 }
 div.redcontent a {
-  font-family:helvetica,sans-serif;
-  text-decoration: none;
-  display: block;
-  color: blue;
+	font-family:verdana,helvetica,sans-serif;
+	text-decoration: none;
+	display: block;
+	color: blue;
=20
 }
=20
 div.redcontent a:hover {
-  font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -433,17 +445,17 @@
=20
 }
 div.content a {
-  font-family:helvetica,sans-serif;
-  text-decoration: none;
-  display: block;
-  color: blue;
-padding: 0;
+	font-family:verdana,helvetica,sans-serif;
+	text-decoration: none;
+	display: block;
+	color: blue;
+	padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-  font-family:helvetica,sans-serif;
+	font-family:verdana,helvetica,sans-serif;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -452,108 +464,108 @@
 }
=20
 div.redcontent a.mtitle {
-  text-decoration:none;
-  display:inline;
+	text-decoration:none;
+	display:inline;
=20
=20
-  color:black;
+	color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  color:white;
-  background-color:darkblue;
+	text-decoration:none;
+	display:inline;
+	color:white;
+	background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-  font-size:10px;
-  text-decoration:none;
-  display:inline;
-  color:blue;
+	font-size:10px;
+	text-decoration:none;
+	display:inline;
+	color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:darkblue;
-  color:white;
+	text-decoration:none;
+	display:inline;
+	background-color:darkblue;
+	color:white;
=20
=20
 }
 div.redcontent input.text {
-   font-family:helvetica,sans-serif;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  background-color:greenyellow;
-  border-width:1px;
-  color:blue;
+	font-family:verdana,helvetica,sans-serif;
+	font-weight:normal;
+	border-color:336699;
+	border-style:solid;
+	background-color:orange;
+	border-width:1px;
+	color:blue;
 }
 div.content input.text {
-   font-family:helvetica,sans-serif;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  border-width:1px;
-  background-color:greenyellow;
-  color:blue;
+	font-family:verdana,helvetica,sans-serif;
+	font-weight:normal;
+	border-color:336699;
+	border-style:solid;
+	border-width:1px;
+	background-color:orange;
+	color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-  background-color:greenyellow;
+	background-color:orange;
 }
 div.content input:focus {
-  background-color:greenyellow;
+	background-color:orange;
 }
 div.redcontent textarea:focus {
-background-color: greenyellow;
+	background-color: orange;
 }
 .document {
-color: #1a207d;
-border-collapse:collapse;
+	color: #1a207d;
+	border-collapse:collapse;
 }
 a.document{
-  font-size:12px;
-  text-decoration:none;
-  display:block;
+	font-size:12px;
+	text-decoration:none;
+	display:block;
 }
 a.document:hover {
-  text-decoration:none;
-  display:block;
+	text-decoration:none;
+	display:block;
=20
=20
 }
 .input_text {
-	   border:groove 1px blue;
+	border:groove 1px blue;
 	margin:1px;
 }
 .input_text:hover {
 	border:groove 1px blue;
 	margin:1px;
-	background-color: greenyellow;
+	background-color: orange;
 }
 legend {
-font-weight: bold;
-font-style: italic;
-font-size: 120% ;
+	font-weight: bold;
+	font-style: italic;
+	font-size: 120% ;
=20
 }
 fieldset fieldset legend {
-	 font-size:110%;
-	 color:grey;
-	 }
+	font-size:110%;
+	color:grey;
+}
 select {
-border: 1px solid blue;
-margin:2px;
-background-color:white;
+	border: 1px solid blue;
+	margin:2px;
+	background-color:white;
=20
=20
 }
@@ -561,18 +573,18 @@
=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 {
@@ -584,24 +596,24 @@
 }
 tr.priority1 {
 	background-color:red;
-	}
+}
 span.action a.action {
-  border:2px outset ;
-  padding-left: 3px;
-  padding-right:3px;
-  text-decoration:none;
-  font-size:14px;
+	border:2px outset ;
+	padding-left: 3px;
+	padding-right:3px;
+	text-decoration:none;
+	font-size:14px;
=20
-  display:inline;
-  color:black;
-  background-color:lightgrey;
+	display:inline;
+	color:black;
+	background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:lightblue;
-  color:black;
+	text-decoration:none;
+	display:inline;
+	background-color:lightblue;
+	color:black;
 }
 div.popup_back{
 	position:absolute;
@@ -628,7 +640,7 @@
 	border: 2px outset #201e87;
 	background-color:#879ED4;
 	font-size: 110% ;
-	font-family: helvetica,sans-serif;
+	font-family: verdana,helvetica,sans-serif;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -638,7 +650,7 @@
 	/*opacity:1;
 	filter:alpha(opacity=3D100);*/
=20
-	}
+}
 div.popup_border_notitle {
 	position:absolute;
 	top:20%;
@@ -650,7 +662,7 @@
 	/*border:dotted 1px black;*/
 	border: 3px outset #201e87;
 	background-color: #879ED4;
-	font-family: helvetica,sans-serif;
+	font-family: verdana,helvetica,sans-serif;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -659,7 +671,7 @@
 	/*opacity:0.7;
 	filter:alpha(opacity=3D70);
 	*/
-	}
+}
=20
 div.popup_content {
 	position:absolute;
@@ -672,7 +684,7 @@
 	overflow: auto;
 	background-color:#DFE7FF;
 	font-size:10px ;
-	font-family: helvetica,sans-serif;
+	font-family: verdana,helvetica,sans-serif;
 	font-style: normal;
 	font-weight: normal;
 	color: black;
@@ -683,13 +695,13 @@
 	filter:alpha(opacity=3D100);*/
 }
 div.autocomplete {
-  position:relative;
-  background-color:white;
-  border:1px solid #888;
-  margin:0;
-  padding:0;
-  text-align:left;
-  font-size:12px;
+	position:relative;
+	background-color:white;
+	border:1px solid #888;
+	margin:0;
+	padding:0;
+	text-align:left;
+	font-size:12px;
=20
 }
 div.autocomplete em {
@@ -697,45 +709,45 @@
 	font-weight:bold;
 }
 div.autocomplete ul {
-  list-style-type:none;
-  background-color:white;
-  border:1px solid #888;
-  width:375px;
-  margin:0;
-  padding:0;
+	list-style-type:none;
+	background-color:white;
+	border:1px solid #888;
+	width:375px;
+	margin:0;
+	padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
-  list-style-type:none;
-  display:block;
-  margin:0;
-  padding:0px;
-  /*height:32px;*/
-  cursor:pointer;
+	list-style-type:none;
+	display:block;
+	margin:0;
+	padding:0px;
+	/*height:32px;*/
+	cursor:pointer;
 }
 span.informal{ font-size:95%; color:black;}
=20
 ul.select_table  {
 	/*padding:5px;*/
 	overflow:hidden;
-	}
+}
 ul.select_table a{
 	width:100%;
 	display:block;
 	background-color:inherit;
 	color: black;
 	text-decoration:none;
-	}
+}
 ul.select_table a:hover{
 	background-color:white;
 	color:black;
 	/*text-decoration:underline;*/
-	}
+}
 ul.select_table li {
 	display:table-row;
 	list-style-type: none;
-	}
+}
 ul.select_table li span {
 	display:table-cell;
 	width:25em;
@@ -744,10 +756,10 @@
 }
=20
 div.pc_calendar{
-		border:1px groove grey;
-		float:left;
=20
-		}
+	float:left;
+
+}
 div.pc_calendar table {
 	text-align:center;
=20
@@ -758,7 +770,8 @@
=20
 }
 div.pc_calendar td{
-	width:10em;
+	width:14%;
+	border:#879ed4 solid 1px;
 }
=20
 div.pc_calendar td.weekend {
@@ -785,49 +798,50 @@
=20
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
--moz-user-focus:ignore;
--moz-user-input:disabled;
-background-color:lightgrey;
-color:black;
-cursor:inherit;
+	-moz-user-focus:ignore;
+	-moz-user-input:disabled;
+	background-color:lightgrey;
+	color:black;
+	cursor:inherit;
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
 	font-size:10;
-	color:black;
+	color:darkblue;
 	font-weight: bold;
=20
 	text-decoration:none;
-	font-family: helvetica,sans-serif,arial;
-	background-color: #DFDFDF;
-	background-repeat: repeat-x;
-	background-position: left;
-	height:32px;
-	border-color:  gray;
-	border-style: outset;
-	border-width:2;
+	font-family: arial,helvetica,sans-serif;
+	background-color: ##DEE3E5;
+	border-style:  solid ;
+	border-color:  blue ;
+	border-width:1;
 	padding-bottom: 4;
 	padding-top: 4;
 	padding-right: 6;
 	padding-left:  6;
 	margin-top:3px;
+	margin-bottom:3px;
+	margin-right:3px;
+	margin-left:3px;
 	cursor:pointer;
-	margin:1 2 1 2;
-	-moz-border-radius:6;
-	border-radius:6;
+	-moz-border-radius:5 5;
+	border-radius:5 5;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
 	cursor:pointer;
-	background-color:white;
-	color:black;
-	margin:1 2 1 2;
-	border-style: inset;
-	}
-	td.tool {
+	background-color:darkblue;
+	color:#DEE3E5;
+	margin-top:3px;
+	margin-bottom:3px;
+	margin-right:3px;
+	margin-left:3px;
+}
+td.tool {
 	border: solid 1px gray;
=20
-	}
+}
 div.topmenu {
 	float:left;
 	width:100%;
@@ -837,22 +851,23 @@
 h2.dossier {
 	color:darkblue;
 	font-style: italic;
+	display:inline;
=20
-font-size:20px;
-margin:0;
-padding:0;
-text-align:center;
+	font-size:14px;
+	margin:0;
+	padding:0;
+	text-align:center;
 }
 /* </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}
+	border:1px solid blue;
+	display:none;
+	background-color:#BFD0FF;
+	padding:3;
+	position:absolute;
+	text-align:left;
+	line-height:3em;
+	z-index:1}
 div.welcome {
=20
 }
@@ -864,56 +879,56 @@
 h2.gest_name {
 	border-left: 5px solid  #403a8d;
 	border-bottom:1px solid  #b4bbc2;
-		border-top:1px solid  #b4bbc2;
-		border-right:1px solid  #b4bbc2;
+	border-top:1px solid  #b4bbc2;
+	border-right:1px solid  #b4bbc2;
 	padding: 5px;
 }
 div.op_detail_frame  {
-  background-color:#e4e7ed;
-  height:100%; width:100%;
+	background-color:#e4e7ed;
+	height:100%; width:100%;
=20
=20
 }
 div.inner_box  {
-  background-color:whitesmoke;
- font-size:10;
-  font-family:helvetica,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:3;
+	background-color:#e4e7ed;
+	font-size:10;
+	font-family:verdana,helvetica,sans-serif;
+	padding:0;
+	margin:0;
+	overflow:hidden;
+	z-index:3;
=20
-position:absolute;
-left:10%;
+	position:absolute;
+	left:10%;
=20
=20
-border:1px solid darkblue;
+	border:1px solid darkblue;
=20
 }
 div.op_detail_title {
 	background-color:grey;
-/*	width:500;*/
+	/*	width:500;*/
=20
=20
 }
 div#div_jrn{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-		      background-color:#EDF3FF;
+	position:absolute;
+	border:1px solid black;
+	top:15%;left:100;
+	visibility:hidden;
+	z-index:2;
+	width:50em;
+	background-color:#EDF3FF;
=20
 }
- div#div_cat{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-             background-color:#EDF3FF;
+div#div_cat{
+	position:absolute;
+	border:1px solid black;
+	top:15%;left:100;
+	visibility:hidden;
+	z-index:2;
+	width:50em;
+	background-color:#EDF3FF;
=20
 }
=20
@@ -922,14 +937,14 @@
=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:100;
+	margin-left:25%
+		z-index:2;
+	width:50%;
+	display:none;
+	background-color:#e4e7ed;
 }
=20
 table.table_large td, table.result td
@@ -941,12 +956,11 @@
 {
 	font-size:18;
 	width:100%;
-
 }
 table.info_op tr
 {
-font-size:14;
-background:white;
+	font-size:14;
+	background:white;
 }
 h2#jrn_name
 {
@@ -963,7 +977,7 @@
 span.remain {
 	font-weight: bold;
 	color:black;
-	}
+}
=20
 div#jrn_name_div
 {
@@ -991,64 +1005,66 @@
 }
 div#wait_box
 {
-  background-color:#F1E6E6;
- font-size:10;
-  font-family:helvetica,arial,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:10;
+	background-color:#F1E6E6;
+	font-size:10;
+	font-family: verdana,helvetica,arial,sans-serif;
+	padding:0;
+	margin:0;
+	overflow:hidden;
+	z-index:10;
=20
-position:absolute;
-left:30%;
-top:30%;
+	position:absolute;
+	left:30%;
+	top:30%;
=20
=20
-border:1px solid darkblue;
+	border:1px solid darkblue;
=20
 }
 #wait_box h2
 {
-color:black;
-text-align:center;
+	color:black;
+	text-align:center;
 }
 div#div_jrnsearch_op{
-  position:absolute;
-			  z-index: 5;
-              border:1px solid black;
-              display:none;
-              width:50em;
-		      background-color:#EDF3FF;
=20
+	border:1px solid black;
+	display:none;
+	width:50em;
+	background-color:#EDF3FF;
+	position:absolute;
+	z-index: 5;
+
 }
 ul {
 	padding-left: 110px;
 }
 a.line,div.content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
- color: #0000ff;
+	font-size:110%;
+	text-decoration:underline;
+	display:inline;
+	color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
-  color: #0000ff;
-     background-color: rgb(93, 144, 205);
+	font-size:110%;
+	text-decoration:underline;
+	display:inline;
+	color: #0000ff;
+	background-color: rgb(93, 144, 205);
 }
 #close_div
 {
- background-color:white;
- color:blue;
- text-decoration:none;
- border:1px solid blue;
- margin-left: 2px;
- margin-right:2px;
- margin-top:0px;
- font-size:10px;
+	background-color:white;
+	color:red;
+	font-family: arial;
+	text-decoration:none;
+	border:1px solid red;
+	margin-left: 2px;
+	margin-right:2px;
+	margin-top:0px;
+	font-size:10px;
 }
 table.table_large tr.odd ,table.table_large tr.even {
=20
@@ -1073,4 +1089,4 @@
     display:block;
     margin: 20px;
     font-weight: bold;
-}
\ No newline at end of file
+}

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2011-11-26 01:14:51 UTC (rev 4477)
+++ phpcompta/trunk/html/style.css	2011-11-26 14:59:15 UTC (rev 4478)
@@ -130,13 +130,20 @@
        float:left;
        margin-left:10px;
 }
-div.u_tool div.acces_direct{
+div.u_tool {
 	float:right;
 	margin-right:10px;
 	text-align:right;
=20
 }
-
+div.module {
+	position:absolute;
+	top:0px;
+	right:5px;
+	text-align:right;
+	padding:0px;
+	margin: 0px;
+}
 div.u_subt2menu {
 background-color:lightgrey;
   left:1%;
@@ -744,7 +751,7 @@
 }
=20
 div.pc_calendar{
-	=09
+
 		float:left;
=20
 		}

Modified: phpcompta/trunk/html/user_login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_login.php	2011-11-26 01:14:51 UTC (rev 4477=
)
+++ phpcompta/trunk/html/user_login.php	2011-11-26 14:59:15 UTC (rev 4478=
)
@@ -121,7 +121,7 @@
=20
 echo '<h2 class=3D"info">'._('Bienvenue    ').$User->first_name.'  '.$Us=
er->name.'   '._("dans PhpCompta")."</h2>";
 echo '<br>'._('Choississez votre dossier');
-echo '<span style=3D"position:absolute;right:10px;top:30px">'.$result.'<=
/span>';
+echo '<div class=3D"module">'.$result.'</div>';
 echo '</div>';
 ?>
 <form method=3D"get" action=3D"?">

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	2011-11-26 01:14:51 UTC =
(rev 4477)
+++ phpcompta/trunk/include/class_html_input.php	2011-11-26 14:59:15 UTC =
(rev 4478)
@@ -208,7 +208,7 @@
      */
     static function button_anchor($p_label,$p_value,$p_name=3D"",$p_java=
script=3D"")
     {
-        $r=3Dsprintf('<span id=3D"%s" class=3D"button"> <A class=3D"butt=
on" style=3D"display:inline;"  href=3D"%s" %s >%s</A></span>',
+        $r=3Dsprintf('<span id=3D"%s" > <A class=3D"button" style=3D"dis=
play:inline;"  href=3D"%s" %s >%s</A></span>',
                    $p_name,
                    $p_value,
                    $p_javascript,

Modified: phpcompta/trunk/include/impress_gl_comptes.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_gl_comptes.inc.php	2011-11-26 01:14:5=
1 UTC (rev 4477)
+++ phpcompta/trunk/include/impress_gl_comptes.inc.php	2011-11-26 14:59:1=
5 UTC (rev 4478)
@@ -169,7 +169,7 @@
         }
=20
         echo '<tr>
-        <td colspan=3D"8">
+        <td colspan=3D"8" style=3D"width:auto">
         <h2 class=3D"info">'. $poste_id['pcm_val'].' '.h($Poste->label).=
'</h2>
         </td>
         </tr>';

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2011-11-26 01:14:51 UTC (=
rev 4477)
+++ phpcompta/trunk/include/template/module.php	2011-11-26 14:59:15 UTC (=
rev 4478)
@@ -46,7 +46,7 @@
 endif;
 ?>
     </div>
-    <div class=3D"acces_direct">
+    <div class=3D"module">
 	<table>
 	    <tr>
 		<?php



From MAILER-DAEMON Sat Nov 26 17:59:49 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RURDp-0004FB-DT
	for mharc-phpcompta-dev@gnu.org; Sat, 26 Nov 2011 17:59:49 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 27 Nov 2011 00:04:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.51473.1322348388.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r196 - in trunk/amortis/include: . template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Nov 2011 22:59:47 -0000

Author: danydb
Date: 2011-11-27 00:04:38 +0100 (Sun, 27 Nov 2011)
New Revision: 196

Modified:
   trunk/amortis/include/am_histo.inc.php
   trunk/amortis/include/template/listing_histo.php
   trunk/amortis/include/template/material_display.php
Log:

#440 AMORTISSEMENT : montant mal format?\195?\169
#441  AMORTISSEMENT : tri dans l'historique
#439  AMORTISSEMENT : total tableau incorrect, il manque les d?\195?\169c=
imales



Modified: trunk/amortis/include/am_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
--- trunk/amortis/include/am_histo.inc.php	2011-11-26 01:15:17 UTC (rev 1=
95)
+++ trunk/amortis/include/am_histo.inc.php	2011-11-26 23:04:38 UTC (rev 1=
96)
@@ -19,13 +19,30 @@
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
 /*!\file
  * \brief print all
  */
-$sql=3D"select quick_code,a_id,ha_id,h_amount,jr_internal,h_year,h_pj,vw=
_name from amortissement.amortissement join amortissement.amortissement_h=
isto using (a_id) join vw_fiche_attr using(f_id) where h_amount > 0 order=
 by vw_name";
+$sql=3D"select quick_code,a_id,ha_id,h_amount,jr_internal,h_year,h_pj,vw=
_name
+	from amortissement.amortissement
+	join amortissement.amortissement_histo using (a_id)
+	join vw_fiche_attr using(f_id) where h_amount > 0";
=20
+$header=3Dnew Sort_Table();
+$r=3DHtmlInput::array_to_string(array('ac','gDossier','sa','sb','plugin_=
code'),$_REQUEST);
+$url=3Dbasename($_SERVER['PHP_SELF']).$r;
+$header->add('Quick_code',$url,'order by 1 asc','order by 1 desc','qca',=
'qcd');
+$header->add('Nom',$url,'order by vw_name asc','order by vw_name desc','=
na','nd');
+$header->add('Montant',$url,'order by h_amount asc','order by h_amount d=
esc','aa','ad');
+$header->add('Ann=C3=A9e',$url,'order by h_year asc','order by h_year de=
sc','ya','yd');
+$header->add('Pi=C3=A8ce',$url,'order by h_pj asc','order by h_pj desc',=
'pja','pjd');
+$header->add('N=C2=B0 interne',$url,'order by jr_internal asc','order by=
 jr_internal desc','nia','nid');
=20
+$ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'na';
+
+$sql_ord=3D$header->get_sql_order($ord);
+
+$sql.=3D$sql_ord;
+
 if ( isset($_POST['remove']))
   {
     for ($i=3D0;$i<count($_POST['h']);$i++)

Modified: trunk/amortis/include/template/listing_histo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/listing_histo.php	2011-11-26 01:15:17 =
UTC (rev 195)
+++ trunk/amortis/include/template/listing_histo.php	2011-11-26 23:04:38 =
UTC (rev 196)
@@ -10,12 +10,12 @@
 ?>
 <table class=3D"result">
 <tr>
-<th>Quick Code</th>
-<th>Nom</th>
-<th style=3D"text-align:right">Montant</th>
-<th style=3D"text-align:center">Ann=C3=A9e</th>
-<th>N=C2=B0</th>
-<th>Op=C3=A9ration</th>
+<th><?=3D$header->get_header(0)?></th>
+<th><?=3D$header->get_header(1)?></th>
+<th style=3D"text-align:right"><?=3D$header->get_header(2)?></th>
+<th style=3D"text-align:center"><?=3D$header->get_header(3)?></th>
+<th><?=3D$header->get_header(4)?></th>
+<th><?=3D$header->get_header(5)?></th>
=20
 </tr>
 <?

Modified: trunk/amortis/include/template/material_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/material_display.php	2011-11-26 01:15:=
17 UTC (rev 195)
+++ trunk/amortis/include/template/material_display.php	2011-11-26 23:04:=
38 UTC (rev 196)
@@ -40,8 +40,8 @@
 <table class=3D"result">
 <th>Ann=C3=A9e</th>
 <th>Montant</th>
-<th>Amortissement act=C3=A9</th>
-<th>Pi=C3=A8ce </th>
+<th style=3D"text-align:right" >Amortissement act=C3=A9</th>
+<th style=3D"text-align:center">Pi=C3=A8ce </th>
 <th>n=C2=B0  interne</th>
=20
=20
@@ -59,7 +59,7 @@
 	</td>
 	<td>
 	<?
-	echo $array[$i]->ad_amount;
+	echo nbm($array[$i]->ad_amount);
         ?>
=20
 </td>
@@ -68,22 +68,22 @@
=20
 	$x=3D$cn->get_array('select ha_id,h_pj,jr_internal,h_amount from amorti=
ssement.amortissement_histo where a_id=3D$1 and h_year=3D$2',
 	                   array($amort->a_id,$array[$i]->ad_year));
-	if ( count ($x) =3D=3D 1)=20
+	if ( count ($x) =3D=3D 1)
 	{
 	$done=3Dbcadd($done,$x[0]['h_amount']);
=20
-	echo td($x[0]['h_amount']);
+	echo td(nbm($x[0]['h_amount']),' class=3D"num"');
=20
-	echo td($x[0]['h_pj']);
+	echo td($x[0]['h_pj'],' style=3D"text-align:center"');
=20
-	if ( $x[0]['jr_internal'] !=3D '' ) {=20
+	if ( $x[0]['jr_internal'] !=3D '' ) {
 	$jr_id=3D$cn->get_value('select jr_id from jrn where jr_internal=3D$1',=
array($x[0]['jr_internal']));
 	echo td(HtmlInput::detail_op($jr_id,$x[0]['jr_internal']));
 	} else {
 	echo td();
 	}
 	}
-	echo td($array[$i]->ad_percentage);
+	echo td(nbm($array[$i]->ad_percentage).'%');
 	?>
 </tr>
=20
@@ -104,7 +104,7 @@
 	echo '<h2>';
  }
  ?>
-</fieldset>=20
+</fieldset>
 <? echo "Date ".date ('d.m.Y');?>
 <? echo HtmlInput::print_window()?>
-  =20
+



From MAILER-DAEMON Sat Nov 26 21:15:20 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUUH2-0004qY-A5
	for mharc-phpcompta-dev@gnu.org; Sat, 26 Nov 2011 21:15:20 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 27 Nov 2011 03:20:13 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.51567.1322360119.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4479 - in phpcompta/trunk: html
	html/admin/sql/patch 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, 27 Nov 2011 02:15:19 -0000

Author: danydb
Date: 2011-11-27 03:20:11 +0100 (Sun, 27 Nov 2011)
New Revision: 4479

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade97.sql
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/do.php
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_database.php
   phpcompta/trunk/include/class_extension.php
   phpcompta/trunk/include/class_pre_op_ach.php
   phpcompta/trunk/include/class_pre_op_advanced.php
   phpcompta/trunk/include/class_pre_op_ven.php
   phpcompta/trunk/include/class_pre_operation.php
   phpcompta/trunk/include/menu.inc.php
   phpcompta/trunk/include/search.inc.php
   phpcompta/trunk/include/template/param_jrn.php
Log:

fix small cosmetic bugs



Modified: phpcompta/trunk/html/admin/sql/patch/upgrade97.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/upgrade97.sql	2011-11-26 14:59:1=
5 UTC (rev 4478)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade97.sql	2011-11-27 02:20:1=
1 UTC (rev 4479)
@@ -69,7 +69,7 @@
 end;
 $BODY$
 LANGUAGE plpgsql;
- =20
+
 DROP FUNCTION comptaproc.account_insert(integer, text);
=20
 CREATE OR REPLACE FUNCTION comptaproc.account_insert(p_f_id integer, p_a=
ccount text)
@@ -170,7 +170,7 @@
 begin
=20
 	if length(trim(p_account)) !=3D 0 then
-		-- 2 accounts in card separated by comma=20
+		-- 2 accounts in card separated by comma
 		if position (',' in p_account) =3D 0 then
 			select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_account;
 			if nCount =3D 0 then
@@ -193,13 +193,13 @@
 			raise exception 'Too many comas, invalid account';
 		end if;
 		-- check that both account are in PCMN
-	=09
+
 		end if;
 	else
 		-- account is null
 		update fiche_detail set ad_value=3Dnull where f_id=3Dp_f_id and ad_id=3D=
5 ;
 	end if;
-=09
+
 	update fiche_detail set ad_value=3Dp_account where f_id=3Dp_f_id and ad=
_id=3D5 ;
=20
 return 0;
@@ -230,7 +230,7 @@
 end;
 $BODY$
 LANGUAGE plpgsql;
- =20
+
 COMMENT ON FUNCTION comptaproc.format_account(account_type) IS 'format t=
he accounting :
 - upper case
 - remove space and special char.
@@ -256,7 +256,7 @@
    r_record tmp_pcmn%ROWTYPE;
 begin
 r_record :=3D NEW;
-if  length(trim(r_record.pcm_type))=3D0 or r_record.pcm_type is NULL the=
n=20
+if  length(trim(r_record.pcm_type))=3D0 or r_record.pcm_type is NULL the=
n
    r_record.pcm_type:=3Dfind_pcm_type(NEW.pcm_val);
    return r_record;
 end if;
@@ -729,8 +729,6 @@
 ALTER TABLE ONLY profile_menu    ADD CONSTRAINT profile_menu_p_id_fkey F=
OREIGN KEY (p_id) REFERENCES profile(p_id) ON UPDATE CASCADE ON DELETE CA=
SCADE;
 ALTER TABLE ONLY profile_menu    ADD CONSTRAINT profile_menu_type_fkey F=
OREIGN KEY (p_type_display) REFERENCES profile_menu_type(pm_type);
 ALTER TABLE ONLY profile_user    ADD CONSTRAINT profile_user_p_id_fkey F=
OREIGN KEY (p_id) REFERENCES profile(p_id) ON UPDATE CASCADE ON DELETE CA=
SCADE;
-insert into menu_ref(me_code,me_menu,me_file,me_description,me_type,me_p=
arameter) select ex_code,ex_name,ex_file,ex_desC,'PL','plugin_code=3D'||e=
x_code from extension;
-insert into profile_menu (me_code,me_code_dep,p_id,p_type_display) selec=
t me_code,'EXTENSION',1,'S' from menu_ref where me_type=3D'PL';
 create type menu_tree as (code text,description text);
=20
 create or replace function comptaproc.get_profile_menu(login text)
@@ -741,16 +739,16 @@
 	a menu_tree;
 	e menu_tree;
 begin
-for a in select me_code,me_description from v_all_menu where user_name=3D=
login=20
+for a in select me_code,me_description from v_all_menu where user_name=3D=
login
 	and me_code_dep is null and me_type <> 'PR' and me_type <>'SP'
 loop
 		return next a;
-=09
+
 		for e in select * from get_menu_tree(a.code,login)
-		loop=20
+		loop
 			return next e;
 		end loop;
-=09
+
 	end loop;
 return;
 end;
@@ -769,7 +767,7 @@
 	x v_all_menu%ROWTYPE;
 begin
 	for x in select *  from v_all_menu where me_code_dep=3Dp_code::text and=
 user_name=3Dlogin::text
-	loop=09
+	loop
 		if x.me_code_dep is not null then
 			i.code :=3D x.me_code_dep||'/'||x.me_code;
 		else
@@ -777,9 +775,9 @@
 		end if;
=20
 		i.description :=3D x.me_description;
-	=09
+
 		return next i;
-	=09
+
 	for e in select *  from get_menu_tree(x.me_code,login)
 		loop
 			e.code:=3Dx.me_code_dep||'/'||e.code;
@@ -791,7 +789,7 @@
 end;
 $BODY$
 LANGUAGE plpgsql;
-=09
+
 alter table mod_payment add jrn_def_id bigint;
 update mod_payment set jrn_def_id=3D2 where mp_type=3D'VEN';
 update mod_payment set jrn_def_id=3D3 where mp_type=3D'ACH';
@@ -934,7 +932,7 @@
                 p_tva_sided);
         return;
 end;
- $function$=20
+ $function$
  LANGUAGE plpgsql;
=20
 DROP FUNCTION comptaproc.insert_quant_sold(text, numeric, character vary=
ing, numeric, numeric, numeric, integer, character varying);
@@ -956,8 +954,14 @@
                 (p_internal,p_jid,fid_good,p_quant,p_price,p_vat,p_vat_c=
ode,fid_client,'Y',p_tva_sided);
         return;
 end;
- $function$=20
+ $function$
  LANGUAGE plpgsql;
+
+insert into menu_ref(me_code,me_menu,me_file,me_description,me_type,me_p=
arameter) select ex_code,ex_name,ex_file,ex_desC,'PL','plugin_code=3D'||e=
x_code from extension;
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_type_display) selec=
t me_code,'EXT',1,'S' from menu_ref where me_type=3D'PL';
+update jrn set jr_internal=3Dsubstring(jr_internal,1,1)||lpad(upper(to_h=
ex(jr_id+1)),6,'0');
+
 update version set val=3D98;
=20
 commit;
\ No newline at end of file

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	2011-11-26 14:59:15 UTC (rev 4478)
+++ phpcompta/trunk/html/ajax_misc.php	2011-11-27 02:20:11 UTC (rev 4479)
@@ -526,13 +526,12 @@
 		 break;
 	 case 'up_pay_method':
 		 require_once 'ajax_update_payment.php';
-		 break;
-         case 'openancsearch':
-         case 'resultancsearch':
-                 require_once('ajax_anc_search.php');
-                 break;
-         case 'autoanc':
-                require_once('ajax_auto_anc_card.php');
-                break;
-
+		break;
+	case 'openancsearch':
+	case 'resultancsearch':
+		require_once('ajax_anc_search.php');
+		break;
+	case 'autoanc':
+		require_once('ajax_auto_anc_card.php');
+		break;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/do.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/do.php	2011-11-26 14:59:15 UTC (rev 4478)
+++ phpcompta/trunk/html/do.php	2011-11-27 02:20:11 UTC (rev 4479)
@@ -137,17 +137,6 @@
 		show_menu($all, $i);
     }
 }
-/*elseif (isset($_REQUEST['plugin_code']))
-{
-	$default =3D find_default_module();
-    $_GET['ac']=3D$default;
-    $_POST['ac']=3D$default;
-    $_REQUEST['ac']=3D$default;
-    show_module('EXTENSION');
-    $all[0] =3D $default;
-    show_menu($all, 0);
-	require_once 'extension_choice.inc.php';
-}*/
 else
 {
     $default =3D find_default_module();

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	2011-11-26 14:59:15 UTC (rev 4478)
+++ phpcompta/trunk/html/style.css	2011-11-27 02:20:11 UTC (rev 4479)
@@ -125,6 +125,7 @@
 div.u_tool {
 	float:left;
 	width:  100%;
+	padding-bottom: 25px;
 	}
 div.u_tool div.name {
        float:left;
@@ -838,7 +839,7 @@
 div.topmenu {
 	float:left;
 	width:100%;
-
+	margin-top:2px;
 }
=20
 h2.dossier {

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-26 14:59:15 UTC (rev 44=
78)
+++ phpcompta/trunk/include/ac_common.php	2011-11-27 02:20:11 UTC (rev 44=
79)
@@ -65,7 +65,10 @@
 {
     return '<h2 ' . $p_class . '>' . htmlspecialchars($p_string) . '</h2=
>';
 }
-
+function h1($p_string, $p_class)
+{
+    return '<h1 ' . $p_class . '>' . htmlspecialchars($p_string) . '</h1=
>';
+}
 /* !\brief surround the string with td
  * \param $p_string string to surround by TD
  * \param $p_extra extra info (class, style, javascript...)
@@ -762,7 +765,7 @@
 	}
 	if ($file[0]['me_file'] !=3D '')
 	{
-	    if ($file[0]['me_parameter'] !=3D=3D "")
+	    if ($file[0]['me_parameter'] !=3D "")
 	    {
 		// if there are paramter put them in superglobal
 		$array=3Dcompute_variable($file[0]['me_parameter']);
@@ -775,17 +778,12 @@
 			require_once $file[0]['me_file'];
 		else
 			require 'extension_get.inc.php';
-	    exit();
 	}
 	if ( $file[0]['me_javascript'] !=3D '')
 	{
 		create_script($file[0]['me_javascript']);
 	}
     }
-    else
-    {
-
-    }
 }
 /**
  * Find the default module or the first one

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	2011-11-26 14:59:15 UTC =
(rev 4478)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-27 02:20:11 UTC =
(rev 4479)
@@ -2912,7 +2912,7 @@
                 $op->od_direct=3D't';
                 if ($op->count() !=3D 0 )
                 {
-                    echo HtmlInput::submit('use_opd','Utilisez une op.pr=
&eacute;d&eacute;finie');
+                    echo HtmlInput::submit('use_opd','Utilisez une op=C3=
=A9ration pr&eacute;d&eacute;finie');
                     echo $op->show_button();
                 }
                 echo '</form>';

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	2011-11-26 14:59:15 UTC (r=
ev 4478)
+++ phpcompta/trunk/include/class_database.php	2011-11-27 02:20:11 UTC (r=
ev 4479)
@@ -364,9 +364,19 @@
         $add=3D($from_setup=3D=3D0)?'admin/':'';
         for ( $i =3D 4;$i <=3D $MaxVersion;$i++)
         {
-            $to=3D$i+1;
-            if ( $this->get_version() <=3D $i )
-            {
+            $to =3D $i + 1;
+
+			if ($this->get_version() <=3D $i)
+			{
+				if ($this->get_version() =3D=3D 97)
+				{
+					if ($this->exist_schema("amortissement"))
+					{
+						$this->exec_sql('ALTER TABLE amortissement.amortissement_histo
+							ADD CONSTRAINT internal_fk FOREIGN KEY (jr_internal) REFERENCES j=
rn (jr_internal)
+							ON UPDATE CASCADE ON DELETE SET NULL');
+					}
+				}
                 echo "<li>Patching ".$p_name.
                 " from the version ".$this->get_version()." to $to ";
=20
@@ -452,7 +462,7 @@
                     $country=3D$this->get_value ("select pr_value from p=
arameter where pr_id=3D'MY_COUNTRY'");
                     $this->execute_script($add."sql/patch/upgrade61.".$c=
ountry.".sql");
                 }
-	=09
+
                 if ( ! DEBUG ) ob_end_clean();
             }
         }

Modified: phpcompta/trunk/include/class_extension.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_extension.php	2011-11-26 14:59:15 UTC (=
rev 4478)
+++ phpcompta/trunk/include/class_extension.php	2011-11-27 02:20:11 UTC (=
rev 4479)
@@ -113,7 +113,7 @@
 			 * insert into default profile
 			 */
 			$this->cn->exec_sql("insert into profile_menu(me_code,me_code_dep,p_t=
ype_display,p_id)
-					values ($1,$2,$3,$4)",array($this->me_code,'EXTENSION','S',1));
+					values ($1,$2,$3,$4)",array($this->me_code,'EXT','S',1));
 			$this->cn->commit();
 		}
 		catch (Exception $exc)

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	2011-11-26 14:59:15 UTC =
(rev 4478)
+++ phpcompta/trunk/include/class_pre_op_ach.php	2011-11-27 02:20:11 UTC =
(rev 4479)
@@ -99,6 +99,7 @@
         $this->db->commit();
     }
     /*!\brief compute an array accordingly with the FormVenView function
+	 * @return an array for filling the form
      */
     function compute_array()
     {
@@ -106,6 +107,7 @@
         $a_op=3D$this->operation->load();
         $array=3D$this->operation->compute_array($a_op);
         $p_array=3D$this->load();
+		if ( empty ($p_array)) return array();
         foreach ($p_array as $row)
         {
             if ( $row['opd_debit']=3D=3D'f')
@@ -126,7 +128,7 @@
         return $array;
     }
     /*!\brief load the data from the database and return an array
-     * \return an array=20
+     * \return an array
      */
     function load()
     {

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	2011-11-26 14:59:15=
 UTC (rev 4478)
+++ phpcompta/trunk/include/class_pre_op_advanced.php	2011-11-27 02:20:11=
 UTC (rev 4479)
@@ -101,6 +101,7 @@
         $array=3D$this->operation->compute_array($a_op);
         $array['desc']=3D$array['e_comm'];
         $p_array=3D$this->load();
+		if (empty($p_array)) return array();
         foreach ($p_array as $row)
         {
             $tmp_array=3Darray("qc_".$count=3D>'',
@@ -126,7 +127,7 @@
         return $array;
     }
     /*!\brief load the data from the database and return an array
-     * \return an array=20
+     * \return an array
      */
     function load()
     {

Modified: phpcompta/trunk/include/class_pre_op_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_op_ven.php	2011-11-26 14:59:15 UTC =
(rev 4478)
+++ phpcompta/trunk/include/class_pre_op_ven.php	2011-11-27 02:20:11 UTC =
(rev 4479)
@@ -105,6 +105,7 @@
         $a_op=3D$this->operation->load();
         $array=3D$this->operation->compute_array($a_op);
         $p_array=3D$this->load();
+		if (empty($p_array)) return array();
         foreach ($p_array as $row)
         {
             if ( $row['opd_debit']=3D=3D't')
@@ -124,7 +125,7 @@
         return $array;
     }
     /*!\brief load the data from the database and return an array
-     * \return an array=20
+     * \return an array
      */
     function load()
     {

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	2011-11-26 14:59:15 U=
TC (rev 4478)
+++ phpcompta/trunk/include/class_pre_operation.php	2011-11-27 02:20:11 U=
TC (rev 4479)
@@ -196,11 +196,8 @@
         $hid=3Dnew IHidden();
         $r=3D$hid->input("action","use_opd");
         $r.=3D$hid->input("jrn_type",$this->get("ledger_type"));
-        if ($this->count() !=3D 0 )
-        {
-            $r.=3D HtmlInput::submit('use_opd','Utilisez une op.pr&eacut=
e;d&eacute;finie');
-            $r.=3D $this->show_button();
-        }
+        $r.=3D HtmlInput::submit('use_opd','Utilisez une op&eacute;ratio=
n pr&eacute;d&eacute;finie');
+        $r.=3D $this->show_button();
         return $r;
=20
     }
@@ -230,7 +227,7 @@
         $value=3D$this->db->make_array("select od_id,od_name from op_pre=
def ".
                                      " where jrn_def_id=3D".sql_string($=
this->jrn_def_id).
                                      " and od_direct =3D'".sql_string($t=
his->od_direct)."'".
-                                     " order by od_name");
+                                     " order by od_name",1);
         return $value;
     }
     function set($p_param,$value)

Modified: phpcompta/trunk/include/menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/menu.inc.php	2011-11-26 14:59:15 UTC (rev 447=
8)
+++ phpcompta/trunk/include/menu.inc.php	2011-11-27 02:20:11 UTC (rev 447=
9)
@@ -155,7 +155,8 @@
 			break;
=20
 	}
-	echo '<tr>';
+	$class=3D ( $i%2 =3D=3D 0)?$class=3D' class=3D"odd"':$class=3D' class=3D=
"even"';
+	echo "<tr $class>";
 	echo td($js);
 	echo td($row->me_menu);
 	echo td($row->me_description);

Modified: phpcompta/trunk/include/search.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/search.inc.php	2011-11-26 14:59:15 UTC (rev 4=
478)
+++ phpcompta/trunk/include/search.inc.php	2011-11-27 02:20:11 UTC (rev 4=
479)
@@ -117,7 +117,7 @@
=20
    }   else
    {
-	    if ($step<$max_line ) echo '<span class=3D"notice">Nombre d\'enregi=
strements trouv=C3=A9s =3D' .$max_line.' limite =3D  '.$step.'</span>';
+	    if ($step<$max_line ) echo '<h2 class=3D"notice">Liste limit=C3=A9e=
 =C3=A0 '.$step.' enregistrements. Le nombre d\'enregistrements trouv=C3=A9=
s est de ' .$max_line.'</h2>';
    }
 	echo '<form method=3D"get" onsubmit=3D"set_reconcile(this);return false=
">';
 	echo HtmlInput::submit("upd_rec","Mettre =C3=A0 jour");

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	2011-11-26 14:59:15 UT=
C (rev 4478)
+++ phpcompta/trunk/include/template/param_jrn.php	2011-11-27 02:20:11 UT=
C (rev 4479)
@@ -119,8 +119,8 @@
 <?
 if ( $new || ($type !=3D 'ODS' && $type !=3D 'FIN')) {
 ?>
-<th><?=3D_('Fiches D=C3=A9bit')?></TH>
-<th><?=3D_('Fiches Cr=C3=A9dit')?></TH>
+<th style=3D"text-align:left"><?=3D_('Fiches D=C3=A9bit')?></TH>
+<th style=3D"text-align:left"><?=3D_('Fiches Cr=C3=A9dit')?></TH>
 <?
 }
 ?>
@@ -139,7 +139,7 @@
       break;
     }
   }
-  echo '<TR>';
+	echo '<tr>';
   printf ('<TD> <INPUT TYPE=3D"CHECKBOX" VALUE=3D"%s" NAME=3D"FICHEDEB[]=
" %s>%s</TD>',
 	  $res['fd_id'],$CHECKED,$res['fd_label']);
   $CHECKED=3D" unchecked";



From MAILER-DAEMON Sat Nov 26 21:17:46 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUUJO-0005Du-0u
	for mharc-phpcompta-dev@gnu.org; Sat, 26 Nov 2011 21:17:46 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 27 Nov 2011 03:22:34 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.51568.1322360265.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4480 - 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, 27 Nov 2011 02:17:45 -0000

Author: danydb
Date: 2011-11-27 03:22:33 +0100 (Sun, 27 Nov 2011)
New Revision: 4480

Removed:
   phpcompta/trunk/sql/account-update.sql
   phpcompta/trunk/sql/account_add.sql
   phpcompta/trunk/sql/account_alphanum.sql
   phpcompta/trunk/sql/account_compute.sql
   phpcompta/trunk/sql/account_insert.sql
   phpcompta/trunk/sql/ajax-direct-form.sql
   phpcompta/trunk/sql/anc-grandlivre.sql
   phpcompta/trunk/sql/anc-modularity-imp.sql
   phpcompta/trunk/sql/backup-new-object.sh
   phpcompta/trunk/sql/change_account_repo.sql
   phpcompta/trunk/sql/extension.sql
   phpcompta/trunk/sql/format_account.sql
   phpcompta/trunk/sql/mode_paiement.sql
   phpcompta/trunk/sql/object-6.0.sql
   phpcompta/trunk/sql/trunk/
Log:

remove temp file=20



Deleted: phpcompta/trunk/sql/account-update.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/account-update.sql	2011-11-27 02:20:11 UTC (rev 4=
479)
+++ phpcompta/trunk/sql/account-update.sql	2011-11-27 02:22:33 UTC (rev 4=
480)
@@ -1,49 +0,0 @@
-CREATE OR REPLACE FUNCTION comptaproc.account_update(p_f_id integer, p_a=
ccount account_type)
-  RETURNS integer AS
-$BODY$
-declare
-	nMax fiche.f_id%type;
-	nCount integer;
-	nParent tmp_pcmn.pcm_val_parent%type;
-	sName varchar;
-	first text;
-	second text;
-begin
-
-	if length(trim(p_account)) !=3D 0 then
-		-- 2 accounts in card separated by comma=20
-		if position (',' in p_account) =3D 0 then
-			select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_account;
-			if nCount =3D 0 then
-			select ad_value into sName from
-				fiche_detail
-				where
-				ad_id=3D1 and f_id=3Dp_f_id;
-			nParent:=3Daccount_parent(p_account);
-			insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_accoun=
t,sName,nParent);
-		end if;
-		else
-		raise info 'presence of a comma';
-		-- there is 2 accounts separated by a comma
-		first :=3D split_part(p_account,',',1);
-		second :=3D split_part(p_account,',',2);
-		-- check there is no other coma
-		raise info 'first value % second value %', first, second;
-
-		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
-			raise exception 'Too many comas, invalid account';
-		end if;
-		-- check that both account are in PCMN
-	=09
-		end if;
-	else
-		-- account is null
-		update fiche_detail set ad_value=3Dnull where f_id=3Dp_f_id and ad_id=3D=
5 ;
-	end if;
-=09
-	update fiche_detail set ad_value=3Dp_account where f_id=3Dp_f_id and ad=
_id=3D5 ;
-
-return 0;
-end;
-$BODY$
-LANGUAGE plpgsql;

Deleted: phpcompta/trunk/sql/account_add.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/account_add.sql	2011-11-27 02:20:11 UTC (rev 4479=
)
+++ phpcompta/trunk/sql/account_add.sql	2011-11-27 02:22:33 UTC (rev 4480=
)
@@ -1,24 +0,0 @@
--- Function: comptaproc.account_add(account_type, character varying)
-
-DROP FUNCTION comptaproc.account_add(account_type, character varying);
-
-CREATE OR REPLACE FUNCTION comptaproc.account_add(p_id account_type, p_n=
ame character varying)
-  RETURNS text AS
-$BODY$
-declare
-	nParent tmp_pcmn.pcm_val_parent%type;
-	nCount integer;
-	sReturn text;
-begin
-	sReturn:=3D format_account(p_id);
-	select count(*) into nCount from tmp_pcmn where pcm_val=3DsReturn;
-	if nCount =3D 0 then
-		nParent=3Daccount_parent(p_id);
-		insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent)
-			values (p_id, p_name,nParent) returning pcm_val into sReturn;
-	end if;
-return sReturn;
-end ;
-$BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100;

Deleted: phpcompta/trunk/sql/account_alphanum.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/account_alphanum.sql	2011-11-27 02:20:11 UTC (rev=
 4479)
+++ phpcompta/trunk/sql/account_alphanum.sql	2011-11-27 02:22:33 UTC (rev=
 4480)
@@ -1,15 +0,0 @@
-CREATE OR REPLACE FUNCTION comptaproc.account_alphanum()
-  RETURNS boolean AS
-$BODY$
-declare
-	l_auto bool;
-begin
-	l_auto :=3D true;
-	select pr_value into l_auto from parameter where pr_id=3D'MY_ALPHANUM';
-	if l_auto =3D 'N' or l_auto is null then
-		l_auto:=3Dfalse;
-	end if;
-	return l_auto;
-end;
-$BODY$
-  LANGUAGE plpgsql;

Deleted: phpcompta/trunk/sql/account_compute.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/account_compute.sql	2011-11-27 02:20:11 UTC (rev =
4479)
+++ phpcompta/trunk/sql/account_compute.sql	2011-11-27 02:22:33 UTC (rev =
4480)
@@ -1,44 +0,0 @@
-CREATE OR REPLACE FUNCTION comptaproc.account_compute(p_f_id integer)
-  RETURNS account_type AS
-$BODY$
-declare
-	class_base fiche_def.fd_class_base%type;
-	maxcode numeric;
-	sResult account_type;
-	bAlphanum bool;
-	sName text;
-begin
-	select fd_class_base into class_base
-	from
-		fiche_def join fiche using (fd_id)
-	where
-		f_id=3Dp_f_id;
-	raise notice 'account_compute class base %',class_base;
-	bAlphanum :=3D account_alphanum();
-	if bAlphanum =3D false  then
-		select count (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent=
 =3D class_base;
-		if maxcode =3D 0	then
-			maxcode:=3Dclass_base::numeric;
-		else
-			select max (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent =
=3D class_base;
-			maxcode:=3Dmaxcode::numeric;
-		end if;
-		if maxcode::text =3D class_base then
-			maxcode:=3Dclass_base::numeric*1000;
-		end if;
-		maxcode:=3Dmaxcode+1;
-		raise notice 'account_compute Max code %',maxcode;
-		sResult:=3Dmaxcode::account_type;
-	else
-		-- if alphanum, use name
-		select ad_value into sName from fiche_detail where f_id=3Dp_f_id and a=
d_id=3D1;
-		if sName is null then
-			raise exception 'Cannot compute an accounting without the name of the=
 card for %',p_f_id;
-		end if;
-		sResult :=3D class_base||sName;
-	end if;
-	return sResult;
-end;
-$BODY$
-LANGUAGE plpgsql;
- =20

Deleted: phpcompta/trunk/sql/account_insert.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/account_insert.sql	2011-11-27 02:20:11 UTC (rev 4=
479)
+++ phpcompta/trunk/sql/account_insert.sql	2011-11-27 02:22:33 UTC (rev 4=
480)
@@ -1,87 +0,0 @@
- DROP FUNCTION comptaproc.account_insert(integer, text);
-
-CREATE OR REPLACE FUNCTION comptaproc.account_insert(p_f_id integer, p_a=
ccount text)
-  RETURNS text  AS
-$BODY$
-declare
-	nParent tmp_pcmn.pcm_val_parent%type;
-	sName varchar;
-	sNew tmp_pcmn.pcm_val%type;
-	bAuto bool;
-	nFd_id integer;
-	sClass_Base fiche_def.fd_class_base%TYPE;
-	nCount integer;
-	first text;
-	second text;
-begin
-
-	if p_account is not null and length(trim(p_account)) !=3D 0 then
-	-- if there is coma in p_account, treat normally
-		if position (',' in p_account) =3D 0 then
-			raise info 'p_account is not empty';
-				select count(*)  into nCount from tmp_pcmn where pcm_val=3Dp_account=
::account_type;
-				raise notice 'found in tmp_pcm %',nCount;
-				if nCount !=3D0  then
-					raise info 'this account exists in tmp_pcmn ';
-					perform attribut_insert(p_f_id,5,p_account);
-				   else
-				       -- account doesn't exist, create it
-					select ad_value into sName from
-						fiche_detail
-					where
-					ad_id=3D1 and f_id=3Dp_f_id;
-
-					nParent:=3Daccount_parent(p_account::account_type);
-					insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_acco=
unt::account_type,sName,nParent);
-					perform attribut_insert(p_f_id,5,p_account);
-
-				end if;
-		else
-		raise info 'presence of a comma';
-		-- there is 2 accounts separated by a comma
-		first :=3D split_part(p_account,',',1);
-		second :=3D split_part(p_account,',',2);
-		-- check there is no other coma
-		raise info 'first value % second value %', first, second;
-
-		if  position (',' in first) !=3D 0 or position (',' in second) !=3D 0 =
then
-			raise exception 'Too many comas, invalid account';
-		end if;
-		perform attribut_insert(p_f_id,5,p_account);
-		end if;
-	else
-	raise info 'p_account is  empty';
-		select fd_id into nFd_id from fiche where f_id=3Dp_f_id;
-		bAuto:=3D account_auto(nFd_id);
-
-		select fd_class_base into sClass_base from fiche_def where fd_id=3DnFd=
_id;
-raise info 'sClass_Base : %',sClass_base;
-		if bAuto =3D true and sClass_base similar to '[[:digit:]]*'  then
-			raise info 'account generated automatically';
-			sNew:=3Daccount_compute(p_f_id);
-			raise info 'sNew %', sNew;
-			select ad_value into sName from
-				fiche_detail
-			where
-				ad_id=3D1 and f_id=3Dp_f_id;
-			nParent:=3Daccount_parent(sNew);
-			sNew :=3D account_add  (sNew,sName);
-			perform attribut_insert(p_f_id,5,sNew);
-
-		else
-		-- if there is an account_base then it is the default
-		      select fd_class_base::account_type into sNew from fiche_def join=
 fiche using (fd_id) where f_id=3Dp_f_id;
-			if sNew is null or length(trim(sNew)) =3D 0 then
-				raise notice 'count is null';
-				 perform attribut_insert(p_f_id,5,null);
-			else
-				 perform attribut_insert(p_f_id,5,sNew);
-			end if;
-		end if;
-	end if;
-
-return 0;
-end;
-$BODY$
-LANGUAGE plpgsql;
-

Deleted: phpcompta/trunk/sql/ajax-direct-form.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/ajax-direct-form.sql	2011-11-27 02:20:11 UTC (rev=
 4479)
+++ phpcompta/trunk/sql/ajax-direct-form.sql	2011-11-27 02:22:33 UTC (rev=
 4480)
@@ -1,61 +0,0 @@
-create type menu_tree as (code text,description text);
-=20
-create or replace function comptaproc.get_profile_menu(login text)
-returns setof  menu_tree
-as
-$BODY$
-declare
-	a menu_tree;
-	e menu_tree;
-begin
-for a in select me_code,me_description from v_all_menu where user_name=3D=
login=20
-	and me_code_dep is null and me_type <> 'PR' and me_type <>'SP'
-loop
-		return next a;
-=09
-		for e in select * from get_menu_tree(a.code,login)
-		loop=20
-			return next e;
-		end loop;
-=09
-	end loop;
-return;
-end;
-$BODY$ language plpgsql;
-
-
-
-
-CREATE OR REPLACE FUNCTION comptaproc.get_menu_tree(p_code text,login te=
xt)
-  RETURNS SETOF menu_tree AS
-$BODY$
-declare
-	i menu_tree;
-	e menu_tree;
-	a text;
-	x v_all_menu%ROWTYPE;
-begin
-	for x in select *  from v_all_menu where me_code_dep=3Dp_code::text and=
 user_name=3Dlogin::text
-	loop=09
-		if x.me_code_dep is not null then
-			i.code :=3D x.me_code_dep||'/'||x.me_code;
-		else
-			i.code :=3D x.me_code;
-		end if;
-
-		i.description :=3D x.me_description;
-	=09
-		return next i;
-	=09
-	for e in select *  from get_menu_tree(x.me_code,login)
-		loop
-			e.code:=3Dx.me_code_dep||'/'||e.code;
-			return next e;
-		end loop;
-
-	end loop;
-	return;
-end;
-$BODY$
-LANGUAGE plpgsql;
-=09

Deleted: phpcompta/trunk/sql/anc-grandlivre.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/anc-grandlivre.sql	2011-11-27 02:20:11 UTC (rev 4=
479)
+++ phpcompta/trunk/sql/anc-grandlivre.sql	2011-11-27 02:22:33 UTC (rev 4=
480)
@@ -1,6 +0,0 @@
-insert into menu_ref(me_code,me_menu,me_file,me_description,me_type)=20
-values ('CSV:AncGrandLivre','Impression Grand-Livre',null,null,'PR');
-
-insert into profile_menu(me_code,me_code_dep,p_id,p_type_display,pm_defa=
ult)
-values ( 'CSV:AncGrandLivre', NULL, 1 , 'P', 0);
-

Deleted: phpcompta/trunk/sql/anc-modularity-imp.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/anc-modularity-imp.sql	2011-11-27 02:20:11 UTC (r=
ev 4479)
+++ phpcompta/trunk/sql/anc-modularity-imp.sql	2011-11-27 02:22:33 UTC (r=
ev 4480)
@@ -1,21 +0,0 @@
-
-insert into menu_ref(me_code,me_menu,me_file,me_description,me_type)=20
-values ('ANCHOP','Historique','anc_history.inc.php','Historique des impu=
tations analytiques','ME'),
-('ANCGL','Grand''Livre','anc_great_ledger.inc.php','Grand livre d''plan =
analytique','ME'),
-('ANCBS','Balance simple','anc_balance_simple.inc.php','Balance simple d=
es imputations analytiques','ME'),
-('ANCBC2','Balance crois=C3=A9e double','anc_balance_double.inc.php','Ba=
lance double crois=C3=A9es des imputations analytiques','ME'),
-('ANCTAB','Tableau','anc_acc_table.inc.php','Tableau li=C3=A9 =C3=A0 la =
comptabilit=C3=A9','ME'),
-('ANCBCC','Balance Analytique/comptabilit=C3=A9','anc_acc_balance.inc.ph=
p','Lien entre comptabilit=C3=A9 et Comptabilit=C3=A9 analytique','ME'),
-('ANCGR','Groupe','anc_group_balance.inc.php','Balance par groupe','ME')=
;
-
-update menu_ref set me_file=3Dnull where me_code=3D'ANCIMP';
-
-insert into profile_menu (me_code,me_code_dep,p_id,p_order,p_type_displa=
y,pm_default)
-values=20
-('ANCHOP','ANCIMP',1,10,'E',0),
-('ANCGL','ANCIMP',1,20,'E',0),
-('ANCBS','ANCIMP',1,30,'E',0),
-('ANCBC2','ANCIMP',1,40,'E',0),
-('ANCTAB','ANCIMP',1,50,'E',0),
-('ANCBCC','ANCIMP',1,60,'E',0),
-('ANCGR','ANCIMP',1,70,'E',0);
\ No newline at end of file

Deleted: phpcompta/trunk/sql/backup-new-object.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/backup-new-object.sh	2011-11-27 02:20:11 UTC (rev=
 4479)
+++ phpcompta/trunk/sql/backup-new-object.sh	2011-11-27 02:22:33 UTC (rev=
 4480)
@@ -1 +0,0 @@
-pg_dump testdossier100 --no-owner --inserts -t profile -t menu_ref -t pr=
ofile_menu -t profile_user -t profile_menu_type -t v_all_menu > object-6.=
0.sql

Deleted: phpcompta/trunk/sql/change_account_repo.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/change_account_repo.sql	2011-11-27 02:20:11 UTC (=
rev 4479)
+++ phpcompta/trunk/sql/change_account_repo.sql	2011-11-27 02:22:33 UTC (=
rev 4480)
@@ -1,5 +0,0 @@
--- Check: valid_state
- ALTER TABLE audit_connect DROP CONSTRAINT valid_state;
-
-ALTER TABLE audit_connect
-  ADD CONSTRAINT valid_state CHECK (ac_state =3D 'FAIL'::text OR ac_stat=
e =3D 'SUCCESS'::text or ac_state=3D'AUDIT');

Deleted: phpcompta/trunk/sql/extension.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/extension.sql	2011-11-27 02:20:11 UTC (rev 4479)
+++ phpcompta/trunk/sql/extension.sql	2011-11-27 02:22:33 UTC (rev 4480)
@@ -1,4 +0,0 @@
-insert into menu_ref(me_code,me_menu,me_file,me_description,me_type,me_p=
arameter) select ex_code,ex_name,ex_file,ex_desC,'PL','plugin_code=3D'||e=
x_code from extension;
-
-insert into profile_menu (me_code,me_code_dep,p_id,p_type_display) selec=
t me_code,'EXTENSION',1,'S' from menu_ref where me_type=3D'PL';
-

Deleted: phpcompta/trunk/sql/format_account.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/format_account.sql	2011-11-27 02:20:11 UTC (rev 4=
479)
+++ phpcompta/trunk/sql/format_account.sql	2011-11-27 02:22:33 UTC (rev 4=
480)
@@ -1,28 +0,0 @@
-CREATE OR REPLACE FUNCTION comptaproc.format_account(p_account account_t=
ype)
-  RETURNS account_type AS
-$BODY$
-
-declare
-
-sResult account_type;
-
-begin
-sResult :=3D lower(p_account);
-
-sResult :=3D translate(sResult,'=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','eeeeaaaiiuuuoo');
-sResult :=3D translate(sResult,' $=E2=82=AC=C2=B5=C2=A3%.+-/\!(){}(),;_&=
|"#''^','');
-
-if not sResult similar to '^[[:alnum:]_]+$' then
-	raise exception 'Invalid character in %',p_account;
-end if;
-
-return upper(sResult);
-
-end;
-$BODY$
-LANGUAGE plpgsql;
- =20
-COMMENT ON FUNCTION comptaproc.format_account(account_type) IS 'format t=
he accounting :
-- upper case
-- remove space and special char.
-';

Deleted: phpcompta/trunk/sql/mode_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/mode_paiement.sql	2011-11-27 02:20:11 UTC (rev 44=
79)
+++ phpcompta/trunk/sql/mode_paiement.sql	2011-11-27 02:22:33 UTC (rev 44=
80)
@@ -1,13 +0,0 @@
--- Mode de paiement par journaux
-
-
-alter table mod_payment add jrn_def_id bigint;
-update mod_payment set jrn_def_id=3D2 where mp_type=3D'VEN';
-update mod_payment set jrn_def_id=3D3 where mp_type=3D'ACH';
-
-alter table mod_payment drop mp_type;
-
-
-alter table mod_payment add constraint mod_payment_jrn_def_id_fk foreign=
 key (jrn_def_id) references jrn_def(jrn_def_id) on delete cascade on upd=
ate cascade;
-
-comment on column mod_payment.jrn_def_id is 'Ledger using this payment m=
ethod';

Deleted: phpcompta/trunk/sql/object-6.0.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/object-6.0.sql	2011-11-27 02:20:11 UTC (rev 4479)
+++ phpcompta/trunk/sql/object-6.0.sql	2011-11-27 02:22:33 UTC (rev 4480)
@@ -1,778 +0,0 @@
---
--- PostgreSQL database dump
---
-
-SET statement_timeout =3D 0;
-SET client_encoding =3D 'UTF8';
-SET standard_conforming_strings =3D off;
-SET check_function_bodies =3D false;
-SET client_min_messages =3D warning;
-SET escape_string_warning =3D off;
-
-SET search_path =3D public, pg_catalog;
-
-SET default_tablespace =3D '';
-
-SET default_with_oids =3D false;
-
---
--- Name: menu_ref; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
---
-
-CREATE TABLE menu_ref (
-    me_code text NOT NULL,
-    me_menu text,
-    me_file text,
-    me_url text,
-    me_description text,
-    me_parameter text,
-    me_javascript text,
-    me_type character varying(2)
-);
-
-
---
--- Name: COLUMN menu_ref.me_code; Type: COMMENT; Schema: public; Owner: =
-
---
-
-COMMENT ON COLUMN menu_ref.me_code IS 'Menu Code ';
-
-
---
--- Name: COLUMN menu_ref.me_menu; Type: COMMENT; Schema: public; Owner: =
-
---
-
-COMMENT ON COLUMN menu_ref.me_menu IS 'Label to display';
-
-
---
--- Name: COLUMN menu_ref.me_file; Type: COMMENT; Schema: public; Owner: =
-
---
-
-COMMENT ON COLUMN menu_ref.me_file IS 'if not empty file to include';
-
-
---
--- Name: COLUMN menu_ref.me_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN menu_ref.me_url IS 'url ';
-
-
---
--- Name: COLUMN menu_ref.me_type; Type: COMMENT; Schema: public; Owner: =
-
---
-
-COMMENT ON COLUMN menu_ref.me_type IS 'ME for menu
-PR for Printing
-SP for special meaning (ex: return to line)
-PL for plugin';
-
-
---
--- Name: profile; Type: TABLE; Schema: public; Owner: -; Tablespace:=20
---
-
-CREATE TABLE profile (
-    p_name text NOT NULL,
-    p_id integer NOT NULL,
-    p_desc text,
-    with_calc boolean DEFAULT true,
-    with_direct_form boolean DEFAULT true
-);
-
-
---
--- Name: TABLE profile; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE profile IS 'Available profile ';
-
-
---
--- Name: COLUMN profile.p_name; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN profile.p_name IS 'Name of the profile';
-
-
---
--- Name: COLUMN profile.p_desc; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN profile.p_desc IS 'description of the profile';
-
-
---
--- Name: COLUMN profile.with_calc; Type: COMMENT; Schema: public; Owner:=
 -
---
-
-COMMENT ON COLUMN profile.with_calc IS 'show the calculator';
-
-
---
--- Name: COLUMN profile.with_direct_form; Type: COMMENT; Schema: public;=
 Owner: -
---
-
-COMMENT ON COLUMN profile.with_direct_form IS 'show the direct form';
-
-
---
--- Name: profile_menu; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
---
-
-CREATE TABLE profile_menu (
-    pm_id integer NOT NULL,
-    me_code text,
-    me_code_dep text,
-    p_id integer,
-    p_order integer,
-    p_type_display text NOT NULL,
-    pm_default integer
-);
-
-
---
--- Name: TABLE profile_menu; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE profile_menu IS 'Join  between the profile and the menu=
 ';
-
-
---
--- Name: COLUMN profile_menu.me_code_dep; Type: COMMENT; Schema: public;=
 Owner: -
---
-
-COMMENT ON COLUMN profile_menu.me_code_dep IS 'menu code dependency';
-
-
---
--- Name: COLUMN profile_menu.p_id; Type: COMMENT; Schema: public; Owner:=
 -
---
-
-COMMENT ON COLUMN profile_menu.p_id IS 'link to profile';
-
-
---
--- Name: COLUMN profile_menu.p_order; Type: COMMENT; Schema: public; Own=
er: -
---
-
-COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu';
-COMMENT ON COLUMN profile_menu.pm_default IS 'default menu';
-
-
---
--- Name: COLUMN profile_menu.p_type_display; Type: COMMENT; Schema: publ=
ic; Owner: -
---
-
-COMMENT ON COLUMN profile_menu.p_type_display IS 'M is a module
-E is a menu
-S is a select (for plugin)';
-
-
---
--- Name: profile_menu_pm_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
---
-
-CREATE SEQUENCE profile_menu_pm_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-
---
--- Name: profile_menu_pm_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
---
-
-ALTER SEQUENCE profile_menu_pm_id_seq OWNED BY profile_menu.pm_id;
-
-
---
--- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
---
-
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 778, true);
-
-
---
--- Name: profile_menu_type; Type: TABLE; Schema: public; Owner: -; Table=
space:=20
---
-
-CREATE TABLE profile_menu_type (
-    pm_type text NOT NULL,
-    pm_desc text
-);
-
-
---
--- Name: profile_p_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE profile_p_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-
---
--- Name: profile_p_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owne=
r: -
---
-
-ALTER SEQUENCE profile_p_id_seq OWNED BY profile.p_id;
-
-
---
--- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('profile_p_id_seq', 11, true);
-
-
---
--- Name: profile_user; Type: TABLE; Schema: public; Owner: -; Tablespace=
:=20
---
-
-CREATE TABLE profile_user (
-    user_name text NOT NULL,
-    pu_id integer NOT NULL,
-    p_id integer
-);
-
-
---
--- Name: TABLE profile_user; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE profile_user IS 'Contains the available profile for use=
rs';
-
-
---
--- Name: COLUMN profile_user.user_name; Type: COMMENT; Schema: public; O=
wner: -
---
-
-COMMENT ON COLUMN profile_user.user_name IS 'fk to available_user : logi=
n';
-
-
---
--- Name: COLUMN profile_user.p_id; Type: COMMENT; Schema: public; Owner:=
 -
---
-
-COMMENT ON COLUMN profile_user.p_id IS 'fk to profile';
-
-
---
--- Name: profile_user_pu_id_seq; Type: SEQUENCE; Schema: public; Owner: =
-
---
-
-CREATE SEQUENCE profile_user_pu_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-
---
--- Name: profile_user_pu_id_seq; Type: SEQUENCE OWNED BY; Schema: public=
; Owner: -
---
-
-ALTER SEQUENCE profile_user_pu_id_seq OWNED BY profile_user.pu_id;
-
-
---
--- Name: profile_user_pu_id_seq; Type: SEQUENCE SET; Schema: public; Own=
er: -
---
-
-SELECT pg_catalog.setval('profile_user_pu_id_seq', 6, true);
-
-
---
--- Name: v_all_menu; Type: VIEW; Schema: public; Owner: -
---
-
-CREATE VIEW v_all_menu AS
-    SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d=
isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil=
e, mr.me_url, mr.me_parameter, mr.me_javascript, mr.me_type, pm.p_id, mr.=
me_description FROM (((profile_menu pm JOIN profile_user pu ON ((pu.p_id =
=3D pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr=
 USING (me_code)) ORDER BY pm.p_order;
-
-
---
--- Name: p_id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE profile ALTER COLUMN p_id SET DEFAULT nextval('profile_p_id_=
seq'::regclass);
-
-
---
--- Name: pm_id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE profile_menu ALTER COLUMN pm_id SET DEFAULT nextval('profile=
_menu_pm_id_seq'::regclass);
-
-
---
--- Name: pu_id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE profile_user ALTER COLUMN pu_id SET DEFAULT nextval('profile=
_user_pu_id_seq'::regclass);
-
-
---
--- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: -
---
-
-INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,=
 'Nouvel achat ou d=C3=A9pense', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCHOP', 'Historique', 'anc_history.inc.ph=
p', NULL, 'Historique des imputations analytiques', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCGL', 'Grand''Livre', 'anc_great_ledger.=
inc.php', NULL, 'Grand livre d''plan analytique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCBS', 'Balance simple', 'anc_balance_sim=
ple.inc.php', NULL, 'Balance simple des imputations analytiques', NULL, N=
ULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCBC2', 'Balance crois=C3=A9e double', 'a=
nc_balance_double.inc.php', NULL, 'Balance double crois=C3=A9es des imput=
ations analytiques', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCTAB', 'Tableau', 'anc_acc_table.inc.php=
', NULL, 'Tableau li=C3=A9 =C3=A0 la comptabilit=C3=A9', NULL, NULL, 'ME'=
);
-INSERT INTO menu_ref VALUES ('ANCBCC', 'Balance Analytique/comptabilit=C3=
=A9', 'anc_acc_balance.inc.php', NULL, 'Lien entre comptabilit=C3=A9 et C=
omptabilit=C3=A9 analytique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCGR', 'Groupe', 'anc_group_balance.inc.p=
hp', NULL, 'Balance par groupe', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CSV:AncGrandLivre', 'Impression Grand-Livr=
e', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe a=
nalytique', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:postedetail', 'Export Poste d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, 'Recherc=
he', NULL, 'popup_recherche()', 'ME');
-INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, 'Param=C3=A8=
tres divers', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, 'Conf=
ig. de la tva', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, 'Fi=
che', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, 'S=
tock', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('MOD', 'Menu et profile', NULL, NULL, 'Menu=
 ', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGPRO', 'Profile', 'profile.inc.php', NUL=
L, 'Configuration profile', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGPAY', 'Moyen de paiement', 'payment_mid=
dle.inc.php', NULL, 'Config. des m=C3=A9thodes de paiement', NULL, NULL, =
'ME');
-INSERT INTO menu_ref VALUES ('CFGACC', 'Poste', 'poste.inc.php', NULL, '=
Config. poste comptable de base', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 'Nouvelle vente ou recette', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', =
NULL, 'Configuration des menus et plugins', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i=
nc.php', NULL, 'Parametre societe', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php=
', NULL, 'Gestion des p=C3=A9riodes', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PDF:fichedetail', 'Export Fiche d=C3=A9tai=
l', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:fiche_balance', 'Export Fiche balance'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:report', 'Export report', NULL, NULL, =
NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:fiche', 'Export Fiche', NULL, NULL, NU=
LL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:glcompte', 'Export Grand Livre', NULL,=
 NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:sec', 'Export S=C3=A9curit=C3=A9', NUL=
L, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:AncList', 'Export Comptabilit=C3=A9 an=
alytique', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique balance simple', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:AncBalSimple', 'Export Comptabilit=C3=A9=
 analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:AncBalDouble', 'Export Comptabilit=C3=A9=
 analytique balance double', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('PDF:balance', 'Export Balance comptable', =
NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:histo', 'Export Historique', NULL, NUL=
L, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:ledger', 'Export Journaux', NULL, NULL=
, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique'=
, NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt.=
 Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',=
 NULL, 'Suivi fournisseur', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('LET', 'Lettrage', NULL, NULL, 'Lettrage', =
NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_=
od.inc.php', NULL, 'OD analytique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi=
lan.inc.php', NULL, 'V=C3=A9rification de la comptabilit=C3=A9', NULL, NU=
LL, 'ME');
-INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo=
rt.inc.php', NULL, 'Cr=C3=A9ation de rapport', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.=
php', NULL, 'Ecriture d''ouverture', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ACHIMP', 'Historique achat', 'history_oper=
ation.inc.php', NULL, 'Historique achat', 'ledger_type=3DACH', NULL, 'ME'=
);
-INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL=
L, 'Suivi, courrier, devis', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc=
.php', NULL, 'Pr=C3=A9vision', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('EXT', 'Extension', 'extension_choice.inc.p=
hp', NULL, 'Extensions (plugins)', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGDOC', 'Document', 'document_modele.inc.=
php', NULL, 'Config. mod=C3=A8le de document', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGLED', 'journaux', 'cfgledger.inc.php', =
NULL, 'Configuration des journaux', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo=
d.inc.php', NULL, 'Gestion des op=C3=A9rations pr=C3=A9d=C3=A9finifies', =
NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, 'Menu ava=
nc=C3=A9', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, 'Mo=
dule comptabilit=C3=A9 analytique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGSEC', 'S=C3=A9curit=C3=A9', 'param_sec.=
inc.php', NULL, 'configuration de la s=C3=A9curit=C3=A9', NULL, NULL, 'ME=
');
-INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p=
a.inc.php', NULL, 'Plan analytique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', =
NULL, 'Groupe analytique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique op=C3=A9rations diver=
ses', 'history_operation.inc.php', NULL, 'Historique op=C3=A9rations dive=
rses', 'ledger_type=3DODS', NULL, 'ME');
-INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, '=
Menu ventes et recettes', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref=
.inc.php', NULL, 'Pr=C3=A9f=C3=A9rence', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'history_operation.in=
c.php', NULL, 'Historique', 'ledger_type=3DALL', NULL, 'ME');
-INSERT INTO menu_ref VALUES ('MENUFIN', 'Financier', NULL, NULL, 'Menu F=
inancier', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('FIMP', 'Historique financier', 'history_op=
eration.inc.php', NULL, 'Historique financier', 'ledger_type=3DFIN', NULL=
, 'ME');
-INSERT INTO menu_ref VALUES ('MENUACH', 'Achat', NULL, NULL, 'Menu achat=
', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('MENUODS', 'Op=C3=A9rations diverses', NULL=
, NULL, 'Menu op=C3=A9rations diverses', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ODS', 'Op=C3=A9rations Diverses', 'compta_=
ods.inc.php', NULL, 'Nouvelle op=C3=A9rations diverses', NULL, NULL, 'ME'=
);
-INSERT INTO menu_ref VALUES ('FREC', 'Rapprochement', 'compta_fin_rec.in=
c.php', NULL, 'Rapprochement bancaire', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL=
L, 'Suivi administration, banque', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('FIN', 'Nouvel extrait', 'compta_fin.inc.ph=
p', NULL, 'Nouvel extrait bancaire', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGATCARD', 'Attribut de fiche', 'card_att=
r.inc.php', NULL, 'Gestion des mod=C3=A8les de fiches', NULL, NULL, 'ME')=
;
-INSERT INTO menu_ref VALUES ('FSALDO', 'Soldes', 'compta_fin_saldo.inc.p=
hp', NULL, 'Solde des comptes en banques, caisse...', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('JSSEARCH', 'Recherche', NULL, NULL, 'Reche=
rche', NULL, 'search_reconcile()', 'ME');
-INSERT INTO menu_ref VALUES ('LETACC', 'Lettrage par Poste', 'lettering.=
account.inc.php', NULL, 'lettrage par poste comptable', NULL, NULL, 'ME')=
;
-INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php=
', NULL, 'Balance par cat=C3=A9gorie de fiche', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, '=
Suivi client', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f=
iche_def.inc.php', NULL, 'Gestion cat=C3=A9gorie de fiche', NULL, NULL, '=
ME');
-INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',=
 'cat_document.inc.php', NULL, 'Config. cat=C3=A9gorie de documents', NUL=
L, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('VENIMP', 'Historique vente', 'history_oper=
ation.inc.php', NULL, 'Historique des ventes', 'ledger_type=3DVEN', NULL,=
 'ME');
-INSERT INTO menu_ref VALUES ('LETCARD', 'Lettrage par Fiche', 'lettering=
.card.inc.php', NULL, 'Lettrage par fiche', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in=
c.php', NULL, 'Config. du plan comptable', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', 'So=
rtie', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.=
inc.php', NULL, 'Tableau de bord', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, =
'Module comptabilit=C3=A9', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, 'Module g=
estion', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, 'Mod=
ule param=C3=A8tre', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTJRN', 'Historique', 'impress_jrn.inc.=
php', NULL, 'Impression historique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTREC', 'Rapprochement', 'impress_rec.i=
nc.php', NULL, 'Impression des rapprochements', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTPOSTE', 'Poste', 'impress_poste.inc.p=
hp', NULL, 'Impression du d=C3=A9tail d''un poste comptable', NULL, NULL,=
 'ME');
-INSERT INTO menu_ref VALUES ('PRINTREPORT', 'Rapport', 'impress_rapport.=
inc.php', NULL, 'Impression de rapport', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTBILAN', 'Bilan', 'impress_bilan.inc.p=
hp', NULL, 'Impression de bilan', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTGL', 'Grand Livre', 'impress_gl_compt=
es.inc.php', NULL, 'Impression du grand livre', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTBAL', 'Balance', 'balance.inc.php', N=
ULL, 'Impression des balances comptables', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINTCARD', 'Cat=C3=A9gorie de Fiches', 'i=
mpress_fiche.inc.php', NULL, 'Impression cat=C3=A9gorie de fiches', NULL,=
 NULL, 'ME');
-INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, 'Menu im=
pression', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ACCESS', 'Accueil', NULL, 'user_login.php'=
, 'Accueil', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', NULL, NULL, 'Impres=
sion compta. analytique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('new_line', 'saut de ligne', NULL, NULL, 'S=
aut de ligne', NULL, NULL, 'SP');
-
-
---
--- Data for Name: profile; Type: TABLE DATA; Schema: public; Owner: -
---
-
-INSERT INTO profile VALUES ('Administrateur', 1, 'Profil par d=C3=A9faut=
 pour les adminstrateurs', true, true);
-INSERT INTO profile VALUES ('Utilisateur', 2, 'Profil par d=C3=A9faut po=
ur les utilisateurs', true, true);
-
-
---
--- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:=
 -
---
-
-INSERT INTO profile_menu VALUES (59, 'CFGPAY', 'DIVPARM', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (68, 'CFGATCARD', 'DIVPARM', 1, 9, 'E', =
0);
-INSERT INTO profile_menu VALUES (61, 'CFGACC', 'DIVPARM', 1, 6, 'E', 0);
-INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (651, 'ANCHOP', 'ANCIMP', 1, 10, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', 0);
-INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (652, 'ANCGL', 'ANCIMP', 1, 20, 'E', 0);
-INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
-INSERT INTO profile_menu VALUES (653, 'ANCBS', 'ANCIMP', 1, 30, 'E', 0);
-INSERT INTO profile_menu VALUES (654, 'ANCBC2', 'ANCIMP', 1, 40, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (655, 'ANCTAB', 'ANCIMP', 1, 50, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (656, 'ANCBCC', 'ANCIMP', 1, 60, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (657, 'ANCGR', 'ANCIMP', 1, 70, 'E', 0);
-INSERT INTO profile_menu VALUES (658, 'CSV:AncGrandLivre', NULL, 1, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (662, 'new_line', NULL, 1, 35, 'M', 0);
-INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', =
0);
-INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (526, 'PRINTGL', 'PRINT', 1, 20, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (23, 'LET', 'COMPTA', 1, 8, 'E', 0);
-INSERT INTO profile_menu VALUES (523, 'PRINTBAL', 'PRINT', 1, 50, 'E', 0=
);
-INSERT INTO profile_menu VALUES (529, 'PRINTREPORT', 'PRINT', 1, 85, 'E'=
, 0);
-INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', 0);
-INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',=
 0);
-INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 20, 'M', 0);
-INSERT INTO profile_menu VALUES (527, 'PRINTJRN', 'PRINT', 1, 10, 'E', 0=
);
-INSERT INTO profile_menu VALUES (530, 'PRINTREC', 'PRINT', 1, 100, 'E', =
0);
-INSERT INTO profile_menu VALUES (524, 'PRINTBILAN', 'PRINT', 1, 90, 'E',=
 0);
-INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 15, 'M', 0);
-INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E', 0);
-INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E', 0);
-INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E', 0=
);
-INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E', 0);
-INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E', 0);
-INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E', 0);
-INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E', 0);
-INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E', 0);
-INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E', 0);
-INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', 0);
-INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', 0);
-INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 25, 'M', 0);
-INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', 0);
-INSERT INTO profile_menu VALUES (35, 'PRINT', 'GESTION', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', 0);
-INSERT INTO profile_menu VALUES (126, 'CSV:postedetail', NULL, 1, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (3, 'MENUACH', 'COMPTA', 1, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (86, 'ACHIMP', 'MENUACH', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 45, 'M', 0);
-INSERT INTO profile_menu VALUES (18, 'MENUODS', 'COMPTA', 1, 5, 'E', 0);
-INSERT INTO profile_menu VALUES (88, 'ODS', 'MENUODS', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (89, 'ODSIMP', 'MENUODS', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 50, 'M', 0);
-INSERT INTO profile_menu VALUES (4, 'VENMENU', 'COMPTA', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (90, 'VEN', 'VENMENU', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (91, 'VENIMP', 'VENMENU', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (19, 'FIN', 'MENUFIN', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (73, 'CFGDOC', 'PARAM', 1, 8, 'E', 0);
-INSERT INTO profile_menu VALUES (74, 'CFGLED', 'PARAM', 1, 9, 'E', 0);
-INSERT INTO profile_menu VALUES (71, 'CFGSEC', 'PARAM', 1, 6, 'E', 0);
-INSERT INTO profile_menu VALUES (82, 'EXT', NULL, 1, 55, 'M', 0);
-INSERT INTO profile_menu VALUES (95, 'FREC', 'MENUFIN', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (94, 'FSALDO', 'MENUFIN', 1, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (27, 'LETACC', 'LET', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (24, 'LETCARD', 'LET', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (167, 'MOD', 'PARAM', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (93, 'FIMP', 'MENUFIN', 1, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (151, 'SEARCH', NULL, 1, 60, 'M', 0);
-INSERT INTO profile_menu VALUES (85, 'ACH', 'MENUACH', 1, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (127, 'PDF:postedetail', NULL, 1, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (128, 'CSV:fichedetail', NULL, 1, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (129, 'PDF:fichedetail', NULL, 1, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (130, 'CSV:fiche_balance', NULL, 1, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (131, 'PDF:fiche_balance', NULL, 1, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (132, 'CSV:report', NULL, 1, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (133, 'PDF:report', NULL, 1, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (134, 'CSV:fiche', NULL, 1, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (135, 'PDF:fiche', NULL, 1, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (136, 'CSV:glcompte', NULL, 1, NULL, 'P'=
, 0);
-INSERT INTO profile_menu VALUES (137, 'PDF:glcompte', NULL, 1, NULL, 'P'=
, 0);
-INSERT INTO profile_menu VALUES (138, 'PDF:sec', NULL, 1, NULL, 'P', 0);
-INSERT INTO profile_menu VALUES (139, 'CSV:AncList', NULL, 1, NULL, 'P',=
 0);
-INSERT INTO profile_menu VALUES (140, 'CSV:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (141, 'PDF:AncBalSimple', NULL, 1, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (142, 'CSV:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (143, 'PDF:AncBalDouble', NULL, 1, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (144, 'CSV:balance', NULL, 1, NULL, 'P',=
 0);
-INSERT INTO profile_menu VALUES (145, 'PDF:balance', NULL, 1, NULL, 'P',=
 0);
-INSERT INTO profile_menu VALUES (146, 'CSV:AncTable', NULL, 1, NULL, 'P'=
, 0);
-INSERT INTO profile_menu VALUES (147, 'CSV:AncAccList', NULL, 1, NULL, '=
P', 0);
-INSERT INTO profile_menu VALUES (148, 'CSV:AncBalGroup', NULL, 1, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (149, 'OTH:Bilan', NULL, 1, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (528, 'PRINTPOSTE', 'PRINT', 1, 30, 'E',=
 0);
-INSERT INTO profile_menu VALUES (525, 'PRINTCARD', 'PRINT', 1, 40, 'E', =
0);
-INSERT INTO profile_menu VALUES (1, 'DASHBOARD', NULL, 1, 10, 'M', 1);
-INSERT INTO profile_menu VALUES (172, 'CFGPRO', 'MOD', 1, NULL, 'E', 0);
-INSERT INTO profile_menu VALUES (171, 'CFGMENU', 'MOD', 1, NULL, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (663, 'CFGPAY', 'DIVPARM', 2, 4, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (664, 'CFGATCARD', 'DIVPARM', 2, 9, 'E',=
 0);
-INSERT INTO profile_menu VALUES (665, 'CFGACC', 'DIVPARM', 2, 6, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (668, 'ANCHOP', 'ANCIMP', 2, 10, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (669, 'COMPTA', NULL, 2, 40, 'M', 0);
-INSERT INTO profile_menu VALUES (672, 'ANCGL', 'ANCIMP', 2, 20, 'E', 0);
-INSERT INTO profile_menu VALUES (673, 'CFGTVA', 'DIVPARM', 2, 5, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (674, 'ANCBS', 'ANCIMP', 2, 30, 'E', 0);
-INSERT INTO profile_menu VALUES (675, 'ANCBC2', 'ANCIMP', 2, 40, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (676, 'ANCTAB', 'ANCIMP', 2, 50, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (677, 'ANCBCC', 'ANCIMP', 2, 60, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (678, 'ANCGR', 'ANCIMP', 2, 70, 'E', 0);
-INSERT INTO profile_menu VALUES (679, 'CSV:AncGrandLivre', NULL, 2, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (680, 'new_line', NULL, 2, 35, 'M', 0);
-INSERT INTO profile_menu VALUES (681, 'CFGCATDOC', 'DIVPARM', 2, 8, 'E',=
 0);
-INSERT INTO profile_menu VALUES (683, 'PRINTGL', 'PRINT', 2, 20, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (684, 'LET', 'COMPTA', 2, 8, 'E', 0);
-INSERT INTO profile_menu VALUES (685, 'PRINTBAL', 'PRINT', 2, 50, 'E', 0=
);
-INSERT INTO profile_menu VALUES (686, 'PRINTREPORT', 'PRINT', 2, 85, 'E'=
, 0);
-INSERT INTO profile_menu VALUES (688, 'PLANANC', 'ANC', 2, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (689, 'CFGCARDCAT', 'DIVPARM', 2, 7, 'E'=
, 0);
-INSERT INTO profile_menu VALUES (690, 'ANCODS', 'ANC', 2, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (717, 'CSV:ledger', NULL, 2, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (718, 'PDF:ledger', NULL, 2, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (719, 'PRINT', 'COMPTA', 2, 6, 'E', 0);
-INSERT INTO profile_menu VALUES (720, 'CSV:postedetail', NULL, 2, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (721, 'MENUACH', 'COMPTA', 2, 3, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (722, 'ACHIMP', 'MENUACH', 2, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (723, 'GESTION', NULL, 2, 45, 'M', 0);
-INSERT INTO profile_menu VALUES (724, 'MENUODS', 'COMPTA', 2, 5, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (725, 'ODS', 'MENUODS', 2, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (726, 'ODSIMP', 'MENUODS', 2, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (727, 'ANC', NULL, 2, 50, 'M', 0);
-INSERT INTO profile_menu VALUES (728, 'VENMENU', 'COMPTA', 2, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (729, 'VEN', 'VENMENU', 2, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (730, 'VENIMP', 'VENMENU', 2, 2, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (731, 'FIN', 'MENUFIN', 2, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (735, 'EXT', NULL, 2, 55, 'M', 0);
-INSERT INTO profile_menu VALUES (736, 'FREC', 'MENUFIN', 2, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (737, 'FSALDO', 'MENUFIN', 2, 3, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (738, 'LETACC', 'LET', 2, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (691, 'ANCGROUP', 'ANC', 2, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (692, 'ANCIMP', 'ANC', 2, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (694, 'PRINTJRN', 'PRINT', 2, 10, 'E', 0=
);
-INSERT INTO profile_menu VALUES (695, 'PRINTREC', 'PRINT', 2, 100, 'E', =
0);
-INSERT INTO profile_menu VALUES (696, 'PRINTBILAN', 'PRINT', 2, 90, 'E',=
 0);
-INSERT INTO profile_menu VALUES (697, 'PREFERENCE', NULL, 2, 15, 'M', 0)=
;
-INSERT INTO profile_menu VALUES (698, 'CUST', 'GESTION', 2, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (699, 'SUPPL', 'GESTION', 2, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (700, 'ADM', 'GESTION', 2, 3, 'E', 0);
-INSERT INTO profile_menu VALUES (701, 'CARD', 'GESTION', 2, 6, 'E', 0);
-INSERT INTO profile_menu VALUES (702, 'STOCK', 'GESTION', 2, 5, 'E', 0);
-INSERT INTO profile_menu VALUES (703, 'FORECAST', 'GESTION', 2, 7, 'E', =
0);
-INSERT INTO profile_menu VALUES (704, 'FOLLOW', 'GESTION', 2, 8, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (705, 'VERIFBIL', 'ADV', 2, 21, 'E', 0);
-INSERT INTO profile_menu VALUES (706, 'STOCK', 'ADV', 2, 22, 'E', 0);
-INSERT INTO profile_menu VALUES (707, 'PREDOP', 'ADV', 2, 23, 'E', 0);
-INSERT INTO profile_menu VALUES (708, 'OPEN', 'ADV', 2, 24, 'E', 0);
-INSERT INTO profile_menu VALUES (709, 'REPORT', 'ADV', 2, 25, 'E', 0);
-INSERT INTO profile_menu VALUES (710, 'CARD', 'COMPTA', 2, 7, 'E', 0);
-INSERT INTO profile_menu VALUES (711, 'HIST', 'COMPTA', 2, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (712, 'ADV', 'COMPTA', 2, 20, 'E', 0);
-INSERT INTO profile_menu VALUES (713, 'ACCESS', NULL, 2, 25, 'M', 0);
-INSERT INTO profile_menu VALUES (714, 'CSV:histo', NULL, 2, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (715, 'LOGOUT', NULL, 2, 30, 'M', 0);
-INSERT INTO profile_menu VALUES (716, 'PRINT', 'GESTION', 2, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (739, 'LETCARD', 'LET', 2, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (742, 'MENUFIN', 'COMPTA', 2, 4, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (743, 'FIMP', 'MENUFIN', 2, 2, 'E', 0);
-INSERT INTO profile_menu VALUES (744, 'SEARCH', NULL, 2, 60, 'M', 0);
-INSERT INTO profile_menu VALUES (745, 'ACH', 'MENUACH', 2, 1, 'E', 0);
-INSERT INTO profile_menu VALUES (746, 'PDF:postedetail', NULL, 2, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (747, 'CSV:fichedetail', NULL, 2, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (748, 'PDF:fichedetail', NULL, 2, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (749, 'CSV:fiche_balance', NULL, 2, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (750, 'PDF:fiche_balance', NULL, 2, NULL=
, 'P', 0);
-INSERT INTO profile_menu VALUES (751, 'CSV:report', NULL, 2, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (752, 'PDF:report', NULL, 2, NULL, 'P', =
0);
-INSERT INTO profile_menu VALUES (753, 'CSV:fiche', NULL, 2, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (754, 'PDF:fiche', NULL, 2, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (755, 'CSV:glcompte', NULL, 2, NULL, 'P'=
, 0);
-INSERT INTO profile_menu VALUES (756, 'PDF:glcompte', NULL, 2, NULL, 'P'=
, 0);
-INSERT INTO profile_menu VALUES (757, 'PDF:sec', NULL, 2, NULL, 'P', 0);
-INSERT INTO profile_menu VALUES (758, 'CSV:AncList', NULL, 2, NULL, 'P',=
 0);
-INSERT INTO profile_menu VALUES (759, 'CSV:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (760, 'PDF:AncBalSimple', NULL, 2, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (761, 'CSV:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (762, 'PDF:AncBalDouble', NULL, 2, NULL,=
 'P', 0);
-INSERT INTO profile_menu VALUES (763, 'CSV:balance', NULL, 2, NULL, 'P',=
 0);
-INSERT INTO profile_menu VALUES (764, 'PDF:balance', NULL, 2, NULL, 'P',=
 0);
-INSERT INTO profile_menu VALUES (765, 'CSV:AncTable', NULL, 2, NULL, 'P'=
, 0);
-INSERT INTO profile_menu VALUES (766, 'CSV:AncAccList', NULL, 2, NULL, '=
P', 0);
-INSERT INTO profile_menu VALUES (767, 'CSV:AncBalGroup', NULL, 2, NULL, =
'P', 0);
-INSERT INTO profile_menu VALUES (768, 'OTH:Bilan', NULL, 2, NULL, 'P', 0=
);
-INSERT INTO profile_menu VALUES (769, 'PRINTPOSTE', 'PRINT', 2, 30, 'E',=
 0);
-INSERT INTO profile_menu VALUES (770, 'PRINTCARD', 'PRINT', 2, 40, 'E', =
0);
-INSERT INTO profile_menu VALUES (777, 'CFGPRO', 'MOD', 2, NULL, 'E', 0);
-INSERT INTO profile_menu VALUES (778, 'CFGMENU', 'MOD', 2, NULL, 'E', 0)=
;
-INSERT INTO profile_menu VALUES (772, 'DASHBOARD', NULL, 2, 10, 'M', 1);
-
-
---
--- Data for Name: profile_menu_type; Type: TABLE DATA; Schema: public; O=
wner: -
---
-
-INSERT INTO profile_menu_type VALUES ('P', 'Impression');
-INSERT INTO profile_menu_type VALUES ('S', 'Extension');
-INSERT INTO profile_menu_type VALUES ('E', 'Menu');
-INSERT INTO profile_menu_type VALUES ('M', 'Module');
-
-
---
--- Data for Name: profile_user; Type: TABLE DATA; Schema: public; Owner:=
 -
---
-
-INSERT INTO profile_user VALUES ('phpcompta', 1, 1);
-
-
---
--- Name: menu_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tabl=
espace:=20
---
-
-ALTER TABLE ONLY menu_ref
-    ADD CONSTRAINT menu_ref_pkey PRIMARY KEY (me_code);
-
-
---
--- Name: profile_menu_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
---
-
-ALTER TABLE ONLY profile_menu
-    ADD CONSTRAINT profile_menu_pkey PRIMARY KEY (pm_id);
-
-
---
--- Name: profile_menu_type_pkey; Type: CONSTRAINT; Schema: public; Owner=
: -; Tablespace:=20
---
-
-ALTER TABLE ONLY profile_menu_type
-    ADD CONSTRAINT profile_menu_type_pkey PRIMARY KEY (pm_type);
-
-
---
--- Name: profile_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Table=
space:=20
---
-
-ALTER TABLE ONLY profile
-    ADD CONSTRAINT profile_pkey PRIMARY KEY (p_id);
-
-
---
--- Name: profile_user_pkey; Type: CONSTRAINT; Schema: public; Owner: -; =
Tablespace:=20
---
-
-ALTER TABLE ONLY profile_user
-    ADD CONSTRAINT profile_user_pkey PRIMARY KEY (pu_id);
-
-
---
--- Name: profile_user_user_name_key; Type: CONSTRAINT; Schema: public; O=
wner: -; Tablespace:=20
---
-
-ALTER TABLE ONLY profile_user
-    ADD CONSTRAINT profile_user_user_name_key UNIQUE (user_name, p_id);
-
-
---
--- Name: fki_profile_menu_me_code; Type: INDEX; Schema: public; Owner: -=
; Tablespace:=20
---
-
-CREATE INDEX fki_profile_menu_me_code ON profile_menu USING btree (me_co=
de);
-
-
---
--- Name: fki_profile_menu_profile; Type: INDEX; Schema: public; Owner: -=
; Tablespace:=20
---
-
-CREATE INDEX fki_profile_menu_profile ON profile_menu USING btree (p_id)=
;
-
-
---
--- Name: fki_profile_menu_type_fkey; Type: INDEX; Schema: public; Owner:=
 -; Tablespace:=20
---
-
-CREATE INDEX fki_profile_menu_type_fkey ON profile_menu USING btree (p_t=
ype_display);
-
-
---
--- Name: profile_menu_me_code_fkey; Type: FK CONSTRAINT; Schema: public;=
 Owner: -
---
-
-ALTER TABLE ONLY profile_menu
-    ADD CONSTRAINT profile_menu_me_code_fkey FOREIGN KEY (me_code) REFER=
ENCES menu_ref(me_code) ON UPDATE CASCADE ON DELETE CASCADE;
-
-
---
--- Name: profile_menu_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
---
-
-ALTER TABLE ONLY profile_menu
-    ADD CONSTRAINT profile_menu_p_id_fkey FOREIGN KEY (p_id) REFERENCES =
profile(p_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-
---
--- Name: profile_menu_type_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
---
-
-ALTER TABLE ONLY profile_menu
-    ADD CONSTRAINT profile_menu_type_fkey FOREIGN KEY (p_type_display) R=
EFERENCES profile_menu_type(pm_type);
-
-
---
--- Name: profile_user_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow=
ner: -
---
-
-ALTER TABLE ONLY profile_user
-    ADD CONSTRAINT profile_user_p_id_fkey FOREIGN KEY (p_id) REFERENCES =
profile(p_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-
---
--- PostgreSQL database dump complete
---
-



From MAILER-DAEMON Sat Nov 26 21:18:13 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUUJp-0005Ej-4x
	for mharc-phpcompta-dev@gnu.org; Sat, 26 Nov 2011 21:18:13 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 27 Nov 2011 03:23:07 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.51571.1322360292.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4481 - 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, 27 Nov 2011 02:18:11 -0000

Author: danydb
Date: 2011-11-27 03:23:06 +0100 (Sun, 27 Nov 2011)
New Revision: 4481

Removed:
   phpcompta/trunk/sql/style-epad.sql
   phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql
   phpcompta/trunk/sql/tmp_pcmn_ins.sql
   phpcompta/trunk/sql/trigger.tmp_pcmn.sql
   phpcompta/trunk/sql/tva.sql
   phpcompta/trunk/sql/upgrade.sql
Log:

remove temp file=20



Deleted: phpcompta/trunk/sql/style-epad.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/style-epad.sql	2011-11-27 02:22:33 UTC (rev 4480)
+++ phpcompta/trunk/sql/style-epad.sql	2011-11-27 02:23:06 UTC (rev 4481)
@@ -1,3 +0,0 @@
--- run to the account_repository
-insert into theme values ('EPad','style-epad.css',null);
-

Deleted: phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.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/tmp_pcmn_alphanum_ins_upd.sql	2011-11-27 02:22:33=
 UTC (rev 4480)
+++ phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql	2011-11-27 02:23:06=
 UTC (rev 4481)
@@ -1,14 +0,0 @@
-
-CREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_alphanum_ins_upd()
-  RETURNS trigger AS
-$BODY$
-declare
-   r_record tmp_pcmn%ROWTYPE;
-begin
-r_record :=3D NEW;
-r_record.pcm_val:=3Dformat_account(NEW.pcm_val);
-
-return r_record;
-end;
-$BODY$
-LANGUAGE plpgsql;

Deleted: phpcompta/trunk/sql/tmp_pcmn_ins.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/tmp_pcmn_ins.sql	2011-11-27 02:22:33 UTC (rev 448=
0)
+++ phpcompta/trunk/sql/tmp_pcmn_ins.sql	2011-11-27 02:23:06 UTC (rev 448=
1)
@@ -1,16 +0,0 @@
-CREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_ins()
-  RETURNS trigger AS
-$BODY$
-declare
-   r_record tmp_pcmn%ROWTYPE;
-begin
-r_record :=3D NEW;
-if  length(trim(r_record.pcm_type))=3D0 or r_record.pcm_type is NULL the=
n=20
-   r_record.pcm_type:=3Dfind_pcm_type(NEW.pcm_val);
-   return r_record;
-end if;
-return NEW;
-end;
-$BODY$
-LANGUAGE plpgsql;
-

Deleted: phpcompta/trunk/sql/trigger.tmp_pcmn.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/trigger.tmp_pcmn.sql	2011-11-27 02:22:33 UTC (rev=
 4480)
+++ phpcompta/trunk/sql/trigger.tmp_pcmn.sql	2011-11-27 02:23:06 UTC (rev=
 4481)
@@ -1,5 +0,0 @@
-CREATE TRIGGER t_tmp_pcm_alphanum_ins_upd
-  BEFORE INSERT OR UPDATE
-  ON tmp_pcmn
-  FOR EACH ROW
-  EXECUTE PROCEDURE comptaproc.tmp_pcmn_alphanum_ins_upd();

Deleted: phpcompta/trunk/sql/tva.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/tva.sql	2011-11-27 02:22:33 UTC (rev 4480)
+++ phpcompta/trunk/sql/tva.sql	2011-11-27 02:23:06 UTC (rev 4481)
@@ -1,171 +0,0 @@
-alter table tva_rate add tva_both_side integer ;
-alter table tva_rate alter tva_both_side set default 0;
-update tva_rate set tva_both_side=3D0;
-
-----------------------------------------------------------------------
--- TVA MODIFY
-----------------------------------------------------------------------
-drop FUNCTION comptaproc.tva_modify(integer, text, numeric, text, text);
-
-
-
-alter table quant_purchase add qp_vat_sided numeric (20,4);
-alter table quant_sold add qs_vat_sided numeric (20,4);
-
-alter table quant_purchase alter qp_vat_sided set default 0.0;
-alter table quant_sold alter qs_vat_sided set default 0.0;
-
-update quant_purchase set qp_vat_sided=3D0.0;
-update quant_sold set qs_vat_sided=3D0.0;
-
-comment on column quant_purchase.qp_vat_sided is 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
-comment on column quant_purchase.qp_vat_sided is 'amount of the VAT whic=
h avoid VAT, case of the VAT which add the same amount at the deb and cre=
d';
-
-CREATE OR REPLACE FUNCTION comptaproc.tva_modify(integer, text, numeric,=
 text, text,integer)
- RETURNS integer
-AS $function$
-declare
-	p_tva_id alias for $1;
-	p_tva_label alias for $2;
-	p_tva_rate alias for $3;
-	p_tva_comment alias for $4;
-	p_tva_poste alias for $5;
-	p_tva_both_side alias for $6;
-	debit text;
-	credit text;
-	nCount integer;
-begin
-if length(trim(p_tva_label)) =3D 0 then
-	return 3;
-end if;
-
-if length(trim(p_tva_poste)) !=3D 0 then
-	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
-	debit  =3D split_part(p_tva_poste,',',1);
-	credit	=3D split_part(p_tva_poste,',',2);
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
-	if nCount =3D 0 then return 4; end if;
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
-	if nCount =3D 0 then return 4; end if;
-
-end if;
-update tva_rate set tva_label=3Dp_tva_label,tva_rate=3Dp_tva_rate,tva_co=
mment=3Dp_tva_comment,tva_poste=3Dp_tva_poste,tva_both_side=3Dp_tva_both_=
side
-	where tva_id=3Dp_tva_id;
-return 0;
-end;
-$function$
-LANGUAGE plpgsql;
-
-----------------------------------------------------------------------
--- TVA INSERT
-----------------------------------------------------------------------
-
-drop FUNCTION comptaproc.tva_insert(text, numeric, text, text);
-
-CREATE OR REPLACE FUNCTION comptaproc.tva_insert(text, numeric, text, te=
xt,integer)
- RETURNS integer
-AS $function$
-declare
-	l_tva_id integer;
-	p_tva_label alias for $1;
-	p_tva_rate alias for $2;
-	p_tva_comment alias for $3;
-	p_tva_poste alias for $4;
-	p_tva_both_side alias for $5;
-	debit text;
-	credit text;
-	nCount integer;
-begin
-if length(trim(p_tva_label)) =3D 0 then
-	return 3;
-end if;
-
-if length(trim(p_tva_poste)) !=3D 0 then
-	if position (',' in p_tva_poste) =3D 0 then return 4; end if;
-	debit  =3D split_part(p_tva_poste,',',1);
-	credit	=3D split_part(p_tva_poste,',',2);
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Ddebit::accoun=
t_type;
-	if nCount =3D 0 then return 4; end if;
-	select count(*) into nCount from tmp_pcmn where pcm_val=3Dcredit::accou=
nt_type;
-	if nCount =3D 0 then return 4; end if;
-
-end if;
-select into l_tva_id nextval('s_tva') ;
-insert into tva_rate(tva_id,tva_label,tva_rate,tva_comment,tva_poste,tva=
_both_side)
-	values (l_tva_id,p_tva_label,p_tva_rate,p_tva_comment,p_tva_poste,p_tva=
_both_side);
-return 0;
-end;
-$function$
-LANGUAGE plpgsql;
-
-
-
-DROP FUNCTION comptaproc.insert_quant_purchase(text,numeric, character v=
arying,numeric,numeric,numeric,integer,numeric,numeric,numeric,numeric,ch=
aracter varying);
--- procedure insert_quant_purchase
-CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(p_internal t=
ext, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price =
numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva=
 numeric, p_nd_tva_recup numeric, p_dep_priv numeric, p_client character =
varying,p_tva_sided numeric)
- RETURNS void
-AS $function$
-declare
-        fid_client integer;
-        fid_good   integer;
-begin
-        select f_id into fid_client from
-                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
-        select f_id into fid_good from
-                 fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim=
(p_fiche));
-        insert into quant_purchase
-                (qp_internal,
-                j_id,
-                qp_fiche,
-                qp_quantite,
-                qp_price,
-                qp_vat,
-                qp_vat_code,
-                qp_nd_amount,
-                qp_nd_tva,
-                qp_nd_tva_recup,
-                qp_supplier,
-                qp_dep_priv,
-                qp_vat_sided)
-        values
-                (p_internal,
-                p_j_id,
-                fid_good,
-                p_quant,
-                p_price,
-                p_vat,
-                p_vat_code,
-                p_nd_amount,
-                p_nd_tva,
-                p_nd_tva_recup,
-                fid_client,
-                p_dep_priv,
-                p_tva_sided);
-        return;
-end;
- $function$=20
- LANGUAGE plpgsql;
-
-DROP FUNCTION comptaproc.insert_quant_sold(text, numeric, character vary=
ing, numeric, numeric, numeric, integer, character varying);
-
--- procedure insert_quant_sold
-CREATE OR REPLACE FUNCTION comptaproc.insert_quant_sold(p_internal text,=
 p_jid numeric, p_fiche character varying, p_quant numeric, p_price numer=
ic, p_vat numeric, p_vat_code integer, p_client character varying,p_tva_s=
ided numeric)
- RETURNS void
-AS $function$
-declare
-        fid_client integer;
-        fid_good   integer;
-begin
-
-        select f_id into fid_client from
-                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
-        select f_id into fid_good from
-                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_fiche));
-        insert into quant_sold
-                (qs_internal,j_id,qs_fiche,qs_quantite,qs_price,qs_vat,q=
s_vat_code,qs_client,qs_valid,qs_vat_sided)
-        values
-                (p_internal,p_jid,fid_good,p_quant,p_price,p_vat,p_vat_c=
ode,fid_client,'Y',p_tva_sided);
-        return;
-end;
- $function$=20
- LANGUAGE plpgsql;

Deleted: 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	2011-11-27 02:22:33 UTC (rev 4480)
+++ phpcompta/trunk/sql/upgrade.sql	2011-11-27 02:23:06 UTC (rev 4481)
@@ -1,39 +0,0 @@
-\set ECHO all
-\set ON_ERROR_ROLLBACK
-\set ON_ERROR_STOP
-begin;
-drop table public.import_tmp;
-drop table public.format_csv_banque;
-insert into parameter values ('MY_ALPHANUM','N');
-update PARAMETER set pr_value=3D'N' where pr_id=3D'MY_CHECK_PERIODE';
-delete from action where ac_id not in (800,805,910);
-insert into action (ac_id,ac_description, ac_module, ac_code) values(102=
0,'Effacer les documents du suivi','followup','RMDOC');
-insert into action (ac_id,ac_description, ac_module, ac_code) values(101=
0,'Voir les documents du suivi','followup','VIEWDOC');
-insert into action (ac_id,ac_description, ac_module, ac_code) values(105=
0,'Modifier le type de document','followup','PARCATDOC');
-/*
-script SQL to run
-*/
-\i account_alphanum.sql
-\i account_compute.sql
-\i account_insert.sql
-\i account-update.sql
-\i format_account.sql
-\i tmp_pcmn_alphanum_ins_upd.sql
-\i tmp_pcmn_ins.sql
-\i trigger.tmp_pcmn.sql
-\i account_add.sql
-\i object-6.0.sql
-\i extension.sql
-\i ajax-direct-form.sql
-
-\i mode_paiement.sql
-\i tva.sql
-create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2=
3;
-
-
----------------------------------------------------
--- for account repository
----------------------------------------------------
--- \i change_account_repo.sql
--- \i style-epad.sql
-commit;



From MAILER-DAEMON Sun Nov 27 15:30:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUlMc-0004ew-Ct
	for mharc-phpcompta-dev@gnu.org; Sun, 27 Nov 2011 15:30:14 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 27 Nov 2011 21:34:58 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.53129.1322425813.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r197 - in trunk: backup_noadmin/include/template
	importbank/include importbank/include/template tva
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Nov 2011 20:30:13 -0000

Author: danydb
Date: 2011-11-27 21:34:55 +0100 (Sun, 27 Nov 2011)
New Revision: 197

Modified:
   trunk/backup_noadmin/include/template/home.php
   trunk/importbank/include/class_import_bank.php
   trunk/importbank/include/import_bank.php
   trunk/importbank/include/template/show_list.php
   trunk/tva/ajax.php
Log:

TVA : cosmetic + lettering=20



Modified: trunk/backup_noadmin/include/template/home.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/backup_noadmin/include/template/home.php	2011-11-26 23:04:38 UT=
C (rev 196)
+++ trunk/backup_noadmin/include/template/home.php	2011-11-27 20:34:55 UT=
C (rev 197)
@@ -1,7 +1,8 @@
 <h2> Backup du dossier courant </h2>
 <form method=3D"get" ACTION=3D"extension.raw.php">
-Voulez-vous avoir une copie de ce dossier=20
+Voulez-vous avoir une copie de ce dossier
 <?=3DHtmlInput::submit('backup','backup')?>
 <?=3Ddossier::hidden()?>
 <?=3DHtmlInput::extension();?>
+<?=3DHtmlInput::hidden('ac',$_REQUEST['ac']);?>
 </form>
\ No newline at end of file

Modified: trunk/importbank/include/class_import_bank.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/class_import_bank.php	2011-11-26 23:04:38 UT=
C (rev 196)
+++ trunk/importbank/include/class_import_bank.php	2011-11-27 20:34:55 UT=
C (rev 197)
@@ -151,11 +151,11 @@
=20
=20
       }
-    $array=3D$cn->get_array('select a.id as id,to_char(i_date,\'DD.MM.YY=
YY HH24:MI\') as i_date,format_name
+    $array=3D$cn->get_array('select a.id as id,to_char(i_date,\'DD.MM.YY=
YY HH24:MI\') as i_date,format_name,jrn_def_id
 				from importbank.import as a
 				join importbank.format_bank as b on (format_bank_id=3Db.id)
 			    where a.id=3D$1',array($p_id));
-    echo h2($array[0]['id']." ".$array[0]['i_date']." ".$array[0]['forma=
t_name'],'');
+    echo h1($array[0]['id']." ".$array[0]['i_date']." ".$array[0]['forma=
t_name'],'');
     $ret=3D$cn->exec_sql(" SELECT id ,ref_operation,tp_date, amount,
 				case when status=3D'N' then 'Nouveau'
 				when status=3D'T' then 'Transf=C3=A8r=C3=A9'
@@ -170,6 +170,10 @@
 			  FROM importbank.temp_bank
 			  where import_id=3D$1 $sql_filter
 			  order by tp_date,ref_operation,amount",array($p_id));
+	$jrn_name=3D$cn->get_value('select jrn_def_name from jrn_def where  jrn=
_def_id=3D$1',array($array[0]['jrn_def_id']));
+	$jrn_account=3D$cn->get_value ("select ad_value from fiche_detail
+						where ad_id=3D1 and f_id=3D(select jrn_Def_bank from jrn_def where=
 jrn_def_id=3D$1) "
+			,array($array[0]['jrn_def_id']));
     require_once('template/show_list.php');
=20
=20
@@ -329,6 +333,24 @@
 			$acc_reconc=3Dnew Acc_Reconciliation($cn);
 			$acc_reconc->set_jr_id($jr_id);
 			$acc_reconc->insert($row->tp_rec);
+			// lettering
+			$a_rec=3D$cn->get_array('select j_id
+										from jrnx join jrn on (j_grpt=3Djr_grpt_id)
+									  where
+									  f_id=3D$1 and jr_id=3D$2',array($row->f_id,$row->tp_rec));
+			if ( count($a_rec) =3D=3D 1 )
+			{
+				$a_target=3D$cn->get_array('select j_id
+										from jrnx join jrn on (j_grpt=3Djr_grpt_id)
+									  where
+									  f_id=3D$1 and jr_id=3D$2',array($row->f_id,$jr_id));
+				if ( count($a_target)=3D=3D1)
+				{
+					$lc=3Dnew Lettering_Card($cn);
+					$lc->insert_couple($a_rec[0]['j_id'],$a_target[0]['j_id']);
+				}
+			}
+
 	      }
=20
             $sql2 =3D "update importbank.temp_bank set status =3D 'T',tp=
_error_msg=3Dnull  where id=3D$1";

Modified: trunk/importbank/include/import_bank.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/import_bank.php	2011-11-26 23:04:38 UTC (rev=
 196)
+++ trunk/importbank/include/import_bank.php	2011-11-27 20:34:55 UTC (rev=
 197)
@@ -24,7 +24,7 @@
  */
 $format=3Dnew IText('format_name');
 $jrn_def=3Dnew ISelect('jrn_def');
-$jrn_def->value=3D$cn->make_array('select jrn_def_id,jrn_def_name from j=
rn_def where '.$user->get_ledger_sql('FIN',3).' order by jrn_def_name');
+$jrn_def->value=3D$cn->make_array('select jrn_def_id,jrn_def_name from j=
rn_def where '.$g_user->get_ledger_sql('FIN',3).' order by jrn_def_name')=
;
 $sep_decimal=3Dnew ISelect('sep_dec');
 $sep_decimal->value=3D$adecimal;
=20

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	2011-11-26 23:04:38 U=
TC (rev 196)
+++ trunk/importbank/include/template/show_list.php	2011-11-27 20:34:55 U=
TC (rev 197)
@@ -1,3 +1,4 @@
+<h2 class=3D"info"> Journal cible =3D <?=3D$jrn_name?> Compte de ce jour=
nal <?=3D$jrn_account?></h2>
 <form method=3D"get">
=20
 Filtrer : <?=3D$filter->input()?>

Modified: trunk/tva/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/ajax.php	2011-11-26 23:04:38 UTC (rev 196)
+++ trunk/tva/ajax.php	2011-11-27 20:34:55 UTC (rev 197)
@@ -7,7 +7,10 @@
 require_once('class_acc_ledger.php');
=20
 extract($_GET);
+global $g_parameter;
 $cn=3Dnew Database($gDossier);
+$g_parameter=3Dnew Own($cn);
+
 $html=3D'';$extra=3D'';$ctl=3D'';
 switch($act) {
 case 'dsp_decl':
@@ -52,11 +55,10 @@
   $count=3D$cn->get_value('select count(*) from tva_belge.declaration_am=
ount where da_id=3D$1',array($_REQUEST['p_id']));
   if ( $count =3D=3D 1 )
     {
-      $r=3D'<div style=3D"float:right"><a class=3D"mtitle" href=3D"javas=
cript:void(0)" onclick=3D"removeDiv(\'record_write\')">fermer</a></div>';
       $ctl=3D'record_write';
       $ledger=3Dnew Acc_ledger($cn,0);
       $sel_ledger=3D$ledger->select_ledger('ODS',1);
-      $r.=3Dh2info('G=C3=A9n=C3=A9ration =C3=A9criture');
+      $r=3DHtmlInput::title_box('G=C3=A9n=C3=A9ration =C3=A9criture','re=
cord_write');
 	  if ($sel_ledger !=3D null)
 	  {
 		  $r.=3D'<form onsubmit=3D"save_write(this);return false;">';



From MAILER-DAEMON Sun Nov 27 15:33:37 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUlPt-0005EU-CQ
	for mharc-phpcompta-dev@gnu.org; Sun, 27 Nov 2011 15:33:37 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 27 Nov 2011 21:38:24 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.53174.1322426016.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4482 - in phpcompta/trunk: doc html
	html/admin/sql/patch include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Nov 2011 20:33:35 -0000

Author: danydb
Date: 2011-11-27 21:38:23 +0100 (Sun, 27 Nov 2011)
New Revision: 4482

Modified:
   phpcompta/trunk/doc/manuel-fr.odt
   phpcompta/trunk/html/admin/sql/patch/upgrade97.sql
   phpcompta/trunk/html/export.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_print_ledger_simple.php
   phpcompta/trunk/include/extension_choice.inc.php
   phpcompta/trunk/include/extension_get.inc.php
   phpcompta/trunk/include/history_operation.inc.php
Log:
Update manuel
Extension are now shown as menu=20
Fix bug with Acc_Ledger::get_operation for the periode
Historic of operation show the requested periode
Bug in patch : version 9.0 the "similar to" clause failed in trigger on p=
cmn
Bug in patch : renumbering of operation doesn't work with data before 1/1=
/2010




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/html/admin/sql/patch/upgrade97.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/upgrade97.sql	2011-11-27 02:23:0=
6 UTC (rev 4481)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade97.sql	2011-11-27 20:38:2=
3 UTC (rev 4482)
@@ -218,13 +218,9 @@
 begin
 sResult :=3D lower(p_account);
=20
-sResult :=3D translate(sResult,'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4','eeeeaaaiiuuuoo');
-sResult :=3D translate(sResult,' $=E2=82=AC=C2=B5=C2=A3%.+-/\!(){}(),;_&=
|"#''^','');
+sResult :=3D translate(sResult,'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4=
=C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4=C3=A7','eeeeaaaiiuuuooc');
+sResult :=3D translate(sResult,' $=E2=82=AC=C2=B5=C2=A3%.+-/\!(){}(),;_&=
|"#''^<>*','');
=20
-if not sResult similar to '^[[:alnum:]_]+$' then
-	raise exception 'Invalid character in %',p_account;
-end if;
-
 return upper(sResult);
=20
 end;
@@ -960,7 +956,7 @@
 insert into menu_ref(me_code,me_menu,me_file,me_description,me_type,me_p=
arameter) select ex_code,ex_name,ex_file,ex_desC,'PL','plugin_code=3D'||e=
x_code from extension;
=20
 insert into profile_menu (me_code,me_code_dep,p_id,p_type_display) selec=
t me_code,'EXT',1,'S' from menu_ref where me_type=3D'PL';
-update jrn set jr_internal=3Dsubstring(jr_internal,1,1)||lpad(upper(to_h=
ex(jr_id+1)),6,'0');
+update jrn set jr_internal=3Dsubstr(jrn_def_type,1,1)||lpad(upper(to_hex=
(jr_id+1)),6,'0') from jrn_def where jrn_def_id=3Djr_def_id;
=20
 update version set val=3D98;
=20

Modified: phpcompta/trunk/html/export.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/export.php	2011-11-27 02:23:06 UTC (rev 4481)
+++ phpcompta/trunk/html/export.php	2011-11-27 20:38:23 UTC (rev 4482)
@@ -34,9 +34,9 @@
=20
 $user=3Dnew User($cn);
 $user->Check();
-$act=3D$user->check_dossier($gDossier);
+$action=3D$user->check_dossier($gDossier);
=20
-if ( $act=3D=3D'X' || ! isset($_GET['act']) || $user->check_print($_GET[=
'act'])=3D=3D0 )
+if ( $action=3D=3D'X' || ! isset($_GET['act']) || $user->check_print($_G=
ET['act'])=3D=3D0 )
   {
     echo alert('Acc=C3=A8s interdit');
     redirect("do.php?".dossier::get());

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2011-11-27 02:23:06 UTC (rev 44=
81)
+++ phpcompta/trunk/include/ac_common.php	2011-11-27 20:38:23 UTC (rev 44=
82)
@@ -774,10 +774,14 @@
=20
 		// if file is not a plugin, include the file, otherwise
 		// include the plugin launcher
-		if ( $file[0]['me_type'] !=3D 'PL')
-			require_once $file[0]['me_file'];
-		else
-			require 'extension_get.inc.php';
+		if ($file[0]['me_type'] !=3D 'PL')
+			{
+				require_once $file[0]['me_file'];
+			}
+			else
+			{
+				var_dump($file);
+			}
 	}
 	if ( $file[0]['me_javascript'] !=3D '')
 	{

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	2011-11-27 02:23:06 UTC =
(rev 4481)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-27 20:38:23 UTC =
(rev 4482)
@@ -2456,10 +2456,12 @@
             if ( ! isset ($date_start))
             {
                 $user=3Dnew User($this->db);
-                $period=3D$user->get_periode();
+                $exercice=3D$user->get_exercice();
=20
-                $per=3Dnew Periode($this->db,$period);
-                list($date_start,$date_end)=3D$per->get_date_limit();
+                $per=3Dnew Periode($this->db);
+				list($per_start,$per_end)=3D$per->limit_year($exercice);
+                list($date_start,$none)=3D$per_start->get_date_limit();
+                list($none,$date_end)=3D$per_end->get_date_limit();
=20
             }
             $desc=3D'';
@@ -2697,8 +2699,10 @@
              " to_char(jr_date,'DDMMYY') as date_fmt, ".
              " jr_comment as comment, jr_montant as montant ,".
              " jr_grpt_id,jr_def_id".
-             " from jrn where jr_tech_per >=3D $1 ".
-             ' and jr_tech_per <=3D$2  '.$jrn.' order by jr_date,substri=
ng(jr_pj_number,\'\\\d+$\')::numeric asc';
+             " from jrn where  ".
+			 " jr_date >=3D (select p_start from parm_periode where p_id =3D $1)
+				 and  jr_date <=3D (select p_end from parm_periode where p_id  =3D $=
2)" .
+             '  '.$jrn.' order by jr_date,substring(jr_pj_number,\'\\\d+=
$\')::numeric asc';
         $ret=3D$this->db->get_array($sql,array($p_from,$p_to));
         return $ret;
     }

Modified: phpcompta/trunk/include/class_print_ledger_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_simple.php	2011-11-27 02:2=
3:06 UTC (rev 4481)
+++ phpcompta/trunk/include/class_print_ledger_simple.php	2011-11-27 20:3=
8:23 UTC (rev 4482)
@@ -93,11 +93,11 @@
         }
         $this->Cell(15,6,'Pi=C3=A8ce');
         $this->Cell(10,6,'Date');
-        $this->Cell(20,6,'ref');
+        $this->Cell(13,6,'ref');
         if ( $this->jrn_type=3D=3D'ACH')
-            $this->Cell(60,6,'Client');
+            $this->Cell(40,6,'Client');
         else
-            $this->Cell(60,6,'Fournisseur');
+            $this->Cell(40,6,'Fournisseur');
=20
         $flag_tva=3D(count($this->a_Tva) > 4)?true:false;
         if ( !$flag_tva )      $this->Cell(65,6,'Description');
@@ -117,7 +117,7 @@
=20
         $this->SetFont('DejaVu','',6);
         // page Header
-        $this->Cell(170,6,'report',0,0,'R');
+        $this->Cell(143,6,'report',0,0,'R');
         $this->Cell(15,6,nbm($this->rap_htva),0,0,'R'); /* HTVA */
         if ( $this->jrn_type !=3D 'VEN')
         {
@@ -149,7 +149,7 @@
         //Position at 3 cm from bottom
         $this->SetY(-20);
         /* write reporting  */
-        $this->Cell(170,6,'Total page ','T',0,'R'); /* HTVA */
+        $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')
         {
@@ -164,7 +164,7 @@
         $this->Cell(15,6,nbm($this->tp_tvac),'T',0,'R'); /* Tvac */
         $this->Ln(2);
=20
-        $this->Cell(170,6,'report',0,0,'R'); /* HTVA */
+        $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')
         {
@@ -219,31 +219,30 @@
             for ($f=3D0;$f<count($aAmountVat);$f++)
             {
                 $l=3D$aAmountVat[$f]['tva_id'];
-                $atva_amount[$l]=3D$aAmountVat[$f]['sum_vat'];
-                $this->tp_tva[$l]+=3D$aAmountVat[$f]['sum_vat'];
-                $this->rap_tva[$l]+=3D$aAmountVat[$f]['sum_vat'];
+                $atva_amount[$l]=3Dbcadd($atva_amount[$l],$aAmountVat[$f=
]['sum_vat']);
+                $this->tp_tva[$l]=3Dbcadd($this->tp_tva[$l],$aAmountVat[=
$f]['sum_vat']);
+                $this->rap_tva[$l]=3Dbcadd($this->rap_tva[$l],$aAmountVa=
t[$f]['sum_vat']);
             }
=20
             $row=3D$a_jrn[$i];
             $this->Cell(15,5,($row['pj']),0,0);
             $this->Cell(10,5,$row['date_fmt'],0,0);
-            $this->Cell(20,5,$row['internal'],0,0);
+            $this->Cell(13,5,$row['internal'],0,0);
             list($qc,$name)=3D$this->get_tiers($row['id'],$this->jrn_typ=
e);
-            $this->Cell(20,5,$qc,0,0);
-            $this->Cell(40,5,$name,0,0);
+            $this->Cell(40,5,"[".$qc."]".$name,0,0);
=20
             $this->Cell(65,5,substr($row['comment'],0,47),0,0);
=20
             /* get other amount (without vat, total vat included, privat=
e, ND */
             $other=3D$this->ledger->get_other_amount($a_jrn[$i]['jr_grpt=
_id']);
-            $this->tp_htva+=3D$other['price'];
-            $this->tp_tvac+=3D$other['price']+$other['vat'];
-            $this->tp_priv+=3D$other['priv'];
-            $this->tp_nd+=3D$other['tva_nd'];
-            $this->rap_htva+=3D$other['price'];
-            $this->rap_tvac+=3D$other['price']+$other['vat'];
-            $this->rap_priv+=3D$other['priv'];
-            $this->rap_nd+=3D$other['tva_nd'];
+            $this->tp_htva=3Dbcadd($this->tp_htva,$other['price']);
+            $this->tp_tvac=3Dbcadd($this->tp_tvac,$other['price']+$other=
['vat']);
+            $this->tp_priv=3Dbcadd($this->tp_priv,$other['priv']);
+            $this->tp_nd=3Dbcadd($this->tp_nd,$other['tva_nd']);
+            $this->rap_htva=3Dbcadd($this->rap_htva,$other['price']);
+            $this->rap_tvac=3Dbcadd($this->rap_tvac,$other['price']+$oth=
er['vat']);
+            $this->rap_priv=3Dbcadd($this->rap_priv,$other['priv']);
+            $this->rap_nd=3Dbcadd($this->rap_nd,$other['tva_nd']);
=20
=20
             $this->Cell(15,5,nbm($other['price']),0,0,'R');
@@ -252,10 +251,10 @@
 	      $this->Cell(15,5,nbm($other['priv']),0,0,'R');
 	      $this->Cell(15,5,nbm($other['tva_nd']),0,0,'R');
             }
-            foreach ($atva_amount  as $row_atva_amount)
-            {
-	      $this->Cell(15,5,nbm($row_atva_amount),0,0,'R');
-            }
+				foreach ($atva_amount as $row_atva_amount)
+			{
+				$this->Cell(15, 5, nbm($row_atva_amount), 0, 0, 'R');
+			}
=20
 	    $l_tvac=3Dbcadd($other['price'],$other['vat']);
             $this->Cell(15,5,nbm($l_tvac),0,0,'R');

Modified: phpcompta/trunk/include/extension_choice.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/extension_choice.inc.php	2011-11-27 02:23:06 =
UTC (rev 4481)
+++ phpcompta/trunk/include/extension_choice.inc.php	2011-11-27 20:38:23 =
UTC (rev 4482)
@@ -38,7 +38,7 @@
 {
     $_REQUEST['plugin_code']=3D$a->value[0]['value'];
 }
-else
+/*else
 {
 	if (!isset($_REQUEST['ac'])) echo_warning ("ac non positionn=C3=A9");
     echo '<form method=3D"get" action=3D"do.php">';
@@ -47,9 +47,8 @@
     echo _('Extension').$a->input().HtmlInput::submit('go',_("Choix de l=
'extension"));
     echo '</form>';
     echo '<hr>';
-}
+}*/
=20
-if ( isset($_REQUEST['plugin_code']))
-	require_once 'extension_get.inc.php';
-
+//if ( isset($_REQUEST['plugin_code']))
+//	require_once 'extension_get.inc.php';
 ?>

Modified: phpcompta/trunk/include/extension_get.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/extension_get.inc.php	2011-11-27 02:23:06 UTC=
 (rev 4481)
+++ phpcompta/trunk/include/extension_get.inc.php	2011-11-27 20:38:23 UTC=
 (rev 4482)
@@ -18,7 +18,7 @@
 global $cn,$g_user;
=20
 $ext=3Dnew Extension($cn);
-;
+
 if ($ext->search($_REQUEST['plugin_code']) =3D=3D -1)
 	{
 		echo_warning("plugin non trouv=C3=A9");

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	2011-11-27 02:23:06=
 UTC (rev 4481)
+++ phpcompta/trunk/include/history_operation.inc.php	2011-11-27 20:38:23=
 UTC (rev 4482)
@@ -85,6 +85,7 @@
 }
 $p_array =3D $_GET;
=20
+$msg=3D"";
 /* by default we should the default period */
 if (!isset($p_array['date_start']))
 {
@@ -93,7 +94,13 @@
 	list($date_start, $date_end) =3D $per->get_date_limit();
 	$p_array['date_start'] =3D $date_start;
 	$p_array['date_end'] =3D $date_end;
+	$msg=3D'<h2 class=3D"info2">'."Periode ".$date_start." au ".$date_end.'=
</h2>';
 }
+else
+{
+	$msg=3D'<h2 class=3D"info2">'."Periode ".$_GET['date_start']." au ".$_G=
ET['date_end'].'</h2>';
+
+}
 /*  compute the sql stmt */
 list($sql, $where) =3D $Ledger->build_search_sql($p_array);
=20
@@ -104,7 +111,7 @@
 $offset =3D (isset($_GET['offset'])) ? $_GET['offset'] : 0;
 $bar =3D jrn_navigation_bar($offset, $max_line, $step, $page);
=20
-
+echo $msg;
 echo '<form method=3D"GET" id=3D"fpaida" class=3D"print">';
 echo HtmlInput::hidden("ac", $_REQUEST['ac']);
 echo HtmlInput::hidden('ledger_type',$_REQUEST['ledger_type']);



From MAILER-DAEMON Mon Nov 28 06:46:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUzet-0004l7-MG
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 06:46:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 12:50:41 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.55621.1322480762.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4483 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 11:46:02 -0000

Author: danydb
Date: 2011-11-28 12:50:38 +0100 (Mon, 28 Nov 2011)
New Revision: 4483

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
am?\195?\169liore page setup.php


Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-27 20:38:23 UTC (rev 448=
2)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-28 11:50:38 UTC (rev 448=
3)
@@ -214,7 +214,7 @@
 ?>
 <h2>Info</h2>
 Vous utilisez le domaine <?php echo domaine; ?>
-<h2>Php setting</h2>
+<h2>PHP/h2>
 <?php
=20
 $flag_php=3D0;
@@ -319,7 +319,7 @@
 $cn=3Dnew Database(-1,'template');
=20
 ?>
-<h2>Database version </h2>
+<h2>Base de donn=C3=A9es</h2>
 <?php
  // Verify Psql version
  //--
@@ -341,7 +341,7 @@
 }
=20
 ?>
-<h2>Database Setting</h2>
+<h3>Param=C3=A8tre base de donn=C3=A9es</h3>
 <?php
 // Language plsql is installed
 //--



From MAILER-DAEMON Mon Nov 28 08:08:37 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV0wn-0000F7-N6
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 08:08:37 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 14:13:22 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.55897.1322485715.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4484 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 13:08:34 -0000

Author: danydb
Date: 2011-11-28 14:13:21 +0100 (Mon, 28 Nov 2011)
New Revision: 4484

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
bug setup.php

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-28 11:50:38 UTC (rev 448=
3)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-28 13:13:21 UTC (rev 448=
4)
@@ -108,7 +108,6 @@
  */
 $failed=3D"<span style=3D\"font-size:18px;color:red\">&#x2716;</span>";
 $succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</span>=
";
-
 $inc_path=3Dget_include_path();
 /**
  *@brief create correctly the htaccess file
@@ -156,7 +155,7 @@
     fwrite($hFile,'php_value include_path .:../../include:../include:add=
on'."\n");
   foreach ($array as $value ) fwrite($hFile,$value."\n");
   fclose($hFile);
-
+}
 if ( strpos($inc_path,";") !=3D 0 ) {
   $new_path=3D$inc_path.';..\..\include;addon';
   $os=3D0;			/* $os is 0 for windoz */
@@ -174,17 +173,17 @@
     Les informations sont sauv&eacute;es vous pouvez continuer
 <input type=3D"submit" value=3D"Continuer">
 </form>';
-create_htaccess();
  exit();
  }
-
 if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'in=
clude'.DIRECTORY_SEPARATOR.'config.inc.php')) {
   /* if the config file is not found we propose to create one */
   if ( is_writable ('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'i=
nclude'.DIRECTORY_SEPARATOR.'constant.php') =3D=3D false ) {
     echo '<h2 class=3D"error"> Ecriture non possible </h2><p class=3D"wa=
rning"> On ne peut pas &eacute;crire dans le r&eacute;pertoire de phpcomp=
ta, changez-en les droits </p>';
     exit();
   }
+}
=20
+echo __LINE__;
   echo '<form method=3D"post">';
   echo '<h1 class=3D"info">Entrez les informations n&eacute;cessaires &a=
grave; phpcompta</h1>';
   require_once('config_file.php');
@@ -193,7 +192,6 @@
   echo HtmlInput::submit('save_config','Sauver la configuration');
   echo '</form>';
   exit();
-  }
 create_htaccess();
=20
 //----------------------------------------------------------------------
@@ -206,7 +204,6 @@
 // magic_quotes_runtime =3D Off
 // magic_quotes_sybase =3D Off
 // include_path
-}
 require_once('config_file.php');
 include_once('constant.php');
 require_once('class_database.php');
@@ -496,4 +493,4 @@
  echo "<p class=3D\"info\">Tout est install&eacute; $succeed";
 ?>
 <A style=3D"display:block;text-align: center" HREF=3D"../index.php">Conn=
ectez-vous =C3=A0 PhpCompta</A>
-</p>
\ No newline at end of file
+</p>



From MAILER-DAEMON Mon Nov 28 08:17:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV14x-0001RM-8J
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 08:17:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 14:21:42 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.55927.1322486220.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4485 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 13:16:59 -0000

Author: danydb
Date: 2011-11-28 14:21:40 +0100 (Mon, 28 Nov 2011)
New Revision: 4485

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
fix bug setup.php

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-28 13:13:21 UTC (rev 448=
4)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-28 13:21:40 UTC (rev 448=
5)
@@ -181,8 +181,8 @@
     echo '<h2 class=3D"error"> Ecriture non possible </h2><p class=3D"wa=
rning"> On ne peut pas &eacute;crire dans le r&eacute;pertoire de phpcomp=
ta, changez-en les droits </p>';
     exit();
   }
-}
=20
+
 echo __LINE__;
   echo '<form method=3D"post">';
   echo '<h1 class=3D"info">Entrez les informations n&eacute;cessaires &a=
grave; phpcompta</h1>';
@@ -192,8 +192,8 @@
   echo HtmlInput::submit('save_config','Sauver la configuration');
   echo '</form>';
   exit();
+}
 create_htaccess();
-
 //----------------------------------------------------------------------
 // End functions
 //



From MAILER-DAEMON Mon Nov 28 08:17:50 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV15i-0001Su-JH
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 08:17:50 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 14:22:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.55930.1322486270.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4486 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 13:17:49 -0000

Author: danydb
Date: 2011-11-28 14:22:35 +0100 (Mon, 28 Nov 2011)
New Revision: 4486

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
fix bug setup.php

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-28 13:21:40 UTC (rev 448=
5)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-28 13:22:35 UTC (rev 448=
6)
@@ -181,9 +181,7 @@
     echo '<h2 class=3D"error"> Ecriture non possible </h2><p class=3D"wa=
rning"> On ne peut pas &eacute;crire dans le r&eacute;pertoire de phpcomp=
ta, changez-en les droits </p>';
     exit();
   }
-
-
-echo __LINE__;
+  create_htaccess();
   echo '<form method=3D"post">';
   echo '<h1 class=3D"info">Entrez les informations n&eacute;cessaires &a=
grave; phpcompta</h1>';
   require_once('config_file.php');
@@ -193,7 +191,6 @@
   echo '</form>';
   exit();
 }
-create_htaccess();
 //----------------------------------------------------------------------
 // End functions
 //



From MAILER-DAEMON Mon Nov 28 08:24:09 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV1Bp-0001ns-KF
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 08:24:09 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 14:28:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.55947.1322486648.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4487 - 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, 28 Nov 2011 13:24:07 -0000

Author: danydb
Date: 2011-11-28 14:28:49 +0100 (Mon, 28 Nov 2011)
New Revision: 4487

Modified:
   phpcompta/trunk/include/config_file.php
Log:
fix bug setup.php

Modified: phpcompta/trunk/include/config_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config_file.php	2011-11-28 13:22:35 UTC (rev =
4486)
+++ phpcompta/trunk/include/config_file.php	2011-11-28 13:28:49 UTC (rev =
4487)
@@ -62,7 +62,7 @@
         $cpasswd=3D'dany';
         $cport=3D5432;
         $cdomain=3D'';
-        $clocal=3D1;
+        $clocale=3D1;
     }
     else extract ($p_array);
=20



From MAILER-DAEMON Mon Nov 28 08:24:59 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV1Cd-0001or-Os
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 08:24:59 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 14:29:46 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.55948.1322486698.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4488 - 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, 28 Nov 2011 13:24:58 -0000

Author: danydb
Date: 2011-11-28 14:29:45 +0100 (Mon, 28 Nov 2011)
New Revision: 4488

Modified:
   phpcompta/trunk/include/config_file.php
Log:
fix bug setup.php

Modified: phpcompta/trunk/include/config_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/config_file.php	2011-11-28 13:28:49 UTC (rev =
4487)
+++ phpcompta/trunk/include/config_file.php	2011-11-28 13:29:45 UTC (rev =
4488)
@@ -147,7 +147,7 @@
     fputs($hFile, 'define ("phpcompta_psql_host","127.0.0.1");');
     fputs($hFile,"\r\n");
=20
-    fputs($hFile, 'define ("locale",'.$clocal.');');
+    fputs($hFile, 'define ("locale",'.$clocale.');');
     fputs($hFile,"\r\n");
    =20
     fputs($hFile, 'define ("domaine","");');



From MAILER-DAEMON Mon Nov 28 08:27:25 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV1Ez-0002Qf-VH
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 08:27:25 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 14:32:07 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.55954.1322486845.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4489 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 13:27:24 -0000

Author: danydb
Date: 2011-11-28 14:32:05 +0100 (Mon, 28 Nov 2011)
New Revision: 4489

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
fix bug setup.php

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-28 13:29:45 UTC (rev 448=
8)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-28 13:32:05 UTC (rev 448=
9)
@@ -208,7 +208,7 @@
 ?>
 <h2>Info</h2>
 Vous utilisez le domaine <?php echo domaine; ?>
-<h2>PHP/h2>
+<h2>PHP</h2>
 <?php
=20
 $flag_php=3D0;



From MAILER-DAEMON Mon Nov 28 09:05:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV1pu-0008E4-5J
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 09:05:34 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 15:10:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56026.1322489133.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4490 - in phpcompta/trunk: html html/admin include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 14:05:32 -0000

Author: danydb
Date: 2011-11-28 15:10:15 +0100 (Mon, 28 Nov 2011)
New Revision: 4490

Modified:
   phpcompta/trunk/html/admin/setup.php
   phpcompta/trunk/html/user_pref.php
   phpcompta/trunk/include/class_user.php
   phpcompta/trunk/include/constant.php
Log:
fix several cosmetic

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-28 13:32:05 UTC (rev 448=
9)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-28 14:10:15 UTC (rev 449=
0)
@@ -205,6 +205,7 @@
 include_once('constant.php');
 require_once('class_database.php');
 echo "<h1>Configuration</h1>";
+echo __LINE__;
 ?>
 <h2>Info</h2>
 Vous utilisez le domaine <?php echo domaine; ?>

Modified: phpcompta/trunk/html/user_pref.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_pref.php	2011-11-28 13:32:05 UTC (rev 4489)
+++ phpcompta/trunk/html/user_pref.php	2011-11-28 14:10:15 UTC (rev 4490)
@@ -29,7 +29,6 @@
 $Rep=3Dnew Database();
 include_once ("class_user.php");
 require_once('class_dossier.php');
-$cn=3Dnew Database();
=20
 /* if the dossier is not set then we have to connect to the
  * account_repository database

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2011-11-28 13:32:05 UTC (rev 4=
489)
+++ phpcompta/trunk/include/class_user.php	2011-11-28 14:10:15 UTC (rev 4=
490)
@@ -615,7 +615,7 @@
 	function insert_default_global_pref($p_type=3D"", $p_value=3D"")
 	{
=20
-		$default_parameter =3D array("THEME" =3D> "Light",
+		$default_parameter =3D array("THEME" =3D> "classic",
 			"PAGESIZE" =3D> "50",
 			'TOPMENU' =3D> 'TEXT',
 			'LANG' =3D> 'fr_FR.utf8');
@@ -648,7 +648,7 @@
=20
 	function update_global_pref($p_type, $p_value=3D"")
 	{
-		$default_parameter =3D array("THEME" =3D> "Light",
+		$default_parameter =3D array("THEME" =3D> "classic",
 			"PAGESIZE" =3D> "50",
 			"LANG" =3D> 'fr_FR.utf8',
 			'TOPMENU' =3D> 'SELECT');

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	2011-11-28 13:32:05 UTC (rev 448=
9)
+++ phpcompta/trunk/include/constant.php	2011-11-28 14:10:15 UTC (rev 449=
0)
@@ -41,7 +41,7 @@
  *
  */
 $version_phpcompta=3D4444;
-define ("DEBUG",true);
+define ("DEBUG",false);
=20
 define ("DBVERSION",98);
 define ("DBVERSIONREPO",14);



From MAILER-DAEMON Mon Nov 28 09:05:58 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV1qI-0008Er-8r
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 09:05:58 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 15:10:40 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56027.1322489157.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4491 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 14:05:56 -0000

Author: danydb
Date: 2011-11-28 15:10:39 +0100 (Mon, 28 Nov 2011)
New Revision: 4491

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
remove debug

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-28 14:10:15 UTC (rev 449=
0)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-28 14:10:39 UTC (rev 449=
1)
@@ -205,7 +205,6 @@
 include_once('constant.php');
 require_once('class_database.php');
 echo "<h1>Configuration</h1>";
-echo __LINE__;
 ?>
 <h2>Info</h2>
 Vous utilisez le domaine <?php echo domaine; ?>



From MAILER-DAEMON Mon Nov 28 09:08:22 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV1sc-0000ft-6w
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 09:08:22 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 15:13:05 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56030.1322489301.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4492 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 14:08:21 -0000

Author: danydb
Date: 2011-11-28 15:13:04 +0100 (Mon, 28 Nov 2011)
New Revision: 4492

Modified:
   phpcompta/trunk/html/style-light.css
Log:
change color h2.info

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	2011-11-28 14:10:39 UTC (rev 449=
1)
+++ phpcompta/trunk/html/style-light.css	2011-11-28 14:13:04 UTC (rev 449=
2)
@@ -68,7 +68,7 @@
 	margin:0px;
 }
 h2.info {
-	background-color:#8989E5;
+	background-color:#C6C6D1;
 	color:white;
 	font-size:14px;
 	text-align:center;



From MAILER-DAEMON Mon Nov 28 09:10:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV1uF-0000mg-J0
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 09:10:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 15:14:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56033.1322489403.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4493 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 14:10:02 -0000

Author: danydb
Date: 2011-11-28 15:14:47 +0100 (Mon, 28 Nov 2011)
New Revision: 4493

Modified:
   phpcompta/trunk/html/style-light.css
Log:
change color #close_div

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	2011-11-28 14:13:04 UTC (rev 449=
2)
+++ phpcompta/trunk/html/style-light.css	2011-11-28 14:14:47 UTC (rev 449=
3)
@@ -1057,10 +1057,10 @@
 #close_div
 {
 	background-color:white;
-	color:red;
+	color:black;
 	font-family: arial;
 	text-decoration:none;
-	border:1px solid red;
+	border:1px solid black;
 	margin-left: 2px;
 	margin-right:2px;
 	margin-top:0px;



From MAILER-DAEMON Mon Nov 28 09:11:53 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV1w1-00016r-Qy
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 09:11:53 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 15:16:43 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56034.1322489513.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4494 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 14:11:52 -0000

Author: danydb
Date: 2011-11-28 15:16:42 +0100 (Mon, 28 Nov 2011)
New Revision: 4494

Modified:
   phpcompta/trunk/html/style-light.css
Log:
change aspect anchor_button

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	2011-11-28 14:14:47 UTC (rev 449=
3)
+++ phpcompta/trunk/html/style-light.css	2011-11-28 14:16:42 UTC (rev 449=
4)
@@ -812,10 +812,10 @@
=20
 	text-decoration:none;
 	font-family: arial,helvetica,sans-serif;
-	background-color: ##DEE3E5;
+	background-color: inherit;
 	border-style:  solid ;
-	border-color:  blue ;
-	border-width:1;
+	border-color:  black;
+	border-width:2px;
 	padding-bottom: 4;
 	padding-top: 4;
 	padding-right: 6;
@@ -825,8 +825,8 @@
 	margin-right:3px;
 	margin-left:3px;
 	cursor:pointer;
-	-moz-border-radius:5 5;
-	border-radius:5 5;
+	-moz-border-radius:6 6;
+	border-radius:6 6;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {



From MAILER-DAEMON Mon Nov 28 09:14:16 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV1yK-00031q-Ep
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 09:14:16 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 15:18:57 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56037.1322489655.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4495 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 14:14:15 -0000

Author: danydb
Date: 2011-11-28 15:18:55 +0100 (Mon, 28 Nov 2011)
New Revision: 4495

Modified:
   phpcompta/trunk/html/style-light.css
Log:
change aspect anchor_button

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	2011-11-28 14:16:42 UTC (rev 449=
4)
+++ phpcompta/trunk/html/style-light.css	2011-11-28 14:18:55 UTC (rev 449=
5)
@@ -814,7 +814,7 @@
 	font-family: arial,helvetica,sans-serif;
 	background-color: inherit;
 	border-style:  solid ;
-	border-color:  black;
+        border-color:  #0066ff;
 	border-width:2px;
 	padding-bottom: 4;
 	padding-top: 4;



From MAILER-DAEMON Mon Nov 28 10:50:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV3Tf-0006ZP-EK
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 10:50:43 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 16:55:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56203.1322495442.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4496 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 15:50:42 -0000

Author: danydb
Date: 2011-11-28 16:55:26 +0100 (Mon, 28 Nov 2011)
New Revision: 4496

Modified:
   phpcompta/trunk/html/style-light.css
Log:
change aspect anchor_button

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	2011-11-28 14:18:55 UTC (rev 449=
5)
+++ phpcompta/trunk/html/style-light.css	2011-11-28 15:55:26 UTC (rev 449=
6)
@@ -825,9 +825,7 @@
 	margin-right:3px;
 	margin-left:3px;
 	cursor:pointer;
-	-moz-border-radius:6 6;
-	border-radius:6 6;
-
+=09
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
 	cursor:pointer;



From MAILER-DAEMON Mon Nov 28 11:25:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV41O-0003Lg-Ik
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 11:25:34 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 17:30:13 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56277.1322497533.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4497 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 16:25:32 -0000

Author: danydb
Date: 2011-11-28 17:30:09 +0100 (Mon, 28 Nov 2011)
New Revision: 4497

Modified:
   phpcompta/trunk/html/style-light.css
Log:
change aspect anchor_button

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	2011-11-28 15:55:26 UTC (rev 449=
6)
+++ phpcompta/trunk/html/style-light.css	2011-11-28 16:30:09 UTC (rev 449=
7)
@@ -806,7 +806,7 @@
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:10;
+	font-size:10px;
 	color:darkblue;
 	font-weight: bold;
=20
@@ -815,11 +815,11 @@
 	background-color: inherit;
 	border-style:  solid ;
         border-color:  #0066ff;
-	border-width:2px;
-	padding-bottom: 4;
-	padding-top: 4;
-	padding-right: 6;
-	padding-left:  6;
+	border-width:1px;
+	padding-bottom: 4px;
+	padding-top: 4px;
+	padding-right: 6px;
+	padding-left:  6px;
 	margin-top:3px;
 	margin-bottom:3px;
 	margin-right:3px;



From MAILER-DAEMON Mon Nov 28 11:26:27 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV42F-0003OB-Ni
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 11:26:27 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 17:31:12 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56278.1322497586.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4498 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 16:26:26 -0000

Author: danydb
Date: 2011-11-28 17:31:09 +0100 (Mon, 28 Nov 2011)
New Revision: 4498

Modified:
   phpcompta/trunk/html/logout.php
Log:
message de sortie

Modified: phpcompta/trunk/html/logout.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/logout.php	2011-11-28 16:30:09 UTC (rev 4497)
+++ phpcompta/trunk/html/logout.php	2011-11-28 16:31:09 UTC (rev 4498)
@@ -26,6 +26,7 @@
 html_page_start("classic");
=20
 session_unset();
+echo '<h2 class=3D"info">Vous =C3=AAtes d=C3=A9connect=C3=A9</h2>';
 echo '<META HTTP-EQUIV=3D"REFRESH" content=3D"0;url=3Dindex.html">';
=20
 html_page_stop();



From MAILER-DAEMON Mon Nov 28 11:27:07 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV42t-0003XD-SC
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 11:27:07 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 17:31:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56283.1322497627.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4499 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 16:27:07 -0000

Author: danydb
Date: 2011-11-28 17:31:46 +0100 (Mon, 28 Nov 2011)
New Revision: 4499

Modified:
   phpcompta/trunk/html/login.php
Log:
message version

Modified: phpcompta/trunk/html/login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/login.php	2011-11-28 16:31:09 UTC (rev 4498)
+++ phpcompta/trunk/html/login.php	2011-11-28 16:31:46 UTC (rev 4499)
@@ -77,7 +77,7 @@
     if ( $rep->get_value('select val from version') !=3D DBVERSIONREPO)=20
       {
 	echo alert('Version de base de donn=C3=A9es incorrectes, vous devez met=
tre =C3=A0 jour');
-	echo "<META HTTP-EQUIV=3D\"REFRESH\" content=3D\"0;url=3Dadmin/setup.ph=
p\">";
+	echo "<META HTTP-EQUIV=3D\"REFRESH\" content=3D\"1;url=3Dadmin/setup.ph=
p\">";
 	exit();
=20
       }



From MAILER-DAEMON Mon Nov 28 11:30:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV45j-0003gH-9G
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 11:30:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 17:34:46 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56286.1322497802.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4500 - 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: Mon, 28 Nov 2011 16:30:01 -0000

Author: danydb
Date: 2011-11-28 17:34:46 +0100 (Mon, 28 Nov 2011)
New Revision: 4500

Modified:
   phpcompta/trunk/doc/
   phpcompta/trunk/doc/manuel-fr.odt
Log:
update documentation


Property changes on: phpcompta/trunk/doc
___________________________________________________________________
Name: svn:ignore
   - *.html
*.pdf
*.txt

   + *.html
*.pdf
*.txt
.~lock.manuel-fr.odt#


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)



From MAILER-DAEMON Mon Nov 28 14:45:12 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV78a-0005rS-Gp
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 14:45:12 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 20:49:58 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56778.1322509511.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4501 -
	phpcompta/trunk/html/admin/sql/account_repository
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?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, 28 Nov 2011 19:45:10 -0000

Author: danydb
Date: 2011-11-28 20:49:56 +0100 (Mon, 28 Nov 2011)
New Revision: 4501

Modified:
   phpcompta/trunk/html/admin/sql/account_repository/data.sql
Log:
default style=20

Modified: phpcompta/trunk/html/admin/sql/account_repository/data.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/sql/account_repository/data.sql	2011-11-28=
 16:34:46 UTC (rev 4500)
+++ phpcompta/trunk/html/admin/sql/account_repository/data.sql	2011-11-28=
 19:49:56 UTC (rev 4501)
@@ -94,8 +94,8 @@
=20
 INSERT INTO user_global_pref (user_id, parameter_type, parameter_value) =
VALUES ('demo', 'PAGESIZE', '50');
 INSERT INTO user_global_pref (user_id, parameter_type, parameter_value) =
VALUES ('phpcompta', 'PAGESIZE', '50');
-INSERT INTO user_global_pref (user_id, parameter_type, parameter_value) =
VALUES ('demo', 'THEME', 'Light');
-INSERT INTO user_global_pref (user_id, parameter_type, parameter_value) =
VALUES ('phpcompta', 'THEME', 'Light');
+INSERT INTO user_global_pref (user_id, parameter_type, parameter_value) =
VALUES ('demo', 'THEME', 'classic');
+INSERT INTO user_global_pref (user_id, parameter_type, parameter_value) =
VALUES ('phpcompta', 'THEME', 'classic');
 INSERT INTO user_global_pref (user_id, parameter_type, parameter_value) =
VALUES ('demo', 'LANG', 'fr_FR.utf8');
 INSERT INTO user_global_pref (user_id, parameter_type, parameter_value) =
VALUES ('phpcompta', 'LANG', 'fr_FR.utf8');
 INSERT INTO user_global_pref (user_id, parameter_type, parameter_value) =
VALUES ('phpcompta', 'TOPMENU', 'TEXT');



From MAILER-DAEMON Mon Nov 28 15:59:38 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV8Ic-0008F6-0N
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 15:59:38 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 22:04:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56897.1322513976.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4502 - 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, 28 Nov 2011 20:59:36 -0000

Author: danydb
Date: 2011-11-28 22:04:18 +0100 (Mon, 28 Nov 2011)
New Revision: 4502

Modified:
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_print_ledger_simple.php
   phpcompta/trunk/include/compta_fin_saldo.inc.php
Log:
=20
Fix small bugs when computing TVA_ND, warning if a fin. ledger misconfigu=
red




Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-28 19:49:56 =
UTC (rev 4501)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2011-11-28 21:04:18 =
UTC (rev 4502)
@@ -265,6 +265,12 @@
         // retrieve bank name, code and account from the jrn_def.jrn_def=
_bank
=20
         $f_bank=3D'<span id=3D"bkname">'.$this->get_bank_name().'</span>=
';
+		if ( $this->bank_id =3D=3D "" )
+		{
+			echo h2("Journal de banque non configur=C3=A9 ".$this->get_name(),' c=
lass=3D"error"');
+			echo '<span class=3D"error"> vous devez donner =C3=A0 ce journal un c=
ompte en banque (fiche), modifiez dans CFGLEDGER</span>';
+			alert ("Journal de banque non configur=C3=A9 ".$this->get_name());
+		}
=20
         $f_legend_detail=3D'Op=C3=A9rations financi=C3=A8res';
         //--------------------------------------------------
@@ -973,9 +979,9 @@
      */
     function get_bank_name()
     {
-        $bank_id=3D$this->db->get_value('select jrn_def_bank from jrn_de=
f where jrn_def_id=3D$1',
+		$this->bank_id=3D$this->db->get_value('select jrn_def_bank from jrn_de=
f where jrn_def_id=3D$1',
                                       array($this->id));
-        $fBank=3Dnew Fiche($this->db,$bank_id);
+        $fBank=3Dnew Fiche($this->db,$this->bank_id);
         $e_bank_account=3D" : ".$fBank->strAttribut(ATTR_DEF_BQ_NO);
         $e_bank_name=3D" : ".$fBank->strAttribut(ATTR_DEF_NAME);
         $e_bank_qcode=3D": ".$fBank->strAttribut(ATTR_DEF_QUICKCODE);

Modified: phpcompta/trunk/include/class_print_ledger_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_simple.php	2011-11-28 19:4=
9:56 UTC (rev 4501)
+++ phpcompta/trunk/include/class_print_ledger_simple.php	2011-11-28 21:0=
4:18 UTC (rev 4502)
@@ -257,6 +257,7 @@
 			}
=20
 	    $l_tvac=3Dbcadd($other['price'],$other['vat']);
+	    $l_tvac=3Dbcadd($l_tvac,$other['tva_nd']);
             $this->Cell(15,5,nbm($l_tvac),0,0,'R');
             $this->Ln(5);
         }

Modified: phpcompta/trunk/include/compta_fin_saldo.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin_saldo.inc.php	2011-11-28 19:49:56 =
UTC (rev 4501)
+++ phpcompta/trunk/include/compta_fin_saldo.inc.php	2011-11-28 21:04:18 =
UTC (rev 4502)
@@ -48,6 +48,12 @@
     // for each account
     for ( $i =3D 0; $i < count($array);$i++)
     {
+		if ( $array[$i]->id=3D=3D0) {
+			echo '<tr >';
+			echo td(h2("Journal mal configur=C3=A9",' class=3D"error" '),' colspa=
n=3D"5" style=3D"width:auto" ');
+			echo '</tr>';
+			continue;
+		}
         // get the saldo
         $m=3D$array[$i]->get_solde_detail($filter_year);
=20



From MAILER-DAEMON Mon Nov 28 16:00:35 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RV8JX-0008PI-Dj
	for mharc-phpcompta-dev@gnu.org; Mon, 28 Nov 2011 16:00:35 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 28 Nov 2011 22:05:22 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.56898.1322514034.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4503 - 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, 28 Nov 2011 21:00:33 -0000

Author: danydb
Date: 2011-11-28 22:05:20 +0100 (Mon, 28 Nov 2011)
New Revision: 4503

Modified:
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/constant.php
Log:
=20
return a array with 0 for get_solde_detail




Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2011-11-28 21:04:18 UTC (rev =
4502)
+++ phpcompta/trunk/include/class_fiche.php	2011-11-28 21:05:20 UTC (rev =
4503)
@@ -1423,7 +1423,7 @@
      */
     function get_solde_detail($p_cond=3D"")
     {
-        if ( $this->id =3D=3D 0 ) exit('fiche->id est nul');
+        if ( $this->id =3D=3D 0 ) return array('credit'=3D>0,'debit'=3D>=
0,'solde'=3D>0);
         $qcode=3D$this->strAttribut(ATTR_DEF_QUICKCODE);
=20
         if ( $p_cond !=3D "") $p_cond=3D" and ".$p_cond;

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	2011-11-28 21:04:18 UTC (rev 450=
2)
+++ phpcompta/trunk/include/constant.php	2011-11-28 21:05:20 UTC (rev 450=
3)
@@ -41,7 +41,7 @@
  *
  */
 $version_phpcompta=3D4444;
-define ("DEBUG",false);
+define ("DEBUG",true);
=20
 define ("DBVERSION",98);
 define ("DBVERSIONREPO",14);



From MAILER-DAEMON Tue Nov 29 04:09:18 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVJgk-0008D5-TX
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 04:09:18 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 10:13:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.58099.1322557758.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4504 - 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, 29 Nov 2011 09:09:16 -0000

Author: danydb
Date: 2011-11-29 10:13:53 +0100 (Tue, 29 Nov 2011)
New Revision: 4504

Modified:
   phpcompta/trunk/include/class_iposte.php
Log:
cosmetic : location of button with iposte


Modified: phpcompta/trunk/include/class_iposte.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iposte.php	2011-11-28 21:05:20 UTC (rev=
 4503)
+++ phpcompta/trunk/include/class_iposte.php	2011-11-29 09:13:53 UTC (rev=
 4504)
@@ -140,11 +140,11 @@
         $ibutton=3D$this->dsp_button();
         if ( $this->table=3D=3D3)
         {
-            $r=3D'<table>'.tr(td($ibutton).td($itext->input()));
+            $r=3D'<table>'.tr(td($itext->input()).td($ibutton));
             $r.=3D'</table>';
             return $r;
         }
-        $r=3D$ibutton.$itext->input();
+        $r=3D$itext->input().$ibutton;
         if ( $this->table=3D=3D1) $r=3Dtd($r);
=20
         return $r;



From MAILER-DAEMON Tue Nov 29 04:46:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVKGJ-0008Mt-4R
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 04:46:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 10:50:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.58334.1322559962.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4505 - 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: Tue, 29 Nov 2011 09:46:02 -0000

Author: danydb
Date: 2011-11-29 10:50:38 +0100 (Tue, 29 Nov 2011)
New Revision: 4505

Modified:
   phpcompta/trunk/html/style-color.css
Log:
style-color button

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	2011-11-29 09:13:53 UTC (rev 450=
4)
+++ phpcompta/trunk/html/style-color.css	2011-11-29 09:50:38 UTC (rev 450=
5)
@@ -809,7 +809,7 @@
 	font-size:10;
 	color:darkblue;
 	font-weight: bold;
-
+        background-image: url("image/bg-submit2.gif");
 	text-decoration:none;
 	font-family: arial,helvetica,sans-serif;
 	background-color: ##DEE3E5;



From MAILER-DAEMON Tue Nov 29 04:52:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVKM9-0001tn-Sa
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 04:52:05 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 10:56:47 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.58372.1322560325.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4506 - 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: Tue, 29 Nov 2011 09:52:04 -0000

Author: danydb
Date: 2011-11-29 10:56:45 +0100 (Tue, 29 Nov 2011)
New Revision: 4506

Modified:
   phpcompta/trunk/html/style-color.css
Log:
style-color button fix background-color

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	2011-11-29 09:50:38 UTC (rev 450=
5)
+++ phpcompta/trunk/html/style-color.css	2011-11-29 09:56:45 UTC (rev 450=
6)
@@ -812,7 +812,7 @@
         background-image: url("image/bg-submit2.gif");
 	text-decoration:none;
 	font-family: arial,helvetica,sans-serif;
-	background-color: ##DEE3E5;
+	background-color: #DEE3E5;
 	border-style:  solid ;
 	border-color:  blue ;
 	border-width:1;



From MAILER-DAEMON Tue Nov 29 04:54:55 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVKOt-0002fW-KZ
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 04:54:55 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 10:59:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.58380.1322560495.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4507 - 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: Tue, 29 Nov 2011 09:54:54 -0000

Author: danydb
Date: 2011-11-29 10:59:35 +0100 (Tue, 29 Nov 2011)
New Revision: 4507

Modified:
   phpcompta/trunk/html/index.php
Log:
add PRERELEASE

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	2011-11-29 09:56:45 UTC (rev 4506)
+++ phpcompta/trunk/html/index.php	2011-11-29 09:59:35 UTC (rev 4507)
@@ -187,7 +187,7 @@
=20
 echo '
 <span style=3D"background-color:#879ed4;color:white;padding-left:4px;pad=
ding-right:4px;">
-version  6.0.SVNINFO - '.$my_domain.'
+version  6.0.PRERELEASE - '.$my_domain.'
 </span>
 <BR>
 <BR>



From MAILER-DAEMON Tue Nov 29 05:16:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVKjW-0006FS-Ba
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 05:16:14 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 11:20:51 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.58408.1322561773.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4508 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Nov 2011 10:16:13 -0000

Author: danydb
Date: 2011-11-29 11:20:51 +0100 (Tue, 29 Nov 2011)
New Revision: 4508

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
setup.php missing require_once

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-29 09:59:35 UTC (rev 450=
7)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-29 10:20:51 UTC (rev 450=
8)
@@ -349,6 +349,7 @@
 <?php exit(); }
=20
 include_once('ac_common.php');
+require_once('class_dossier.php');
=20
 // Memory setting
 //--



From MAILER-DAEMON Tue Nov 29 05:18:06 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVKlK-0006JC-Ld
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 05:18:06 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 11:22:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.58412.1322561885.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4509 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Nov 2011 10:18:05 -0000

Author: danydb
Date: 2011-11-29 11:22:47 +0100 (Tue, 29 Nov 2011)
New Revision: 4509

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
setup.php doesn't rewrite .htaccess

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-29 10:20:51 UTC (rev 450=
8)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-29 10:22:47 UTC (rev 450=
9)
@@ -191,6 +191,7 @@
   echo '</form>';
   exit();
 }
+  create_htaccess();
 //----------------------------------------------------------------------
 // End functions
 //



From MAILER-DAEMON Tue Nov 29 05:19:21 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVKmX-0006L8-V7
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 05:19:21 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 11:24:02 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.58415.1322561960.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4510 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Nov 2011 10:19:19 -0000

Author: danydb
Date: 2011-11-29 11:24:00 +0100 (Tue, 29 Nov 2011)
New Revision: 4510

Modified:
   phpcompta/trunk/html/admin/setup.php
Log:
setup.php doesn't rewrite .htaccess

Modified: phpcompta/trunk/html/admin/setup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.php	2011-11-29 10:22:47 UTC (rev 450=
9)
+++ phpcompta/trunk/html/admin/setup.php	2011-11-29 10:24:00 UTC (rev 451=
0)
@@ -175,13 +175,13 @@
 </form>';
  exit();
  }
-if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'in=
clude'.DIRECTORY_SEPARATOR.'config.inc.php')) {
-  /* if the config file is not found we propose to create one */
-  if ( is_writable ('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'i=
nclude'.DIRECTORY_SEPARATOR.'constant.php') =3D=3D false ) {
+if ( is_writable ('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'inc=
lude'.DIRECTORY_SEPARATOR.'constant.php') =3D=3D false ) {
     echo '<h2 class=3D"error"> Ecriture non possible </h2><p class=3D"wa=
rning"> On ne peut pas &eacute;crire dans le r&eacute;pertoire de phpcomp=
ta, changez-en les droits </p>';
     exit();
   }
-  create_htaccess();
+create_htaccess();
+
+if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'in=
clude'.DIRECTORY_SEPARATOR.'config.inc.php')) {
   echo '<form method=3D"post">';
   echo '<h1 class=3D"info">Entrez les informations n&eacute;cessaires &a=
grave; phpcompta</h1>';
   require_once('config_file.php');
@@ -191,7 +191,7 @@
   echo '</form>';
   exit();
 }
-  create_htaccess();
+=20
 //----------------------------------------------------------------------
 // End functions
 //



From MAILER-DAEMON Tue Nov 29 06:23:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVLmb-0007MI-G2
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 06:23:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 12:28:03 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.58539.1322565807.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4511 - phpcompta/trunk/html/admin/sql/patch
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Nov 2011 11:23:26 -0000

Author: danydb
Date: 2011-11-29 12:28:01 +0100 (Tue, 29 Nov 2011)
New Revision: 4511

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade97.sql
Log:
upgrade97.sql : corrige profile -> profil

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade97.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/upgrade97.sql	2011-11-29 10:24:0=
0 UTC (rev 4510)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade97.sql	2011-11-29 11:28:0=
1 UTC (rev 4511)
@@ -409,8 +409,8 @@
 INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, 'Conf=
ig. de la tva', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, 'Fi=
che', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, 'S=
tock', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('MOD', 'Menu et profile', NULL, NULL, 'Menu=
 ', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('CFGPRO', 'Profile', 'profile.inc.php', NUL=
L, 'Configuration profile', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('MOD', 'Menu et profil', NULL, NULL, 'Menu =
', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGPRO', 'Profil', 'profile.inc.php', NULL=
, 'Configuration profil', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CFGPAY', 'Moyen de paiement', 'payment_mid=
dle.inc.php', NULL, 'Config. des m=C3=A9thodes de paiement', NULL, NULL, =
'ME');
 INSERT INTO menu_ref VALUES ('CFGACC', 'Poste', 'poste.inc.php', NULL, '=
Config. poste comptable de base', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,=
 'Nouvelle vente ou recette', NULL, NULL, 'ME');



From MAILER-DAEMON Tue Nov 29 14:57:06 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVTne-0000zc-D1
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 14:57:06 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 21:01:46 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.59741.1322596624.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r198 - 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: Tue, 29 Nov 2011 19:57:04 -0000

Author: danydb
Date: 2011-11-29 21:01:44 +0100 (Tue, 29 Nov 2011)
New Revision: 198

Modified:
   trunk/importbank/include/template/show_import.php
   trunk/importbank/include/template/show_list.php
Log:

change class of table : use table_large




Modified: trunk/importbank/include/template/show_import.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/show_import.php	2011-11-27 20:34:55=
 UTC (rev 197)
+++ trunk/importbank/include/template/show_import.php	2011-11-29 20:01:44=
 UTC (rev 198)
@@ -1,6 +1,6 @@
=20
 <form id=3D"purge" method=3D"POST">
-<table class=3D"result">
+<table class=3D"table_large">
 	<TR>
 	<th> num transfert</th>
 	<Th>Date </Th>

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	2011-11-27 20:34:55 U=
TC (rev 197)
+++ trunk/importbank/include/template/show_list.php	2011-11-29 20:01:44 U=
TC (rev 198)
@@ -11,7 +11,7 @@
 <?=3DHtmlInput::submit('transfer_record','Transf=C3=A8rer')?>
 </form>
=20
-<table class=3D"result">
+<table class=3D"table_large">
 	<TR>
 	<th></th>
 	<TH>N=C2=B0 op=C3=A9ration</TH>



From MAILER-DAEMON Tue Nov 29 15:08:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVTyH-0003ST-4f
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 15:08:05 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 21:12:43 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.59761.1322597284.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4512 - in 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, 29 Nov 2011 20:08:03 -0000

Author: danydb
Date: 2011-11-29 21:12:42 +0100 (Tue, 29 Nov 2011)
New Revision: 4512

Modified:
   phpcompta/trunk/
   phpcompta/trunk/html/js/card.js
Log:
enlarge card box


Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svn:ignore
   - cache
compile
tmp
.setenv.sh.swp

   + cache
compile
tmp
.setenv.sh.swp
.clean.sh.swp
.clean.sh.swo


Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2011-11-29 11:28:01 UTC (rev 4511)
+++ phpcompta/trunk/html/js/card.js	2011-11-29 20:12:42 UTC (rev 4512)
@@ -299,7 +299,7 @@
     var content=3D'card_'+card_layer;
     var nTop=3DposY-40;
     var nLeft=3DposX-20;
-    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:40em;height:auto"=
;
+    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:60em;height:auto"=
;
=20
     var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};
=20



From MAILER-DAEMON Tue Nov 29 15:15:38 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVU5a-00049g-5V
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 15:15:38 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 21:20:22 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.59768.1322597737.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4513 - 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, 29 Nov 2011 20:15:36 -0000

Author: danydb
Date: 2011-11-29 21:20:22 +0100 (Tue, 29 Nov 2011)
New Revision: 4513

Modified:
   phpcompta/trunk/html/js/card.js
Log:
enlarge card box

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2011-11-29 20:12:42 UTC (rev 4512)
+++ phpcompta/trunk/html/js/card.js	2011-11-29 20:20:22 UTC (rev 4513)
@@ -299,7 +299,7 @@
     var content=3D'card_'+card_layer;
     var nTop=3DposY-40;
     var nLeft=3DposX-20;
-    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:60em;height:auto"=
;
+    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:50em;height:auto"=
;
=20
     var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};
=20



From MAILER-DAEMON Tue Nov 29 15:18:40 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVU8W-0004To-M6
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 15:18:40 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 21:23:20 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.59769.1322597920.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4514 - 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, 29 Nov 2011 20:18:39 -0000

Author: danydb
Date: 2011-11-29 21:23:19 +0100 (Tue, 29 Nov 2011)
New Revision: 4514

Modified:
   phpcompta/trunk/html/js/card.js
Log:
enlarge card box

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2011-11-29 20:20:22 UTC (rev 4513)
+++ phpcompta/trunk/html/js/card.js	2011-11-29 20:23:19 UTC (rev 4514)
@@ -299,7 +299,7 @@
     var content=3D'card_'+card_layer;
     var nTop=3DposY-40;
     var nLeft=3DposX-20;
-    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:50em;height:auto"=
;
+    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:45em;height:auto"=
;
=20
     var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};
=20



From MAILER-DAEMON Tue Nov 29 16:02:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVUpM-0003ye-20
	for mharc-phpcompta-dev@gnu.org; Tue, 29 Nov 2011 16:02:56 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 29 Nov 2011 22:07:30 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.59852.1322600575.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4515 - 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: Tue, 29 Nov 2011 21:02:55 -0000

Author: danydb
Date: 2011-11-29 22:07:28 +0100 (Tue, 29 Nov 2011)
New Revision: 4515

Modified:
   phpcompta/trunk/html/
   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/
   phpcompta/trunk/include/user_common.php
Log:
improve css


Property changes on: phpcompta/trunk/html
___________________________________________________________________
Name: svn:ignore
   - *.log
ajax
.user_login.php.swp
.~lock.a.csv#
.~lock.a.ods#
.a.csv.swp
.direct.php.swp
.style-light.css.swp
.a.swp

   + *.log
ajax
.user_login.php.swp
.~lock.a.csv#
.~lock.a.ods#
.a.csv.swp
.direct.php.swp
.style-light.css.swp
.a.swp
.htaccess.swp


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	2011-11-29 20:23:19 UTC (rev 451=
4)
+++ phpcompta/trunk/html/style-color.css	2011-11-29 21:07:28 UTC (rev 451=
5)
@@ -1090,3 +1090,15 @@
     margin: 20px;
     font-weight: bold;
 }
+a.nav,div.content a.nav,div.redcontent a.nav {
+	display:inline;
+	text-decoration:none;
+	font-size:1em;
+}
+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;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-epad.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-epad.css	2011-11-29 20:23:19 UTC (rev 4514=
)
+++ phpcompta/trunk/html/style-epad.css	2011-11-29 21:07:28 UTC (rev 4515=
)
@@ -1086,3 +1086,15 @@
     margin: 20px;
     font-weight: bold;
 }
+a.nav,div.content a.nav,div.redcontent a.nav {
+	display:inline;
+	text-decoration:none;
+	font-size:1em;
+}
+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;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-29 20:23:19 UTC (rev 451=
4)
+++ phpcompta/trunk/html/style-light.css	2011-11-29 21:07:28 UTC (rev 451=
5)
@@ -825,7 +825,7 @@
 	margin-right:3px;
 	margin-left:3px;
 	cursor:pointer;
-=09
+
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
 	cursor:pointer;
@@ -1088,3 +1088,15 @@
     margin: 20px;
     font-weight: bold;
 }
+a.nav,div.content a.nav,div.redcontent a.nav {
+	display:inline;
+	text-decoration:none;
+	font-size:1em;
+}
+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;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2011-11-29 20:23:19 UTC (rev 4514)
+++ phpcompta/trunk/html/style.css	2011-11-29 21:07:28 UTC (rev 4515)
@@ -1083,3 +1083,15 @@
     margin: 20px;
     font-weight: bold;
 }
+a.nav,div.content a.nav,div.redcontent a.nav {
+	display:inline;
+	text-decoration:none;
+	font-size:1em;
+}
+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;
+}
\ No newline at end of file


Property changes on: phpcompta/trunk/include
___________________________________________________________________
Name: svn:ignore
   - .user_menu.php.swp

   + .user_menu.php.swp
.config.inc.php.swp


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	2011-11-29 20:23:19 UTC (rev =
4514)
+++ phpcompta/trunk/include/user_common.php	2011-11-29 21:07:28 UTC (rev =
4515)
@@ -121,7 +121,7 @@
    $step=3D$_SESSION['g_pagesize'];
    $page=3D(isset($_GET['offset']))?$_GET['page']:1;
    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
-=20
+
    list ($max_ligne,$list)=3DListJrn($cn,$_GET['p_jrn'],$sql,null,$offse=
t,1);
    $bar=3Djrn_navigation_bar($offset,$max_ligne,$step,$page);
 \endverbatim
@@ -178,6 +178,7 @@
     $end_bar  =3D($p_page < 11 )?20:$p_page+10;
     $end_bar  =3D($end_bar > $nb_page )?$nb_page:$end_bar;
=20
+	$sep=3D"";
     // Create the bar
     for ($e=3D$start_bar;$e<=3D$end_bar;$e++)
     {
@@ -188,12 +189,15 @@
             $offset=3D($e-1)*$step;
=20
             $go=3D$_SERVER['PHP_SELF']."?".$url."&offset=3D$offset&step=3D=
$step&page=3D$e&size=3D$step";
-
-            $r.=3Dsprintf('<A class=3D"mtitle" HREF=3D"%s" CLASS=3D"one"=
 %s >%d</A>&nbsp;',$go,$p_javascript,$e);
+			$r.=3D$sep;
+            $r.=3Dsprintf('<A class=3D"nav" HREF=3D"%s"  %s >%d</A>&nbsp=
;',$go,$p_javascript,$e);
+			$sep=3D" &#8231;  ";
         }
         else
         {
+			$r.=3D$sep;
             $r.=3D"<b> [ $e ] </b>";
+			$sep=3D" &#8231;  ";
         } //else
     } //for
     // next



From MAILER-DAEMON Wed Nov 30 06:28:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RViL1-0004fL-II
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 06:28:31 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 12:33:06 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.62301.1322652510.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4516 - 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, 30 Nov 2011 11:28:29 -0000

Author: danydb
Date: 2011-11-30 12:33:03 +0100 (Wed, 30 Nov 2011)
New Revision: 4516

Modified:
   phpcompta/trunk/include/template/periode_add_exercice.php
Log:
cosmetique message ajout p?\195?\169riode

Modified: phpcompta/trunk/include/template/periode_add_exercice.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/periode_add_exercice.php	2011-11-29 =
21:07:28 UTC (rev 4515)
+++ phpcompta/trunk/include/template/periode_add_exercice.php	2011-11-30 =
11:33:03 UTC (rev 4516)
@@ -1,5 +1,5 @@
 <fieldset><legend>Ajout d'un exercice</legend>
-Ajout d'un exercice comptable de 13 p=C3=A9riodes, commen=C3=A7ant le 1 =
janvier jusqu'au 31 d=C3=A9cembre
+Ajout d'un exercice comptable de 12 p=C3=A9riodes, commen=C3=A7ant le 1 =
janvier et terminant le 31 d=C3=A9cembre
 <form method=3D"post" onsubmit=3D"return confirm('Confirmez vous l\'ajou=
t d\'un exercice comptable ?')">
 <?
 echo HtmlInput::hidden("ac",$_REQUEST['ac']);



From MAILER-DAEMON Wed Nov 30 06:34:08 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RViQS-00062H-VP
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 06:34:08 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 12:38:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.62305.1322652848.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4517 - 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, 30 Nov 2011 11:34:08 -0000

Author: danydb
Date: 2011-11-30 12:38:49 +0100 (Wed, 30 Nov 2011)
New Revision: 4517

Modified:
   phpcompta/trunk/include/class_periode.php
Log:
p?\195?\169riode sur 12=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	2011-11-30 11:33:03 UTC (re=
v 4516)
+++ phpcompta/trunk/include/class_periode.php	2011-11-30 11:38:49 UTC (re=
v 4517)
@@ -495,8 +495,7 @@
 	      $date_end=3D$this->cn->get_value("select to_char(to_date('$date_s=
tart','DD.MM.YYYY')+interval '1 month'-interval '1 day','DD.MM.YYYY')");
 	      $this->insert($date_start,$date_end,$p_exercice);
 	    }
-	  $this->insert('01.12.'.$p_exercice,'30.12.'.$p_exercice,$p_exercice);
-	  $this->insert('31.12.'.$p_exercice,'31.12.'.$p_exercice,$p_exercice);
+	  $this->insert('01.12.'.$p_exercice,'31.12.'.$p_exercice,$p_exercice);
=20
 	  $this->cn->commit();
 	}



From MAILER-DAEMON Wed Nov 30 09:57:16 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVlb2-0005fx-LF
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 09:57:16 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 16:01:52 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.62726.1322665035.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4518 - in phpcompta/trunk: html 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, 30 Nov 2011 14:57:15 -0000

Author: danydb
Date: 2011-11-30 16:01:50 +0100 (Wed, 30 Nov 2011)
New Revision: 4518

Modified:
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/template/periode_add_exercice.php
Log:
p?\195?\169riode sur 12

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	2011-11-30 11:38:49 UTC (rev 4517)
+++ phpcompta/trunk/html/style.css	2011-11-30 15:01:50 UTC (rev 4518)
@@ -933,8 +933,8 @@
 {
               position:absolute;
               border:1px solid black;
-              top:15%;left:100;
-              margin-left:25%
+              top:15%;left:100px;
+              margin-left:25%;
               z-index:2;
               width:50%;
               display:none;

Modified: phpcompta/trunk/include/template/periode_add_exercice.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/periode_add_exercice.php	2011-11-30 =
11:38:49 UTC (rev 4517)
+++ phpcompta/trunk/include/template/periode_add_exercice.php	2011-11-30 =
15:01:50 UTC (rev 4518)
@@ -1,5 +1,7 @@
 <fieldset><legend>Ajout d'un exercice</legend>
-Ajout d'un exercice comptable de 12 p=C3=A9riodes, commen=C3=A7ant le 1 =
janvier et terminant le 31 d=C3=A9cembre
+Ajout d'un exercice comptable de 12 p=C3=A9riodes, commen=C3=A7ant le 1 =
janvier et terminant le 31 d=C3=A9cembre. Si vous souhaitez une 13i=C3=A8=
me p=C3=A9riode (le 31/12)
+pour faire tous les =C3=A9critures de fin d'exercice: amortissements, r=C3=
=A9gulations de compte... Il vous suffit de raccourcir d'allonger la p=C3=
=A9riode de d=C3=A9cembre jusqu'au 30/12
+et d'ajouter une p=C3=A9riode d'un jour allant du 31/12 au 31/12
 <form method=3D"post" onsubmit=3D"return confirm('Confirmez vous l\'ajou=
t d\'un exercice comptable ?')">
 <?
 echo HtmlInput::hidden("ac",$_REQUEST['ac']);



From MAILER-DAEMON Wed Nov 30 10:50:40 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVmQi-0001ZO-CL
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 10:50:40 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 16:55:09 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.62881.1322668239.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4519 - 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, 30 Nov 2011 15:50:38 -0000

Author: danydb
Date: 2011-11-30 16:55:07 +0100 (Wed, 30 Nov 2011)
New Revision: 4519

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
Log:
format montant op.concern?\195?\169e

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	2011-11-30 15:01:50 UTC =
(rev 4518)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-30 15:55:07 UTC =
(rev 4519)
@@ -716,7 +716,7 @@
                     $operation->jr_id=3D$element;
                     $l_amount=3D$this->db->get_value("select jr_montant =
from jrn ".
                                                    " where jr_id=3D$elem=
ent");
-                    $r.=3D "<A class=3D\"detail\" HREF=3D\"javascript:mo=
difyOperation('".$element."',".$gDossier.")\" > ".$operation->get_interna=
l()." [ $l_amount &euro; ]</A>";
+                    $r.=3D "<A class=3D\"detail\" HREF=3D\"javascript:mo=
difyOperation('".$element."',".$gDossier.")\" > ".$operation->get_interna=
l()."[".nbm($l_amount)."]</A>";
                 }//for
             }// if ( $a !=3D null ) {
             $r.=3D"</TD>";
@@ -932,7 +932,7 @@
                     $operation->jr_id=3D$element;
                     $l_amount=3D$this->db->get_value("select jr_montant =
from jrn ".
                                                    " where jr_id=3D$elem=
ent");
-                    $r.=3D "<A class=3D\"detail\" HREF=3D\"javascript:mo=
difyOperation('".$element."',".$gDossier.")\" > ".$operation->get_interna=
l()." [ $l_amount &euro; ]</A>";
+                    $r.=3D "<A class=3D\"detail\" HREF=3D\"javascript:mo=
difyOperation('".$element."',".$gDossier.")\" > ".$operation->get_interna=
l()."[".nbm($l_amount)."]</A>";
                 }//for
             }// if ( $a !=3D null ) {
             $r.=3D"</TD>";



From MAILER-DAEMON Wed Nov 30 10:50:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVmQy-0001aU-3Y
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 10:50:56 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 16:55:33 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.62882.1322668254.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4520 - 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, 30 Nov 2011 15:50:53 -0000

Author: danydb
Date: 2011-11-30 16:55:31 +0100 (Wed, 30 Nov 2011)
New Revision: 4520

Modified:
   phpcompta/trunk/include/template/form_ledger_fin.php
Log:
format montant op.concern?\195?\169e

Modified: phpcompta/trunk/include/template/form_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_fin.php	2011-11-30 15:55=
:07 UTC (rev 4519)
+++ phpcompta/trunk/include/template/form_ledger_fin.php	2011-11-30 15:55=
:31 UTC (rev 4520)
@@ -32,7 +32,7 @@
 echo td($item['search'].$item['qcode']);
 echo td($item['span']);
 echo td($item['comment']);
-echo td($item['amount']);
+echo td(nbm($item['amount']));
 echo td($item['concerned']);
 echo '</tr>';
 }



From MAILER-DAEMON Wed Nov 30 10:52:21 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVmSL-0001qg-Ps
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 10:52:21 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 16:56:58 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.62885.1322668339.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4521 - 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, 30 Nov 2011 15:52:19 -0000

Author: danydb
Date: 2011-11-30 16:56:56 +0100 (Wed, 30 Nov 2011)
New Revision: 4521

Modified:
   phpcompta/trunk/html/index.php
Log:
use SVNINFO

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	2011-11-30 15:55:31 UTC (rev 4520)
+++ phpcompta/trunk/html/index.php	2011-11-30 15:56:56 UTC (rev 4521)
@@ -187,7 +187,7 @@
=20
 echo '
 <span style=3D"background-color:#879ed4;color:white;padding-left:4px;pad=
ding-right:4px;">
-version  6.0.PRERELEASE - '.$my_domain.'
+version  6.0.SVNINFO - '.$my_domain.'
 </span>
 <BR>
 <BR>



From MAILER-DAEMON Wed Nov 30 10:53:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVmT1-00022P-UJ
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 10:53:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 16:57:43 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.62890.1322668383.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4522 - 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, 30 Nov 2011 15:53:02 -0000

Author: danydb
Date: 2011-11-30 16:57:42 +0100 (Wed, 30 Nov 2011)
New Revision: 4522

Modified:
   phpcompta/trunk/include/constant.php
Log:
use SVNINFO

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	2011-11-30 15:56:56 UTC (rev 452=
1)
+++ phpcompta/trunk/include/constant.php	2011-11-30 15:57:42 UTC (rev 452=
2)
@@ -35,14 +35,13 @@
 /*set to none for production */
 /* uncomment for production */
=20
-/*
- * $version_phpcompta=3DSVNINFO;
- * define ("DEBUG",false);
- *
- */
-$version_phpcompta=3D4444;
-define ("DEBUG",true);
=20
+$version_phpcompta=3DSVNINFO;
+define ("DEBUG",false);
+
+/*$version_phpcompta=3D4444;
+define ("DEBUG",false);
+*/
 define ("DBVERSION",98);
 define ("DBVERSIONREPO",14);
 define ('NOTFOUND','--not found--');



From MAILER-DAEMON Wed Nov 30 11:29:08 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVn1w-0000ox-ON
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 11:29:08 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 17:33:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.62965.1322670547.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4523 - 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: Wed, 30 Nov 2011 16:29:06 -0000

Author: danydb
Date: 2011-11-30 17:33:47 +0100 (Wed, 30 Nov 2011)
New Revision: 4523

Modified:
   phpcompta/trunk/doc/manuel-fr.odt
Log:
Mise ?\195?\160 jour manuel

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)



From MAILER-DAEMON Wed Nov 30 11:47:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVnJr-0007CH-7D
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 11:47:39 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 17:52:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63039.1322671657.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r199 - in trunk: amortis import_card importbank
	skel tool_pcmn tools 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: Wed, 30 Nov 2011 16:47:36 -0000

Author: danydb
Date: 2011-11-30 17:52:15 +0100 (Wed, 30 Nov 2011)
New Revision: 199

Modified:
   trunk/amortis/index.php
   trunk/import_card/index.php
   trunk/importbank/index.php
   trunk/skel/index.php
   trunk/tool_pcmn/index.php
   trunk/tools/index.php
   trunk/tva/index.php
Log:
add version

Modified: trunk/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/index.php	2011-11-29 20:01:44 UTC (rev 198)
+++ trunk/amortis/index.php	2011-11-30 16:52:15 UTC (rev 199)
@@ -69,7 +69,9 @@
     $def=3D3;
     break;
   }
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Damortissement" targe=
t=3D"_blank">Aide</a></div>';
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Damortissement" targe=
t=3D"_blank">Aide</a>'.
+'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'</div>';
 echo ShowItem($menu,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;ma=
rgin-left:10%;border-collapse: separate;border-spacing:  5px;"');
=20
 /* List + add and modify card */

Modified: trunk/import_card/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/import_card/index.php	2011-11-29 20:01:44 UTC (rev 198)
+++ trunk/import_card/index.php	2011-11-30 16:52:15 UTC (rev 199)
@@ -29,7 +29,9 @@
  */
 require_once('include/class_import_card.php');
 global $cn;
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_fiche=
" target=3D"_blank">Aide</a></div>';
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_fiche=
" target=3D"_blank">Aide</a>'.
+'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'</div>';
 $cn=3Dnew Database(dossier::id());
 if ( ! isset($_REQUEST['sa']))
   {

Modified: trunk/importbank/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/importbank/index.php	2011-11-29 20:01:44 UTC (rev 198)
+++ trunk/importbank/index.php	2011-11-30 16:52:15 UTC (rev 199)
@@ -32,7 +32,9 @@
 require_once('class_html_table.php');
 Extension::check_version(4400);
 global $cn;
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_banqu=
e" target=3D"_blank">Aide</a></div>';
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_banqu=
e" target=3D"_blank">Aide</a>'.
+'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'</div>';
 $cn=3Dnew Database(dossier::id());
=20
 ob_start();

Modified: trunk/skel/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/skel/index.php	2011-11-29 20:01:44 UTC (rev 198)
+++ trunk/skel/index.php	2011-11-30 16:52:15 UTC (rev 199)
@@ -79,7 +79,9 @@
   }
=20
 // show menu
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Daide" target=3D"_bla=
nk">Aide</a></div>';
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Daide" target=3D"_bla=
nk">Aide</a>'.
+'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'</div>';
=20
 echo ShowItem($menu,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;ma=
rgin-left:10%;border-collapse: separate;border-spacing:  5px;"');
=20

Modified: trunk/tool_pcmn/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/tool_pcmn/index.php	2011-11-29 20:01:44 UTC (rev 198)
+++ trunk/tool_pcmn/index.php	2011-11-30 16:52:15 UTC (rev 199)
@@ -29,7 +29,9 @@
  */
 Extension::check_version(4400);
 global $cn;
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_plan_=
comptable" target=3D"_blank">Aide</a></div>';
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_plan_=
comptable" target=3D"_blank">Aide</a>'.
+'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'</div>';
 $cn=3Dnew Database(dossier::id());
 /*
  * load javascript

Modified: trunk/tools/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/tools/index.php	2011-11-29 20:01:44 UTC (rev 198)
+++ trunk/tools/index.php	2011-11-30 16:52:15 UTC (rev 199)
@@ -54,7 +54,9 @@
=20
 $cn=3Dnew Database(dossier::id());
 // show menu
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Doutil_comptable" tar=
get=3D"_blank">Aide</a></div>';
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Doutil_comptable" tar=
get=3D"_blank">Aide</a>'.
+'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'</div>';
=20
 echo ShowItem($array,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;m=
argin-left:10%;border-collapse: separate;border-spacing:  5px;"');
 require_once('include/tool_function.php');

Modified: trunk/tva/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/index.php	2011-11-29 20:01:44 UTC (rev 198)
+++ trunk/tva/index.php	2011-11-30 16:52:15 UTC (rev 199)
@@ -88,7 +88,9 @@
 if ( $a =3D=3D false)
   $cn->exec_sql("alter table tva_belge.assujetti add exercice text");
=20
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dtva" target=3D"_blan=
k">Aide</a></div>';
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dtva" target=3D"_blan=
k">Aide</a>'.
+'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'</div>';
 // show menu
 echo ShowItem($array,'H',"mtitle","mtitle",$def,' style=3D"width:80%;mar=
gin-left:10%;border-spacing:5;" ');
=20



From MAILER-DAEMON Wed Nov 30 11:52:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVnOZ-0007n5-Jy
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 11:52:31 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 17:57:06 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63044.1322671951.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r200 - in trunk: amortis import_card importbank
	skel tool_pcmn tools 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: Wed, 30 Nov 2011 16:52:30 -0000

Author: danydb
Date: 2011-11-30 17:57:05 +0100 (Wed, 30 Nov 2011)
New Revision: 200

Modified:
   trunk/amortis/index.php
   trunk/import_card/index.php
   trunk/importbank/index.php
   trunk/skel/index.php
   trunk/tool_pcmn/index.php
   trunk/tools/index.php
   trunk/tva/index.php
Log:
version enlarge char.

Modified: trunk/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/index.php	2011-11-30 16:52:15 UTC (rev 199)
+++ trunk/amortis/index.php	2011-11-30 16:57:05 UTC (rev 200)
@@ -70,7 +70,7 @@
     break;
   }
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Damortissement" targe=
t=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
 '</div>';
 echo ShowItem($menu,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;ma=
rgin-left:10%;border-collapse: separate;border-spacing:  5px;"');
=20

Modified: trunk/import_card/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/import_card/index.php	2011-11-30 16:52:15 UTC (rev 199)
+++ trunk/import_card/index.php	2011-11-30 16:57:05 UTC (rev 200)
@@ -30,7 +30,7 @@
 require_once('include/class_import_card.php');
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_fiche=
" target=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
 '</div>';
 $cn=3Dnew Database(dossier::id());
 if ( ! isset($_REQUEST['sa']))

Modified: trunk/importbank/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/importbank/index.php	2011-11-30 16:52:15 UTC (rev 199)
+++ trunk/importbank/index.php	2011-11-30 16:57:05 UTC (rev 200)
@@ -33,7 +33,7 @@
 Extension::check_version(4400);
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_banqu=
e" target=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
 '</div>';
 $cn=3Dnew Database(dossier::id());
=20

Modified: trunk/skel/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/skel/index.php	2011-11-30 16:52:15 UTC (rev 199)
+++ trunk/skel/index.php	2011-11-30 16:57:05 UTC (rev 200)
@@ -80,7 +80,7 @@
=20
 // show menu
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Daide" target=3D"_bla=
nk">Aide</a>'.
-'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
 '</div>';
=20
 echo ShowItem($menu,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;ma=
rgin-left:10%;border-collapse: separate;border-spacing:  5px;"');

Modified: trunk/tool_pcmn/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/tool_pcmn/index.php	2011-11-30 16:52:15 UTC (rev 199)
+++ trunk/tool_pcmn/index.php	2011-11-30 16:57:05 UTC (rev 200)
@@ -30,7 +30,7 @@
 Extension::check_version(4400);
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_plan_=
comptable" target=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
 '</div>';
 $cn=3Dnew Database(dossier::id());
 /*

Modified: trunk/tools/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/tools/index.php	2011-11-30 16:52:15 UTC (rev 199)
+++ trunk/tools/index.php	2011-11-30 16:57:05 UTC (rev 200)
@@ -55,7 +55,7 @@
 $cn=3Dnew Database(dossier::id());
 // show menu
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Doutil_comptable" tar=
get=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
 '</div>';
=20
 echo ShowItem($array,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;m=
argin-left:10%;border-collapse: separate;border-spacing:  5px;"');

Modified: trunk/tva/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/index.php	2011-11-30 16:52:15 UTC (rev 199)
+++ trunk/tva/index.php	2011-11-30 16:57:05 UTC (rev 200)
@@ -89,7 +89,7 @@
   $cn->exec_sql("alter table tva_belge.assujetti add exercice text");
=20
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dtva" target=3D"_blan=
k">Aide</a>'.
-'<span style=3D"font-size:0.33em;color:red;display:inline">SVNINFO</span=
>'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
 '</div>';
 // show menu
 echo ShowItem($array,'H',"mtitle","mtitle",$def,' style=3D"width:80%;mar=
gin-left:10%;border-spacing:5;" ');



From MAILER-DAEMON Wed Nov 30 11:55:15 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVnRD-00085R-5z
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 11:55:15 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 17:59:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63054.1322672114.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r201 - in trunk: amortis import_card importbank
	skel tool_pcmn tools 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: Wed, 30 Nov 2011 16:55:13 -0000

Author: danydb
Date: 2011-11-30 17:59:49 +0100 (Wed, 30 Nov 2011)
New Revision: 201

Modified:
   trunk/amortis/index.php
   trunk/import_card/index.php
   trunk/importbank/index.php
   trunk/skel/index.php
   trunk/tool_pcmn/index.php
   trunk/tools/index.php
   trunk/tva/index.php
Log:
version add vers.

Modified: trunk/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/index.php	2011-11-30 16:57:05 UTC (rev 200)
+++ trunk/amortis/index.php	2011-11-30 16:59:49 UTC (rev 201)
@@ -70,7 +70,7 @@
     break;
   }
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Damortissement" targe=
t=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 echo ShowItem($menu,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;ma=
rgin-left:10%;border-collapse: separate;border-spacing:  5px;"');
=20

Modified: trunk/import_card/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/import_card/index.php	2011-11-30 16:57:05 UTC (rev 200)
+++ trunk/import_card/index.php	2011-11-30 16:59:49 UTC (rev 201)
@@ -30,7 +30,7 @@
 require_once('include/class_import_card.php');
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_fiche=
" target=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 $cn=3Dnew Database(dossier::id());
 if ( ! isset($_REQUEST['sa']))

Modified: trunk/importbank/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/importbank/index.php	2011-11-30 16:57:05 UTC (rev 200)
+++ trunk/importbank/index.php	2011-11-30 16:59:49 UTC (rev 201)
@@ -33,7 +33,7 @@
 Extension::check_version(4400);
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_banqu=
e" target=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 $cn=3Dnew Database(dossier::id());
=20

Modified: trunk/skel/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/skel/index.php	2011-11-30 16:57:05 UTC (rev 200)
+++ trunk/skel/index.php	2011-11-30 16:59:49 UTC (rev 201)
@@ -80,7 +80,7 @@
=20
 // show menu
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Daide" target=3D"_bla=
nk">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
=20
 echo ShowItem($menu,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;ma=
rgin-left:10%;border-collapse: separate;border-spacing:  5px;"');

Modified: trunk/tool_pcmn/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/tool_pcmn/index.php	2011-11-30 16:57:05 UTC (rev 200)
+++ trunk/tool_pcmn/index.php	2011-11-30 16:59:49 UTC (rev 201)
@@ -30,7 +30,7 @@
 Extension::check_version(4400);
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_plan_=
comptable" target=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 $cn=3Dnew Database(dossier::id());
 /*

Modified: trunk/tools/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/tools/index.php	2011-11-30 16:57:05 UTC (rev 200)
+++ trunk/tools/index.php	2011-11-30 16:59:49 UTC (rev 201)
@@ -55,7 +55,7 @@
 $cn=3Dnew Database(dossier::id());
 // show menu
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Doutil_comptable" tar=
get=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
=20
 echo ShowItem($array,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;m=
argin-left:10%;border-collapse: separate;border-spacing:  5px;"');

Modified: trunk/tva/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/index.php	2011-11-30 16:57:05 UTC (rev 200)
+++ trunk/tva/index.php	2011-11-30 16:59:49 UTC (rev 201)
@@ -89,7 +89,7 @@
   $cn->exec_sql("alter table tva_belge.assujetti add exercice text");
=20
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dtva" target=3D"_blan=
k">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">SVNINFO</span>=
'.
+'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 // show menu
 echo ShowItem($array,'H',"mtitle","mtitle",$def,' style=3D"width:80%;mar=
gin-left:10%;border-spacing:5;" ');



From MAILER-DAEMON Wed Nov 30 11:56:47 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVnSh-0008EY-I1
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 11:56:47 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 18:01:18 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63065.1322672206.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r202 - in trunk: amortis import_card importbank
	skel tool_pcmn tools 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: Wed, 30 Nov 2011 16:56:45 -0000

Author: danydb
Date: 2011-11-30 18:01:17 +0100 (Wed, 30 Nov 2011)
New Revision: 202

Modified:
   trunk/amortis/index.php
   trunk/import_card/index.php
   trunk/importbank/index.php
   trunk/skel/index.php
   trunk/tool_pcmn/index.php
   trunk/tools/index.php
   trunk/tva/index.php
Log:
version enlarge char.

Modified: trunk/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/index.php	2011-11-30 16:59:49 UTC (rev 201)
+++ trunk/amortis/index.php	2011-11-30 17:01:17 UTC (rev 202)
@@ -70,7 +70,7 @@
     break;
   }
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Damortissement" targe=
t=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
+'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 echo ShowItem($menu,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;ma=
rgin-left:10%;border-collapse: separate;border-spacing:  5px;"');
=20

Modified: trunk/import_card/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/import_card/index.php	2011-11-30 16:59:49 UTC (rev 201)
+++ trunk/import_card/index.php	2011-11-30 17:01:17 UTC (rev 202)
@@ -30,7 +30,7 @@
 require_once('include/class_import_card.php');
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_fiche=
" target=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
+'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 $cn=3Dnew Database(dossier::id());
 if ( ! isset($_REQUEST['sa']))

Modified: trunk/importbank/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/importbank/index.php	2011-11-30 16:59:49 UTC (rev 201)
+++ trunk/importbank/index.php	2011-11-30 17:01:17 UTC (rev 202)
@@ -33,7 +33,7 @@
 Extension::check_version(4400);
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_banqu=
e" target=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
+'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 $cn=3Dnew Database(dossier::id());
=20

Modified: trunk/skel/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/skel/index.php	2011-11-30 16:59:49 UTC (rev 201)
+++ trunk/skel/index.php	2011-11-30 17:01:17 UTC (rev 202)
@@ -80,7 +80,7 @@
=20
 // show menu
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Daide" target=3D"_bla=
nk">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
+'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
=20
 echo ShowItem($menu,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;ma=
rgin-left:10%;border-collapse: separate;border-spacing:  5px;"');

Modified: trunk/tool_pcmn/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/tool_pcmn/index.php	2011-11-30 16:59:49 UTC (rev 201)
+++ trunk/tool_pcmn/index.php	2011-11-30 17:01:17 UTC (rev 202)
@@ -30,7 +30,7 @@
 Extension::check_version(4400);
 global $cn;
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dimportation_de_plan_=
comptable" target=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
+'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 $cn=3Dnew Database(dossier::id());
 /*

Modified: trunk/tools/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/tools/index.php	2011-11-30 16:59:49 UTC (rev 201)
+++ trunk/tools/index.php	2011-11-30 17:01:17 UTC (rev 202)
@@ -55,7 +55,7 @@
 $cn=3Dnew Database(dossier::id());
 // show menu
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Doutil_comptable" tar=
get=3D"_blank">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
+'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
=20
 echo ShowItem($array,'H','mtitle ','mtitle ',$def,' style=3D"width:80%;m=
argin-left:10%;border-collapse: separate;border-spacing:  5px;"');

Modified: trunk/tva/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/index.php	2011-11-30 16:59:49 UTC (rev 201)
+++ trunk/tva/index.php	2011-11-30 17:01:17 UTC (rev 202)
@@ -89,7 +89,7 @@
   $cn->exec_sql("alter table tva_belge.assujetti add exercice text");
=20
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dtva" target=3D"_blan=
k">Aide</a>'.
-'<span style=3D"font-size:0.7em;color:red;display:inline">vers:SVNINFO</=
span>'.
+'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
 '</div>';
 // show menu
 echo ShowItem($array,'H',"mtitle","mtitle",$def,' style=3D"width:80%;mar=
gin-left:10%;border-spacing:5;" ');



From MAILER-DAEMON Wed Nov 30 11:59:08 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVnUy-0000ty-1w
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 11:59:08 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 18:03:42 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63068.1322672346.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r203 - trunk/modop
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?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, 30 Nov 2011 16:59:05 -0000

Author: danydb
Date: 2011-11-30 18:03:42 +0100 (Wed, 30 Nov 2011)
New Revision: 203

Modified:
   trunk/modop/index.php
Log:
add version + help to modop

Modified: trunk/modop/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/modop/index.php	2011-11-30 17:01:17 UTC (rev 202)
+++ trunk/modop/index.php	2011-11-30 17:03:42 UTC (rev 203)
@@ -27,6 +27,9 @@
 $str=3Dnew IConcerned("jr_id");
 $str->value=3D(isset($_GET['jr_id']))?strtoupper($_GET['jr_id']):'';
 $str->value=3D(isset($_GET['ext_jr_id']))?strtoupper($_GET['ext_jr_id'])=
:$str->value;
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dmodification_d_opera=
tion" target=3D"_blank">Aide</a>'.
+'<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.
+'</div>';
=20
=20
=20



From MAILER-DAEMON Wed Nov 30 12:03:20 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVnZ2-0003xa-F2
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 12:03:20 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 18:07:53 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63078.1322672599.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r204 - 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: Wed, 30 Nov 2011 17:03:18 -0000

Author: danydb
Date: 2011-11-30 18:07:52 +0100 (Wed, 30 Nov 2011)
New Revision: 204

Modified:
   trunk/tva/class_ext_list_assujetti.php
   trunk/tva/class_ext_list_intra.php
Log:
TVA : cosmetic : listing assujetti + intracom

Modified: trunk/tva/class_ext_list_assujetti.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/class_ext_list_assujetti.php	2011-11-30 17:03:42 UTC (rev 2=
03)
+++ trunk/tva/class_ext_list_assujetti.php	2011-11-30 17:07:52 UTC (rev 2=
04)
@@ -249,7 +249,7 @@
    */
   function display_declaration_amount() {
     $res=3D'<fieldset><legend>Listing</legend>';
-    $res.=3D '<table id=3D"tb_dsp" class=3D"result" style=3D"width:80%;m=
argin-left:5%">';
+    $res.=3D '<table id=3D"tb_dsp" class=3D"result" style=3D"width:80%;"=
>';
     $clean=3Dnew IButton();
     $clean->label=3D'Efface ligne';
     $clean->javascript=3D"deleteRow('tb_dsp',this);";

Modified: trunk/tva/class_ext_list_intra.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/class_ext_list_intra.php	2011-11-30 17:03:42 UTC (rev 203)
+++ trunk/tva/class_ext_list_intra.php	2011-11-30 17:07:52 UTC (rev 204)
@@ -227,7 +227,7 @@
   function display_declaration_amount() {
     $res=3D'<fieldset><legend>Listing</legend>';
=20
-    $res.=3D '<table id=3D"tb_dsp" class=3D"result" style=3D"width:80%;m=
argin-left:5%">';
+    $res.=3D '<table id=3D"tb_dsp" class=3D"result" style=3D"width:80%;"=
>';
     $clean=3Dnew IButton();
     $clean->label=3D'Efface ligne';
     $clean->javascript=3D"deleteRow('tb_dsp',this);";



From MAILER-DAEMON Wed Nov 30 15:37:57 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVquj-00011O-Dq
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 15:37:57 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 21:42:35 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63679.1322685476.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4524 - 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: Wed, 30 Nov 2011 20:37:55 -0000

Author: danydb
Date: 2011-11-30 21:42:33 +0100 (Wed, 30 Nov 2011)
New Revision: 4524

Modified:
   phpcompta/trunk/html/js/card.js
Log:
smaller card box

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2011-11-30 16:33:47 UTC (rev 4523)
+++ phpcompta/trunk/html/js/card.js	2011-11-30 20:42:33 UTC (rev 4524)
@@ -299,7 +299,7 @@
     var content=3D'card_'+card_layer;
     var nTop=3DposY-40;
     var nLeft=3DposX-20;
-    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:45em;height:auto"=
;
+    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:40em;height:auto"=
;
=20
     var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};
=20



From MAILER-DAEMON Wed Nov 30 15:40:46 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVqxS-0001Al-7t
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 15:40:46 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 21:45:24 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63686.1322685645.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4525 - 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: Wed, 30 Nov 2011 20:40:45 -0000

Author: danydb
Date: 2011-11-30 21:45:23 +0100 (Wed, 30 Nov 2011)
New Revision: 4525

Modified:
   phpcompta/trunk/html/js/card.js
Log:
smaller card box

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2011-11-30 20:42:33 UTC (rev 4524)
+++ phpcompta/trunk/html/js/card.js	2011-11-30 20:45:23 UTC (rev 4525)
@@ -299,7 +299,7 @@
     var content=3D'card_'+card_layer;
     var nTop=3DposY-40;
     var nLeft=3DposX-20;
-    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:40em;height:auto"=
;
+    var str_style=3D"top:"+nTop+";left:"+nLeft+";padding-left:2em;width:=
40em;height:auto";
=20
     var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};
=20



From MAILER-DAEMON Wed Nov 30 15:43:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVr05-0001Rp-Gr
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 15:43:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 21:48:09 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63691.1322685808.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4526 - 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: Wed, 30 Nov 2011 20:43:27 -0000

Author: danydb
Date: 2011-11-30 21:48:08 +0100 (Wed, 30 Nov 2011)
New Revision: 4526

Modified:
   phpcompta/trunk/html/js/card.js
Log:
card box : remove padding-left

Modified: phpcompta/trunk/html/js/card.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/card.js	2011-11-30 20:45:23 UTC (rev 4525)
+++ phpcompta/trunk/html/js/card.js	2011-11-30 20:48:08 UTC (rev 4526)
@@ -299,7 +299,7 @@
     var content=3D'card_'+card_layer;
     var nTop=3DposY-40;
     var nLeft=3DposX-20;
-    var str_style=3D"top:"+nTop+";left:"+nLeft+";padding-left:2em;width:=
40em;height:auto";
+    var str_style=3D"top:"+nTop+";left:"+nLeft+";width:40em;height:auto"=
;
=20
     var popup=3D{'id':  content,'cssclass':'inner_box','style':str_style=
,'html':loading(),'drag':true};
=20



From MAILER-DAEMON Wed Nov 30 15:56:16 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVrCS-0003GX-3n
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 15:56:16 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 22:00:53 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63747.1322686574.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4527 - in phpcompta/trunk: html 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, 30 Nov 2011 20:56:13 -0000

Author: danydb
Date: 2011-11-30 22:00:52 +0100 (Wed, 30 Nov 2011)
New Revision: 4527

Modified:
   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/template/module.php
Log:
set properly dossier:name

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	2011-11-30 20:48:08 UTC (rev 452=
6)
+++ phpcompta/trunk/html/style-color.css	2011-11-30 21:00:52 UTC (rev 452=
7)
@@ -1101,4 +1101,10 @@
 	background-color:darkblue;
 	color:white;
 	font-size:1em;
+}
+#dossier {
+	display:inline;
+	float:left;
+	width:40em;
+	top:0px;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-epad.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-epad.css	2011-11-30 20:48:08 UTC (rev 4526=
)
+++ phpcompta/trunk/html/style-epad.css	2011-11-30 21:00:52 UTC (rev 4527=
)
@@ -1097,4 +1097,10 @@
 	background-color:darkblue;
 	color:white;
 	font-size:1em;
+}
+#dossier {
+	display:inline;
+	float:left;
+	width:40em;
+	top:0px;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-light.css	2011-11-30 20:48:08 UTC (rev 452=
6)
+++ phpcompta/trunk/html/style-light.css	2011-11-30 21:00:52 UTC (rev 452=
7)
@@ -1099,4 +1099,10 @@
 	background-color:darkblue;
 	color:white;
 	font-size:1em;
+}
+#dossier {
+	display:inline;
+	float:left;
+	width:40em;
+	top:0px;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2011-11-30 20:48:08 UTC (rev 4526)
+++ phpcompta/trunk/html/style.css	2011-11-30 21:00:52 UTC (rev 4527)
@@ -1094,4 +1094,10 @@
 	background-color:darkblue;
 	color:white;
 	font-size:1em;
+}
+#dossier {
+	display:inline;
+	float:left;
+	width:40em;
+	top:0px;
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2011-11-30 20:48:08 UTC (=
rev 4526)
+++ phpcompta/trunk/include/template/module.php	2011-11-30 21:00:52 UTC (=
rev 4527)
@@ -1,7 +1,6 @@
 <div class=3D"u_tool">
     <div class=3D"name">
=20
-	<H2 class=3D"dossier"> Dossier : <?=3Dh(dossier::name())?></h2>
 <?php
=20
 if ( $cn->get_value("select count(*) from profile join profile_user usin=
g (p_id)
@@ -43,8 +42,10 @@
 		</script>
 	</div>
 <?
-endif;
-?>
+endif;?>
+	<div id=3D"dossier">
+	<H2 class=3D"dossier"> Dossier : <?=3Dh(dossier::name())?></h2>
+	</div>
     </div>
     <div class=3D"module">
 	<table>



From MAILER-DAEMON Wed Nov 30 17:55:19 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVt3f-0006SK-Ed
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 17:55:19 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 30 Nov 2011 23:59:52 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.63928.1322693718.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4528 - 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, 30 Nov 2011 22:55:17 -0000

Author: danydb
Date: 2011-11-30 23:59:50 +0100 (Wed, 30 Nov 2011)
New Revision: 4528

Modified:
   phpcompta/trunk/include/action.common.inc.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/impress_poste.inc.php
   phpcompta/trunk/include/template/form_ledger_detail.php
   phpcompta/trunk/include/template/form_ledger_fin.php
   phpcompta/trunk/include/template/ledger_search.php
Log:
location button for searching card

Modified: phpcompta/trunk/include/action.common.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/action.common.inc.php	2011-11-30 21:00:52 UTC=
 (rev 4527)
+++ phpcompta/trunk/include/action.common.inc.php	2011-11-30 22:59:50 UTC=
 (rev 4528)
@@ -267,7 +267,7 @@
   $w->table=3D0;
   $list=3D$cn->make_list("select fd_id from fiche_def where frd_id in (4=
,8,9,14,15,16,25)");
   $w->extra=3D$list;
-  echo _('Fiche').' :'.$w->search().$w->input().'<br/>';
+  echo _('Fiche').' :'.$w->input().$w->search().'<br/>';
   printf (_('Titre ou r=C3=A9f=C3=A9rence').': <input class=3D"input_tex=
t" type=3D"text" name=3D"query" value=3D"%s">',
 	  $a);
   echo '<br/>';

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	2011-11-30 21:00:52 UTC =
(rev 4527)
+++ phpcompta/trunk/include/class_acc_ledger.php	2011-11-30 22:59:50 UTC =
(rev 4528)
@@ -1676,7 +1676,7 @@
             $deb->javascript=3D' onChange=3D"checkTotalDirect()"';
=20
             $ret.=3D'<tr>';
-            $ret.=3D'<td>'.$quick_code->search().$quick_code->input().'<=
/td>';
+            $ret.=3D'<td>'.$quick_code->input().$quick_code->search().'<=
/td>';
             $ret.=3D'<td>'.$poste->input().
                   '<script> document.getElementById(\'poste'.$i.'\').onb=
lur=3Dfunction(){ if (trim(this.value) !=3D\'\') {document.getElementById=
(\'qc_'.$i.'\').value=3D"";}}</script>'.
                   '</td>';

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	2011-11-30 21:00:52 UTC=
 (rev 4527)
+++ phpcompta/trunk/include/impress_poste.inc.php	2011-11-30 22:59:50 UTC=
 (rev 4528)
@@ -80,7 +80,7 @@
=20
=20
 $w_poste->value=3D(isset($_REQUEST['f_id']))?$_REQUEST['f_id']:"";
-print td($w_poste->search().$w_poste->input());
+print td($w_poste->input().$w_poste->search());
 echo td($span->input('f_id_label'));
 print '</TR>';
 print '<TR>';

Modified: phpcompta/trunk/include/template/form_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_detail.php	2011-11-30 21=
:00:52 UTC (rev 4527)
+++ phpcompta/trunk/include/template/form_ledger_detail.php	2011-11-30 22=
:59:50 UTC (rev 4528)
@@ -36,8 +36,8 @@
 </tr>
 <? foreach ($array as $item) {
 echo '<tr>';
+echo $item['quick_code'];
 echo '<td>'.$item['bt'].'</td>';
-echo $item['quick_code'];
 ?>
 <td style=3D"border-bottom: 1px dotted grey; width: 75%;"><?=3D$item['de=
nom'] ?></td>
 <?

Modified: phpcompta/trunk/include/template/form_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_fin.php	2011-11-30 21:00=
:52 UTC (rev 4527)
+++ phpcompta/trunk/include/template/form_ledger_fin.php	2011-11-30 22:59=
:50 UTC (rev 4528)
@@ -29,7 +29,7 @@
=20
 <? foreach ($array as $item) {
 echo '<tr>';
-echo td($item['search'].$item['qcode']);
+echo td($item['qcode'].$item['search']);
 echo td($item['span']);
 echo td($item['comment']);
 echo td(nbm($item['amount']));

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	2011-11-30 21:00:5=
2 UTC (rev 4527)
+++ phpcompta/trunk/include/template/ledger_search.php	2011-11-30 22:59:5=
0 UTC (rev 4528)
@@ -40,7 +40,7 @@
 	<?=3D_('Et utilisant la fiche (quick code)')?>
 </td>
 <td>
-   <?php echo $f_qcode->search();echo $f_qcode->input();  ?>
+   <?php echo $f_qcode->input(); echo $f_qcode->search(); ?>
 </td>
 </tr>
 <tr>



From MAILER-DAEMON Wed Nov 30 19:15:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVuJS-0007Rg-UT
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 19:15:42 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  1 Dec 2011 01:20:21 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64007.1322698541.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4529 - 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, 01 Dec 2011 00:15:41 -0000

Author: danydb
Date: 2011-12-01 01:20:19 +0100 (Thu, 01 Dec 2011)
New Revision: 4529

Modified:
   phpcompta/trunk/include/user.inc.php
Log:
tri sur utilisateur actif/inactif

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	2011-11-30 22:59:50 UTC (rev 452=
8)
+++ phpcompta/trunk/include/user.inc.php	2011-12-01 00:20:19 UTC (rev 452=
9)
@@ -104,6 +104,7 @@
 $header->add("Nom", $url," order by use_login asc", "order by use_login =
desc","na", "nd");
 $header->add('Dossier',$url,' order by ag_dossier asc','order by ag_doss=
ier desc',
         'da','dd');
+$header->add("Actif", $url," order by use_active asc", "order by  use_ac=
tive desc","aa", "ad");
 $ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la';
 $sql=3D$header->get_sql_order($ord);
=20
@@ -116,7 +117,7 @@
     echo '<th>'.$header->get_header(0).'</th>';
     echo '<th>'.$header->get_header(1).'</th>';
     echo th("Pr=C3=A9nom");
-    echo th("Actif");
+    echo '<th>'.$header->get_header(3).'</th>';
 	echo "<th>Type</th>";
     echo '<th>'.$header->get_header(2).'</th>';
     echo '</tr>';



From MAILER-DAEMON Wed Nov 30 19:28:53 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVuWD-0001Kb-E7
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 19:28:53 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  1 Dec 2011 01:33:31 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64017.1322699332.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4530 - 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: Thu, 01 Dec 2011 00:28:51 -0000

Author: danydb
Date: 2011-12-01 01:33:30 +0100 (Thu, 01 Dec 2011)
New Revision: 4530

Modified:
   phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.sql
Log:
change L user to R user

Modified: phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.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/ac-upgrade13.sql	2011-12-01 00:2=
0:19 UTC (rev 4529)
+++ phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.sql	2011-12-01 00:3=
3:30 UTC (rev 4530)
@@ -5,6 +5,6 @@
 ALTER TABLE audit_connect ADD CONSTRAINT valid_state CHECK (ac_state =3D=
 'FAIL'::text OR ac_state =3D 'SUCCESS'::text or ac_state=3D'AUDIT');
 -- run to the account_repository
 insert into theme values ('EPad','style-epad.css',null);
-
+update priv_user set priv_priv=3D'R' where priv_priv=3D'L';
 update version set val=3D14;
 commit;



From MAILER-DAEMON Wed Nov 30 19:32:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVuZr-0001v0-H8
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 19:32:39 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  1 Dec 2011 01:37:19 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64024.1322699559.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4531 - 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, 01 Dec 2011 00:32:38 -0000

Author: danydb
Date: 2011-12-01 01:37:17 +0100 (Thu, 01 Dec 2011)
New Revision: 4531

Modified:
   phpcompta/trunk/include/param_sec.inc.php
Log:
filter by actif

Modified: phpcompta/trunk/include/param_sec.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/param_sec.inc.php	2011-12-01 00:33:30 UTC (re=
v 4530)
+++ phpcompta/trunk/include/param_sec.inc.php	2011-12-01 00:37:17 UTC (re=
v 4531)
@@ -72,7 +72,7 @@
                                             priv_priv
                                                 from ac_users natural jo=
in jnt_use_dos " .
                                                " join priv_user on (jnt_=
id=3Dpriv_jnt)
-					where use_login !=3D 'phpcompta' and priv_priv <> 'X'
+					where use_login !=3D 'phpcompta' and priv_priv <> 'X' and use_activ=
e=3D1
 					and dos_id=3D$1  " . $ord_sql, array($gDossier));
=20
     $MaxUser =3D Database::num_row($user_sql);
@@ -298,8 +298,8 @@
             $jrn_priv->selected=3D$sec_User->get_ledger_access($l_line['=
jrn_def_id']);
         else
             $jrn_priv->selected=3D'W';
-           =20
=20
+
         echo '<td>';
         echo $jrn_priv->input();
         echo '</td>';



From MAILER-DAEMON Wed Nov 30 19:41:50 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVuik-00031z-Ka
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 19:41:50 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  1 Dec 2011 01:46:29 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64025.1322700110.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4532 - 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: Thu, 01 Dec 2011 00:41:49 -0000

Author: danydb
Date: 2011-12-01 01:46:27 +0100 (Thu, 01 Dec 2011)
New Revision: 4532

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade97.sql
Log:
remove mod_paiement for inexisting ledger

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade97.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/upgrade97.sql	2011-12-01 00:37:1=
7 UTC (rev 4531)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade97.sql	2011-12-01 00:46:2=
7 UTC (rev 4532)
@@ -792,6 +792,8 @@
=20
 alter table mod_payment drop mp_type;
=20
+delete from mod_payment where jrn_def_id not in (select jrn_def_id from =
jrn_def);
+
 alter table mod_payment add constraint mod_payment_jrn_def_id_fk foreign=
 key (jrn_def_id) references jrn_def(jrn_def_id) on delete cascade on upd=
ate cascade;
=20
 comment on column mod_payment.jrn_def_id is 'Ledger using this payment m=
ethod';



From MAILER-DAEMON Wed Nov 30 20:43:10 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVvg6-0001dA-Jw
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 20:43:10 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  1 Dec 2011 02:47:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64067.1322703789.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4533 - 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, 01 Dec 2011 01:43:09 -0000

Author: danydb
Date: 2011-12-01 02:47:45 +0100 (Thu, 01 Dec 2011)
New Revision: 4533

Modified:
   phpcompta/trunk/include/dossier.inc.php
   phpcompta/trunk/include/modele.inc.php
Log:
Add a sort for template and folder

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	2011-12-01 00:46:27 UTC (rev =
4532)
+++ phpcompta/trunk/include/dossier.inc.php	2011-12-01 01:47:45 UTC (rev =
4533)
@@ -155,17 +155,30 @@
 // List of folder
 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');
-
+	$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");
+	$header->add("Nom",$url," order by dos_name asc"," order by dos_name de=
sc","na","nd");
+	$header->add("Description",$url," order by dos_description asc"," order=
 by dos_description  desc","da","dd");
     $repo=3Dnew Dossier(0);
 	$repocn=3Dnew Database();
-    $Res=3D$repo->show_dossier('all');
-    $compteur=3D1;
+	$ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'na';
+	$sql_order=3D$header->get_sql_order($ord);
+	$Res=3D$repocn->get_array("select *  from ac_dossier $sql_order");
+
+	$compteur=3D1;
     $template=3D"";
+	echo '<div class=3D"content">';
+    echo '<TABLE class=3D"table_large" >';
+	$r=3D"";
+	$r.=3D'<th>'.$header->get_header(0).'</td>';
+	$r.=3D'<th>'.$header->get_header(1).'</td>';
+	$r.=3D'<th>'.$header->get_header(2).'</td>';
+    $r.=3Dth('Taille').th('Nom base de donn=C3=A9es');
=20
-    echo '<TABLE class=3D"table_large" >';
-    $r=3Dth('ID').th('Nom du dossier ').th('Description').th('Taille').t=
h('Nom base de donn=C3=A9es');
     $r=3Dtr($r);
     echo $r;
     // show all dossiers

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	2011-12-01 00:46:27 UTC (rev 4=
532)
+++ phpcompta/trunk/include/modele.inc.php	2011-12-01 01:47:45 UTC (rev 4=
533)
@@ -199,9 +199,20 @@
 	}
 }
 // Show all available templates
+require_once('class_sort_table.php');
+$url=3D$_SERVER['PHP_SELF']."?sa=3Dlist&action=3D".$_REQUEST['action'];
=20
+$header=3Dnew Sort_Table();
+$header->add("id",$url," order by mod_id asc"," order by mod_id desc","i=
a","id");
+$header->add("Nom",$url," order by mod_name asc"," order by mod_name des=
c","na","nd");
+$header->add("Description",$url," order by mod_desc asc"," order by mod_=
desc desc","da","dd");
+
+$ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'na';
+$sql_order=3D$header->get_sql_order($ord);
+
 $Res =3D $cn->exec_sql("select mod_id,mod_name,mod_desc from
-                   modeledef order by mod_name");
+                   modeledef $sql_order");
+
 $count =3D Database::num_row($Res);
 echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
 echo "<H2>Mod=C3=A8les</H2>";
@@ -209,7 +220,7 @@
 {
 	if ($count =3D=3D 0)
 	{
-		echo "No template available";
+		echo "Aucun mod=C3=A8le disponible";
 	}
 	else
 	{
@@ -219,11 +230,12 @@
 		echo HtmlInput::button_anchor('Ajouter', 'admin_repo.php?action=3Dmode=
le_mgt&sa=3Dadd');
=20
 		echo '<table class=3D"result" style=3D"border-spacing:10;border-collap=
se:separate" >';
-		echo "<TR><TH>Nom</TH>" .
-		"<TH>Description</TH>" .
+		echo "<TR>".
+				"<TH>".$header->get_header(0)."</TH>" .
+				"<TH>".$header->get_header(1)."</TH>" .
+				"<TH>".$header->get_header(2)."</TH>" .
 		"<th> </th>" .
 		"<th> </th>" .
-		"<th> </th>" .
 		"</TR>";
=20
 		for ($i =3D 0; $i < $count; $i++)
@@ -231,7 +243,7 @@
 			$mod =3D Database::fetch_array($Res, $i);
 			$class =3D ($i % 2 =3D=3D 0) ? "odd" : "even";
 			printf('<TR class=3D"' . $class . '" style=3D"vertical-align:top">' .
-					'<TD>%d <b> %s</b> </TD>' .
+					'<TD>%d </td><td><b> %s</b> </TD>' .
 					'<TD><I> %s </I></TD>' .
 					'<td> ' .
 					HtmlInput::button_anchor('Effacer', '?action=3Dmodele_mgt&sa=3Ddel&=
m=3D' . $mod['mod_id']) . '</td>' .



From MAILER-DAEMON Wed Nov 30 20:54:54 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVvrS-0002ST-2n
	for mharc-phpcompta-dev@gnu.org; Wed, 30 Nov 2011 20:54:54 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  1 Dec 2011 02:59:33 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.64072.1322704493.797.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r4534 - 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, 01 Dec 2011 01:54:53 -0000

Author: danydb
Date: 2011-12-01 02:59:31 +0100 (Thu, 01 Dec 2011)
New Revision: 4534

Modified:
   phpcompta/trunk/include/constant.security.php
Log:
remove sec

Modified: phpcompta/trunk/include/constant.security.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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.security.php	2011-12-01 01:47:45 UTC=
 (rev 4533)
+++ phpcompta/trunk/include/constant.security.php	2011-12-01 01:59:31 UTC=
 (rev 4534)
@@ -5,5 +5,5 @@
 define ('RMDOC',1020);   // Effacement de document pour follow up
 define ('VIEWDOC',1010);   // Voir document pour follow up
 define ('PARCATDOC',1050);   // modifier type document pour follow up
-global $audit; $audit=3Dtrue;
+global $audit; $audit=3Dfalse;
 ?>



