From MAILER-DAEMON Tue Mar 05 09:45:46 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UCt7i-0002ax-5E
	for mharc-phpcompta-dev@gnu.org; Tue, 05 Mar 2013 09:45:46 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  5 Mar 2013 15:40:09 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1166990.1362494744.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5183 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Mar 2013 14:45:44 -0000

Author: danydb
Date: 2013-03-05 15:40:08 +0100 (Tue, 05 Mar 2013)
New Revision: 5183

Modified:
   phpcompta/tags/rel650/include/tva.inc.php
Log:
0000791: Afficher dans la vue Param?\195?\168tres / Divers / TVA le code =
TVA


Modified: phpcompta/tags/rel650/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/tags/rel650/include/tva.inc.php	2013-02-28 13:04:44 UTC (re=
v 5182)
+++ phpcompta/tags/rel650/include/tva.inc.php	2013-03-05 14:40:08 UTC (re=
v 5183)
@@ -100,6 +100,7 @@
 ?>
 <TABLE>
     <TR>
+        <th>Id</th>
 	<th>Label</TH>
 	<th>Taux</th>
 	<th>Commentaire</th>
@@ -123,8 +124,10 @@
     echo "<TR>";
     echo '<FORM METHOD=3D"POST">';
=20
+    echo '<td>';
+    echo $row['tva_id'];
+    echo '</td>';
=20
-
     echo "<TD>";
     echo HtmlInput::hidden('tva_id', $row['tva_id']);
     echo h($row['tva_label']);



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


From MAILER-DAEMON Tue Mar 05 10:44:02 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UCu26-0002oa-12
	for mharc-phpcompta-dev@gnu.org; Tue, 05 Mar 2013 10:44:02 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  5 Mar 2013 16:38:23 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1167117.1362498241.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r466 - trunk/import_account/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, 05 Mar 2013 15:44:00 -0000

Author: danydb
Date: 2013-03-05 16:38:23 +0100 (Tue, 05 Mar 2013)
New Revision: 466

Modified:
   trunk/import_account/include/class_impacc_operation.php
Log:
0000782: Nouveau module import_account - impossible d'importer un avoir (=
 montant n?\195?\169gatif )=20

Modified: trunk/import_account/include/class_impacc_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/class_impacc_operation.php	2013-02-28 13=
:47:50 UTC (rev 465)
+++ trunk/import_account/include/class_impacc_operation.php	2013-03-05 15=
:38:23 UTC (rev 466)
@@ -334,6 +334,7 @@
 					$amount_tva =3D $oper->getp("amount_vat");
 					$amount_tvac =3D $oper->getp("amount_total");
 					$jrnx->amount =3D bcsub($amount_tvac, $amount_tva);
+                                        $save_amount=3D$jrnx->amount;
 					$jrnx->poste =3D $oper->getp('poste');
 					$jrnx->grpt =3D $grpt;
 					$jrnx->type =3D $oth_side;
@@ -359,7 +360,7 @@
 						case 'ACH':
 							$sql =3D "insert into quant_purchase(qp_internal,j_id,qp_fiche,qp=
_quantite,qp_price,qp_vat,qp_vat_code,qp_supplier)
 							values($1,$2,$3,$4,$5,$6,$7,$8)";
-							$cn->exec_sql($sql, array(null, $id, $oper->getp("fiche"), $oper-=
>getp("number_unit"), $jrnx->amount, $amount_tva, $tva_id, $oper_tiers->g=
etp("fiche")));
+							$cn->exec_sql($sql, array(null, $id, $oper->getp("fiche"), $oper-=
>getp("number_unit"), $save_amount, $amount_tva, $tva_id, $oper_tiers->ge=
tp("fiche")));
 							break;
 						case 'VEN':
 							$cn->exec_sql("insert into quant_sold
@@ -368,7 +369,7 @@
                                         ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)=
", array(null, /* 1 qs_internal */
 								$oper->getp("fiche"), /* 2 qs_fiche */
 								$oper->getp("number_unit"), /* 3 qs_quantite */
-								$jrnx->amount, /* 4 qs_price */
+								$save_amount, /* 4 qs_price */
 								$amount_tva, /* 5 qs_vat */
 								$tva_id, /* 6 qs_vat_code */
 								$oper_tiers->getp('fiche'), /* 7 qs_client */
@@ -394,7 +395,7 @@
=20
 				$jtiers =3D new Acc_Operation($cn);
 				$jtiers->date =3D $date;
-				$jtiers->amount =3D $sum;
+				$jtiers->amount =3D abs($sum);
 				$jtiers->poste =3D $oper_tiers->getp('poste');
 				$jtiers->grpt =3D $grpt;
 				$jtiers->type =3D $tiers_side;



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


From MAILER-DAEMON Wed Mar 13 11:29:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UFncJ-0005wm-OO
	for mharc-phpcompta-dev@gnu.org; Wed, 13 Mar 2013 11:29:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 13 Mar 2013 16:23:23 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1197175.1363188563.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5184 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Mar 2013 15:29:22 -0000

Author: danydb
Date: 2013-03-13 16:23:22 +0100 (Wed, 13 Mar 2013)
New Revision: 5184

Modified:
   phpcompta/tags/rel650/include/class_calendar.php
