From MAILER-DAEMON Tue Jul 05 17:21:53 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QeD44-0000rF-WA for mharc-phpcompta-dev@gnu.org; Tue, 05 Jul 2011 17:21:53 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 5 Jul 2011 23:26:49 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4176 - phpcompta/branches/rel560/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 21:21:51 -0000 Author: danydb Date: 2011-07-05 23:26:47 +0200 (Tue, 05 Jul 2011) New Revision: 4176 Modified: phpcompta/branches/rel560/include/class_html_input.php Log: add function HtmlInput::button_close Modified: phpcompta/branches/rel560/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/branches/rel560/include/class_html_input.php 2011-06-29 17:= 04:07 UTC (rev 4175) +++ phpcompta/branches/rel560/include/class_html_input.php 2011-07-05 21:= 26:47 UTC (rev 4176) @@ -398,11 +398,12 @@ */ static function button_close($div_name) { - $html=3D'
'; + $a=3Dnew IButton('Fermer','Fermer'); + $a->label=3D"Fermer"; + $a->javascript=3D"removeDiv('".$div_name."')"; + $html=3D$a->input(); =20 - $html.=3D 'Fermer'; - $html.=3D'
'; - return $html; + return $html; =20 } /** From MAILER-DAEMON Tue Jul 05 17:22:13 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QeD4O-0000wB-T8 for mharc-phpcompta-dev@gnu.org; Tue, 05 Jul 2011 17:22:13 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 5 Jul 2011 23:27:17 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4177 - phpcompta/branches/rel560/html X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 21:22:11 -0000 Author: danydb Date: 2011-07-05 23:27:16 +0200 (Tue, 05 Jul 2011) New Revision: 4177 Modified: phpcompta/branches/rel560/html/style-color.css phpcompta/branches/rel560/html/style-light.css Log: Background transparency=20 Modified: phpcompta/branches/rel560/html/style-color.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/html/style-color.css 2011-07-05 21:26:47 UT= C (rev 4176) +++ phpcompta/branches/rel560/html/style-color.css 2011-07-05 21:27:16 UT= C (rev 4177) @@ -585,7 +585,7 @@ height:100%; z-index:1; /*background-color:lightgrey;*/ -=09 +background-color: rgba(203, 203,203, 0.2);=09 display:none;=09 } =20 Modified: phpcompta/branches/rel560/html/style-light.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/html/style-light.css 2011-07-05 21:26:47 UT= C (rev 4176) +++ phpcompta/branches/rel560/html/style-light.css 2011-07-05 21:27:16 UT= C (rev 4177) @@ -602,7 +602,7 @@ =20 z-index:1; /*background-color:lightgrey;*/ -background-color: rgba(165, 213,195, 0.5); +background-color: rgba(203, 203,203, 0.2); display:none;=09 } =20 From MAILER-DAEMON Tue Jul 05 17:22:45 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QeD4u-00015V-8b for mharc-phpcompta-dev@gnu.org; Tue, 05 Jul 2011 17:22:44 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 5 Jul 2011 23:27:48 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4178 - phpcompta/branches/rel560/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 21:22:42 -0000 Author: danydb Date: 2011-07-05 23:27:47 +0200 (Tue, 05 Jul 2011) New Revision: 4178 Modified: phpcompta/branches/rel560/include/class_user.php Log: Fix bug : in parameter > extension all the users are seen Modified: phpcompta/branches/rel560/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/branches/rel560/include/class_user.php 2011-07-05 21:27:16 = UTC (rev 4177) +++ phpcompta/branches/rel560/include/class_user.php 2011-07-05 21:27:47 = UTC (rev 4178) @@ -692,8 +692,11 @@ { $sql=3D"select distinct use_id,use_login,use_first_name,use_name= from ac_users left outer join jnt_use_dos using (use_id) - where - (dos_id=3D$1 or use_admin=3D1) and use_active=3D1 order by= use_login,use_name"; + left join priv_user on (priv_jnt=3Djnt_id) + where + (dos_id=3D$1 or use_admin=3D1) and use_active=3D1 and (us= e_admin=3D1 or priv_priv <> 'X') order by use_login,use_name"; + + $repo=3Dnew Database(); $array=3D$repo->get_array($sql,array($p_dossier)); if ( $repo->size() =3D=3D 0 ) throw new Exception ('Error inacce= ssible folder'); From MAILER-DAEMON Tue Jul 05 17:30:32 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QeDCR-00036M-DQ for mharc-phpcompta-dev@gnu.org; Tue, 05 Jul 2011 17:30:31 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 5 Jul 2011 23:35:33 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4179 - phpcompta/branches/rel560/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 21:30:29 -0000 Author: danydb Date: 2011-07-05 23:35:31 +0200 (Tue, 05 Jul 2011) New Revision: 4179 Modified: phpcompta/branches/rel560/include/class_user.php Log: Bug for 9.0.4: comparison with always true Modified: phpcompta/branches/rel560/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/branches/rel560/include/class_user.php 2011-07-05 21:27:47 = UTC (rev 4178) +++ phpcompta/branches/rel560/include/class_user.php 2011-07-05 21:35:31 = UTC (rev 4179) @@ -694,7 +694,7 @@ left outer join jnt_use_dos using (use_id) left join priv_user on (priv_jnt=3Djnt_id) where - (dos_id=3D$1 or use_admin=3D1) and use_active=3D1 and (us= e_admin=3D1 or priv_priv <> 'X') order by use_login,use_name"; + (dos_id=3D$1 or use_admin=3D1) and use_active=3D1 and (us= e_admin=3D1 or (priv_priv is not null and priv_priv <> 'X')) order by use= _login,use_name"; =20 =20 $repo=3Dnew Database(); From MAILER-DAEMON Tue Jul 05 17:34:23 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QeDGA-0003xX-KN for mharc-phpcompta-dev@gnu.org; Tue, 05 Jul 2011 17:34:22 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 5 Jul 2011 23:39:27 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4180 - phpcompta/branches/rel560/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 21:34:21 -0000 Author: danydb Date: 2011-07-05 23:39:26 +0200 (Tue, 05 Jul 2011) New Revision: 4180 Modified: phpcompta/branches/rel560/include/class_user.php Log: fix small bug Modified: phpcompta/branches/rel560/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/branches/rel560/include/class_user.php 2011-07-05 21:35:31 = UTC (rev 4179) +++ phpcompta/branches/rel560/include/class_user.php 2011-07-05 21:39:26 = UTC (rev 4180) @@ -694,7 +694,7 @@ left outer join jnt_use_dos using (use_id) left join priv_user on (priv_jnt=3Djnt_id) where - (dos_id=3D$1 or use_admin=3D1) and use_active=3D1 and (us= e_admin=3D1 or (priv_priv is not null and priv_priv <> 'X')) order by use= _login,use_name"; + (dos_id=3D$1 or use_admin=3D1) and use_active=3D1 and (us= e_admin=3D1 or priv_priv <> 'X') order by use_login,use_name"; =20 =20 $repo=3Dnew Database(); From MAILER-DAEMON Sun Jul 10 12:38:23 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Qfx1T-0003kB-4X for mharc-phpcompta-dev@gnu.org; Sun, 10 Jul 2011 12:38:23 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 10 Jul 2011 18:43:23 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4181 - in phpcompta/branches/rel560: 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2011 16:38:21 -0000 Author: danydb Date: 2011-07-10 18:43:22 +0200 (Sun, 10 Jul 2011) New Revision: 4181 Modified: phpcompta/branches/rel560/html/ajax_card.php phpcompta/branches/rel560/html/js/card.js phpcompta/branches/rel560/include/class_html_input.php Log: #320 bouton fermer dans popup de fiche Modified: phpcompta/branches/rel560/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/branches/rel560/html/ajax_card.php 2011-07-05 21:39:26 UTC = (rev 4180) +++ phpcompta/branches/rel560/html/ajax_card.php 2011-07-10 16:43:22 UTC = (rev 4181) @@ -122,7 +122,8 @@ case 'dc': $f=3Dnew Fiche($cn); /* add title + close */ - $html=3DHtmlInput::button_close($ctl); + $html=3D""; + $html=3DHtmlInput::anchor_close($ctl); $html.=3Dh2info('D=C3=A9tail fiche'); if ( $qcode !=3D '') { @@ -176,7 +177,7 @@ if ( $user->check_action(FICADD)=3D=3D1 ) { $r=3D''; - $r=3DHtmlInput::button_close($ctl); + $r=3DHtmlInput::anchor_close($ctl); /* get cat. name */ $cat_name=3D$cn->get_value('select fd_label from fiche_def where fd_id=3D= $1', array($fd_id)); @@ -244,7 +245,7 @@ } } $array=3D$cn->make_array($sql); - $html=3DHtmlInput::button_close('select_card_div'); + $html=3DHtmlInput::anchor_close('select_card_div'); $html.=3Dh2info('Choix de la cat=C3=A9gorie'); if ( empty($array)) { Modified: phpcompta/branches/rel560/html/js/card.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/html/js/card.js 2011-07-05 21:39:26 UTC (re= v 4180) +++ phpcompta/branches/rel560/html/js/card.js 2011-07-10 16:43:22 UTC (re= v 4181) @@ -408,7 +408,7 @@ sx=3Ddocument.body.scrollTop+60; } =20 - var str_style=3D"top:"+sx+";left:10%;width:80%;height:auto"; + var str_style=3D"top:"+sx+";left:25%;width:50%;height:auto"; =20 var popup=3D{'id': content,'cssclass':'op_detail','style':str_style= ,'html':loading(),'drag':true}; =20 Modified: phpcompta/branches/rel560/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/branches/rel560/include/class_html_input.php 2011-07-05 21:= 39:26 UTC (rev 4180) +++ phpcompta/branches/rel560/include/class_html_input.php 2011-07-10 16:= 43:22 UTC (rev 4181) @@ -413,7 +413,7 @@ static function anchor_close($div) { $r=3D''; - $r.=3D'
'; + $r.=3D'
'; $r.=3D 'Fer= mer'; $r.=3D'
'; return $r; From MAILER-DAEMON Sun Jul 10 12:49:55 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QfxCd-0004g4-D3 for mharc-phpcompta-dev@gnu.org; Sun, 10 Jul 2011 12:49:55 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 10 Jul 2011 18:55:03 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4182 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2011 16:49:53 -0000 Author: danydb Date: 2011-07-10 18:55:01 +0200 (Sun, 10 Jul 2011) New Revision: 4182 Modified: phpcompta/trunk/ phpcompta/trunk/html/ajax_card.php phpcompta/trunk/html/js/card.js phpcompta/trunk/html/style-color.css phpcompta/trunk/html/style-light.css phpcompta/trunk/include/class_html_input.php phpcompta/trunk/include/class_user.php Log: Merged revisions 4176-4181 via svnmerge from=20 svn+ssh://danydb@svn/svn/phpcompta/branches/rel560 ........ r4176 | danydb | 2011-07-05 23:26:47 +0200 (Tue, 05 Jul 2011) | 1 line =20 add function HtmlInput::button_close ........ r4177 | danydb | 2011-07-05 23:27:16 +0200 (Tue, 05 Jul 2011) | 1 line =20 Background transparency=20 ........ r4178 | danydb | 2011-07-05 23:27:47 +0200 (Tue, 05 Jul 2011) | 1 line =20 Fix bug : in parameter > extension all the users are seen ........ r4179 | danydb | 2011-07-05 23:35:31 +0200 (Tue, 05 Jul 2011) | 2 lines =20 Bug for 9.0.4: comparison with always true ........ r4180 | danydb | 2011-07-05 23:39:26 +0200 (Tue, 05 Jul 2011) | 2 lines =20 fix small bug ........ r4181 | danydb | 2011-07-10 18:43:22 +0200 (Sun, 10 Jul 2011) | 2 lines =20 #320 bouton fermer dans popup de fiche ........ Property changes on: phpcompta/trunk ___________________________________________________________________ Name: svnmerge-integrated - /phpcompta/branches/rel560:1-4170 + /phpcompta/branches/rel560:1-4181 Modified: phpcompta/trunk/html/ajax_card.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_card.php 2011-07-10 16:43:22 UTC (rev 4181) +++ phpcompta/trunk/html/ajax_card.php 2011-07-10 16:55:01 UTC (rev 4182) @@ -122,7 +122,8 @@ case 'dc': $f=3Dnew Fiche($cn); /* add title + close */ - $html=3DHtmlInput::button_close($ctl); + $html=3D""; + $html=3DHtmlInput::anchor_close($ctl); $html.=3Dh2info('D=C3=A9tail fiche'); if ( $qcode !=3D '') { @@ -176,7 +177,7 @@ if ( $user->check_action(FICADD)=3D=3D1 ) { $r=3D''; - $r=3DHtmlInput::button_close($ctl); + $r=3DHtmlInput::anchor_close($ctl); /* get cat. name */ $cat_name=3D$cn->get_value('select fd_label from fiche_def where fd_id=3D= $1', array($fd_id)); @@ -244,7 +245,7 @@ } } $array=3D$cn->make_array($sql); - $html=3DHtmlInput::button_close('select_card_div'); + $html=3DHtmlInput::anchor_close('select_card_div'); $html.=3Dh2info('Choix de la cat=C3=A9gorie'); if ( empty($array)) { Modified: phpcompta/trunk/html/js/card.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/card.js 2011-07-10 16:43:22 UTC (rev 4181) +++ phpcompta/trunk/html/js/card.js 2011-07-10 16:55:01 UTC (rev 4182) @@ -408,7 +408,7 @@ sx=3Ddocument.body.scrollTop+60; } =20 - var str_style=3D"top:"+sx+";left:10%;width:80%;height:auto"; + var str_style=3D"top:"+sx+";left:25%;width:50%;height:auto"; =20 var popup=3D{'id': content,'cssclass':'op_detail','style':str_style= ,'html':loading(),'drag':true}; =20 Modified: phpcompta/trunk/html/style-color.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-color.css 2011-07-10 16:43:22 UTC (rev 418= 1) +++ phpcompta/trunk/html/style-color.css 2011-07-10 16:55:01 UTC (rev 418= 2) @@ -585,7 +585,7 @@ height:100%; z-index:1; /*background-color:lightgrey;*/ -=09 +background-color: rgba(203, 203,203, 0.2);=09 display:none;=09 } =20 Modified: phpcompta/trunk/html/style-light.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-light.css 2011-07-10 16:43:22 UTC (rev 418= 1) +++ phpcompta/trunk/html/style-light.css 2011-07-10 16:55:01 UTC (rev 418= 2) @@ -602,7 +602,7 @@ =20 z-index:1; /*background-color:lightgrey;*/ -background-color: rgba(165, 213,195, 0.5); +background-color: rgba(203, 203,203, 0.2); display:none;=09 } =20 Modified: phpcompta/trunk/include/class_html_input.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_html_input.php 2011-07-10 16:43:22 UTC = (rev 4181) +++ phpcompta/trunk/include/class_html_input.php 2011-07-10 16:55:01 UTC = (rev 4182) @@ -397,11 +397,12 @@ */ static function button_close($div_name) { - $html=3D'
'; + $a=3Dnew IButton('Fermer','Fermer'); + $a->label=3D"Fermer"; + $a->javascript=3D"removeDiv('".$div_name."')"; + $html=3D$a->input(); =20 - $html.=3D 'Fermer'; - $html.=3D'
'; - return $html; + return $html; =20 } /** @@ -411,7 +412,7 @@ static function anchor_close($div) { $r=3D''; - $r.=3D'
'; + $r.=3D'
'; $r.=3D 'Fer= mer'; $r.=3D'
'; return $r; Modified: phpcompta/trunk/include/class_user.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_user.php 2011-07-10 16:43:22 UTC (rev 4= 181) +++ phpcompta/trunk/include/class_user.php 2011-07-10 16:55:01 UTC (rev 4= 182) @@ -692,8 +692,11 @@ { $sql=3D"select distinct use_id,use_login,use_first_name,use_name= from ac_users left outer join jnt_use_dos using (use_id) - where - (dos_id=3D$1 or use_admin=3D1) and use_active=3D1 order by= use_login,use_name"; + left join priv_user on (priv_jnt=3Djnt_id) + where + (dos_id=3D$1 or use_admin=3D1) and use_active=3D1 and (us= e_admin=3D1 or priv_priv <> 'X') order by use_login,use_name"; + + $repo=3Dnew Database(); $array=3D$repo->get_array($sql,array($p_dossier)); if ( $repo->size() =3D=3D 0 ) throw new Exception ('Error inacce= ssible folder'); From MAILER-DAEMON Tue Jul 12 12:35:03 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QgfvK-0002bE-K3 for mharc-phpcompta-dev@gnu.org; Tue, 12 Jul 2011 12:35:02 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 12 Jul 2011 18:40:03 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4183 - phpcompta/branches/rel560/html/document/fr_be X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2011 16:35:01 -0000 Author: danydb Date: 2011-07-12 18:40:02 +0200 (Tue, 12 Jul 2011) New Revision: 4183 Modified: phpcompta/branches/rel560/html/document/fr_be/bnb.form Log: Bug stock not computed in bilan Modified: phpcompta/branches/rel560/html/document/fr_be/bnb.form =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/html/document/fr_be/bnb.form 2011-07-10 16:= 55:01 UTC (rev 4182) +++ phpcompta/branches/rel560/html/document/fr_be/bnb.form 2011-07-12 16:= 40:02 UTC (rev 4183) @@ -146,8 +146,9 @@ # $S1=3Dabs($C2-$C29) $S2=3D$C22+$C23+$C24+$C25+$C26+$C27 -$S3=3D$C29+$C50+$C51+$C52+$C53+$C54+$C55+$C56+$C57+$C58+$C490+$C491+$C41= +$C40 $S4=3D$C30+$C31+$C32+$C33+$C34+$C35+$C36 +$S3=3D$C29+$C50+$C51+$C52+$C53+$C54+$C55+$C56+$C57+$C58+$C490+$C491+$C41= +$C40+$S4 + $S5=3D$C40+$C41 $S6=3D$C50+$C51+$C52+$C53 $S7=3D$C54+$C55+$C56+$C57+$C58 From MAILER-DAEMON Tue Jul 12 18:11:50 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QglBF-0003RJ-L9 for mharc-phpcompta-dev@gnu.org; Tue, 12 Jul 2011 18:11:49 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 13 Jul 2011 00:16:52 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4184 - phpcompta/branches/rel560/html/document/fr_be X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2011 22:11:46 -0000 Author: danydb Date: 2011-07-13 00:16:50 +0200 (Wed, 13 Jul 2011) New Revision: 4184 Modified: phpcompta/branches/rel560/html/document/fr_be/bnb.form Log: bug with bilan Modified: phpcompta/branches/rel560/html/document/fr_be/bnb.form =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/html/document/fr_be/bnb.form 2011-07-12 16:= 40:02 UTC (rev 4183) +++ phpcompta/branches/rel560/html/document/fr_be/bnb.form 2011-07-12 22:= 16:50 UTC (rev 4184) @@ -153,7 +153,7 @@ $S6=3D$C50+$C51+$C52+$C53 $S7=3D$C54+$C55+$C56+$C57+$C58 $S8=3D$C490+$C491 -$S9=3D$S1+$S3+$C3 +$S9=3D$S1+$S3 $S10=3D$C10+$C11+$C12+$C13+$C14+$C15 $S11=3D$C160+$C161+$C162+$C163+$C164+$C165 $S12=3D$C17+$C42+$C43+$C44+$C45+$C46+$C47+$C48+$C492+$C493 From MAILER-DAEMON Tue Jul 12 18:37:35 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QglaB-0000Sf-Br for mharc-phpcompta-dev@gnu.org; Tue, 12 Jul 2011 18:37:35 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 13 Jul 2011 00:42:43 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4185 - phpcompta/branches/rel560/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2011 22:37:34 -0000 Author: danydb Date: 2011-07-13 00:42:41 +0200 (Wed, 13 Jul 2011) New Revision: 4185 Modified: phpcompta/branches/rel560/include/export_balance_pdf.php Log: bug incomplete balance Modified: phpcompta/branches/rel560/include/export_balance_pdf.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/include/export_balance_pdf.php 2011-07-12 2= 2:16:50 UTC (rev 4184) +++ phpcompta/branches/rel560/include/export_balance_pdf.php 2011-07-12 2= 2:42:41 UTC (rev 4185) @@ -117,79 +117,106 @@ $lvl3_old=3D''; =20 bcscale(2); +if (! empty($array)) + { + $i=3D0; + foreach ($array as $key=3D>$value) + { + $i++; + /* + * level x + */ + if ( $value['poste']=3D=3D'') continue;=09 + foreach (array(3,2,1) as $ind) + {=09 + $r=3D$value; + if ( ! isset($_GET['lvl'.$ind]))continue; + =20 + if (${'lvl'.$ind.'_old'} =3D=3D '') ${'lvl'.$ind.'_old'}=3Dsubstr= ($r['poste'],0,$ind); + if ( ${'lvl'.$ind.'_old'} !=3D substr($r['poste'],0,$ind)) + { + $pdf->SetFont('DejaVu','B',7); + $pdf->Cell(30,6,"Totaux ".$ind); + $pdf->Cell(80,6,${'lvl'.$ind.'_old'}); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_deb']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_cred']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_deb']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_cred']),0,0,'R'); + $pdf->Ln(); + $pdf->SetFont('DejaVuCond','',7); + ${'lvl'.$ind.'_old'}=3Dsubstr($r['poste'],0,$ind); + foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) + { + ${'nlvl'.$ind}[$a]=3D0; + } + } + } + foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) + { + $nlvl1[$a]=3Dbcadd($nlvl1[$a],$r[$a]); + $nlvl2[$a]=3Dbcadd($nlvl2[$a],$r[$a]); + $nlvl3[$a]=3Dbcadd($nlvl3[$a],$r[$a]); + } +=09 + if ( $i % 2 =3D=3D 0 ) + { + $pdf->SetFillColor(220,221,255); + $fill=3D1; + } + else + { + $pdf->SetFillColor(0,0,0); + $fill=3D0; + } +=09 + $pdf->Cell(30,6,$value['poste'],0,0,'L',$fill); + $pdf->Cell(80,6,$value['label'],0,0,'L',$fill); + $pdf->Cell(20,6,nbm($value['sum_deb']),0,0,'R',$fill); + $pdf->Cell(20,6,nbm($value['sum_cred']),0,0,'R',$fill); + $pdf->Cell(20,6,nbm($value['solde_deb']),0,0,'R',$fill); + $pdf->Cell(20,6,nbm($value['solde_cred']),0,0,'R',$fill); + $pdf->Ln(); + $tp_deb=3Dbcadd($tp_deb,$value['sum_deb']); + $tp_cred=3Dbcadd($tp_cred,$value['sum_cred']); + $tp_sold=3Dbcadd($tp_sold,$value['solde_deb']); + $tp_solc=3Dbcadd($tp_solc,$value['solde_cred']); =20 -for ($i=3D0;$iSetFont('DejaVu','B',7); - $pdf->Cell(30,6,"Totaux ".$ind); - $pdf->Cell(80,6,${'lvl'.$ind.'_old'}); - $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_deb']),0,0,'R'); - $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_cred']),0,0,'R'); - $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_deb']),0,0,'R'); - $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_cred']),0,0,'R'); - $pdf->Ln(); - $pdf->SetFont('DejaVuCond','',7); - ${'lvl'.$ind.'_old'}=3Dsubstr($r['poste'],0,$ind); - foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) - { - ${'nlvl'.$ind}[$a]=3D0; - } - } - } - foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) - { - $nlvl1[$a]=3Dbcadd($nlvl1[$a],$r[$a]); - $nlvl2[$a]=3Dbcadd($nlvl2[$a],$r[$a]); - $nlvl3[$a]=3Dbcadd($nlvl3[$a],$r[$a]); - } - - if ( $i % 2 =3D=3D 0 ) - { - $pdf->SetFillColor(220,221,255); - $fill=3D1; - } - else - { - $pdf->SetFillColor(0,0,0); - $fill=3D0; - } - - $pdf->Cell(30,6,$array[$i]['poste'],0,0,'L',$fill); - $pdf->Cell(80,6,$array[$i]['label'],0,0,'L',$fill); - $pdf->Cell(20,6,nbm($array[$i]['sum_deb']),0,0,'R',$fill); - $pdf->Cell(20,6,nbm($array[$i]['sum_cred']),0,0,'R',$fill); - $pdf->Cell(20,6,nbm($array[$i]['solde_deb']),0,0,'R',$fill); - $pdf->Cell(20,6,nbm($array[$i]['solde_cred']),0,0,'R',$fill); + } + foreach (array(3,2,1) as $ind) + {=09 + $r=3D$value; + if ( ! isset($_GET['lvl'.$ind]))continue; +=09 + if (${'lvl'.$ind.'_old'} =3D=3D '') ${'lvl'.$ind.'_old'}=3Dsubstr($r[= 'poste'],0,$ind); + if ( ${'lvl'.$ind.'_old'} !=3D substr($r['poste'],0,$ind)) + { + $pdf->SetFont('DejaVu','B',7); + $pdf->Cell(30,6,"Totaux ".$ind); + $pdf->Cell(80,6,${'lvl'.$ind.'_old'}); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_deb']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_cred']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_deb']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_cred']),0,0,'R'); + $pdf->Ln(); + $pdf->SetFont('DejaVuCond','',7); + ${'lvl'.$ind.'_old'}=3Dsubstr($r['poste'],0,$ind); + foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) + { + ${'nlvl'.$ind}[$a]=3D0; + } + } + } + =20 + // Totaux + $pdf->SetFont('DejaVuCond','B',8); + $pdf->Cell(110,6,'Totaux'); + $pdf->Cell(20,6,nbm($tp_deb),'T',0,'R',0); + $pdf->Cell(20,6,nbm($tp_cred),'T',0,'R',0); + $pdf->Cell(20,6,nbm($tp_sold),'T',0,'R',0); + $pdf->Cell(20,6,nbm($tp_solc),'T',0,'R',0); $pdf->Ln(); - $tp_deb=3Dbcadd($tp_deb,$array[$i]['sum_deb']); - $tp_cred=3Dbcadd($tp_cred,$array[$i]['sum_cred']); - $tp_sold=3Dbcadd($tp_sold,$array[$i]['solde_deb']); - $tp_solc=3Dbcadd($tp_solc,$array[$i]['solde_cred']); + } // if ! empty =20 -} -// Totaux -$pdf->SetFont('DejaVuCond','B',8); -$pdf->Cell(110,6,'Totaux'); -$pdf->Cell(20,6,nbm($tp_deb),'T',0,'R',0); -$pdf->Cell(20,6,nbm($tp_cred),'T',0,'R',0); -$pdf->Cell(20,6,nbm($tp_sold),'T',0,'R',0); -$pdf->Cell(20,6,nbm($tp_solc),'T',0,'R',0); -$pdf->Ln(); - - $fDate=3Ddate('dmy-Hi'); $pdf->Output('balance-'.$fDate.'.pdf','I'); =20 From MAILER-DAEMON Sat Jul 16 17:39:21 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QiCa1-0006cs-0e for mharc-phpcompta-dev@gnu.org; Sat, 16 Jul 2011 17:39:21 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 16 Jul 2011 23:44:27 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4186 - in phpcompta/trunk: . html/document/fr_be include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jul 2011 21:39:19 -0000 Author: danydb Date: 2011-07-16 23:44:25 +0200 (Sat, 16 Jul 2011) New Revision: 4186 Modified: phpcompta/trunk/ phpcompta/trunk/html/document/fr_be/bnb.form phpcompta/trunk/include/export_balance_pdf.php Log: Merged revisions 4183-4185 via svnmerge from=20 svn+ssh://danydb@svn/svn/phpcompta/branches/rel560 ........ r4183 | danydb | 2011-07-12 18:40:02 +0200 (Tue, 12 Jul 2011) | 1 line =20 Bug stock not computed in bilan ........ r4184 | danydb | 2011-07-13 00:16:50 +0200 (Wed, 13 Jul 2011) | 2 lines =20 bug with bilan ........ r4185 | danydb | 2011-07-13 00:42:41 +0200 (Wed, 13 Jul 2011) | 2 lines =20 bug incomplete balance ........ Property changes on: phpcompta/trunk ___________________________________________________________________ Name: svnmerge-integrated - /phpcompta/branches/rel560:1-4181 + /phpcompta/branches/rel560:1-4185 Modified: phpcompta/trunk/html/document/fr_be/bnb.form =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/document/fr_be/bnb.form 2011-07-12 22:42:41 UTC = (rev 4185) +++ phpcompta/trunk/html/document/fr_be/bnb.form 2011-07-16 21:44:25 UTC = (rev 4186) @@ -146,13 +146,14 @@ # $S1=3Dabs($C2-$C29) $S2=3D$C22+$C23+$C24+$C25+$C26+$C27 -$S3=3D$C29+$C50+$C51+$C52+$C53+$C54+$C55+$C56+$C57+$C58+$C490+$C491+$C41= +$C40 $S4=3D$C30+$C31+$C32+$C33+$C34+$C35+$C36 +$S3=3D$C29+$C50+$C51+$C52+$C53+$C54+$C55+$C56+$C57+$C58+$C490+$C491+$C41= +$C40+$S4 + $S5=3D$C40+$C41 $S6=3D$C50+$C51+$C52+$C53 $S7=3D$C54+$C55+$C56+$C57+$C58 $S8=3D$C490+$C491 -$S9=3D$S1+$S3+$C3 +$S9=3D$S1+$S3 $S10=3D$C10+$C11+$C12+$C13+$C14+$C15 $S11=3D$C160+$C161+$C162+$C163+$C164+$C165 $S12=3D$C17+$C42+$C43+$C44+$C45+$C46+$C47+$C48+$C492+$C493 Modified: phpcompta/trunk/include/export_balance_pdf.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/export_balance_pdf.php 2011-07-12 22:42:41 UT= C (rev 4185) +++ phpcompta/trunk/include/export_balance_pdf.php 2011-07-16 21:44:25 UT= C (rev 4186) @@ -117,79 +117,106 @@ $lvl3_old=3D''; =20 bcscale(2); +if (! empty($array)) + { + $i=3D0; + foreach ($array as $key=3D>$value) + { + $i++; + /* + * level x + */ + if ( $value['poste']=3D=3D'') continue;=09 + foreach (array(3,2,1) as $ind) + {=09 + $r=3D$value; + if ( ! isset($_GET['lvl'.$ind]))continue; + =20 + if (${'lvl'.$ind.'_old'} =3D=3D '') ${'lvl'.$ind.'_old'}=3Dsubstr= ($r['poste'],0,$ind); + if ( ${'lvl'.$ind.'_old'} !=3D substr($r['poste'],0,$ind)) + { + $pdf->SetFont('DejaVu','B',7); + $pdf->Cell(30,6,"Totaux ".$ind); + $pdf->Cell(80,6,${'lvl'.$ind.'_old'}); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_deb']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_cred']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_deb']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_cred']),0,0,'R'); + $pdf->Ln(); + $pdf->SetFont('DejaVuCond','',7); + ${'lvl'.$ind.'_old'}=3Dsubstr($r['poste'],0,$ind); + foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) + { + ${'nlvl'.$ind}[$a]=3D0; + } + } + } + foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) + { + $nlvl1[$a]=3Dbcadd($nlvl1[$a],$r[$a]); + $nlvl2[$a]=3Dbcadd($nlvl2[$a],$r[$a]); + $nlvl3[$a]=3Dbcadd($nlvl3[$a],$r[$a]); + } +=09 + if ( $i % 2 =3D=3D 0 ) + { + $pdf->SetFillColor(220,221,255); + $fill=3D1; + } + else + { + $pdf->SetFillColor(0,0,0); + $fill=3D0; + } +=09 + $pdf->Cell(30,6,$value['poste'],0,0,'L',$fill); + $pdf->Cell(80,6,$value['label'],0,0,'L',$fill); + $pdf->Cell(20,6,nbm($value['sum_deb']),0,0,'R',$fill); + $pdf->Cell(20,6,nbm($value['sum_cred']),0,0,'R',$fill); + $pdf->Cell(20,6,nbm($value['solde_deb']),0,0,'R',$fill); + $pdf->Cell(20,6,nbm($value['solde_cred']),0,0,'R',$fill); + $pdf->Ln(); + $tp_deb=3Dbcadd($tp_deb,$value['sum_deb']); + $tp_cred=3Dbcadd($tp_cred,$value['sum_cred']); + $tp_sold=3Dbcadd($tp_sold,$value['solde_deb']); + $tp_solc=3Dbcadd($tp_solc,$value['solde_cred']); =20 -for ($i=3D0;$iSetFont('DejaVu','B',7); - $pdf->Cell(30,6,"Totaux ".$ind); - $pdf->Cell(80,6,${'lvl'.$ind.'_old'}); - $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_deb']),0,0,'R'); - $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_cred']),0,0,'R'); - $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_deb']),0,0,'R'); - $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_cred']),0,0,'R'); - $pdf->Ln(); - $pdf->SetFont('DejaVuCond','',7); - ${'lvl'.$ind.'_old'}=3Dsubstr($r['poste'],0,$ind); - foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) - { - ${'nlvl'.$ind}[$a]=3D0; - } - } - } - foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) - { - $nlvl1[$a]=3Dbcadd($nlvl1[$a],$r[$a]); - $nlvl2[$a]=3Dbcadd($nlvl2[$a],$r[$a]); - $nlvl3[$a]=3Dbcadd($nlvl3[$a],$r[$a]); - } - - if ( $i % 2 =3D=3D 0 ) - { - $pdf->SetFillColor(220,221,255); - $fill=3D1; - } - else - { - $pdf->SetFillColor(0,0,0); - $fill=3D0; - } - - $pdf->Cell(30,6,$array[$i]['poste'],0,0,'L',$fill); - $pdf->Cell(80,6,$array[$i]['label'],0,0,'L',$fill); - $pdf->Cell(20,6,nbm($array[$i]['sum_deb']),0,0,'R',$fill); - $pdf->Cell(20,6,nbm($array[$i]['sum_cred']),0,0,'R',$fill); - $pdf->Cell(20,6,nbm($array[$i]['solde_deb']),0,0,'R',$fill); - $pdf->Cell(20,6,nbm($array[$i]['solde_cred']),0,0,'R',$fill); + } + foreach (array(3,2,1) as $ind) + {=09 + $r=3D$value; + if ( ! isset($_GET['lvl'.$ind]))continue; +=09 + if (${'lvl'.$ind.'_old'} =3D=3D '') ${'lvl'.$ind.'_old'}=3Dsubstr($r[= 'poste'],0,$ind); + if ( ${'lvl'.$ind.'_old'} !=3D substr($r['poste'],0,$ind)) + { + $pdf->SetFont('DejaVu','B',7); + $pdf->Cell(30,6,"Totaux ".$ind); + $pdf->Cell(80,6,${'lvl'.$ind.'_old'}); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_deb']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['sum_cred']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_deb']),0,0,'R'); + $pdf->Cell(20,6,nbm(${'nlvl'.$ind}['solde_cred']),0,0,'R'); + $pdf->Ln(); + $pdf->SetFont('DejaVuCond','',7); + ${'lvl'.$ind.'_old'}=3Dsubstr($r['poste'],0,$ind); + foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) + { + ${'nlvl'.$ind}[$a]=3D0; + } + } + } + =20 + // Totaux + $pdf->SetFont('DejaVuCond','B',8); + $pdf->Cell(110,6,'Totaux'); + $pdf->Cell(20,6,nbm($tp_deb),'T',0,'R',0); + $pdf->Cell(20,6,nbm($tp_cred),'T',0,'R',0); + $pdf->Cell(20,6,nbm($tp_sold),'T',0,'R',0); + $pdf->Cell(20,6,nbm($tp_solc),'T',0,'R',0); $pdf->Ln(); - $tp_deb=3Dbcadd($tp_deb,$array[$i]['sum_deb']); - $tp_cred=3Dbcadd($tp_cred,$array[$i]['sum_cred']); - $tp_sold=3Dbcadd($tp_sold,$array[$i]['solde_deb']); - $tp_solc=3Dbcadd($tp_solc,$array[$i]['solde_cred']); + } // if ! empty =20 -} -// Totaux -$pdf->SetFont('DejaVuCond','B',8); -$pdf->Cell(110,6,'Totaux'); -$pdf->Cell(20,6,nbm($tp_deb),'T',0,'R',0); -$pdf->Cell(20,6,nbm($tp_cred),'T',0,'R',0); -$pdf->Cell(20,6,nbm($tp_sold),'T',0,'R',0); -$pdf->Cell(20,6,nbm($tp_solc),'T',0,'R',0); -$pdf->Ln(); - - $fDate=3Ddate('dmy-Hi'); $pdf->Output('balance-'.$fDate.'.pdf','I'); =20