From MAILER-DAEMON Thu Aug 23 14:43:18 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T4cNC-00014b-6Q
	for mharc-phpcompta-dev@gnu.org; Thu, 23 Aug 2012 14:43:18 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 23 Aug 2012 20:29:52 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.462358.1345747397.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5092 - 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, 23 Aug 2012 18:43:17 -0000

Author: danydb
Date: 2012-08-23 20:29:52 +0200 (Thu, 23 Aug 2012)
New Revision: 5092

Modified:
   phpcompta/tags/rel650/include/class_html_input.php
Log:
add a field hidden

Modified: phpcompta/tags/rel650/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_html_input.php	2012-07-30 19:44:2=
3 UTC (rev 5091)
+++ phpcompta/tags/rel650/include/class_html_input.php	2012-08-23 18:29:5=
2 UTC (rev 5092)
@@ -189,9 +189,10 @@
     {
         return '<INPUT TYPE=3D"RESET" class=3D"button" VALUE=3D"'.$p_val=
ue.'">';
     }
-    static function hidden($p_name,$p_value)
+    static function hidden($p_name,$p_value,$p_id=3D"")
     {
-        return '<INPUT TYPE=3D"hidden" id=3D"'.$p_name.'" NAME=3D"'.$p_n=
ame.'" VALUE=3D"'.$p_value.'">';
+		if ($p_id=3D=3D"") $p_id=3D$p_name;
+        return '<INPUT TYPE=3D"hidden" id=3D"'.$p_id.'" NAME=3D"'.$p_nam=
e.'" VALUE=3D"'.$p_value.'">';
     }
=20
     static function extension()



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


From MAILER-DAEMON Thu Aug 23 17:05:34 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T4eas-0007W9-7p
	for mharc-phpcompta-dev@gnu.org; Thu, 23 Aug 2012 17:05:34 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 23 Aug 2012 22:52:07 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.462894.1345755933.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5093 - 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, 23 Aug 2012 21:05:32 -0000

Author: danydb
Date: 2012-08-23 22:52:06 +0200 (Thu, 23 Aug 2012)
New Revision: 5093

Modified:
   phpcompta/tags/rel650/include/class_acc_account_ledger.php
   phpcompta/tags/rel650/include/export_poste_detail_csv.php
   phpcompta/tags/rel650/include/export_poste_detail_pdf.php
Log:
0000705: Perte info lettrage lors de l'export .csv
Nom de fichier comprennent la date et le poste comptable

Modified: phpcompta/tags/rel650/include/class_acc_account_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_acc_account_ledger.php	2012-08-23=
 18:29:52 UTC (rev 5092)
+++ phpcompta/tags/rel650/include/class_acc_account_ledger.php	2012-08-23=
 20:52:06 UTC (rev 5093)
@@ -127,7 +127,9 @@
 	if ( $solded =3D=3D 1)
 	  {
 	    $filter=3Dstr_replace('jrn_def_id','jr_def_id',$filter_sql);
-	    $bal_sql=3D"select sum(amount_deb) as s_deb,sum(amount_cred) as s_c=
red, j_poste from 						(select case when j_debit=3D't' then j_montant el=
se 0 end as amount_deb,
+	    $bal_sql=3D"select sum(amount_deb) as s_deb,sum(amount_cred) as s_c=
red, j_poste,
+				 coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
+				from 						(select case when j_debit=3D't' then j_montant else 0 end=
 as amount_deb,
 								case when j_debit=3D'f' then j_montant else 0 end as amount_cred=
,
 								j_poste
 								from jrnx join jrn on (j_grpt =3D jr_grpt_id)

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	2012-08-23 =
18:29:52 UTC (rev 5092)
+++ phpcompta/tags/rel650/include/export_poste_detail_csv.php	2012-08-23 =
20:52:06 UTC (rev 5093)
@@ -25,10 +25,10 @@
 require_once('class_database.php');
 require_once("class_acc_account_ledger.php");
 require_once ('class_acc_operation.php');
-
+$fDate=3Ddate('dmy-Hi');
 header('Pragma: public');
 header('Content-type: application/csv');
-header('Content-Disposition: attachment;filename=3D"poste.csv"',FALSE);
+header('Content-Disposition: attachment;filename=3D"poste-'.$fDate.'-'.$=
_REQUEST['poste_id'].'.csv"',FALSE);
 require_once('class_dossier.php');
 $gDossier=3Ddossier::id();
=20
@@ -68,7 +68,8 @@
         "\"Description\";".
         "\"D=C3=A9bit\";".
         "\"Cr=C3=A9dit\";".
-        "\"Prog.\"";
+        "\"Prog.\";".
+		"\"Let.\"";
         printf("\n");
=20
         $prog=3D0;
@@ -84,7 +85,8 @@
             '"'.$op['description'].'";'.
             nb($op['deb_montant']).";".
             nb($op['cred_montant']).";".
-            nb(abs($prog));
+            nb(abs($prog)).";".
+			(($op['letter']!=3D-1)?$op['letter']:"");
             printf("\n");
=20
=20

Modified: phpcompta/tags/rel650/include/export_poste_detail_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/export_poste_detail_pdf.php	2012-08-23 =
18:29:52 UTC (rev 5092)
+++ phpcompta/tags/rel650/include/export_poste_detail_pdf.php	2012-08-23 =
20:52:06 UTC (rev 5093)
@@ -198,5 +198,5 @@
=20
 }
 $fDate=3Ddate('dmy-Hi');
-$pdf->Output('poste-'.$fDate.'.pdf','D');
+$pdf->Output('poste-'.$fDate.'-'.$poste_id.'.pdf','D');
 ?>



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


From MAILER-DAEMON Thu Aug 23 17:14:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T4ejO-00035O-Au
	for mharc-phpcompta-dev@gnu.org; Thu, 23 Aug 2012 17:14:22 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 23 Aug 2012 23:00:58 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.462905.1345756462.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5094 - 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, 23 Aug 2012 21:14:21 -0000

Author: danydb
Date: 2012-08-23 23:00:58 +0200 (Thu, 23 Aug 2012)
New Revision: 5094

Modified:
   phpcompta/tags/rel650/include/export_fiche_balance_csv.php
   phpcompta/tags/rel650/include/export_fiche_balance_pdf.php
Log:
0000700: CARD : historique, Dans le PDF, il manque le quick code et dans =
le CSV, il manque le nom

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	2012-08-23=
 20:52:06 UTC (rev 5093)
+++ phpcompta/tags/rel650/include/export_fiche_balance_csv.php	2012-08-23=
 21:00:58 UTC (rev 5094)
@@ -133,7 +133,7 @@
 			/* skip if nothing to display */
 			if (count($letter->content) =3D=3D 0)
 				continue;
-			printf('"%s"'."\n",$row->strAttribut(ATTR_DEF_QUICKCODE), $row->strAt=
tribut(ATTR_DEF_NAME));
+			printf('"%s";"%s"'."\n",$row->strAttribut(ATTR_DEF_QUICKCODE), $row->=
strAttribut(ATTR_DEF_NAME));
=20
 			printf('"%s";"%s";"%s";"%s";"%s";"%s";"%s";"%s";"%s"',
 					_('Date'),

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	2012-08-23=
 20:52:06 UTC (rev 5093)
+++ phpcompta/tags/rel650/include/export_fiche_balance_pdf.php	2012-08-23=
 21:00:58 UTC (rev 5094)
@@ -120,11 +120,11 @@
 	$side=3D'';
 	if(bcsub($solde['credit'],$solde['debit']) < 0) $side=3D'Deb.';
 	if(bcsub($solde['credit'],$solde['debit']) > 0) $side=3D'Cred.';
-       =20
+
         $sum_cred=3Dbcadd($sum_cred,$solde['credit']);
         $sum_deb=3Dbcadd($sum_deb,$solde['debit']);
         $sum_solde=3Dbcsub($sum_deb,$sum_cred);
-       =20
+
         $pdf->Cell(30,7,$oCard->strAttribut(ATTR_DEF_QUICKCODE),0,0,'L',=
$fill);
         $pdf->Cell(80,7,$oCard->strAttribut(ATTR_DEF_NAME),0,0,'L',$fill=
);
         $pdf->Cell(20,7,nbm($solde['debit']),0,0,'R',$fill);
@@ -140,7 +140,7 @@
         $pdf->Cell(20,7,nbm($sum_cred),0,0,'R',$fill);
         $pdf->Cell(20,7,nbm(abs($sum_solde)),0,0,'R',$fill);
         $side=3D" =3D ";
-        if ( $sum_solde > 0 )=20
+        if ( $sum_solde > 0 )
         {
             $side=3D'Deb.';
         }
@@ -148,7 +148,7 @@
         {
             $side=3D'Cred.';
         }
-       =20
+
         $pdf->Cell(20,7,$side,0,0,'C',$fill);
         $pdf->Ln();
 	}
@@ -210,7 +210,7 @@
 				continue;
 			$pdf->SetFont('DejaVuCond', '', 10);
 			$fiche =3D new Fiche($cn, $row_fiche['f_id']);
-			$pdf->Cell(0, 7, $fiche->strAttribut(ATTR_DEF_NAME), 1, 1, 'C');
+			$pdf->Cell(0, 7, $fiche->strAttribut(ATTR_DEF_NAME)." [".$fiche->strA=
ttribut(ATTR_DEF_QUICKCODE)."]", 1, 1, 'C');
=20
 			$pdf->SetFont('DejaVuCond', '', 7);
=20



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


From MAILER-DAEMON Thu Aug 23 17:19:28 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T4eoJ-0004PI-Vy
	for mharc-phpcompta-dev@gnu.org; Thu, 23 Aug 2012 17:19:27 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 23 Aug 2012 23:06:00 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.462917.1345756766.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5095 - 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, 23 Aug 2012 21:19:26 -0000

Author: danydb
Date: 2012-08-23 23:06:00 +0200 (Thu, 23 Aug 2012)
New Revision: 5095

Modified:
   phpcompta/tags/rel650/include/ajax_boxcard_search.php
Log:
recherche aussi sur quick-code

Modified: phpcompta/tags/rel650/include/ajax_boxcard_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/ajax_boxcard_search.php	2012-08-23 21:0=
0:58 UTC (rev 5094)
+++ phpcompta/tags/rel650/include/ajax_boxcard_search.php	2012-08-23 21:0=
6:00 UTC (rev 5095)
@@ -37,6 +37,7 @@
 	or vw_description ~* $1
 	or tva_num ~* $1
 	or pc.ad_value like $1||'%'
+	or quick_code like upper($1||'%')
 	order by 2
 ";
 $array=3D$cn->get_array($sql,array($_GET['card']));



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


From MAILER-DAEMON Thu Aug 23 17:33:56 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T4f2K-0005SK-EF
	for mharc-phpcompta-dev@gnu.org; Thu, 23 Aug 2012 17:33:56 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 23 Aug 2012 23:20:33 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.462939.1345757635.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5096 - 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: Thu, 23 Aug 2012 21:33:55 -0000

Author: danydb
Date: 2012-08-23 23:20:32 +0200 (Thu, 23 Aug 2012)
New Revision: 5096

Modified:
   phpcompta/tags/rel650/include/fiche.inc.php
   phpcompta/tags/rel650/include/template/fiche_list.php
Log:
#699 CARD : liste des fiches=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	2012-08-23 21:06:00 UTC (=
rev 5095)
+++ phpcompta/tags/rel650/include/fiche.inc.php	2012-08-23 21:20:32 UTC (=
rev 5096)
@@ -87,7 +87,7 @@
 ?>
 <div style=3D"position:absolute;right:230px;top:110px">
=20
-		Recherche de fiche <?=3DHtmlInput::infobulle(18)?> :<?=3D$search_card-=
>input()?>
+		<?=3D_('Recherche de fiche')?> <?=3DHtmlInput::infobulle(18)?> :<?=3D$=
search_card->input()?>
 		<?=3DHtmlInput::button_anchor("Chercher","javascript:void(0)","",$sear=
ch_card_js)?>
 </div>
 <?
@@ -165,8 +165,8 @@
 				}
 				if ($msg !=3D "")
 				{
-					echo h2("Fiche non effac=C3=A9es", ' class=3D"error"  ');
-					echo '<p class=3D"error">'." Ces fiches n'ont pas =C3=A9t=C3=A9 eff=
ac=C3=A9es  ".$msg;
+					echo h2(_("Fiche non effac=C3=A9es"), ' class=3D"error"  ');
+					echo '<p class=3D"error">'._(" Ces fiches n'ont pas =C3=A9t=C3=A9 e=
ffac=C3=A9es  ").$msg;
 				}
 			}
 		}