Log:
0000795: Orthographe : dans le calendrier : t?\195?\162che suivi


Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_calendar.php	2013-03-05 14:40:08 =
UTC (rev 5183)
+++ phpcompta/tags/rel650/include/class_calendar.php	2013-03-13 15:23:22 =
UTC (rev 5184)
@@ -61,7 +61,7 @@
         for ($i=3D0;$i<count($array);$i++)
         {
             $ind=3D$array[$i]['ag_timestamp_day'];
-            $p_array[$ind].=3D"<span class=3D\"notice\">".$array[$i]['nb=
']." "._("T=C3=A2ches suivis").'</span>';
+            $p_array[$ind].=3D"<span class=3D\"notice\">".$array[$i]['nb=
']." "._("T=C3=A2ches suivies").'</span>';
=20
         }
     }



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


From MAILER-DAEMON Wed Mar 13 11:35:50 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UFniY-0001qF-0D
	for mharc-phpcompta-dev@gnu.org; Wed, 13 Mar 2013 11:35:50 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 13 Mar 2013 16:30:37 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1197307.1363188949.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5185 - phpcompta/tags/rel650/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Mar 2013 15:35:48 -0000

Author: danydb
Date: 2013-03-13 16:30:37 +0100 (Wed, 13 Mar 2013)
New Revision: 5185

Modified:
   phpcompta/tags/rel650/include/template/letter_all.php
   phpcompta/tags/rel650/include/template/letter_prop.php
Log:
0000796: Lettrage : en code Hexad?\195?\169cimal ou en base 36 (A ?\195?\=
160 Z + 0 ?\195?\160 10)


Modified: phpcompta/tags/rel650/include/template/letter_all.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/letter_all.php	2013-03-13 15:2=
3:22 UTC (rev 5184)
+++ phpcompta/tags/rel650/include/template/letter_all.php	2013-03-13 15:3=
0:37 UTC (rev 5185)
@@ -47,7 +47,7 @@
   <tr <? echo "class=3D\"$class\""; ?> >
 <td>
 <?php
-$letter=3D($this->content[$i]['letter']=3D=3D-1)?"x":$this->content[$i][=
'letter'];
+$letter=3D($this->content[$i]['letter']=3D=3D-1)?"x":base_convert($this-=
>content[$i]['letter'],10,36);
 $js=3D"this.gDossier=3D".dossier::id().
   ";this.j_id=3D".$this->content[$i]['j_id'].
   ";this.obj_type=3D'".$this->object_type."'".

Modified: phpcompta/tags/rel650/include/template/letter_prop.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/letter_prop.php	2013-03-13 15:=
23:22 UTC (rev 5184)
+++ phpcompta/tags/rel650/include/template/letter_prop.php	2013-03-13 15:=
30:37 UTC (rev 5185)
@@ -98,7 +98,7 @@
 </td>
 <td>
 <?php
-$letter=3D($this->content[$i]['letter']< 0)?" ":$this->content[$i]['lett=
er'];
+$letter=3D($this->content[$i]['letter']< 0)?" ":base_convert($this->cont=
ent[$i]['letter'],10,36);
 ?>
 <?=3D$letter?>
 </td>



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


From MAILER-DAEMON Wed Mar 13 17:15:25 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UFt1B-0005pj-R2
	for mharc-phpcompta-dev@gnu.org; Wed, 13 Mar 2013 17:15:25 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 13 Mar 2013 22:10:15 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1198123.1363209325.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5186 - in phpcompta/tags/rel650/include: . template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Mar 2013 21:15:24 -0000

Author: danydb
Date: 2013-03-13 22:10:15 +0100 (Wed, 13 Mar 2013)
New Revision: 5186

Modified:
   phpcompta/tags/rel650/include/class_acc_account_ledger.php
   phpcompta/tags/rel650/include/class_fiche.php
   phpcompta/tags/rel650/include/export_fiche_balance_csv.php
   phpcompta/tags/rel650/include/export_fiche_balance_pdf.php
   phpcompta/tags/rel650/include/export_fiche_detail_csv.php
   phpcompta/tags/rel650/include/export_fiche_detail_pdf.php
   phpcompta/tags/rel650/include/export_fiche_pdf.php
   phpcompta/tags/rel650/include/export_poste_detail_csv.php
   phpcompta/tags/rel650/include/fiche.inc.php
   phpcompta/tags/rel650/include/impress_gl_comptes.inc.php
   phpcompta/tags/rel650/include/template/letter_all.php
   phpcompta/tags/rel650/include/template/letter_prop.php
Log:
0000796: Lettrage : en code Hexad?\195?\169cimal ou en base 36 (A ?\195?\=
160 Z + 0 ?\195?\160 10)


Modified: phpcompta/tags/rel650/include/class_acc_account_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_acc_account_ledger.php	2013-03-13=
 15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/class_acc_account_ledger.php	2013-03-13=
 21:10:15 UTC (rev 5186)
@@ -355,7 +355,7 @@
             $vw_operation=3Dsprintf('<A class=3D"detail" style=3D"text-d=
ecoration:underline" HREF=3D"javascript:modifyOperation(\'%s\',\'%s\')" >=
%s</A>',
                                   $op['jr_id'], dossier::id(), $op['jr_i=
nternal']);
             $let=3D'';
-            if ( $op['letter'] !=3D-1) $let=3D$op['letter'];
+            if ( $op['letter'] !=3D-1) $let=3D  strtoupper (base_convert=
 ( $op['letter'],10,36));
 	    $tmp_diff=3Dbcsub($op['deb_montant'],$op['cred_montant']);
=20
 	    /*

Modified: phpcompta/tags/rel650/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_fiche.php	2013-03-13 15:30:37 UTC=
 (rev 5185)
+++ phpcompta/tags/rel650/include/class_fiche.php	2013-03-13 21:10:15 UTC=
 (rev 5186)
@@ -1285,7 +1285,7 @@
             $vw_operation=3Dsprintf('<A class=3D"detail" style=3D"text-d=
ecoration:underline" HREF=3D"javascript:modifyOperation(\'%s\',\'%s\')" >=
%s</A>',
                                   $op['jr_id'], dossier::id(), $op['jr_i=
nternal']);
             $let=3D'';
-            if ( $op['letter'] !=3D-1) $let=3D$op['letter'];
+            if ( $op['letter'] !=3D-1) $let=3D  strtoupper(base_convert(=
$op['letter'],10,36));
=20
 	    $tmp_diff=3Dbcsub($op['deb_montant'],$op['cred_montant']);
=20

Modified: phpcompta/tags/rel650/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/tags/rel650/include/export_fiche_balance_csv.php	2013-03-13=
 15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_balance_csv.php	2013-03-13=
 21:10:15 UTC (rev 5186)
@@ -175,7 +175,7 @@
 				printf ("%s;\"%s\";",abs(nb($prog)),$fic->get_amount_side($prog));
 				if ($row['letter'] !=3D -1)
 				{
-					printf('"%s";',$row['letter']);
+					printf('"%s";',  strtoupper(base_convert($row['letter'],10,36)));
 					printf("%s",nb($row['letter_diff']));
 				}
 				else

Modified: phpcompta/tags/rel650/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/tags/rel650/include/export_fiche_balance_pdf.php	2013-03-13=
 15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_balance_pdf.php	2013-03-13=
 21:10:15 UTC (rev 5186)
@@ -265,7 +265,7 @@
 				}
 				if ($row['letter'] !=3D -1)
 				{
-					$pdf->Cell($tab[6], 4, $row['letter'], 0, 0, $align[6], $fill);
+					$pdf->Cell($tab[6], 4, strtoupper(base_convert($row['letter'],10,36=
)), 0, 0, $align[6], $fill);
 					// get sum for this lettering
=20
 					$pdf->Cell($tab[7], 4, sprintf('%s', nbm($row['letter_diff'])), '0'=
, '0', $align[7], $fill);

Modified: phpcompta/tags/rel650/include/export_fiche_detail_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/export_fiche_detail_csv.php	2013-03-13 =
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_detail_csv.php	2013-03-13 =
21:10:15 UTC (rev 5186)
@@ -74,7 +74,7 @@
 	  nb($op['deb_montant']).";".
 	  nb($op['cred_montant']).";".
 	  nb(abs($progress)).';'.
-	  '"'.(($op['letter']=3D=3D-1)?'':$op['letter']).'"';
+	  '"'.(($op['letter']=3D=3D-1)?'':strtoupper(base_convert($op['letter']=
,10,36))).'"';
         printf("\n");
=20
     }

Modified: phpcompta/tags/rel650/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/tags/rel650/include/export_fiche_detail_pdf.php	2013-03-13 =
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_detail_pdf.php	2013-03-13 =
21:10:15 UTC (rev 5186)
@@ -107,7 +107,7 @@
     $pdf->LongLine($size[$l],6,($row['description'].'('.$row['jr_interna=
l'].")"),0,$align[$l]);
=20
     $l++;
-    $pdf->Cell($size[$l],6,(($row['letter']!=3D-1)?$row['letter']:''),0,=
0,$align[$l]);
+    $pdf->Cell($size[$l],6,(($row['letter']!=3D-1)?strtoupper(base_conve=
rt($row['letter'],10,36)):''),0,0,$align[$l]);
     $l++;
     $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$row['deb_montant'])),0,0,=
$align[$l]);
     $l++;

Modified: phpcompta/tags/rel650/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/tags/rel650/include/export_fiche_pdf.php	2013-03-13 15:30:3=
7 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_pdf.php	2013-03-13 21:10:1=
5 UTC (rev 5186)
@@ -197,7 +197,7 @@
             }
             if ($row['letter'] !=3D -1 )
             {
-                $pdf->Cell($tab[5],4,$row['letter'],0,0,$align[5],$fill)=
;
+                $pdf->Cell($tab[5],4,strtoupper(base_convert($row['lette=
r'],10,36)),0,0,$align[5],$fill);
                 // get sum for this lettering
                 $sql=3D"select sum(j_montant) from jrnx where j_debit=3D=
$1 and j_id in ".
                      " (select j_id from jnt_letter join letter_deb usin=
g (jl_id) where jl_id=3D$2 union ".

Modified: phpcompta/tags/rel650/include/export_poste_detail_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/export_poste_detail_csv.php	2013-03-13 =
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_poste_detail_csv.php	2013-03-13 =
21:10:15 UTC (rev 5186)
@@ -86,7 +86,7 @@
             nb($op['deb_montant']).";".
             nb($op['cred_montant']).";".
             nb(abs($prog)).";".
-			(($op['letter']!=3D-1)?$op['letter']:"");
+			(($op['letter']!=3D-1)?strtoupper(base_convert($op['letter'],10,36)):=
"");
             printf("\n");
=20
=20

Modified: phpcompta/tags/rel650/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/fiche.inc.php	2013-03-13 15:30:37 UTC (=
rev 5185)
+++ phpcompta/tags/rel650/include/fiche.inc.php	2013-03-13 21:10:15 UTC (=
rev 5186)
@@ -464,7 +464,7 @@
 				$span_error =3D "";
 				if ($row['letter_diff'] !=3D 0)
 					$span_error =3D $g_failed;
-				echo td($row['letter'] . $span_error);
+				echo td(strtoupper(base_convert($row['letter'],10,36)) . $span_error=
);
 			}
 			else
 				echo td('');

Modified: phpcompta/tags/rel650/include/impress_gl_comptes.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/impress_gl_comptes.inc.php	2013-03-13 1=
5:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/impress_gl_comptes.inc.php	2013-03-13 2=
1:10:15 UTC (rev 5186)
@@ -218,7 +218,7 @@
 	      $solde_d =3D bcadd($solde_d,$detail['deb_montant']);
             }
 			$side=3D"&nbsp;".$Poste->get_amount_side($solde);
-	    $letter=3D($detail['letter']!=3D-1)?hi($detail['letter']):'';
+	    $letter=3D($detail['letter']!=3D-1)?hi(strtoupper(base_convert($det=
ail['letter'],10,36))):'';
 		$i++;
 		if (($i % 2 ) =3D=3D 0) $class=3D"odd"; else $class=3D"even";
             echo '<tr class=3D"'.$class.'">

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

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



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


From MAILER-DAEMON Wed Mar 13 19:09:57 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UFuo1-0001az-Lw
	for mharc-phpcompta-dev@gnu.org; Wed, 13 Mar 2013 19:09:57 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 14 Mar 2013 00:04:54 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1198253.1363216197.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5187 - in phpcompta/tags/rel650: 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: Wed, 13 Mar 2013 23:09:56 -0000

Author: danydb
Date: 2013-03-14 00:04:53 +0100 (Thu, 14 Mar 2013)
New Revision: 5187

Modified:
   phpcompta/tags/rel650/html/js/acc_ledger.js
   phpcompta/tags/rel650/include/template/history_top.php
   phpcompta/tags/rel650/include/template/ledger_detail_top.php
Log:
esth?\195?\169tique


Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/acc_ledger.js	2013-03-13 21:10:15 UTC (=
rev 5186)
+++ phpcompta/tags/rel650/html/js/acc_ledger.js	2013-03-13 23:04:53 UTC (=
rev 5187)
@@ -564,17 +564,22 @@
=20
     querystring=3D'gDossier=3D'+dossier+'&act=3Dde&pcm_val=3D'+p_value+'=
&div=3D'+id;
     add_div(popup);
+
     var action=3Dnew Ajax.Request(
                    "ajax_history.php",
                    {
                    method:'get',
                    parameters:querystring,
                    onFailure:error_box,
-                   onSuccess:success_box
+                   onSuccess:function (req,xml)
+					{
+						success_box(req,xml);
+						g(id).style.top=3Dcalcy(140+(layer*3));
+						g(id).style.left=3D"10%";
+						g(id).style.width=3D'80%';
+					}
                    }
                );
-    g(id).style.top=3DposY-40;
-    g(id).style.left=3DposX-10;
=20
 }
=20
@@ -588,7 +593,13 @@
 		method:'get',
 		parameters:querystring,
 		onFailure:error_box,
-		onSuccess:success_box
+		  onSuccess:function (req,xml)
+					{
+						success_box(req,xml);
+						g(obj.div).style.top=3Dcalcy(140+(layer*3));
+						g(obj.div).style.left=3D"10%";
+						g(obj.div).style.width=3D'80%';
+					}
 	    });
     } catch (e)
     {
@@ -618,12 +629,15 @@
                    method:'get',
                    parameters:querystring,
                    onFailure:error_box,
-                   onSuccess:success_box
+                   onSuccess:function (req,xml)
+					{
+						success_box(req,xml);
+						g(id).style.top=3Dcalcy(140+(layer*3));
+						g(id).style.left=3D"10%";
+						g(id).style.width=3D'80%';
+					}
                    }
                );
-    g(id).style.top=3DposY-40;
-    g(id).style.left=3DposX-10;
-
 }
=20
 function update_history_card(obj)
@@ -636,7 +650,13 @@
 		method:'get',
 		parameters:querystring,
 		onFailure:error_box,
-		onSuccess:success_box
+		  onSuccess:function (req,xml)
+					{
+						success_box(req,xml);
+						g(obj.div).style.top=3Dcalcy(140+(layer*3));
+						g(obj.div).style.left=3D"10%";
+						g(obj.div).style.width=3D'80%';
+					}
 	    });
     } catch (e)
     {
@@ -713,7 +733,7 @@
                    onSuccess:success_box
                    }
                );
-    g(id).style.top=3DposY-40;
+    g(id).style.top=3Dcalcy(100+(layer*3));
     g(id).style.left=3D300;
=20
 }

Modified: phpcompta/tags/rel650/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/tags/rel650/include/template/history_top.php	2013-03-13 21:=
10:15 UTC (rev 5186)
+++ phpcompta/tags/rel650/include/template/history_top.php	2013-03-13 23:=
04:53 UTC (rev 5187)
@@ -4,7 +4,7 @@
    {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3Dde&ajax=3D$callback";
-     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'toolbar=3D0,width=3D600,h=
eight=3D400,scrollbars=3Dyes,resizable=3Dyes,status=3D0,location=3D0\'); =
a.focus();removeDiv(\''.$div.'\')">
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'fullscreen=3Dyes,location=
=3Dno,toolbar=3Dno,scrollbars=3Dauto,resizable=3Dyes,status=3Dno,location=
=3Dno\'); a.focus();removeDiv(\''.$div.'\')">
 !pop me out ! </A>';
 echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"removeD=
iv(\''.$div.'\');">Fermer</A>';
 }

Modified: phpcompta/tags/rel650/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/tags/rel650/include/template/ledger_detail_top.php	2013-03-=
13 21:10:15 UTC (rev 5186)
+++ phpcompta/tags/rel650/include/template/ledger_detail_top.php	2013-03-=
13 23:04:53 UTC (rev 5187)
@@ -3,7 +3,7 @@
    if ($div !=3D "popup") {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3D$action&ajax=3D$callback";
-     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'toolbar=3D0,width=3D600,h=
eight=3D400,scrollbars=3Dyes,resizable=3Dyes,status=3D0,location=3D0\'); =
a.focus();removeDiv(\''.$div.'\')">
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'location=3Dno,toolbar=3Dn=
o,fullscreen=3Dyes,scrollbars=3Dauto,resizable=3Dyes,status=3Dno\'); a.fo=
cus();removeDiv(\''.$div.'\')">
 !pop me out ! </A>';
      echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"re=
moveDiv(\''.$div.'\');">Fermer</A>';
    }



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


From MAILER-DAEMON Sat Mar 16 20:29:02 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UH1TC-00010i-Ot
	for mharc-phpcompta-dev@gnu.org; Sat, 16 Mar 2013 20:29:02 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun, 17 Mar 2013 01:24:06 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1208381.1363480141.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5188 - in phpcompta/tags/rel650: 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, 17 Mar 2013 00:29:01 -0000

Author: danydb
Date: 2013-03-17 01:24:05 +0100 (Sun, 17 Mar 2013)
New Revision: 5188

Modified:
   phpcompta/tags/rel650/include/action.common.inc.php
   phpcompta/tags/rel650/include/action.inc.php
   phpcompta/tags/rel650/include/category_followup.inc.php
   phpcompta/tags/rel650/include/class_follow_up.php
   phpcompta/tags/rel650/include/doc_state.inc.php
   phpcompta/tags/rel650/include/template/action_search.php
   phpcompta/tags/rel650/include/template/history_top.php
   phpcompta/tags/rel650/include/template/ledger_detail_top.php
   phpcompta/tags/rel650/sql/upgrade.sql
Log:
0000797: Am?\195?\169lioration du workflow : statut des documents / actio=
ns



Modified: phpcompta/tags/rel650/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/tags/rel650/include/action.common.inc.php	2013-03-13 23:04:=
53 UTC (rev 5187)
+++ phpcompta/tags/rel650/include/action.common.inc.php	2013-03-17 00:24:=
05 UTC (rev 5188)
@@ -191,7 +191,7 @@
 	Follow_Up::show_action_list($cn, $base);
 	// Add a button to export to Csv
 	echo '<form method=3D"GET" ACTION=3D"export.php">';
-	echo HtmlInput::request_to_hidden(array("remind_date_end","remind_date"=
,"sag_ref", "remind_date","only_internal", "state", "gDossier", "qcode", =
"start_date", "end_date", "ag_id", "ag_dest_query",
+	echo HtmlInput::request_to_hidden(array("closed_action","remind_date_en=
d","remind_date","sag_ref", "remind_date","only_internal", "state", "gDos=
sier", "qcode", "start_date", "end_date", "ag_id", "ag_dest_query",
 		"tdoc",   "query"));
 	echo HtmlInput::hidden("act", "CSV:ActionGestion");
 	echo HtmlInput::submit("follow_up_csv", "Export CSV");

Modified: phpcompta/tags/rel650/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/tags/rel650/include/action.inc.php	2013-03-13 23:04:53 UTC =
(rev 5187)
+++ phpcompta/tags/rel650/include/action.inc.php	2013-03-17 00:24:05 UTC =
(rev 5188)
@@ -24,7 +24,7 @@
 require_once('class_ipopup.php');
 global $g_user;
 $retour=3DHtmlInput::button_anchor(_('Retour liste'),
-		HtmlInput::request_to_string(array("remind_date_end","remind_date","sa=
g_ref","only_internal","state","ac","gDossier","qcode","ag_dest_query","q=
uery","tdoc","date_start","date_end","hsstate")));
+		HtmlInput::request_to_string(array("closed_action","remind_date_end","=
remind_date","sag_ref","only_internal","state","ac","gDossier","qcode","a=
g_dest_query","query","tdoc","date_start","date_end","hsstate")));
 //-----------------------------------------------------
 // Follow_Up
 //-----------------------------------------------------

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

Modified: phpcompta/tags/rel650/include/class_follow_up.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_follow_up.php	2013-03-13 23:04:53=
 UTC (rev 5187)
+++ phpcompta/tags/rel650/include/class_follow_up.php	2013-03-17 00:24:05=
 UTC (rev 5188)
@@ -504,7 +504,7 @@
 		/* add the number of item */
 		$Hid =3D new IHidden();
 		$r.=3D$Hid->input("nb_item", MAX_ARTICLE);
-		$r.=3DHtmlInput::request_to_hidden(array("remind_date_end","remind_dat=
e","sag_ref","only_internal","state","qcode", "ag_dest_query", "query", "=
tdoc", "date_start", "date_end", "hsstate"));
+		$r.=3DHtmlInput::request_to_hidden(array("closed_action","remind_date_=
end","remind_date","sag_ref","only_internal","state","qcode", "ag_dest_qu=
ery", "query", "tdoc", "date_start", "date_end", "hsstate"));
 		/* get template */
 		ob_start();
 		require_once 'template/detail-action.php';
@@ -673,7 +673,7 @@
 	function myList($p_base, $p_filter =3D "", $p_search =3D "")
 	{
 		// for the sort
-		$url =3D HtmlInput::get_to_string(array("remind_date_end","remind_date=
","sag_ref","only_internal","state","qcode", "ag_dest_query", "query", "t=
doc", "date_start", "date_end", "hsstate")) . '&' . $p_base;
+		$url =3D HtmlInput::get_to_string(array("closed_action","remind_date_e=
nd","remind_date","sag_ref","only_internal","state","qcode", "ag_dest_que=
ry", "query", "tdoc", "date_start", "date_end", "hsstate")) . '&' . $p_ba=
se;
=20
 		$table =3D new Sort_Table();
 		$table->add('Date', $url, 'order by ag_timestamp asc', 'order by ag_ti=
mestamp desc', 'da', 'dd');
@@ -747,7 +747,7 @@
 		//show the sub_action
 		foreach ($a_row as $row)
 		{
-			$href =3D '<A class=3D"document" HREF=3D"do.php?'  . $p_base .HtmlInp=
ut::get_to_string(array("remind_date_end","remind_date","sag_ref","only_i=
nternal","state","gDossier", "qcode", "ag_dest_query", "query", "tdoc", "=
date_start", "date_end", "hsstate", "ac"),"&") . '&sa=3Ddetail&ag_id=3D' =
. $row['ag_id'] . '">';
+			$href =3D '<A class=3D"document" HREF=3D"do.php?'  . $p_base .HtmlInp=
ut::get_to_string(array("closed_action","remind_date_end","remind_date","=
sag_ref","only_internal","state","gDossier", "qcode", "ag_dest_query", "q=
uery", "tdoc", "date_start", "date_end", "hsstate", "ac"),"&") . '&sa=3Dd=
etail&ag_id=3D' . $row['ag_id'] . '">';
 			$i++;
 			$tr =3D ($i % 2 =3D=3D 0) ? 'even' : 'odd';
 			if ($row['ag_priority'] < 2)
@@ -1163,6 +1163,11 @@
 		$end =3D new IDate('date_end');
 		$end->value =3D (isset($_GET['date_end'])) ? $_GET['date_end'] : "";
=20
+		// Closed action
+		$closed_action=3Dnew ICheckBox('closed_action');
+		$closed_action->selected=3D(isset($_GET['closed_action']))?true:false;
+
+		// Internal
 		$only_internal=3D new ICheckBox('only_internal');
 		$only_internal->selected =3D (isset($_GET['only_internal'])) ? true : =
false;
 		// select profile
@@ -1221,7 +1226,7 @@
 		$query =3D "";
=20
=20
-                if (isset($_REQUEST['query']))
+        if (isset($_REQUEST['query']))
 		{
 			// if a query is request build the sql stmt
 			$query =3D "and (ag_title ~* '" . sql_string($_REQUEST['query']) . "'=
 " .
@@ -1296,6 +1301,9 @@
 		{
 			$query .=3D " and to_date('".sql_string($remind_date_end)."','DD.MM.Y=
YYY')>=3D ag_remind_date";
 		}
+		if ( ! isset ($closed_action)) {
+			$query.=3D" and s_status is null ";
+		}
 		return $query . $str;
 	}
=20
@@ -1364,6 +1372,7 @@
 			coalesce((select p_name from profile where p_id=3Dag_dest),'Aucun gro=
upe') as dest
              from action_gestion
              join document_type on (ag_type=3Ddt_id)
+			 join document_state on(ag_state=3Ds_id)
              where  true  $p_search order by ag_timestamp,ag_id";
 		$ret=3D$this->db->exec_sql($sql);
=20

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

Modified: phpcompta/tags/rel650/include/template/action_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/action_search.php	2013-03-13 2=
3:04:53 UTC (rev 5187)
+++ phpcompta/tags/rel650/include/template/action_search.php	2013-03-17 0=
0:24:05 UTC (rev 5188)
@@ -59,6 +59,10 @@
 					<?=3D$remind_date_end->input();?>
 				</td>
 			<tr>
+			<tr>
+				<td style=3D"width:180px;text-align:right"> Affiche aussi les action=
s ferm=C3=A9es</td>
+				<td><?=3D$closed_action->input();?></td>
+			</tr>
 			<td style=3D"width:180px;text-align:right"> R=C3=A9f=C3=A9rence</td>
 				<td>
 					<?=3D$osag_ref->input();?>

Modified: phpcompta/tags/rel650/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/tags/rel650/include/template/history_top.php	2013-03-13 23:=
04:53 UTC (rev 5187)
+++ phpcompta/tags/rel650/include/template/history_top.php	2013-03-17 00:=
24:05 UTC (rev 5188)
@@ -4,7 +4,7 @@
    {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3Dde&ajax=3D$callback";
-     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'fullscreen=3Dyes,location=
=3Dno,toolbar=3Dno,scrollbars=3Dauto,resizable=3Dyes,status=3Dno,location=
=3Dno\'); a.focus();removeDiv(\''.$div.'\')">
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'fullscreen=3Dyes,location=
=3Dno,toolbar=3Dno,scrollbars=3Dyes,resizable=3Dyes,status=3Dno,location=3D=
no\'); a.focus();removeDiv(\''.$div.'\')">
 !pop me out ! </A>';
 echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"removeD=
iv(\''.$div.'\');">Fermer</A>';
 }

Modified: phpcompta/tags/rel650/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/tags/rel650/include/template/ledger_detail_top.php	2013-03-=
13 23:04:53 UTC (rev 5187)
+++ phpcompta/tags/rel650/include/template/ledger_detail_top.php	2013-03-=
17 00:24:05 UTC (rev 5188)
@@ -3,7 +3,7 @@
    if ($div !=3D "popup") {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3D$action&ajax=3D$callback";
-     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'location=3Dno,toolbar=3Dn=
o,fullscreen=3Dyes,scrollbars=3Dauto,resizable=3Dyes,status=3Dno\'); a.fo=
cus();removeDiv(\''.$div.'\')">
+     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'location=3Dno,toolbar=3Dn=
o,fullscreen=3Dyes,scrollbars=3Dyes,resizable=3Dyes,status=3Dno\'); a.foc=
us();removeDiv(\''.$div.'\')">
 !pop me out ! </A>';
      echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"re=
moveDiv(\''.$div.'\');">Fermer</A>';
    }

Modified: phpcompta/tags/rel650/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/tags/rel650/sql/upgrade.sql	2013-03-13 23:04:53 UTC (rev 51=
87)
+++ phpcompta/tags/rel650/sql/upgrade.sql	2013-03-17 00:24:05 UTC (rev 51=
88)
@@ -97,3 +97,8 @@
 	end;
 $BODY$
   LANGUAGE plpgsql;
+
+
+alter table document_state add s_status char(1);
+
+update document_state set s_status=3D'C' where s_id in (1,4)
\ No newline at end of file



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


From MAILER-DAEMON Wed Mar 20 09:01:55 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UIIeR-0000q0-7c
	for mharc-phpcompta-dev@gnu.org; Wed, 20 Mar 2013 09:01:55 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 20 Mar 2013 13:57:03 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1224107.1363784514.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5189 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Mar 2013 13:01:54 -0000

Author: danydb
Date: 2013-03-20 13:57:01 +0100 (Wed, 20 Mar 2013)
New Revision: 5189

Modified:
   phpcompta/tags/rel650/include/class_acc_payment.php
Log:
code cleaning : remove function Acc_Payment::row

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_acc_payment.php	2013-03-17 00:24:=
05 UTC (rev 5188)
+++ phpcompta/tags/rel650/include/class_acc_payment.php	2013-03-20 12:57:=
01 UTC (rev 5189)
@@ -225,50 +225,6 @@
         }
         return $ret;
     }
-    /**
-     *@deprecated
-     * @return string
-     */
-    public function row_deprecated()
-    {
-        //--------------------------------------------------------------=
-------------
-        // Common variable
-        $td=3D'<TD>';
-        $etd=3D'</td>';
-        $tr=3D'<tr>';
-        $etr=3D'</tr>';
-        $th=3D'<th>';
-        $eth=3D'</th>';
-
-        $r=3D'';
-        if ( $this->jrn_def_id !=3D '' )
-        {
-            $name=3D$this->cn->get_value("select jrn_def_name from jrn_d=
ef where jrn_def_id=3D$1",
-                    array($this->jrn_def_id));
-        }
-        $r.=3Dtd($this->mp_lib);
-
-        if ( $this->mp_fd_id !=3D NULL && $this->mp_fd_id !=3D0)
-        {
-            $fiche=3Dnew Fiche_Def($this->cn,$this->mp_fd_id);
-            $fiche->Get();
-            $r.=3Dtd($fiche->label);
-        }
-        else
-            $r.=3D$td.$etd;
-        $jrn=3Dnew Acc_Ledger($this->cn,$this->mp_jrn_def_id);
-        $r.=3D$td.$jrn->get_name().$etd;
-        if ( strlen(trim($this->mp_qcode)) !=3D 0 )
-        {
-            $f=3Dnew Fiche($this->cn);
-            $f->get_by_qcode($this->mp_qcode);
-            $r.=3Dtd($f->strAttribut(ATTR_DEF_NAME));
-
-        }
-        else
-            $r.=3D$td.$etd;
-        return $r;
-    }
     /*!\brief return a string with a form (into a table)
      *\param none
      *\return a html string



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


From MAILER-DAEMON Wed Mar 20 09:07:27 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UIIjn-0002mm-E4
	for mharc-phpcompta-dev@gnu.org; Wed, 20 Mar 2013 09:07:27 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 20 Mar 2013 14:02:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1224198.1363784846.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5190 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Mar 2013 13:07:26 -0000

Author: danydb
Date: 2013-03-20 14:02:36 +0100 (Wed, 20 Mar 2013)
New Revision: 5190

Modified:
   phpcompta/tags/rel650/include/class_impress.php
   phpcompta/tags/rel650/include/class_print_ledger_fin.php
   phpcompta/tags/rel650/include/class_print_ledger_simple.php
   phpcompta/tags/rel650/include/class_print_ledger_simple_without_vat.ph=
p
Log:
Code cleaning

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_impress.php	2013-03-20 12:57:01 U=
TC (rev 5189)
+++ phpcompta/tags/rel650/include/class_impress.php	2013-03-20 13:02:36 U=
TC (rev 5190)
@@ -21,7 +21,6 @@
 // $Revision$
 /*!\file
  * \brief contains function for the printing
- * \todo the functions of class_impress.php should be replaced in a OO w=
ay
 */
 require_once('class_periode.php');
=20

Modified: phpcompta/tags/rel650/include/class_print_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_print_ledger_fin.php	2013-03-20 1=
2:57:01 UTC (rev 5189)
+++ phpcompta/tags/rel650/include/class_print_ledger_fin.php	2013-03-20 1=
3:02:36 UTC (rev 5190)
@@ -22,7 +22,6 @@
=20
 /*!\file
  * \brief print a listing of financial
- *\todo Must add the third part
  */
 require_once('class_pdf.php');
 class Print_Ledger_Financial extends PDF
@@ -65,11 +64,7 @@
=20
     }
     /**
-     *@brief print the pdf
-     *@param
-     *@param
-     *@return
-     *@see
+     *@brief print the pdf for a financial ledger
      */
     function export()
     {

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_print_ledger_simple.php	2013-03-2=
0 12:57:01 UTC (rev 5189)
+++ phpcompta/tags/rel650/include/class_print_ledger_simple.php	2013-03-2=
0 13:02:36 UTC (rev 5190)
@@ -23,7 +23,6 @@
 /*!\file
  * \brief this class extends PDF and let you export the detailled printi=
ng
  *  of any ledgers
- *\todo Must add the third part
  */
 require_once('class_pdf.php');
=20

Modified: phpcompta/tags/rel650/include/class_print_ledger_simple_without=
_vat.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_print_ledger_simple_without_vat.p=
hp	2013-03-20 12:57:01 UTC (rev 5189)
+++ phpcompta/tags/rel650/include/class_print_ledger_simple_without_vat.p=
hp	2013-03-20 13:02:36 UTC (rev 5190)
@@ -23,7 +23,6 @@
 /*!\file
  * \brief this class extends PDF and let you export the detailled printi=
ng
  *  of any ledgers
- * *\todo Must add the third part
  */
 require_once('class_pdf.php');
=20



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


From MAILER-DAEMON Thu Mar 21 14:50:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UIkYu-0002Ip-Pn
	for mharc-phpcompta-dev@gnu.org; Thu, 21 Mar 2013 14:50:04 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 21 Mar 2013 19:45:20 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1229863.1363891804.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r467 - 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: Thu, 21 Mar 2013 18:50:03 -0000

Author: danydb
Date: 2013-03-21 19:45:19 +0100 (Thu, 21 Mar 2013)
New Revision: 467

Modified:
   trunk/amortis/include/am_generate.inc.php
   trunk/amortis/include/class_am_generate.php
   trunk/amortis/include/template/util_generate.php
Log:
0000798: Refus de g?\195?\169n?\195?\169rer l'?\195?\169criture d'un amor=
tissement

Modified: trunk/amortis/include/am_generate.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_generate.inc.php	2013-03-05 15:38:23 UTC (re=
v 466)
+++ trunk/amortis/include/am_generate.inc.php	2013-03-21 18:45:19 UTC (re=
v 467)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,12 +16,13 @@
  *   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 let you generate the accounting for the paid off for a selecte=
d
  *  year
  */
@@ -28,59 +30,65 @@
 require_once('class_amortissement_sql.php');
 global $cn;
=20
-$am=3Dnew Am_Generate();
+$am =3D new Am_Generate();
=20
-if (isset( $_POST['generate'] ))
-  {
-    /*
-     * propose writing
-     */
-    if ( $am->propose_writing($_POST) =3D=3D false )
-      {
-	echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
-	echo $am->input($_POST );
-	echo '</div>';
-      }
-    exit();
-  }
+if (isset($_POST['generate']))
+{
+	try
+	{
+		/*
+		 * propose writing
+		 */
+		if ($am->propose_writing($_POST) =3D=3D false)
+		{
+			echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
+			echo $am->input($_POST);
+			echo '</div>';
+		}
+		exit();
+	}
+	catch (Exception $e)
+	{
+		var_dump($e->getTraceAsString());
+	}
+}
=20
 if (isset($_POST['save']))
-  {
-    $ledger=3Dnew Acc_Ledger($cn,$_POST['p_jrn']);
-    try=20
-      {
-	$cn->start();
-	$ledger->save($_POST);
+{
+	$ledger =3D new Acc_Ledger($cn, $_POST['p_jrn']);
+	try
+	{
+		$cn->start();
+		$ledger->save($_POST);
=20
-	$jr_id=3D$cn->get_value("select jr_id from jrn where jr_internal=3D$1",=
array($ledger->internal));
+		$jr_id =3D $cn->get_value("select jr_id from jrn where jr_internal=3D$=
1", array($ledger->internal));
=20
-	$m=3D$am->save($_POST,$ledger->internal);
-	  /*
-	   * if $m is not empty, some mat. were already encoded
-	   */
-	if ( $m !=3D '' )
-	  {
-	    throw new Exception ($m);
-	  }
-	echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
+		$m =3D $am->save($_POST, $ledger->internal);
+		/*
+		 * if $m is not empty, some mat. were already encoded
+		 */
+		if ($m !=3D '')
+		{
+			throw new Exception($m);
+		}
+		echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
=20
-	$p_mesg=3D"Op=C3=A9ration sauv=C3=A9e : ".$ledger->internal;=09
-        echo sprintf('<A class=3D"detail" style=3D"display:inline;text-d=
ecoration:underline" HREF=3D"javascript:modifyOperation(%d,%d)">%s</A>',
-                       $jr_id,dossier::id(),$p_mesg);
+		$p_mesg =3D "Op=C3=A9ration sauv=C3=A9e : " . $ledger->internal;
+		echo sprintf('<A class=3D"detail" style=3D"display:inline;text-decorat=
ion:underline" HREF=3D"javascript:modifyOperation(%d,%d)">%s</A>', $jr_id=
, dossier::id(), $p_mesg);
=20
-	echo '</div>';
-	$cn->commit();
-	exit();
-      }
-    catch (Exception $e)
-      {
-	echo alert($e->getMessage());
-	$cn->rollback();
-      }
-  }
+		echo '</div>';
+		$cn->commit();
+		exit();
+	}
+	catch (Exception $e)
+	{
+		echo alert($e->getMessage());
+		$cn->rollback();
+	}
+}
=20
 echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
-echo $am->input($_POST );
+echo $am->input($_POST);
=20
=20
 echo '</div>';
\ No newline at end of file

Modified: trunk/amortis/include/class_am_generate.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/class_am_generate.php	2013-03-05 15:38:23 UTC (=
rev 466)
+++ trunk/amortis/include/class_am_generate.php	2013-03-21 18:45:19 UTC (=
rev 467)
@@ -37,13 +37,13 @@
    */
   function input($p_array)
   {
-    global $cn;
+    global $cn,$g_user;
     /*
      * select ledger
      */
=20
-    $legder =3D new Acc_Ledger($cn,0);
-    $sel_ledger=3D$legder->select_ledger('ODS',2);
+    $ledger =3D new Acc_Ledger($cn,0);
+    $sel_ledger=3D$ledger->select_ledger('ODS',2);
     $sel_ledger->selected=3D(isset($p_array['p_jrn']))?$p_array['p_jrn']=
:'';
     /*
      * Operation Date
@@ -63,6 +63,33 @@
      */
     $pj=3Dnew IText('p_pj');
     $pj->size=3D10;
+	/*
+	 * If we use the periode
+	 */
+	if ($ledger->check_periode() =3D=3D true)
+		{
+			$l_user_per =3D $g_user->get_periode();
+			$def =3D (isset($periode)) ? $periode : $l_user_per;
+			$period =3D new IPeriod("period");
+			$period->user =3D $g_user;
+			$period->cn =3D $cn;
+			$period->value =3D $def;
+			$period->type =3D OPEN;
+			try
+			{
+				$l_form_per =3D $period->input();
+			}
+			catch (Exception $e)
+			{
+				if ($e->getCode() =3D=3D 1)
+				{
+					echo _("Aucune p=C3=A9riode ouverte");
+					exit();
+				}
+			}
+			$label =3D HtmlInput::infobulle(3);
+			$f_periode =3D _("P=C3=A9riode comptable") . " $label " ;
+		}
     /*
      * show all the visible material
      */
@@ -94,8 +121,8 @@
     if ( isDate($p_array['p_date']) =3D=3D null) $msg.=3D"Date invalide =
";
     if ( $msg !=3D '')
       {
-	echo alert($msg);
-	return false;
+		echo alert($msg);
+		return false;
       }
=20
     $array=3Darray(
@@ -107,6 +134,9 @@
 		 'e_pj_suggest' =3D> $p_array['p_pj'] ,
=20
 		 );
+	if ( isset($p_array['period'])) {
+		$array['period']=3D$p_array['period'];
+	}
     $idx=3D0;
     for ($i =3D0;$i<count($p_array['a_id']);$i++)
       {
@@ -158,7 +188,7 @@
       }
=20
     echo '</form>';
-    /*
+	/*
      * correct
      */
     echo '<form method=3D"POST" style=3D"display:inline">';

Modified: trunk/amortis/include/template/util_generate.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/util_generate.php	2013-03-05 15:38:23 =
UTC (rev 466)
+++ trunk/amortis/include/template/util_generate.php	2013-03-21 18:45:19 =
UTC (rev 467)
@@ -43,7 +43,17 @@
 <td>Date de l'op=C3=A9ration</td>
 <td><?=3D$p_date->input()?></td>
 </tr>
+<? if ( isset ($f_periode)) : ?>
 <tr>
+	<td>
+		<?=3D$f_periode?>
+	</td>
+	<td>
+		 <?=3D$l_form_per?>
+	</td>
+</tr>
+<? endif; ?>
+<tr>
 <td>Pi=C3=A8ce</td>
 <td><?=3D$pj->input()?></td>
 </tr>



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


From MAILER-DAEMON Mon Mar 25 18:47:10 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKGAY-0006NL-8n
	for mharc-phpcompta-dev@gnu.org; Mon, 25 Mar 2013 18:47:10 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 25 Mar 2013 23:42:35 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1242324.1364251629.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r468 - in trunk: backup_noadmin coprop/include
	import_account/include import_card/include
	import_doli/include importbank/include rapport_avance
	skel/include tool_pcmn/include 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, 25 Mar 2013 22:47:08 -0000

Author: danydb
Date: 2013-03-25 23:42:34 +0100 (Mon, 25 Mar 2013)
New Revision: 468

Modified:
   trunk/backup_noadmin/raw.php
   trunk/coprop/include/class_install_plugin.php
   trunk/import_account/include/class_import_card.php
   trunk/import_card/include/class_import_card.php
   trunk/import_doli/include/class_import_card.php
   trunk/importbank/include/class_import_bank.php
   trunk/rapport_avance/index.php
   trunk/skel/include/class_install_plugin.php
   trunk/tool_pcmn/include/import_plan.php
   trunk/tva/list_tva.inc.php
Log:
Documentation : doxygen tag misplaced due to netbeans

Modified: trunk/backup_noadmin/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/backup_noadmin/raw.php	2013-03-21 18:45:19 UTC (rev 467)
+++ trunk/backup_noadmin/raw.php	2013-03-25 22:42:34 UTC (rev 468)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief raw file for backup
  */
 $cmd =3D escapeshellcmd(PG_DUMP);

Modified: trunk/coprop/include/class_install_plugin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/class_install_plugin.php	2013-03-21 18:45:19 UTC=
 (rev 467)
+++ trunk/coprop/include/class_install_plugin.php	2013-03-25 22:42:34 UTC=
 (rev 468)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief this class manages the installation and the patch of the plugi=
n
  */
=20

Modified: trunk/import_account/include/class_import_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/class_import_card.php	2013-03-21 18:45:1=
9 UTC (rev 467)
+++ trunk/import_account/include/class_import_card.php	2013-03-25 22:42:3=
4 UTC (rev 468)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief Manage import
  */
=20

Modified: trunk/import_card/include/class_import_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_card/include/class_import_card.php	2013-03-21 18:45:19 U=
TC (rev 467)
+++ trunk/import_card/include/class_import_card.php	2013-03-25 22:42:34 U=
TC (rev 468)
@@ -18,7 +18,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\file
+/**\file
  * \brief Manage import
  */
 class Import_Card

Modified: trunk/import_doli/include/class_import_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/include/class_import_card.php	2013-03-21 18:45:19 U=
TC (rev 467)
+++ trunk/import_doli/include/class_import_card.php	2013-03-25 22:42:34 U=
TC (rev 468)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief Manage import
  */
=20

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	2013-03-21 18:45:19 UT=
C (rev 467)
+++ trunk/importbank/include/class_import_bank.php	2013-03-25 22:42:34 UT=
C (rev 468)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief Manage import
  */
 require_once('class_format_bank_sql.php');

Modified: trunk/rapport_avance/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/index.php	2013-03-21 18:45:19 UTC (rev 467)
+++ trunk/rapport_avance/index.php	2013-03-25 22:42:34 UTC (rev 468)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief main file for tools
  */
=20

Modified: trunk/skel/include/class_install_plugin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/skel/include/class_install_plugin.php	2013-03-21 18:45:19 UTC (=
rev 467)
+++ trunk/skel/include/class_install_plugin.php	2013-03-25 22:42:34 UTC (=
rev 468)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief this class manages the installation and the patch of the plugi=
n
  replace SKEL by the plugin schema
  */

Modified: trunk/tool_pcmn/include/import_plan.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tool_pcmn/include/import_plan.php	2013-03-21 18:45:19 UTC (rev =
467)
+++ trunk/tool_pcmn/include/import_plan.php	2013-03-25 22:42:34 UTC (rev =
468)
@@ -20,7 +20,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief import Accountancy plan
  */
 echo '<div style=3D"width:80%;margin-left:10%;border-collapse: separate;=
border-spacing:  5px;">';

Modified: trunk/tva/list_tva.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/list_tva.inc.php	2013-03-21 18:45:19 UTC (rev 467)
+++ trunk/tva/list_tva.inc.php	2013-03-25 22:42:34 UTC (rev 468)
@@ -25,7 +25,7 @@
 echo '<div id=3D"detail" style=3D"display:none; width:80%;margin-left:10=
%">';
 echo '<image src=3D"image/loading.gif" border=3D"0" alt=3D"Chargement...=
">';
 echo '</div>';
-/* !\file
+/**\file
  * \brief show all the declaration by date
  */
=20



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


From MAILER-DAEMON Mon Mar 25 18:47:31 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKGAt-0006Ot-DI
	for mharc-phpcompta-dev@gnu.org; Mon, 25 Mar 2013 18:47:31 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 25 Mar 2013 23:42:50 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1242325.1364251650.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5191 - in phpcompta/tags/rel650: html include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Mar 2013 22:47:29 -0000

Author: danydb
Date: 2013-03-25 23:42:49 +0100 (Mon, 25 Mar 2013)
New Revision: 5191

Modified:
   phpcompta/tags/rel650/html/ajax_misc.php
   phpcompta/tags/rel650/html/do.php
   phpcompta/tags/rel650/html/show_document.php
   phpcompta/tags/rel650/include/ac_common.php
   phpcompta/tags/rel650/include/action.common.inc.php
   phpcompta/tags/rel650/include/ajax_mod_periode.php
   phpcompta/tags/rel650/include/ajax_mod_predf_op.php
   phpcompta/tags/rel650/include/class_acc_balance.php
   phpcompta/tags/rel650/include/class_acc_ledger.php
   phpcompta/tags/rel650/include/class_acc_ledger_fin.php
   phpcompta/tags/rel650/include/class_acc_ledger_purchase.php
   phpcompta/tags/rel650/include/class_acc_ledger_sold.php
   phpcompta/tags/rel650/include/class_document.php
   phpcompta/tags/rel650/include/class_document_type.php
   phpcompta/tags/rel650/include/class_fiche.php
   phpcompta/tags/rel650/include/class_fiche_def.php
   phpcompta/tags/rel650/include/class_follow_up.php
   phpcompta/tags/rel650/include/class_iradio.php
   phpcompta/tags/rel650/include/class_tool_uos.php
   phpcompta/tags/rel650/include/class_user.php
   phpcompta/tags/rel650/include/client.inc.php
   phpcompta/tags/rel650/include/compta_ach.inc.php
   phpcompta/tags/rel650/include/compta_fin_rec.inc.php
   phpcompta/tags/rel650/include/compta_fin_saldo.inc.php
   phpcompta/tags/rel650/include/compta_ods.inc.php
   phpcompta/tags/rel650/include/constant.php
   phpcompta/tags/rel650/include/contact.inc.php
   phpcompta/tags/rel650/include/dossier.inc.php
   phpcompta/tags/rel650/include/export_balance_pdf.php
   phpcompta/tags/rel650/include/fiche.inc.php
   phpcompta/tags/rel650/include/forecast.inc.php
   phpcompta/tags/rel650/include/history_operation.inc.php
   phpcompta/tags/rel650/include/impress_jrn.inc.php
   phpcompta/tags/rel650/include/menu.inc.php
   phpcompta/tags/rel650/include/modele.inc.php
   phpcompta/tags/rel650/include/opening.inc.php
   phpcompta/tags/rel650/include/operation_ods_confirm.inc.php
   phpcompta/tags/rel650/include/pref.inc.php
   phpcompta/tags/rel650/include/template/document_mod_change.php
   phpcompta/tags/rel650/include/template/search_top.php
   phpcompta/tags/rel650/include/tva.inc.php
   phpcompta/tags/rel650/include/user_detail.inc.php
Log:
Documentation : doxygen tag misplaced due to netbeans

Modified: phpcompta/tags/rel650/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/tags/rel650/html/ajax_misc.php	2013-03-20 13:02:36 UTC (rev=
 5190)
+++ phpcompta/tags/rel650/html/ajax_misc.php	2013-03-25 22:42:49 UTC (rev=
 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief this file respond to an ajax request
  * The parameters are
  * - gDossier

Modified: phpcompta/tags/rel650/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/tags/rel650/html/do.php	2013-03-20 13:02:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/html/do.php	2013-03-25 22:42:49 UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief Main file
  */
 require_once 'class_database.php';

Modified: phpcompta/tags/rel650/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/tags/rel650/html/show_document.php	2013-03-20 13:02:36 UTC =
(rev 5190)
+++ phpcompta/tags/rel650/html/show_document.php	2013-03-25 22:42:49 UTC =
(rev 5191)
@@ -20,7 +20,7 @@
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 // Verify parameters
-/* ! \file
+/** \file
  * \brief retrieve a document
  */
=20

Modified: phpcompta/tags/rel650/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/ac_common.php	2013-03-20 13:02:36 UTC (=
rev 5190)
+++ phpcompta/tags/rel650/include/ac_common.php	2013-03-25 22:42:49 UTC (=
rev 5191)
@@ -29,7 +29,7 @@
 require_once('class_database.php');
 require_once('class_periode.php');
=20
-/* !\brief to protect again bad characters which can lead to a cross scr=
ipting attack
+/**\brief to protect again bad characters which can lead to a cross scri=
pting attack
   the string to be diplayed must be protected
  */
=20
@@ -71,7 +71,7 @@
 {
     return '<h1 ' . $p_class . '>' . htmlspecialchars($p_string) . '</h1=
>';
 }
-/* !\brief surround the string with td
+/**\brief surround the string with td
  * \param $p_string string to surround by TD
  * \param $p_extra extra info (class, style, javascript...)
  * \return string surrounded by td
@@ -87,7 +87,7 @@
     return '<tr  ' . $p_extra . '>' . $p_string . '</tr>';
 }
=20
-/* !\brief escape correctly php string to javascript */
+/**\brief escape correctly php string to javascript */
=20
 function j($p_string)
 {
@@ -133,7 +133,7 @@
     return $r;
 }
=20
-/* !
+/**
  * \brief  log error into the /tmp/phpcompta_error.log it doesn't work o=
n windows
  *
  * \param p_log message
@@ -155,7 +155,7 @@
     }
 }
=20
-/* !
+/**
  * \brief  Compare 2 dates
  * \param p_date
  * \param p_date_oth
@@ -243,7 +243,7 @@
     return $p_date;
 }
=20
-/* !
+/**
  * \brief Default page header for each page
  *
  * \param p_theme default theme
@@ -317,7 +317,7 @@
=20
 }
=20
-/* !
+/**
  * \brief Minimal  page header for each page, used for small popup windo=
w
  *
  * \param p_theme default theme
@@ -372,7 +372,7 @@
     }
 }
=20
-/* !
+/**
  * \brief end tag
  *
  */
@@ -383,7 +383,7 @@
     echo "</HTML>";
 }
=20
-/* !
+/**
  * \brief Echo no access and stop
  *
  * \return nothing
@@ -413,7 +413,7 @@
 {
     return sql_string($p_string);
 }
-/* !
+/**
  * \brief Fix the problem with the quote char for the database
  *
  * \param $p_string
@@ -430,7 +430,7 @@
     return $p_string;
 }
=20
-/* !
+/**
   /* \brief store the string which print
  *           the content of p_array in a table
  *           used to display the menu
@@ -499,7 +499,7 @@
     return $ret;
 }
=20
-/* !
+/**
  * \brief warns
  *
  * \param p_string error message
@@ -514,7 +514,7 @@
     echo '<H2 class=3D"error">' . $p_string . "</H2>";
 }
=20
-/* !
+/**
  * \brief Show the periode which found thanks its id
  *
  *
@@ -534,7 +534,7 @@
     return $ret;
 }
=20
-/* !
+/**
  * \brief Return the period corresponding to the
  *           date
  *
@@ -554,7 +554,7 @@
     return $R;
 }
=20
-/* !\brief Decode the html for the widegt richtext and remove newline
+/**\brief Decode the html for the widegt richtext and remove newline
  * \param $p_html string to decode
  * \return the html code without new line
  */
@@ -567,7 +567,7 @@
     return $p_html;
 }
=20
-/* !\brief Create the condition to filter on the j_tech_per
+/**\brief Create the condition to filter on the j_tech_per
  *        thanks a from and to date.
  * \param $p_cn database conx
  * \param $p_from start date (date)
@@ -611,7 +611,7 @@
     return $periode;
 }
=20
-/* !\brief alert in javascript
+/**\brief alert in javascript
  * \param $p_msg is the message
  * \param $buffer if false, echo directly and execute the javascript, if=
 $buffer is true, the alert javascript
  * is in the return string

Modified: phpcompta/tags/rel650/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/tags/rel650/include/action.common.inc.php	2013-03-20 13:02:=
36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/action.common.inc.php	2013-03-25 22:42:=
49 UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief this file is common to suivi client, suivi fournisseur, suivi
  * administration.
  * The needed variables are

Modified: phpcompta/tags/rel650/include/ajax_mod_periode.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/ajax_mod_periode.php	2013-03-20 13:02:3=
6 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/ajax_mod_periode.php	2013-03-25 22:42:4=
9 UTC (rev 5191)
@@ -22,7 +22,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 require_once('class_periode.php');
=20
-/* !\file
+/**\file
  * \brief display or save a periode
  * variable received $op, $cn $g_user
  */

Modified: phpcompta/tags/rel650/include/ajax_mod_predf_op.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/ajax_mod_predf_op.php	2013-03-20 13:02:=
36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/ajax_mod_predf_op.php	2013-03-25 22:42:=
49 UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief display a form to change the name of a predefined operation
  */
 ob_start();

Modified: phpcompta/tags/rel650/include/class_acc_balance.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_acc_balance.php	2013-03-20 13:02:=
36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_acc_balance.php	2013-03-25 22:42:=
49 UTC (rev 5191)
@@ -33,7 +33,7 @@
     var $jrn;						/*!< idx of a table of ledger create by user->get_led=
ger */
     var $from_poste;				/*!< from_poste  filter on the post */
     var $to_poste;				/*!< to_poste filter on the post*/
-    var $unsold;				/*!< if true only the no solded account (saldo !=3D =
0) */
+    var $unsold;				/**=3D 0) */
     function Acc_Balance($p_cn)
     {
         $this->db=3D$p_cn;

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_acc_ledger.php	2013-03-20 13:02:3=
6 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_acc_ledger.php	2013-03-25 22:42:4=
9 UTC (rev 5191)
@@ -44,24 +44,24 @@
 require_once 'class_sort_table.php';
 require_once 'class_jrn_def_sql.php';
 require_once 'class_acc_payment.php';
-/* !\file
- * \brief Class for jrn,  class acc_ledger for manipulating the ledger
+/** \file
+ * @brief Class for jrn,  class acc_ledger for manipulating the ledger
  */
=20
-/* !\brief Class for jrn,  class acc_ledger for manipulating the ledger
+/** @brief Class for jrn,  class acc_ledger for manipulating the ledger
  *
  */
=20
 class Acc_Ledger extends jrn_def_sql
 {
=20
-	var $id;   /* !< jrn_def.jrn_def_id */
-	var $name;   /* !< jrn_def.jrn_def_name */
-	var $db;   /* !< database connextion */
-	var $row;   /* !< row of the ledger */
-	var $type;   /* !< type of the ledger ACH ODS FIN
+	var $id;   /**< jrn_def.jrn_def_id */
+	var $name;   /**< jrn_def.jrn_def_name */
+	var $db;   /**< database connextion */
+	var $row;   /**< row of the ledger */
+	var $type;   /**< type of the ledger ACH ODS FIN
 	  VEN or GL */
-	var $nb;   /* !< default number of rows by
+	var $nb;   /**< default number of rows by
 	  default 10 */
=20
 	/**
@@ -84,7 +84,7 @@
 		{
 			$ret =3D $this->db->get_array("select last_value,is_called from s_jrn=
_pj" . $this->id);
 			$last =3D $ret[0]['last_value'];
-			/* !
+			/**
 			 * \note  With PSQL sequence , the last_value column is 1 when before=
   AND after the first call, to make the difference between them
 			 * I have to check whether the sequence has been already called or no=
t */
 			if ($ret[0]['is_called'] =3D=3D 'f')
@@ -96,8 +96,8 @@
 		return 0;
 	}
=20
-	/* !
-	 * \brief Return the type of a ledger (ACH,VEN,ODS or FIN) or GL
+	/**
+	 * @brief Return the type of a ledger (ACH,VEN,ODS or FIN) or GL
 	 *
 	 */
=20
@@ -331,8 +331,8 @@
 		}
 	}
=20
-	/* !
-	 * \brief Return the name of a ledger
+	/**
+	 * @brief Return the name of a ledger
 	 *
 	 */
=20
@@ -354,14 +354,14 @@
 		return $ret['jrn_def_name'];
 	}
=20
-	/* ! \function  get_row
-	 * \brief  Get The data
+	/** \function  get_row
+	 * @brief  Get The data
 	 *
 	 *
-	 * \param p_from from periode
-	 * \param p_to to periode
-	 * \param p_limit starting line
-	 * \param p_offset number of lines
+	 * @paramp_from from periode
+	 * @paramp_to to periode
+	 * @paramp_limit starting line
+	 * @paramp_offset number of lines
 	 * \return Array with the asked data
 	 *
 	 */
@@ -509,13 +509,13 @@
 		return $a;
 	}
=20
-	/* ! \brief  Get simplified row from ledger
+	/** @brief  Get simplified row from ledger
 	 *
-	 * \param from periode
-	 * \param to periode
-	 * \param p_limit starting line
-	 * \param p_offset number of lines
-	 * \param trunc if data must be truncated (pdf export)
+	 * @paramfrom periode
+	 * @paramto periode
+	 * @paramp_limit starting line
+	 * @paramp_offset number of lines
+	 * @paramtrunc if data must be truncated (pdf export)
 	 *
 	 * \return an Array with the asked data
 	 */
@@ -580,7 +580,8 @@
=20
 // end function get_rowSimple
=20
-	/* !\brief guess what  the next pj should be
+	/**
+	 * @brief guess what  the next pj should be
 	 */
=20
 	function guess_pj()
@@ -591,10 +592,11 @@
 		return $pj_pref . $pj_seq;
 	}
=20
-	/* !\brief Show all the operation
-	 * \param $sql is the sql stmt, normally created by build_search_sql
-	 * \param $offset the offset
-	 * \param $p_paid if we want to see info about payment
+	/**
+	 * @brief Show all the operation
+	 * @param$sql is the sql stmt, normally created by build_search_sql
+	 * @param$offset the offset
+	 * @param$p_paid if we want to see info about payment
 	  \code
 	  // Example
 	  // Build the sql
@@ -766,10 +768,11 @@
 		return array($count, $r);
 	}
=20
-	/* !\brief Show all the operation
-	 * \param $sql is the sql stmt, normally created by build_search_sql
-	 * \param $offset the offset
-	 * \param $p_paid if we want to see info about payment
+	/**
+	 * @brief Show all the operation
+	 * @param$sql is the sql stmt, normally created by build_search_sql
+	 * @param$offset the offset
+	 * @param$p_paid if we want to see info about payment
 	  \code
 	  // Example
 	  // Build the sql
@@ -1021,8 +1024,8 @@
 		return array($count, $r);
 	}
=20
-	/* !
-	 * \brief get_detail gives the detail of row
+	/**
+	 * @brief get_detail gives the detail of row
 	 * this array must contains at least the field
 	 *       <ul>
 	 *       <li> montant</li>
@@ -1039,12 +1042,12 @@
 	 *          </ul>
 	 *       </ul>
 	 *
-	 * \param p_array the structure is set in get_rowSimple, this array is
+	 * @paramp_array the structure is set in get_rowSimple, this array is
 	 *        modified,
-	 * \param $trunc if the data must be truncated, usefull for pdf export
-	 * \param p_jrn_type is the type of the ledger (ACH or VEN)
-	 * \param $a_TVA TVA Array (default null)
-	 * \param $a_ParmCode Array (default null)
+	 * @param$trunc if the data must be truncated, usefull for pdf export
+	 * @paramp_jrn_type is the type of the ledger (ACH or VEN)
+	 * @param$a_TVA TVA Array (default null)
+	 * @param$a_ParmCode Array (default null)
 	 * \return p_array
 	 */
=20
@@ -1203,8 +1206,8 @@
 	}
=20
 // retrieve data from jrnx
-	/* !
-	 * \brief  Get the properties of a journal
+	/**
+	 * @brief  Get the properties of a journal
 	 *
 	 * \return an array containing properties
 	 *
@@ -1229,9 +1232,9 @@
 		return Database::fetch_array($Res, 0);
 	}
=20
-	/* ! \function GetDefLine
-	 * \brief Get the number of lines of a journal
-	 * \param $p_cred deb or cred
+	/** \function GetDefLine
+	 * @brief Get the number of lines of a journal
+	 * @param$p_cred deb or cred
 	 *
 	 * \return an integer
 	 */
@@ -1247,9 +1250,10 @@
 		return $Res[0]['value'];
 	}
=20
-	/* !\brief get the saldo of a ledger for a specific period
-	 * \param $p_from start period
-	 * \param $p_to end period
+	/**
+	 * @brief get the saldo of a ledger for a specific period
+	 * @param$p_from start period
+	 * @param$p_to end period
 	 */
=20
 	function get_solde($p_from, $p_to)
@@ -1280,11 +1284,11 @@
 		return $response;
 	}
=20
-	/* !
-	 * \brief Show a select list   of the ledgers you can access in
+	/**
+	 * @brief Show a select list   of the ledgers you can access in
 	 * writing, reading or simply accessing.
-	 * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS)
-	 * \param $p_access =3D3 for READ and WRITE, 2 for write and 1 for read=
only
+	 * @param$p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS)
+	 * @param$p_access =3D3 for READ and WRITE, 2 for write and 1 for reado=
nly
 	 * \return     object HtmlInput select
 	 */
=20
@@ -1312,8 +1316,8 @@
 		return $select;
 	}
=20
-	/* !
-	 * \brief retrieve the jrn_def_fiche and return them into a array
+	/**
+	 * @brief retrieve the jrn_def_fiche and return them into a array
 	 *        index deb, cred
 	 * \param
 	 * \param
@@ -1338,8 +1342,8 @@
 		return $res[0];
 	}
=20
-	/* !
-	 * \brief retrieve the jrn_def_class_deb and return it
+	/**
+	 * @brief retrieve the jrn_def_class_deb and return it
 	 *
 	 *
 	 * \return return an string
@@ -1361,10 +1365,10 @@
 		return $res[0];
 	}
=20
-	/* !
-	 * \brief show the result of the array to confirm
+	/**
+	 * @brief show the result of the array to confirm
 	 * before inserting
-	 * \param $p_array array from the form
+	 * @param$p_array array from the form
 	 * \return string
 	 */
=20
@@ -1524,10 +1528,10 @@
 		return $ret;
 	}
=20
-	/* !
-	 * \brief Show the form to encode your operation
-	 * \param $p_array if you correct or use a predef operation (default =3D=
 null)
-	 * \param $p_readonly 1 for readonly 0 for writable (default 0)
+	/**
+	 * @brief Show the form to encode your operation
+	 * @param$p_array if you correct or use a predef operation (default =3D=
 null)
+	 * @param$p_readonly 1 for readonly 0 for writable (default 0)
 	 *
 	 * \return a string containing the form
 	 */
@@ -1762,7 +1766,8 @@
 		return $ret;
 	}
=20
-	/* !\brief
+	/**
+	 * @brief
 	 * check if the current ledger is closed
 	 * \return 1 for yes, otherwise 0
 	 * \see Periode::is_closed
@@ -1777,9 +1782,9 @@
 		return $ret;
 	}
=20
-	/* !
-	 * \brief verify that the operation can be saved
-	 * \param $p_array array of data same layout that the $_POST from show_=
form
+	/**
+	 * @brief verify that the operation can be saved
+	 * @param$p_array array of data same layout that the $_POST from show_f=
orm
 	 *
 	 *
 	 * \throw  the getcode  value is 1 incorrect balance,  2 date
@@ -1909,11 +1914,11 @@
 		return $msg;
 	}
=20
-	/* !
-	 * \brief compute the internal code of the saved operation and set the =
$this->jr_internal to
+	/**
+	 * @brief compute the internal code of the saved operation and set the =
$this->jr_internal to
 	 *  the computed value
 	 *
-	 * \param $p_grpt id in jr_grpt_
+	 * @param$p_grpt id in jr_grpt_
 	 *
 	 * \return string internal_code
 	 *      -
@@ -1932,10 +1937,10 @@
 		return $internal_code;
 	}
=20
-	/* !
-	 * \brief save the operation into the jrnx,jrn, ,
+	/**
+	 * @brief save the operation into the jrnx,jrn, ,
 	 *  CA and pre_def
-	 * \param $p_array
+	 * @param$p_array
 	 *
 	 * \return array with [0] =3D false if failed otherwise true, [1] error
 	 * code
@@ -2099,8 +2104,8 @@
 		return true;
 	}
=20
-	/* !
-	 * \brief get all the data from request and build the object
+	/**
+	 * @brief get all the data from request and build the object
 	 */
=20
 	function get_request()
@@ -2108,10 +2113,10 @@
 		$this->id =3D $_REQUEST['p_jrn'];
 	}
=20
-	/* !
-	 * \brief retrieve the next number for this type of ledger
-	 * \param p_cn connx
-	 * \param p_type ledger type
+	/**
+	 * @brief retrieve the next number for this type of ledger
+	 * @paramp_cn connx
+	 * @paramp_type ledger type
 	 *
 	 * \return the number
 	 *
@@ -2125,8 +2130,9 @@
 		return $Ret + 1;
 	}
=20
-	/* !\brief get the first ledger
-	 * \param the type
+	/**
+	 * @brief get the first ledger
+	 * @paramthe type
 	 * \return the j_id
 	 */
=20
@@ -2137,8 +2143,9 @@
 		return $all[0];
 	}
=20
-	/* !\brief Update the paiment  in the list of operation
-	 * \param $p_array is normally $_GET
+	/**
+	 * @brief Update the paiment  in the list of operation
+	 * @param$p_array is normally $_GET
 	 */
=20
 	function update_paid($p_array)
@@ -2173,9 +2180,10 @@
 				" jr_grpt_id =3D " . $this->grpt_id);
 	}
=20
-	/* !\brief retrieve all the card for this type of ledger, make them
+	/**
+	 * @brief retrieve all the card for this type of ledger, make them
 	 * into a string separated by comma
-	 * \param none
+	 * @paramnone
 	 * \return all the card or null is nothing is found
 	 */
=20
@@ -2209,8 +2217,9 @@
 		return $card;
 	}
=20
-	/* !\brief get the saldo of an exercice, used for the opening of a fold=
er
-	 * \param $p_exercice is the exercice we want
+	/**
+	 * @brief get the saldo of an exercice, used for the opening of a folde=
r
+	 * @param$p_exercice is the exercice we want
 	 * \return an array
 	 * index =3D
 	 * - solde (debit > 0 ; credit < 0)
@@ -2237,8 +2246,8 @@
 		return $res;
 	}
=20
-	/* !
-	 * \brief Check if a Dossier is using the strict mode or not
+	/**
+	 * @brief Check if a Dossier is using the strict mode or not
 	 * \return true if we are using the strict_mode
 	 */
=20
@@ -2252,8 +2261,8 @@
 		exit("Valeur invalid " . __FILE__ . ':' . __LINE__);
 	}
=20
-	/* !
-	 * \brief Check if a Dossier is using the check on the periode, if true=
 than the user has to enter the date
+	/**
+	 * @brief Check if a Dossier is using the check on the periode, if true=
 than the user has to enter the date
 	 * and the periode, it is a security check
 	 * \return true if we are using the double encoding (date+periode)
 	 */
@@ -2268,7 +2277,8 @@
 		exit("Valeur invalid " . __FILE__ . ':' . __LINE__);
 	}
=20
-	/* !\brief get the date of the last operation
+	/**
+	 * @brief get the date of the last operation
 	 */
=20
 	function get_last_date()
@@ -2280,9 +2290,10 @@
 		return $date;
 	}
=20
-	/* !\brief retrieve the jr_id thanks the internal code, do not change
+	/**
+	 * @brief retrieve the jr_id thanks the internal code, do not change
 	 * anything to the current object
-	 * \param the internal code
+	 * @paramthe internal code
 	 * \return the jr_id or 0 if not found
 	 */
=20
@@ -2295,10 +2306,11 @@
 		return $value;
 	}
=20
-	/* !\brief create the invoice and saved it as attachment to the
+	/**
+	 * @brief create the invoice and saved it as attachment to the
 	 * operation,
-	 * \param $internal is the internal code
-	 * \param $p_array is normally the $_POST
+	 * @param$internal is the internal code
+	 * @param$p_array is normally the $_POST
 	 * \return a string
 	 */
=20
@@ -2321,8 +2333,9 @@
 		return h($doc->d_name . ' (' . $doc->d_filename . ')');
 	}
=20
-	/* !\brief check if the payment method is valid
-	 * \param $e_mp is the value and $e_mp_qcode is the quickcode
+	/**
+	 * @brief check if the payment method is valid
+	 * @param$e_mp is the value and $e_mp_qcode is the quickcode
 	 * \return nothing throw an Exception
 	 */
=20
@@ -2358,7 +2371,8 @@
 		}
 	}
=20
-	/* !\brief increment the sequence for the pj */
+	/**
+	 * @brief increment the sequence for the pj */
=20
 	function inc_seq_pj()
 	{
@@ -2366,7 +2380,8 @@
 		$this->db->exec_sql($sql);
 	}
=20
-	/* !@brief return a HTML string with the form for the search
+	/**
+	 * @brief return a HTML string with the form for the search
 	 * @param $p_type if the type of ledger possible values=3DALL,VEN,ACH,O=
DS,FIN
 	 * @param $all_type_ledger
 	 *       values :
@@ -2478,11 +2493,12 @@
 		return $r;
 	}
=20
-	/* !\brief this function will create a sql stmt to use to create the li=
st for
+	/**
+	 * @brief this function will create a sql stmt to use to create the lis=
t for
 	 * the ledger,
-	 * \param $p_array is usually the $_GET,
-	 * \param $p_order the order of the row
-	 * \param $p_where is the sql condition if not null then the $p_array w=
ill not be used
+	 * @param$p_array is usually the $_GET,
+	 * @param$p_order the order of the row
+	 * @param$p_where is the sql condition if not null then the $p_array wi=
ll not be used
 	 * \note the p_action will be used to filter the ledger but gl means AL=
L
 	 * struct array $p_array
 	  \verbatim
@@ -2733,7 +2749,8 @@
 		return array($sql, $where);
 	}
=20
-	/* !\brief return a html string with the search_form
+	/**
+	 * @brief return a html string with the search_form
 	 * \return a HTML string with the FORM
 	 * \see build_search_sql
 	 * \see search_form
@@ -2778,8 +2795,9 @@
 		return $r;
 	}
=20
-	/* !\brief return the last p_limit operation into an array
-	 * \param $p_limit is the max of operation to return
+	/**
+	 * @brief return the last p_limit operation into an array
+	 * @param$p_limit is the max of operation to return
 	 * \return $p_array of Follow_Up object
 	 */
=20
@@ -3002,8 +3020,8 @@
 	///////////////////////////////////////////////////////////////////////=
/////////
 	// TEST MODULE
 	///////////////////////////////////////////////////////////////////////=
/////////
-	/* !
-	 * \brief this function is intended to test this class
+	/**
+	 * @brief this function is intended to test this class
 	 */
 	static function test_me($pCase =3D '')
 	{

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_acc_ledger_fin.php	2013-03-20 13:=
02:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_acc_ledger_fin.php	2013-03-25 22:=
42:49 UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief the class Acc_Ledger_Fin inherits from Acc_Ledger, this
  * object permit to manage the financial ledger
  */
@@ -46,7 +46,7 @@
 		$this->type =3D 'FIN';
 	}
=20
-	/* !\brief verify that the data are correct before inserting or confirm=
ing
+	/**\brief verify that the data are correct before inserting or confirmi=
ng
 	 * \param an array (usually $_POST)
 	 * \return String
 	 * \throw Exception on error occurs
@@ -223,7 +223,7 @@
 		}
 	}
=20
-	/* !\brief
+	/**\brief
 	 * \param $p_array contains the value usually it is $_POST
 	 * \return string with html code
 	 * \note the form tag are not  set here
@@ -435,7 +435,7 @@
 		return $r;
 	}
=20
-	/* !\brief show the summary before inserting into the database, it
+	/**\brief show the summary before inserting into the database, it
 	 * calls the function for adding a attachment. The function verify
 	 * should be called before
 	 * \param $p_array an array usually is $_POST
@@ -657,7 +657,7 @@
 		return $r;
 	}
=20
-	/* !\brief save the data into the database, included the attachment,
+	/**\brief save the data into the database, included the attachment,
 	 * and the reconciliations
 	 * \param $p_array usually $_POST
 	 * \return string with HTML code
@@ -723,7 +723,7 @@
 			$get_solde=3Dtrue;
 			for ($i =3D 0; $i < $nb_item; $i++)
 			{
-				// if tiers is set and amount !=3D 0 insert it into the database
+				/**=3D 0 insert it into the database
 				// and quit the loop ?
 				if (strlen(trim(${"e_other$i"})) =3D=3D 0)
 					continue;
@@ -954,7 +954,7 @@
 		return $ret;
 	}
=20
-	/* !\brief display operation of a FIN ledger
+	/**\brief display operation of a FIN ledger
 	 * \return html code into a string
 	 */
=20

Modified: phpcompta/tags/rel650/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_acc_ledger_purchase.php	2013-03-2=
0 13:02:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_acc_ledger_purchase.php	2013-03-2=
5 22:42:49 UTC (rev 5191)
@@ -708,7 +708,7 @@
             $this->db->exec_sql('update quant_purchase set qp_internal =3D=
 $1 where j_id in (select j_id from jrnx where j_grpt=3D$2)',
                                 array($internal,$seq));
=20
-            /* if e_suggest !=3D e_pj then do not increment sequence */
+            /**=3D e_pj then do not increment sequence */
             if ( strcmp($e_pj,$e_pj_suggest) =3D=3D 0 && strlen(trim($e_=
pj)) !=3D 0 )
             {
                 $this->inc_seq_pj();

Modified: phpcompta/tags/rel650/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_acc_ledger_sold.php	2013-03-20 13=
:02:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_acc_ledger_sold.php	2013-03-25 22=
:42:49 UTC (rev 5191)
@@ -477,7 +477,7 @@
=20
             $this->pj=3D$acc_operation->set_pj();
=20
-            /* if e_suggest !=3D e_pj then do not increment sequence */
+            /**=3D e_pj then do not increment sequence */
             /* and e_pj is not null */
             if ( strcmp($e_pj,$e_pj_suggest) =3D=3D 0 && strlen( trim($e=
_pj)) !=3D 0 )
             {

Modified: phpcompta/tags/rel650/include/class_document.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_document.php	2013-03-20 13:02:36 =
UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_document.php	2013-03-25 22:42:49 =
UTC (rev 5191)
@@ -368,7 +368,7 @@
         $r=3D'<A class=3D"mtitle" HREF=3D"show_document.php?d_id=3D'.$th=
is->d_id.'&'.dossier::get().'">'.$image.'</A>';
         return $r;
     }
-    /* ! Get
+    /** Get
      * \brief Send the document
      */
     function Send()

Modified: phpcompta/tags/rel650/include/class_document_type.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_document_type.php	2013-03-20 13:0=
2:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_document_type.php	2013-03-25 22:4=
2:49 UTC (rev 5191)
@@ -20,17 +20,17 @@
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* ! \file
+/** \file
  * \brief  class for the table document_type
  */
=20
-/* ! \brief class for the table document_type
+/** \brief class for the table document_type
  * < dt_id pk document_type
  * < dt_value value
  */
 class Document_type
 {
-	/* ! document_type
+	/** document_type
 	 * \brief constructor
 	 * \param $p_cn database connx
 	 */
@@ -41,7 +41,7 @@
 		$this->dt_id =3D $p_id;
 	}
=20
-	/* !
+	/**
 	 * \brief Get all the data for this dt_id
 	 */
=20

Modified: phpcompta/tags/rel650/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_fiche.php	2013-03-20 13:02:36 UTC=
 (rev 5190)
+++ phpcompta/tags/rel650/include/class_fiche.php	2013-03-25 22:42:49 UTC=
 (rev 5191)
@@ -178,7 +178,9 @@
         if ( sizeof($this->attribut) !=3D sizeof($e->attribut ) )
         {
=20
-            // !!! Missing attribute
+            /*
+			 * !! Missing attribute
+			 */
             foreach ($e->attribut as $f )
             {
                 $flag=3D0;

Modified: phpcompta/tags/rel650/include/class_fiche_def.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_fiche_def.php	2013-03-20 13:02:36=
 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_fiche_def.php	2013-03-25 22:42:49=
 UTC (rev 5191)
@@ -206,7 +206,7 @@
 			alert (_('Le nom de la cat=C3=A9gorie ne peut pas =C3=AAtre vide'));
             return 1;
 		}
-        // $p_FICHE_REF cannot be null !!! (=3D=3D fiche_def_ref.frd_id
+        /**!! (=3D=3D fiche_def_ref.frd_id
         if (! isset ($p_FICHE_REF) || strlen($p_FICHE_REF) =3D=3D 0 )
         {
             echo alert (_('Vous devez choisir une categorie'));

Modified: phpcompta/tags/rel650/include/class_follow_up.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_follow_up.php	2013-03-20 13:02:36=
 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_follow_up.php	2013-03-25 22:42:49=
 UTC (rev 5191)
@@ -38,7 +38,7 @@
 require_once 'class_sort_table.php';
 require_once 'class_irelated_action.php';
=20
-/* !\file
+/**\file
  * \brief class_action for manipulating actions
  * action can be :
  * <ul>
@@ -49,7 +49,7 @@
  * </ul>
  * The table document_type are the possible actions
  */
-/* !
+/**
  * \brief class_action for manipulating actions
  * action can be :
  * <ul>
@@ -63,23 +63,23 @@
 class Follow_Up
 {
=20
-	var $db; /* !<  $db  database connexion    */
-	var $ag_timestamp;  /* !<   $ag_timestamp document date (ag_gestion.ag_=
timestamp) */
-	var $dt_id;   /* !<   $dt_id type of the document (document_type.dt_id)=
 */
-	var $ag_state; /* !<   $ag_state stage of the document (printed, send t=
o client...) */
-	var $d_number;   /* !<   $d_number number of the document */
-	var $d_filename; /* !<   $d_filename filename's document      */
-	var $d_mimetype; /* !<   $d_mimetype document's filename      */
-	var $ag_title;   /* !<   $ag_title title document	      */
-	var $f_id; /* !<   $f_id_dest fiche id (From field )  */
-	var $ag_ref;  /* !< $ag_ref is the ref  */
-	var $ag_hour;  /* !< $ag_hour is the hour of the meeting, action */
-	var $ag_priority; /* !< $ag_priority is the priority 1 High, 2 medium, =
3 low */
-	var $ag_dest;  /* !< $ag_dest person who is in charged */
-	var $ag_contact;  /* !< $ag_contact contact */
-	var $ag_remind_date;  /* !< $ag_contact contact */
+	var $db; /**<  $db  database connexion    */
+	var $ag_timestamp;  /**<   $ag_timestamp document date (ag_gestion.ag_t=
imestamp) */
+	var $dt_id;   /**<   $dt_id type of the document (document_type.dt_id) =
*/
+	var $ag_state; /**<   $ag_state stage of the document (printed, send to=
 client...) */
+	var $d_number;   /**<   $d_number number of the document */
+	var $d_filename; /**<   $d_filename filename's document      */
+	var $d_mimetype; /**<   $d_mimetype document's filename      */
+	var $ag_title;   /**<   $ag_title title document	      */
+	var $f_id; /**<   $f_id_dest fiche id (From field )  */
+	var $ag_ref;  /**< $ag_ref is the ref  */
+	var $ag_hour;  /**< $ag_hour is the hour of the meeting, action */
+	var $ag_priority; /**< $ag_priority is the priority 1 High, 2 medium, 3=
 low */
+	var $ag_dest;  /**< $ag_dest person who is in charged */
+	var $ag_contact;  /**< $ag_contact contact */
+	var $ag_remind_date;  /**< $ag_contact contact */
=20
-	/* !  constructor
+	/**  constructor
 	 * \brief constructor
 	 * \param p_cn database connection
 	 */
@@ -106,7 +106,7 @@
 		return $sql;
 	}
 	//---------------------------------------------------------------------=
-
-	/* !
+	/**
 	 * \brief Display the object, the tags for the FORM
 	 *        are in the caller. It will be used for adding and updating
 	 *        action
@@ -524,7 +524,7 @@
 	}
=20
 	//---------------------------------------------------------------------=
-
-	/* !\brief This function shows the detail of an action thanks the ag_id
+	/**\brief This function shows the detail of an action thanks the ag_id
 	 */
 	function get()
 	{
@@ -571,7 +571,7 @@
 		$this->qcode_dest =3D $aexp->strAttribut(ATTR_DEF_QUICKCODE);
 	}
=20
-	/* !
+	/**
 	 * \brief Save the document and propose to save the generated document =
or
 	 *  to upload one, the data are included except the file. Temporary the=
 generated
 	 * document is save
@@ -662,7 +662,7 @@
 		$this->insert_action();
 	}
=20
-	/* ! myList($p_filter=3D"")
+	/** myList($p_filter=3D"")
 	 * \brief Show list of action by default if sorted on date
 	 * \param $p_base base url with ac...
 	 * \param $p_filter filters on the document_type
@@ -823,7 +823,7 @@
 	}
=20
 	//---------------------------------------------------------------------=
-
-	/* !\brief Update the data into the database
+	/**\brief Update the data into the database
 	 *
 	 * \return true on success otherwise false
 	 */
@@ -952,7 +952,7 @@
 		return true;
 	}
=20
-	/* !\brief generate the document and add it to the action
+	/**\brief generate the document and add it to the action
 	 * \param md_id is the id of the document_modele
 	 * \param $p_array contains normally the $_POST
 	 */
@@ -968,7 +968,7 @@
 		$doc->Generate($p_array);
 	}
=20
-	/* !\brief put an array in the variable member, the indice
+	/**\brief put an array in the variable member, the indice
 	 * is the member name
 	 * \param $p_array to parse
 	 * \return nothing
@@ -998,7 +998,7 @@
 		$this->action =3D (isset($p_array['action'])) ? $p_array['action'] : n=
ull;
 	}
=20
-	/* !\brief remove the action
+	/**\brief remove the action
 	 *
 	 */
=20
@@ -1022,7 +1022,7 @@
 		}
 	}
