From MAILER-DAEMON Sun Aug 04 15:21:07 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V63rX-00014Q-Iy
	for mharc-phpcompta-dev@gnu.org; Sun, 04 Aug 2013 15:21:07 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sun,  4 Aug 2013 21:12:30 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.40669.1375644065.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5338 - phpcompta/tags/rel660/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Aug 2013 19:21:04 -0000

Author: danydb
Date: 2013-08-04 21:12:29 +0200 (Sun, 04 Aug 2013)
New Revision: 5338

Modified:
   phpcompta/tags/rel660/html/ajax_card.php
Log:
BUG cannot display list of card

Modified: phpcompta/tags/rel660/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/rel660/html/ajax_card.php	2013-07-10 20:00:08 UTC (rev=
 5337)
+++ phpcompta/tags/rel660/html/ajax_card.php	2013-08-04 19:12:29 UTC (rev=
 5338)
@@ -367,7 +367,7 @@
 	}
      /* We limit the search to MAX_SEARCH_CARD records */
     $sql=3D$sql.' order by vw_name limit '.MAX_SEARCH_CARD;
-
+    $a=3D$cn->get_array($sql);
     for($i=3D0;$i<count($a);$i++)
     {
         $array[$i]['quick_code']=3D$a[$i]['quick_code'];



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


From MAILER-DAEMON Thu Aug 08 17:59:20 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V7YEq-00023D-E5
	for mharc-phpcompta-dev@gnu.org; Thu, 08 Aug 2013 17:59:20 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu,  8 Aug 2013 23:50:39 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.45195.1375999160.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5339 - phpcompta/tags/rel660/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, 08 Aug 2013 21:59:18 -0000

Author: danydb
Date: 2013-08-08 23:50:38 +0200 (Thu, 08 Aug 2013)
New Revision: 5339

Modified:
   phpcompta/tags/rel660/include/constant.php
Log:
PDF problem, need to increase memory

Modified: phpcompta/tags/rel660/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel660/include/constant.php	2013-08-04 19:12:29 UTC (r=
ev 5338)
+++ phpcompta/tags/rel660/include/constant.php	2013-08-08 21:50:38 UTC (r=
ev 5339)
@@ -44,7 +44,7 @@
 ini_set ('session.use_only_cookies','on');
 ini_set ('magic_quotes_gpc','off');
 ini_set ('max_execution_time',240);
-ini_set ('memory_limit','20M');
+ini_set ('memory_limit','256M');
 ini_set ('default_charset',"UTF-8");
 @ini_set ('session.use_trans_sid','on');
 @session_start();
@@ -60,13 +60,10 @@
 $g_failed=3D"<span style=3D\"font-size:18px;color:red\">&#x2716;</span>"=
;
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /* uncomment for development */
-/*
 define ('SVNINFO',5900);
 define ("DEBUG",true);
-*/
=20
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",false);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);



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


From MAILER-DAEMON Fri Aug 09 07:25:13 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V7koj-0006xZ-S0
	for mharc-phpcompta-dev@gnu.org; Fri, 09 Aug 2013 07:25:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  9 Aug 2013 13:16:30 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.45634.1376047512.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5340 - phpcompta/trunk/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Aug 2013 11:25:11 -0000

Author: danydb
Date: 2013-08-09 13:16:30 +0200 (Fri, 09 Aug 2013)
New Revision: 5340

Modified:
   phpcompta/trunk/doc/manuel-fr.odt
Log:
update doc

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



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


From MAILER-DAEMON Mon Aug 12 19:25:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V91Tx-0007Qq-Ga
	for mharc-phpcompta-dev@gnu.org; Mon, 12 Aug 2013 19:25:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 01:16:14 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48258.1376349899.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5341 - in phpcompta/trunk: . html include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Aug 2013 23:24:59 -0000

Author: danydb
Date: 2013-08-13 01:16:13 +0200 (Tue, 13 Aug 2013)
New Revision: 5341

Modified:
   phpcompta/trunk/
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/include/constant.php
Log:
Merged revisions 5338-5339 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel660

........
  r5338 | danydb | 2013-08-04 21:12:29 +0200 (dim., 04 ao?\195?\187t 2013=
) | 1 line
 =20
  BUG cannot display list of card
........
  r5339 | danydb | 2013-08-08 23:50:38 +0200 (jeu., 08 ao?\195?\187t 2013=
) | 1 line
 =20
  PDF problem, need to increase memory
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel660:1-5332
   + /phpcompta/tags/rel660:1-5340

Modified: phpcompta/trunk/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_card.php	2013-08-09 11:16:30 UTC (rev 5340)
+++ phpcompta/trunk/html/ajax_card.php	2013-08-12 23:16:13 UTC (rev 5341)
@@ -367,7 +367,7 @@
 	}
      /* We limit the search to MAX_SEARCH_CARD records */
     $sql=3D$sql.' order by vw_name limit '.MAX_SEARCH_CARD;
-
+    $a=3D$cn->get_array($sql);
     for($i=3D0;$i<count($a);$i++)
     {
         $array[$i]['quick_code']=3D$a[$i]['quick_code'];

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-08-09 11:16:30 UTC (rev 534=
0)
+++ phpcompta/trunk/include/constant.php	2013-08-12 23:16:13 UTC (rev 534=
1)
@@ -44,7 +44,7 @@
 ini_set ('session.use_only_cookies','on');
 ini_set ('magic_quotes_gpc','off');
 ini_set ('max_execution_time',240);
-ini_set ('memory_limit','20M');
+ini_set ('memory_limit','256M');
 ini_set ('default_charset',"UTF-8");
 @ini_set ('session.use_trans_sid','on');
 @session_start();
@@ -60,13 +60,10 @@
 $g_failed=3D"<span style=3D\"font-size:18px;color:red\">&#x2716;</span>"=
;
 $g_succeed=3D"<span style=3D\"font-size:18px;color:green\">&#x2713;</spa=
n>";
 /* uncomment for development */
-/*
 define ('SVNINFO',5900);
 define ("DEBUG",true);
-*/
=20
 $version_phpcompta=3DSVNINFO;
-define ("DEBUG",false);
 /* define ('SVNINFO',5015);
  * $version_phpcompta=3DSVNINFO;
  * define ("DEBUG",true);



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


From MAILER-DAEMON Mon Aug 12 19:26:25 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V91VJ-0007th-A9
	for mharc-phpcompta-dev@gnu.org; Mon, 12 Aug 2013 19:26:25 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 01:17:41 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48259.1376349984.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5342 - phpcompta/tags/rel660/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Aug 2013 23:26:24 -0000

Author: danydb
Date: 2013-08-13 01:17:41 +0200 (Tue, 13 Aug 2013)
New Revision: 5342

Modified:
   phpcompta/tags/rel660/html/style.css
Log:
test css : font-size in percentage

Modified: phpcompta/tags/rel660/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/tags/rel660/html/style.css	2013-08-12 23:16:13 UTC (rev 534=
1)
+++ phpcompta/tags/rel660/html/style.css	2013-08-12 23:17:41 UTC (rev 534=
2)
@@ -2,8 +2,8 @@
=20
 BODY {
   background-color:#EDF3FF;
- font-size:12px;
-  font-family:verdana,helvetica,sans-serif;
+ font-size:100%;
+  font-family:verdana,sans-serif,helvetica;
   padding: 0px 0px 0px 0px ;
   margin:0;
   color:blue;
@@ -29,7 +29,7 @@
 }
 table.sortable th,  table.table_large th,table.result th {
   font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
  border-bottom:1px solid blue;
  border-top:0;
=20
@@ -40,8 +40,8 @@
 }
=20
 h2 {
-  font-family:verdana,helvetica,sans-serif;
-  font-size:14px;
+  font-family:verdana,sans-serif,helvetica;
+  font-size:120%;
   color:grey;
 }
 div.info {
@@ -54,7 +54,7 @@
 content h2.info {
 	background:#879ed4;
   color:black;
-  font-size:14pt;
+  font-size:120%;
   text-align:center;
   padding:0px;
   margin:0px;
@@ -62,7 +62,7 @@
 redcontent h2.info {
   background:#879ed4;
   color:white;
-  font-size:14pt;
+  font-size:120%;
   text-align:center;
   padding:0px;
   margin:0px;
@@ -70,7 +70,7 @@
 h2.info {
   background-color:#879ed4;
 	color:white;
-	font-size:14px;
+	font-size:120%;
   text-align:center;
   padding:0px;
   margin:0px;
@@ -81,13 +81,13 @@
 h3.info {
   background:#879ed4;
   color:white;
-  font-size:14px;
+  font-size:120%;
   text-align:center;
 }
=20
 h2.info2 {
   color:blue;
-  font-size:14px;
+  font-size:100%;
   text-align:center;
=20
 }
@@ -96,7 +96,7 @@
 h2.error {
 	background:red;
 	color:white;
-	font-size:14px;
+	font-size:120%;
 }
=20
=20
@@ -147,14 +147,14 @@
 div.lmenu {
 	 float:left;
 	 clear:left;
-	font-size:9px;
+	font-size:90%;
=20
 }
 div.lextmenu {
=20
 	float:left;
-	font-family:verdana,helvetica,sans-serif;
-	font-size:9px;
+	font-family:verdana,sans-serif,helvetica;
+	font-size:90%;
=20
 }
 div.searchmenu {
@@ -167,8 +167,8 @@
=20
 div.recherche_form{
 	width:700px;
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
+	font-size:90%;
+	font-family:verdana,sans-serif,helvetica;
   border-style:outset;
   border-width:1px;
=20
@@ -178,8 +178,8 @@
          float:left;
 	 padding-top:7px;
 	 padding-left:8px;
-         font-size:9px;
-         font-family:verdana,helvetica,sans-serif;
+         font-size:90%;
+         font-family:verdana,sans-serif,helvetica;
 	 width:75%;
=20
 }
@@ -188,7 +188,7 @@
 		padding-top:2px;
 		margin-top:2px;
          width:100%;
-         font-family:verdana,helvetica,sans-serif;
+         font-family:verdana,sans-serif,helvetica;
=20
=20
 }
@@ -197,12 +197,12 @@
          float:left;
 	 padding-top:7px;
          width:35%;
-         font-family:verdana,helvetica,sans-serif;
+         font-family:verdana,sans-serif,helvetica;
=20
 }
 div.no span{
 	position:static;
-	font-family:verdana,helvetica,sans-serif;
+	font-family:verdana,sans-serif,helvetica;
 	font-weight:bold;
 	color:red;
=20
@@ -217,7 +217,7 @@
 }
 table.document th{
   font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
   border-bottom:2px solid blue;
   border-top:0;
   color:#25238F;
@@ -252,20 +252,20 @@
 	text-align:center;
 	width:95px;
         height :30px;
-	font-size:10px;
+	font-size:90%;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
 }
 td.msubtitle {
 	text-align:center;
 	height:20px;
-	font-size:10px;
+	font-size:90%;
     background-color:#DDE6FF;
 }
 span.mtitle {
 	color:gray;
 	background-color:blue;
-	font-size:10px;
+	font-size:90%;
 	border-style:groove
 }
 span.odd {
@@ -279,18 +279,18 @@
=20
 tr.odd {
 	background-color:#DDE6FF;
-	font-size:10px;
+	font-size:90%;
 }
 tr {
-	font-size:10px;
+	font-size:90%;
 }
 td.odd{
 	background-color:#DDE6FF ;
-	font-size:10px;
+	font-size:90%;
 }
 td.even{
 	border:0px;
-	font-size:10px;
+	font-size:90%;
 }
 td.cell{
 	    height:32px;
@@ -300,21 +300,21 @@
 	border-style:inset;
         border-color:blue;
 	border-width:1pt ;
-	font-size:10px;
+	font-size:90%;
         background:#5D90CD ;
         color:white;
         text-align:center;
 	     width:120px;
 }
 a.mtitle {
-  font-size:10px;
+  font-size:90%;
   text-decoration:none;
   display:inline;
  color: blue;
=20
 }
 a.mtitle:hover {
-  font-size:10px;
+  font-size:90%;
   text-decoration:none;
   display:inline;
=20
@@ -323,13 +323,13 @@
=20
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
- font-size:1em;
+ font-size:90%;
  text-decoration:none;
  display:block;
  color:white;
 }
 a.dossier {
-  font-size:10px;
+  font-size:90%;
   text-decoration:none;
   display:block;
    color: #202267;
@@ -362,11 +362,11 @@
   display:block;
   color:blue;
   background-color:white;
-  font-size:9px;
+  font-size:90%;
 }
=20
 a.cell:hover {
-  font-size:9px;
+  font-size:90%;
   color:white;
   background-color:#5D90CD;
   text-decoration:none;
@@ -396,8 +396,8 @@
=20
 a.detail
 {
-  font-size:9px;
-  font-family:verdana,helvetica,sans-serif;
+  font-size:90%;
+  font-family:verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -405,8 +405,8 @@
=20
 a.detail:hover
 {
-  font-size:9px;
-  font-family:verdana,helvetica,sans-serif;
+  font-size:90%;
+  font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -418,7 +418,7 @@
 	 padding:1em 1em;
 }
 div.redcontent a {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
   text-decoration: none;
   display: block;
   color: blue;
@@ -426,7 +426,7 @@
 }
=20
 div.redcontent a:hover {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -434,7 +434,7 @@
=20
 }
 div.content a {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
   text-decoration: none;
   display: block;
   color: blue;
@@ -444,7 +444,7 @@
=20
=20
 div.content a:hover {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -470,7 +470,7 @@
=20
 }
 div.content a.mtitle {
-  font-size:10px;
+  font-size:90%;
   text-decoration:none;
   display:inline;
   color:blue;
@@ -488,7 +488,7 @@
=20
 }
 div.redcontent input.text {
-   font-family:verdana,helvetica,sans-serif;
+   font-family:verdana,sans-serif,helvetica;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -497,7 +497,7 @@
   color:blue;
 }
 div.content input.text {
-   font-family:verdana,helvetica,sans-serif;
+   font-family:verdana,sans-serif,helvetica;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -522,7 +522,7 @@
 border-collapse:collapse;
 }
 a.document{
-  font-size:12px;
+  font-size:100%;
   text-decoration:none;
   display:block;
 }
@@ -550,11 +550,11 @@
 h1.legend, legend {
 font-weight: bold;
 font-style: italic;
-font-size: 110% ;
+font-size: 120% ;
=20
 }
 fieldset fieldset legend {
-	 font-size:110%;
+	 font-size:120%;
 	 color:grey;
 	 }
 select {
@@ -596,7 +596,7 @@
   padding-left: 3px;
   padding-right:3px;
   text-decoration:none;
-  font-size:14px;
+  font-size:120%;
=20
   display:inline;
   color:black;
@@ -633,8 +633,8 @@
 	/*border:dotted 1px black;*/
 	border: 2px outset #201e87;
 	background-color:#879ED4;
-	font-size: 110% ;
-	font-family: verdana,helvetica,sans-serif;
+	font-size: 100% ;
+	font-family: verdana,sans-serif,helvetica;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -656,7 +656,7 @@
 	/*border:dotted 1px black;*/
 	border: 3px outset #201e87;
 	background-color: #879ED4;
-	font-family: verdana,helvetica,sans-serif;
+	font-family: verdana,sans-serif,helvetica;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -677,8 +677,8 @@
 	height:96%;
 	overflow: auto;
 	background-color:#DFE7FF;
-	font-size:10px ;
-	font-family: verdana,helvetica,sans-serif;
+	font-size:90% ;
+	font-family: verdana,sans-serif,helvetica;
 	font-style: normal;
 	font-weight: normal;
 	color: black;
@@ -695,7 +695,7 @@
   margin:0;
   padding:0;
   text-align:left;
-  font-size:12px;
+  font-size:100%;
=20
 }
 div.autocomplete em {
@@ -800,12 +800,12 @@
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:10px;
+	font-size:90%;
 	color:white;
 	font-weight: bold;
=20
 	text-decoration:none;
-	font-family: verdana,helvetica,sans-serif;
+	font-family: verdana,sans-serif,helvetica;
 	background-image: url("image/bg-submit2.gif");
 	background-repeat: repeat-x;
 	background-position: left;
@@ -845,7 +845,7 @@
 	color:darkblue;
 	font-style: italic;
 	display:inline;
-	font-size:14px;
+	font-size:120%;
 	margin:0px;
 	padding:0px;
 	font-variant:small-caps;
@@ -886,8 +886,8 @@
 }
 div.inner_box  {
   background-color:#e4e7ed;
- font-size:10;
-  font-family:verdana,helvetica,sans-serif;
+ font-size:100%;
+  font-family:verdana,sans-serif,helvetica;
   padding:0;
   margin:0;
   overflow:hidden;
@@ -949,24 +949,24 @@
 }
 table.info_op
 {
-	font-size:18;
+	font-size:100%;
 	width:100%;
 }
 table.info_op tr
 {
-font-size:14;
+font-size:120%;
 background:white;
 }
 h2#jrn_name
 {
 	color:blue;
-	font-size:22;
+	font-size:120%;
 	margin-right:30%;
 	float: right;
=20
 }
 tr.footer{
-	font-size:14;
+	font-size:120%;
 	font-style: italic;
 	font-weight: bold;
=20
@@ -1001,7 +1001,7 @@
 div#wait_box
 {
   background-color:#F1E6E6;
- font-size:10;
+ font-size:120%;
   font-family: verdana,helvetica,arial,sans-serif;
   padding:0;
   margin:0;
@@ -1058,7 +1058,7 @@
  margin-left: 2px;
  margin-right:2px;
  margin-top:0px;
- font-size:10px;
+ font-size:90%;
 }
 #close_div:hover
 {
@@ -1077,7 +1077,7 @@
 	width:300px;
 	border:1px solid black;
 	background-color:#aec3e8;
-	font-size:16px;
+	font-size:120%;
 	padding: 20px 20px;
 }
 span.invoice
@@ -1091,14 +1091,14 @@
 a.nav,div.content a.nav,div.redcontent a.nav {
 	display:inline;
 	text-decoration:none;
-	font-size:1em;
+	font-size:100%;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
 	display:inline;
 	text-decoration:none;
 	background-color:darkblue;
 	color:white;
-	font-size:1em;
+	font-size:100%;
 }
 #dossier {
 	display:inline;
@@ -1112,30 +1112,30 @@
=20
 h1.title {
 	color: blue;
-	font-size:18px;
+	font-size:120%;
 	font-style: italic;
 }
 h2.title {
 	color: blue;
-	font-size:14px;
+	font-size:120%;
 	font-weight:bold;
 	font-style: italic;
 	margin-left: 15px;
 }
 h3.title {
 	color: blue;
-	font-size:14px;
+	font-size:120%;
 	margin-left: 30px;
 }
 h4.title {
 	color: blue;
-	font-size:12px;
+	font-size:120%;
 	margin-left: 45px;
 	text-decoration: underline;
 }
 h5.title {
 	color: blue;
-	font-size:12px;
+	font-size:120%;
 	margin-left: 45px;
 	text-decoration: none;
 	font-style: italic;



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


From MAILER-DAEMON Mon Aug 12 19:26:47 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V91Vf-0007uh-ES
	for mharc-phpcompta-dev@gnu.org; Mon, 12 Aug 2013 19:26:47 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 01:18:04 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48260.1376350006.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5343 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Aug 2013 23:26:46 -0000

Author: danydb
Date: 2013-08-13 01:18:04 +0200 (Tue, 13 Aug 2013)
New Revision: 5343

Modified:
   phpcompta/trunk/html/style.css
Log:
test css : font-size in percentage

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-12 23:17:41 UTC (rev 5342)
+++ phpcompta/trunk/html/style.css	2013-08-12 23:18:04 UTC (rev 5343)
@@ -2,8 +2,8 @@
=20
 BODY {
   background-color:#EDF3FF;
- font-size:12px;
-  font-family:verdana,helvetica,sans-serif;
+ font-size:100%;
+  font-family:verdana,sans-serif,helvetica;
   padding: 0px 0px 0px 0px ;
   margin:0;
   color:blue;
@@ -29,7 +29,7 @@
 }
 table.sortable th,  table.table_large th,table.result th {
   font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
  border-bottom:1px solid blue;
  border-top:0;
=20
@@ -40,8 +40,8 @@
 }
=20
 h2 {
-  font-family:verdana,helvetica,sans-serif;
-  font-size:14px;
+  font-family:verdana,sans-serif,helvetica;
+  font-size:120%;
   color:grey;
 }
 div.info {
@@ -54,7 +54,7 @@
 content h2.info {
 	background:#879ed4;
   color:black;
-  font-size:14pt;
+  font-size:120%;
   text-align:center;
   padding:0px;
   margin:0px;
@@ -62,7 +62,7 @@
 redcontent h2.info {
   background:#879ed4;
   color:white;
-  font-size:14pt;
+  font-size:120%;
   text-align:center;
   padding:0px;
   margin:0px;
@@ -70,7 +70,7 @@
 h2.info {
   background-color:#879ed4;
 	color:white;
-	font-size:14px;
+	font-size:120%;
   text-align:center;
   padding:0px;
   margin:0px;
@@ -81,13 +81,13 @@
 h3.info {
   background:#879ed4;
   color:white;
-  font-size:14px;
+  font-size:120%;
   text-align:center;
 }
=20
 h2.info2 {
   color:blue;
-  font-size:14px;
+  font-size:100%;
   text-align:center;
=20
 }
@@ -96,7 +96,7 @@
 h2.error {
 	background:red;
 	color:white;
-	font-size:14px;
+	font-size:120%;
 }
=20
=20
@@ -147,14 +147,14 @@
 div.lmenu {
 	 float:left;
 	 clear:left;
-	font-size:9px;
+	font-size:90%;
=20
 }
 div.lextmenu {
=20
 	float:left;
-	font-family:verdana,helvetica,sans-serif;
-	font-size:9px;
+	font-family:verdana,sans-serif,helvetica;
+	font-size:90%;
=20
 }
 div.searchmenu {
@@ -167,8 +167,8 @@
=20
 div.recherche_form{
 	width:700px;
-	font-size:9px;
-	font-family:verdana,helvetica,sans-serif;
+	font-size:90%;
+	font-family:verdana,sans-serif,helvetica;
   border-style:outset;
   border-width:1px;
=20
@@ -178,8 +178,8 @@
          float:left;
 	 padding-top:7px;
 	 padding-left:8px;
-         font-size:9px;
-         font-family:verdana,helvetica,sans-serif;
+         font-size:90%;
+         font-family:verdana,sans-serif,helvetica;
 	 width:75%;
=20
 }
@@ -188,7 +188,7 @@
 		padding-top:2px;
 		margin-top:2px;
          width:100%;
-         font-family:verdana,helvetica,sans-serif;
+         font-family:verdana,sans-serif,helvetica;
=20
=20
 }
@@ -197,12 +197,12 @@
          float:left;
 	 padding-top:7px;
          width:35%;
-         font-family:verdana,helvetica,sans-serif;
+         font-family:verdana,sans-serif,helvetica;
=20
 }
 div.no span{
 	position:static;
-	font-family:verdana,helvetica,sans-serif;
+	font-family:verdana,sans-serif,helvetica;
 	font-weight:bold;
 	color:red;
=20
@@ -217,7 +217,7 @@
 }
 table.document th{
   font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
   border-bottom:2px solid blue;
   border-top:0;
   color:#25238F;
@@ -252,20 +252,20 @@
 	text-align:center;
 	width:95px;
         height :30px;
-	font-size:10px;
+	font-size:90%;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
 }
 td.msubtitle {
 	text-align:center;
 	height:20px;
-	font-size:10px;
+	font-size:90%;
     background-color:#DDE6FF;
 }
 span.mtitle {
 	color:gray;
 	background-color:blue;
-	font-size:10px;
+	font-size:90%;
 	border-style:groove
 }
 span.odd {
@@ -279,18 +279,18 @@
=20
 tr.odd {
 	background-color:#DDE6FF;
-	font-size:10px;
+	font-size:90%;
 }
 tr {
-	font-size:10px;
+	font-size:90%;
 }
 td.odd{
 	background-color:#DDE6FF ;
-	font-size:10px;
+	font-size:90%;
 }
 td.even{
 	border:0px;
-	font-size:10px;
+	font-size:90%;
 }
 td.cell{
 	    height:32px;
@@ -300,21 +300,21 @@
 	border-style:inset;
         border-color:blue;
 	border-width:1pt ;
-	font-size:10px;
+	font-size:90%;
         background:#5D90CD ;
         color:white;
         text-align:center;
 	     width:120px;
 }
 a.mtitle {
-  font-size:10px;
+  font-size:90%;
   text-decoration:none;
   display:inline;
  color: blue;
=20
 }
 a.mtitle:hover {
-  font-size:10px;
+  font-size:90%;
   text-decoration:none;
   display:inline;
=20
@@ -323,13 +323,13 @@
=20
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
- font-size:1em;
+ font-size:90%;
  text-decoration:none;
  display:block;
  color:white;
 }
 a.dossier {
-  font-size:10px;
+  font-size:90%;
   text-decoration:none;
   display:block;
    color: #202267;
@@ -362,11 +362,11 @@
   display:block;
   color:blue;
   background-color:white;
-  font-size:9px;
+  font-size:90%;
 }
=20
 a.cell:hover {
-  font-size:9px;
+  font-size:90%;
   color:white;
   background-color:#5D90CD;
   text-decoration:none;
@@ -396,8 +396,8 @@
=20
 a.detail
 {
-  font-size:9px;
-  font-family:verdana,helvetica,sans-serif;
+  font-size:90%;
+  font-family:verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -405,8 +405,8 @@
=20
 a.detail:hover
 {
-  font-size:9px;
-  font-family:verdana,helvetica,sans-serif;
+  font-size:90%;
+  font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -418,7 +418,7 @@
 	 padding:1em 1em;
 }
 div.redcontent a {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
   text-decoration: none;
   display: block;
   color: blue;
@@ -426,7 +426,7 @@
 }
=20
 div.redcontent a:hover {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -434,7 +434,7 @@
=20
 }
 div.content a {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
   text-decoration: none;
   display: block;
   color: blue;
@@ -444,7 +444,7 @@
=20
=20
 div.content a:hover {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -470,7 +470,7 @@
=20
 }
 div.content a.mtitle {
-  font-size:10px;
+  font-size:90%;
   text-decoration:none;
   display:inline;
   color:blue;
@@ -488,7 +488,7 @@
=20
 }
 div.redcontent input.text {
-   font-family:verdana,helvetica,sans-serif;
+   font-family:verdana,sans-serif,helvetica;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -497,7 +497,7 @@
   color:blue;
 }
 div.content input.text {
-   font-family:verdana,helvetica,sans-serif;
+   font-family:verdana,sans-serif,helvetica;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -522,7 +522,7 @@
 border-collapse:collapse;
 }
 a.document{
-  font-size:12px;
+  font-size:100%;
   text-decoration:none;
   display:block;
 }
@@ -550,11 +550,11 @@
 h1.legend, legend {
 font-weight: bold;
 font-style: italic;
-font-size: 110% ;
+font-size: 120% ;
=20
 }
 fieldset fieldset legend {
-	 font-size:110%;
+	 font-size:120%;
 	 color:grey;
 	 }
 select {
@@ -596,7 +596,7 @@
   padding-left: 3px;
   padding-right:3px;
   text-decoration:none;
-  font-size:14px;
+  font-size:120%;
=20
   display:inline;
   color:black;
@@ -633,8 +633,8 @@
 	/*border:dotted 1px black;*/
 	border: 2px outset #201e87;
 	background-color:#879ED4;
-	font-size: 110% ;
-	font-family: verdana,helvetica,sans-serif;
+	font-size: 100% ;
+	font-family: verdana,sans-serif,helvetica;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -656,7 +656,7 @@
 	/*border:dotted 1px black;*/
 	border: 3px outset #201e87;
 	background-color: #879ED4;
-	font-family: verdana,helvetica,sans-serif;
+	font-family: verdana,sans-serif,helvetica;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -677,8 +677,8 @@
 	height:96%;
 	overflow: auto;
 	background-color:#DFE7FF;
-	font-size:10px ;
-	font-family: verdana,helvetica,sans-serif;
+	font-size:90% ;
+	font-family: verdana,sans-serif,helvetica;
 	font-style: normal;
 	font-weight: normal;
 	color: black;
@@ -695,7 +695,7 @@
   margin:0;
   padding:0;
   text-align:left;
-  font-size:12px;
+  font-size:100%;
=20
 }
 div.autocomplete em {
@@ -800,12 +800,12 @@
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:10px;
+	font-size:90%;
 	color:white;
 	font-weight: bold;
=20
 	text-decoration:none;
-	font-family: verdana,helvetica,sans-serif;
+	font-family: verdana,sans-serif,helvetica;
 	background-image: url("image/bg-submit2.gif");
 	background-repeat: repeat-x;
 	background-position: left;
@@ -845,7 +845,7 @@
 	color:darkblue;
 	font-style: italic;
 	display:inline;
-	font-size:14px;
+	font-size:120%;
 	margin:0px;
 	padding:0px;
 	font-variant:small-caps;
@@ -886,8 +886,8 @@
 }
 div.inner_box  {
   background-color:#e4e7ed;
- font-size:10;
-  font-family:verdana,helvetica,sans-serif;
+ font-size:100%;
+  font-family:verdana,sans-serif,helvetica;
   padding:0;
   margin:0;
   overflow:hidden;
@@ -949,24 +949,24 @@
 }
 table.info_op
 {
-	font-size:18;
+	font-size:100%;
 	width:100%;
 }
 table.info_op tr
 {
-font-size:14;
+font-size:120%;
 background:white;
 }
 h2#jrn_name
 {
 	color:blue;
-	font-size:22;
+	font-size:120%;
 	margin-right:30%;
 	float: right;
=20
 }
 tr.footer{
-	font-size:14;
+	font-size:120%;
 	font-style: italic;
 	font-weight: bold;
=20
@@ -1001,7 +1001,7 @@
 div#wait_box
 {
   background-color:#F1E6E6;
- font-size:10;
+ font-size:120%;
   font-family: verdana,helvetica,arial,sans-serif;
   padding:0;
   margin:0;
@@ -1058,7 +1058,7 @@
  margin-left: 2px;
  margin-right:2px;
  margin-top:0px;
- font-size:10px;
+ font-size:90%;
 }
 #close_div:hover
 {
@@ -1077,7 +1077,7 @@
 	width:300px;
 	border:1px solid black;
 	background-color:#aec3e8;
-	font-size:16px;
+	font-size:120%;
 	padding: 20px 20px;
 }
 span.invoice
@@ -1091,14 +1091,14 @@
 a.nav,div.content a.nav,div.redcontent a.nav {
 	display:inline;
 	text-decoration:none;
-	font-size:1em;
+	font-size:100%;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
 	display:inline;
 	text-decoration:none;
 	background-color:darkblue;
 	color:white;
-	font-size:1em;
+	font-size:100%;
 }
 #dossier {
 	display:inline;
@@ -1112,30 +1112,30 @@
=20
 h1.title {
 	color: blue;
-	font-size:18px;
+	font-size:120%;
 	font-style: italic;
 }
 h2.title {
 	color: blue;
-	font-size:14px;
+	font-size:120%;
 	font-weight:bold;
 	font-style: italic;
 	margin-left: 15px;
 }
 h3.title {
 	color: blue;
-	font-size:14px;
+	font-size:120%;
 	margin-left: 30px;
 }
 h4.title {
 	color: blue;
-	font-size:12px;
+	font-size:120%;
 	margin-left: 45px;
 	text-decoration: underline;
 }
 h5.title {
 	color: blue;
-	font-size:12px;
+	font-size:120%;
 	margin-left: 45px;
 	text-decoration: none;
 	font-style: italic;



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


From MAILER-DAEMON Mon Aug 12 19:30:46 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V91ZV-00005S-Db
	for mharc-phpcompta-dev@gnu.org; Mon, 12 Aug 2013 19:30:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 01:21:59 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48261.1376350244.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5344 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Aug 2013 23:30:44 -0000

Author: danydb
Date: 2013-08-13 01:21:58 +0200 (Tue, 13 Aug 2013)
New Revision: 5344

Modified:
   phpcompta/trunk/include/class_phpcompta_sql.php
Log:
bug : undefined variable

Modified: phpcompta/trunk/include/class_phpcompta_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_phpcompta_sql.php	2013-08-12 23:18:04 U=
TC (rev 5343)
+++ phpcompta/trunk/include/class_phpcompta_sql.php	2013-08-12 23:21:58 U=
TC (rev 5344)
@@ -282,7 +282,7 @@
 	 */
  public function get_object($p_ret,$idx)
     {
-    return $this->next($p_ret, $i);
+    return $this->next($p_ret, $idx);
    }
 }
=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 12 21:23:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V93KB-0007lI-U4
	for mharc-phpcompta-dev@gnu.org; Mon, 12 Aug 2013 21:23:03 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 03:14:15 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48314.1376356983.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5345 - in phpcompta/trunk: . include sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Aug 2013 01:23:02 -0000

Author: danydb
Date: 2013-08-13 03:14:15 +0200 (Tue, 13 Aug 2013)
New Revision: 5345

Modified:
   phpcompta/trunk/
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/constant.php
   phpcompta/trunk/include/export_ledger_csv.php
   phpcompta/trunk/sql/upgrade.sql
Log:
Bug #0000873: Si achat utilisant le poste comptable dans DEP_PRIV alors l=
e mettre en d?\195?\169pense privee


Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel660:1-5340
   + /phpcompta/tags/rel660:1-5342

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-08-12 23:21:58 UTC =
(rev 5344)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-08-13 01:14:15 UTC =
(rev 5345)
@@ -511,11 +511,11 @@
=20
 	/** @brief  Get simplified row from ledger
 	 *
-	 * @paramfrom periode
-	 * @paramto periode
-	 * @paramp_limit starting line
-	 * @paramp_offset number of lines
-	 * @paramtrunc if data must be truncated (pdf export)
+	 * @param p_from periode
+	 * @param p_to periode
+	 * @param p_limit starting line
+	 * @param p_offset number of lines
+	 * @param trunc if data must be truncated (pdf export)
 	 *
 	 * \return an Array with the asked data
 	 */
@@ -1093,7 +1093,8 @@
 				$fiche_def_id =3D $fiche->get_fiche_def_ref_id();
 				// Customer or supplier
 				if ($fiche_def_id =3D=3D FICHE_TYPE_CLIENT ||
-						$fiche_def_id =3D=3D FICHE_TYPE_FOURNISSEUR)
+						$fiche_def_id =3D=3D FICHE_TYPE_FOURNISSEUR
+                                        ||$fiche_def_id =3D=3D FICHE_TYP=
E_ADM_TAX)
 				{
 					$p_array['TVAC'] =3D $code['j_montant'];
=20
@@ -1104,6 +1105,11 @@
 						$p_array['reversed'] =3D true;
 						$p_array['TVAC']*=3D-1;
 					}
+					if ($fiche_def_id =3D=3D FICHE_TYPE_ADM_TAX && $code['j_debit'] =3D=
=3D 'f')
+					{
+						$p_array['reversed'] =3D true;
+						$p_array['TVAC']*=3D-1;
+					}
 					if ($fiche_def_id =3D=3D FICHE_TYPE_FOURNISSEUR && $code['j_debit']=
 =3D=3D 't')
 					{
 						$p_array['reversed'] =3D true;
@@ -1115,7 +1121,9 @@
 					// if we use the ledger ven / ach for others card than supplier and=
 customer
 					if ($fiche_def_id !=3D FICHE_TYPE_VENTE &&
 							$fiche_def_id !=3D FICHE_TYPE_ACH_MAR &&
-							$fiche_def_id !=3D FICHE_TYPE_ACH_SER)
+							$fiche_def_id !=3D FICHE_TYPE_ACH_SER  &&
+							$fiche_def_id !=3D FICHE_TYPE_ACH_MAT
+                                           )                            =
                   =20
 					{
 						$p_array['TVAC'] =3D $code['j_montant'];
=20
@@ -1173,7 +1181,7 @@
 				$p_array['dep_priv'] =3D $dep_priv;
 			}
 		}
-		$p_array['TVAC'] =3D sprintf('% 10.2f', $p_array['TVAC'] - $dep_priv);
+		$p_array['TVAC'] =3D sprintf('% 10.2f', $p_array['TVAC'] );
 		$p_array['HTVA'] =3D sprintf('% 10.2f', $p_array['TVAC'] - $p_array['A=
MOUNT_TVA']);
 		$r =3D "";
 		$a_tva_amount =3D array();

Modified: phpcompta/trunk/include/constant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/constant.php	2013-08-12 23:21:58 UTC (rev 534=
4)
+++ phpcompta/trunk/include/constant.php	2013-08-13 01:14:15 UTC (rev 534=
5)
@@ -179,6 +179,7 @@
 define ("FICHE_TYPE_ADM_TAX",14);
 define ("FICHE_TYPE_ACH_MAR",2);
 define ("FICHE_TYPE_ACH_SER",3);
+define ("FICHE_TYPE_ACH_MAT",7);
=20
=20
 define ('JS_INFOBULLE','

Modified: phpcompta/trunk/include/export_ledger_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_ledger_csv.php	2013-08-12 23:21:58 UTC=
 (rev 5344)
+++ phpcompta/trunk/include/export_ledger_csv.php	2013-08-13 01:14:15 UTC=
 (rev 5345)
@@ -33,7 +33,6 @@
=20
 require_once('class_database.php');
 require_once("class_acc_ledger.php");
-$cn=3Dnew Database($gDossier);
=20
=20
 require_once ('class_user.php');
@@ -145,16 +144,17 @@
                 $col_tva.=3D'"Tva '.$line_tva['tva_label'].'";';
             }
         }
-        echo '"Date";"operation";"Client/Fourn.";"Commentaire";"inter.";=
"HTVA";'.$col_tva.'"TVAC"'."\n\r";
+        echo '"Date";"operation";"Client/Fourn.";"Commentaire";"inter.";=
"HTVA";priv=C3=A9;'.$col_tva.'"TVAC"'."\n\r";
         foreach ($Row as $line)
         {
-            printf('"%s";"%s";"%s";"%s";"%s";%s;',
+            printf('"%s";"%s";"%s";"%s";"%s";%s;%s;',
                    $line['date'],
                    $line['num'],
                    $Jrn->get_tiers($line['jrn_def_type'],$line['jr_id'])=
,
                    $line['comment'],
                    $line['jr_internal'],
-                   nb($line['HTVA']));
+                   nb($line['HTVA']),
+                   nb($line['dep_priv']));
             $a_tva_amount=3Darray();
             foreach ($line['TVA'] as $lineTVA)
             {

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-08-12 23:21:58 UTC (rev 5344)
+++ phpcompta/trunk/sql/upgrade.sql	2013-08-13 01:14:15 UTC (rev 5345)
@@ -0,0 +1,63 @@
+-- si la fiche utilise le code DEPENSE PRIVEE alors ajout dans QP_DEP_PR=
IV
+with m as (select qp_id, qp_price from quant_purchase join fiche_detail =
on (qp_fiche=3Df_id and ad_id=3D5) where ad_value in (select p_value from=
 parm_code where p_code=3D'DEP_PRIV'))
+update quant_purchase as e set qp_dep_priv=3D(select qp_price from m whe=
re m.qp_id=3De.qp_id);
+-- =C3=A9vite les valeurs nulles dans quant_purchase
+update quant_purchase set qp_dep_priv =3D 0 where qp_dep_priv is null;
+-- update script insert_quant_purchase
+
+CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(p_internal t=
ext, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price =
numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva=
 numeric, p_nd_tva_recup numeric, p_dep_priv numeric, p_client character =
varying, p_tva_sided numeric)
+  RETURNS void AS
+$BODY$
+declare
+        fid_client integer;
+        fid_good   integer;
+        account_priv    account_type;
+        fid_good_account account_type;
+begin
+	select p_value into account_priv from parm_code where p_code=3D'DEP_PRI=
V';
+=09
+        select f_id into fid_client from
+                fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim(=
p_client));
+        select f_id into fid_good from
+                 fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim=
(p_fiche));
+        select ad_value into fid_good_account from fiche_detail where ad=
_id=3D5 and f_id=3Dfid_good;
+
+        if account_priv =3D fid_good_account then
+		p_dep_priv=3Dp_price;
+	end if;
+=09
+        insert into quant_purchase
+                (qp_internal,
+                j_id,
+                qp_fiche,
+                qp_quantite,
+                qp_price,
+                qp_vat,
+                qp_vat_code,
+                qp_nd_amount,
+                qp_nd_tva,
+                qp_nd_tva_recup,
+                qp_supplier,
+                qp_dep_priv,
+                qp_vat_sided)
+        values
+                (p_internal,
+                p_j_id,
+                fid_good,
+                p_quant,
+                p_price,
+                p_vat,
+                p_vat_code,
+                p_nd_amount,
+                p_nd_tva,
+                p_nd_tva_recup,
+                fid_client,
+                p_dep_priv,
+                p_tva_sided);
+        return;
+end;
+ $BODY$
+  LANGUAGE plpgsql;
+
+
+



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


From MAILER-DAEMON Mon Aug 12 21:43:33 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V93e1-0004q3-5k
	for mharc-phpcompta-dev@gnu.org; Mon, 12 Aug 2013 21:43:33 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 03:34:46 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48332.1376358212.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5346 - phpcompta/trunk/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Aug 2013 01:43:32 -0000

Author: danydb
Date: 2013-08-13 03:34:46 +0200 (Tue, 13 Aug 2013)
New Revision: 5346

Modified:
   phpcompta/trunk/sql/upgrade.sql
Log:
Mise ?\195?\160 jour mod1 : parm_code manquant par rapport ?\195?\160 la =
Belgique

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-08-13 01:14:15 UTC (rev 5345)
+++ phpcompta/trunk/sql/upgrade.sql	2013-08-13 01:34:46 UTC (rev 5346)
@@ -59,5 +59,19 @@
  $BODY$
   LANGUAGE plpgsql;
=20
-
-
+create or replace function add_parm_code() returns void as
+$fct$
+declare
+    country_code text;
+begin=20
+    select pr_value into country_code from parameter where pr_id=3D'MY_C=
OUNTRY';
+    if country_code=3D'FR' then
+        insert into parm_code (p_code,p_comment,p_value) values ('DNA','=
D=C3=A9pense non d=C3=A9ductible','67');
+        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_D=
NA','TVA non d=C3=A9ductible','');
+        insert into parm_code  (p_code,p_comment,p_value) values ('TVA_D=
ED_IMPOT','TVA d=C3=A9ductible =C3=A0 l''imp=C3=B4t','');
+        insert into parm_code  (p_code,p_comment,p_value) values ('COMPT=
E_COURANT','Poste comptable pour le compte courant','');
+        insert into parm_code  (p_code,p_comment,p_value) values ('COMPT=
E_TVA','TVA =C3=A0 payer ou =C3=A0 recevoir','');
+     end if;
+end;
+$fct$
+language plpgsql;



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


From MAILER-DAEMON Mon Aug 12 22:09:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V942t-0004BQ-IW
	for mharc-phpcompta-dev@gnu.org; Mon, 12 Aug 2013 22:09:15 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 04:00:30 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48348.1376359755.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5347 - phpcompta/trunk/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Aug 2013 02:09:14 -0000

Author: danydb
Date: 2013-08-13 04:00:29 +0200 (Tue, 13 Aug 2013)
New Revision: 5347

Modified:
   phpcompta/trunk/sql/upgrade.sql
Log:
Bug #0000873: Si achat utilisant le poste comptable dans DEP_PRIV alors l=
e mettre en d?\195?\169pense privee

Modified: phpcompta/trunk/sql/upgrade.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/sql/upgrade.sql	2013-08-13 01:34:46 UTC (rev 5346)
+++ phpcompta/trunk/sql/upgrade.sql	2013-08-13 02:00:29 UTC (rev 5347)
@@ -22,10 +22,10 @@
                  fiche_detail where ad_id=3D23 and ad_value=3Dupper(trim=
(p_fiche));
         select ad_value into fid_good_account from fiche_detail where ad=
_id=3D5 and f_id=3Dfid_good;
=20
-        if account_priv =3D fid_good_account then
+        if strpos( fid_good_account , account_priv ) =3D 1 then
 		p_dep_priv=3Dp_price;
 	end if;
-=09
+           =20
         insert into quant_purchase
                 (qp_internal,
                 j_id,
@@ -59,6 +59,7 @@
  $BODY$
   LANGUAGE plpgsql;
=20
+-- ajout code manquant dans parm_code
 create or replace function add_parm_code() returns void as
 $fct$
 declare
@@ -75,3 +76,10 @@
 end;
 $fct$
 language plpgsql;
+
+select add_parm_code();
+
+drop function add_parm_code();
+
+update parm_code set p_value=3D'67' where p_value=3D'6740' and p_code=3D=
'DNA';
+



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


From MAILER-DAEMON Mon Aug 12 22:09:39 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V943H-0004DW-M3
	for mharc-phpcompta-dev@gnu.org; Mon, 12 Aug 2013 22:09:39 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 04:00:52 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48349.1376359779.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5348 - phpcompta/tags/rel660/doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Aug 2013 02:09:38 -0000

Author: danydb
Date: 2013-08-13 04:00:51 +0200 (Tue, 13 Aug 2013)
New Revision: 5348

Modified:
   phpcompta/tags/rel660/doc/manuel-fr.odt
Log:
Bug #0000873: Si achat utilisant le poste comptable dans DEP_PRIV alors l=
e mettre en d?\195?\169pense privee

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



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


From MAILER-DAEMON Mon Aug 12 22:12:10 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V945h-0004wl-VX
	for mharc-phpcompta-dev@gnu.org; Mon, 12 Aug 2013 22:12:09 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 04:03:24 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48353.1376359929.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5349 - in phpcompta/trunk: . doc
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Aug 2013 02:12:08 -0000

Author: danydb
Date: 2013-08-13 04:03:24 +0200 (Tue, 13 Aug 2013)
New Revision: 5349

Modified:
   phpcompta/trunk/
   phpcompta/trunk/doc/
   phpcompta/trunk/doc/manuel-fr.odt
Log:
Bug #0000873: Si achat utilisant le poste comptable dans DEP_PRIV alors l=
e mettre en d?\195?\169pense privee


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


Property changes on: phpcompta/trunk/doc
___________________________________________________________________
Name: svn:ignore
   - *.html
*.pdf
*.txt
.~lock.manuel-fr.odt#
.a.swp
.~lock.manuel-fr.pdf#

   + *.html
*.pdf
*.txt
.~lock.manuel-fr.odt#
.a.swp
.~lock.manuel-fr.pdf#
.~lock.manuel-fr.odt.merge-right.r5348#
.~lock.manuel-fr.odt.merge-left.r5347#


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



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


From MAILER-DAEMON Tue Aug 13 03:00:23 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V98ad-0005XM-7f
	for mharc-phpcompta-dev@gnu.org; Tue, 13 Aug 2013 03:00:23 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 13 Aug 2013 08:51:14 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.48613.1376377222.12399.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5350 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Aug 2013 07:00:21 -0000

Author: danydb
Date: 2013-08-13 08:51:13 +0200 (Tue, 13 Aug 2013)
New Revision: 5350

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_print_ledger_detail.php
   phpcompta/trunk/include/class_print_ledger_simple.php
   phpcompta/trunk/include/class_print_ledger_simple_without_vat.php
   phpcompta/trunk/include/export_ledger_csv.php
   phpcompta/trunk/include/impress_jrn.inc.php
Log:
Task #0000874: Am?\195?\169lioration impression journaux

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-08-13 02:03:24 UTC =
(rev 5349)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-08-13 06:51:13 UTC =
(rev 5350)
@@ -1070,6 +1070,8 @@
 		$p_array['TVA'] =3D array();
 		$p_array['AMOUNT_TVA'] =3D 0.0;
 		$p_array['dep_priv'] =3D 0;
+		$p_array['dna'] =3D 0;
+		$p_array['tva_dna'] =3D 0;
 		$dep_priv =3D 0.0;
 		//
 		// Retrieve data from jrnx
@@ -1179,7 +1181,10 @@
 				$purchase->load();
 				$dep_priv+=3D$purchase->qp_dep_priv;
 				$p_array['dep_priv'] =3D $dep_priv;
+                                $p_array['dna']=3D$purchase->qp_nd_amoun=
t;
+                                $p_array['tva_dna']=3D$purchase->qp_nd_t=
va;
 			}
+                       =20
 		}
 		$p_array['TVAC'] =3D sprintf('% 10.2f', $p_array['TVAC'] );
 		$p_array['HTVA'] =3D sprintf('% 10.2f', $p_array['TVAC'] - $p_array['A=
MOUNT_TVA']);
@@ -2912,7 +2917,7 @@
 		if ($this->type =3D=3D 'ACH')
 		{
 			$array =3D $this->db->get_array('select sum(qp_price) as price,sum(qp=
_vat) as vat ' .
-					',sum(qp_dep_priv) as priv' .
+					',coalesce(sum(qp_nd_amount),0)+coalesce(sum(qp_dep_priv),0) as pri=
v' .
 					',sum(qp_nd_tva_recup)+sum(qp_nd_tva) as tva_nd' .
 					'  from quant_purchase join jrnx using(j_id)
                                         where  j_grpt=3D$1 ', array($p_j=
r_id));

Modified: phpcompta/trunk/include/class_print_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_detail.php	2013-08-13 02:0=
3:24 UTC (rev 5349)
+++ phpcompta/trunk/include/class_print_ledger_detail.php	2013-08-13 06:5=
1:13 UTC (rev 5350)
@@ -59,10 +59,9 @@
         //Arial italic 8
         $this->SetFont('Arial', 'I', 8);
         //Page number
-        $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'=
/{nb}',0,0,'C');
-        $this->Ln(3);
+        $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'=
/{nb}',0,0,'L');
         // Created by PhpCompta
-        $this->Cell(0,8,'Created by Phpcompta, online on http://www.aeva=
lys.eu',0,0,'C',false,'http://www.aevalys.eu');
+        $this->Cell(0,8,'Created by Phpcompta, online on http://www.aeva=
lys.eu',0,0,'R',false,'http://www.aevalys.eu');
=20
     }
     function Cell ($w, $h=3D0, $txt=3D'', $border=3D0, $ln=3D0, $align=3D=
'', $fill=3Dfalse, $link=3D'')

Modified: phpcompta/trunk/include/class_print_ledger_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_simple.php	2013-08-13 02:0=
3:24 UTC (rev 5349)
+++ phpcompta/trunk/include/class_print_ledger_simple.php	2013-08-13 06:5=
1:13 UTC (rev 5350)
@@ -104,7 +104,7 @@
         $this->Cell(15,6,'HTVA',0,0,'R');
         if ( $this->jrn_type=3D=3D'ACH')
         {
-            $this->Cell(15,6,'Priv=C3=A9',0,0,'R');
+            $this->Cell(15,6,'Priv/DNA',0,0,'R');
             $this->Cell(15,6,'TVA ND',0,0,'R');
         }
         foreach($this->a_Tva as $line_tva)
@@ -181,10 +181,9 @@
         //Arial italic 8
         $this->SetFont('Arial', 'I', 8);
         //Page number
-        $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'=
/{nb}',0,0,'C');
-        $this->Ln(3);
+        $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'=
/{nb}',0,0,'L');
         // Created by PhpCompta
-        $this->Cell(0,8,'Created by Phpcompta, online on http://www.aeva=
lys.eu',0,0,'C',false,'http://www.aevalys.eu');
+        $this->Cell(0,8,'Created by Phpcompta, online on http://www.aeva=
lys.eu',0,0,'R',false,'http://www.aevalys.eu');
     }
=20
     function Cell ($w, $h=3D0, $txt=3D'', $border=3D0, $ln=3D0, $align=3D=
'', $fill=3Dfalse, $link=3D'')

Modified: phpcompta/trunk/include/class_print_ledger_simple_without_vat.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_print_ledger_simple_without_vat.php	201=
3-08-13 02:03:24 UTC (rev 5349)
+++ phpcompta/trunk/include/class_print_ledger_simple_without_vat.php	201=
3-08-13 06:51:13 UTC (rev 5350)
@@ -132,10 +132,9 @@
         //Arial italic 8
         $this->SetFont('Arial', 'I', 8);
         //Page number
-        $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'=
/{nb}',0,0,'C');
-        $this->Ln(3);
+        $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'=
/{nb}',0,0,'L');
         // Created by PhpCompta
-        $this->Cell(0,8,'Created by Phpcompta, online on http://www.aeva=
lys.eu',0,0,'C',false,'http://www.aevalys.eu');
+        $this->Cell(0,8,'Created by Phpcompta, online on http://www.aeva=
lys.eu',0,0,'R',false,'http://www.aevalys.eu');
     }
=20
     function Cell ($w, $h=3D0, $txt=3D'', $border=3D0, $ln=3D0, $align=3D=
'', $fill=3Dfalse, $link=3D'')

Modified: phpcompta/trunk/include/export_ledger_csv.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_ledger_csv.php	2013-08-13 02:03:24 UTC=
 (rev 5349)
+++ phpcompta/trunk/include/export_ledger_csv.php	2013-08-13 06:51:13 UTC=
 (rev 5350)
@@ -144,17 +144,20 @@
                 $col_tva.=3D'"Tva '.$line_tva['tva_label'].'";';
             }
         }
-        echo '"Date";"operation";"Client/Fourn.";"Commentaire";"inter.";=
"HTVA";priv=C3=A9;'.$col_tva.'"TVAC"'."\n\r";
+        echo '"Date";"operation";"Client/Fourn.";"Commentaire";"inter.";=
"HTVA";priv=C3=A9;DNA;tva non ded.;'.$col_tva.'"TVAC"'."\n\r";
         foreach ($Row as $line)
         {
-            printf('"%s";"%s";"%s";"%s";"%s";%s;%s;',
+            printf('"%s";"%s";"%s";"%s";"%s";%s;%s;%s;%s;',
                    $line['date'],
                    $line['num'],
                    $Jrn->get_tiers($line['jrn_def_type'],$line['jr_id'])=
,
                    $line['comment'],
                    $line['jr_internal'],
                    nb($line['HTVA']),
-                   nb($line['dep_priv']));
+                   nb($line['dep_priv']),
+                   nb($line['dna']),
+                   nb($line['tva_dna'])
+                   );
             $a_tva_amount=3Darray();
             foreach ($line['TVA'] as $lineTVA)
             {

Modified: phpcompta/trunk/include/impress_jrn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_jrn.inc.php	2013-08-13 02:03:24 UTC (=
rev 5349)
+++ phpcompta/trunk/include/impress_jrn.inc.php	2013-08-13 06:51:13 UTC (=
rev 5350)
@@ -64,13 +64,12 @@
                        uj_login=3D'$g_user->id'
                        and uj_priv =3D'X'
                        ");
-// Pour voir tout les journal ?
-if ($NoPriv =3D=3D 0 && $ret !=3D null)
-{
-	$a =3D count($ret);
-	$all =3D array('value' =3D> 0, 'label' =3D> 'Tous les journaux');
-	$ret[$a] =3D $all;
-}
+/*
+ * Show all the available ledgers
+ */
+$a =3D count($ret);
+$all =3D array('value' =3D> 0, 'label' =3D> 'Tous les journaux disponibl=
es');
+$ret[$a] =3D $all;
 if (count($ret) < 1)
 	NoAccess();
 $exercice =3D (isset($_GET['exercice'])) ? $_GET['exercice'] : $g_user->=
get_exercice();
@@ -255,6 +254,8 @@
 	///////////////////////////////////////////////////////////////////////=
//////////////
 	elseif ($_GET['p_simple'] =3D=3D 1)
 	{
+            if ( $Jrn->get_type() !=3D 'ACH' && $Jrn->get_type() !=3D 'V=
EN')
+            {
 		// Simple printing
 		//---
 		echo '<TABLE class=3D"result">';
@@ -307,6 +308,14 @@
 			echo "</tr>";
 		}
 		echo "</table>";
+            } else {
+                /*
+                 * Ledger ACH or VEN
+                 */
+                $own=3Dnew Own($cn);
+                require_once 'template/print_ledger_simple.php';
+               =20
+            }
 	}
 	///////////////////////////////////////////////////////////////////////=
//////////////
 	// D=C3=A9taill=C3=A9



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


From MAILER-DAEMON Mon Aug 26 16:29:13 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VE3PV-0004z5-3W
	for mharc-phpcompta-dev@gnu.org; Mon, 26 Aug 2013 16:29:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 26 Aug 2013 22:20:07 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12527.1377548952.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5351 - phpcompta/trunk/html/admin
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Aug 2013 20:29:11 -0000

Author: danydb
Date: 2013-08-26 22:20:07 +0200 (Mon, 26 Aug 2013)
New Revision: 5351

Modified:
   phpcompta/trunk/html/admin/setup.js
Log:
Orthographe

Modified: phpcompta/trunk/html/admin/setup.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/admin/setup.js	2013-08-13 06:51:13 UTC (rev 5350=
)
+++ phpcompta/trunk/html/admin/setup.js	2013-08-26 20:20:07 UTC (rev 5351=
)
@@ -9,7 +9,7 @@
 content[203]=3D"Utilisateur de la base de donn=C3=A9e postgresql";
 content[204]=3D"Mot de passe de l'utilisateur ";
 content[205]=3D"Port de postgresql";
-content[206]=3D"En version mono dossier, le nom de la base de donn=C3=A9=
es doit =C3=AAtre mentionn=C3=A9e";
+content[206]=3D"En version mono dossier, le nom de la base de donn=C3=A9=
es doit =C3=AAtre mentionn=C3=A9";
 content[207]=3D"Vous devez choisir si phpcompta est install=C3=A9 sur l'=
un de vos servers ou sur un server mutualis=C3=A9 qui ne donne qu'une seu=
le base de donn=C3=A9es";
=20
=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 26 16:38:51 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VE3Yp-0006vd-4X
	for mharc-phpcompta-dev@gnu.org; Mon, 26 Aug 2013 16:38:51 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 26 Aug 2013 22:29:47 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12532.1377549530.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5352 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Aug 2013 20:38:50 -0000

Author: danydb
Date: 2013-08-26 22:29:46 +0200 (Mon, 26 Aug 2013)
New Revision: 5352

Modified:
   phpcompta/trunk/include/template/module.php
Log:
remove Dossier

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2013-08-26 20:20:07 UTC (=
rev 5351)
+++ phpcompta/trunk/include/template/module.php	2013-08-26 20:29:46 UTC (=
rev 5352)
@@ -38,13 +38,13 @@
 			new Ajax.Autocompleter("ac","ac_choices","direct.php?gDossier=3D<?php=
 echo $gDossier?>",
                             {paramName:"acs",minChars:1,indicator:null,
                             callback:null,
-                             afterUpdateElement:null});} catch (e){alert=
(e.message);};
+                             afterUpdateElement:null});} catch (e){$('in=
fo_div').innerHTML=3De.message;};
 		</script>
 	</div>
 <?php=20
 endif;?>
 	<div id=3D"dossier">
-	<H2 class=3D"dossier"> Dossier : <?php echo h(dossier::name())?></h2>
+	<H2 class=3D"dossier"><?php echo h(dossier::name())?></h2>
 	</div>
     </div>
=20



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


From MAILER-DAEMON Mon Aug 26 16:39:19 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VE3ZH-00070U-Hq
	for mharc-phpcompta-dev@gnu.org; Mon, 26 Aug 2013 16:39:19 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 26 Aug 2013 22:30:15 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12535.1377549559.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5353 - phpcompta/trunk/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Aug 2013 20:39:18 -0000

Author: danydb
Date: 2013-08-26 22:30:14 +0200 (Mon, 26 Aug 2013)
New Revision: 5353

Added:
   phpcompta/trunk/include/template/print_ledger_simple.php
Log:
Improve printjrn

Added: phpcompta/trunk/include/template/print_ledger_simple.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/print_ledger_simple.php	            =
            (rev 0)
+++ phpcompta/trunk/include/template/print_ledger_simple.php	2013-08-26 2=
0:30:14 UTC (rev 5353)
@@ -0,0 +1,74 @@
+<TABLE class=3D"result">
+    <tr>
+        <th>Pi=C3=A8ce</th>
+        <th>Date</th>
+        <th>Ref</th>
+        <th>Client / Fournisseur</th>
+        <th>Description</th>
+        <th style=3D"text-align:right">HTVA</th>
+        <th style=3D"text-align:right">Priv=C3=A9</th>
+        <th style=3D"text-align:right">DNA</th>
+        <th style=3D"text-align:right">TVA ND</th>
+<?php
+$col_tva=3D"";
+
+ if ( $own->MY_TVA_USE=3D=3D'Y')
+        {
+            $a_Tva=3D$cn->get_array("select tva_id,tva_label from tva_ra=
te where tva_rate !=3D 0.0000 order by tva_rate");
+            foreach($a_Tva as $line_tva)
+            {
+                $col_tva.=3D'<th style=3D"text-align:right">Tva '.$line_=
tva['tva_label'].'</th>';
+            }
+        }
+echo $col_tva;     =20
+?>
+        <th style=3D"text-align:right">TVAC</th>
+    </tr>
+<?php
+$i =3D 0;
+foreach ($Row as $line) {
+    $i++;
+    $class =3D ($i % 2 =3D=3D 0) ? ' class=3D"even" ' : ' class=3D"odd" =
';
+    echo "<tr $class>";
+    echo "<TD>" . smaller_date($line['date']) . "</TD>";
+    echo "<TD>" . h($line['jr_pj_number']) . "</TD>";
+    echo "<TD>" . HtmlInput::detail_op($line['jr_id'], $line['jr_interna=
l']) . "</TD>";
+    $tiers =3D $Jrn->get_tiers($line['jrn_def_type'], $line['jr_id']);
+    echo td($tiers);
+    echo "<TD>" . h($line['comment']) . "</TD>";
+    $dep_priv=3D($line['dep_priv']=3D=3D0)?"":nbm($line['dep_priv']);
+    $dna=3D($line['dna']=3D=3D0)?"":nbm($line['dna']);
+    $tva_dna=3D($line['tva_dna']=3D=3D0)?"":nbm($line['tva_dna']);
+    echo "<TD class=3D\"num\">" . nbm($line['HTVA']) . "</TD>";
+    echo "<TD class=3D\"num\">" .$dep_priv . "</TD>";
+    echo "<TD class=3D\"num\">" . $dna . "</TD>";
+    echo "<TD class=3D\"num\">" . $tva_dna. "</TD>";
+    if ($own->MY_TVA_USE =3D=3D 'Y' )
+    {
+        $a_tva_amount=3Darray();
+        foreach ($line['TVA'] as $lineTVA)
+                {
+                    foreach ($a_Tva as $idx=3D>$line_tva)
+                    {
+
+                        if ($line_tva['tva_id'] =3D=3D $lineTVA[1][0])
+                        {
+                            $a=3D$line_tva['tva_id'];
+                            $a_tva_amount[$a]=3D$lineTVA[1][2];
+                        }
+                    }
+                }
+                    foreach ($a_Tva as $line_tva)
+                    {
+                        $a=3D$line_tva['tva_id'];
+                        if ( isset($a_tva_amount[$a]))
+                            echo '<td class=3D"num">'.nb($a_tva_amount[$=
a]).'</td>';
+                        else
+                            printf("<td class=3D\"num\"></td>");
+                    }
+    }
+    echo '<td class=3D"num">'.$line['TVAC'].'</td>';
+    echo "</tr>";
+}
+?>
+</table>
\ No newline at end of file



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


From MAILER-DAEMON Mon Aug 26 16:40:07 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VE3a3-00075V-OM
	for mharc-phpcompta-dev@gnu.org; Mon, 26 Aug 2013 16:40:07 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 26 Aug 2013 22:31:02 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.12536.1377549607.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5354 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Aug 2013 20:40:06 -0000

Author: danydb
Date: 2013-08-26 22:31:02 +0200 (Mon, 26 Aug 2013)
New Revision: 5354

Modified:
   phpcompta/trunk/include/ajax_view_mod_stock.php
   phpcompta/trunk/include/class_stock_goods.php
   phpcompta/trunk/include/stock_histo.inc.php
   phpcompta/trunk/include/stock_inv.inc.php
   phpcompta/trunk/include/stock_state.inc.php
Log:
correct stock

Modified: phpcompta/trunk/include/ajax_view_mod_stock.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_view_mod_stock.php	2013-08-26 20:30:14 U=
TC (rev 5353)
+++ phpcompta/trunk/include/ajax_view_mod_stock.php	2013-08-26 20:31:02 U=
TC (rev 5354)
@@ -28,7 +28,7 @@
  */
 require_once 'class_stock_goods.php';
=20
-$st=3Dnew Stock_Goods();
+$st=3Dnew Stock_Goods($cn);
 $array=3D$cn->get_array("select * from stock_goods where c_id=3D$1",arra=
y($_GET['c_id']));
 echo HtmlInput::title_box("D=C3=A9tail changement",$_GET['ctl']);
 $p_array=3Darray();

Modified: phpcompta/trunk/include/class_stock_goods.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_stock_goods.php	2013-08-26 20:30:14 UTC=
 (rev 5353)
+++ phpcompta/trunk/include/class_stock_goods.php	2013-08-26 20:31:02 UTC=
 (rev 5354)
@@ -101,7 +101,7 @@
 		require_once 'template/stock_inv.php';
 	}
=20
-	function save($p_array)
+	function record_save($p_array)
 	{
 		global $cn;
 		try

Modified: phpcompta/trunk/include/stock_histo.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/stock_histo.inc.php	2013-08-26 20:30:14 UTC (=
rev 5353)
+++ phpcompta/trunk/include/stock_histo.inc.php	2013-08-26 20:31:02 UTC (=
rev 5354)
@@ -30,7 +30,7 @@
 require_once 'class_stock.php';
 require_once 'class_periode.php';
=20
-$stock=3Dnew Stock();
+$stock=3Dnew Stock($cn);
 $array=3D$_GET;
 if ( ! isset ($array['wdate_start']) || ! isset ($array['wdate_end']))
 {

Modified: phpcompta/trunk/include/stock_inv.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/stock_inv.inc.php	2013-08-26 20:30:14 UTC (re=
v 5353)
+++ phpcompta/trunk/include/stock_inv.inc.php	2013-08-26 20:31:02 UTC (re=
v 5354)
@@ -29,12 +29,12 @@
 require_once 'class_stock_goods.php';
 global $cn;
=20
-$inv=3Dnew Stock_Goods();
+$inv=3Dnew Stock_Goods($cn);
 if ( isset ($_POST['save']))
 {
 	try
 	{
-		$inv->save($_POST);
+		$inv->record_save($_POST);
 		echo h2info("Op=C3=A9ration sauv=C3=A9e");
 		$inv->input($_POST,true);
=20

Modified: phpcompta/trunk/include/stock_state.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/stock_state.inc.php	2013-08-26 20:30:14 UTC (=
rev 5353)
+++ phpcompta/trunk/include/stock_state.inc.php	2013-08-26 20:31:02 UTC (=
rev 5354)
@@ -44,7 +44,7 @@
 $presentation->selected=3D(isset($_GET['present']))?$_GET['present']:"T"=
;
 require_once 'template/stock_state_search.php';
=20
-$stock=3Dnew Stock();
+$stock=3Dnew Stock($cn);
=20
=20
 $stock->summary($_GET);



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


From MAILER-DAEMON Tue Aug 27 17:07:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VEQUK-0003eK-Sv
	for mharc-phpcompta-dev@gnu.org; Tue, 27 Aug 2013 17:07:44 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 27 Aug 2013 22:58:30 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.13814.1377637664.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5355 - in phpcompta/trunk: html include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Aug 2013 21:07:43 -0000

Author: danydb
Date: 2013-08-27 22:58:29 +0200 (Tue, 27 Aug 2013)
New Revision: 5355

Modified:
   phpcompta/trunk/html/style-epad.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/html/user_login.php
   phpcompta/trunk/include/ac_common.php
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/include/template/history_top.php
   phpcompta/trunk/include/template/menu.php
   phpcompta/trunk/include/template/module.php
Log:
improve CSS

Modified: phpcompta/trunk/html/style-epad.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style-epad.css	2013-08-26 20:31:02 UTC (rev 5354=
)
+++ phpcompta/trunk/html/style-epad.css	2013-08-27 20:58:29 UTC (rev 5355=
)
@@ -2,14 +2,24 @@
=20
 BODY {
   background-color:#EDF3FF;
- font-size:14px;
-  font-family:verdana,helvetica,sans-serif;
+  font-size:100%;
+  font-family:verdana,sans-serif,helvetica;
   padding: 0px 0px 0px 0px ;
   margin:0;
   color:blue;
 }
+#info_div {
+	display:none;
+	background-color: yellow;
+	color:black;
+	z-index: 15;
+	position: absolute;
+	top:0;
+	left:45%;
+}
+
 .notice {
-		color:red;
+	color:red;
         font-style: italic;
         }
=20
@@ -29,7 +39,7 @@
 }
 table.sortable th,  table.table_large th,table.result th {
   font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
  border-bottom:1px solid blue;
  border-top:0;
=20
@@ -40,8 +50,8 @@
 }
=20
 h2 {
-  font-family:verdana,helvetica,sans-serif;
-  font-size:18px;
+  font-family:verdana,sans-serif,helvetica;
+  font-size:120%;
   color:grey;
 }
 div.info {
@@ -54,7 +64,7 @@
 content h2.info {
 	background:#879ed4;
   color:black;
-  font-size:18px;
+  font-size:120%;
   text-align:center;
   padding:0px;
   margin:0px;
@@ -62,7 +72,7 @@
 redcontent h2.info {
   background:#879ed4;
   color:white;
-  font-size:18px;
+  font-size:120%;
   text-align:center;
   padding:0px;
   margin:0px;
@@ -70,7 +80,7 @@
 h2.info {
   background-color:#879ed4;
 	color:white;
-	font-size:18px;
+	font-size:120%;
   text-align:center;
   padding:0px;
   margin:0px;
@@ -81,13 +91,13 @@
 h3.info {
   background:#879ed4;
   color:white;
-  font-size:16px;
+  font-size:120%;
   text-align:center;
 }
=20
 h2.info2 {
   color:blue;
-  font-size:18px;
+  font-size:100%;
   text-align:center;
=20
 }
@@ -96,7 +106,7 @@
 h2.error {
 	background:red;
 	color:white;
-	font-size:18px;
+	font-size:120%;
 }
=20
=20
@@ -147,14 +157,14 @@
 div.lmenu {
 	 float:left;
 	 clear:left;
-	font-size:13px;
+	font-size:90%;
=20
 }
 div.lextmenu {
=20
 	float:left;
-	font-family:verdana,helvetica,sans-serif;
-	font-size:13px;
+	font-family:verdana,sans-serif,helvetica;
+	font-size:90%;
=20
 }
 div.searchmenu {
@@ -167,8 +177,8 @@
=20
 div.recherche_form{
 	width:700px;
-	font-size:13px;
-	font-family:verdana,helvetica,sans-serif;
+	font-size:90%;
+	font-family:verdana,sans-serif,helvetica;
   border-style:outset;
   border-width:1px;
=20
@@ -178,8 +188,8 @@
          float:left;
 	 padding-top:7px;
 	 padding-left:8px;
-         font-size:13px;
-         font-family:verdana,helvetica,sans-serif;
+         font-size:90%;
+         font-family:verdana,sans-serif,helvetica;
 	 width:75%;
=20
 }
@@ -188,7 +198,7 @@
 		padding-top:2px;
 		margin-top:2px;
          width:100%;
-         font-family:verdana,helvetica,sans-serif;
+         font-family:verdana,sans-serif,helvetica;
=20
=20
 }
@@ -197,12 +207,12 @@
          float:left;
 	 padding-top:7px;
          width:35%;
-         font-family:verdana,helvetica,sans-serif;
+         font-family:verdana,sans-serif,helvetica;
=20
 }
 div.no span{
 	position:static;
-	font-family:verdana,helvetica,sans-serif;
+	font-family:verdana,sans-serif,helvetica;
 	font-weight:bold;
 	color:red;
=20
@@ -217,7 +227,7 @@
 }
 table.document th{
   font-weight:bold;
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
   border-bottom:2px solid blue;
   border-top:0;
   color:#25238F;
@@ -252,20 +262,20 @@
 	text-align:center;
 	width:95px;
         height :30px;
-	font-size:12px;
+	font-size:90%;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
 }
 td.msubtitle {
 	text-align:center;
 	height:20px;
-	font-size:12px;
+	font-size:90%;
     background-color:#DDE6FF;
 }
 span.mtitle {
 	color:gray;
 	background-color:blue;
-	font-size:12px;
+	font-size:90%;
 	border-style:groove
 }
 span.odd {
@@ -279,18 +289,18 @@
=20
 tr.odd {
 	background-color:#DDE6FF;
-	font-size:12px;
+	font-size:90%;
 }
 tr {
-	font-size:12px;
+	font-size:90%;
 }
 td.odd{
 	background-color:#DDE6FF ;
-	font-size:12px;
+	font-size:90%;
 }
 td.even{
 	border:0px;
-	font-size:12px;
+	font-size:90%;
 }
 td.cell{
 	    height:32px;
@@ -300,21 +310,21 @@
 	border-style:inset;
         border-color:blue;
 	border-width:1pt ;
-	font-size:12px;
+	font-size:90%;
         background:#5D90CD ;
         color:white;
         text-align:center;
 	     width:120px;
 }
 a.mtitle {
-  font-size:12px;
+  font-size:90%;
   text-decoration:none;
   display:inline;
  color: blue;
=20
 }
 a.mtitle:hover {
-  font-size:12px;
+  font-size:90%;
   text-decoration:none;
   display:inline;
=20
@@ -323,13 +333,13 @@
=20
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
- font-size:1.2em;
+ font-size:90%;
  text-decoration:none;
  display:block;
  color:white;
 }
 a.dossier {
-  font-size:12px;
+  font-size:90%;
   text-decoration:none;
   display:block;
    color: #202267;
@@ -362,11 +372,11 @@
   display:block;
   color:blue;
   background-color:white;
-  font-size:12px;
+  font-size:90%;
 }
=20
 a.cell:hover {
-  font-size:12px;
+  font-size:90%;
   color:white;
   background-color:#5D90CD;
   text-decoration:none;
@@ -396,8 +406,8 @@
=20
 a.detail
 {
-  font-size:12px;
-  font-family:verdana,helvetica,sans-serif;
+  font-size:90%;
+  font-family:verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -405,8 +415,8 @@
=20
 a.detail:hover
 {
-  font-size:12px;
-  font-family:verdana,helvetica,sans-serif;
+  font-size:90%;
+  font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -418,7 +428,7 @@
 	 padding:1em 1em;
 }
 div.redcontent a {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
   text-decoration: none;
   display: block;
   color: blue;
@@ -426,7 +436,7 @@
 }
=20
 div.redcontent a:hover {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -434,7 +444,7 @@
=20
 }
 div.content a {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
   text-decoration: none;
   display: block;
   color: blue;
@@ -444,7 +454,7 @@
=20
=20
 div.content a:hover {
-  font-family:verdana,helvetica,sans-serif;
+  font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -470,7 +480,7 @@
=20
 }
 div.content a.mtitle {
-  font-size:12px;
+  font-size:90%;
   text-decoration:none;
   display:inline;
   color:blue;
@@ -488,7 +498,7 @@
=20
 }
 div.redcontent input.text {
-   font-family:verdana,helvetica,sans-serif;
+   font-family:verdana,sans-serif,helvetica;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -497,7 +507,7 @@
   color:blue;
 }
 div.content input.text {
-   font-family:verdana,helvetica,sans-serif;
+   font-family:verdana,sans-serif,helvetica;
   font-weight:normal;
   border-color:336699;
   border-style:solid;
@@ -522,7 +532,7 @@
 border-collapse:collapse;
 }
 a.document{
-  font-size:14px;
+  font-size:100%;
   text-decoration:none;
   display:block;
 }
@@ -550,11 +560,11 @@
 h1.legend, legend {
 font-weight: bold;
 font-style: italic;
-font-size: 110% ;
+font-size: 120% ;
=20
 }
 fieldset fieldset legend {
-	 font-size:110%;
+	 font-size:120%;
 	 color:grey;
 	 }
 select {
@@ -596,7 +606,7 @@
   padding-left: 3px;
   padding-right:3px;
   text-decoration:none;
-  font-size:17px;
+  font-size:120%;
=20
   display:inline;
   color:black;
@@ -633,8 +643,8 @@
 	/*border:dotted 1px black;*/
 	border: 2px outset #201e87;
 	background-color:#879ED4;
-	font-size: 110% ;
-	font-family: verdana,helvetica,sans-serif;
+	font-size: 100% ;
+	font-family: verdana,sans-serif,helvetica;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -656,7 +666,7 @@
 	/*border:dotted 1px black;*/
 	border: 3px outset #201e87;
 	background-color: #879ED4;
-	font-family: verdana,helvetica,sans-serif;
+	font-family: verdana,sans-serif,helvetica;
 	font-style: italic;
 	font-weight: bolder;
 	text-align:center;
@@ -677,8 +687,8 @@
 	height:96%;
 	overflow: auto;
 	background-color:#DFE7FF;
-	font-size:12px ;
-	font-family: verdana,helvetica,sans-serif;
+	font-size:90% ;
+	font-family: verdana,sans-serif,helvetica;
 	font-style: normal;
 	font-weight: normal;
 	color: black;
@@ -695,7 +705,7 @@
   margin:0;
   padding:0;
   text-align:left;
-  font-size:14px;
+  font-size:100%;
=20
 }
 div.autocomplete em {
@@ -800,12 +810,12 @@
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:12;
+	font-size:90%;
 	color:white;
 	font-weight: bold;
=20
 	text-decoration:none;
-	font-family: verdana,helvetica,sans-serif;
+	font-family: verdana,sans-serif,helvetica;
 	background-image: url("image/bg-submit2.gif");
 	background-repeat: repeat-x;
 	background-position: left;
@@ -821,7 +831,7 @@
 	cursor:pointer;
 	margin:1 2 1 2;
         border-radius: 4px;
-	-moz-border-radius:4px;
+	moz-border-radius:4px;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
@@ -835,7 +845,7 @@
 	td.tool {
 	border: solid 1px gray;
 	background-color: white;
-
+	border-bottom-width: 2px;
 	}
 div.topmenu {
 	margin-top:2px;
@@ -845,7 +855,7 @@
 	color:darkblue;
 	font-style: italic;
 	display:inline;
-	font-size:16px;
+	font-size:120%;
 	margin:0px;
 	padding:0px;
 	font-variant:small-caps;
@@ -886,8 +896,8 @@
 }
 div.inner_box  {
   background-color:#e4e7ed;
- font-size:12;
-  font-family:verdana,helvetica,sans-serif;
+ font-size:100%;
+  font-family:verdana,sans-serif,helvetica;
   padding:0;
   margin:0;
   overflow:hidden;
@@ -949,24 +959,24 @@
 }
 table.info_op
 {
-	font-size:22;
+	font-size:100%;
 	width:100%;
 }
 table.info_op tr
 {
-font-size:16;
+font-size:120%;
 background:white;
 }
 h2#jrn_name
 {
 	color:blue;
-	font-size:28;
+	font-size:120%;
 	margin-right:30%;
 	float: right;
=20
 }
 tr.footer{
-	font-size:16;
+	font-size:120%;
 	font-style: italic;
 	font-weight: bold;
=20
@@ -1001,7 +1011,7 @@
 div#wait_box
 {
   background-color:#F1E6E6;
- font-size:12;
+ font-size:120%;
   font-family: verdana,helvetica,arial,sans-serif;
   padding:0;
   margin:0;
@@ -1058,7 +1068,7 @@
  margin-left: 2px;
  margin-right:2px;
  margin-top:0px;
- font-size:12px;
+ font-size:90%;
 }
 #close_div:hover
 {
@@ -1077,7 +1087,7 @@
 	width:300px;
 	border:1px solid black;
 	background-color:#aec3e8;
-	font-size:18px;
+	font-size:120%;
 	padding: 20px 20px;
 }
 span.invoice
@@ -1091,14 +1101,14 @@
 a.nav,div.content a.nav,div.redcontent a.nav {
 	display:inline;
 	text-decoration:none;
-	font-size:1.2em;
+	font-size:100%;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
 	display:inline;
 	text-decoration:none;
 	background-color:darkblue;
 	color:white;
-	font-size:1.2em;
+	font-size:100%;
 }
 #dossier {
 	display:inline;
@@ -1112,30 +1122,30 @@
=20
 h1.title {
 	color: blue;
-	font-size:22px;
+	font-size:120%;
 	font-style: italic;
 }
 h2.title {
 	color: blue;
-	font-size:16px;
+	font-size:120%;
 	font-weight:bold;
 	font-style: italic;
 	margin-left: 15px;
 }
 h3.title {
 	color: blue;
-	font-size:16px;
+	font-size:120%;
 	margin-left: 30px;
 }
 h4.title {
 	color: blue;
-	font-size:14px;
+	font-size:120%;
 	margin-left: 45px;
 	text-decoration: underline;
 }
 h5.title {
 	color: blue;
-	font-size:14px;
+	font-size:120%;
 	margin-left: 45px;
 	text-decoration: none;
 	font-style: italic;
@@ -1147,13 +1157,3 @@
 	margin-right: 5px;
 	border:lightgrey 2px groove;
 }
-#info_div {
-	display:none;
-	background-color: yellow;
-	font-size:120%;
-	color:black;
-	z-index: 15;
-	position: absolute;
-	top:0;
-	left:0;
-}
\ No newline at end of file

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-26 20:31:02 UTC (rev 5354)
+++ phpcompta/trunk/html/style.css	2013-08-27 20:58:29 UTC (rev 5355)
@@ -1,403 +1,408 @@
 /* <style type=3D"text/css"> */
=20
 BODY {
-  background-color:#EDF3FF;
- font-size:100%;
-  font-family:verdana,sans-serif,helvetica;
-  padding: 0px 0px 0px 0px ;
-  margin:0;
-  color:blue;
+    background-color:#EDF3FF;
+    font-size:95%;
+    font-family:verdana,sans-serif,helvetica;
+    padding: 0px 0px 0px 0px ;
+    margin:0;
+    color:blue;
 }
 .notice {
-		color:red;
-        font-style: italic;
-        }
+    color:red;
+    font-style: italic;
+}
=20
 table.sortable, table.table_large, table.result  ,table.resultfooter {
-  color:blue;
-  /* border:blue solid 1px; */
-  width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    /* border:blue solid 1px; */
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
=20
 }
 table.resultfooter tfoot {
-	font-size:110%;
-	font-weight: bold;
+    font-size:110%;
+    font-weight: bold;
=20
=20
 }
 table.sortable th,  table.table_large th,table.result th {
-  font-weight:bold;
-  font-family:verdana,sans-serif,helvetica;
- border-bottom:1px solid blue;
- border-top:0;
+    font-weight:bold;
+    font-family:verdana,sans-serif,helvetica;
+    border-bottom:1px solid blue;
+    border-top:0;
+    font-size:90%;
=20
-  color:#25238F;
-  text-align: left;
-  font-style: italic;
+    color:#25238F;
+    text-align: left;
+    font-style: italic;
=20
 }
=20
 h2 {
-  font-family:verdana,sans-serif,helvetica;
-  font-size:120%;
-  color:grey;
+    font-family:verdana,sans-serif,helvetica;
+    font-size:120%;
+    color:grey;
 }
 div.info {
-	background:#879ed4;
-	color:white;
-	font-size:120%;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:120%;
+    text-align:center;
 }
=20
 content h2.info {
-	background:#879ed4;
-  color:black;
-  font-size:120%;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:black;
+    font-size:120%;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 redcontent h2.info {
-  background:#879ed4;
-  color:white;
-  font-size:120%;
-  text-align:center;
-  padding:0px;
-  margin:0px;
+    background:#879ed4;
+    color:white;
+    font-size:120%;
+    text-align:center;
+    padding:0px;
+    margin:0px;
 }
 h2.info {
-  background-color:#879ed4;
-	color:white;
-	font-size:120%;
-  text-align:center;
-  padding:0px;
-  margin:0px;
-  border:1px solid grey;
+    background-color:#879ed4;
+    color:white;
+    font-size:120%;
+    text-align:center;
+    padding:0px;
+    margin:0px;
+    border:1px solid grey;
=20
 }
=20
 h3.info {
-  background:#879ed4;
-  color:white;
-  font-size:120%;
-  text-align:center;
+    background:#879ed4;
+    color:white;
+    font-size:120%;
+    text-align:center;
 }
=20
 h2.info2 {
-  color:blue;
-  font-size:100%;
-  text-align:center;
+    color:blue;
+    font-size:100%;
+    text-align:center;
=20
 }
=20
=20
 h2.error {
-	background:red;
-	color:white;
-	font-size:120%;
+    background:red;
+    color:white;
+    font-size:120%;
 }
=20
=20
 div.u_tmenu {
-  margin-top:0px;
-  width:100%;
- /* background-color:#879ED4; */
+    margin-top:0px;
+    width:100%;
+    /* background-color:#879ED4; */
=20
=20
 }
 div.u_subtmenu {
-  background-color:white	;
-  float:left;
-  clear:both;
-  left:10px;
+    background-color:white	;
+    float:left;
+    clear:both;
+    left:10px;
=20
 }
 div.u_tmenu div.u_tool {
-	   float:left;
+    float:left;
=20
 }
 div.u_tool {
-	float:left;
-	width:  100%;
-	padding-bottom: 20px;
-	}
-div.u_tool div.name {
-       float:left;
-       margin-left:10px;
+    float:left;
+    width:  100%;
+    padding-bottom: 20px;
 }
-div.u_tool {
-	float:right;
-	margin-right:10px;
+div.u_tool #name {
+    float:left;
+    margin-left:10px;
 }
-div.module {
-	position:absolute;
-	top:0px;
-	right:5px;
-	text-align:right;
-	padding:0px;
-	margin: 0px;
+#u_tool {
+    float:right;
+    margin-right:10px;
 }
+#top {
+    float:left;
+    margin-bottom: 0.9512%;
+    width: 100%;
+}
+#module {
+    position:absolute;
+    top:0px;
+    right:5px;
+    text-align:right;
+    padding:0px;
+    margin: 0px;
+}
 div.u_subt2menu {
-background-color:lightgrey;
-  left:1%;
+    background-color:lightgrey;
+    left:1%;
=20
 }
 div.lmenu {
-	 float:left;
-	 clear:left;
-	font-size:90%;
+    float:left;
+    clear:left;
+    font-size:90%;
=20
 }
 div.lextmenu {
=20
-	float:left;
-	font-family:verdana,sans-serif,helvetica;
-	font-size:90%;
+    float:left;
+    font-family:verdana,sans-serif,helvetica;
+    font-size:90%;
=20
 }
 div.searchmenu {
-  left:30px;
-  width:95px;
-  top:100px;
-  position:absolute;
+    left:30px;
+    width:95px;
+    top:100px;
+    position:absolute;
=20
 }
=20
 div.recherche_form{
-	width:700px;
-	font-size:90%;
-	font-family:verdana,sans-serif,helvetica;
-  border-style:outset;
-  border-width:1px;
+    width:700px;
+    font-size:90%;
+    font-family:verdana,sans-serif,helvetica;
+    border-style:outset;
+    border-width:1px;
=20
 }
 div.redcontent{
=20
-         float:left;
-	 padding-top:7px;
-	 padding-left:8px;
-         font-size:90%;
-         font-family:verdana,sans-serif,helvetica;
-	 width:75%;
+    float:left;
+    padding-top:7px;
+    padding-left:8px;
+    font-size:90%;
+    font-family:verdana,sans-serif,helvetica;
+    width:75%;
=20
 }
 div.content{
+    padding-top:0.0030%;
+    margin-top:0.0030%;
+    width:100%;
+    font-family:verdana,sans-serif,helvetica;
=20
-		padding-top:2px;
-		margin-top:2px;
-         width:100%;
-         font-family:verdana,sans-serif,helvetica;
=20
-
 }
 div.content30{
=20
-         float:left;
-	 padding-top:7px;
-         width:35%;
-         font-family:verdana,sans-serif,helvetica;
+    float:left;
+    padding-top:7px;
+    width:35%;
+    font-family:verdana,sans-serif,helvetica;
=20
 }
 div.no span{
-	position:static;
-	font-family:verdana,sans-serif,helvetica;
-	font-weight:bold;
-	color:red;
+    position:static;
+    font-family:verdana,sans-serif,helvetica;
+    font-weight:bold;
+    color:red;
=20
 }
=20
 table.document {
-   color:blue;
-   width:100%;
-   border-spacing:  0px;
-   border-collapse:collapse;
+    color:blue;
+    width:100%;
+    border-spacing:  0px;
+    border-collapse:collapse;
=20
 }
 table.document th{
-  font-weight:bold;
-  font-family:verdana,sans-serif,helvetica;
-  border-bottom:2px solid blue;
-  border-top:0;
-  color:#25238F;
-  text-align: left;
-  background-color:#EDF3FF;
-  font-style: italic;
+    font-weight:bold;
+    font-family:verdana,sans-serif,helvetica;
+    border-bottom:2px solid blue;
+    border-top:0;
+    color:#25238F;
+    text-align: left;
+    background-color:#EDF3FF;
+    font-style: italic;
 }
 .error {
-width:60%;
-margin-left:20%;
-text-align: center;
+    width:60%;
+    margin-left:20%;
+    text-align: center;
=20
-color:white;
-background-color:red;
-font-weight: bolder;
-font-size:120%;
+    color:white;
+    background-color:red;
+    font-weight: bolder;
+    font-size:120%;
 }
=20
 table.mtitle {
-	border:0;
-	text-align:center
+    border:0;
+    text-align:center
 }
 td.mshort {
-  height:15px;
-  width:60px;
-  text-align:center;
-  border:  1px solid;
-  color:#5D90CD ;
-  background-color:#DDE6FF;
+    height:15px;
+    width:60px;
+    text-align:center;
+    border:  1px solid;
+    color:#5D90CD ;
+    background-color:#DDE6FF;
 }
 td.mtitle {
-	text-align:center;
-	width:95px;
-        height :30px;
-	font-size:90%;
+    text-align:center;
+    width:95px;
+    height :30px;
+    font-size:90%;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
 }
 td.msubtitle {
-	text-align:center;
-	height:20px;
-	font-size:90%;
+    text-align:center;
+    height:20px;
+    font-size:90%;
     background-color:#DDE6FF;
 }
 span.mtitle {
-	color:gray;
-	background-color:blue;
-	font-size:90%;
-	border-style:groove
+    color:gray;
+    background-color:blue;
+    font-size:90%;
+    border-style:groove
 }
 span.odd {
-  background-color:#ECF3FF;
-  display:block;
- }
+    background-color:#ECF3FF;
+    display:block;
+}
 span.even {
-  background-color:#DDE6FF;
-  display:block;
- }
+    background-color:#DDE6FF;
+    display:block;
+}
=20
 tr.odd {
-	background-color:#DDE6FF;
-	font-size:90%;
+    background-color:#DDE6FF;
+    font-size:90%;
 }
 tr {
-	font-size:90%;
+    font-size:90%;
 }
 td.odd{
-	background-color:#DDE6FF ;
-	font-size:90%;
+    background-color:#DDE6FF ;
+    font-size:90%;
 }
 td.even{
-	border:0px;
-	font-size:90%;
+    border:0px;
+    font-size:90%;
 }
 td.cell{
-	    height:32px;
-	     padding: 1px;
+    height:32px;
+    padding: 1px;
 }
 td.selectedcell{
-	border-style:inset;
-        border-color:blue;
-	border-width:1pt ;
-	font-size:90%;
-        background:#5D90CD ;
-        color:white;
-        text-align:center;
-	     width:120px;
+    border-style:inset;
+    border-color:blue;
+    border-width:1pt ;
+    font-size:90%;
+    background:#5D90CD ;
+    color:white;
+    text-align:center;
+    width:120px;
 }
 a.mtitle {
-  font-size:90%;
-  text-decoration:none;
-  display:inline;
- color: blue;
+    font-size:90%;
+    text-decoration:none;
+    display:inline;
+    color: blue;
=20
 }
 a.mtitle:hover {
-  font-size:90%;
-  text-decoration:none;
-  display:inline;
+    font-size:90%;
+    text-decoration:none;
+    display:inline;
=20
- color: darkblue;
-background-color:#5D90CD;
+    color: darkblue;
+    background-color:#5D90CD;
=20
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
- font-size:90%;
- text-decoration:none;
- display:block;
- color:white;
+    font-size:90%;
+    text-decoration:none;
+    display:block;
+    color:white;
 }
 a.dossier {
-  font-size:90%;
-  text-decoration:none;
-  display:block;
-   color: #202267;
+    font-size:90%;
+    text-decoration:none;
+    display:block;
+    color: #202267;
=20
 }
 tr.odd:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 tr.even:hover td
 {
-  text-decoration:none;
-  background-color: #a9d6e4;
-  color:white;
+    text-decoration:none;
+    background-color: #a9d6e4;
+    color:white;
 }
 td.mtitle:hover,td.mtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 td.msubtitle:hover,td.msubtitle:hover a
 {
-  background-color:#a9d6e4;
-  color:white;
+    background-color:#a9d6e4;
+    color:white;
 }
 a.cell {
-  text-decoration:none;
-  display:block;
-  color:blue;
-  background-color:white;
-  font-size:90%;
+    text-decoration:none;
+    display:block;
+    color:blue;
+    background-color:white;
+    font-size:90%;
 }
=20
 a.cell:hover {
-  font-size:90%;
-  color:white;
-  background-color:#5D90CD;
-  text-decoration:none;
-  display:block;
-	}
+    font-size:90%;
+    color:white;
+    background-color:#5D90CD;
+    text-decoration:none;
+    display:block;
+}
=20
=20
 a.one:link {
-	text-decoration:none;
-	color:#3010FF
+    text-decoration:none;
+    color:#3010FF
 }
 a.one:visited {
-	text-decoration:none;
-	color:#3010FF
-	}
+    text-decoration:none;
+    color:#3010FF
+}
=20
 a.one:active {
-	background: #0000FF;
-	}
+    background: #0000FF;
+}
=20
 a.one:hover {
-	    text-decoration:underline;
-	background:#3010FF;
-	color:#FFFFFF;
-	}
+    text-decoration:underline;
+    background:#3010FF;
+    color:#FFFFFF;
+}
=20
=20
 a.detail
 {
-  font-size:90%;
-  font-family:verdana,sans-serif,helvetica;
+    font-size:90%;
+    font-family:verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -405,8 +410,8 @@
=20
 a.detail:hover
 {
-  font-size:90%;
-  font-family:verdana,sans-serif,helvetica;
+    font-size:90%;
+    font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -414,19 +419,19 @@
 }
=20
 li.menuv,ol.menuv {
-	 display:inline;
-	 padding:1em 1em;
+    display:inline;
+    padding:1em 1em;
 }
 div.redcontent a {
-  font-family:verdana,sans-serif,helvetica;
-  text-decoration: none;
-  display: block;
-  color: blue;
+    font-family:verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
=20
 }
=20
 div.redcontent a:hover {
-  font-family:verdana,sans-serif,helvetica;
+    font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -434,17 +439,17 @@
=20
 }
 div.content a {
-  font-family:verdana,sans-serif,helvetica;
-  text-decoration: none;
-  display: block;
-  color: blue;
-padding: 0;
+    font-family:verdana,sans-serif,helvetica;
+    text-decoration: none;
+    display: block;
+    color: blue;
+    padding: 0;
=20
 }
=20
=20
 div.content a:hover {
-  font-family:verdana,sans-serif,helvetica;
+    font-family:verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -453,477 +458,476 @@
 }
=20
 div.redcontent a.mtitle {
-  text-decoration:none;
-  display:inline;
+    text-decoration:none;
+    display:inline;
=20
=20
-  color:black;
+    color:black;
=20
 }
=20
 div.redcontent a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  color:white;
-  background-color:darkblue;
+    text-decoration:none;
+    display:inline;
+    color:white;
+    background-color:darkblue;
=20
=20
 }
 div.content a.mtitle {
-  font-size:90%;
-  text-decoration:none;
-  display:inline;
-  color:blue;
+    font-size:90%;
+    text-decoration:none;
+    display:inline;
+    color:blue;
=20
=20
=20
 }
=20
 div.content a.mtitle:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:darkblue;
-  color:white;
+    text-decoration:none;
+    display:inline;
+    background-color:darkblue;
+    color:white;
=20
=20
 }
 div.redcontent input.text {
-   font-family:verdana,sans-serif,helvetica;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  background-color:orange;
-  border-width:1px;
-  color:blue;
+    font-family:verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    background-color:orange;
+    border-width:1px;
+    color:blue;
 }
 div.content input.text {
-   font-family:verdana,sans-serif,helvetica;
-  font-weight:normal;
-  border-color:336699;
-  border-style:solid;
-  border-width:1px;
-  background-color:orange;
-  color:blue;
+    font-family:verdana,sans-serif,helvetica;
+    font-weight:normal;
+    border-color:336699;
+    border-style:solid;
+    border-width:1px;
+    background-color:orange;
+    color:blue;
 }
=20
=20
=20
 div.redcontent input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.content input:focus {
-  background-color:orange;
+    background-color:orange;
 }
 div.redcontent textarea:focus {
-background-color: orange;
+    background-color: orange;
 }
 .document {
-color: #1a207d;
-border-collapse:collapse;
+    color: #1a207d;
+    border-collapse:collapse;
 }
 a.document{
-  font-size:100%;
-  text-decoration:none;
-  display:block;
+    font-size:90%;
+    text-decoration:none;
+    display:block;
 }
 a.document:hover {
-  text-decoration:none;
-  display:block;
+    text-decoration:none;
+    display:block;
=20
=20
 }
 .input_text_ro {
-	   border:solid 1px blue;
-	   background:#EDEDED;
-	   color:blue;
-	margin:1px;
+    border:solid 1px blue;
+    background:#EDEDED;
+    color:blue;
+    margin:1px;
 }
 .input_text {
-	   border:groove 1px blue;
-	margin:1px;
+    border:groove 1px blue;
+    margin:1px;
 }
 .input_text:hover {
-	border:groove 1px blue;
-	margin:1px;
-	background-color: orange;
+    border:groove 1px blue;
+    margin:1px;
+    background-color: orange;
 }
 h1.legend, legend {
-font-weight: bold;
-font-style: italic;
-font-size: 120% ;
+    font-weight: bold;
+    font-style: italic;
+    font-size: 120% ;
=20
 }
 fieldset fieldset legend {
-	 font-size:120%;
-	 color:grey;
-	 }
+    font-size:120%;
+    color:grey;
+}
 select {
-border: 1px solid blue;
-margin:2px;
-background-color:white;
+    border: 1px solid blue;
+    margin:2px;
+    background-color:white;
=20
 }
=20
=20
=20
 .infobulle {
-	   position:absolute;
-	   border:1px solid black;
-	   background-color:yellow;
-	   padding-bottom: 10;
-	   padding-top: 10;
-	   padding-left: 10;
-	   padding-right: 10;
-	   color:black;
-	   top:0;left:0;
-	   visibility:hidden;
-	   width:25em;
-		z-index:20;
+    position:absolute;
+    border:1px solid black;
+    background-color:yellow;
+    padding-bottom: 10;
+    padding-top: 10;
+    padding-left: 10;
+    padding-right: 10;
+    color:black;
+    top:0;left:0;
+    visibility:hidden;
+    width:25em;
+    z-index:20;
 }
=20
 span.action {
-	height:3em;
+    height:3em;
=20
 }
 td.num {
-	text-align:right;
+    text-align:right;
 }
 tr.priority1 {
-	background-color: coral;
-	}
+    background-color: coral;
+}
 span.action a.action {
-  border:2px outset ;
-  padding-left: 3px;
-  padding-right:3px;
-  text-decoration:none;
-  font-size:120%;
+    border:2px outset ;
+    padding-left: 3px;
+    padding-right:3px;
+    text-decoration:none;
+    font-size:120%;
=20
-  display:inline;
-  color:black;
-  background-color:lightgrey;
+    display:inline;
+    color:black;
+    background-color:lightgrey;
 }
=20
 span.action a.action:hover {
-  text-decoration:none;
-  display:inline;
-  background-color:lightblue;
-  color:black;
+    text-decoration:none;
+    display:inline;
+    background-color:lightblue;
+    color:black;
 }
 div.popup_back{
-	position:absolute;
-	top:0px;
-	left:0px;
-	opacity:0.6;
-	width:100%;
-	height:100%;
-	z-index:1;
-	/*background-color:lightgrey;*/
+    position:absolute;
+    top:0px;
+    left:0px;
+    opacity:0.6;
+    width:100%;
+    height:100%;
+    z-index:1;
+    /*background-color:lightgrey;*/
=20
-	display:none;
+    display:none;
 }
=20
 div.popup_border_title {
-	position:absolute;
-	top:20%;
-	left:10%;
-	width:60%;
-	height:80%;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 2px outset #201e87;
-	background-color:#879ED4;
-	font-size: 100% ;
-	font-family: verdana,sans-serif,helvetica;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	/*border-bottom: 2px solid #201e87;*/
-	color: white;
-	display:none;
-	/*opacity:1;
-	filter:alpha(opacity=3D100);*/
+    position:absolute;
+    top:20%;
+    left:10%;
+    width:60%;
+    height:80%;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 2px outset #201e87;
+    background-color:#879ED4;
+    font-size: 90% ;
+    font-family: verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    /*border-bottom: 2px solid #201e87;*/
+    color: white;
+    display:none;
+    /*opacity:1;
+    filter:alpha(opacity=3D100);*/
=20
-	}
+}
 div.popup_border_notitle {
-	position:absolute;
-	top:20%;
-	left:20%;
-	width:60%;
-	height:80% ;
-	/*background:lightgrey;*/
-	z-index:10;
-	/*border:dotted 1px black;*/
-	border: 3px outset #201e87;
-	background-color: #879ED4;
-	font-family: verdana,sans-serif,helvetica;
-	font-style: italic;
-	font-weight: bolder;
-	text-align:center;
-	display:none;
-	color: white;
-	/*opacity:0.7;
-	filter:alpha(opacity=3D70);
-	*/
-	}
+    position:absolute;
+    top:20%;
+    left:20%;
+    width:60%;
+    height:80% ;
+    /*background:lightgrey;*/
+    z-index:10;
+    /*border:dotted 1px black;*/
+    border: 3px outset #201e87;
+    background-color: #879ED4;
+    font-family: verdana,sans-serif,helvetica;
+    font-style: italic;
+    font-weight: bolder;
+    text-align:center;
+    display:none;
+    color: white;
+    /*opacity:0.7;
+    filter:alpha(opacity=3D70);
+    */
+}
=20
 div.popup_content {
-	position:absolute;
-	top:16;
-	bottom:0;
-	left:0;
-	right:0;
-	width:100%;
-	height:96%;
-	overflow: auto;
-	background-color:#DFE7FF;
-	font-size:90% ;
-	font-family: verdana,sans-serif,helvetica;
-	font-style: normal;
-	font-weight: normal;
-	color: black;
-	text-align: left;
-	display:none;
-	z-index:10;
-	/*opacity:1;
-	filter:alpha(opacity=3D100);*/
+    position:absolute;
+    top:16;
+    bottom:0;
+    left:0;
+    right:0;
+    width:100%;
+    height:96%;
+    overflow: auto;
+    background-color:#DFE7FF;
+    font-size:90% ;
+    font-family: verdana,sans-serif,helvetica;
+    font-style: normal;
+    font-weight: normal;
+    color: black;
+    text-align: left;
+    display:none;
+    z-index:10;
+    /*opacity:1;
+    filter:alpha(opacity=3D100);*/
 }
 div.autocomplete {
-  position:relative;
-  background-color:white;
-  border:1px solid #888;
-  margin:0;
-  padding:0;
-  text-align:left;
-  font-size:100%;
+    position:relative;
+    background-color:white;
+    border:1px solid #888;
+    margin:0;
+    padding:0;
+    text-align:left;
+    font-size:90%;
=20
 }
 div.autocomplete em {
-	color:blue;
-	font-weight:bold;
+    color:blue;
+    font-weight:bold;
 }
 div.autocomplete ul {
-  list-style-type:none;
-  background-color:white;
-  border:1px solid #888;
-  width:375px;
-  margin:0;
-  padding:0;
+    list-style-type:none;
+    background-color:white;
+    border:1px solid #888;
+    width:375px;
+    margin:0;
+    padding:0;
 }
 div.autocomplete ul li.selected { background-color: lightblue;}
=20
 div.autocomplete ul li {
-  list-style-type:none;
-  display:block;
-  margin:0;
-  padding:0px;
-  /*height:32px;*/
-  cursor:pointer;
+    list-style-type:none;
+    display:block;
+    margin:0;
+    padding:0px;
+    /*height:32px;*/
+    cursor:pointer;
 }
-span.informal{ font-size:95%; color:black;}
+span.informal{ font-size:90%; color:black;}
=20
 ul.select_table  {
-	/*padding:5px;*/
-	overflow:hidden;
-	}
+    /*padding:5px;*/
+    overflow:hidden;
+}
 ul.select_table a{
-	width:100%;
-	display:block;
-	background-color:inherit;
-	color: black;
-	text-decoration:none;
-	}
+    width:100%;
+    display:block;
+    background-color:inherit;
+    color: black;
+    text-decoration:none;
+}
 ul.select_table a:hover{
-	background-color:white;
-	color:black;
-	/*text-decoration:underline;*/
-	}
+    background-color:white;
+    color:black;
+    /*text-decoration:underline;*/
+}
 ul.select_table li {
-	display:table-row;
-	list-style-type: none;
-	}
+    display:table-row;
+    list-style-type: none;
+}
 ul.select_table li span {
-	display:table-cell;
-	width:25em;
-	margin: 0px;
-	padding:  0px;
+    display:table-cell;
+    width:25em;
+    margin: 0px;
+    padding:  0px;
 }
=20
 div.pc_calendar{
=20
-		float:left;
+    float:left;
=20
-		}
+}
 div.pc_calendar table {
-	text-align:center;
+    text-align:center;
=20
 }
 div.pc_calendar tr{
-	height:40;
+    height:40;
=20
=20
 }
 div.pc_calendar td{
-	width:14%;
-	border:#879ed4 solid 1px;
+    width:14%;
+    border:#879ed4 solid 1px;
 }
=20
 div.pc_calendar td.weekend {
-	background-color:#cce0e6;
+    background-color:#cce0e6;
=20
 }
 div.pc_calendar td.workday{
-	background-color:inherit;
+    background-color:inherit;
=20
=20
 }
 div.pc_calendar span.day{
-	font-weight: bold;
-	display:block;
+    font-weight: bold;
+    display:block;
=20
 }
 div.pc_calendar span.event{
-	font-weight: bolder;
+    font-weight: bolder;
=20
 }
 span.todo  {
-	text-align: left;
-	background-color:yellow;
+    text-align: left;
+    background-color:yellow;
=20
 }
 input[disabled], textarea[disabled], option[disabled], optgroup[disabled=
], select[disabled] {
--moz-user-focus:ignore;
--moz-user-input:disabled;
-background-color:lightgrey;
-color:black;
-cursor:inherit;
+    -moz-user-focus:ignore;
+    -moz-user-input:disabled;
+    background-color:lightgrey;
+    color:black;
+    cursor:inherit;
 }
=20
 a#anchorbutton, .button, a.button,div.content a.button {
-	font-size:90%;
-	color:white;
-	font-weight: bold;
+    color:white;
+    font-weight: bold;
+    font-size:87%;
+    text-decoration:none;
+    font-family: verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
=20
-	text-decoration:none;
-	font-family: verdana,sans-serif,helvetica;
-	background-image: url("image/bg-submit2.gif");
-	background-repeat: repeat-x;
-	background-position: left;
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0;
+    padding-bottom: 4;
+    padding-top: 4;
+    padding-right: 6;
+    padding-left:  6;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 4px;
+    moz-border-radius:4px;
=20
-	border-style:  outset ;
-	border-color:  blue ;
-	border-width:0;
-	padding-bottom: 4;
-	padding-top: 4;
-	padding-right: 6;
-	padding-left:  6;
-	margin-top:3px;
-	cursor:pointer;
-	margin:1 2 1 2;
-        border-radius: 4px;
-	moz-border-radius:4px;
-
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
-	cursor:pointer;
-	background-color:white;
-	border-style:  inset ;
-	color:red;
-	margin:1 2 1 2;
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
=20
-	}
-	td.tool {
-	border: solid 1px gray;
-	background-color: white;
-	border-bottom-width: 2px;
-	}
+}
+td.tool {
+    border: solid 1px gray;
+    background-color: white;
+    border-bottom-width: 2px;
+    text-align:center;
+}
 div.topmenu {
-	margin-top:2px;
+
 }
=20
-h2.dossier {
-	color:darkblue;
-	font-style: italic;
-	display:inline;
-	font-size:120%;
-	margin:0px;
-	padding:0px;
-	font-variant:small-caps;
+#dossier h2{
+    color:darkblue;
+    display:inline;
+    font-size:120%;
+    margin:0px;
+    padding:0px;
+    font-variant:small-caps;
 }
 /* </style> */
-div.add_todo_list {
-                    border:1px solid blue;
-                    display:none;
-                    background-color:#BFD0FF;
-                    padding:3;
-                    position:absolute;
-                    text-align:left;
-                    line-height:3em;
-                    z-index:1;
-                    width:345px;
-                }
+#add_todo_list {
+    border:1px solid blue;
+    display:none;
+    background-color:#BFD0FF;
+    padding:0.0015%;
+    position:absolute;
+    text-align:left;
+    z-index:1;
+    width:17.9687%;
+    font-size:95%;
+}
 div.welcome {
=20
 }
 div.gest_name {
-	float:left;
-	margin-left:150;
-	margin-top:15
+    float:left;
+    margin-left:150;
+    margin-top:15
 }
 h2.gest_name {
-	border-left: 5px solid  #403a8d;
-	border-bottom:1px solid  #b4bbc2;
-		border-top:1px solid  #b4bbc2;
-		border-right:1px solid  #b4bbc2;
-	padding: 5px;
-	width: 40%;
+    border-left: 5px solid  #403a8d;
+    border-bottom:1px solid  #b4bbc2;
+    border-top:1px solid  #b4bbc2;
+    border-right:1px solid  #b4bbc2;
+    padding: 5px;
+    width: 40%;
 }
 body.op_detail_frame,div.op_detail_frame  {
-  background-color:#e4e7ed;
-  height:100%; width:100%;
+    background-color:#e4e7ed;
+    height:100%; width:100%;
=20
=20
 }
 div.inner_box  {
-  background-color:#e4e7ed;
- font-size:100%;
-  font-family:verdana,sans-serif,helvetica;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:3;
+    background-color:#e4e7ed;
+    font-size:90%;
+    font-family:verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
=20
-position:absolute;
-left:10%;
+    position:absolute;
+    left:10%;
=20
=20
-border:1px solid darkblue;
+    border:1px solid darkblue;
=20
 }
 div.op_detail_title {
-	background-color:grey;
-/*	width:500;*/
+    background-color:grey;
+    /*	width:500;*/
=20
=20
 }
 div#div_jrn{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-		      background-color:#EDF3FF;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
=20
 }
- div#div_cat{
-              position:absolute;
-              border:1px solid black;
-               top:15%;left:100;
-              visibility:hidden;
-              z-index:2;
-              width:50em;
-             background-color:#EDF3FF;
+div#div_cat{
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100;
+    visibility:hidden;
+    z-index:2;
+    width:50em;
+    background-color:#EDF3FF;
=20
 }
=20
@@ -932,153 +936,154 @@
=20
 div#search_form
 {
-              position:absolute;
-              border:1px solid black;
-              top:15%;left:100px;
-              margin-left:25%;
-              z-index:2;
-              width:50%;
-              display:none;
-	      background-color:#e4e7ed;
+    position:absolute;
+    border:1px solid black;
+    top:15%;left:100px;
+    margin-left:25%;
+    z-index:2;
+    width:50%;
+    display:none;
+    background-color:#e4e7ed;
 }
=20
 table.sortable td, table.table_large td, table.result td
 {
-	padding-left:5px;
-	padding-right:5px;
+    padding-left:5px;
+    padding-right:5px;
 }
 table.info_op
 {
-	font-size:100%;
-	width:100%;
+    font-size:90%;
+    width:100%;
 }
 table.info_op tr
 {
-font-size:120%;
-background:white;
+    font-size:120%;
+    background:white;
 }
 h2#jrn_name
 {
-	color:blue;
-	font-size:120%;
-	margin-right:30%;
-	float: right;
+    color:darkgrey;
+    font-size:274%;
+    margin-right:30%;
+    float: right;
=20
 }
 tr.footer{
-	font-size:120%;
-	font-style: italic;
-	font-weight: bold;
+    font-size:120%;
+    font-style: italic;
+    font-weight: bold;
=20
 }
 span.remain {
-	font-weight: bold;
-	color:black;
-	}
+    font-weight: bold;
+    color:black;
+}
=20
 div#jrn_name_div
 {
-	float: right;
-	margin-right:150;
+    float: right;
+    margin-right:150;
=20
=20
 }
 #predef_form {
-	margin-left:20%;
-	width:60%;
+    margin-left:20%;
+    width:60%;
=20
 }
 #direct
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
+    font-size:75%;
 }
 #calc
 {
-	display:inline;
-	float:left;
+    display:inline;
+    float:left;
 }
 div#wait_box
 {
-  background-color:#F1E6E6;
- font-size:120%;
-  font-family: verdana,helvetica,arial,sans-serif;
-  padding:0;
-  margin:0;
-  overflow:hidden;
-  z-index:10;
+    background-color:#F1E6E6;
+    font-size:120%;
+    font-family: verdana,helvetica,arial,sans-serif;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:10;
=20
-position:absolute;
-left:30%;
-top:30%;
+    position:absolute;
+    left:30%;
+    top:30%;
=20
=20
-border:1px solid darkblue;
+    border:1px solid darkblue;
=20
 }
 #wait_box h2
 {
-color:black;
-text-align:center;
+    color:black;
+    text-align:center;
 }
 div#div_jrnsearch_op{
=20
-              border:1px solid black;
-              display:none;
-              width:50em;
-		      background-color:#EDF3FF;
-			  position:absolute;
-			  z-index: 5;
+    border:1px solid black;
+    display:none;
+    width:50em;
+    background-color:#EDF3FF;
+    position:absolute;
+    z-index: 5;
=20
 }
 ul {
-	padding-left: 110px;
+    padding-left: 110px;
 }
 a.line,div.content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
- color: #0000ff;
+    font-size:110%;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-font-size:110%;
-  text-decoration:underline;
-  display:inline;
-  color: #0000ff;
-     background-color: rgb(93, 144, 205);
+    font-size:110%;
+    text-decoration:underline;
+    display:inline;
+    color: #0000ff;
+    background-color: rgb(93, 144, 205);
 }
 #close_div
 {
- background-color:white;
- color:blue;
- text-decoration:none;
- border:1px solid blue;
- margin-left: 2px;
- margin-right:2px;
- margin-top:0px;
- font-size:90%;
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:2px;
+    margin-top:0px;
+    font-size:85%;
 }
 #close_div:hover
 {
-	background-color: orange;
+    background-color: orange;
 }
 table.table_large tr.odd ,table.table_large tr.even {
=20
-	height:32px;
+    height:32px;
 }
 #calc1
 {
-	position:absolute;
-	display:block;
-	top:30px;
-	left:150px;
-	width:300px;
-	border:1px solid black;
-	background-color:#aec3e8;
-	font-size:120%;
-	padding: 20px 20px;
+    position:absolute;
+    display:block;
+    top:30px;
+    left:150px;
+    width:300px;
+    border:1px solid black;
+    background-color:#aec3e8;
+    font-size:120%;
+    padding: 20px 20px;
 }
 span.invoice
 {
@@ -1089,70 +1094,78 @@
     font-weight: bold;
 }
 a.nav,div.content a.nav,div.redcontent a.nav {
-	display:inline;
-	text-decoration:none;
-	font-size:100%;
+    display:inline;
+    text-decoration:none;
+    font-size:90%;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
-	display:inline;
-	text-decoration:none;
-	background-color:darkblue;
-	color:white;
-	font-size:100%;
+    display:inline;
+    text-decoration:none;
+    background-color:darkblue;
+    color:white;
+    font-size:90%;
 }
 #dossier {
-	display:inline;
-	float:left;
-	width:40em;
-	top:0px;
+    display:inline;
+    float:left;
+    width:100%;
+    //margin-left:5.28%;
+    top:0px;
+    text-align: center;
 }
 div.foldercontent {
-	padding:20px 30px 0px 40px;
-	}
+    padding:20px 30px 0px 40px;
+}
=20
 h1.title {
-	color: blue;
-	font-size:120%;
-	font-style: italic;
+    color: blue;
+    font-size:120%;
+    font-style: italic;
 }
 h2.title {
-	color: blue;
-	font-size:120%;
-	font-weight:bold;
-	font-style: italic;
-	margin-left: 15px;
+    color: blue;
+    font-size:120%;
+    font-weight:bold;
+    font-style: italic;
+    margin-left: 15px;
 }
 h3.title {
-	color: blue;
-	font-size:120%;
-	margin-left: 30px;
+    color: blue;
+    font-size:120%;
+    margin-left: 30px;
 }
 h4.title {
-	color: blue;
-	font-size:120%;
-	margin-left: 45px;
-	text-decoration: underline;
+    color: blue;
+    font-size:120%;
+    margin-left: 45px;
+    text-decoration: underline;
 }
 h5.title {
-	color: blue;
-	font-size:120%;
-	margin-left: 45px;
-	text-decoration: none;
-	font-style: italic;
+    color: blue;
+    font-size:120%;
+    margin-left: 45px;
+    text-decoration: none;
+    font-style: italic;
 }
 div.myfieldset
 {
-	margin-top: 5px;
-	margin-left:5px;
-	margin-right: 5px;
-	border:lightgrey 2px groove;
+    margin-top: 5px;
+    margin-left:5px;
+    margin-right: 5px;
+    border:lightgrey 2px groove;
 }
 #info_div {
-	display:none;
-	background-color: yellow;
-	color:black;
-	z-index: 15;
-	position: absolute;
-	top:0;
-	left:45%;
+    display:none;
+    background-color: yellow;
+    color:black;
+    z-index: 15;
+    position: absolute;
+    top:0;
+    left:45%;
+}
+div.menu2 a.mtitle{
+    font-size:85%;
+}
+div.menu3 {
+   =20
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/user_login.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/user_login.php	2013-08-26 20:31:02 UTC (rev 5354=
)
+++ phpcompta/trunk/html/user_login.php	2013-08-27 20:58:29 UTC (rev 5355=
)
@@ -138,7 +138,7 @@
 $result.=3D"</table>";
=20
 echo '<h2 class=3D"info">'._('Bienvenue    ').$User->first_name.'  '.$Us=
er->name.'   '._("dans PhpCompta")."</h2>";
-echo '<div class=3D"module">'.$result.'</div>';
+echo '<div id=3D"module">'.$result.'</div>';
 echo '</div>';
 ?>
 <div class=3D"foldercontent">

Modified: phpcompta/trunk/include/ac_common.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ac_common.php	2013-08-26 20:31:02 UTC (rev 53=
54)
+++ phpcompta/trunk/include/ac_common.php	2013-08-27 20:58:29 UTC (rev 53=
55)
@@ -118,9 +118,9 @@
     if (trim($p_number) =3D=3D '')
 	return '';
     if ($p_number =3D=3D 0)
-	return 0;
+	return "0,00";
+   =20
     $a =3D doubleval($p_number);
-
     $r =3D number_format($a, 2, ",", ".");
     if (trim($r) =3D=3D '')
     {
@@ -916,7 +916,7 @@
  * show the module
  * @global $g_user
  * @param $module the $_REQUEST['ac'] exploded into an array
- * @param  $idx the index
+ * @param  $idx the index of the array : the AD code is splitted into an=
 array thanks the slash
  */
 function show_menu($module, $idx)
 {
@@ -930,6 +930,12 @@
=20
     if (!empty($amenu) && count($amenu) > 1)
     {
+        $a_style_menu=3Darray('topmenu','menu2','menu3');
+        if ( $idx > count($a_style_menu))
+            $style_menu=3D'menu3';
+        else {
+            $style_menu=3D$a_style_menu[$idx];
+        }
 		require 'template/menu.php';
     }
     elseif (count($amenu) =3D=3D 1)

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-08-26 20:31:02 UT=
C (rev 5354)
+++ phpcompta/trunk/include/template/dashboard.php	2013-08-27 20:58:29 UT=
C (rev 5355)
@@ -302,7 +302,7 @@
=20
=20
=20
-<div id=3D"add_todo_list" class=3D"add_todo_list">
+<div id=3D"add_todo_list" >
 	<script charset=3D"utf8" type=3D"text/javascript" language=3D"javascrip=
t">
 		new Draggable($('add_todo_list'),{});
 	</script>

Modified: phpcompta/trunk/include/template/history_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/history_top.php	2013-08-26 20:31:02 =
UTC (rev 5354)
+++ phpcompta/trunk/include/template/history_top.php	2013-08-27 20:58:29 =
UTC (rev 5355)
@@ -4,7 +4,7 @@
    {
      $callback=3D$_SERVER['PHP_SELF'];
      $str=3D$_SERVER['QUERY_STRING']."&act=3Dde&ajax=3D$callback";
-     echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"va=
r a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'fullscreen=3Dyes,location=
=3Dno,toolbar=3Dno,scrollbars=3Dyes,resizable=3Dyes,status=3Dno,location=3D=
no\'); a.focus();removeDiv(\''.$div.'\')">
+     echo '<A id=3D"popmeout" HREF=3D"javascript:void(0)" onclick=3D"var=
 a=3Dwindow.open(\'popup.php?'.$str.'\',\'\',\'fullscreen=3Dyes,location=3D=
no,toolbar=3Dno,scrollbars=3Dyes,resizable=3Dyes,status=3Dno,location=3Dn=
o\'); a.focus();removeDiv(\''.$div.'\')">
 !pop me out ! </A>';
 echo '<A id=3D"close_div" HREF=3D"javascript:void(0)" onclick=3D"removeD=
iv(\''.$div.'\');">Fermer</A>';
 }

Modified: phpcompta/trunk/include/template/menu.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu.php	2013-08-26 20:31:02 UTC (re=
v 5354)
+++ phpcompta/trunk/include/template/menu.php	2013-08-27 20:58:29 UTC (re=
v 5355)
@@ -1,8 +1,7 @@
-<div class=3D"topmenu">
+<div class=3D"<?php echo $style_menu; ?>">
     <?php if ( count($amenu) > 4 && $idx =3D=3D 0) :
 	$style =3D'style=3D "width:100%"';
-    ?>
-    <?php elseif ($idx=3D=3D0):
+     elseif ($idx=3D=3D0):
 switch (count($amenu))
 {
 case 4:

Modified: phpcompta/trunk/include/template/module.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/module.php	2013-08-26 20:31:02 UTC (=
rev 5354)
+++ phpcompta/trunk/include/template/module.php	2013-08-27 20:58:29 UTC (=
rev 5355)
@@ -1,4 +1,8 @@
-<div class=3D"u_tool">
+<div id=3D"top">
+      <div id=3D"dossier">
+	<H2><?php echo h(dossier::name())?></h2>
+	</div>
+    <div style=3D"clear:both;"></div>
     <div class=3D"name">
=20
 <?php
@@ -43,12 +47,10 @@
 	</div>
 <?php=20
 endif;?>
-	<div id=3D"dossier">
-	<H2 class=3D"dossier"><?php echo h(dossier::name())?></h2>
-	</div>
+=09
     </div>
=20
-    <div class=3D"module">
+    <div id=3D"module">
 	<table>
 	    <tr>
 		<?php
@@ -87,5 +89,6 @@
 	</table>
=20
     </div>
+ =20
 </div>
 <div style=3D"clear:both;"></div>
\ No newline at end of file



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


From MAILER-DAEMON Tue Aug 27 17:08:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VEQUb-0003nO-7n
	for mharc-phpcompta-dev@gnu.org; Tue, 27 Aug 2013 17:08:01 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 27 Aug 2013 22:58:52 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.13817.1377637680.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5356 - in phpcompta/trunk/include: . template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Aug 2013 21:08:00 -0000

Author: danydb
Date: 2013-08-27 22:58:52 +0200 (Tue, 27 Aug 2013)
New Revision: 5356

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/compta_ven.inc.php
   phpcompta/trunk/include/template/form_ledger_detail.php
Log:
Improve appearance VEN

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-08-27 20:58:29 UTC =
(rev 5355)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-08-27 20:58:52 UTC =
(rev 5356)
@@ -3416,19 +3416,15 @@
 		}
 	}
=20
-	function input_paid($nofieldset =3D 0)
+	function input_paid()
 	{
 		$r =3D '';
-		if ($nofieldset =3D=3D 0)
-		{
-			$r.=3D'<fieldset id=3D"payment"> ';
-		}
-		$r.=3D'<legend> ' . _('Pay=C3=A9 par') . ' </legend>';
+		$r.=3D'<div id=3D"payment"> ';
+		$r.=3D'<h2> ' . _('Pay=C3=A9 par') . ' </h2>';
 		$mp =3D new Acc_Payment($this->db);
 		$mp->set_parameter('ledger_source', $this->id);
 		$r.=3D$mp->select();
-		if ($nofieldset =3D=3D 0)
-			$r.=3D'</fieldset>';
+		$r.=3D'</div>';
 		return $r;
 	}
=20

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-27 20:58:29=
 UTC (rev 5355)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-27 20:58:52=
 UTC (rev 5356)
@@ -1,4 +1,5 @@
- <?php
+<?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,12 +16,12 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/*!\file
+/* !\file
  * \brief class for the sold, herits from acc_ledger
  */
 require_once("class_iselect.php");
@@ -41,578 +42,531 @@
 require_once('class_acc_ledger_fin.php');
 require_once 'class_stock_goods.php';
=20
-/*!\brief Handle the ledger of sold,
+/* !\brief Handle the ledger of sold,
  *
- *@exception throw an exception is something is wrong
+ * @exception throw an exception is something is wrong
  */
-class  Acc_Ledger_Sold extends Acc_Ledger
-{
-    function __construct ($p_cn,$p_init)
-    {
-        parent::__construct($p_cn,$p_init);
-        $this->type=3D'VEN';
+
+class Acc_Ledger_Sold extends Acc_Ledger {
+
+    function __construct($p_cn, $p_init) {
+        parent::__construct($p_cn, $p_init);
+        $this->type =3D 'VEN';
     }
-    /*!\brief verify that the data are correct before inserting or confi=
rming
-     *\param an array (usually $_POST)
-     *\return String
-     *\throw Exception if an error occurs
+
+    /* !\brief verify that the data are correct before inserting or conf=
irming
+     * \param an array (usually $_POST)
+     * \return String
+     * \throw Exception if an error occurs
      */
-    public function verify($p_array)
-    {
-        global $g_parameter,$g_user;
-        extract ($p_array);
+
+    public function verify($p_array) {
+        global $g_parameter, $g_user;
+        extract($p_array);
         /* check for a double reload */
-        if (  isset($mt) && $this->db->count_sql('select jr_mt from jrn =
where jr_mt=3D$1',array($mt)) !=3D 0 )
-            throw new Exception (_('Double Encodage'),5);
+        if (isset($mt) && $this->db->count_sql('select jr_mt from jrn wh=
ere jr_mt=3D$1', array($mt)) !=3D 0)
+            throw new Exception(_('Double Encodage'), 5);
=20
         /* check if we can write into this ledger */
-        if ( $g_user->check_jrn($p_jrn) !=3D 'W' )
-            throw new Exception (_('Acc=C3=A8s interdit'),20);
+        if ($g_user->check_jrn($p_jrn) !=3D 'W')
+            throw new Exception(_('Acc=C3=A8s interdit'), 20);
=20
         /* check if there is a customer */
-        if ( strlen(trim($e_client)) =3D=3D 0 )
-            throw new Exception(_('Vous n\'avez pas donn=C3=A9 de client=
'),11);
+        if (strlen(trim($e_client)) =3D=3D 0)
+            throw new Exception(_('Vous n\'avez pas donn=C3=A9 de client=
'), 11);
=20
         /*  check if the date is valid */
-        if ( isDate($e_date) =3D=3D null )
-        {
+        if (isDate($e_date) =3D=3D null) {
             throw new Exception(_('Date invalide'), 2);
         }
=20
-        $oPeriode=3Dnew Periode($this->db);
-        if ( $this->check_periode() =3D=3D true)
-        {
-            $tperiode=3D$period;
+        $oPeriode =3D new Periode($this->db);
+        if ($this->check_periode() =3D=3D true) {
+            $tperiode =3D $period;
             /* check that the datum is in the choosen periode */
-            $oPeriode->p_id=3D$period;
-            list ($min,$max)=3D$oPeriode->get_date_limit();
+            $oPeriode->p_id =3D $period;
+            list ($min, $max) =3D $oPeriode->get_date_limit();
=20
-            if ( cmpDate($e_date,$min) < 0 ||
-                    cmpDate($e_date,$max) > 0)
-                throw new Exception(_('Date et periode ne correspondent =
pas'),6);
+            if (cmpDate($e_date, $min) < 0 ||
+                    cmpDate($e_date, $max) > 0)
+                throw new Exception(_('Date et periode ne correspondent =
pas'), 6);
         }
-        else
-        {
-            $per=3Dnew Periode($this->db);
-            $tperiode=3D$per->find_periode($e_date);
+        else {
+            $per =3D new Periode($this->db);
+            $tperiode =3D $per->find_periode($e_date);
         }
=20
         /* check if the periode is closed */
-        if ( $this->is_closed($tperiode)=3D=3D1 )
-        {
-            throw new Exception(_('Periode fermee'),6);
+        if ($this->is_closed($tperiode) =3D=3D 1) {
+            throw new Exception(_('Periode fermee'), 6);
         }
         /* check if we are using the strict mode */
-        if( $this->check_strict() =3D=3D true)
-        {
+        if ($this->check_strict() =3D=3D true) {
             /* if we use the strict mode, we get the date of the last
-            operation */
-            $last_date=3D$this->get_last_date();
-            if ( $last_date !=3D null  && cmpDate($e_date,$last_date) < =
0 )
+              operation */
+            $last_date =3D $this->get_last_date();
+            if ($last_date !=3D null && cmpDate($e_date, $last_date) < 0=
)
                 throw new Exception(_('Vous utilisez le mode strict la d=
erni=C3=A8re operation est date du ')
-                                    .$last_date._(' vous ne pouvez pas e=
ncoder =C3=A0 une date ant=C3=A9rieure'),13);
-
+                . $last_date . _(' vous ne pouvez pas encoder =C3=A0 une=
 date ant=C3=A9rieure'), 13);
         }
=20
=20
-        $fiche=3Dnew Fiche($this->db);
+        $fiche =3D new Fiche($this->db);
         $fiche->get_by_qcode($e_client);
-        if ( $fiche->empty_attribute(ATTR_DEF_ACCOUNT) =3D=3D true)
-            throw new Exception(_('La fiche ').$e_client._('n\'a pas de =
poste comptable'),8);
+        if ($fiche->empty_attribute(ATTR_DEF_ACCOUNT) =3D=3D true)
+            throw new Exception(_('La fiche ') . $e_client . _('n\'a pas=
 de poste comptable'), 8);
=20
         /* get the account and explode if necessary */
-        $sposte=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT);
+        $sposte =3D $fiche->strAttribut(ATTR_DEF_ACCOUNT);
         // if 2 accounts, take only the debit one for customer
-        if ( strpos($sposte,',') !=3D 0 )
-        {
-            $array=3Dexplode(',',$sposte);
-            $poste_val=3D$array[0];
+        if (strpos($sposte, ',') !=3D 0) {
+            $array =3D explode(',', $sposte);
+            $poste_val =3D $array[0];
+        } else {
+            $poste_val =3D $sposte;
         }
-        else
-        {
-            $poste_val=3D$sposte;
-        }
         /* The account exists */
=20
-        $poste=3Dnew Acc_Account_Ledger($this->db,$poste_val);
+        $poste =3D new Acc_Account_Ledger($this->db, $poste_val);
=20
-        if ( $poste->load() =3D=3D false )
-        {
-            throw new Exception(_('Pour la fiche ').$e_client._(' le pos=
te comptable [').$poste->id._('] n\'existe pas'),9);
+        if ($poste->load() =3D=3D false) {
+            throw new Exception(_('Pour la fiche ') . $e_client . _(' le=
 poste comptable [') . $poste->id . _('] n\'existe pas'), 9);
         }
=20
         /* Check if the card belong to the ledger */
-        $fiche=3Dnew Fiche ($this->db);
-        $fiche->get_by_qcode($e_client,'deb');
-        if ( $fiche->belong_ledger($p_jrn) !=3D1 )
-            throw new Exception(_('La fiche ').$e_client._('n\'est pas a=
ccessible =C3=A0 ce journal'),10);
+        $fiche =3D new Fiche($this->db);
+        $fiche->get_by_qcode($e_client, 'deb');
+        if ($fiche->belong_ledger($p_jrn) !=3D 1)
+            throw new Exception(_('La fiche ') . $e_client . _('n\'est p=
as accessible =C3=A0 ce journal'), 10);
=20
-        $nb=3D0;
+        $nb =3D 0;
=20
         //----------------------------------------
         // foreach item
         //----------------------------------------
-        for ($i=3D0;$i< $nb_item;$i++)
-        {
-            if ( strlen(trim(${'e_march'.$i}))=3D=3D 0) continue;
+        for ($i =3D 0; $i < $nb_item; $i++) {
+            if (strlen(trim(${'e_march' . $i})) =3D=3D 0)
+                continue;
             /* check if amount are numeric and */
-            if ( isNumber(${'e_march'.$i.'_price'}) =3D=3D 0 )
-                throw new Exception(_('La fiche ').${'e_march'.$i}._('a =
un montant invalide [').${'e_march'.$i}.']',6);
-            if ( isNumber(${'e_quant'.$i}) =3D=3D 0 )
-                throw new Exception(_('La fiche ').${'e_march'.$i}._('a =
une quantit=C3=A9 invalide [').${'e_quant'.$i}.']',7);
-            /* check if all card has a ATTR_DEF_ACCOUNT*/
-            $fiche=3Dnew Fiche($this->db);
-            $fiche->get_by_qcode(${'e_march'.$i});
-            if ( $fiche->empty_attribute(ATTR_DEF_ACCOUNT) =3D=3D true)
-                throw new Exception(_('La fiche ').${'e_march'.$i}._('n\=
'a pas de poste comptable'),8);
+            if (isNumber(${'e_march' . $i . '_price'}) =3D=3D 0)
+                throw new Exception(_('La fiche ') . ${'e_march' . $i} .=
 _('a un montant invalide [') . ${'e_march' . $i} . ']', 6);
+            if (isNumber(${'e_quant' . $i}) =3D=3D 0)
+                throw new Exception(_('La fiche ') . ${'e_march' . $i} .=
 _('a une quantit=C3=A9 invalide [') . ${'e_quant' . $i} . ']', 7);
+            /* check if all card has a ATTR_DEF_ACCOUNT */
+            $fiche =3D new Fiche($this->db);
+            $fiche->get_by_qcode(${'e_march' . $i});
+            if ($fiche->empty_attribute(ATTR_DEF_ACCOUNT) =3D=3D true)
+                throw new Exception(_('La fiche ') . ${'e_march' . $i} .=
 _('n\'a pas de poste comptable'), 8);
=20
             // Check if the given tva id is valid
-            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-            {
-                if (  isNumber(${'e_march'.$i.'_tva_id'}) =3D=3D 0 )
-                    throw new Exception(_('La fiche ').${'e_march'.$i}._=
('a un code tva invalide').' ['.${'e_march'.$i.'_tva_id'}.']',13);
-                $tva_rate=3Dnew Acc_Tva($this->db);
-                $tva_rate->set_parameter('id',${'e_march'.$i.'_tva_id'})=
;
-                if ( $tva_rate->load() !=3D 0 )
-                    throw new Exception(_('La fiche ').${'e_march'.$i}._=
('a un code tva invalide').' ['.${'e_march'.$i.'_tva_id'}.']',13);
+            if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
+                if (isNumber(${'e_march' . $i . '_tva_id'}) =3D=3D 0)
+                    throw new Exception(_('La fiche ') . ${'e_march' . $=
i} . _('a un code tva invalide') . ' [' . ${'e_march' . $i . '_tva_id'} .=
 ']', 13);
+                $tva_rate =3D new Acc_Tva($this->db);
+                $tva_rate->set_parameter('id', ${'e_march' . $i . '_tva_=
id'});
+                if ($tva_rate->load() !=3D 0)
+                    throw new Exception(_('La fiche ') . ${'e_march' . $=
i} . _('a un code tva invalide') . ' [' . ${'e_march' . $i . '_tva_id'} .=
 ']', 13);
=20
-		/*
-		 * check if the accounting for VAT are valid
-		 */
-		$a_poste=3Dexplode(',',$tva_rate->tva_poste);
+                /*
+                 * check if the accounting for VAT are valid
+                 */
+                $a_poste =3D explode(',', $tva_rate->tva_poste);
=20
-		if (
-		    $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=3D=
$1',array($a_poste[0])) =3D=3D 0 ||
-		    $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=3D=
$1',array($a_poste[1])) =3D=3D 0 )
-		  throw new Exception(_(" La TVA ".$tva_rate->tva_label." utilise des =
postes comptables inexistants"));
+                if (
+                        $this->db->get_value('select count(*) from tmp_p=
cmn where pcm_val=3D$1', array($a_poste[0])) =3D=3D 0 ||
+                        $this->db->get_value('select count(*) from tmp_p=
cmn where pcm_val=3D$1', array($a_poste[1])) =3D=3D 0)
+                    throw new Exception(_(" La TVA " . $tva_rate->tva_la=
bel . " utilise des postes comptables inexistants"));
             }
             // if 2 accounts, take only the credit one
             /* The account exists */
-            $sposte=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT);
+            $sposte =3D $fiche->strAttribut(ATTR_DEF_ACCOUNT);
=20
-            if ( strpos($sposte,',') !=3D 0 )
-            {
-                $array=3Dexplode(',',$sposte);
-                $poste_val=3D$array[1];
+            if (strpos($sposte, ',') !=3D 0) {
+                $array =3D explode(',', $sposte);
+                $poste_val =3D $array[1];
+            } else {
+                $poste_val =3D $sposte;
             }
-            else
-            {
-                $poste_val=3D$sposte;
+            $poste =3D new Acc_Account_Ledger($this->db, $poste_val);
+            if ($poste->load() =3D=3D false) {
+                throw new Exception(_('Pour la fiche ') . ${'e_march' . =
$i} . _(' le poste comptable [') . $poste->id . _('n\'existe pas'), 9);
             }
-            $poste=3Dnew Acc_Account_Ledger($this->db,$poste_val);
-            if ( $poste->load() =3D=3D false )
-            {
-                throw new Exception(_('Pour la fiche ').${'e_march'.$i}.=
_(' le poste comptable [').$poste->id._('n\'existe pas'),9);
-            }
             /* Check if the card belong to the ledger */
-            $fiche=3Dnew Fiche ($this->db);
-            $fiche->get_by_qcode(${'e_march'.$i});
-            if ( $fiche->belong_ledger($p_jrn,'cred') !=3D1 )
-                throw new Exception(_('La fiche ').${'e_march'.$i}._('n\=
'est pas accessible =C3=A0 ce journal'),10);
+            $fiche =3D new Fiche($this->db);
+            $fiche->get_by_qcode(${'e_march' . $i});
+            if ($fiche->belong_ledger($p_jrn, 'cred') !=3D 1)
+                throw new Exception(_('La fiche ') . ${'e_march' . $i} .=
 _('n\'est pas accessible =C3=A0 ce journal'), 10);
             $nb++;
         }
-        if ( $nb =3D=3D 0 )
-            throw new Exception(_('Il n\'y a aucune marchandise'),12);
+        if ($nb =3D=3D 0)
+            throw new Exception(_('Il n\'y a aucune marchandise'), 12);
         //------------------------------------------------------
         // The "Paid By"  check
         //------------------------------------------------------
=20
-        if ($e_mp !=3D 0 ) {
-            $this->check_payment($e_mp,${"e_mp_qcode_".$e_mp});
+        if ($e_mp !=3D 0) {
+            $this->check_payment($e_mp, ${"e_mp_qcode_" . $e_mp});
         }
-
     }
=20
-
-    /*!\brief insert into the database, it calls first the verify functi=
on,
+    /* !\brief insert into the database, it calls first the verify funct=
ion,
      * change the value of this->jr_id and this->jr_internal
      * * It generates the document if gen_invoice is set and save the mi=
ddle of payment if any ($e_mp)
      *
-     *\param $p_array is usually $_POST or a predefined operation
-     *\return string
-     *\note throw an Exception
+     * \param $p_array is usually $_POST or a predefined operation
+     * \return string
+     * \note throw an Exception
      */
-    public function insert($p_array=3Dnull)
-    {
+
+    public function insert($p_array =3D null) {
         global $g_parameter;
-        extract ($p_array);
-        $this->verify($p_array) ;
+        extract($p_array);
+        $this->verify($p_array);
=20
-        $group=3D$this->db->get_next_seq("s_oa_group"); /* for analytic =
*/
-        $seq=3D$this->db->get_next_seq('s_grpt');
-        $this->id=3D$p_jrn;
-        $internal=3D$this->compute_internal_code($seq);
-        $this->internal=3D$internal;
+        $group =3D $this->db->get_next_seq("s_oa_group"); /* for analyti=
c */
+        $seq =3D $this->db->get_next_seq('s_grpt');
+        $this->id =3D $p_jrn;
+        $internal =3D $this->compute_internal_code($seq);
+        $this->internal =3D $internal;
=20
-        $oPeriode=3Dnew Periode($this->db);
-        $check_periode=3D$this->check_periode();
+        $oPeriode =3D new Periode($this->db);
+        $check_periode =3D $this->check_periode();
=20
-        if ( $check_periode =3D=3D true )
-            $tperiode=3D$period;
+        if ($check_periode =3D=3D true)
+            $tperiode =3D $period;
         else
-            $tperiode=3D$oPeriode->find_periode($e_date);
+            $tperiode =3D $oPeriode->find_periode($e_date);
=20
-        $cust=3Dnew Fiche($this->db);
+        $cust =3D new Fiche($this->db);
         $cust->get_by_qcode($e_client);
-        $sposte=3D$cust->strAttribut(ATTR_DEF_ACCOUNT);
+        $sposte =3D $cust->strAttribut(ATTR_DEF_ACCOUNT);
=20
         // if 2 accounts, take only the debit one for the customer
         //
-        if ( strpos($sposte,',') !=3D 0 )
-        {
-            $array=3Dexplode(',',$sposte);
-            $poste=3D$array[0];
+        if (strpos($sposte, ',') !=3D 0) {
+            $array =3D explode(',', $sposte);
+            $poste =3D $array[0];
+        } else {
+            $poste =3D $sposte;
         }
-        else
-        {
-            $poste=3D$sposte;
-        }
=20
         bcscale(4);
-        try
-        {
-            $tot_amount=3D0;
-            $tot_tva=3D0;
-            $tot_debit=3D0;
+        try {
+            $tot_amount =3D 0;
+            $tot_tva =3D 0;
+            $tot_debit =3D 0;
             $this->db->start();
-			$tva=3Darray();
+            $tva =3D array();
             /* Save all the items without vat */
-            for ($i=3D0;$i< $nb_item;$i++)
-            {
-				$n_both=3D0;
-                if ( strlen(trim(${'e_march'.$i})) =3D=3D 0 ) continue;
+            for ($i =3D 0; $i < $nb_item; $i++) {
+                $n_both =3D 0;
+                if (strlen(trim(${'e_march' . $i})) =3D=3D 0)
+                    continue;
=20
                 /* First we save all the items without vat */
-                $fiche=3Dnew Fiche($this->db);
-                $fiche->get_by_qcode(${"e_march".$i});
-                $amount=3Dbcmul(${'e_march'.$i.'_price'},${'e_quant'.$i}=
);
-                $tot_amount=3Dbcadd($tot_amount,$amount);
-                $acc_operation=3Dnew Acc_Operation($this->db);
-                $acc_operation->date=3D$e_date;
-                $sposte=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT);
+                $fiche =3D new Fiche($this->db);
+                $fiche->get_by_qcode(${"e_march" . $i});
+                $amount =3D bcmul(${'e_march' . $i . '_price'}, ${'e_qua=
nt' . $i});
+                $tot_amount =3D bcadd($tot_amount, $amount);
+                $acc_operation =3D new Acc_Operation($this->db);
+                $acc_operation->date =3D $e_date;
+                $sposte =3D $fiche->strAttribut(ATTR_DEF_ACCOUNT);
=20
                 // if 2 accounts, take only the credit one
-                if ( strpos($sposte,',') !=3D 0 )
-                {
-                    $array=3Dexplode(',',$sposte);
-                    $poste_val=3D$array[1];
+                if (strpos($sposte, ',') !=3D 0) {
+                    $array =3D explode(',', $sposte);
+                    $poste_val =3D $array[1];
+                } else {
+                    $poste_val =3D $sposte;
                 }
-                else
-                {
-                    $poste_val=3D$sposte;
-                }
=20
-                $acc_operation->poste=3D$poste_val;
-                $acc_operation->amount=3D$amount;
-                $acc_operation->grpt=3D$seq;
-                $acc_operation->jrn=3D$p_jrn;
-                $acc_operation->type=3D'c';
-                $acc_operation->periode=3D$tperiode;
-                if ( $g_parameter->MY_UPDLAB=3D=3D'Y')
-                    $acc_operation->desc=3Dstrip_tags(${"e_march".$i."_l=
abel"});
+                $acc_operation->poste =3D $poste_val;
+                $acc_operation->amount =3D $amount;
+                $acc_operation->grpt =3D $seq;
+                $acc_operation->jrn =3D $p_jrn;
+                $acc_operation->type =3D 'c';
+                $acc_operation->periode =3D $tperiode;
+                if ($g_parameter->MY_UPDLAB =3D=3D 'Y')
+                    $acc_operation->desc =3D strip_tags(${"e_march" . $i=
 . "_label"});
                 else
-                    $acc_operation->desc=3Dnull;
+                    $acc_operation->desc =3D null;
=20
-                $acc_operation->qcode=3D${"e_march".$i};
-                if ( $amount < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($am=
ount));
+                $acc_operation->qcode =3D ${"e_march" . $i};
+                if ($amount < 0)
+                    $tot_debit =3D bcadd($tot_debit, abs($amount));
=20
-                $j_id=3D$acc_operation->insert_jrnx();
+                $j_id =3D $acc_operation->insert_jrnx();
=20
-                if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
-                {
+                if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
                     /* Compute sum vat */
-                    $oTva=3Dnew Acc_Tva($this->db);
-                    $idx_tva=3D${'e_march'.$i.'_tva_id'};
-                    $tva_item=3D${'e_march'.$i.'_tva_amount'};
-					$oTva->set_parameter("id",$idx_tva);
-					$oTva->load();
+                    $oTva =3D new Acc_Tva($this->db);
+                    $idx_tva =3D ${'e_march' . $i . '_tva_id'};
+                    $tva_item =3D ${'e_march' . $i . '_tva_amount'};
+                    $oTva->set_parameter("id", $idx_tva);
+                    $oTva->load();
                     /* if empty then we need to compute it */
-                    if (trim($tva_item)=3D=3D'')
-                    {
+                    if (trim($tva_item) =3D=3D '') {
                         /* retrieve tva */
-                        $l=3Dnew Acc_Tva($this->db,$idx_tva);
+                        $l =3D new Acc_Tva($this->db, $idx_tva);
                         $l->load();
-                        $tva_item=3Dbcmul($amount,$l->get_parameter('rat=
e'));
+                        $tva_item =3D bcmul($amount, $l->get_parameter('=
rate'));
                     }
-                    if (isset($tva[$idx_tva] ) )
+                    if (isset($tva[$idx_tva]))
                         $tva[$idx_tva]+=3D$tva_item;
                     else
-                        $tva[$idx_tva]=3D$tva_item;
-                    if ($oTva->get_parameter("both_side")=3D=3D0) {
-						$tot_tva=3Dround(bcadd($tva_item,$tot_tva),2);
-					}else {
-							$n_both=3D$tva_item;
-							if ( $n_both < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($n_both));
-					}
+                        $tva[$idx_tva] =3D $tva_item;
+                    if ($oTva->get_parameter("both_side") =3D=3D 0) {
+                        $tot_tva =3D round(bcadd($tva_item, $tot_tva), 2=
);
+                    } else {
+                        $n_both =3D $tva_item;
+                        if ($n_both < 0)
+                            $tot_debit =3D bcadd($tot_debit, abs($n_both=
));
+                    }
                 }
=20
                 /* Save the stock */
                 /* if the quantity is < 0 then the stock increase (retur=
n of
                  *  material)
                  */
-                $nNeg=3D(${"e_quant".$i}<0)?-1:1;
+                $nNeg =3D (${"e_quant" . $i} < 0) ? -1 : 1;
=20
                 // always save quantity but in withStock we can find
                 // what card need a stock management
-                if ( $g_parameter->MY_STOCK=3D'Y' && isset ($repo))
-                    Stock_Goods::insert_goods($this->db,array('j_id'=3D>=
$j_id,'goods'=3D>${'e_march'.$i},'quant'=3D>$nNeg*${'e_quant'.$i},'dir'=3D=
>'c','repo'=3D>$repo)) ;
+                if ($g_parameter->MY_STOCK =3D 'Y' && isset($repo))
+                    Stock_Goods::insert_goods($this->db, array('j_id' =3D=
> $j_id, 'goods' =3D> ${'e_march' . $i}, 'quant' =3D> $nNeg * ${'e_quant'=
 . $i}, 'dir' =3D> 'c', 'repo' =3D> $repo));
=20
=20
-                if ( $g_parameter->MY_ANALYTIC !=3D "nu" )
-                {
+                if ($g_parameter->MY_ANALYTIC !=3D "nu") {
                     // for each item, insert into operation_analytique *=
/
-                    $op=3Dnew Anc_Operation($this->db);
-                    $op->oa_group=3D$group;
-                    $op->j_id=3D$j_id;
-                    $op->oa_date=3D$e_date;
-                    $op->oa_debit=3D($amount < 0 )?'t':'f';
-                    $op->oa_description=3Dsql_string($e_comm);
-                    $op->save_form_plan($_POST,$i,$j_id);
+                    $op =3D new Anc_Operation($this->db);
+                    $op->oa_group =3D $group;
+                    $op->j_id =3D $j_id;
+                    $op->oa_date =3D $e_date;
+                    $op->oa_debit =3D ($amount < 0 ) ? 't' : 'f';
+                    $op->oa_description =3D sql_string($e_comm);
+                    $op->save_form_plan($_POST, $i, $j_id);
                 }
-                if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-                {
+                if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
                     /* save into quant_sold */
-                    $r=3D$this->db->exec_sql("select insert_quant_sold (=
$1,$2,$3,$4,$5,$6,$7,$8,$9)",
-                                           array(null, /* 1 */
-                                                 $j_id,	/* 2 */
-                                                 ${'e_march'.$i} , /* 3 =
*/
-                                                 ${'e_quant'.$i},  /* 4 =
*/
-                                                 round($amount,2),	     =
  /* 5 */
-                                                 $tva_item,	       /* 6 =
*/
-                                                 $idx_tva,	       /* 7 *=
/
-                                                 $e_client,      /* 8 */
-                                                 $n_both));
-
-                }
-                else
-                {
-                    $r=3D$this->db->exec_sql("select insert_quant_sold (=
$1,$2,$3,$4,$5,$6,$7,$8,$9) ",
-                                           array(null, /* 1 */
-                                                 $j_id,	  /* 2 */
-                                                 ${'e_march'.$i}, /* 3 *=
/
-                                                 ${'e_quant'.$i}, /* 4 *=
/
-                                                 $amount,		// 5
-                                                 0,
-                                                 null,
-                                                 $e_client,
-                                                         0));
-
+                    $r =3D $this->db->exec_sql("select insert_quant_sold=
 ($1,$2,$3,$4,$5,$6,$7,$8,$9)", array(null, /* 1 */
+                        $j_id, /* 2 */
+                        ${'e_march' . $i}, /* 3 */
+                        ${'e_quant' . $i}, /* 4 */
+                        round($amount, 2), /* 5 */
+                        $tva_item, /* 6 */
+                        $idx_tva, /* 7 */
+                        $e_client, /* 8 */
+                        $n_both));
+                } else {
+                    $r =3D $this->db->exec_sql("select insert_quant_sold=
 ($1,$2,$3,$4,$5,$6,$7,$8,$9) ", array(null, /* 1 */
+                        $j_id, /* 2 */
+                        ${'e_march' . $i}, /* 3 */
+                        ${'e_quant' . $i}, /* 4 */
+                        $amount, // 5
+                        0,
+                        null,
+                        $e_client,
+                        0));
                 }  // if ( $g_parameter->MY_TVA_USE=3D=3D'Y') {
             }// end loop : save all items
=20
             /*  save total customer */
-            $cust_amount=3Dbcadd($tot_amount,$tot_tva);
-            $acc_operation=3Dnew Acc_Operation($this->db);
-            $acc_operation->date=3D$e_date;
-            $acc_operation->poste=3D$poste;
-            $acc_operation->amount=3D$cust_amount;
-            $acc_operation->grpt=3D$seq;
-            $acc_operation->jrn=3D$p_jrn;
-            $acc_operation->type=3D'd';
-            $acc_operation->periode=3D$tperiode;
-            $acc_operation->qcode=3D${"e_client"};
-            if ( $cust_amount > 0 ) $tot_debit=3Dbcadd($tot_debit,$cust_=
amount);
-            $let_tiers=3D$acc_operation->insert_jrnx();
+            $cust_amount =3D bcadd($tot_amount, $tot_tva);
+            $acc_operation =3D new Acc_Operation($this->db);
+            $acc_operation->date =3D $e_date;
+            $acc_operation->poste =3D $poste;
+            $acc_operation->amount =3D $cust_amount;
+            $acc_operation->grpt =3D $seq;
+            $acc_operation->jrn =3D $p_jrn;
+            $acc_operation->type =3D 'd';
+            $acc_operation->periode =3D $tperiode;
+            $acc_operation->qcode =3D ${"e_client"};
+            if ($cust_amount > 0)
+                $tot_debit =3D bcadd($tot_debit, $cust_amount);
+            $let_tiers =3D $acc_operation->insert_jrnx();
=20
=20
             /** save all vat
              * $i contains the tva_id and value contains the vat amount
              * if if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
              */
-            if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
-            {
-                foreach ($tva as $i =3D> $value)
-                {
-                    $oTva=3Dnew Acc_Tva($this->db);
-                    $oTva->set_parameter('id',$i);
+            if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
+                foreach ($tva as $i =3D> $value) {
+                    $oTva =3D new Acc_Tva($this->db);
+                    $oTva->set_parameter('id', $i);
                     $oTva->load();
=20
-                    $poste_vat=3D$oTva->get_side('c');
+                    $poste_vat =3D $oTva->get_side('c');
=20
-                    $cust_amount=3Dbcadd($tot_amount,$tot_tva);
-                    $acc_operation=3Dnew Acc_Operation($this->db);
-                    $acc_operation->date=3D$e_date;
-                    $acc_operation->poste=3D$poste_vat;
-                    $acc_operation->amount=3D$value;
-                    $acc_operation->grpt=3D$seq;
-                    $acc_operation->jrn=3D$p_jrn;
-                    $acc_operation->type=3D'c';
-                    $acc_operation->periode=3D$tperiode;
-                    if ($value < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($=
value));
+                    $cust_amount =3D bcadd($tot_amount, $tot_tva);
+                    $acc_operation =3D new Acc_Operation($this->db);
+                    $acc_operation->date =3D $e_date;
+                    $acc_operation->poste =3D $poste_vat;
+                    $acc_operation->amount =3D $value;
+                    $acc_operation->grpt =3D $seq;
+                    $acc_operation->jrn =3D $p_jrn;
+                    $acc_operation->type =3D 'c';
+                    $acc_operation->periode =3D $tperiode;
+                    if ($value < 0)
+                        $tot_debit =3D bcadd($tot_debit, abs($value));
                     $acc_operation->insert_jrnx();
=20
                     // if TVA is on both side, we deduce it immediately
-                    if ( $oTva->get_parameter("both_side")=3D=3D1)
-                    {
-                        $poste_vat=3D$oTva->get_side('d');
-                        $cust_amount=3Dbcadd($tot_amount,$tot_tva);
-                        $acc_operation=3Dnew Acc_Operation($this->db);
-                        $acc_operation->date=3D$e_date;
-                        $acc_operation->poste=3D$poste_vat;
-                        $acc_operation->amount=3D$value;
-                        $acc_operation->grpt=3D$seq;
-                        $acc_operation->jrn=3D$p_jrn;
-                        $acc_operation->type=3D'd';
-                        $acc_operation->periode=3D$tperiode;
-						$acc_operation->insert_jrnx();
-						$tot_debit=3Dbcadd($tot_debit,$value);
-                        $n_both=3D$value;
+                    if ($oTva->get_parameter("both_side") =3D=3D 1) {
+                        $poste_vat =3D $oTva->get_side('d');
+                        $cust_amount =3D bcadd($tot_amount, $tot_tva);
+                        $acc_operation =3D new Acc_Operation($this->db);
+                        $acc_operation->date =3D $e_date;
+                        $acc_operation->poste =3D $poste_vat;
+                        $acc_operation->amount =3D $value;
+                        $acc_operation->grpt =3D $seq;
+                        $acc_operation->jrn =3D $p_jrn;
+                        $acc_operation->type =3D 'd';
+                        $acc_operation->periode =3D $tperiode;
+                        $acc_operation->insert_jrnx();
+                        $tot_debit =3D bcadd($tot_debit, $value);
+                        $n_both =3D $value;
                     }
-
-
                 }
             } // if ($g_parameter->MY_TVA_USE=3D=3D'Y')
             /* insert into jrn */
-            $acc_operation=3Dnew Acc_Operation($this->db);
-            $acc_operation->date=3D$e_date;
-            $acc_operation->echeance=3D$e_ech;
-            $acc_operation->amount=3Dabs(round($tot_debit,2));
-            $acc_operation->desc=3D$e_comm;
-            $acc_operation->grpt=3D$seq;
-            $acc_operation->jrn=3D$p_jrn;
-            $acc_operation->periode=3D$tperiode;
-            $acc_operation->pj=3D$e_pj;
-            $acc_operation->mt=3D$mt;
+            $acc_operation =3D new Acc_Operation($this->db);
+            $acc_operation->date =3D $e_date;
+            $acc_operation->echeance =3D $e_ech;
+            $acc_operation->amount =3D abs(round($tot_debit, 2));
+            $acc_operation->desc =3D $e_comm;
+            $acc_operation->grpt =3D $seq;
+            $acc_operation->jrn =3D $p_jrn;
+            $acc_operation->periode =3D $tperiode;
+            $acc_operation->pj =3D $e_pj;
+            $acc_operation->mt =3D $mt;
=20
-            $this->jr_id=3D$acc_operation->insert_jrn();
+            $this->jr_id =3D $acc_operation->insert_jrn();
=20
-            $this->pj=3D$acc_operation->set_pj();
+            $this->pj =3D $acc_operation->set_pj();
=20
-            /**=3D e_pj then do not increment sequence */
+            /*             * =3D e_pj then do not increment sequence */
             /* and e_pj is not null */
-            if ( strcmp($e_pj,$e_pj_suggest) =3D=3D 0 && strlen( trim($e=
_pj)) !=3D 0 )
-            {
+            if (strcmp($e_pj, $e_pj_suggest) =3D=3D 0 && strlen(trim($e_=
pj)) !=3D 0) {
                 $this->inc_seq_pj();
             }
=20
-            $this->db->exec_sql("update jrn set jr_internal=3D'".$intern=
al."' where ".
-                                " jr_grpt_id =3D ".$seq);
+            $this->db->exec_sql("update jrn set jr_internal=3D'" . $inte=
rnal . "' where " .
+                    " jr_grpt_id =3D " . $seq);
=20
             /* update quant_sold */
-            $this->db->exec_sql('update quant_sold set qs_internal =3D $=
1 where j_id in (select j_id from jrnx where j_grpt=3D$2)',
-                                array($internal,$seq));
+            $this->db->exec_sql('update quant_sold set qs_internal =3D $=
1 where j_id in (select j_id from jrnx where j_grpt=3D$2)', array($intern=
al, $seq));
=20
-            /* Save the attachment or generate doc*/
-            if ( isset ($_FILES['pj']))
-            {
-                if ( strlen(trim($_FILES['pj']['name'])) !=3D 0 )
+            /* Save the attachment or generate doc */
+            if (isset($_FILES['pj'])) {
+                if (strlen(trim($_FILES['pj']['name'])) !=3D 0)
                     $this->db->save_upload_document($seq);
                 else
-                    /* Generate an invoice and save it into the database=
 */
-                    if ( isset($_POST['gen_invoice']))
-                    {
-                        $file=3D$this->create_document($internal,$p_arra=
y);
-                        $this->doc=3D _('Document g=C3=A9n=C3=A9r=C3=A9'=
)."  : "."<br>";
-                        $this->doc.=3D'<A class=3D"line" HREF=3D"show_pj=
.php?'.dossier::get().'&jr_grpt_id=3D'.$seq.'&jrn=3D'.$this->id.'">'.$fil=
e.'</A>';
-                    }
+                /* Generate an invoice and save it into the database */
+                if (isset($_POST['gen_invoice'])) {
+                    $file =3D $this->create_document($internal, $p_array=
);
+                    $this->doc =3D _('Document g=C3=A9n=C3=A9r=C3=A9') .=
 "  : " . "<br>";
+                    $this->doc.=3D'<A class=3D"line" HREF=3D"show_pj.php=
?' . dossier::get() . '&jr_grpt_id=3D' . $seq . '&jrn=3D' . $this->id . '=
">' . $file . '</A>';
+                }
             }
             //----------------------------------------
             // Save the payer
             //----------------------------------------
-            if ( $e_mp !=3D 0 )
-            {
+            if ($e_mp !=3D 0) {
                 /* mp */
-                $mp=3Dnew Acc_Payment($this->db,$e_mp);
+                $mp =3D new Acc_Payment($this->db, $e_mp);
                 $mp->load();
=20
                 /* fiche */
-                $fqcode=3D${'e_mp_qcode_'.$e_mp};
+                $fqcode =3D ${'e_mp_qcode_' . $e_mp};
                 $acfiche =3D new Fiche($this->db);
                 $acfiche->get_by_qcode($fqcode);
=20
                 /* jrnx */
-                $acseq=3D$this->db->get_next_seq('s_grpt');
-                $acjrn=3Dnew Acc_Ledger($this->db,$mp->get_parameter('le=
dger_target'));
-                $acinternal=3D$acjrn->compute_internal_code($acseq);
+                $acseq =3D $this->db->get_next_seq('s_grpt');
+                $acjrn =3D new Acc_Ledger($this->db, $mp->get_parameter(=
'ledger_target'));
+                $acinternal =3D $acjrn->compute_internal_code($acseq);
=20
                 /* Insert paid by  */
-                $acc_pay=3Dnew Acc_Operation($this->db);
-                $acc_pay->date=3D$e_date;
+                $acc_pay =3D new Acc_Operation($this->db);
+                $acc_pay->date =3D $e_date;
                 /* get the account and explode if necessary */
-                $sposte=3D$acfiche->strAttribut(ATTR_DEF_ACCOUNT);
+                $sposte =3D $acfiche->strAttribut(ATTR_DEF_ACCOUNT);
                 // if 2 accounts, take only the debit one for customer
-                if ( strpos($sposte,',') !=3D 0 )
-                {
-                    $array=3Dexplode(',',$sposte);
-                    $poste_val=3D$array[0];
+                if (strpos($sposte, ',') !=3D 0) {
+                    $array =3D explode(',', $sposte);
+                    $poste_val =3D $array[0];
+                } else {
+                    $poste_val =3D $sposte;
                 }
-                else
-                {
-                    $poste_val=3D$sposte;
-                }
-                $famount=3Dbcsub($cust_amount,$acompte);
-                $acc_pay->poste=3D$poste_val;
-                $acc_pay->qcode=3D$fqcode;
-                $acc_pay->amount=3Dabs(round($famount,2));
-                $acc_pay->desc=3Dnull;
+                $famount =3D bcsub($cust_amount, $acompte);
+                $acc_pay->poste =3D $poste_val;
+                $acc_pay->qcode =3D $fqcode;
+                $acc_pay->amount =3D abs(round($famount, 2));
+                $acc_pay->desc =3D null;
=20
-                $acc_pay->grpt=3D$acseq;
-                $acc_pay->jrn=3D$mp->get_parameter('ledger_target');
-                $acc_pay->periode=3D$tperiode;
-                $acc_pay->type=3D($famount>=3D0)?'d':'c';
+                $acc_pay->grpt =3D $acseq;
+                $acc_pay->jrn =3D $mp->get_parameter('ledger_target');
+                $acc_pay->periode =3D $tperiode;
+                $acc_pay->type =3D ($famount >=3D 0) ? 'd' : 'c';
                 $acc_pay->insert_jrnx();
=20
                 /* Insert supplier  */
-                $acc_pay=3Dnew Acc_Operation($this->db);
-                $acc_pay->date=3D$e_date;
-                $acc_pay->poste=3D$poste;
-                $acc_pay->qcode=3D$e_client;
-                $acc_pay->amount=3Dabs(round($famount,2));
-                $acc_pay->desc=3Dnull;
-                $acc_pay->grpt=3D$acseq;
-                $acc_pay->jrn=3D$mp->get_parameter('ledger_target');
-                $acc_pay->periode=3D$tperiode;
-				$acc_pay->type=3D($famount>=3D0)?'c':'d';
-                $let_other=3D$acc_pay->insert_jrnx();
+                $acc_pay =3D new Acc_Operation($this->db);
+                $acc_pay->date =3D $e_date;
+                $acc_pay->poste =3D $poste;
+                $acc_pay->qcode =3D $e_client;
+                $acc_pay->amount =3D abs(round($famount, 2));
+                $acc_pay->desc =3D null;
+                $acc_pay->grpt =3D $acseq;
+                $acc_pay->jrn =3D $mp->get_parameter('ledger_target');
+                $acc_pay->periode =3D $tperiode;
+                $acc_pay->type =3D ($famount >=3D 0) ? 'c' : 'd';
+                $let_other =3D $acc_pay->insert_jrnx();
=20
                 /* insert into jrn */
-				$acc_pay->mt=3D$mt;
-                $acjrn->grpt_id=3D$acseq;
-				$acc_pay->desc=3D(!isset($e_comm_paiement) || strlen(trim($e_comm_pa=
iement)) =3D=3D 0) ?$e_comm:$e_comm_paiement;
-                $mp_jr_id=3D$acc_pay->insert_jrn();
+                $acc_pay->mt =3D $mt;
+                $acjrn->grpt_id =3D $acseq;
+                $acc_pay->desc =3D (!isset($e_comm_paiement) || strlen(t=
rim($e_comm_paiement)) =3D=3D 0) ? $e_comm : $e_comm_paiement;
+                $mp_jr_id =3D $acc_pay->insert_jrn();
                 $acjrn->update_internal_code($acinternal);
=20
-                $r1=3D$this->get_id($internal);
-                $r2=3D$this->get_id($acinternal);
+                $r1 =3D $this->get_id($internal);
+                $r2 =3D $this->get_id($acinternal);
=20
-		/*
-		 * add lettering
-		 */
-		$oletter=3Dnew Lettering($this->db);
-		$oletter->insert_couple($let_tiers,$let_other);
+                /*
+                 * add lettering
+                 */
+                $oletter =3D new Lettering($this->db);
+                $oletter->insert_couple($let_tiers, $let_other);
=20
=20
                 /* set the flag paid */
-                $Res=3D$this->db->exec_sql("update jrn set jr_rapt=3D'pa=
id' where jr_id=3D$1",array($r1));
+                $Res =3D $this->db->exec_sql("update jrn set jr_rapt=3D'=
paid' where jr_id=3D$1", array($r1));
=20
                 /* Reconcialiation */
-                $rec=3Dnew Acc_Reconciliation($this->db);
+                $rec =3D new Acc_Reconciliation($this->db);
                 $rec->set_jr_id($r1);
                 $rec->insert($r2);
=20
=20
-		/*
-		 * save also into quant_fin
-		 */
+                /*
+                 * save also into quant_fin
+                 */
=20
-		/* get ledger property */
-		$ledger=3Dnew Acc_Ledger_Fin($this->db,$acc_pay->jrn);
-		$prop=3D$ledger->get_propertie();
+                /* get ledger property */
+                $ledger =3D new Acc_Ledger_Fin($this->db, $acc_pay->jrn)=
;
+                $prop =3D $ledger->get_propertie();
=20
-		/* if ledger is FIN then insert into quant_fin */
-		if ( $prop['jrn_def_type'] =3D=3D 'FIN' )
-		  {
-		    $ledger->insert_quant_fin($acfiche->id,$mp_jr_id,$cust->id,bcmul($=
famount,1));
-		  }
-
+                /* if ledger is FIN then insert into quant_fin */
+                if ($prop['jrn_def_type'] =3D=3D 'FIN') {
+                    $ledger->insert_quant_fin($acfiche->id, $mp_jr_id, $=
cust->id, bcmul($famount, 1));
+                }
             }
-
-        }
-        catch (Exception $e)
-        {
-            echo '<span class=3D"error">'.
-            'Erreur dans l\'enregistrement '.
-            __FILE__.':'.__LINE__.' '.
+        } catch (Exception $e) {
+            echo '<span class=3D"error">' .
+            'Erreur dans l\'enregistrement ' .
+            __FILE__ . ':' . __LINE__ . ' ' .
             $e->getMessage();
             echo $e->getTrace();
=20
@@ -624,727 +578,661 @@
         return $internal;
     }
=20
-
-    /*!
-	 *@brief show the summary of the operation and propose to save it
-     *@param array contains normally $_POST. It proposes also to save
+    /* !
+     * @brief show the summary of the operation and propose to save it
+     * @param array contains normally $_POST. It proposes also to save
      * the Analytic accountancy
-	 *@param $p_summary false for the feedback, true to show the summary
-     *@return string
-	 *
+     * @param $p_summary false for the feedback, true to show the summar=
y
+     * @return string
+     *
      */
-    function confirm($p_array,$p_summary=3Dfalse)
-    {
+
+    function confirm($p_array, $p_summary =3D false) {
         global $g_parameter;
-        extract ($p_array);
+        extract($p_array);
=20
-		// don't need to verify for a summary
-        if ( ! $p_summary ) $this->verify($p_array) ;
-        $anc=3Dnull;
+        // don't need to verify for a summary
+        if (!$p_summary)
+            $this->verify($p_array);
+        $anc =3D null;
         // to show a select list for the analytic & VAT USE
         // if analytic is op (optionnel) there is a blank line
=20
         bcscale(4);
-        $client=3Dnew Fiche($this->db);
-        $client->get_by_qcode($e_client,true);
+        $client =3D new Fiche($this->db);
+        $client->get_by_qcode($e_client, true);
=20
-        $client_name=3D$client->getName().
-                     ' '.$client->strAttribut(ATTR_DEF_ADRESS).' '.
-                     $client->strAttribut(ATTR_DEF_CP).' '.
-                     $client->strAttribut(ATTR_DEF_CITY);
-        $lPeriode=3Dnew Periode($this->db);
-        if ($this->check_periode() =3D=3D true)
-        {
-            $lPeriode->p_id=3D$period;
-        }
-        else
-        {
+        $client_name =3D $client->getName() .
+                ' ' . $client->strAttribut(ATTR_DEF_ADRESS) . ' ' .
+                $client->strAttribut(ATTR_DEF_CP) . ' ' .
+                $client->strAttribut(ATTR_DEF_CITY);
+        $lPeriode =3D new Periode($this->db);
+        if ($this->check_periode() =3D=3D true) {
+            $lPeriode->p_id =3D $period;
+        } else {
             $lPeriode->find_periode($e_date);
         }
-        $date_limit=3D$lPeriode->get_date_limit();
-        $r=3D"";
-        $r.=3D"<fieldset>";
-        $r.=3D"<legend>"._('En-t=C3=AAte facture client')."  </legend>";
-		$r.=3D'<div id=3D"jrn_name_div">';
-		$r.=3D'<h2 class=3D"title"  id=3D"jrn_name" style=3D"display:inline">'=
 . $this->get_name() . '</h2>';
-		$r.=3D '</div>';
+        $date_limit =3D $lPeriode->get_date_limit();
+        $r =3D "";
+        $r.=3D'<div id=3D"jrn_name_div">';
+        $r.=3D'<h2   id=3D"jrn_name" style=3D"display:inline">' . $this-=
>get_name() . '</h2>';
+        $r.=3D '</div>';
+        $r.=3D'<div>';
         $r.=3D'<TABLE  width=3D"100%">';
         $r.=3D'<tr>';
-        $r.=3D'<td> '._('Date').' '.$e_date.'</td>';
-        $r.=3D'<td>'._('Echeance').' '.$e_ech.'</td>';
-        $r.=3D'<td> '._('P=C3=A9riode Comptable').' '.$date_limit['p_sta=
rt'].'-'.$date_limit['p_end'].'</td>';
+        $r.=3D'<td> ' . _('Date') . '</td><td> ' . hb($e_date) . '</td>'=
;
+        $r.=3D'</tr>';
         $r.=3D'<tr>';
-        $r.=3D'<td> '._('Journal').' '.h($this->get_name()).'</td>';
+        $r.=3D'<td>' . _('Echeance') . '</td><td> ' . hb($e_ech) . '</td=
>';
         $r.=3D'</tr>';
         $r.=3D'<tr>';
-        $r.=3D'<td colspan=3D"3"> '._('Libell=C3=A9').' '.h($e_comm).'</=
td><td>PJ Num:  '.h($e_pj).'</td>';
+        $r.=3D'<td> ' . _('P=C3=A9riode Comptable') . '</td><td> ' .hb( =
$date_limit['p_start'] . '-' . $date_limit['p_end']) . '</td>';
         $r.=3D'</tr>';
         $r.=3D'<tr>';
-        $r.=3D'<td colspan=3D"3"> '._('Client').' '.h($e_client.':'.$cli=
ent_name).'</td>';
+        $r.=3D'<td> ' . _('Journal') . '</td><td> ' . hb($this->get_name=
()) . '</td>';
         $r.=3D'</tr>';
+        $r.=3D'<tr>';
+        $r.=3D'<td> ' . _('Libell=C3=A9') . '</td><td> ' . hb($e_comm) .=
 '</td>';
+        $r.=3D'</tr>';
+        $r.=3D'<tr>';
+        $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'. hb($e_p=
j) . '</td>';
+        $r.=3D'</tr>';
+        $r.=3D'<tr>';
+        $r.=3D'<td> ' . _('Client') . '</td><td> ' . hb($e_client . ':' =
. $client_name) . '</td>';
+        $r.=3D'</tr>';
         $r.=3D'</table>';
-        $r.=3D'</fieldset>';
-        $r.=3D'<fieldset><legend>'._('D=C3=A9tail articles vendus').'</l=
egend>';
-        $r.=3D'<table width=3D"100%" border=3D"0">';
+        $r.=3D'<h2>' . _('D=C3=A9tail articles vendus') . '</h2>';
+        $r.=3D'<table class=3D"result" border=3D"0">';
         $r.=3D'<TR>';
-        $r.=3D"<th>"._('Code')."</th>";
-        $r.=3D"<th>"._('D=C3=A9nomination')."</th>";
-        $r.=3D"<th style=3D\"text-align:right\">"._('prix')."</th>";
-        $r.=3D"<th style=3D\"text-align:right\">"._('quantit=C3=A9')."</=
th>";
+        $r.=3D"<th>" . _('Code') . "</th>";
+        $r.=3D"<th>" . _('D=C3=A9nomination') . "</th>";
+        $r.=3D"<th style=3D\"text-align:right\">" . _('prix') . "</th>";
+        $r.=3D"<th style=3D\"text-align:right\">" . _('quantit=C3=A9') .=
 "</th>";
=20
=20
-        if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-        {
-			$r.=3D"<th style=3D\"text-align:right\">"._('tva')."</th>";
-            $r.=3D'<th style=3D"text-align:right"> '._('Montant TVA').'<=
/th>';
-            $r.=3D'<th style=3D"text-align:right">'._('Montant HTVA').'<=
/th>';
-            $r.=3D'<th style=3D"text-align:right">'._('Montant TVAC').'<=
/th>';
+        if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
+            $r.=3D"<th style=3D\"text-align:right\">" . _('tva') . "</th=
>";
+            $r.=3D'<th style=3D"text-align:right"> ' . _('Montant TVA') =
. '</th>';
+            $r.=3D'<th style=3D"text-align:right">' . _('Montant HTVA') =
. '</th>';
+            $r.=3D'<th style=3D"text-align:right">' . _('Montant TVAC') =
. '</th>';
+        } else {
+            $r.=3D'<th style=3D"text-align:right">' . _('Montant') . '</=
th>';
         }
-		else
-		{
-			$r.=3D'<th style=3D"text-align:right">'._('Montant').'</th>';
-		}
         /* if we use the AC */
-        if ($g_parameter->MY_ANALYTIC!=3D'nu')
-        {
-            $anc=3Dnew Anc_Plan($this->db);
-            $a_anc=3D$anc->get_list();
-            $x=3Dcount($a_anc);
+        if ($g_parameter->MY_ANALYTIC !=3D 'nu') {
+            $anc =3D new Anc_Plan($this->db);
+            $a_anc =3D $anc->get_list();
+            $x =3D count($a_anc);
             /* set the width of the col */
-            $r.=3D'<th colspan=3D"'.$x.'">'._('Compt. Analytique').'</th=
>';
+            $r.=3D'<th colspan=3D"' . $x . '">' . _('Compt. Analytique')=
 . '</th>';
=20
             /* add hidden variables pa[] to hold the value of pa_id */
             $r.=3DAnc_Plan::hidden($a_anc);
         }
         $r.=3D'</tr>';
-        $tot_amount=3D0.0;
-        $tot_tva=3D0.0;
-        for ($i =3D 0; $i < $nb_item;$i++)
-        {
-            if ( strlen(trim(${"e_march".$i})) =3D=3D 0 ) continue;
+        $tot_amount =3D 0.0;
+        $tot_tva =3D 0.0;
+        for ($i =3D 0; $i < $nb_item; $i++) {
+            if (strlen(trim(${"e_march" . $i})) =3D=3D 0)
+                continue;
=20
             /* retrieve information for card */
-            $fiche=3Dnew Fiche($this->db);
-            $fiche->get_by_qcode(${"e_march".$i});
-            if ( $g_parameter->MY_UPDLAB=3D=3D'Y')
-                $fiche_name=3Dh(${"e_march".$i."_label"});
+            $fiche =3D new Fiche($this->db);
+            $fiche->get_by_qcode(${"e_march" . $i});
+            if ($g_parameter->MY_UPDLAB =3D=3D 'Y')
+                $fiche_name =3D h(${"e_march" . $i . "_label"});
             else
-                $fiche_name=3D$fiche->strAttribut (ATTR_DEF_NAME);
-            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-            {
-                $oTva=3Dnew Acc_Tva($this->db);
-                $idx_tva=3D${"e_march".$i."_tva_id"};
+                $fiche_name =3D $fiche->strAttribut(ATTR_DEF_NAME);
+            if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
+                $oTva =3D new Acc_Tva($this->db);
+                $idx_tva =3D ${"e_march" . $i . "_tva_id"};
=20
-                $oTva->set_parameter('id',$idx_tva);
+                $oTva->set_parameter('id', $idx_tva);
                 $oTva->load();
             }
-            $op=3Dnew Acc_Compute();
-            $amount=3Dbcmul(${"e_march".$i."_price"},${'e_quant'.$i});
-            $op->set_parameter("amount",$amount);
-            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-            {
-                $op->set_parameter('amount_vat_rate',$oTva->get_paramete=
r('rate'));
+            $op =3D new Acc_Compute();
+            $amount =3D bcmul(${"e_march" . $i . "_price"}, ${'e_quant' =
. $i});
+            $op->set_parameter("amount", $amount);
+            if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
+                $op->set_parameter('amount_vat_rate', $oTva->get_paramet=
er('rate'));
                 $op->compute_vat();
-                $tva_computed=3D$op->get_parameter('amount_vat');
-                $tva_item=3D${"e_march".$i."_tva_amount"};
-                if (isset($tva[$idx_tva] ) )
+                $tva_computed =3D $op->get_parameter('amount_vat');
+                $tva_item =3D ${"e_march" . $i . "_tva_amount"};
+                if (isset($tva[$idx_tva]))
                     $tva[$idx_tva]+=3D$tva_item;
                 else
-                    $tva[$idx_tva]=3D$tva_item;
-                $tot_tva=3Dround(bcadd($tva_item,$tot_tva),2);
+                    $tva[$idx_tva] =3D $tva_item;
+                $tot_tva =3D round(bcadd($tva_item, $tot_tva), 2);
             }
-            $tot_amount=3Dround(bcadd($tot_amount,$amount),2);
+            $tot_amount =3D round(bcadd($tot_amount, $amount), 2);
=20
             $r.=3D'<tr>';
             $r.=3D'<td>';
-            $r.=3D${"e_march".$i};
+            $r.=3D${"e_march" . $i};
             $r.=3D'</td>';
-            $r.=3D'<TD style=3D"width:60%;border-bottom:1px dotted grey;=
">';
+            $r.=3D'<TD style=3D"border-bottom:1px dotted grey;">';
             $r.=3D$fiche_name;
             $r.=3D'</td>';
             $r.=3D'<td class=3D"num">';
-            $r.=3Dnbm(${"e_march".$i."_price"});
+            $r.=3Dnbm(${"e_march" . $i . "_price"});
             $r.=3D'</td>';
             $r.=3D'<td class=3D"num">';
-            $r.=3Dnbm(${"e_quant".$i});
+            $r.=3Dnbm(${"e_quant" . $i});
             $r.=3D'</td>';
-            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-            {
+            if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
                 $r.=3D'<td class=3D"num">';
                 $r.=3D$oTva->get_parameter('label');
                 $r.=3D'</td>';
=20
                 /* warning if tva_computed and given are not the
-                   same */
-                if ( bcsub($tva_item,$tva_computed) !=3D 0)
-                {
-					 $r.=3D'<td style=3D"background-color:red" class=3D"num">';
-					 $r.=3DHtmlInput::infobulle(28);
-                    $r.=3D'<a href=3D"#" class=3D"error" style=3D"displa=
y:inline" title=3D"'. _("Attention Diff=C3=A9rence entre TVA calcul=C3=A9=
e et donn=C3=A9e").'">'
-							.nbm($tva_item).'<a>';
+                  same */
+                if (bcsub($tva_item, $tva_computed) !=3D 0) {
+                    $r.=3D'<td style=3D"background-color:red" class=3D"n=
um">';
+                    $r.=3DHtmlInput::infobulle(28);
+                    $r.=3D'<a href=3D"#" class=3D"error" style=3D"displa=
y:inline" title=3D"' . _("Attention Diff=C3=A9rence entre TVA calcul=C3=A9=
e et donn=C3=A9e") . '">'
+                            . nbm($tva_item) . '<a>';
+                } else {
+                    $r.=3D'<td  class=3D"num">';
+                    $r.=3Dnbm($tva_item);
                 }
-				else{
-					 $r.=3D'<td  class=3D"num">';
-					$r.=3Dnbm($tva_item);
-				}
                 $r.=3D'</td>';
-				$r.=3D'<td class=3D"num">';
-				$r.=3Dnbm($amount);
-				$r.=3D'</td>';
-				$tot_row=3Dbcadd($tva_item,$amount);
-				$r.=3Dtd(nbm($tot_row),'class=3D"num"');
+                $r.=3D'<td class=3D"num">';
+                $r.=3Dnbm($amount);
+                $r.=3D'</td>';
+                $tot_row =3D bcadd($tva_item, $amount);
+                $r.=3Dtd(nbm($tot_row), 'class=3D"num"');
+            } else {
+                $r.=3D'<td class=3D"num">';
+                $r.=3Dnbm($amount);
+                $r.=3D'</td>';
             }
-			else
-			{
-				$r.=3D'<td class=3D"num">';
-				$r.=3Dnbm($amount);
-				$r.=3D'</td>';
-			}
-			// encode the pa
-            if ( $g_parameter->MY_ANALYTIC!=3D'nu') // use of AA
-            {
+            // encode the pa
+            if ($g_parameter->MY_ANALYTIC !=3D 'nu') { // use of AA
                 // show form
-                $anc_op=3Dnew Anc_Operation($this->db);
-                $null=3D($g_parameter->MY_ANALYTIC=3D=3D'op')?1:0;
+                $anc_op =3D new Anc_Operation($this->db);
+                $null =3D ($g_parameter->MY_ANALYTIC =3D=3D 'op') ? 1 : =
0;
                 $r.=3D'<td>';
-                $p_mode=3D($p_summary=3D=3Dfalse)?1:0;
-                $p_array['pa_id']=3D$a_anc;
+                $p_mode =3D ($p_summary =3D=3D false) ? 1 : 0;
+                $p_array['pa_id'] =3D $a_anc;
                 /* op is the operation it contains either a sequence or =
a jrnx.j_id */
-                $r.=3DHtmlInput::hidden('op[]=3D',$i);
-                $r.=3D$anc_op->display_form_plan($p_array,$null,$p_mode,=
$i,$amount);
+                $r.=3DHtmlInput::hidden('op[]=3D', $i);
+                $r.=3D$anc_op->display_form_plan($p_array, $null, $p_mod=
e, $i, $amount);
                 $r.=3D'</td>';
             }
=20
=20
             $r.=3D'</tr>';
+        } // end loop item
=20
-        }
=20
-
         $r.=3D'</table>';
-        if ( $g_parameter->MY_ANALYTIC!=3D'nu' && $p_summary ) // use of=
 AA
-            $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'V=C3=A9rifiez Imputation Analytique').'" onClick=3D"verify_ca(\'\');">';
-        $r.=3D'</fieldset>';
-        if (! $p_summary )
-		{
-			$r.=3D$this->extra_info();
-                         $r.=3D'<div style=3D"width:40%;position:float;f=
loat:right;text-align:right;padding-left:5%;padding-right:5%;color:blue;f=
ont-size:1.2em;font-weight:bold">';
-		}
-		else
-			$r.=3D'<div style=3D"width:60%;position:float;float:left;text-align:r=
ight;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-wei=
ght:bold">';
-        $r.=3D'<fieldset> <legend>Totaux</legend>';
-        $tot=3Dround(bcadd($tot_amount,$tot_tva),2);
-        $r.=3D'<div style=3D"width:40%;position:float;float:left;text-al=
ign:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;fon=
t-weight:bold">';
+        if ($g_parameter->MY_ANALYTIC !=3D 'nu' && ! $p_summary) // use =
of AA
+            $r.=3D'<input type=3D"button" class=3D"button" value=3D"' . =
_('V=C3=A9rifiez Imputation Analytique') . '" onClick=3D"verify_ca(\'\');=
">';
+        $r.=3D'<h2>Totaux</h2>';
+        $tot =3D round(bcadd($tot_amount, $tot_tva), 2);
         /* use VAT */
-        if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
-        {
-            $r.=3D'<br>Total HTVA';
-            foreach ($tva as $i=3D>$value)
-            {
-                $oTva->set_parameter('id',$i);
+        if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
+            $r.=3D'<table>';
+            $r.=3D'<tr><td>Total HTVA</td>';
+            $r.=3Dtd(hb(nbm($tot_amount) ),'class=3D"num"');
+            foreach ($tva as $i =3D> $value) {
+                $oTva->set_parameter('id', $i);
                 $oTva->load();
=20
-                $r.=3D'<br>  TVA =C3=A0 '.$oTva->get_parameter('label');
+                $r.=3D'<tr><td>  TVA ' . $oTva->get_parameter('label').'=
</td>';
+                $r.=3Dtd(hb(nbm($tva[$i])),'class=3D"num"');
             }
-            $r.=3D'<br>Total TVA';
-            $r.=3D'<br>Total TVAC';
+            $r.=3D'<tr>'.td(_('Total TVA')).td(hb(nbm($tot_tva)),'class=3D=
"num"');
+            $r.=3D'<tr>'.td(_('Total TVAC')).td(hb(nbm($tot)),'class=3D"=
num"');
+            $r.=3D'</table>';
+        } else {
+            $r.=3D'<br>Total '.nbm($tot);
         }
-        else
-        {
-            $r.=3D'<br>Total ';
+      =20
+        if (!$p_summary) {
+            $r.=3D$this->extra_info();
         }
-        $r.=3D'</div>';
+       =20
+    =20
=20
-        $r.=3D'<div style=3D"position:float;float:left;text-align:right;=
color:blue;font-size:1.2em;font-weight:bold">';
-        $r.=3D'<br><span id=3D"htva">'.nbm($tot_amount).'</span>';
-
-        if ($g_parameter->MY_TVA_USE =3D=3D 'Y' )
-        {
-            foreach ($tva as $i=3D>$value)
-            {
-	      $r.=3D'<br>'.nbm($tva[$i]);
-            }
-            $r.=3D'<br><span id=3D"tva">'.nbm($tot_tva).'</span>';
-	    $r.=3D'<br><span id=3D"tvac">'.nbm($tot).'</span>';
-        }
-        $r.=3D"</div>";
-
-
-
-        $r.=3D'</fieldset>';
-        $r.=3D"</div>";
-
         /*  Add hidden */
-        $r.=3DHtmlInput::hidden('e_client',$e_client);
-        $r.=3DHtmlInput::hidden('nb_item',$nb_item);
-        $r.=3DHtmlInput::hidden('p_jrn',$p_jrn);
-        $mt=3Dmicrotime(true);
-        $r.=3DHtmlInput::hidden('mt',$mt);
+        $r.=3DHtmlInput::hidden('e_client', $e_client);
+        $r.=3DHtmlInput::hidden('nb_item', $nb_item);
+        $r.=3DHtmlInput::hidden('p_jrn', $p_jrn);
+        $mt =3D microtime(true);
+        $r.=3DHtmlInput::hidden('mt', $mt);
=20
-        if ( isset($period))
-            $r.=3DHtmlInput::hidden('period',$period);
-        /*\todo comment les types hidden g=C3=A9rent ils des contenus av=
ec des quotes, double quote ou < > ??? */
-        $r.=3DHtmlInput::hidden('e_comm',$e_comm);
-        $r.=3DHtmlInput::hidden('e_date',$e_date);
-        $r.=3DHtmlInput::hidden('e_ech',$e_ech);
-        $r.=3DHtmlInput::hidden('e_pj',$e_pj);
-        $r.=3DHtmlInput::hidden('e_pj_suggest',$e_pj_suggest);
+        if (isset($period))
+            $r.=3DHtmlInput::hidden('period', $period);
+        /* \todo comment les types hidden g=C3=A9rent ils des contenus a=
vec des quotes, double quote ou < > ??? */
+        $r.=3DHtmlInput::hidden('e_comm', $e_comm);
+        $r.=3DHtmlInput::hidden('e_date', $e_date);
+        $r.=3DHtmlInput::hidden('e_ech', $e_ech);
+        $r.=3DHtmlInput::hidden('e_pj', $e_pj);
+        $r.=3DHtmlInput::hidden('e_pj_suggest', $e_pj_suggest);
=20
-        $e_mp=3D(isset($e_mp))?$e_mp:0;
-        $r.=3DHtmlInput::hidden('e_mp',$e_mp);
-		// Show the available repository
-		if ($g_parameter->MY_STOCK =3D=3D 'Y')
-		{
-			$sel =3D HtmlInput::select_stock($this->db, 'repo', 'W');
-			$sel->readOnly =3D $p_summary;
-			if ($p_summary =3D=3D true)
-				$sel->selected =3D $repo;
-			$r.=3D"<div style=3D\"clear:both\"></div>";
-			$r.=3D'<div style=3D"float:left"><h2 class=3D"info">D=C3=A9p=C3=B4t</=
h2>';
-			$r.=3D"<p> Dans le d=C3=A9p=C3=B4t : ";
-			$r.=3D$sel->input();
-			$r.=3D'</p>';
-			$r.=3D'</div>';
-		}
+        $e_mp =3D (isset($e_mp)) ? $e_mp : 0;
+        $r.=3DHtmlInput::hidden('e_mp', $e_mp);
+        // Show the available repository
+        if ($g_parameter->MY_STOCK =3D=3D 'Y') {
+            $sel =3D HtmlInput::select_stock($this->db, 'repo', 'W');
+            $sel->readOnly =3D $p_summary;
+            if ($p_summary =3D=3D true)
+                $sel->selected =3D $repo;
+            $r.=3D'<h2>D=C3=A9p=C3=B4t</h2>';
+            $r.=3D"<p> Dans le d=C3=A9p=C3=B4t : ";
+            $r.=3D$sel->input();
+            $r.=3D'</p>';
+        }
         /* Paid by */
         /* if the paymethod is not 0 and if a quick code is given */
-        if ( $e_mp!=3D0 && strlen (trim (${'e_mp_qcode_'.$e_mp})) !=3D 0=
 )
-        {
-            $r.=3DHtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.=
$e_mp});
-            $r.=3DHtmlInput::hidden('acompte',$acompte);
-			$r.=3DHtmlInput::hidden('e_comm_paiement',$e_comm_paiement);
+        if ($e_mp !=3D 0 && strlen(trim(${'e_mp_qcode_' . $e_mp})) !=3D =
0) {
+            $r.=3DHtmlInput::hidden('e_mp_qcode_' . $e_mp, ${'e_mp_qcode=
_' . $e_mp});
+            $r.=3DHtmlInput::hidden('acompte', $acompte);
+            $r.=3DHtmlInput::hidden('e_comm_paiement', $e_comm_paiement)=
;
             /* needed for generating a invoice */
-            $r.=3DHtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp}=
);
+            $r.=3DHtmlInput::hidden('qcode_benef', ${'e_mp_qcode_' . $e_=
mp});
=20
-			$fname=3Dnew Fiche($this->db);
-			$fname->get_by_qcode(${'e_mp_qcode_'.$e_mp});
-			$r.=3D"<div style=3D\"clear:both\"></div>";
-			$r.=3D'<div style=3D"float:left"><h2 class=3D"info">'."Pay=C3=A9 par =
".${'e_mp_qcode_'.$e_mp}.
-				   " ".$fname->getName().'</H2> '.'<p>'._('D=C3=A9duction acompte ')=
.h($acompte).'</p>'.
-					_('Libell=C3=A9 :' ).h($e_comm_paiement).'</div>';
+            $fname =3D new Fiche($this->db);
+            $fname->get_by_qcode(${'e_mp_qcode_' . $e_mp});
+            $r.=3D'<h2>' . "Pay=C3=A9 par " . ${'e_mp_qcode_' . $e_mp} .
+                    " " . $fname->getName() . '</H2> ' . '<p>' . _('D=C3=
=A9duction acompte ') . h($acompte) . '</p>' .
+                    _('Libell=C3=A9 :') . h($e_comm_paiement) ;
             $r.=3D'<br>';
         }
=20
-        $r.=3DHtmlInput::hidden('jrn_type',$jrn_type);
-        for ($i=3D0;$i < $nb_item;$i++)
-        {
-            $r.=3DHtmlInput::hidden("e_march".$i,${"e_march".$i});
-            if (isset (${"e_march".$i."_label"})) $r.=3DHtmlInput::hidde=
n("e_march".$i."_label",${"e_march".$i."_label"});
-            $r.=3DHtmlInput::hidden("e_march".$i."_price",${"e_march".$i=
."_price"});
-            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-            {
-                $r.=3DHtmlInput::hidden("e_march".$i."_tva_id",${"e_marc=
h".$i."_tva_id"});
-                $r.=3DHtmlInput::hidden("e_march".$i."_tva_amount",${"e_=
march".$i."_tva_amount"});
+        $r.=3DHtmlInput::hidden('jrn_type', $jrn_type);
+        for ($i =3D 0; $i < $nb_item; $i++) {
+            $r.=3DHtmlInput::hidden("e_march" . $i, ${"e_march" . $i});
+            if (isset(${"e_march" . $i . "_label"}))
+                $r.=3DHtmlInput::hidden("e_march" . $i . "_label", ${"e_=
march" . $i . "_label"});
+            $r.=3DHtmlInput::hidden("e_march" . $i . "_price", ${"e_marc=
h" . $i . "_price"});
+            if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
+                $r.=3DHtmlInput::hidden("e_march" . $i . "_tva_id", ${"e=
_march" . $i . "_tva_id"});
+                $r.=3DHtmlInput::hidden("e_march" . $i . "_tva_amount", =
${"e_march" . $i . "_tva_amount"});
             }
-            $r.=3DHtmlInput::hidden("e_quant".$i,${"e_quant".$i});
+            $r.=3DHtmlInput::hidden("e_quant" . $i, ${"e_quant" . $i});
         }
-
+           $r.=3D"</div>";
         return $r;
     }
-    /*!\brief the function extra info allows to
+
+    /* !\brief the function extra info allows to
      * - add a attachment
      * - generate an invoice
      * - insert extra info
-     *\return string
+     * \return string
      */
-    public function extra_info()
-    {
-        $r=3D"";
-        $r.=3D'<div style=3D"position:float;float:left;width:50%;text-al=
ign:right;line-height:3em;">';
-        $r.=3D'<fieldset> <legend> Facturation</legend>';
+
+    public function extra_info() {
+        $r =3D "";
+        $r.=3D'<h2> Facturation</h2>';
         // check for upload piece
-        $file=3Dnew IFile();
-        $file->table=3D0;
+        $file =3D new IFile();
+        $file->table =3D 0;
         $r.=3D_("Ajoutez une pi=C3=A8ce justificative ");
-        $r.=3D$file->input("pj","");
+        $r.=3D$file->input("pj", "");
=20
-        if ( $this->db->count_sql("select md_id,md_name from document_mo=
dele where md_affect=3D'VEN'") > 0 )
-        {
+        if ($this->db->count_sql("select md_id,md_name from document_mod=
ele where md_affect=3D'VEN'") > 0) {
=20
=20
-            $r.=3D_('ou g=C3=A9n=C3=A9rer une facture').' <input type=3D=
"checkbox" name=3D"gen_invoice" CHECKED>';
+            $r.=3D_('ou g=C3=A9n=C3=A9rer une facture') . ' <input type=3D=
"checkbox" name=3D"gen_invoice" CHECKED>';
             // We propose to generate  the invoice and some template
-            $doc_gen=3Dnew ISelect();
-            $doc_gen->name=3D"gen_doc";
-            $doc_gen->value=3D$this->db->make_array(
-                                "select md_id,md_name ".
-                                " from document_modele where md_affect=3D=
'VEN'");
-            $r.=3D$doc_gen->input().'<br>';
+            $doc_gen =3D new ISelect();
+            $doc_gen->name =3D "gen_doc";
+            $doc_gen->value =3D $this->db->make_array(
+                    "select md_id,md_name " .
+                    " from document_modele where md_affect=3D'VEN'");
+            $r.=3D$doc_gen->input() . '<br>';
         }
         $r.=3D'<br>';
-        $obj=3Dnew IText();
-        $r.=3D_('Numero de bon de commande : ').$obj->input('bon_comm').=
'<br>';
-        $r.=3D_('Autre information : ').$obj->input('other_info').'<br>'=
;
+        $obj =3D new IText();
+        $r.=3D_('Numero de bon de commande : ') . $obj->input('bon_comm'=
) . '<br>';
+        $r.=3D_('Autre information : ') . $obj->input('other_info') . '<=
br>';
=20
-        $r.=3D"</fieldset>";
-        $r.=3D'</div>';
         return $r;
     }
=20
-
-    /*!\brief update the payment
+    /* !\brief update the payment
      */
-    function show_unpaid()
-    {
+
+    function show_unpaid() {
         // Show list of unpaid sell
         // Date - date of payment - Customer - amount
         // Nav. bar
-        $step=3D$_SESSION['g_pagesize'];
-        $page=3D(isset($_GET['offset']))?$_GET['page']:1;
-        $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
+        $step =3D $_SESSION['g_pagesize'];
+        $page =3D (isset($_GET['offset'])) ? $_GET['page'] : 1;
+        $offset =3D (isset($_GET['offset'])) ? $_GET['offset'] : 0;
=20
=20
-        $sql=3DSQL_LIST_UNPAID_INVOICE_DATE_LIMIT." and jr_def_id=3D".$t=
his->id ;
-        list($max_line,$list)=3DListJrn($this->db,$sql,null,$offset,1);
-        $sql=3DSQL_LIST_UNPAID_INVOICE." and jr_def_id=3D".$this->id ;
-        list($max_line2,$list2)=3DListJrn($this->db,$sql,null,$offset,1)=
;
+        $sql =3D SQL_LIST_UNPAID_INVOICE_DATE_LIMIT . " and jr_def_id=3D=
" . $this->id;
+        list($max_line, $list) =3D ListJrn($this->db, $sql, null, $offse=
t, 1);
+        $sql =3D SQL_LIST_UNPAID_INVOICE . " and jr_def_id=3D" . $this->=
id;
+        list($max_line2, $list2) =3D ListJrn($this->db, $sql, null, $off=
set, 1);
=20
         // Get the max line
-        $m=3D($max_line2>$max_line)?$max_line2:$max_line;
-        $bar2=3Dnavigation_bar($offset,$m,$step,$page);
+        $m =3D ($max_line2 > $max_line) ? $max_line2 : $max_line;
+        $bar2 =3D navigation_bar($offset, $m, $step, $page);
=20
         echo $bar2;
-        echo '<h2 class=3D"info"> '._('Echeance d=C3=A9pass=C3=A9e').' <=
/h2>';
+        echo '<h2 class=3D"info"> ' . _('Echeance d=C3=A9pass=C3=A9e') .=
 ' </h2>';
         echo $list;
-        echo  '<h2 class=3D"info"> '._('Non Pay=C3=A9e').' </h2>';
+        echo '<h2 class=3D"info"> ' . _('Non Pay=C3=A9e') . ' </h2>';
         echo $list2;
         echo $bar2;
         // Add hidden parameter
-        $hid=3Dnew IHidden();
+        $hid =3D new IHidden();
=20
         echo '<hr>';
=20
-        if ( $m !=3D 0 )
-            echo HtmlInput::submit('paid',_('Mise =C3=A0 jour paiement')=
);
+        if ($m !=3D 0)
+            echo HtmlInput::submit('paid', _('Mise =C3=A0 jour paiement'=
));
+    }
=20
+    /* !\brief display the form for entering data for invoice,
+     * \param $p_array is null or you can put the predef operation or th=
e $_POST
+     *
+     * \return HTML string
+     */
=20
-    }
-    /*!\brief display the form for entering data for invoice,
-    *\param $p_array is null or you can put the predef operation or the =
$_POST
-    *
-    *\return HTML string
-    */
-    function input($p_array=3Dnull,$p_readonly=3D0)
-    {
-        global $g_parameter,$g_user;
-        if ( $p_array !=3D null ) extract($p_array);
+    function input($p_array =3D null, $p_readonly =3D 0) {
+        global $g_parameter, $g_user;
+        if ($p_array !=3D null)
+            extract($p_array);
=20
-        $flag_tva=3D$g_parameter->MY_TVA_USE;
+        $flag_tva =3D $g_parameter->MY_TVA_USE;
         /* Add button */
-        $f_add_button=3Dnew IButton('add_card');
-		$f_add_button->tabindex=3D-1;
-        $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche');
-        $f_add_button->set_attribute('ipopup','ipop_newcard');
-        $f_add_button->set_attribute('jrn',$this->id);
-        $f_add_button->javascript=3D"this.jrn=3D\$('p_jrn').value; selec=
t_card_type(this);";
+        $f_add_button =3D new IButton('add_card');
+        $f_add_button->tabindex =3D -1;
+        $f_add_button->label =3D _('Cr=C3=A9er une nouvelle fiche');
+        $f_add_button->set_attribute('ipopup', 'ipop_newcard');
+        $f_add_button->set_attribute('jrn', $this->id);
+        $f_add_button->javascript =3D "this.jrn=3D\$('p_jrn').value; sel=
ect_card_type(this);";
=20
-        $f_add_button2=3Dnew IButton('add_card2');
-		$f_add_button2->tabindex=3D-1;
-        $f_add_button2->label=3D_('Cr=C3=A9er une nouvelle fiche');
-        $f_add_button2->set_attribute('ipopup','ipop_newcard');
-        $f_add_button2->set_attribute('filter',$this->get_all_fiche_def =
());
+        $f_add_button2 =3D new IButton('add_card2');
+        $f_add_button2->tabindex =3D -1;
+        $f_add_button2->label =3D _('Cr=C3=A9er une nouvelle fiche');
+        $f_add_button2->set_attribute('ipopup', 'ipop_newcard');
+        $f_add_button2->set_attribute('filter', $this->get_all_fiche_def=
());
         //    $f_add_button2->set_attribute('jrn',$this->id);
-        $f_add_button2->javascript=3D" this.jrn=3D\$('p_jrn').value;sele=
ct_card_type(this);";
+        $f_add_button2->javascript =3D " this.jrn=3D\$('p_jrn').value;se=
lect_card_type(this);";
=20
-		$str_add_button=3D"";
-		$str_add_button2=3D"";
-		if ($g_user->check_action(FICADD)=3D=3D1)
-		{
-			$str_add_button=3D$f_add_button->input();
-			$str_add_button2=3D$f_add_button2->input();
-		}
+        $str_add_button =3D "";
+        $str_add_button2 =3D "";
+        if ($g_user->check_action(FICADD) =3D=3D 1) {
+            $str_add_button =3D $f_add_button->input();
+            $str_add_button2 =3D $f_add_button2->input();
+        }
         // The first day of the periode
-        $oPeriode=3Dnew Periode($this->db);
-        list ($l_date_start,$l_date_end)=3D$oPeriode->get_date_limit($g_=
user->get_periode());
-        if (  $g_parameter->MY_DATE_SUGGEST=3D=3D'Y' )
-            $op_date=3D( ! isset($e_date) ) ?$l_date_start:$e_date;
+        $oPeriode =3D new Periode($this->db);
+        list ($l_date_start, $l_date_end) =3D $oPeriode->get_date_limit(=
$g_user->get_periode());
+        if ($g_parameter->MY_DATE_SUGGEST =3D=3D 'Y')
+            $op_date =3D (!isset($e_date) ) ? $l_date_start : $e_date;
         else
-            $op_date=3D( ! isset($e_date) ) ?'':$e_date;
+            $op_date =3D (!isset($e_date) ) ? '' : $e_date;
=20
=20
-        $e_ech=3D(isset($e_ech))?$e_ech:"";
-        $e_comm=3D(isset($e_comm))?$e_comm:"";
+        $e_ech =3D (isset($e_ech)) ? $e_ech : "";
+        $e_comm =3D (isset($e_comm)) ? $e_comm : "";
=20
-        $r=3D'';
+        $r =3D '';
         $r.=3Ddossier::hidden();
-        $f_legend=3D_('En-t=C3=AAte facture client');
+        $f_legend =3D _('Client');
=20
-        $Echeance=3Dnew IDate();
+        $Echeance =3D new IDate();
         $Echeance->setReadOnly(false);
=20
-        $Echeance->tabindex=3D2;
-        $label=3DHtmlInput::infobulle(4);
-        $f_echeance=3D$Echeance->input('e_ech',$e_ech,_('Ech=C3=A9ance')=
.$label);
-        $Date=3Dnew IDate();
+        $Echeance->tabindex =3D 2;
+        $label =3D HtmlInput::infobulle(4);
+        $f_echeance =3D $Echeance->input('e_ech', $e_ech, _('Ech=C3=A9an=
ce') . $label);
+        $Date =3D new IDate();
         $Date->setReadOnly(false);
=20
-        $f_date=3D$Date->input("e_date",$op_date);
+        $f_date =3D $Date->input("e_date", $op_date);
=20
-        $f_periode=3D'';
+        $f_periode =3D '';
         // Periode
         //--
-        if ($this->check_periode() =3D=3D true)
-        {
-            $l_user_per=3D$g_user->get_periode();
-            $def=3D(isset($periode))?$periode:$l_user_per;
+        if ($this->check_periode() =3D=3D true) {
+            $l_user_per =3D $g_user->get_periode();
+            $def =3D (isset($periode)) ? $periode : $l_user_per;
=20
-            $period=3Dnew IPeriod("period");
-            $period->user=3D$g_user;
-            $period->cn=3D$this->db;
-            $period->value=3D$def;
-            $period->type=3DOPEN;
-            try
-            {
-                $l_form_per=3D$period->input();
-            }
-            catch (Exception $e)
-            {
-                if ($e->getCode() =3D=3D 1 )
-                {
+            $period =3D new IPeriod("period");
+            $period->user =3D $g_user;
+            $period->cn =3D $this->db;
+            $period->value =3D $def;
+            $period->type =3D OPEN;
+            try {
+                $l_form_per =3D $period->input();
+            } catch (Exception $e) {
+                if ($e->getCode() =3D=3D 1) {
                     echo _("Aucune p=C3=A9riode ouverte");
                     exit();
                 }
             }
-            $label=3DHtmlInput::infobulle(3);
-            $f_periode=3D_("P=C3=A9riode comptable")." $label ".$l_form_=
per;
+            $label =3D HtmlInput::infobulle(3);
+            $f_periode =3D '<td>' . _("P=C3=A9riode comptable") . "</td>=
 <td> $label " . $l_form_per . '</td>';
         }
         /* if we suggest the next pj, then we need a javascript */
-        $add_js=3D"";
-        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
-        {
-            $add_js=3D"update_pj();";
+        $add_js =3D "";
+        if ($g_parameter->MY_PJ_SUGGEST =3D=3D 'Y') {
+            $add_js =3D "update_pj();";
         }
-		if ($g_parameter->MY_DATE_SUGGEST =3D=3D 'Y')
-		{
-			$add_js.=3D'get_last_date();';
-		}
-		$add_js.=3D'update_name();';
-		$add_js.=3D'update_pay_method();';
-		$add_js.=3D'update_row("sold_item");';
+        if ($g_parameter->MY_DATE_SUGGEST =3D=3D 'Y') {
+            $add_js.=3D'get_last_date();';
+        }
+        $add_js.=3D'update_name();';
+        $add_js.=3D'update_pay_method();';
+        $add_js.=3D'update_row("sold_item");';
=20
-        $wLedger=3D$this->select_ledger('VEN',2);
-        if ( $wLedger =3D=3D null )
+        $wLedger =3D $this->select_ledger('VEN', 2);
+        if ($wLedger =3D=3D null)
             exit(_('Pas de journal disponible'));
-        $wLedger->table=3D1;
-        $wLedger->javascript=3D"onChange=3D'update_predef(\"ven\",\"f\")=
;$add_js'";
-        $wLedger->label=3D" Journal ".HtmlInput::infobulle(2) ;
+        $wLedger->table =3D 1;
+        $wLedger->javascript =3D "onChange=3D'update_predef(\"ven\",\"f\=
");$add_js'";
+        $wLedger->label =3D " Journal " . HtmlInput::infobulle(2);
=20
-        $f_jrn=3D$wLedger->input();
+        $f_jrn =3D $wLedger->input();
=20
-        $Commentaire=3Dnew IText();
-        $Commentaire->table=3D0;
+        $Commentaire =3D new IText();
+        $Commentaire->table =3D 0;
         $Commentaire->setReadOnly(false);
-        $Commentaire->size=3D60;
-        $Commentaire->tabindex=3D3;
+        $Commentaire->size =3D 60;
+        $Commentaire->tabindex =3D 3;
=20
-        $label=3DHtmlInput::infobulle(1) ;
+        $label =3D HtmlInput::infobulle(1);
=20
-        $f_desc=3D$label.$Commentaire->input("e_comm",h($e_comm));
+        $f_desc =3D $Commentaire->input("e_comm", h($e_comm)) . $label;
         // PJ
         //--
         /* suggest PJ ? */
-        $default_pj=3D'';
-        if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y')
-        {
-            $default_pj=3D$this->guess_pj();
+        $default_pj =3D '';
+        if ($g_parameter->MY_PJ_SUGGEST =3D=3D 'Y') {
+            $default_pj =3D $this->guess_pj();
         }
=20
-        $pj=3Dnew IText();
+        $pj =3D new IText();
=20
-        $pj->table=3D0;
-        $pj->name=3D"e_pj";
-        $pj->size=3D10;
-        $pj->value=3D(isset($e_pj))?$e_pj:$default_pj;
-        $f_pj=3D$pj->input().HtmlInput::hidden('e_pj_suggest',$default_p=
j);
+        $pj->table =3D 0;
+        $pj->name =3D "e_pj";
+        $pj->size =3D 10;
+        $pj->value =3D (isset($e_pj)) ? $e_pj : $default_pj;
+        $f_pj =3D $pj->input() . HtmlInput::hidden('e_pj_suggest', $defa=
ult_pj);
         // Display the customer
         //--
-        $fiche=3D'deb';
+        $fiche =3D 'deb';
=20
         // Save old value and set a new one
         //--
-        $e_client=3D( isset ($e_client) )?$e_client:"";
-        $e_client_label=3D"&nbsp;";//str_pad("",100,".");
-
-
+        $e_client =3D ( isset($e_client) ) ? $e_client : "";
+        $e_client_label =3D "&nbsp;"; //str_pad("",100,".");
         // retrieve e_client_label
         //--
=20
-        if ( strlen(trim($e_client)) !=3D  0)
-        {
-            $fClient=3Dnew Fiche($this->db);
+        if (strlen(trim($e_client)) !=3D 0) {
+            $fClient =3D new Fiche($this->db);
             $fClient->get_by_qcode($e_client);
-            $e_client_label=3D$fClient->strAttribut(ATTR_DEF_NAME).' '.
-                            ' Adresse : '.$fClient->strAttribut(ATTR_DEF=
_ADRESS).' '.
-                            $fClient->strAttribut(ATTR_DEF_CP).' '.
-                            $fClient->strAttribut(ATTR_DEF_CITY).' ';
-
-
+            $e_client_label =3D $fClient->strAttribut(ATTR_DEF_NAME) . '=
 ' .
+                    ' Adresse : ' . $fClient->strAttribut(ATTR_DEF_ADRES=
S) . ' ' .
+                    $fClient->strAttribut(ATTR_DEF_CP) . ' ' .
+                    $fClient->strAttribut(ATTR_DEF_CITY) . ' ';
         }
=20
-        $W1=3Dnew ICard();
-        $W1->label=3D"Client ".HtmlInput::infobulle(0) ;
-        $W1->name=3D"e_client";
-        $W1->tabindex=3D3;
-        $W1->value=3D$e_client;
-        $W1->table=3D0;
+        $W1 =3D new ICard();
+        $W1->label =3D "Client " . HtmlInput::infobulle(0);
+        $W1->name =3D "e_client";
+        $W1->tabindex =3D 3;
+        $W1->value =3D $e_client;
+        $W1->table =3D 0;
         $W1->set_dblclick("fill_ipopcard(this);");
-        $W1->set_attribute('ipopup','ipopcard');
+        $W1->set_attribute('ipopup', 'ipopcard');
=20
         // name of the field to update with the name of the card
-        $W1->set_attribute('label','e_client_label');
+        $W1->set_attribute('label', 'e_client_label');
         // name of the field to update with the name of the card
-        $W1->set_attribute('typecard','deb');
+        $W1->set_attribute('typecard', 'deb');
=20
         // Add the callback function to filter the card on the jrn
         $W1->set_callback('filter_card');
         $W1->set_function('fill_data');
-        $W1->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\=
');" ',
-                                $W1->name);
-        $f_client_qcode=3D$W1->input();
-        $client_label=3Dnew ISpan();
-        $client_label->table=3D0;
-        $f_client=3D$client_label->input("e_client_label",$e_client_labe=
l);
-        $f_client_bt=3D$W1->search();
+        $W1->javascript =3D sprintf(' onchange=3D"fill_data_onchange(\'%=
s\');" ', $W1->name);
+        $f_client_qcode =3D $W1->input();
+        $client_label =3D new ISpan();
+        $client_label->table =3D 0;
+        $f_client =3D $client_label->input("e_client_label", $e_client_l=
abel);
+        $f_client_bt =3D $W1->search();
=20
=20
         // Record the current number of article
-        $Hid=3Dnew IHidden();
-        $p_article=3D ( isset ($nb_item))?$nb_item:$this->get_min_row();
-        $r.=3D$Hid->input("nb_item",$p_article);
-        $max=3D($p_article < $this->get_min_row())?$this->get_min_row():=
$p_article;
+        $Hid =3D new IHidden();
+        $p_article =3D ( isset($nb_item)) ? $nb_item : $this->get_min_ro=
w();
+        $r.=3D$Hid->input("nb_item", $p_article);
+        $max =3D ($p_article < $this->get_min_row()) ? $this->get_min_ro=
w() : $p_article;
=20
=20
-        $f_legend_detail=3D_("D=C3=A9tail articles vendus");
+        $f_legend_detail =3D _("D=C3=A9tail articles vendus");
=20
         // For each article
         //--
-        for ($i=3D0;$i< $max;$i++)
-        {
+        for ($i =3D 0; $i < $max; $i++) {
             // Code id, price & vat code
             //--
-            $march=3D(isset(${"e_march$i"}))?${"e_march$i"}:""
-                   ;
-            $march_price=3D(isset(${"e_march".$i."_price"}))?${"e_march"=
.$i."_price"}:""
-                         ;
-            if ( $flag_tva=3D=3D'Y')
-            {
-                $march_tva_id=3D(isset(${"e_march$i"."_tva_id"}))?${"e_m=
arch$i"."_tva_id"}:"";
-                $march_tva_amount=3D(isset(${"e_march$i"."_tva_amount"})=
)?${"e_march$i"."_tva_amount"}:"";
+            $march =3D (isset(${"e_march$i"})) ? ${"e_march$i"} : ""
+            ;
+            $march_price =3D (isset(${"e_march" . $i . "_price"})) ? ${"=
e_march" . $i . "_price"} : ""
+            ;
+            if ($flag_tva =3D=3D 'Y') {
+                $march_tva_id =3D (isset(${"e_march$i" . "_tva_id"})) ? =
${"e_march$i" . "_tva_id"} : "";
+                $march_tva_amount =3D (isset(${"e_march$i" . "_tva_amoun=
t"})) ? ${"e_march$i" . "_tva_amount"} : "";
             }
-            $march_label=3D(isset(${"e_march".$i."_label"}))?${"e_march"=
.$i."_label"}:"";
+            $march_label =3D (isset(${"e_march" . $i . "_label"})) ? ${"=
e_march" . $i . "_label"} : "";
=20
             // retrieve the tva label and name
             //--
-            if ( strlen(trim($march))!=3D0 && strlen(trim($march_label))=
=3D=3D0)
-            {
-                $fMarch=3Dnew Fiche($this->db);
+            if (strlen(trim($march)) !=3D 0 && strlen(trim($march_label)=
) =3D=3D 0) {
+                $fMarch =3D new Fiche($this->db);
                 $fMarch->get_by_qcode($march);
-                $march_label=3D$fMarch->strAttribut(ATTR_DEF_NAME);
-                if ( $flag_tva=3D=3D'Y')
-                {
-                    if ( ! (isset(${"e_march$i"."_tva_id"})))
-                        $march_tva_id=3D$fMarch->strAttribut(ATTR_DEF_TV=
A);
+                $march_label =3D $fMarch->strAttribut(ATTR_DEF_NAME);
+                if ($flag_tva =3D=3D 'Y') {
+                    if (!(isset(${"e_march$i" . "_tva_id"})))
+                        $march_tva_id =3D $fMarch->strAttribut(ATTR_DEF_=
TVA);
                 }
             }
             // Show input
             //--
-            $W1=3Dnew ICard();
-            $W1->label=3D"";
-            $W1->name=3D"e_march".$i;
-            $W1->value=3D$march;
-            $W1->table=3D1;
-            $W1->set_attribute('typecard','cred');
+            $W1 =3D new ICard();
+            $W1->label =3D "";
+            $W1->name =3D "e_march" . $i;
+            $W1->value =3D $march;
+            $W1->table =3D 1;
+            $W1->set_attribute('typecard', 'cred');
             $W1->set_dblclick("fill_ipopcard(this);");
-            $W1->set_attribute('ipopup','ipopcard');
+            $W1->set_attribute('ipopup', 'ipopcard');
=20
             // name of the field to update with the name of the card
-            $W1->set_attribute('label','e_march'.$i.'_label');
+            $W1->set_attribute('label', 'e_march' . $i . '_label');
             // name of the field with the price
-            $W1->set_attribute('price','e_march'.$i.'_price');
+            $W1->set_attribute('price', 'e_march' . $i . '_price');
             // name of the field with the TVA_ID
-            $W1->set_attribute('tvaid','e_march'.$i.'_tva_id');
+            $W1->set_attribute('tvaid', 'e_march' . $i . '_tva_id');
             // Add the callback function to filter the card on the jrn
             $W1->set_callback('filter_card');
             $W1->set_function('fill_data');
-            $W1->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\=
'%s\');" ',
-                                    $W1->name);
+            $W1->javascript =3D sprintf(' onchange=3D"fill_data_onchange=
(\'%s\');" ', $W1->name);
=20
-            $W1->readonly=3Dfalse;
+            $W1->readonly =3D false;
=20
-            $array[$i]['quick_code']=3D$W1->input();
-            $array[$i]['bt']=3D$W1->search();
+            $array[$i]['quick_code'] =3D $W1->input();
+            $array[$i]['bt'] =3D $W1->search();
             // For computing we need some hidden field for holding the v=
alue
-            $array[$i]['hidden']=3D'';
-            if ( $flag_tva=3D=3D'Y') $array[$i]['hidden'].=3DHtmlInput::=
hidden('tva_march'.$i,0);
+            $array[$i]['hidden'] =3D '';
+            if ($flag_tva =3D=3D 'Y')
+                $array[$i]['hidden'].=3DHtmlInput::hidden('tva_march' . =
$i, 0);
=20
-            $htva=3Dnew INum('htva_march'.$i);
-            $htva->readOnly=3D1;
-            $htva->value=3D0;
-            $array[$i]['htva']=3D$htva->input();
+            $htva =3D new INum('htva_march' . $i);
+            $htva->readOnly =3D 1;
+            $htva->value =3D 0;
+            $array[$i]['htva'] =3D $htva->input();
=20
-            if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-                $tvac=3Dnew INum('tvac_march'.$i);
+            if ($g_parameter->MY_TVA_USE =3D=3D 'Y')
+                $tvac =3D new INum('tvac_march' . $i);
             else
-                $tvac=3Dnew IHidden('tvac_march'.$i);
+                $tvac =3D new IHidden('tvac_march' . $i);
=20
-            $tvac->readOnly=3D1;
-            $tvac->value=3D0;
-            $array[$i]['tvac']=3D$tvac->input();
+            $tvac->readOnly =3D 1;
+            $tvac->value =3D 0;
+            $array[$i]['tvac'] =3D $tvac->input();
=20
-            if ( $g_parameter->MY_UPDLAB =3D=3D 'Y')
-            {
-                $Span=3Dnew IText("e_march".$i."_label");
+            if ($g_parameter->MY_UPDLAB =3D=3D 'Y') {
+                $Span =3D new IText("e_march" . $i . "_label");
=20
-                $Span->css_size=3D"100%";
-            } else
-            {
-                $Span=3Dnew ISpan("e_march".$i."_label");
+                $Span->css_size =3D "100%";
+            } else {
+                $Span =3D new ISpan("e_march" . $i . "_label");
             }
-            $Span->value=3D$march_label;
+            $Span->value =3D $march_label;
             $Span->setReadOnly(false);
             // card's name, price
             //--
-            $array[$i]['denom']=3D$Span->input("e_march".$i."_label",$ma=
rch_label);
+            $array[$i]['denom'] =3D $Span->input("e_march" . $i . "_labe=
l", $march_label);
             // price
-            $Price=3Dnew INum();
+            $Price =3D new INum();
             $Price->setReadOnly(false);
-            $Price->size=3D9;
-            $Price->javascript=3D"onBlur=3D'format_number(this);clean_tv=
a($i);compute_ledger($i)'";
-            $array[$i]['pu']=3D$Price->input("e_march".$i."_price",$marc=
h_price);
-            $array[$i]['tva']=3D'';
-            $array[$i]['amount_tva']=3D'';
+            $Price->size =3D 9;
+            $Price->javascript =3D "onBlur=3D'format_number(this);clean_=
tva($i);compute_ledger($i)'";
+            $array[$i]['pu'] =3D $Price->input("e_march" . $i . "_price"=
, $march_price);
+            $array[$i]['tva'] =3D '';
+            $array[$i]['amount_tva'] =3D '';
             // if tva is not needed then no tva field
-            if ( $flag_tva =3D=3D 'Y' )
-            {
+            if ($flag_tva =3D=3D 'Y') {
                 // vat label
                 //--
-                $Tva=3Dnew ITva_Popup($this->db);
-                $Tva->in_table=3Dtrue;
-                $Tva->set_attribute('compute',$i);
+                $Tva =3D new ITva_Popup($this->db);
+                $Tva->in_table =3D true;
+                $Tva->set_attribute('compute', $i);
=20
-                $Tva->js=3D'onblur=3D"format_number(this);clean_tva('.$i=
.');compute_ledger('.$i.')"';
-                $Tva->value=3D$march_tva_id;
-                $array[$i]['tva']=3D$Tva->input("e_march$i"."_tva_id");
+                $Tva->js =3D 'onblur=3D"format_number(this);clean_tva(' =
. $i . ');compute_ledger(' . $i . ')"';
+                $Tva->value =3D $march_tva_id;
+                $array[$i]['tva'] =3D $Tva->input("e_march$i" . "_tva_id=
");
                 // vat amount
                 //--
-                $wTva_amount=3Dnew INum();
-                $wTva_amount->readOnly=3Dfalse;
-                $wTva_amount->size=3D6;
-                $wTva_amount->javascript=3D"onBlur=3D'format_number(this=
);compute_ledger($i)'";
-                $array[$i]['amount_tva']=3D$wTva_amount->input("e_march"=
.$i."_tva_amount",$march_tva_amount);
+                $wTva_amount =3D new INum();
+                $wTva_amount->readOnly =3D false;
+                $wTva_amount->size =3D 6;
+                $wTva_amount->javascript =3D "onBlur=3D'format_number(th=
is);compute_ledger($i)'";
+                $array[$i]['amount_tva'] =3D $wTva_amount->input("e_marc=
h" . $i . "_tva_amount", $march_tva_amount);
             }
             // quantity
             //--
-            $quant=3D(isset(${"e_quant$i"}))?${"e_quant$i"}:"1"
-                   ;
-            $Quantity=3Dnew INum();
+            $quant =3D (isset(${"e_quant$i"})) ? ${"e_quant$i"} : "1"
+            ;
+            $Quantity =3D new INum();
             $Quantity->setReadOnly(false);
-            $Quantity->size=3D8;
-            $Quantity->javascript=3D"onChange=3D'format_number(this);cle=
an_tva($i);compute_ledger($i)'";
-            $array[$i]['quantity']=3D$Quantity->input("e_quant".$i,$quan=
t);
-
+            $Quantity->size =3D 8;
+            $Quantity->javascript =3D "onChange=3D'format_number(this);c=
lean_tva($i);compute_ledger($i)'";
+            $array[$i]['quantity'] =3D $Quantity->input("e_quant" . $i, =
$quant);
         }// foreach article
-        $f_type=3D_('Client');
+        $f_type =3D _('Client');
=20
=20
         ob_start();
@@ -1355,25 +1243,21 @@
=20
=20
         // Set correctly the REQUEST param for jrn_type
-        $r.=3DHtmlInput::hidden('jrn_type','VEN');
+        $r.=3DHtmlInput::hidden('jrn_type', 'VEN');
=20
-        $r.=3DHtmlInput::button('add_item',_('Ajout article'),      ' on=
Click=3D"ledger_add_row()"');
-		$r.=3D create_script("$('".$Date->id."').focus()");
+        $r.=3DHtmlInput::button('add_item', _('Ajout article'), ' onClic=
k=3D"ledger_add_row()"');
+        $r.=3D create_script("$('" . $Date->id . "').focus()");
         return $r;
     }
=20
-    /*!\brief test function
+    /* !\brief test function
      */
-    static function test_me($p_string=3D'')
-    {
-        $cn=3Dnew Database(dossier::id());
-        $a=3Dnew Acc_Ledger_Sold($cn,2);
+
+    static function test_me($p_string =3D '') {
+        $cn =3D new Database(dossier::id());
+        $a =3D new Acc_Ledger_Sold($cn, 2);
         echo $a->input();
     }
=20
 }
=20
-
-
-
-

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2013-08-27 20:58:29 UTC (r=
ev 5355)
+++ phpcompta/trunk/include/compta_ven.inc.php	2013-08-27 20:58:52 UTC (r=
ev 5356)
@@ -70,7 +70,8 @@
         if ( ! isset($correct))
         {
             echo '<div class=3D"content">';
-			echo h2info('Confirmation');
+            echo h1('Confirmation','');
+            echo_warning("Attention, cette op=C3=A9ration n'est pas enco=
re sauv=C3=A9e : vous devez encore confirmer");
=20
=20
 			echo '<div class=3D"content">';
@@ -81,9 +82,9 @@
             $chk=3Dnew ICheckBox();
             $chk->selected=3Dfalse;
 	    echo '<div style=3D"clear:both">';
-            echo $chk->input('opd_save');
-            echo "Sauvez cette op&eacute;ration comme mod=C3=A8le d'op=C3=
=A9ration ?";
-	    echo '<br/>';
+           =20
+            echo "<h2>Mod=C3=A8le d'op=C3=A9ration</h2>";
+            echo "Donnez un nom pour sauver cette op=C3=A9ration comme m=
od=C3=A8le <br>";
 	    $opd_name=3Dnew IText('opd_name');
 	    echo "Nom du mod=C3=A8le ".$opd_name->input();
 	    echo '</div>';
@@ -130,7 +131,7 @@
             $internal=3D$Ledger->insert($_POST);
=20
             /* Save the predefined operation */
-            if ( isset($_POST['opd_save']))
+            if ( isset($_POST['opd_name']) && trim($_POST['opd_name']) !=
=3D "" )
             {
                 $opd=3Dnew Pre_op_ven($cn);
                 $opd->get_post();
@@ -138,7 +139,7 @@
             }
=20
             /* Show button  */
-            echo '<h2 class=3D"info"> Enregistrement </h2>';
+            echo '<h1 > Enregistrement </h1>';
             $jr_id=3D$cn->get_value('select jr_id from jrn where jr_inte=
rnal=3D$1',array($internal));
=20
             echo "<h2 >"._('Op=C3=A9ration sauv=C3=A9e');
@@ -149,7 +150,7 @@
                 echo '<h3 class=3D"notice"> '._('Attention num=C3=A9ro p=
i=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</h3>';
             }
=20
-            printf ('<a class=3D"line" style=3D"display:inline" href=3D"=
javascript:modifyOperation(%d,%d)">%s</a><hr>',
+            printf ('D=C3=A9tail op=C3=A9ration : <a class=3D"line" styl=
e=3D"display:inline" href=3D"javascript:modifyOperation(%d,%d)">%s</a><hr=
>',
                     $jr_id,dossier::id(),$internal);
 	    echo $Ledger->confirm($_POST,true);
             /* Show link for Invoice */

Modified: phpcompta/trunk/include/template/form_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_detail.php	2013-08-27 20=
:58:29 UTC (rev 5355)
+++ phpcompta/trunk/include/template/form_ledger_detail.php	2013-08-27 20=
:58:52 UTC (rev 5356)
@@ -1,23 +1,63 @@
-<?php
=20
-?>
-<fieldset>
-<legend><?php echo $f_legend ?>
-</legend>
 	<div id=3D"jrn_name_div">
 	<h2 class=3D"title" id=3D"jrn_name"> <?php echo $this->get_name()?></h2=
>
 </div>
-      <?php echo _('Date').':'?> <?php echo $f_date ?> <?php echo _('Ech=
eance')?> : <?php echo $f_echeance?>
-<?php echo $f_periode?><br>
-      <?php echo _('Journal')?> <?php echo $f_jrn?><br><hr>
-<?php echo $f_type?><?php echo $f_client_qcode?><?php echo $f_client_bt?=
> <?php echo $f_client?><br>
-      <?php echo _('Libell=C3=A9')?> <?php echo $f_desc?>
-      <?php echo _('Num Pj')?> <?php echo $f_pj?><br>
+<table>
+    <tr>
+        <td>=20
+            <?php echo _('Journal')?> <?php echo $f_jrn?>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo _('Date')?>=20
+        </td>
+        <td>
+            <?php echo $f_date ?>
+        </td>
+    </tr>
+    <tr>
+        <td>
+        <?php echo _('Echeance')?> =20
+        </td>
+        <td>
+            <?php echo $f_echeance?>
+        </td>
+    </tr>
+    <tr>
+        <td><?php echo $f_type?></td>
+        <td>
+            <?php echo $f_client_qcode?><?php echo $f_client_bt?> <?php =
echo $f_client?></td>
+        </td>
+    </tr>
+   =20
+    <tr>
+            <?php echo $f_periode?>
+    </tr>
+    <tr>
+        <td>
+            <?php echo _('Num=C3=A9ro Pi=C3=A8ce')?>=20
+        </td>
+        <td>
+            <?php echo $f_pj?>
+        </td>
+    </tr>
+    <tr>
+        <td>
+             <?php echo _('Libell=C3=A9')?>=20
+        </td>
+        <td>
+            <?php echo $f_desc?>
+        </td>
+    </tr>
+
+</table>
+    =20
+     =20
+<br>
 <?php echo $str_add_button?>
-</fieldset>
=20
-<fieldset>
-<legend><?php echo $f_legend_detail?></legend>
+<h2><?php echo $f_legend_detail?></h2>
 <table id=3D"sold_item" width=3D"100%" border=3D"0">
 <tr>
 <th style=3D"width:auto"colspan=3D"2">Code <?php echo HtmlInput::infobul=
le(0)?></th>
@@ -86,6 +126,5 @@
 <?php endif; ?>
 </div>
=20
-</fieldset>
=20
=20



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


From MAILER-DAEMON Tue Aug 27 17:11:45 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VEQYD-0004J4-PW
	for mharc-phpcompta-dev@gnu.org; Tue, 27 Aug 2013 17:11:45 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 27 Aug 2013 23:02:39 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.13820.1377637905.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5357 - phpcompta/trunk/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Aug 2013 21:11:44 -0000

Author: danydb
Date: 2013-08-27 23:02:39 +0200 (Tue, 27 Aug 2013)
New Revision: 5357

Modified:
   phpcompta/trunk/include/compta_ven.inc.php
Log:
remove dead code

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2013-08-27 20:58:52 UTC (r=
ev 5356)
+++ phpcompta/trunk/include/compta_ven.inc.php	2013-08-27 21:02:39 UTC (r=
ev 5357)
@@ -259,169 +259,5 @@
 		echo create_script(" get_last_date()");
 	}
 =09
-    exit();
-
-
-
 exit();
-
-//----------------------------------------------------------------------=
---------
-// Listing
-//----------------------------------------------------------------------=
----------
-if ( $def =3D=3D 2 )
-{
-    echo '<div class=3D"content">';
-// Check privilege
-    if ( isset($_REQUEST['p_jrn']) &&
-            $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X')
-    {
-
-        NoAccess();
-        exit -1;
-    }
-
-    $Ledger=3Dnew Acc_Ledger_Sold($cn,0);
-    if ( !isset($_REQUEST['p_jrn']))
-    {
-        $Ledger->id=3D-1;
-    }
-    else
-        $Ledger->id=3D$_REQUEST['p_jrn'];
-    echo $Ledger->display_search_form();
-    //------------------------------
-    // UPdate the payment
-    //------------------------------
-    if ( isset ( $_GET ['paid']))
-    {
-        $Ledger->update_paid($_GET);
-    }
-    $p_array=3D$_GET;
-    /* by default we should the default period */
-    if ( ! isset($p_array['date_start']))
-    {
-        $period=3D$g_user->get_periode();
-        $per=3Dnew Periode($cn,$period);
-        list($date_start,$date_end)=3D$per->get_date_limit();
-        $p_array['date_start']=3D$date_start;
-        $p_array['date_end']=3D$date_end;
-    }
-    /*  compute the sql stmt */
-    list($sql,$where)=3D$Ledger->build_search_sql($p_array);
-
-    $max_line=3D$cn->count_sql($sql);
-
-    $step=3D$_SESSION['g_pagesize'];
-    $page=3D(isset($_GET['offset']))?$_GET['page']:1;
-    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
-    $bar=3Dnavigation_bar($offset,$max_line,$step,$page);
-
-
-    echo '<form method=3D"GET" id=3D"fpaidv" class=3D"print" action=3D"'=
.$href.'">';
-    echo HtmlInput::hidden("sa","l");
-    echo HtmlInput::hidden("p_action","ven");
-    echo dossier::hidden();
-      echo HtmlInput::hidden("ac",$_REQUEST['ac']);
-    echo $bar;
-    list($count,$html)=3D $Ledger->list_operation($sql,$offset,1);
-    echo $html;
-    echo $bar;
-    $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des=
c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le=
dger_type','p_action'));
-    if (isset($_GET['r_jrn'])) {
-      foreach ($_GET['r_jrn'] as $k=3D>$v)
-	$r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
-    }
-    echo $r;
-
-    echo '<p>'.HtmlInput::submit('paid',_('Mise =C3=A0 jour paiement')).=
IButton::select_checkbox('fpaidv').IButton::unselect_checkbox('fpaidv').'=
</p>';
-
-    echo '</form>';
-
-    /*
-     * Export to csv
-     */
-    $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des=
c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le=
dger_type','p_action'));
-    if (isset($_GET['r_jrn'])) {
-      foreach ($_GET['r_jrn'] as $k=3D>$v)
-	$r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
-    }
-    echo '<form action=3D"export.php" method=3D"get">';
-    echo $r;
-    echo HtmlInput::hidden('act','CSV:histo');
-    echo HtmlInput::submit('viewsearch','Export vers CSV');
-
-    echo '</form>';
-
-    echo '</div>';
-    exit();
-
-}
-//----------------------------------------------------------------------=
-----
-// Listing unpaid
-//----------------------------------------------------------------------=
-----
-if ( $def=3D=3D3 )
-{
-    echo '<div class=3D"content">';
-// Check privilege
-    if ( isset($_REQUEST['p_jrn']) &&
-            $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X')
-    {
-        NoAccess();
-        exit -1;
-    }
-
-    $Ledger=3Dnew Acc_Ledger_Sold($cn,0);
-    if ( !isset($_REQUEST['p_jrn']))
-    {
-        $Ledger->id=3D-1;
-    }
-    else
-        $Ledger->id=3D$_REQUEST['p_jrn'];
-    echo $Ledger->display_search_form();
-    //------------------------------
-    // UPdate the payment
-    //------------------------------
-    if ( isset ( $_GET ['paid']))
-    {
-        $Ledger->update_paid($_GET);
-    }
-
-    $p_array=3D$_GET;
-
-    /*  compute the sql stmt */
-    list($sql,$where)=3D$Ledger->build_search_sql($p_array);
-    if ( trim($where) !=3D '')
-        $sql .=3D ' and '.SQL_LIST_UNPAID_INVOICE;
-    else
-        $sql .=3D ' where '.SQL_LIST_UNPAID_INVOICE;
-
-    $max_line=3D$cn->count_sql($sql);
-
-    $step=3D$_SESSION['g_pagesize'];
-    $page=3D(isset($_GET['offset']))?$_GET['page']:1;
-    $offset=3D(isset($_GET['offset']))?$_GET['offset']:0;
-    $bar=3Dnavigation_bar($offset,$max_line,$step,$page);
-
-
-    echo '<form method=3D"GET" id=3D"fpaidv" class=3D"print" action=3D"'=
.$href.'">';
-    echo HtmlInput::hidden("sa","lnp");
-    echo HtmlInput::hidden("p_action","ven");
-    echo dossier::hidden();
-    echo $bar;
-    list($count,$html)=3D $Ledger->list_operation($sql,$offset,1);
-    echo $html;
-    echo $bar;
-
-    $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des=
c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le=
dger_type','p_action'));
-    if (isset($_GET['r_jrn'])) {
-      foreach ($_GET['r_jrn'] as $k=3D>$v)
-	$r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v);
-    }
-    echo $r;
-
-    echo '<p>'.HtmlInput::submit('paid',_('Mise =C3=A0 jour paiement')).=
IButton::select_checkbox('fpaidv').IButton::unselect_checkbox('fpaidv').'=
</p>';
-    echo '</form>';
-
-    echo '</div>';
-    exit();
-
-}
+?>



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


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

Author: danydb
Date: 2013-08-28 18:21:45 +0200 (Wed, 28 Aug 2013)
New Revision: 5358

Modified:
   phpcompta/trunk/include/class_acc_ledger_sold.php
Log:
Improve VEN

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-27 21:02:39=
 UTC (rev 5357)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-28 16:21:45=
 UTC (rev 5358)
@@ -465,8 +465,7 @@
                 /* Generate an invoice and save it into the database */
                 if (isset($_POST['gen_invoice'])) {
                     $file =3D $this->create_document($internal, $p_array=
);
-                    $this->doc =3D _('Document g=C3=A9n=C3=A9r=C3=A9') .=
 "  : " . "<br>";
-                    $this->doc.=3D'<A class=3D"line" HREF=3D"show_pj.php=
?' . dossier::get() . '&jr_grpt_id=3D' . $seq . '&jrn=3D' . $this->id . '=
">' . $file . '</A>';
+                    $this->doc=3D'<A class=3D"line" HREF=3D"show_pj.php?=
' . dossier::get() . '&jr_grpt_id=3D' . $seq . '&jrn=3D' . $this->id . '"=
>' . $file . '</A>';
                 }
             }
             //----------------------------------------
@@ -614,11 +613,20 @@
         }
         $date_limit =3D $lPeriode->get_date_limit();
         $r =3D "";
-        $r.=3D'<div id=3D"jrn_name_div">';
-        $r.=3D'<h2   id=3D"jrn_name" style=3D"display:inline">' . $this-=
>get_name() . '</h2>';
-        $r.=3D '</div>';
         $r.=3D'<div>';
         $r.=3D'<TABLE  width=3D"100%">';
+        if ( $p_summary ) {
+            $jr_id=3D$this->db->get_value('select jr_id from jrn where j=
r_internal=3D$1',array($this->internal));
+            $r.=3D"<tr>";
+            $r.=3D'<td>';
+            $r.=3D_('D=C3=A9tail op=C3=A9ration ');
+            $r.=3D'</td>';
+            $r.=3D'<td>';
+            $r.=3Dsprintf ('<a class=3D"line" style=3D"display:inline" h=
ref=3D"javascript:modifyOperation(%d,%d)">%s</a>',
+                    $jr_id,dossier::id(),$this->internal);
+            $r.=3D'</td>';
+            $r.=3D"</tr>";
+        }
         $r.=3D'<tr>';
         $r.=3D'<td> ' . _('Date') . '</td><td> ' . hb($e_date) . '</td>'=
;
         $r.=3D'</tr>';
@@ -635,7 +643,18 @@
         $r.=3D'<td> ' . _('Libell=C3=A9') . '</td><td> ' . hb($e_comm) .=
 '</td>';
         $r.=3D'</tr>';
         $r.=3D'<tr>';
-        $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'. hb($e_p=
j) . '</td>';
+        if ( ! $p_summary) {
+            $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'. hb(=
$e_pj) . '</td>';
+        } else {
+           =20
+             if ( strcmp($this->pj,$e_pj) !=3D 0 )
+            {
+                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) .=20
+                        '<span class=3D"notice"> '._('Attention num=C3=A9=
ro pi=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</span></td>=
';
+            } else {
+                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) . '</td>';
+            }
+        }
         $r.=3D'</tr>';
         $r.=3D'<tr>';
         $r.=3D'<td> ' . _('Client') . '</td><td> ' . hb($e_client . ':' =
. $client_name) . '</td>';
@@ -786,7 +805,7 @@
             $r.=3D'<tr>'.td(_('Total TVAC')).td(hb(nbm($tot)),'class=3D"=
num"');
             $r.=3D'</table>';
         } else {
-            $r.=3D'<br>Total '.nbm($tot);
+            $r.=3D'<br>Total '.nbm(hb($tot));
         }
       =20
         if (!$p_summary) {



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


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

Author: danydb
Date: 2013-08-28 18:22:06 +0200 (Wed, 28 Aug 2013)
New Revision: 5359

Modified:
   phpcompta/trunk/include/compta_ven.inc.php
Log:
Improve VEN

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2013-08-28 16:21:45 UTC (r=
ev 5358)
+++ phpcompta/trunk/include/compta_ven.inc.php	2013-08-28 16:22:06 UTC (r=
ev 5359)
@@ -79,8 +79,6 @@
             echo dossier::hidden();
             echo $Ledger->confirm($_POST );
 			echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-            $chk=3Dnew ICheckBox();
-            $chk->selected=3Dfalse;
 	    echo '<div style=3D"clear:both">';
            =20
             echo "<h2>Mod=C3=A8le d'op=C3=A9ration</h2>";
@@ -88,7 +86,6 @@
 	    $opd_name=3Dnew IText('opd_name');
 	    echo "Nom du mod=C3=A8le ".$opd_name->input();
 	    echo '</div>';
-            echo '<hr>';
 	    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
             echo HtmlInput::submit("record",_("Enregistrement"),'onClick=
=3D"return verify_ca(\'\');"');
             echo HtmlInput::submit('correct',_("Corriger"));
@@ -140,25 +137,13 @@
=20
             /* Show button  */
             echo '<h1 > Enregistrement </h1>';
-            $jr_id=3D$cn->get_value('select jr_id from jrn where jr_inte=
rnal=3D$1',array($internal));
=20
-            echo "<h2 >"._('Op=C3=A9ration sauv=C3=A9e');
-            if ( $Ledger->pj !=3D '') echo ' Piece : '.h($Ledger->pj);
-            echo "</h2>";
-            if ( strcmp($Ledger->pj,$_POST['e_pj']) !=3D 0 )
-            {
-                echo '<h3 class=3D"notice"> '._('Attention num=C3=A9ro p=
i=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</h3>';
-            }
-
-            printf ('D=C3=A9tail op=C3=A9ration : <a class=3D"line" styl=
e=3D"display:inline" href=3D"javascript:modifyOperation(%d,%d)">%s</a><hr=
>',
-                    $jr_id,dossier::id(),$internal);
-	    echo $Ledger->confirm($_POST,true);
+            echo $Ledger->confirm($_POST,true);
             /* Show link for Invoice */
             if (isset ($Ledger->doc) )
             {
-                echo '<span class=3D"invoice">';
+                echo '<h2>Document </h2>';
                 echo $Ledger->doc;
-                echo '</span>';
             }
=20
=20



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


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

Author: danydb
Date: 2013-08-28 19:13:04 +0200 (Wed, 28 Aug 2013)
New Revision: 5360

Modified:
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/compta_ven.inc.php
Log:
Improve VEN & ACH

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-08-28 16:22:06 UTC =
(rev 5359)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-08-28 17:13:04 UTC =
(rev 5360)
@@ -2338,6 +2338,7 @@
 		$doc->f_id =3D $e_client;
 		$doc->md_id =3D $gen_doc;
 		$doc->ag_id =3D 0;
+                $p_array['e_pj']=3D$this->pj;
 		$filename=3D"";
 		$doc->Generate($p_array,$p_array['e_pj']);
 		// Move the document to the jrn

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-08-28 16:2=
2:06 UTC (rev 5359)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-08-28 17:1=
3:04 UTC (rev 5360)
@@ -727,8 +727,7 @@
             if ( isset($_POST['gen_invoice']) )
             {
                 $ref_doc=3D $this->create_document($internal,$p_array);
-                $this->doc=3D _('Document g=C3=A9n=C3=A9r=C3=A9')."  : "=
."<br>";
-                $this->doc.=3D'<A class=3D"line" HREF=3D"show_pj.php?'.d=
ossier::get().'&jr_grpt_id=3D'.$seq.'&jrn=3D'.$this->id.'">'.$ref_doc.'</=
A>';
+                $this->doc=3D'<A class=3D"line" HREF=3D"show_pj.php?'.do=
ssier::get().'&jr_grpt_id=3D'.$seq.'&jrn=3D'.$this->id.'">'.$ref_doc.'</A=
>';
             }
=20
             //----------------------------------------
@@ -922,8 +921,7 @@
=20
         $r=3D"";
         $r.=3Ddossier::hidden();
-        $f_legend=3D_("En-t=C3=AAte facture fournisseur");
-        $f_legend_detail=3D_("D=C3=A9tail articles achet=C3=A9");
+        $f_legend_detail=3D_("D=C3=A9tail articles achet=C3=A9s");
=20
         //  Date
         //--
@@ -988,8 +986,7 @@
 		$wLedger=3D$this->select_ledger('ACH',2);
         if ($wLedger =3D=3D null) exit (_('Pas de journal disponible'));
         $wLedger->javascript=3D"onChange=3D'update_predef(\"ach\",\"f\")=
;$add_js'";
-        $label=3D" Journal ".HtmlInput::infobulle(2) ;
-
+        $wLedger->table=3D1;
         $f_jrn=3D$wLedger->input();
=20
         // Comment
@@ -1000,7 +997,7 @@
         $Commentaire->size=3D60;
         $Commentaire->tabindex=3D3;
         $label=3DHtmlInput::infobulle(1) ;
-        $f_desc=3D$label.$Commentaire->input("e_comm",h($e_comm));
+        $f_desc=3D$Commentaire->input("e_comm",h($e_comm)).$label;
=20
         // PJ
         //--
@@ -1275,47 +1272,70 @@
         }
         $date_limit=3D$lPeriode->get_date_limit();
         $r=3D"";
-        $r.=3D"<fieldset>";
-        $r.=3D"<legend>"._('En-t=C3=AAte facture fournisseur')."  </lege=
nd>";
-		$r.=3D'<div id=3D"jrn_name_div">';
-		$r.=3D'<h2 class=3D"title"  id=3D"jrn_name">'.$this->get_name().'</h2>=
';
-		$r.=3D'</div>';
         $r.=3D'<TABLE  width=3D"100%">';
+        if ( $p_summary ) {
+            $jr_id=3D$this->db->get_value('select jr_id from jrn where j=
r_internal=3D$1',array($this->internal));
+            $r.=3D"<tr>";
+            $r.=3D'<td>';
+            $r.=3D_('D=C3=A9tail op=C3=A9ration ');
+            $r.=3D'</td>';
+            $r.=3D'<td>';
+            $r.=3Dsprintf ('<a class=3D"line" style=3D"display:inline" h=
ref=3D"javascript:modifyOperation(%d,%d)">%s</a>',
+                    $jr_id,dossier::id(),$this->internal);
+            $r.=3D'</td>';
+            $r.=3D"</tr>";
+        }
         $r.=3D'<tr>';
-        $r.=3D'<td> '._('Date').' '.$e_date.'</td>';
-        $r.=3D'<td>'._('Echeance').' '.$e_ech.'</td>';
-        $r.=3D'<td> '._('P=C3=A9riode Comptable').' '.$date_limit['p_sta=
rt'].'-'.$date_limit['p_end'].'</td>';
+        $r.=3D'<td> ' . _('Date') . '</td><td> ' . hb($e_date) . '</td>'=
;
+        $r.=3D'</tr>';
         $r.=3D'<tr>';
-        $r.=3D'<td> '._('Journal').' '.h($this->get_name()).'</td>';
+        $r.=3D'<td>' . _('Echeance') . '</td><td> ' . hb($e_ech) . '</td=
>';
         $r.=3D'</tr>';
         $r.=3D'<tr>';
-        $r.=3D'<td colspan=3D"2"> '._('Libell=C3=A9').' '.h($e_comm).'</=
td><td> Pj :'.h($e_pj).'</td>';
+        $r.=3D'<td> ' . _('P=C3=A9riode Comptable') . '</td><td> ' .hb( =
$date_limit['p_start'] . '-' . $date_limit['p_end']) . '</td>';
         $r.=3D'</tr>';
         $r.=3D'<tr>';
-        $r.=3D'<td colspan=3D"3"> '._('Fournisseur').' '.h($e_client.':'=
.$client_name).'</td>';
+        $r.=3D'<td> ' . _('Journal') . '</td><td> ' . hb($this->get_name=
()) . '</td>';
         $r.=3D'</tr>';
+        $r.=3D'<tr>';
+        $r.=3D'<td> ' . _('Libell=C3=A9') . '</td><td> ' . hb($e_comm) .=
 '</td>';
+        $r.=3D'</tr>';
+        $r.=3D'<tr>';
+        if ( ! $p_summary) {
+            $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'. hb(=
$e_pj) . '</td>';
+        } else {
+           =20
+             if ( strcmp($this->pj,$e_pj) !=3D 0 )
+            {
+                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) .=20
+                        '<span class=3D"notice"> '._('Attention num=C3=A9=
ro pi=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'</span></td>=
';
+            } else {
+                $r.=3D'<td>' . _('Num=C3=A9ro Pi=C3=A8ce') .'</td><td>'.=
 hb($this->pj) . '</td>';
+            }
+        }
+        $r.=3D'</tr>';
+        $r.=3D'<tr>';
+        $r.=3D'<td> ' . _('Fournisseur') . '</td><td> ' . hb($e_client .=
 ':' . $client_name) . '</td>';
+        $r.=3D'</tr>';
         $r.=3D'</table>';
-        $r.=3D'</fieldset>';
-        $r.=3D'<fieldset><legend>'._('D=C3=A9tail articles achet=C3=A9s'=
).'</legend>';
-        $r.=3D'<table width=3D"100%" border=3D"0">';
+        $r.=3D'<h2>' . _('D=C3=A9tail articles achet=C3=A9s') . '</h2>';
+        $r.=3D'<table class=3D"result" border=3D"0">';
         $r.=3D'<TR>';
-        $r.=3D"<th>Code</th>";
-        $r.=3D"<th>"._('D=C3=A9nomination')."</th>";
-        $r.=3D"<th style=3D\"text-align:right\">"._('prix')."</th>";
-        /* vat use */
-        if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-        {
+        $r.=3D"<th>" . _('Code') . "</th>";
+        $r.=3D"<th>" . _('D=C3=A9nomination') . "</th>";
+        $r.=3D"<th style=3D\"text-align:right\">" . _('prix') . "</th>";
+        $r.=3D"<th style=3D\"text-align:right\">" . _('quantit=C3=A9') .=
 "</th>";
+
+
+        if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
+            $r.=3D"<th style=3D\"text-align:right\">" . _('tva') . "</th=
>";
+            $r.=3D'<th style=3D"text-align:right"> ' . _('Montant TVA') =
. '</th>';
+            $r.=3D'<th style=3D"text-align:right">' . _('Montant HTVA') =
. '</th>';
+            $r.=3D'<th style=3D"text-align:right">' . _('Montant TVAC') =
. '</th>';
+        } else {
+            $r.=3D'<th style=3D"text-align:right">' . _('Montant') . '</=
th>';
             $r.=3D"<th style=3D\"text-align:right\">"._('quantit=C3=A9')=
."</th>";
-            $r.=3D"<th style=3D\"text-align:right\">tva</th>";
-            $r.=3D'<th style=3D"text-align:right"> '._('Montant TVA').'<=
/th>';
-            $r.=3D'<th style=3D"text-align:right">'._('Montant HTVA').'<=
/th>';
-            $r.=3D'<th style=3D"text-align:right">'._('Montant TVAC').'<=
/th>';
         }
-        else
-        {
-            $r.=3D"<th style=3D\"text-align:right\">"._('quantit=C3=A9')=
."</th>";
-            $r.=3D'<th style=3D"text-align:right"> '._('Total')."</th>";
-        }
=20
         /* if we use the AC */
         if ($g_parameter->MY_ANALYTIC!=3D'nu')
@@ -1387,7 +1407,7 @@
             $r.=3D'<td>';
             $r.=3D${"e_march".$i};
             $r.=3D'</td>';
-            $r.=3D'<TD style=3D"width:60%;border-bottom:1px dotted grey;=
">';
+            $r.=3D'<TD style=3D"border-bottom:1px dotted grey;">';
             $r.=3D$fiche_name;
             $r.=3D'</td>';
             $r.=3D'<td class=3D"num">';
@@ -1448,52 +1468,27 @@
         $r.=3D'</table>';
         if ( $g_parameter->MY_ANALYTIC!=3D'nu' && !$p_summary) // use of=
 AA
             $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'V=C3=A9rifiez imputation analytique').'" onClick=3D"verify_ca(\'\');">';
-        $r.=3D'</fieldset>';
-
-		if ( ! $p_summary )
-				$r.=3D'<div style=3D"width:40%;position:float;float:right;text-align=
:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-w=
eight:bold">';
-			else
-				$r.=3D'<div style=3D"width:60%;position:float;float:left;text-align:=
right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-we=
ight:bold">';
-        $r.=3D'<fieldset> <legend>Totaux</legend>';
-        $tot=3Dround(bcadd($tot_amount,$tot_tva),2);
-        $r.=3D'<div style=3D"position:float;float:left;text-align:right;=
padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-weight:b=
old">';
-
-        $r.=3D'<br>'._('Total HTVA');
-        if ($g_parameter->MY_TVA_USE=3D=3D'Y')
-        {
-            foreach ($tva as $i=3D>$value)
-            {
-                $oTva->set_parameter('id',$i);
+        $r.=3D'<h2>Totaux</h2>';
+        $tot =3D round(bcadd($tot_amount, $tot_tva), 2);
+        /* use VAT */
+        if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
+            $r.=3D'<table>';
+            $r.=3D'<tr><td>Total HTVA</td>';
+            $r.=3Dtd(hb(nbm($tot_amount) ),'class=3D"num"');
+            foreach ($tva as $i =3D> $value) {
+                $oTva->set_parameter('id', $i);
                 $oTva->load();
=20
-                $r.=3D'<br>  '._('TVA =C3=A0 ').$oTva->get_parameter('la=
bel');
+                $r.=3D'<tr><td>  TVA ' . $oTva->get_parameter('label').'=
</td>';
+                $r.=3Dtd(hb(nbm($tva[$i])),'class=3D"num"');
             }
-
-            $r.=3D'<br>'._('Total TVA');
-            $r.=3D'<br>'._(' TVAC');
-
+            $r.=3D'<tr>'.td(_('Total TVA')).td(hb(nbm($tot_tva)),'class=3D=
"num"');
+            $r.=3D'<tr>'.td(_('Total TVAC')).td(hb(nbm($tot)),'class=3D"=
num"');
+            $r.=3D'</table>';
+        } else {
+            $r.=3D'<br>Total '.nbm(hb($tot));
         }
-        $r.=3D"</div>";
-
-
-        $r.=3D'<div style=3D"position:float;float:left;text-align:right;=
color:blue;font-size:1.2em;font-weight:bold">';
-        $r.=3D'<br><span id=3D"htva">'.nbm($tot_amount).'</span>';
-
-        if ( $g_parameter->MY_TVA_USE=3D=3D'Y')
-        {
-            foreach ($tva as $i=3D>$value)
-            {
-	      $r.=3D'<br>'.nbm($tva[$i]);
-            }
-            $r.=3D'<br><span id=3D"tva">'.nbm($tot_tva).'</span>';
-            $r.=3D'<br><span id=3D"tvac">'.nbm($tot).'</span>';
-        }
-        $r.=3D"</div>";
-
-
-
-        $r.=3D'</fieldset>';
-	$r.=3D'</div>';
+      =20
         /*  Add hidden */
         $r.=3DHtmlInput::hidden('e_client',$e_client);
         $r.=3DHtmlInput::hidden('nb_item',$nb_item);
@@ -1530,34 +1525,36 @@
         }
 	if ( ! $p_summary )
             $r.=3D$this->extra_info();
-	if ($g_parameter->MY_STOCK =3D=3D 'Y')
-		{
-			$sel =3D HtmlInput::select_stock($this->db, 'repo', 'W');
-			$sel->readOnly =3D $p_summary;
-			if ($p_summary =3D=3D true)
-				$sel->selected =3D $repo;
-			$r.=3D"<div style=3D\"clear:both\"></div>";
-			$r.=3D'<div style=3D"float:left"><h2 class=3D"info">D=C3=A9p=C3=B4t</=
h2>';
-			$r.=3D"<p> Dans le d=C3=A9p=C3=B4t : ";
-			$r.=3D$sel->input();
-			$r.=3D'</p>';
-			$r.=3D'</div>';
-		}
+	// Show the available repository
+        if ($g_parameter->MY_STOCK =3D=3D 'Y') {
+            $sel =3D HtmlInput::select_stock($this->db, 'repo', 'W');
+            $sel->readOnly =3D $p_summary;
+            if ($p_summary =3D=3D true)
+                $sel->selected =3D $repo;
+            $r.=3D'<h2>D=C3=A9p=C3=B4t</h2>';
+            $r.=3D"<p> Dans le d=C3=A9p=C3=B4t : ";
+            $r.=3D$sel->input();
+            $r.=3D'</p>';
+        }
 	if ( $e_mp!=3D0 && strlen (trim (${'e_mp_qcode_'.$e_mp})) !=3D 0 )
         {
             $r.=3DHtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.=
$e_mp});
             $r.=3DHtmlInput::hidden('acompte',$acompte);
 			$r.=3DHtmlInput::hidden('e_comm_paiement',$e_comm_paiement);
             /* needed for generating a invoice */
-            $r.=3DHtmlInput::hidden('qcode_benef', ${'e_mp_qcode_' . $e_=
mp});
+           $r.=3DHtmlInput::hidden('qcode_benef', ${'e_mp_qcode_' . $e_m=
p});
 			$fname =3D new Fiche($this->db);
 			$fname->get_by_qcode(${'e_mp_qcode_' . $e_mp});
-			$r.=3D"<div style=3D\"clear:both\"></div>";
+			/*$r.=3D"<div style=3D\"clear:both\"></div>";
 			$r.=3D'<div style=3D"float:left"><h2 class=3D"info">' . "Pay=C3=A9 pa=
r " . ${'e_mp_qcode_' . $e_mp} .
 					" ".$fname->getName() ."</h2> ".
 					'<p>'._('D=C3=A9duction acompte ').h($acompte).'</p>'.
-					_('Libell=C3=A9 :' ).h($e_comm_paiement).'</div>';
+					_('Libell=C3=A9 :' ).h($e_comm_paiement).'</div>';*/
+            $r.=3D'<h2>' . "Pay=C3=A9 par " . ${'e_mp_qcode_' . $e_mp} .
+                    " " . $fname->getName() . '</H2> ' . '<p>' . _('D=C3=
=A9duction acompte ') . h($acompte) . '</p>' .
+                    _('Libell=C3=A9 :') . h($e_comm_paiement) ;
             $r.=3D'<br>';
+            $r.=3D'<br>';
         }
         // check for upload piece
=20
@@ -1573,8 +1570,7 @@
     public function extra_info()
     {
         $r=3D"";
-        $r.=3D'<div style=3D"position:float;float:left;width:50%;text-al=
ign:right;line-height:3em;">';
-        $r.=3D'<fieldset> <legend> '._('Document =C3=A0 g=C3=A9n=C3=A9re=
r').'</legend>';
+        $r.=3D'<h2> Facturation</h2>';
         // check for upload piece
         $file=3Dnew IFile();
         $file->table=3D0;
@@ -1584,7 +1580,6 @@
         if ( $this->db->count_sql("select md_id,md_name from document_mo=
dele where md_affect=3D'ACH'") > 0 )
         {
=20
-            $r.=3D'<hr>';
             $r.=3D_('ou g=C3=A9n=C3=A9rer un document').' <input type=3D=
"checkbox" name=3D"gen_invoice" >';
             // We propose to generate  the fee note
             $doc_gen=3Dnew ISelect();
@@ -1598,8 +1593,6 @@
         $obj=3Dnew IText();
         $r.=3D_('Numero de bon de commande : ').$obj->input('bon_comm').=
'<br>';
         $r.=3D_('Autre information : ').$obj->input('other_info').'<br>'=
;
-        $r.=3D"</fieldset>";
-        $r.=3D'</div>';
         return $r;
     }
=20

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-28 16:22:06=
 UTC (rev 5359)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-28 17:13:04=
 UTC (rev 5360)
@@ -613,7 +613,6 @@
         }
         $date_limit =3D $lPeriode->get_date_limit();
         $r =3D "";
-        $r.=3D'<div>';
         $r.=3D'<TABLE  width=3D"100%">';
         if ( $p_summary ) {
             $jr_id=3D$this->db->get_value('select jr_id from jrn where j=
r_internal=3D$1',array($this->internal));
@@ -872,7 +871,6 @@
             }
             $r.=3DHtmlInput::hidden("e_quant" . $i, ${"e_quant" . $i});
         }
-           $r.=3D"</div>";
         return $r;
     }
=20

Modified: phpcompta/trunk/include/compta_ach.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ach.inc.php	2013-08-28 16:22:06 UTC (r=
ev 5359)
+++ phpcompta/trunk/include/compta_ach.inc.php	2013-08-28 17:13:04 UTC (r=
ev 5360)
@@ -60,24 +60,22 @@
 	if (!isset($correct))
 	{
 		echo '<div class=3D"content">';
-		echo h2info('Confirmation');
+		 echo h1('Confirmation','');
+                echo_warning("Attention, cette op=C3=A9ration n'est pas =
encore sauv=C3=A9e : vous devez encore confirmer");
=20
+
 		echo '<form enctype=3D"multipart/form-data" method=3D"post" class=3D"p=
rint">';
 		echo dossier::hidden();
=20
 		echo $Ledger->confirm($_POST);
 		echo HtmlInput::hidden('ac', $_REQUEST['ac']);
-		$chk =3D new ICheckBox();
-		$chk->selected =3D false;
 		echo '<div style=3D"float:left;clear:both">';
=20
-		echo $chk->input('opd_save');
-		echo "Sauvez cette op&eacute;ration comme mod=C3=A8le d'op=C3=A9ration=
 ?";
-		echo '<br/>';
+                echo "<h2>Mod=C3=A8le d'op=C3=A9ration</h2>";
+                echo "Donnez un nom pour sauver cette op=C3=A9ration com=
me mod=C3=A8le <br>";
 		$opd_name =3D new IText('opd_name');
 		echo "Nom du mod=C3=A8le " . $opd_name->input();
-
-		echo '<hr>';
+                echo '</div>';
 		echo HtmlInput::submit("record", _("Enregistrement"), 'onClick=3D"retu=
rn verify_ca(\'\');"');
 		echo HtmlInput::submit('correct', _("Corriger"));
 		echo '</form>';
@@ -113,7 +111,7 @@
=20
=20
 		/* Save the predefined operation */
-		if (isset($_POST['opd_save']) )
+                if ( isset($_POST['opd_name']) && trim($_POST['opd_name'=
]) !=3D "" )
 		{
 			$opd =3D new Pre_op_ach($cn);
 			$opd->get_post();
@@ -123,26 +121,25 @@
 		/* Show button  */
 		$jr_id =3D $cn->get_value('select jr_id from jrn where jr_internal=3D$=
1', array($internal));
=20
-		echo '<h2 class=3D"info"> Enregistrement </h2>';
-		echo "<h2 >" . _('Op=C3=A9ration sauv=C3=A9e') . " $internal ";
-		if ($Ledger->pj !=3D '')
-			echo ' Piece : ' . h($Ledger->pj);
-		echo "</h2>";
-		if (strcmp($Ledger->pj, $_POST['e_pj']) !=3D 0)
-		{
-			echo '<h3 class=3D"notice"> ' . _('Attention num=C3=A9ro pi=C3=A8ce e=
xistante, elle a du =C3=AAtre adapt=C3=A9e') . '</h3>';
-		}
+		echo '<h1> Enregistrement </h1>';
+		// echo "<h2 >" . _('Op=C3=A9ration sauv=C3=A9e') . " $internal ";
+		// if ($Ledger->pj !=3D '')
+		//	echo ' Piece : ' . h($Ledger->pj);
+		// echo "</h2>";
+		// if (strcmp($Ledger->pj, $_POST['e_pj']) !=3D 0)
+		// {
+		//	echo '<h3 class=3D"notice"> ' . _('Attention num=C3=A9ro pi=C3=A8ce=
 existante, elle a du =C3=AAtre adapt=C3=A9e') . '</h3>';
+		// }
 		/* Save the additional information into jrn_info */
 		$obj =3D new Acc_Ledger_Info($cn);
 		$obj->save_extra($Ledger->jr_id, $_POST);
-		printf('<a class=3D"line" style=3D"display:inline" href=3D"javascript:=
modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), $internal);
+		//printf('<a class=3D"line" style=3D"display:inline" href=3D"javascrip=
t:modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), $internal);
 		// Feedback
 		echo $Ledger->confirm($_POST, true);
 		if (isset($Ledger->doc))
 		{
-                     echo '<span class=3D"invoice">';
+                     echo '<h2>Document</h2>';
                      echo $Ledger->doc;
-                     echo '</span>';
 		}
=20
 		echo '</div>';
@@ -239,4 +236,5 @@
=20
=20
 exit();
-// end record invoice
\ No newline at end of file
+// end record invoice
+?>
\ No newline at end of file

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2013-08-28 16:22:06 UTC (r=
ev 5359)
+++ phpcompta/trunk/include/compta_ven.inc.php	2013-08-28 17:13:04 UTC (r=
ev 5360)
@@ -74,7 +74,6 @@
             echo_warning("Attention, cette op=C3=A9ration n'est pas enco=
re sauv=C3=A9e : vous devez encore confirmer");
=20
=20
-			echo '<div class=3D"content">';
             echo '<form class=3D"print" enctype=3D"multipart/form-data" =
method=3D"post">';
             echo dossier::hidden();
             echo $Ledger->confirm($_POST );
@@ -92,7 +91,6 @@
             echo '</form>';
=20
             echo '</div>';
-            echo '</div>';
             exit();
         }
     }



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


From MAILER-DAEMON Wed Aug 28 14:17:37 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VEkJF-0008HS-Fm
	for mharc-phpcompta-dev@gnu.org; Wed, 28 Aug 2013 14:17:37 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 28 Aug 2013 20:08:26 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.15853.1377713857.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5361 - phpcompta/trunk/html
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 18:17:36 -0000

Author: danydb
Date: 2013-08-28 20:08:25 +0200 (Wed, 28 Aug 2013)
New Revision: 5361

Modified:
   phpcompta/trunk/html/style.css
Log:
blank line

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-28 17:13:04 UTC (rev 5360)
+++ phpcompta/trunk/html/style.css	2013-08-28 18:08:25 UTC (rev 5361)
@@ -1168,4 +1168,7 @@
 }
 div.menu3 {
    =20
+}
+#go_submit_id {
+    font-size:116%;
 }
\ No newline at end of file



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


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

Author: danydb
Date: 2013-08-28 22:22:24 +0200 (Wed, 28 Aug 2013)
New Revision: 5362

Modified:
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/compta_ven.inc.php
Log:
am?\195?\169liore apparence

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-28 18:08:25 UTC (rev 5361)
+++ phpcompta/trunk/html/style.css	2013-08-28 20:22:24 UTC (rev 5362)
@@ -2,7 +2,6 @@
=20
 BODY {
     background-color:#EDF3FF;
-    font-size:95%;
     font-family:verdana,sans-serif,helvetica;
     padding: 0px 0px 0px 0px ;
     margin:0;
@@ -44,6 +43,9 @@
     font-family:verdana,sans-serif,helvetica;
     font-size:120%;
     color:grey;
+    margin:1px;
+    padding:1px;
+    font-style: italic;
 }
 div.info {
     background:#879ed4;
@@ -284,18 +286,16 @@
=20
 tr.odd {
     background-color:#DDE6FF;
-    font-size:90%;
+    font-size:75%;
 }
-tr {
-    font-size:90%;
+tr.even {
+  font-size:75%;
 }
 td.odd{
     background-color:#DDE6FF ;
-    font-size:90%;
 }
 td.even{
     border:0px;
-    font-size:90%;
 }
 td.cell{
     height:32px;
@@ -312,14 +312,13 @@
     width:120px;
 }
 a.mtitle {
-    font-size:90%;
     text-decoration:none;
     display:inline;
     color: blue;
=20
 }
 a.mtitle:hover {
-    font-size:90%;
+    font-size:110%;
     text-decoration:none;
     display:inline;
=20
@@ -1171,4 +1170,7 @@
 }
 #go_submit_id {
     font-size:116%;
+}
+.decale {
+    margin-left:30px;
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-08-28 18:08:25 UTC =
(rev 5361)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-08-28 20:22:24 UTC =
(rev 5362)
@@ -664,9 +664,9 @@
 		$r.=3D'<th>Pi=C3=A8ce</td>';
 		$r.=3Dth('tiers');
 		$r.=3D'<th>Description</th>';
-		$r.=3Dth('Notes', ' style=3D"width:15%"');
+		$r.=3Dth('Notes', ' ');
 		$r.=3D'<th>Montant</th>';
-		$r.=3D"<th>" . _('Op. Concern=C3=A9e') . "</th>";
+		$r.=3D"<th>" . _('Concerne') . "</th>";
 		$r.=3D"</tr>";
 		// Total Amount
 		$tot =3D 0.0;
@@ -862,7 +862,7 @@
 		{
 			$r.=3D"<th> " . _('Pay=C3=A9') . "</th>";
 		}
-		$r.=3D"<th>" . _('Op. Concern=C3=A9e') . "</th>";
+		$r.=3D"<th>" . _('Concerne') . "</th>";
 		$r.=3D"<th>" . _('Document') . "</th>";
 		$r.=3D"</tr>";
 		// Total Amount

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-08-28 18:0=
8:25 UTC (rev 5361)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-08-28 20:2=
2:24 UTC (rev 5362)
@@ -1272,7 +1272,7 @@
         }
         $date_limit=3D$lPeriode->get_date_limit();
         $r=3D"";
-        $r.=3D'<TABLE  width=3D"100%">';
+        $r.=3D'<TABLE>';
         if ( $p_summary ) {
             $jr_id=3D$this->db->get_value('select jr_id from jrn where j=
r_internal=3D$1',array($this->internal));
             $r.=3D"<tr>";
@@ -1319,7 +1319,8 @@
         $r.=3D'</tr>';
         $r.=3D'</table>';
         $r.=3D'<h2>' . _('D=C3=A9tail articles achet=C3=A9s') . '</h2>';
-        $r.=3D'<table class=3D"result" border=3D"0">';
+        $r.=3D'<p class=3D"decale">';
+        $r.=3D'<table class=3D"result" >';
         $r.=3D'<TR>';
         $r.=3D"<th>" . _('Code') . "</th>";
         $r.=3D"<th>" . _('D=C3=A9nomination') . "</th>";
@@ -1466,9 +1467,11 @@
=20
=20
         $r.=3D'</table>';
+        $r.=3D'</p>';
         if ( $g_parameter->MY_ANALYTIC!=3D'nu' && !$p_summary) // use of=
 AA
             $r.=3D'<input type=3D"button" class=3D"button" value=3D"'._(=
'V=C3=A9rifiez imputation analytique').'" onClick=3D"verify_ca(\'\');">';
         $r.=3D'<h2>Totaux</h2>';
+        $r.=3D'<p class=3D"decale">';
         $tot =3D round(bcadd($tot_amount, $tot_tva), 2);
         /* use VAT */
         if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
@@ -1488,7 +1491,7 @@
         } else {
             $r.=3D'<br>Total '.nbm(hb($tot));
         }
-      =20
+        $r.=3D'</p>';
         /*  Add hidden */
         $r.=3DHtmlInput::hidden('e_client',$e_client);
         $r.=3DHtmlInput::hidden('nb_item',$nb_item);
@@ -1532,7 +1535,7 @@
             if ($p_summary =3D=3D true)
                 $sel->selected =3D $repo;
             $r.=3D'<h2>D=C3=A9p=C3=B4t</h2>';
-            $r.=3D"<p> Dans le d=C3=A9p=C3=B4t : ";
+            $r.=3D"<p class=3D\"decale\"> Dans le d=C3=A9p=C3=B4t : ";
             $r.=3D$sel->input();
             $r.=3D'</p>';
         }
@@ -1551,7 +1554,7 @@
 					'<p>'._('D=C3=A9duction acompte ').h($acompte).'</p>'.
 					_('Libell=C3=A9 :' ).h($e_comm_paiement).'</div>';*/
             $r.=3D'<h2>' . "Pay=C3=A9 par " . ${'e_mp_qcode_' . $e_mp} .
-                    " " . $fname->getName() . '</H2> ' . '<p>' . _('D=C3=
=A9duction acompte ') . h($acompte) . '</p>' .
+                    " " . $fname->getName() . '</H2> ' . '<p class=3D"de=
cale">' . _('D=C3=A9duction acompte ') . h($acompte) . '</p>' .
                     _('Libell=C3=A9 :') . h($e_comm_paiement) ;
             $r.=3D'<br>';
             $r.=3D'<br>';
@@ -1571,6 +1574,7 @@
     {
         $r=3D"";
         $r.=3D'<h2> Facturation</h2>';
+        $r.=3D'<p class=3D"decale">';
         // check for upload piece
         $file=3Dnew IFile();
         $file->table=3D0;
@@ -1593,6 +1597,7 @@
         $obj=3Dnew IText();
         $r.=3D_('Numero de bon de commande : ').$obj->input('bon_comm').=
'<br>';
         $r.=3D_('Autre information : ').$obj->input('other_info').'<br>'=
;
+        $r.=3D'</p>';
         return $r;
     }
=20

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-28 18:08:25=
 UTC (rev 5361)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-28 20:22:24=
 UTC (rev 5362)
@@ -613,7 +613,8 @@
         }
         $date_limit =3D $lPeriode->get_date_limit();
         $r =3D "";
-        $r.=3D'<TABLE  width=3D"100%">';
+       =20
+        $r.=3D'<TABLE>';
         if ( $p_summary ) {
             $jr_id=3D$this->db->get_value('select jr_id from jrn where j=
r_internal=3D$1',array($this->internal));
             $r.=3D"<tr>";
@@ -660,7 +661,8 @@
         $r.=3D'</tr>';
         $r.=3D'</table>';
         $r.=3D'<h2>' . _('D=C3=A9tail articles vendus') . '</h2>';
-        $r.=3D'<table class=3D"result" border=3D"0">';
+        $r.=3D'<p class=3D"decale">';
+        $r.=3D'<table class=3D"result" >';
         $r.=3D'<TR>';
         $r.=3D"<th>" . _('Code') . "</th>";
         $r.=3D"<th>" . _('D=C3=A9nomination') . "</th>";
@@ -784,9 +786,11 @@
=20
=20
         $r.=3D'</table>';
+        $r.=3D'</p>';
         if ($g_parameter->MY_ANALYTIC !=3D 'nu' && ! $p_summary) // use =
of AA
             $r.=3D'<input type=3D"button" class=3D"button" value=3D"' . =
_('V=C3=A9rifiez Imputation Analytique') . '" onClick=3D"verify_ca(\'\');=
">';
         $r.=3D'<h2>Totaux</h2>';
+        $r.=3D'<p class=3D"decale">';
         $tot =3D round(bcadd($tot_amount, $tot_tva), 2);
         /* use VAT */
         if ($g_parameter->MY_TVA_USE =3D=3D 'Y') {
@@ -806,7 +810,7 @@
         } else {
             $r.=3D'<br>Total '.nbm(hb($tot));
         }
-      =20
+       $r.=3D'</p>';
         if (!$p_summary) {
             $r.=3D$this->extra_info();
         }
@@ -838,7 +842,7 @@
             if ($p_summary =3D=3D true)
                 $sel->selected =3D $repo;
             $r.=3D'<h2>D=C3=A9p=C3=B4t</h2>';
-            $r.=3D"<p> Dans le d=C3=A9p=C3=B4t : ";
+            $r.=3D"<p class=3D\"decale\"> Dans le d=C3=A9p=C3=B4t : ";
             $r.=3D$sel->input();
             $r.=3D'</p>';
         }
@@ -854,7 +858,7 @@
             $fname =3D new Fiche($this->db);
             $fname->get_by_qcode(${'e_mp_qcode_' . $e_mp});
             $r.=3D'<h2>' . "Pay=C3=A9 par " . ${'e_mp_qcode_' . $e_mp} .
-                    " " . $fname->getName() . '</H2> ' . '<p>' . _('D=C3=
=A9duction acompte ') . h($acompte) . '</p>' .
+                    " " . $fname->getName() . '</H2> ' . '<p class=3D"de=
cale">' . _('D=C3=A9duction acompte ') . h($acompte) . '</p>' .
                     _('Libell=C3=A9 :') . h($e_comm_paiement) ;
             $r.=3D'<br>';
         }
@@ -887,6 +891,7 @@
         // check for upload piece
         $file =3D new IFile();
         $file->table =3D 0;
+        $r.=3D'<p class=3D"decale">';
         $r.=3D_("Ajoutez une pi=C3=A8ce justificative ");
         $r.=3D$file->input("pj", "");
=20
@@ -906,7 +911,7 @@
         $obj =3D new IText();
         $r.=3D_('Numero de bon de commande : ') . $obj->input('bon_comm'=
) . '<br>';
         $r.=3D_('Autre information : ') . $obj->input('other_info') . '<=
br>';
-
+        $r.=3D'</p>';
         return $r;
     }
=20

Modified: phpcompta/trunk/include/compta_ach.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ach.inc.php	2013-08-28 18:08:25 UTC (r=
ev 5361)
+++ phpcompta/trunk/include/compta_ach.inc.php	2013-08-28 20:22:24 UTC (r=
ev 5362)
@@ -69,12 +69,14 @@
=20
 		echo $Ledger->confirm($_POST);
 		echo HtmlInput::hidden('ac', $_REQUEST['ac']);
-		echo '<div style=3D"float:left;clear:both">';
+		echo '<div style=3D"clear:both">';
=20
                 echo "<h2>Mod=C3=A8le d'op=C3=A9ration</h2>";
+                echo '<p class=3D"decale">';
                 echo "Donnez un nom pour sauver cette op=C3=A9ration com=
me mod=C3=A8le <br>";
 		$opd_name =3D new IText('opd_name');
 		echo "Nom du mod=C3=A8le " . $opd_name->input();
+                echo '</p>';
                 echo '</div>';
 		echo HtmlInput::submit("record", _("Enregistrement"), 'onClick=3D"retu=
rn verify_ca(\'\');"');
 		echo HtmlInput::submit('correct', _("Corriger"));

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2013-08-28 18:08:25 UTC (r=
ev 5361)
+++ phpcompta/trunk/include/compta_ven.inc.php	2013-08-28 20:22:24 UTC (r=
ev 5362)
@@ -81,9 +81,11 @@
 	    echo '<div style=3D"clear:both">';
            =20
             echo "<h2>Mod=C3=A8le d'op=C3=A9ration</h2>";
+            echo '<p class=3D"decale">';
             echo "Donnez un nom pour sauver cette op=C3=A9ration comme m=
od=C3=A8le <br>";
 	    $opd_name=3Dnew IText('opd_name');
 	    echo "Nom du mod=C3=A8le ".$opd_name->input();
+            echo '</p>';
 	    echo '</div>';
 	    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
             echo HtmlInput::submit("record",_("Enregistrement"),'onClick=
=3D"return verify_ca(\'\');"');



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


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

Author: danydb
Date: 2013-08-28 22:29:03 +0200 (Wed, 28 Aug 2013)
New Revision: 5363

Modified:
   phpcompta/trunk/html/style.css
Log:
am?\195?\169liore apparence

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-28 20:22:24 UTC (rev 5362)
+++ phpcompta/trunk/html/style.css	2013-08-28 20:29:03 UTC (rev 5363)
@@ -134,6 +134,20 @@
     float:right;
     margin-right:10px;
 }
+td.tool a.mtitle {
+    text-decoration:none;
+    display:inline;
+    color: blue;
+    font-size:75%;
+}
+td.tool a.mtitle:hover {
+    text-decoration:none;
+    display:inline;
+    font-size:75%;
+    color: darkblue;
+    background-color:#5D90CD;
+
+}
 #top {
     float:left;
     margin-bottom: 0.9512%;



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


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

Author: danydb
Date: 2013-08-28 23:23:50 +0200 (Wed, 28 Aug 2013)
New Revision: 5364

Modified:
   phpcompta/trunk/html/style.css
Log:
add popmeout

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-28 20:29:03 UTC (rev 5363)
+++ phpcompta/trunk/html/style.css	2013-08-28 21:23:50 UTC (rev 5364)
@@ -1082,6 +1082,20 @@
 {
     background-color: orange;
 }
+#popmeout
+{
+    background-color:white;
+    color:blue;
+    text-decoration:none;
+    border:1px solid blue;
+    margin-left: 2px;
+    margin-right:18px;
+    font-size:85%;
+}
+#popmeout:hover
+{
+    background-color: orange;
+}
 table.table_large tr.odd ,table.table_large tr.even {
=20
     height:32px;



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


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

Author: danydb
Date: 2013-08-28 23:25:58 +0200 (Wed, 28 Aug 2013)
New Revision: 5365

Modified:
   phpcompta/trunk/include/class_itextarea.php
   phpcompta/trunk/include/class_user.php
Log:
am?\195?\169liore apparence

Modified: phpcompta/trunk/include/class_itextarea.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_itextarea.php	2013-08-28 21:23:50 UTC (=
rev 5364)
+++ phpcompta/trunk/include/class_itextarea.php	2013-08-28 21:25:58 UTC (=
rev 5365)
@@ -31,8 +31,8 @@
     {
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
-		if ( !isset ($this->style )) $this->style=3D' style=3D"border:solid bl=
ue 1px" ';
-		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+	if ( !isset ($this->style )) $this->style=3D' style=3D"border:solid blu=
e 1px" ';
+	$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2013-08-28 21:23:50 UTC (rev 5=
364)
+++ phpcompta/trunk/include/class_user.php	2013-08-28 21:25:58 UTC (rev 5=
365)
@@ -935,7 +935,7 @@
 		if ($p_array =3D=3D 0)
 			return $result . " * Aucun dossier *";
=20
-		$result.=3D"<TABLE id=3D\"folder\" style=3D\"width:auto;border-width:0=
px;border-collapse:collapse;\">";
+		$result.=3D"<TABLE id=3D\"folder\" style=3D\"font-size:154%;width:auto=
;border-width:0px;border-collapse:collapse;\">";
 		for ($i =3D 0; $i < sizeof($p_array); $i++)
 		{
=20



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


From MAILER-DAEMON Fri Aug 30 10:06:50 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFPLe-0003lI-0O
	for mharc-phpcompta-dev@gnu.org; Fri, 30 Aug 2013 10:06:50 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 30 Aug 2013 15:57:40 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.19203.1377871609.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5366 - in phpcompta/trunk: html html/image include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 14:06:48 -0000

Author: danydb
Date: 2013-08-30 15:57:39 +0200 (Fri, 30 Aug 2013)
New Revision: 5366

Modified:
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/html/ajax_history.php
   phpcompta/trunk/html/ajax_poste.php
   phpcompta/trunk/html/image/search.png
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_anc_table.php
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/class_ibutton.php
   phpcompta/trunk/include/class_icard.php
   phpcompta/trunk/include/class_iposte.php
   phpcompta/trunk/include/class_itextarea.php
   phpcompta/trunk/include/class_itva_popup.php
   phpcompta/trunk/include/class_pre_operation.php
   phpcompta/trunk/include/class_user.php
   phpcompta/trunk/include/fiche.inc.php
   phpcompta/trunk/include/operation_ods_new.inc.php
   phpcompta/trunk/include/template/anc_balance_group.php
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/include/template/detail-action.php
   phpcompta/trunk/include/verif_bilan.inc.php
Log:
am?\195?\169liore apparence

Modified: phpcompta/trunk/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_card.php	2013-08-28 21:25:58 UTC (rev 5365)
+++ phpcompta/trunk/html/ajax_card.php	2013-08-30 13:57:39 UTC (rev 5366)
@@ -332,7 +332,7 @@
 	$r.=3D'<span style=3D"margin-left:50px">';
     $r.=3D_('Fiche contenant').HtmlInput::infobulle(19);
     $r.=3D$q->input();
-    $r.=3DHtmlInput::submit('fs',_('Recherche'));
+    $r.=3DHtmlInput::submit('fs',_('Recherche'),"","smallbutton");
 	$r.=3D'</span>';
     $r.=3Ddossier::hidden().HtmlInput::hidden('op','fs');
     $array=3Darray();

Modified: phpcompta/trunk/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/trunk/html/ajax_history.php	2013-08-28 21:25:58 UTC (rev 53=
65)
+++ phpcompta/trunk/html/ajax_history.php	2013-08-30 13:57:39 UTC (rev 53=
66)
@@ -107,7 +107,7 @@
         require_once('template/history_top.php');
 	$detail_card=3DHtmlInput::card_detail($fiche->strAttribut(ATTR_DEF_QUIC=
KCODE),$fiche->getName());
 	echo h2info(  $fiche->getName().'['.$fiche->strAttribut(ATTR_DEF_QUICKC=
ODE).']');
-	echo '<p style=3D"text-align:center;font-size:125%">'.$detail_card.'</p=
>';
+	echo '<p style=3D"text-align:center;">'.$detail_card.'</p>';
=20
 	if (   $fiche->HtmlTable($array,0,$from_div)=3D=3D-1){
 	  echo h2("Aucune op=C3=A9ration pour l'exercice courant",'class=3D"err=
or"');

Modified: phpcompta/trunk/html/ajax_poste.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_poste.php	2013-08-28 21:25:58 UTC (rev 5365=
)
+++ phpcompta/trunk/html/ajax_poste.php	2013-08-30 13:57:39 UTC (rev 5366=
)
@@ -80,7 +80,7 @@
     $it->size=3D30;
     $it->value=3D(isset($q))?$q:'';
     $str_poste=3D$it->input();
-    $str_submit=3DHtmlInput::submit('sf',_('Recherche'));
+    $str_submit=3DHtmlInput::submit('sf',_('Recherche'),"","smallbutton"=
);
     $r=3D'';
 	$r=3DHtmlInput::anchor_close('search_account');
     $r.=3D'<div> '.h2info(_('Poste Comptable')).'</div>';

Modified: phpcompta/trunk/html/image/search.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-28 21:25:58 UTC (rev 5365)
+++ phpcompta/trunk/html/style.css	2013-08-30 13:57:39 UTC (rev 5366)
@@ -2,10 +2,11 @@
=20
 BODY {
     background-color:#EDF3FF;
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     padding: 0px 0px 0px 0px ;
     margin:0;
     color:blue;
+    font-size:1em;
 }
 .notice {
     color:red;
@@ -21,17 +22,17 @@
=20
 }
 table.resultfooter tfoot {
-    font-size:110%;
+   font-size:0.57em;
     font-weight: bold;
=20
=20
 }
 table.sortable th,  table.table_large th,table.result th {
     font-weight:bold;
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     border-bottom:1px solid blue;
     border-top:0;
-    font-size:90%;
+    font-size:0.75em;;
=20
     color:#25238F;
     text-align: left;
@@ -40,8 +41,8 @@
 }
=20
 h2 {
-    font-family:verdana,sans-serif,helvetica;
-    font-size:120%;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:1.35em;
     color:grey;
     margin:1px;
     padding:1px;
@@ -50,14 +51,14 @@
 div.info {
     background:#879ed4;
     color:white;
-    font-size:120%;
+    font-size:0.87em;
     text-align:center;
 }
=20
 content h2.info {
     background:#879ed4;
     color:black;
-    font-size:120%;
+    font-size:0.87em;
     text-align:center;
     padding:0px;
     margin:0px;
@@ -65,7 +66,7 @@
 redcontent h2.info {
     background:#879ed4;
     color:white;
-    font-size:120%;
+    font-size:0.87em;
     text-align:center;
     padding:0px;
     margin:0px;
@@ -73,7 +74,7 @@
 h2.info {
     background-color:#879ed4;
     color:white;
-    font-size:120%;
+    font-size:1.34em;
     text-align:center;
     padding:0px;
     margin:0px;
@@ -84,13 +85,13 @@
 h3.info {
     background:#879ed4;
     color:white;
-    font-size:120%;
+    font-size:0.87em;
     text-align:center;
 }
=20
 h2.info2 {
     color:blue;
-    font-size:100%;
+    font-size:1em;;
     text-align:center;
=20
 }
@@ -99,7 +100,7 @@
 h2.error {
     background:red;
     color:white;
-    font-size:120%;
+    font-size:0.87em;
 }
=20
=20
@@ -138,12 +139,13 @@
     text-decoration:none;
     display:inline;
     color: blue;
-    font-size:75%;
+    font-size:0.75em;
+   =20
 }
 td.tool a.mtitle:hover {
     text-decoration:none;
     display:inline;
-    font-size:75%;
+    font-size:0.75em;;
     color: darkblue;
     background-color:#5D90CD;
=20
@@ -169,14 +171,14 @@
 div.lmenu {
     float:left;
     clear:left;
-    font-size:90%;
+    font-size:0.75em;;
=20
 }
 div.lextmenu {
=20
     float:left;
-    font-family:verdana,sans-serif,helvetica;
-    font-size:90%;
+    font-family:arial,verdana,sans-serif,helvetica;
+    font-size:0.75em;;
=20
 }
 div.searchmenu {
@@ -189,8 +191,8 @@
=20
 div.recherche_form{
     width:700px;
-    font-size:90%;
-    font-family:verdana,sans-serif,helvetica;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
     border-style:outset;
     border-width:1px;
=20
@@ -200,8 +202,8 @@
     float:left;
     padding-top:7px;
     padding-left:8px;
-    font-size:90%;
-    font-family:verdana,sans-serif,helvetica;
+    font-size:0.75em;;
+    font-family:arial,verdana,sans-serif,helvetica;
     width:75%;
=20
 }
@@ -209,7 +211,7 @@
     padding-top:0.0030%;
     margin-top:0.0030%;
     width:100%;
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
=20
=20
 }
@@ -218,12 +220,12 @@
     float:left;
     padding-top:7px;
     width:35%;
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
=20
 }
 div.no span{
     position:static;
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     font-weight:bold;
     color:red;
=20
@@ -238,7 +240,7 @@
 }
 table.document th{
     font-weight:bold;
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     border-bottom:2px solid blue;
     border-top:0;
     color:#25238F;
@@ -254,7 +256,7 @@
     color:white;
     background-color:red;
     font-weight: bolder;
-    font-size:120%;
+    font-size:0.87em;
 }
=20
 table.mtitle {
@@ -273,20 +275,21 @@
     text-align:center;
     width:95px;
     height :30px;
-    font-size:90%;
+    font-size:0.75em;;
     background-color:#DDE6FF;
     border:1px solid #99B1DF;
+    border-radius:5px;
 }
 td.msubtitle {
     text-align:center;
     height:20px;
-    font-size:90%;
+    font-size:0.75em;;
     background-color:#DDE6FF;
 }
 span.mtitle {
     color:gray;
     background-color:blue;
-    font-size:90%;
+    font-size:0.75em;;
     border-style:groove
 }
 span.odd {
@@ -300,10 +303,10 @@
=20
 tr.odd {
     background-color:#DDE6FF;
-    font-size:75%;
+    font-size:0.87em;;
 }
 tr.even {
-  font-size:75%;
+  font-size:0.87em;;
 }
 td.odd{
     background-color:#DDE6FF ;
@@ -314,16 +317,19 @@
 td.cell{
     height:32px;
     padding: 1px;
+   =20
 }
 td.selectedcell{
     border-style:inset;
     border-color:blue;
     border-width:1pt ;
-    font-size:90%;
+    font-size:1.2em;
+    font-weight: bold;
     background:#5D90CD ;
     color:white;
     text-align:center;
     width:120px;
+    border-radius:5px;
 }
 a.mtitle {
     text-decoration:none;
@@ -332,7 +338,6 @@
=20
 }
 a.mtitle:hover {
-    font-size:110%;
     text-decoration:none;
     display:inline;
=20
@@ -341,13 +346,13 @@
=20
 }
 td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
-    font-size:90%;
+    font-size:0.75em;;
     text-decoration:none;
     display:block;
     color:white;
 }
 a.dossier {
-    font-size:90%;
+    font-size:0.75em;;
     text-decoration:none;
     display:block;
     color: #202267;
@@ -380,11 +385,11 @@
     display:block;
     color:blue;
     background-color:white;
-    font-size:90%;
+    font-size:0.75em;;
 }
=20
 a.cell:hover {
-    font-size:90%;
+    font-size:0.75em;;
     color:white;
     background-color:#5D90CD;
     text-decoration:none;
@@ -414,8 +419,8 @@
=20
 a.detail
 {
-    font-size:90%;
-    font-family:verdana,sans-serif,helvetica;
+    font-size:0.87em;;
+    font-family:arial,verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -423,8 +428,8 @@
=20
 a.detail:hover
 {
-    font-size:90%;
-    font-family:verdana,sans-serif,helvetica;
+/*    font-size:0.75em;; */
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -436,7 +441,7 @@
     padding:1em 1em;
 }
 div.redcontent a {
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -444,7 +449,7 @@
 }
=20
 div.redcontent a:hover {
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -452,7 +457,7 @@
=20
 }
 div.content a {
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     text-decoration: none;
     display: block;
     color: blue;
@@ -462,7 +467,7 @@
=20
=20
 div.content a:hover {
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     color: white;
     background-color: rgb(93, 144, 205);
     text-decoration: none;
@@ -488,7 +493,6 @@
=20
 }
 div.content a.mtitle {
-    font-size:90%;
     text-decoration:none;
     display:inline;
     color:blue;
@@ -506,7 +510,7 @@
=20
 }
 div.redcontent input.text {
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     font-weight:normal;
     border-color:336699;
     border-style:solid;
@@ -515,7 +519,7 @@
     color:blue;
 }
 div.content input.text {
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     font-weight:normal;
     border-color:336699;
     border-style:solid;
@@ -539,9 +543,9 @@
     color: #1a207d;
     border-collapse:collapse;
 }
-a.document{
-    font-size:90%;
-    text-decoration:none;
+div.content a.document, a.document{
+/*    font-size:0.75em;;*/
+    text-decoration:underline;
     display:block;
 }
 a.document:hover {
@@ -568,11 +572,11 @@
 h1.legend, legend {
     font-weight: bold;
     font-style: italic;
-    font-size: 120% ;
+    font-size: 1.2em ;
=20
 }
 fieldset fieldset legend {
-    font-size:120%;
+    font-size:0.87em;
     color:grey;
 }
 select {
@@ -614,7 +618,7 @@
     padding-left: 3px;
     padding-right:3px;
     text-decoration:none;
-    font-size:120%;
+    font-size:0.87em;
=20
     display:inline;
     color:black;
@@ -651,8 +655,8 @@
     /*border:dotted 1px black;*/
     border: 2px outset #201e87;
     background-color:#879ED4;
-    font-size: 90% ;
-    font-family: verdana,sans-serif,helvetica;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
     font-style: italic;
     font-weight: bolder;
     text-align:center;
@@ -674,7 +678,7 @@
     /*border:dotted 1px black;*/
     border: 3px outset #201e87;
     background-color: #879ED4;
-    font-family: verdana,sans-serif,helvetica;
+    font-family: arial,verdana,sans-serif,helvetica;
     font-style: italic;
     font-weight: bolder;
     text-align:center;
@@ -695,8 +699,8 @@
     height:96%;
     overflow: auto;
     background-color:#DFE7FF;
-    font-size:90% ;
-    font-family: verdana,sans-serif,helvetica;
+    font-size:0.75em; ;
+    font-family: arial,verdana,sans-serif,helvetica;
     font-style: normal;
     font-weight: normal;
     color: black;
@@ -713,7 +717,7 @@
     margin:0;
     padding:0;
     text-align:left;
-    font-size:90%;
+    font-size:0.75em;;
=20
 }
 div.autocomplete em {
@@ -738,7 +742,7 @@
     /*height:32px;*/
     cursor:pointer;
 }
-span.informal{ font-size:90%; color:black;}
+span.informal{ font-size:0.75em;; color:black;}
=20
 ul.select_table  {
     /*padding:5px;*/
@@ -820,25 +824,22 @@
 a#anchorbutton, .button, a.button,div.content a.button {
     color:white;
     font-weight: bold;
-    font-size:87%;
+    font-size:0.87em;
     text-decoration:none;
-    font-family: verdana,sans-serif,helvetica;
+    font-family: arial,verdana,sans-serif,helvetica;
     background-image: url("image/bg-submit2.gif");
     background-repeat: repeat-x;
     background-position: left;
=20
     border-style:  outset ;
     border-color:  blue ;
-    border-width:0;
-    padding-bottom: 4;
-    padding-top: 4;
-    padding-right: 6;
-    padding-left:  6;
+    border-width:0px;
+    padding:8px;
     margin-top:3px;
     cursor:pointer;
     margin:1 2 1 2;
-    border-radius: 4px;
-    moz-border-radius:4px;
+    border-radius: 5px;
+    moz-border-radius:5px;
=20
 }
 a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:=
hover  {
@@ -849,11 +850,44 @@
     margin:1 2 1 2;
=20
 }
+a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutt=
on {
+    color:white;
+    font-weight: bold;
+    font-size:0.75em;
+    text-decoration:none;
+    font-family: arial,verdana,sans-serif,helvetica;
+    background-image: url("image/bg-submit2.gif");
+    background-repeat: repeat-x;
+    background-position: left;
+
+    border-style:  outset ;
+    border-color:  blue ;
+    border-width:0;
+    padding-bottom: 3px;
+    padding-top: 3px;
+    padding-right: 3px;
+    padding-left:  3px;
+    margin-top:3px;
+    cursor:pointer;
+    margin:1 2 1 2;
+    border-radius: 2px;
+    moz-border-radius:2px;
+
+}
+a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.co=
ntent a.smallbutton:hover  {
+    cursor:pointer;
+    background-color:white;
+    border-style:  inset ;
+    color:red;
+    margin:1 2 1 2;
+
+}
 td.tool {
     border: solid 1px gray;
     background-color: white;
     border-bottom-width: 2px;
     text-align:center;
+    border-radius:2px;
 }
 div.topmenu {
=20
@@ -862,7 +896,7 @@
 #dossier h2{
     color:darkblue;
     display:inline;
-    font-size:120%;
+    font-size:2em;
     margin:0px;
     padding:0px;
     font-variant:small-caps;
@@ -877,7 +911,6 @@
     text-align:left;
     z-index:1;
     width:17.9687%;
-    font-size:95%;
 }
 div.welcome {
=20
@@ -903,8 +936,7 @@
 }
 div.inner_box  {
     background-color:#e4e7ed;
-    font-size:90%;
-    font-family:verdana,sans-serif,helvetica;
+    font-family:arial,verdana,sans-serif,helvetica;
     padding:0;
     margin:0;
     overflow:hidden;
@@ -966,24 +998,24 @@
 }
 table.info_op
 {
-    font-size:90%;
+//    font-size:0.75em;;
     width:100%;
 }
 table.info_op tr
 {
-    font-size:120%;
+  //  font-size:0.87em;
     background:white;
 }
 h2#jrn_name
 {
     color:darkgrey;
-    font-size:274%;
+    font-size:2.74em;
     margin-right:30%;
     float: right;
=20
 }
 tr.footer{
-    font-size:120%;
+    font-size:0.87em;
     font-style: italic;
     font-weight: bold;
=20
@@ -1009,7 +1041,7 @@
 {
     display:inline;
     float:left;
-    font-size:75%;
+    font-size:0.75em;;
 }
 #calc
 {
@@ -1019,8 +1051,8 @@
 div#wait_box
 {
     background-color:#F1E6E6;
-    font-size:120%;
-    font-family: verdana,helvetica,arial,sans-serif;
+    font-size:0.87em;
+    font-family: arial,verdana,helvetica,arial,sans-serif;
     padding:0;
     margin:0;
     overflow:hidden;
@@ -1054,14 +1086,14 @@
 }
 a.line,div.content a.line
 {
-    font-size:110%;
+   font-size:0.87em;
     text-decoration:underline;
     display:inline;
     color: #0000ff;
 }
 a.line:hover,div_content a.line
 {
-    font-size:110%;
+   font-size:0.57em;
     text-decoration:underline;
     display:inline;
     color: #0000ff;
@@ -1076,7 +1108,7 @@
     margin-left: 2px;
     margin-right:2px;
     margin-top:0px;
-    font-size:85%;
+    font-size:0.75em;
 }
 #close_div:hover
 {
@@ -1090,7 +1122,7 @@
     border:1px solid blue;
     margin-left: 2px;
     margin-right:18px;
-    font-size:85%;
+    font-size:0.75em;
 }
 #popmeout:hover
 {
@@ -1109,12 +1141,12 @@
     width:300px;
     border:1px solid black;
     background-color:#aec3e8;
-    font-size:120%;
+    font-size:0.87em;
     padding: 20px 20px;
 }
 span.invoice
 {
-    font-size: 120%;
+    font-size: 1.2em;
     font-style: italic;
     display:block;
     margin: 20px;
@@ -1123,14 +1155,14 @@
 a.nav,div.content a.nav,div.redcontent a.nav {
     display:inline;
     text-decoration:none;
-    font-size:90%;
+    font-size:0.75em;;
 }
 a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
     display:inline;
     text-decoration:none;
     background-color:darkblue;
     color:white;
-    font-size:90%;
+    font-size:0.75em;;
 }
 #dossier {
     display:inline;
@@ -1146,30 +1178,30 @@
=20
 h1.title {
     color: blue;
-    font-size:120%;
+    font-size:0.87em;
     font-style: italic;
 }
 h2.title {
     color: blue;
-    font-size:120%;
+    font-size:0.87em;
     font-weight:bold;
     font-style: italic;
     margin-left: 15px;
 }
 h3.title {
     color: blue;
-    font-size:120%;
+    font-size:0.87em;
     margin-left: 30px;
 }
 h4.title {
     color: blue;
-    font-size:120%;
+    font-size:0.87em;
     margin-left: 45px;
     text-decoration: underline;
 }
 h5.title {
     color: blue;
-    font-size:120%;
+    font-size:0.87em;
     margin-left: 45px;
     text-decoration: none;
     font-style: italic;
@@ -1180,6 +1212,7 @@
     margin-left:5px;
     margin-right: 5px;
     border:lightgrey 2px groove;
+    border-radius: 4px;
 }
 #info_div {
     display:none;
@@ -1191,14 +1224,30 @@
     left:45%;
 }
 div.menu2 a.mtitle{
-    font-size:85%;
+   =20
 }
 div.menu3 {
    =20
 }
 #go_submit_id {
-    font-size:116%;
+    font-size:1.25em;
 }
 .decale {
     margin-left:30px;
+}
+#folder {
+    font-size:1.4em;
+    width:auto;
+    border-width:0px;
+    border-collapse:separate;
+   =20
+   =20
+}
+/*#folder tr.odd,#folder tr.even {
+    font-size : 1.2em;
+}*/
+textarea.itextarea{
+    border:solid blue 1px;
+    width:90%;
+    margin-left:5%;
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-08-28 21:25:58 UTC =
(rev 5365)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-08-30 13:57:39 UTC =
(rev 5366)
@@ -718,7 +718,7 @@
 			$tmp_jr_comment =3D h($row['jr_comment']);
 			$r.=3D$tmp_jr_comment;
 			$r.=3D"</TD>";
-			$r.=3Dtd(h($row['n_text']), ' style=3D"font-size:90%"');
+			$r.=3Dtd(h($row['n_text']), ' style=3D"font-size:0.87em"');
 			// Amount
 			// If the ledger is financial :
 			// the credit must be negative and written in red
@@ -914,7 +914,7 @@
 			$tmp_jr_comment =3D h($row['jr_comment']);
 			$r.=3D$tmp_jr_comment;
 			$r.=3D"</TD>";
-			$r.=3Dtd(h($row['n_text']), ' style=3D"font-size:90%"');
+			$r.=3Dtd(h($row['n_text']), ' style=3D"font-size:0.87em%"');
 			// Amount
 			// If the ledger is financial :
 			// the credit must be negative and written in red
@@ -3079,7 +3079,7 @@
 				$op->od_direct =3D 't';
 				if ($op->count() !=3D 0)
 				{
-					echo HtmlInput::submit('use_opd', 'Utilisez une op=C3=A9ration pr&e=
acute;d&eacute;finie');
+					echo HtmlInput::submit('use_opd', 'Utilisez une op=C3=A9ration pr&e=
acute;d&eacute;finie',"","smallbutton");
 					echo $op->show_button();
 				}
 				echo '</form>';

Modified: phpcompta/trunk/include/class_anc_table.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_anc_table.php	2013-08-28 21:25:58 UTC (=
rev 5365)
+++ phpcompta/trunk/include/class_anc_table.php	2013-08-30 13:57:39 UTC (=
rev 5366)
@@ -174,7 +174,7 @@
 	  {
 	    echo td(nbm($tot_col[$i]),' class=3D"num"');
 	  }
-	echo td(nbm($tot_global),' class=3D"num" style=3D"font-size:130%;text-w=
eight:bold;border:solid 1px blue"');
+	echo td(nbm($tot_global),' class=3D"num" style=3D"font-size:1.3em;text-=
weight:bold;border:solid 1px blue"');
 	echo '</tr>';
 	echo '</table>';
       }
@@ -228,7 +228,7 @@
 	  {
 	    echo td(nbm($tot_col[$i]),' class=3D"num"');
 	  }
-	echo td(nbm($tot_global),' class=3D"num" style=3D"font-size:130%;text-w=
eight:bold;border:solid 1px blue"');
+	echo td(nbm($tot_global),' class=3D"num" style=3D"font-size:1.3em;text-=
weight:bold;border:solid 1px blue"');
 	echo '</tr>';
 	echo '</table>';
=20

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-08-28 21:25:58 UTC (rev =
5365)
+++ phpcompta/trunk/include/class_fiche.php	2013-08-30 13:57:39 UTC (rev =
5366)
@@ -367,7 +367,8 @@
         }
         return $return;
     }
-    /*!\brief make an array of attributes of the category of card (FICHE=
_DEF.FD_ID)
+    /**
+     * @brief make an array of attributes of the category of card (FICHE=
_DEF.FD_ID)
      *The array can be used with the function insert, it will return a s=
truct like this :
      * in the first key (av_textX),  X is the ATTR_DEF::AD_ID
     \verbatim

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-08-28 21:25:58 UTC =
(rev 5365)
+++ phpcompta/trunk/include/class_html_input.php	2013-08-30 13:57:39 UTC =
(rev 5366)
@@ -175,15 +175,15 @@
         $readonly=3D($this->readonly=3D=3Dfalse)?"false":"true";
         echo "read only".$readonly."<br>";
     }
-    static   function submit ($p_name,$p_value,$p_javascript=3D"")
+    static   function submit ($p_name,$p_value,$p_javascript=3D"",$p_cla=
ss=3D"button")
     {
=20
-        return '<INPUT TYPE=3D"SUBMIT" class=3D"button" NAME=3D"'.$p_nam=
e.'" ID=3D"'.$p_name.'_submit_id"  VALUE=3D"'.$p_value.'" '.$p_javascript=
.'>';
+        return '<INPUT TYPE=3D"SUBMIT" class=3D"'.$p_class.'" NAME=3D"'.=
$p_name.'" ID=3D"'.$p_name.'_submit_id"  VALUE=3D"'.$p_value.'" '.$p_java=
script.'>';
     }
-    static   function button ($p_name,$p_value,$p_javascript=3D"")
+    static   function button ($p_name,$p_value,$p_javascript=3D"",$p_cla=
ss=3D"button")
     {
=20
-        return '<INPUT TYPE=3D"button" class=3D"button" NAME=3D"'.$p_nam=
e.'" ID=3D"'.$p_name.'" VALUE=3D"'.$p_value.'" '.$p_javascript.'>';
+        return '<INPUT TYPE=3D"button" class=3D"'.$p_class.'" NAME=3D"'.=
$p_name.'" ID=3D"'.$p_name.'" VALUE=3D"'.$p_value.'" '.$p_javascript.'>';
     }
=20
     static function reset ($p_value)
@@ -718,7 +718,7 @@
 		$r=3D "
 			<span>
 			<input id=3D\"lk_".$p_table_id."\" class=3D\"input_text\" name=3D\"fi=
lter\" onkeyup=3D\"filter_table(this, '$p_table_id','$p_col',$start_row )=
\" type=3D\"text\">
-			<input type=3D\"button\" class=3D\"button\" onclick=3D\"$('lk_".$p_ta=
ble_id."').value=3D'';filter_table($('lk_".$p_table_id."'), '$p_table_id'=
,'$p_col',$start_row );\" value=3D\"X\">
+			<input type=3D\"button\" class=3D\"smallbutton\" onclick=3D\"$('lk_".=
$p_table_id."').value=3D'';filter_table($('lk_".$p_table_id."'), '$p_tabl=
e_id','$p_col',$start_row );\" value=3D\"X\">
 			</span>
 			";
 		return $r;

Modified: phpcompta/trunk/include/class_ibutton.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_ibutton.php	2013-08-28 21:25:58 UTC (re=
v 5365)
+++ phpcompta/trunk/include/class_ibutton.php	2013-08-30 13:57:39 UTC (re=
v 5366)
@@ -39,6 +39,7 @@
 		$tab=3D(isset($this->tabindex))?' tabindex=3D"'.$this->tabindex.'"':""=
;
         $r=3D'<input type=3D"BUTTON" name=3D"'.$this->name.'"'.
            ' class=3D"button" '.
+                $this->extra.
 				$tab.
            ' id=3D"'.$this->id.'"'.
            ' value=3D"'.$this->label.'"'.
@@ -87,3 +88,29 @@
     {
     }
 }
+class ISmallButton extends IButton
+{
+    var $label;
+    /*!\brief show the html  input of the widget*/
+    public function input($p_name=3Dnull,$p_value=3Dnull,$p_style=3Dnull=
)
+    {
+        $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
+        $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
+		$this->label=3D(trim($this->label) !=3D '')?$this->label:$this->value;
+        if ( $this->readOnly=3D=3Dtrue) return $this->display();
+        $extra=3D ( isset($this->extra))?$this->extra:"";
+        $this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
+		$tab=3D(isset($this->tabindex))?' tabindex=3D"'.$this->tabindex.'"':""=
;
+        $r=3D'<input type=3D"BUTTON" name=3D"'.$this->name.'"'.
+           ' class=3D"smallbutton" '.
+                $this->extra.
+				$tab.
+           ' id=3D"'.$this->id.'"'.
+           ' value=3D"'.$this->label.'"'.
+           ' onClick=3D"'.$this->javascript.'"'.$extra.'>';
+        $attr=3D$this->get_js_attr();
+        $r.=3D$attr;
+        return $r;
+
+    }
+}
\ No newline at end of file

Modified: phpcompta/trunk/include/class_icard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_icard.php	2013-08-28 21:25:58 UTC (rev =
5365)
+++ phpcompta/trunk/include/class_icard.php	2013-08-30 13:57:39 UTC (rev =
5366)
@@ -287,7 +287,8 @@
     {
         if ( $this->readOnly=3D=3Dtrue) return '';
 		if ( ! isset($this->id )) $this->id=3D$this->name;
-        $button=3Dnew IButton($this->name.'_bt');
+        $button=3Dnew ISmallButton($this->name.'_bt');
+        $button->label=3D_('Recherche');
         $a=3D"";
         foreach (array('typecard','jrn','label','price','tvaid') as $att=
)
         {

Modified: phpcompta/trunk/include/class_iposte.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iposte.php	2013-08-28 21:25:58 UTC (rev=
 5365)
+++ phpcompta/trunk/include/class_iposte.php	2013-08-30 13:57:39 UTC (rev=
 5366)
@@ -92,7 +92,8 @@
         $this->javascript=3D"";
         $this->extra2=3D"all";
         $this->attribute=3Darray();
-		$this->id=3D$p_id;
+	$this->id=3D$p_id;
+      =20
=20
     }
=20
@@ -129,7 +130,9 @@
     public function dsp_button()
     {
 		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
-        $ib=3Dnew IButton($this->id.'_bt');
+        $ib=3Dnew ISmallButton($this->id.'_bt');
+        $ib->label=3D_('Recherche');
+       //  $ib->extra=3D'style=3D"background:url(image/search.png) no-re=
peat;background-position:0;padding-left:36px;"';
         $ib->javascript=3D'search_poste(this)';
=20
         /*  add the property */

Modified: phpcompta/trunk/include/class_itextarea.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_itextarea.php	2013-08-28 21:25:58 UTC (=
rev 5365)
+++ phpcompta/trunk/include/class_itextarea.php	2013-08-30 13:57:39 UTC (=
rev 5366)
@@ -31,15 +31,15 @@
     {
         $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name;
         $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value;
-	if ( !isset ($this->style )) $this->style=3D' style=3D"border:solid blu=
e 1px" ';
+	if ( !isset ($this->style )) $this->style=3D' class=3D"itextarea" ';
 	$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         if ( $this->readOnly=3D=3Dtrue) return $this->display();
=20
         $r=3D"";
         $r.=3D'<TEXTAREA '.$this->style.'  name=3D"'.$this->name.'" id=3D=
"'.$this->id.'"';
-        $r.=3D" rows=3D\"$this->heigh\" ";
-        $r.=3D" cols=3D\"$this->width\" ";
+        /*$r.=3D" rows=3D\"$this->heigh\" ";
+        $r.=3D" cols=3D\"$this->width\" "; */
         $r.=3D'>';
         $r.=3D$this->value;
=20

Modified: phpcompta/trunk/include/class_itva_popup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_itva_popup.php	2013-08-28 21:25:58 UTC =
(rev 5365)
+++ phpcompta/trunk/include/class_itva_popup.php	2013-08-30 13:57:39 UTC =
(rev 5366)
@@ -127,7 +127,7 @@
 		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         // button
-        $bt=3Dnew IButton('bt_'.$this->id);
+        $bt=3Dnew ISmallButton('bt_'.$this->id);
 		$bt->tabindex=3D"-1";
         $bt->label=3D_(' TVA ');
         $bt->set_attribute('gDossier',dossier::id());

Modified: phpcompta/trunk/include/class_pre_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_operation.php	2013-08-28 21:25:58 U=
TC (rev 5365)
+++ phpcompta/trunk/include/class_pre_operation.php	2013-08-30 13:57:39 U=
TC (rev 5366)
@@ -227,7 +227,7 @@
         $hid=3Dnew IHidden();
         $r=3D$hid->input("action","use_opd");
         $r.=3D$hid->input("jrn_type",$this->get("ledger_type"));
-        $r.=3D HtmlInput::submit('use_opd','Utilisez une op&eacute;ratio=
n pr&eacute;d&eacute;finie');
+        $r.=3D HtmlInput::submit('use_opd','Utilisez une op&eacute;ratio=
n pr&eacute;d&eacute;finie','','smallbutton');
         $r.=3D $this->show_button();
         return $r;
=20

Modified: phpcompta/trunk/include/class_user.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_user.php	2013-08-28 21:25:58 UTC (rev 5=
365)
+++ phpcompta/trunk/include/class_user.php	2013-08-30 13:57:39 UTC (rev 5=
366)
@@ -935,7 +935,7 @@
 		if ($p_array =3D=3D 0)
 			return $result . " * Aucun dossier *";
=20
-		$result.=3D"<TABLE id=3D\"folder\" style=3D\"font-size:154%;width:auto=
;border-width:0px;border-collapse:collapse;\">";
+		$result.=3D"<TABLE id=3D\"folder\" >";
 		for ($i =3D 0; $i < sizeof($p_array); $i++)
 		{
=20

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-08-28 21:25:58 UTC (rev 53=
65)
+++ phpcompta/trunk/include/fiche.inc.php	2013-08-30 13:57:39 UTC (rev 53=
66)
@@ -85,7 +85,7 @@
 $search_card=3Dnew IText('card_search');
 $search_card_js=3Dsprintf('onclick=3D"boxsearch_card(\'%d\')"',dossier::=
id());
 ?>
-<div style=3D"position:absolute;right:230px;top:110px">
+<div style=3D"position:absolute;right:15.625%;top:35%">
=20
 		<?php echo _('Recherche de fiche')?> <?php echo HtmlInput::infobulle(1=
8)?> :<?php echo $search_card->input()?>
 		<?php echo HtmlInput::button_anchor("Chercher","javascript:void(0)",""=
,$search_card_js)?>

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	2013-08-28 21:25:58=
 UTC (rev 5365)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2013-08-30 13:57:39=
 UTC (rev 5366)
@@ -88,9 +88,7 @@
 echo $ledger->input($p_post);
=20
=20
-echo HtmlInput::button('add', _('Ajout d\'une ligne'), 'onClick=3D"quick=
_writing_add_row()"');
=20
-echo HtmlInput::submit('summary', _('Sauvez'));
=20
 echo '<div style=3D"position:absolute;width:40%;right:20px">';
 echo '<table class=3D"info_op">'.
@@ -103,6 +101,12 @@
 $iconcerned=3Dnew IConcerned('jrn_concerned');
 $iconcerned->amount_id=3D"totalDeb";
 echo "Op=C3=A9ration rapproch=C3=A9e : ".$iconcerned->input();
+
+echo '<p>';
+echo HtmlInput::button('add', _('Ajout d\'une ligne'), 'onClick=3D"quick=
_writing_add_row()"');
+echo HtmlInput::submit('summary', _('Sauvez'));
+echo '</p>';
+
 echo '</form>';
=20
 echo "<script>checkTotalDirect();</script>";

Modified: phpcompta/trunk/include/template/anc_balance_group.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/anc_balance_group.php	2013-08-28 21:=
25:58 UTC (rev 5365)
+++ phpcompta/trunk/include/template/anc_balance_group.php	2013-08-30 13:=
57:39 UTC (rev 5366)
@@ -14,7 +14,7 @@
 if ( $i=3D=3D0) {
 	$prev=3D$array[$i]['ga_id'];
 	echo '<tr>';
-	echo td($array[$i]['ga_id'],' colspan=3D"5" style=3D"width:auto;font-si=
ze:120%"');
+	echo td($array[$i]['ga_id'],' colspan=3D"5" style=3D"width:auto;font-si=
ze:1.2em"');
 	 echo '</tr>';
 	 ?>
 	 <tr>
@@ -39,7 +39,7 @@
 	$tot_group_deb=3D0;$tot_group_cred=3D0;
 		$prev=3D$array[$i]['ga_id'];
 	echo '<tr>';
-	echo td($array[$i]['ga_id'],' colspan=3D"5" style=3D"width:auto;font-si=
ze:120%"');
+	echo td($array[$i]['ga_id'],' colspan=3D"5" style=3D"width:auto;font-si=
ze:1.2em"');
 	 echo '</tr>';
 	 ?>
 	 <tr>

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-08-28 21:25:58 UT=
C (rev 5365)
+++ phpcompta/trunk/include/template/dashboard.php	2013-08-30 13:57:39 UT=
C (rev 5366)
@@ -48,7 +48,7 @@
       '</a>'.
        '</td>'.
       '<td>'.
-      HtmlInput::button('del','X','onClick=3D"todo_list_remove('.$row['t=
l_id'].')"').
+      HtmlInput::smallbutton('del','X','onClick=3D"todo_list_remove('.$r=
ow['tl_id'].')"').
       '</td>'.
       '</tr>';
   }

Modified: phpcompta/trunk/include/template/detail-action.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/detail-action.php	2013-08-28 21:25:5=
8 UTC (rev 5365)
+++ phpcompta/trunk/include/template/detail-action.php	2013-08-30 13:57:3=
9 UTC (rev 5366)
@@ -197,12 +197,12 @@
   <p>
 <script language=3D"javascript">
    function enlarge(p_id_textarea){
-   $(p_id_textarea).rows=3D40; $(p_id_textarea).cols=3D120;
+   $(p_id_textarea).style.height=3D'80%';
    $('bt_enlarge').style.display=3D"none";
    $('bt_small').style.display=3D"inline";
  }
 function small(p_id_textarea){
-   $(p_id_textarea).rows=3D5; $(p_id_textarea).cols=3D70;
+   $(p_id_textarea).style.height=3D"auto";
    $('bt_enlarge').style.display=3D"inline";
    $('bt_small').style.display=3D"none";
=20

Modified: phpcompta/trunk/include/verif_bilan.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/verif_bilan.inc.php	2013-08-28 21:25:58 UTC (=
rev 5365)
+++ phpcompta/trunk/include/verif_bilan.inc.php	2013-08-30 13:57:39 UTC (=
rev 5366)
@@ -39,11 +39,11 @@
=20
 if ( $cred =3D=3D $deb )
 {
-    $result =3D'<span style=3D"color:green;font-size:120%;font-weight:bo=
ld;"> OK </span>';
+    $result =3D'<span style=3D"color:green;font-size:1.2em;font-weight:b=
old;"> OK </span>';
 }
 else
 {
-    $result =3D'<span style=3D"color:red;font-size:120%;font-weight:bold=
;"> NON OK </span>';
+    $result =3D'<span style=3D"color:red;font-size:1.2em;font-weight:bol=
d;"> NON OK </span>';
 }
=20
 printf ('<li> Solde Grand Livre : debit %f credit %f %s</li>',$deb,$cred=
,$result);
@@ -60,11 +60,11 @@
=20
     if ( $cred =3D=3D $deb )
     {
-        $result =3D'<span style=3D"color:green;font-size:120%;font-weigh=
t:bold;"> OK </span>';
+        $result =3D'<span style=3D"color:green;font-size:1.2em;font-weig=
ht:bold;"> OK </span>';
     }
     else
     {
-        $result =3D'<span style=3D"color:red;font-size:120%;font-weight:=
bold;"> NON OK </span>';
+        $result =3D'<span style=3D"color:red;font-size:1.2em;font-weight=
:bold;"> NON OK </span>';
     }
=20
     printf ('<li> Journal %s Solde   : debit %f credit %f %s</li>',$name=
,$deb,$cred,$result);
@@ -79,11 +79,11 @@
=20
 if ( $cred =3D=3D $deb )
 {
-    $result =3D'<span style=3D"color:green;font-size:120%;font-weight:bo=
ld;"> OK </span>';
+    $result =3D'<span style=3D"color:green;font-size:1.2em;font-weight:b=
old;"> OK </span>';
 }
 else
 {
-    $result =3D'<span style=3D"color:red;font-size:120%;font-weight:bold=
;"> NON OK </span>';
+    $result =3D'<span style=3D"color:red;font-size:1.2em;font-weight:bol=
d;"> NON OK </span>';
 }
=20
 printf ('<li> Total solde Grand Livre : debit %f credit %f %s</li>',$deb=
,$cred,$result);
@@ -99,11 +99,11 @@
=20
     if ( $cred =3D=3D $deb )
     {
-        $result =3D'<span style=3D"color:green;font-size:120%;font-weigh=
t:bold;"> OK </span>';
+        $result =3D'<span style=3D"color:green;font-size:1.2em;font-weig=
ht:bold;"> OK </span>';
     }
     else
     {
-        $result =3D'<span style=3D"color:red;font-size:120%;font-weight:=
bold;"> NON OK </span>';
+        $result =3D'<span style=3D"color:red;font-size:1.2em;font-weight=
:bold;"> NON OK </span>';
     }
=20
     printf ('<li> Journal %s total : debit %f credit %f %s</li>',$name,$=
deb,$cred,$result);



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


From MAILER-DAEMON Fri Aug 30 10:53:32 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFQ4q-0005XU-9s
	for mharc-phpcompta-dev@gnu.org; Fri, 30 Aug 2013 10:53:32 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 30 Aug 2013 16:44:22 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.19292.1377874411.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5367 - in phpcompta/trunk: html include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 14:53:31 -0000

Author: danydb
Date: 2013-08-30 16:44:22 +0200 (Fri, 30 Aug 2013)
New Revision: 5367

Modified:
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/fiche.inc.php
   phpcompta/trunk/include/template/category_of_card.php
   phpcompta/trunk/include/template/ledger_detail_fin.php
   phpcompta/trunk/include/template/ledger_detail_misc.php
   phpcompta/trunk/include/template/ledger_detail_top.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
Log:
am?\195?\169liore apparence

Modified: phpcompta/trunk/html/ajax_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/ajax_card.php	2013-08-30 13:57:39 UTC (rev 5366)
+++ phpcompta/trunk/html/ajax_card.php	2013-08-30 14:44:22 UTC (rev 5367)
@@ -126,9 +126,7 @@
 case 'dc':
     $f=3Dnew Fiche($cn);
     /* add title + close */
-    $html=3D"";
-    $html=3DHtmlInput::anchor_close($ctl);
-    $html.=3Dh2info('D=C3=A9tail fiche');
+    $html=3DHtmlInput::title_box("D=C3=A9tail fiche", $ctl);
     if ( $qcode !=3D '')
     {
         $f->get_by_qcode($qcode);
@@ -180,12 +178,10 @@
 case 'bc':
     if ( $g_user->check_action(FICADD)=3D=3D1 )
     {
-        $r=3D'';
-	$r=3DHtmlInput::anchor_close($ctl);
+        $r=3DHtmlInput::title_box("Nouvelle fiche", $ctl);
 	/* get cat. name */
 	$cat_name=3D$cn->get_value('select fd_label from fiche_def where fd_id=3D=
$1',
 				 array($fd_id));
-	$r.=3Dh2info(_('Nouvelle fiche ').$cat_name);
         $f=3Dnew Fiche($cn);
         $r.=3D'<form id=3D"save_card" method=3D"POST" onsubmit=3D"this.i=
popup=3D\''.$ctl.'\';save_card(this);return false;" >';
         $r.=3Ddossier::hidden();
@@ -261,8 +257,8 @@
     $sql.=3D" ".$where." order by fd_label";
=20
     $array=3D$cn->make_array($sql);
-    $html=3DHtmlInput::anchor_close('select_card_div');
-    $html.=3Dh2info('Choix de la cat=C3=A9gorie');
+    $html=3DHtmlInput::title_box("Choix de la cat=C3=A9gorie", $ctl);
+
     if ( empty($array))
     {
         $html.=3D_("Aucune cat=C3=A9gorie de fiche ne correspond  =C3=A0=
".
@@ -297,8 +293,7 @@
      *
      -------------------------------------------------------------------=
---*/
 case 'sc':
-  $html=3DHtmlInput::anchor_close($ctl);
-  $html.=3Dh2info('Nouvelle fiche');
+    $html=3DHtmlInput::title_box("Choix de la cat=C3=A9gorie", $ctl);
     if ( $g_user->check_action(FICADD)=3D=3D1 )
     {
         $f=3Dnew Fiche($cn);
@@ -322,10 +317,7 @@
      *------------------------------------------------------------------=
----*/
 case 'fs':
     require_once('class_acc_ledger.php');
-    $r=3D'';
-	$r.=3DHtmlInput::anchor_close('search_card');
-    $r.=3D'<div> '.h2info(_('Recherche de fiche')).'</div>';
-
+    $r=3DHtmlInput::title_box("D=C3=A9tail fiche", $ctl);
     $r.=3D'<form method=3D"GET" onsubmit=3D"this.ctl=3D\'ipop_card\';sea=
rch_get_card(this);return false;">';
     $q=3Dnew IText('query');
     $q->value=3D(isset($query))?$query:'';
@@ -491,8 +483,7 @@
     }
     break;
 case 'upc':
-  $html=3DHtmlInput::anchor_close($ctl);
-  $html.=3Dh2info('D=C3=A9tail fiche');
+    $html=3DHtmlInput::title_box("D=C3=A9tail fiche", $ctl);
=20
   if ( $g_user->check_action(FICADD)=3D=3D0 )
     {

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-30 13:57:39 UTC (rev 5366)
+++ phpcompta/trunk/html/style.css	2013-08-30 14:44:22 UTC (rev 5367)
@@ -82,6 +82,7 @@
=20
 }
=20
+
 h3.info {
     background:#879ed4;
     color:white;
@@ -1182,11 +1183,14 @@
     font-style: italic;
 }
 h2.title {
-    color: blue;
-    font-size:0.87em;
-    font-weight:bold;
-    font-style: italic;
-    margin-left: 15px;
+    background-color:#879ed4;
+    color:white;
+    font-size:1.34em;
+    text-align:center;
+    padding:0.24%;
+    //margin:0.24%;
+    border:1px solid darkblue;
+
 }
 h3.title {
     color: blue;

Modified: phpcompta/trunk/include/class_html_input.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_html_input.php	2013-08-30 13:57:39 UTC =
(rev 5366)
+++ phpcompta/trunk/include/class_html_input.php	2013-08-30 14:44:22 UTC =
(rev 5367)
@@ -411,7 +411,7 @@
     static function anchor_close($div)
     {
 	$r=3D'';
-	$r.=3D'<div style=3D"float:right;margin-right:2px;margin-top:1px;paddin=
g:0">';
+	$r.=3D'<div style=3D"float:right;margin-right:2px;margin-top:5px;paddin=
g:0">';
 	$r.=3D '<A id=3D"close_div" class=3D"input_text" HREF=3D"javascript:voi=
d(0)" onclick=3D"removeDiv(\''.$div.'\');">Fermer</A>';
 	$r.=3D'</div>';
 	return $r;
@@ -648,7 +648,7 @@
 	{
 		if ($mod=3D=3D'close')		$r=3DHtmlInput::anchor_close($div);
 		if ($mod=3D=3D'hide')		$r=3DHtmlInput::anchor_hide(_('Fermer'),"$('$di=
v').hide()");
-		$r.=3Dh2info($name);
+		$r.=3Dh2($name,' class=3D"title" ');
 		return $r;
 	}
         /**

Modified: phpcompta/trunk/include/fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/fiche.inc.php	2013-08-30 13:57:39 UTC (rev 53=
66)
+++ phpcompta/trunk/include/fiche.inc.php	2013-08-30 14:44:22 UTC (rev 53=
67)
@@ -85,7 +85,7 @@
 $search_card=3Dnew IText('card_search');
 $search_card_js=3Dsprintf('onclick=3D"boxsearch_card(\'%d\')"',dossier::=
id());
 ?>
-<div style=3D"position:absolute;right:15.625%;top:35%">
+<div style=3D"position:absolute;right:15.625%;top:150px">
=20
 		<?php echo _('Recherche de fiche')?> <?php echo HtmlInput::infobulle(1=
8)?> :<?php echo $search_card->input()?>
 		<?php echo HtmlInput::button_anchor("Chercher","javascript:void(0)",""=
,$search_card_js)?>

Modified: phpcompta/trunk/include/template/category_of_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/category_of_card.php	2013-08-30 13:5=
7:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/category_of_card.php	2013-08-30 14:4=
4:22 UTC (rev 5367)
@@ -1,7 +1,6 @@
 <?php=20
-     echo HtmlInput::anchor_close($ctl);
+$html=3DHtmlInput::title_box("Ajout d'une cat=C3=A9gorie ".$msg, $ctl);
 ?>
-   <?php echo h2info(_("Ajout d'une cat=C3=A9gorie").$msg); ?>
=20
 <div class=3D"content">
 <form id=3D"newcat" name=3D"newcat" method=3D"get" onsubmit=3D"this.ipop=
up=3D'<?php echo $ipopup?>';save_card_category(this);return false;">

Modified: phpcompta/trunk/include/template/ledger_detail_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_fin.php	2013-08-30 13:=
57:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/ledger_detail_fin.php	2013-08-30 14:=
44:22 UTC (rev 5367)
@@ -64,8 +64,8 @@
=20
 </tr>
 </table>
-</td><td>
-<table style=3D"border:solid 1px yellow">
+</td><td style=3D'width:50%'>
+			<table style=3D"width:100%;border:solid 1px yellow">
 <tr>
 <td>
 	Note

Modified: phpcompta/trunk/include/template/ledger_detail_misc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_misc.php	2013-08-30 13=
:57:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/ledger_detail_misc.php	2013-08-30 14=
:44:22 UTC (rev 5367)
@@ -49,14 +49,16 @@
=20
 								</td></tr>
 			</table>
-			</td><td>
-						<table style=3D"border:solid 1px yellow">
-						<tr>
-						<td>
-							Note
-						</td></tr>
-						<tr>
-						<td>
+			</td>
+                            <td style=3D'width:50%'>
+                            <table style=3D"width:100%;border:solid 1px =
yellow">
+				<tr>
+                                    <td>
+						Note
+                                    </td>
+                                </tr>
+				<tr>
+                                    <td>
 						<?php=20
 						$inote=3Dnew ITextarea('jrn_note');
 						$inote->width=3D25;
@@ -65,9 +67,9 @@
 						echo $inote->input();
 						?>
=20
-						</td>
-						</tr>
-						</table>
+                                    </td>
+                                </tr>
+                            </table>
 </td>
 </tr>
 </table>

Modified: phpcompta/trunk/include/template/ledger_detail_top.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_top.php	2013-08-30 13:=
57:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/ledger_detail_top.php	2013-08-30 14:=
44:22 UTC (rev 5367)
@@ -1,4 +1,4 @@
-<div style=3D"float:right;height:10px;display:block;margin-top:2px;margi=
n-right:2px">
+<div style=3D"float:right;height:10px;display:block;margin-top:0.48%;mar=
gin-right:0.48%">
 <?php=20
    if ($div !=3D "popup") {
      $callback=3D$_SERVER['PHP_SELF'];
@@ -10,7 +10,7 @@
 ?>
 </div>
 <div>
-   <?php echo h2info($oLedger->get_name()); ?>
+   <?php echo h2($oLedger->get_name(),'class=3D"title"'); ?>
 </div>
 <?php echo "Op=C3=A9ration ID=3D".hb($obj->det->jr_internal); ?>
 <div id=3D"<?php echo $div.'info'?>" class=3D"divinfo"></div>

Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/ledger_detail_ven.php	2013-08-30 13:=
57:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php	2013-08-30 14:=
44:22 UTC (rev 5367)
@@ -75,8 +75,8 @@
                                                     </tr>
 						</table>
 </td>
-<td>
-			<table style=3D"border:solid 1px yellow">
+<td style=3D'width:50%'>
+			<table style=3D"width:100%;border:solid 1px yellow">
 			<tr>
 			<td>
 				Note



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


From MAILER-DAEMON Fri Aug 30 16:51:43 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFVfT-0004l4-UM
	for mharc-phpcompta-dev@gnu.org; Fri, 30 Aug 2013 16:51:43 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 30 Aug 2013 22:42:31 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.19525.1377895903.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5368 - in phpcompta/trunk: html include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 20:51:42 -0000

Author: danydb
Date: 2013-08-30 22:42:30 +0200 (Fri, 30 Aug 2013)
New Revision: 5368

Modified:
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_acc_ledger_fin.php
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/class_icard.php
   phpcompta/trunk/include/class_iposte.php
   phpcompta/trunk/include/class_itva_popup.php
   phpcompta/trunk/include/compta_fin.inc.php
   phpcompta/trunk/include/impress_jrn.inc.php
   phpcompta/trunk/include/operation_ods_new.inc.php
   phpcompta/trunk/include/template/dashboard.php
   phpcompta/trunk/include/template/form_ledger_detail.php
   phpcompta/trunk/include/template/form_ledger_fin.php
Log:
am?\195?\169liore apparence

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-30 14:44:22 UTC (rev 5367)
+++ phpcompta/trunk/html/style.css	2013-08-30 20:42:30 UTC (rev 5368)
@@ -78,7 +78,6 @@
     text-align:center;
     padding:0px;
     margin:0px;
-    border:1px solid grey;
=20
 }
=20
@@ -1009,11 +1008,10 @@
 }
 h2#jrn_name
 {
-    color:darkgrey;
+    color:blue;
     font-size:2.74em;
     margin-right:30%;
     float: right;
-
 }
 tr.footer{
     font-size:0.87em;
@@ -1094,7 +1092,7 @@
 }
 a.line:hover,div_content a.line
 {
-   font-size:0.57em;
+   font-size:0.87em;
     text-decoration:underline;
     display:inline;
     color: #0000ff;

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_fin.php	2013-08-30 14:44:22 =
UTC (rev 5367)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php	2013-08-30 20:42:30 =
UTC (rev 5368)
@@ -469,7 +469,7 @@
 		$r.=3D'';
 		$r.=3D'<fieldset><legend>Banque, caisse </legend>';
 		$r.=3D '<div id=3D"jrn_name_div">';
-		$r.=3D'<h2 class=3D"title" id=3D"jrn_name" style=3D"display:inline">' =
. $this->get_name() . '</h2>';
+		$r.=3D'<h2 id=3D"jrn_name" style=3D"display:inline">' . $this->get_nam=
e() . '</h2>';
 		$r.=3D '</div>';
 		$r.=3D'<TABLE  width=3D"100%">';
 		//  Date

Modified: phpcompta/trunk/include/class_fiche.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_fiche.php	2013-08-30 14:44:22 UTC (rev =
5367)
+++ phpcompta/trunk/include/class_fiche.php	2013-08-30 20:42:30 UTC (rev =
5368)
@@ -489,9 +489,8 @@
 						break;
 					case 'zone':
 						$w =3D new ITextArea();
-						$w->width =3D $attr->ad_size;
-						$w->heigh =3D 2;
-						break;
+                                                $w->style=3D' class=3D"i=
textarea" style=3D"margin:0px;width:100%"';
+                                                break;
 					case 'poste':
 						$w =3D new IPoste("av_text" . $attr->ad_id);
 						$w->set_attribute('ipopup', 'ipop_account');
@@ -618,9 +617,8 @@
 							break;
 						case 'zone':
 							$w =3D new ITextArea('av_text' . $r->ad_id);
-							$w->width =3D $r->ad_size;
-							$w->heigh =3D 2;
-							$w->value =3D $r->av_text;
+                                                        $w->style=3D' cl=
ass=3D"itextarea" style=3D"margin:0px;width:100%"';
+                                                        $w->value =3D $r=
->av_text;
 							break;
 						case 'poste':
 							$w =3D new IPoste("av_text" . $r->ad_id);

Modified: phpcompta/trunk/include/class_icard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_icard.php	2013-08-30 14:44:22 UTC (rev =
5367)
+++ phpcompta/trunk/include/class_icard.php	2013-08-30 20:42:30 UTC (rev =
5368)
@@ -287,7 +287,7 @@
     {
         if ( $this->readOnly=3D=3Dtrue) return '';
 		if ( ! isset($this->id )) $this->id=3D$this->name;
-        $button=3Dnew ISmallButton($this->name.'_bt');
+        $button=3Dnew ISmallButton($this->name.'_bt',"","","smallbutton"=
);
         $button->label=3D_('Recherche');
         $a=3D"";
         foreach (array('typecard','jrn','label','price','tvaid') as $att=
)

Modified: phpcompta/trunk/include/class_iposte.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iposte.php	2013-08-30 14:44:22 UTC (rev=
 5367)
+++ phpcompta/trunk/include/class_iposte.php	2013-08-30 20:42:30 UTC (rev=
 5368)
@@ -130,7 +130,7 @@
     public function dsp_button()
     {
 		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
-        $ib=3Dnew ISmallButton($this->id.'_bt');
+        $ib=3Dnew IButton($this->id.'_bt',"","","smallbutton");
         $ib->label=3D_('Recherche');
        //  $ib->extra=3D'style=3D"background:url(image/search.png) no-re=
peat;background-position:0;padding-left:36px;"';
         $ib->javascript=3D'search_poste(this)';

Modified: phpcompta/trunk/include/class_itva_popup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_itva_popup.php	2013-08-30 14:44:22 UTC =
(rev 5367)
+++ phpcompta/trunk/include/class_itva_popup.php	2013-08-30 20:42:30 UTC =
(rev 5368)
@@ -127,7 +127,7 @@
 		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         // button
-        $bt=3Dnew ISmallButton('bt_'.$this->id);
+        $bt=3Dnew IButton('bt_'.$this->id,"smallbutton");
 		$bt->tabindex=3D"-1";
         $bt->label=3D_(' TVA ');
         $bt->set_attribute('gDossier',dossier::id());

Modified: phpcompta/trunk/include/compta_fin.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_fin.inc.php	2013-08-30 14:44:22 UTC (r=
ev 5367)
+++ phpcompta/trunk/include/compta_fin.inc.php	2013-08-30 20:42:30 UTC (r=
ev 5368)
@@ -75,7 +75,8 @@
 	if ( ! isset ($correct ))
 	{
 		echo '<div class=3D"content">';
-		echo '<h2 class=3D"info">'._('Confirmation').' </h2>';
+		echo h1('Confirmation','');
+                echo_warning("Attention, cette op=C3=A9ration n'est pas =
encore sauv=C3=A9e : vous devez encore confirmer");
 		echo '<form name=3D"form_detail" class=3D"print" enctype=3D"multipart/=
form-data" class=3D"print" METHOD=3D"POST">';
 		echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 		echo $Ledger->confirm($_POST);
@@ -110,7 +111,7 @@
=20
 		echo '<div class=3D"content">';
 		$a=3D $Ledger->insert($_POST);
-		echo '<h2 class=3D"info">'._('Enregistrement').' </h2>';
+		echo '<h1>'._('Enregistrement').' </h1>';
 		echo '<div class=3D"content">';
 		echo $a;
 		echo '</div>';

Modified: phpcompta/trunk/include/impress_jrn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_jrn.inc.php	2013-08-30 14:44:22 UTC (=
rev 5367)
+++ phpcompta/trunk/include/impress_jrn.inc.php	2013-08-30 20:42:30 UTC (=
rev 5368)
@@ -92,7 +92,21 @@
 echo HtmlInput::get_to_hidden(array('ac', 'type'));
 echo '</fieldset>';
 echo '</form>';
+?>
+<div class=3D"noprint" style=3D"position:absolute;right:5%;top:200px;bac=
kground-color:yellow;border: 1px solid black">
+    <h3>
+        Remarque  : choix possibles
+    </h3>
+    <ul>
+        <li> D=C3=A9tail op=C3=A9rations ne donne pas le m=C3=AAme r=C3=A9=
sultat si on regarde tous les journaux ou un journal de type ACH ou VEN</=
li>
+        <li> Liste op=C3=A9rations ne donne pas le m=C3=AAme r=C3=A9sult=
at si on regarde tous les journaux ou un journal de type ACH ou VEN</li>
+        <li> Journaux VEN ou ACH en mode "d=C3=A9tail op=C3=A9rations" d=
onne les d=C3=A9tails des factures, y compris les montants, TVA et quanti=
t=C3=A9 par article</li>
+        <li> Journaux VEN ou ACH en mode "liste op=C3=A9rations" donne p=
our chaque op=C3=A9ration, le total de la TVA, ND, ...</li>
+    </ul>
+     =20
+</div>
=20
+<?php
=20
=20
 echo '<FORM METHOD=3D"GET">' . dossier::hidden();
@@ -325,7 +339,7 @@
 		foreach ($Row as $line)
 		{
 			echo '<div style=3D"margin-top:2px;margin-bottom:10px;border:solid 1p=
x black">';
-			$class =3D ' class=3D"odd" style=3D"font-stretch: expanded;font-size:=
12px;"';
+			$class =3D ' class=3D"odd" style=3D"font-stretch: expanded;font-size:=
1em;"';
 			echo '<table class=3D"result" style=3D"font-weight: bolder;font-varia=
nt: small-caps;width:100%;">';
 			echo "<tr $class>";
 			echo '<TD style=3D"width:5%">' . $line['date'] . "</TD>";

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	2013-08-30 14:44:22=
 UTC (rev 5367)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2013-08-30 20:42:30=
 UTC (rev 5368)
@@ -59,7 +59,7 @@
 echo '</form>';
 echo '</div>';
 echo '<div id=3D"jrn_name_div">';
-echo '<h2 class=3D"title" id=3D"jrn_name" style=3D"display:inline">' . $=
ledger->get_name() . '</h2>';
+echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $ledger->get_name=
() . '</h2>';
 echo '</div>';
=20
 // Show the predef operation

Modified: phpcompta/trunk/include/template/dashboard.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/dashboard.php	2013-08-30 14:44:22 UT=
C (rev 5367)
+++ phpcompta/trunk/include/template/dashboard.php	2013-08-30 20:42:30 UT=
C (rev 5368)
@@ -48,7 +48,7 @@
       '</a>'.
        '</td>'.
       '<td>'.
-      HtmlInput::smallbutton('del','X','onClick=3D"todo_list_remove('.$r=
ow['tl_id'].')"').
+      HtmlInput::button('del','X','onClick=3D"todo_list_remove('.$row['t=
l_id'].')"','smallbutton').
       '</td>'.
       '</tr>';
   }

Modified: phpcompta/trunk/include/template/form_ledger_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_detail.php	2013-08-30 14=
:44:22 UTC (rev 5367)
+++ phpcompta/trunk/include/template/form_ledger_detail.php	2013-08-30 20=
:42:30 UTC (rev 5368)
@@ -1,6 +1,6 @@
=20
 	<div id=3D"jrn_name_div">
-	<h2 class=3D"title" id=3D"jrn_name"> <?php echo $this->get_name()?></h2=
>
+	<h2 id=3D"jrn_name"> <?php echo $this->get_name()?></h2>
 </div>
 <table>
     <tr>

Modified: phpcompta/trunk/include/template/form_ledger_fin.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/form_ledger_fin.php	2013-08-30 14:44=
:22 UTC (rev 5367)
+++ phpcompta/trunk/include/template/form_ledger_fin.php	2013-08-30 20:42=
:30 UTC (rev 5368)
@@ -1,6 +1,6 @@
 <fieldset>
 	<div id=3D"jrn_name_div">
-	<h2 class=3D"title" id=3D"jrn_name"> <?php echo $this->get_name()?></h2=
>
+	<h2  id=3D"jrn_name"> <?php echo $this->get_name()?></h2>
 </div>
 <legend><?php echo $f_legend ?> </legend>
 <?php=20



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


From MAILER-DAEMON Fri Aug 30 18:34:57 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFXHN-0001yZ-JB
	for mharc-phpcompta-dev@gnu.org; Fri, 30 Aug 2013 18:34:57 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 31 Aug 2013 00:25:46 +0200 (CEST)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.19553.1377902096.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5369 - in phpcompta/trunk: html html/js include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 22:34:56 -0000

Author: danydb
Date: 2013-08-31 00:25:45 +0200 (Sat, 31 Aug 2013)
New Revision: 5369

Modified:
   phpcompta/trunk/html/js/acc_ledger.js
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ajax_update_predef.php
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_pre_operation.php
   phpcompta/trunk/include/compta_ach.inc.php
   phpcompta/trunk/include/compta_ven.inc.php
   phpcompta/trunk/include/operation_ods_new.inc.php
Log:
Model of operation in a DIV

Modified: phpcompta/trunk/html/js/acc_ledger.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/acc_ledger.js	2013-08-30 20:42:30 UTC (rev 53=
68)
+++ phpcompta/trunk/html/js/acc_ledger.js	2013-08-30 22:25:45 UTC (rev 53=
69)
@@ -28,21 +28,39 @@
 /**
 * @brief update the list of available predefined operation when we chang=
e the ledger.
 */
-function update_predef(p_type,p_direct)
+function update_predef(p_type,p_direct,p_ac)
 {
     var jrn=3Dg("p_jrn").value;
     var dossier=3Dg("gDossier").value;
-    var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn+'&t=3D'+p_type+'=
&d=3D'+p_direct+"&op=3Dup_predef";
+    var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn+'&t=3D'+p_type+'=
&d=3D'+p_direct+"&op=3Dup_predef&ac=3D"+p_ac;
     g("p_jrn_predef").value=3Djrn;
-    var action=3Dnew Ajax.Request(
-                   "ajax_misc.php",
-                   {
-                   method:'get',
-                   parameters:querystring,
-                   onFailure:error_get_predef,
-                   onSuccess:success_get_predef
-                   }
-               );
+    var action =3D new Ajax.Request(
+            "ajax_misc.php",
+            {
+                method: 'get',
+                parameters: querystring,
+                onFailure: error_get_predef,
+                onSuccess: function(req) {
+                    try {
+                        $('info_div').innerHTML =3D "ok";
+                        var answer =3D req.responseXML;
+                        var a =3D answer.getElementsByTagName('code');
+                        var html =3D answer.getElementsByTagName('value'=
);
+                        if (a.length =3D=3D 0)
+                        {
+                            var rec =3D req.responseText;
+                            alert('erreur :' + rec);
+                        }
+                        var code_html =3D getNodeText(html[0]);
+                        code_html =3D unescape_xml(code_html);
+                        // document.getElementsByName(name_ctl)[0].value=
 =3D code_html;
+                        $('modele_op_div').innerHTML=3Dcode_html;
+                    } catch (e) {
+                        $('info_div').innerHTML =3D e.getMessage;
+                    }
+                }
+            }
+    );
 }
=20
 /**
@@ -79,25 +97,6 @@
 /**
  * @brief update the field predef
  */
-function success_get_predef(request,json)
-{
-    var i=3D0;
-    var answer=3Drequest.responseText.evalJSON(true);
-    obj=3Dg("pre_def");
-    obj.innerHTML=3D'';
-    if ( answer.count =3D=3D 0 ) return;
-
-    for ( i =3D 0 ; i < answer.count;i++)
-    {
-        value=3Danswer['value'+i];
-        label=3Danswer['label'+i];
-        obj.options[obj.options.length]=3Dnew Option(label,value);
-    }
-
-}
-/**
- * @brief update the field predef
- */
 function error_get_predef(request,json)
 {
     alert ("Erreur mise =C3=A0 jour champs non possible");

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-30 20:42:30 UTC (rev 5368)
+++ phpcompta/trunk/html/style.css	2013-08-30 22:25:45 UTC (rev 5369)
@@ -1252,4 +1252,17 @@
     border:solid blue 1px;
     width:90%;
     margin-left:5%;
+}
+div#modele_op_div{
+    display: none;
+    background-color:#e4e7ed;
+    font-family:arial,verdana,sans-serif,helvetica;
+    padding:0;
+    margin:0;
+    overflow:hidden;
+    z-index:3;
+    position:absolute;
+    left:10%;
+    width:60%;
+    border:1px solid darkblue;
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/ajax_update_predef.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/ajax_update_predef.php	2013-08-30 20:42:30 UT=
C (rev 5368)
+++ phpcompta/trunk/include/ajax_update_predef.php	2013-08-30 22:25:45 UT=
C (rev 5369)
@@ -48,21 +48,21 @@
 $op->set('ledger',$l);
 $op->set('ledger_type',$t);
 $op->set('direct',$d);
-$array=3D$op->get_operation();
-$string=3D'{"count":"'.count($array).'"';
-$idx=3D0;
-if (! empty($array))
-    foreach ($array as $a)
-{
-    $string.=3D',"value'.$idx.'":"'.$a['value'].'",';
-    $string.=3D'"label'.$idx.'":"'.$a['label'].'"';
-    $idx++;
-}
-$string.=3D"}";
+$url=3Dhttp_build_query(array('action'=3D>'use_opd','p_jrn_predef'=3D>$l=
,'ac'=3D>$_GET['ac'],'gDossier'=3D>dossier::id()));
+$html=3D"";
=20
-header("Content-type: text/json; charset: utf8",true);
-echo $string;
+$html.=3DHtmlInput::title_box("Mod=C3=A8le d'op=C3=A9rations ", 'modele_=
op_div', 'hide');
+$html.=3D$op->show_button('do.php?'.$url);
=20
+$html=3Descape_xml($html);
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<code></code>
+<value>$html</value>
+</data>
+EOF;
=20
 ?>
=20

Modified: phpcompta/trunk/include/class_acc_ledger.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger.php	2013-08-30 20:42:30 UTC =
(rev 5368)
+++ phpcompta/trunk/include/class_acc_ledger.php	2013-08-30 22:25:45 UTC =
(rev 5369)
@@ -1586,7 +1586,7 @@
 		$wLedger =3D $this->select_ledger('ODS', 2);
 		if ($wLedger =3D=3D null)
 			exit(_('Pas de journal disponible'));
-		$wLedger->javascript =3D "onChange=3D'update_name();update_predef(\"od=
s\",\"t\");$add_js'";
+		$wLedger->javascript =3D "onChange=3D'update_name();update_predef(\"od=
s\",\"t\",\"".$_REQUEST['ac']."\");$add_js'";
 		$label =3D " Journal " . HtmlInput::infobulle(2);
=20
 		$ret.=3D$label . $wLedger->input();

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-08-30 20:4=
2:30 UTC (rev 5368)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php	2013-08-30 22:2=
5:45 UTC (rev 5369)
@@ -985,7 +985,7 @@
=20
 		$wLedger=3D$this->select_ledger('ACH',2);
         if ($wLedger =3D=3D null) exit (_('Pas de journal disponible'));
-        $wLedger->javascript=3D"onChange=3D'update_predef(\"ach\",\"f\")=
;$add_js'";
+        $wLedger->javascript=3D"onChange=3D'update_predef(\"ach\",\"f\",=
\"".$_REQUEST['ac']."\");$add_js'";
         $wLedger->table=3D1;
         $f_jrn=3D$wLedger->input();
=20

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-30 20:42:30=
 UTC (rev 5368)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php	2013-08-30 22:25:45=
 UTC (rev 5369)
@@ -1051,7 +1051,7 @@
         if ($wLedger =3D=3D null)
             exit(_('Pas de journal disponible'));
         $wLedger->table =3D 1;
-        $wLedger->javascript =3D "onChange=3D'update_predef(\"ven\",\"f\=
");$add_js'";
+        $wLedger->javascript =3D "onChange=3D'update_predef(\"ven\",\"f\=
",\"".$_REQUEST['ac']."\");$add_js'";
         $wLedger->label =3D " Journal " . HtmlInput::infobulle(2);
=20
         $f_jrn =3D $wLedger->input();

Modified: phpcompta/trunk/include/class_pre_operation.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_pre_operation.php	2013-08-30 20:42:30 U=
TC (rev 5368)
+++ phpcompta/trunk/include/class_pre_operation.php	2013-08-30 22:25:45 U=
TC (rev 5369)
@@ -221,14 +221,16 @@
=20
     /*!\brief show a form to use pre_op
      */
-    function form_get ()
+    function form_get ($p_url)
     {
-
+        $r=3DHtmlInput::button_action("Mod=C3=A8le d'op=C3=A9rations", '=
 $(\'modele_op_div\').style.display=3D\'block\';$(\'lk_modele_op_tab\').f=
ocus();');
+        $r.=3D'<div id=3D"modele_op_div">';
+        $r.=3DHtmlInput::title_box("Mod=C3=A8le d'op=C3=A9rations ", 'mo=
dele_op_div', 'hide');
         $hid=3Dnew IHidden();
-        $r=3D$hid->input("action","use_opd");
+        $r.=3D$hid->input("action","use_opd");
         $r.=3D$hid->input("jrn_type",$this->get("ledger_type"));
-        $r.=3D HtmlInput::submit('use_opd','Utilisez une op&eacute;ratio=
n pr&eacute;d&eacute;finie','','smallbutton');
-        $r.=3D $this->show_button();
+        $r.=3D $this->show_button($p_url);
+        $r.=3D'</div>';
         return $r;
=20
     }
@@ -242,15 +244,21 @@
         return $a;
     }
     /*!\brief show the button for selecting a predefined operation */
-    function show_button()
+    function show_button($p_url)
     {
-
-        $select=3Dnew ISelect();
-
         $value=3D$this->get_operation();
-        //	if ( empty($value)=3D=3Dtrue) return "";
-        $select->value=3D$value;
-        $r=3D$select->input("pre_def");
+        $r=3D"";
+        $r.=3D'<h2>Choississez un mod=C3=A8le</h2>';
+        $r.=3D'Filtrer '.HtmlInput::filter_table('modele_op_tab', '0', '=
0');
+        $r.=3D'<table style=3D"width:100%" id=3D"modele_op_tab">';
+        for ($i=3D0;$i<count($value);$i++) {
+            $r.=3D'<tr class=3D"'.(($i%2=3D=3D0)?"even":"odd").'">';
+            $r.=3D'<td>';
+            $r.=3Dsprintf('<a href=3D"%s&pre_def=3D%s" onclick=3D"waitin=
g_box()">%s</a>',$p_url,$value[$i]['value'],$value[$i]['label']);
+            $r.=3D'</td>';
+            $r.=3D'</tr>';
+        }
+        $r.=3D'</table>';
         return $r;
     }
     public function   get_operation()

Modified: phpcompta/trunk/include/compta_ach.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ach.inc.php	2013-08-30 20:42:30 UTC (r=
ev 5368)
+++ phpcompta/trunk/include/compta_ach.inc.php	2013-08-30 22:25:45 UTC (r=
ev 5369)
@@ -179,23 +179,20 @@
 // pre defined operation
 //
 echo '<div id=3D"predef_form">';
-echo '<form method=3D"GET" action=3D"do.php">';
-echo dossier::hidden();
 echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
-echo HtmlInput::hidden('ac', $_REQUEST['ac']);
 $op =3D new Pre_op_ach($cn);
 $op->set('ledger', $Ledger->id);
 $op->set('ledger_type', "ACH");
 $op->set('direct', 'f');
-echo $op->form_get();
-echo '</form>';
+$url=3Dhttp_build_query(array('p_jrn_predef'=3D>$Ledger->id,'ac'=3D>$_RE=
QUEST['ac'],'gDossier'=3D>dossier::id()));
+echo $op->form_get('do.php?'.$url);
 echo '</div>';
 echo '</div>';
=20
 echo '<div class=3D"content">';
 echo "<FORM class=3D\"print\"NAME=3D\"form_detail\" METHOD=3D\"POST\" >"=
;
 /* request for a predefined operation */
-if (isset($_GET['use_opd']) && isset($_REQUEST['pre_def']) && !isset($_P=
OST['correct']))
+if ( isset($_REQUEST['pre_def']) && !isset($_POST['correct']))
 {
 	// used a predefined operation
 	//

Modified: phpcompta/trunk/include/compta_ven.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/compta_ven.inc.php	2013-08-30 20:42:30 UTC (r=
ev 5368)
+++ phpcompta/trunk/include/compta_ven.inc.php	2013-08-30 22:25:45 UTC (r=
ev 5369)
@@ -165,7 +165,7 @@
 //
 // pre defined operation
 //
-
+echo '<div class=3D"content">';
     if ( !isset($_REQUEST ['p_jrn']) )
     {
         $def_ledger=3D$Ledger->get_first('ven',2);
@@ -181,17 +181,14 @@
 		$Ledger->id=3D$_REQUEST['p_jrn_predef'];
 	}
=20
-   echo '<div id=3D"predef_form">';
-    echo '<form style=3D"display:inline" method=3D"GET" >';
-	echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_jrn_predef',$Ledger->id);
+    echo '<div id=3D"predef_form">';
+    echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
     $op=3Dnew Pre_op_ven($cn);
     $op->set('ledger',$Ledger->id);
     $op->set('ledger_type',"VEN");
     $op->set('direct','f');
-    echo $op->form_get();
-    echo '</form>';
+    $url=3Dhttp_build_query(array('p_jrn_predef'=3D>$Ledger->id,'ac'=3D>=
$_REQUEST['ac'],'gDossier'=3D>dossier::id()));
+    echo $op->form_get('do.php?'.$url);
     echo '</div>';
=20
    echo '<div class=3D"content">';

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/operation_ods_new.inc.php	2013-08-30 20:42:30=
 UTC (rev 5368)
+++ phpcompta/trunk/include/operation_ods_new.inc.php	2013-08-30 22:25:45=
 UTC (rev 5369)
@@ -45,18 +45,14 @@
 }
 echo '<div class=3D"content">';
 echo '<div id=3D"predef_form">';
-echo '<form method=3D"GET" action=3D"do.php">';
-echo HtmlInput::hidden("action", "use_opd");
-echo HtmlInput::hidden("ac",$_REQUEST['ac']);
-echo dossier::hidden();
 echo HtmlInput::hidden('p_jrn_predef', $ledger->id);
 $op =3D new Pre_op_ods($cn);
 $op->set('ledger', $ledger->id);
 $op->set('ledger_type', "ODS");
 $op->set('direct', 't');
-echo $op->form_get();
+$url=3Dhttp_build_query(array('action'=3D>'use_opd','p_jrn_predef'=3D>$l=
edger->id,'ac'=3D>$_REQUEST['ac'],'gDossier'=3D>dossier::id()));
+echo $op->form_get('do.php?'.$url);
=20
-echo '</form>';
 echo '</div>';
 echo '<div id=3D"jrn_name_div">';
 echo '<h2 id=3D"jrn_name" style=3D"display:inline">' . $ledger->get_name=
() . '</h2>';



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


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

Author: danydb
Date: 2013-08-31 19:52:34 +0200 (Sat, 31 Aug 2013)
New Revision: 5370

Modified:
   phpcompta/trunk/include/export_fiche_balance_pdf.php
Log:
Bug : $name not set

Modified: phpcompta/trunk/include/export_fiche_balance_pdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/export_fiche_balance_pdf.php	2013-08-30 22:25=
:45 UTC (rev 5369)
+++ phpcompta/trunk/include/export_fiche_balance_pdf.php	2013-08-31 17:52=
:34 UTC (rev 5370)
@@ -38,6 +38,7 @@
 $cn=3Dnew Database($gDossier);
 $g_user->Check();
 $g_user->check_dossier($gDossier);
+$name=3D$cn->get_value('select fd_label from fiche_def where fd_id=3D$1'=
,array($_GET['cat']));
=20
 $pdf=3Dnew PDF($cn);
 $pdf->setDossierInfo("  Periode : ".$_GET['start']." - ".$_GET['end']);



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


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

Author: danydb
Date: 2013-08-31 21:07:50 +0200 (Sat, 31 Aug 2013)
New Revision: 5371

Modified:
   phpcompta/trunk/include/menu.inc.php
Log:
Task : add a rapid filter to menu cfg

Modified: phpcompta/trunk/include/menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/menu.inc.php	2013-08-31 17:52:34 UTC (rev 537=
0)
+++ phpcompta/trunk/include/menu.inc.php	2013-08-31 19:07:50 UTC (rev 537=
1)
@@ -147,6 +147,7 @@
 	<?php echo HtmlInput::submit("search", "Recherche")?>
 	<?php echo HtmlInput::request_to_hidden(array('ac','gDossier','ord'))?>
 </form>
+    Filtre <?php echo HtmlInput::filter_table('menu_tb', '0,1,2,3', '1')=
; ?>
 </fieldset>
 <p class=3D"info"> le type vaut :
 	<ul>
@@ -161,7 +162,8 @@
 $gDossier=3DDossier::id();
 echo HtmlInput::button("Add_plugin", "Ajout d'un plugin", "onclick=3Dadd=
_plugin($gDossier)");
 echo HtmlInput::button("Add_menu", "Ajout d'un menu", "onclick=3Dcreate_=
menu($gDossier)");
-echo '<table class=3D"result">';
+
+echo '<table class=3D"result" id=3D"menu_tb">';
 echo '<tr>';
 echo '<th>'.$table->get_header(0).'</th>';
 echo '<th>'.$table->get_header(1).'</th>';



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


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

Author: danydb
Date: 2013-08-31 21:40:18 +0200 (Sat, 31 Aug 2013)
New Revision: 5372

Modified:
   phpcompta/trunk/html/js/infobulle.js
   phpcompta/trunk/include/menu.inc.php
   phpcompta/trunk/include/template/menu_detail.php
Log:
Improve CFGMENU

Modified: phpcompta/trunk/html/js/infobulle.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/js/infobulle.js	2013-08-31 19:07:50 UTC (rev 537=
1)
+++ phpcompta/trunk/html/js/infobulle.js	2013-08-31 19:40:18 UTC (rev 537=
2)
@@ -59,9 +59,9 @@
 content[29]=3D"Si vous ne donnez pas de nom, ce sera le nom du fichier q=
ui sera utilis=C3=A9";
 content[30]=3D"Peut contenir une information telle que le message struct=
ur=C3=A9 sur le virement";
 content[31]=3D"Peut contenir un num=C3=A9ro de bon de commande";
-
-function showBulle(p_ctl)
-{
+content[32]=3D'<h3>        Remarque  : choix possibles    </h3>    <ul> =
       <li> D=C3=A9tail op=C3=A9rations ne donne pas le m=C3=AAme r=C3=A9=
sultat si on regarde tous les journaux ou un journal de type ACH ou VEN</=
li>        <li> Liste op=C3=A9rations ne donne pas le m=C3=AAme r=C3=A9su=
ltat si on regarde tous les journaux ou un journal de type ACH ou VEN</li=
>        <li> Journaux VEN ou ACH en mode "d=C3=A9tail op=C3=A9rations" d=
onne les d=C3=A9tails des factures, y compris les montants, TVA et quanti=
t=C3=A9 par article</li>        <li> Journaux VEN ou ACH en mode "liste o=
p=C3=A9rations" donne pour chaque op=C3=A9ration, le total de la TVA, ND,=
 ...</li>    </ul>';
+content[33]=3D'le type vaut :<ul>	<li> ME pour Menu</li>	<li> PR pour le=
s impressions </li>	<li> PL pour les plugins</li>	<li> SP pour des valeur=
s sp=C3=A9ciales</li>	</ul>';
+function showBulle(p_ctl){
     d=3Ddocument.getElementById('bulle');
     d.innerHTML=3Dcontent[p_ctl];
     d.style.top=3DposY+offsetY;

Modified: phpcompta/trunk/include/menu.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/menu.inc.php	2013-08-31 19:07:50 UTC (rev 537=
1)
+++ phpcompta/trunk/include/menu.inc.php	2013-08-31 19:40:18 UTC (rev 537=
2)
@@ -112,11 +112,11 @@
 $table->add('Code',$url,"order by me_code asc","order by me_code desc","=
codea","coded");
 $table->add('Menu',$url,"order by me_menu asc","order by me_menu desc","=
menua","menud");
 $table->add('Description',$url,"order by me_description asc","order by m=
e_description desc","desa","desd");
+$table->add('Type',$url,"order by me_type asc","order by me_type desc","=
ta","td");
 $table->add('Fichier',$url,"order by me_file asc","order by me_file desc=
","fa","fd");
 $table->add('URL',$url,"order by me_url asc","order by me_url desc","url=
a","urld");
 $table->add('Param=C3=A8tre',$url,"order by me_parametere asc","order by=
 me_parameter desc","paa","pad");
 $table->add('Javascript',$url,"order by me_javascript asc","order by me_=
javascript desc","jsa","jsd");
-$table->add('Type',$url,"order by me_type asc","order by me_type desc","=
ta","td");
=20
 $ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'codea';
=20
@@ -147,17 +147,8 @@
 	<?php echo HtmlInput::submit("search", "Recherche")?>
 	<?php echo HtmlInput::request_to_hidden(array('ac','gDossier','ord'))?>
 </form>
-    Filtre <?php echo HtmlInput::filter_table('menu_tb', '0,1,2,3', '1')=
; ?>
+    Filtre <?php echo HtmlInput::filter_table('menu_tb', '0,1,2,4', '1')=
; ?>
 </fieldset>
-<p class=3D"info"> le type vaut :
-	<ul>
-	<li> ME pour Menu</li>
-	<li> PR pour les impressions </li>
-	<li> PL pour les plugins</li>
-	<li> SP pour des valeurs sp=C3=A9ciales</li>
-	</ul>
-
-	</p>
 <?php=20
 $gDossier=3DDossier::id();
 echo HtmlInput::button("Add_plugin", "Ajout d'un plugin", "onclick=3Dadd=
_plugin($gDossier)");
@@ -168,7 +159,7 @@
 echo '<th>'.$table->get_header(0).'</th>';
 echo '<th>'.$table->get_header(1).'</th>';
 echo '<th>'.$table->get_header(2).'</th>';
-echo '<th>'.$table->get_header(3).'</th>';
+echo '<th>'.$table->get_header(3).HtmlInput::infobulle(33).'</th>';
 echo '<th>'.$table->get_header(4).'</th>';
 echo '<th>'.$table->get_header(5).'</th>';
 echo '<th>'.$table->get_header(6).'</th>';
@@ -193,11 +184,11 @@
     echo td($js);
     echo td($row->me_menu);
     echo td(h($row->me_description));
+    echo td(h($row->me_type));
     echo td(h($row->me_file));
     echo td(h($row->me_url));
     echo td(h($row->me_parameter));
     echo td(h($row->me_javascript));
-    echo td(h($row->me_type));
     echo '</tr>';
 }
 echo '</table>';

Modified: phpcompta/trunk/include/template/menu_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/template/menu_detail.php	2013-08-31 19:07:50 =
UTC (rev 5371)
+++ phpcompta/trunk/include/template/menu_detail.php	2013-08-31 19:40:18 =
UTC (rev 5372)
@@ -11,7 +11,12 @@
 $str_url=3Dnew IText('me_url',$m->me_url);
 $str_parameter=3Dnew IText('me_parameter',$m->me_parameter);
 $str_js=3Dnew IText('me_javascript',$m->me_javascript);
-
+$a_type=3Darray (
+       array ('label'=3D>'Impression','value'=3D>'PR' ),
+       array ('label'=3D>'Menu','value'=3D>'ME' )
+    );
+$str_type=3Dnew ISelect("me_type", $a_type);
+$str_type->selected=3D$m->me_type;
 ?>
 <table>
     <tr>
@@ -38,6 +43,14 @@
             <?php echo $str_desc->input()?>
         </td>
     </tr>
+    <tr>
+        <td>
+            Type=20
+        </td>
+        <td>
+            <?php echo $str_type->input();?>
+        </td>
+    </tr>
          <tr>
         <td>
             Fichier =C3=A0 inclure (depuis le r=C3=A9pertoire include)
@@ -56,7 +69,7 @@
     </tr>
      <tr>
         <td>
-            Param=C3=A8ttre
+            Param=C3=A8tre
         </td>
         <td>
             <?php echo $str_parameter->input()?>



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


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

Author: danydb
Date: 2013-08-31 21:43:23 +0200 (Sat, 31 Aug 2013)
New Revision: 5373

Modified:
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/impress_jrn.inc.php
Log:
Documentation in an infobulle

Modified: phpcompta/trunk/html/style.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/html/style.css	2013-08-31 19:40:18 UTC (rev 5372)
+++ phpcompta/trunk/html/style.css	2013-08-31 19:43:23 UTC (rev 5373)
@@ -717,8 +717,6 @@
     margin:0;
     padding:0;
     text-align:left;
-    font-size:0.75em;;
-
 }
 div.autocomplete em {
     color:blue;
@@ -742,7 +740,9 @@
     /*height:32px;*/
     cursor:pointer;
 }
-span.informal{ font-size:0.75em;; color:black;}
+span.informal{=20
+    color:black;
+}
=20
 ul.select_table  {
     /*padding:5px;*/
@@ -998,12 +998,10 @@
 }
 table.info_op
 {
-//    font-size:0.75em;;
     width:100%;
 }
 table.info_op tr
 {
-  //  font-size:0.87em;
     background:white;
 }
 h2#jrn_name
@@ -1040,7 +1038,7 @@
 {
     display:inline;
     float:left;
-    font-size:0.75em;;
+    font-size:0.87em;;
 }
 #calc
 {
@@ -1167,7 +1165,6 @@
     display:inline;
     float:left;
     width:100%;
-    //margin-left:5.28%;
     top:0px;
     text-align: center;
 }
@@ -1186,7 +1183,6 @@
     font-size:1.34em;
     text-align:center;
     padding:0.24%;
-    //margin:0.24%;
     border:1px solid darkblue;
=20
 }
@@ -1265,4 +1261,11 @@
     left:10%;
     width:60%;
     border:1px solid darkblue;
+}
+div#notice {
+    position:absolute;
+    right:5%;
+    top:200px;
+    background-color:yellow;
+    border: 1px solid black;
 }
\ No newline at end of file

Modified: phpcompta/trunk/include/impress_jrn.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/impress_jrn.inc.php	2013-08-31 19:40:18 UTC (=
rev 5372)
+++ phpcompta/trunk/include/impress_jrn.inc.php	2013-08-31 19:43:23 UTC (=
rev 5373)
@@ -93,19 +93,6 @@
 echo '</fieldset>';
 echo '</form>';
 ?>
-<div class=3D"noprint" style=3D"position:absolute;right:5%;top:200px;bac=
kground-color:yellow;border: 1px solid black">
-    <h3>
-        Remarque  : choix possibles
-    </h3>
-    <ul>
-        <li> D=C3=A9tail op=C3=A9rations ne donne pas le m=C3=AAme r=C3=A9=
sultat si on regarde tous les journaux ou un journal de type ACH ou VEN</=
li>
-        <li> Liste op=C3=A9rations ne donne pas le m=C3=AAme r=C3=A9sult=
at si on regarde tous les journaux ou un journal de type ACH ou VEN</li>
-        <li> Journaux VEN ou ACH en mode "d=C3=A9tail op=C3=A9rations" d=
onne les d=C3=A9tails des factures, y compris les montants, TVA et quanti=
t=C3=A9 par article</li>
-        <li> Journaux VEN ou ACH en mode "liste op=C3=A9rations" donne p=
our chaque op=C3=A9ration, le total de la TVA, ND, ...</li>
-    </ul>
-     =20
-</div>
-
 <?php
=20
=20
@@ -143,7 +130,7 @@
 print '</TR>';
 print '<TR>';
 $w->selected =3D (isset($_GET['p_simple'])) ? $_GET['p_simple'] : '';
-echo td('Style d\'impression') . $w->input('p_simple', $a);
+echo '<td>Style d\'impression '.HtmlInput::infobulle(32).'</td>' . $w->i=
nput('p_simple', $a);
 print "</TR>";
 echo '</TABLE>';
 print HtmlInput::submit('bt_html', 'Visualisation');



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


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

Author: danydb
Date: 2013-08-31 21:43:32 +0200 (Sat, 31 Aug 2013)
New Revision: 5374

Modified:
   phpcompta/trunk/include/class_iposte.php
   phpcompta/trunk/include/class_itva_popup.php
Log:
Small button

Modified: phpcompta/trunk/include/class_iposte.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_iposte.php	2013-08-31 19:43:23 UTC (rev=
 5373)
+++ phpcompta/trunk/include/class_iposte.php	2013-08-31 19:43:32 UTC (rev=
 5374)
@@ -130,7 +130,7 @@
     public function dsp_button()
     {
 		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
-        $ib=3Dnew IButton($this->id.'_bt',"","","smallbutton");
+        $ib=3Dnew ISmallButton($this->id.'_bt');
         $ib->label=3D_('Recherche');
        //  $ib->extra=3D'style=3D"background:url(image/search.png) no-re=
peat;background-position:0;padding-left:36px;"';
         $ib->javascript=3D'search_poste(this)';

Modified: phpcompta/trunk/include/class_itva_popup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- phpcompta/trunk/include/class_itva_popup.php	2013-08-31 19:43:23 UTC =
(rev 5373)
+++ phpcompta/trunk/include/class_itva_popup.php	2013-08-31 19:43:32 UTC =
(rev 5374)
@@ -127,7 +127,7 @@
 		$this->id=3D($this->id=3D=3D"")?$this->name:$this->id;
=20
         // button
-        $bt=3Dnew IButton('bt_'.$this->id,"smallbutton");
+        $bt=3Dnew ISmallButton('bt_'.$this->id);
 		$bt->tabindex=3D"-1";
         $bt->label=3D_(' TVA ');
         $bt->set_attribute('gDossier',dossier::id());



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