@@ -182,10 +182,10 @@
 	}
 	else
 	{
-		$cond =3D " where fd_id =3D " . sql_string($_GET['cat']);
+		$cond =3D " where f.fd_id =3D " . sql_string($_GET['cat']);
 	}
 	// Create nav bar
-	$max =3D $cn->get_value("select count(*) from fiche " . $cond);
+	$max =3D $cn->get_value("select count(*) from fiche as f " . $cond);
=20
 	$step =3D $_SESSION['g_pagesize'];
 	$page =3D (isset($_GET['offset'])) ? $_GET['page'] : 1;
@@ -195,9 +195,10 @@
 	$res =3D $cn->exec_sql("
 		select f_id,
 			(select ad_value from fiche_detail as fd1 where ad_id=3D1 and fd1.f_i=
d=3Df.f_id) as name,
-			(select ad_value from fiche_detail as fd1 where ad_id=3D23 and fd1.f_=
id=3Df.f_id) as qcode
-		from fiche as f
-		$cond   order by 1 offset $offset $limit
+			(select ad_value from fiche_detail as fd1 where ad_id=3D23 and fd1.f_=
id=3Df.f_id) as qcode,
+			fd_label
+		from fiche as f join fiche_def as fd on (fd.fd_id=3Df.fd_id)
+		$cond   order by 2 offset $offset $limit
 	");
 	$nb_line =3D Database::num_row($res);
 	require_once 'template/fiche_list.php';
@@ -292,7 +293,7 @@
 		{
 			if ($allcard =3D=3D 0)
 			{
-				echo "Aucune fiche trouv=C3=A9e";
+				echo _("Aucune fiche trouv=C3=A9e");
 				exit;
 			} else
 				continue;

Modified: phpcompta/tags/rel650/include/template/fiche_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/template/fiche_list.php	2012-08-23 21:0=
6:00 UTC (rev 5095)
+++ phpcompta/tags/rel650/include/template/fiche_list.php	2012-08-23 21:2=
0:32 UTC (rev 5096)
@@ -28,7 +28,7 @@
 ?>
 <?=3D $bar?>
 <form method=3D"POST" class=3D"print" style=3D"display:inline" onsubmit=3D=
"return confirm('Vous confirmez ?')">
-	<table>
+	<table class=3D"result">
 		<tr>
 			<th>
 				Quick Code
@@ -37,13 +37,19 @@
 				Nom
=20
 			</th>
+			<? if ($allcard =3D=3D 1 ) : ?>
 			<th>
+				Cat=C3=A9gorie
+			</th>
+			<? endif; ?>
+			<th>
 				Selection
 			</th>
 		</tr>
 		<? for ($i =3D 0; $i < $nb_line; $i++) :?>
 			<? $row =3D Database::fetch_array($res, $i);?>
-			<tr>
+			<? $class=3D($i%2 =3D=3D 0)?' class=3D"even" ':' class=3D"odd" ';?>
+			<tr <?=3D$class?> >
 				<td>
 					<?=3D HtmlInput::card_detail($row['qcode'], "", ' class=3D"line" ')=
?>
=20
@@ -51,7 +57,12 @@
 				<td>
 					<?=3D h($row['name'])?>
 				</td>
+				<? if ($allcard =3D=3D 1 ) : ?>
 				<td>
+					<?=3D h($row['fd_label'])?>
+				</td>
+				<? endif; ?>
+				<td>
 					<?
 					if ($write =3D=3D 1)
 					{



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


From MAILER-DAEMON Fri Aug 24 15:59:59 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T502x-0004ua-Ei
	for mharc-phpcompta-dev@gnu.org; Fri, 24 Aug 2012 15:59:59 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 24 Aug 2012 21:46:38 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.467476.1345838398.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r395 - tag/rel650/tools/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, 24 Aug 2012 19:59:58 -0000

Author: danydb
Date: 2012-08-24 21:46:38 +0200 (Fri, 24 Aug 2012)
New Revision: 395

Modified:
   tag/rel650/tools/include/tools_exercice.inc.php
Log:
TOOLS : Feedback when adding a new exercice

Modified: tag/rel650/tools/include/tools_exercice.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/tools/include/tools_exercice.inc.php	2012-07-30 18:19:07 U=
TC (rev 394)
+++ tag/rel650/tools/include/tools_exercice.inc.php	2012-08-24 19:46:38 U=
TC (rev 395)
@@ -27,6 +27,7 @@
  *
  */
 require_once 'class_tool_exercice.php';
+global $g_succeed;
 if (isset ($_POST['save']))
 {
 	try
@@ -34,6 +35,8 @@
 		$exercice=3Dnew Tool_Exercice($cn);
 		$exercice->fromPost();
 		$exercice->save();
+		printf (_("%s Vous avez ajout=C3=A9 %d mois depuis le %d/%d pour l'exe=
rcice %d "),$g_succeed,$_POST['nb_month'],$_POST['from_month'],$_POST['ye=
ar'],$_POST['p_exercice']);
+		exit();
 	}
 	catch (Exception $e)
 	{



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


From MAILER-DAEMON Fri Aug 24 16:40:41 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T50gL-00023Z-KG
	for mharc-phpcompta-dev@gnu.org; Fri, 24 Aug 2012 16:40:41 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 24 Aug 2012 22:27:20 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.467647.1345840840.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5097 - in phpcompta/tags/rel650: html include
	include/tfpdf
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?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, 24 Aug 2012 20:40:40 -0000

Author: danydb
Date: 2012-08-24 22:27:20 +0200 (Fri, 24 Aug 2012)
New Revision: 5097

Modified:
   phpcompta/tags/rel650/html/ajax_card.php
   phpcompta/tags/rel650/html/ajax_history.php
   phpcompta/tags/rel650/html/ajax_ledger.php
   phpcompta/tags/rel650/html/ajax_misc.php
   phpcompta/tags/rel650/html/ajax_poste.php
   phpcompta/tags/rel650/include/ajax_mod_document.php
   phpcompta/tags/rel650/include/ajax_mod_predf_op.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_anticipation.php
   phpcompta/tags/rel650/include/class_html_input.php
   phpcompta/tags/rel650/include/class_lettering.php
   phpcompta/tags/rel650/include/tfpdf/tfpdf.php
Log:
replace ob_clean by ob_end_clean

Modified: phpcompta/tags/rel650/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/html/ajax_card.php	2012-08-23 21:20:32 UTC (rev=
 5096)
+++ phpcompta/tags/rel650/html/ajax_card.php	2012-08-24 20:27:20 UTC (rev=
 5097)
@@ -116,7 +116,7 @@
         echo $e->getMessage();
     }
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
     /* ------------------------------------------------------------ */
     /* Display card detail */
@@ -395,7 +395,7 @@
     ob_start();
     require_once('template/card_result.php');
     $r.=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     $ctl=3D$ctl.'_content';
     $html=3D$r;
     break;
@@ -444,7 +444,7 @@
         ob_start();
         require('template/category_of_card.php');
         $html.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
=20
     }
     else
@@ -513,7 +513,7 @@
 	  ob_start();
 	  $f->update($_GET);
 	  $html.=3Dob_get_contents();
-	  ob_clean();
+	  ob_end_clean();
 	  $html.=3D$f->Display(true);
 	  $html.=3DHtmlInput::button('close_'.$ctl,'Fermer',"onclick=3D\"remove=
Div('$ctl')\"");
 	}

Modified: phpcompta/tags/rel650/html/ajax_history.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_history.php	2012-08-23 21:20:32 UTC (=
rev 5096)
+++ phpcompta/tags/rel650/html/ajax_history.php	2012-08-24 20:27:20 UTC (=
rev 5097)
@@ -115,7 +115,7 @@
 	echo $old;
=20
         $html=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
       }
   }
 ////////////////////////////////////////////////////////////////////////=
///
@@ -185,7 +185,7 @@
 	echo $old;
=20
         $html=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
       }
   }
 $html=3Descape_xml($html);

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	2012-08-23 21:20:32 UTC (r=
ev 5096)
+++ phpcompta/tags/rel650/html/ajax_ledger.php	2012-08-24 20:27:20 UTC (r=
ev 5097)
@@ -72,7 +72,7 @@
     ob_start();
     require_once ('template/ledger_detail_forbidden.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     $html=3Descape_xml($html);
     header('Content-type: text/xml; charset=3DUTF-8');
     echo <<<EOF
@@ -98,7 +98,7 @@
 	echo HtmlInput::title_box(_("Information"), $div);
     require_once ('template/ledger_detail_forbidden.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
=20
     $html=3Descape_xml($html);
     header('Content-type: text/xml; charset=3DUTF-8');
@@ -119,7 +119,7 @@
 	echo HtmlInput::title_box(_("Information"), $div);
     require_once ('template/ledger_detail_forbidden.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
=20
     $html=3Descape_xml($html);
     header('Content-type: text/xml; charset=3DUTF-8');
@@ -158,7 +158,7 @@
                 $cn->rollback;
             }
             $html=3Dob_get_contents();
-            ob_clean();
+            ob_end_clean();
         }
     break;
     ////////////////////////////////////////////////////////////////////=
//
@@ -197,7 +197,7 @@
         echo '<h2 class=3D"error">D=C3=A9sol=C3=A9 il y a une erreur</h2=
>';
     }
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
=20
     break;
     ////////////////////////////////////////////////////////////////////=