=20
-	/* !\brief return the last p_limit operation into an array
+	/**\brief return the last p_limit operation into an array
 	 * \param $p_limit is the max of operation to return
 	 * \return $p_array of Follow_Up object
 	 */
@@ -1200,7 +1200,7 @@
 		Follow_Up::display_search($cn);
=20
 		$act =3D new Follow_Up($cn);
-		/* ! \brief
+		/** \brief
 		 *  \note The field 'recherche' is   about a part of the title or a re=
f. number
 		 */
 		$query =3D Follow_Up::create_query($cn);

Modified: phpcompta/tags/rel650/include/class_iradio.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_iradio.php	2013-03-20 13:02:36 UT=
C (rev 5190)
+++ phpcompta/tags/rel650/include/class_iradio.php	2013-03-25 22:42:49 UT=
C (rev 5191)
@@ -21,14 +21,14 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief Html Input=20
  */
 require_once('class_html_input.php');
=20
 class IRadio extends HtmlInput
     {
-    /* !\brief show the html  input of the widget */
+    /**\brief show the html  input of the widget */
=20
     public function input($p_name=3Dnull, $p_value=3Dnull)
         {
@@ -45,7 +45,7 @@
         return $r;
         }
=20
-    /* !\brief print in html the readonly value of the widget */
+    /**\brief print in html the readonly value of the widget */
=20
     public function display()
         {

Modified: phpcompta/tags/rel650/include/class_tool_uos.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_tool_uos.php	2013-03-20 13:02:36 =
UTC (rev 5190)
+++ phpcompta/tags/rel650/include/class_tool_uos.php	2013-03-25 22:42:49 =
UTC (rev 5191)
@@ -19,13 +19,19 @@
 /* $Revision: $Revision $ */
 /**
  * @file
- * Objec to check a double insert into the database, this duplicate occu=
rs after
+ * @brief Objec to check a double insert into the database, this duplica=
te occurs after
  * a refresh of the web page
  */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
 require_once 'class_database.php';
 define ('CODE_EXCP_DUPLICATE',901);
+/**
+ * @brief Objec to check a double insert into the database, this duplica=
te occurs after
+ * a refresh of the web page
+ * in
+ */
+
 class Tool_Uos
 {
     /**

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

Modified: phpcompta/tags/rel650/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/tags/rel650/include/client.inc.php	2013-03-20 13:02:36 UTC =
(rev 5190)
+++ phpcompta/tags/rel650/include/client.inc.php	2013-03-25 22:42:49 UTC =
(rev 5191)
@@ -18,7 +18,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\brief include from client.inc.php and concerned only the customer c=
ard and
+/**\brief include from client.inc.php and concerned only the customer ca=
rd and
  * the customer category
  */
 require_once("class_iselect.php");
@@ -30,7 +30,7 @@
=20
=20
 $low_action =3D (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list";
-/* ! \file
+/** \file
  * \brief Called from the module "Gestion" to manage the customer
  */
 $href=3Dbasename($_SERVER['PHP_SELF']);

Modified: phpcompta/tags/rel650/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/tags/rel650/include/compta_ach.inc.php	2013-03-20 13:02:36 =
UTC (rev 5190)
+++ phpcompta/tags/rel650/include/compta_ach.inc.php	2013-03-25 22:42:49 =
UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief file included to manage all the sold operation
  */
 require_once("class_icheckbox.php");

Modified: phpcompta/tags/rel650/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/tags/rel650/include/compta_fin_rec.inc.php	2013-03-20 13:02=
:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/compta_fin_rec.inc.php	2013-03-25 22:42=
:49 UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief reconcile operation

Modified: phpcompta/tags/rel650/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/tags/rel650/include/compta_fin_saldo.inc.php	2013-03-20 13:=
02:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/compta_fin_saldo.inc.php	2013-03-25 22:=
42:49 UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief show bank saldo

Modified: phpcompta/tags/rel650/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/tags/rel650/include/compta_ods.inc.php	2013-03-20 13:02:36 =
UTC (rev 5190)
+++ phpcompta/tags/rel650/include/compta_ods.inc.php	2013-03-25 22:42:49 =
UTC (rev 5191)
@@ -20,7 +20,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief to write directly into the ledgers,the stock and the tables
@@ -49,7 +49,7 @@
 }
 $ledger->id =3D ($ledger->id =3D=3D -1) ? $first_ledger['jrn_def_id'] : =
$id;
=20
-/* !\brief show a form for quick_writing */
+/**\brief show a form for quick_writing */
 $def =3D -1;
 $ledger->with_concerned =3D true;
=20

Modified: phpcompta/tags/rel650/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/tags/rel650/include/constant.php	2013-03-20 13:02:36 UTC (r=
ev 5190)
+++ phpcompta/tags/rel650/include/constant.php	2013-03-25 22:42:49 UTC (r=
ev 5191)
@@ -35,12 +35,12 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
-$version_phpcompta=3DSVNINFO;
-define ("DEBUG",false);
-/* define ('SVNINFO',5015);
- * $version_phpcompta=3DSVNINFO;
- * define ("DEBUG",true);
-*/
+// $version_phpcompta=3DSVNINFO;
+// define ("DEBUG",false);
+ define ('SVNINFO',5138);
+ $version_phpcompta=3DSVNINFO;
+ define ("DEBUG",true);
+
 // If you don't want to be notified of the update
 // define ("SITE_UPDATE",'');
 define ("SITE_UPDATE",'http://www.phpcompta.eu/last_version.txt');

Modified: phpcompta/tags/rel650/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/tags/rel650/include/contact.inc.php	2013-03-20 13:02:36 UTC=
 (rev 5190)
+++ phpcompta/tags/rel650/include/contact.inc.php	2013-03-25 22:42:49 UTC=
 (rev 5191)
@@ -18,7 +18,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\brief include from client.inc.php and concerned only the contact ca=
rd and
+/**\brief include from client.inc.php and concerned only the contact car=
d and
  * the contact category
  */
 require_once("class_iselect.php");
@@ -30,7 +30,7 @@
=20
=20
 $low_action =3D (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list";
-/* ! \file
+/** \file
  * \brief Called from the module "Gestion" to manage the contact
  */
 $href=3Dbasename($_SERVER['PHP_SELF']);

Modified: phpcompta/tags/rel650/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/tags/rel650/include/dossier.inc.php	2013-03-20 13:02:36 UTC=
 (rev 5190)
+++ phpcompta/tags/rel650/include/dossier.inc.php	2013-03-25 22:42:49 UTC=
 (rev 5191)
@@ -195,11 +195,11 @@
             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'];
-           =20
+
 	    echo "<TD><I>  ".h($Dossier['dos_description'])."</I></td>";
-           =20
+
             $database_exist=3D$repocn->exist_database($str_name);
-           =20
+
             if ($database_exist > 0 )
             {
                 $size=3D$repocn->get_value("select pg_database_size($1)/=
(1024*1024)::float",

Modified: phpcompta/tags/rel650/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/tags/rel650/include/export_balance_pdf.php	2013-03-20 13:02=
:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/export_balance_pdf.php	2013-03-25 22:42=
:49 UTC (rev 5191)
@@ -215,7 +215,7 @@
     $pdf->Cell(20,6,nbm($tp_sold),'T',0,'R',0);
     $pdf->Cell(20,6,nbm($tp_solc),'T',0,'R',0);
     $pdf->Ln();
-  } // if ! empty
+  } /** empty */
=20
 $fDate=3Ddate('dmy-Hi');
 $pdf->Output('balance-'.$fDate.'.pdf','D');

Modified: phpcompta/tags/rel650/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/fiche.inc.php	2013-03-20 13:02:36 UTC (=
rev 5190)
+++ phpcompta/tags/rel650/include/fiche.inc.php	2013-03-25 22:42:49 UTC (=
rev 5191)
@@ -19,7 +19,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\file
+/**\file
  * \brief printing of category of card  : balance, historic
  */
 include_once('class_database.php');

Modified: phpcompta/tags/rel650/include/forecast.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/forecast.inc.php	2013-03-20 13:02:36 UT=
C (rev 5190)
+++ phpcompta/tags/rel650/include/forecast.inc.php	2013-03-25 22:42:49 UT=
C (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief display, add, delete and modify forecast
  */
=20

Modified: phpcompta/tags/rel650/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/tags/rel650/include/history_operation.inc.php	2013-03-20 13=
:02:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/history_operation.inc.php	2013-03-25 22=
:42:49 UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief

Modified: phpcompta/tags/rel650/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/tags/rel650/include/impress_jrn.inc.php	2013-03-20 13:02:36=
 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/impress_jrn.inc.php	2013-03-25 22:42:49=
 UTC (rev 5191)
@@ -19,7 +19,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* ! \file
+/** \file
  * \brief ask for Printing the ledger (pdf,html)
  */
=20

Modified: phpcompta/tags/rel650/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/tags/rel650/include/menu.inc.php	2013-03-20 13:02:36 UTC (r=
ev 5190)
+++ phpcompta/tags/rel650/include/menu.inc.php	2013-03-25 22:42:49 UTC (r=
ev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief Show the table menu and let you add your own

Modified: phpcompta/tags/rel650/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/tags/rel650/include/modele.inc.php	2013-03-20 13:02:36 UTC =
(rev 5190)
+++ phpcompta/tags/rel650/include/modele.inc.php	2013-03-25 22:42:49 UTC =
(rev 5191)
@@ -20,7 +20,8 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**
+ * \file
  *
  *
  * \brief concerne only the template

Modified: phpcompta/tags/rel650/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/tags/rel650/include/opening.inc.php	2013-03-20 13:02:36 UTC=
 (rev 5190)
+++ phpcompta/tags/rel650/include/opening.inc.php	2013-03-25 22:42:49 UTC=
 (rev 5191)
@@ -20,7 +20,7 @@
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\file
+/**\file
  * \brief The opening of the exercices. it takes the saldo of the
  * choosen foolder / exercice and import it as a misc operation in the
  * current folder

Modified: phpcompta/tags/rel650/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/tags/rel650/include/operation_ods_confirm.inc.php	2013-03-2=
0 13:02:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/operation_ods_confirm.inc.php	2013-03-2=
5 22:42:49 UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief confirm ODS operation

Modified: phpcompta/tags/rel650/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/tags/rel650/include/pref.inc.php	2013-03-20 13:02:36 UTC (r=
ev 5190)
+++ phpcompta/tags/rel650/include/pref.inc.php	2013-03-25 22:42:49 UTC (r=
ev 5191)
@@ -18,7 +18,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* !\file
+/**\file
  * \brief this file is always included and then executed
  *        it permits to change the user preferences
  * \see user_pref.php

Modified: phpcompta/tags/rel650/include/template/document_mod_change.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/document_mod_change.php	2013-0=
3-20 13:02:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/template/document_mod_change.php	2013-0=
3-25 22:42:49 UTC (rev 5191)
@@ -18,7 +18,7 @@
  */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  * \brief this file respond to an ajax request to modify a type of docum=
ent
  */
 require_once 'class_document_type.php';

Modified: phpcompta/tags/rel650/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/tags/rel650/include/template/search_top.php	2013-03-20 13:0=
2:36 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/template/search_top.php	2013-03-25 22:4=
2:49 UTC (rev 5191)
@@ -21,7 +21,7 @@
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/* !\file
+/**\file
  *
  *
  * \brief

Modified: phpcompta/tags/rel650/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/tags/rel650/include/tva.inc.php	2013-03-20 13:02:36 UTC (re=
v 5190)
+++ phpcompta/tags/rel650/include/tva.inc.php	2013-03-25 22:42:49 UTC (re=
v 5191)
@@ -18,7 +18,7 @@
  */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* ! \file
+/** \file
  * \brief included file for customizing with the vat (account,rate...)
  */
 require_once('class_own.php');

Modified: phpcompta/tags/rel650/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/tags/rel650/include/user_detail.inc.php	2013-03-20 13:02:36=
 UTC (rev 5190)
+++ phpcompta/tags/rel650/include/user_detail.inc.php	2013-03-25 22:42:49=
 UTC (rev 5191)
@@ -17,7 +17,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
  */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* ! \file
+/** \file
  * \brief Users Security
  */
 include_once("ac_common.php");



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


From MAILER-DAEMON Wed Mar 27 14:59:00 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKvYq-0005sF-Ol
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 14:59:00 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 27 Mar 2013 19:54:38 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248099.1364410740.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5192 - phpcompta/tags/rel650/html/js
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 18:58:59 -0000

Author: danydb
Date: 2013-03-27 19:54:37 +0100 (Wed, 27 Mar 2013)
New Revision: 5192

Modified:
   phpcompta/tags/rel650/html/js/acc_ledger.js
Log:
cosmetic : width div for operation detail=20

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/acc_ledger.js	2013-03-25 22:42:49 UTC (=
rev 5191)
+++ phpcompta/tags/rel650/html/js/acc_ledger.js	2013-03-27 18:54:37 UTC (=
rev 5192)
@@ -713,29 +713,31 @@
 /*!\brief
  * \param p_value jrn.jr_id
  */
-function modifyOperation(p_value,dossier)
+function modifyOperation(p_value, dossier)
 {
-    layer++;
-    id=3D'det'+layer;
-    var popup=3D{'id':
-           id,'cssclass':'inner_box'
-           ,'html':
-           loading(),'drag':
-               true};
-    querystring=3D'gDossier=3D'+dossier+'&act=3Dde&jr_id=3D'+p_value+'&d=
iv=3D'+id;
-    add_div(popup);
-    var action=3Dnew Ajax.Request(
-                   "ajax_ledger.php",
-                   {
-                   method:'get',
-                   parameters:querystring,
-                   onFailure:error_box,
-                   onSuccess:success_box
-                   }
-               );
-    g(id).style.top=3Dcalcy(100+(layer*3));
-    g(id).style.left=3D300;
-
+	layer++;
+	id =3D 'det' + layer;
+	var popup =3D {'id':
+				id, 'cssclass': 'inner_box'
+				, 'html':
+				loading(), 'drag':
+				true};
+	querystring =3D 'gDossier=3D' + dossier + '&act=3Dde&jr_id=3D' + p_valu=
e + '&div=3D' + id;
+	add_div(popup);
+	var action =3D new Ajax.Request(
+			"ajax_ledger.php",
+			{
+				method: 'get',
+				parameters: querystring,
+				onFailure: error_box,
+				onSuccess: function(xml, txt) {
+					success_box(xml, txt);
+					g(id).style.top =3D calcy(100 + (layer * 3));
+					g(id).style.left =3D '10%';
+					g(id).style.width =3D "80%";
+				}
+			}
+	);
 }
=20
 /*!\brief



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


From MAILER-DAEMON Wed Mar 27 15:12:29 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKvlt-0001qt-Co
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 15:12:29 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 27 Mar 2013 20:08:10 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248120.1364411548.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5193 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 19:12:28 -0000

Author: danydb
Date: 2013-03-27 20:08:09 +0100 (Wed, 27 Mar 2013)
New Revision: 5193

Modified:
   phpcompta/tags/rel650/include/param_sec.inc.php
Log:
cosmetic : orthographe profile -> profil

Modified: phpcompta/tags/rel650/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/tags/rel650/include/param_sec.inc.php	2013-03-27 18:54:37 U=
TC (rev 5192)
+++ phpcompta/tags/rel650/include/param_sec.inc.php	2013-03-27 19:08:09 U=
TC (rev 5193)
@@ -82,7 +82,7 @@
 	echo '<th>'.$header->get_header(0).'</th>';
 	echo '<th>'.$header->get_header(1).'</th>';
 	echo th('pr=C3=A9nom');
-	echo th('profile');
+	echo th('profil');
 	echo '<th>'.$header->get_header(2).'</th>';
     for ($i =3D 0;$i < $MaxUser;$i++)
     {
@@ -269,7 +269,7 @@
 	$i_profile->selected=3D$sec_User->get_profile();
=20
 	echo "<p>";
-	echo " Profile ".$i_profile->input();
+	echo _("Profil")." ".$i_profile->input();
 	echo "</p>";
     echo '<Fieldset><legend>Journaux </legend>';
     echo '<table>';



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


From MAILER-DAEMON Wed Mar 27 15:22:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKvvM-0000mG-5E
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 15:22:16 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 27 Mar 2013 20:17:51 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248135.1364412135.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5194 - phpcompta/tags/rel650/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 19:22:14 -0000

Author: danydb
Date: 2013-03-27 20:17:51 +0100 (Wed, 27 Mar 2013)
New Revision: 5194

Modified:
   phpcompta/tags/rel650/html/ajax_ledger.php
Log:
cosmetic : ajout bouton fermeture si d?\195?\169tail non disponible

Modified: phpcompta/tags/rel650/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/tags/rel650/html/ajax_ledger.php	2013-03-27 19:08:09 UTC (r=
ev 5193)
+++ phpcompta/tags/rel650/html/ajax_ledger.php	2013-03-27 19:17:51 UTC (r=
ev 5194)
@@ -71,6 +71,7 @@
 {
     ob_start();
     require_once ('template/ledger_detail_forbidden.php');
+	echo HtmlInput::button_close($div);
     $html=3Dob_get_contents();
     ob_end_clean();
     $html=3Descape_xml($html);
@@ -97,6 +98,7 @@
     ob_start();
 	echo HtmlInput::title_box(_("Information"), $div);
     require_once ('template/ledger_detail_forbidden.php');
+	echo HtmlInput::button_close($div);
     $html=3Dob_get_contents();
     ob_end_clean();
=20
@@ -118,9 +120,9 @@
     ob_start();
 	echo HtmlInput::title_box(_("Information"), $div);
     require_once ('template/ledger_detail_forbidden.php');
+	echo HtmlInput::button_close($div);
     $html=3Dob_get_contents();
     ob_end_clean();
-
     $html=3Descape_xml($html);
     header('Content-type: text/xml; charset=3DUTF-8');
     echo <<<EOF



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


From MAILER-DAEMON Wed Mar 27 15:24:56 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKvxw-0001MV-Ub
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 15:24:56 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 27 Mar 2013 20:20:33 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248144.1364412296.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5195 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 19:24:56 -0000

Author: danydb
Date: 2013-03-27 20:20:33 +0100 (Wed, 27 Mar 2013)
New Revision: 5195

Modified:
   phpcompta/tags/rel650/include/class_follow_up.php
Log:
0000802: Bug : visibilit?\195?\169 des actions

Modified: phpcompta/tags/rel650/include/class_follow_up.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_follow_up.php	2013-03-27 19:17:51=
 UTC (rev 5194)
+++ phpcompta/tags/rel650/include/class_follow_up.php	2013-03-27 19:20:33=
 UTC (rev 5195)
@@ -1281,12 +1281,12 @@
 		}
 		if (isset($ag_dest_query) && $ag_dest_query !=3D -2 )
 		{
-                    $query.=3D " and ag_dest =3D " . sql_string($ag_dest=
_query);
+                    $query.=3D " and ag_dest =3D " . sql_string($ag_dest=
_query)." and ".self::sql_security_filter($cn, "R");
 		}
-                else
-                {
-                    $query .=3D" and (ag_owner=3D'" . $_SESSION['g_user'=
] . "' or ".self::sql_security_filter($cn, "R")." or ag_dest=3D-1 )";
-                }
+		else
+		{
+			$query .=3D" and (ag_owner=3D'" . $_SESSION['g_user'] . "' or ".self:=
:sql_security_filter($cn, "R")." or ag_dest=3D-1 )";
+		}
=20
=20
 		if (isNumber($ag_id) =3D=3D 1 && $ag_id !=3D 0)



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


From MAILER-DAEMON Wed Mar 27 15:27:18 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKw0D-0006Wv-UX
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 15:27:17 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 27 Mar 2013 20:22:54 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248149.1364412437.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5196 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 19:27:17 -0000

Author: danydb
Date: 2013-03-27 20:22:53 +0100 (Wed, 27 Mar 2013)
New Revision: 5196

Modified:
   phpcompta/tags/rel650/include/class_follow_up.php
Log:
0000802: Bug : visibilit?\195?\169 des actions

Modified: phpcompta/tags/rel650/include/class_follow_up.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_follow_up.php	2013-03-27 19:20:33=
 UTC (rev 5195)
+++ phpcompta/tags/rel650/include/class_follow_up.php	2013-03-27 19:22:53=
 UTC (rev 5196)
@@ -1281,7 +1281,8 @@
 		}
 		if (isset($ag_dest_query) && $ag_dest_query !=3D -2 )
 		{
-                    $query.=3D " and ag_dest =3D " . sql_string($ag_dest=
_query)." and ".self::sql_security_filter($cn, "R");
+                    $query.=3D " and ((ag_dest =3D " . sql_string($ag_de=
st_query)." and ".self::sql_security_filter($cn, "R").") or ".
+				" ag_owner=3D'" . $_SESSION['g_user'] . "')";
 		}
 		else
 		{



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


From MAILER-DAEMON Wed Mar 27 18:29:58 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKyr0-0003Ne-U3
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 18:29:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 27 Mar 2013 23:25:35 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248757.1364423397.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5197 - in phpcompta/tags/rel650: html html/js
	include include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 22:29:57 -0000

Author: danydb
Date: 2013-03-27 23:25:34 +0100 (Wed, 27 Mar 2013)
New Revision: 5197

Added:
   phpcompta/tags/rel650/include/ajax_view_action.php
Modified:
   phpcompta/tags/rel650/html/ajax_misc.php
   phpcompta/tags/rel650/html/js/acc_ledger.js
   phpcompta/tags/rel650/html/js/scripts.js
   phpcompta/tags/rel650/include/class_follow_up.php
   phpcompta/tags/rel650/include/class_html_input.php
   phpcompta/tags/rel650/include/template/action_search.php
   phpcompta/tags/rel650/include/template/dashboard.php
   phpcompta/tags/rel650/include/template/detail-action.php
   phpcompta/tags/rel650/include/template/ledger_detail_bottom.php
Log:
0000801: Ajouter un lien vers l'action

Modified: phpcompta/tags/rel650/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/tags/rel650/html/ajax_misc.php	2013-03-27 19:22:53 UTC (rev=
 5196)
+++ phpcompta/tags/rel650/html/ajax_misc.php	2013-03-27 22:25:34 UTC (rev=
 5197)
@@ -565,6 +565,9 @@
 	case 'fddetail':
 		require_once 'ajax_fiche_def_detail.php';
 		break;
+	case 'vw_action':
+		require_once 'ajax_view_action.php';
+		break;
 	default:
 		var_dump($_GET);
 }

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/acc_ledger.js	2013-03-27 19:22:53 UTC (=
rev 5196)
+++ phpcompta/tags/rel650/html/js/acc_ledger.js	2013-03-27 22:25:34 UTC (=
rev 5197)
@@ -324,6 +324,7 @@
         a=3Dtrim(g("e_march"+p_ctl_nb+'_tva_amount').value);
         g("e_march"+p_ctl_nb+'_tva_amount').value=3Da;
     }
+	if ( ! document.getElementById("e_march"+p_ctl_nb))  {return;}
     g("e_march"+p_ctl_nb).value=3Dtrim(g("e_march"+p_ctl_nb).value);
     var qcode=3Dg("e_march"+p_ctl_nb).value;
=20
@@ -375,12 +376,12 @@
     for (var i=3D0;i<g("nb_item").value;i++)
     {
         if( g('tva_march'+i))  tva+=3Dg('tva_march'+i).value*1;
-        htva+=3Dg('htva_march'+i).value*1;
-        tvac+=3Dg('tvac_march'+i).value*1;
+        if (g('htva_march'+i)) htva+=3Dg('htva_march'+i).value*1;
+        if (g('tvac_march'+i)) tvac+=3Dg('tvac_march'+i).value*1;
     }
=20
     if ( g('tva') ) g('tva').innerHTML=3DMath.round(tva*100)/100;
-    g('htva').innerHTML=3DMath.round(htva*100)/100;
+    if (g('htva')) g('htva').innerHTML=3DMath.round(htva*100)/100;
     if (g('tvac'))    g('tvac').innerHTML=3DMath.round(tvac*100)/100;
 }
 /**
@@ -449,8 +450,8 @@
     for (var i=3D0;i<g("nb_item").value;i++)
     {
         if ( g('tva_march') ) tva+=3Dg('tva_march'+i).value*1;
-        htva+=3Dg('htva_march'+i).value*1;
-        tvac+=3Dg('tvac_march'+i).value*1;
+        if( g('htva_march'+i)) htva+=3Dg('htva_march'+i).value*1;
+        if( g('tvac_march'+i))tvac+=3Dg('tvac_march'+i).value*1;
     }
=20
     if ( g('tva') ) g('tva').innerHTML=3DMath.round(tva*100)/100;

Modified: phpcompta/tags/rel650/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/html/js/scripts.js	2013-03-27 19:22:53 UTC (rev=
 5196)
+++ phpcompta/tags/rel650/html/js/scripts.js	2013-03-27 22:25:34 UTC (rev=
 5197)
@@ -1674,4 +1674,42 @@
 {
 	var str_date=3D$(p_id_date).value;
 	return check_date(str_date);
+}
+/**
+ *
+ * @param ag_id to view
+ * @param dossier is the folder
+ * @param modify : show the modify button values : 0 for no 1 for yes
+ */
+function view_action(ag_id,dossier,modify)
+{
+	waiting_box();
+	layer++;
+	id =3D 'action' + layer;
+
+	querystring =3D 'gDossier=3D' + dossier + '&op=3Dvw_action&ag_id=3D' + =
ag_id + '&div=3D' + id+'&mod=3D'+modify;
+	var action =3D new Ajax.Request(
+			"ajax_misc.php",
+			{
+				method: 'get',
+				parameters: querystring,
+				onFailure: error_box,
+				onSuccess: function(req) {
+					try {
+						remove_waiting_box();
+						var pos =3D fixed_position(0, 50) + ";width:90%;left:5%;";
+						add_div({
+							id: id,
+							drag: 1,
+							cssclass: "inner_box",
+							style: pos
+						});
+						$(id).innerHTML =3D req.responseText;
+						compute_all_ledger();
+					} catch (e) {
+						alert(e.message);
+					}
+				}
+			}
+	);
 }
\ No newline at end of file

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

Modified: phpcompta/tags/rel650/include/class_follow_up.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_follow_up.php	2013-03-27 19:22:53=
 UTC (rev 5196)
+++ phpcompta/tags/rel650/include/class_follow_up.php	2013-03-27 22:25:34=
 UTC (rev 5197)
@@ -114,7 +114,7 @@
 	 *        it is a new document
 	 *
 	 * \param $p_view if set to true the form will be in readonly mode (val=
ue: true or false)
-	 * \param $p_gen true we show the tag for generating a doc (value : tru=
e or false)
+	 * \param $p_gen true we show the tag for generating a doc (value : tru=
e or false) and adding files
 	 * \param $p_base is the ac parameter
 	 * \param $retour is the html code for the return button
 	 * \note  update the reference number or the document type is not allow=
ed
@@ -414,7 +414,7 @@
 		/* TVA */
 		$itva =3D new ITva_Popup($this->db);
 		$itva->in_table =3D true;
-
+		$aCard=3Darray();
 		/* create aArticle for the detail section */
 		for ($i =3D 0; $i < MAX_ARTICLE; $i++)
 		{
@@ -428,6 +428,7 @@
 			$tmp_ad =3D (isset($this->aAction_detail[$i])) ? $this->aAction_detai=
l[$i] : false;
 			$icard->readOnly=3D$readonly;
 			$icard->value =3D '';
+			$aCard[$i]=3D0;
 			if ($tmp_ad)
 			{
 				$march =3D new Fiche($this->db);
@@ -436,6 +437,7 @@
 				{
 					$march->id =3D $f;
 					$icard->value =3D $march->get_quick_code();
+					$aCard[$i]=3D$f;
 				}
 			}
 			$icard->set_dblclick("fill_ipopcard(this);");
@@ -1392,5 +1394,16 @@
 				)
 			);
 	}
-
+	static function get_all_operation($p_jr_id)
+	{
+		global $cn;
+		$array=3D$cn->get_array("
+			select ag_id,ag_ref,
+				ag_title
+				from action_gestion
+				join action_gestion_operation using(ag_id)
+				where
+				jr_id=3D$1",array($p_jr_id));
+		return $array;
+	}
 }

Modified: phpcompta/tags/rel650/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_html_input.php	2013-03-27 19:22:5=
3 UTC (rev 5196)
+++ phpcompta/tags/rel650/include/class_html_input.php	2013-03-27 22:25:3=
4 UTC (rev 5197)
@@ -235,6 +235,18 @@
         return sprintf('<A class=3D"detail" style=3D"text-decoration:und=
erline;display:inline" HREF=3D"javascript:modifyOperation(%d,%d)">%s</A>'=
,
                        $p_jr_id,dossier::id(),$p_mesg);
     }
+	/**
+	 * @brief return an anchor to view the detail of an action
+	 * @param $ag_id
+	 * @param $p_mesg
+	 * @param $p_modify let you modify an operation
+	 *
+	 */
+	 static function detail_action($ag_id,$p_mesg,$p_modify=3D1)
+    {
+        return sprintf('<A class=3D"detail" style=3D"text-decoration:und=
erline;display:inline" HREF=3D"javascript:view_action(%d,%d,%d)">%s</A>',
+                       $ag_id,dossier::id(),$p_modify,$p_mesg);
+    }
     /**
      * return a string containing the html code for calling the modifyMo=
deleDocument
      */

Modified: phpcompta/tags/rel650/include/template/action_search.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/action_search.php	2013-03-27 1=
9:22:53 UTC (rev 5196)
+++ phpcompta/tags/rel650/include/template/action_search.php	2013-03-27 2=
2:25:34 UTC (rev 5197)
@@ -79,7 +79,7 @@
 				<td ><?=3D $w->input() . $w->search()?><span id=3D"<?=3D$label?>"></=
span></td>
 			<tr>
 			<tr>
-				<td style=3D"text-align:right" ><?=3D _("Profile")?></td>
+				<td style=3D"text-align:right" ><?=3D _("Profil")?></td>
 				<td><?=3D $str_ag_dest?></td>
 			</tr>
 			<tr>

Modified: phpcompta/tags/rel650/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/dashboard.php	2013-03-27 19:22=
:53 UTC (rev 5196)
+++ phpcompta/tags/rel650/include/template/dashboard.php	2013-03-27 22:25=
:34 UTC (rev 5197)
@@ -68,9 +68,7 @@
 	for($i=3D0;$i<count($last_operation);$i++):
 	?>
 	<li>
-		<span>
-			<?=3Dh($last_operation[$i]['ag_ref'])?>
-		</span>
+		<?=3DHtmlInput::detail_action($last_operation[$i]['ag_id'],h($last_ope=
ration[$i]['ag_ref']))?>
 	<span>
 	<?=3Dsmaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
 	</span>
@@ -98,9 +96,7 @@
 	for($i=3D0;$i<count($late_operation);$i++):
 	?>
 	<li>
-		<span>
-			<?=3Dh($late_operation[$i]['ag_ref'])?>
-		</span>
+		<?=3DHtmlInput::detail_action($last_operation[$i]['ag_id'],h($last_ope=
ration[$i]['ag_ref']))?>
 	<span>
 	<?=3Dsmaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
 	</span>

Modified: phpcompta/tags/rel650/include/template/detail-action.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/detail-action.php	2013-03-27 1=
9:22:53 UTC (rev 5196)
+++ phpcompta/tags/rel650/include/template/detail-action.php	2013-03-27 2=
2:25:34 UTC (rev 5197)
@@ -254,17 +254,38 @@
 <? endif; ?>
   </div>
 </div>
+<? if ( $p_base !=3D 'ajax' ) :?>
 <input type=3D'button' class=3D"button" class=3D"noprint" value=3D'Montr=
er articles' id=3D"toggleButton" onclick=3D'toggleShowDetail()'>
+<? endif; ?>
+<?
+/**
+ * check if there card to show,
+ */
+$show_row=3D0;
+for ($i=3D0;$i<count($aArticle);$i++) :
+	if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ=
'){ $show_row=3D1;break;}
+endfor;
+?>
+<?
+/*
+ * display detail if there card or if we are in UPDATE or NEW mode
+ */
+if ($show_row !=3D0 ) :
+
+	?>
 <fieldset id=3D"fldDetail" style=3D'display:block'>
    <LEGEND> <?=3D_('D=C3=A9tail des articles')?>
 </LEGEND>
 <?php // hidden fields
+$show_row=3D0;
 for ($i=3D0;$i<count($aArticle);$i++) :
 	echo $aArticle[$i]['ad_id'];
 	echo $aArticle[$i]['hidden_tva'];
 	echo $aArticle[$i]['hidden_htva'];
+	if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ=
'){ $show_row=3D1;}
 endfor;
 ?>
+
 <table id=3D"art" >
 <tr>
   <th><?=3D_('Fiche')?></th>
@@ -276,8 +297,11 @@
 <th><?=3D_('Montant TVAC')?></th>
=20
 </tr>
-
 <?for ($i=3D0;$i<count($aArticle);$i++): ?>
+<?
+if ( ($aCard[$i] !=3D 0 && $p_view =3D=3D 'READ') || $p_view !=3D 'READ'=
):
+	$show_row++;
+	?>
 <TR>
 <TD><?php echo $aArticle[$i]['fid'] ?></TD>
 <TD><?php echo $aArticle[$i]['desc'] ?></TD>
@@ -286,10 +310,11 @@
 <TD class=3D"num"><?php echo $aArticle[$i]['tvaid'] ?></TD>
 <TD class=3D"num"><?php echo $aArticle[$i]['tva'] ?></TD>
 <TD class=3D"num"><?php echo $aArticle[$i]['tvac'] ?></TD>
-
 </TR>
+<? endif; ?>
 <?php endfor; ?>
 </table>
+
 <script language=3D"JavaScript">
 if ( $('e_march0') && $('e_march0').value =3D=3D'') { toggleShowDetail()=
;}
 function toggleShowDetail() {
@@ -301,6 +326,7 @@
 	}
=20
 </script>
+<? if ( $show_row !=3D 0 ): ?>
 <div style=3D"float: left; text-align: right; padding-right: 5px; font-s=
ize: 1.2em; font-weight: bold; color: blue;">
   <input name=3D"act" id=3D"act" class=3D"button" value=3D"<?=3D_('Actua=
liser')?>" onclick=3D"compute_all_ledger();" type=3D"button">
=20
@@ -316,8 +342,9 @@
     <br>Total TVAC
  </div>
 </div>
-
+<? endif; ?>
 </fieldset>
+<?endif; ?>
=20
 <? if ($p_view !=3D 'READ' && $str_select_doc !=3D '') : ?>
 <fieldset class=3D"noprint" >
@@ -366,6 +393,7 @@
 catch(exception) { alert('<?=3Dj(_('Je ne peux pas ajouter de fichier'))=
?>'); alert(exception.message);}
 }
 </script>
+<? if ($p_view !=3D 'READ') : ?>
   <div class=3D"noprint">
      <h3 >Fichiers =C3=A0 ajouter: </h3>
     <ol id=3D'add_file'  >
@@ -375,8 +403,9 @@
       </li>
     </ol>
   <span   >
-<? if ($p_view !=3D 'READ') : ?> <input type=3D"button" class=3D"button"=
 onclick=3D"addFiles();" value=3D"Ajouter un fichier"> <? endif;?>
+ <input type=3D"button" class=3D"button" onclick=3D"addFiles();" value=3D=
"Ajouter un fichier">
   </span>
   </div>
+ <? endif;?>
 </fieldset>
 <script>compute_all_ledger()</script>
\ No newline at end of file

Modified: phpcompta/tags/rel650/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/tags/rel650/include/template/ledger_detail_bottom.php	2013-=
03-27 19:22:53 UTC (rev 5196)
+++ phpcompta/tags/rel650/include/template/ledger_detail_bottom.php	2013-=
03-27 22:25:34 UTC (rev 5197)
@@ -44,10 +44,37 @@
     echo $wConcerned->input();
=20
 }
-
 ?>
 </div>
 <?
+$array =3D Follow_Up::get_all_operation($jr_id);
+if (count($array) > 0)
+{
+	?>
+	<div class=3D"myfieldset">
+		<h1 class=3D"legend">Actions li=C3=A9es</h1>
+	<?
+	/**
+	 * show eventually action
+	 */
+	$array =3D Follow_Up::get_all_operation($jr_id);
+	echo '<ul style=3D"list-style-type:square;">';
+	for ($i =3D 0; $i < count($array); $i++)
+	{
+		if ( $div =3D=3D 'popup')
+		{
+			echo '<li>'.HtmlInput::detail_action($array[$i]['ag_id'], h($array[$i=
]['ag_ref']." ".$array[$i]['ag_title']),0).'</li>';
+		}
+		else
+		{
+			echo '<li>'.HtmlInput::detail_action($array[$i]['ag_id'], h($array[$i=
]['ag_ref']." ".$array[$i]['ag_title']),1).'</li>';
+		}
+	}
+	echo '</ul>';
+}
+?>
+</div>
+<?
=20
 require_once('template/ledger_detail_file.php');
 ?>
@@ -62,7 +89,12 @@
 }
=20
 ?>
-<?if ( $access=3D=3D'W') {
+<?
+
+/**
+ * if you can write
+ */
+  if ( $access=3D=3D'W') {
   echo HtmlInput::submit('save',_('Sauver'),'onClick=3D"return verify_ca=
(\'popup\');"');
   $owner=3Dnew Own($cn);
   if ($owner->MY_ANALYTIC !=3D 'nu' && $div=3D=3D'popup'){



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


From MAILER-DAEMON Wed Mar 27 18:30:37 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKyrd-0003bn-33
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 18:30:37 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 27 Mar 2013 23:26:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248760.1364423436.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5198 - phpcompta/tags/rel650/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 22:30:35 -0000

Author: danydb
Date: 2013-03-27 23:26:17 +0100 (Wed, 27 Mar 2013)
New Revision: 5198

Modified:
   phpcompta/tags/rel650/include/template/user_sec_profile.php
Log:
typo profile -> profil

Modified: phpcompta/tags/rel650/include/template/user_sec_profile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/user_sec_profile.php	2013-03-2=
7 22:25:34 UTC (rev 5197)
+++ phpcompta/tags/rel650/include/template/user_sec_profile.php	2013-03-2=
7 22:26:17 UTC (rev 5198)
@@ -32,7 +32,7 @@
 	<?=3DHtmlInput::hidden("p_id", $p_id);?>
 	<table>
 		<tr>
-			<th><?=3D_("Profile")?></th>
+			<th><?=3D_("Profil")?></th>
 			<th><?=3D_("Acc=C3=A8s")?></th>
 		</tr>
 		<? for ($i=3D0;$i<count($array);$i++): ?>



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


From MAILER-DAEMON Wed Mar 27 19:16:22 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKzZu-0006Je-9h
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 19:16:22 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Mar 2013 00:12:02 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248806.1364426181.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5199 - phpcompta/tags/rel650/html/js
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 23:16:20 -0000

Author: danydb
Date: 2013-03-28 00:12:02 +0100 (Thu, 28 Mar 2013)
New Revision: 5199

Modified:
   phpcompta/tags/rel650/html/js/acc_ledger.js
Log:
javascript bug

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/acc_ledger.js	2013-03-27 22:26:17 UTC (=
rev 5198)
+++ phpcompta/tags/rel650/html/js/acc_ledger.js	2013-03-27 23:12:02 UTC (=
rev 5199)
@@ -455,7 +455,7 @@
     }
=20
     if ( g('tva') ) g('tva').innerHTML=3DMath.round(tva*100)/100;
-    g('htva').innerHTML=3DMath.round(htva*100)/100;
+    if (g('htva')) g('htva').innerHTML=3DMath.round(htva*100)/100;
     if (g('tvac'))g('tvac').innerHTML=3DMath.round(tvac*100)/100;
=20
=20



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


From MAILER-DAEMON Wed Mar 27 19:16:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKzaG-0006Jw-EF
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 19:16:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Mar 2013 00:12:25 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248807.1364426204.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5200 - phpcompta/tags/rel650/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 23:16:43 -0000

Author: danydb
Date: 2013-03-28 00:12:25 +0100 (Thu, 28 Mar 2013)
New Revision: 5200

Modified:
   phpcompta/tags/rel650/include/template/dashboard.php
Log:
bug last_operation <> late_operation

Modified: phpcompta/tags/rel650/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/dashboard.php	2013-03-27 23:12=
:02 UTC (rev 5199)
+++ phpcompta/tags/rel650/include/template/dashboard.php	2013-03-27 23:12=
:25 UTC (rev 5200)
@@ -96,7 +96,7 @@
 	for($i=3D0;$i<count($late_operation);$i++):
 	?>
 	<li>
-		<?=3DHtmlInput::detail_action($last_operation[$i]['ag_id'],h($last_ope=
ration[$i]['ag_ref']))?>
+		<?=3DHtmlInput::detail_action($late_operation[$i]['ag_id'],h($late_ope=
ration[$i]['ag_ref']))?>
 	<span>
 	<?=3Dsmaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
 	</span>



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


From MAILER-DAEMON Wed Mar 27 19:18:45 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UKzcD-0006jg-SV
	for mharc-phpcompta-dev@gnu.org; Wed, 27 Mar 2013 19:18:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Mar 2013 00:14:28 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1248808.1364426325.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5201 - phpcompta/tags/rel650/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 23:18:44 -0000

Author: danydb
Date: 2013-03-28 00:14:27 +0100 (Thu, 28 Mar 2013)
New Revision: 5201

Modified:
   phpcompta/tags/rel650/html/style.css
Log:
cosmetic

Modified: phpcompta/tags/rel650/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/html/style.css	2013-03-27 23:12:25 UTC (rev 520=
0)
+++ phpcompta/tags/rel650/html/style.css	2013-03-27 23:14:27 UTC (rev 520=
1)
@@ -876,7 +876,7 @@
 		border-top:1px solid  #b4bbc2;
 		border-right:1px solid  #b4bbc2;
 	padding: 5px;
-	width: 30%;
+	width: 40%;
 }
 body.op_detail_frame,div.op_detail_frame  {
   background-color:#e4e7ed;



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


From MAILER-DAEMON Thu Mar 28 13:09:27 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULGKN-0000TC-JU
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Mar 2013 13:09:27 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Mar 2013 18:05:09 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1250734.1364490567.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5202 - in phpcompta/tags/rel650:
	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: Thu, 28 Mar 2013 17:09:26 -0000

Author: danydb
Date: 2013-03-28 18:05:08 +0100 (Thu, 28 Mar 2013)
New Revision: 5202

Added:
   phpcompta/tags/rel650/html/admin/sql/patch/upgrade105.sql
Modified:
   phpcompta/tags/rel650/include/constant.php
Log:
Add patch upgrade105

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

Modified: phpcompta/tags/rel650/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/tags/rel650/include/constant.php	2013-03-27 23:14:27 UTC (r=
ev 5201)
+++ phpcompta/tags/rel650/include/constant.php	2013-03-28 17:05:08 UTC (r=
ev 5202)
@@ -35,19 +35,19 @@
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /*set to none for production */
 /* uncomment for production */
-// $version_phpcompta=3DSVNINFO;
-// define ("DEBUG",false);
- define ('SVNINFO',5138);
- $version_phpcompta=3DSVNINFO;
- define ("DEBUG",true);
-
+$version_phpcompta=3DSVNINFO;
+define ("DEBUG",false);
+/* define ('SVNINFO',5015);
+ * $version_phpcompta=3DSVNINFO;
+ * define ("DEBUG",true);
+*/
 // If you don't want to be notified of the update
 // define ("SITE_UPDATE",'');
 define ("SITE_UPDATE",'http://www.phpcompta.eu/last_version.txt');
 define ("SITE_UPDATE_PLUGIN",'http://www.phpcompta.eu/plugin_last_versio=
n.txt');
=20
=20
-define ("DBVERSION",105);
+define ("DBVERSION",106);
=20
 define ("DBVERSIONREPO",14);
 define ('NOTFOUND','--not found--');



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


From MAILER-DAEMON Thu Mar 28 13:17:43 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULGSN-0006Xi-MF
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Mar 2013 13:17:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Mar 2013 18:13:22 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1250741.1364491062.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5203 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Mar 2013 17:17:42 -0000

Author: danydb
Date: 2013-03-28 18:13:22 +0100 (Thu, 28 Mar 2013)
New Revision: 5203

Modified:
   phpcompta/tags/rel650/include/class_acc_ledger.php
   phpcompta/tags/rel650/include/constant.php
   phpcompta/tags/rel650/include/search.inc.php
Log:
0000799: Pouvoir augmenter le nombre de lignes propos?\195?\169es pour un=
 rapprochement

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_acc_ledger.php	2013-03-28 17:05:0=
8 UTC (rev 5202)
+++ phpcompta/tags/rel650/include/class_acc_ledger.php	2013-03-28 17:13:2=
2 UTC (rev 5203)
@@ -627,7 +627,7 @@
 	{
 		global $g_parameter, $g_user;
 		$gDossier =3D dossier::id();
-		$limit =3D " LIMIT 25";
+		$limit =3D " LIMIT ".MAX_RECONCILE;
 		// Sort
 		// Count
 		$count =3D $this->db->count_sql($sql);

Modified: phpcompta/tags/rel650/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/tags/rel650/include/constant.php	2013-03-28 17:05:08 UTC (r=
ev 5202)
+++ phpcompta/tags/rel650/include/constant.php	2013-03-28 17:13:22 UTC (r=
ev 5203)
@@ -61,6 +61,7 @@
 define ('MAX_COMPTE_CARD',4);
 define ('COMPTA_MAX_YEAR',2100);
 define ('COMPTA_MIN_YEAR',1990);
+define ('MAX_RECONCILE',25);
=20
 if ( DEBUG ) error_reporting(2147483647);  else error_reporting(0);
 // Erreur

Modified: phpcompta/tags/rel650/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/tags/rel650/include/search.inc.php	2013-03-28 17:05:08 UTC =
(rev 5202)
+++ phpcompta/tags/rel650/include/search.inc.php	2013-03-28 17:13:22 UTC =
(rev 5203)
@@ -90,7 +90,7 @@
 {
=20
     // Navigation bar
-    $step=3D25;
+    $step=3DMAX_RECONCILE;
     $page=3D(isset($_GET['offset']))?$_GET['page']:1;
     $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
     if (count ($_GET) =3D=3D 0)



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


From MAILER-DAEMON Thu Mar 28 13:58:39 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULH5z-0003AC-3y
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Mar 2013 13:58:39 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Mar 2013 18:54:16 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1250788.1364493517.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5204 - phpcompta/tags/rel650/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Mar 2013 17:58:37 -0000

Author: danydb
Date: 2013-03-28 18:54:15 +0100 (Thu, 28 Mar 2013)
New Revision: 5204

Modified:
   phpcompta/tags/rel650/include/template/detail-action.php
Log:
voir les heures dans commentaire

Modified: phpcompta/tags/rel650/include/template/detail-action.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/detail-action.php	2013-03-28 1=
7:13:22 UTC (rev 5203)
+++ phpcompta/tags/rel650/include/template/detail-action.php	2013-03-28 1=
7:54:15 UTC (rev 5204)
@@ -235,7 +235,7 @@
 	}
 	else
 	{
-		echo 'n=C2=B0'.$acomment[$c]['agc_id'].'('.h($acomment[$c]['tech_user'=
])." ".smaller_date($acomment[$c]['str_agc_date']).')'.
+		echo 'n=C2=B0'.$acomment[$c]['agc_id'].'('.h($acomment[$c]['tech_user'=
])." ".$acomment[$c]['str_agc_date'].')'.
 				'<pre style=3D"white-space: -moz-pre-wrap;white-space: pre-wrap;bord=
er:1px solid blue;width:70%;" id=3D"com'.$acomment[$c]['agc_id'].'"> '.
 				" ".h($acomment[$c]['agc_comment']).'</pre>'
 				;



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


From MAILER-DAEMON Thu Mar 28 18:02:53 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULKuL-0000ri-Ny
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Mar 2013 18:02:53 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Mar 2013 22:58:35 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1251045.1364508172.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5205 - in phpcompta/tags/rel650: 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, 28 Mar 2013 22:02:52 -0000

Author: danydb
Date: 2013-03-28 22:58:34 +0100 (Thu, 28 Mar 2013)
New Revision: 5205

Modified:
   phpcompta/tags/rel650/html/js/acc_ledger.js
   phpcompta/tags/rel650/html/js/anc_script.js
   phpcompta/tags/rel650/html/js/scripts.js
   phpcompta/tags/rel650/include/template/ledger_detail_bottom.php
Log:
Cannot save a detail operation

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/acc_ledger.js	2013-03-28 17:54:15 UTC (=
rev 5204)
+++ phpcompta/tags/rel650/html/js/acc_ledger.js	2013-03-28 21:58:34 UTC (=
rev 5205)
@@ -891,10 +891,11 @@
 *@brief save an operation in ajax, it concerns only the
 * comment, the pj and the rapt
 * the form elements are access by their name
-*@param form
+*@param obj form
 */
 function op_save(obj)
 {
+	try {
     var queryString=3D$(obj).serialize();
     queryString+=3D"&lib=3D"+obj.lib.value;
     queryString+=3D"&gDossier=3D"+obj.gDossier.value;
@@ -929,6 +930,8 @@
                                     );
     }
     return false;
+	} catch (e)
+	{ alert(e.message);}
 }
 function  get_history_account(ctl,dossier) {
 	if ( $(ctl).value !=3D '')

Modified: phpcompta/tags/rel650/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/tags/rel650/html/js/anc_script.js	2013-03-28 17:54:15 UTC (=
rev 5204)
+++ phpcompta/tags/rel650/html/js/anc_script.js	2013-03-28 21:58:34 UTC (=
rev 5205)
@@ -124,6 +124,9 @@
  */
 function verify_ca(div)
 {
+	try
+	{
+
     var idx=3D0;
     var amount_error=3D0;
     // put a maximum
@@ -168,6 +171,12 @@
         return false;
     }
     return true;
+	}
+	catch  (e)
+	{
+		alert(e.message);
+		return false;
+	}
 }
 /*!
  * \brief open a window for searching a CA account,
@@ -209,7 +218,7 @@
         }
     }
     );
-   =20
+
 }
 function search_anc_form(obj)
 {

Modified: phpcompta/tags/rel650/html/js/scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/html/js/scripts.js	2013-03-28 17:54:15 UTC (rev=
 5204)
+++ phpcompta/tags/rel650/html/js/scripts.js	2013-03-28 21:58:34 UTC (rev=
 5205)
@@ -1092,7 +1092,7 @@
 	var target=3D"search_op";
 	removeDiv(target);
 	var str_style=3Dfixed_position(77, 99);
-        str_style+=3D";width:80%";
+        str_style+=3D";width:92%;overflow:auto;";
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20

Modified: phpcompta/tags/rel650/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/tags/rel650/include/template/ledger_detail_bottom.php	2013-=
03-28 17:54:15 UTC (rev 5204)
+++ phpcompta/tags/rel650/include/template/ledger_detail_bottom.php	2013-=
03-28 21:58:34 UTC (rev 5205)
@@ -71,9 +71,11 @@
 		}
 	}
 	echo '</ul>';
+
+	echo '</div>';
 }
 ?>
-</div>
+
 <?
=20
 require_once('template/ledger_detail_file.php');



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


From MAILER-DAEMON Thu Mar 28 18:28:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULLIm-0005PI-Ci
	for mharc-phpcompta-dev@gnu.org; Thu, 28 Mar 2013 18:28:08 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 28 Mar 2013 23:23:51 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1251070.1364509688.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5206 - phpcompta/tags/rel650/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Mar 2013 22:28:07 -0000

Author: danydb
Date: 2013-03-28 23:23:50 +0100 (Thu, 28 Mar 2013)
New Revision: 5206

Modified:
   phpcompta/tags/rel650/include/class_acc_ledger_fin.php
Log:
Cannot save financial

Modified: phpcompta/tags/rel650/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/tags/rel650/include/class_acc_ledger_fin.php	2013-03-28 21:=
58:34 UTC (rev 5205)
+++ phpcompta/tags/rel650/include/class_acc_ledger_fin.php	2013-03-28 22:=
23:50 UTC (rev 5206)
@@ -723,7 +723,7 @@
 			$get_solde=3Dtrue;
 			for ($i =3D 0; $i < $nb_item; $i++)
 			{
-				/**=3D 0 insert it into the database
+				// insert it into the database
 				// and quit the loop ?
 				if (strlen(trim(${"e_other$i"})) =3D=3D 0)
 					continue;



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


From MAILER-DAEMON Fri Mar 29 13:23:57 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULd1x-00083p-7d
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Mar 2013 13:23:57 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Mar 2013 18:19:33 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1253308.1364577836.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r469 - tag/rel652/import_doli/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 17:23:55 -0000

Author: danydb
Date: 2013-03-29 18:19:32 +0100 (Fri, 29 Mar 2013)
New Revision: 469

Modified:
   tag/rel652/import_doli/doc/
   tag/rel652/import_doli/doc/fiche-2.csv
   tag/rel652/import_doli/doc/fiche.csv
Log:
Correct data


Property changes on: tag/rel652/import_doli/doc
___________________________________________________________________
Name: svn:ignore
   - .~lock.import-donnee-fiche.ods#
.~lock.import-donnee-dolibarr test.ods#
.~lock.import-donnee-dolibarr.ods#
.~lock.import-donnee-dolibarr test.csv#
.~lock.import_doli.odt#

   + .~lock.import-donnee-fiche.ods#
.~lock.import-donnee-dolibarr test.ods#
.~lock.import-donnee-dolibarr.ods#
.~lock.import-donnee-dolibarr test.csv#
.~lock.import_doli.odt#
.~lock.fiche.csv#


Modified: tag/rel652/import_doli/doc/fiche-2.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel652/import_doli/doc/fiche-2.csv	2013-03-25 22:42:34 UTC (rev 4=
68)
+++ tag/rel652/import_doli/doc/fiche-2.csv	2013-03-29 17:19:32 UTC (rev 4=
69)
@@ -1,9 +1,6 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe LeclercS;26.02.2011;01.04.2012;Abonnement Entre=
prise sur Aevalys;;leclerc.ph@gmail.com;4001;FR67384260733;7 rue Copernic=
;75016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA
+"N=C2=B0 operation","Date (dd.mm.yyyy)","Quick_code","libelle operation"=
,"n=C2=B0 Pi=C3=A8ce ","montant HTVA par unit=C3=A9","Montant TVA","Nbre =
unit=C3=A9","Taux TVA","Montant TVAC"
+1,"13.03.2012","FOURN1","achat de marchandises",,,,,,
+1,"13.03.2012","M1","Marchandise 1",,3,"1,62",9,"0,06","28,62"
+1,"13.03.2012","M2","Marchandise 2",,12,"0,72",1,"0,06","12,72"
+2,"14.03.2012","FOURN2","Facture n=C2=B0121212121 : Electrict=C3=A9",,,,=
,,
+2,"14.03.2012","ELEC","=C3=89lectrict=C3=A9",,125,"7,5",1,"0,06","132,5"

Modified: tag/rel652/import_doli/doc/fiche.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel652/import_doli/doc/fiche.csv	2013-03-25 22:42:34 UTC (rev 468=
)
+++ tag/rel652/import_doli/doc/fiche.csv	2013-03-29 17:19:32 UTC (rev 469=
)
@@ -1,9 +1,6 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe Leclerc;26.02.2011;01.04.2012;Abonnement Entrep=
rise sur Aevalys;;leclerc.ph@gmail.com;400;FR67384260733;7 rue Copernic;7=
5016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA
+"N=C2=B0 operation","Date (dd.mm.yyyy)","Quick_code","libelle operation"=
,"n=C2=B0 Pi=C3=A8ce ","montant HTVA par unit=C3=A9","Montant TVA","Nbre =
unit=C3=A9","Taux TVA","Montant TVAC"
+1,"13.03.2012","FOURN1","achat de marchandises",,,,,,
+1,"13.03.2012","M1","Marchandise 1",,3,"1,62",9,"0,06","28,62"
+1,"13.03.2012","M2","Marchandise 2",,12,"0,72",1,"0,06","12,72"
+2,"14.03.2012","FOURN2","Facture n=C2=B0121212121 : Electrict=C3=A9",,,,=
,,
+2,"14.03.2012","ELEC","=C3=89lectrict=C3=A9",,125,"7,5",1,"0,06","132,5"



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


From MAILER-DAEMON Fri Mar 29 13:32:38 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULdAM-0002tk-D0
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Mar 2013 13:32:38 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Mar 2013 18:28:21 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1253321.1364578357.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r470 - tag/rel652/import_doli/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 17:32:36 -0000

Author: danydb
Date: 2013-03-29 18:28:21 +0100 (Fri, 29 Mar 2013)
New Revision: 470

Modified:
   tag/rel652/import_doli/doc/fiche-2.csv
   tag/rel652/import_doli/doc/fiche.csv
   tag/rel652/import_doli/doc/import-donnee-fiche.ods
Log:
Correct data

Modified: tag/rel652/import_doli/doc/fiche-2.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel652/import_doli/doc/fiche-2.csv	2013-03-29 17:19:32 UTC (rev 4=
69)
+++ tag/rel652/import_doli/doc/fiche-2.csv	2013-03-29 17:28:21 UTC (rev 4=
70)
@@ -1,6 +1,5 @@
-"N=C2=B0 operation","Date (dd.mm.yyyy)","Quick_code","libelle operation"=
,"n=C2=B0 Pi=C3=A8ce ","montant HTVA par unit=C3=A9","Montant TVA","Nbre =
unit=C3=A9","Taux TVA","Montant TVAC"
-1,"13.03.2012","FOURN1","achat de marchandises",,,,,,
-1,"13.03.2012","M1","Marchandise 1",,3,"1,62",9,"0,06","28,62"
-1,"13.03.2012","M2","Marchandise 2",,12,"0,72",1,"0,06","12,72"
-2,"14.03.2012","FOURN2","Facture n=C2=B0121212121 : Electrict=C3=A9",,,,=
,,
-2,"14.03.2012","ELEC","=C3=89lectrict=C3=A9",,125,"7,5",1,"0,06","132,5"
+"CLIENT1","Premier client",400
+"M1","Marchandise1",6101
+"M2","Marchandise2",6102
+"FOURNISSEUR1","Fournisseur1",440
+"FID1070","Electricit=C3=A9",6100

Modified: tag/rel652/import_doli/doc/fiche.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel652/import_doli/doc/fiche.csv	2013-03-29 17:19:32 UTC (rev 469=
)
+++ tag/rel652/import_doli/doc/fiche.csv	2013-03-29 17:28:21 UTC (rev 470=
)
@@ -1,6 +1,5 @@
-"N=C2=B0 operation","Date (dd.mm.yyyy)","Quick_code","libelle operation"=
,"n=C2=B0 Pi=C3=A8ce ","montant HTVA par unit=C3=A9","Montant TVA","Nbre =
unit=C3=A9","Taux TVA","Montant TVAC"
-1,"13.03.2012","FOURN1","achat de marchandises",,,,,,
-1,"13.03.2012","M1","Marchandise 1",,3,"1,62",9,"0,06","28,62"
-1,"13.03.2012","M2","Marchandise 2",,12,"0,72",1,"0,06","12,72"
-2,"14.03.2012","FOURN2","Facture n=C2=B0121212121 : Electrict=C3=A9",,,,=
,,
-2,"14.03.2012","ELEC","=C3=89lectrict=C3=A9",,125,"7,5",1,"0,06","132,5"
+"CLIENT1","Premier client",400
+"M1","Marchandise1",6101
+"M2","Marchandise2",6102
+"FOURNISSEUR1","Fournisseur1",440
+"FID1070","Electricit=C3=A9",6100

Modified: tag/rel652/import_doli/doc/import-donnee-fiche.ods
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



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


From MAILER-DAEMON Fri Mar 29 13:49:12 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULdQO-0005hm-4E
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Mar 2013 13:49:12 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Mar 2013 18:44:55 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1253338.1364579351.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r471 - in trunk: . import_doli/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 17:49:10 -0000

Author: danydb
Date: 2013-03-29 18:44:55 +0100 (Fri, 29 Mar 2013)
New Revision: 471

Modified:
   trunk/
   trunk/import_doli/doc/
   trunk/import_doli/doc/fiche-2.csv
   trunk/import_doli/doc/fiche.csv
   trunk/import_doli/doc/import-donnee-fiche.ods
Log:
Merged revisions 469-470 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel652

........
  r469 | danydb | 2013-03-29 18:19:32 +0100 (Fri, 29 Mar 2013) | 1 line
 =20
  Correct data
........
  r470 | danydb | 2013-03-29 18:28:21 +0100 (Fri, 29 Mar 2013) | 1 line
 =20
  Correct data
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel652:1-463
   + /tag/rel652:1-470


Property changes on: trunk/import_doli/doc
___________________________________________________________________
Name: svn:ignore
   - .~lock.import-donnee-fiche.ods#
.~lock.import-donnee-dolibarr test.ods#
.~lock.import-donnee-dolibarr.ods#
.~lock.import-donnee-dolibarr test.csv#
.~lock.import_doli.odt#

   + .~lock.import-donnee-fiche.ods#
.~lock.import-donnee-dolibarr test.ods#
.~lock.import-donnee-dolibarr.ods#
.~lock.import-donnee-dolibarr test.csv#
.~lock.import_doli.odt#
.~lock.fiche.csv#


Modified: trunk/import_doli/doc/fiche-2.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/doc/fiche-2.csv	2013-03-29 17:28:21 UTC (rev 470)
+++ trunk/import_doli/doc/fiche-2.csv	2013-03-29 17:44:55 UTC (rev 471)
@@ -1,9 +1,5 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe LeclercS;26.02.2011;01.04.2012;Abonnement Entre=
prise sur Aevalys;;leclerc.ph@gmail.com;4001;FR67384260733;7 rue Copernic=
;75016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA
+"CLIENT1","Premier client",400
+"M1","Marchandise1",6101
+"M2","Marchandise2",6102
+"FOURNISSEUR1","Fournisseur1",440
+"FID1070","Electricit=C3=A9",6100

Modified: trunk/import_doli/doc/fiche.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/doc/fiche.csv	2013-03-29 17:28:21 UTC (rev 470)
+++ trunk/import_doli/doc/fiche.csv	2013-03-29 17:44:55 UTC (rev 471)
@@ -1,9 +1,5 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe Leclerc;26.02.2011;01.04.2012;Abonnement Entrep=
rise sur Aevalys;;leclerc.ph@gmail.com;400;FR67384260733;7 rue Copernic;7=
5016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA
+"CLIENT1","Premier client",400
+"M1","Marchandise1",6101
+"M2","Marchandise2",6102
+"FOURNISSEUR1","Fournisseur1",440
+"FID1070","Electricit=C3=A9",6100

Modified: trunk/import_doli/doc/import-donnee-fiche.ods
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



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


From MAILER-DAEMON Fri Mar 29 13:50:48 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULdRw-0007TI-FE
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Mar 2013 13:50:48 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Mar 2013 18:46:31 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1253339.1364579448.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r472 - tag/rel651/import_doli/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 17:50:46 -0000

Author: danydb
Date: 2013-03-29 18:46:30 +0100 (Fri, 29 Mar 2013)
New Revision: 472

Removed:
   tag/rel651/import_doli/doc/fiche-2.csv
   tag/rel651/import_doli/doc/fiche.csv
Modified:
   tag/rel651/import_doli/doc/import-donnee-dolibarr test.csv
   tag/rel651/import_doli/doc/import-donnee-dolibarr test.ods
   tag/rel651/import_doli/doc/import-donnee-fiche.ods
Log:
correct data

Deleted: tag/rel651/import_doli/doc/fiche-2.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel651/import_doli/doc/fiche-2.csv	2013-03-29 17:44:55 UTC (rev 4=
71)
+++ tag/rel651/import_doli/doc/fiche-2.csv	2013-03-29 17:46:30 UTC (rev 4=
72)
@@ -1,9 +0,0 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe LeclercS;26.02.2011;01.04.2012;Abonnement Entre=
prise sur Aevalys;;leclerc.ph@gmail.com;4001;FR67384260733;7 rue Copernic=
;75016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA

Deleted: tag/rel651/import_doli/doc/fiche.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel651/import_doli/doc/fiche.csv	2013-03-29 17:44:55 UTC (rev 471=
)
+++ tag/rel651/import_doli/doc/fiche.csv	2013-03-29 17:46:30 UTC (rev 472=
)
@@ -1,9 +0,0 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe Leclerc;26.02.2011;01.04.2012;Abonnement Entrep=
rise sur Aevalys;;leclerc.ph@gmail.com;400;FR67384260733;7 rue Copernic;7=
5016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA

Modified: tag/rel651/import_doli/doc/import-donnee-dolibarr test.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel651/import_doli/doc/import-donnee-dolibarr test.csv	2013-03-29=
 17:44:55 UTC (rev 471)
+++ tag/rel651/import_doli/doc/import-donnee-dolibarr test.csv	2013-03-29=
 17:46:30 UTC (rev 472)
@@ -1,5 +1,5 @@
-3;"13.03.2012";"T";"CLIENT1";"achat de marchandises";"A1";;;;;
-3;"13.03.2012";"S";"M1";"Marchandise 1";"A1";3;1,62;9;0,06;28,62
-3;"13.03.2012";"S";"M2";"Marchandise 2";"A1";12;0,72;1;0,06;12,72
-2;"14.03.2012";"T";"FOURNISSEUR1";"Facture n=C2=B0121212121 : Electrict=C3=
=A9";"B1";;;;;
-2;"14.03.2012";"S";"FID1070";"=C3=89lectrict=C3=A9";"B1";125;7,5;1;0,06;=
132,5
+7;"13.03.2012";"T";"CLIENT1";"achat de marchandises";"A2";;;;;
+7;"13.03.2012";"S";"M1";"Marchandise 1";"A2";3;1,62;9;0,06;28,62
+7;"13.03.2012";"S";"M2";"Marchandise 2";"A2";12;0,72;1;0,06;12,72
+8;"14.03.2012";"T";"FOURNISSEUR1";"Facture n=C2=B0121212121 : Electrict=C3=
=A9";"B2";;;;;
+8;"14.03.2012";"S";"FID1070";"=C3=89lectrict=C3=A9";"B2";-125;-7,5;1;0,0=
6;-132,5

Modified: tag/rel651/import_doli/doc/import-donnee-dolibarr test.ods
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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: tag/rel651/import_doli/doc/import-donnee-fiche.ods
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



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


From MAILER-DAEMON Fri Mar 29 13:51:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULdSh-0007gu-2m
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Mar 2013 13:51:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Mar 2013 18:47:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1253340.1364579494.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r473 - tag/rel650/import_doli/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 17:51:33 -0000

Author: danydb
Date: 2013-03-29 18:47:17 +0100 (Fri, 29 Mar 2013)
New Revision: 473

Modified:
   tag/rel650/import_doli/doc/fiche-2.csv
   tag/rel650/import_doli/doc/fiche.csv
   tag/rel650/import_doli/doc/import-donnee-dolibarr test.csv
   tag/rel650/import_doli/doc/import-donnee-dolibarr test.ods
   tag/rel650/import_doli/doc/import-donnee-fiche.ods
Log:
correct data

Modified: tag/rel650/import_doli/doc/fiche-2.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/import_doli/doc/fiche-2.csv	2013-03-29 17:46:30 UTC (rev 4=
72)
+++ tag/rel650/import_doli/doc/fiche-2.csv	2013-03-29 17:47:17 UTC (rev 4=
73)
@@ -1,9 +1,5 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe LeclercS;26.02.2011;01.04.2012;Abonnement Entre=
prise sur Aevalys;;leclerc.ph@gmail.com;4001;FR67384260733;7 rue Copernic=
;75016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA
+"CLIENT1","Premier client",400
+"M1","Marchandise1",6101
+"M2","Marchandise2",6102
+"FOURNISSEUR1","Fournisseur1",440
+"FID1070","Electricit=C3=A9",6100

Modified: tag/rel650/import_doli/doc/fiche.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/import_doli/doc/fiche.csv	2013-03-29 17:46:30 UTC (rev 472=
)
+++ tag/rel650/import_doli/doc/fiche.csv	2013-03-29 17:47:17 UTC (rev 473=
)
@@ -1,9 +1,5 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe Leclerc;26.02.2011;01.04.2012;Abonnement Entrep=
rise sur Aevalys;;leclerc.ph@gmail.com;400;FR67384260733;7 rue Copernic;7=
5016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA
+"CLIENT1","Premier client",400
+"M1","Marchandise1",6101
+"M2","Marchandise2",6102
+"FOURNISSEUR1","Fournisseur1",440
+"FID1070","Electricit=C3=A9",6100

Modified: tag/rel650/import_doli/doc/import-donnee-dolibarr test.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/import_doli/doc/import-donnee-dolibarr test.csv	2013-03-29=
 17:46:30 UTC (rev 472)
+++ tag/rel650/import_doli/doc/import-donnee-dolibarr test.csv	2013-03-29=
 17:47:17 UTC (rev 473)
@@ -1,5 +1,5 @@
-3;"13.03.2012";"T";"WOOHA";"achat de marchandises";"A1";;;;;
-3;"13.03.2012";"S";"M1";"Marchandise 1";"A1";3;1,62;9;0,06;28,62
-3;"13.03.2012";"S";"M2";"Marchandise 2";"A1";12;0,72;1;0,06;12,72
-2;"14.03.2012";"T";"TANGRAM";"Facture n=C2=B0121212121 : Electrict=C3=A9=
";"B1";;;;;
-2;"14.03.2012";"S";"FID1070";"=C3=89lectrict=C3=A9";"B1";125;7,5;1;0,06;=
132,5
+7;"13.03.2012";"T";"CLIENT1";"achat de marchandises";"A2";;;;;
+7;"13.03.2012";"S";"M1";"Marchandise 1";"A2";3;1,62;9;0,06;28,62
+7;"13.03.2012";"S";"M2";"Marchandise 2";"A2";12;0,72;1;0,06;12,72
+8;"14.03.2012";"T";"FOURNISSEUR1";"Facture n=C2=B0121212121 : Electrict=C3=
=A9";"B2";;;;;
+8;"14.03.2012";"S";"FID1070";"=C3=89lectrict=C3=A9";"B2";-125;-7,5;1;0,0=
6;-132,5

Modified: tag/rel650/import_doli/doc/import-donnee-dolibarr test.ods
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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: tag/rel650/import_doli/doc/import-donnee-fiche.ods
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



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


From MAILER-DAEMON Fri Mar 29 13:52:17 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULdTN-0007id-Rk
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Mar 2013 13:52:17 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Mar 2013 18:48:03 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1253343.1364579537.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r474 - tag/rel605/import_doli/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 17:52:16 -0000

Author: danydb
Date: 2013-03-29 18:48:03 +0100 (Fri, 29 Mar 2013)
New Revision: 474

Modified:
   tag/rel605/import_doli/doc/fiche-2.csv
   tag/rel605/import_doli/doc/fiche.csv
   tag/rel605/import_doli/doc/import-donnee-dolibarr test.csv
   tag/rel605/import_doli/doc/import-donnee-dolibarr test.ods
   tag/rel605/import_doli/doc/import-donnee-fiche.ods
Log:
correct data

Modified: tag/rel605/import_doli/doc/fiche-2.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel605/import_doli/doc/fiche-2.csv	2013-03-29 17:47:17 UTC (rev 4=
73)
+++ tag/rel605/import_doli/doc/fiche-2.csv	2013-03-29 17:48:03 UTC (rev 4=
74)
@@ -1,9 +1,5 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe LeclercS;26.02.2011;01.04.2012;Abonnement Entre=
prise sur Aevalys;;leclerc.ph@gmail.com;4001;FR67384260733;7 rue Copernic=
;75016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA
+"CLIENT1","Premier client",400
+"M1","Marchandise1",6101
+"M2","Marchandise2",6102
+"FOURNISSEUR1","Fournisseur1",440
+"FID1070","Electricit=C3=A9",6100

Modified: tag/rel605/import_doli/doc/fiche.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel605/import_doli/doc/fiche.csv	2013-03-29 17:47:17 UTC (rev 473=
)
+++ tag/rel605/import_doli/doc/fiche.csv	2013-03-29 17:48:03 UTC (rev 474=
)
@@ -1,9 +1,5 @@
-Dubbel Win SA;Schiettecatte Patrick;01.02.2010;01.02.2013;;;p-s-2@voo.be=
;400;BE463141049;AVENUE LAVOISIER 13;1300;WAVRE;Belgique;PSCHIET
-FRMJC;LAURENT.COSTY@FRMJC.ORG;01.06.2011;01.06.2012;PLUSIEURS DOSSIERS;0=
3 80 45 02 86;LAURENT.COSTY@FRMJC.ORG;400;;22 RUE DU TIRE PESSEAU; 21000;=
DIJON;FRANCE;FRMJC
-marcellin champagnat;Jean marc PE;01.06.2010;01.06.2012;Compte =C3=A0 fe=
rmer au 30/5/2012;063/23.51.50;jeanmarc.pe@scarlet.be;400;ASBL 896.993;33=
 rue de bastogne;6700;Arlon;Belgique;MARCECHAMP
-Self Reliance;Pierre willot;15.01.2008;15.01.2013;;071.77.36.17;pierre.w=
illot@self-reliance.be;4000009;BE0874.449.753;rue Haut Vent 34;5070;Fosse=
s-La-Ville;Belgique;SR
-SHONAGON FILM;Aude Boesmans;01.02.2010;31.12.2011;Abonnement termin=C3=A9=
;;;400;;;;;;SHONAGON
-SNETAP FSU;Henri COMBEAU;01.07.2010;01.07.2012;;;;400;;Rue de Vaugirard =
251;75732;Paris;France;SNETAP
-Tangram Finance;Philippe Leclerc;26.02.2011;01.04.2012;Abonnement Entrep=
rise sur Aevalys;;leclerc.ph@gmail.com;400;FR67384260733;7 rue Copernic;7=
5016;Paris;France;TANGRAM
-woningen123;Aude Boesmans;01.02.2010;01.08.2011;Aude m'a dit que cette a=
bonnement terminera en janvier/f=C3=A9vrier 2012;;audeb44@yahoo.fr;400;;;=
;;;WO123
-Wooha sprl;Vincent Oury;05.02.2009;05.02.2013;;;vo@boutiquedegestion.be;=
4000012;BE0884986032;Bd Ernest Solvay 489;4000;Li=C3=A8ge;Belgique;WOOHA
+"CLIENT1","Premier client",400
+"M1","Marchandise1",6101
+"M2","Marchandise2",6102
+"FOURNISSEUR1","Fournisseur1",440
+"FID1070","Electricit=C3=A9",6100

Modified: tag/rel605/import_doli/doc/import-donnee-dolibarr test.csv
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel605/import_doli/doc/import-donnee-dolibarr test.csv	2013-03-29=
 17:47:17 UTC (rev 473)
+++ tag/rel605/import_doli/doc/import-donnee-dolibarr test.csv	2013-03-29=
 17:48:03 UTC (rev 474)
@@ -1,5 +1,5 @@
-1;"13.03.2012";"WOOHA";"achat de marchandises";;;;;;
-1;"13.03.2012";"M1";"Marchandise 1";;3;1,62;9;0,06;28,62
-1;"13.03.2012";"M2";"Marchandise 2";;12;0,72;1;0,06;12,72
-2;"14.03.2012";"TANGRAM";"Facture n=C2=B0121212121 : Electrict=C3=A9";;;=
;;;
-2;"14.03.2012";"ELEC";"=C3=89lectrict=C3=A9";;125;7,5;1;0,06;132,5
+7;"13.03.2012";"T";"CLIENT1";"achat de marchandises";"A2";;;;;
+7;"13.03.2012";"S";"M1";"Marchandise 1";"A2";3;1,62;9;0,06;28,62
+7;"13.03.2012";"S";"M2";"Marchandise 2";"A2";12;0,72;1;0,06;12,72
+8;"14.03.2012";"T";"FOURNISSEUR1";"Facture n=C2=B0121212121 : Electrict=C3=
=A9";"B2";;;;;
+8;"14.03.2012";"S";"FID1070";"=C3=89lectrict=C3=A9";"B2";-125;-7,5;1;0,0=
6;-132,5

Modified: tag/rel605/import_doli/doc/import-donnee-dolibarr test.ods
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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: tag/rel605/import_doli/doc/import-donnee-fiche.ods
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)



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


From MAILER-DAEMON Fri Mar 29 14:16:00 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULdqK-000080-Pq
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Mar 2013 14:16:00 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Mar 2013 19:11:37 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1253379.1364580960.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5207 - phpcompta/branches/rel601-ovh/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 18:15:59 -0000

Author: danydb
Date: 2013-03-29 19:11:37 +0100 (Fri, 29 Mar 2013)
New Revision: 5207

Modified:
   phpcompta/branches/rel601-ovh/include/function_javascript.php
Log:
PHP LONG needed

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/function_javascript.php	2013-03=
-28 22:23:50 UTC (rev 5206)
+++ phpcompta/branches/rel601-ovh/include/function_javascript.php	2013-03=
-29 18:11:37 UTC (rev 5207)
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
 PHP URL encoding/decoding functions for Javascript interaction V3.0
 (C) 2006 www.captain.at - all rights reserved



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


From MAILER-DAEMON Fri Mar 29 14:55:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ULeSK-0002LD-KS
	for mharc-phpcompta-dev@gnu.org; Fri, 29 Mar 2013 14:55:16 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 29 Mar 2013 19:50:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1253427.1364583315.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5208 - in phpcompta/branches/rel601-ovh: 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: Fri, 29 Mar 2013 18:55:15 -0000

Author: danydb
Date: 2013-03-29 19:50:16 +0100 (Fri, 29 Mar 2013)
New Revision: 5208

Modified:
   phpcompta/branches/rel601-ovh/html/direct.php
   phpcompta/branches/rel601-ovh/html/do.php
   phpcompta/branches/rel601-ovh/include/action.common.inc.php
   phpcompta/branches/rel601-ovh/include/adm.inc.php
   phpcompta/branches/rel601-ovh/include/ajax_add_menu.php
   phpcompta/branches/rel601-ovh/include/ajax_auto_anc_card.php
   phpcompta/branches/rel601-ovh/include/ajax_get_menu_detail.php
   phpcompta/branches/rel601-ovh/include/ajax_get_profile.php
   phpcompta/branches/rel601-ovh/include/ajax_plugin_detail.php
   phpcompta/branches/rel601-ovh/include/audit_log.php
   phpcompta/branches/rel601-ovh/include/bank.inc.php
   phpcompta/branches/rel601-ovh/include/class_profile_menu.php
   phpcompta/branches/rel601-ovh/include/client.inc.php
   phpcompta/branches/rel601-ovh/include/constant.php
   phpcompta/branches/rel601-ovh/include/contact.inc.php
   phpcompta/branches/rel601-ovh/include/menu.inc.php
   phpcompta/branches/rel601-ovh/include/pref.inc.php
   phpcompta/branches/rel601-ovh/include/supplier.inc.php
   phpcompta/branches/rel601-ovh/include/template/account_result.php
   phpcompta/branches/rel601-ovh/include/template/account_search.php
   phpcompta/branches/rel601-ovh/include/template/action-reference.php
   phpcompta/branches/rel601-ovh/include/template/calendar.php
   phpcompta/branches/rel601-ovh/include/template/card_result.php
   phpcompta/branches/rel601-ovh/include/template/category_of_card.php
   phpcompta/branches/rel601-ovh/include/template/dashboard.php
   phpcompta/branches/rel601-ovh/include/template/detail-action.php
   phpcompta/branches/rel601-ovh/include/template/fiche_def_input.php
   phpcompta/branches/rel601-ovh/include/template/forecast-detail.php
   phpcompta/branches/rel601-ovh/include/template/forecast_cat.php
   phpcompta/branches/rel601-ovh/include/template/forecast_result.php
   phpcompta/branches/rel601-ovh/include/template/form_ledger_detail.php
   phpcompta/branches/rel601-ovh/include/template/form_ledger_fin.php
   phpcompta/branches/rel601-ovh/include/template/impress_cat_card.php
   phpcompta/branches/rel601-ovh/include/template/impress_reconciliation.=
php
   phpcompta/branches/rel601-ovh/include/template/ledger_detail_ach.php
   phpcompta/branches/rel601-ovh/include/template/ledger_detail_bottom.ph=
p
   phpcompta/branches/rel601-ovh/include/template/ledger_detail_file.php
   phpcompta/branches/rel601-ovh/include/template/ledger_detail_fin.php
   phpcompta/branches/rel601-ovh/include/template/ledger_detail_forbidden=
.php
   phpcompta/branches/rel601-ovh/include/template/ledger_detail_misc.php
   phpcompta/branches/rel601-ovh/include/template/ledger_detail_top.php
   phpcompta/branches/rel601-ovh/include/template/ledger_detail_ven.php
   phpcompta/branches/rel601-ovh/include/template/ledger_search.php
   phpcompta/branches/rel601-ovh/include/template/letter_all.php
   phpcompta/branches/rel601-ovh/include/template/letter_prop.php
   phpcompta/branches/rel601-ovh/include/template/list_category_document.=
php
   phpcompta/branches/rel601-ovh/include/template/list_mod_payment.php
   phpcompta/branches/rel601-ovh/include/template/menu.php
   phpcompta/branches/rel601-ovh/include/template/menu_detail.php
   phpcompta/branches/rel601-ovh/include/template/modele_document.php
   phpcompta/branches/rel601-ovh/include/template/module.php
   phpcompta/branches/rel601-ovh/include/template/new_mod_payment.php
   phpcompta/branches/rel601-ovh/include/template/param_jrn.php
   phpcompta/branches/rel601-ovh/include/template/periode_add_exercice.ph=
p
   phpcompta/branches/rel601-ovh/include/template/profile.php
   phpcompta/branches/rel601-ovh/include/template/result_cat_card_summary=
.php
   phpcompta/branches/rel601-ovh/include/template/search_top.php
   phpcompta/branches/rel601-ovh/include/user_detail.inc.php
Log:
change short tag by long tag

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/html/direct.php	2013-03-29 18:11:37 UTC=
 (rev 5207)
+++ phpcompta/branches/rel601-ovh/html/direct.php	2013-03-29 18:50:16 UTC=
 (rev 5208)
@@ -1,4 +1,4 @@
-<?
+<?php
 require_once "../include/setting.php";
 require_once ("class_database.php");
 require_once 'class_user.php';

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/html/do.php	2013-03-29 18:11:37 UTC (re=
v 5207)
+++ phpcompta/branches/rel601-ovh/html/do.php	2013-03-29 18:50:16 UTC (re=
v 5208)
@@ -19,6 +19,7 @@
  */
 /* $Revision$ */
=20
+
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 require_once "../include/setting.php";
 /* !\file

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/action.common.inc.php	2013-03-2=
9 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/action.common.inc.php	2013-03-2=
9 18:50:16 UTC (rev 5208)
@@ -238,7 +238,7 @@
   <div id=3D"search_action" style=3D"width:50%;text-align:right;clear:bo=
th;display:block;">
     <fieldset>
     <legend>
-    <?=3D_('Recherche avanc=C3=A9e')?>
+    <?php echo _('Recherche avanc=C3=A9e')?>
     </legend>
     <form method=3D"get" action=3D"do.php">
     <?php
@@ -290,10 +290,10 @@
=20
   echo _('affect=C3=A9 =C3=A0 d\'autre:').$my_action->input().'<br/>';
   ?>
-    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D_('recherche')?>">
+    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?php echo _('recherche')?>">
        <input type=3D"hidden" name=3D"sa" value=3D"list">
=20
-       <?=3D$supl_hidden?>
+       <?php echo $supl_hidden?>
        </form>
=20
        </fieldset>
@@ -304,11 +304,11 @@
        <form  method=3D"get" action=3D"do.php">
        <?php echo dossier::hidden();
   ?>
-       <input type=3D"submit" class=3D"button" name=3D"submit_query" val=
ue=3D"<?=3D_("Ajout Action")?>">
-	  <input type=3D"hidden" name=3D"ac" value=3D"<?=3D$_REQUEST['ac']?>">
+       <input type=3D"submit" class=3D"button" name=3D"submit_query" val=
ue=3D"<?php echo _("Ajout Action")?>">
+	  <input type=3D"hidden" name=3D"ac" value=3D"<?php echo $_REQUEST['ac'=
]?>">
 	  <input type=3D"hidden" name=3D"sa" value=3D"add_action">
-	  <?=3D$supl_hidden?>
-	  <input id=3D"bt_search" type=3D"button" class=3D"button" onclick=3D"t=
oggleShow(this,'<?=3D_('Afficher Recherche')?>','<?=3D_('Cache Recherche'=
)?>','search_action')" value=3D"">
+	  <?php echo $supl_hidden?>
+	  <input id=3D"bt_search" type=3D"button" class=3D"button" onclick=3D"t=
oggleShow(this,'<?php echo _('Afficher Recherche')?>','<?php echo _('Cach=
e Recherche')?>','search_action')" value=3D"">
=20
 	  <script language=3D"JavaScript">
 	  <?php
@@ -324,7 +324,7 @@
 	  else
 	    {
 	      ?>
-	      toggleShow($('bt_search'),'<?=3D_('Afficher Recherche')?>','<?=3D=
_('Cache Recherche')?>','search_action')
+	      toggleShow($('bt_search'),'<?php echo _('Afficher Recherche')?>',=
'<?php echo _('Cache Recherche')?>','search_action')
 		<?php
 		}
   ?>

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/adm.inc.php	2013-03-29 18:11:37=
 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/adm.inc.php	2013-03-29 18:50:16=
 UTC (rev 5208)
@@ -89,7 +89,7 @@
     echo _('Cat=C3=A9gorie :').$sel_card->input();
=20
     ?>
-    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D_('recherche')?>">
+    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?php echo _('recherche')?>">
 	 <input type=3D"hidden" name=3D"p_action" value=3D"adm">
                                                                      </f=
orm>
                                                                      </d=
iv>

Modified: phpcompta/branches/rel601-ovh/include/ajax_add_menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/ajax_add_menu.php	2013-03-29 18=
:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/ajax_add_menu.php	2013-03-29 18=
:50:16 UTC (rev 5208)
@@ -57,31 +57,31 @@
 echo HtmlInput::title_box("Nouveau menu", $ctl);
 ?>
 <form method=3D"POST" onsubmit=3D"return confirm('Vous confirmez ?')">
-	<?=3DHtmlInput::hidden('p_id',$p_id)?>
+	<?php echo HtmlInput::hidden('p_id',$p_id)?>
 <table>
 <tr>
 	<td>Code</td>
-	<td><?=3D$me_code->input()?></td>
+	<td><?php echo $me_code->input()?></td>
 </tr>
 <tr>
 	<td>D=C3=A9pendant de </td>
-	<td><?=3D$me_code_dep->input()?></td>
+	<td><?php echo $me_code_dep->input()?></td>
 </tr>
=20
 <tr>
 	<td>Ordre d'apparition</td>
-	<td><?=3D$p_order->input()?></td>
+	<td><?php echo $p_order->input()?></td>
 </tr>
 <tr>
 	<td>Menu par d=C3=A9faut</td>
-	<td><?=3D$pm_default->input()?></td>
+	<td><?php echo $pm_default->input()?></td>
 </tr>
 <tr>
 	<td>Type de menu</td>
-	<td><?=3D$p_type->input()?></td>
+	<td><?php echo $p_type->input()?></td>
 </tr>
 </table>
-<?
+<?php
 echo HtmlInput::submit('add_menu',"Valider");
 echo '</form>';
 ?>

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/ajax_auto_anc_card.php	2013-03-=
29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/ajax_auto_anc_card.php	2013-03-=
29 18:50:16 UTC (rev 5208)
@@ -1,4 +1,4 @@
-<?
+<?php
 require_once ("class_database.php");
 require_once 'class_user.php';
 $cn=3Dnew Database($_GET['gDossier']);
@@ -6,7 +6,7 @@
 $user->Check();
 $user->check_dossier($_GET['gDossier']);
 if ( isset($_REQUEST['pa_id']) )
-{  =20
+{
     $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']));
 }

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

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/ajax_get_profile.php	2013-03-29=
 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/ajax_get_profile.php	2013-03-29=
 18:50:16 UTC (rev 5208)
@@ -34,9 +34,9 @@
 $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>
+<h1>Profile <?php echo $profile->p_name?></h1>
=20
-<?
+<?php
 $id=3DHtmlInput::hidden('p_id',$profile->p_id);
 $name=3Dnew IText("p_name",$profile->p_name);
 $desc=3Dnew IText("p_desc",$profile->p_desc);

Modified: phpcompta/branches/rel601-ovh/include/ajax_plugin_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/ajax_plugin_detail.php	2013-03-=
29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/ajax_plugin_detail.php	2013-03-=
29 18:50:16 UTC (rev 5208)
@@ -33,22 +33,22 @@
 <table>
 	<tr>
 		<TD>Label</td>
-		<td><?=3D$me_menu->input();?></td>
+		<td><?php echo $me_menu->input();?></td>
 	</tr>
 	<tr>
 		<TD>Code</td>
-		<td><?=3D$me_code->input();?></td>
+		<td><?php echo $me_code->input();?></td>
 	</tr>
 	<tr>
 		<TD>Description</td>
-		<td><?=3D$me_description->input();?></td>
+		<td><?php echo $me_description->input();?></td>
 	</tr>
 	<tr>
 		<TD>Fichier</td>
-		<td><?=3D$me_file->input();?></td>
+		<td><?php echo $me_file->input();?></td>
 	</tr>
 </table>
-	<?
+	<?php
 	if ($new =3D=3D1 )
 	{
 		echo HtmlInput::submit("save_plugin","Ajouter ce plugin");

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/audit_log.php	2013-03-29 18:11:=
37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/audit_log.php	2013-03-29 18:50:=
16 UTC (rev 5208)
@@ -47,23 +47,23 @@
     $r=3D$cn->fetch($i);
 ?>
 <td>
-    <?=3Dh($r['ac_user']);?>
+    <?php echo h($r['ac_user']);?>
 </td>
=20
 <td>
-<?=3D$r['fmt_date'];?>
+<?php echo $r['fmt_date'];?>
 </td>
=20
 <td>
-<?=3D$r['ac_ip'];?>
+<?php echo $r['ac_ip'];?>
 </td>
=20
 <td>
-<?=3D$r['ac_module'];?>
+<?php echo $r['ac_module'];?>
 </td>
=20
=20
-<?
+<?php
 switch ( $r['ac_state'] )
   {
   case 'FAIL';
@@ -76,11 +76,11 @@
 	  echo '<td>';
   }
 ?>
-<?=3D$r['ac_state']?>
+<?php echo $r['ac_state']?>
 </td>
=20
 </TR>
-<?
+<?php
   endfor;
 ?>
=20

Modified: phpcompta/branches/rel601-ovh/include/bank.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/bank.inc.php	2013-03-29 18:11:3=
7 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/bank.inc.php	2013-03-29 18:50:1=
6 UTC (rev 5208)
@@ -85,8 +85,8 @@
     echo _('Inclure les banques sans op=C3=A9ration :').$nooperation->in=
put();
=20
     ?>
-    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D_('recherche')?>">
-                                           <input type=3D"hidden" name=3D=
"ac" value=3D"<?=3D$_REQUEST['ac']?>">
+    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?php echo _('recherche')?>">
+                                           <input type=3D"hidden" name=3D=
"ac" value=3D"<?php echo $_REQUEST['ac']?>">
                                                                      </f=
orm>
                                                                      </d=
iv>
                                                                      <?p=
hp

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/class_profile_menu.php	2013-03-=
29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/class_profile_menu.php	2013-03-=
29 18:50:16 UTC (rev 5208)
@@ -39,10 +39,10 @@
 						'<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?>
-					<?
+					<?php echo  $me_menu?>
+					( <?php echo  $js?> )
+					<?php echo  $me_desc?>
+					<?php
 					$ret2 =3D $this->cn->exec_sql("
 									SELECT pm_id,
 										pm.me_code,

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/client.inc.php	2013-03-29 18:11=
:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/client.inc.php	2013-03-29 18:50=
:16 UTC (rev 5208)
@@ -83,8 +83,8 @@
=20
 		echo _('Inclure les clients sans op=C3=A9ration :') . $nooperation->in=
put();
 		?>
-    	    <input type=3D"submit" class=3D"button" name=3D"submit_query" v=
alue=3D"<?=3D _('recherche')?>">
-    	    <input type=3D"hidden" name=3D"ac" value=3D"<?=3D $_REQUEST['ac=
']?>">
+    	    <input type=3D"submit" class=3D"button" name=3D"submit_query" v=
alue=3D"<?php echo  _('recherche')?>">
+    	    <input type=3D"hidden" name=3D"ac" value=3D"<?php echo  $_REQUE=
ST['ac']?>">
     	</form>
         </div>
 	<?php

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/constant.php	2013-03-29 18:11:3=
7 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/constant.php	2013-03-29 18:50:1=
6 UTC (rev 5208)
@@ -36,7 +36,7 @@
 /*set to none for production */
 /* uncomment for production */
 //$version_phpcompta=3DSVNINFO;
-define ("DEBUG",false);
+define ("DEBUG",true);
=20
 $version_phpcompta=3D4823;
 //define ("DEBUG",true);

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/contact.inc.php	2013-03-29 18:1=
1:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/contact.inc.php	2013-03-29 18:5=
0:16 UTC (rev 5208)
@@ -90,8 +90,8 @@
 		echo _('Soci=C3=A9t=C3=A9 :') . $sl_company->input();
=20
 		?>
-    	    <input type=3D"submit" class=3D"button" name=3D"submit_query" v=
alue=3D"<?=3D _('recherche')?>">
-    	    <input type=3D"hidden" name=3D"ac" value=3D"<?=3D $_REQUEST['ac=
']?>">
+    	    <input type=3D"submit" class=3D"button" name=3D"submit_query" v=
alue=3D"<?php echo  _('recherche')?>">
+    	    <input type=3D"hidden" name=3D"ac" value=3D"<?php echo  $_REQUE=
ST['ac']?>">
     	</form>
         </div>
 	<?php

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/menu.inc.php	2013-03-29 18:11:3=
7 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/menu.inc.php	2013-03-29 18:50:1=
6 UTC (rev 5208)
@@ -143,9 +143,9 @@
 ?>
 <fieldset><legend>Recherche</legend>
 <form method=3D"GET">
-	<?=3D$iselect->input()?>
-	<?=3DHtmlInput::submit("search", "Recherche")?>
-	<?=3DHtmlInput::request_to_hidden(array('ac','gDossier','ord'))?>
+	<?php echo $iselect->input()?>
+	<?php echo HtmlInput::submit("search", "Recherche")?>
+	<?php echo HtmlInput::request_to_hidden(array('ac','gDossier','ord'))?>
 </form>
 </fieldset>
 <p class=3D"info"> le type vaut :
@@ -157,7 +157,7 @@
 	</ul>
=20
 	</p>
-<?
+<?php
 $gDossier=3DDossier::id();
 echo HtmlInput::button("Add_plugin", "Ajout d'un plugin", "onclick=3Dadd=
_plugin($gDossier)");
 echo HtmlInput::button("Add_menu", "Ajout d'un menu", "onclick=3Dcreate_=
menu($gDossier)");

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/pref.inc.php	2013-03-29 18:11:3=
7 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/pref.inc.php	2013-03-29 18:50:1=
6 UTC (rev 5208)
@@ -149,7 +149,7 @@
     		    </td>
     		    <td>  <?php echo $msg;?></td>
     		<tr>
-    		    <td><? echo _('Taille des pages');?></td>
+    		    <td><?php echo _('Taille des pages');?></td>
     		    <td>
     			<SELECT NAME=3D"p_size">
     			    <option value=3D"15">15
@@ -167,7 +167,7 @@
=20
     		    </td>
     		</tr>
-		    <?
+		    <?php
 		}
 		?>
 	    </table>

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/supplier.inc.php	2013-03-29 18:=
11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/supplier.inc.php	2013-03-29 18:=
50:16 UTC (rev 5208)
@@ -89,8 +89,8 @@
     echo _('Inclure les fournisseurs sans op=C3=A9ration :').$nooperatio=
n->input();
=20
     ?>
-    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?=3D_('recherche')?>">
-                                           <input type=3D"hidden" name=3D=
"ac" value=3D"<?=3D$_REQUEST['ac']?>">
+    <input type=3D"submit" class=3D"button" name=3D"submit_query" value=3D=
"<?php echo _('recherche')?>">
+                                           <input type=3D"hidden" name=3D=
"ac" value=3D"<?php echo $_REQUEST['ac']?>">
                                                                      </f=
orm>
                                                                      </d=
iv>
                                                                      <?p=
hp

Modified: phpcompta/branches/rel601-ovh/include/template/account_result.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/account_result.php	201=
3-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/account_result.php	201=
3-03-29 18:50:16 UTC (rev 5208)
@@ -1,28 +1,28 @@
 <fieldset id=3D"asearch" style=3D"height:88%">
-<legend><? echo _('R=C3=A9sultats')?></legend>
+<legend><?php echo _('R=C3=A9sultats')?></legend>
 <div style=3D"height:88%;overflow:auto;">
 <table>
-<? for ($i=3D0;$i<sizeof($array);$i++) : ?>
+<?php for ($i=3D0;$i<sizeof($array);$i++) : ?>
 <tr>
 <td>
-<a href=3D"javascript:void(0)" onclick=3D"<?=3D$array[$i]['javascript']?=
>">
-<span  id=3D"val<?=3D$i?>">
-<?=3D$array[$i]['pcm_val']?>
+<a href=3D"javascript:void(0)" onclick=3D"<?php echo $array[$i]['javascr=
ipt']?>">
+<span  id=3D"val<?php echo $i?>">
+<?php echo $array[$i]['pcm_val']?>
 </span>
 </a>
 </td>
 <td>
-<span id=3D"lib<?=3D$i?>">
-<?=3D$array[$i]['pcm_lib']?>
+<span id=3D"lib<?php echo $i?>">
+<?php echo $array[$i]['pcm_lib']?>
 </span>
 </td>
 </tr>
=20
=20
-<? endfor; ?>
+<?php endfor; ?>
 </table>
 <span style=3D"font-style:italic">
-<? echo _("Nombre d'enregistrements")." ".$i;?>
+<?php echo _("Nombre d'enregistrements")." ".$i;?>
 </span>
=20
 </div>

Modified: phpcompta/branches/rel601-ovh/include/template/account_search.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/account_search.php	201=
3-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/account_search.php	201=
3-03-29 18:50:16 UTC (rev 5208)
@@ -1,3 +1,3 @@
-<? echo _('Partie du poste comptable ou du libell=C3=A9'); ?>
-<?=3D$str_poste?>
-<?=3D$str_submit?>
\ No newline at end of file
+<?php echo _('Partie du poste comptable ou du libell=C3=A9'); ?>
+<?php echo $str_poste?>
+<?php echo $str_submit?>
\ No newline at end of file

Modified: phpcompta/branches/rel601-ovh/include/template/action-reference=
.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/action-reference.php	2=
013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/action-reference.php	2=
013-03-29 18:50:16 UTC (rev 5208)
@@ -29,7 +29,7 @@
 $new_action=3Dnew INum('new_ref',0);
 ?>
 <p>
-	Ajout d'une action qui d=C3=A9pend de l'action actuelle : <?=3D$new_act=
ion->input()?>
+	Ajout d'une action qui d=C3=A9pend de l'action actuelle : <?php echo $n=
ew_action->input()?>
 	<span class=3D"notice"> Ne donner que le num=C3=A9ro de document
 	</span>
 </p>
\ No newline at end of file

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/calendar.php	2013-03-2=
9 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/calendar.php	2013-03-2=
9 18:50:16 UTC (rev 5208)
@@ -1,5 +1,5 @@
 <div class=3D"pc_calendar" id=3D"user_cal" style=3D"width:100%">
-<?=3D$month_year?>
+<?php echo $month_year?>
 <table width=3D"100%">
 <tr>
 <?php

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

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

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/dashboard.php	2013-03-=
29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/dashboard.php	2013-03-=
29 18:50:16 UTC (rev 5208)
@@ -1,6 +1,6 @@
 <div style=3D"float:left;width:50%">
 <fieldset style=3D"width:100%">
-<legend><?=3D_('Calendrier')?>
+<legend><?php echo _('Calendrier')?>
 </legend>
 <?php echo $cal->display(); ?>
 </fieldset>
@@ -25,7 +25,7 @@
 ?>
=20
 <div style=3D"float:right;width:45%">
-<fieldset> <legend><?=3D_('Pense-B=C3=AAte')?></legend>
+<fieldset> <legend><?php echo _('Pense-B=C3=AAte')?></legend>
=20
 <?php
 echo HtmlInput::button('add',_('Ajout'),'onClick=3D"add_todo()"');

Modified: phpcompta/branches/rel601-ovh/include/template/detail-action.ph=
p
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/detail-action.php	2013=
-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/detail-action.php	2013=
-03-29 18:50:16 UTC (rev 5208)
@@ -1,6 +1,6 @@
 <fieldset>
   <legend>
-<?=3D_('Informations g=C3=A9n=C3=A9rales')?>
+<?php echo _('Informations g=C3=A9n=C3=A9rales')?>
   </legend>
   <div style=3D"float:right">
     <?echo $retour;
@@ -12,7 +12,7 @@
         <table width=3D"50%">
           <TR>
             <TD>
-   <?=3D_('Date')?>
+   <?php echo _('Date')?>
             </TD>
             <TD>
               <?php echo $date->input();
@@ -21,7 +21,7 @@
           </TR>
           <TR>
             <TD>
-	    <?=3D_('Heure')?>
+	    <?php echo _('Heure')?>
             </TD>
             <TD>
               <?php echo $str_ag_hour;
@@ -30,7 +30,7 @@
           </TR>
           <tr>
             <TD>
-	    <?=3D_('Reference')?>
+	    <?php echo _('Reference')?>
             </TD>
             <TD>
               <?php echo $str_ag_ref;
@@ -39,7 +39,7 @@
           </TR>
 	<tr>
           <TD>
-	    <?=3D_('Destinataire')?>
+	    <?php echo _('Destinataire')?>
           </TD>
           <TD>
   <?php echo $w->search().$w->input();
@@ -48,7 +48,7 @@
           </Tr>
 	<tr>
           <TD>
-	  <?=3D_('Contact')?>
+	  <?php echo _('Contact')?>
           </TD>
           <TD>
   <?php echo $ag_contact->search().$ag_contact->input();
@@ -68,7 +68,7 @@
         <table>
           <tr>
             <td>
-   <?=3D_('Concerne')?>
+   <?php echo _('Concerne')?>
             </td>
             <td>
               <?php echo $lag_ref_ag_id;
@@ -77,7 +77,7 @@
           </tr>
           <tr>
             <TD>
-	    <?=3D_('Type')?>
+	    <?php echo _('Type')?>
             </TD>
             <TD>
               <?php echo $str_doc_type;
@@ -87,7 +87,7 @@
=20
           <tr>
             <TD>
-	    <?=3D_('Calendrier')?>
+	    <?php echo _('Calendrier')?>
             </TD>
             <TD>
               <?php echo $str_ag_cal;
@@ -96,7 +96,7 @@
           </tr>
           <tr>
             <TD>
-	    <?=3D_('Etat')?>
+	    <?php echo _('Etat')?>
             </TD>
             <td>
               <?php echo $str_state;
@@ -106,7 +106,7 @@
           </TR>
           <tr>
             <TD>
-	    <?=3D_('Priorit=C3=A9')?>
+	    <?php echo _('Priorit=C3=A9')?>
             </TD>
             <td>
               <?php echo $str_ag_priority;
@@ -116,7 +116,7 @@
           </TR>
           <tr>
             <TD>
-	    <?=3D_('Affect=C3=A9')?>
+	    <?php echo _('Affect=C3=A9')?>
             </TD>
             <td>
               <?php echo $str_ag_dest;?>
@@ -130,7 +130,7 @@
 </fieldset>
 <fieldset>
   <legend>
-	    <?=3D_('Description')?>
+	    <?php echo _('Description')?>
   </legend>
   <p>
 <script language=3D"javascript">
@@ -147,24 +147,24 @@
    }
 </script>
=20
-   <h4 class=3D"info"><?=3D_('Titre')?></h4>
+   <h4 class=3D"info"><?php echo _('Titre')?></h4>
     <p style=3D"margin-left:100">
     <?php echo $title->input();
     ?>
 </p>
-<h4 class=3D"info">   <?=3D_('Commentaire')?></h4>
+<h4 class=3D"info">   <?php echo _('Commentaire')?></h4>
     <div style=3D"margin-left:100">
     <?php echo $desc->input();
 $style_enl=3D'style=3D"display:inline"';$style_small=3D'style=3D"display=
:none"';
 if (strlen($desc->value)>300) {$style_enl=3D'style=3D"display:none"';$st=
yle_small=3D'style=3D"display:inline"';}
 ?>
-<input type=3D"button" id=3D"bt_enlarge" <?=3D$style_enl?> value=3D"+" o=
nclick=3D"enlarge('ag_comment');return false;">
-<input type=3D"button" id=3D"bt_small"  <?=3D$style_small?> value=3D"-" =
style=3D"display:none" onclick=3D"small('ag_comment');return false;">
+<input type=3D"button" id=3D"bt_enlarge" <?php echo $style_enl?> value=3D=
"+" onclick=3D"enlarge('ag_comment');return false;">
+<input type=3D"button" id=3D"bt_small"  <?php echo $style_small?> value=3D=
"-" style=3D"display:none" onclick=3D"small('ag_comment');return false;">
   </div>
 </fieldset>
 <input type=3D'button' class=3D"button" value=3D'Montrer articles' id=3D=
"toggleButton" onclick=3D'toggleShowDetail()'>
 <fieldset id=3D"fldDetail" style=3D'display:block'>
-   <LEGEND> <?=3D_('D=C3=A9tail des articles')?>
+   <LEGEND> <?php echo _('D=C3=A9tail des articles')?>
 </LEGEND>
 <?php // hidden fields
 for ($i=3D0;$i<count($aArticle);$i++) :
@@ -175,13 +175,13 @@
 ?>
 <table id=3D"art" >
 <tr>
-  <th><?=3D_('Fiche')?></th>
-  <th><?=3D_('Description')?></th>
-  <th><?=3D_('prix unitaire')?></th>
-<th><?=3D_('quantit=C3=A9')?></th>
-<th><?=3D_('Code TVA')?></th>
-<th><?=3D_('Montant TVA')?></th>
-<th><?=3D_('Montant TVAC')?></th>
+  <th><?php echo _('Fiche')?></th>
+  <th><?php echo _('Description')?></th>
+  <th><?php echo _('prix unitaire')?></th>
+<th><?php echo _('quantit=C3=A9')?></th>
+<th><?php echo _('Code TVA')?></th>
+<th><?php echo _('Montant TVA')?></th>
+<th><?php echo _('Montant TVAC')?></th>
=20
 </tr>
=20
@@ -203,14 +203,14 @@
 function toggleShowDetail() {
 	try {var detail=3Dg('fldDetail');
 	var but=3Dg('toggleButton');
-	if (detail.style.display=3D=3D'block' ) { but.value=3D"<?=3D_("Montrer =
les d=C3=A9tails")?>";detail.style.display=3D'none';}
-	else { but.value=3D"<?=3D_("Cacher les d=C3=A9tails")?>";detail.style.d=
isplay=3D'block';} }
+	if (detail.style.display=3D=3D'block' ) { but.value=3D"<?php echo _("Mo=
ntrer les d=C3=A9tails")?>";detail.style.display=3D'none';}
+	else { but.value=3D"<?php echo _("Cacher les d=C3=A9tails")?>";detail.s=
tyle.display=3D'block';} }
 	catch (error)  {alert(error);}
 	}
=20
 </script>
 <div style=3D"float: left; text-align: right; padding-right: 5px; font-s=
ize: 1.2em; font-weight: bold; color: blue;">
-  <input name=3D"act" id=3D"act" class=3D"button" value=3D"<?=3D_('Actua=
liser')?>" onclick=3D"compute_all_ledger();" type=3D"button">
+  <input name=3D"act" id=3D"act" class=3D"button" value=3D"<?php echo _(=
'Actualiser')?>" onclick=3D"compute_all_ledger();" type=3D"button">
=20
     <div style=3D"float: right; text-align: left; font-size: 1.2em; font=
-weight: bold; color: blue;" id=3D"sum">
     <br><span id=3D"htva">0.0</span>
@@ -228,7 +228,7 @@
 </fieldset>
 <fieldset >
   <legend>
-     <?=3D_('Document =C3=A0 g=C3=A9n=C3=A9rer')?>
+     <?php echo _('Document =C3=A0 g=C3=A9n=C3=A9rer')?>
   </legend>
   <?php echo $str_select_doc;
 echo $str_submit_generate;
@@ -236,7 +236,7 @@
 </fieldset>
 <fieldset>
   <legend>
-     <?=3D_('Pi=C3=A8ces attach=C3=A9es')?>
+     <?php echo _('Pi=C3=A8ces attach=C3=A9es')?>
   </legend>
   <?php
 for ($i=3D0;$i<sizeof($aAttachedFile);$i++) :
@@ -262,7 +262,7 @@
 	new_element.innerHTML=3D'<input class=3D"inp" type=3D"file" value=3D"" =
name=3D"file_upload[]"/>';
 	docAdded.appendChild(new_element);
 }
-catch(exception) { alert('<?=3Dj(_('Je ne peux pas ajouter de fichier'))=
?>'); alert(exception.message);}
+catch(exception) { alert('<?php echo j(_('Je ne peux pas ajouter de fich=
ier'))?>'); alert(exception.message);}
 }
 </script>
   <p>

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

Modified: phpcompta/branches/rel601-ovh/include/template/forecast-detail.=
php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/forecast-detail.php	20=
13-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/forecast-detail.php	20=
13-03-29 18:50:16 UTC (rev 5208)
@@ -24,7 +24,7 @@
 </tr>
 <?php endfor;?>
 </table>
-<?=3D$f_add_row ?>
+<?php echo $f_add_row ?>
 </fieldset>
=20
=20

Modified: phpcompta/branches/rel601-ovh/include/template/forecast_cat.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/forecast_cat.php	2013-=
03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/forecast_cat.php	2013-=
03-29 18:50:16 UTC (rev 5208)
@@ -2,8 +2,8 @@
 <legend>
 <?php echo $str_action;?></legend>
 <?php echo $str_name;?>
-Date de d=C3=A9but <?=3D$str_start_date?>
-Date de fin <?=3D$str_end_date ?>
+Date de d=C3=A9but <?php echo $str_start_date?>
+Date de fin <?php echo $str_end_date ?>
=20
 <h2> <?php echo _('Cat=C3=A9gories');?></h2>
 <table>

Modified: phpcompta/branches/rel601-ovh/include/template/forecast_result.=
php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/forecast_result.php	20=
13-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/forecast_result.php	20=
13-03-29 18:50:16 UTC (rev 5208)
@@ -1,5 +1,5 @@
 <h1><?php echo $str_name;?></h1>
-P=C3=A9riode du <?=3D$str_start?> =C3=A0 <?=3D$str_end;?>
+P=C3=A9riode du <?php echo $str_start?> =C3=A0 <?php echo $str_end;?>
 <?php  for ($i=3D0;$i<count($aCat);$i++): // foreach category ?>
 <?php if (count($aItem[$i])=3D=3D0) continue;?>
 <fieldset>
@@ -166,18 +166,18 @@
=20
=20
 <?php endfor;?>
-<? if ( ! empty ($error) ) : ?>
+<?php if ( ! empty ($error) ) : ?>
 <div class=3D"error">
 D=C3=A9sol=C3=A9 il y a des formules incorrectes=20
 <ul style=3D"list-style-type:none">
=20
-   <? $last=3D"";?>
-   <? for ($i=3D0;$i<count($error);$i++) : ?>
-<?
+   <?php $last=3D"";?>
+   <?php for ($i=3D0;$i<count($error);$i++) : ?>
+<?php=20
    if ( $last !=3D $error[$i] ) {  echo h($error[$i]); }
 $last=3D$error[$i];
 endfor;
 ?>
 </ul>
 </div>
-<? endif; ?>
\ No newline at end of file
+<?php endif; ?>
\ No newline at end of file

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

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/form_ledger_fin.php	20=
13-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/form_ledger_fin.php	20=
13-03-29 18:50:16 UTC (rev 5208)
@@ -1,34 +1,34 @@
 <fieldset>
 	<div id=3D"jrn_name_div">
-	<h2 id=3D"jrn_name"> <?=3D$this->get_name()?></h2>
+	<h2 id=3D"jrn_name"> <?php echo $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 ?>
+<legend><?php echo $f_legend ?> </legend>
+   <?php echo _('Date').' '.$f_date ?>
+<?php echo $f_period?><br>
+<?php echo $f_jrn?><br>
+<?php echo _('Banque')?><?php echo $f_bank ?>
=20
 </fieldset>
=20
 <fieldset>
-<legend><?=3D$f_legend_detail?></legend>
-   <fieldset><legend><?=3D_('Extrait de compte')?></legend>
-   <?=3D_('Num=C3=A9ro extrait')?> <?=3D$f_extrait?>
-   <?=3D_('Solde d=C3=A9but') ?> <?=3D$wFirst->input();?>
-<?=3D_('Solde Fin')?> <?=3D$wLast->input();?>
+<legend><?php echo $f_legend_detail?></legend>
+   <fieldset><legend><?php echo _('Extrait de compte')?></legend>
+   <?php echo _('Num=C3=A9ro extrait')?> <?php echo $f_extrait?>
+   <?php echo _('Solde d=C3=A9but') ?> <?php echo $wFirst->input();?>
+<?php echo _('Solde Fin')?> <?php echo $wLast->input();?>
 </fieldset>
-<?=3D$str_add_button?>
-   <fieldset><legend><?=3D_('Op=C3=A9rations')?></legend>
+<?php echo $str_add_button?>
+   <fieldset><legend><?php echo _('Op=C3=A9rations')?></legend>
 <table id=3D"fin_item" width=3D"100%" border=3D"0">
 <tr>
 <th style=3D"text-align: left;width: auto">code<?HtmlInput::infobulle(0)=
?></TH>
-   <th style=3D"text-align: left"><?=3D_('Fiche')?></TH>
-   <th style=3D"text-align: left"><?=3D_('Commentaire')?></TH>
-   <th style=3D"text-align: left"><?=3D_('Montant')?></TH>
-   <th style=3D"text-align: left;width:auto"colspan=3D"2"> <?=3D_('Op. C=
oncern=C3=A9e(s)')?></th>
+   <th style=3D"text-align: left"><?php echo _('Fiche')?></TH>
+   <th style=3D"text-align: left"><?php echo _('Commentaire')?></TH>
+   <th style=3D"text-align: left"><?php echo _('Montant')?></TH>
+   <th style=3D"text-align: left;width:auto"colspan=3D"2"> <?php echo _(=
'Op. Concern=C3=A9e(s)')?></th>
 </tr>
=20
-<? foreach ($array as $item) {
+<?php foreach ($array as $item) {
 echo '<tr>';
 echo td($item['qcode'].$item['search']);
 echo td($item['cname']);

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/impress_cat_card.php	2=
013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/impress_cat_card.php	2=
013-03-29 18:50:16 UTC (rev 5208)
@@ -1,22 +1,22 @@
 <table>
 <tr>
-  <td><?=3D_('Categorie')?> </td>
-  <td><?=3D$str_categorie?></td>
+  <td><?php echo _('Categorie')?> </td>
+  <td><?php echo $str_categorie?></td>
 </tr>
 <tr>
-  <td><?=3D_('Type')?></td>
-  <td><?=3D$str_histo?></td>
+  <td><?php echo _('Type')?></td>
+  <td><?php echo $str_histo?></td>
 </tr>
 <tr id=3D"trstart">
-  <td><?=3D_('Depuis')?></td>
-  <td> <?=3D$str_start?></td>
+  <td><?php echo _('Depuis')?></td>
+  <td> <?php echo $str_start?></td>
 </tr>
 <tr id=3D"trend">
-  <td><?=3D_('Jusque')?></td>
-  <td><?=3D$str_end?></td>
+  <td><?php echo _('Jusque')?></td>
+  <td><?php echo $str_end?></td>
 <tr id=3D"allcard">
 	<td>Toutes les fiches</td>
-	<td><?=3D$str_icall?></td>
+	<td><?php echo $str_icall?></td>
 </tr>
 </tr>
 </table>

Modified: phpcompta/branches/rel601-ovh/include/template/impress_reconcil=
iation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/impress_reconciliation=
.php	2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/impress_reconciliation=
.php	2013-03-29 18:50:16 UTC (rev 5208)
@@ -19,7 +19,7 @@
 Montant
 </th>
 </tr>
-<?
+<?php=20
 for ($i=3D0;$i<count($array);$i++) {
 	$r=3D'';
 	$r.=3Dtd($i);

Modified: phpcompta/branches/rel601-ovh/include/template/ledger_detail_ac=
h.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/ledger_detail_ach.php	=
2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/ledger_detail_ach.php	=
2013-03-29 18:50:16 UTC (rev 5208)
@@ -1,15 +1,15 @@
-<? require_once('template/ledger_detail_top.php'); ?>
+<?php require_once('template/ledger_detail_top.php'); ?>
 <div class=3D"content" style=3D"padding:0;">
-<?
+<?php=20
   require_once('class_own.php');
   $owner=3Dnew Own($cn);
 ?>
=20
-    <? if ( $access=3D=3D'W') : ?>
+    <?php if ( $access=3D=3D'W') : ?>
 <form  class=3D"print" onsubmit=3D"return op_save(this);">
-   <? endif; ?>
+   <?php endif; ?>
=20
-    <? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',=
$jr_id).dossier::hidden();?>
+    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
     <table style=3D"width:100%">
     <tr><td>
 							<table>
@@ -33,7 +33,7 @@
 							</tr>
=20
 							<tr><td>
-							<?
+							<?php=20
 							$bk=3Dnew Fiche($cn,$obj->det->array[0]['qp_supplier']);
 							echo td(_('Fournisseur'));
=20
@@ -45,7 +45,7 @@
 							</tr>
 							<tr>
 							<td>
-							<?
+							<?php=20
 							$itext=3Dnew IText('npj');
 							$itext->value=3Dstrip_tags($obj->det->jr_pj_number);
 							echo td(_('Pi=C3=A8ce')).td($itext->input());
@@ -53,7 +53,7 @@
 							</td>
 							<tr>
 							<td>
-							<?
+							<?php=20
 							  $itext=3Dnew IText('lib');
 							  $itext->value=3Dstrip_tags($obj->det->jr_comment);
 							  $itext->size=3D40;
@@ -67,7 +67,7 @@
 															   <td></td>
                                                             <td>Pay=C3=A9=
</td>
                                                             <td>
-                                                                <?
+                                                                <?php=20
                                                                 $ipaid=3D=
new ICheckBox("ipaid",'paid');
                                                                 $ipaid->=
selected=3D($obj->det->jr_rapt=3D=3D'paid');
                                                                 echo $ip=
aid->input();
@@ -83,7 +83,7 @@
 				</td></tr>
 				<tr>
 				<td>
-				<?
+				<?php=20
 				$inote=3Dnew ITextarea('jrn_note');
 				$inote->width=3D25;
 				$inote->heigh=3D5;
@@ -99,9 +99,9 @@
=20
 </table>
=20
-<fieldset><legend><?=3D_('D=C3=A9tail')?></legend>
+<fieldset><legend><?php echo _('D=C3=A9tail')?></legend>
 <table class=3D"result">
-<?
+<?php=20
   bcscale(2);
   $total_htva=3D0;$total_tvac=3D0;
   echo th(_('Quick Code'));
@@ -222,10 +222,10 @@
 </fieldset>
 <fieldset>
 <legend>
-<?=3D_('Ecritures comptables')?>
+<?php echo _('Ecritures comptables')?>
 </legend>
=20
-<?
+<?php=20
   /* if it is not in a popup, the details are hidden */
   if ( $div !=3D 'popup') {
     $ib=3Dnew IButton ("a".$div);
@@ -244,7 +244,7 @@
 ?>
 <table class=3D"result">
 <tr>
-<?
+<?php=20
  echo th(_('Poste Comptable'));
     echo th(_('Quick Code'));
     echo th(_('Libell=C3=A9'));
@@ -289,7 +289,7 @@
 </div>
 </fieldset>
=20
-<?
+<?php=20
 require_once('ledger_detail_bottom.php');
 ?>
 </div>

Modified: phpcompta/branches/rel601-ovh/include/template/ledger_detail_bo=
ttom.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/ledger_detail_bottom.p=
hp	2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/ledger_detail_bottom.p=
hp	2013-03-29 18:50:16 UTC (rev 5208)
@@ -1,8 +1,8 @@
 <fieldset>
 <legend>
-<? echo _('Rapprochement');?>
+<?php echo _('Rapprochement');?>
 </legend>
-<?
+<?php=20
 $oRap=3Dnew Acc_Reconciliation($cn);
 $oRap->jr_id=3D$jr_id;
 $aRap=3D$oRap->get();
@@ -37,7 +37,7 @@
 }
 ?>
 </legend>
-<?
+<?php=20
 if ( $access=3D=3D'W') {
      $wConcerned=3Dnew IConcerned("rapt".$div);
      $wConcerned->amount_id=3D$obj->det->jr_montant;
@@ -47,12 +47,12 @@
=20
 ?>
 </fieldset>
-<?
+<?php=20
=20
 require_once('template/ledger_detail_file.php');
 ?>
 <hr>
-<?
+<?php=20
=20
 if ( $div !=3D 'popup' ) {
   $a=3Dnew IButton('Fermer','Fermer');

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

Modified: phpcompta/branches/rel601-ovh/include/template/ledger_detail_fi=
n.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/ledger_detail_fin.php	=
2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/ledger_detail_fin.php	=
2013-03-29 18:50:16 UTC (rev 5208)
@@ -1,17 +1,17 @@
-<? require_once('template/ledger_detail_top.php'); ?>
+<?php require_once('template/ledger_detail_top.php'); ?>
 <div class=3D"content" style=3D"padding:0;">
-<?
+<?php=20
   require_once('class_own.php');
   $owner=3Dnew Own($cn);
 require_once ('class_anc_plan.php');
 require_once('class_anc_operation.php');
=20
 ?>
-    <? if ( $access=3D=3D'W') : ?>
+    <?php if ( $access=3D=3D'W') : ?>
 <form class=3D"print" onsubmit=3D"return op_save(this);">
-   <? endif; ?>
+   <?php endif; ?>
=20
-    <? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',=
$jr_id).dossier::hidden();?>
+    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
             <table style=3D"width:100%"><tr><td>
 <table>
 <tr>
@@ -25,7 +25,7 @@
 </tr>
=20
 <tr>
-<?
+<?php=20
 $bk=3Dnew Fiche($cn,$obj->det->array[0]['qf_bank']);
 $view_history=3D sprintf('<A class=3D"line" HREF=3D"javascript:view_hist=
ory_card(\'%s\',\'%s\')" >%s</A>',
 				$bk->id, $gDossier, $bk->get_quick_code());
@@ -34,7 +34,7 @@
 ?>
 </tr>
 <tr>
-<?
+<?php=20
=20
 $bk=3Dnew Fiche($cn,$obj->det->array[0]['qf_other']);
 $view_history=3D sprintf('<A class=3D"line" HREF=3D"javascript:view_hist=
ory_card(\'%s\',\'%s\')" >%s</A>',
@@ -45,7 +45,7 @@
 </tr>
=20
 <tr>
-<?
+<?php=20
   $itext=3Dnew IText('lib');
   $itext->value=3Dstrip_tags($obj->det->jr_comment);
   $itext->size=3D40;
@@ -55,10 +55,10 @@
 ?>
 </tr>
 <tr>
-<? echo td('montant').td(nbm($obj->det->array[0]['qf_amount']),' class=3D=
"inum"');?>
+<?php echo td('montant').td(nbm($obj->det->array[0]['qf_amount']),' clas=
s=3D"inum"');?>
 </tr>
 <tr>
-<?
+<?php=20
 $itext=3Dnew IText('npj');
 $itext->value=3Dstrip_tags($obj->det->jr_pj_number);
 echo td(_('Pi=C3=A8ce')).td($itext->input());
@@ -74,7 +74,7 @@
 </td></tr>
 <tr>
 <td>
-<?
+<?php=20
 $inote=3Dnew ITextarea('jrn_note');
 $inote->width=3D25;
 $inote->heigh=3D5;
@@ -92,15 +92,15 @@
 </td>
 <fieldset>
 <legend>
-<?=3D_('D=C3=A9tail')?>
-<?
+<?php echo _('D=C3=A9tail')?>
+<?php=20
   $detail=3Dnew Acc_Misc($cn,$obj->jr_id);
 $detail->get();
 ?>
 </legend>
 <table class=3D"result">
 <tr>
-<?
+<?php=20
  echo th(_('Poste Comptable'));
     echo th(_('Quick Code'));
     echo th(_('Libell=C3=A9'));
@@ -171,7 +171,7 @@
 ?>
 </table>
 </fieldset>
-<?
+<?php=20
 require_once('ledger_detail_bottom.php');
 ?>
 </div>
\ No newline at end of file

Modified: phpcompta/branches/rel601-ovh/include/template/ledger_detail_fo=
rbidden.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/ledger_detail_forbidde=
n.php	2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/ledger_detail_forbidde=
n.php	2013-03-29 18:50:16 UTC (rev 5208)
@@ -1,4 +1,4 @@
-<?
+<?php=20
 echo HtmlInput::anchor_close($div);
 ?>
 <div style=3D"margin:0;padding:0;background-color:red;text-align:center;=
">

Modified: phpcompta/branches/rel601-ovh/include/template/ledger_detail_mi=
sc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/ledger_detail_misc.php=
	2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/ledger_detail_misc.php=
	2013-03-29 18:50:16 UTC (rev 5208)
@@ -1,20 +1,20 @@
-<?
+<?php=20
 require_once('template/ledger_detail_top.php');
 require_once('class_anc_operation.php');
 require_once('class_anc_plan.php');
=20
 ?>
-<?
+<?php=20
 require_once('class_own.php');
 require_once ('class_anc_plan.php');
 ?>
 <div class=3D"content" style=3D"padding:0">
=20
-    <? if ( $access=3D=3D'W') : ?>
+    <?php if ( $access=3D=3D'W') : ?>
 <form class=3D"print" onsubmit=3D"return op_save(this);">
-   <? endif; ?>
+   <?php endif; ?>
=20
-    <? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',=
$jr_id).dossier::hidden();?>
+    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
   <table style=3D"width:100%"><tr><td>
 					<table>
 								<tr><td>
@@ -28,7 +28,7 @@
 								</tr>
=20
 								<tr><td>
-								<?
+								<?php=20
 								  $itext=3Dnew IText('lib');
 								  $itext->value=3Dstrip_tags($obj->det->jr_comment);
 								  $itext->size=3D40;
@@ -38,10 +38,10 @@
 								?>
 								</td></tr>
 								<tr><td>
-								<? echo td('montant').td(nbm($obj->det->jr_montant),' class=3D"i=
num"');?>
+								<?php echo td('montant').td(nbm($obj->det->jr_montant),' class=3D=
"inum"');?>
 								</td></tr>
 								<tr><td>
-								<?
+								<?php=20
 								$itext=3Dnew IText('npj');
 								$itext->value=3Dstrip_tags($obj->det->jr_pj_number);
 								echo td(_('Pi=C3=A8ce')).td($itext->input());
@@ -57,7 +57,7 @@
 						</td></tr>
 						<tr>
 						<td>
-						<?
+						<?php=20
 						$inote=3Dnew ITextarea('jrn_note');
 						$inote->width=3D25;
 						$inote->heigh=3D5;
@@ -74,15 +74,15 @@
=20
 <fieldset>
 <legend>
-<?=3D_('D=C3=A9tail')?>
-<?
+<?php echo _('D=C3=A9tail')?>
+<?php=20
   require_once('class_own.php');
   $owner=3Dnew Own($cn);
 ?>
 </legend>
 <table class=3D"result">
 <tr>
-<?
+<?php=20
     echo th(_('Poste Comptable'));
     echo th(_('Quick Code'));
     echo th(_('Libell=C3=A9'));
@@ -170,7 +170,7 @@
 </table>
 </fieldset>
=20
-<?
+<?php=20
 require_once('ledger_detail_bottom.php');
 ?>
 </div>

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

Modified: phpcompta/branches/rel601-ovh/include/template/ledger_detail_ve=
n.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/ledger_detail_ven.php	=
2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/ledger_detail_ven.php	=
2013-03-29 18:50:16 UTC (rev 5208)
@@ -1,15 +1,15 @@
-<? require_once('template/ledger_detail_top.php'); ?>
+<?php require_once('template/ledger_detail_top.php'); ?>
 <div class=3D"content" style=3D"padding:0;">
-<?
+<?php=20
   require_once('class_own.php');
   $owner=3Dnew Own($cn);
 ?>
=20
-    <? if ( $access=3D=3D'W') : ?>
+    <?php if ( $access=3D=3D'W') : ?>
 <form class=3D"print" onsubmit=3D"return op_save(this);">
-   <? endif; ?>
+   <?php endif; ?>
=20
-    <? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',=
$jr_id).dossier::hidden();?>
+    <?php echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_i=
d',$jr_id).dossier::hidden();?>
   <table style=3D"width:100%">
   <tr><td>
 						<table>
@@ -33,7 +33,7 @@
 							</td>
 						<tr>
 						<td>
-						<?
+						<?php=20
 						$bk=3Dnew Fiche($cn,$obj->det->array[0]['qs_client']);
 						echo td(_('Client'));
=20
@@ -45,7 +45,7 @@
 						</tr>
 						<tr>
 						<td>
-						<?
+						<?php=20
 						$itext=3Dnew IText('npj');
 						$itext->value=3Dstrip_tags($obj->det->jr_pj_number);
 						echo td(_('Pi=C3=A8ce')).td($itext->input());
@@ -53,7 +53,7 @@
 						</td>
 						<tr>
 						<td>
-						<?
+						<?php=20
 						  $itext=3Dnew IText('lib');
 						  $itext->value=3Dstrip_tags($obj->det->jr_comment);
 						  $itext->size=3D40;
@@ -67,7 +67,7 @@
 												   <td></td>
                                                         <td>Pay=C3=A9</t=
d>
                                                         <td>
-                                                            <?
+                                                            <?php=20
                                                             $ipaid=3Dnew=
 ICheckBox("ipaid",'paid');
                                                             $ipaid->sele=
cted=3D($obj->det->jr_rapt=3D=3D'paid');
                                                             echo $ipaid-=
>input();
@@ -84,7 +84,7 @@
 			</td></tr>
 			<tr>
 			<td>
-			<?
+			<?php=20
 			$inote=3Dnew ITextarea('jrn_note');
 			$inote->width=3D25;
 			$inote->heigh=3D5;
@@ -99,9 +99,9 @@
 </tr>
 </table>
=20
-<fieldset><legend><?=3D_('D=C3=A9tail')?></legend>
+<fieldset><legend><?php echo _('D=C3=A9tail')?></legend>
 <table class=3D"result">
-<?
+<?php=20
   bcscale(2);
   $total_htva=3D0;$total_tvac=3D0;
   echo th(_('Quick Code'));
@@ -219,9 +219,9 @@
 </fieldset>
 <fieldset>
 <legend>
-<?=3D_('Ecritures comptables')?>
+<?php echo _('Ecritures comptables')?>
 </legend>
-<?
+<?php=20
   /* if it is not in a popup, the details are hidden */
   if ( $div !=3D 'popup') {
     $ib=3Dnew IButton ("a".$div);
@@ -242,7 +242,7 @@
=20
 <table class=3D"result">
 <tr>
-<?
+<?php=20
  echo th(_('Poste Comptable'));
     echo th(_('Quick Code'));
     echo th(_('Libell=C3=A9'));
@@ -285,7 +285,7 @@
 </table>
 </div>
 </fieldset>
-<?
+<?php=20
 require_once('ledger_detail_bottom.php');
 ?>
 </div>

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

Modified: phpcompta/branches/rel601-ovh/include/template/letter_all.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/letter_all.php	2013-03=
-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/letter_all.php	2013-03=
-29 18:50:16 UTC (rev 5208)
@@ -7,35 +7,35 @@
=20
 if ( count($this->content) =3D=3D 0 ) :
 ?>
-  <h2 class=3D"info2"><?=3D_('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat trouv=
=C3=A9')?></h2>
+  <h2 class=3D"info2"><?php echo _('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat=
 trouv=C3=A9')?></h2>
=20
-<?      exit();
+<?php      exit();
 endif;?>
 <table class=3D"result">
 <tr>
 <th>
-   <?=3D_('Lettrage')?>
+   <?php echo _('Lettrage')?>
 </th>
 <th>
-   <?=3D_('Date')?>
+   <?php echo _('Date')?>
 </th>
 <th>
-   <?=3D_('Ref')?>
+   <?php echo _('Ref')?>
 </th>
 <th>
-   <?=3D_('Interne')?>
+   <?php echo _('Interne')?>
 </th>
 <th>
-   <?=3D_('Description')?>
+   <?php echo _('Description')?>
 </th>
 <th>
-   <?=3D_('Montant')?>
+   <?php echo _('Montant')?>
 </th>
 <th>
-   <?=3D_('Debit / Credit')?>
+   <?php echo _('Debit / Credit')?>
 </th>
 <th>
-  <?=3D_('Op. concern=C3=A9')?>
+  <?php echo _('Op. concern=C3=A9')?>
 </th>
 </tr>
=20
@@ -44,7 +44,7 @@
   $class=3D"";
 if ( ($i % 2) =3D=3D 0 ) $class=3D"odd";
 ?>
-  <tr <? echo "class=3D\"$class\""; ?> >
+  <tr <?php echo "class=3D\"$class\""; ?> >
 <td>
 <?php
 $letter=3D($this->content[$i]['letter']=3D=3D-1)?"x":$this->content[$i][=
'letter'];
@@ -54,21 +54,21 @@
   ";dsp_letter(this)";
=20
 ?>
-<A class=3D"detail" href=3D"javascript:<?=3D$js?>"><?=3D$letter?>
-<? if ( $this->content[$i]['letter_diff'] !=3D 0) echo $g_failed;	?>
+<A class=3D"detail" href=3D"javascript:<?php echo $js?>"><?php echo $let=
ter?>
+<?php if ( $this->content[$i]['letter_diff'] !=3D 0) echo $g_failed;	?>
 	</A>
 </td>
-<td> <?=3D  smaller_date($this->content[$i]['j_date_fmt'])?> </td>
-<td> <?=3D$this->content[$i]['jr_pj_number']?> </td>
+<td> <?php echo   smaller_date($this->content[$i]['j_date_fmt'])?> </td>
+<td> <?php echo $this->content[$i]['jr_pj_number']?> </td>
=20
 <?php
 $r=3Dsprintf('<A class=3D"detail" style=3D"text-decoration:underline" HR=
EF=3D"javascript:viewOperation(\'%s\',\'%s\')" >%s</A>',
 	     $this->content[$i]['jr_id'], $gDossier, $this->content[$i]['jr_int=
ernal']);
 ?>
-  <td> <?=3D$r?> </td>
-  <td> <?=3Dh($this->content[$i]['jr_comment'])?> </td>
-  <td style=3D"text-align:right"> <?=3Dnb($this->content[$i]['j_montant'=
])?> </td>
-<td> <?=3D($this->content[$i]['j_debit']=3D=3D't')?'D':'C'?> </td>
+  <td> <?php echo $r?> </td>
+  <td> <?php echo h($this->content[$i]['jr_comment'])?> </td>
+  <td style=3D"text-align:right"> <?php echo nb($this->content[$i]['j_mo=
ntant'])?> </td>
+<td> <?php echo ($this->content[$i]['j_debit']=3D=3D't')?'D':'C'?> </td>
 <td>
 <?php
     // Rapprochement
@@ -97,14 +97,14 @@
     endfor;
 ?>
 </table>
-<h2 class=3D"info2" style=3D"margin:0 0"> Solde d=C3=A9bit  : <?=3Dnb($a=
mount_deb);?>
-<h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9dit : <?=3Dnb($=
amount_cred);?>
-  <?
+<h2 class=3D"info2" style=3D"margin:0 0"> Solde d=C3=A9bit  : <?php echo=
 nb($amount_deb);?>
+<h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9dit : <?php ech=
o nb($amount_cred);?>
+  <?php=20
 bcscale(2);
   $solde=3Dbcsub($amount_deb,$amount_cred);
 if ( $solde > 0 ) :
 ?>
-  <h2 class=3D"info2"  style=3D"margin:0 0"> Solde d=C3=A9biteur       :=
 <?=3Dnb($solde)?>
-<? else : ?>
-     <h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9diteur    =
   : <?=3Dnb(abs($solde))?>
-<? endif; ?>
+  <h2 class=3D"info2"  style=3D"margin:0 0"> Solde d=C3=A9biteur       :=
 <?php echo nb($solde)?>
+<?php else : ?>
+     <h2 class=3D"info2"  style=3D"margin:0 0"> Solde cr=C3=A9diteur    =
   : <?php echo nb(abs($solde))?>
+<?php endif; ?>

Modified: phpcompta/branches/rel601-ovh/include/template/letter_prop.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/letter_prop.php	2013-0=
3-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/letter_prop.php	2013-0=
3-29 18:50:16 UTC (rev 5208)
@@ -6,9 +6,9 @@
=20
 if ( count($this->content) =3D=3D 0 ) :
 ?>
-  <h2 class=3D"info2"><?=3D_('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat trouv=
=C3=A9')?></h2>
+  <h2 class=3D"info2"><?php echo _('D=C3=A9sol=C3=A9 aucun r=C3=A9sultat=
 trouv=C3=A9')?></h2>
=20
-<?
+<?php=20
   else :
 ?>
 <table class=3D"result">
@@ -16,25 +16,25 @@
 <th>
 </th>
 <th>
-   <?=3D_('Lettrage')?>
+   <?php echo _('Lettrage')?>
 </th>
 <th>
-   <?=3D_('Date')?>
+   <?php echo _('Date')?>
 </th>
 <th>
-   <?=3D_('Ref')?>
+   <?php echo _('Ref')?>
 </th>
 <th>
-   <?=3D_('Description')?>
+   <?php echo _('Description')?>
 </th>
 <th>
-   <?=3D_('Montant')?>
+   <?php echo _('Montant')?>
 </th>
 <th>
-   <?=3D_('Debit / Credit')?>
+   <?php echo _('Debit / Credit')?>
 </th>
 <th>
-  <?=3D_('Op. concern=C3=A9')?>
+  <?php echo _('Op. concern=C3=A9')?>
 </th>
 </tr>
=20
@@ -56,32 +56,32 @@
 <th>
 </th>
 <th>
-   <?=3D_('Lettrage')?>
+   <?php echo _('Lettrage')?>
 </th>
 <th>
-   <?=3D_('Date')?>
+   <?php echo _('Date')?>
 </th>
 <th>
-   <?=3D_('Ref')?>
+   <?php echo _('Ref')?>
 </th>
 <th>
-   <?=3D_('Description')?>
+   <?php echo _('Description')?>
 </th>
 <th>
-   <?=3D_('Montant')?>
+   <?php echo _('Montant')?>
 </th>
 <th>
-   <?=3D_('Debit / Credit')?>
+   <?php echo _('Debit / Credit')?>
 </th>
 <th>
-  <?=3D_('Op. concern=C3=A9')?>
+  <?php echo _('Op. concern=C3=A9')?>
 </th>
 </tr>
-<?
+<?php=20
=20
 }
 ?>
-  <tr <? echo "class=3D\"$class\""; ?> >
+  <tr <?php echo "class=3D\"$class\""; ?> >
 <td>
 <?php
=20
@@ -100,17 +100,17 @@
 <?php
 $letter=3D($this->content[$i]['letter']< 0)?" ":$this->content[$i]['lett=
er'];
 ?>
-<?=3D$letter?>
+<?php echo $letter?>
 </td>
-<td> <?=3Dsmaller_date($this->content[$i]['j_date_fmt'])?> </td>
+<td> <?php echo smaller_date($this->content[$i]['j_date_fmt'])?> </td>
 <?php
 $r=3Dsprintf('<A class=3D"detail" style=3D"text-decoration:underline"  H=
REF=3D"javascript:viewOperation(\'%s\',\'%s\')" >%s</A>',
 	   $this->content[$i]['jr_id'], $gDossier,  $this->content[$i]['jr_inte=
rnal']);
 ?>
-<td> <?=3D$r?> </td>
-<td> <?=3D$this->content[$i]['jr_comment']?> </td>
-  <td> <?=3Dnb($this->content[$i]['j_montant'])?> </td>
-<td> <?=3D($this->content[$i]['j_debit']=3D=3D't')?'D':'C'?> </td>
+<td> <?php echo $r?> </td>
+<td> <?php echo $this->content[$i]['jr_comment']?> </td>
+  <td> <?php echo nb($this->content[$i]['j_montant'])?> </td>
+<td> <?php echo ($this->content[$i]['j_debit']=3D=3D't')?'D':'C'?> </td>
 <td>
 <?php
     // Rapprochement
@@ -132,7 +132,7 @@
 </td>
=20
 </tr>
-<?
+<?php=20
 if ($i<$linked_limit)
 {
   $amount_deb+=3D( $jnt_id =3D=3D $this->content[$i]['letter'] && $this-=
>content[$i]['j_debit']=3D=3D't')?$this->content[$i]['j_montant']:0;
@@ -142,9 +142,9 @@
 ?>
 </TABLE>
   <h2 class=3D"info"> Total lettr=C3=A9</h2>
-<span style=3D"display:block;font-size:14px"><?=3D_('Total Debit')?>   <=
?=3D$amount_deb?></span>
-<span style=3D"display:block;font-size:14px"><?=3D_('Total Credit')?>   =
<?=3D$amount_cred?></span>
+<span style=3D"display:block;font-size:14px"><?php echo _('Total Debit')=
?>   <?php echo $amount_deb?></span>
+<span style=3D"display:block;font-size:14px"><?php echo _('Total Credit'=
)?>   <?php echo $amount_cred?></span>
=20
 <?php endif;?>
-<?=3DHtmlInput::button('check_all','S=C3=A9lectionner tout',' onclick=3D=
"select_checkbox(\'letter_form\')"');?>
-<?=3DHtmlInput::button('check_none','Tout D=C3=A9s=C3=A9lectionner ',' o=
nclick=3D"unselect_checkbox(\'letter_form\')"');?>
\ No newline at end of file
+<?php echo HtmlInput::button('check_all','S=C3=A9lectionner tout',' oncl=
ick=3D"select_checkbox(\'letter_form\')"');?>
+<?php echo HtmlInput::button('check_none','Tout D=C3=A9s=C3=A9lectionner=
 ',' onclick=3D"unselect_checkbox(\'letter_form\')"');?>
\ No newline at end of file

Modified: phpcompta/branches/rel601-ovh/include/template/list_category_do=
cument.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/list_category_document=
.php	2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/list_category_document=
.php	2013-03-29 18:50:16 UTC (rev 5208)
@@ -7,28 +7,28 @@
   $row=3D$aList[$i];
 ?>
=20
-<tr id=3D"row<?=3D$row['dt_id']?>">
+<tr id=3D"row<?php echo $row['dt_id']?>">
 <td colspan=3D"2">
-<?=3D$row['dt_value'];?>
+<?php echo $row['dt_value'];?>
 </td>
 <td>
-<?=3D$row['js_remove'];?>
+<?php echo $row['js_remove'];?>
 </td>
 </tr>
-<?
+<?php=20
 endfor;
 ?>
 <tr>
 <td>
-<?=3D$str_addCat?>
+<?php echo $str_addCat?>
 </td>
 <td>
-   <?=3D$str_submit?>
+   <?php echo $str_submit?>
 </td>
 </tr>
=20
 </table>
-<?
+<?php=20
 echo dossier::hidden();
 echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 ?>

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/list_mod_payment.php	2=
013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/list_mod_payment.php	2=
013-03-29 18:50:16 UTC (rev 5208)
@@ -31,56 +31,56 @@
  <table class=3D"table_large" >
 	 <tr >
 		 <th>
-			 <?=3D$header->get_header(0)?>
+			 <?php echo $header->get_header(0)?>
 		 </th>
 		 <th style=3D"text-align:center">
-			 <?=3D$header->get_header(1)?>
+			 <?php echo $header->get_header(1)?>
 		 </th>
 		 <th style=3D"text-align:center">
-			 <?=3D$header->get_header(2)?>
+			 <?php echo $header->get_header(2)?>
 		 </th>
 		 <th style=3D"text-align:center">
-			 <?=3D$header->get_header(3)?>
+			 <?php echo $header->get_header(3)?>
 		 </th>
 		 <th style=3D"text-align:center">
-			 <?=3D$header->get_header(4)?>
+			 <?php echo $header->get_header(4)?>
 		 </th>
 		 <th>
=20
 		 </th>
 	 </tr>
-<? for ($i=3D0;$i<count($array);$i++):
+<?php for ($i=3D0;$i<count($array);$i++):
 	if ($i%2=3D=3D0):
 		$class=3D'class=3D"odd" ';
 	else:
 		$class=3D'class=3D"even"';
 	endif;
 ?>
-	 <tr <?=3D$class?>>
+	 <tr <?php echo $class?>>
 		 <td>
-			 <?=3Dh($array[$i]['mp_lib'])?>
+			 <?php echo h($array[$i]['mp_lib'])?>
 		 </td>
 		 <td style=3D"text-align:center">
-			 <?=3Dh($array[$i]['jrn_def_name'])?>
+			 <?php echo h($array[$i]['jrn_def_name'])?>
=20
 		 </td>
 		 <td style=3D"text-align:center">
-			 <?=3Dh($array[$i]['fd_label'])?>
+			 <?php echo h($array[$i]['fd_label'])?>
=20
 		 </td>
 		 <td style=3D"text-align:center">
-			 <?=3Dh($array[$i]['jrn_target'])?>
+			 <?php echo h($array[$i]['jrn_target'])?>
 		 </td>
 		 <td style=3D"text-align:center">
-			 <?=3Dh($array[$i]['vw_name'])?>
+			 <?php echo h($array[$i]['vw_name'])?>
 		 </td>
=20
-<?
+<?php=20
 echo $td.HtmlInput::button_anchor(_('Modifie'),'?ac=3D'.$_REQUEST['ac'].=
'&sa=3Dmp&sb=3Dchange&'.dossier::get().
                                               '&id=3D'.$array[$i]['mp_id=
']);
 ?>
=20
 	 </tr>
-<? endfor;?>
+<?php endfor;?>
=20
 </table>
\ No newline at end of file

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/menu.php	2013-03-29 18=
:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/menu.php	2013-03-29 18=
:50:16 UTC (rev 5208)
@@ -1,9 +1,9 @@
 <div class=3D"topmenu">
-    <? if ( count($amenu) > 4 && $idx =3D=3D 0) :
+    <?php if ( count($amenu) > 4 && $idx =3D=3D 0) :
 	$style =3D "width:100%";
     ?>
-<table style=3D"<?=3D$style?>" >
-    <? elseif ($idx=3D=3D0):
+<table style=3D"<?php echo $style?>" >
+    <?php elseif ($idx=3D=3D0):
 switch (count($amenu))
 {
 case 4:
@@ -19,7 +19,7 @@
 		$style=3D" class=3D\"mtitle\"";
=20
     	endif;?>
-<table style=3D"<?=3D$style?>" >
+<table style=3D"<?php echo $style?>" >
=20
=20
     <tr>
@@ -30,12 +30,12 @@
 	    if ( (count($amenu)=3D=3D1)|| (isset($module[$idx+1]) && $module[$i=
dx+1]=3D=3D$amenu[$i]['me_code'])):
 		$class=3D"selectedcell";
 ?>
-	<td class=3D"<?=3D$class?>">
-	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$_REQUEST['ac']?>" title=3D"<?=3Dh($amenu[$i]['me_description']=
)?>" >
-	    <?=3D$amenu[$i]['me_menu']?>
+	<td class=3D"<?php echo $class?>">
+	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?php echo Dossier::i=
d()?>&ac=3D<?php echo $_REQUEST['ac']?>" title=3D"<?php echo h($amenu[$i]=
['me_description'])?>" >
+	    <?php echo $amenu[$i]['me_menu']?>
 	    </a>
 	</td>
-<?
+<?php=20
 	    else:
 		$class=3D"mtitle";
 	    $url=3D"";$pt=3D"";
@@ -58,18 +58,18 @@
 			$url.=3D$pt.$amenu[$i]['me_code'];
 		}
=20
-?>	<td class=3D"<?=3D$class?>">
-	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?=3DDossier::id()?>&=
ac=3D<?=3D$url?>" <?=3D$js?> title=3D"<?=3Dh($amenu[$i]['me_description']=
)?>">
-	    <?=3D$amenu[$i]['me_menu']?>
+?>	<td class=3D"<?php echo $class?>">
+	    <a class=3D"mtitle" href=3D"do.php?gDossier=3D<?php echo Dossier::i=
d()?>&ac=3D<?php echo $url?>" <?php echo $js?> title=3D"<?php echo h($ame=
nu[$i]['me_description'])?>">
+	    <?php echo $amenu[$i]['me_menu']?>
 	    </a>
 	</td>
=20
=20
-<?
+<?php=20
 endif;
=20
 	?>
-	<?
+	<?php=20
 	    endfor;
     	?>
     </tr>

Modified: phpcompta/branches/rel601-ovh/include/template/menu_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/menu_detail.php	2013-0=
3-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/menu_detail.php	2013-0=
3-29 18:50:16 UTC (rev 5208)
@@ -19,7 +19,7 @@
             Code du menu
         </td>
         <td>
-            <?=3D$str_code->input()?>
+            <?php echo $str_code->input()?>
         </td>
     </tr>
         <tr>
@@ -27,7 +27,7 @@
             Libell=C3=A9 du menu
         </td>
         <td>
-            <?=3D$str_menu->input()?>
+            <?php echo $str_menu->input()?>
         </td>
     </tr>
         <tr>
@@ -35,7 +35,7 @@
             Description
         </td>
         <td>
-            <?=3D$str_desc->input()?>
+            <?php echo $str_desc->input()?>
         </td>
     </tr>
          <tr>
@@ -43,7 +43,7 @@
             Fichier =C3=A0 inclure (depuis le r=C3=A9pertoire include)
         </td>
         <td>
-            <?=3D$str_file->input()?>
+            <?php echo $str_file->input()?>
         </td>
     </tr>
     <tr>
@@ -51,7 +51,7 @@
             URL
         </td>
         <td>
-            <?=3D$str_url->input()?>
+            <?php echo $str_url->input()?>
         </td>
     </tr>
      <tr>
@@ -59,7 +59,7 @@
             Param=C3=A8ttre
         </td>
         <td>
-            <?=3D$str_parameter->input()?>
+            <?php echo $str_parameter->input()?>
         </td>
     </tr>
      <tr>
@@ -67,7 +67,7 @@
             Javascript
         </td>
         <td>
-            <?=3D$str_js->input()?>
+            <?php echo $str_js->input()?>
         </td>
     </tr>
 </table>

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/modele_document.php	20=
13-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/modele_document.php	20=
13-03-29 18:50:16 UTC (rev 5208)
@@ -1,4 +1,4 @@
-<?=3DHtmlInput::anchor_close('mod_doc');?>
+<?php echo HtmlInput::anchor_close('mod_doc');?>
 <h2 class=3D"info">Mod=C3=A8le de document</h2>
 <form  method=3D"post" enctype=3D"multipart/form-data">
 <table>

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/module.php	2013-03-29 =
18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/module.php	2013-03-29 =
18:50:16 UTC (rev 5208)
@@ -15,9 +15,9 @@
 ?>
 	<div id=3D"direct">
 	<form method=3D"get">
-		<?=3DHtmlInput::default_value('ac', '', $_REQUEST)?>
-		<?=3DDossier::hidden()?>
-		<?
+		<?php echo HtmlInput::default_value('ac', '', $_REQUEST)?>
+		<?php echo Dossier::hidden()?>
+		<?php=20
=20
 			$direct=3Dnew IText('ac');
 			$direct->style=3D'class=3D"input_text"';
@@ -27,7 +27,7 @@
 			$gDossier=3Ddossier::id();
 			?>
 		<div id=3D"ac_choices" class=3D"autocomplete" style=3D"width:150"></di=
v>
-		<?
+		<?php=20
 			echo HtmlInput::submit('go','aller');
 			?>
=20
@@ -35,16 +35,16 @@
 	<script charset=3D"utf8" language=3D"javascript">
=20
 		try {
-			new Ajax.Autocompleter("ac","ac_choices","direct.php?gDossier=3D<?=3D=
$gDossier?>",
+			new Ajax.Autocompleter("ac","ac_choices","direct.php?gDossier=3D<?php=
 echo $gDossier?>",
                             {paramName:"acs",minChars:1,indicator:null,
                             callback:null,
                              afterUpdateElement:null});} catch (e){alert=
(e.message);};
 		</script>
 	</div>
-<?
+<?php=20
 endif;?>
 	<div id=3D"dossier">
-	<H2 class=3D"dossier"> Dossier : <?=3Dh(dossier::name())?></h2>
+	<H2 class=3D"dossier"> Dossier : <?php echo h(dossier::name())?></h2>
 	</div>
     </div>
=20
@@ -78,8 +78,8 @@
 				$url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['me_code'];
 		    }
 		    ?>
-		<td class=3D"tool" style=3D"<?=3D$style?>"><a class=3D"mtitle" href=3D=
"<?=3D$url?>" title=3D"<?=3D$row['me_description']?>" <?=3D$js?> ><?=3D$r=
ow['me_menu']?></td>
-		<?
+		<td class=3D"tool" style=3D"<?php echo $style?>"><a class=3D"mtitle" h=
ref=3D"<?php echo $url?>" title=3D"<?php echo $row['me_description']?>" <=
?php echo $js?> ><?php echo $row['me_menu']?></td>
+		<?php=20
 		    endforeach;
 		?>
 	    </tr>

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/new_mod_payment.php	20=
13-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/new_mod_payment.php	20=
13-03-29 18:50:16 UTC (rev 5208)
@@ -1,50 +1,50 @@
 <fieldset>
-<legend><?=3D$msg?>
+<legend><?php echo $msg?>
 </legend>
 <table>
 <tr>
 <td>
-   <?=3D_('Pour le journal')?>
+   <?php echo _('Pour le journal')?>
 </td>
 <td>
-<?=3D$f_source?>
+<?php echo $f_source?>
 </td>
 </tr>
=20
 <tr>
 <td>
-   <?=3D_('Libell=C3=A9')?>
+   <?php echo _('Libell=C3=A9')?>
 </td>
 <td>
-<?=3D$f_lib?>
+<?php echo $f_lib?>
 </td>
 </tr>
=20
 <tr>
 <td>
-   <?=3D_('Type de fiche')?>
+   <?php echo _('Type de fiche')?>
 </td>
 <td>
-<?=3D$f_type_fiche?>
+<?php echo $f_type_fiche?>
 </td>
 </tr>
=20
=20
 <tr>
 <td>
-   <?=3D_('Paiement enregistr=C3=A9 dans ')?>
+   <?php echo _('Paiement enregistr=C3=A9 dans ')?>
 </td>
 <td>
-<?=3D$f_ledger_record?>
+<?php echo $f_ledger_record?>
 </td>
 </tr>
=20
 <tr>
 <td>
-   <?=3D_('Avec la fiche')?>
+   <?php echo _('Avec la fiche')?>
 </td>
 <td>
-<?=3D$f_qcode?>
+<?php echo $f_qcode?>
 </td>
 </tr>
 </table>

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

Modified: phpcompta/branches/rel601-ovh/include/template/periode_add_exer=
cice.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/periode_add_exercice.p=
hp	2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/periode_add_exercice.p=
hp	2013-03-29 18:50:16 UTC (rev 5208)
@@ -7,7 +7,7 @@
 </ul>
=20
 <form method=3D"post" onsubmit=3D"return confirm('Confirmez vous l\'ajou=
t d\'un exercice comptable ?')">
-<?
+<?php=20
 echo HtmlInput::hidden("ac",$_REQUEST['ac']);
 echo $nb_exercice->input();
 echo HtmlInput::hidden("jrn_def_id","0");

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/profile.php	2013-03-29=
 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/profile.php	2013-03-29=
 18:50:16 UTC (rev 5208)
@@ -31,18 +31,18 @@
 <table>
 <tr>
 	<td>Nom</td>
-	<td><?=3D$name->input();?></td>
+	<td><?php echo $name->input();?></td>
 </tr>
 <tr>
 	<td>Description</td>
-	<td><?=3D$desc->input()?></td>
+	<td><?php echo $desc->input()?></td>
 </tr>
 <tr>
 	<td>Avec Calculatrice</td>
-	<td><?=3D$with_calc->input()?></td>
+	<td><?php echo $with_calc->input()?></td>
 </tr>
 <tr>
 	<td>Avec Direct Form</td>
-	<td><?=3D$with_direct_form->input()?></td>
+	<td><?php echo $with_direct_form->input()?></td>
 </tr>
 </table>
\ No newline at end of file

Modified: phpcompta/branches/rel601-ovh/include/template/result_cat_card_=
summary.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/branches/rel601-ovh/include/template/result_cat_card_summar=
y.php	2013-03-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/result_cat_card_summar=
y.php	2013-03-29 18:50:16 UTC (rev 5208)
@@ -1,14 +1,14 @@
 <div class=3D"content">
 <table >
 <tr>
-<?
+<?php=20
    echo th('D=C3=A9tail');
 for ($i=3D0;$i<count($aHeading);$i++) :
    echo th($aHeading[$i]->ad_text,'style=3D"color:blue;padding: 0 5 1 10=
"');
    endfor;
 ?>
 </tr>
-<?
+<?php=20
 $e=3D0;
 foreach ($array as $row ) :
  $e++;

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/template/search_top.php	2013-03=
-29 18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/template/search_top.php	2013-03=
-29 18:50:16 UTC (rev 5208)
@@ -29,7 +29,7 @@
  */
 ?>
 <div style=3D"float:right;height:10px;display:block;margin-top:2px;margi=
n-right:2px">
-<?
+<?php=20
    if ($div =3D=3D "search_op") {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D"recherche.php?".Dossier::get().'&ac=3DSEARCH';
@@ -38,5 +38,5 @@
 ?>
 </div>
 <div>
-	<? echo h2info('Recherche')?>
+	<?php echo h2info('Recherche')?>
 </div>
\ No newline at end of file

Modified: phpcompta/branches/rel601-ovh/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/branches/rel601-ovh/include/user_detail.inc.php	2013-03-29 =
18:11:37 UTC (rev 5207)
+++ phpcompta/branches/rel601-ovh/include/user_detail.inc.php	2013-03-29 =
18:50:16 UTC (rev 5208)
@@ -101,10 +101,10 @@
 $it_pass->value=3D"";
 ?>
 <h1 class=3D"info">Modification</h1>
-<? echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Duser=
_mgt'); ?>
+<?php echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Du=
ser_mgt'); ?>
 <FORM  METHOD=3D"POST">
=20
-<?=3DHtmlInput::hidden('UID',$uid)?>
+<?php echo HtmlInput::hidden('UID',$uid)?>
     <TABLE BORDER=3D0>
         <TR>
=20
@@ -127,7 +127,7 @@
                 Mot de passe :<span class=3D"info">Laisser =C3=A0 VIDE p=
our ne PAS le changer</span>
             </td>
             <td>
-                <?=3D$it_pass->input();?>
+                <?php echo $it_pass->input();?>
             </td>
         </tr>
     </table>
@@ -224,7 +224,7 @@
         <input type=3D"Submit" class=3D"button" NAME=3D"SAVE" VALUE=3D"S=
auver les changements" onclick=3D"return confirm('Confirmer changement ?'=
);">
=20
         <input type=3D"Submit"  class=3D"button" NAME=3D"DELETE" VALUE=3D=
"Effacer" onclick=3D"return confirm('Confirmer effacement ?');" >
-<? echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Duser=
_mgt'); ?>
+<?php echo HtmlInput::button_anchor('Retour', 'admin_repo.php?action=3Du=
ser_mgt'); ?>
 </FORM>
=20
 </DIV>



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


From MAILER-DAEMON Sat Mar 30 15:56:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UM1tM-0003lE-4P
	for mharc-phpcompta-dev@gnu.org; Sat, 30 Mar 2013 15:56:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 30 Mar 2013 20:52:30 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1255636.1364673403.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r475 - tag/rel652/import_doli/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Mar 2013 19:56:42 -0000

Author: danydb
Date: 2013-03-30 20:52:29 +0100 (Sat, 30 Mar 2013)
New Revision: 475

Modified:
   tag/rel652/import_doli/include/class_impdol_operation.php
Log:
Bug with negative sale

Modified: tag/rel652/import_doli/include/class_impdol_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
--- tag/rel652/import_doli/include/class_impdol_operation.php	2013-03-29 =
17:48:03 UTC (rev 474)
+++ tag/rel652/import_doli/include/class_impdol_operation.php	2013-03-30 =
19:52:29 UTC (rev 475)
@@ -316,7 +316,7 @@
=20
 				$oper_tiers =3D new Impdol_Operation_Tmp_Sql($atiers[0]['o_id']);
 				$nb_detail =3D count($adetail);
-				$sum =3D 0;
+				$sum =3D 0; $sum_side=3D0;
 				$grpt =3D $cn->get_value("select nextval('s_grpt');");
 				$internal =3D $ledger->compute_internal_code($grpt);
=20
@@ -361,6 +361,7 @@
 							$sql =3D "insert into quant_purchase(qp_internal,j_id,qp_fiche,qp=
_quantite,qp_price,qp_vat,qp_vat_code,qp_supplier)
 							values($1,$2,$3,$4,$5,$6,$7,$8)";
 							$cn->exec_sql($sql, array(null, $id, $oper->getp("fiche"), $oper-=
>getp("number_unit"), $save_amount, $amount_tva, $tva_id, $oper_tiers->ge=
tp("fiche")));
+							$sum_side =3D ($save_amount > 0) ? bcadd($sum_side, $amount_tvac)=
:$sum_side;
 							break;
 						case 'VEN':
 							$cn->exec_sql("insert into quant_sold
@@ -369,7 +370,7 @@
                                         ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)=
", array(null, /* 1 qs_internal */
 								$oper->getp("fiche"), /* 2 qs_fiche */
 								$oper->getp("number_unit"), /* 3 qs_quantite */
-								$jrnx->amount, /* 4 qs_price */
+								$save_amount, /* 4 qs_price */
 								$amount_tva, /* 5 qs_vat */
 								$tva_id, /* 6 qs_vat_code */
 								$oper_tiers->getp('fiche'), /* 7 qs_client */
@@ -378,6 +379,7 @@
 								'Y' /* 10 qs_valid */
 							));
=20
+							$sum_side =3D ($save_amount > 0) ? bcadd($sum_side, $amount_tvac)=
:$sum_side;
 							break;
 					}
 					/* save VAT into an array */
@@ -390,6 +392,7 @@
 						$tva[$tva_id] =3D $amount_tva;
 					}
 					$sum =3D bcadd($sum, $amount_tvac);
+
 				}  // loop e
 				// Record the tiers
=20
@@ -429,7 +432,7 @@
 				/* record into jrn */
 				$acc_jrn =3D new Acc_Operation($cn);
 				$acc_jrn->jrn =3D $jrn;
-				$acc_jrn->amount =3Dabs ($sum);
+				$acc_jrn->amount =3Dabs ($sum_side);
 				$acc_jrn->desc =3D mb_substr($oper_tiers->getp("desc"),0,80,'UTF8');
 				$acc_jrn->date =3D $date;
 				$acc_jrn->grpt =3D $grpt;



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


From MAILER-DAEMON Sat Mar 30 16:02:10 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UM1yc-0004WV-SW
	for mharc-phpcompta-dev@gnu.org; Sat, 30 Mar 2013 16:02:10 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 30 Mar 2013 20:57:59 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1255640.1364673730.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r476 - trunk/import_account/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Mar 2013 20:02:09 -0000

Author: danydb
Date: 2013-03-30 20:57:59 +0100 (Sat, 30 Mar 2013)
New Revision: 476

Modified:
   trunk/import_account/include/class_impacc_operation.php
Log:
Bug with negative sale

Modified: trunk/import_account/include/class_impacc_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/class_impacc_operation.php	2013-03-30 19=
:52:29 UTC (rev 475)
+++ trunk/import_account/include/class_impacc_operation.php	2013-03-30 19=
:57:59 UTC (rev 476)
@@ -316,7 +316,7 @@
=20
 				$oper_tiers =3D new Impacc_Operation_Tmp_Sql($atiers[0]['o_id']);
 				$nb_detail =3D count($adetail);
-				$sum =3D 0;
+				$sum =3D 0;$sum_side=3D0;
 				$grpt =3D $cn->get_value("select nextval('s_grpt');");
 				$internal =3D $ledger->compute_internal_code($grpt);
=20
@@ -361,6 +361,7 @@
 							$sql =3D "insert into quant_purchase(qp_internal,j_id,qp_fiche,qp=
_quantite,qp_price,qp_vat,qp_vat_code,qp_supplier)
 							values($1,$2,$3,$4,$5,$6,$7,$8)";
 							$cn->exec_sql($sql, array(null, $id, $oper->getp("fiche"), $oper-=
>getp("number_unit"), $save_amount, $amount_tva, $tva_id, $oper_tiers->ge=
tp("fiche")));
+							$sum_side =3D ($save_amount > 0) ? bcadd($sum_side, $amount_tvac)=
:$sum_side;
 							break;
 						case 'VEN':
 							$cn->exec_sql("insert into quant_sold
@@ -378,6 +379,7 @@
 								'Y' /* 10 qs_valid */
 							));
=20
+							$sum_side =3D ($save_amount > 0) ? bcadd($sum_side, $amount_tvac)=
:$sum_side;
 							break;
 					}
 					/* save VAT into an array */
@@ -429,7 +431,7 @@
 				/* record into jrn */
 				$acc_jrn =3D new Acc_Operation($cn);
 				$acc_jrn->jrn =3D $jrn;
-				$acc_jrn->amount =3D $sum;
+				$acc_jrn->amount =3D abs($sum_side);
 				$acc_jrn->desc =3D mb_substr($oper_tiers->getp("desc"),0,80,'UTF8');
 				$acc_jrn->date =3D $date;
 				$acc_jrn->grpt =3D $grpt;



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


From MAILER-DAEMON Sat Mar 30 16:36:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UM2VQ-0001Em-6F
	for mharc-phpcompta-dev@gnu.org; Sat, 30 Mar 2013 16:36:04 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 30 Mar 2013 21:31:51 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1255661.1364675763.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r477 - trunk/import_account/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Mar 2013 20:36:02 -0000

Author: danydb
Date: 2013-03-30 21:31:51 +0100 (Sat, 30 Mar 2013)
New Revision: 477

Modified:
   trunk/import_account/include/class_impacc_operation.php
Log:
Negative VAT rate

Modified: trunk/import_account/include/class_impacc_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_account/include/class_impacc_operation.php	2013-03-30 19=
:57:59 UTC (rev 476)
+++ trunk/import_account/include/class_impacc_operation.php	2013-03-30 20=
:31:51 UTC (rev 477)
@@ -383,13 +383,14 @@
 							break;
 					}
 					/* save VAT into an array */
-					if (isset($tva[$tva_id]))
+					$side=3D($amount_tva > 0)?1:0
+					if (isset($tva[$tva_id][$side]))
 					{
-						$tva[$tva_id] =3D bcadd($tva[$tva_id], $amount_tva);
+						$tva[$tva_id][$side] =3D bcadd($tva[$tva_id][$side], $amount_tva);
 					}
 					else
 					{
-						$tva[$tva_id] =3D $amount_tva;
+						$tva[$tva_id][$side] =3D $amount_tva;
 					}
 					$sum =3D bcadd($sum, $amount_tvac);
 				}  // loop e
@@ -409,23 +410,26 @@
 				$jtiers->insert_jrnx();
=20
 				/* Record the vat 1 */
-				foreach ($tva as $key =3D> $value)
+				foreach ($tva as $key =3D> $atva)
 				{
-					$tva =3D new Acc_TVA($cn, $key);
-					$tva->load();
-					$poste =3D $tva->get_side($oth_side);
-					$op_tva =3D new Acc_Operation($cn);
-					$op_tva->date =3D $date;
-					$op_tva->amount =3D $value;
-					$op_tva->poste =3D $poste;
-					$op_tva->grpt =3D $grpt;
-					$op_tva->type =3D $oth_side;
-					$op_tva->jrn =3D $jrn;
-					$op_tva->user =3D $_SESSION['g_user'];
-					$op_tva->periode =3D 0;
-					$op_tva->qcode =3D null;
-					$op_tva->desc =3D $tva->tva_label;
-					$op_tva->insert_jrnx();
+					foreach ($atva as $tvaid=3D>$tva_value )
+					{
+						$tva =3D new Acc_TVA($cn, $key);
+						$tva->load();
+						$poste =3D $tva->get_side($oth_side);
+						$op_tva =3D new Acc_Operation($cn);
+						$op_tva->date =3D $date;
+						$op_tva->amount =3D $tva_value;
+						$op_tva->poste =3D $poste;
+						$op_tva->grpt =3D $grpt;
+						$op_tva->type =3D $oth_side;
+						$op_tva->jrn =3D $jrn;
+						$op_tva->user =3D $_SESSION['g_user'];
+						$op_tva->periode =3D 0;
+						$op_tva->qcode =3D null;
+						$op_tva->desc =3D $tva->tva_label;
+						$op_tva->insert_jrnx();
+					}
 				}
=20
 				/* record into jrn */



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


From MAILER-DAEMON Sat Mar 30 16:36:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UM2Vc-0001Ge-AH
	for mharc-phpcompta-dev@gnu.org; Sat, 30 Mar 2013 16:36:16 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 30 Mar 2013 21:32:02 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.1255662.1364675775.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r478 - in tag/rel652: import_doli/include
	rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Mar 2013 20:36:15 -0000

Author: danydb
Date: 2013-03-30 21:32:01 +0100 (Sat, 30 Mar 2013)
New Revision: 478

Modified:
   tag/rel652/import_doli/include/class_impdol_operation.php
   tag/rel652/rapport_avance/include/class_formulaire_param.php
Log:
Negative VAT rate

Modified: tag/rel652/import_doli/include/class_impdol_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
--- tag/rel652/import_doli/include/class_impdol_operation.php	2013-03-30 =
20:31:51 UTC (rev 477)
+++ tag/rel652/import_doli/include/class_impdol_operation.php	2013-03-30 =
20:32:01 UTC (rev 478)
@@ -383,13 +383,14 @@
 							break;
 					}
 					/* save VAT into an array */
-					if (isset($tva[$tva_id]))
+					$side=3D($amount_tva > 0)?1:0;
+					if (isset($tva[$tva_id][$side]))
 					{
-						$tva[$tva_id] =3D bcadd($tva[$tva_id], $amount_tva);
+						$tva[$tva_id][$side] =3D bcadd($tva[$tva_id][$side], $amount_tva);
 					}
 					else
 					{
-						$tva[$tva_id] =3D $amount_tva;
+						$tva[$tva_id][$side] =3D $amount_tva;
 					}
 					$sum =3D bcadd($sum, $amount_tvac);
=20
@@ -408,27 +409,28 @@
 				$jtiers->qcode =3D $oper_tiers->getp("qcode");
 				$jtiers->desc =3D mb_substr($oper_tiers->getp("desc"),0,80,'UTF8');
 				$jtiers->insert_jrnx();
-
 				/* Record the vat 1 */
-				foreach ($tva as $key =3D> $value)
+				foreach ($tva as $key =3D> $atva)
 				{
-					$tva =3D new Acc_TVA($cn, $key);
-					$tva->load();
-					$poste =3D $tva->get_side($oth_side);
-					$op_tva =3D new Acc_Operation($cn);
-					$op_tva->date =3D $date;
-					$op_tva->amount =3D $value;
-					$op_tva->poste =3D $poste;
-					$op_tva->grpt =3D $grpt;
-					$op_tva->type =3D $oth_side;
-					$op_tva->jrn =3D $jrn;
-					$op_tva->user =3D $_SESSION['g_user'];
-					$op_tva->periode =3D 0;
-					$op_tva->qcode =3D null;
-					$op_tva->desc =3D $tva->tva_label;
-					$op_tva->insert_jrnx();
+					foreach ($atva as $tvaid=3D>$tva_value)
+					{
+						$tva =3D new Acc_TVA($cn, $key);
+						if ( $tva->load() =3D=3D -1 ) die ("Code TVA inconnu $tvaid");
+						$poste =3D $tva->get_side($oth_side);
+						$op_tva =3D new Acc_Operation($cn);
+						$op_tva->date =3D $date;
+						$op_tva->amount =3D $tva_value;
+						$op_tva->poste =3D $poste;
+						$op_tva->grpt =3D $grpt;
+						$op_tva->type =3D $oth_side;
+						$op_tva->jrn =3D $jrn;
+						$op_tva->user =3D $_SESSION['g_user'];
+						$op_tva->periode =3D 0;
+						$op_tva->qcode =3D null;
+						$op_tva->desc =3D $tva->tva_label;
+						$op_tva->insert_jrnx();
+					}
 				}
-
 				/* record into jrn */
 				$acc_jrn =3D new Acc_Operation($cn);
 				$acc_jrn->jrn =3D $jrn;

Modified: tag/rel652/rapport_avance/include/class_formulaire_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel652/rapport_avance/include/class_formulaire_param.php	2013-03-=
30 20:31:51 UTC (rev 477)
+++ tag/rel652/rapport_avance/include/class_formulaire_param.php	2013-03-=
30 20:32:01 UTC (rev 478)
@@ -107,7 +107,6 @@
 			// first line is the title and description
 			$form =3D new formulaire_sql();
 			$first =3D fgetcsv($in, 0, ";");
-			var_dump($first);
 			$form->f_title =3D $first[0];
 			if (isset($first[1]))
 				$form->f_description =3D $first[1];



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