/////////
@@ -477,7 +477,7 @@
       alert( "Changement impossible: on ne peut pas changer la date dans=
 une p=C3=A9riode ferm=C3=A9e");
     }
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
=20
     break;
 ////////////////////////////////////////////////////////////////////////=
/////
@@ -525,7 +525,7 @@
         }
     }
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
 }
 $html=3Descape_xml($html);

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	2012-08-23 21:20:32 UTC (rev=
 5096)
+++ phpcompta/tags/rel650/html/ajax_misc.php	2012-08-24 20:27:20 UTC (rev=
 5097)
@@ -403,7 +403,7 @@
 			ob_start();
 			alert(_('Date malform=C3=A9e, d=C3=A9sol=C3=A9'));
 			$html =3D ob_get_contents();
-			ob_clean();
+			ob_end_clean();
=20
 			$html =3D escape_xml($html);
=20

Modified: phpcompta/tags/rel650/html/ajax_poste.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/html/ajax_poste.php	2012-08-23 21:20:32 UTC (re=
v 5096)
+++ phpcompta/tags/rel650/html/ajax_poste.php	2012-08-24 20:27:20 UTC (re=
v 5097)
@@ -88,7 +88,7 @@
     ob_start();
     require_once('template/account_search.php');
     $r.=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     $r.=3Ddossier::hidden();
     $r.=3D(isset ($c))?HtmlInput::hidden('account',$c):"";
     $r.=3D(isset ($l))?HtmlInput::hidden('label',$l):"";
@@ -163,7 +163,7 @@
=20
     require_once('template/account_result.php');
     $r.=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
=20
     $html=3D$r;
     break;

Modified: phpcompta/tags/rel650/include/ajax_mod_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/ajax_mod_document.php	2012-08-23 21:20:=
32 UTC (rev 5096)
+++ phpcompta/tags/rel650/include/ajax_mod_document.php	2012-08-24 20:27:=
20 UTC (rev 5097)
@@ -38,7 +38,7 @@
 require('template/modele_document.php');
=20
 $html=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 $html=3Descape_xml($html);
 header('Content-type: text/xml; charset=3DUTF-8');
=20

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	2012-08-23 21:20:=
32 UTC (rev 5096)
+++ phpcompta/tags/rel650/include/ajax_mod_predf_op.php	2012-08-24 20:27:=
20 UTC (rev 5097)
@@ -41,7 +41,7 @@
=20
=20
 $html =3D ob_get_contents();
-ob_clean();
+ob_end_clean();
 $html =3D escape_xml($html);
=20
 header('Content-type: text/xml; charset=3DUTF-8');

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	2012-08-23 21:20:3=
2 UTC (rev 5096)
+++ phpcompta/tags/rel650/include/class_acc_ledger.php	2012-08-24 20:27:2=
0 UTC (rev 5097)
@@ -2462,7 +2462,7 @@
 		ob_start();
 		require_once('template/ledger_search.php');
 		$r.=3Dob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		return $r;
 	}
=20

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	2012-08-23 21:=
20:32 UTC (rev 5096)
+++ phpcompta/tags/rel650/include/class_acc_ledger_fin.php	2012-08-24 20:=
27:20 UTC (rev 5097)
@@ -425,7 +425,7 @@
 		ob_start();
 		require_once('template/form_ledger_fin.php');
 		$r.=3Dob_get_contents();
-		ob_clean();
+		ob_end_clean();
=20
=20
 		return $r;

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	2012-08-2=
3 21:20:32 UTC (rev 5096)
+++ phpcompta/tags/rel650/include/class_acc_ledger_purchase.php	2012-08-2=
4 20:27:20 UTC (rev 5097)
@@ -1210,7 +1210,7 @@
         ob_start();
         require_once('template/form_ledger_detail.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
=20
         // Set correctly the REQUEST param for jrn_type
         $r.=3D HtmlInput::hidden('jrn_type','ACH');

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	2012-08-23 21=
:20:32 UTC (rev 5096)
+++ phpcompta/tags/rel650/include/class_acc_ledger_sold.php	2012-08-24 20=
:27:20 UTC (rev 5097)
@@ -1336,7 +1336,7 @@
         ob_start();
         require_once('template/form_ledger_detail.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
=20
=20
=20

Modified: phpcompta/tags/rel650/include/class_anticipation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_anticipation.php	2012-08-23 21:20=
:32 UTC (rev 5096)
+++ phpcompta/tags/rel650/include/class_anticipation.php	2012-08-24 20:27=
:20 UTC (rev 5097)
@@ -176,7 +176,7 @@
         ob_start();
         require_once('template/forecast_result.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     public static function div()
@@ -246,7 +246,7 @@
         ob_start();
         require_once('template/forecast_cat.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     /**
@@ -309,7 +309,7 @@
         ob_start();
         require_once('template/forecast_cat.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
=20
     }
@@ -433,7 +433,7 @@
         ob_start();
         require_once('template/forecast-detail.php');
         $r.=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     /**

Modified: phpcompta/tags/rel650/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel650/include/class_html_input.php	2012-08-23 21:20:3=
2 UTC (rev 5096)
+++ phpcompta/tags/rel650/include/class_html_input.php	2012-08-24 20:27:2=
0 UTC (rev 5097)
@@ -325,7 +325,7 @@
=20
         echo '</div>';
         $ret=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $ret;
     }
     /**
@@ -366,7 +366,7 @@
=20
         echo '</div>';
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     static function display_periode($p_id)

Modified: phpcompta/tags/rel650/include/class_lettering.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_lettering.php	2012-08-23 21:20:32=
 UTC (rev 5096)
+++ phpcompta/tags/rel650/include/class_lettering.php	2012-08-24 20:27:20=
 UTC (rev 5097)
@@ -261,7 +261,7 @@
         ob_start();
         include('template/letter_all.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
 	function get_linked($p_jlid)
@@ -289,7 +289,7 @@
         ob_start();
         include('template/letter_all.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
 	/**
@@ -303,7 +303,7 @@
         ob_start();
         include('template/letter_all.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
=20
@@ -319,7 +319,7 @@
         ob_start();
         include('template/letter_all.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         return $r;
     }
     /**
@@ -369,7 +369,7 @@
         ob_start();
         require_once('template/letter_prop.php');
         $r=3Dob_get_contents();
-        ob_clean();
+        ob_end_clean();
         $r.=3DHtmlInput::hidden('j_id',$p_jid);
         $r.=3DHtmlInput::hidden('jnt_id',$jnt_id);
=20

Modified: phpcompta/tags/rel650/include/tfpdf/tfpdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/tfpdf/tfpdf.php	2012-08-23 21:20:32 UTC=
 (rev 5096)
+++ phpcompta/tags/rel650/include/tfpdf/tfpdf.php	2012-08-24 20:27:20 UTC=
 (rev 5097)
@@ -1279,7 +1279,7 @@
 		if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents()))
 		{
 			// It contains only a UTF-8 BOM and/or whitespace, let's clean it
-			ob_clean();
+			ob_end_clean();
 		}
 		else
 			$this->Error("Some data has already been output, can't send PDF file"=
);



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


From MAILER-DAEMON Fri Aug 24 16:41:35 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T50hD-00026n-Q7
	for mharc-phpcompta-dev@gnu.org; Fri, 24 Aug 2012 16:41:35 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 24 Aug 2012 22:28:13 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.467654.1345840894.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r396 - in tag/rel650: amortis coprop
	import_card/include import_card/include/template import_doli
	import_doli/include import_doli/include/template importbank
	importbank/include/template skel tools tva
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 20:41:33 -0000

Author: danydb
Date: 2012-08-24 22:28:12 +0200 (Fri, 24 Aug 2012)
New Revision: 396

Modified:
   tag/rel650/amortis/ajax.php
   tag/rel650/amortis/index.php
   tag/rel650/coprop/index.php
   tag/rel650/import_card/include/class_import_card.php
   tag/rel650/import_card/include/template/test_file.php
   tag/rel650/import_doli/include/class_import_card.php
   tag/rel650/import_doli/include/template/test_file.php
   tag/rel650/import_doli/include/template/test_operation.php
   tag/rel650/import_doli/index.php
   tag/rel650/importbank/ajax.php
   tag/rel650/importbank/include/template/confirm_transfer.php
   tag/rel650/importbank/include/template/show_transfer.php
   tag/rel650/importbank/include/template/test_file.php
   tag/rel650/importbank/index.php
   tag/rel650/skel/ajax.php
   tag/rel650/skel/index.php
   tag/rel650/tools/ajax.php
   tag/rel650/tools/index.php
   tag/rel650/tva/ajax.php
   tag/rel650/tva/class_ext_tva.php
   tag/rel650/tva/class_ext_tvagen.php
Log:
replace ob_clean by ob_end_clean

Modified: tag/rel650/amortis/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/amortis/ajax.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/amortis/ajax.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -43,7 +43,7 @@
     echo $close;
     require_once('include/material_add.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
     /*
      * save the new material
@@ -53,13 +53,13 @@
     echo $close;
     require_once('include/material_new.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
   case 'display_modify':
     ob_start();
     require_once('include/material_modify.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
=20
   case 'save_modify':
@@ -70,13 +70,13 @@
     $f=3D$cn->get_value("select f_id from fiche join fiche_detail using =
(f_id) where ad_id=3D23 and ad_value=3D$1",array($_POST['p_card']));
     require_once('include/material_modify.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
   case 'rm':
     ob_start();
     require_once('include/material_delete.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
=20
   }

Modified: tag/rel650/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/amortis/index.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/amortis/index.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -34,7 +34,7 @@
 ob_start();
 require_once('amortize_javascript.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
 $url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&a=
c=3D'.$_REQUEST['ac'];

Modified: tag/rel650/coprop/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/coprop/index.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/coprop/index.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -35,7 +35,7 @@
 ob_start();
 require_once('coprop-javascript.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
 $url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&a=
c=3D'.$_REQUEST['ac'];

Modified: tag/rel650/import_card/include/class_import_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/import_card/include/class_import_card.php	2012-08-24 19:46=
:38 UTC (rev 395)
+++ tag/rel650/import_card/include/class_import_card.php	2012-08-24 20:28=
:12 UTC (rev 396)
@@ -52,7 +52,7 @@
 		$encodage->selected =3D true;
 		require_once('template/input_file.php');
 		$r =3D ob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		echo $r;
 	}
 	/**
@@ -197,7 +197,7 @@
 			echo '</tr>';
 		}
 		$table_content =3D ob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		echo '<tr>';
 		echo th('');
 		for ($e =3D 0; $e < count($header); $e++)

Modified: tag/rel650/import_card/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/import_card/include/template/test_file.php	2012-08-24 19:4=
6:38 UTC (rev 395)
+++ tag/rel650/import_card/include/template/test_file.php	2012-08-24 20:2=
8:12 UTC (rev 396)
@@ -64,7 +64,7 @@
       echo '</tr>';
   }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 echo '<table style=3D"border:solid 1px black;width:100%">

Modified: tag/rel650/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
--- tag/rel650/import_doli/include/class_import_card.php	2012-08-24 19:46=
:38 UTC (rev 395)
+++ tag/rel650/import_doli/include/class_import_card.php	2012-08-24 20:28=
:12 UTC (rev 396)
@@ -60,7 +60,7 @@
=20
 		require_once('template/input_file.php');
 		$r =3D ob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		echo $r;
 	}
=20
@@ -224,7 +224,7 @@
 			echo '</tr>';
 		}
 		$table_content =3D ob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		echo '<tr>';
 		echo th('');
 		for ($e =3D 0; $e < count($header); $e++)

Modified: tag/rel650/import_doli/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/import_doli/include/template/test_file.php	2012-08-24 19:4=
6:38 UTC (rev 395)
+++ tag/rel650/import_doli/include/template/test_file.php	2012-08-24 20:2=
8:12 UTC (rev 396)
@@ -64,7 +64,7 @@
       echo '</tr>';
   }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 echo '<table style=3D"border:solid 1px black;width:100%">

Modified: tag/rel650/import_doli/include/template/test_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/rel650/import_doli/include/template/test_operation.php	2012-08-24=
 19:46:38 UTC (rev 395)
+++ tag/rel650/import_doli/include/template/test_operation.php	2012-08-24=
 20:28:12 UTC (rev 396)
@@ -64,7 +64,7 @@
       echo '</tr>';
   }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 echo '<table style=3D"border:solid 1px black;width:100%">

Modified: tag/rel650/import_doli/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
--- tag/rel650/import_doli/index.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/import_doli/index.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -46,7 +46,7 @@
  ob_start();
  require_once('impdol.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
=20

Modified: tag/rel650/importbank/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/importbank/ajax.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/importbank/ajax.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -78,7 +78,7 @@
       else
 	$bi->show_item($ctl);
   $r=3Dob_get_contents();
-  ob_clean();
+  ob_end_clean();
 }
=20
 $html=3Descape_xml($r);

Modified: tag/rel650/importbank/include/template/confirm_transfer.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/importbank/include/template/confirm_transfer.php	2012-08-2=
4 19:46:38 UTC (rev 395)
+++ tag/rel650/importbank/include/template/confirm_transfer.php	2012-08-2=
4 20:28:12 UTC (rev 396)
@@ -35,7 +35,7 @@
       echo '</tr>';
 }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 $nb_col->value=3D($nb_col->value=3D=3D'')?$max:$nb_col->value;

Modified: tag/rel650/importbank/include/template/show_transfer.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/importbank/include/template/show_transfer.php	2012-08-24 1=
9:46:38 UTC (rev 395)
+++ tag/rel650/importbank/include/template/show_transfer.php	2012-08-24 2=
0:28:12 UTC (rev 396)
@@ -95,7 +95,7 @@
=20
 echo '</table>';
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 $cn->commit();
 $nb_col->value=3D($nb_col->value=3D=3D'')?$max:$nb_col->value;
 ?>

Modified: tag/rel650/importbank/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/importbank/include/template/test_file.php	2012-08-24 19:46=
:38 UTC (rev 395)
+++ tag/rel650/importbank/include/template/test_file.php	2012-08-24 20:28=
:12 UTC (rev 396)
@@ -64,7 +64,7 @@
       echo '</tr>';
   }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 echo '<table style=3D"border:solid 1px black;width:100%">

Modified: tag/rel650/importbank/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/importbank/index.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/importbank/index.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -42,7 +42,7 @@
 ob_start();
 require_once('bank_js.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
 /*

Modified: tag/rel650/skel/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/skel/ajax.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/skel/ajax.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -19,7 +19,7 @@
=20
 $html=3Dob_get_contents();
=20
-ob_clean();
+ob_end_clean();
=20
 $html=3Descape_xml($html);
=20

Modified: tag/rel650/skel/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/skel/index.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/skel/index.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -31,7 +31,7 @@
 ob_start();
 require_once('skel_javascript.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
 global $version_plugin;
 $version_plugin=3DSVNINFO;

Modified: tag/rel650/tools/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/tools/ajax.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/tools/ajax.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -21,7 +21,7 @@
=20
 $html=3Dob_get_contents();
=20
-ob_clean();
+ob_end_clean();
=20
 $html=3Descape_xml($html);
=20

Modified: tag/rel650/tools/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/tools/index.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/tools/index.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -33,7 +33,7 @@
 ob_start();
 require_once('tools_javascript.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
 $url=3D'?'.dossier::get()."&plugin_code=3D".$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];

Modified: tag/rel650/tva/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/tva/ajax.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/tva/ajax.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -159,7 +159,7 @@
     echo alert($e->getMessage());
   }
   $r=3Dob_get_contents();
-  ob_clean();
+  ob_end_clean();
    break;
 case 'rm_form':
   switch($type)

Modified: tag/rel650/tva/class_ext_tva.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/tva/class_ext_tva.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/tva/class_ext_tva.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -319,7 +319,7 @@
      ob_start();
      require_once('form_decl.php');
      $r=3Dob_get_contents();
-     ob_clean();
+     ob_end_clean();
      $r.=3DHtmlInput::hidden('periode_dec',$this->periode_dec);
      return $r;
=20

Modified: tag/rel650/tva/class_ext_tvagen.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tag/rel650/tva/class_ext_tvagen.php	2012-08-24 19:46:38 UTC (rev 395)
+++ tag/rel650/tva/class_ext_tvagen.php	2012-08-24 20:28:12 UTC (rev 396)
@@ -125,7 +125,7 @@
     ob_start();
     require_once('form_periode.php');
     $r=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     return $r;
   }
=20
@@ -200,7 +200,7 @@
     ob_start();
     require_once('form_decl_info.php');
     $r=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     return $r;
   }
=20



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


From MAILER-DAEMON Mon Aug 27 08:03:51 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T5y2p-00076j-FX
	for mharc-phpcompta-dev@gnu.org; Mon, 27 Aug 2012 08:03:51 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 27 Aug 2012 13:50:41 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.475939.1346069030.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r397 - trunk/coprop/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, 27 Aug 2012 12:03:49 -0000

Author: danydb
Date: 2012-08-27 13:50:40 +0200 (Mon, 27 Aug 2012)
New Revision: 397

Modified:
   trunk/coprop/include/template/coprop_lot_list.php
Log:
add title

Modified: trunk/coprop/include/template/coprop_lot_list.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/template/coprop_lot_list.php	2012-08-24 20:28:12=
 UTC (rev 396)
+++ trunk/coprop/include/template/coprop_lot_list.php	2012-08-27 11:50:40=
 UTC (rev 397)
@@ -30,7 +30,7 @@
 ?>
 <h1>Lots affect=C3=A9s</h1>
 <? for ( $i=3D0;$i<count($a_immeuble);$i++):?>
-<h2><?=3DHtmlInput::card_detail($a_immeuble[$i]['quick_code'],$a_immeubl=
e[$i]['vw_name'],' style=3D"display:inline;text-decoration:underline"')?>=
</h2>
+<h2>Immeuble : <?=3DHtmlInput::card_detail($a_immeuble[$i]['quick_code']=
,$a_immeuble[$i]['vw_name'],' style=3D"display:inline;text-decoration:und=
erline"')?></h2>
=20
 <?
 $ret_coprop=3D$cn->execute("coprop",array($a_immeuble[$i]['f_id']));
@@ -46,7 +46,7 @@
     $r=3DDatabase::fetch_array($ret_coprop,$e);
     ?>
 <li style=3D"margin-top:4px;margin-bottom:4px;">
-<?=3DHtmlInput::card_detail($r['copro_qcode'],'',' style=3D"display:inli=
ne;text-decoration:underline"').' '.h($r['copro_name']." ".$r['copro_firs=
t_name'])?>
+Copropri=C3=A9taire : <?=3DHtmlInput::card_detail($r['copro_qcode'],'','=
 style=3D"display:inline;text-decoration:underline"').' '.h($r['copro_nam=
e']." ".$r['copro_first_name'])?>
 </li>
     <?
     $ret_lot=3D$cn->execute("lot",array($a_immeuble[$i]['f_id'],$r['copr=
op_id']));
@@ -61,7 +61,7 @@
     <?for ($l=3D0;$l<$max_lot;$l++):
     $s=3DDatabase::fetch_array($ret_lot,$l);
     ?>
-       <li style=3D"list-style-type: square;margin-top:2px;margin-bottom=
:2px;"><?=3DHtmlInput::card_detail($s['lot_qcode'],'',' style=3D"display:=
inline;text-decoration:underline"')." ".h($s['lot_name']." ".$s['lot_desc=
'])?></li>
+       <li style=3D"list-style-type: square;margin-top:2px;margin-bottom=
:2px;">Lot : <?=3DHtmlInput::card_detail($s['lot_qcode'],'',' style=3D"di=
splay:inline;text-decoration:underline"')." ".h($s['lot_name']." ".$s['lo=
t_desc'])?></li>
     <? endfor;?>
     </ul>
     <? endfor;?>



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


From MAILER-DAEMON Mon Aug 27 08:14:05 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T5yCj-0000vP-NU
	for mharc-phpcompta-dev@gnu.org; Mon, 27 Aug 2012 08:14:05 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 27 Aug 2012 14:00:54 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.475969.1346069644.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r398 - trunk/coprop/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2012 12:14:04 -0000

Author: danydb
Date: 2012-08-27 14:00:54 +0200 (Mon, 27 Aug 2012)
New Revision: 398

Modified:
   trunk/coprop/include/key.inc.php
Log:
Clef de repartition ajout diff?\195?\169rence entre tanti?\195?\168me et =
total tanti?\195?\168me des coprop

Modified: trunk/coprop/include/key.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/key.inc.php	2012-08-27 11:50:40 UTC (rev 397)
+++ trunk/coprop/include/key.inc.php	2012-08-27 12:00:54 UTC (rev 398)
@@ -32,6 +32,9 @@
 // ajout nouvelle clef
 if ( isset($_POST['add_key']))
 {
+    /**
+     * @todo ajout verification double chargement
+     */
 	$a=3Dnew Copro_key();
 	$a->insert($_POST);
 }
@@ -45,10 +48,17 @@
 }
=20
=20
-$sql=3D"select cr_id,cr_name,cr_note,cr_tantieme from coprop.clef_repart=
ition order by cr_name";
+$sql=3D"select cr_id,cr_name,cr_note,cr_tantieme,
+    coalesce(  (select sum(crd_amount) from
+		coprop.clef_repartition_detail as crd
+		where crd.cr_id=3Dcr.cr_id) ,0) as delta
+    from=20
+    coprop.clef_repartition as cr
+    order by cr_name";
=20
 $a_key=3D$cn->get_array($sql);
 ?>
+<div id=3D"key_list">
 <table class=3D"result">
 	<tr>
 		<th>
@@ -60,7 +70,12 @@
                 <th>
                     Tanti=C3=A8me
                 </th>
-                <th></th>
+                <th>
+                    Diff=C3=A9rence
+                </th>
+                <th>
+                   =20
+                </th>
 	</tr>
 <?
 for ($i=3D0;$i < count($a_key);$i++):
@@ -69,14 +84,17 @@
 ?>
 	<tr id=3D"row<?=3D$a_key[$i]['cr_id']?>">
 		<td>
-			<?=3D$mod_key?>
+			<?=3Dh($mod_key)?>
 		</td>
 		<td>
-			<?=3D$a_key[$i]['cr_note']?>
+			<?=3Dh($a_key[$i]['cr_note'])?>
 		</td>
-                <td>
-                    <?=3Dround($a_key[$i]['cr_tantieme'])?>
+                <td class=3D"num">
+                    <?=3Dnbm($a_key[$i]['cr_tantieme'])?>
                 </td>
+                <td class=3D"num">
+                    <?=3Dnbm($a_key[$i]['delta'])?>
+                </td>
 		<td id=3D"col<?=3D$a_key[$i]['cr_id']?>">
                     <?
                     $js=3D"onclick=3Dremove_key('".$_REQUEST['plugin_cod=
e']."','".$_REQUEST['ac']."','".$_REQUEST['gDossier']."','".$a_key[$i]['c=
r_id']."')";
@@ -89,6 +107,7 @@
 endfor;
 ?>
 </table>
+ </div>
 <? $js=3Dsprintf("add_key('%s','%s','%s')",$gDossier,$_REQUEST['plugin_c=
ode'],$_REQUEST['ac']);
  echo HtmlInput::button("add_key","Ajout clef","onclick=3D\"$js\"");
 	?>



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


From MAILER-DAEMON Mon Aug 27 08:18:45 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T5yHF-0002Ft-KV
	for mharc-phpcompta-dev@gnu.org; Mon, 27 Aug 2012 08:18:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 27 Aug 2012 14:05:36 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.475982.1346069924.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r399 - in trunk/coprop: . 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, 27 Aug 2012 12:18:44 -0000

Author: danydb
Date: 2012-08-27 14:05:36 +0200 (Mon, 27 Aug 2012)
New Revision: 399

Modified:
   trunk/coprop/coprop-javascript.js
   trunk/coprop/include/template/key_detail.php
Log:
Clef de r?\195?\169partition  : cache la liste si d?\195?\169tail demand?=
\195?\169 et depuis d?\195?\169tail, la remontre

Modified: trunk/coprop/coprop-javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/coprop-javascript.js	2012-08-27 12:00:54 UTC (rev 398)
+++ trunk/coprop/coprop-javascript.js	2012-08-27 12:05:36 UTC (rev 399)
@@ -109,6 +109,7 @@
  */
 function add_key(dossier,plugin_code,ac)
 {
+    $('key_list').hide();
 	waiting_box();
 	try
 	{
@@ -144,6 +145,7 @@
  */
 function mod_key(dossier,plugin_code,ac,key_id)
 {
+    $('key_list').hide();
 	waiting_box();
 	try
 	{

Modified: trunk/coprop/include/template/key_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/include/template/key_detail.php	2012-08-27 12:00:54 UTC =
(rev 398)
+++ trunk/coprop/include/template/key_detail.php	2012-08-27 12:05:36 UTC =
(rev 399)
@@ -29,6 +29,8 @@
 ?>
 <div class=3D"content" style=3D"margin-left: 20px">
 <h1><?=3D$str_message?></h1>
+<?=3DHtmlInput::button('rlist','Retour list',' onclick=3D"$(\'key_list\'=
).show()"')?>
+
 <h2> Caract=C3=A9ristique</h2>
 <table>
 	<tr>



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


From MAILER-DAEMON Mon Aug 27 16:41:34 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T667q-0003X7-I5
	for mharc-phpcompta-dev@gnu.org; Mon, 27 Aug 2012 16:41:34 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 27 Aug 2012 22:28:23 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.479111.1346100093.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r400 - in trunk: . amortis coprop
	import_card/include import_card/include/template import_doli
	import_doli/doc import_doli/include
	import_doli/include/template importbank
	importbank/include/template skel tools tools/include
	tools/include/template tva tva/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2012 20:41:33 -0000

Author: danydb
Date: 2012-08-27 22:28:22 +0200 (Mon, 27 Aug 2012)
New Revision: 400

Added:
   trunk/tools/include/class_tool_exercice.php
   trunk/tools/include/template/tool_exercice_input.php
   trunk/tools/include/tools_exercice.inc.php
Removed:
   trunk/tva/class_tva_param.php
Modified:
   trunk/
   trunk/amortis/ajax.php
   trunk/amortis/index.php
   trunk/coprop/index.php
   trunk/import_card/include/class_import_card.php
   trunk/import_card/include/template/test_file.php
   trunk/import_doli/doc/
   trunk/import_doli/doc/import-donnee-dolibarr test.csv
   trunk/import_doli/doc/import-donnee-dolibarr test.ods
   trunk/import_doli/include/class_impdol_operation.php
   trunk/import_doli/include/class_import_card.php
   trunk/import_doli/include/template/test_file.php
   trunk/import_doli/include/template/test_operation.php
   trunk/import_doli/index.php
   trunk/importbank/ajax.php
   trunk/importbank/include/template/confirm_transfer.php
   trunk/importbank/include/template/show_transfer.php
   trunk/importbank/include/template/test_file.php
   trunk/importbank/index.php
   trunk/skel/ajax.php
   trunk/skel/index.php
   trunk/tools/ajax.php
   trunk/tools/index.php
   trunk/tva/ajax.php
   trunk/tva/class_ext_tva.php
   trunk/tva/class_ext_tvagen.php
   trunk/tva/list_tva.inc.php
   trunk/tva/sql/patch2.sql
Log:
Merged revisions 387-396 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel650

........
  r387 | danydb | 2012-07-01 17:12:46 +0200 (Sun, 01 Jul 2012) | 1 line
 =20
  correct bug with unexisting tva_id
........
  r388 | danydb | 2012-07-01 17:14:00 +0200 (Sun, 01 Jul 2012) | 1 line
 =20
  correct bug with unexisting tva_id
........
  r389 | danydb | 2012-07-01 17:23:31 +0200 (Sun, 01 Jul 2012) | 1 line
 =20
  forget the commit into sql patch
........
  r390 | danydb | 2012-07-09 18:12:43 +0200 (Mon, 09 Jul 2012) | 1 line
 =20
  Import BANK Problem VMSKEYTRADE : extra invisible char. make the insert=
  failed
........
  r391 | danydb | 2012-07-20 06:44:45 +0200 (Fri, 20 Jul 2012) | 1 line
 =20
  Sort table for history of form
........
  r392 | danydb | 2012-07-29 15:09:32 +0200 (Sun, 29 Jul 2012) | 1 line
 =20
  New Tool for adding exercice
........
  r393 | danydb | 2012-07-29 15:19:11 +0200 (Sun, 29 Jul 2012) | 1 line
 =20
  remove obsolete
........
  r394 | danydb | 2012-07-30 20:19:07 +0200 (Mon, 30 Jul 2012) | 1 line
 =20
  fix bug : receipt missing
........
  r395 | danydb | 2012-08-24 21:46:38 +0200 (Fri, 24 Aug 2012) | 1 line
 =20
  TOOLS : Feedback when adding a new exercice
........
  r396 | danydb | 2012-08-24 22:28:12 +0200 (Fri, 24 Aug 2012) | 1 line
 =20
  replace ob_clean by ob_end_clean
........



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

Modified: trunk/amortis/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/ajax.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/amortis/ajax.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -43,7 +43,7 @@
     echo $close;
     require_once('include/material_add.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
     /*
      * save the new material
@@ -53,13 +53,13 @@
     echo $close;
     require_once('include/material_new.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
   case 'display_modify':
     ob_start();
     require_once('include/material_modify.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
=20
   case 'save_modify':
@@ -70,13 +70,13 @@
     $f=3D$cn->get_value("select f_id from fiche join fiche_detail using =
(f_id) where ad_id=3D23 and ad_value=3D$1",array($_POST['p_card']));
     require_once('include/material_modify.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
   case 'rm':
     ob_start();
     require_once('include/material_delete.inc.php');
     $html=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     break;
=20
   }

Modified: trunk/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/index.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/amortis/index.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -34,7 +34,7 @@
 ob_start();
 require_once('amortize_javascript.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
 $url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&a=
c=3D'.$_REQUEST['ac'];

Modified: trunk/coprop/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coprop/index.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/coprop/index.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -35,7 +35,7 @@
 ob_start();
 require_once('coprop-javascript.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
 $url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&a=
c=3D'.$_REQUEST['ac'];

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	2012-08-27 12:05:36 U=
TC (rev 399)
+++ trunk/import_card/include/class_import_card.php	2012-08-27 20:28:22 U=
TC (rev 400)
@@ -52,7 +52,7 @@
 		$encodage->selected =3D true;
 		require_once('template/input_file.php');
 		$r =3D ob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		echo $r;
 	}
 	/**
@@ -197,7 +197,7 @@
 			echo '</tr>';
 		}
 		$table_content =3D ob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		echo '<tr>';
 		echo th('');
 		for ($e =3D 0; $e < count($header); $e++)

Modified: trunk/import_card/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_card/include/template/test_file.php	2012-08-27 12:05:36 =
UTC (rev 399)
+++ trunk/import_card/include/template/test_file.php	2012-08-27 20:28:22 =
UTC (rev 400)
@@ -64,7 +64,7 @@
       echo '</tr>';
   }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 echo '<table style=3D"border:solid 1px black;width:100%">


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-donnee-fiche.ods#
.~lock.import-donnee-dolibarr test.ods#
.~lock.import-donnee-dolibarr.ods#
.~lock.import-donnee-dolibarr test.csv#
.~lock.import_doli.odt#


Modified: trunk/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
--- trunk/import_doli/doc/import-donnee-dolibarr test.csv	2012-08-27 12:0=
5:36 UTC (rev 399)
+++ trunk/import_doli/doc/import-donnee-dolibarr test.csv	2012-08-27 20:2=
8:22 UTC (rev 400)
@@ -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
+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

Modified: trunk/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: trunk/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
--- trunk/import_doli/include/class_impdol_operation.php	2012-08-27 12:05=
:36 UTC (rev 399)
+++ trunk/import_doli/include/class_impdol_operation.php	2012-08-27 20:28=
:22 UTC (rev 400)
@@ -434,6 +434,7 @@
 				$acc_jrn->grpt =3D $grpt;
 				$acc_jrn->periode =3D 0;
 				$acc_jrn->insert_jrn();
+				$cn->exec_sql('update jrn set jr_pj_number=3D$1 where jr_id=3D$2',ar=
ray($oper->getp('pj'),$acc_jrn->jr_id));
=20
 				/* Update info */
 				$ledger->grpt_id =3D $grpt;

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	2012-08-27 12:05:36 U=
TC (rev 399)
+++ trunk/import_doli/include/class_import_card.php	2012-08-27 20:28:22 U=
TC (rev 400)
@@ -60,7 +60,7 @@
=20
 		require_once('template/input_file.php');
 		$r =3D ob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		echo $r;
 	}
=20
@@ -224,7 +224,7 @@
 			echo '</tr>';
 		}
 		$table_content =3D ob_get_contents();
-		ob_clean();
+		ob_end_clean();
 		echo '<tr>';
 		echo th('');
 		for ($e =3D 0; $e < count($header); $e++)

Modified: trunk/import_doli/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/include/template/test_file.php	2012-08-27 12:05:36 =
UTC (rev 399)
+++ trunk/import_doli/include/template/test_file.php	2012-08-27 20:28:22 =
UTC (rev 400)
@@ -64,7 +64,7 @@
       echo '</tr>';
   }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 echo '<table style=3D"border:solid 1px black;width:100%">

Modified: trunk/import_doli/include/template/test_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_doli/include/template/test_operation.php	2012-08-27 12:0=
5:36 UTC (rev 399)
+++ trunk/import_doli/include/template/test_operation.php	2012-08-27 20:2=
8:22 UTC (rev 400)
@@ -64,7 +64,7 @@
       echo '</tr>';
   }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 echo '<table style=3D"border:solid 1px black;width:100%">

Modified: trunk/import_doli/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/import_doli/index.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/import_doli/index.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -46,7 +46,7 @@
  ob_start();
  require_once('impdol.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
=20

Modified: trunk/importbank/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/ajax.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/importbank/ajax.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -78,7 +78,7 @@
       else
 	$bi->show_item($ctl);
   $r=3Dob_get_contents();
-  ob_clean();
+  ob_end_clean();
 }
=20
 $html=3Descape_xml($r);

Modified: trunk/importbank/include/template/confirm_transfer.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/confirm_transfer.php	2012-08-27 12:=
05:36 UTC (rev 399)
+++ trunk/importbank/include/template/confirm_transfer.php	2012-08-27 20:=
28:22 UTC (rev 400)
@@ -35,7 +35,7 @@
       echo '</tr>';
 }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 $nb_col->value=3D($nb_col->value=3D=3D'')?$max:$nb_col->value;

Modified: trunk/importbank/include/template/show_transfer.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/show_transfer.php	2012-08-27 12:05:=
36 UTC (rev 399)
+++ trunk/importbank/include/template/show_transfer.php	2012-08-27 20:28:=
22 UTC (rev 400)
@@ -50,7 +50,7 @@
       			$libelle=3Dutf8_encode($array_row[$i]);
       			break;
 		 case 3:
-      			$operation_nb=3D$array_row[$i];
+      			$operation_nb=3Dpreg_replace('/[^[:print:]]/','',$array_row[$i]=
);
       			break;
 		 case 4:
 			$third=3Dutf8_encode($array_row[$i]);
@@ -95,7 +95,7 @@
=20
 echo '</table>';
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 $cn->commit();
 $nb_col->value=3D($nb_col->value=3D=3D'')?$max:$nb_col->value;
 ?>

Modified: trunk/importbank/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/test_file.php	2012-08-27 12:05:36 U=
TC (rev 399)
+++ trunk/importbank/include/template/test_file.php	2012-08-27 20:28:22 U=
TC (rev 400)
@@ -64,7 +64,7 @@
       echo '</tr>';
   }
 $table=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
=20
=20
 echo '<table style=3D"border:solid 1px black;width:100%">

Modified: trunk/importbank/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/index.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/importbank/index.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -42,7 +42,7 @@
 ob_start();
 require_once('bank_js.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
 /*

Modified: trunk/skel/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/skel/ajax.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/skel/ajax.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -19,7 +19,7 @@
=20
 $html=3Dob_get_contents();
=20
-ob_clean();
+ob_end_clean();
=20
 $html=3Descape_xml($html);
=20

Modified: trunk/skel/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/skel/index.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/skel/index.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -31,7 +31,7 @@
 ob_start();
 require_once('skel_javascript.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
 global $version_plugin;
 $version_plugin=3DSVNINFO;

Modified: trunk/tools/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/ajax.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/tools/ajax.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -21,7 +21,7 @@
=20
 $html=3Dob_get_contents();
=20
-ob_clean();
+ob_end_clean();
=20
 $html=3Descape_xml($html);
=20

Copied: trunk/tools/include/class_tool_exercice.php (from rev 396, tag/re=
l650/tools/include/class_tool_exercice.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/class_tool_exercice.php	                        (=
rev 0)
+++ trunk/tools/include/class_tool_exercice.php	2012-08-27 20:28:22 UTC (=
rev 400)
@@ -0,0 +1,130 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of class_tool_exercice
+ *
+ * @author dany
+ */
+class Tool_Exercice
+{
+
+	function __construct($cn)
+	{
+		$this->cn =3D $cn;
+	}
+
+	/**
+	 * Show form to input data for new exercice
+	 */
+	function input()
+	{
+		$exercice =3D new INum('p_exercice');
+		$exercice->prec =3D 0;
+		$exercice->value =3D HtmlInput::default_value_post('p_exercice', '');
+
+		$year =3D new INum('year');
+		$year->prec =3D 0;
+		$year->value =3D HtmlInput::default_value_post('year', '');
+
+		$nb_month =3D new INum('nb_month');
+		$nb_month->prec =3D 0;
+		$nb_month->value =3D HtmlInput::default_value_post('nb_month', '');
+
+		$from =3D new ISelect('from_month');
+		$from->selected=3D HtmlInput::default_value_post('from_month', '');
+		$amonth =3D array();
+		for ($i =3D 1; $i < 13; $i++)
+		{
+			$amonth[] =3D array("value" =3D> $i, "label" =3D> $i);
+		}
+		$from->value =3D $amonth;
+
+		require_once 'template/tool_exercice_input.php';
+	}
+
+	function fromPost()
+	{
+		$this->exercice =3D $_POST['p_exercice'];
+		$this->nb_month =3D $_POST['nb_month'];
+		$this->from =3D $_POST['from_month'];
+		$this->year=3D $_POST['year'];
+	}
+
+	function verify()
+	{
+		if (isNumber($this->exercice) =3D=3D 0)
+			throw new Exception("Exercice n'est pas un nombre");
+
+		if ($this->exercice > COMPTA_MAX_YEAR|| $this->exercice < COMPTA_MIN_Y=
EAR)
+			throw new Exception("Exercice doit =C3=AAtre entre ".COMPTA_MAX_YEAR.=
"& ".COMPTA_MIN_YEAR);
+		if (isNumber($this->year) =3D=3D 0)
+			throw new Exception("Ann=C3=A9e n'est pas un nombre");
+
+		if ($this->year > COMPTA_MAX_YEAR|| $this->year < COMPTA_MIN_YEAR)
+			throw new Exception("Ann=C3=A9e doit =C3=AAtre entre ".COMPTA_MAX_YEA=
R."& ".COMPTA_MIN_YEAR);
+
+		if (isNumber($this->nb_month) =3D=3D 0)
+			throw new Exception("Nombre de mois n'est pas un nombre");
+		if ($this->nb_month < 1 || $this->nb_month > 60)
+			throw new Exception("Nombre de mois doit =C3=AAtre compris entre 1 & =
60 ");
+		if (isNumber($this->from) =3D=3D 0)
+			throw new Exception("Mois de d=C3=A9but n'existe pas ");
+		if ($this->from > 13 || $this->from < 1)
+			throw new Exception("Mois de d=C3=A9but n'existe pas ");
+	}
+
+	function save()
+	{
+		try
+		{
+			$this->verify();
+		}
+		catch (Exception $e)
+		{
+			alert($e->getMessage());
+			return -1;
+		}
+		$this->cn->start();
+		try
+		{
+			$periode =3D new Periode($this->cn);
+			$exercice=3D$this->exercice;
+			$year=3D$this->year;
+			$month=3D$this->from;
+			for ($i =3D 1; $i <=3D $this->nb_month; $i++)
+			{
+
+
+				$date_start =3D sprintf('01.%02d.%d', $month, $year);
+				$date_end =3D $this->cn->get_value("select to_char(to_date('$date_st=
art','DD.MM.YYYY')+interval '1 month'-interval '1 day','DD.MM.YYYY')");
+				if ($periode->insert($date_start, $date_end, $this->exercice) !=3D 0=
)
+				{
+					throw new Exception('Erreur insertion p=C3=A9riode');
+				}
+				if ($month>11 )
+				{
+					$year++;
+					$month=3D1;
+				}
+				else
+				{
+					$month++;
+				}
+			}
+		}
+		catch (Exception $e)
+		{
+			var_dump($e->getTraceAsString());
+			return -1;
+		}
+		return 0;
+	}
+
+}
+
+?>

Copied: trunk/tools/include/template/tool_exercice_input.php (from rev 39=
6, tag/rel650/tools/include/template/tool_exercice_input.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/template/tool_exercice_input.php	                =
        (rev 0)
+++ trunk/tools/include/template/tool_exercice_input.php	2012-08-27 20:28=
:22 UTC (rev 400)
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief Input data for new Exercice
+ *
+ */
+?>
+<form method=3D"POST">
+	<table>
+		<tr>
+			<td>
+				Exercice
+			</td>
+			<td>
+				<?=3D$exercice->input()?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				Ann=C3=A9e
+			</td>
+			<td>
+				<?=3D$year->input()?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				Nombre de mois
+			</td>
+			<td>
+				<?=3D$nb_month->input()?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				A partir du mois de
+			</td>
+			<td>
+				<?=3D$from->input()?>
+			</td>
+		</tr>
+	</table>
+<?
+echo HtmlInput::submit('save','Valider');
+echo HtmlInput::request_to_hidden(array('sa','ac','plugin_code','gDossie=
r'));
+?>
+</form>
\ No newline at end of file

Copied: trunk/tools/include/tools_exercice.inc.php (from rev 396, tag/rel=
650/tools/include/tools_exercice.inc.php)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/tools_exercice.inc.php	                        (r=
ev 0)
+++ trunk/tools/include/tools_exercice.inc.php	2012-08-27 20:28:22 UTC (r=
ev 400)
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ *   This file is part of PhpCompta.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+/* $Revision$ */
+
+// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
+
+/**
+ * @file
+ * @brief add an exercice of 12 month starting when we want
+ *
+ */
+require_once 'class_tool_exercice.php';
+global $g_succeed;
+if (isset ($_POST['save']))
+{
+	try
+	{
+		$exercice=3Dnew Tool_Exercice($cn);
+		$exercice->fromPost();
+		$exercice->save();
+		printf (_("%s Vous avez ajout=C3=A9 %d mois depuis le %d/%d pour l'exe=
rcice %d "),$g_succeed,$_POST['nb_month'],$_POST['from_month'],$_POST['ye=
ar'],$_POST['p_exercice']);
+		exit();
+	}
+	catch (Exception $e)
+	{
+		var_dump($e->getTraceAsString());
+	}
+
+}
+
+$exercice=3Dnew Tool_Exercice($cn);
+echo $exercice->input();
+?>

Modified: trunk/tools/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/index.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/tools/index.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -25,7 +25,7 @@
  */
 global $version_plugin;
 $version_plugin=3DSVNINFO;
-Extension::check_version(4400);
+Extension::check_version(5082);
=20
 /*
  * load javascript
@@ -33,13 +33,14 @@
 ob_start();
 require_once('tools_javascript.js');
 $j=3Dob_get_contents();
-ob_clean();
+ob_end_clean();
 echo create_script($j);
=20
 $url=3D'?'.dossier::get()."&plugin_code=3D".$_REQUEST['plugin_code']."&a=
c=3D".$_REQUEST['ac'];
 $array=3Darray (
          array($url.'&sa=3Dop',_('Op=C3=A9ration'),_('Changer poste comp=
table ou fiche'),1),
-         array($url.'&sa=3Dpj',_('Pi=C3=A8ce'),_('R=C3=A9num=C3=A9roter =
des pi=C3=A8ces justificative'),2)
+         array($url.'&sa=3Dpj',_('Pi=C3=A8ce'),_('R=C3=A9num=C3=A9roter =
des pi=C3=A8ces justificative'),2),
+         array($url.'&sa=3Dexe',_('Exercice'),_('Ajouter des ann=C3=A9es=
 comptables'),3)
        );
=20
 $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
@@ -52,6 +53,9 @@
   case 'pj':
     $def=3D2;
     break;
+  case 'exe':
+	  $def=3D3;
+	  break;
   }
=20
 $cn=3Dnew Database(dossier::id());
@@ -76,4 +80,10 @@
     require_once('include/receipt.inc.php');
     exit();
   }
+/* Exercice */
+  if ($def =3D=3D 3 )
+  {
+	  require_once 'include/tools_exercice.inc.php';
+	  exit();
+  }
 ?>

Modified: trunk/tva/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/ajax.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/tva/ajax.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -159,7 +159,7 @@
     echo alert($e->getMessage());
   }
   $r=3Dob_get_contents();
-  ob_clean();
+  ob_end_clean();
    break;
 case 'rm_form':
   switch($type)

Modified: trunk/tva/class_ext_tva.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/class_ext_tva.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/tva/class_ext_tva.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -319,7 +319,7 @@
      ob_start();
      require_once('form_decl.php');
      $r=3Dob_get_contents();
-     ob_clean();
+     ob_end_clean();
      $r.=3DHtmlInput::hidden('periode_dec',$this->periode_dec);
      return $r;
=20

Modified: trunk/tva/class_ext_tvagen.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/class_ext_tvagen.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/tva/class_ext_tvagen.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -125,7 +125,7 @@
     ob_start();
     require_once('form_periode.php');
     $r=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     return $r;
   }
=20
@@ -200,7 +200,7 @@
     ob_start();
     require_once('form_decl_info.php');
     $r=3Dob_get_contents();
-    ob_clean();
+    ob_end_clean();
     return $r;
   }
=20

Deleted: trunk/tva/class_tva_param.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/class_tva_param.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/tva/class_tva_param.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -1,111 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published b=
y
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-
-/*!\file
- * \brief manage the table tva.parameters
- */
-
-/*!\brief=20
- *
- *
- */
-class=20
-{
-  /* example private $variable=3Darray("val1"=3D>1,"val2"=3D>"Seconde va=
leur","val3"=3D>0); */
-  private static $variable;
-  function __construct ($p_init) {
-    /* example    $this->set_parameter("val3",$p_init); */
-  }
-  public function get_parameter($p_string) {
-    if ( array_key_exists($p_string,self::$variable) ) {
-      $idx=3Dself::$variable[$p_string];
-      return $this->$idx;
-    }
-    else=20
-      exit (__FILE__.":".__LINE__.'Erreur attribut inexistant');
-  }
-  public function set_parameter($p_string,$p_value) {
-    if ( array_key_exists($p_string,self::$variable) ) {
-      $idx=3Dself::$variable[$p_string];
-      $this->$idx=3D$p_value;
-    }
-    else=20
-      exit (__FILE__.":".__LINE__.'Erreur attribut inexistant');
-   =20
-   =20
-  }
-  public function get_info() {    return var_export(self::$variable,true=
);  }
-  public function verify() {
-    // Verify that the elt we want to add is correct
-  }
-  public function save() {
-      $this->update();
-  }
-
-  public function update() {
-    if ( $this->verify() !=3D 0 ) return;
-    /*   please adapt
-    $sql=3D"update tva_rate set tva_label=3D$1,tva_rate=3D$2,tva_comment=
=3D$3,tva_poste=3D$4 ".
-      " where tva_id =3D $5";
-    $res=3DExecSqlParam($this->cn,
-		 $sql,
-		 array($this->tva_label,
-		       $this->tva_rate,
-		       $this->tva_comment,
-		       $this->tva_poste,
-		       $this->tva_id)
-		 );
-		 */
-  }
-
-  public function load() {
-
-   $sql=3D"select tva_label,tva_rate, tva_comment,tva_poste from tva_rat=
e where tva_id=3D$1";=20
-    /* please adapt
-    $res=3DExecSqlParam($this->cn,
-		 $sql,
-		 array($this->tva_id)
-		 );
-		 */
-    if ( pg_NumRows($res) =3D=3D 0 ) return;
-    $row=3Dpg_fetch_array($res,0);
-    foreach ($row as $idx=3D>$value) { $this->$idx=3D$value; }
-  }
-  public function delete() {
-/*    $sql=3D"delete from tva_rate where tva_id=3D$1";=20
-    $res=3DExecSqlParam($this->cn,$sql,array($this->tva_id));
-*/
-  }
-  /*!\brief
-   *\param
-   *\return
-   *\note
-   *\see
-   *\todo
-   */=09
-  static function test_me() {
-  }
- =20
-}
-
-/* test::test_me(); */
-

Modified: trunk/tva/list_tva.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/list_tva.inc.php	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/tva/list_tva.inc.php	2012-08-27 20:28:22 UTC (rev 400)
@@ -15,16 +15,17 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 require_once('class_iselect.php');
+require_once 'class_sort_table.php';
=20
 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
@@ -32,24 +33,35 @@
 echo '<form method=3D"get">';
 echo HtmlInput::request_to_hidden(array('ac'));
 echo _('Filtrer par ');
-$choice=3Dnew ISelect('type');
-$choice->value=3Darray(
-		     array('label'=3D> 'Toutes','value'=3D> 0 ),
-		     array('label'=3D> 'D=C3=A9clarations','value'=3D> 1 ),
-		     array('label'=3D> 'Listings assujetti','value'=3D> 2),
-		     array('label'=3D> 'Listings intracom','value'=3D> 3)
-		     );
-$choice->selected=3D(isset($_REQUEST['type']))?$_REQUEST['type']:0;
-$choice->javascript=3D' onchange=3D"submit(this)"';
+$choice =3D new ISelect('type');
+$choice->value =3D array(
+	array('label' =3D> 'Toutes', 'value' =3D> 0),
+	array('label' =3D> 'D=C3=A9clarations', 'value' =3D> 1),
+	array('label' =3D> 'Listings assujetti', 'value' =3D> 2),
+	array('label' =3D> 'Listings intracom', 'value' =3D> 3)
+);
+$choice->selected =3D (isset($_REQUEST['type'])) ? $_REQUEST['type'] : 0=
;
+$choice->javascript =3D ' onchange=3D"submit(this)"';
 echo HtmlInput::extension();
-echo HtmlInput::hidden('sa','ltva');
+echo HtmlInput::hidden('sa', 'ltva');
 echo dossier::hidden();
 echo $choice->input();
-echo HtmlInput::submit('rc','Recharger');
+echo HtmlInput::submit('rc', 'Recharger');
 echo '</form>';
-switch($choice->selected) {
-case 0:
- $sql=3D"
+
+$url =3D HtmlInput::request_to_string(array('ac', 'plugin_code', 'gDossi=
er', 'sa', 'type'));
+$sort=3D new Sort_Table();
+$sort->add('Date d=C3=A9claration	', $url, ' order by date_decl asc', ' =
order by date_decl desc', 'da', 'dd');
+$sort->add('P=C3=A9riode	', $url, ' order by exercice asc,periode_dec as=
c', ' order by exercice desc,periode_dec desc', 'pa', 'pd');
+
+$option_order =3D (isset($_GET['ord'])) ? $_GET['ord'] : 'dd';
+
+$sql_order =3D $sort->get_sql_order($option_order);
+
+switch ($choice->selected)
+{
+	case 0:
+		$sql =3D "
 select da_id as id, 'D=C3=A9claration trim/mens' as type_title,1 as type=
_decl,to_char(date_decl,'DD.MM.YYYY') as date_fmt,date_decl,
 case when periodicity =3D'1' then 'Mensuel'
 when periodicity =3D '2' then 'Trimestriel'
@@ -69,15 +81,13 @@
  'Annuel' as fmt_periodicity,
 periode_dec,exercice
 from tva_belge.assujetti
-
-order by date_decl desc
 ";
=20
-  break;
+		break;
=20
-case 1:
+	case 1:
=20
-  $sql=3D"
+		$sql =3D "
 select da_id as id, 'D=C3=A9claration trim/mens' as type_title,1 as type=
_decl,to_char(date_decl,'DD.MM.YYYY') as date_fmt,
 case when periodicity =3D'1' then 'Mensuel'
 when periodicity =3D '2' then 'Trimestriel'
@@ -85,18 +95,17 @@
 periode_dec,exercice
 from tva_belge.declaration_amount order by date_decl desc
 ";
-  break;
-case 2:
-$sql=3D"
+		break;
+	case 2:
+		$sql =3D "
 select a_id as id, 'Listing assujetti' as type_title, 2 as type_decl, to=
_char(date_decl,'DD.MM.YYYY') as date_fmt,date_decl,
  'Annuel' as fmt_periodicity,
 periode_dec,exercice
 from tva_belge.assujetti
-order by date_decl desc
 ";
-break;
-case 3:
-$sql=3D"
+		break;
+	case 3:
+		$sql =3D "
 select i_id as id, 'Listing Intracom' as type_title, 3 as type_decl, to_=
char(date_decl,'DD.MM.YYYY') as date_fmt,date_decl,
 case when periodicity =3D'1' then 'Mensuel'
 when periodicity =3D '2' then 'Trimestriel'
@@ -104,26 +113,31 @@
 end as fmt_periodicity,
 periode_dec,exercice
 from tva_belge.intracomm
-order by date_decl desc
 ";
-  break;
-
+		break;
 }
-$res=3D$cn->get_array($sql);
-echo '<table class=3D"result" >';
-echo tr(th('Type de d=C3=A9claration').th('Periodicit=C3=A9').th('Mois/a=
nn=C3=A9e').th('Date').th('Ann=C3=A9e'));
-for ($i=3D0;$i<count($res);$i++){
-  $aref=3Dsprintf('<a href=3D"javascript:void(0)" onclick=3D"show_declar=
ation(\'%s\',\'%s\')">',
-		$res[$i]['type_decl'],$res[$i]['id']);
-  $row=3Dtd($aref.$res[$i]['type_title'].'</a>');
-  $row.=3Dtd($aref.$res[$i]['fmt_periodicity'].'</a>');
-  $row.=3Dtd($aref.$res[$i]['periode_dec'].'</a>');
-  $row.=3Dtd($aref.$res[$i]['date_fmt'].'</a>');
-  $row.=3Dtd($aref.$res[$i]['exercice'].'</a>');
+$sql =3D $sql . $sql_order;
+$res =3D $cn->get_array($sql);
+?>
+<table class=3D"result" >
+	<tr>
+		<th>Type de d=C3=A9claration</th>
+		<th>Periodicit=C3=A9</th>
+		<th> <?=3D$sort->get_header(1)?></th>
+		<th><?=3D$sort->get_header(0)?></th>
=20
-  echo tr($row);
-}
-echo '</table>';
-echo '</div>';
+		<? for ($i =3D 0; $i < count($res); $i++):?>
+		<tr>
+			<?
+			$aref =3D sprintf('<a href=3D"javascript:void(0)" onclick=3D"show_dec=
laration(\'%s\',\'%s\')">', $res[$i]['type_decl'], $res[$i]['id']);
+			echo td($aref . $res[$i]['type_title'] . '</a>');
+			echo td($aref . $res[$i]['fmt_periodicity'] . '</a>');
+			echo td($aref.$res[$i]['periode_dec'].' - '.$res[$i]['exercice'].'</a=
>');
+			echo td($aref.$res[$i]['date_fmt'].'</a>');
+			?>
+		</tr>
+	<? endfor;?>
+</table>
+</div>
=20
=20

Modified: trunk/tva/sql/patch2.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/sql/patch2.sql	2012-08-27 12:05:36 UTC (rev 399)
+++ trunk/tva/sql/patch2.sql	2012-08-27 20:28:22 UTC (rev 400)
@@ -36,7 +36,7 @@
    f record;
    n_size_tva int;
    n_size_account int;
-
+   n_exist_tva int;
 begin
=20
 for i in select pcode,pvalue,paccount from tva_belge.parameter
@@ -56,9 +56,13 @@
=20
 		while n_size_account <> 0 loop
=20
-			insert into tva_belge.parameter_chld (pcode,tva_id,pcm_val)
-				values (i.pcode,a_tva_id[n_size_tva]::numeric,a_account[n_size_accou=
nt]::account_type);
+			select count(*) into n_exist_tva from tva_rate where tva_id=3Da_tva_i=
d[n_size_tva]::numeric;
=20
+			if n_exist_tva !=3D 0 then
+			=09
+					insert into tva_belge.parameter_chld (pcode,tva_id,pcm_val)
+						values (i.pcode,a_tva_id[n_size_tva]::numeric,a_account[n_size_acc=
ount]::account_type);
+			end if;
 			n_size_account :=3D n_size_account -1;
 		end loop;
 		n_size_account :=3D array_upper(a_account,1);
@@ -86,7 +90,7 @@
    f record;
    n_size_tva int;
    n_size_account int;
-
+   n_exist_tva int;
 begin
=20
 for i in select distinct pvalue from tva_belge.parameter WHERE pcode in =
('GRIL00','GRIL01','GRIL02','GRIL03')
@@ -101,9 +105,12 @@
=20
=20
 	while n_size_tva <> 0 loop
+		select count(*) into n_exist_tva from tva_rate where tva_id=3Da_tva_id=
[n_size_tva]::numeric;
=20
-		insert into tva_belge.parameter_chld (pcode,tva_id)
-			values ('ASSUJETTI',a_tva_id[n_size_tva]::numeric);
+		if n_exist_tva !=3D 0 then
+			insert into tva_belge.parameter_chld (pcode,tva_id)
+				values ('ASSUJETTI',a_tva_id[n_size_tva]::numeric);
+		end if;
 		n_size_tva :=3D n_size_tva -1;
 	end loop;
=20
@@ -124,4 +131,4 @@
  alter table tva_belge.parameter drop column paccount;
  alter table tva_belge.parameter drop column pvalue;
 insert into tva_belge.version(vdesc) values ('Version 2 : am=C3=A9liorat=
ion plugin');
-commit;
\ No newline at end of file
+commit;



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


From MAILER-DAEMON Fri Aug 31 14:13:13 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1T7ViT-0006yE-M7
	for mharc-phpcompta-dev@gnu.org; Fri, 31 Aug 2012 14:13:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 31 Aug 2012 20:00:30 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 91.121.80.190
Message-ID: <mailman.495538.1346436793.854.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r401 - tag/rel650/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: Fri, 31 Aug 2012 18:13:12 -0000

Author: danydb
Date: 2012-08-31 20:00:30 +0200 (Fri, 31 Aug 2012)
New Revision: 401

Modified:
   tag/rel650/tva/list_tva.inc.php
Log:
bug dans tri par d?\195?\169claration

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



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


